096a45a67ca693804beca3aa50a1e9975afbe46d |
26-Sep-2015 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ie2eb569fc4b41e3639b81af4d84a52ec564cd662 Auto-generated-cl: translation import
es/values-fa/strings.xml
|
c153cb57f2de82fa6ed7ad01de516724f007bed0 |
19-Sep-2015 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ie210e470536721f3d8dbe0f44620e5e7c7bfbb26 Auto-generated-cl: translation import
es/values-fa/strings.xml
es/values-ja/strings.xml
es/values-mr-rIN/strings.xml
es/values-nl/strings.xml
|
5816ae83804d6e3e899becb1c182324cba5d99f9 |
31-Jul-2015 |
Alan Newberger <alann@google.com> |
am 431be7f8: am c8594ddf: Check for zero length array returns * commit '431be7f85d9693a05b1a1863d75ea44e7b008754': Check for zero length array returns
|
431be7f85d9693a05b1a1863d75ea44e7b008754 |
31-Jul-2015 |
Alan Newberger <alann@google.com> |
am c8594ddf: Check for zero length array returns * commit 'c8594ddf504109dc3c17baf9c2448469b28973e9': Check for zero length array returns
|
65485d4097b704f4df6a5dcd180873be55d51645 |
31-Jul-2015 |
Dianne Hackborn <hackbod@google.com> |
am ef0b96ce: Change MNC codename to just M. * commit 'ef0b96ce4571805066c1e0865d41272b066e22e6': Change MNC codename to just M.
|
c8594ddf504109dc3c17baf9c2448469b28973e9 |
31-Jul-2015 |
Alan Newberger <alann@google.com> |
Check for zero length array returns permissions API may return zero length arrays, check before access. Bug: 22871531 Change-Id: I0ebd5feecb24f03fda0350a9ab42efa25127b3dc
rc/com/android/camera/PermissionsActivity.java
|
ef0b96ce4571805066c1e0865d41272b066e22e6 |
30-Jul-2015 |
Dianne Hackborn <hackbod@google.com> |
Change MNC codename to just M. Change-Id: I1a6d7b269e5b7a1630d29e9f406684175d5bdf7d
rc/com/android/camera/util/ApiHelper.java
|
6269e66df53113c46918e8f8a46b711e50a9899a |
29-Jul-2015 |
Geoff Mendal <mendal@google.com> |
am 822b0367: (-s ours) am 51a59c80: (-s ours) am a94d0f6f: (-s ours) Import translations. DO NOT MERGE * commit '822b0367d41d46a101f5a7b87094718811976517': Import translations. DO NOT MERGE
|
6b1e2a64def65d34e2faf0118db105e048b3a061 |
29-Jul-2015 |
Geoff Mendal <mendal@google.com> |
am ff24828e: (-s ours) am 0b9400ac: (-s ours) Import translations. DO NOT MERGE * commit 'ff24828ed44a1d6c9ca8ba934f5cab4d092a728c': Import translations. DO NOT MERGE
|
822b0367d41d46a101f5a7b87094718811976517 |
29-Jul-2015 |
Geoff Mendal <mendal@google.com> |
am 51a59c80: (-s ours) am a94d0f6f: (-s ours) Import translations. DO NOT MERGE * commit '51a59c80a1e60f91e446b0b55282204501cf56a7': Import translations. DO NOT MERGE
|
ff24828ed44a1d6c9ca8ba934f5cab4d092a728c |
29-Jul-2015 |
Geoff Mendal <mendal@google.com> |
am 0b9400ac: (-s ours) Import translations. DO NOT MERGE * commit '0b9400ac9bec5db4919c6ec78e89b84a951ddd43': Import translations. DO NOT MERGE
|
51a59c80a1e60f91e446b0b55282204501cf56a7 |
29-Jul-2015 |
Geoff Mendal <mendal@google.com> |
am a94d0f6f: (-s ours) Import translations. DO NOT MERGE * commit 'a94d0f6f8f74a3d0b24cf31641d036cff59f8579': Import translations. DO NOT MERGE
|
a94d0f6f8f74a3d0b24cf31641d036cff59f8579 |
29-Jul-2015 |
Geoff Mendal <mendal@google.com> |
Import translations. DO NOT MERGE Change-Id: Ib6a5d3ad23b3b1f6490853959ee68c2d667817b0 Auto-generated-cl: translation import
es/values-uz-rUZ/strings.xml
|
0b9400ac9bec5db4919c6ec78e89b84a951ddd43 |
29-Jul-2015 |
Geoff Mendal <mendal@google.com> |
Import translations. DO NOT MERGE Change-Id: Ibca60d6b4cced483ee7ec106ec45c1fbdd50a02c Auto-generated-cl: translation import
es/values-uz-rUZ/strings.xml
|
14d0c31a681c9db803f955a1989fc9a194c94543 |
29-Jul-2015 |
Geoff Mendal <mendal@google.com> |
Import translations. DO NOT MERGE Change-Id: Ied3be971df7df1d1edb6373748666d42a43a76a5 Auto-generated-cl: translation import
es/values-uz-rUZ/strings.xml
|
f2c82590b1ea264578b6cbd87a51b031afd7662b |
24-Jul-2015 |
Alan Newberger <alann@google.com> |
am 5bbf8748: am 30339719: Remove unused ACCOUNTS permissions * commit '5bbf8748046e59b5633d42c84ff687fa22405ea5': Remove unused ACCOUNTS permissions
|
a5c8a7daefe8fadb37ec4f5508eb458a52582013 |
24-Jul-2015 |
Alan Newberger <alann@google.com> |
am 151f74fc: am 4df3011e: Protect against destroying uncreated values * commit '151f74fca138df5d3c6f83b86e3b6e8d9748a7e3': Protect against destroying uncreated values
|
5bbf8748046e59b5633d42c84ff687fa22405ea5 |
24-Jul-2015 |
Alan Newberger <alann@google.com> |
am 30339719: Remove unused ACCOUNTS permissions * commit '30339719b7ff523b1ab8e6c953b269a870c1181c': Remove unused ACCOUNTS permissions
|
151f74fca138df5d3c6f83b86e3b6e8d9748a7e3 |
24-Jul-2015 |
Alan Newberger <alann@google.com> |
am 4df3011e: Protect against destroying uncreated values * commit '4df3011e2f3680a80ecc89c817ba528b2a578f0f': Protect against destroying uncreated values
|
30339719b7ff523b1ab8e6c953b269a870c1181c |
24-Jul-2015 |
Alan Newberger <alann@google.com> |
Remove unused ACCOUNTS permissions BUG=22716720 Change-Id: Id465f3cf55f41d7ebf90e4feecfa38824b66faa4
ndroidManifest.xml
|
4df3011e2f3680a80ecc89c817ba528b2a578f0f |
24-Jul-2015 |
Alan Newberger <alann@google.com> |
Protect against destroying uncreated values Though we attempt to minimize lifecycle impact by exiting onCreate early due to inadequate permissions, we need to protect against touching fields in onDestroy that we did not initialize in onCreate. BUG=22718094 Change-Id: I49adcbbed005c4efa785458aa398e61488cfceb0
rc/com/android/camera/CameraActivity.java
|
f0c8509b1b59e89c881bfb59ddcf2dd23c90a152 |
23-Jul-2015 |
Sascha Haeberling <haeberling@google.com> |
am 1aaec6c0: am ae474d0b: [Haleakala] Change JPEG compression thread priority to BACKGROUND - 1. * commit '1aaec6c024f7f2077590ea507fe70900c4889c48': [Haleakala] Change JPEG compression thread priority to BACKGROUND - 1.
|
1aaec6c024f7f2077590ea507fe70900c4889c48 |
23-Jul-2015 |
Sascha Haeberling <haeberling@google.com> |
am ae474d0b: [Haleakala] Change JPEG compression thread priority to BACKGROUND - 1. * commit 'ae474d0b2967b3995a4e1e334d6689b0cd9a38c9': [Haleakala] Change JPEG compression thread priority to BACKGROUND - 1.
|
ae474d0b2967b3995a4e1e334d6689b0cd9a38c9 |
23-Jul-2015 |
Sascha Haeberling <haeberling@google.com> |
[Haleakala] Change JPEG compression thread priority to BACKGROUND - 1. Bug: 22670310 Change-Id: Ic2ee7e2de141d7df2a316733b465daa354b2d517
rc/com/android/camera/async/AndroidPriorityThread.java
rc/com/android/camera/processing/imagebackend/ImageBackend.java
|
63704a163384b4e9c610e81a7eab4c6a634dbd36 |
18-Jul-2015 |
zafir <zafir@google.com> |
am 2506ff92: am ac0e2425: Fixes to M permissions. * commit '2506ff92df39152e2ea0cb9070fa08db05262e2a': Fixes to M permissions.
|
2506ff92df39152e2ea0cb9070fa08db05262e2a |
18-Jul-2015 |
zafir <zafir@google.com> |
am ac0e2425: Fixes to M permissions. * commit 'ac0e2425e77a9b69e76d2f31876798825ea44584': Fixes to M permissions.
|
ac0e2425e77a9b69e76d2f31876798825ea44584 |
15-Jul-2015 |
zafir <zafir@google.com> |
Fixes to M permissions. Previously, we called PermissionsActivity with startActivityForResult(). However, this creates race conditions as we check for permissions and the CameraActivity continues to operate. Now, we end CameraActivity and launch a new instance upon successful permissions resolution. We can also put the preload filmstrip logic back in its original place in onCreate. The checks for permissions happen in both onCreate and onResume. Bug: 22442745, 22478144, 22497152 Change-Id: I82e9125a46581db44aa61d4ee94aec5a820e9df0
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/PermissionsActivity.java
|
8ec15d5fe95c9851a4fcbe94a627f927639d19ff |
17-Jul-2015 |
zafir <zafir@google.com> |
am e65f51f5: am dd334be9: Camera M permissions: lockscreen improvements * commit 'e65f51f583c1707548662992d85176a8ed9ba19e': Camera M permissions: lockscreen improvements
|
e65f51f583c1707548662992d85176a8ed9ba19e |
17-Jul-2015 |
zafir <zafir@google.com> |
am dd334be9: Camera M permissions: lockscreen improvements * commit 'dd334be92c5513a06c809ee3ea25e411dfad0589': Camera M permissions: lockscreen improvements
|
dd334be92c5513a06c809ee3ea25e411dfad0589 |
15-Jul-2015 |
zafir <zafir@google.com> |
Camera M permissions: lockscreen improvements This CL now just provides some improvements for lockscreen independent of any onCreate/onResume lifecycle adjustments. Fixes include: * add a black content view to Permissions Activity -- noticed screen junk opening from lockscreen due to unpainted regions, the whole activity needs to paint the screen not just the dialog. * use FLAG_SHOW_WHEN_LOCKED to show permissions screen over lockscreen, per bug discussion in this case force failure, don't prompt for permission grants. * fun double onResumes induce flicker jank in the dialog UI. Inherit QuickActivity to automatically pick up the workarounds for double onResumes from lockscreens, no more flicker in the permission dialog. * also borrow from CameraActivity, broadcast receives to shut down the permissions dialog when screen goes off or user hits home on top of lockscreen. Actually apply this more broadly so that even below lockscreen, we finish this activity on screen off, IMO it is jarring to go in through lockscreen and see our permission dialog again without context of having just opened camera. * tweak permission dialog to not be cancelable, and to finish activity on back button press. * excludeFromRecents on the activity to prevent dual recents for Camera to show up when opening both via SecureCameraActivity and CameraActivity. Bug: 22502696 Change-Id: Ib545d3baa2d83b52604eec5517047b0c6278cd92
ndroidManifest.xml
es/layout/permissions.xml
rc/com/android/camera/PermissionsActivity.java
|
5559d54b4472979a423ed7b94f6d4803107b9c86 |
15-Jul-2015 |
Geoff Mendal <mendal@google.com> |
am ede11beb: (-s ours) am 34663b0f: (-s ours) am 36c35f23: (-s ours) Import translations. DO NOT MERGE * commit 'ede11beb9c3a05dad2628809641c16398e3fbeb0': Import translations. DO NOT MERGE
|
684332f23fc40b49452c7ee4f8f53aafbecb0e0a |
15-Jul-2015 |
Geoff Mendal <mendal@google.com> |
am 5449f0fd: (-s ours) am 62f7a266: (-s ours) Import translations. DO NOT MERGE * commit '5449f0fdc0fe0eceb106e4d4554cdfe729103f84': Import translations. DO NOT MERGE
|
ede11beb9c3a05dad2628809641c16398e3fbeb0 |
15-Jul-2015 |
Geoff Mendal <mendal@google.com> |
am 34663b0f: (-s ours) am 36c35f23: (-s ours) Import translations. DO NOT MERGE * commit '34663b0fd4a21a6c107c6df313bcbd1548235fd5': Import translations. DO NOT MERGE
|
5449f0fdc0fe0eceb106e4d4554cdfe729103f84 |
15-Jul-2015 |
Geoff Mendal <mendal@google.com> |
am 62f7a266: (-s ours) Import translations. DO NOT MERGE * commit '62f7a266f8862fbec21a97c3a73e74871170296d': Import translations. DO NOT MERGE
|
34663b0fd4a21a6c107c6df313bcbd1548235fd5 |
15-Jul-2015 |
Geoff Mendal <mendal@google.com> |
am 36c35f23: (-s ours) Import translations. DO NOT MERGE * commit '36c35f23f17ecfc47d1e2ef5d36b6516251b9018': Import translations. DO NOT MERGE
|
13688c8b7e84a2ff8017c33db35559b5d0fb878a |
15-Jul-2015 |
Geoff Mendal <mendal@google.com> |
am a95faf78: (-s ours) Import translations. DO NOT MERGE * commit 'a95faf780471afea65bb4e5f2b2570e4d9a4e7b9': Import translations. DO NOT MERGE
|
36c35f23f17ecfc47d1e2ef5d36b6516251b9018 |
15-Jul-2015 |
Geoff Mendal <mendal@google.com> |
Import translations. DO NOT MERGE Change-Id: I53f7a9c9bbdcdde5cad99311baab64f6f544d166 Auto-generated-cl: translation import
es/values-it/strings.xml
es/values-ky-rKG/strings.xml
es/values-th/strings.xml
|
62f7a266f8862fbec21a97c3a73e74871170296d |
15-Jul-2015 |
Geoff Mendal <mendal@google.com> |
Import translations. DO NOT MERGE Change-Id: I6dcf9bc38b2598177be02909f1f856ffc27cc609 Auto-generated-cl: translation import
es/values-it/strings.xml
es/values-ky-rKG/strings.xml
es/values-th/strings.xml
|
d8296c0e192b71603b3a473cfc696ccfffb04162 |
15-Jul-2015 |
Geoff Mendal <mendal@google.com> |
Import translations. DO NOT MERGE Change-Id: Icc30bb057630e9fde4214259ba5407d99475c3b8 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-az-rAZ/strings.xml
es/values-bg/strings.xml
es/values-bn-rBD/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rAU/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-eu-rES/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-gl-rES/strings.xml
es/values-gu-rIN/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-is-rIS/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-kk-rKZ/strings.xml
es/values-km-rKH/strings.xml
es/values-kn-rIN/strings.xml
es/values-ko/strings.xml
es/values-ky-rKG/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mk-rMK/strings.xml
es/values-ml-rIN/strings.xml
es/values-mn-rMN/strings.xml
es/values-mr-rIN/strings.xml
es/values-ms-rMY/strings.xml
es/values-my-rMM/strings.xml
es/values-nb/strings.xml
es/values-ne-rNP/strings.xml
es/values-nl/strings.xml
es/values-pa-rIN/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-si-rLK/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sq-rAL/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-ta-rIN/strings.xml
es/values-te-rIN/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-ur-rPK/strings.xml
es/values-uz-rUZ/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
a95faf780471afea65bb4e5f2b2570e4d9a4e7b9 |
15-Jul-2015 |
Geoff Mendal <mendal@google.com> |
Import translations. DO NOT MERGE Change-Id: I11944ad0054d472734152d0021b52eec67e3821a Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-az-rAZ/strings.xml
es/values-bg/strings.xml
es/values-bn-rBD/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-eu-rES/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-gl-rES/strings.xml
es/values-gu-rIN/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-is-rIS/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-kk-rKZ/strings.xml
es/values-km-rKH/strings.xml
es/values-kn-rIN/strings.xml
es/values-ko/strings.xml
es/values-ky-rKG/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mk-rMK/strings.xml
es/values-mn-rMN/strings.xml
es/values-mr-rIN/strings.xml
es/values-ms-rMY/strings.xml
es/values-my-rMM/strings.xml
es/values-nb/strings.xml
es/values-ne-rNP/strings.xml
es/values-nl/strings.xml
es/values-pa-rIN/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sq-rAL/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-ta-rIN/strings.xml
es/values-te-rIN/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-ur-rPK/strings.xml
es/values-uz-rUZ/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
|
ec28103983e6b51d582eeff8df8f3a4e3aeab2a2 |
14-Jul-2015 |
Geoff Mendal <mendal@google.com> |
am 498af6a5: (-s ours) am ca7f4ce9: (-s ours) am ec5a5213: (-s ours) Import translations. DO NOT MERGE * commit '498af6a5693cde49419f3a9abcfeb572d3a461e2': Import translations. DO NOT MERGE
|
498af6a5693cde49419f3a9abcfeb572d3a461e2 |
14-Jul-2015 |
Geoff Mendal <mendal@google.com> |
am ca7f4ce9: (-s ours) am ec5a5213: (-s ours) Import translations. DO NOT MERGE * commit 'ca7f4ce983d0bf25433226eb35f052741339ef12': Import translations. DO NOT MERGE
|
15579b8d972cc0b986d8fd39debaede674ae0bce |
14-Jul-2015 |
Geoff Mendal <mendal@google.com> |
am 4e3575eb: (-s ours) am 4c77d6a7: (-s ours) Import translations. DO NOT MERGE * commit '4e3575eb98e1b60600a9146862ab190491eec035': Import translations. DO NOT MERGE
|
ca7f4ce983d0bf25433226eb35f052741339ef12 |
14-Jul-2015 |
Geoff Mendal <mendal@google.com> |
am ec5a5213: (-s ours) Import translations. DO NOT MERGE * commit 'ec5a52136e344305fac60f6053fe4c36aa24ceb8': Import translations. DO NOT MERGE
|
4e3575eb98e1b60600a9146862ab190491eec035 |
14-Jul-2015 |
Geoff Mendal <mendal@google.com> |
am 4c77d6a7: (-s ours) Import translations. DO NOT MERGE * commit '4c77d6a70be80db4aac675d6a795708e7f0c57b4': Import translations. DO NOT MERGE
|
ec5a52136e344305fac60f6053fe4c36aa24ceb8 |
14-Jul-2015 |
Geoff Mendal <mendal@google.com> |
Import translations. DO NOT MERGE Change-Id: I98a926452e577686aa0fa16232c7e25a6a8ba234 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-az-rAZ/strings.xml
es/values-bg/strings.xml
es/values-bn-rBD/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-eu-rES/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-gl-rES/strings.xml
es/values-gu-rIN/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-is-rIS/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-kk-rKZ/strings.xml
es/values-km-rKH/strings.xml
es/values-kn-rIN/strings.xml
es/values-ko/strings.xml
es/values-ky-rKG/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mk-rMK/strings.xml
es/values-mn-rMN/strings.xml
es/values-mr-rIN/strings.xml
es/values-ms-rMY/strings.xml
es/values-my-rMM/strings.xml
es/values-nb/strings.xml
es/values-ne-rNP/strings.xml
es/values-nl/strings.xml
es/values-pa-rIN/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sq-rAL/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-ta-rIN/strings.xml
es/values-te-rIN/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-ur-rPK/strings.xml
es/values-uz-rUZ/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
|
4c77d6a70be80db4aac675d6a795708e7f0c57b4 |
14-Jul-2015 |
Geoff Mendal <mendal@google.com> |
Import translations. DO NOT MERGE Change-Id: Ic68870870e0b7c0b89c4dad2cecf0981ae6086fc Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-az-rAZ/strings.xml
es/values-bg/strings.xml
es/values-bn-rBD/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-eu-rES/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-gl-rES/strings.xml
es/values-gu-rIN/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-is-rIS/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-kk-rKZ/strings.xml
es/values-km-rKH/strings.xml
es/values-kn-rIN/strings.xml
es/values-ko/strings.xml
es/values-ky-rKG/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mk-rMK/strings.xml
es/values-mn-rMN/strings.xml
es/values-mr-rIN/strings.xml
es/values-ms-rMY/strings.xml
es/values-my-rMM/strings.xml
es/values-nb/strings.xml
es/values-ne-rNP/strings.xml
es/values-nl/strings.xml
es/values-pa-rIN/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sq-rAL/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-ta-rIN/strings.xml
es/values-te-rIN/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-ur-rPK/strings.xml
es/values-uz-rUZ/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
|
801d5289e434f2d8c1ce85f9bda3d9cd41117d0a |
14-Jul-2015 |
Alan Newberger <alann@google.com> |
am cc4f1804: am 6bb610be: am ad510fdd: Merge "Set ModeListView to LTR layout" into ub-camera-haleakala * commit 'cc4f1804cdd1bd41b1531883db25c28a55326f4c': Set ModeListView to LTR layout
|
c3b7039c31eea15b1e45471ce1fac1f336a47ad5 |
14-Jul-2015 |
Geoff Mendal <mendal@google.com> |
am f3eb023d: (-s ours) am 50f8944c: (-s ours) am 1ac1ac74: (-s ours) Import translations. DO NOT MERGE * commit 'f3eb023d60d359d19169be04d417c88c130636f2': Import translations. DO NOT MERGE
|
4732765ae07ff7b74f3ba3e546c54e37b0ac01e6 |
14-Jul-2015 |
Geoff Mendal <mendal@google.com> |
am eb29ae19: (-s ours) am 45289c3d: (-s ours) Import translations. DO NOT MERGE * commit 'eb29ae196e61227396ebb13ca3b6f14d4f00802a': Import translations. DO NOT MERGE
|
05bbbfc5cb24d06e5ad56b70b8b1551d8cafac03 |
14-Jul-2015 |
Geoff Mendal <mendal@google.com> |
am 0e58fb83: (-s ours) Import translations. DO NOT MERGE * commit '0e58fb83b7dc93ac4f55d21900a4244b3a89cdf0': Import translations. DO NOT MERGE
|
e552d003412958f09168f239ab802b9af29fcfe8 |
14-Jul-2015 |
Geoff Mendal <mendal@google.com> |
am 57b4d24e: (-s ours) am 09364eeb: (-s ours) am b980a5be: (-s ours) Import translations. DO NOT MERGE * commit '57b4d24e779a10a6dccf4c5c841d1f43c2bc77fd': Import translations. DO NOT MERGE
|
a06a903fa4f414bd5a1aa0c6061a5b46b7739013 |
14-Jul-2015 |
Geoff Mendal <mendal@google.com> |
am 5d806912: (-s ours) am e27c079d: (-s ours) Import translations. DO NOT MERGE * commit '5d806912451dd81453aac72c9b7b2fa53e4f6096': Import translations. DO NOT MERGE
|
718859d892a1b0fae7cfe470e42a028f46da9000 |
14-Jul-2015 |
Geoff Mendal <mendal@google.com> |
am 0462d5b1: (-s ours) Import translations. DO NOT MERGE * commit '0462d5b16c7e6c00ecc6bf74df57fca7ba5a3c19': Import translations. DO NOT MERGE
|
ca758103543d7f5145ee93e876b7cf5b17b0fb37 |
14-Jul-2015 |
Alan Newberger <alann@google.com> |
am c9b45d41: am 01c3f7ad: am e25f675a: Shorten location startup dialog string * commit 'c9b45d41b93f0e31ed88cf22db387006b8219333': Shorten location startup dialog string
|
cc4f1804cdd1bd41b1531883db25c28a55326f4c |
13-Jul-2015 |
Alan Newberger <alann@google.com> |
am 6bb610be: am ad510fdd: Merge "Set ModeListView to LTR layout" into ub-camera-haleakala * commit '6bb610be1aa27864d4049732f330e277623a9381': Set ModeListView to LTR layout
|
6bb610be1aa27864d4049732f330e277623a9381 |
13-Jul-2015 |
Alan Newberger <alann@google.com> |
am ad510fdd: Merge "Set ModeListView to LTR layout" into ub-camera-haleakala * commit 'ad510fddb124d1e02fd1e135d672ab1f14923e56': Set ModeListView to LTR layout
|
ad510fddb124d1e02fd1e135d672ab1f14923e56 |
13-Jul-2015 |
Alan Newberger <alann@google.com> |
Merge "Set ModeListView to LTR layout" into ub-camera-haleakala
|
f3eb023d60d359d19169be04d417c88c130636f2 |
13-Jul-2015 |
Geoff Mendal <mendal@google.com> |
am 50f8944c: (-s ours) am 1ac1ac74: (-s ours) Import translations. DO NOT MERGE * commit '50f8944c200e20e6a387e2cade03865ae95368ec': Import translations. DO NOT MERGE
|
eb29ae196e61227396ebb13ca3b6f14d4f00802a |
13-Jul-2015 |
Geoff Mendal <mendal@google.com> |
am 45289c3d: (-s ours) Import translations. DO NOT MERGE * commit '45289c3d39d24b7530e4478af0120da4a21e2744': Import translations. DO NOT MERGE
|
50f8944c200e20e6a387e2cade03865ae95368ec |
13-Jul-2015 |
Geoff Mendal <mendal@google.com> |
am 1ac1ac74: (-s ours) Import translations. DO NOT MERGE * commit '1ac1ac74af7007eb7351eb60c832e1f405252f34': Import translations. DO NOT MERGE
|
1ac1ac74af7007eb7351eb60c832e1f405252f34 |
13-Jul-2015 |
Geoff Mendal <mendal@google.com> |
Import translations. DO NOT MERGE Change-Id: Idd4712a71746b45c1512f75c8d1062513acb3a6a Auto-generated-cl: translation import
es/values-en-rAU/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-ml-rIN/strings.xml
es/values-si-rLK/strings.xml
es/values-zu/strings.xml
|
45289c3d39d24b7530e4478af0120da4a21e2744 |
13-Jul-2015 |
Geoff Mendal <mendal@google.com> |
Import translations. DO NOT MERGE Change-Id: I3b7e6493447bb1c23aa65ab3dd326d51210b2256 Auto-generated-cl: translation import
es/values-en-rAU/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-ky-rKG/strings.xml
es/values-ml-rIN/strings.xml
es/values-si-rLK/strings.xml
es/values-zu/strings.xml
|
0e58fb83b7dc93ac4f55d21900a4244b3a89cdf0 |
13-Jul-2015 |
Geoff Mendal <mendal@google.com> |
Import translations. DO NOT MERGE Change-Id: Id2b5c6b23f376ad17dd40559e4da37ddee650443 Auto-generated-cl: translation import
es/values-en-rAU/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-ky-rKG/strings.xml
es/values-ml-rIN/strings.xml
es/values-si-rLK/strings.xml
es/values-zu/strings.xml
|
1fee657d480865262f8e4659624b1ae40f2963a6 |
11-Jul-2015 |
Geoff Mendal <mendal@google.com> |
Import translations. DO NOT MERGE Change-Id: I77039d1b70cd2caa6f758fd1773e40289198b552 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-az-rAZ/strings.xml
es/values-bg/strings.xml
es/values-bn-rBD/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rAU/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-eu-rES/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-gl-rES/strings.xml
es/values-gu-rIN/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-is-rIS/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-kk-rKZ/strings.xml
es/values-km-rKH/strings.xml
es/values-kn-rIN/strings.xml
es/values-ko/strings.xml
es/values-ky-rKG/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mk-rMK/strings.xml
es/values-ml-rIN/strings.xml
es/values-mn-rMN/strings.xml
es/values-mr-rIN/strings.xml
es/values-ms-rMY/strings.xml
es/values-my-rMM/strings.xml
es/values-nb/strings.xml
es/values-ne-rNP/strings.xml
es/values-nl/strings.xml
es/values-pa-rIN/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-si-rLK/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sq-rAL/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-ta-rIN/strings.xml
es/values-te-rIN/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-ur-rPK/strings.xml
es/values-uz-rUZ/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
57b4d24e779a10a6dccf4c5c841d1f43c2bc77fd |
11-Jul-2015 |
Geoff Mendal <mendal@google.com> |
am 09364eeb: (-s ours) am b980a5be: (-s ours) Import translations. DO NOT MERGE * commit '09364eebaa1c07801e5849b73c5163646b4ceb4d': Import translations. DO NOT MERGE
|
5d806912451dd81453aac72c9b7b2fa53e4f6096 |
11-Jul-2015 |
Geoff Mendal <mendal@google.com> |
am e27c079d: (-s ours) Import translations. DO NOT MERGE * commit 'e27c079d3634309d3d709a6bd8b1a2e5b032ec65': Import translations. DO NOT MERGE
|
09364eebaa1c07801e5849b73c5163646b4ceb4d |
11-Jul-2015 |
Geoff Mendal <mendal@google.com> |
am b980a5be: (-s ours) Import translations. DO NOT MERGE * commit 'b980a5be2ea0d39d99e4946885278efbfaf1bf37': Import translations. DO NOT MERGE
|
b980a5be2ea0d39d99e4946885278efbfaf1bf37 |
11-Jul-2015 |
Geoff Mendal <mendal@google.com> |
Import translations. DO NOT MERGE Change-Id: I29df25340044638daaed9d2fd7828b85af0eef86 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-az-rAZ/strings.xml
es/values-bg/strings.xml
es/values-bn-rBD/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rAU/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-eu-rES/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-gl-rES/strings.xml
es/values-gu-rIN/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-is-rIS/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-kk-rKZ/strings.xml
es/values-km-rKH/strings.xml
es/values-kn-rIN/strings.xml
es/values-ko/strings.xml
es/values-ky-rKG/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mk-rMK/strings.xml
es/values-ml-rIN/strings.xml
es/values-mn-rMN/strings.xml
es/values-mr-rIN/strings.xml
es/values-ms-rMY/strings.xml
es/values-my-rMM/strings.xml
es/values-nb/strings.xml
es/values-ne-rNP/strings.xml
es/values-nl/strings.xml
es/values-pa-rIN/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-si-rLK/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sq-rAL/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-ta-rIN/strings.xml
es/values-te-rIN/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-ur-rPK/strings.xml
es/values-uz-rUZ/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
e27c079d3634309d3d709a6bd8b1a2e5b032ec65 |
11-Jul-2015 |
Geoff Mendal <mendal@google.com> |
Import translations. DO NOT MERGE Change-Id: If81760a295e909e517fe103cdd0fbe014d647dc5 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-bn-rBD/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rAU/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-eu-rES/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-gl-rES/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-is-rIS/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-kk-rKZ/strings.xml
es/values-km-rKH/strings.xml
es/values-kn-rIN/strings.xml
es/values-ko/strings.xml
es/values-ky-rKG/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mk-rMK/strings.xml
es/values-ml-rIN/strings.xml
es/values-mn-rMN/strings.xml
es/values-mr-rIN/strings.xml
es/values-ms-rMY/strings.xml
es/values-my-rMM/strings.xml
es/values-nb/strings.xml
es/values-ne-rNP/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-si-rLK/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-ta-rIN/strings.xml
es/values-te-rIN/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-ur-rPK/strings.xml
es/values-uz-rUZ/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
0462d5b16c7e6c00ecc6bf74df57fca7ba5a3c19 |
11-Jul-2015 |
Geoff Mendal <mendal@google.com> |
Import translations. DO NOT MERGE Change-Id: I4b769451a358ff48a35ec059b2574462fd2ddd65 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-az-rAZ/strings.xml
es/values-bg/strings.xml
es/values-bn-rBD/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rAU/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-eu-rES/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-gl-rES/strings.xml
es/values-gu-rIN/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-is-rIS/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-kk-rKZ/strings.xml
es/values-km-rKH/strings.xml
es/values-kn-rIN/strings.xml
es/values-ko/strings.xml
es/values-ky-rKG/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mk-rMK/strings.xml
es/values-ml-rIN/strings.xml
es/values-mn-rMN/strings.xml
es/values-mr-rIN/strings.xml
es/values-ms-rMY/strings.xml
es/values-my-rMM/strings.xml
es/values-nb/strings.xml
es/values-ne-rNP/strings.xml
es/values-nl/strings.xml
es/values-pa-rIN/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-si-rLK/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sq-rAL/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-ta-rIN/strings.xml
es/values-te-rIN/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-ur-rPK/strings.xml
es/values-uz-rUZ/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
4d3055b9f2a8571ee31a02ba254c32f13837eca0 |
11-Jul-2015 |
Alan Newberger <alann@google.com> |
Set ModeListView to LTR layout Mode list is LTR layout at all times. But without being marked as such, subitems like SettingsCling had their getLeft View property adjusted for RTL layout. SettingsCling had a ~800 pixel left property under RTL vs 0 in LTR, causing it to set itself off screen. BUG=22206761 Change-Id: I356e464a1121069def71c350902c032833542c29
es/layout/mode_list_layout.xml
|
c9b45d41b93f0e31ed88cf22db387006b8219333 |
11-Jul-2015 |
Alan Newberger <alann@google.com> |
am 01c3f7ad: am e25f675a: Shorten location startup dialog string * commit '01c3f7adc5ee35ecd6ad226ad91a03017c0ad4a0': Shorten location startup dialog string
|
01c3f7adc5ee35ecd6ad226ad91a03017c0ad4a0 |
11-Jul-2015 |
Alan Newberger <alann@google.com> |
am e25f675a: Shorten location startup dialog string * commit 'e25f675a189f56df57d08b62fa3604843dfee4a8': Shorten location startup dialog string
|
e25f675a189f56df57d08b62fa3604843dfee4a8 |
11-Jul-2015 |
Alan Newberger <alann@google.com> |
Shorten location startup dialog string BUG=21706101 Change-Id: I66164d43830cb71bb3a24f0f996a533358cb7d7e
es/values/strings.xml
|
981eb996de64e9e798fa76c59e50d52e6dc1aa8f |
10-Jul-2015 |
Alan Newberger <alann@google.com> |
am ade8896d: am 2fc4970c: am 00720781: Null check when evaluating valid resolution size * commit 'ade8896d12cb0c250c24e38e81848f5fb9032310': Null check when evaluating valid resolution size
|
ade8896d12cb0c250c24e38e81848f5fb9032310 |
10-Jul-2015 |
Alan Newberger <alann@google.com> |
am 2fc4970c: am 00720781: Null check when evaluating valid resolution size * commit '2fc4970c2631ec5593c4566a72d4524014b49a29': Null check when evaluating valid resolution size
|
2fc4970c2631ec5593c4566a72d4524014b49a29 |
10-Jul-2015 |
Alan Newberger <alann@google.com> |
am 00720781: Null check when evaluating valid resolution size * commit '00720781f6703de532ddbc05238db5bf5fd7cd2d': Null check when evaluating valid resolution size
|
00720781f6703de532ddbc05238db5bf5fd7cd2d |
10-Jul-2015 |
Alan Newberger <alann@google.com> |
Null check when evaluating valid resolution size Guard against nonexistent size so that logic to reset size preference can proceed BUG=22396405 Change-Id: Id508713ef91f632867366934e72fe939a839e228
rc/com/android/camera/settings/ResolutionSetting.java
|
c28abdb81256db38f8a6ee4780d7e3d091d65991 |
09-Jul-2015 |
zafir <zafir@google.com> |
am dfd3ecb1: am 148d0b8e: Launch PermissionsActivity if CameraActivity resume is called without critical permissions. * commit 'dfd3ecb1b6bbec03d419b3a65a10dd344ae5dbc3': Launch PermissionsActivity if CameraActivity resume is called without critical permissions.
|
dfd3ecb1b6bbec03d419b3a65a10dd344ae5dbc3 |
09-Jul-2015 |
zafir <zafir@google.com> |
am 148d0b8e: Launch PermissionsActivity if CameraActivity resume is called without critical permissions. * commit '148d0b8e3fd412fa6a666e75484fe6b7e0465f5a': Launch PermissionsActivity if CameraActivity resume is called without critical permissions.
|
148d0b8e3fd412fa6a666e75484fe6b7e0465f5a |
09-Jul-2015 |
zafir <zafir@google.com> |
Launch PermissionsActivity if CameraActivity resume is called without critical permissions. Bug: 22358833 Change-Id: I5c189d4976b9355d531e028ecc163bb67bae6987
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/PermissionsActivity.java
|
b01de9c315cd69ee995d034475e5470c677b3105 |
08-Jul-2015 |
Alan Newberger <alann@google.com> |
am 6e0e81f3: am 5c8c7d3c: Clear permissions check after successful PermissionsActivity * commit '6e0e81f33fb78722474ee139c99c8f2e94af5592': Clear permissions check after successful PermissionsActivity
|
6e0e81f33fb78722474ee139c99c8f2e94af5592 |
08-Jul-2015 |
Alan Newberger <alann@google.com> |
am 5c8c7d3c: Clear permissions check after successful PermissionsActivity * commit '5c8c7d3c86a866fc955d2cf2e6c3ed5e49d1d233': Clear permissions check after successful PermissionsActivity
|
5c8c7d3c86a866fc955d2cf2e6c3ed5e49d1d233 |
08-Jul-2015 |
Alan Newberger <alann@google.com> |
Clear permissions check after successful PermissionsActivity If the permissions activity indicates the user was successful, mark mHasCriticalPermissions true to allow the app to resume normally. BUG=22347017 Change-Id: I6b9bdd02382d071530529a08e8f8fe7faf02fe3b
rc/com/android/camera/CameraActivity.java
|
b462c3ca45c1daafa1b2bb4461959b55734cf544 |
08-Jul-2015 |
Alan Newberger <alann@google.com> |
am f2bdf276: am c2d5d078: Restrict permission checks to M devices * commit 'f2bdf2767617415e476ecab683e1fc05704174e7': Restrict permission checks to M devices
|
f2bdf2767617415e476ecab683e1fc05704174e7 |
08-Jul-2015 |
Alan Newberger <alann@google.com> |
am c2d5d078: Restrict permission checks to M devices * commit 'c2d5d078821ca5e8de0c0d03b6603bf7c505c53f': Restrict permission checks to M devices
|
c2d5d078821ca5e8de0c0d03b6603bf7c505c53f |
08-Jul-2015 |
Alan Newberger <alann@google.com> |
Restrict permission checks to M devices Add an ApiHelper check and only call checkSelfPermission if we are on M and the methods exist. BUG=22345681 Change-Id: Icda8d40057b5492502858ced731a749a2f66abf8
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/util/ApiHelper.java
|
3f3dfcb15b9d0dca041b935cc46946acbfa2ff06 |
08-Jul-2015 |
Geoff Mendal <mendal@google.com> |
am ccb925b1: (-s ours) am a5380779: (-s ours) Import translations. DO NOT MERGE * commit 'ccb925b17d751735427c44e05acc871b02d0028e': Import translations. DO NOT MERGE
|
03d7cde4c5ba0eb4195b7b91266ef10c3e85a574 |
08-Jul-2015 |
Geoff Mendal <mendal@google.com> |
am a532005c: (-s ours) Import translations. DO NOT MERGE * commit 'a532005ce9d17b0d89a16ea94106cc3e9ca8b25c': Import translations. DO NOT MERGE
|
ccb925b17d751735427c44e05acc871b02d0028e |
08-Jul-2015 |
Geoff Mendal <mendal@google.com> |
am a5380779: (-s ours) Import translations. DO NOT MERGE * commit 'a5380779fdb646b295dd84a0db4cb48c0d98b63a': Import translations. DO NOT MERGE
|
a5380779fdb646b295dd84a0db4cb48c0d98b63a |
08-Jul-2015 |
Geoff Mendal <mendal@google.com> |
Import translations. DO NOT MERGE Change-Id: I3e278d51be24e50c7b97e94929914bb982ff1ebe Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-bn-rBD/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rAU/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-eu-rES/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-gl-rES/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-is-rIS/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-kk-rKZ/strings.xml
es/values-km-rKH/strings.xml
es/values-kn-rIN/strings.xml
es/values-ko/strings.xml
es/values-ky-rKG/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mk-rMK/strings.xml
es/values-ml-rIN/strings.xml
es/values-mn-rMN/strings.xml
es/values-mr-rIN/strings.xml
es/values-ms-rMY/strings.xml
es/values-my-rMM/strings.xml
es/values-nb/strings.xml
es/values-ne-rNP/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-si-rLK/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-ta-rIN/strings.xml
es/values-te-rIN/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-ur-rPK/strings.xml
es/values-uz-rUZ/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
a532005ce9d17b0d89a16ea94106cc3e9ca8b25c |
08-Jul-2015 |
Geoff Mendal <mendal@google.com> |
Import translations. DO NOT MERGE Change-Id: I45b02325512d117d47e0aee868b0d13bc4538aa2 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-az-rAZ/strings.xml
es/values-bg/strings.xml
es/values-bn-rBD/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rAU/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-eu-rES/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-gl-rES/strings.xml
es/values-gu-rIN/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-is-rIS/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-kk-rKZ/strings.xml
es/values-km-rKH/strings.xml
es/values-kn-rIN/strings.xml
es/values-ko/strings.xml
es/values-ky-rKG/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mk-rMK/strings.xml
es/values-ml-rIN/strings.xml
es/values-mn-rMN/strings.xml
es/values-mr-rIN/strings.xml
es/values-ms-rMY/strings.xml
es/values-my-rMM/strings.xml
es/values-nb/strings.xml
es/values-ne-rNP/strings.xml
es/values-nl/strings.xml
es/values-pa-rIN/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-si-rLK/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sq-rAL/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-ta-rIN/strings.xml
es/values-te-rIN/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-ur-rPK/strings.xml
es/values-uz-rUZ/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
2b4101fe49818cc4b71105386820c9d753ca5aaa |
07-Jul-2015 |
zafir <zafir@google.com> |
am ad44cda8: Minimum viable Android M runtime permissions handling for H. * commit 'ad44cda82fe6ec5ee090115129223c6314f9e1bb': Minimum viable Android M runtime permissions handling for H.
|
ad44cda82fe6ec5ee090115129223c6314f9e1bb |
29-Jun-2015 |
zafir <zafir@google.com> |
Minimum viable Android M runtime permissions handling for H. Creates new activity for permissions handling: both checking for permissions and handling error condition when critical permissions are not present. The reason for creating a new activity is so the app does not attempt to continue executing OnCreate, OnResume etc, which opens the camera while the dialogs are showing. This should not slow the app down because the permissions activity will only run when a) the first time the app has insufficient permissions and b) when a critical permission is missing and the app needs to shut down. Bug: 21273463 Change-Id: I603acfb3057ba26b9cfa7935eb4cb24b5d547cb5
ndroidManifest.xml
es/values/strings.xml
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/PermissionsActivity.java
rc/com/android/camera/settings/Keys.java
|
1cef126a6de13b002f0caf55963fe0b48de00546 |
29-Jun-2015 |
Alan Newberger <alann@google.com> |
am fd6f316a: Merge "Ensure CaptureModule/API2 works without front camera" into ub-camera-haleakala * commit 'fd6f316adc5abfa071534642688bdf46f47a3925': Ensure CaptureModule/API2 works without front camera
|
245239baa8ac24036f05716af4b2739b254846f6 |
29-Jun-2015 |
Alan Newberger <alann@google.com> |
am 62240e14: Merge "Update filmstrip item on metadata update" into ub-camera-haleakala * commit '62240e14e310aa06601b4d069f30c0190e7b5ef3': Update filmstrip item on metadata update
|
fd6f316adc5abfa071534642688bdf46f47a3925 |
29-Jun-2015 |
Alan Newberger <alann@google.com> |
Merge "Ensure CaptureModule/API2 works without front camera" into ub-camera-haleakala
|
62240e14e310aa06601b4d069f30c0190e7b5ef3 |
29-Jun-2015 |
Alan Newberger <alann@google.com> |
Merge "Update filmstrip item on metadata update" into ub-camera-haleakala
|
75dcaf3bd47ec093f5805dc422dcdd397d2d0e1a |
27-Jun-2015 |
Senpo Hu <senpo@google.com> |
am 04a9f8b6: Merge "Fix transform issue in CaptureIntent." into ub-camera-haleakala * commit '04a9f8b68dfc636e5d2194af18cc2022e6b8354f': Fix transform issue in CaptureIntent.
|
ef22af43f7769ce6975f674351d29d5fa0df5e07 |
25-Jun-2015 |
Alan Newberger <alann@google.com> |
Ensure CaptureModule/API2 works without front camera Add a check in both first run dialogs, and the generated HardwareSpec, so that front cameras are only used if detected. BUG=21781461 Change-Id: I6844655b2fd3df90b649f5dfd6a006ef68dbf1da
rc/com/android/camera/CaptureModule.java
rc/com/android/camera/app/FirstRunDialog.java
rc/com/android/camera/one/v2/Camera2OneCameraManagerImpl.java
|
9ad71f6fa9cc5471fbc08d181fa2d6361974e524 |
25-Jun-2015 |
Alan Newberger <alann@google.com> |
Update filmstrip item on metadata update Due to async metadata loading, when viewing an image progress bar, after progress completion the main handler hiding progress bar would also hide filmstrip buttons if in secure mode, but the async metadata handler was calling a restricted handler that would only update the controls, not hiding for secure, or updating overflow menu. This change ensures all UI aspects of the item update are processed upon metadata loading. BUG=21499182 Change-Id: I92f22667d836d6ece6aa8427d967ec8e038b1e77
rc/com/android/camera/CameraActivity.java
|
04a9f8b68dfc636e5d2194af18cc2022e6b8354f |
25-Jun-2015 |
Senpo Hu <senpo@google.com> |
Merge "Fix transform issue in CaptureIntent." into ub-camera-haleakala
|
a6572422e8940e176e3630c23a331927b5b08853 |
13-Jun-2015 |
Senpo Hu <senpo@google.com> |
Fix transform issue in CaptureIntent. On M, EventOnTextureViewLayoutChanged comes earlier during app initialization in StateForeground which doesn't handle it. So here in StateReadyForCapture, we pull the current preview layout size and inform ResourceSurfaceTexture to allow it to calculate transform. Noted that we also need to bring this fix to Ivvavik. Bug: 21786937 Bug: 20173626 Change-Id: I417aef2f09247e77059fc5b066cbf10602ce5cf1
rc/com/android/camera/captureintent/CaptureIntentModuleUI.java
rc/com/android/camera/captureintent/resource/ResourceSurfaceTextureImpl.java
rc/com/android/camera/captureintent/state/StateReadyForCapture.java
|
d3611d6a86f46fb877e5260410ddd6389445be1e |
19-Jun-2015 |
Alan Newberger <alann@google.com> |
AOSP Camera source should run camera2 API on M In all cases has Camera2 app run in CaptureModule, using capability levels to configure in either LEGACY or LIMITED JPEG, or full ZSL mode. BUG=21490086 Change-Id: I75842e9afc8d6ef387dd6611a5251394e8318caa
rc/com/android/camera/one/config/OneCameraFeatureConfigCreator.java
|
e07a7e90a11a60e073ef55d3633671ca29177e6c |
16-Jun-2015 |
Geoff Mendal <mendal@google.com> |
am 2399038f: (-s ours) Import translations. DO NOT MERGE * commit '2399038f488c5ae0a4cd6fb45301ff8747a29be1': Import translations. DO NOT MERGE
|
2399038f488c5ae0a4cd6fb45301ff8747a29be1 |
16-Jun-2015 |
Geoff Mendal <mendal@google.com> |
Import translations. DO NOT MERGE Change-Id: I68480e5a35383d6967dedbada17bc8075a24d90e Auto-generated-cl: translation import
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-hi/strings.xml
es/values-it/strings.xml
es/values-ta-rIN/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
|
71d368a9672dc366165a16d7f6a94797dafd92c9 |
11-Jun-2015 |
I-Jong Lin <ijonglin@google.com> |
am 8d8b329d: Fix for invalidated resolutions via upgrade * commit '8d8b329da25456adb5ee45e0450680654114e125': Fix for invalidated resolutions via upgrade
|
8d8b329da25456adb5ee45e0450680654114e125 |
11-Jun-2015 |
I-Jong Lin <ijonglin@google.com> |
Fix for invalidated resolutions via upgrade Bug: 21758681 There was a upgrade bug where an valid resolution of the previous version of the Camera App could then be invalidated the subsequent version of the Camera App. If there were no other valid resolutions of the same aspect ratio available to the app, the current Camera App would choose (0,0) as its default size and then write this value into the saved settings. This fix allows the current Camera App to consider other resolutions not of aspect ratio as a fallback resolution setting. Also, if an invalid resolution valid has been saved to the settings, it also ignores it and then resaves a valid resolution value to the settings. Change-Id: I08f19d1ee6491619e92697897b73e4fd33a19a00
rc/com/android/camera/settings/ResolutionSetting.java
rc/com/android/camera/settings/ResolutionUtil.java
|
5b76be0d5896711d4d8b08a23c8f86bc48583d2e |
08-Jun-2015 |
I-Jong Lin <ijonglin@google.com> |
am e2323c53: Refresh required for full-screen undo in filmstrip * commit 'e2323c537f0ec4966ad58251a14e1437071ae085': Refresh required for full-screen undo in filmstrip
|
e2323c537f0ec4966ad58251a14e1437071ae085 |
08-Jun-2015 |
I-Jong Lin <ijonglin@google.com> |
Refresh required for full-screen undo in filmstrip Bug: 21666018 A Glacier regression bug: when filmstrip is in full-screen mode, and an deletion is undone, a blank screen is shown. With the fix, the undo forces the filmstrip into its "filmstrip" mode and forces a refresh with the un-deleted image. Change-Id: Id99be5d4d06e220e8698821badff32dba9b43997
rc/com/android/camera/CameraActivity.java
|
f7fa07b1018362acd62c0aed6a773faaa4d124e5 |
08-Jun-2015 |
Geoff Mendal <mendal@google.com> |
am 43c0ecae: (-s ours) Import translations. DO NOT MERGE * commit '43c0ecae9759eb19ab4485e367e1b09f7291578f': Import translations. DO NOT MERGE
|
43c0ecae9759eb19ab4485e367e1b09f7291578f |
08-Jun-2015 |
Geoff Mendal <mendal@google.com> |
Import translations. DO NOT MERGE Change-Id: Ia8c1a4f5d0fdc4d89b6b817da959888d1916aac0 Auto-generated-cl: translation import
es/values-bg/strings.xml
es/values-bn-rBD/strings.xml
es/values-el/strings.xml
es/values-fa/strings.xml
es/values-hu/strings.xml
es/values-kn-rIN/strings.xml
es/values-ml-rIN/strings.xml
es/values-mr-rIN/strings.xml
es/values-ms-rMY/strings.xml
es/values-nl/strings.xml
es/values-pt-rPT/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sr/strings.xml
es/values-te-rIN/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-ur-rPK/strings.xml
es/values-uz-rUZ/strings.xml
|
1c94fe675b519315f91a38c95412d334c8c23f05 |
08-Jun-2015 |
Geoff Mendal <mendal@google.com> |
Import translations. DO NOT MERGE Change-Id: Ie2d9444fb528a76ffd4518f77deacfdf6f5390f6 Auto-generated-cl: translation import
es/values-bg/strings.xml
es/values-bn-rBD/strings.xml
es/values-el/strings.xml
es/values-fa/strings.xml
es/values-hu/strings.xml
es/values-kn-rIN/strings.xml
es/values-ml-rIN/strings.xml
es/values-mr-rIN/strings.xml
es/values-ms-rMY/strings.xml
es/values-nl/strings.xml
es/values-pt-rPT/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sr/strings.xml
es/values-te-rIN/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-ur-rPK/strings.xml
es/values-uz-rUZ/strings.xml
|
d949816b38b64bd62573a5ce15ddba0073f30918 |
03-Jun-2015 |
Geoff Mendal <mendal@google.com> |
am f79704fb: (-s ours) Import translations. DO NOT MERGE * commit 'f79704fb4a9798b11f7cb5f725903019b9701d1a': Import translations. DO NOT MERGE
|
f79704fb4a9798b11f7cb5f725903019b9701d1a |
03-Jun-2015 |
Geoff Mendal <mendal@google.com> |
Import translations. DO NOT MERGE Change-Id: I1f299766739dbf1ed6fa34340cdca5dbea1f6837 Auto-generated-cl: translation import
es/values-bn-rBD/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-de/strings.xml
es/values-es/strings.xml
es/values-fr/strings.xml
es/values-kk-rKZ/strings.xml
es/values-kn-rIN/strings.xml
es/values-ml-rIN/strings.xml
es/values-nb/strings.xml
es/values-pt/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-uz-rUZ/strings.xml
|
78b74c2032b749395cbc37bc0f9993dfd4b2231c |
03-Jun-2015 |
Geoff Mendal <mendal@google.com> |
Import translations. DO NOT MERGE Change-Id: Ie103b96bb87277a84715b7d581a9f1d4dbf71f7a Auto-generated-cl: translation import
es/values-bn-rBD/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-de/strings.xml
es/values-es/strings.xml
es/values-fr/strings.xml
es/values-kk-rKZ/strings.xml
es/values-kn-rIN/strings.xml
es/values-ml-rIN/strings.xml
es/values-nb/strings.xml
es/values-pt/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-uz-rUZ/strings.xml
|
7081fd655bee82f050854aa9ec2cb6a461d95014 |
01-Jun-2015 |
Geoff Mendal <mendal@google.com> |
am 4fa352a2: (-s ours) Import translations. DO NOT MERGE * commit '4fa352a29cb96fe72032a55222baae8ff4257f4c': Import translations. DO NOT MERGE
|
4fa352a29cb96fe72032a55222baae8ff4257f4c |
01-Jun-2015 |
Geoff Mendal <mendal@google.com> |
Import translations. DO NOT MERGE Change-Id: I9e3eba897019de07aefe4b661040453808a94de9 Auto-generated-cl: translation import
es/values-kk-rKZ/strings.xml
|
8fb1558e59bd04e40b2d70731190e72e8efb25e1 |
01-Jun-2015 |
Geoff Mendal <mendal@google.com> |
Import translations. DO NOT MERGE Change-Id: Iddf03f7766f7821fc3a77c6113e3318721da63c3 Auto-generated-cl: translation import
es/values-kk-rKZ/strings.xml
|
ab2bc5228305da8da7576685692be06ea6481288 |
31-May-2015 |
Geoff Mendal <mendal@google.com> |
Import translations. DO NOT MERGE Change-Id: I7e5e0f0de17ef074a13351eb1aa834c5620a707a Auto-generated-cl: translation import
es/values-es/strings.xml
|
ee1910d4d1fc3a73f10bc72c2233f10744499e15 |
30-May-2015 |
Geoff Mendal <mendal@google.com> |
am 818a2ecc: (-s ours) Import translations. DO NOT MERGE * commit '818a2ecc3f9756866c03d462667499ae88ef2a2a': Import translations. DO NOT MERGE
|
818a2ecc3f9756866c03d462667499ae88ef2a2a |
30-May-2015 |
Geoff Mendal <mendal@google.com> |
Import translations. DO NOT MERGE Change-Id: I85d8e4593585d2af00fd20b7e1ec65630b8476b0 Auto-generated-cl: translation import
es/values-az-rAZ/strings.xml
es/values-es/strings.xml
es/values-gu-rIN/strings.xml
es/values-it/strings.xml
es/values-pa-rIN/strings.xml
es/values-sq-rAL/strings.xml
|
862447f384ca4e210bafff498503b94ad72c0980 |
30-May-2015 |
Sascha Haeberling <haeberling@google.com> |
am 2eb8298b: Use Google Feedback CrashBuilder API to make reports easier to consume. * commit '2eb8298b5fa99af132f6be6da920ed8867974488': Use Google Feedback CrashBuilder API to make reports easier to consume.
|
2eb8298b5fa99af132f6be6da920ed8867974488 |
30-May-2015 |
Sascha Haeberling <haeberling@google.com> |
Use Google Feedback CrashBuilder API to make reports easier to consume. Manual Cherry-Pick Part 1 of http://ag/699672 Currently, Feedback reports don't include a stacktrace. You have to download a system log file to find it. This tweak allows us to see the stacktrace on the Report page itself. Example old report: https://feedback.corp.google.com/product/102042/crash?lView=rd&lCategory=8590053278&lRSort=1&lROrder=2&lRFilter=1&lReport=5517267704 Example new report: https://feedback.corp.google.com/product/102042/crash?lView=rd&lCategory=8590053278&lRSort=1&lROrder=2&lRFilter=1&lReport=5517601160 Change-Id: If5f0ed6c69e96fe5f3661af913ae1525f8594b75
rc/com/android/camera/FatalErrorHandlerImpl.java
rc/com/android/camera/util/CameraUtil.java
rc_pd/com/android/camera/util/GoogleHelpHelper.java
|
7958ad5c113e056de683dfd365b086e660622c8c |
29-May-2015 |
Geoff Mendal <mendal@google.com> |
Import translations. DO NOT MERGE Change-Id: Id6de56c0589428fce871f3babcbc691ec052a9e9 Auto-generated-cl: translation import
es/values-az-rAZ/strings.xml
es/values-it/strings.xml
|
3d908f59f7640d2d352bb35476338d1ac52f2806 |
29-May-2015 |
Gabriel Nava <gnava@google.com> |
am e6b00bf3: Fix for unusable camera after quick pause/resume and HDR+ switch (camera-Haleakala) * commit 'e6b00bf3c0319cba17ce23161402568c8e3c3547': Fix for unusable camera after quick pause/resume and HDR+ switch (camera-Haleakala)
|
e6b00bf3c0319cba17ce23161402568c8e3c3547 |
28-May-2015 |
Gabriel Nava <gnava@google.com> |
Fix for unusable camera after quick pause/resume and HDR+ switch (camera-Haleakala) - Removing the hack for b/18854352 - Running the camera reopen camera operations and onReadyForCapture callback in a non-UI thread to avoid dead-locks Bug: 21025113 Change-Id: I5545148769d92e5a87ffa9b693397fd7737edee6
rc/com/android/camera/CaptureModule.java
rc/com/android/camera/one/v2/initialization/GenericOneCameraImpl.java
|
3609a80b8671b38a282f59795301fd9885b401ff |
28-May-2015 |
Sascha Haeberling <haeberling@google.com> |
am dad39b12: Add logging for when a session knowingly failed. * commit 'dad39b12816f05468476804b7caf3ef39a4aa682': Add logging for when a session knowingly failed.
|
dad39b12816f05468476804b7caf3ef39a4aa682 |
28-May-2015 |
Sascha Haeberling <haeberling@google.com> |
Add logging for when a session knowingly failed. Bug: 21169512 Change-Id: Ic1dc499785a97f7344e517f555fa5f7b3a1c7ea9
rc/com/android/camera/session/CaptureSession.java
rc/com/android/camera/session/CaptureSessionImpl.java
rc_pd/com/android/camera/stats/CaptureStats.java
|
7c4ad98a4068e88491bddfe948610e58341d7f4c |
28-May-2015 |
Paul Rohde <codelogic@google.com> |
am 14d92c34: Merge "Log capture session canceled events." into ub-camera-haleakala * commit '14d92c346e1890cf3eeb0fb9c846d834e2c59179': Log capture session canceled events.
|
14d92c346e1890cf3eeb0fb9c846d834e2c59179 |
28-May-2015 |
Paul Rohde <codelogic@google.com> |
Merge "Log capture session canceled events." into ub-camera-haleakala
|
646e84f85a3f463ce094ad5a9caca261277f0d0e |
28-May-2015 |
Paul Rohde <codelogic@google.com> |
Log capture session canceled events. This will handle the edgecase where capture sessions may be canceled inbetween the time the button is pressed and the capture actually starts so that it is possible to subtract these cases out of the unsaved image data. Bug: 21169512 Change-Id: Ie226d81bb10acd90dc1297230d4b024b7cd2d4d6
rc/com/android/camera/CaptureModule.java
rc/com/android/camera/session/CaptureSession.java
rc/com/android/camera/session/CaptureSessionImpl.java
rc_pd/com/android/camera/stats/CaptureStats.java
|
84a379fffdc439e49623178e81b9535904de0030 |
27-May-2015 |
Gabriel Nava <gnava@google.com> |
am d927492a: Handling the GcamService timeout due to application in paused state (camera-Haleakala) * commit 'd927492ade2e253ccc620effd5602582eaa6dd2d': Handling the GcamService timeout due to application in paused state (camera-Haleakala)
|
d927492ade2e253ccc620effd5602582eaa6dd2d |
27-May-2015 |
Gabriel Nava <gnava@google.com> |
Handling the GcamService timeout due to application in paused state (camera-Haleakala) - When GcamService times out due to a pause state, all resources are released. - Releasing the gcam resources without showing the error dialog allows next resume operation to open the camera Bug: 21025113 Change-Id: I95a89fbf6ce2498c1323cd4d06383141cc7cb913
rc/com/android/camera/CaptureModule.java
|
fefb025973e2bffcbeb02666339fb7797513d82e |
21-May-2015 |
Geoff Mendal <mendal@google.com> |
am 7ca4f1a4: (-s ours) Import translations. DO NOT MERGE * commit '7ca4f1a488c01a649bf39fae1848cd31b1dfaa65': Import translations. DO NOT MERGE
|
b14ca683faeb243119363f51206133d8391c921f |
21-May-2015 |
Geoff Mendal <mendal@google.com> |
Merge "Import translations. DO NOT MERGE" into mnc-dev
|
7ca4f1a488c01a649bf39fae1848cd31b1dfaa65 |
21-May-2015 |
Geoff Mendal <mendal@google.com> |
Import translations. DO NOT MERGE Change-Id: I3f56ffd3cd032a6c6c1984c6a5c0648733a748b2 Auto-generated-cl: translation import
es/values-kk-rKZ/strings.xml
|
56b1b15a92faf761460403171955055ceee1fec4 |
21-May-2015 |
Geoff Mendal <mendal@google.com> |
Import translations. DO NOT MERGE Change-Id: I5d5dba5fc742d7822713e2bfedebb2c240ab01b6 Auto-generated-cl: translation import
es/values-gu-rIN/strings.xml
es/values-kk-rKZ/strings.xml
es/values-pa-rIN/strings.xml
es/values-sq-rAL/strings.xml
|
f8b9b59adb97d30f3c778587c3069bc90a5c1998 |
21-May-2015 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I5a4df3b736ef4fa7cf5bf772e5e6c86f2254ff21 Auto-generated-cl: translation import
es/values-gu-rIN/strings.xml
es/values-kk-rKZ/strings.xml
es/values-pa-rIN/strings.xml
es/values-sq-rAL/strings.xml
|
08f4a90f4e4d0416612a138568b2a931c14a9d91 |
21-May-2015 |
Spike Sprague <spikuru@google.com> |
am 090f2fce: Fill out more EXIF data, closer parity to Nexus HAL bug: 21277434 * commit '090f2fce636d45d8e32d3e8cb665c0880d5a9e70': Fill out more EXIF data, closer parity to Nexus HAL bug: 21277434
|
090f2fce636d45d8e32d3e8cb665c0880d5a9e70 |
20-May-2015 |
Spike Sprague <spikuru@google.com> |
Fill out more EXIF data, closer parity to Nexus HAL bug: 21277434 Change-Id: I4e4d9b4bffa6b0a8ccb3e870d553643dd27d2356
rc/com/android/camera/exif/ExifInterface.java
rc/com/android/camera/util/ExifUtil.java
|
a344634f121d245d2096af445d3f4e5afe94f6f4 |
21-May-2015 |
Sascha Haeberling <haeberling@google.com> |
am fa77628e: Merge "Don\'t attempt to update thumbnail if session is finished." into ub-camera-haleakala * commit 'fa77628ec03fcd74af79da7a85437b0fd14bdae2': Don't attempt to update thumbnail if session is finished.
|
5266ca5cdbb0a024449769317e09a441e13e6ddf |
21-May-2015 |
Gabriel Nava <gnava@google.com> |
am 51495cc9: Fix to avoid random ArrayIndexOutOfBoundsException in bottom bar (camera-Haleakala) * commit '51495cc98578dda7ea2e9eafd5271f2dc0bc2d97': Fix to avoid random ArrayIndexOutOfBoundsException in bottom bar (camera-Haleakala)
|
fa77628ec03fcd74af79da7a85437b0fd14bdae2 |
20-May-2015 |
Sascha Haeberling <haeberling@google.com> |
Merge "Don't attempt to update thumbnail if session is finished." into ub-camera-haleakala
|
dae7a41623e04e8d583dfd636e3f5a5ae0e245e6 |
20-May-2015 |
Sascha Haeberling <haeberling@google.com> |
Don't attempt to update thumbnail if session is finished. Bug: 21167342 Change-Id: If2e4db523aa66e82809d30aa35fb9a30d124d9df
rc/com/android/camera/session/CaptureSessionImpl.java
|
51495cc98578dda7ea2e9eafd5271f2dc0bc2d97 |
20-May-2015 |
Gabriel Nava <gnava@google.com> |
Fix to avoid random ArrayIndexOutOfBoundsException in bottom bar (camera-Haleakala) Bug: 20957536 Change-Id: I6985d009e550f8f67ff36be3fce53c82ada0610e
rc/com/android/camera/MultiToggleImageButton.java
|
a93b4225a5b965dbd00a85864a7b6ce345a1eefe |
20-May-2015 |
Paul Rohde <codelogic@google.com> |
am 76ab7148: Merge "Log capture started and bytes on disk" into ub-camera-haleakala * commit '76ab7148d30b5eab605f3448ac4ff1613f2f019d': Log capture started and bytes on disk
|
3e2860f4a66e3048126ce4d2791c01a69652e17b |
20-May-2015 |
Paul Rohde <codelogic@google.com> |
am 95a80b6b: Make filmstrip grey squares less common. * commit '95a80b6bd97d306cafc74fb96be00ea0eeba1842': Make filmstrip grey squares less common.
|
b1f23f9b60e28c814828e3a87652ef5580c647f4 |
20-May-2015 |
Pengchong Jin <pengchong@google.com> |
am 10aea802: Merge "Workaround of the face detection failure on L and N5" into ub-camera-haleakala * commit '10aea802d1ab9e2a05e65b347fdb89153bbd2e5a': Workaround of the face detection failure on L and N5
|
f5e47427300ffc5e667765621d801d80f6873d22 |
20-May-2015 |
Paul Rohde <codelogic@google.com> |
am 83160a84: Merge "Increase the default JPG buffer size." into ub-camera-haleakala * commit '83160a849de1488a602f08821ee14353ef67973f': Increase the default JPG buffer size.
|
47e2f28a64e5b52c6fadb459336c182751b72751 |
20-May-2015 |
Alan Newberger <alann@google.com> |
am a5813069: Dynamic configuration management for Camera2 * commit 'a5813069b90628f20dca2184dbb579200a958670': Dynamic configuration management for Camera2
|
76ab7148d30b5eab605f3448ac4ff1613f2f019d |
20-May-2015 |
Paul Rohde <codelogic@google.com> |
Merge "Log capture started and bytes on disk" into ub-camera-haleakala
|
231b1c0679892e431bac9fe4461d5fb235e362b1 |
16-May-2015 |
Paul Rohde <codelogic@google.com> |
Log capture started and bytes on disk Change-Id: I3a62aed33f55b396b4940a7bc9e5da5131616890
rc/com/android/camera/CaptureModule.java
rc/com/android/camera/captureintent/CaptureIntentSession.java
rc/com/android/camera/captureintent/resource/ResourceCaptureToolsImpl.java
rc/com/android/camera/session/CaptureSession.java
rc/com/android/camera/session/CaptureSessionImpl.java
rc_pd/com/android/camera/stats/CaptureStats.java
|
beb40ca95cc4acc2045fb0fe8faa32be2df3ef66 |
02-Apr-2015 |
Alex Klyubin <klyubin@google.com> |
Declare that Camera2 does not use cleartext network traffic. This declares to the platform and tools that this app does not use cleartext network traffic. The platform and tools will be blocking (on best effort basis) attempts to use such traffic by this app. For example, attempts to use HTTP (rather than HTTPS) will be blocked. Bug: 19215516 Change-Id: Icaad30144192b13df87726445e19c37e0fd824bf (cherry picked from commit 2cd1529cd3ae0aa03e9e28d20b07ac072fc065c0)
ndroidManifest.xml
|
95a80b6bd97d306cafc74fb96be00ea0eeba1842 |
18-May-2015 |
Paul Rohde <codelogic@google.com> |
Make filmstrip grey squares less common. Increase the encoding priority of the intermediate thumbnails by changing the task priority to "Average". This causes the intermediate thumbs to run on their own thread pool, after the tiny thumbs are generated but allow them to not get prempted by slow, full jpg encoding tasks. Bug: 21169512 Change-Id: I2862acac724cf6302c896feeeb04702170cbf030
rc/com/android/camera/processing/imagebackend/TaskPreviewChainedJpeg.java
|
10aea802d1ab9e2a05e65b347fdb89153bbd2e5a |
16-May-2015 |
Pengchong Jin <pengchong@google.com> |
Merge "Workaround of the face detection failure on L and N5" into ub-camera-haleakala
|
83160a849de1488a602f08821ee14353ef67973f |
16-May-2015 |
Paul Rohde <codelogic@google.com> |
Merge "Increase the default JPG buffer size." into ub-camera-haleakala
|
ce10e6217be01d56238fac708a738f8d3313bac0 |
16-May-2015 |
Paul Rohde <codelogic@google.com> |
Increase the default JPG buffer size. BUG: 21162720 Change-Id: Ie9d634533778c254a000da92f0af2948d814b1dd
rc/com/android/camera/processing/imagebackend/TaskCompressImageToJpeg.java
|
a5813069b90628f20dca2184dbb579200a958670 |
16-May-2015 |
Alan Newberger <alann@google.com> |
Dynamic configuration management for Camera2 Ensure Camera2 app selects the appropriate OneCamera per feature configuration. Bug: 21204365 Change-Id: I47671a91c89f20e2add2f1f3889d4411341fa1dc
rc_pd/com/android/camera/one/v2/OneCameraCreator.java
|
9218dc38da07cbfe48d64897d67472028644fea1 |
15-May-2015 |
Pengchong Jin <pengchong@google.com> |
Workaround of the face detection failure on L and N5 This patch is a workaround of the face detection failure on L and Nexus 5. For Nexus 5 on L, the current FD only works when the preview stream is configured as the first stream before the JPEG stream. This change lock the order by creating a capture session with the preview stream first, and then creating the normal capture session with preview and JPEG. Bug: b/21039466 Change-Id: Icb7f1f758bc9d7ca428c7a4748223072d39dd57f
rc/com/android/camera/one/v2/initialization/PreviewStarter.java
|
e3ef956f23cf797ba59f9eb5c04abb6d5277fb6f |
15-May-2015 |
Alex Cheung <alexcheung@google.com> |
keep history after reset to ub-camera-haleakala
|
797ea92e91faa8c02c7cd042e607960eb50ec2ba |
15-May-2015 |
Alan Newberger <alann@google.com> |
Merge "Remove jpegutiltest for ub-camera-haleakala" into ub-camera-haleakala
|
80658d2843ed702f1304574c218981ac30988640 |
15-May-2015 |
Alan Newberger <alann@google.com> |
Remove jpegutiltest for ub-camera-haleakala This test breaks on mnc-dev toolchain, not critical for operation. Change-Id: Icad375c9d1d7a943168d88241e69276d7536df61
ni/Android.mk
ni/jpegutiltest.cpp
|
dd044ddbc8f9ab3970f3b066bab29a1e3954de00 |
14-May-2015 |
Geoff Mendal <mendal@google.com> |
Import translations. DO NOT MERGE Change-Id: I0dcf363579e411bb5aef5974f2dd4923d4865a78 Auto-generated-cl: translation import
es/values-es/strings.xml
es/values-uz-rUZ/strings.xml
|
f361659dd9ab34087276b2514a766eadafe344ae |
13-May-2015 |
Gabriel Nava <gnava@google.com> |
Fix for crash when switching cameras on KitKat (camera-haleakala) - Adding null check for hardwareSpec in CameraAppUI.onChangeCamera() - Hardware spec may not be available if call to get camera parameters hasn't finished yet Bug: 21118170 Change-Id: I5bf1b0328f2cae7211464ff136a31ace2577630f
rc/com/android/camera/app/CameraAppUI.java
|
7c3072ebb2b78bf5be5cdf9a6a2115b5ac6f64ba |
13-May-2015 |
Geoff Mendal <mendal@google.com> |
Import translations. DO NOT MERGE Change-Id: Ia40e98cbd91bc955da9f01c1be57d9ecfc79c1d1 Auto-generated-cl: translation import
es/values-el/strings.xml
es/values-es/strings.xml
es/values-nl/strings.xml
es/values-sk/strings.xml
es/values-uz-rUZ/strings.xml
|
49f0d8846a84e23207dd547ab320c5fa0ee4078a |
13-May-2015 |
Pengchong Jin <pengchong@google.com> |
Merge "WAR of the face detection failure" into ub-camera-haleakala
|
f51a30f89aeab87a3f163e306aa7a51b886d2920 |
12-May-2015 |
Gabriel Nava <gnava@google.com> |
Merge "Ensuring the right HDR icon is shown on camera switch (camera-haleakala)" into ub-camera-haleakala
|
64efe896623b1eb9b3116869ae1f6ad9be9a1195 |
12-May-2015 |
Alan Newberger <alann@google.com> |
Merge "skip first run dialog when starting in secure mode" into ub-camera-haleakala
|
04e24acb19a2f283f36fc67d6c32f6b11350dca7 |
12-May-2015 |
Alan Newberger <alann@google.com> |
skip first run dialog when starting in secure mode Go right into camera mode when starting from secure lockscreen, this restores prior behavior and avoids resume loops in double onResume workarounds. Bug: 21070237 Change-Id: I353bdd4b73c8c63e58710e35304b5c269458c72e
rc/com/android/camera/CameraActivity.java
|
4368ec0368f69e7604403b4a6db6f1e3123a1814 |
12-May-2015 |
Gabriel Nava <gnava@google.com> |
Ensuring the right HDR icon is shown on camera switch (camera-haleakala) - When switching cameras HDR+ icon was always shown in disabled state regardless of the actual support mode - Existing boolean setting to track device's HDR support is not enough - Changing global device's HDR support setting to string that can hold no-hdr, hdr or hdr-plus values Bug: 21037428 Change-Id: Ia9cf0484879a22a27e4deb0e4aa066ec806a43e6
es/values/arrays.xml
es/values/strings.xml
rc/com/android/camera/app/CameraAppUI.java
rc/com/android/camera/settings/Keys.java
|
55bcfcad2e492277c84c7d32912469c4b31d16e7 |
12-May-2015 |
Gabriel Nava <gnava@google.com> |
Merge "Freezing preview in capture intent when image is exposed instead of shutter click (camera-haleakala)" into ub-camera-haleakala
|
7e39f8b015985fc0e539e14c193286065b5e51d4 |
09-May-2015 |
Pengchong Jin <pengchong@google.com> |
WAR of the face detection failure This patch gives a work-around of the face detection failure that occurs when the ZSL camera is used. It forces to request a preview frame followed by a 5-frame ZSL burst before requesting the repeated preview and ZSL streams. It also hides the first preview frame in order to avoid potential janks. We do this only for L, Nexus 6 and Haleakala. Bug: 20724126 Change-Id: I40b7861e07570ed53135b2d8d182b65c5799adac
rc/com/android/camera/app/CameraAppUI.java
rc/com/android/camera/one/v2/ZslOneCameraFactory.java
rc/com/android/camera/one/v2/commands/ZslPreviewCommand.java
rc/com/android/camera/one/v2/commands/ZslPreviewCommandFactory.java
rc/com/android/camera/util/ApiHelper.java
|
ea48e2e02549198b7c3fca075328ee35845d693e |
11-May-2015 |
Gabriel Nava <gnava@google.com> |
Freezing preview in capture intent when image is exposed instead of shutter click (camera-haleakala) - Removing preview freeze call from shutter button callback - Relocating preview freeze call to quick expose handler Bug: 20957671 Change-Id: Ie1c68ed52e04cdafd6f5894d001990a030d15761
rc/com/android/camera/captureintent/state/StateReadyForCapture.java
|
cc986451105a407142e6939a88c3821dadbebd5f |
11-May-2015 |
Paul Rohde <codelogic@google.com> |
Merge "Hide no active camera NPE by defaulting to camera device -1" into ub-camera-haleakala
|
d46ac0034a0fe7b700c4f39499dd22c2c5da5300 |
11-May-2015 |
Paul Rohde <codelogic@google.com> |
Hide no active camera NPE by defaulting to camera device -1 NPE's can occur if no camera device is currently active. It's not feasable to rewire all parts of the codebase for this release to properly access the target camera device. This fix may lead to inconsistent setting persistance if in places where a NPE would otherwise occur. Bug: 21026362 Change-Id: I76c5b5fab429f61238a1ba91c0c52e839a431573
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/app/CameraController.java
|
c534c71cee79c91310ad5c43824165cc06e7cbae |
11-May-2015 |
Alan Newberger <alann@google.com> |
Fall back to bounds if provided width/height is 0 Monkey results show async dimensions can lag behind automated filmstrip. Protect against this case, should reduce monkey issues. Bug: 21023148 Change-Id: I8fef5e8d00f96c4b4c249b3a9daebfcf9991e193
rc/com/android/camera/util/CameraUtil.java
|
edd5f8086326786390a7c74dda3f0a6c9ba933b5 |
08-May-2015 |
Senpo Hu <senpo@google.com> |
[ImageIntent] Support volume / camera key to take photo. Bug: 20947910 Change-Id: I01e49840b69926b1489d6564a8b183d653b71ac1
rc/com/android/camera/captureintent/CaptureIntentModule.java
rc/com/android/camera/captureintent/event/EventClickOnCameraKey.java
rc/com/android/camera/captureintent/resource/ResourceCaptureTools.java
rc/com/android/camera/captureintent/state/StateReadyForCapture.java
|
14de25b5c502ffb2ac6396014624206562affef2 |
07-May-2015 |
Gabriel Nava <gnava@google.com> |
Opening the right camera on app restart when using PhotoModule (camera-haleakala) - In existing logic PhotoModule reverts to back camera if no aspect ratio has been selected - Reverting to Back camera only if device allows showing the aspect ratio dialog (N4,N5,N6) - Updating the Camera ID persistent setting if reverting, not only the runtime value Bug: 20889927 Change-Id: Ie59b878fd03da751c552fbf92ec5c96889144016
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/app/CameraAppUI.java
rc/com/android/camera/app/FirstRunDialog.java
|
0ec045201975bc12ac12007615c099c5e98d202a |
06-May-2015 |
Alan Newberger <alann@google.com> |
Refresh metadata for every filmstrip item update. Current filmstrip item updates: 1. call CameraFilmstripDataAdapter.updateItemAt which then calls FilmstripView.updateViewItem 2. FilmstripView.updateViewItem updates the view then calls CameraActivity.updateUiByData 3. CameraActivity.updateUiByData calls CameraFilmstripDataAdapter.updateMetadataAt 4. MetadataUpdateTask calls FilmstripView.updateViewItem again if metadata was loaded The double updateViewItems disrupts SessionItem -> PhotoItem transitions, and for some reason for LB causes the second updateViewItem to only request tiny thumbnails. For a very targeted fix, we instead make step 1 do the metadata load, and then updateViewItem is only called once. The code in step 3 still executes but is a no-op since metadata was already loaded in step one. Tested with Camera mode, Pano/PhotoSphere, LB, redoing an LB, calling out to editor and changing a photo, and taking a video. Bug: 20862631 Change-Id: Ib8b112c2ef1b5a364a5569d1391ef359d1b5fb1a
rc/com/android/camera/data/CameraFilmstripDataAdapter.java
rc/com/android/camera/data/PhotoItem.java
|
ca434e5414ae721e577da44c279a7fad9f43ca2a |
04-May-2015 |
Gabriel Nava <gnava@google.com> |
Preventing camera button to get into wrong state when pressed in succession (camera-haleakala) - Adding methods to ButtonManager to enable/disable camera button explicitly - Camera button cannot be enabled during initialization if it was explicitly disabled - PhotoModule, VideoModule and CaptureModule enable/disable camera button on camera switch - Capture button is disabled before requesting the camera switch - Capture button is re-enabled once the camera open confirmation is received Bug: 20693214 Change-Id: I6383c705eee0a82397b975332cf37bbcd5913128
rc/com/android/camera/ButtonManager.java
rc/com/android/camera/CaptureModule.java
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/VideoModule.java
|
012cfd9ffff557070aa796bbd346d1606a927abf |
04-May-2015 |
Gabriel Nava <gnava@google.com> |
Merge "Avoid camera switch while HDR activation is in progress (camera-haleakala)" into ub-camera-haleakala
|
9a57f184a6f5be46e93dd2f6c66f4b9ba07bdd75 |
02-May-2015 |
Gabriel Nava <gnava@google.com> |
Avoid camera switch while HDR activation is in progress (camera-haleakala) - Adding pre-change listener to MultiToggleImageButton to be executed before running state change animations - Allowing button initialization with pre-change callback in ButtonManager - Adding pre-change callback for conflicting options in CameraAppUI: HDR/HDR+ button disables camera button to avoid camera facing switch Camera facing disables HDR/HDR+ - Conflicting button is shown in disabled state for a while until re-enabled if applicable when the module switch is completed Bug: 20696068 Change-Id: I11a0a0567363f656be52a9ece0707ccf326f2d67
rc/com/android/camera/ButtonManager.java
rc/com/android/camera/MultiToggleImageButton.java
rc/com/android/camera/app/CameraAppUI.java
|
64f82d503cebad274deb8b5f7f7063135c99bba9 |
02-May-2015 |
Paul Rohde <codelogic@google.com> |
Merge "Check for a potentially destroyed activity before startPreview." into ub-camera-haleakala
|
e76ece9cb051dbd0cf48271b11381ff9c1aac689 |
02-May-2015 |
Pengchong Jin <pengchong@google.com> |
Merge "Fix bug b/20638423" into ub-camera-haleakala
|
6e2dc1ef0c021ca6bd86f4878a159b38778cf942 |
02-May-2015 |
Gabriel Nava <gnava@google.com> |
Merge "Disabling non available options instead of hiding when hw support is present (camera-haleakala)" into ub-camera-haleakala
|
2914f845c1d53f4a3b9aac68998b521290a7192c |
30-Apr-2015 |
Paul Rohde <codelogic@google.com> |
Check for a potentially destroyed activity before startPreview. There is a small chance that the activity can be destroyed between the time the camera is created and the preview is started. This can lead to unchecked NPE's across the app because most code assumes that there will never be a case where activity objects are accessed after onDestroy. Bug: 20097425 Change-Id: I2904ffba451ded2417a806c83fd12e4f62611150
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/CaptureModule.java
rc/com/android/camera/captureintent/event/EventOnOpenCameraSucceeded.java
rc/com/android/camera/captureintent/state/StateOpeningCamera.java
rc/com/android/camera/one/OneCamera.java
rc/com/android/camera/one/v2/Camera2OneCameraOpenerImpl.java
|
ce9ef4e3528e5599773809f74657b798c370aad2 |
01-May-2015 |
Gabriel Nava <gnava@google.com> |
Disabling non available options instead of hiding when hw support is present (camera-haleakala) - Global scope property persists the support of flash and hdr for the main camera (back) - If option is not supported at all, option is hidden - If option is supported in at least one camera but not supported in current module, option is disabled - If option is supported in current module, option is enabled - Avoiding race condition where CameraAppUI.applyModuleSpecs was bein called multiple times simultaneously for the same change - Adding a check so BottomBar UI is updated only when there's a scope (module/camera) change, unless... - Scope check can be requested within same scope for settings change Bug: 20630060 Change-Id: Iac5fa2658f04fe8329a2232fb0d5b11d20e566a2
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/VideoModule.java
rc/com/android/camera/app/CameraAppUI.java
rc/com/android/camera/settings/Keys.java
|
e3ba951d640316c598f0e690422879e8d4ba0a62 |
30-Apr-2015 |
Pengchong Jin <pengchong@google.com> |
Fix bug b/20638423 Catch the AssertionError exception thrown by CameraAgentFactory.getAndroidCameraAgent, and pop up the reporting dialog before App termination. Bug: 20638423 Change-Id: I090ea03b7ff872b40f4b0cc6bcbb33e41f332920
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/device/PortabilityCameraActions.java
|
1fe3cb806057878c136866871a8a26f76b282560 |
01-May-2015 |
Pengchong Jin <pengchong@google.com> |
Merge "Fix bug b/19965993" into ub-camera-haleakala
|
a88d6fb320a84c1371c7177153408903f91185c7 |
01-May-2015 |
Senpo Hu <senpo@google.com> |
Merge "Freeze preview after taking shot in capture intent." into ub-camera-haleakala
|
e5c19b4acc3be9b70e665627f76d082c6fc3289d |
01-May-2015 |
Senpo Hu <senpo@google.com> |
Freeze preview after taking shot in capture intent. Bug: 20690039 Change-Id: I3402b7d7acb956a886596267ca37bd129ba74e3c
rc/com/android/camera/app/CameraAppUI.java
rc/com/android/camera/captureintent/state/StateReadyForCapture.java
|
09d24d469c7a33e2bf423c824bfa52cc0dd98ed6 |
01-May-2015 |
Pengchong Jin <pengchong@google.com> |
Fix bug b/19965993 CameraId null check before checking whether the exposure compensation is supported. Bug: 19965993 Change-Id: If5cd7fbfe9ae6d2f83e56c8647836f96fa6e7426
rc/com/android/camera/settings/CameraSettingsActivity.java
|
350c3a424d42784c8df4a289adbc4a9033f4b3e6 |
01-May-2015 |
I-Jong Lin <ijonglin@google.com> |
Merge "Fix for N4 Video and inclusion of CaptureIntent" into ub-camera-haleakala
|
436aba83744b104d000ae34fead732c5271d3144 |
30-Apr-2015 |
I-Jong Lin <ijonglin@google.com> |
Fix for N4 Video and inclusion of CaptureIntent Bug: 20694189 Workaround b/19271661 needs to specifically applied in these circumstances only: 1. Phone is Nexus4 2. CaptureModule is enabled 3. Photo Mode, OR Capture Intent Photo is enabled. Since we are passing the CameraActivity in TextureViewHelper, it has enough context to know everything. Previous implementation used an invalid CameraProvider to signal that Camera2 was enabled. Now we just ask the CameraActivity directly. Change-Id: I47f841ae6476bc034a7ad3f487c40616eed05b71
rc/com/android/camera/TextureViewHelper.java
|
d9ca269f8f54ea9b316d383ec85e05708b0fefcb |
30-Apr-2015 |
Sascha Haeberling <haeberling@google.com> |
Make sure we cancel countdown before mPaused is set. Bug: 20696312 Change-Id: I3785a46881e2bb027d0cd06d1c2eba1b38ca2b4a
rc/com/android/camera/CaptureModule.java
|
ff1bb57533728cdb7aea13f8f4ca998993905b47 |
30-Apr-2015 |
Sascha Haeberling <haeberling@google.com> |
Lower the priority of ProcessingService to 'background'. Bug: 20675397 This should e.g. greatly reduce the jank we see while Lens Blurs are processing. Change-Id: I7ffd9bb394a113b913105a6e91c8f12fc067bfbb
rc/com/android/camera/processing/ProcessingService.java
|
a49c2be37cf75db0a28807783782c4fd1e1bb471 |
30-Apr-2015 |
I-Jong Lin <ijonglin@google.com> |
Merge "Fix for N4 Video Rotation Bug" into ub-camera-haleakala
|
f018bce18af5626bf67e6dcb37ea60b0cc6a53cd |
30-Apr-2015 |
I-Jong Lin <ijonglin@google.com> |
Fix for N4 Video Rotation Bug Previous fix for N4 preview (b/19271661) needed to only be applied when PhotoModule is active. Grossly plumbed the correct object references into TextureViewHelper so that it could know which module was active. Bug: 20694189 Change-Id: I0f639ae6ee0832f453213699723dc8aa25e5d9e7
rc/com/android/camera/TextureViewHelper.java
rc/com/android/camera/app/CameraAppUI.java
|
a8fcb96eadae508dc3b6036594cbaf9a7bacfc0d |
30-Apr-2015 |
Sascha Haeberling <haeberling@google.com> |
Merge "DO NOT MERGE - Show an error if we couldn't connect to the Camera device." into ub-camera-haleakala
|
301a3e18f52f9c8ca99a5bbad2943f0a323ddc15 |
30-Apr-2015 |
Sascha Haeberling <haeberling@google.com> |
DO NOT MERGE - Show an error if we couldn't connect to the Camera device. Bug: 20158861 Change-Id: Ib7cec6547a52ef02bb4ab1791d3945ef9e0a99d7
rc/com/android/camera/CameraActivity.java
|
470df0382d13b71e9c301b4e3e99b0736a0374db |
30-Apr-2015 |
Pengchong Jin <pengchong@google.com> |
Merge "Fix b/20638271: (Part 1)" into ub-camera-haleakala
|
de88a4254b858f7234d5f6d8e4d59d080af99849 |
30-Apr-2015 |
Pengchong Jin <pengchong@google.com> |
Fix b/20638271: (Part 1) Handle the case when the instance of CameraDeviceInfo is null. Bug: b/20638271 Change-Id: If8d9938405f4f2229bc5962c21f3f46e9a2bd1dd
rc/com/android/camera/settings/SettingsUtil.java
|
bb7cd0a2b1b499784af5764dc2280bd5cab317c2 |
30-Apr-2015 |
Paul Rohde <codelogic@google.com> |
Merge "Correctly read AF and AE capabilities for front-camera." into ub-camera-haleakala
|
7340e5c860c3ed94f48cf7af1aad70c64979bba0 |
30-Apr-2015 |
Senpo Hu <senpo@google.com> |
Merge "Fix a race condition while tapping retake button." into ub-camera-haleakala
|
bc75813126be7e9518e821fae31471db5ec3fe1a |
29-Apr-2015 |
Senpo Hu <senpo@google.com> |
Fix a race condition while tapping retake button. Bug: 19988384 Change-Id: I2dd6c31bdaaf24475b1cb1239a06592b3bd2ec56
rc/com/android/camera/captureintent/state/StateReadyForCapture.java
|
c5ecbd6e0a6c2a2d93fc58f0ba3d273249b06da2 |
29-Apr-2015 |
Spike Sprague <spikuru@google.com> |
calling setDrawableByLayerId sets that Drawable's level to 0. reset level of video shutter button to maximum. bug: 19955500 Change-Id: Ie1fb79dc57edfcd53fa2148b2223a0cd5d6faeb3
rc/com/android/camera/ui/AnimatedCircleDrawable.java
rc/com/android/camera/ui/BottomBar.java
|
b55bc734e5d9284cd739bc384a190dbe155d540d |
29-Apr-2015 |
Paul Rohde <codelogic@google.com> |
Correctly read AF and AE capabilities for front-camera. Bug: 20088402 Change-Id: I034bc7db3a52a9ab950da0f41515ceec8f170d03
rc/com/android/camera/CaptureModule.java
rc/com/android/camera/captureintent/state/StateReadyForCapture.java
rc/com/android/camera/one/OneCameraCharacteristics.java
rc/com/android/camera/one/v1/OneCameraCharacteristicsImpl.java
rc/com/android/camera/one/v2/OneCameraCharacteristicsImpl.java
|
511bc07f6d8bfbeab519e58bb39a29cbd3753fa1 |
22-Apr-2015 |
Geoff Mendal <mendal@google.com> |
Import translations. DO NOT MERGE Change-Id: I6daa637a6a0003dd1eb99ae4f2e88c6f4bc8db9a Auto-generated-cl: translation import
es/values-gu-rIN/strings.xml
es/values-pa-rIN/strings.xml
es/values-sq-rAL/strings.xml
|
d82f136d7e34e22619dfaec7b6c975b152a2437f |
21-Apr-2015 |
Alan Newberger <alann@google.com> |
Ensure OnScreenHint uses an Activity While using an appContext WindowManager is useful in certain cases, for OnScreenHint is MUST have an Activity-based one so that it can attach views to it. This was changed before but when moved to AndroidServices layer, regressed. Added explicit doc comment to ensure we preserve the activity reference. Bug: 20430202 Change-Id: Id4977bd8913e8bff8848e5241738111dcc10ac74
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/OnScreenHint.java
|
f39d45637c8f3a72e828a8fdf1b4d595962ef328 |
18-Apr-2015 |
Geoff Mendal <mendal@google.com> |
Import translations. DO NOT MERGE Change-Id: Ia9a8b8da5efa281afab9c56c498015f8ae5e4539 Auto-generated-cl: translation import
es/values-el/strings.xml
|
2c1c639ff161b0b1b2cba16d44b738f774cfb696 |
15-Apr-2015 |
Paul Rohde <codelogic@google.com> |
Merge "Add copywrite headers for device lifecycle classes." into ub-camera-haleakala
|
bb5cb5fa3d9e4ac18f4b4c9adaf237b804a09c56 |
15-Apr-2015 |
Paul Rohde <codelogic@google.com> |
Add copywrite headers for device lifecycle classes. Bug: 20263460 Change-Id: Ia583ec45ba9bec7dbcf41312905f7d92fa9b47dd
rc/com/android/camera/device/CameraDeviceActionProvider.java
rc/com/android/camera/device/CameraDeviceLifecycle.java
rc/com/android/camera/device/SingleDeviceActions.java
rc/com/android/camera/device/SingleDeviceCloseListener.java
rc/com/android/camera/device/SingleDeviceLifecycle.java
rc/com/android/camera/device/SingleDeviceOpenListener.java
rc/com/android/camera/device/SingleDeviceRequest.java
rc/com/android/camera/device/SingleDeviceShutdownListener.java
rc/com/android/camera/device/SingleDeviceStateMachine.java
|
f7b0fbad338552d697bad5fa152715cb09737cc4 |
15-Apr-2015 |
Sascha Haeberling <haeberling@google.com> |
Merge "Add some basic progress reporting for saving JPEG files." into ub-camera-haleakala
|
922cd8565b2f1e5dc198b88f6f039ccc75b72e65 |
15-Apr-2015 |
Sascha Haeberling <haeberling@google.com> |
Add some basic progress reporting for saving JPEG files. Bug: 18960470 Change-Id: I8f1547ae6652cd6b81773acf7726751f2d22a55c
rc/com/android/camera/one/v2/imagesaver/YuvImageBackendImageSaver.java
|
5f1f618eb3df6b9a2f8554e97e8410467b642653 |
15-Apr-2015 |
Paul Rohde <codelogic@google.com> |
Send a warmup burst to the camera before attaching the preview. This reduces startup jank by submitting a warmup burst of n frames to the camera before the preview surface is attached to the camera. This ensures the large internal buffers are allocated by the HAL before the preview stream is attached. The change will delay the preview by n frames in exchange for a smoother preview once the preview is actually shown. Bug: 19076469 Change-Id: I5abb8b49a64c35686c014001a45239f4eccfe34d
rc/com/android/camera/one/v2/SimpleOneCameraFactory.java
rc/com/android/camera/one/v2/ZslOneCameraFactory.java
rc/com/android/camera/one/v2/commands/BasicPreviewCommandFactory.java
rc/com/android/camera/one/v2/commands/PreviewCommand.java
rc/com/android/camera/one/v2/commands/PreviewCommandFactory.java
rc/com/android/camera/one/v2/commands/ZslPreviewCommand.java
rc/com/android/camera/one/v2/commands/ZslPreviewCommandFactory.java
rc/com/android/camera/one/v2/commands/zsl/BasicPreviewCommandFactory.java
rc/com/android/camera/one/v2/commands/zsl/PreviewCommandFactory.java
rc/com/android/camera/one/v2/commands/zsl/ZslPreviewCommand.java
rc/com/android/camera/one/v2/commands/zsl/ZslPreviewCommandFactory.java
rc/com/android/camera/one/v2/common/BasicCameraFactory.java
|
417e1941bdb3738c0037032adfbc015ccc395064 |
15-Apr-2015 |
Paul Rohde <codelogic@google.com> |
Merge "Add a memory pool for reusing direct bytebuffers." into ub-camera-haleakala
|
de2c5f84c216d91a366d3361be78a8c8710bd65d |
09-Apr-2015 |
Paul Rohde <codelogic@google.com> |
Add a memory pool for reusing direct bytebuffers. This should reduce GC's caused by releasing and reusing direct bytebuffers for subsequent image captures and jpg encoding. Bug: 20129797 Change-Id: I5dd2538bd3dbc77be1446564f537e7ec0fc56ec4
rc/com/android/camera/processing/imagebackend/ImageBackend.java
rc/com/android/camera/processing/imagebackend/TaskCompressImageToJpeg.java
rc/com/android/camera/processing/imagebackend/TaskJpegEncode.java
rc/com/android/camera/processing/imagebackend/TaskPreviewChainedJpeg.java
rc/com/android/camera/processing/memory/ByteBufferDirectPool.java
rc/com/android/camera/processing/memory/LruPool.java
rc/com/android/camera/processing/memory/LruResourcePool.java
rc/com/android/camera/processing/memory/SimpleLruResourcePool.java
|
9c6f9b8085c2752758e0f5633958fd17cfc9307e |
13-Apr-2015 |
Sascha Haeberling <haeberling@google.com> |
Add proper support for canceling sessions. Bug: 19384186 Change-Id: I45b0262947dcd4257d54e706f3cffc69b6bd4bc9
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/Storage.java
rc/com/android/camera/captureintent/state/StateReadyForCapture.java
rc/com/android/camera/captureintent/state/StateReviewingPicture.java
rc/com/android/camera/data/SessionItem.java
rc/com/android/camera/session/CaptureSessionImpl.java
rc/com/android/camera/session/CaptureSessionManager.java
rc/com/android/camera/session/CaptureSessionManagerImpl.java
rc/com/android/camera/session/PlaceholderManager.java
rc/com/android/camera/session/SessionNotifier.java
|
6a9e937e35091639211208960b36de1940a37c4d |
11-Apr-2015 |
zafir <zafir@google.com> |
Merge "Catch security exception and show error dialog." into ub-camera-haleakala
|
efcd55e4573e6049090bdfaf4c645e83d30b6329 |
11-Apr-2015 |
zafir <zafir@google.com> |
Catch security exception and show error dialog. Bug: 20159429 Change-Id: I180ca3d5582d6e5824adc6bdf248af686724ceba
rc/com/android/camera/one/v2/Camera2OneCameraOpenerImpl.java
|
9640ff98f5ea513e8665be92d75b454b0bf22435 |
11-Apr-2015 |
Alan Newberger <alann@google.com> |
Merge "Fix view recycling in filmstrip" into ub-camera-haleakala
|
5a0be52d3db2398cfe01d18adf779d9e443edf82 |
09-Apr-2015 |
Alan Newberger <alann@google.com> |
Fix view recycling in filmstrip View recycling is pretty broken, with code put in for the old camera preview in filmstrip being used to avoid recycling in all cases. This looks like its been broken in a number of releases, but less so due to a destructive removal of views during updates. I had fixed that but it then exposed the issue that recycling wasn't occurring elsewhere. This CL removes views from hierarchy, confirmed no more leaks when capturing and when swiping through filmstrip. Bug: 19970885 Change-Id: Ic63b9231bd24db0f44a99567278886eb0998d740
rc/com/android/camera/widget/FilmstripView.java
|
e1bfecfb5efaa29419705b35706decece4985126 |
09-Apr-2015 |
I-Jong Lin <ijonglin@google.com> |
Add average priority speed to ImageBackend Bug: 20129797 Create another priority level for ImageBackend so that we have finer grain assignment of thread priority. Change-Id: I291efeab8cf4be561c7d53c52fe13b64dc75f080
rc/com/android/camera/one/v2/errorhandling/FramerateJankDetector.java
rc/com/android/camera/processing/imagebackend/ImageBackend.java
rc/com/android/camera/processing/imagebackend/TaskImageContainer.java
|
40d3aad3972244f05888f03343cc1d23150532da |
09-Apr-2015 |
Paul Rohde <codelogic@google.com> |
Increase the thread priority of critical camera components. This increases the priority of the frame server and metadata response listeners that must respond immediatly to frames and callbacks that are returned from the camera HAL. Both threads have a tiny amout of code and callbacks that get run but must not block or they will stall the preview on image capture. This appears to only have limited impact on jank in the app. Bug: 19076469 Change-Id: I41845e094feffb1ecd3be9613489a3d70f916580
rc/com/android/camera/async/HandlerFactory.java
rc/com/android/camera/one/v2/core/FrameServerFactory.java
rc/com/android/camera/one/v2/sharedimagereader/imagedistributor/ImageDistributorFactory.java
|
220539de13121614b92323fdc54213aa587f991e |
08-Apr-2015 |
Paul Rohde <codelogic@google.com> |
Merge "Reduce software jpg encoding priority." into ub-camera-haleakala
|
22f00c96114a150ed75f02810a3fff1fa6461564 |
08-Apr-2015 |
Paul Rohde <codelogic@google.com> |
Reduce software jpg encoding priority. This skews the time-to-jpg vs preview jank in favor of a smoother preview after capturing an image compared to jpg encoding time. This should remove some of the excessive jank present post-image capture. Bug: 19076469 Change-Id: I908ec91153268a0fc9eb3a8e0112dda5bd15a6fb
rc/com/android/camera/processing/imagebackend/ImageBackend.java
rc/com/android/camera/processing/imagebackend/ImageProcessorProxyListener.java
|
c545666dcef00e568c0db0cc67412ab6785edd23 |
08-Apr-2015 |
Geoff Mendal <mendal@google.com> |
Import translations. DO NOT MERGE Change-Id: I1638540ca2170f545f32cf3f8a6acba8a45eed75 Auto-generated-cl: translation import
es/values-nl/strings.xml
es/values-sk/strings.xml
|
4f70ac0cc2624ed85f1ef2065a795ba0d2041fc7 |
07-Apr-2015 |
Senpo Hu <senpo@google.com> |
On non-Nexus device, don't show aspect ratio dialog. Bug: 20101791 Change-Id: I569f0d235c27b87bf5275d7d8f8956162f6de7bf
rc/com/android/camera/app/FirstRunDialog.java
|
f80bfbb58f6ddd0a1f428e0166334daebc5887ab |
06-Apr-2015 |
I-Jong Lin <ijonglin@google.com> |
Avoid Camera2 Contanimation in Kit-Kat, Part 2 Bug: 383307 Removed the run-time references to Camera2 API structures within the face-detection instrumentation code. Change-Id: Ib2e6acb74446c5abbbb572e28d8cc06f83f01a8f
rc/com/android/camera/stats/Camera2FaceProxy.java
rc/com/android/camera/stats/CaptureSessionStatsCollector.java
rc_pd/com/android/camera/stats/UsageStatistics.java
|
fbc5a67362ce14668f18b81064956c963d8f98a2 |
06-Apr-2015 |
Paul Rohde <codelogic@google.com> |
Merge "Defer the ZSL stream by 500 ms" into ub-camera-haleakala
|
faa6c880d64300b135592af3b0ca62bcfab20531 |
03-Apr-2015 |
Sascha Haeberling <haeberling@google.com> |
Make sure a 0x0 size is not crashing summary filling. Bug: 20036947 Change-Id: I56a39cd9bf65b84ca5d9820ad6738d16bbc4446e
rc/com/android/camera/settings/CameraSettingsActivity.java
|
2cd1529cd3ae0aa03e9e28d20b07ac072fc065c0 |
02-Apr-2015 |
Alex Klyubin <klyubin@google.com> |
Declare that Camera2 does not use cleartext network traffic. This declares to the platform and tools that this app does not use cleartext network traffic. The platform and tools will be blocking (on best effort basis) attempts to use such traffic by this app. For example, attempts to use HTTP (rather than HTTPS) will be blocked. Bug: 19215516 Change-Id: Icaad30144192b13df87726445e19c37e0fd824bf
ndroidManifest.xml
|
ffae1b53110ddae98b810bdb9a5c9dc210d96551 |
01-Apr-2015 |
Paul Rohde <codelogic@google.com> |
Defer the ZSL stream by 500 ms This forces the preview to start before the ZSL stream is attached, and then attaches the ZSL stream to the repeating request after a 500ms delay to give the system time to allocate the underlying buffers for the ZSL image readers. Bug: 19076469 Change-Id: I75ea28ead5b009e0f65f5f00c0522bcb2219cb22
rc/com/android/camera/one/v2/SimpleOneCameraFactory.java
rc/com/android/camera/one/v2/ZslOneCameraFactory.java
rc/com/android/camera/one/v2/commands/zsl/BasicPreviewCommandFactory.java
rc/com/android/camera/one/v2/commands/zsl/PreviewCommandFactory.java
rc/com/android/camera/one/v2/commands/zsl/ZslPreviewCommand.java
rc/com/android/camera/one/v2/commands/zsl/ZslPreviewCommandFactory.java
rc/com/android/camera/one/v2/common/BasicCameraFactory.java
|
bb2eeedb5567cf56790e094d5c894ab4ad215b16 |
02-Apr-2015 |
Senpo Hu <senpo@google.com> |
Merge "[CaptureIntent] Disable the shutter button after taking photo." into ub-camera-haleakala
|
42d1bb07b9c9c57b8b477a1f784e1eca9a57ac13 |
02-Apr-2015 |
Puneet Lall <puneetl@google.com> |
Merge "Ignore TRIGGER_CANCEL when tracking AF state" into ub-camera-haleakala
|
6420374af54849ccd8544780f2079c2d4fe4eff5 |
02-Apr-2015 |
Puneet Lall <puneetl@google.com> |
Ignore TRIGGER_CANCEL when tracking AF state Ignores AF state changes caused by the TRIGGER_CANCEL sent before AF scans resulting from tap-to-focus. Bug: 20036915 Change-Id: Iea4db57d5683f454dbf929d95af8fa0f0f419f92
rc/com/android/camera/one/v2/autofocus/FullAFScanCommand.java
|
6aca73ead6c02357b517383313cfec202767c651 |
02-Apr-2015 |
Senpo Hu <senpo@google.com> |
[CaptureIntent] Disable the shutter button after taking photo. Disable the button immediately. The button will be re-enabled when users press re-take button. Bug: 19988700 Change-Id: I17088b858e43079bbf17f84fec252a7ba205f5d0
rc/com/android/camera/captureintent/resource/ResourceCaptureToolsImpl.java
|
ef670bfd726c3b60cc8557fcff7963f119c10c62 |
02-Apr-2015 |
Sascha Häberling <haeberling@google.com> |
Merge "[CaptureIntent] Fix post-capture screen off-by-one pixel issue." into ub-camera-haleakala
|
c2953af6223dafabce2f4809e725727377926787 |
01-Apr-2015 |
Senpo Hu <senpo@google.com> |
[CaptureIntent] Fix post-capture screen off-by-one pixel issue. Bug: 19676505 Change-Id: Ifc9b8847f2194d73768e94d426f7ddc56d21f536
rc/com/android/camera/captureintent/CaptureIntentModuleUI.java
|
d03edd0bad7f888200cdb3e060ac2013adb2dedc |
01-Apr-2015 |
Sascha Haeberling <haeberling@google.com> |
Merge "Make sure picture sizes are cached on start-up, if they are not already." into ub-camera-haleakala
|
35a69421972d22fcd627ca1702b5f65521ef8f67 |
01-Apr-2015 |
Sascha Haeberling <haeberling@google.com> |
Make sure picture sizes are cached on start-up, if they are not already. Bug: 20015834 We cache picture sizes on disk, keyed by OS build version number. This makes sure we update this cache if we start the app on an updated OS. Refocus requires these sizes and loads them from cache. Change-Id: Ib8aa9a37481b9a6be441122be41ab81917a5bd37
rc/com/android/camera/CameraActivity.java
|
36a1ad23bead41193e22442d3196e93a01ec7fe6 |
31-Mar-2015 |
Puneet Lall <puneetl@google.com> |
Add support for dynamic ring-buffer max size Enables specifying a maximum ring-buffer size. Setting the ring-buffer size to a value smaller than ImageReader#getMaxImages reduces the number of android.media.Images held open at a steady-state at application startup. Because ImageReader images are allocated on-demand, this mitigates stuttering in the preview-stream caused by massive allocations that would otherwise occur as the ring buffer expands. Bug: 19989536 Change-Id: I5623d0cd0da6542599f430f0dcbf97d581ec8df1
rc/com/android/camera/one/v2/ZslOneCameraFactory.java
rc/com/android/camera/one/v2/sharedimagereader/ZslSharedImageReaderFactory.java
rc/com/android/camera/one/v2/sharedimagereader/ringbuffer/DynamicRingBuffer.java
rc/com/android/camera/one/v2/sharedimagereader/ringbuffer/DynamicRingBufferFactory.java
|
7e120c2f0b886ab20c3328d69b61a514219b083a |
31-Mar-2015 |
Paul Rohde <codelogic@google.com> |
Merge "Report jank for simple capture module cameras." into ub-camera-haleakala
|
cee1a391dd8f5e0a57f6fae5b0ec3849f2a20871 |
31-Mar-2015 |
Paul Rohde <codelogic@google.com> |
Report jank for simple capture module cameras. This clarifies the jank statistics by explicitly including a report if the jank detector is installed. Bug: 19987252 Change-Id: Ie8e4b9826eb0e3152d7f8358728019d1a81e787b
rc/com/android/camera/one/v2/SimpleOneCameraFactory.java
rc/com/android/camera/one/v2/errorhandling/FramerateJankDetector.java
rc_pd/com/android/camera/stats/UsageStatistics.java
|
47aeebfd46bad0703201f211dbf8e0b487958672 |
31-Mar-2015 |
Sascha Haeberling <haeberling@google.com> |
Fix build by adding missing imports. Change-Id: Ic98b815cd9aa956d1d36db70f85d8bc29d5b8cf6
rc_pd/com/android/camera/util/CameraSettingsActivityHelper.java
|
592c9e774a67ffd447ce75ded8e5926524936d18 |
31-Mar-2015 |
Sascha Haeberling <haeberling@google.com> |
Merge "Add support for new independent Lens Blur quality setting." into ub-camera-haleakala
|
45314d55fb25d19dc452be076ad3cbd3faaebe29 |
31-Mar-2015 |
Paul Rohde <codelogic@google.com> |
Merge "Collect and log jank statistics in the Camera." into ub-camera-haleakala
|
4a0c6900b1aaa75cbd2546fdc26b08fcb9544e22 |
30-Mar-2015 |
Paul Rohde <codelogic@google.com> |
Merge "Reduce startup preview jank by preventing Glide pre-allocation." into ub-camera-haleakala
|
46f8751da2fef488f6612b6f2f96e749595d3a2e |
26-Mar-2015 |
Sascha Haeberling <haeberling@google.com> |
Add support for new independent Lens Blur quality setting. Bug: 19424875 This CL and its sibling do two things: - Bring back the Lens Blur setting - Populate the setting with up to three native picture resolutions. - If needed, choose the default as being the second highest resolution. (The list is not a full list, but filterd by what we show to the user). - Make sure that after a new install a the default is set. - Extra check in RefocusModule to make sure the default is set if old setting is not valid. This is important for upgrades. - To make the size logic re-usable, I wrapped it into a PictureSizeLoader which also makes the CameraSettingsActivity a bit easier to read. Change-Id: I53fcac8304f19be4f2c5ac053363f6805b933d89
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/settings/AppUpgrader.java
rc/com/android/camera/settings/CameraPictureSizesCacher.java
rc/com/android/camera/settings/CameraSettingsActivity.java
rc/com/android/camera/settings/ListPreferenceFiller.java
rc/com/android/camera/settings/PictureSizeLoader.java
rc/com/android/camera/settings/SettingsUtil.java
rc/com/android/camera/util/Size.java
rc_pd/com/android/camera/util/CameraSettingsActivityHelper.java
|
a1a76c8ae8a0c6f0ffca427758c771ee77af2c59 |
30-Mar-2015 |
Paul Rohde <codelogic@google.com> |
Collect and log jank statistics in the Camera. This detects and logs sequences of camera timestamps where the delta between the the current and last frame exceeds the previous delta by a percentage threshold. This should only occur when there are visible janks in the camera preview. Bug: 19987252 Change-Id: Icced48be8232bba625aa501b2b1f5c111dbb5573
rc/com/android/camera/one/v2/ZslOneCameraFactory.java
rc/com/android/camera/one/v2/errorhandling/FramerateJankDetector.java
rc_pd/com/android/camera/stats/UsageStatistics.java
rc_pd/com/android/camera/util/GservicesHelper.java
|
778a15a2bd60115c19d461e90523e8726ec62ea4 |
30-Mar-2015 |
Paul Rohde <codelogic@google.com> |
Merge "Detect jank in the preview by measuring sensor timestamps." into ub-camera-haleakala
|
3bc38870104d065beb667f2c1274efea26fbc3af |
28-Mar-2015 |
Paul Rohde <codelogic@google.com> |
Detect jank in the preview by measuring sensor timestamps. This detects frames dropped by the camera (Which results in a preview that skips and jitters) by tracking the delta between frames and logging when that delta increases by more than 120%. Bug: 19076469 Change-Id: Icc9f08174097587c850c06ae88007ce784775851
rc/com/android/camera/one/v2/ZslOneCameraFactory.java
rc/com/android/camera/one/v2/errorhandling/FramerateJankDetector.java
|
f6f2863e4f906d8f9b3cfbc04292177a51fe0f55 |
30-Mar-2015 |
Geoff Mendal <mendal@google.com> |
Import translations. DO NOT MERGE Change-Id: I3163846ab4a148369e7ce40e2397e2c470313799 Auto-generated-cl: translation import
es/values-hy-rAM/strings.xml
|
0a1bd6152b063c999de06b44d4ad51f4519866a7 |
30-Mar-2015 |
Geoff Mendal <mendal@google.com> |
Import translations. DO NOT MERGE Change-Id: Ic0ec16a70f3a459175f5d06902c16e39a4c6f3a9 Auto-generated-cl: translation import
es/values-hy-rAM/strings.xml
|
7456d9eb353f0d2f60e0c0b997e7413d53444b7b |
28-Mar-2015 |
zafir <zafir@google.com> |
Merge "Enable exposure compensation in capture intent." into ub-camera-haleakala
|
cdc63303895d39e6f8b8dc60ba72e73d101ab401 |
28-Mar-2015 |
zafir <zafir@google.com> |
Enable exposure compensation in capture intent. Bug: 19964499 Change-Id: I2f7d43aa421dba0fa873eaf47c46d955136662e5
rc/com/android/camera/CaptureModule.java
rc/com/android/camera/captureintent/state/StateOpeningCamera.java
|
c14fe7dc7e8f61850cdf75c90825217ec6391726 |
28-Mar-2015 |
Sascha Haeberling <haeberling@google.com> |
Merge "Don't use undersore for variable names." into ub-camera-haleakala
|
7cdefdb76241d83169eafa3da79f9dfba4c26448 |
27-Mar-2015 |
Geoff Mendal <mendal@google.com> |
Import translations. DO NOT MERGE Change-Id: I50e93f74c8b4e26a2431e01133eff7e5c63b67d3 Auto-generated-cl: translation import
es/values-hi/strings.xml
|
6e7a26d15322405566d0779499be1fb840d8dd5f |
27-Mar-2015 |
Geoff Mendal <mendal@google.com> |
Import translations. DO NOT MERGE Change-Id: I3f638a70211e60ea731ca24dec0d3358df2e461e Auto-generated-cl: translation import
es/values-hi/strings.xml
|
c9f44b6b9d0462e3fd5ed3f65270c36bea56d200 |
27-Mar-2015 |
Sascha Haeberling <haeberling@google.com> |
Don't use undersore for variable names. Gets rid of the following compiler warning: "use of '_' as an identifier might not be supported in releases after Java SE 8)" Change-Id: Icb7eec3093acdd629f1e5b9994bd157a01fd8781
rc/com/android/camera/data/GlideFilmstripManager.java
|
a3fee380ed9ab59ba5c6e2c3bf867db078d9ebe7 |
27-Mar-2015 |
Spike Sprague <spikuru@google.com> |
Merge "Sync Video torch setting with on-screen indicator" into ub-camera-haleakala
|
6ffdeac1670c8938d0331c89d9269b68f361d6fa |
27-Mar-2015 |
zafir <zafir@google.com> |
Hiding manual exposure button in video module. Manual exposure button should never appear in non-camera modes. This fix explicitly ensures that it will never appear in either disabled or greyed out states in video module. Bug: 19954837 Change-Id: Ia6730da9e3acaa62e2a30f594f344d86e2b25c69
rc/com/android/camera/VideoModule.java
rc/com/android/camera/app/CameraAppUI.java
|
030ea25812565f3e35d3e76942eaa79a751ff006 |
27-Mar-2015 |
Spike Sprague <spikuru@google.com> |
Sync Video torch setting with on-screen indicator bug: 19954583 Change-Id: Ia491b63f31d81038ca8d8841b1f72f5ee76bb64f
rc/com/android/camera/widget/IndicatorIconController.java
|
a4158d3452cee1ecb3a669c9821ba75033911680 |
27-Mar-2015 |
Andy Huibers <andyhuibers@google.com> |
Merge "Include HDR on/off correctly in event." into ub-camera-haleakala
|
86eb60744b65f90d1f710585007b300c11181fa3 |
27-Mar-2015 |
Andy Huibers <andyhuibers@google.com> |
Include HDR on/off correctly in event. Bug: 19900458 Change-Id: Ifd9a585a61801cd1abe16bdbe47a56d96399b84e
rc/com/android/camera/CaptureModule.java
|
e2529657eeb168588b9a47f5dc3bc87eb54f503d |
27-Mar-2015 |
Sascha Haeberling <haeberling@google.com> |
Make sure N4 uses the correct texture view transform. Bug: 19948775 Change-Id: Ib489a5a66cf4a667914c8516f71f54219660fc09
rc/com/android/camera/TextureViewHelper.java
|
458cb4c551fe9114a11befe0a02450aa4414c7ed |
26-Mar-2015 |
Paul Rohde <codelogic@google.com> |
Prevent countdown cancelation from starting the camera on pause. Bug: 19937825 Change-Id: I13e774afe2da9342b9defcc0f1d304032d931b12
rc/com/android/camera/CaptureModule.java
|
70dbb60a3c7100e3fe412e0834e6a32c6ad884de |
26-Mar-2015 |
Senpo Hu <senpo@google.com> |
[CaptureIntent] Fix NPE crash when open camera. Change-Id: I09cddae3ce935c92d6829924372a4082bb69f48a
rc/com/android/camera/captureintent/state/StateOpeningCamera.java
|
11daa1d9b88b4976758672b82550a09172027149 |
26-Mar-2015 |
Paul Rohde <codelogic@google.com> |
Merge "Remove the setFocusRatio verbose logspam." into ub-camera-haleakala
|
863e9ac43fc1dbfaff3daf555a85b12d0c553385 |
26-Mar-2015 |
Sascha Haeberling <haeberling@google.com> |
Merge "Change CaptureSession.saveAndFinish to return a future for the URI." into ub-camera-haleakala
|
37036186326fb68c27063f97305405d3667a5eb3 |
25-Mar-2015 |
Sascha Haeberling <haeberling@google.com> |
Change CaptureSession.saveAndFinish to return a future for the URI. Bug: 19665531 Most callers of saveAndFinish never provided the callback. In addition it's unclear on what thread the callback is called. This cleans this up a bit and moves the responsibility to the caller to decide on which thread the URI should be received. Callers that don't care don't have to do anything. Also fixes a bug where we wouldn't even supply a URI for when there was no placeholder. Change-Id: I1a186b470d2cca8f34a674e9eb5c533fc01a4409
rc/com/android/camera/CaptureModule.java
rc/com/android/camera/captureintent/CaptureIntentSession.java
rc/com/android/camera/one/v2/OneCameraImpl.java
rc/com/android/camera/one/v2/OneCameraZslImpl.java
rc/com/android/camera/processing/imagebackend/TaskCompressImageToJpeg.java
rc/com/android/camera/session/CaptureSession.java
rc/com/android/camera/session/CaptureSessionImpl.java
|
15001b3d8e1f8f2ce37b7cb847b1d0606e936f15 |
26-Mar-2015 |
Paul Rohde <codelogic@google.com> |
Remove the setFocusRatio verbose logspam. Bug: 19931564 Change-Id: Ib4d9768a95e47879f945f9a869ce1631d43cbbc8
rc/com/android/camera/ui/focus/FocusController.java
|
10e22c5e1dcfd3523481e00039f25caa37909572 |
25-Mar-2015 |
Sascha Haeberling <haeberling@google.com> |
Fix build error. Mirror API change to Camera2. Bug: 19899007 Change-Id: I51d3e02b42a0bff1bea85c6cd910192e6c239293
rc_pd/com/android/camera/one/v2/OneCameraCreator.java
|
6dced729a2b3416a3399a744ea188d5e5d4331d3 |
25-Mar-2015 |
Sascha Haeberling <haeberling@google.com> |
Merge "Catch HAL error that prevents retrieval of resolutions." into ub-camera-haleakala
|
9a532be5b1e06603f4374f5e106f04df3283de25 |
25-Mar-2015 |
Sascha Häberling <haeberling@google.com> |
Merge "Cancel in-progress capture when paused" into ub-camera-haleakala
|
3ad9c9035f8be50f6b2ef8cac9943045f7cf8a74 |
24-Mar-2015 |
Sascha Haeberling <haeberling@google.com> |
Catch HAL error that prevents retrieval of resolutions. Bug: 19899007 Change-Id: I822510c03ecc1d48f607bf8f765831f1a39e3074
rc/com/android/camera/CaptureModule.java
rc/com/android/camera/captureintent/state/StateStartingPreview.java
rc/com/android/camera/one/v2/Camera2OneCameraOpenerImpl.java
rc/com/android/camera/one/v2/OneCameraCharacteristicsImpl.java
rc/com/android/camera/one/v2/OneCameraFactory.java
rc/com/android/camera/one/v2/common/PictureSizeCalculator.java
|
4fe6f70c5def72185769917ec17734f61bb482be |
25-Mar-2015 |
Puneet Lall <puneetl@google.com> |
Cancel in-progress capture when paused Change exception-handling behavior to cancel an in-progress capture (via CaptureSession#cancel()) if the app is paused before any image is acquired from the device. Previous behavior launched an error dialog to the user. Bug: 19913612 Change-Id: If40dceabc4adbd901fbdac1a0d97f805389c778d
rc/com/android/camera/one/v2/photo/PictureTakerImpl.java
|
d6780314422f6cfa6e905f52e2744d7e45bd3b66 |
25-Mar-2015 |
Alan Newberger <alann@google.com> |
Suppress HDR 16:9 on N4 Add logic to CaptureModule HardwareSpec to avoid support for HDR if in 16:9. This takes care of UI, also wire HardwareSpec into OneCameraCaptureSetting to ensure we only use the stored setting when HDR is supported. Bug: 19697027 Change-Id: Idcd02ea9910974d8afda5f81c45eb928b9df89af
rc/com/android/camera/CaptureModule.java
rc/com/android/camera/captureintent/state/StateOpeningCamera.java
rc/com/android/camera/one/OneCameraCaptureSetting.java
|
6d58416b7d82f4755246e671b08d300b5b5496ea |
25-Mar-2015 |
zafir <zafir@google.com> |
Merge "Show error dialog when camera is unavailable." into ub-camera-haleakala
|
8d84a7c1bb9df49aa21396f98b371875c816ed42 |
25-Mar-2015 |
zafir <zafir@google.com> |
Show error dialog when camera is unavailable. Bug: 19888394 Change-Id: I6d52d1be7ecac6ece85845bc3f06b1c7e0963d6f
rc/com/android/camera/CaptureModule.java
|
29d61c9ac3a0343cabed508e1c56cad820a1af18 |
25-Mar-2015 |
Paul Rohde <codelogic@google.com> |
Reduce startup preview jank by preventing Glide pre-allocation. Several systraces and app runs seem to show that removing the Glide bitmap pre-allocation for full size images slightly reduces the startup preview jank on the N6. There did not appear to be any significant regressions in the filmstrip jank. Bug: 19076469 Change-Id: Ia01d7d09eedfc6ac78611c0f433cdcad8c15c559
rc/com/android/camera/CameraActivity.java
|
d10cbf43dc137eebde6970445dbd8becc1c27959 |
25-Mar-2015 |
Senpo Hu <senpo@google.com> |
Merge "[CaptureIntent] Log CaptureDone event to Clearcut." into ub-camera-haleakala
|
8aefbc59ce6176f27efd47f4a568117bd4d9ea77 |
25-Mar-2015 |
Senpo Hu <senpo@google.com> |
[CaptureIntent] Log CaptureDone event to Clearcut. Bug: 19035503 Change-Id: I786f834beb45d519047aaa06a7838720c0188459
rc/com/android/camera/captureintent/CaptureIntentModule.java
rc/com/android/camera/captureintent/event/EventTapOnShutterButton.java
rc/com/android/camera/captureintent/event/EventTimerCountDownToZero.java
rc/com/android/camera/captureintent/resource/ResourceCaptureTools.java
rc/com/android/camera/captureintent/resource/ResourceCaptureToolsImpl.java
rc/com/android/camera/captureintent/resource/ResourceOpenedCamera.java
rc/com/android/camera/captureintent/resource/ResourceOpenedCameraImpl.java
rc/com/android/camera/captureintent/state/StateOpeningCamera.java
rc/com/android/camera/captureintent/state/StateReadyForCapture.java
rc/com/android/camera/captureintent/state/StateStartingPreview.java
|
107171c5ac8bfe6ba65176d2ca9ce878e16309a2 |
25-Mar-2015 |
Sascha Haeberling <haeberling@google.com> |
DO NOT MERGE Disable ZSL for N5. Bug: 19565931 Data showed the preview freeze is happening and WAR is not working. Change-Id: I9e49bfe7cdf447ef5fe57a1a393ba8d96d1b051b
rc/com/android/camera/one/config/OneCameraFeatureConfigCreator.java
|
c2908a7aa1a4effb1191e551cc7ea215293f8614 |
24-Mar-2015 |
Puneet Lall <puneetl@google.com> |
Send AF_TRIGGER_CANCEL before every AF_TRIGGER_START Implements a workaround for bug on N6 in which the camera driver may get stuck if two adjacent AF_TRIGGER_START are sent in a sequence. Bug: 19892741 Change-Id: I729d7a5ca865cd5b3ba8ddd5862e422470c16671
rc/com/android/camera/one/v2/autofocus/FullAFScanCommand.java
|
899a750cc80afebfeca13146d714b049c2a1775e |
24-Mar-2015 |
Paul Rohde <codelogic@google.com> |
Merge "Fix the camera2 build and import the correct Android metadata." into ub-camera-haleakala
|
b10d44a37d33f6964a068adce135bfa57c4f0bb9 |
24-Mar-2015 |
Paul Rohde <codelogic@google.com> |
Fix the camera2 build and import the correct Android metadata. Change-Id: Id7f6d630ec7eb8db2e43c97025b5cbb172ed9192
rc/com/android/camera/one/v2/OneCameraCharacteristicsImpl.java
rc/com/android/camera/one/v2/common/StatisticsFaceDetectMode.java
|
28a98f5cbadee3589e3698f3653301351e46d200 |
24-Mar-2015 |
zafir <zafir@google.com> |
Merge "Hiding manual exposure button in N6. The button was previously disabled." into ub-camera-haleakala
|
bb27cc628ee84737c72b0368b8b27a5bf8609b56 |
24-Mar-2015 |
Paul Rohde <codelogic@google.com> |
Read and enable face detection when available in capture module. Bug: 19715640 Change-Id: I719cc92800a73ec3eaa27044fda09f64e1b9d946
rc/com/android/camera/one/OneCameraCharacteristics.java
rc/com/android/camera/one/v1/OneCameraCharacteristicsImpl.java
rc/com/android/camera/one/v2/OneCameraCharacteristicsImpl.java
rc/com/android/camera/one/v2/SimpleOneCameraFactory.java
rc/com/android/camera/one/v2/common/BasicCameraFactory.java
rc/com/android/camera/one/v2/common/ControlModeSelector.java
rc/com/android/camera/one/v2/common/ControlSceneModeSelector.java
rc/com/android/camera/one/v2/common/HdrSettingBasedControlMode.java
rc/com/android/camera/one/v2/common/HdrSettingBasedSceneMode.java
rc/com/android/camera/one/v2/common/StatisticsFaceDetectMode.java
rc/com/android/camera/one/v2/face/FaceDetect.java
|
57c889d4b88517dd0996547dbae4f314c2a3fcdf |
24-Mar-2015 |
zafir <zafir@google.com> |
Hiding manual exposure button in N6. The button was previously disabled. Bug: 18523154 Change-Id: Id08cef46fc4a67e50ce4b1acd185c5ae6efa94ad
rc/com/android/camera/CaptureModule.java
rc/com/android/camera/app/CameraAppUI.java
|
55542d27c0b0631879c970ffaaa1ba2fa6047cce |
24-Mar-2015 |
Andy Huibers <andyhuibers@google.com> |
Merge "Limit maximum display size to prevent out of memory problems." into ub-camera-haleakala
|
0ee271c0d50bffa5f83177c74fbcb6806004591f |
24-Mar-2015 |
Paul Rohde <codelogic@google.com> |
Limit maximum display size to prevent out of memory problems. Change-Id: Id681ab9f66d6a5f10f9df8fb6ae57ce90f5e25d8
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/data/GlideFilmstripManager.java
|
6bb2326e658562bbffb8ca5b8d33e84062e519d9 |
24-Mar-2015 |
I-Jong Lin <ijonglin@google.com> |
Merge "Add Faces and Lens Dist. info to photoCaptureDone" into ub-camera-haleakala
|
90db65676b53f591ca4333c35768cd7e2c8d49ed |
24-Mar-2015 |
Senpo Hu <senpo@google.com> |
Merge "OneCameraOpener should inform ActiveCameraDeviceTracker about camera open." into ub-camera-haleakala
|
75384f97d5db98182503c9d76dae98357470e000 |
23-Mar-2015 |
Senpo Hu <senpo@google.com> |
Merge "Clean up HDR+ button state logic." into ub-camera-haleakala
|
00562dd0a8451eda80815b3d8fdcb8075e4b9db6 |
23-Mar-2015 |
Senpo Hu <senpo@google.com> |
OneCameraOpener should inform ActiveCameraDeviceTracker about camera open. Therefore, people use OneCameraOpener to open a camera don't need to worry about ActiveCameraDeviceTracker. To make people don't need to depend on CameraActivity/AppController, move setting scope generation into two utility methods: * SettingsManager.getCameraSettingScope() * SettingsManager.getModuleSettingScope() Bug: 19892712 Change-Id: I04caae24ea72a41d7d8e0786a99912098c2cf1ef
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/CaptureModule.java
rc/com/android/camera/captureintent/state/StateOpeningCamera.java
rc/com/android/camera/captureintent/stateful/StateMachineImpl.java
rc/com/android/camera/one/OneCameraModule.java
rc/com/android/camera/one/v2/Camera2OneCameraOpenerImpl.java
rc/com/android/camera/settings/AppUpgrader.java
rc/com/android/camera/settings/CameraFacingSetting.java
rc/com/android/camera/settings/SettingsManager.java
|
ad529c3073ce16c1cc2861f33658132b87bfea95 |
18-Mar-2015 |
I-Jong Lin <ijonglin@google.com> |
Add Faces and Lens Dist. info to photoCaptureDone Added the plumbing for getting values off of the TotalCaptureResult and putting them into the photoCaptureDoneEvent. Bug: 19805467 Change-Id: Id0d16623ffe7eef78b23fd15a4edfeeca5a66eaa
rc/com/android/camera/CaptureModule.java
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/VideoModule.java
rc/com/android/camera/processing/imagebackend/TaskCompressImageToJpeg.java
rc/com/android/camera/stats/CaptureSessionStatsCollector.java
rc_pd/com/android/camera/stats/UsageStatistics.java
|
7ecd24520b56ec39766bbbbc12cbfa46a1c9b060 |
23-Mar-2015 |
Paul Rohde <codelogic@google.com> |
Merge "Compute the max texture size from the EGL context" into ub-camera-haleakala
|
d67aae7d87998b394ce66d1d85267f438158cd0d |
23-Mar-2015 |
Paul Rohde <codelogic@google.com> |
Merge "Clamp pixels and bounds for filmstrip images." into ub-camera-haleakala
|
41783f006b435d247459c1a781ec39d2a87b7287 |
23-Mar-2015 |
Paul Rohde <codelogic@google.com> |
Compute the max texture size from the EGL context Initialize and read the GL_MAX_TEXTURE_SIZE property by opening and initializing an Open GL display, context, and surface and using the initialized objects to read out the texture size. Bug: 19871547 Change-Id: If74045e00d99e7268b78dcca0ad0a22f4d581f0e
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/data/GlideFilmstripManager.java
|
46aac2cd824dceb30afebf1c8da955e4fa55ac5c |
20-Mar-2015 |
Senpo Hu <senpo@google.com> |
Clean up HDR+ button state logic. CameraAppUI#applyModuleSpecs should honor whatever HardwareSpec and BottomBarUISpec provided by modules. UI should not change behavior by poking setting by itself. This can cause huge pain when debugging. Bug: 19657871 Change-Id: Ief153f6c92a12ab1a72732a7a0908059fd91167e
rc/com/android/camera/CaptureModule.java
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/VideoModule.java
rc/com/android/camera/app/CameraAppUI.java
rc/com/android/camera/hardware/HardwareSpecImpl.java
rc/com/android/camera/module/ModulesInfo.java
rc/com/android/camera/one/config/OneCameraFeatureConfig.java
|
689348be49bf1e5e5f705d55915f87292d9506ed |
23-Mar-2015 |
Paul Rohde <codelogic@google.com> |
Clamp pixels and bounds for filmstrip images. This change does a more extensive set of checks and constraints based on the maximum area (to prevent jank) and adds clamping for the bounds of the image based on the maximum supported texture size of the device to prevent blank frames. Bug: 19871547 Change-Id: Ib33e6e591638fb4dfefb60ddea488818e985495d
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/data/FilmstripItemBase.java
rc/com/android/camera/data/GlideFilmstripManager.java
rc/com/android/camera/data/PhotoItem.java
rc/com/android/camera/data/VideoItem.java
|
5aaf7c89b7debfd38e5f27f721176a7cda47f8eb |
23-Mar-2015 |
Alan Newberger <alann@google.com> |
Check for null on N5 resolution upgrade In case of first run with no existing resolution setting, ignore the upgrade step. Bug: 19889422 Change-Id: I518eaf089468c8255dedfea371f68763d62d777a
rc/com/android/camera/settings/AppUpgrader.java
|
d9b18ec2a013e5cbd2037cd0950aa04b9707e3ef |
21-Mar-2015 |
Geoff Mendal <mendal@google.com> |
Import translations. DO NOT MERGE Change-Id: Ie1dc944ecb771d87935cd89b62a679c335f81452 Auto-generated-cl: translation import
es/values-en-rAU/strings.xml
|
cb562b6d9ddc2222a3175636a12612046439af7c |
21-Mar-2015 |
Geoff Mendal <mendal@google.com> |
Import translations. DO NOT MERGE Change-Id: I3c48e28f7992c0ba1577b2e4d60a3ed2da3ae80d Auto-generated-cl: translation import
es/values-en-rAU/strings.xml
|
1435b30dd0e683b9697ebf5b07b6f5da54ac57cc |
20-Mar-2015 |
zafir <zafir@google.com> |
Merge "Display error dialog and log error when video recording fails to start." into ub-camera-haleakala
|
b66922aa8e3ca5c3e95d6b72eceabca9ad84e16b |
20-Mar-2015 |
I-Jong Lin <ijonglin@google.com> |
Merge "Catch memory allocation errors JPEG ImageTask" into ub-camera-haleakala
|
b7eb9e8272cd43171cee142c371b5b1c421d9795 |
20-Mar-2015 |
zafir <zafir@google.com> |
Display error dialog and log error when video recording fails to start. Bug: 19814676 Change-Id: Iec3fde247720db4471da8f40a5c0f55d706d52cd
rc/com/android/camera/VideoModule.java
|
9a70cc71fc487f4af8e6652e55b5675c8e4d6223 |
20-Mar-2015 |
Paul Rohde <codelogic@google.com> |
Merge "Re-arrange camera initialization." into ub-camera-haleakala
|
1d84d7107686aa428ee2eeb1a8caf0ea3e43b1df |
12-Mar-2015 |
Paul Rohde <codelogic@google.com> |
Re-arrange camera initialization. This change re-arranges several things to make it possible to know the CameraId you are about to open before you actually open the camera device. It also adds an explicit CameraId class for handling both legacy and camera2 id comparisons, an active camera tracker, and moves the camera id query mechanism into a hardware manager class in prep for the subsequent camera release. Bug: 19679820 Change-Id: I4c09b9a12a1ea5badcac3a6a073a56764f9a7eba
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/CaptureModule.java
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/TextureViewHelper.java
rc/com/android/camera/app/AppController.java
rc/com/android/camera/app/CameraController.java
rc/com/android/camera/app/CameraProvider.java
rc/com/android/camera/app/FirstRunDialog.java
rc/com/android/camera/captureintent/CaptureIntentModule.java
rc/com/android/camera/captureintent/resource/ResourceConstructed.java
rc/com/android/camera/captureintent/resource/ResourceConstructedImpl.java
rc/com/android/camera/captureintent/resource/ResourceOpenedCamera.java
rc/com/android/camera/captureintent/resource/ResourceOpenedCameraImpl.java
rc/com/android/camera/captureintent/state/StateForegroundWithSurfaceTexture.java
rc/com/android/camera/captureintent/state/StateOpeningCamera.java
rc/com/android/camera/captureintent/state/StateReadyForCapture.java
rc/com/android/camera/captureintent/state/StateStartingPreview.java
rc/com/android/camera/device/ActiveCameraDeviceTracker.java
rc/com/android/camera/device/Camera2ActionProvider.java
rc/com/android/camera/device/Camera2Actions.java
rc/com/android/camera/device/CameraDeviceActionProvider.java
rc/com/android/camera/device/CameraDeviceKey.java
rc/com/android/camera/device/CameraDeviceLifecycle.java
rc/com/android/camera/device/CameraId.java
rc/com/android/camera/device/LegacyCameraActionProvider.java
rc/com/android/camera/device/LegacyCameraActions.java
rc/com/android/camera/device/MultiCameraDeviceLifecycle.java
rc/com/android/camera/device/PortabilityCameraActionProvider.java
rc/com/android/camera/device/PortabilityCameraActions.java
rc/com/android/camera/device/SingleDeviceActions.java
rc/com/android/camera/device/SingleDeviceStateMachine.java
rc/com/android/camera/module/ModulesInfo.java
rc/com/android/camera/one/OneCameraCaptureSetting.java
rc/com/android/camera/one/OneCameraManager.java
rc/com/android/camera/one/OneCameraModule.java
rc/com/android/camera/one/OneCameraOpener.java
rc/com/android/camera/one/v1/LegacyOneCameraManagerImpl.java
rc/com/android/camera/one/v1/LegacyOneCameraOpenerImpl.java
rc/com/android/camera/one/v1/OneCameraManagerImpl.java
rc/com/android/camera/one/v2/Camera2OneCameraManagerImpl.java
rc/com/android/camera/one/v2/Camera2OneCameraOpenerImpl.java
rc/com/android/camera/one/v2/OneCameraManagerImpl.java
rc/com/android/camera/settings/CameraSettingsActivity.java
rc/com/android/camera/settings/ResolutionSetting.java
rc/com/android/camera/settings/ResolutionUtil.java
rc/com/android/camera/settings/SettingObserver.java
rc/com/android/camera/settings/SettingsManager.java
|
12df9856109645b9f874d3f007c100ed7130f94c |
20-Mar-2015 |
I-Jong Lin <ijonglin@google.com> |
Catch memory allocation errors JPEG ImageTask Bug: 19354210 Although rare, we should fail gracefully in the case where we cannot allocate a large memory buffer in TaskCompressImageToJpeg. Change-Id: I1f16ba16a785b32869030a5f8ec2116fbbc900d3
rc/com/android/camera/processing/imagebackend/TaskCompressImageToJpeg.java
|
976bba4cfffb0089d4b7c61e16b90f506dbf1a2b |
20-Mar-2015 |
Sascha Haeberling <haeberling@google.com> |
Rename CaptureSession#finalize to not collide with Object#finalize. Bug: 19855781 Change-Id: Ie32024a9d2b7c04a27cc1ff7eee62df0e6857031
rc/com/android/camera/captureintent/CaptureIntentSession.java
rc/com/android/camera/session/CaptureSession.java
rc/com/android/camera/session/CaptureSessionImpl.java
rc/com/android/camera/session/CaptureSessionManager.java
rc/com/android/camera/session/CaptureSessionManagerImpl.java
|
826267d28d6a03cd925a5aa1d800de486fdadcd9 |
19-Mar-2015 |
Spike Sprague <spikuru@google.com> |
Merge "Hide flash icon if not supported by camera hardware." into ub-camera-haleakala
|
edf2fef4b5a04fd1aa8f1db6f878fb73d0e1318a |
19-Mar-2015 |
Spike Sprague <spikuru@google.com> |
Merge "don't mess with the options buttons in transistionToCapture and transitionToCancel" into ub-camera-haleakala
|
34cf891d6962f03b38f6e0048c91cbfe7dc504df |
19-Mar-2015 |
Spike Sprague <spikuru@google.com> |
Hide flash icon if not supported by camera hardware. bug: 19199856 Change-Id: I5e4f7842c61e6c260b7a35c455f2caaa4d8e5e53
rc/com/android/camera/app/CameraAppUI.java
|
9ef3768c26c67ba4c1b97b2151d9456b19b53ddb |
18-Mar-2015 |
Spike Sprague <spikuru@google.com> |
don't mess with the options buttons in transistionToCapture and transitionToCancel bug: 19366720 Change-Id: I0620d1ceb80c2c45de95336be18ccf212ace6f69
rc/com/android/camera/app/CameraAppUI.java
|
a3cf031578293fe07942decfae5832b23173caf3 |
18-Mar-2015 |
Geoff Mendal <mendal@google.com> |
Import translations. DO NOT MERGE Change-Id: Iaa30b150c8992357763849265a2b2de4a172f3f7 Auto-generated-cl: translation import
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
|
f542b4b3a5d7ec740e8c80ce1f9d99245f3f8fc8 |
18-Mar-2015 |
Geoff Mendal <mendal@google.com> |
Import translations. DO NOT MERGE Change-Id: I55ecffbca5fb21a46d1eeda4cf78441cd3871daf Auto-generated-cl: translation import
es/values-zh-rCN/strings.xml
|
c36bcac14302b1bb3d7a316f221685d4d6ad95cb |
17-Mar-2015 |
I-Jong Lin <ijonglin@google.com> |
Pass crop and implement crop in JPEG ImageSaver Bug: 19660460 Allows for the JpegImageBackendSaver to accept crop regions and then implements this crop within the JPEG compression task. Change-Id: I165b272376c3d5c919c1c41b55bf0b8e551520be
rc/com/android/camera/one/v2/imagesaver/JpegImageBackendImageSaver.java
rc/com/android/camera/processing/imagebackend/TaskCompressImageToJpeg.java
rc/com/android/camera/processing/imagebackend/TaskImageContainer.java
rc/com/android/camera/processing/imagebackend/TaskJpegEncode.java
|
0994d56562a3814e08fd62696e571a505a39a2be |
17-Mar-2015 |
Andy Huibers <andyhuibers@google.com> |
Merge "Add processing time to capture done event for CaptureModule captures." into ub-camera-haleakala
|
599ebc0d346e6ac920ef45f051a97f0e5334a721 |
17-Mar-2015 |
Puneet Lall <puneetl@google.com> |
Merge "Detect and log missing images" into ub-camera-haleakala
|
29ef6293a9d3ff61b1e32fd61594fb60fd3f2e36 |
17-Mar-2015 |
Puneet Lall <puneetl@google.com> |
Detect and log missing images Adds logic to detect and log when the camera framework fails to deliver an image, but successfully delivers subsequent images. Bug: 19430369 Change-Id: I404888882879ac021ba84d725732e9c9a9c61f05
rc/com/android/camera/one/v2/sharedimagereader/imagedistributor/ImageDistributorFactory.java
rc/com/android/camera/one/v2/sharedimagereader/imagedistributor/ImageDistributorImpl.java
|
c64fce911ef412068bc73c58230fd389a6c00d1a |
17-Mar-2015 |
Puneet Lall <puneetl@google.com> |
Merge "Optimize ZSL for auto-flash mode" into ub-camera-haleakala
|
5ca7d2642881f3cf06adb2532e0d5950524a34f4 |
07-Mar-2015 |
Puneet Lall <puneetl@google.com> |
Optimize ZSL for auto-flash mode Cache the most recent converged AE state to enable more auto-flash pictures to be taken with zero shutter lag. Bug: 19151363 Change-Id: I7d4bd5a67d4cddb7a1f733844e1a080acfacf7f4
rc/com/android/camera/one/v2/OneCameraImpl.java
rc/com/android/camera/one/v2/OneCameraZslImpl.java
rc/com/android/camera/one/v2/SimpleOneCameraFactory.java
rc/com/android/camera/one/v2/ZslOneCameraFactory.java
rc/com/android/camera/one/v2/camera2proxy/AndroidCaptureResultProxy.java
rc/com/android/camera/one/v2/camera2proxy/AndroidTotalCaptureResultProxy.java
rc/com/android/camera/one/v2/camera2proxy/CameraDeviceProxy.java
rc/com/android/camera/one/v2/camera2proxy/CaptureResultProxy.java
rc/com/android/camera/one/v2/camera2proxy/TotalCaptureResultProxy.java
rc/com/android/camera/one/v2/common/TotalCaptureResultResponseListener.java
rc/com/android/camera/one/v2/core/RequestTemplate.java
rc/com/android/camera/one/v2/core/ResponseListeners.java
rc/com/android/camera/one/v2/core/ResponseManager.java
rc/com/android/camera/one/v2/photo/FlashBasedPhotoCommand.java
rc/com/android/camera/one/v2/photo/MetadataFuture.java
rc/com/android/camera/one/v2/photo/PictureTakerFactory.java
rc/com/android/camera/one/v2/photo/ZslPictureTakerFactory.java
rc/com/android/camera/one/v2/photo/zsl/AutoFlashZslImageFilter.java
rc/com/android/camera/one/v2/photo/zsl/ZslImageCaptureCommand.java
|
d0d01c38dad9a7d2a4868be29618f8fcec984e31 |
17-Mar-2015 |
Sascha Haeberling <haeberling@google.com> |
Merge "Fix bug where return value for thumbnail can be null." into ub-camera-haleakala
|
70fea35dbda91e0a3f8489d325afd5856a547a6e |
16-Mar-2015 |
Puneet Lall <puneetl@google.com> |
Optimize shot-to-shot time for camera2 legacy Optimize shot-to-shot time for devices which only support the camera2 LEGACY api by releasing the exclusive lock on the FrameServer as soon as each image is exposed, allowing the user to immediately submit a request for the next shot. Bug: 19365933 Change-Id: I8935611fae666dde1fb3a1c4aecf95c1cc5a7ef8
rc/com/android/camera/one/v2/photo/SimpleImageCaptureCommand.java
|
d2672f692de547859664be4e7f6950f8f9b0bc89 |
17-Mar-2015 |
Andy Huibers <andyhuibers@google.com> |
Add processing time to capture done event for CaptureModule captures. Bug: 18913439 Bug: 19035503 Change-Id: Ib3768d93a2240ccfbf5f5a750b66939c6930ed0e
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/VideoModule.java
rc/com/android/camera/processing/imagebackend/TaskCompressImageToJpeg.java
rc/com/android/camera/stats/CaptureSessionStatsCollector.java
rc_pd/com/android/camera/stats/UsageStatistics.java
|
6d3c6c5208314e2a120ae6b8d4a99a9f925b0f20 |
17-Mar-2015 |
Sascha Haeberling <haeberling@google.com> |
Fix bug where return value for thumbnail can be null. Bug: 19779596 Change-Id: I4ccf39b0e19956c6873868bc02be836b547fa1c5
rc/com/android/camera/data/VideoItem.java
|
14b9f1fc0b273bbfb79fde19d699e5db8fcf95f6 |
16-Mar-2015 |
I-Jong Lin <ijonglin@google.com> |
Merge "Add PhotoCaptureEvent to Capture Module" into ub-camera-haleakala
|
e7c53cc907f5bb40c8d112830d12ac494e4c68c5 |
12-Mar-2015 |
I-Jong Lin <ijonglin@google.com> |
Add PhotoCaptureEvent to Capture Module Adds a CaptureSession collector class so that we can combine stats information from both the CaptureModule and ImageBackend to create a complete PhotoCaptureDone event. Bug: 19035503 Change-Id: Ide5f708c5f3efb710fa704f3f30c52ac7a8c3fe4
rc/com/android/camera/CaptureModule.java
rc/com/android/camera/captureintent/CaptureIntentSession.java
rc/com/android/camera/processing/imagebackend/TaskCompressImageToJpeg.java
rc/com/android/camera/session/CaptureSession.java
rc/com/android/camera/session/CaptureSessionImpl.java
rc/com/android/camera/stats/CaptureSessionStatsCollector.java
|
19d3d9e162f71dd132687835b8132c00203dc9da |
16-Mar-2015 |
Geoff Mendal <mendal@google.com> |
Import translations. DO NOT MERGE Change-Id: I1f460126d1eea77d4106016fea65f03ed550922f Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-bn-rBD/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-eu-rES/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-gl-rES/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-is-rIS/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-kk-rKZ/strings.xml
es/values-km-rKH/strings.xml
es/values-kn-rIN/strings.xml
es/values-ko/strings.xml
es/values-ky-rKG/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mk-rMK/strings.xml
es/values-ml-rIN/strings.xml
es/values-mn-rMN/strings.xml
es/values-mr-rIN/strings.xml
es/values-ms-rMY/strings.xml
es/values-my-rMM/strings.xml
es/values-nb/strings.xml
es/values-ne-rNP/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-si-rLK/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-ta-rIN/strings.xml
es/values-te-rIN/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-ur-rPK/strings.xml
es/values-uz-rUZ/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
0f40400dbed72f89fafbedd06734759abb852639 |
14-Mar-2015 |
Senpo Hu <senpo@google.com> |
[CaptureIntent] clean up extra PreviewAreaChangedListener. A simple cleanup that we register two PreviewAreaChangedListener for CaptureIntentModuleUI which is kind of silly. This CL consolidate it into one. Change-Id: I1c5b29a77021a21cd6d8c023b4b98906430c305e
rc/com/android/camera/captureintent/CaptureIntentModule.java
rc/com/android/camera/captureintent/CaptureIntentModuleUI.java
|
4638d752066a96fcb98b3d3bc6ccf6233b9ee230 |
13-Mar-2015 |
Sascha Haeberling <haeberling@google.com> |
Merge "Don't take picture if camera is closed." into ub-camera-haleakala
|
0f0329889f69182648fe8f535335e48978d63cc0 |
06-Mar-2015 |
I-Jong Lin <ijonglin@google.com> |
Automated ImageProcessorListener registration I've added the ImageConsumer interface and implementation in ImageBackend to support the automatic registering and unregistering of the ImageProcessingListener. This new functionality avoids the issues of reference leaking, so that the transient listener implementations are NOT held by the image backend. Also more general purpose interface has been created such that any passed Runnable will be executed when the associated set of tasks that have been enqueued with ImageBackend::ReceiveImage have finished processing. This functionality solves the referencing leaking issue of ImageProcessingListener in the current implementation. Also, removed all references to Main thread executor so that ImageBackend is not a direct suspect in jank issues. Bug: 19517380 Change-Id: I806582f13157030ed6bc23ad70a4efd93339d9ff
rc/com/android/camera/one/v2/imagesaver/JpegImageBackendImageSaver.java
rc/com/android/camera/one/v2/imagesaver/YuvImageBackendImageSaver.java
rc/com/android/camera/processing/imagebackend/ImageBackend.java
rc/com/android/camera/processing/imagebackend/ImageConsumer.java
rc/com/android/camera/processing/imagebackend/ImageProcessorProxyListener.java
rc/com/android/camera/processing/imagebackend/ImageShadowTask.java
rc/com/android/camera/processing/imagebackend/TaskImageContainer.java
|
46a5b5e7a933e510e0ab634e3f222aeff7de7a76 |
13-Mar-2015 |
Sascha Haeberling <haeberling@google.com> |
Don't take picture if camera is closed. Bug: 19712310 Change-Id: Iaaae7a1c784e4149ca837e9bda496f734be56890
rc/com/android/camera/CaptureModule.java
|
fddf523fda6ea8af438ef476c991412fd96f3cc7 |
13-Mar-2015 |
I-Jong Lin <ijonglin@google.com> |
Merge "Implementation of Crop in Thumbnail Creation" into ub-camera-haleakala
|
7b68d60653d5022a142aa2369e25f35b7b4b074f |
13-Mar-2015 |
Puneet Lall <puneetl@google.com> |
Fix build Change-Id: I36c5f2bf963bfe7d63941777ecedce7354aa0212
rc/com/android/camera/one/v2/autofocus/PointMeteringParameters.java
|
fd761634a6921694aa473fc01a14172c30a5c949 |
12-Mar-2015 |
Puneet Lall <puneetl@google.com> |
Merge "Reset existing AF scan upon tap-to-focus" into ub-camera-haleakala
|
7abd8f51ff9c6764966e3ae879f3ecc4039987fd |
12-Mar-2015 |
zafir <zafir@google.com> |
Merge "Disable manual exposure button in HDR+ mode." into ub-camera-haleakala
|
0409c8594fd1629ee07df827cf0d7a0f336b9326 |
11-Mar-2015 |
zafir <zafir@google.com> |
Disable manual exposure button in HDR+ mode. Bug: 19641530 Change-Id: I70d47a678eb0c5b77040ff071af14dd35c1e73a8
rc/com/android/camera/ButtonManager.java
rc/com/android/camera/CaptureModule.java
rc/com/android/camera/app/CameraAppUI.java
|
725059d4d1ab78b5ffaa99cbba397b2dafc717d2 |
10-Mar-2015 |
I-Jong Lin <ijonglin@google.com> |
Implementation of Crop in Thumbnail Creation Propogated the crop information into the thumbnail creation code. Required generalization of the thubmnail creator to accept a crop region, and implementation of consistent handling of the crop parameter into the TaskInfo. Tests for this newer functionality are available in ag/653259. Bug: 19323062 Change-Id: I135ae16459eedf7f2631925526c0e64184f6a859
rc/com/android/camera/processing/imagebackend/TaskChainedCompressImageToJpeg.java
rc/com/android/camera/processing/imagebackend/TaskCompressImageToJpeg.java
rc/com/android/camera/processing/imagebackend/TaskConvertImageToRGBPreview.java
rc/com/android/camera/processing/imagebackend/TaskImageContainer.java
rc/com/android/camera/processing/imagebackend/TaskPreviewChainedJpeg.java
|
7b132e3a555529a3add373fe169a1eca5cf006e8 |
12-Mar-2015 |
Spike Sprague <spikuru@google.com> |
If JPEG data already has some EXIF data, carry it over during EXIF population bug: 16961102 Change-Id: I887726dda0af62c7eaecbde4297079fc447c39fa
rc/com/android/camera/processing/imagebackend/TaskCompressImageToJpeg.java
|
249a22cf1f87d3b306c7dfac08e7ef5d92ae4323 |
12-Mar-2015 |
Spike Sprague <spikuru@google.com> |
add null check protections to ExifUtil to prevent Nexus 4 crashes bug: 19701200 Change-Id: Icea7d5d57e5c692d214745f83efd4b06f3517740
rc/com/android/camera/util/ExifUtil.java
|
c44b7c47dbb8f53a6401285c4ca9218326d21a7e |
10-Mar-2015 |
Puneet Lall <puneetl@google.com> |
Reset existing AF scan upon tap-to-focus * Interrupts existing, in-progress AF scans upon tap-to-focus (triggerFocusAndMeterAtPoint). * Removes pending delayed-af-resets upon subsequent tap-to-focus to fix the case in which a user triggers AF twice within <3 seconds which previously resulted in the AF mode returning to continuous_picture shortly after the second AF scan. * Removes dependencies on CameraUtil and static Settings3A methods, and refactors FrameServerImpl to enable unit-testing. Bug: 18935538 Change-Id: I0c2d5d92d2b07efdc11de8388e42b931d3ea89d0
rc/com/android/camera/async/ResettingDelayedExecutor.java
rc/com/android/camera/one/Settings3A.java
rc/com/android/camera/one/v2/AutoFocusHelper.java
rc/com/android/camera/one/v2/SimpleOneCameraFactory.java
rc/com/android/camera/one/v2/ZslOneCameraFactory.java
rc/com/android/camera/one/v2/autofocus/AEMeteringRegion.java
rc/com/android/camera/one/v2/autofocus/AFMeteringRegion.java
rc/com/android/camera/one/v2/autofocus/AFScanHoldResetCommand.java
rc/com/android/camera/one/v2/autofocus/GlobalMeteringParameters.java
rc/com/android/camera/one/v2/autofocus/ManualAutoFocusFactory.java
rc/com/android/camera/one/v2/autofocus/ManualAutoFocusImpl.java
rc/com/android/camera/one/v2/autofocus/MeteringParameters.java
rc/com/android/camera/one/v2/autofocus/PointMeteringParameters.java
rc/com/android/camera/one/v2/commands/CameraCommandExecutor.java
rc/com/android/camera/one/v2/commands/ResettingRunnableCameraCommand.java
rc/com/android/camera/one/v2/common/BasicCameraFactory.java
rc/com/android/camera/one/v2/core/FrameServerImpl.java
rc/com/android/camera/one/v2/core/TagDispatchCaptureSession.java
rc/com/android/camera/util/CameraUtil.java
|
ccb0c17a104801a994c901d1c89c9d99005782ed |
06-Mar-2015 |
Puneet Lall <puneetl@google.com> |
Fix ready-state issue when commands are queued Ensure that the FrameServer is marked as unavailable if a command is queued, waiting to acquire access. Bug: 19367334 Change-Id: Id7b1639c6c3a7e65c75002b9f6f8f24c7515e932
rc/com/android/camera/one/v2/SimpleOneCameraFactory.java
rc/com/android/camera/one/v2/ZslOneCameraFactory.java
rc/com/android/camera/one/v2/core/ObservableFrameServer.java
rc/com/android/camera/one/v2/photo/PictureTakerImpl.java
|
bc99343fe987af501f73eed4e9113e7e6edcaa87 |
11-Mar-2015 |
Sascha Haeberling <haeberling@google.com> |
Merge "Fix 16:9 start-up dialog selection." into ub-camera-haleakala
|
14ed26ab891ad561cf445aa453a3bc7033283f72 |
11-Mar-2015 |
Sascha Haeberling <haeberling@google.com> |
Fix 16:9 start-up dialog selection. Bug: 19696056 We need to make sure the list from which we choose the highest resolution size of a given aspect ratio based on a list that is filtered to be chosen by the user. In case of the N5 the native camera list will be augmented with a new high resolution 16:9 size which needs to be selected if the user chooses 16:9 on start-up on the N5. Change-Id: I03a86aa0a148b6cbabbd51a577202b79b4941d7d
rc/com/android/camera/settings/ResolutionSetting.java
|
24aceb0bee1f1fa99ea8d7c4e22457f08ca4e2fa |
11-Mar-2015 |
Sascha Haeberling <haeberling@google.com> |
Swap dimensions of artificial 16:9 resolution on N5 on upgrade. Bug: 19693226 Since the N5 doesn't natively support a high resolution 16:9 size we need to artificially add it and then crop the result from the high-resolution 4:3 size. In version 2.4 we unfortunately swapped the dimensions of ResolutionUtil#NEXUS_5_LARGE_16_BY_9_SIZE, which now causes a few issues in 2.5. If we detect this case, we will swap the dimensions here to make sure they are the right way around going forward. Change-Id: I579e464d177ac86d6cc88e9142c26fd9d6b67a76
rc/com/android/camera/settings/AppUpgrader.java
|
9f0a07d216d4eb6e2523d567f34580467d8ce83b |
06-Mar-2015 |
Shashi Shekhar <shashishekhar@google.com> |
Enable shutter button as soon as burst finishes. Instead of keeping the Capture button disabled, do not wait for burst results to enable the capture button. Instead enable it as soon as burst is done. Change-Id: I19f873d8e461b0c5385bdd2f9fb93f0a9fb7a05b
rc/com/android/camera/CaptureModule.java
rc/com/android/camera/burst/BurstCaptureCommand.java
rc/com/android/camera/burst/BurstFacade.java
rc/com/android/camera/burst/BurstFacadeFactory.java
rc/com/android/camera/burst/BurstFacadeImpl.java
rc/com/android/camera/burst/ToastingBurstFacadeDecorator.java
|
7666f938667ad36c310dfa0ae8c2ab90555abadb |
11-Mar-2015 |
Geoff Mendal <mendal@google.com> |
Import translations. DO NOT MERGE Change-Id: Ib339597a120a49926cc3fc4be01c0541af9bbeec Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-bn-rBD/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-eu-rES/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-gl-rES/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-is-rIS/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-kk-rKZ/strings.xml
es/values-km-rKH/strings.xml
es/values-kn-rIN/strings.xml
es/values-ko/strings.xml
es/values-ky-rKG/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mk-rMK/strings.xml
es/values-ml-rIN/strings.xml
es/values-mn-rMN/strings.xml
es/values-mr-rIN/strings.xml
es/values-ms-rMY/strings.xml
es/values-my-rMM/strings.xml
es/values-nb/strings.xml
es/values-ne-rNP/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-si-rLK/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-ta-rIN/strings.xml
es/values-te-rIN/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-ur-rPK/strings.xml
es/values-uz-rUZ/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
dfef32425e6184d5721bb7af9db823ec46bc2b4f |
11-Mar-2015 |
Sascha Haeberling <haeberling@google.com> |
Add Location to EXIF Bug: 16961102 Change-Id: I9f2335c0f02bea1286698330483cd30fdb875f45
rc/com/android/camera/one/v2/OneCameraImpl.java
rc/com/android/camera/one/v2/OneCameraZslImpl.java
rc/com/android/camera/processing/imagebackend/TaskCompressImageToJpeg.java
rc/com/android/camera/util/ExifUtil.java
|
f6031c016d916db9789026dc0a6c559d8163a088 |
19-Feb-2015 |
Spike Sprague <spikuru@google.com> |
Add EXIF data to images processed via software JPEG encoder. bug: 16961102 Change-Id: I3df48a74fedbba6ca5540bf095f5e5eaf93db3ab
rc/com/android/camera/burst/BurstCaptureCommand.java
rc/com/android/camera/burst/BurstController.java
rc/com/android/camera/burst/RingBuffer.java
rc/com/android/camera/one/OneCameraCharacteristics.java
rc/com/android/camera/one/v1/OneCameraCharacteristicsImpl.java
rc/com/android/camera/one/v2/OneCameraCharacteristicsImpl.java
rc/com/android/camera/one/v2/OneCameraImpl.java
rc/com/android/camera/one/v2/OneCameraZslImpl.java
rc/com/android/camera/one/v2/imagesaver/JpegImageBackendImageSaver.java
rc/com/android/camera/one/v2/imagesaver/MetadataImage.java
rc/com/android/camera/one/v2/imagesaver/MostRecentImageSaver.java
rc/com/android/camera/one/v2/imagesaver/YuvImageBackendImageSaver.java
rc/com/android/camera/one/v2/photo/ConvergedImageCaptureCommand.java
rc/com/android/camera/one/v2/photo/MetadataFuture.java
rc/com/android/camera/processing/imagebackend/ImageToProcess.java
rc/com/android/camera/processing/imagebackend/TaskCompressImageToJpeg.java
rc/com/android/camera/util/ExifUtil.java
rc_pd/com/android/camera/burst/BurstControllerImpl.java
|
5b2561d44c39d9c78feede919338105df410127c |
10-Mar-2015 |
Alan Newberger <alann@google.com> |
Merge "Workaround for future GPS timestamps" into ub-camera-haleakala
|
65bf3ddf0b0377ea9fb0e78c3e82a4bba27b531a |
10-Mar-2015 |
Alan Newberger <alann@google.com> |
Workaround for future GPS timestamps Some images are known to have incorrect GPS timestamps, which are used by MediaStore as creation date. If future creation dates are encountered, fall back to modification date which is not known to have bugs. Bug: 19565464 Change-Id: I35b5e43c9a3de1f05d9a2f405502a2bb2bf9adde
rc/com/android/camera/data/CameraFilmstripDataAdapter.java
rc/com/android/camera/data/NewestFirstComparator.java
|
1c1427e4cbee47656d6beea1a13f650d4526115b |
10-Mar-2015 |
zafir <zafir@google.com> |
Add error handling for CameraDevice.StateCallBack when the camera is already opened. Bug: 19569722 Change-Id: I510931e595d491c2d42710151b05edea89c81094
rc/com/android/camera/one/v2/OneCameraManagerImpl.java
|
e57ca2ca7d23e1c3f7e5f060a192fe845e4b1994 |
10-Mar-2015 |
Alan Newberger <alann@google.com> |
Merge "Grant read URI permission for playback of video capture" into ub-camera-haleakala
|
acb342b9b5b21824d5992d59544c7a8a24c4b3a4 |
10-Mar-2015 |
Senpo Hu <senpo@google.com> |
Merge "[CaptureIntent] Detect if flash is supported from camera characteristics." into ub-camera-haleakala
|
6442baf3a8ac4eb0c4e4d4b472f62fb7c68a3427 |
10-Mar-2015 |
Alan Newberger <alann@google.com> |
Grant read URI permission for playback of video capture Current implementation of video capture UI configured MediaRecorder to output directly into supplied URI, which per recommendation should be a content: URI. We pass this URI to another app to play back the video, and should pass along the read permission. Bug: 19675889 Change-Id: I37f8ae3702a9f1ed9dbaac9416104c0c0bfb6dd0
rc/com/android/camera/VideoModule.java
|
8c50948fce260d0614daed71fc53ca5bf0e98060 |
10-Mar-2015 |
Senpo Hu <senpo@google.com> |
[CaptureIntent] Detect if flash is supported from camera characteristics. Bug: 19669175 Change-Id: I04c5ab27d9ee0c8723d9bffab55b89def7311acf
rc/com/android/camera/app/CameraAppUI.java
rc/com/android/camera/captureintent/CaptureIntentModule.java
rc/com/android/camera/captureintent/CaptureIntentModuleUI.java
rc/com/android/camera/captureintent/state/StateOpeningCamera.java
|
4b8af33d9d17d10863bd9b328e1d0bca53d0f514 |
10-Mar-2015 |
Alan Newberger <alann@google.com> |
Merge "Limit setting photo item placeholders when session is done." into ub-camera-haleakala
|
86f1d1f3664c909d1d949951056c7bb1e9627324 |
09-Mar-2015 |
Alan Newberger <alann@google.com> |
Limit setting photo item placeholders when session is done. Only add placeholders for an item visible in the filmstrip. If a session is done for an item not visible, it is less janky for the user to see the standard gray placeholder while loading the image from disk. Pruned older methods of determining filmstrip visibility, none of which worked and relied on older code assuming the camera preview was an item in the filmstrip, including 'sticky' filmstrip item bits. Added a method to CameraAppUI that proxies the FilmstripLayout visibility, which is actually what app uses to show/hide the filmstrip. Bug: 19517380 Change-Id: I5e2a61b55aa2045bfd09f495dd02cdcb9c65dc68
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/app/CameraAppUI.java
rc/com/android/camera/data/FilmstripItemAttributes.java
rc/com/android/camera/filmstrip/FilmstripController.java
rc/com/android/camera/widget/FilmstripView.java
|
2414329ae1e1052d0c38ddfd888aa1ed5510e7ba |
09-Mar-2015 |
Shashi Shekhar <shashishekhar@google.com> |
Merge "Fix zoom for burst." into ub-camera-haleakala
|
b7f5e884cf358f4ad1884d9e4342f51e35f0034b |
09-Mar-2015 |
Alan Newberger <alann@google.com> |
Merge "Remove video portrait orientation prompt" into ub-camera-haleakala
|
21a5390e04de17dc843bedec4267a48f49584ab8 |
09-Mar-2015 |
Alan Newberger <alann@google.com> |
Remove video portrait orientation prompt No longer display visual reminder for users to rotate device to landscape. Bug: 19416311 Change-Id: Ia03f54809f64e6034479a9021c87b50f186bab99
es/drawable-hdpi/ic_phone_graphic.png
es/drawable-hdpi/rotate_arrows.png
es/drawable-mdpi/ic_phone_graphic.png
es/drawable-mdpi/rotate_arrows.png
es/drawable-xhdpi/ic_phone_graphic.png
es/drawable-xhdpi/rotate_arrows.png
es/drawable-xxhdpi/ic_phone_graphic.png
es/drawable-xxhdpi/rotate_arrows.png
es/layout/video_module.xml
es/values/dimens.xml
rc/com/android/camera/VideoModule.java
rc/com/android/camera/VideoUI.java
rc/com/android/camera/widget/VideoRecordingHints.java
|
259ef720650f3d4e77dd381167ed12cdfd489403 |
09-Mar-2015 |
Shashi Shekhar <shashishekhar@google.com> |
Fix zoom for burst. Instead of passing the root request builder, use the request builder configured by the Camera factory. BUG: 19637871 Change-Id: Ibae1a85c47b0b31e07c91c4a15ec138ad021449e
rc/com/android/camera/burst/BurstCaptureCommand.java
rc/com/android/camera/one/v2/ZslOneCameraFactory.java
|
f88566e97d2d6866120bff6ca82abc370d540731 |
09-Mar-2015 |
Shashi Shekhar <shashishekhar@google.com> |
Merge "Fix a typo in Camera capture session." into ub-camera-haleakala
|
aa92d134dd63b71396e0c734007d24a3b37662bd |
09-Mar-2015 |
Shashi Shekhar <shashishekhar@google.com> |
Fix a typo in Camera capture session. Fix a typo that leads to recursive call. Change-Id: Iad9fe9335169f1d7b211d6d6f5355229a08f797b
rc/com/android/camera/CaptureModule.java
|
20d1014b73d467531d2e5a6c53164ad2955d515c |
09-Mar-2015 |
zafir <zafir@google.com> |
Merge "Hide "Advanced" settings screen on N6." into ub-camera-haleakala
|
df682a2d9cd88c31e84b8e69d6bdc3dbb5c894bb |
07-Mar-2015 |
zafir <zafir@google.com> |
Hide "Advanced" settings screen on N6. The N6 currently doesn't support manual exposure. That's the only item under Advanced, so hiding that option entirely. Bug: 18523154 Change-Id: I1b8238a9b9f0e04f8b0d2047a444b81fcecc4767
es/xml/camera_preferences.xml
rc/com/android/camera/settings/CameraSettingsActivity.java
|
80d68da457199b4c528a4900afc1deec1db3f3c5 |
09-Mar-2015 |
Geoff Mendal <mendal@google.com> |
Revert "Import translations. DO NOT MERGE" This reverts commit be4ba3e3f1285ad76445fa5c56271b9940097f74. Change-Id: I16cac16e134e88629fdd6916f096d16e65780a34
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-bn-rBD/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-eu-rES/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-gl-rES/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-is-rIS/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-kk-rKZ/strings.xml
es/values-km-rKH/strings.xml
es/values-kn-rIN/strings.xml
es/values-ko/strings.xml
es/values-ky-rKG/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mk-rMK/strings.xml
es/values-ml-rIN/strings.xml
es/values-mn-rMN/strings.xml
es/values-mr-rIN/strings.xml
es/values-ms-rMY/strings.xml
es/values-my-rMM/strings.xml
es/values-nb/strings.xml
es/values-ne-rNP/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-si-rLK/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-ta-rIN/strings.xml
es/values-te-rIN/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-ur-rPK/strings.xml
es/values-uz-rUZ/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
be4ba3e3f1285ad76445fa5c56271b9940097f74 |
09-Mar-2015 |
Geoff Mendal <mendal@google.com> |
Import translations. DO NOT MERGE Change-Id: I4cf51575a628a197d7676b4b955214e761fe8bbd Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-bn-rBD/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-eu-rES/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-gl-rES/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-is-rIS/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-kk-rKZ/strings.xml
es/values-km-rKH/strings.xml
es/values-kn-rIN/strings.xml
es/values-ko/strings.xml
es/values-ky-rKG/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mk-rMK/strings.xml
es/values-ml-rIN/strings.xml
es/values-mn-rMN/strings.xml
es/values-mr-rIN/strings.xml
es/values-ms-rMY/strings.xml
es/values-my-rMM/strings.xml
es/values-nb/strings.xml
es/values-ne-rNP/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-si-rLK/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-ta-rIN/strings.xml
es/values-te-rIN/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-ur-rPK/strings.xml
es/values-uz-rUZ/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
0460ef28c6970d646260584b7df0b2b3157a67ee |
07-Mar-2015 |
Sascha Haeberling <haeberling@google.com> |
CaptureSession passes on message IDs instead of strings. Bug: 18867164 Change-Id: Ie601a0fbaf64873c56c6a9b2767a2fa6a04a11d9
es/values/strings.xml
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/captureintent/CaptureIntentSession.java
rc/com/android/camera/captureintent/state/StateReadyForCapture.java
rc/com/android/camera/captureintent/state/StateReviewingPicture.java
rc/com/android/camera/one/v2/imagesaver/YuvImageBackendImageSaver.java
rc/com/android/camera/one/v2/photo/PictureTakerImpl.java
rc/com/android/camera/processing/ProcessingService.java
rc/com/android/camera/session/CaptureSession.java
rc/com/android/camera/session/CaptureSessionImpl.java
rc/com/android/camera/session/CaptureSessionManager.java
rc/com/android/camera/session/CaptureSessionManagerImpl.java
rc/com/android/camera/session/SessionNotifier.java
|
698e271d2b263778bfa73d1e67d6e2cd2783c89e |
04-Mar-2015 |
zafir <zafir@google.com> |
Added more error handling for camera access and picture storage issues. Implemented onFailure() method in the OpenCallback interface and onPictureTakingFailed() in the PictureCallback interface. OnFailure() routes through showErrorAndFinish() in the AppController. Bug: 19452391 Change-Id: I3c19a274cc7664f7d1834899a486c57d0585dc9a
es/values/strings.xml
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/CaptureModule.java
rc/com/android/camera/FatalErrorHandler.java
rc/com/android/camera/FatalErrorHandlerImpl.java
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/app/AppController.java
rc/com/android/camera/captureintent/CaptureIntentModule.java
rc/com/android/camera/captureintent/CaptureIntentSession.java
rc/com/android/camera/captureintent/state/StateFatal.java
rc/com/android/camera/captureintent/state/StateReadyForCapture.java
rc/com/android/camera/captureintent/state/StateReviewingPicture.java
rc/com/android/camera/captureintent/state/StateStartingPreview.java
rc/com/android/camera/one/v2/photo/PictureTakerImpl.java
rc/com/android/camera/session/CaptureSession.java
rc/com/android/camera/session/CaptureSessionImpl.java
rc/com/android/camera/session/CaptureSessionManager.java
rc/com/android/camera/session/CaptureSessionManagerImpl.java
rc/com/android/camera/session/SessionNotifier.java
|
4a1378acfdebc4c2959bf68ee31e44dc9d131ae8 |
07-Mar-2015 |
Alan Newberger <alann@google.com> |
Merge "Fix units in video duration calculation" into ub-camera-haleakala
|
51d891107f231b5c91bd86cb0c4221516395037d |
07-Mar-2015 |
I-Jong Lin <ijonglin@google.com> |
Merge "Fix Version Codes from L to LOLLIPOP" into ub-camera-haleakala
|
5a729094346d0be1a117e2265181e045d8777186 |
07-Mar-2015 |
I-Jong Lin <ijonglin@google.com> |
Fix Version Codes from L to LOLLIPOP Just so that Intellij IDE don't barf on these files. Change-Id: I405e41da920d15bd4b0726fb90b859a8741bfef7
rc/com/android/camera/one/v2/common/HdrSettingBasedSceneMode.java
rc/com/android/camera/ui/focus/LensRangeCalculator.java
|
2cd148f3cb0d37b2e8220c6226c201bf4d117ea2 |
07-Mar-2015 |
Sascha Haeberling <haeberling@google.com> |
Merge "Add black-list for resolutions." into ub-camera-haleakala
|
86d753fcbb0c7474fa9b2797e76e31ef575e76cd |
06-Mar-2015 |
Sascha Haeberling <haeberling@google.com> |
Add black-list for resolutions. Bug: 19611738 Change-Id: I5147bcd925c28e3db0e1e50c8a013cc6750fb47e
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/captureintent/resource/ResourceConstructedImpl.java
rc/com/android/camera/settings/CameraSettingsActivity.java
rc/com/android/camera/settings/ResolutionSetting.java
rc/com/android/camera/settings/ResolutionUtil.java
rc_pd/com/android/camera/util/GservicesHelper.java
|
adb9d0d9af9bc969a38cac0f26d11cdc544cdf40 |
06-Mar-2015 |
Alan Newberger <alann@google.com> |
Fix units in video duration calculation Convert milliseconds coming out of media table, to seconds for details formatting. Bug: 19305203 Change-Id: I4fafae9b3d09d23e60906c2fb3c3f305faee1339
rc/com/android/camera/data/VideoItem.java
|
ac8e7dfcf441ffa38415f2e555ad2061673ef2cd |
06-Mar-2015 |
Puneet Lall <puneetl@google.com> |
Merge "Fix exif dimensions for cropped images" into ub-camera-haleakala
|
56ccc3e5f74dcef523fd45a6cd32b96e00a15c6a |
06-Mar-2015 |
Puneet Lall <puneetl@google.com> |
Fix exif dimensions for cropped images Bug: 19323062 Change-Id: Ieb2905bc44324f2e9f7f4498fd1e1882924e4e92
rc/com/android/camera/processing/imagebackend/TaskCompressImageToJpeg.java
|
799e1b9b1617b25be9d301e9c3ca11c527bc64dc |
06-Mar-2015 |
Paul Rohde <codelogic@google.com> |
Merge "Fix flash mode by changing the setting scope to be correct." into ub-camera-haleakala
|
12fe621b859fe5c270cdae0088dd9fb104d5aa0a |
06-Mar-2015 |
Paul Rohde <codelogic@google.com> |
Fix flash mode by changing the setting scope to be correct. Bug: 19630464 Change-Id: I27abc70041002ff8f9134f249b70d318e05620b9
rc/com/android/camera/captureintent/state/StateOpeningCamera.java
|
c7b2c5b495735d4de405ea7fe00fa7f9e12172f7 |
06-Mar-2015 |
Puneet Lall <puneetl@google.com> |
Merge "Add support for negative rotations" into ub-camera-haleakala
|
94aa337fb9fe49cc277727174db4846d767d78ec |
06-Mar-2015 |
Shashi Shekhar <shashishekhar@google.com> |
Merge " Change interface of BurstMediaItem to provide filepath." into ub-camera-haleakala
|
3a92e37230714aafc7fe8924e7f2d1413306da17 |
06-Mar-2015 |
Paul Rohde <codelogic@google.com> |
Fix flash mode by changing the setting scope to be correct. Bug: 19630464 Change-Id: Id1257c23fef1152792a9fb81572768a4d91e22e5
rc/com/android/camera/CaptureModule.java
|
01b66bf18ca26982b8d5fadf68ec19f9fa260147 |
06-Mar-2015 |
Puneet Lall <puneetl@google.com> |
Add support for negative rotations Bug: 19636843 Change-Id: I03a30b433942cacd4978c7788e2ae7d0046479a7
rc/com/android/camera/util/JpegUtilNative.java
|
4361352633d1e106c1574c02ddd27c8891c5ee78 |
25-Feb-2015 |
Shashi Shekhar <shashishekhar@google.com> |
Change interface of BurstMediaItem to provide filepath. - Instead of passing a byte array, use a file path for the burst media item. - Change the save operation in Stack saver to simply rename the image. - The burst controller is now responsible for managing captured images and implementations should free the captured images as soon as possible. Change-Id: I6762972c68865d6ab15bd6fa20b60fb275f103f1
rc/com/android/camera/Storage.java
rc/com/android/camera/burst/BurstCaptureCommand.java
rc/com/android/camera/burst/BurstController.java
rc/com/android/camera/burst/BurstFacadeImpl.java
rc/com/android/camera/burst/BurstMediaItem.java
rc/com/android/camera/burst/BurstResultsSaver.java
rc/com/android/camera/session/StackSaver.java
rc/com/android/camera/session/StackSaverImpl.java
rc_pd/com/android/camera/burst/BurstControllerImpl.java
|
9d007ad3629d82317f39e52449e67cf6e90ef564 |
06-Mar-2015 |
Andy Huibers <andyhuibers@google.com> |
Merge "Update stats." into ub-camera-haleakala
|
84e3363cc64e6627d160f1247f72cf462272c41c |
06-Mar-2015 |
Senpo Hu <senpo@google.com> |
Merge "[CaptureIntent] Fix 16x9 stretch problem on Nexus 4." into ub-camera-haleakala
|
2c9a42a87e599e58be189b4d52d9f8999a8cd34b |
05-Mar-2015 |
Andy Huibers <andyhuibers@google.com> |
Update stats. Bug: 18913439 Change-Id: Iadca6b527c76b55504ce21e9f37f7c29dbb71c57
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/util/QuickActivity.java
rc_pd/com/android/camera/stats/UsageStatistics.java
|
f41cdaebdab8e5559e5ce4f8a4cbe40cdd3c7d3d |
06-Mar-2015 |
Puneet Lall <puneetl@google.com> |
Merge "Add partial crop support to ImageBackend" into ub-camera-haleakala
|
cc6139467c1c9545de1f098d938409e182c9b7ad |
05-Mar-2015 |
Senpo Hu <senpo@google.com> |
[CaptureIntent] Fix 16x9 stretch problem on Nexus 4. 2. Also, more clean up for unit tests. Unfortunately I lump two things together is because there are some nice things about the clean up that helps deliver the fix. Bug: 19616722 Change-Id: I632e9f679db6e8a68179912ee4e29c1394084324
rc/com/android/camera/async/RefCountBase.java
rc/com/android/camera/captureintent/CaptureIntentConfig.java
rc/com/android/camera/captureintent/CaptureIntentModule.java
rc/com/android/camera/captureintent/CaptureIntentModuleUI.java
rc/com/android/camera/captureintent/resource/ResourceConstructed.java
rc/com/android/camera/captureintent/resource/ResourceConstructedImpl.java
rc/com/android/camera/captureintent/resource/ResourceSurfaceTexture.java
rc/com/android/camera/captureintent/resource/ResourceSurfaceTextureImpl.java
rc/com/android/camera/captureintent/resource/ResourceSurfaceTextureNexus4Impl.java
rc/com/android/camera/captureintent/state/StateBackground.java
rc/com/android/camera/captureintent/state/StateBackgroundWithSurfaceTexture.java
rc/com/android/camera/captureintent/state/StateForeground.java
rc/com/android/camera/captureintent/state/StateForegroundWithSurfaceTexture.java
rc/com/android/camera/captureintent/state/StateOpeningCamera.java
rc/com/android/camera/captureintent/state/StateReadyForCapture.java
rc/com/android/camera/captureintent/state/StateStartingPreview.java
rc/com/android/camera/captureintent/stateful/State.java
rc/com/android/camera/captureintent/stateful/StateImpl.java
rc/com/android/camera/util/AspectRatio.java
|
90122434d474a891c48dd2fdc251f451a2ecb1d3 |
06-Mar-2015 |
Puneet Lall <puneetl@google.com> |
Merge "Fix CameraCaptureSession exception handling" into ub-camera-haleakala
|
89dabed144478060db022093e44f7160d3063a00 |
06-Mar-2015 |
Puneet Lall <puneetl@google.com> |
Fix CameraCaptureSession exception handling Bug: 19484657 Change-Id: I475444ad5f52d790460fa3c7232f1571c432d54e
rc/com/android/camera/one/v2/camera2proxy/AndroidCameraCaptureSessionProxy.java
|
e995c04e754b8227ff3118bf300007b164020488 |
06-Mar-2015 |
Puneet Lall <puneetl@google.com> |
Merge "Fix jpeg compression without rotation" into ub-camera-haleakala
|
8fd8c5d05e705a6fe158cc772be526d597c17d56 |
06-Mar-2015 |
Alan Newberger <alann@google.com> |
Merge "Custom checkbox drawable for K devices" into ub-camera-haleakala
|
e7c78cf8e07c13562551253c2d98ead0641b3c16 |
05-Mar-2015 |
Alan Newberger <alann@google.com> |
Custom checkbox drawable for K devices L is already taken care of in a v21 style, with the new buttonTint property. For K, use the given assets, which happen to be in a Material style as provided by UX. Bug: 19083903 Change-Id: I9392edf6460a3a9c7c00e1b62cc0f61f9e2b4231
es/drawable-hdpi/ic_box_checked.png
es/drawable-hdpi/ic_box_unchecked.png
es/drawable-mdpi/ic_box_checked.png
es/drawable-mdpi/ic_box_unchecked.png
es/drawable-xhdpi/ic_box_checked.png
es/drawable-xhdpi/ic_box_unchecked.png
es/drawable-xxhdpi/ic_box_checked.png
es/drawable-xxhdpi/ic_box_unchecked.png
es/drawable-xxxhdpi/ic_box_checked.png
es/drawable-xxxhdpi/ic_box_unchecked.png
es/drawable/checkbox_material_black.xml
es/values/styles.xml
|
b759b67a8574fa30ea04d2340ecdfc2979ec0304 |
05-Mar-2015 |
Paul Rohde <codelogic@google.com> |
Switch round thumbnail to respond immedatly to thumbnails. Previous version queued thumbnail requests and would wait to show thumbnails until the animations completed. Bug: 19606612 Change-Id: I6c9ab8946ba39d6ac53476bf493829647b415cba
rc/com/android/camera/widget/RoundedThumbnailView.java
|
89c4277aa2f9f4dda2f2a70d4d6c19866f4994d9 |
06-Mar-2015 |
Puneet Lall <puneetl@google.com> |
Fix jpeg compression without rotation Fix an incorrect precondition which had resulted in crash upon attempts to compress images to jpeg with 0 rotation. Bug: 19630619 Change-Id: Ic70edda6288cf88f24cd552705adaa615b6daaa5
rc/com/android/camera/util/JpegUtilNative.java
|
c56ef82017f772c5892bfc8a46f4ee5e3a9b65ad |
06-Mar-2015 |
Puneet Lall <puneetl@google.com> |
Add partial crop support to ImageBackend Adds functionality to crop final YUV images through the ImageBackend. Note that thumbnails are not yet cropped correctly. Bug: 19323062 Change-Id: I55e0ad2ce60fd963d0d3f452dc10bc7548f08b1c
rc/com/android/camera/one/v2/imagesaver/JpegImageBackendImageSaver.java
rc/com/android/camera/one/v2/imagesaver/YuvImageBackendImageSaver.java
rc/com/android/camera/processing/imagebackend/ImageToProcess.java
rc/com/android/camera/processing/imagebackend/TaskCompressImageToJpeg.java
|
06659480c5cfef2ea43c74aefaa0457a8f196cd9 |
05-Mar-2015 |
Paul Rohde <codelogic@google.com> |
Merge "Read tiny thumbnail resolution from resources." into ub-camera-haleakala
|
2c0832daaeca1bf9a0568ab1bfb7492303caaacf |
05-Mar-2015 |
Paul Rohde <codelogic@google.com> |
Read tiny thumbnail resolution from resources. Previous implemenation used a hardcoded pixel value. This makes the tiny thumbnail generation work better across all devices and ensures the resolution matches the displayed circle size. Bug: 19621182 Change-Id: Ibfcf76bdddd476a1ad107a6541278ffedf0104d8
rc/com/android/camera/processing/ProcessingServiceManager.java
rc/com/android/camera/processing/imagebackend/ImageBackend.java
|
e107dd39b23caa651888d2e7c2ff4a8d4d160261 |
05-Mar-2015 |
Puneet Lall <puneetl@google.com> |
Fix the Camera2 build Change-Id: I8747231424708aa21df1367f912cfe3ed622c04c
rc_pd/com/android/camera/one/v2/OneCameraCreator.java
|
0e531c67cc8bcaa57390a9e3c1170b3fbe72710d |
05-Mar-2015 |
Paul Rohde <codelogic@google.com> |
Merge "Fix rotation problem with the capture indicator." into ub-camera-haleakala
|
a6794192885c0e5e942de43b7dbff9e6c4282e70 |
05-Mar-2015 |
Puneet Lall <puneetl@google.com> |
Merge "Add error handling for repeating preview workaround" into ub-camera-haleakala
|
9f69ef5117dbfa7d6587d5b5f276bb611d5f3cb9 |
05-Mar-2015 |
Sascha Haeberling <haeberling@google.com> |
Merge "Fixing comment syntax for RoundedThumbnailView." into ub-camera-haleakala
|
a0e9afff5bb91d096f4b87d747e4d86222d42fbd |
05-Mar-2015 |
Senpo Hu <senpo@google.com> |
Merge "[CaptureIntent] remove log spam." into ub-camera-haleakala
|
b499c975c56275d757bf94c03e1de55b6a7b80f9 |
05-Mar-2015 |
Puneet Lall <puneetl@google.com> |
Merge "Add on-the-fly cropping and rotation to jpegutil" into ub-camera-haleakala
|
8950eeb4deed45538d5e5143cd6d0282ed325746 |
05-Mar-2015 |
Senpo Hu <senpo@google.com> |
[CaptureIntent] remove log spam. Bug: 19535852 Change-Id: I79d11e0de40b8952983e8af71481358bc2cf8643
rc/com/android/camera/captureintent/state/StateReadyForCapture.java
rc/com/android/camera/captureintent/stateful/State.java
rc/com/android/camera/captureintent/stateful/StateImpl.java
rc/com/android/camera/captureintent/stateful/StateMachineImpl.java
|
04aab100674dfdd11bffabc46e6a199f5e9a5267 |
05-Mar-2015 |
Paul Rohde <codelogic@google.com> |
Fix rotation problem with the capture indicator. This addresses a tiny problem where taking a new picture after rotating the device causes the indicator to temporarily rotate. Bug: 19479623 Change-Id: I567edba32ff7e776ef7605e993db09007b956acd
rc/com/android/camera/app/CameraAppUI.java
rc/com/android/camera/widget/RoundedThumbnailView.java
|
ee669af495f2d3d22c97ab53fc5804c41e807e67 |
05-Mar-2015 |
Sascha Haeberling <haeberling@google.com> |
Fixing comment syntax for RoundedThumbnailView. Change-Id: I167489672f0df4d9bd0f7ccc194a8c50608d5c5f
rc/com/android/camera/widget/RoundedThumbnailView.java
|
7e744b14ab0657d5e766d6313255eed6dd6eab2a |
10-Feb-2015 |
Puneet Lall <puneetl@google.com> |
Add on-the-fly cropping and rotation to jpegutil Bug: 19323062 * Adds another JpegUtilNative method for compression with a crop rectangle. * Improves speed of Jpeg compression with a non-zero rotation. * Fixes small native memory leak caused by not calling jpeg_destroy_compress() to free the libjpeg context. * Adds gunit tests for native code. Change-Id: Id0aa5fd525fb232c4241a6b24970923f4f2c20df
ni/Android.mk
ni/jpegutil.cpp
ni/jpegutil.h
ni/jpegutilnative.cpp
ni/jpegutiltest.cpp
rc/com/android/camera/util/JpegUtilNative.java
|
66b942a3d20aac65454961ef2bc219ca560b9fba |
03-Mar-2015 |
Puneet Lall <puneetl@google.com> |
Add error handling for repeating preview workaround Adds error handling to show a dialog if the workaround for the repeating preview (bug: 19061883) fails. Bug: 19565931 Change-Id: Iabc3b4fdbc6977b0e1828243e80138385a3ef522
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/CaptureModule.java
rc/com/android/camera/FatalErrorHandler.java
rc/com/android/camera/FatalErrorHandlerImpl.java
rc/com/android/camera/app/AppController.java
rc/com/android/camera/captureintent/resource/ResourceConstructed.java
rc/com/android/camera/captureintent/resource/ResourceConstructedImpl.java
rc/com/android/camera/captureintent/state/StateBackground.java
rc/com/android/camera/captureintent/state/StateOpeningCamera.java
rc/com/android/camera/one/OneCameraManager.java
rc/com/android/camera/one/v1/OneCameraManagerImpl.java
rc/com/android/camera/one/v2/OneCameraFactory.java
rc/com/android/camera/one/v2/OneCameraManagerImpl.java
rc/com/android/camera/one/v2/SimpleOneCameraFactory.java
rc/com/android/camera/one/v2/ZslOneCameraFactory.java
rc/com/android/camera/one/v2/errorhandling/FailureHandler.java
rc/com/android/camera/one/v2/errorhandling/FastCameraReset.java
rc/com/android/camera/one/v2/errorhandling/FatalErrorDialogFailureHandler.java
rc/com/android/camera/one/v2/errorhandling/RecoverySuccessCallback.java
rc/com/android/camera/one/v2/errorhandling/RepeatFailureDetector.java
rc/com/android/camera/one/v2/errorhandling/RepeatFailureHandlerComponent.java
rc/com/android/camera/util/CameraUtil.java
|
9e310b7471da884bf8a0c9e2d651d24fd815ac92 |
05-Mar-2015 |
Paul Rohde <codelogic@google.com> |
Merge "Cache Paint objects for capture animation rendering." into ub-camera-haleakala
|
d6fad4a44e0afca5164704fcd906601744e68fb7 |
04-Mar-2015 |
Paul Rohde <codelogic@google.com> |
Cache Paint objects for capture animation rendering. This should help reduce the draw times for the thumbnail view by reducing object allocation and reusing the same paint objects. Bug: 19424945 Change-Id: Ia38a65dec4477f100a27543312b736c10ec07e40
rc/com/android/camera/widget/RoundedThumbnailView.java
|
a73b87109097e0557e3b9e7a03a12ae04b610245 |
05-Mar-2015 |
Puneet Lall <puneetl@google.com> |
Merge "Add support for non-native picture sizes" into ub-camera-haleakala
|
76132c239e0d7732610ba30f3d945c42ca12eeb7 |
05-Mar-2015 |
I-Jong Lin <ijonglin@google.com> |
Merge "N4 16:9 Preview Workaround" into ub-camera-haleakala
|
55e498578b46ef9e7b3aa70f30a68ea9bd788d63 |
04-Mar-2015 |
I-Jong Lin <ijonglin@google.com> |
N4 16:9 Preview Workaround The N4-specific fix is to trick the layout UI logic to accept a 16:9 preview coming from a 4:3 surface. When we render the 4:3 surface, we fill in the size of the preview area. So, if the surface dimensions are 4:3 AND the surface actually contains 16:9 content AND the preview view is also 16:9, then preview will actually look correct. To maintain this inconsistency between the surface and the content aspect ratio, we use the legacy layout path, and trick the UI layout into laying out a 16:9 preview, but using a matrix transform that converts 4:3 surface into a 16:9 view. In new and improved matrix transformation codepath, we correctly assume that the matrix and the preview size should be consistent. Currently, the 0.9MP camera setting on the N4 on the front and back camera produces a squeezed preview, but also produces a squeezed JPEG artifact and is probably another independent N4 HAL related issue. But it's WYSIWYG, so I guess it's correct. Bug: 19271661 Change-Id: I213a423f891a7c216568970c7f520a6134f9ad13
rc/com/android/camera/CaptureModule.java
rc/com/android/camera/TextureViewHelper.java
|
0842910285929b6612eff62791c2041c37d4955e |
05-Mar-2015 |
Sascha Haeberling <haeberling@google.com> |
Merge "Make sure we don't start sessions on long-press if no burst is taken." into ub-camera-haleakala
|
2f6fe6f07a6d43d8bb49156a7a73e86896ab7d1e |
24-Feb-2015 |
Puneet Lall <puneetl@google.com> |
Add support for non-native picture sizes Add a new PictureSizeCalculator which selects the most-appropriate natively-supported picture size for any target, user-selected, picture size. The appropriate, centered, crop-region is passed to the ImageBackend, but is currently ignored. Future work is required to crop the resulting images using these values. Bug: 19323062 Change-Id: I65cdc97950840dde0a94c96179ade3aae17acc30
rc/com/android/camera/one/v2/common/PictureSizeCalculator.java
rc/com/android/camera/one/v2/imagesaver/JpegImageBackendImageSaver.java
rc/com/android/camera/one/v2/imagesaver/YuvImageBackendImageSaver.java
rc/com/android/camera/settings/ResolutionUtil.java
rc/com/android/camera/util/AspectRatio.java
rc/com/android/camera/util/Size.java
|
a6043e2655340b65cd36b42397e43e85d2dc9245 |
05-Mar-2015 |
Paul Rohde <codelogic@google.com> |
Merge "Change the capture flash to use paint opacity." into ub-camera-haleakala
|
dd565aafbdfba7310289ff2a371d46ef157c1b4d |
04-Mar-2015 |
Senpo Hu <senpo@google.com> |
Merge "[CaptureIntent] refactor state machine." into ub-camera-haleakala
|
d2d86155337a7dd9fd285a25c93e27dc05200ed1 |
28-Feb-2015 |
Senpo Hu <senpo@google.com> |
[CaptureIntent] refactor state machine. 1. Change the event handling mechanism by introducing EventHandler and get rid of all processXXX() methods in State class. 2. Remove State.ID enum. 3. Move core classes to "stateful" package. Refactor for unit test. 1. Extract interface for ResourceXXX class. 2. Extract interface for StateMachine. Change-Id: I5b988959c44cf995f5a52b638bcda86d625e6795
rc/com/android/camera/captureintent/CaptureIntentModule.java
rc/com/android/camera/captureintent/event/Event.java
rc/com/android/camera/captureintent/event/EventCameraBusy.java
rc/com/android/camera/captureintent/event/EventCameraQuickExpose.java
rc/com/android/camera/captureintent/event/EventCameraReady.java
rc/com/android/camera/captureintent/event/EventFastPictureBitmapAvailable.java
rc/com/android/camera/captureintent/event/EventOnOpenCameraFailed.java
rc/com/android/camera/captureintent/event/EventOnOpenCameraSucceeded.java
rc/com/android/camera/captureintent/event/EventOnStartPreviewFailed.java
rc/com/android/camera/captureintent/event/EventOnStartPreviewSucceeded.java
rc/com/android/camera/captureintent/event/EventOnSurfaceTextureAvailable.java
rc/com/android/camera/captureintent/event/EventOnSurfaceTextureDestroyed.java
rc/com/android/camera/captureintent/event/EventOnSurfaceTextureUpdated.java
rc/com/android/camera/captureintent/event/EventOnTextureViewLayoutChanged.java
rc/com/android/camera/captureintent/event/EventPause.java
rc/com/android/camera/captureintent/event/EventPictureCompressed.java
rc/com/android/camera/captureintent/event/EventPictureDecoded.java
rc/com/android/camera/captureintent/event/EventResume.java
rc/com/android/camera/captureintent/event/EventTapOnCancelIntentButton.java
rc/com/android/camera/captureintent/event/EventTapOnCancelShutterButton.java
rc/com/android/camera/captureintent/event/EventTapOnConfirmPhotoButton.java
rc/com/android/camera/captureintent/event/EventTapOnPreview.java
rc/com/android/camera/captureintent/event/EventTapOnRetakePhotoButton.java
rc/com/android/camera/captureintent/event/EventTapOnShutterButton.java
rc/com/android/camera/captureintent/event/EventTapOnSwitchCameraButton.java
rc/com/android/camera/captureintent/event/EventTimerCountDownToZero.java
rc/com/android/camera/captureintent/event/EventZoomRatioChanged.java
rc/com/android/camera/captureintent/resource/ResourceCaptureTools.java
rc/com/android/camera/captureintent/resource/ResourceCaptureToolsImpl.java
rc/com/android/camera/captureintent/resource/ResourceConstructed.java
rc/com/android/camera/captureintent/resource/ResourceConstructedImpl.java
rc/com/android/camera/captureintent/resource/ResourceOpenedCamera.java
rc/com/android/camera/captureintent/resource/ResourceOpenedCameraImpl.java
rc/com/android/camera/captureintent/resource/ResourceSurfaceTexture.java
rc/com/android/camera/captureintent/resource/ResourceSurfaceTextureImpl.java
rc/com/android/camera/captureintent/state/ResourceCaptureTools.java
rc/com/android/camera/captureintent/state/ResourceConstructed.java
rc/com/android/camera/captureintent/state/ResourceOpenedCamera.java
rc/com/android/camera/captureintent/state/ResourceSurfaceTexture.java
rc/com/android/camera/captureintent/state/State.java
rc/com/android/camera/captureintent/state/StateBackground.java
rc/com/android/camera/captureintent/state/StateBackgroundWithSurfaceTexture.java
rc/com/android/camera/captureintent/state/StateFatal.java
rc/com/android/camera/captureintent/state/StateForeground.java
rc/com/android/camera/captureintent/state/StateForegroundWithSurfaceTexture.java
rc/com/android/camera/captureintent/state/StateIntentCompleted.java
rc/com/android/camera/captureintent/state/StateMachine.java
rc/com/android/camera/captureintent/state/StateOpeningCamera.java
rc/com/android/camera/captureintent/state/StateReadyForCapture.java
rc/com/android/camera/captureintent/state/StateReviewingPicture.java
rc/com/android/camera/captureintent/state/StateSavingPicture.java
rc/com/android/camera/captureintent/state/StateStartingPreview.java
rc/com/android/camera/captureintent/stateful/Event.java
rc/com/android/camera/captureintent/stateful/EventHandler.java
rc/com/android/camera/captureintent/stateful/State.java
rc/com/android/camera/captureintent/stateful/StateImpl.java
rc/com/android/camera/captureintent/stateful/StateMachine.java
rc/com/android/camera/captureintent/stateful/StateMachineImpl.java
|
a33f00ff8496f087d2cf3811515eea0430aab240 |
04-Mar-2015 |
Alan Newberger <alann@google.com> |
Merge "Enable ripple for filmstrip buttons" into ub-camera-haleakala
|
e48cd5405840c530d4beefca84674c4919a77edb |
04-Mar-2015 |
Sascha Haeberling <haeberling@google.com> |
Make sure we don't start sessions on long-press if no burst is taken. Bug: 19602850 Change-Id: Ia49e508811ca145e93d1f7e2df83100ba3fa1816
rc/com/android/camera/CaptureModule.java
rc/com/android/camera/burst/BurstFacade.java
rc/com/android/camera/burst/BurstFacadeFactory.java
rc/com/android/camera/burst/BurstFacadeImpl.java
rc/com/android/camera/burst/ToastingBurstFacadeDecorator.java
rc/com/android/camera/session/CaptureSession.java
|
19b1df0b8013a585f78d10006b862d160ef28b83 |
03-Mar-2015 |
Alan Newberger <alann@google.com> |
Enable ripple for filmstrip buttons Style already specified selectableItemBackgroundBorderless, but no ripple was visible. Swapped in an explicit ripple drawable, works fine. Bug: 19586511 Change-Id: I154e5b30705cb2f07b4c6824869abc05a745335e
es/drawable-v21/filmstrip_button_background.xml
es/values-v21/styles.xml
|
6e1029f9136ed9deb540c583998ae0bc9fd10287 |
04-Mar-2015 |
Senpo Hu <senpo@google.com> |
Merge "Decouple OneCameraManager and CameraActivity." into ub-camera-haleakala
|
a166b882d74c9c8d638479b79517c99448865e99 |
04-Mar-2015 |
Senpo Hu <senpo@google.com> |
Decouple OneCameraManager and CameraActivity. 1. To allow other activity (such as SettingsActivity) to create OneCameraManager. 2. Also simplify OneCameraManager.open() and OneCameraCreator.create() interface by introducing OneCameraCaptureSetting. From time to time, we always need to change these interfaces if we want to pass in more things to OneCamera. This solves the headache and also removes the dependency between OneCameraCreator and SettingsManager. Bug: 18523154 Change-Id: Ifb9077bb046740c600dab3b3b369a0f422dbbbeb
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/CaptureModule.java
rc/com/android/camera/captureintent/state/StateOpeningCamera.java
rc/com/android/camera/one/OneCameraCaptureSetting.java
rc/com/android/camera/one/OneCameraManager.java
rc/com/android/camera/one/config/OneCameraFeatureConfig.java
rc/com/android/camera/one/config/OneCameraFeatureConfigCreator.java
rc/com/android/camera/one/v1/OneCameraManagerImpl.java
rc/com/android/camera/one/v2/OneCameraManagerImpl.java
rc_pd/com/android/camera/one/v2/OneCameraCreator.java
|
60b24b89cda589914a71da627360985b02280b5b |
04-Mar-2015 |
Senpo Hu <senpo@google.com> |
Merge "[FirstRunDialog] finish when users hit back button." into ub-camera-haleakala
|
7f83911e75e5a4a30d783a4e06f4337e61750eaa |
04-Mar-2015 |
Senpo Hu <senpo@google.com> |
[FirstRunDialog] finish when users hit back button. Bug: 19593942 Change-Id: I5c3d811759f4943e8fca4fc4634bc8ee3df04f58
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/app/FirstRunDialog.java
|
33adbba93511bb4c25f23096f87a5403ee626379 |
04-Mar-2015 |
I-Jong Lin <ijonglin@google.com> |
Merge "PhotoModule Timing Regression Fix onResume" into ub-camera-haleakala
|
4c364aa8a0c0a536548c0186462289173fe23334 |
04-Mar-2015 |
I-Jong Lin <ijonglin@google.com> |
PhotoModule Timing Regression Fix onResume Fix for an timing issue on initializing the Accessibility UI without having a valid CameraCapabilities. The initialization of the Accessibility UI is moved to onCameraAvailable. Bug: 19605317 Change-Id: Ifbbaca71141a187750890ffe66a1a62558f80f64
rc/com/android/camera/PhotoModule.java
|
5eecde851c9dfa590ff0f8386fa64ca2f523ab82 |
04-Mar-2015 |
Paul Rohde <codelogic@google.com> |
Change the capture flash to use paint opacity. Performance optimization to prevent GPU thrashing that was occuring because of custom draw in addition to layer alpha animation. This makes this animation more performant by altering the alpha property of the paint instead of the entire layer. Bug: 19424945 Change-Id: Idb14b49148ce0caf9d5c19380f364e7f20339aca
rc/com/android/camera/ui/CaptureAnimationOverlay.java
|
aeceab7308e3951a9fb7ba7daef72f86e0641d0e |
04-Mar-2015 |
Geoff Mendal <mendal@google.com> |
Import translations. DO NOT MERGE Change-Id: If31d3656d2ed7e2d6d538f61eb057b05a20059d6 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-bn-rBD/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-eu-rES/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-gl-rES/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-is-rIS/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-kk-rKZ/strings.xml
es/values-km-rKH/strings.xml
es/values-kn-rIN/strings.xml
es/values-ko/strings.xml
es/values-ky-rKG/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mk-rMK/strings.xml
es/values-ml-rIN/strings.xml
es/values-mn-rMN/strings.xml
es/values-mr-rIN/strings.xml
es/values-ms-rMY/strings.xml
es/values-my-rMM/strings.xml
es/values-nb/strings.xml
es/values-ne-rNP/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-si-rLK/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-ta-rIN/strings.xml
es/values-te-rIN/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-ur-rPK/strings.xml
es/values-uz-rUZ/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
6b7e9c3fec6d53eed53185e84644fb1a01fff284 |
04-Mar-2015 |
Shashi Shekhar <shashishekhar@google.com> |
Merge "Switch Burst to use 24 fps for N5." into ub-camera-haleakala
|
f88e75f8478162955e170d763f1b2be8e3753c92 |
03-Mar-2015 |
Shashi Shekhar <shashishekhar@google.com> |
Switch Burst to use 24 fps for N5. Make burst use 24 fps for N5. Change-Id: Ifeec74c3a854d6173557ee5a31626b61289a23c0
rc/com/android/camera/burst/BurstCaptureCommand.java
|
5cb9b7c456c59d751b44408cab362347308152c9 |
04-Mar-2015 |
Puneet Lall <puneetl@google.com> |
Merge "Filter out duplicate calls to ready state listener" into ub-camera-haleakala
|
81308a22b0f64c6667f6c23adee9da520415bcb6 |
03-Mar-2015 |
Puneet Lall <puneetl@google.com> |
Filter out duplicate calls to ready state listener * Adds a FilteredCallback to filter out callback invocations with duplicate values. * Simplifies ready-state calculations. Bug: 19535852 Change-Id: I8376c13f24ff7a4f6f2d347f363746c2a6466601
rc/com/android/camera/async/FilteredCallback.java
rc/com/android/camera/async/Listenable.java
rc/com/android/camera/async/ListenableConcurrentState.java
rc/com/android/camera/async/ObservableCombiner.java
rc/com/android/camera/async/Observables.java
rc/com/android/camera/one/v2/SimpleOneCameraFactory.java
rc/com/android/camera/one/v2/ZslOneCameraFactory.java
rc/com/android/camera/one/v2/initialization/GenericOneCameraImpl.java
rc/com/android/camera/one/v2/initialization/InitializedOneCameraFactory.java
|
8d1f04d7babc04d73ac5bd0d9e1dd46bc559ff3d |
03-Mar-2015 |
I-Jong Lin <ijonglin@google.com> |
Merge "Legacy Autotransform Support to CaptureModule" into ub-camera-haleakala
|
e61fbc4cba45ec740703d9a9e2a651e2d3e3a3c2 |
03-Mar-2015 |
zafir <zafir@google.com> |
Merge "Adding ability to zoom in accessibility mode using TalkBack" into ub-camera-haleakala
|
971ad50c0f220a396ffce50245617ff59ed0a09e |
21-Feb-2015 |
zafir <zafir@google.com> |
Adding ability to zoom in accessibility mode using TalkBack Bug: 18986078 Bug: 19546523 Change-Id: Ie68234a9a3a0b8b9be870cc674658194c72c84ef
es/layout/camera.xml
es/values/strings.xml
rc/com/android/camera/AccessibilityUtil.java
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/CaptureModule.java
rc/com/android/camera/CaptureModuleUI.java
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/PhotoUI.java
rc/com/android/camera/VideoModule.java
rc/com/android/camera/app/CameraAppUI.java
rc/com/android/camera/ui/PreviewOverlay.java
|
1d0dd50db5d3d02d1209b4c0a3e6d4a71d2c8acf |
03-Mar-2015 |
I-Jong Lin <ijonglin@google.com> |
Legacy Autotransform Support to CaptureModule Added the legacy support for Capture Module to use the combination of transformations, dynamic layout, and transform helpers that PhotoModule uses. It seems to replicate that same functionality as the CaptureModuleUI, but it's good to have that option for comparison, and to be able to turn it on and off with one line configuration. Bug: 19271661 Change-Id: I4ad4fa6fe3547373d6fbf77a53a1a18cd26df8ec
rc/com/android/camera/CaptureModule.java
rc/com/android/camera/TextureViewHelper.java
|
e727428fb48a0df77a42eca417dec8749397d407 |
03-Mar-2015 |
Paul Rohde <codelogic@google.com> |
Merge "Use getLayerType() instead of boolean for hardware layers." into ub-camera-haleakala
|
7543914f2de33b1be25626afb31fa979b06dd582 |
03-Mar-2015 |
Paul Rohde <codelogic@google.com> |
Use getLayerType() instead of boolean for hardware layers. Prevent hardware layers from existing during steady states by using getLayerType() and checking progress during each update. Bug: 19514276 Change-Id: Ia5d9434cddd78e28aa5575bcba1cec5a91c46b2f
rc/com/android/camera/app/CameraAppUI.java
rc/com/android/camera/ui/ModeListView.java
|
f51ad7e460fc231b42c137fc11d9edac2f3f0923 |
03-Mar-2015 |
Senpo Hu <senpo@google.com> |
[OneCamera v1] wrap RuntimeException properly. Bug: 19280025 Change-Id: Id23fedb018cbe188917bca76abc9a0130dd52b9e
rc/com/android/camera/one/OneCameraAccessException.java
rc/com/android/camera/one/v1/OneCameraManagerImpl.java
|
66956b43db3b539513afa635c392d65bc8637053 |
03-Mar-2015 |
Senpo Hu <senpo@google.com> |
Merge "[CaptureIntent] trigger active focus." into ub-camera-haleakala
|
9a13c50727b29e2e8c94224db52a298c76268946 |
03-Mar-2015 |
Paul Rohde <codelogic@google.com> |
Merge "Turn on hardware layers for semi-transparent layers." into ub-camera-haleakala
|
06b99efe8afaae7c311ff144c6ed906528d4394b |
03-Mar-2015 |
Paul Rohde <codelogic@google.com> |
Merge "Add a shutdown mechanism to the camera lifecycle." into ub-camera-haleakala
|
915337c1a51f9816878e12c3049fca5664f5564f |
03-Mar-2015 |
Paul Rohde <codelogic@google.com> |
Merge "Futures2 async join functions." into ub-camera-haleakala
|
c7ef4da1e06ad9a4b88daed9ffc49bdb415fd011 |
03-Mar-2015 |
Senpo Hu <senpo@google.com> |
[CaptureIntent] trigger active focus. Bug: 19559091 Change-Id: I8060465237c8bf14b36bece9255b1175644be04c
rc/com/android/camera/captureintent/CaptureIntentModuleUI.java
rc/com/android/camera/captureintent/state/ResourceOpenedCamera.java
rc/com/android/camera/captureintent/state/StateReadyForCapture.java
|
1908beee07fe9792338dbf8e0c36a5f1e3e9401f |
02-Mar-2015 |
Paul Rohde <codelogic@google.com> |
Turn on hardware layers for semi-transparent layers. This tracks and enables hardware layers for the mode switcher when the alpha values are being animated. This helps prevent large extra draws that are causing jank when opening or closing the mode switcher. Bug: 19514276 Change-Id: I902be1d4470bc5ae9c82ff7329d9b9167dee5eb9
rc/com/android/camera/app/CameraAppUI.java
rc/com/android/camera/ui/ModeListView.java
|
624f758a41220fc96280f2817707b3d283cebcf9 |
02-Mar-2015 |
Senpo Hu <senpo@google.com> |
Merge "[CaptureIntent] suppress capture indicator." into ub-camera-haleakala
|
660ed40ad0b4dc942893ec714e6297702e596162 |
02-Mar-2015 |
Paul Rohde <codelogic@google.com> |
Merge "Fix focus ring radius responses." into ub-camera-haleakala
|
1106276c9b365afadb12a7280ec3a297fdeeec44 |
02-Mar-2015 |
Senpo Hu <senpo@google.com> |
[CaptureIntent] suppress capture indicator. Bug: 19559037 Change-Id: Ie62cc6e7a5a984633c27624fc06e26a4be76d8b7
rc/com/android/camera/captureintent/CaptureIntentModuleUI.java
|
22cc812406334dfe7f1d38ecac75b82b51c1c9d1 |
02-Mar-2015 |
Andy Huibers <andyhuibers@google.com> |
Move JPEG quality to separate stub-able method. Bug: 19548882 Change-Id: I43e1fe93de63eacdc8c8a16b4f3b528e3a65728b
rc/com/android/camera/processing/imagebackend/TaskCompressImageToJpeg.java
|
4ed350f20ec8838aa2aac19564e39969af28eacc |
02-Mar-2015 |
Geoff Mendal <mendal@google.com> |
Import translations. DO NOT MERGE Change-Id: Ifecb7688602e8d7b08e53037caf66b4ecffaed81 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-bn-rBD/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-eu-rES/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-gl-rES/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-is-rIS/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-kk-rKZ/strings.xml
es/values-km-rKH/strings.xml
es/values-kn-rIN/strings.xml
es/values-ko/strings.xml
es/values-ky-rKG/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mk-rMK/strings.xml
es/values-ml-rIN/strings.xml
es/values-mn-rMN/strings.xml
es/values-mr-rIN/strings.xml
es/values-ms-rMY/strings.xml
es/values-my-rMM/strings.xml
es/values-nb/strings.xml
es/values-ne-rNP/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-si-rLK/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-ta-rIN/strings.xml
es/values-te-rIN/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-ur-rPK/strings.xml
es/values-uz-rUZ/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
02d42f96dc463f76beae47b9ac4d681e87c06c57 |
28-Feb-2015 |
Pengchong Jin <pengchong@google.com> |
Change software jpeg encoder quality to CameraProfile.QUALITY_HIGH Bug: 19548882 Change-Id: I9bdbeb11c2614f3d3d3f60d2a940d2c368617072
rc/com/android/camera/processing/imagebackend/TaskCompressImageToJpeg.java
|
d1f25e8507bc27a85853bb718c365d79a838dc33 |
27-Feb-2015 |
Paul Rohde <codelogic@google.com> |
Fix focus ring radius responses. This fixes a scaling problem that was causing the focus controller to ignore the radius changes on devices that supported providing lens position. It also removes redundant focus indicator clearing that was causing intermitent and jumpy animations. Bug: 19527399 Change-Id: I0b2a734aa9dc4030430f1420cc26d75784dcbdf6
rc/com/android/camera/CaptureModule.java
rc/com/android/camera/captureintent/state/StateReadyForCapture.java
rc/com/android/camera/one/OneCamera.java
rc/com/android/camera/ui/focus/FocusController.java
rc/com/android/camera/ui/focus/LensRangeCalculator.java
rc/com/android/camera/ui/motion/LinearScale.java
|
389b11bf5bcf9f6fbddecb43cd7cb7f43673396e |
27-Feb-2015 |
Paul Rohde <codelogic@google.com> |
Merge "Require USE_SCENE_MODE when HDR is turned on." into ub-camera-haleakala
|
7db6d1eb6f124496a4fbc10733741c62d97d29d2 |
27-Feb-2015 |
Paul Rohde <codelogic@google.com> |
Require USE_SCENE_MODE when HDR is turned on. Setting the scene mode to the HDR value is not enough for legacy devices to pick up the scene mode change. USE_SCENE_MODE must also be set at the same time for the HDR scene mode to capture images correctly. Bug: 18622877 Change-Id: I84c5d483ac7e50860eff28c874ac046220f35a8d
rc/com/android/camera/one/v2/common/BasicCameraFactory.java
rc/com/android/camera/one/v2/common/HdrSettingBasedControlMode.java
|
d1a4002830183b9757428dbb0d0254396fd92d53 |
27-Feb-2015 |
Geoff Mendal <mendal@google.com> |
am d4fcb351: (-s ours) am 182c13c6: (-s ours) Import translations. DO NOT MERGE * commit 'd4fcb351790bd69f09dc7109598eeccc9cbf9722': Import translations. DO NOT MERGE
|
d4fcb351790bd69f09dc7109598eeccc9cbf9722 |
27-Feb-2015 |
Geoff Mendal <mendal@google.com> |
am 182c13c6: (-s ours) Import translations. DO NOT MERGE * commit '182c13c6767a1513ef998559bed684cbefc8e2c9': Import translations. DO NOT MERGE
|
de4e5225ea92d681f9f4c005e6285f739635d271 |
27-Feb-2015 |
Senpo Hu <senpo@google.com> |
[CaptureIntentModule] Fix preview layout race condition. Bug: 19510313 Change-Id: I5bcf89eeedcf3850a632683b695ebde0bf86d643
rc/com/android/camera/captureintent/CaptureIntentModule.java
rc/com/android/camera/captureintent/CaptureIntentModuleUI.java
rc/com/android/camera/captureintent/PreviewTransformCalculator.java
rc/com/android/camera/captureintent/event/EventOnSurfaceTextureDestroyed.java
rc/com/android/camera/captureintent/event/EventOnSurfaceTextureUpdated.java
rc/com/android/camera/captureintent/state/ResourceSurfaceTexture.java
rc/com/android/camera/captureintent/state/State.java
rc/com/android/camera/captureintent/state/StateBackgroundWithSurfaceTexture.java
rc/com/android/camera/captureintent/state/StateForegroundWithSurfaceTexture.java
rc/com/android/camera/captureintent/state/StateReadyForCapture.java
rc/com/android/camera/captureintent/state/StateStartingPreview.java
|
182c13c6767a1513ef998559bed684cbefc8e2c9 |
27-Feb-2015 |
Geoff Mendal <mendal@google.com> |
Import translations. DO NOT MERGE Change-Id: I5c3699b9217bfa4356e94fcf69cd74f40b0c2b52 Auto-generated-cl: translation import
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bn-rBD/strings.xml
es/values-cs/strings.xml
es/values-el/strings.xml
es/values-es/strings.xml
es/values-eu-rES/strings.xml
es/values-fr/strings.xml
es/values-gl-rES/strings.xml
es/values-hi/strings.xml
es/values-is-rIS/strings.xml
es/values-ja/strings.xml
es/values-kk-rKZ/strings.xml
es/values-km-rKH/strings.xml
es/values-kn-rIN/strings.xml
es/values-ky-rKG/strings.xml
es/values-mk-rMK/strings.xml
es/values-ml-rIN/strings.xml
es/values-mr-rIN/strings.xml
es/values-my-rMM/strings.xml
es/values-ne-rNP/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-si-rLK/strings.xml
es/values-sk/strings.xml
es/values-ta-rIN/strings.xml
es/values-te-rIN/strings.xml
es/values-ur-rPK/strings.xml
es/values-uz-rUZ/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
|
14cbe7d9b51fd07503344054d44fa2e8e00d78e2 |
27-Feb-2015 |
Senpo Hu <senpo@google.com> |
Merge "[CaptureIntentModule] Transition StateBackgroundWithSurfaceTexture when module got paused." into ub-camera-haleakala
|
8185c13b1562def4774cabd710c23402b27d0a0a |
27-Feb-2015 |
Senpo Hu <senpo@google.com> |
[CaptureIntentModule] Transition StateBackgroundWithSurfaceTexture when module got paused. Bug: 19522250 Change-Id: Iaea6229cb4b7329f401842565d322f041fbc6b3f
rc/com/android/camera/captureintent/state/StateBackgroundWithSurfaceTexture.java
rc/com/android/camera/captureintent/state/StateOpeningCamera.java
rc/com/android/camera/captureintent/state/StateReadyForCapture.java
rc/com/android/camera/captureintent/state/StateStartingPreview.java
|
f77ff55b5c3be0b03de296ff432be62de56313a3 |
27-Feb-2015 |
Alan Newberger <alann@google.com> |
Merge "Remove accordion" into ub-camera-haleakala
|
13560fbb4348746b5b007fc7535ff41dc102ad56 |
27-Feb-2015 |
Sascha Haeberling <haeberling@google.com> |
Merge "Capture Intent: Initialize options status." into ub-camera-haleakala
|
ddd3632198a6d3804d742f336f7e2976cb09b21c |
27-Feb-2015 |
Andy Huibers <andyhuibers@google.com> |
Fix build. Bug: 19534046 Change-Id: I95443c855527c45224a8343621a66c852873e8a2
rc_pd/com/android/camera/one/v2/OneCameraCreator.java
|
0877b74d42b0e33952fcf5b1640d6accafcc3826 |
27-Feb-2015 |
Andy Huibers <andyhuibers@google.com> |
Allow number of Images in ImageReader to be variable. Goes with ag/644111. Bug: 19534046 Change-Id: I7c54de56cd97798f0c325260d6215e1ad8834348
rc/com/android/camera/one/v2/OneCameraManagerImpl.java
rc_pd/com/android/camera/util/GservicesHelper.java
|
f307e8544b96e6ac2b226cd7fd8f8dcab58f7131 |
27-Feb-2015 |
Andy Huibers <andyhuibers@google.com> |
Merge "Disable ZSL for pre-MR1 L only for Nexus 5 and 6." into ub-camera-haleakala
|
722d2759dd94db85b4515cd66c6ca6839b68f81d |
27-Feb-2015 |
Sascha Haeberling <haeberling@google.com> |
Capture Intent: Initialize options status. Bug: 19535308 Change-Id: I7880d02514a85a6871cc5a000efd127729260733
rc/com/android/camera/captureintent/CaptureIntentModule.java
|
a27011ccd08c97465a1329b30e6b856f9c2d258f |
27-Feb-2015 |
Senpo Hu <senpo@google.com> |
[CaptureIntentModule] Remove event for focus state update. Because now FocusStateListener is registered inside StateReadyForCapture. Change-Id: I179232077fd37b4206cc13083c167ddccd1824ec
rc/com/android/camera/captureintent/state/State.java
rc/com/android/camera/captureintent/state/StateReadyForCapture.java
|
d2710487e724660cbb890ebf5eb887b4a93281c1 |
27-Feb-2015 |
Alan Newberger <alann@google.com> |
Remove accordion No more accordion animation. Bug: 19535309 Change-Id: I001315e03b63de1ed228d371c849f30f5af2f17d
rc/com/android/camera/ui/ModeListView.java
|
924c693b2c70d5332ad86d39550c99cb8ff696ed |
27-Feb-2015 |
Sascha Haeberling <haeberling@google.com> |
Capture intent: Cancel countdown on resume. Bug: 19521959 Change-Id: I06c9462a34718adf3b6669bbecc45a4ee82fb124
rc/com/android/camera/captureintent/state/StateReadyForCapture.java
|
64d22d9caf0824739cb250575d69a56fe7f3fa3c |
27-Feb-2015 |
Sascha Haeberling <haeberling@google.com> |
Capture Intent: Add capture-cancel (cancel countdown) support. Bug: 19521614 Change-Id: I624601268947d9540d379b74753b7c92898c7553
rc/com/android/camera/app/CameraAppUI.java
rc/com/android/camera/captureintent/CaptureIntentModule.java
rc/com/android/camera/captureintent/CaptureIntentModuleUI.java
rc/com/android/camera/captureintent/event/EventTapOnCancelIntentButton.java
rc/com/android/camera/captureintent/event/EventTapOnCancelShutterButton.java
rc/com/android/camera/captureintent/state/State.java
rc/com/android/camera/captureintent/state/StateReadyForCapture.java
rc/com/android/camera/captureintent/state/StateReviewingPicture.java
|
2f5eba72136bcc8974ec44f68b19ea4c306c1d84 |
26-Feb-2015 |
Senpo Hu <senpo@google.com> |
[CaptureIntentModule] Add StateBackgroundWithSurfaceTexture. Module is in this state when first run dialog is still presented. The module will be resumed after people finish first run dialog. Bug: 19531554 Change-Id: Ibe878eba66ab4f235a39a6d5ba0abfdad30f5cab
rc/com/android/camera/captureintent/CaptureIntentModule.java
rc/com/android/camera/captureintent/state/State.java
rc/com/android/camera/captureintent/state/StateBackground.java
rc/com/android/camera/captureintent/state/StateBackgroundWithSurfaceTexture.java
rc/com/android/camera/captureintent/state/StateForegroundWithSurfaceTexture.java
|
a10a07d23b207fd2e7c2c415b69bec87199a41f1 |
26-Feb-2015 |
Andy Huibers <andyhuibers@google.com> |
Disable ZSL for pre-MR1 L only for Nexus 5 and 6. Bug: 19534046 Change-Id: I6c46c5027658cc6afc6e486114149b46a2f8f4c1
rc/com/android/camera/one/config/OneCameraFeatureConfigCreator.java
|
86d3e0684b39aa6fd303dcf5546295b26bfaba38 |
26-Feb-2015 |
Senpo Hu <senpo@google.com> |
Merge "[CaptureIntentModule] Dont' dispatch startPreview call" into ub-camera-haleakala
|
8b4309b20d64b15bc49d5cdc891d09208f009f06 |
26-Feb-2015 |
Senpo Hu <senpo@google.com> |
[CaptureIntentModule] Dont' dispatch startPreview call it will result in race condition. Bug: 19522251 Bug: 19522250 Change-Id: I078ed51a92ae54dd064a00e376e3e151523eb361
rc/com/android/camera/captureintent/state/StateStartingPreview.java
|
fe458825264fc909c503564903a37b6c58c2c8c3 |
26-Feb-2015 |
Sascha Haeberling <haeberling@google.com> |
CaptureIntent: Disable button before taking a picture. Bug: 19521616 Change-Id: I1c071ab1eddabb759c651bec261363227629ed0e
rc/com/android/camera/captureintent/state/StateReadyForCapture.java
|
a7ec5eabe57a2bc8512a4e45c60d457cad895a98 |
26-Feb-2015 |
Senpo Hu <senpo@google.com> |
[CaptureIntentModule] enable flash photo. Bug: 19520829 Change-Id: Id56c621f92feb4124d745716f9b101c200b20d3b
rc/com/android/camera/captureintent/CaptureIntentModule.java
rc/com/android/camera/one/v2/initialization/GenericOneCameraImpl.java
|
482ee873725a2e7ff9be5aa819b69e2a277b38ba |
26-Feb-2015 |
Senpo Hu <senpo@google.com> |
Fix build break by ag/643763 Change-Id: I4e274526667ec40daa8cd3d2b6d3e8ac5a03ddea
rc/com/android/camera/captureintent/event/EventOnSurfaceTextureAvailable.java
rc/com/android/camera/captureintent/event/EventOnTextureViewLayoutChanged.java
rc/com/android/camera/captureintent/event/EventTapOnPreview.java
rc/com/android/camera/captureintent/event/EventZoomRatioChanged.java
|
687476eb81212f13e122ea822c5551cf899ee3bd |
26-Feb-2015 |
Senpo Hu <senpo@google.com> |
Merge "[CaptureIntentModule] Refactoring to help writing unit tests." into ub-camera-haleakala
|
1b98e83085e2b0a3066a4bf3cbde2d664b8422ee |
26-Feb-2015 |
Senpo Hu <senpo@google.com> |
[CaptureIntentModule] Refactoring to help writing unit tests. Eventually I want to get rid of those processXXX methods in State class. 1. Move various callback into state class instead of having them all in the module class. 2. Create various event class instead of using anonymous class. Change-Id: I065ca199052be36b5b29cc0d6743bb174b128d75
rc/com/android/camera/captureintent/CaptureIntentModule.java
rc/com/android/camera/captureintent/event/Event.java
rc/com/android/camera/captureintent/event/EventOnOpenCameraFailed.java
rc/com/android/camera/captureintent/event/EventOnOpenCameraSucceeded.java
rc/com/android/camera/captureintent/event/EventOnStartPreviewFailed.java
rc/com/android/camera/captureintent/event/EventOnStartPreviewSucceeded.java
rc/com/android/camera/captureintent/event/EventOnSurfaceTextureAvailable.java
rc/com/android/camera/captureintent/event/EventOnTextureViewLayoutChanged.java
rc/com/android/camera/captureintent/event/EventPause.java
rc/com/android/camera/captureintent/event/EventResume.java
rc/com/android/camera/captureintent/event/EventTapOnCancelIntentButton.java
rc/com/android/camera/captureintent/event/EventTapOnConfirmPhotoButton.java
rc/com/android/camera/captureintent/event/EventTapOnPreview.java
rc/com/android/camera/captureintent/event/EventTapOnRetakePhotoButton.java
rc/com/android/camera/captureintent/event/EventTapOnShutterButton.java
rc/com/android/camera/captureintent/event/EventTapOnSwitchCameraButton.java
rc/com/android/camera/captureintent/event/EventZoomRatioChanged.java
rc/com/android/camera/captureintent/state/Event.java
rc/com/android/camera/captureintent/state/ResourceCaptureTools.java
rc/com/android/camera/captureintent/state/ResourceConstructed.java
rc/com/android/camera/captureintent/state/ResourceOpenedCamera.java
rc/com/android/camera/captureintent/state/ResourceSurfaceTexture.java
rc/com/android/camera/captureintent/state/State.java
rc/com/android/camera/captureintent/state/StateBackground.java
rc/com/android/camera/captureintent/state/StateForeground.java
rc/com/android/camera/captureintent/state/StateForegroundWithSurfaceTexture.java
rc/com/android/camera/captureintent/state/StateMachine.java
rc/com/android/camera/captureintent/state/StateOpeningCamera.java
rc/com/android/camera/captureintent/state/StateReadyForCapture.java
rc/com/android/camera/captureintent/state/StateReviewingPicture.java
rc/com/android/camera/captureintent/state/StateStartingPreview.java
|
9d31043682f3ed17bce71145e02eb015561a04df |
25-Feb-2015 |
zafir <zafir@google.com> |
Merge "Adding reporting functionality using Feedback API for PhotoModule and CaptureModule when captured pictures don't save to the device." into ub-camera-haleakala
|
c35c29fc64bd7597fdf0f7d68d71047e5d46005a |
25-Feb-2015 |
Senpo Hu <senpo@google.com> |
Merge "[CaptureIntent] fix review image shift issue." into ub-camera-haleakala
|
83d86d3aad276b0c15bfc2767d27c9f0354a104d |
25-Feb-2015 |
Senpo Hu <senpo@google.com> |
[CaptureIntent] fix review image shift issue. Bug: 19510803 Change-Id: I817a00f6ed56311dbbf3e257ec23da6dc139ff14
rc/com/android/camera/captureintent/CaptureIntentModule.java
rc/com/android/camera/captureintent/CaptureIntentModuleUI.java
rc/com/android/camera/captureintent/state/StateReadyForCapture.java
rc/com/android/camera/captureintent/state/StateReviewingPicture.java
|
734122e8fe6c621a8510043839f05a0adff4c3a4 |
06-Feb-2015 |
zafir <zafir@google.com> |
Adding reporting functionality using Feedback API for PhotoModule and CaptureModule when captured pictures don't save to the device. Bug: 19231841 Change-Id: I7d66db1e4c273dc7ec082f40a80b349bd91a7e8b
es/values/strings.xml
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/MediaSaverImpl.java
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/Storage.java
rc/com/android/camera/exif/ExifInterface.java
rc/com/android/camera/one/v2/imagesaver/YuvImageBackendImageSaver.java
rc/com/android/camera/session/CaptureSessionImpl.java
rc/com/android/camera/session/PlaceholderManager.java
rc/com/android/camera/session/StackSaver.java
rc/com/android/camera/session/StackSaverImpl.java
rc/com/android/camera/util/CameraUtil.java
rc_pd/com/android/camera/util/GoogleHelpHelper.java
|
1353ff4af747ace3364843dc128e3dea180427bf |
25-Feb-2015 |
Andy Huibers <andyhuibers@google.com> |
Merge "Log API2 preview repeat failures." into ub-camera-haleakala
|
9b2e78294a9dc91e871b8363e521250efbc3a20a |
24-Feb-2015 |
Andy Huibers <andyhuibers@google.com> |
Log API2 preview repeat failures. Bug: 19061883 Change-Id: I45a361169e27bc22b5fe36f5d54810fe2abcf6e5
rc/com/android/camera/one/v2/ZslOneCameraFactory.java
rc/com/android/camera/one/v2/errorhandling/RepeatFailureDetector.java
rc_pd/com/google/common/logging/eventprotos.java
|
1d518e63212290741d66aaf34356bd3897bb609e |
24-Feb-2015 |
Senpo Hu <senpo@google.com> |
Fix preview transform issue when switching between back/front camera. Move preview related logic to StateStartingPreview. Add more documentation. Bug: 18726217 Change-Id: I839c243656daa40773da6631359b91808c2d98f8
rc/com/android/camera/captureintent/state/ResourceCaptureTools.java
rc/com/android/camera/captureintent/state/ResourceConstructed.java
rc/com/android/camera/captureintent/state/ResourceOpenedCamera.java
rc/com/android/camera/captureintent/state/ResourceSurfaceTexture.java
rc/com/android/camera/captureintent/state/StateForegroundWithSurfaceTexture.java
rc/com/android/camera/captureintent/state/StateOpeningCamera.java
rc/com/android/camera/captureintent/state/StateReadyForCapture.java
rc/com/android/camera/captureintent/state/StateReviewingPicture.java
rc/com/android/camera/captureintent/state/StateStartingPreview.java
|
10036f046819f3ce527eb9fad5133c2c2b3c16bc |
24-Feb-2015 |
Senpo Hu <senpo@google.com> |
Merge "Fix resource leak when CaptureIntentModule goes to StateBackground." into ub-camera-haleakala
|
80aed3c513dc6a6670e25ef6e11bc71ab6a2d9fd |
23-Feb-2015 |
Senpo Hu <senpo@google.com> |
Fix resource leak when CaptureIntentModule goes to StateBackground. Make RefCountBase more solid. Bug: 18726217 Change-Id: Ibb5d731f8891627e832d5961f0e736aaaaff7078
rc/com/android/camera/async/RefCountBase.java
rc/com/android/camera/captureintent/state/ResourceCaptureTools.java
rc/com/android/camera/captureintent/state/ResourceConstructed.java
rc/com/android/camera/captureintent/state/ResourceOpenedCamera.java
rc/com/android/camera/captureintent/state/ResourceSurfaceTexture.java
rc/com/android/camera/captureintent/state/StateBackground.java
rc/com/android/camera/captureintent/state/StateForeground.java
rc/com/android/camera/captureintent/state/StateForegroundWithSurfaceTexture.java
rc/com/android/camera/captureintent/state/StateOpeningCamera.java
rc/com/android/camera/captureintent/state/StateReadyForCapture.java
rc/com/android/camera/captureintent/state/StateReviewingPicture.java
rc/com/android/camera/captureintent/state/StateSavingPicture.java
rc/com/android/camera/captureintent/state/StateStartingPreview.java
rc/com/android/camera/one/v2/sharedimagereader/imagedistributor/ImageDistributorImpl.java
rc/com/android/camera/one/v2/sharedimagereader/imagedistributor/RefCountedImageProxy.java
|
64205841ceb7c0ada169497b0d21ce044b922b25 |
24-Feb-2015 |
Alan Newberger <alann@google.com> |
Merge "Make module scope prefix a static agent value" into ub-camera-haleakala
|
f2399a5148ec6f101e9e0b3f137d33b443b79b8c |
24-Feb-2015 |
Alan Newberger <alann@google.com> |
Make module scope prefix a static agent value This removes the multiple "PhotoModule" strings across the codebase and allows for retrieval of a module's string scope prefix as part of its static ModuleAgent properties rather than as a property of the module itself. Bug: 19482146 Change-Id: I2c36878dd070106149909f19f98bcae221b94012
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/CaptureModule.java
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/VideoModule.java
rc/com/android/camera/app/ModuleManager.java
rc/com/android/camera/captureintent/CaptureIntentConfig.java
rc/com/android/camera/captureintent/CaptureIntentModule.java
rc/com/android/camera/module/ModuleController.java
rc/com/android/camera/module/ModulesInfo.java
rc/com/android/camera/settings/AppUpgrader.java
rc/com/android/camera/settings/SettingsScopeNamespaces.java
|
b68886f8055aa22458bbe7009a617c45800eb2b1 |
24-Feb-2015 |
Puneet Lall <puneetl@google.com> |
Merge "Limit ZSL images to 100ms look-back" into ub-camera-haleakala
|
95dcd9ec6538be24cdfab90003708e4a3bd53081 |
24-Feb-2015 |
I-Jong Lin <ijonglin@google.com> |
Merge "Refactor PreviewTransform into CaptureModule" into ub-camera-haleakala
|
e121849f9a77b3a1e385b2aee382e0d66411fe40 |
23-Feb-2015 |
I-Jong Lin <ijonglin@google.com> |
Refactor PreviewTransform into CaptureModule Propogate the refactoring of the Preview Transformation into CaptureModule so that we can have consistent cross-module implementation. Stepping stone CL on the way to fix the aspect ratio. Bug: 19271661 Change-Id: Ib3e09ed0c4c5cef9e94bcd0f89228c1b2990f489
rc/com/android/camera/CaptureModule.java
|
01b4a1bb336aba3cc0648f964377ba7594c761fc |
24-Feb-2015 |
Alan Newberger <alann@google.com> |
Merge "Only copy preferences files on upgrade if they previously exist" into ub-camera-haleakala
|
8d0178ea8ea318e52dd8bd3ed5f3c8e697383304 |
23-Feb-2015 |
Alan Newberger <alann@google.com> |
Only copy preferences files on upgrade if they previously exist If no data exists in an old module format, there's no need to upgrade it. This is only a partial fix to the below bug, but will allow for fresh installs to work. Full fix requires all modules (or rather, their scope) to be created programmatically. Bug: 19482146 Change-Id: I50918eefc4ae9dcb472d2fc79cb1c5de710c5806
rc/com/android/camera/settings/AppUpgrader.java
|
f8d390731abd88cc86354b377e1cb8beab0561af |
21-Feb-2015 |
Senpo Hu <senpo@google.com> |
Introduce CaptureIntentSession and CaptureIntentSessionFactory. The capture intent module needs its own custom CaptureSession implementation. This also adds two new methods in CaptureSessionManager.SessionListener in order to allow CaptureIntentModule receive the thumbnail image and compressed picture data byte array. Bug: 18726217 Change-Id: If823846fa4f37d9fc7ee8becde7c95ed559b4200
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/captureintent/CaptureIntentModule.java
rc/com/android/camera/captureintent/CaptureIntentSession.java
rc/com/android/camera/captureintent/CaptureIntentSessionFactory.java
rc/com/android/camera/session/CaptureSessionManager.java
rc/com/android/camera/session/CaptureSessionManagerImpl.java
rc/com/android/camera/session/SessionNotifier.java
|
d1d87341f89058f0804a8577dcb0e0ebe1b08e56 |
23-Feb-2015 |
Puneet Lall <puneetl@google.com> |
Limit ZSL images to 100ms look-back Bug: 19244733 Change-Id: Ic537a627aeda3c32112c41d9de9026c93e277d85
rc/com/android/camera/one/v2/photo/ZslPictureTakerFactory.java
rc/com/android/camera/one/v2/photo/zsl/ZslImageCaptureCommand.java
|
5e45ec6f8d5bd986e4894ddd1e3e81faf90ad1c3 |
23-Feb-2015 |
Puneet Lall <puneetl@google.com> |
Fix log tags with length greater than 20 chars Change-Id: Ie7d3c0d47af1b53eba7015be4b958bd3f45599a1
rc/com/android/camera/one/v2/commands/CameraCommandExecutor.java
rc/com/android/camera/one/v2/errorhandling/RepeatFailureDetector.java
|
1909b45aa33ac03b53bfd7c431f27ab72475dcb2 |
23-Feb-2015 |
Puneet Lall <puneetl@google.com> |
Merge "Add metadata to ImageSaver interface" into ub-camera-haleakala
|
d0316626dd2c2f4bd37ac7a198dbfe9e0ce2277f |
20-Feb-2015 |
Puneet Lall <puneetl@google.com> |
Add metadata to ImageSaver interface ImageSavers are now provided with a future to metadata (TotalCaptureResult) for full-size images. This change also implements a proper .equals() and .hashCode() for ImageProxy. Bug: 19443252 Change-Id: I16aec5edcd7ad64ea71e457d1de7976fc7e27c72
rc/com/android/camera/one/v2/camera2proxy/AndroidImageProxy.java
rc/com/android/camera/one/v2/camera2proxy/ForwardingImageProxy.java
rc/com/android/camera/one/v2/camera2proxy/ImageProxy.java
rc/com/android/camera/one/v2/imagesaver/ImageSaver.java
rc/com/android/camera/one/v2/imagesaver/JpegImageBackendImageSaver.java
rc/com/android/camera/one/v2/imagesaver/MostRecentImageSaver.java
rc/com/android/camera/one/v2/imagesaver/SingleImageSaver.java
rc/com/android/camera/one/v2/imagesaver/YuvImageBackendImageSaver.java
rc/com/android/camera/one/v2/photo/ConvergedImageCaptureCommand.java
rc/com/android/camera/one/v2/photo/MetadataFuture.java
rc/com/android/camera/one/v2/photo/SimpleImageCaptureCommand.java
rc/com/android/camera/one/v2/photo/zsl/ZslImageCaptureCommand.java
|
48f55e7456b422eff516da320c0fb7cbd4dbfb55 |
23-Feb-2015 |
Geoff Mendal <mendal@google.com> |
Import translations. DO NOT MERGE Change-Id: Ic2953c2453b7327c6092b4c4fa15f97c33048d42 Auto-generated-cl: translation import
es/values-am/strings.xml
es/values-fr/strings.xml
|
24f3bd8d691f73aa57a2cbd84cc3ee0b4ef37f47 |
23-Feb-2015 |
Geoff Mendal <mendal@google.com> |
Import translations. DO NOT MERGE Change-Id: I3afef572387842129ff5a99995e9292882d26ece Auto-generated-cl: translation import
es/values-am/strings.xml
es/values-fr/strings.xml
|
44167c98e7848b60a539cf31bac3eaabb3086161 |
21-Feb-2015 |
Alan Newberger <alann@google.com> |
Merge "Reduce memory footprint of session bitmap cache." into ub-camera-haleakala
|
995083b53be47e1e27133e403da0b63a03d07ea7 |
20-Feb-2015 |
Alan Newberger <alann@google.com> |
Reduce memory footprint of session bitmap cache. Convert storage bitmap cache to an LRU cache to have a fixed upper bound on usage. Evict bitmaps after a session is complete. Bug: 19124117 Change-Id: I4a5dd9f15c3b986601c4a92477edf9346f190de1
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/Storage.java
rc/com/android/camera/data/PhotoItem.java
rc/com/android/camera/data/SessionItem.java
rc/com/android/camera/session/CaptureSession.java
rc/com/android/camera/session/CaptureSessionImpl.java
rc/com/android/camera/session/CaptureSessionManager.java
rc/com/android/camera/session/CaptureSessionManagerImpl.java
rc/com/android/camera/session/PlaceholderManager.java
rc/com/android/camera/session/SessionNotifier.java
|
8f51086c8177056345de996963515c4bd3415254 |
19-Feb-2015 |
Sascha Haeberling <haeberling@google.com> |
Centralize logic for Camera API feature determination. Bug: 19179276 This captures camera capabilities in a centralized class and allows them to be overridden by GServices in the field or using adb. Since this is not it's own class it would be trivial to create another instance for testing and pass that into CameraActivity or even to change these values using a UI before the actual Activity is started. Change-Id: I74262c8467f631c7b5e42b02d269d5f401d4e9e7
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/CaptureModule.java
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/VideoModule.java
rc/com/android/camera/app/AppController.java
rc/com/android/camera/app/CameraApp.java
rc/com/android/camera/app/CameraController.java
rc/com/android/camera/app/MemoryManagerImpl.java
rc/com/android/camera/burst/BurstFacadeFactory.java
rc/com/android/camera/debug/DebugPropertyHelper.java
rc/com/android/camera/hardware/HardwareSpecImpl.java
rc/com/android/camera/module/ModulesInfo.java
rc/com/android/camera/one/OneCameraManager.java
rc/com/android/camera/one/config/OneCameraFeatureConfig.java
rc/com/android/camera/one/config/OneCameraFeatureConfigCreator.java
rc/com/android/camera/one/v2/OneCameraFactory.java
rc/com/android/camera/one/v2/OneCameraManagerImpl.java
rc/com/android/camera/one/v2/SimpleOneCameraFactory.java
rc/com/android/camera/one/v2/ZslOneCameraFactory.java
rc/com/android/camera/util/ApiHelper.java
rc_pd/com/android/camera/burst/BurstControllerImpl.java
rc_pd/com/android/camera/one/v2/OneCameraCreator.java
rc_pd/com/android/camera/util/GservicesHelper.java
rc_pd_gcam/com/android/camera/util/GcamHelper.java
|
e17a39b6bef8264956e48d7dbf7139fbe738dbe2 |
21-Feb-2015 |
Senpo Hu <senpo@google.com> |
Merge "Assign an initial state for the state machine." into ub-camera-haleakala
|
4908a11eefa7f69129891bc9859029d6b2504efa |
21-Feb-2015 |
Senpo Hu <senpo@google.com> |
Assign an initial state for the state machine. Bug: 18726217 Change-Id: I357a0565697ee7e7ec0473b8906362fc63d79c4f
rc/com/android/camera/captureintent/state/State.java
rc/com/android/camera/captureintent/state/StateMachine.java
|
4974105403bee9b2de0e5d59c86bb50e505409cf |
21-Feb-2015 |
Paul Rohde <codelogic@google.com> |
Merge "HDR Scene mode support for CaptureModule." into ub-camera-haleakala
|
f82fe68f0481ce569ad3870f298586dc46aafc2a |
21-Feb-2015 |
Senpo Hu <senpo@google.com> |
Merge "Instantiate CaptureIntentModule in ModulesInfo." into ub-camera-haleakala
|
01e482a30cca945821e9a0c9ab927d66d34b2ac5 |
21-Feb-2015 |
Senpo Hu <senpo@google.com> |
Instantiate CaptureIntentModule in ModulesInfo. Bug: 18726217 Change-Id: I93397322843a7b1258b881e19ae90a7f6fb55e3b
es/values-v21/arrays.xml
es/values/arrays.xml
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/app/ModuleManager.java
rc/com/android/camera/module/ModulesInfo.java
rc/com/android/camera/settings/AppUpgrader.java
|
0db8a2fd5cc02753d42f34a1c858b980c6c277bb |
20-Feb-2015 |
Paul Rohde <codelogic@google.com> |
HDR Scene mode support for CaptureModule. Bug: 18622877 N4 HDR Scene support. Bug: 19269257 HDR+ flash setting persistance. Change-Id: Ibac3d6513a1e14d8a2ffaf6208509133d31a8fb8
rc/com/android/camera/CaptureModule.java
rc/com/android/camera/one/AbstractOneCamera.java
rc/com/android/camera/one/OneCamera.java
rc/com/android/camera/one/OneCameraCharacteristics.java
rc/com/android/camera/one/v1/OneCameraCharacteristicsImpl.java
rc/com/android/camera/one/v2/OneCameraCharacteristicsImpl.java
rc/com/android/camera/one/v2/OneCameraFactory.java
rc/com/android/camera/one/v2/SimpleOneCameraFactory.java
rc/com/android/camera/one/v2/ZslOneCameraFactory.java
rc/com/android/camera/one/v2/common/BasicCameraFactory.java
rc/com/android/camera/one/v2/common/FlashBasedAEMode.java
rc/com/android/camera/one/v2/common/HdrSettingBasedSceneMode.java
rc/com/android/camera/one/v2/initialization/InitializedOneCameraFactory.java
|
abe810e55965009846e23e0ea631b6f9f32dd452 |
21-Feb-2015 |
Puneet Lall <puneetl@google.com> |
Fix build breakage due to incorrect import Change-Id: I2c13c343fd83d97e3205510fd4634ae0b941cf14
rc/com/android/camera/one/v2/commands/CameraCommandExecutor.java
|
56ca4d2ba87f0d9fc97d9e9f15a1ae0f0ed7586b |
21-Feb-2015 |
Senpo Hu <senpo@google.com> |
Merge "Introduce CaptureIntentModule" into ub-camera-haleakala
|
1893a030b6b68feb859f99900fc13e5e79e539ae |
21-Feb-2015 |
Puneet Lall <puneetl@google.com> |
Merge "Reset the camera after detecting repeated failure" into ub-camera-haleakala
|
24be7cc6d138129b4087ef28f114701de54aba3c |
19-Feb-2015 |
Senpo Hu <senpo@google.com> |
Introduce CaptureIntentModule Continue with ag/618042. =================== Improve the UX by adopting ZSL and showing fast intermediate thumbnail. Try to implement this from scratch, this module has an event driven and state machine design. * the state machine is thread safe. * Event is implemented with guava's Function. * The event processing uses Strategy pattern. State Machine Chart: https://docs.google.com/presentation/d/1LA30__ZNnzO6HWju1kA0geJ5LBsMs3hvdTf6_IPn9Y0/edit#slide=id.p Bug: 18726217 Change-Id: Ie869c84bfe2f02145e5cb5c9e9af270fd82048d6
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/app/AppController.java
rc/com/android/camera/app/OrientationManager.java
rc/com/android/camera/app/OrientationManagerImpl.java
rc/com/android/camera/async/RefCountBase.java
rc/com/android/camera/burst/BurstFacadeFactory.java
rc/com/android/camera/captureintent/CaptureIntentConfig.java
rc/com/android/camera/captureintent/CaptureIntentModule.java
rc/com/android/camera/captureintent/CaptureIntentModuleUI.java
rc/com/android/camera/captureintent/PreviewTransformCalculator.java
rc/com/android/camera/captureintent/state/Event.java
rc/com/android/camera/captureintent/state/ResourceCaptureTools.java
rc/com/android/camera/captureintent/state/ResourceConstructed.java
rc/com/android/camera/captureintent/state/ResourceOpenedCamera.java
rc/com/android/camera/captureintent/state/ResourceSurfaceTexture.java
rc/com/android/camera/captureintent/state/State.java
rc/com/android/camera/captureintent/state/StateBackground.java
rc/com/android/camera/captureintent/state/StateFatal.java
rc/com/android/camera/captureintent/state/StateForeground.java
rc/com/android/camera/captureintent/state/StateForegroundWithSurfaceTexture.java
rc/com/android/camera/captureintent/state/StateIntentCompleted.java
rc/com/android/camera/captureintent/state/StateMachine.java
rc/com/android/camera/captureintent/state/StateOpeningCamera.java
rc/com/android/camera/captureintent/state/StateReadyForCapture.java
rc/com/android/camera/captureintent/state/StateReviewingPicture.java
rc/com/android/camera/captureintent/state/StateSavingPicture.java
rc/com/android/camera/captureintent/state/StateStartingPreview.java
rc/com/android/camera/settings/CameraFacingSetting.java
rc/com/android/camera/settings/ResolutionSetting.java
|
6645855f2f0989254e2edf72f330e2d30dcef564 |
20-Feb-2015 |
Senpo Hu <senpo@google.com> |
Merge "Add captureintent.PictureDecoder." into ub-camera-haleakala
|
fff20fbff842da0deb6d314071742119592c5b47 |
20-Feb-2015 |
Senpo Hu <senpo@google.com> |
Merge "Move resources allocation in CameraActivity to the front in onCreateTasks." into ub-camera-haleakala
|
7486e9b01d635bafd9e36b8aebf088f42637d64e |
20-Feb-2015 |
Senpo Hu <senpo@google.com> |
Move resources allocation in CameraActivity to the front in onCreateTasks. The new capture intent module requires several resource in its constructor. This CL addresses the need. Bug: 18726217 Change-Id: Ic2c0966151b58b23b4ac4be882067bf9362177f7
rc/com/android/camera/CameraActivity.java
|
00a764a3b6d9072413d18b441c759d4a604223b4 |
20-Feb-2015 |
Senpo Hu <senpo@google.com> |
Add captureintent.PictureDecoder. Extract the logic from PhotoModule so it be reused by the new capture intent module. Bug: 18726217 Change-Id: I7c3b2f6f556dd40bbc02d0624117bf4675e85a02
rc/com/android/camera/PhotoUI.java
rc/com/android/camera/captureintent/PictureDecoder.java
rc/com/android/camera/util/CameraUtil.java
|
c3b6ca1d07a73274be8917c1d051122f9f36eb3b |
20-Feb-2015 |
Paul Rohde <codelogic@google.com> |
Merge "Remove CanSwipeInFullScreen attribute." into ub-camera-haleakala
|
270990a7e3fcd1cf71b652c9ad1cc46598ddf4b3 |
19-Feb-2015 |
Puneet Lall <puneetl@google.com> |
Reset the camera after detecting repeated failure Bug: 19061883 Change-Id: I913334e19fc248010bdeb2dab4ae1a6d05427f40
rc/com/android/camera/one/v2/SimpleOneCameraFactory.java
rc/com/android/camera/one/v2/ZslOneCameraFactory.java
rc/com/android/camera/one/v2/autofocus/ManualAutoFocusFactory.java
rc/com/android/camera/one/v2/camera2proxy/AndroidCameraCaptureSessionProxy.java
rc/com/android/camera/one/v2/camera2proxy/AndroidCameraDeviceProxy.java
rc/com/android/camera/one/v2/camera2proxy/CameraDeviceProxy.java
rc/com/android/camera/one/v2/commands/CameraCommandExecutor.java
rc/com/android/camera/one/v2/common/BasicCameraFactory.java
rc/com/android/camera/one/v2/core/ResponseListener.java
rc/com/android/camera/one/v2/core/TagDispatchCaptureSession.java
rc/com/android/camera/one/v2/errorhandling/RepeatFailureDetector.java
rc/com/android/camera/util/Provider.java
|
f0ff1a9aa44d04f680af7cec8b97c3b01d3e76bd |
18-Feb-2015 |
Sascha Haeberling <haeberling@google.com> |
Refactors the CaptureSession API by splitting out notifier interface. This will remove the need to pass in an *Impl instead of an interface and will therefore make the capture intent refactor cleaner as well. Change-Id: I4d3b272e9cde1548c8ef1ad235a31bf420fe4f74
rc/com/android/camera/session/CaptureSessionFactory.java
rc/com/android/camera/session/CaptureSessionFactoryImpl.java
rc/com/android/camera/session/CaptureSessionImpl.java
rc/com/android/camera/session/CaptureSessionManager.java
rc/com/android/camera/session/CaptureSessionManagerImpl.java
rc/com/android/camera/session/SessionNotifier.java
|
b6a8810b7a5ac0df1e19efd26628c01bcb32b97b |
19-Feb-2015 |
Paul Rohde <codelogic@google.com> |
Remove CanSwipeInFullScreen attribute. This fixes the swipe guesture problem by removing the mostly unused canSwipeInFullScreen attribute on filmstrip items and checking existing usages to ensure they still work. Bug: 18948437 Change-Id: I7d8c9fba4b0cf3db6fc3d60afe37d527c0732318
rc/com/android/camera/data/CameraFilmstripDataAdapter.java
rc/com/android/camera/data/FilmstripItemAttributes.java
rc/com/android/camera/data/FixedFirstProxyAdapter.java
rc/com/android/camera/data/FixedLastProxyAdapter.java
rc/com/android/camera/data/PhotoItem.java
rc/com/android/camera/data/PlaceholderItem.java
rc/com/android/camera/data/VideoItem.java
rc/com/android/camera/filmstrip/FilmstripDataAdapter.java
rc/com/android/camera/widget/FilmstripView.java
|
90b584400dc5d7535de84f6a2601e3d3e6825764 |
19-Feb-2015 |
Paul Rohde <codelogic@google.com> |
Merge "Lock opacity of filmstrip items at 100% when scaling." into ub-camera-haleakala
|
83b241e447a2b1a6da8fc2f4f40ac2ae3bcf4152 |
19-Feb-2015 |
Paul Rohde <codelogic@google.com> |
Fix accidental import. Change-Id: Ia6bb08c1d1c690510faf1b8fd45b128685908821
rc/com/android/camera/CaptureModule.java
|
d34df829eba68c977ef4c77e3f6830fbbc8d01bf |
21-Jan-2015 |
Paul Rohde <codelogic@google.com> |
Create log and guard profilers. Change-Id: I824e0f65be05e3681189802610656955ba14d5bf
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/CaptureModule.java
rc/com/android/camera/app/CameraApp.java
rc/com/android/camera/app/FirstRunDetector.java
rc/com/android/camera/stats/profiler/GuardingProfile.java
rc/com/android/camera/stats/profiler/GuardingProfiler.java
rc/com/android/camera/stats/profiler/LoggingProfile.java
rc/com/android/camera/stats/profiler/LoggingProfiler.java
rc/com/android/camera/stats/profiler/Profile.java
rc/com/android/camera/stats/profiler/ProfileBase.java
rc/com/android/camera/stats/profiler/Profiler.java
rc/com/android/camera/stats/profiler/Profilers.java
rc/com/android/camera/stats/profiler/Writer.java
|
e7263f7ea45cf31d3948984ba8514e03ef86627e |
19-Feb-2015 |
Paul Rohde <codelogic@google.com> |
Lock opacity of filmstrip items at 100% when scaling. Bug: 19252309 Change-Id: Ia82714649e7fac7b1cce2adc21c36832e055f9f6
rc/com/android/camera/widget/FilmstripView.java
|
c8cca7c35be948ff906dd2650709aa57e6d1a689 |
19-Feb-2015 |
Alan Newberger <alann@google.com> |
Merge "Add black buttonTint to checkbox" into ub-camera-haleakala
|
025b23f1dd9bd2dc92db4b42d67026e154d11aaf |
19-Feb-2015 |
Senpo Hu <senpo@google.com> |
Merge "Introduce CaptureSessionFactory interface." into ub-camera-haleakala
|
7aea01c423c0303d71c44d05184d61eb16fec8d8 |
18-Feb-2015 |
Alan Newberger <alann@google.com> |
Add black buttonTint to checkbox For API 21, add a black button tint to the checkbox to ensure it paints black against the current light blue background. Bug: 19083903 Change-Id: Ifdd4ddf39bcd379b5761e3d2dacb3963967fd9eb
es/layout-land/location_dialog_content.xml
es/layout-port/location_dialog_content.xml
es/values-v21/styles.xml
es/values/styles.xml
|
b20ba94a5df96aef8857fbed18e93ca0a1a2b754 |
18-Feb-2015 |
Paul Rohde <codelogic@google.com> |
Fix location of PreviewSizeSelector. Change-Id: I7645ef27e46e5652a427a2a19ab9df8a3055cb40
rc/com/android/camera/one/PreviewSizeSelector.java
rc/com/android/camera/one/v2/PreviewSizeSelector.java
|
251c60cbdfc6b221510a43dd25543ea16f9f582b |
17-Feb-2015 |
Puneet Lall <puneetl@google.com> |
Disable AE precapture trigger when flash is off Bug: 19407066 Change-Id: I9d5ec0271510fe6ff5615767fc3523ba5e287bc3
rc/com/android/camera/one/v2/SimpleOneCameraFactory.java
rc/com/android/camera/one/v2/photo/ConvergedImageCaptureCommand.java
rc/com/android/camera/one/v2/photo/PictureTakerFactory.java
rc/com/android/camera/one/v2/photo/ZslPictureTakerFactory.java
|
6dabcd78a044233c1f308611e6209aa8371e3295 |
18-Feb-2015 |
Sascha Haeberling <haeberling@google.com> |
Merge "Make sure shutter button is inactive before the preview was started." into ub-camera-haleakala
|
8ad02daf72adbc700743d2c949558acbd4f4233d |
18-Feb-2015 |
Paul Rohde <codelogic@google.com> |
Merge "Add a PreviewSizeSelector interface." into ub-camera-haleakala
|
249b796a6be8eb0761faa8d59ca8840919f5d734 |
18-Feb-2015 |
Puneet Lall <puneetl@google.com> |
Merge "Fix resource leak" into ub-camera-haleakala
|
da9d37d2fcc37e071fb2cab15bbc2b860d443347 |
18-Feb-2015 |
Puneet Lall <puneetl@google.com> |
Fix resource leak Bug: 19407130 Change-Id: Ia08013c1240a2e3e4b9a55d0a08be06d3f4f91b3
rc/com/android/camera/one/v2/sharedimagereader/imagedistributor/ImageDistributorFactory.java
|
9b0205056c30372f8e3fae2a67b20f238319f503 |
18-Feb-2015 |
Andy Huibers <andyhuibers@google.com> |
Make sure ringer/sound silencing does not interfere with recording start and stop sounds. Bug: 19210666 Change-Id: I16b3cb4df62b05903ad53044ac66d69efffb5f74
rc/com/android/camera/VideoModule.java
|
6ba8eeea4758e29318c615e978c63599c30438b4 |
18-Feb-2015 |
Paul Rohde <codelogic@google.com> |
Add a PreviewSizeSelector interface. This removes the required context object for the utility objects in both CameraUtil and CaptureModuleUtil. Adding an interface for PreviewSizeSelection clears the way for future work to move the preview size selection code into a dedicated class and to have api specific versions of preview selection code for startup speed improvements. Change-Id: I92e58dad23b08057eb10984c31d04947a376ac6d
rc/com/android/camera/CaptureModuleUtil.java
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/VideoModule.java
rc/com/android/camera/one/v2/OneCameraImpl.java
rc/com/android/camera/one/v2/OneCameraZslImpl.java
rc/com/android/camera/one/v2/PreviewSizeSelector.java
rc/com/android/camera/one/v2/initialization/Camera2PreviewSizeSelector.java
rc/com/android/camera/one/v2/initialization/GenericOneCameraImpl.java
rc/com/android/camera/one/v2/initialization/InitializedOneCameraFactory.java
rc/com/android/camera/one/v2/initialization/PreviewSizeSelector.java
rc/com/android/camera/util/CameraUtil.java
|
71332e70c750948343a93600aa68ebd6fc43ad68 |
18-Feb-2015 |
Paul Rohde <codelogic@google.com> |
Merge "Fix NaN in LinearScale" into ub-camera-haleakala
|
5c401f50563dde4ea3d28fd37bd396abf93b2a5c |
18-Feb-2015 |
Paul Rohde <codelogic@google.com> |
Fix NaN in LinearScale Change-Id: Ie3cc20f713940aba7426ce54dbb2fad32cda45bf
rc/com/android/camera/ui/motion/LinearScale.java
|
6a7c7722d1eb49418b8ee02df0018f03719a8c61 |
13-Feb-2015 |
I-Jong Lin <ijonglin@google.com> |
N4 Capture Module Rotation/EXIF fix Finally, have some understanding what values are supposed to be passed to the session vs. what are supposed to be put in the EXIF flags. Although they are similar, they are used for slightly different purposes. This CL has been tested on both N5 and N4 and seems to give filmstrip behavior and forwards the correct EXIF values. Bug: 19378973 Change-Id: Ie8b41b6d8e03e0a5392da8f0e7b52f65383b4e4f
rc/com/android/camera/processing/imagebackend/TaskCompressImageToJpeg.java
|
5fb629902527b7c688358ece3ef1f181322fc2ab |
17-Feb-2015 |
Senpo Hu <senpo@google.com> |
Introduce CaptureSessionFactory interface. Currently CaptureSessionManagerImpl always creates CaptureSessionImpl. However, the capture intent module needs a mechanism to create its custom CaptureSession objects. Bug: 18726217 Change-Id: I30b3e01dc27f7c5f14d783c83bcdab76e823f0a6
rc/com/android/camera/app/CameraServicesImpl.java
rc/com/android/camera/session/CaptureSessionFactory.java
rc/com/android/camera/session/CaptureSessionFactoryImpl.java
rc/com/android/camera/session/CaptureSessionManager.java
rc/com/android/camera/session/CaptureSessionManagerImpl.java
|
160293ecf8e17d418e6ac0b2bd49470f5e8052b3 |
17-Feb-2015 |
Sascha Haeberling <haeberling@google.com> |
Merge "Allow for the thumbnail to be updated and refreshed." into ub-camera-haleakala
|
01369b2e64f347f4425286ac5f4762db97b490cb |
17-Feb-2015 |
Sascha Haeberling <haeberling@google.com> |
Merge "Add method to detect L MR1 or higher for NPF compatability." into ub-camera-haleakala
|
a8c7362bad737952f671cc6b26f12209c8a514a5 |
17-Feb-2015 |
Sascha Haeberling <haeberling@google.com> |
Add method to detect L MR1 or higher for NPF compatability. Bug: 1939424: Change-Id: I60470e4ddfa81004db6f3efe4ea470f89579baa5
rc/com/android/camera/util/ApiHelper.java
|
b6c4a314d0a0a185e6d987298ef9b7f4db8a6a2f |
11-Feb-2015 |
Senpo Hu <senpo@google.com> |
Enable exposure compensation in CaptureModule. * Expose camera exposure compensation capabilities in OneCameraCharacteristics. * Turn off exposure compensation on Nexus 6 (API level 21). Bug: 18523154 Change-Id: I551f19945f5a64a09a76b3a0777664d16a9b2ba2
rc/com/android/camera/CaptureModule.java
rc/com/android/camera/app/CameraAppUI.java
rc/com/android/camera/one/OneCameraCharacteristics.java
rc/com/android/camera/one/v1/OneCameraCharacteristicsImpl.java
rc/com/android/camera/one/v2/OneCameraCharacteristicsImpl.java
rc/com/android/camera/one/v2/OneCameraFactory.java
rc/com/android/camera/one/v2/SimpleOneCameraFactory.java
rc/com/android/camera/one/v2/ZslOneCameraFactory.java
rc/com/android/camera/one/v2/common/BasicCameraFactory.java
rc/com/android/camera/util/ApiHelper.java
rc/com/android/camera/widget/ModeOptions.java
rc/com/android/camera/widget/ModeOptionsOverlay.java
|
401990916915791be14c65694ce3507eac3ec82d |
17-Feb-2015 |
Paul Rohde <codelogic@google.com> |
Merge "Read focus range from CameraCharacteristics." into ub-camera-haleakala
|
636bce5ed9771df424a5ca46586648a11018179b |
14-Feb-2015 |
Sascha Haeberling <haeberling@google.com> |
Allow for the thumbnail to be updated and refreshed. Bug: 19325176 Change-Id: Icc0f08b4c8b20e1b6d3e66fa420efea9e24faf73
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/session/CaptureSession.java
rc/com/android/camera/session/CaptureSessionImpl.java
rc/com/android/camera/session/CaptureSessionManager.java
rc/com/android/camera/session/CaptureSessionManagerImpl.java
|
1226e43679d40427257e280c50cbdd4c83c8db00 |
13-Feb-2015 |
Puneet Lall <puneetl@google.com> |
Merge "Fix bug in which exposure and AE settings were not applied to AF scans" into ub-camera-haleakala
|
3bfc4b9613c758e3852e147cd9910231c5637adf |
13-Feb-2015 |
Puneet Lall <puneetl@google.com> |
Fix bug in which exposure and AE settings were not applied to AF scans Change-Id: I2b495bab4221f231835219173edade26f3e4e896
rc/com/android/camera/one/v2/autofocus/ManualAutoFocusFactory.java
rc/com/android/camera/one/v2/common/BasicCameraFactory.java
|
ec980898dd0dc712a3d6373c06a13f8646a0eebc |
13-Feb-2015 |
Alan Newberger <alann@google.com> |
Remove flicker from view items added to hierarchy as visible With view items made visible right when added to hierarchy, under certain use cases the view would then get drawn before layout puts them offscreen and turns visibility off again. One example is delete -- once a deletion drag finishes, a view is added to the end of the 5-item array set to visible, and when dragging would briefly get shown. This CL ensures views only become visible when properly positioned. Bug: 17905863 Change-Id: I860dbee421f5bf6acb3cd9f5c09e4130eb9bc3c9
rc/com/android/camera/widget/FilmstripView.java
|
7a72d72e97fe280fd88127b7891efe9112bcaeac |
12-Feb-2015 |
I-Jong Lin <ijonglin@google.com> |
N4 CaptureModule Memory Optimization Although functionally correct, there was some processing that was wasteful of memory in N4 Capture Module. The two major culprits are the implicit full-size JPEG decoding for the thumbnail, and using the capacity (instead of the limit) of the byte buffers when making a memory copy of the JPEG data. Fixes include a explicit subsample value for thumbnail and a tighter memory allocation based on the limit. Bug: 19354120 Change-Id: Ibd94c30974753e426254ac002e795b5d1de8bcba
rc/com/android/camera/one/v2/imagesaver/JpegImageBackendImageSaver.java
rc/com/android/camera/processing/imagebackend/TaskCompressImageToJpeg.java
|
f5ac3fc48062243e6fb419ca39b5cd42d4543965 |
13-Feb-2015 |
Narayan Kamath <narayan@google.com> |
Add an explicit dependency on org.apache.http.legacy. bug: 18027885 Change-Id: I94b14450807bdad2153078ac9a800863acf3177d
ndroid.mk
|
718c88615444f2b9e68f27dd51b46eb740d1aaff |
13-Feb-2015 |
Sascha Haeberling <haeberling@google.com> |
Merge "Route all thumbnail updates through CaptureSession" into ub-camera-haleakala
|
38c9024c9f7094ea454fb56081c6142ecb85272c |
13-Feb-2015 |
Geoff Mendal <mendal@google.com> |
am b87c7f22: (-s ours) am fe4cb0e6: (-s ours) Import translations. DO NOT MERGE * commit 'b87c7f22b5e494afe6896931f23335c7de293352': Import translations. DO NOT MERGE
|
b87c7f22b5e494afe6896931f23335c7de293352 |
13-Feb-2015 |
Geoff Mendal <mendal@google.com> |
am fe4cb0e6: (-s ours) Import translations. DO NOT MERGE * commit 'fe4cb0e6f2845e88b4d909bc240b135bf05a910b': Import translations. DO NOT MERGE
|
fe4cb0e6f2845e88b4d909bc240b135bf05a910b |
13-Feb-2015 |
Geoff Mendal <mendal@google.com> |
Import translations. DO NOT MERGE Change-Id: Id44efe2fd9c5b7fe3f98a7ff5c9b384d78b1b8be Auto-generated-cl: translation import
es/values-ar/strings.xml
es/values-bn-rBD/strings.xml
es/values-cs/strings.xml
es/values-el/strings.xml
es/values-es/strings.xml
es/values-eu-rES/strings.xml
es/values-fr/strings.xml
es/values-gl-rES/strings.xml
es/values-hi/strings.xml
es/values-is-rIS/strings.xml
es/values-ja/strings.xml
es/values-kk-rKZ/strings.xml
es/values-km-rKH/strings.xml
es/values-kn-rIN/strings.xml
es/values-ky-rKG/strings.xml
es/values-mk-rMK/strings.xml
es/values-ml-rIN/strings.xml
es/values-mr-rIN/strings.xml
es/values-my-rMM/strings.xml
es/values-ne-rNP/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-si-rLK/strings.xml
es/values-sk/strings.xml
es/values-ta-rIN/strings.xml
es/values-te-rIN/strings.xml
es/values-ur-rPK/strings.xml
es/values-uz-rUZ/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
|
660550fea5aec2c1131c7f5d15bd679a48196b60 |
13-Feb-2015 |
Andy Huibers <andyhuibers@google.com> |
Merge "Simplify double onResume workaround and allow different delays for secure and non secure lock screen." into ub-camera-haleakala
|
9fc67f9d5c7a31e828e52f4621054dd9ac170826 |
13-Feb-2015 |
Shashi Shekhar <shashishekhar@google.com> |
Merge "Fix setting surface texture." into ub-camera-haleakala
|
75c8abdce334f195fb6a1423495fe9d20e5139bd |
12-Feb-2015 |
Shashi Shekhar <shashishekhar@google.com> |
Fix setting surface texture. Related to removal of FrameDistributor in http://ag/616209 BUG: 19368123 Change-Id: Ie49c5303db72d457493d7967ec2ee5e8638e1956
rc/com/android/camera/CaptureModule.java
|
6dd5840e86bffecba8a7f52327b9c1085caeb7d2 |
10-Feb-2015 |
Sascha Haeberling <haeberling@google.com> |
Route all thumbnail updates through CaptureSession Bug: 19326495 Bug: 19310525 This removes the thumbnail ready callback that was hooked directly into the ImageBackend from the CaptureModule before since it's now unnecessary. Client of CaptureSession can no optionally specify whether the updated thumbnail is to be used to update the capture indicator. Default is 'yes' so that Lens Blur, Photo Sphere and HDR+ don't need to change. Change-Id: I94adb50f875ccee214492f03f00ed2a67d400da1
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/CaptureModule.java
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/one/OneCamera.java
rc/com/android/camera/one/v2/imagesaver/JpegImageBackendImageSaver.java
rc/com/android/camera/one/v2/imagesaver/YuvImageBackendImageSaver.java
rc/com/android/camera/session/CaptureSession.java
rc/com/android/camera/session/CaptureSessionImpl.java
rc/com/android/camera/session/CaptureSessionManager.java
rc/com/android/camera/session/CaptureSessionManagerImpl.java
|
55c5150ff358665f3dc3f1a22b6d6c5c5b1ef034 |
12-Feb-2015 |
Andy Huibers <andyhuibers@google.com> |
Simplify double onResume workaround and allow different delays for secure and non secure lock screen. Bug: 17925205 Change-Id: Ia7cf1d3e134cb7aa725fdeed71235825969d0f89
rc/com/android/camera/util/QuickActivity.java
|
3abe513d381dd8d8fb67b6e1f3ad10396762dd40 |
12-Feb-2015 |
Neil Fuller <nfuller@google.com> |
am 50c8fe9b: am 6bd9d6cb: Merge "Remove additional dependencies on FloatMath" * commit '50c8fe9b7cadf48338e71fc4a5682ba9ec076bb2': Remove additional dependencies on FloatMath
|
aca904e29aea542b6e6a4fcc837759a57a270a49 |
12-Feb-2015 |
Paul Rohde <codelogic@google.com> |
Read focus range from CameraCharacteristics. - Remove hardcoded focus range values. - Explicitly provide a lens range and range checks. Bug: 19356651 Change-Id: Ied2513b5a654a00af07e76a66e72aac50ffc9c42
rc/com/android/camera/one/OneCamera.java
rc/com/android/camera/one/OneCameraCharacteristics.java
rc/com/android/camera/one/v1/OneCameraCharacteristicsImpl.java
rc/com/android/camera/one/v2/OneCameraCharacteristicsImpl.java
rc/com/android/camera/one/v2/OneCameraImpl.java
rc/com/android/camera/one/v2/OneCameraZslImpl.java
rc/com/android/camera/one/v2/SimpleOneCameraFactory.java
rc/com/android/camera/one/v2/ZslOneCameraFactory.java
rc/com/android/camera/one/v2/initialization/GenericOneCameraImpl.java
rc/com/android/camera/one/v2/initialization/InitializedOneCameraFactory.java
rc/com/android/camera/ui/focus/FocusController.java
rc/com/android/camera/ui/focus/LensRangeCalculator.java
rc/com/android/camera/ui/motion/LinearScale.java
|
50c8fe9b7cadf48338e71fc4a5682ba9ec076bb2 |
12-Feb-2015 |
Neil Fuller <nfuller@google.com> |
am 6bd9d6cb: Merge "Remove additional dependencies on FloatMath" * commit '6bd9d6cbf53f07e4ea0455d9125ddd2a2ae8b6a1': Remove additional dependencies on FloatMath
|
5a49a792186082177ba00eff6d381927e056d258 |
12-Feb-2015 |
I-Jong Lin <ijonglin@google.com> |
N4 Shutter Regression Fix The fix to allow the OnCameraAvailable Listener synchronization causes a regression failure in enabling the shutter button properly. Remove that fix, but now I can enable CaptureModule N4 by default, since it actually works now. Bug: 19355923 Change-Id: I60fbc38010535cd750a2a74b9b6ead12df80e366
rc/com/android/camera/async/ListenableConcurrentState.java
rc/com/android/camera/module/ModulesInfo.java
|
eb0aa6a261bd2b2009efb279c29c5bed97b9a334 |
12-Feb-2015 |
I-Jong Lin <ijonglin@google.com> |
Merge "N4 CaptureModule not closing" into ub-camera-haleakala
|
6bd9d6cbf53f07e4ea0455d9125ddd2a2ae8b6a1 |
12-Feb-2015 |
Neil Fuller <nfuller@google.com> |
Merge "Remove additional dependencies on FloatMath"
|
b4b27f2c7738cd5e3f31a281d66a33f4698810b3 |
16-Jan-2015 |
Shashi Shekhar <shashishekhar@google.com> |
Port burst to use FrameServer. Port burst to frameserver - simplifies burst interfaces - removes burst methods from OneCamera. - locks orientation when burst is running. - Deletes most old code for burst integration. - Removes frame distributor preview forwarding, instead frames are streamed using a surface texture the Surface for which is passed as a output target to the create capture session. - Deletes FrameDistributor, now the low-res frames are streamed to a new surface specifically setup for burst. Change-Id: I50f2955bb48610a7e284f9609cd70b8e4e1f1059
rc/com/android/camera/CaptureModule.java
rc/com/android/camera/burst/BurstCaptureCommand.java
rc/com/android/camera/burst/BurstConfiguration.java
rc/com/android/camera/burst/BurstController.java
rc/com/android/camera/burst/BurstFacade.java
rc/com/android/camera/burst/BurstFacadeFactory.java
rc/com/android/camera/burst/BurstFacadeImpl.java
rc/com/android/camera/burst/BurstImage.java
rc/com/android/camera/burst/BurstResultsSaver.java
rc/com/android/camera/burst/BurstTaker.java
rc/com/android/camera/burst/BurstTakerImpl.java
rc/com/android/camera/burst/EvictionHandler.java
rc/com/android/camera/burst/OrientationLockController.java
rc/com/android/camera/burst/ResultsAccessor.java
rc/com/android/camera/burst/RingBuffer.java
rc/com/android/camera/burst/SurfaceTextureContainer.java
rc/com/android/camera/burst/ToastingBurstFacadeDecorator.java
rc/com/android/camera/gl/CopyShader.java
rc/com/android/camera/gl/FrameDistributor.java
rc/com/android/camera/gl/FrameDistributorImpl.java
rc/com/android/camera/gl/FrameDistributorWrapper.java
rc/com/android/camera/gl/GLToolbox.java
rc/com/android/camera/gl/RenderTarget.java
rc/com/android/camera/gl/SurfaceTextureConsumer.java
rc/com/android/camera/one/AbstractOneCamera.java
rc/com/android/camera/one/OneCamera.java
rc/com/android/camera/one/OneCameraManager.java
rc/com/android/camera/one/v1/OneCameraManagerImpl.java
rc/com/android/camera/one/v2/ImageCaptureManager.java
rc/com/android/camera/one/v2/OneCameraFactory.java
rc/com/android/camera/one/v2/OneCameraManagerImpl.java
rc/com/android/camera/one/v2/OneCameraZslImpl.java
rc/com/android/camera/one/v2/SimpleOneCameraFactory.java
rc/com/android/camera/one/v2/ZslOneCameraFactory.java
rc/com/android/camera/one/v2/initialization/GenericOneCameraImpl.java
rc/com/android/camera/one/v2/sharedimagereader/ZslSharedImageReaderFactory.java
rc_pd/com/android/camera/burst/BurstControllerImpl.java
rc_pd/com/android/camera/one/v2/OneCameraCreator.java
|
f27cf91653d6be413e14c362a0887d3bf1f5ca50 |
12-Feb-2015 |
Paul Rohde <codelogic@google.com> |
Merge "Fix several focus indicator edge cases." into ub-camera-haleakala
|
3ac7a551f005d43f86617ae400b7a203c552b386 |
11-Feb-2015 |
Paul Rohde <codelogic@google.com> |
Futures2 async join functions. Change-Id: I4dd62570df4886276e0be0e4e589e5685bcfa856
rc/com/android/camera/async/Futures2.java
|
25de24b2930d176a3957cb6865564e9e334175d6 |
12-Feb-2015 |
I-Jong Lin <ijonglin@google.com> |
N4 CaptureModule not closing N4 CaptureModule was not wired up properly to close the device when it closed. There's still an issue that the synchronization is incorrect, i.e. we don't guarentee close has completed before we open it again. There's a fix so that we can use OnCameraAvailable listener to only open the camera when it is available. Bug: 19332637 Change-Id: Ie88acb3a9f75a5896606dd660c005de0dc82dc3c
rc/com/android/camera/async/ListenableConcurrentState.java
rc/com/android/camera/module/ModulesInfo.java
rc/com/android/camera/one/v2/SimpleOneCameraFactory.java
rc/com/android/camera/one/v2/initialization/GenericOneCameraImpl.java
|
3969cc29e63b999501324aefbe2e0b74fb8fdbae |
11-Feb-2015 |
Paul Rohde <codelogic@google.com> |
Add a shutdown mechanism to the camera lifecycle. Change-Id: I68676dfb52dec4bba97275b46e0a99d0974028f6
rc/com/android/camera/device/MultiCameraDeviceLifecycle.java
|
2c2ce5c75980fea0d39dc95725413404b686ade8 |
11-Feb-2015 |
Paul Rohde <codelogic@google.com> |
Merge "Adjust device lifecycle log messages to be more consistent." into ub-camera-haleakala
|
d552f16540c59b28073e526e99fbcfe7dfa5ef09 |
11-Feb-2015 |
Paul Rohde <codelogic@google.com> |
Adjust device lifecycle log messages to be more consistent. Change-Id: Iaeed1c0746f05aedcd1ee0554b0904256a28e623
rc/com/android/camera/device/Camera2Actions.java
rc/com/android/camera/device/CameraDeviceKey.java
rc/com/android/camera/device/LegacyCameraActions.java
rc/com/android/camera/device/PortabilityCameraActions.java
rc/com/android/camera/device/SingleDeviceStateMachine.java
|
469dafb8cf229524e85b3bcb8093297c9fecc07d |
11-Feb-2015 |
Alan Newberger <alann@google.com> |
Remove overlays from Capture UI, partial revert of overdraw improvements This partially reverts ag/631666, keeping overdraw improvements for filmstrip but adding overdraw back in for capture to remove overlays which have landscape issues in video/photosphere. Keeping MarginDrawable in codebase for now in hopes of re-adding the overlay soon. Bug: 19352143 Change-Id: I7c75a7dcfa1643c7e4783742bfe5da49443a1848
es/layout/camera.xml
rc/com/android/camera/app/CameraAppUI.java
|
4c7278d85c3398c97f941efb245df6e3ccde22c4 |
31-Jan-2015 |
Paul Rohde <codelogic@google.com> |
Fix several focus indicator edge cases. Bug: 19213609 Bug: 18949556 Bug: 19214672 Bug: 19213602 Change-Id: I0d5c5ce8b4a62f98b44f6ae02ef1ac81d1d7f178
es/values/dimens.xml
rc/com/android/camera/CaptureModule.java
rc/com/android/camera/FocusOverlayManager.java
rc/com/android/camera/VideoModule.java
rc/com/android/camera/ui/focus/AutoFocusRing.java
rc/com/android/camera/ui/focus/FocusController.java
rc/com/android/camera/ui/focus/FocusRing.java
rc/com/android/camera/ui/focus/FocusRingRenderer.java
rc/com/android/camera/ui/focus/FocusRingView.java
rc/com/android/camera/ui/focus/ManualFocusRing.java
rc/com/android/camera/ui/motion/LinearScale.java
rc/com/android/camera/util/DebugBoundsRenderer.java
|
31be44e269e06e910ee0c341fdc24162370b87d0 |
28-Oct-2014 |
Sascha Haeberling <haeberling@google.com> |
Remove additional dependencies on FloatMath See frameworks/base commit 33253a4baa6279f81a73425b49dfb6abe5f5416e for details. Bug: https://code.google.com/p/android/issues/detail?id=36199 (cherry-picked from commit 1332fc023ea9941ff4afac0a43d13930d5b59771) Change-Id: Idc988340bfda1030a0d3461016cf592050417389
rc/com/android/camera/util/CameraUtil.java
|
07a37cae38cb971c0bccb2d76db82467242c6456 |
11-Feb-2015 |
Andy Huibers <andyhuibers@google.com> |
Merge "Don't assume OneCamera implementation is ready to take a shot after startup." into ub-camera-haleakala
|
affc49eb57fbd1223d8659f022862ddde7167150 |
10-Feb-2015 |
Alan Newberger <alann@google.com> |
Merge "Remove app background and reduce 1 layer of overdraw" into ub-camera-haleakala
|
b69e9bbc7dd762e980c42d3f09498543a3485c44 |
10-Feb-2015 |
I-Jong Lin <ijonglin@google.com> |
Merge "Add JPEG Orientation into N4 CaptureRequests" into ub-camera-haleakala
|
f68a39a0ad362ff0543e11e3f0ce11741a7de48c |
05-Feb-2015 |
I-Jong Lin <ijonglin@google.com> |
Add JPEG Orientation into N4 CaptureRequests Wired up the SimpleOneCameraFactory to dynamically decorate the JPEG capture request with the proper orientation so that the framework does the proper orientation. Paired with ag/629241. Bug: 19122922 Change-Id: If206b0d18979ddc4ed9ab6df7ce4d22ba01534a8
rc/com/android/camera/CaptureModule.java
rc/com/android/camera/module/ModulesInfo.java
rc/com/android/camera/one/v2/SimpleOneCameraFactory.java
rc/com/android/camera/one/v2/imagesaver/JpegImageBackendImageSaver.java
rc/com/android/camera/one/v2/imagesaver/YuvImageBackendImageSaver.java
rc/com/android/camera/one/v2/photo/ImageRotationCalculator.java
rc/com/android/camera/one/v2/photo/ImageRotationCalculatorImpl.java
rc/com/android/camera/processing/imagebackend/TaskCompressImageToJpeg.java
|
0079bc118851fd3d7d9cf73b46f7a3057cef1aec |
10-Feb-2015 |
Andy Huibers <andyhuibers@google.com> |
Don't assume OneCamera implementation is ready to take a shot after startup. Bug: 18114636 Change-Id: I1b4366dcef4a7f02a3240768508b39296db9b0b9
rc/com/android/camera/CaptureModule.java
|
d7064a6c6f1eb0748de8f56b8a1e006d60ab0f7e |
10-Feb-2015 |
Alan Newberger <alann@google.com> |
Remove app background and reduce 1 layer of overdraw Set the app background to null. This saves one full layer of overdraw in the filmstrip. The capture UI is more dependent on the window background, both for gaps in the preview and screen edges, and behind the shutter button when it is made transparent when the mode list is open. The preview is a large portion of screen and to remove one overdraw, we instead fill gaps around the preview with a MarginDrawable overlay. This CL leaves a background behind the shutter button when opaque, to allow for it becoming transparent during mode list view. Bug: 18596159 Change-Id: I2a9083a2413944c6244e2f0528164e8852ae3d8e
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/app/CameraAppUI.java
rc/com/android/camera/ui/BottomBar.java
rc/com/android/camera/ui/MarginDrawable.java
|
b350c0beb091086526c6ca8985a1beebc0d7c74d |
10-Feb-2015 |
Andy Huibers <andyhuibers@google.com> |
Log service requests taking longer than a threshold. Bug: 19269341 Change-Id: I1d199b7e53890214ab2d9fabb0e82219ed7b5699
rc/com/android/camera/util/AndroidServices.java
|
444bd470a7e1c7475798b89b567f0c34b4b42d92 |
10-Feb-2015 |
Sascha Haeberling <haeberling@google.com> |
Fish crash due to null session bitmap Bug: 19310525 Change-Id: I3701f18ba4080f2414bdb84141d8bf9597d9ab3b
rc/com/android/camera/data/SessionItem.java
|
8a8534566eed80d85b472adfe25d5c21822ffcf2 |
10-Feb-2015 |
Sascha Haeberling <haeberling@google.com> |
Fix capture indicators not showing caused by refactoring last month. Bug: 19310525 This was caused by http://ag/607738 which refactored the data classes. Change-Id: Idbbaf1b40c9aaf5ea241408125fa97bb2e6c36b2
rc/com/android/camera/data/SessionItem.java
|
49ad739cea7758555940ba8dd1c4cbf9bf0eb55d |
09-Feb-2015 |
Alan Newberger <alann@google.com> |
Merge "gray cleanup to 1b1b1b" into ub-camera-haleakala
|
fe80632c9bc017b3773af5bc8e309a5ee737b2dd |
09-Feb-2015 |
Andy Huibers <andyhuibers@google.com> |
Merge "Access KeyguardManager from AndroidServices." into ub-camera-haleakala
|
40f49f5d42b65a63e02e0b5fe44307309c1feb43 |
09-Feb-2015 |
Geoff Mendal <mendal@google.com> |
Import translations. DO NOT MERGE Change-Id: I90ce0137c030ac0a44f49ae05779f01763870cd0 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-bn-rBD/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-eu-rES/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-gl-rES/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-is-rIS/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-kk-rKZ/strings.xml
es/values-km-rKH/strings.xml
es/values-kn-rIN/strings.xml
es/values-ko/strings.xml
es/values-ky-rKG/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mk-rMK/strings.xml
es/values-ml-rIN/strings.xml
es/values-mn-rMN/strings.xml
es/values-mr-rIN/strings.xml
es/values-ms-rMY/strings.xml
es/values-my-rMM/strings.xml
es/values-nb/strings.xml
es/values-ne-rNP/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-si-rLK/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-ta-rIN/strings.xml
es/values-te-rIN/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-ur-rPK/strings.xml
es/values-uz-rUZ/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
8992a26dd589310b2f45cbb01c158f324fd10289 |
07-Feb-2015 |
Alan Newberger <alann@google.com> |
gray cleanup to 1b1b1b During Material update, filmstrip background was intentionally made 1b1b1b. Capture button and mode covers were slightly off from a previous gray design. Unifying all to one color constant. There are other, unused background specified from older times, removing them as part of cleanup. Confirmed with UX that all these colors should be 1b1b1b. Change-Id: I3da07e9828546d2c9d30a8ac756a0bbb89d6376c
es/drawable-v19/photopage_bottom_button_background.xml
es/drawable-v21/shutter_button_background_camera.xml
es/drawable-v21/shutter_button_background_panorama.xml
es/drawable-v21/shutter_button_background_photosphere.xml
es/drawable-v21/shutter_button_background_refocus.xml
es/drawable/cover.xml
es/drawable/photopage_bottom_button_background.xml
es/drawable/shutter_button_background_refocus.xml
es/drawable/shutter_button_background_still.xml
es/layout-land-v21/retake_done_cancel_layout.xml
es/layout-land/retake_done_cancel_layout.xml
es/layout-port-v21/retake_done_cancel_layout.xml
es/layout-port/retake_done_cancel_layout.xml
es/layout-v21/keyguard_widget.xml
es/layout/keyguard_widget.xml
es/values-v21/styles.xml
es/values/colors.xml
es/values/styles.xml
rc/com/android/camera/app/CameraAppUI.java
rc/com/android/camera/widget/FilmstripLayout.java
|
1966f422391c2478abffb2dad2006a9c7f7c2042 |
07-Feb-2015 |
Sascha Haeberling <haeberling@google.com> |
Make sure shutter button is inactive before the preview was started. Bug: 19285609 Change-Id: I7ef4cd5a80bdc151d743ece99aa1528ffe09ed20
rc/com/android/camera/CaptureModule.java
|
b3774e8135e1b61d97166194aa466123a265bf4d |
06-Feb-2015 |
Andy Huibers <andyhuibers@google.com> |
Access KeyguardManager from AndroidServices. Bug: 17925205 Change-Id: I29bd61eb49f5c8a5ec3ac7d9c2357d742e1929d1
rc/com/android/camera/util/AndroidServices.java
rc/com/android/camera/util/QuickActivity.java
|
c3adc0558139f6b7424f8be1116c246455bdf6ab |
06-Feb-2015 |
Puneet Lall <puneetl@google.com> |
Implement ready-state for non-zsl cameras Bug: 18934542 Change-Id: I028177a0ea02d8477083ffca8b40d03be5f444ac
rc/com/android/camera/one/v2/SimpleOneCameraFactory.java
|
adf3b29e69726175761fa2a5558c545822024bed |
06-Feb-2015 |
Puneet Lall <puneetl@google.com> |
Minor cleanup Change-Id: I1c8a953762fc51ddaabd0b3b0a82ec2a95e4757d
rc/com/android/camera/async/ConcurrentState.java
rc/com/android/camera/one/v2/ZslOneCameraFactory.java
rc/com/android/camera/one/v2/sharedimagereader/ringbuffer/AvailableTicketCounter.java
|
11bdc0f19a00094b8003155e89ffcbe12ad0536a |
06-Feb-2015 |
Puneet Lall <puneetl@google.com> |
Merge "Implement ready state" into ub-camera-haleakala
|
da01fd85202bc46645166723f2495387411d5997 |
06-Feb-2015 |
Puneet Lall <puneetl@google.com> |
Merge "Rename ImageStreamFactory to ManagedImageReader" into ub-camera-haleakala
|
63204dc989dbd0eba56f65086fde0ebe29ed6bdb |
31-Jan-2015 |
Puneet Lall <puneetl@google.com> |
Implement ready state Bug: 18934542 Change-Id: I1dc27eb3f8fb1ef156ae8643b2b5e92f013c4e4b
rc/com/android/camera/async/ConcurrentState.java
rc/com/android/camera/async/Observables.java
rc/com/android/camera/one/v2/ZslOneCameraFactory.java
rc/com/android/camera/one/v2/sharedimagereader/ZslSharedImageReaderFactory.java
rc/com/android/camera/one/v2/sharedimagereader/metadatasynchronizer/MetadataPool.java
rc/com/android/camera/one/v2/sharedimagereader/ringbuffer/AvailableTicketCounter.java
rc/com/android/camera/one/v2/sharedimagereader/ringbuffer/DynamicRingBuffer.java
rc/com/android/camera/one/v2/sharedimagereader/ringbuffer/DynamicRingBufferFactory.java
rc/com/android/camera/one/v2/sharedimagereader/ringbuffer/QueueFlusher.java
rc/com/android/camera/one/v2/sharedimagereader/ringbuffer/TicketPoolPrioritizer.java
|
1318feb043f89f8309a7d4cf53ccaa7a58939c98 |
06-Feb-2015 |
Puneet Lall <puneetl@google.com> |
Rename ImageStreamFactory to ManagedImageReader Improves documentation for the internal camera2 wrapper API. Change-Id: I62d0c9aa52f5254c45fc06f2792f92b9b90e3e31
rc/com/android/camera/one/v2/SimpleOneCameraFactory.java
rc/com/android/camera/one/v2/core/CaptureStream.java
rc/com/android/camera/one/v2/photo/ConvergedImageCaptureCommand.java
rc/com/android/camera/one/v2/photo/LegacyPictureTakerFactory.java
rc/com/android/camera/one/v2/photo/PictureTakerFactory.java
rc/com/android/camera/one/v2/photo/SimpleImageCaptureCommand.java
rc/com/android/camera/one/v2/photo/ZslPictureTakerFactory.java
rc/com/android/camera/one/v2/sharedimagereader/ImageStreamFactory.java
rc/com/android/camera/one/v2/sharedimagereader/ManagedImageReader.java
rc/com/android/camera/one/v2/sharedimagereader/SharedImageReaderFactory.java
rc/com/android/camera/one/v2/sharedimagereader/ZslSharedImageReaderFactory.java
rc/com/android/camera/one/v2/sharedimagereader/imagedistributor/ImageStream.java
|
8351c3f3db70796a04380265a9cf17c6c6b559c4 |
05-Feb-2015 |
Spike Sprague <spikuru@google.com> |
Merge "in secure camera, prevent swiping to filmstrip when no photo has been taken." into ub-camera-haleakala
|
b5338e7a69d31984c22e9acabb279d2111a7ef2a |
05-Feb-2015 |
Spike Sprague <spikuru@google.com> |
in secure camera, prevent swiping to filmstrip when no photo has been taken. bug: 19279388 Change-Id: I92c23dd5546aa31166df2ce40d19e374808d83d3
rc/com/android/camera/widget/FilmstripLayout.java
|
ce53fbf4adc50a7feb9e0937b0d5906bdbd6f200 |
05-Feb-2015 |
Senpo Hu <senpo@google.com> |
Merge "Use MainThread in CaptureModule and FocusController." into ub-camera-haleakala
|
2a489b8b2b6a43e17376e5c9bd8c0d60c1840551 |
05-Feb-2015 |
Puneet Lall <puneetl@google.com> |
Merge "Cancel implicit AE lock after AE precapture sequence" into ub-camera-haleakala
|
7057dbbbc1c75894ec48b03299914a4bfa7c30e1 |
05-Feb-2015 |
Puneet Lall <puneetl@google.com> |
Cancel implicit AE lock after AE precapture sequence After taking, or attempting to take a flash photo, the app currently sends a CONTROL_AF_TRIGGER_CANCEL to release the AF lock. On some devices (N6), there appears to be an implicit AE lock set by the CONTROL_AE_PRECAPTURE_TRIGGER, which is unlocked when a flash photo is captured (with INTENT_STILL_CAPTURE). In the event that the app is interrupted before sending the still capture request, it must still cancel the implicit AE lock. As a workaround, sending a request with AE_LOCK=true followed by AE_LOCK=false appears to reset this implicit AE lock. Workaround for Bug: 19265647 Change-Id: Ie76a81c1a138fb2334de736b315796e869378bf4
rc/com/android/camera/one/v2/photo/ConvergedImageCaptureCommand.java
|
fc6e6dc57be148e20b989c00b9673877a3957512 |
05-Feb-2015 |
Sascha Haeberling <haeberling@google.com> |
Revert N4 to PhotoModule until ImageBackend can handle EXIF rotation. Bug: 19281550 Change-Id: I8a87b8e4815b2f16d42c28a0cd9887379b742f75
rc/com/android/camera/module/ModulesInfo.java
|
0f404c49c140212e1a0ab15a8508d63ee07efc48 |
05-Feb-2015 |
Senpo Hu <senpo@google.com> |
Use MainThread in CaptureModule and FocusController. Change-Id: I9de2aa619edc3cc1d686b297776cdf8ab2a65ce7
rc/com/android/camera/CaptureModule.java
rc/com/android/camera/ui/focus/FocusController.java
|
196c2183b4e7537b2ea4cfe6f2ceffb7114841e3 |
05-Feb-2015 |
Puneet Lall <puneetl@google.com> |
Merge "Add support for non-ZSL, non-legacy cameras" into ub-camera-haleakala
|
5d54ef4379592758a28c225347029096c8259b13 |
05-Feb-2015 |
Andy Huibers <andyhuibers@google.com> |
Merge "Control some chatty logging with a boolean." into ub-camera-haleakala
|
dfe19d2fedee0a3af39d335402ff9dc7e774e8bd |
05-Feb-2015 |
Sascha Haeberling <haeberling@google.com> |
Merge "Make sure to null SurfaceTexture when destroyed." into ub-camera-haleakala
|
d119b0ab2f700de33259ddc2ece7fb3cc1f305a2 |
05-Feb-2015 |
Andy Huibers <andyhuibers@google.com> |
Control some chatty logging with a boolean. Bug: 19269341 Change-Id: Ifb90a06a8022cadc47cbe67b852dc2d0f5da2571
rc/com/android/camera/util/AndroidServices.java
|
a6bddcf608dc387f64ab196163e5e313a82ef752 |
05-Feb-2015 |
Andy Huibers <andyhuibers@google.com> |
Merge "Use KeyguardManager.isKeyguardLocked() to fire double-onResume lock screen launch workaround. Previously we were only doing workaround for INTENT_ACTION_STILL_IMAGE_CAMERA_SECURE." into ub-camera-haleakala
|
82a5c17b22c8b29ee1b601d362a3742de75fece7 |
05-Feb-2015 |
Sascha Haeberling <haeberling@google.com> |
Make sure to null SurfaceTexture when destroyed. Bug: 19149830 This will prevent unnecessary camera open events. We assume that when a SurfaceTexture is present at the time we resume, that it is usable and we can initialize the camera. Not nulling it causes the camera to be initialized on a potentially invalid Surface. Once the Surface becomes available, we'd close and re-open the camera, which slows down our resume times. By nulling the SurfaceTexture when it gets destroyed we make sure to not initialize the camera in resume an instead wait for the proper callback. This might get rid of the HDR+ resume issue we've been seeing as well. Change-Id: I71837aeda79c2f7516e64bdb10c12d39f728c0ca
rc/com/android/camera/CaptureModule.java
|
60d252d03fcd4a9dc22ea2ff292db563a83c5f6f |
05-Feb-2015 |
Andy Huibers <andyhuibers@google.com> |
Use KeyguardManager.isKeyguardLocked() to fire double-onResume lock screen launch workaround. Previously we were only doing workaround for INTENT_ACTION_STILL_IMAGE_CAMERA_SECURE. Bug: 17925205 Change-Id: I63206aa268fb41897da6fe37fc967bf12c3f4e7b
rc/com/android/camera/util/QuickActivity.java
|
5cbdddd3ba0241b60dbd7a0ab44cfc08dc5e8fc9 |
05-Feb-2015 |
Puneet Lall <puneetl@google.com> |
Add support for non-ZSL, non-legacy cameras Bug: 19178315 Change-Id: Icc73563cdf708efe70bfc814c279850e1a690cf3
rc/com/android/camera/one/OneCameraCharacteristics.java
rc/com/android/camera/one/v1/OneCameraCharacteristicsImpl.java
rc/com/android/camera/one/v2/OneCameraCharacteristicsImpl.java
rc/com/android/camera/one/v2/SimpleOneCameraFactory.java
rc/com/android/camera/one/v2/common/BasicCameraFactory.java
rc/com/android/camera/one/v2/photo/PictureTakerFactory.java
|
054ccbf10949437349140f3285d33250e2e28136 |
05-Feb-2015 |
Alan Newberger <alann@google.com> |
Merge "Remove elevations from filmstrip" into ub-camera-haleakala
|
6fc611a9e7f756953c9fbd3857c86b5a1a6aac01 |
05-Feb-2015 |
Alan Newberger <alann@google.com> |
Merge "Address black flash on filmstrip items by loading placeholder consistently" into ub-camera-haleakala
|
d70b22919f8d212bf11abd6e6724b3a395ef02c1 |
04-Feb-2015 |
Alan Newberger <alann@google.com> |
Remove elevations from filmstrip Elevations were not applied to SessionItems causing bad z-order behavior. As the shadows are not really visible, just removing elevation entirely, this also seems to improve performance. Bug: 17742801 Change-Id: I8fedad3b6c083f7cde349e51021f928d719edb40
es/drawable/dummy_rect_background.xml
es/layout/filmstrip_image.xml
es/layout/filmstrip_video.xml
rc/com/android/camera/data/PhotoItem.java
rc/com/android/camera/widget/FilmstripView.java
|
f7fb23cde49a62b116c678c7c1dd4d3f44e656d7 |
05-Feb-2015 |
zafir <zafir@google.com> |
Merge "Implemented Report functionality using GMS Core Feedback API. Implemented stubs for Camera2." into ub-camera-haleakala
|
d251aa45da226d9fde64a481a22023adc6be43b0 |
05-Feb-2015 |
Alan Newberger <alann@google.com> |
Address black flash on filmstrip items by loading placeholder consistently Refactor removed placeholder (gray rectangle) from large image builder in glide, but it's necessary there. Moved default placeholder to builders, behavior looks correct now. Change-Id: Ib154c5f5db0d2b7d4f861366bfe4e156fabad45d
rc/com/android/camera/data/GlideFilmstripManager.java
|
6f7432515b81245d77a2592f06cb032cf6dac547 |
05-Feb-2015 |
I-Jong Lin <ijonglin@google.com> |
Merge "Nexus 4 Camera Start-up Fix" into ub-camera-haleakala
|
61eeaa75d8bf863e53c7a308ea7ee29e2cc90202 |
04-Feb-2015 |
I-Jong Lin <ijonglin@google.com> |
Nexus 4 Camera Start-up Fix Issue revolves around the fact that the camera ZSL template was invalid for Nexus4, and Nexus4 did not support ConvergedImage Picture taker. Turned those things off for the Nexus 4 and now it works. Bug: 19123014 Change-Id: I5aef58a0f0c7e9396e999d6b7ab2736e4565b73f
rc/com/android/camera/module/ModulesInfo.java
rc/com/android/camera/one/v2/SimpleOneCameraFactory.java
rc/com/android/camera/one/v2/photo/PictureTakerFactory.java
|
91bdb7fa1084af44c36dd7072033a90f4823ef5a |
05-Feb-2015 |
Senpo Hu <senpo@google.com> |
Merge "Adjust capture indicator position while open/close mode options." into ub-camera-haleakala
|
54ac03ba6ae3e739df74c6d9e35fda9017be07d7 |
02-Feb-2015 |
Senpo Hu <senpo@google.com> |
Adjust capture indicator position while open/close mode options. This CL also fixes the layout issue in landscape mode when mode option indicators are visible. Bug: 18866551 Bug: 18317565 Bug: 18905659 Change-Id: I34ca5aa77aa9d37a7f0ad3d2d7efbed92fe94f2b
rc/com/android/camera/ui/StickyBottomCaptureLayout.java
rc/com/android/camera/ui/motion/InterpolatorHelper.java
rc/com/android/camera/widget/ModeOptions.java
rc/com/android/camera/widget/ModeOptionsOverlay.java
rc/com/android/camera/widget/RoundedThumbnailView.java
|
29f491385647ba4ce18297d7dbdde9fcb1e16ac4 |
05-Feb-2015 |
I-Jong Lin <ijonglin@google.com> |
Merge "Remove UNKNOWN Orientation values" into ub-camera-haleakala
|
4e68cbcc312ff9b70a57b2cf635d7a1d94d43012 |
05-Feb-2015 |
Puneet Lall <puneetl@google.com> |
Use CONTROL_CAPTURE_INTENT_STILL_CAPTURE Fixes issue in which flash may not fire when set to on or auto. Bug: 19151455 Change-Id: If5cb82bea3e882224ad9afe2b3a69d5e5596ee36
rc/com/android/camera/one/v2/photo/ConvergedImageCaptureCommand.java
|
db34aa1f60ba88b904cfbc00cf4cddfa1c8e0896 |
04-Feb-2015 |
Paul Rohde <codelogic@google.com> |
Merge "Multi camera device lifecycle management." into ub-camera-haleakala
|
ec604214008248f7858b3a8b66d70919947399a9 |
04-Feb-2015 |
I-Jong Lin <ijonglin@google.com> |
Remove UNKNOWN Orientation values UNKNOWN Orientation is causing some strange crashes in the Camera App, in certain situation when the phone starts up while faceup on a table, i.e. an unknown orientation. This CL is to make sure that we stop any UNKOWN orientations propogating through the system and causes these sorts of crashes. Bug: 19049293 Change-Id: I4f403bda1b6b23f2bbe5ee590e23d0fc078543b7
rc/com/android/camera/app/OrientationManager.java
rc/com/android/camera/app/OrientationManagerImpl.java
rc/com/android/camera/processing/imagebackend/TaskCompressImageToJpeg.java
|
88988ccd197b9b3139943dfb90ca08ce7e8a4e04 |
04-Feb-2015 |
Paul Rohde <codelogic@google.com> |
Merge "Fix filmstrip jank on N4." into ub-camera-haleakala
|
77d9f023e76816e5da7bd067ad46cc0e9c98623f |
03-Feb-2015 |
Paul Rohde <codelogic@google.com> |
Fix filmstrip jank on N4. Bug: 19164291 Bug: 19220382 Bug: 19020507 Change-Id: Id1c2011b29b1cee206593fb395d9b4a4c89e71ab
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/data/CameraFilmstripDataAdapter.java
rc/com/android/camera/data/FilmstripItem.java
rc/com/android/camera/data/FilmstripItemBase.java
rc/com/android/camera/data/FixedFirstProxyAdapter.java
rc/com/android/camera/data/FixedLastProxyAdapter.java
rc/com/android/camera/data/GlideFilmstripManager.java
rc/com/android/camera/data/PhotoItem.java
rc/com/android/camera/data/PhotoItemFactory.java
rc/com/android/camera/data/PlaceholderItem.java
rc/com/android/camera/data/SessionItem.java
rc/com/android/camera/data/VideoItem.java
rc/com/android/camera/data/VideoItemFactory.java
rc/com/android/camera/filmstrip/FilmstripDataAdapter.java
rc/com/android/camera/widget/FilmstripView.java
|
b886235598704fafb9c09723544e78464a0de7b4 |
04-Feb-2015 |
Spike Sprague <spikuru@google.com> |
minor comment fix. Change-Id: I284a6b4485dd972faef725cd7fd598afc9b83378
rc/com/android/camera/widget/FilmstripLayout.java
|
27d31d88e64a2075c87bb6f3969bdd99cd9ceaea |
04-Feb-2015 |
Spike Sprague <spikuru@google.com> |
Merge "Fix for CL ag/627135" into ub-camera-haleakala
|
e08c469a48a347ba02e3c246370757e16b2bbad0 |
04-Feb-2015 |
Spike Sprague <spikuru@google.com> |
Fix for CL ag/627135 Move logic to open filmstrip from onUp() to onFling(), mimicking logic in ModeListView fling handling. Limit fling handling to entering Filmstip from the Preview. bug: 18904319 Change-Id: I51960dbb427345eb69a2d4a4a84d74479361be96
rc/com/android/camera/widget/FilmstripLayout.java
|
e4e15811211d6470a6182f4a1d080b962caa9ae4 |
04-Feb-2015 |
Puneet Lall <puneetl@google.com> |
Implement tracking of FrameServer availability To track the "ready state" of the camera, it is necessary to track whether or not a new command can immediately acquire an exclusive lock on the FrameServer. Bug: 18934542 Change-Id: Ie87fe8ac0a60662e0889ca6569d6f2f8ffcfb362
rc/com/android/camera/one/v2/commands/PreviewCommand.java
rc/com/android/camera/one/v2/core/FrameServer.java
rc/com/android/camera/one/v2/core/FrameServerFactory.java
rc/com/android/camera/one/v2/core/FrameServerImpl.java
rc/com/android/camera/one/v2/core/ObservableFrameServer.java
rc/com/android/camera/one/v2/core/ResponseListenerBroadcaster.java
rc/com/android/camera/one/v2/core/ResponseListeners.java
|
7a2678faaa49df9a7acc1c4d95a7c9ee3b8580aa |
04-Feb-2015 |
Puneet Lall <puneetl@google.com> |
Fix build breakage Removes import of deleted class. Change-Id: I998fcd37a6db8ab9e2338c729ef49d116c4d96a4
rc/com/android/camera/one/v2/common/BasicCameraFactory.java
|
5ded8d33969af7586687063df4b006f8d89df798 |
04-Feb-2015 |
Puneet Lall <puneetl@google.com> |
Merge "Change/simplify Observable interface" into ub-camera-haleakala
|
e606c4d68b74293e7d7725aecbaa9c915751cd43 |
04-Feb-2015 |
Puneet Lall <puneetl@google.com> |
Change/simplify Observable interface Previously, the Observable interface allowed registering callbacks to receive each update to a value, in a thread-safe way. However, this adds unnecessary complexity and greatly complicates the implementation of callbacks to track the camera ready-state. Replacing Callback<T> with Runnables, which can simply call Observable.get() to retrieve the latest value makes implementing ready-state significantly simpler. Bug: 18934542 Change-Id: I00d512f3c380148c0e9cb52352b2f304494e5e5a
rc/com/android/camera/async/CallbackRunnable.java
rc/com/android/camera/async/ConcurrentState.java
rc/com/android/camera/async/FilteredCallback.java
rc/com/android/camera/async/ForwardingObservable.java
rc/com/android/camera/async/ListenableConcurrentState.java
rc/com/android/camera/async/Observable.java
rc/com/android/camera/async/ObservableCombiner.java
rc/com/android/camera/async/Observables.java
rc/com/android/camera/one/v2/common/BasicCameraFactory.java
rc/com/android/camera/settings/SettingObserver.java
|
3fca93604d84b50e9b9e245ea719824725fa239d |
04-Feb-2015 |
Geoff Mendal <mendal@google.com> |
Import translations. DO NOT MERGE Change-Id: Id155f7afc4b25a85ef916ca32d52a9d46e5c83ea Auto-generated-cl: translation import
es/values-ml-rIN/strings.xml
es/values-nb/strings.xml
es/values-sw/strings.xml
|
4e550eef4dd2936e493554217619a33b4a3b4b52 |
04-Feb-2015 |
Alan Newberger <alann@google.com> |
Merge "Revert "Move logic to open filmstrip from onUp() to onFling(), mimicking logic in ModeListView fling handling."" into ub-camera-haleakala
|
5f4f329d7d1780c6ea052bdaa64680e86bf74181 |
04-Feb-2015 |
Alan Newberger <alann@google.com> |
Revert "Move logic to open filmstrip from onUp() to onFling(), mimicking logic in ModeListView fling handling." This reverts commit e3fd993f9e85acc7963673ee338ed4f1ba5dacbc. Change-Id: Idd51a11192640f9f20699b754b121262b3f51cc3
rc/com/android/camera/ui/ModeListView.java
rc/com/android/camera/widget/FilmstripLayout.java
|
983fbebe0cbcedb6e4515f4240ec2d6034e4a7d9 |
04-Feb-2015 |
Alan Newberger <alann@google.com> |
Merge "Ensure right non-neighbors are invisible during filmstrip item scaling" into ub-camera-haleakala
|
2eb1f8531b4879b836206cbde0e57335e300b445 |
03-Feb-2015 |
I-Jong Lin <ijonglin@google.com> |
Fix for Capture Indicator Animation Listeners Issue arose when Capture Indicator was hidden from the screen, and animations were NOT finished. Current listeners were unregistered, but never re-registered when capture indicator was shown again. Simplest solution is to null out the references to the animators in the RoundThumbnailView to signal animators to be re-created. Bug: 19034435 Change-Id: I94b74c0ea8f385d348dd981ebe8d9402140c3248
rc/com/android/camera/widget/RoundedThumbnailView.java
|
69c897f767f327722efd3314bf679c5a5dd64bb8 |
30-Jan-2015 |
zafir <zafir@google.com> |
Implemented Report functionality using GMS Core Feedback API. Implemented stubs for Camera2. Bug: 18188247 Change-Id: Ic47bf432dca326bb454d0e4408b6b58f645a3fa4
es/values/strings.xml
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/settings/CameraSettingsActivity.java
rc/com/android/camera/util/CameraUtil.java
rc_pd/com/android/camera/util/GoogleHelpHelper.java
|
4e3fcaaf751be8221a6a08352ac3ce6f842d21b1 |
03-Feb-2015 |
Sascha Haeberling <haeberling@google.com> |
Merge "Move CaptureSession into it's own file and clean up interface." into ub-camera-haleakala
|
b62fa4716df6bcc526f575006822e06dd8ea9b83 |
03-Feb-2015 |
Sascha Haeberling <haeberling@google.com> |
Move CaptureSession into it's own file and clean up interface. Change-Id: Iaca24e22b541aec898cdf1d3246c98ed72cd85ca
rc/com/android/camera/MediaSaverImpl.java
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/VideoModule.java
rc/com/android/camera/app/CameraServicesImpl.java
rc/com/android/camera/app/MediaSaver.java
rc/com/android/camera/session/CaptureSessionImpl.java
rc/com/android/camera/session/CaptureSessionManagerImpl.java
rc/com/android/camera/tinyplanet/TinyPlanetFragment.java
|
087f6d917758bd3cd982fcecd4230ab670eb995b |
03-Feb-2015 |
I-Jong Lin <ijonglin@google.com> |
Merge "ImageBackend Service Integration, Pass 2" into ub-camera-haleakala
|
5f384e153b6b1e9b15178b5edc457f7916006d3a |
03-Feb-2015 |
I-Jong Lin <ijonglin@google.com> |
Merge "Fix centering issue of the Fast Thumbnail Preview" into ub-camera-haleakala
|
24ae21924dac251bd11d2ccbcf2679f23baeb8a0 |
28-Jan-2015 |
I-Jong Lin <ijonglin@google.com> |
Fix centering issue of the Fast Thumbnail Preview Circular Fast thumbnail doesn't seem to be quite centered, even though picture is centered in the viewfinder. Y channel horizontal offset in memory was not being calculated correctly from the specified pixel strides. Also, added an offset of 1/2 of the downsample so that the image can be more centered. Bug: 19132967 Change-Id: I406172beda8b383d513c539ae5963400f57cdd42
rc/com/android/camera/processing/imagebackend/TaskConvertImageToRGBPreview.java
|
0a155c041cde83720825386fb4f5ce3e4a9aaf75 |
03-Feb-2015 |
Spike Sprague <spikuru@google.com> |
Merge "Move logic to open filmstrip from onUp() to onFling(), mimicking logic in ModeListView fling handling." into ub-camera-haleakala
|
e3fd993f9e85acc7963673ee338ed4f1ba5dacbc |
03-Feb-2015 |
Spike Sprague <spikuru@google.com> |
Move logic to open filmstrip from onUp() to onFling(), mimicking logic in ModeListView fling handling. bug: 18904319 Change-Id: I8e2b1db72eceab1b5ba14f3ecf3aa35ba35df046
rc/com/android/camera/ui/ModeListView.java
rc/com/android/camera/widget/FilmstripLayout.java
|
259fa6b34f93b5312948c67df2b0fcbe7a6c3f83 |
03-Feb-2015 |
Puneet Lall <puneetl@google.com> |
Merge "Fix race condition in MetadataPool implementation" into ub-camera-haleakala
|
e265ca85ba762062461126471ed1f3053907cfef |
03-Feb-2015 |
Puneet Lall <puneetl@google.com> |
Fix race condition in MetadataPool implementation Existing code synchronized on the wrong object. Bug: 19237665 Change-Id: Icd50b3b0dee8a03dfb0696af01351323493d7b0c
rc/com/android/camera/one/v2/sharedimagereader/metadatasynchronizer/MetadataPoolImpl.java
|
ab8b067ce585a471c373a3e108322e592cc8ee20 |
02-Feb-2015 |
Alan Newberger <alann@google.com> |
Merge "Log suppression for JVM tests" into ub-camera-haleakala
|
6ce2f41ca6338c8b0055d1e79bc61a434ba91006 |
02-Feb-2015 |
Alan Newberger <alann@google.com> |
Ensure Glide signatures include MediaStore metadata We add MediaStore metadata to Glide signatures to ensure cache keys get correctly updated when MediaStore items are updated. Bug: 19199401 Change-Id: Iaf4db5ad58c33aab454b29e120fe25c5b3accb65
rc/com/android/camera/data/FilmstripItemBase.java
|
abac2a23443f13b58951d88bf4b972f31a562e3d |
15-Jan-2015 |
I-Jong Lin <ijonglin@google.com> |
ImageBackend Service Integration, Pass 2 ImageBackend now emulates its processing by submitting shadow tasks onto the Processing Service queue, submitting one ImageShadowTask for every call to Imagebackend::receiveImage. Actual processing is still handled by the ImageBackend object, but this shadow task emulation allows the ProcessingServiceManager to deferment Long running tasks of Photosphere and Lens blur when there is current ImageBackend processing. However, ImageBackend does NOT defer any of its task to Photosphere and Lens Blur and runs all its tasks asynchronously on its own thread pools. The image shadow tasks that ImageBackend submits merely block until processing on an image is finished with processing. Bug: 18906477 Change-Id: Ia8e89c03a5e64ebb1b980111c9e3b8cc4eaeda4f
rc/com/android/camera/processing/ProcessingServiceManager.java
rc/com/android/camera/processing/ProcessingTaskConsumer.java
rc/com/android/camera/processing/imagebackend/ImageBackend.java
rc/com/android/camera/processing/imagebackend/ImageConsumer.java
rc/com/android/camera/processing/imagebackend/ImageShadowTask.java
|
b6a4d96a310a1dee22ddea89b09130bcda206bb3 |
22-Jan-2015 |
Paul Rohde <codelogic@google.com> |
Multi camera device lifecycle management. - Generic device open lifecycle. - Generic device open / close states. - Camera specific single device lifecycle. - Camera2 specific single device actions. - Portibility specific single device actions. - Legacy Camera specific single device actions. - Combined multi-camera lifecycle layer. Related Bugs: Bug: 17905863 - Filmstrip Jank Bug: 18414621 - Startup Latency Bug: 17925205 - Cold start Latency Change-Id: I13e1e5909f05617485c7303c82d3baed20b6cd1c
rc/com/android/camera/device/Camera2ActionProvider.java
rc/com/android/camera/device/Camera2Actions.java
rc/com/android/camera/device/CameraDeviceActionProvider.java
rc/com/android/camera/device/CameraDeviceKey.java
rc/com/android/camera/device/CameraDeviceLifecycle.java
rc/com/android/camera/device/CameraModuleHelper.java
rc/com/android/camera/device/CameraOpenException.java
rc/com/android/camera/device/LegacyCameraActionProvider.java
rc/com/android/camera/device/LegacyCameraActions.java
rc/com/android/camera/device/MultiCameraDeviceLifecycle.java
rc/com/android/camera/device/PortabilityCameraActionProvider.java
rc/com/android/camera/device/PortabilityCameraActions.java
rc/com/android/camera/device/SingleDeviceActions.java
rc/com/android/camera/device/SingleDeviceCloseListener.java
rc/com/android/camera/device/SingleDeviceLifecycle.java
rc/com/android/camera/device/SingleDeviceOpenListener.java
rc/com/android/camera/device/SingleDeviceRequest.java
rc/com/android/camera/device/SingleDeviceShutdownListener.java
rc/com/android/camera/device/SingleDeviceStateMachine.java
|
94529d95accea27b28e1e0e21c3c8eb86b7b01f2 |
02-Feb-2015 |
Geoff Mendal <mendal@google.com> |
Import translations. DO NOT MERGE Change-Id: I0ff379f424160a2b4a4b7390f920cc454ef30956 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-bn-rBD/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-eu-rES/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-gl-rES/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-is-rIS/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-kk-rKZ/strings.xml
es/values-km-rKH/strings.xml
es/values-kn-rIN/strings.xml
es/values-ko/strings.xml
es/values-ky-rKG/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mk-rMK/strings.xml
es/values-ml-rIN/strings.xml
es/values-mn-rMN/strings.xml
es/values-mr-rIN/strings.xml
es/values-ms-rMY/strings.xml
es/values-my-rMM/strings.xml
es/values-nb/strings.xml
es/values-ne-rNP/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-si-rLK/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-ta-rIN/strings.xml
es/values-te-rIN/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-ur-rPK/strings.xml
es/values-uz-rUZ/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
ff8f64c7f8876c3683832ec1a11dbee3e13d48ea |
02-Feb-2015 |
Geoff Mendal <mendal@google.com> |
Import translations. DO NOT MERGE Change-Id: Ifa64b280d99c32f5ade8442db541e237109cae95 Auto-generated-cl: translation import
es/values-ar/strings.xml
|
63a8c9467824ef8aa2039b7e27831b0533d8e5d9 |
29-Jan-2015 |
Sascha Haeberling <haeberling@google.com> |
Only create temp session file when necessary. Bug: 19148484 This also removes the IOException that could happen when a new session is created and moves it to where a module actually needs the temporary output file. Change-Id: Ifc1f1ba2735557580c1302f8658a07bb13cc3c3e
rc/com/android/camera/CaptureModule.java
rc/com/android/camera/processing/ProcessingService.java
rc/com/android/camera/session/CaptureSession.java
rc/com/android/camera/session/CaptureSessionManager.java
rc/com/android/camera/session/CaptureSessionManagerImpl.java
rc/com/android/camera/session/SessionStorageManager.java
rc/com/android/camera/session/SessionStorageManagerImpl.java
rc/com/android/camera/session/TemporarySessionFile.java
|
34ac66e6d0bb849fb24a6255328390aba204abe3 |
31-Jan-2015 |
Alan Newberger <alann@google.com> |
Ensure right non-neighbors are invisible during filmstrip item scaling Only the immediate right hand neighbor should fade out and translate to center when drag-scaling the centered filmstrip item. Regression from G to H, this CL ensures only the immediate neighbor is visible. Bug: 19127110 Change-Id: I4023b91c384abd2b139b04124167cce8cb50c618
rc/com/android/camera/widget/FilmstripView.java
|
67d715c632d3d8261623974247f91fda65c06ebc |
31-Jan-2015 |
Senpo Hu <senpo@google.com> |
Merge "Suppress capture indicator while recording video." into ub-camera-haleakala
|
ecb546aca4093beb60a3d40171b5038693dc7d05 |
30-Jan-2015 |
Senpo Hu <senpo@google.com> |
Suppress capture indicator while recording video. Bug: 18908730 Change-Id: I2acd06f792c630b5ddac769c07edbefa94d9e110
rc/com/android/camera/VideoModule.java
rc/com/android/camera/app/CameraAppUI.java
|
cb6c50a45d68749b2e7e4ee3f05683687df2511d |
30-Jan-2015 |
Puneet Lall <puneetl@google.com> |
Merge "Enable tracking of image availability" into ub-camera-haleakala
|
e919a48fb40b9d6c698a495acf40adbc0e320431 |
22-Jan-2015 |
Puneet Lall <puneetl@google.com> |
Enable tracking of image availability To allow updating the UI whenever image reader space is exhausted, we must be able to track whether or not non-zsl images can be allocated at any given time. This CL implements this for the general case of both single images as well as for finite bursts. Bug: 18934542 Change-Id: Ia8c6e03f631cf47e4385cb8da1e3f6d74e7901a2
rc/com/android/camera/async/ConcurrentState.java
rc/com/android/camera/async/FilteredCallback.java
rc/com/android/camera/async/ForwardingObservable.java
rc/com/android/camera/async/NoOp.java
rc/com/android/camera/async/Observable.java
rc/com/android/camera/async/ObservableCombiner.java
rc/com/android/camera/async/Observables.java
rc/com/android/camera/async/Updatables.java
rc/com/android/camera/one/v2/sharedimagereader/SharedImageReaderFactory.java
rc/com/android/camera/one/v2/sharedimagereader/ZslSharedImageReaderFactory.java
rc/com/android/camera/one/v2/sharedimagereader/ringbuffer/TicketPoolPrioritizer.java
rc/com/android/camera/one/v2/sharedimagereader/ticketpool/FiniteTicketPool.java
rc/com/android/camera/one/v2/sharedimagereader/ticketpool/ReservableTicketPool.java
rc/com/android/camera/one/v2/sharedimagereader/ticketpool/TicketPool.java
rc/com/android/camera/one/v2/sharedimagereader/ticketpool/TicketProvider.java
rc/com/android/camera/one/v2/stats/PreviewFpsListener.java
rc/com/android/camera/settings/SettingObserver.java
rc/com/android/camera/util/Callback.java
|
9c0835fc31c48c2122fb75675c05314cb8203b1d |
30-Jan-2015 |
Paul Rohde <codelogic@google.com> |
Merge "Disable the touch to focus sound." into ub-camera-haleakala
|
d4b2e9e0838d21adddd1ee3c492e5b11a7c2b509 |
30-Jan-2015 |
Puneet Lall <puneetl@google.com> |
Fix build break Android's Exception class is missing a constructor which was added in java 7. Change-Id: Idab9bf40d59c5816d2431edb8302e350df748ead
rc/com/android/camera/one/v2/camera2proxy/CameraCaptureSessionClosedException.java
|
71cdc139c2e2840929c51c38701e3c25f1b4ecdc |
30-Jan-2015 |
Puneet Lall <puneetl@google.com> |
Translate API IllegalStateException into checked exceptions Fixes AndroidCameraCaptureSessionProxy to actually translate IllegalStateExceptions into CameraCaptureSessionClosedException. CameraCaptureSessionProxy already declared this as a possible checked exception, but the AndroidCameraCaptureSessionProxy implementation never actually did the correct translation. As a result, extremely-misleading error-level logs can be output when the app is paused. Change-Id: I3f1e39bda079a04500988447dd6c24fa679cd2d0
rc/com/android/camera/one/v2/camera2proxy/AndroidCameraCaptureSessionProxy.java
rc/com/android/camera/one/v2/camera2proxy/CameraCaptureSessionClosedException.java
rc/com/android/camera/one/v2/camera2proxy/CameraCaptureSessionProxy.java
|
c47442db477392e296bfb18e3ac953df0e16d5c5 |
30-Jan-2015 |
Paul Rohde <codelogic@google.com> |
Disable the touch to focus sound. Bug: 18898692 Change-Id: Idd9485971dd6bd9a8175f79455691ef1e56e89f8
rc/com/android/camera/ui/focus/FocusController.java
|
529f3777bf514020de0455820639bb32cd1631a6 |
30-Jan-2015 |
Puneet Lall <puneetl@google.com> |
Merge "Fix bug in counting open images" into ub-camera-haleakala
|
1738db31add0aea5a6a6f2c137ca6fc476a10237 |
30-Jan-2015 |
Puneet Lall <puneetl@google.com> |
Fix bug in counting open images Bug: 19156045 AndroidImageReaderProxy previously would return an instance of itself via onImageAvailable. This caused a problem because it bypassed the LoggingImageReaderProxy and CloseWhenDoneImageReaderProxy decorators. This change also includes additional minor fixes for potential issues, specifically, it also synchronizes access to each android.media.Image and ImageReader because they are not thread-safe. Change-Id: I0d76c07ae37b09cdec40f7d7789b49f7397fb414
rc/com/android/camera/debug/Loggers.java
rc/com/android/camera/one/v2/CloseWhenDoneImageReader.java
rc/com/android/camera/one/v2/LoggingImageReader.java
rc/com/android/camera/one/v2/SimpleOneCameraFactory.java
rc/com/android/camera/one/v2/ZslOneCameraFactory.java
rc/com/android/camera/one/v2/camera2proxy/AndroidImageProxy.java
rc/com/android/camera/one/v2/camera2proxy/AndroidImageReaderProxy.java
rc/com/android/camera/one/v2/camera2proxy/ForwardingImageProxy.java
rc/com/android/camera/one/v2/camera2proxy/ImageProxy.java
rc/com/android/camera/one/v2/camera2proxy/ImageReaderProxy.java
rc/com/android/camera/one/v2/sharedimagereader/imagedistributor/ImageDistributorFactory.java
rc/com/android/camera/one/v2/sharedimagereader/imagedistributor/ImageDistributorOnImageAvailableListener.java
rc/com/android/camera/one/v2/sharedimagereader/imagedistributor/RefCountedImageProxy.java
rc/com/android/camera/one/v2/sharedimagereader/metadatasynchronizer/MetadataReleasingImageQueue.java
rc/com/android/camera/one/v2/sharedimagereader/util/TicketImageProxy.java
|
a9be9d1a30c594e1489505d36e83cf91e332c60b |
30-Jan-2015 |
Senpo Hu <senpo@google.com> |
Merge "Trigger hit state animation when clicking on capture indicator." into ub-camera-haleakala
|
cb8f66b4953e4fed4a0cd5133c2914b26097c133 |
28-Jan-2015 |
Senpo Hu <senpo@google.com> |
Trigger hit state animation when clicking on capture indicator. Bug: 18905659 Change-Id: I78131ded35e7663e159ec378a50603fa4cc23434
rc/com/android/camera/app/CameraAppUI.java
rc/com/android/camera/widget/RoundedThumbnailView.java
|
57adcfae20e3466425f5c26777922fc491d08890 |
30-Jan-2015 |
Alan Newberger <alann@google.com> |
Merge "Avoid building FilmstripItems when data is null" into ub-camera-haleakala
|
93a8139a1c8c1fd738ad71918585268b5a5beba3 |
29-Jan-2015 |
Alan Newberger <alann@google.com> |
Log suppression for JVM tests Allow JVM tests to suppress logs, and thus any calls to Android specific classes. Static accessors to logs is a common idiom in Android, rather than overhaul the entire app to inject Loggers, take advantage of our existing proxy and allow tests to suppress Android specific class calls (to Context and android.util.Log). Change-Id: I1b0d266326fc3ecc4791b9bc4b3b69eac8110dc2
rc/com/android/camera/debug/Log.java
|
539eff07760146baebb2331156a4e22a4b1472a4 |
29-Jan-2015 |
Alan Newberger <alann@google.com> |
Avoid building FilmstripItems when data is null Items should not have null data. Code exists to handle null items generated, and skip them, but if data is null, items are still added to caches and cause exceptions later. Bug: 19097423 Change-Id: I171ec40369cdcc5a5567968380a600943d4991e4
rc/com/android/camera/data/FilmstripContentQueries.java
rc/com/android/camera/data/PhotoDataFactory.java
rc/com/android/camera/data/PhotoItemFactory.java
rc/com/android/camera/data/VideoItemFactory.java
|
6c3a702472798d446049bd6241851f3ae8775b57 |
27-Jan-2015 |
Puneet Lall <puneetl@google.com> |
Fix flash implementation Bug: 19132962 Change-Id: Ifdf4c9694bc503c8b902386f380ae1a39e7824d0
rc/com/android/camera/one/v2/ZslOneCameraFactory.java
rc/com/android/camera/one/v2/autofocus/AETriggerResult.java
rc/com/android/camera/one/v2/autofocus/AETriggerStateMachine.java
rc/com/android/camera/one/v2/autofocus/AFTriggerResult.java
rc/com/android/camera/one/v2/autofocus/AFTriggerStateMachine.java
rc/com/android/camera/one/v2/autofocus/FullAFScanCommand.java
rc/com/android/camera/one/v2/autofocus/TriggerStateMachine.java
rc/com/android/camera/one/v2/photo/ConvergedImageCaptureCommand.java
|
795e2b520b9469638b1170a76a4f5087b2fd760b |
28-Jan-2015 |
Sascha Haeberling <haeberling@google.com> |
Merge "Make sure to always use ZSL frames for capture." into ub-camera-haleakala
|
a9b1dfc158c60fa985bb92c83e348288da6ee066 |
28-Jan-2015 |
Paul Rohde <codelogic@google.com> |
Merge "Convert Logger from a class to an interface." into ub-camera-haleakala
|
5529153df9ab23a2f47cb4f8b49279e8381aeddd |
28-Jan-2015 |
Sascha Haeberling <haeberling@google.com> |
Make sure to always use ZSL frames for capture. Bug: 19166357 This fixes an issue on the N9 which does SW NR with TEMPLATE_STILL_CAPTURE, which stalls the whole camera image reading pipeline for a long time. And in general we should probably not take pictures with potentially differenty qualities for ZSL and while waiting for 3A to converge. M will solve this issue with the introduction of the reprocessing pipeline. Change-Id: Ic444884f5dad6ecff44d0a6b7c7a118f0242bef2
rc/com/android/camera/one/v2/photo/ConvergedImageCaptureCommand.java
rc/com/android/camera/one/v2/photo/PictureTakerFactory.java
rc/com/android/camera/one/v2/photo/ZslPictureTakerFactory.java
|
e2e8678196dba840e9da8f6bd698d0f269514827 |
28-Jan-2015 |
Spike Sprague <spikuru@google.com> |
Merge "set default flashMode and focusMode onto Camera Settings add null checks when accessing flashMode and focusMode" into ub-camera-haleakala
|
a19ffced0ec4d1392b5abd31a47001b279d25f8b |
28-Jan-2015 |
Spike Sprague <spikuru@google.com> |
set default flashMode and focusMode onto Camera Settings add null checks when accessing flashMode and focusMode bug: 18200939 Change-Id: I622deed48764ff42b5db9a7313c5bdf3253d3f69
rc/com/android/camera/PhotoModule.java
|
1e123ea83881996b6c5ac3e29702050cc42d43ad |
28-Jan-2015 |
Paul Rohde <codelogic@google.com> |
Convert Logger from a class to an interface. This set of changes makes it easier to insert any Logger implementation into a method and to ask for instances during object creation so that objects that require logging and testing can be easily tested. - Add Loggers for individual Logger types. - Add static methods for existing TagLogger. - Add NoOp logger implementation. Change-Id: I30c03667c88214cff03521d0a1f6fa3b00851a68
rc/com/android/camera/debug/Logger.java
rc/com/android/camera/debug/Loggers.java
rc/com/android/camera/one/v2/LoggingImageReader.java
rc/com/android/camera/one/v2/ZslOneCameraFactory.java
|
d674f58cae699f644333ec4a15a391d8bf59c9fd |
28-Jan-2015 |
Spike Sprague <spikuru@google.com> |
Merge "Hide accessibility buttons in Intent Capture Hide options button during Intent Review" into ub-camera-haleakala
|
7958adbe3efde0b05283772fd7a8a5d95f80e6ca |
28-Jan-2015 |
Spike Sprague <spikuru@google.com> |
Merge "Fix content description for video intent review playback button." into ub-camera-haleakala
|
c989d417a53341b144e9f78304270ac66f8f5813 |
28-Jan-2015 |
Spike Sprague <spikuru@google.com> |
Fix content description for video intent review playback button. bug: 18760510 Change-Id: I59773006d8075e957451082ca0fcc11c3c417f30
es/values/strings.xml
rc/com/android/camera/ButtonManager.java
rc/com/android/camera/app/CameraAppUI.java
|
b45f618d4a3aa068766be8741213080532feaaff |
13-Jan-2015 |
Spike Sprague <spikuru@google.com> |
Hide accessibility buttons in Intent Capture Hide options button during Intent Review bug: 18739652 Change-Id: I6ea912f811e3363c5e1454ad62c6645d7669003f
rc/com/android/camera/app/CameraAppUI.java
|
9e287572634591b2c81a09ad6c50ed293a40715d |
28-Jan-2015 |
I-Jong Lin <ijonglin@google.com> |
Merge "Fix for Ripple on Fast Thumbnail Indicator" into ub-camera-haleakala
|
ef9d4ef785e0b2671ef7fc47a347a53f027bb8a9 |
28-Jan-2015 |
Puneet Lall <puneetl@google.com> |
Merge "Ignore duplicate calls to Image.close()" into ub-camera-haleakala
|
326495c5c02876984c6ef5fd7531b7139eaa5dd7 |
28-Jan-2015 |
Puneet Lall <puneetl@google.com> |
Ignore duplicate calls to Image.close() Bug: 19156045 Change-Id: I78d4dea216b50c0edd3f8784a5aaafc4647568d0
rc/com/android/camera/one/v2/CloseWhenDoneImageReader.java
|
04f6bcb60fde3cfd12097509a1fb0b57a4248660 |
27-Jan-2015 |
I-Jong Lin <ijonglin@google.com> |
Fix for Ripple on Fast Thumbnail Indicator There was a cute optimization was to start the ripple animation, and then fill in the bitmap in 30ms after the bitmap was computed. However, when the system is overloaded, the bitmap is not necessarily computed in 30ms, and an empty ripple can result. Put in a more conservative fix, when the ripple only starts when the bitmap has already been computed. Bug: 19132963 Change-Id: Id39257a1d75342c78385bac8682462e8875d97f7
rc/com/android/camera/CaptureModule.java
rc/com/android/camera/one/OneCamera.java
rc/com/android/camera/one/v2/imagesaver/JpegImageBackendImageSaver.java
rc/com/android/camera/one/v2/imagesaver/YuvImageBackendImageSaver.java
rc/com/android/camera/processing/imagebackend/TaskConvertImageToRGBPreview.java
|
18f47b3f23123037a9d49cf220c90a6bfd372228 |
24-Jan-2015 |
Spike Sprague <spikuru@google.com> |
Make CaptureModule obey camera characteristics when reporting flash support bug: 19018131 Change-Id: If891bc410a99452dfe0fadc6545e41c3853f5639
rc/com/android/camera/CaptureModule.java
|
9a06f14042dd3a2896a33f47afb8fded1789d74f |
27-Jan-2015 |
Puneet Lall <puneetl@google.com> |
Consolidate camera logging Consolidates logging and removes misleading stack traces when commands are interrupted due to an application pause. Bug: 19156045 Change-Id: I92eea8df1d3bbce048bac02689a14d2240aad2be
rc/com/android/camera/one/v2/commands/LoggingCameraCommand.java
rc/com/android/camera/one/v2/photo/PictureTakerImpl.java
|
3c2c50c761de241085c81886b21575cfdec169b8 |
27-Jan-2015 |
Puneet Lall <puneetl@google.com> |
Change/fix flash behavior when taking photos * Ignore ZSL images when flash is ON (Bug: 19151455) * Ignore AE state when flash is OFF (Bug: 19151502) Change-Id: I2e27eb9b7573beab352fba89c02805447d009c80
rc/com/android/camera/one/v2/ZslOneCameraFactory.java
rc/com/android/camera/one/v2/photo/FlashBasedPhotoCommand.java
rc/com/android/camera/one/v2/photo/FrameExposureResponseListener.java
rc/com/android/camera/one/v2/photo/ZslPictureTakerFactory.java
rc/com/android/camera/one/v2/photo/zsl/AcceptableZslImageFilter.java
rc/com/android/camera/one/v2/photo/zsl/ZslImageCaptureCommand.java
rc/com/android/camera/one/v2/photo/zsl/ZslImageCaptureCommandFactory.java
|
5175aa7004ce87bf87763e22c4fc938463161cc8 |
24-Jan-2015 |
Senpo Hu <senpo@google.com> |
Merge "Fix NPE crash in RoundedThumbnailView." into ub-camera-haleakala
|
30eda38142fd279e0f10796e39f469d97f2a5b43 |
24-Jan-2015 |
Senpo Hu <senpo@google.com> |
Fix NPE crash in RoundedThumbnailView. Bug: 19003975 Change-Id: I4839696e1f5c4e9b7a768ed24ad5951764cd9d66
rc/com/android/camera/widget/RoundedThumbnailView.java
|
51cafa0a35546a42c573357aa7a031a79cf9ba1b |
23-Jan-2015 |
Alan Newberger <alann@google.com> |
Fix Video thumbnail filmstrip size Video size comes in asynchronously, and after refactor wasn't wired up to query the metadata instead of the initial mediastore size. This CL hides FilmstripItemData dimensions behind FilmstripItem so that VideoItem can override and provide a Size via its existing methods that use metadata if present. Bug: 19000322 Change-Id: Ifddd6c90169c80d9fd69a1549e1086d5f1abfd85
rc/com/android/camera/data/FilmstripItem.java
rc/com/android/camera/data/FilmstripItemBase.java
rc/com/android/camera/data/FilmstripItemData.java
rc/com/android/camera/data/PlaceholderItem.java
rc/com/android/camera/data/SessionItem.java
rc/com/android/camera/data/VideoItem.java
rc/com/android/camera/widget/FilmstripView.java
|
410e8a8ea9df5826a943af156cb62992bc5342cb |
23-Jan-2015 |
Spike Sprague <spikuru@google.com> |
Merge "add isFlashSUpported() to OneCameraCharacteristics, make it work with API 1 and API 2" into ub-camera-haleakala
|
88559ffac9fe0d3b00614475b45417e74c7d0678 |
23-Jan-2015 |
Spike Sprague <spikuru@google.com> |
add isFlashSUpported() to OneCameraCharacteristics, make it work with API 1 and API 2 bug: 19018131 Change-Id: I0d4157688e6219f9d6f5827c19938e90d3831bdf
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/CaptureModule.java
rc/com/android/camera/app/CameraAppUI.java
rc/com/android/camera/one/OneCameraCharacteristics.java
rc/com/android/camera/one/OneCameraManager.java
rc/com/android/camera/one/v1/OneCameraCharacteristicsImpl.java
rc/com/android/camera/one/v1/OneCameraManagerImpl.java
rc/com/android/camera/one/v2/OneCameraCharacteristicsImpl.java
|
abf1e994d236a65180eecfcb6997003ab12795df |
21-Jan-2015 |
Sascha Haeberling <haeberling@google.com> |
CaptureSession can now be started with an empty placeholder. Bug: 19014774 Bug: 18853119 Bug: 18979823 Being able to start with an empty placeholder and then updating that placeholder allows us to add a visual entry to the filmstrip early on. This avoid jarring effects where after taking many apid fire shots and going to filmstrip, the entries are appearing one after the other. This was caused by sessions only getting started when the thumbnail was produced, which can take a while when multiple shots are in the encoding pipeline. Also contains changes that make CaptureSession testable. Change-Id: I3d44704099be81524f8e165f3f09de6eebfc147b
es/values/colors.xml
rc/com/android/camera/CaptureModule.java
rc/com/android/camera/Storage.java
rc/com/android/camera/app/CameraServicesImpl.java
rc/com/android/camera/data/FilmstripItem.java
rc/com/android/camera/data/FilmstripItemBase.java
rc/com/android/camera/data/SessionItem.java
rc/com/android/camera/one/v2/OneCameraImpl.java
rc/com/android/camera/one/v2/OneCameraZslImpl.java
rc/com/android/camera/one/v2/imagesaver/JpegImageBackendImageSaver.java
rc/com/android/camera/one/v2/imagesaver/YuvImageBackendImageSaver.java
rc/com/android/camera/processing/ProcessingService.java
rc/com/android/camera/session/CaptureSession.java
rc/com/android/camera/session/CaptureSessionManager.java
rc/com/android/camera/session/CaptureSessionManagerImpl.java
rc/com/android/camera/session/PlaceholderManager.java
rc/com/android/camera/session/SessionStorageManager.java
rc/com/android/camera/session/SessionStorageManagerImpl.java
|
a6bfec1e1e6eec96fa33a1e40ae9841e95a24280 |
23-Jan-2015 |
Alan Newberger <alann@google.com> |
Merge "Remove placeholders from filmstrip methods, add PhotoItem/SessionItem integration" into ub-camera-haleakala
|
5e1069fed3d2067a9dbcd8a76b46c60a2d4743dc |
23-Jan-2015 |
Puneet Lall <puneetl@google.com> |
Merge "Fix build breakage" into ub-camera-haleakala
|
e313156adda85d4977d6ce7d7d0875bcecd2806b |
23-Jan-2015 |
Puneet Lall <puneetl@google.com> |
Fix build breakage Fix build breakage due to "Enable testing of ZslSharedImageReaderFactory" Change-Id: I0e1da855a71f5ab83c65bdfb8b1e76cfd9199e3c
rc/com/android/camera/one/v2/core/FrameServerFactory.java
|
2edaa2079a342f6411e07528576f54a8720f80e1 |
23-Jan-2015 |
Puneet Lall <puneetl@google.com> |
Merge "Enable testing of ZslSharedImageReaderFactory" into ub-camera-haleakala
|
a8c94d5c059db2598caca676f0cab47a997ef631 |
23-Jan-2015 |
Puneet Lall <puneetl@google.com> |
Enable testing of ZslSharedImageReaderFactory * Migrate from CloseableHandlerThread to HandlerFactory to remove all direct dependencies on the platform. Change-Id: I3d6aca94cd6f9559596d157b86c174bfb8801f90
rc/com/android/camera/async/CloseableHandlerThread.java
rc/com/android/camera/one/v2/SimpleOneCameraFactory.java
rc/com/android/camera/one/v2/ZslOneCameraFactory.java
rc/com/android/camera/one/v2/sharedimagereader/SharedImageReaderFactory.java
rc/com/android/camera/one/v2/sharedimagereader/ZslSharedImageReaderFactory.java
rc/com/android/camera/one/v2/sharedimagereader/imagedistributor/ImageDistributorFactory.java
|
005bb2f26e73c4c9daad41b615f6dd414396f625 |
23-Jan-2015 |
Alan Newberger <alann@google.com> |
Remove placeholders from filmstrip methods, add PhotoItem/SessionItem integration In this CL we add the ability for a PhotoItem to use a Session bitmap as a placeholder. We also move general placeholder management out of the method call stack, moving a single static initialization in CameraActivity into a field in FilmstripItemBase for use by FilmstripItems. Bug: 18977838 Change-Id: Ic1b0dc11fd0e4c85b9b310235e6d3122cf1543ce
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/data/CameraFilmstripDataAdapter.java
rc/com/android/camera/data/FilmstripItem.java
rc/com/android/camera/data/FilmstripItemBase.java
rc/com/android/camera/data/FixedFirstProxyAdapter.java
rc/com/android/camera/data/FixedLastProxyAdapter.java
rc/com/android/camera/data/PhotoItem.java
rc/com/android/camera/data/PlaceholderItem.java
rc/com/android/camera/data/SessionItem.java
rc/com/android/camera/data/VideoItem.java
|
5c1db74d807c64e7917d927b532cd109c697ce35 |
20-Jan-2015 |
Paul Rohde <codelogic@google.com> |
Make most app services lazy. Change-Id: I476914b1ed399f8ad727ac33782229cdf39d378f
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/CaptureModule.java
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/VideoModule.java
rc/com/android/camera/app/CameraApp.java
rc/com/android/camera/app/CameraServicesImpl.java
rc/com/android/camera/processing/ProcessingService.java
rc/com/android/camera/processing/ProcessingServiceManager.java
rc/com/android/camera/settings/ManagedSwitchPreference.java
rc/com/android/camera/tinyplanet/TinyPlanetFragment.java
rc/com/android/camera/util/CameraUtil.java
|
e956d1a46cb6edd6ab78f65f446b2120dd9b8940 |
23-Jan-2015 |
Alan Newberger <alann@google.com> |
Merge "Reduce view add/removes when loading photos" into ub-camera-haleakala
|
91fbd8cb64a5aa9ec67e04c94c76a94c82033406 |
23-Jan-2015 |
Puneet Lall <puneetl@google.com> |
Merge "Wait for AE/AF convergence before taking pictures" into ub-camera-haleakala
|
4dc301a073dab22b9bc12e0b846530d3a80bf8f7 |
15-Jan-2015 |
I-Jong Lin <ijonglin@google.com> |
Image Backend Integration w/ Simple Camera Wiring for cameras that only deliver compressed JPEG artifacts. This CL was tested by enabling it on the Nexus 5. Currently, the code in this CL is NOT exposed in any known Nexus Camera model. The two unexposed bugs are as follows: an camera initialization bug on Nexus 4, and a cross-device functional issue with the SimpleCameraOneFactory object in that it doesn't request a JPEG compression artifact from the HAL with zero orientation. Bug: 18908116 Change-Id: If7080c4e8e52a329fb9a6fed52f7c31541758afb
rc/com/android/camera/CaptureModule.java
rc/com/android/camera/module/ModulesInfo.java
rc/com/android/camera/one/OneCameraManager.java
rc/com/android/camera/one/v1/OneCameraManagerImpl.java
rc/com/android/camera/one/v2/OneCameraManagerImpl.java
rc/com/android/camera/one/v2/imagesaver/JpegImageBackendImageSaver.java
rc/com/android/camera/one/v2/imagesaver/YuvImageBackendImageSaver.java
rc/com/android/camera/processing/imagebackend/ImageBackend.java
rc/com/android/camera/processing/imagebackend/ImageConsumer.java
rc/com/android/camera/processing/imagebackend/TaskChainedCompressImageToJpeg.java
rc/com/android/camera/processing/imagebackend/TaskCompressImageToJpeg.java
rc/com/android/camera/processing/imagebackend/TaskConvertImageToRGBPreview.java
rc/com/android/camera/processing/imagebackend/TaskPreviewChainedJpeg.java
rc/com/android/camera/util/ApiHelper.java
rc_pd/com/android/camera/one/v2/OneCameraCreator.java
|
f0eda77c4651a436420d8b9a958f8f83e1e89800 |
23-Jan-2015 |
Puneet Lall <puneetl@google.com> |
Merge "Close ImageReaders after the camera is closed" into ub-camera-haleakala
|
8e29072ca69229a25dc4a856e3635d131613f4ca |
22-Jan-2015 |
Alan Newberger <alann@google.com> |
Reduce view add/removes when loading photos Two fixes to reduce flicker when loading images. First, adjust ViewItem instances in-place instead of creating new ViewItems which included adding and removing views from the hierarchy. It turned out we were doing an update for every photo due to touching PanoramaMetadata and reporting back that metadata was adjusted, whether or not a photo was a panorama. Now that data is reported. New photo captures are essentially added and removed from the view hierarchy three times before this change, after an ImageView is added once, with its contents changed as the photo is loaded. More testing is needed but I cannot repro the elusive filmstrip flicker with these changes. Bug: 18977838 Bug: 17905863 Change-Id: I5a42c0baf87a8cef0ee4dbcf9f03d40715e6aa2d
rc/com/android/camera/data/MetadataLoader.java
rc/com/android/camera/data/PanoramaMetadataLoader.java
rc/com/android/camera/data/RgbzMetadataLoader.java
rc/com/android/camera/data/VideoRotationMetadataLoader.java
rc/com/android/camera/widget/FilmstripView.java
|
b8397360d318edf3093b20b2b102207d76730e1b |
14-Jan-2015 |
Puneet Lall <puneetl@google.com> |
Close ImageReaders after the camera is closed Bug: 18841114 Change-Id: Ifc0b79e70059efd8f8ace2c29243406b524ad918
rc/com/android/camera/async/ForwardingBufferQueue.java
rc/com/android/camera/async/ForwardingObservable.java
rc/com/android/camera/debug/Logger.java
rc/com/android/camera/one/v2/CloseWhenDoneImageReader.java
rc/com/android/camera/one/v2/LoggingImageReader.java
rc/com/android/camera/one/v2/SimpleOneCameraFactory.java
rc/com/android/camera/one/v2/ZslOneCameraFactory.java
rc/com/android/camera/one/v2/camera2proxy/AndroidImageProxy.java
rc/com/android/camera/one/v2/camera2proxy/AndroidImageReaderProxy.java
rc/com/android/camera/one/v2/camera2proxy/CameraDeviceProxy.java
rc/com/android/camera/one/v2/camera2proxy/ForwardingImageProxy.java
rc/com/android/camera/one/v2/camera2proxy/ForwardingImageReader.java
rc/com/android/camera/one/v2/camera2proxy/ImageReaderProxy.java
rc/com/android/camera/one/v2/initialization/InitializedOneCameraFactory.java
rc/com/android/camera/one/v2/sharedimagereader/SharedImageReaderFactory.java
rc/com/android/camera/one/v2/sharedimagereader/ZslSharedImageReaderFactory.java
rc/com/android/camera/one/v2/sharedimagereader/imagedistributor/ImageDistributorFactory.java
rc/com/android/camera/one/v2/sharedimagereader/imagedistributor/ImageDistributorOnImageAvailableListener.java
|
875d9fff24e283efa5d95ad75c3fab074e489fa4 |
15-Jan-2015 |
Puneet Lall <puneetl@google.com> |
Wait for AE/AF convergence before taking pictures Bug: 18997124 Change-Id: I27b06186acde05c81d31042f330b6dabeac865cf
rc/com/android/camera/async/Observables.java
rc/com/android/camera/async/UpdatableCountDownLatch.java
rc/com/android/camera/one/v2/autofocus/AETriggerStateMachine.java
rc/com/android/camera/one/v2/autofocus/AFTriggerStateMachine.java
rc/com/android/camera/one/v2/autofocus/FullAFScanCommand.java
rc/com/android/camera/one/v2/autofocus/TriggerStateMachine.java
rc/com/android/camera/one/v2/autofocus/TriggeredAFScanStateResponseListener.java
rc/com/android/camera/one/v2/camera2proxy/CameraDeviceProxy.java
rc/com/android/camera/one/v2/commands/LoggingCameraCommand.java
rc/com/android/camera/one/v2/common/FrameworkFailureResponseListener.java
rc/com/android/camera/one/v2/common/TimestampResponseListener.java
rc/com/android/camera/one/v2/common/TotalCaptureResultResponseListener.java
rc/com/android/camera/one/v2/core/RequestBuilder.java
rc/com/android/camera/one/v2/core/ResponseListener.java
rc/com/android/camera/one/v2/core/ResponseListeners.java
rc/com/android/camera/one/v2/photo/ConvergedImageCaptureCommand.java
rc/com/android/camera/one/v2/photo/FlashBasedPhotoCommand.java
rc/com/android/camera/one/v2/photo/FrameExposureResponseListener.java
rc/com/android/camera/one/v2/photo/LegacyPictureTakerFactory.java
rc/com/android/camera/one/v2/photo/PictureTakerFactory.java
rc/com/android/camera/one/v2/photo/SimpleImageCaptureCommand.java
rc/com/android/camera/one/v2/photo/ZslPictureTakerFactory.java
rc/com/android/camera/one/v2/sharedimagereader/AllocatingImageStream.java
rc/com/android/camera/one/v2/sharedimagereader/ImageStreamFactory.java
rc/com/android/camera/one/v2/sharedimagereader/SingleAllocationImageStream.java
|
93864cf39dfe25c27b41fb327d590dc31ff69fe5 |
22-Jan-2015 |
Alan Newberger <alann@google.com> |
Merge "Add typing to cursor item factories" into ub-camera-haleakala
|
e0457cfc20c974c7327aacf64456f32da4dca32b |
22-Jan-2015 |
Paul Rohde <codelogic@google.com> |
Fix camera2 LogHelper signature mismatch. Change-Id: Ibb37baad498bfebbab9f0451af4d5a95ac45dabe
rc_pd/com/android/camera/debug/LogHelper.java
|
5e5d6b7101a0d7bc1877c899c9a95c6dc05b0f7d |
22-Jan-2015 |
Paul Rohde <codelogic@google.com> |
Extended logging utilities. Change-Id: I4a49a0694495f9c03c55a9ea8fad0ed22bc45bfc
rc/com/android/camera/async/MainThread.java
rc/com/android/camera/debug/Log.java
rc/com/android/camera/debug/LogUtil.java
|
71dd56f86579b953bf13ee2617989c8ff5042eda |
22-Jan-2015 |
Alan Newberger <alann@google.com> |
Add typing to cursor item factories Add a bit of generic typing to allow clients to directly use PhotoItem or VideoItem without casting, particularly in CameraActivity.onSessionDone where explicit calls are made to the PhotoItem factory. Bug: 18977838 Change-Id: Ib5ecff2342d73ec3ce817a5f7e7fe42733ed8a71
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/data/CameraFilmstripDataAdapter.java
rc/com/android/camera/data/FilmstripContentQueries.java
rc/com/android/camera/data/FilmstripItemList.java
rc/com/android/camera/data/PhotoItemFactory.java
rc/com/android/camera/data/VideoItemFactory.java
|
8be316c7a8caf962cf3fcf5e49d332fb2718319f |
20-Jan-2015 |
Paul Rohde <codelogic@google.com> |
Make it possible for singletons that rely on application context to be initalized lazily. * Add AndroidContext * Add AndroidServices * Make LogHelper ues thread safe lazy initialization * Convert several unused fields into local variables in CameraApp. Change-Id: I9c73e9b91efb49a01d848a8cca1e8e65f059b5d0
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/CaptureModule.java
rc/com/android/camera/CaptureModuleUtil.java
rc/com/android/camera/OnScreenHint.java
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/TextureViewHelper.java
rc/com/android/camera/VideoModule.java
rc/com/android/camera/app/CameraApp.java
rc/com/android/camera/app/CameraAppUI.java
rc/com/android/camera/app/CameraController.java
rc/com/android/camera/app/LegacyLocationProvider.java
rc/com/android/camera/app/MemoryManagerImpl.java
rc/com/android/camera/app/OrientationManagerImpl.java
rc/com/android/camera/debug/Log.java
rc/com/android/camera/one/v2/OneCameraManagerImpl.java
rc/com/android/camera/processing/ProcessingService.java
rc/com/android/camera/settings/ResolutionUtil.java
rc/com/android/camera/ui/MainActivityLayout.java
rc/com/android/camera/ui/ModeListView.java
rc/com/android/camera/util/AndroidContext.java
rc/com/android/camera/util/AndroidServices.java
rc/com/android/camera/util/CameraUtil.java
rc/com/android/camera/widget/RoundedThumbnailView.java
|
33726afb96b7bc93df7549cd74600240d00cf257 |
22-Jan-2015 |
Paul Rohde <codelogic@google.com> |
Merge "Move first run detection into its own object." into ub-camera-haleakala
|
67063a294955285efd6b3f038aafecc92293f803 |
22-Jan-2015 |
Paul Rohde <codelogic@google.com> |
Move first run detection into its own object. Change-Id: I82f109e970ac871c9de54ff551176c2cd29070b4
rc/com/android/camera/app/CameraApp.java
rc/com/android/camera/app/FirstRunDetector.java
|
f00bc6d1f9d76ab649384825b66110bdb2b1b1ba |
22-Jan-2015 |
Puneet Lall <puneetl@google.com> |
Add missing copyright header Change-Id: Ia0198b9661ef5882e998ac0a6bb17cffc013057a
rc/com/android/camera/one/v2/sharedimagereader/ticketpool/ReservableTicketPool.java
|
70e853e4c6a7d78aaa3cff9c2efd17a3a1c34d38 |
20-Jan-2015 |
Radford Juang <radford@google.com> |
Merge "Fix issue where holding down shutter button sometimes does not trigger burst." into ub-camera-haleakala
|
704484c1e816f136f4d4e183245caaa55fb1bdab |
20-Jan-2015 |
Alan Newberger <alann@google.com> |
Preserve zoom on touch to focus During the full AF scan the crop region is missing from the request, so you see the preview snap back to no zoom, then back when the delayed reset occurs. This CL works, I think it's sound per AF/AE metering as they were already monitoring the crop region in their calculations, this just feeds the crop region to the request as well. Bug: 19064291 Change-Id: I5b2b90147f29abda68df80fed66685aca90a515c
rc/com/android/camera/one/v2/autofocus/ManualAutoFocusFactory.java
|
36d0bba2b446320338a8861cff8e70c62e797fac |
19-Jan-2015 |
Geoff Mendal <mendal@google.com> |
Import translations. DO NOT MERGE Change-Id: I192c17e266944cba08e062ecd291e6d139461961 Auto-generated-cl: translation import
es/values-cs/strings.xml
|
660f1fe07e090b678d3a01495fb75cdd1f3b3507 |
17-Jan-2015 |
Alan Newberger <alann@google.com> |
Merge "Check for null camera within proxy" into ub-camera-haleakala
|
30996b9b6b9db1f411b87d13906ee8db6388d488 |
17-Jan-2015 |
Alan Newberger <alann@google.com> |
Check for null camera within proxy Companion cl to ag/614134, ensures now may have a null camera rather than a potentially stale one, ensure we don't pass one into the MediaRecorder. Bug: 18414095 Change-Id: I215cd10e4322109019ea710b155121d375f82712
rc/com/android/camera/VideoModule.java
rc/com/android/camera/debug/DebugCameraProxy.java
|
e5343ae752f63129ef4a235daaabffba75d5ad9b |
16-Jan-2015 |
Radford Juang <radford@google.com> |
Fix issue where holding down shutter button sometimes does not trigger burst. This can occur when the user intends to do a long-press but finger budges slightly (e.g., 1 pixel) triggering an ACTION_MOVE event. This fix disables ACTION_MOVE events from being sent to gesture detector, allowing the long tap event to occur when slight finger movement occurs. Change-Id: Id13a7121f0a899291f031509983050d472566c80
rc/com/android/camera/ShutterButton.java
|
31a39a07a2ac48462c14553bbd4164627675476b |
17-Jan-2015 |
Puneet Lall <puneetl@google.com> |
Merge "Delete obsolete/unused interface" into ub-camera-haleakala
|
9a034a1119fbba2fa82362de74dcb671d2ce6c19 |
16-Jan-2015 |
I-Jong Lin <ijonglin@google.com> |
Framerate fix for ZSL Nexus 5, Redux Screwed up the merge last time. Need to redo this fix. Bug: 19017062 Change-Id: I52b5bb71dea71f52c7c5d3379df798931b1976c5
rc/com/android/camera/one/v2/ZslOneCameraFactory.java
|
af7ff468e4c4429c35e205ff8eed08b9de09b84f |
16-Jan-2015 |
I-Jong Lin <ijonglin@google.com> |
Fix for Camera2 Build Unfortunately, introduced in ag/612015. Change-Id: Ic4e17f8093272f7b531c526607ca974b2d456737
rc/com/android/camera/one/v2/imagesaver/YuvImageBackendImageSaver.java
|
5ce957f63f1ba49be5b68deab3c335a4cd4a3ad8 |
16-Jan-2015 |
Senpo Hu <senpo@google.com> |
Merge "Fix capture indicator on non-zsl modules." into ub-camera-haleakala
|
78276fbe6c30265d5e52df9ececb275ce898e684 |
16-Jan-2015 |
I-Jong Lin <ijonglin@google.com> |
Revert "Optimize Framerate Workaround for ZSL on Nexus 5" This reverts commit 3ec132c4429683871ffd652e2563459e5c866065. Change-Id: I269f26ce801dc730055307226479af1d6f6effd5
rc/com/android/camera/one/v2/ZslOneCameraFactory.java
|
d3f4c08da939e6a74eabec8991b28e978100c7d0 |
16-Jan-2015 |
Puneet Lall <puneetl@google.com> |
Delete obsolete/unused interface Change-Id: I5c79e3372c9950fde6d6a86e647cf38dee79c9af
rc/com/android/camera/one/OneCamera.java
|
3ec132c4429683871ffd652e2563459e5c866065 |
16-Jan-2015 |
I-Jong Lin <ijonglin@google.com> |
Optimize Framerate Workaround for ZSL on Nexus 5 Through experimentation, we have found that the framerate range [7,29] does NOT reproduce the preview jank, but still allows ZSL to be run. Bug: 19017062 Change-Id: I99f71385640f103a05f86d7a194f36712b1841d8
rc/com/android/camera/one/v2/ZslOneCameraFactory.java
|
ad38daf0897acce9f6b4a5a69e6032faf0e70aff |
16-Jan-2015 |
I-Jong Lin <ijonglin@google.com> |
Merge "Route ImageBackend JPEG Thumbnail To Wear" into ub-camera-haleakala
|
9c98680a61cc88592d96010b863c3e0adb9abbe1 |
16-Jan-2015 |
Senpo Hu <senpo@google.com> |
Fix capture indicator on non-zsl modules. The logic is accidentally changed by ag/607738. Let's revert it here. Bug: 19022139 Change-Id: Idc6fd91ff5352a464bc128b367c54ba971b16b28
rc/com/android/camera/CameraActivity.java
|
9eab2cdc9f38f06586f342ef5cf5418ebc317db8 |
13-Jan-2015 |
I-Jong Lin <ijonglin@google.com> |
Route ImageBackend JPEG Thumbnail To Wear Sends the results of JPEG compression task to a wear device if available. Need to do a little plumbing on the OneCamera.PictureSaverCallback. Bug: 18841900 Change-Id: Iec86a82d9b99e8ff9fecd208d27bfbc563af73f6
rc/com/android/camera/CaptureModule.java
rc/com/android/camera/one/OneCamera.java
rc/com/android/camera/one/v2/imagesaver/YuvImageBackendImageSaver.java
|
891a9e536a44f83ffd227e14823da4fd8700c48b |
16-Jan-2015 |
Puneet Lall <puneetl@google.com> |
Merge "Apply flash setting changes to the AE mode" into ub-camera-haleakala
|
386c5b885b99f67f9c0a7380f4be153f28333089 |
09-Jan-2015 |
Puneet Lall <puneetl@google.com> |
Apply flash setting changes to the AE mode Bug: 17216526 Change-Id: If6c03102f04ad2ba54e1a045a3ab7445aaa5b595
rc/com/android/camera/CaptureModule.java
rc/com/android/camera/app/AppController.java
rc/com/android/camera/async/ExecutorCallback.java
rc/com/android/camera/async/ForwardingObservable.java
rc/com/android/camera/async/HandlerExecutor.java
rc/com/android/camera/async/MainThread.java
rc/com/android/camera/async/Observables.java
rc/com/android/camera/one/FlashSetting.java
rc/com/android/camera/one/OneCamera.java
rc/com/android/camera/one/v2/OneCameraFactory.java
rc/com/android/camera/one/v2/OneCameraZslImpl.java
rc/com/android/camera/one/v2/SimpleOneCameraFactory.java
rc/com/android/camera/one/v2/ZslOneCameraFactory.java
rc/com/android/camera/one/v2/commands/CameraCommandExecutor.java
rc/com/android/camera/one/v2/common/BasicCameraFactory.java
rc/com/android/camera/one/v2/imagesaver/YuvImageBackendImageSaver.java
rc/com/android/camera/one/v2/photo/PictureTakerFactory.java
rc/com/android/camera/one/v2/photo/PictureTakerImpl.java
rc/com/android/camera/one/v2/photo/ZslPictureTakerFactory.java
rc/com/android/camera/settings/Setting.java
rc/com/android/camera/settings/SettingObserver.java
rc/com/android/camera/settings/SettingsManager.java
|
d7aab1856f58f13905b7e2705108795f6c2567a4 |
16-Jan-2015 |
Andy Huibers <andyhuibers@google.com> |
Move stats to new package. Change-Id: Idfab1a24c91ff4c96515f3520283c7a0512d0514
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/CaptureModule.java
rc/com/android/camera/FocusOverlayManager.java
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/VideoModule.java
rc/com/android/camera/app/CameraApp.java
rc/com/android/camera/ui/MainActivityLayout.java
rc/com/android/camera/ui/ModeListView.java
rc_pd/com/android/camera/stats/SessionStatsCollector.java
rc_pd/com/android/camera/stats/UsageStatistics.java
rc_pd/com/android/camera/util/SessionStatsCollector.java
rc_pd/com/android/camera/util/UsageStatistics.java
|
d5cdb7f36cbfc5497973e066123bd11f37e635cb |
16-Jan-2015 |
Senpo Hu <senpo@google.com> |
Merge "Move FirstRunDialog to app layer." into ub-camera-haleakala
|
5e1d854711992d2d89fe22f948b1528f063ac6b3 |
16-Jan-2015 |
Puneet Lall <puneetl@google.com> |
Merge "Add method for preallocating image-reader space" into ub-camera-haleakala
|
fb0496133a0b4b526dc70f6447bd4b97d95de95f |
12-Jan-2015 |
Senpo Hu <senpo@google.com> |
Move FirstRunDialog to app layer. The first run logic should live in CameraActivity. This refactoring could clean up CaptureModule and PhotoModule. * Introduce ResolutionSetting class. * Introduce OneCameraManagerImpl for camera API 1. Tested and verified this works on K / L devices. Change-Id: I11a968a9346b520dee23fc4591a73bb483c43246
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/CaptureModule.java
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/PhotoUI.java
rc/com/android/camera/app/AppController.java
rc/com/android/camera/app/FirstRunDialog.java
rc/com/android/camera/one/OneCameraManager.java
rc/com/android/camera/one/v1/OneCameraCharacteristicsImpl.java
rc/com/android/camera/one/v1/OneCameraManagerImpl.java
rc/com/android/camera/one/v2/OneCameraManagerImpl.java
rc/com/android/camera/settings/Keys.java
rc/com/android/camera/settings/ResolutionSetting.java
rc/com/android/camera/settings/ResolutionUtil.java
rc/com/android/camera/settings/SettingsUtil.java
rc/com/android/camera/util/ApiHelper.java
|
3d9639a1b93ee245c53bc7948ec12be4119ff08c |
16-Jan-2015 |
Alan Newberger <alann@google.com> |
Merge "Add Camera cover equivalent to windowBackground to smooth lockscreen startup" into ub-camera-haleakala
|
31f89504302fcecf25cad7b5f71de1978bdf877a |
14-Jan-2015 |
Alan Newberger <alann@google.com> |
Add Camera cover equivalent to windowBackground to smooth lockscreen startup This CL adds a windowBackground drawable equivalent to the covers shown by lockscreen and app, to remove the black screen in between. With this CL I mostly see no artifacts when opening camera from lockscreen. Some issues: * to improve memory usage in system UI holding the lockscreen preview, a vector camera blanket was added in ag/587418 to ic_camera_blanket. That works transparently everywhere so far but not in resource drawables that can only handle bitmaps in layer-list items. Split the vector and bitmaps here, which means only the lockscreen uses the vector -- this also surfaced a color mismatch between the vector and our PNG bitmaps, corrected in the new ic_camera_blanket_vector resource. This is a bit fragile as we rely on pixel match of the two resources, would like a cleaner solution but the layer-list limitation is tough -- without this change the app crashes at runtime within BitmapDrawable when the windowBackground is loaded. * likewise both the lockscreen and app covers explicitly size the bitmap, there are no provisions to do so within layer-list. Will follow up with a refactor of in-app cover (ModeTransitionView) to remove explicit sizing and then all will rely on bitmap size (per above will still need vector file size coordinated with bitmap). * current implementation relies upon a black window background, we restore that in onCreate. * Both secure camera and v21 main camera currently use the windowBackground, will submit just for secure then introduce for main camera when we always start into Camera mode. * For L explicitly set android:windowDrawsSystemBarBackgrounds to false to ensure the system preview into the DecorView doesn't take the navigation bar into account when vertically centering the cover bitmap, to make the preview identical to the other covers. Bug: 18369862 Change-Id: Ia481e2d1d94bdc5a5d39b4d35b32c29a75bf99ec
ndroidManifest.xml
es/drawable-anydpi-v21/ic_camera_blanket.xml
es/drawable-anydpi-v21/ic_camera_blanket_vector.xml
es/drawable/cover.xml
es/layout-v21/keyguard_widget.xml
es/values-v21/styles.xml
es/values/styles.xml
rc/com/android/camera/CameraActivity.java
|
67f1358059efee259a94f50e9b094a809e7cd121 |
16-Jan-2015 |
Puneet Lall <puneetl@google.com> |
Add method for preallocating image-reader space For non-zsl picture-taking, it is critical that image-reader space be allocated prior to starting the precapture AF/AE sequence. Bug: 18997124 Change-Id: Id931d687c4034dadab3aee60142b096f298216a7
rc/com/android/camera/one/v2/sharedimagereader/ImageStreamFactory.java
|
db7db57204b8c32b523c406e28f24234671468a4 |
15-Jan-2015 |
Sascha Haeberling <haeberling@google.com> |
Change visibility to allow for continuous testing. Bug: 19034273 Background: Dexmaker (through Mockito) is not able to mock package-protected classes: https://code.google.com/p/dexmaker/issues/detail?id=34 This can be reverted once we have a build system that doesn't require us wrapping JUnit tests into an APK. Change-Id: I7de59e36fa7645f9e1616e4d9c4fdda8e612e9bc
rc/com/android/camera/one/v2/core/TagDispatchCaptureSession.java
|
a1ea88071be696ea8dee99c7bdb4007128ed60ef |
15-Jan-2015 |
I-Jong Lin <ijonglin@google.com> |
Fix for JPEG Compression w/ Unknown Orientation TaskCompressImageToJpeg blindly passed the orientation from the camera to JpegUtilNative.compressJpegFromYUV420Image, which then threw a run-time exception. Behavior for TaskCompressImageToJpeg with an image of UNKNOWN orientation is to treat it as CLOCKWISE_0 for purposes of JPEG compression. Instead of crashing, the camera now receives a JPEG of the dark image of one's tabletop. Bug: 19000723 Change-Id: I412fb6fed5d80035b180db7f6e8504d6d36b4fcc
rc/com/android/camera/processing/imagebackend/TaskCompressImageToJpeg.java
|
bbdfed96b232615ee3ae5d45a8b8c7ce12c5529e |
15-Jan-2015 |
Puneet Lall <puneetl@google.com> |
Merge "Make SettingsManager thread-safe" into ub-camera-haleakala
|
d85912a55e0a3cd7ca75337b2ee45644260f57e9 |
15-Jan-2015 |
Puneet Lall <puneetl@google.com> |
Merge "Filter ZSL images based on frame metadata" into ub-camera-haleakala
|
84bfe7508a7ae592d3b436c7b6d2f8889218113f |
14-Jan-2015 |
Puneet Lall <puneetl@google.com> |
Make SettingsManager thread-safe Required to fix bug: 17216526 Change-Id: I4e0d8dfc613a8022982d48f2086e2539f3db9596
rc/com/android/camera/settings/SettingsManager.java
|
8d3552d334196a09e20c83a5296f0b373041032c |
14-Jan-2015 |
Paul Rohde <codelogic@google.com> |
Check filmstrip scroll controller as well when deciding to load the full resolution image. b/18947934 Change-Id: I6e9558bbd8a9b5ae52207cbb9af3b575123eda1f
rc/com/android/camera/widget/FilmstripView.java
|
e3866e245b34a4b71db528dc708b88e8b764ee61 |
14-Jan-2015 |
Geoff Mendal <mendal@google.com> |
Import translations. DO NOT MERGE Change-Id: I52476dd1aa23937b316b105075fb771020351796 Auto-generated-cl: translation import
es/values-cs/strings.xml
|
4961ad31d9a877e3a68566fb5d4b33b7f79ce44e |
08-Jan-2015 |
Puneet Lall <puneetl@google.com> |
Filter ZSL images based on frame metadata Introduces a new metadatasynchronizer package with functionality for retrieving metadata (TotalCaptureResults) for images which have been added to the zsl ringbuffer. To enable unit-testing, proxy objects for CaptureRequest, CaptureResult, and TotalCaptureResult have been added, so they can now be mocked. Bug: 18964540 Change-Id: I8374350e09d33f54ff241f23fd005013ed26dab0
rc/com/android/camera/async/BufferQueueController.java
rc/com/android/camera/async/ConcurrentBufferQueue.java
rc/com/android/camera/async/ConcurrentState.java
rc/com/android/camera/async/CountableBufferQueue.java
rc/com/android/camera/async/FilteredUpdatable.java
rc/com/android/camera/async/Futures2.java
rc/com/android/camera/async/NoOp.java
rc/com/android/camera/async/RefCountedBufferQueueController.java
rc/com/android/camera/async/Updatable.java
rc/com/android/camera/async/UpdatableCountDownLatch.java
rc/com/android/camera/one/v2/SimpleOneCameraFactory.java
rc/com/android/camera/one/v2/ZslOneCameraFactory.java
rc/com/android/camera/one/v2/camera2proxy/CaptureRequestProxy.java
rc/com/android/camera/one/v2/camera2proxy/CaptureResultProxy.java
rc/com/android/camera/one/v2/camera2proxy/TotalCaptureResultProxy.java
rc/com/android/camera/one/v2/common/TotalCaptureResultResponseListener.java
rc/com/android/camera/one/v2/initialization/CameraStarter.java
rc/com/android/camera/one/v2/initialization/GenericOneCameraImpl.java
rc/com/android/camera/one/v2/initialization/MetadataCallback.java
rc/com/android/camera/one/v2/photo/FrameExposureResponseListener.java
rc/com/android/camera/one/v2/photo/ImageCaptureCommand.java
rc/com/android/camera/one/v2/photo/PictureCallbackAdapter.java
rc/com/android/camera/one/v2/photo/PictureTakerImpl.java
rc/com/android/camera/one/v2/photo/SimpleImageCaptureCommand.java
rc/com/android/camera/one/v2/photo/ZslImageCaptureCommand.java
rc/com/android/camera/one/v2/photo/ZslPictureTakerFactory.java
rc/com/android/camera/one/v2/photo/zsl/AcceptableZslImageFilter.java
rc/com/android/camera/one/v2/photo/zsl/ZslImageCaptureCommand.java
rc/com/android/camera/one/v2/photo/zsl/ZslImageCaptureCommandFactory.java
rc/com/android/camera/one/v2/sharedimagereader/TicketRequiredFilter.java
rc/com/android/camera/one/v2/sharedimagereader/ZslSharedImageReaderFactory.java
rc/com/android/camera/one/v2/sharedimagereader/metadatasynchronizer/MetadataPool.java
rc/com/android/camera/one/v2/sharedimagereader/metadatasynchronizer/MetadataPoolFactory.java
rc/com/android/camera/one/v2/sharedimagereader/metadatasynchronizer/MetadataPoolImpl.java
rc/com/android/camera/one/v2/sharedimagereader/metadatasynchronizer/MetadataReleasingImageQueue.java
rc/com/android/camera/one/v2/sharedimagereader/ringbuffer/DynamicRingBuffer.java
rc/com/android/camera/settings/Setting.java
|
4af002c781c7a85d5026e65cadf1078d49094f31 |
14-Jan-2015 |
Paul Rohde <codelogic@google.com> |
Merge "Load full resolution images for newly inserted images." into ub-camera-haleakala
|
c14b6ba434575b7d795a8cd681821f86a39bc371 |
14-Jan-2015 |
Paul Rohde <codelogic@google.com> |
Load full resolution images for newly inserted images. - Update log messages to remove filmstrip log spam. b/18947934 Change-Id: I7ee26e45ab2991ada148ce52d04899fc1d164784
rc/com/android/camera/widget/FilmstripView.java
|
0745f6eb1a8cbed85761e02839367ed8b2ff6ef6 |
14-Jan-2015 |
I-Jong Lin <ijonglin@google.com> |
Turn off message spam on ImageBackend Change-Id: Id31cb1571f7ed135c7aa74fbca37270c401ca9c1
rc/com/android/camera/processing/imagebackend/ImageBackend.java
|
1ff2ce2a1dcb1a08cd133a450c26374bf21bad48 |
14-Jan-2015 |
Puneet Lall <puneetl@google.com> |
Merge "Change ImageSaver interface to support processing bursts and thumbnails" into ub-camera-haleakala
|
4660e6c1011c47ad7f604ad1b7f5f2227171a694 |
13-Jan-2015 |
Alan Newberger <alann@google.com> |
Merge "Remove exception when releasing a requested, not yet opened camera" into ub-camera-haleakala
|
8a09cc29b273e35128a03794e82dd4f329d35cc9 |
08-Jan-2015 |
Puneet Lall <puneetl@google.com> |
Change ImageSaver interface to support processing bursts and thumbnails Bug: 18908116 Change-Id: I14863011de5c3a575bfb54758824ccfaa04cf200
rc/com/android/camera/CaptureModule.java
rc/com/android/camera/one/OneCameraManager.java
rc/com/android/camera/one/v1/OneCameraManagerImpl.java
rc/com/android/camera/one/v2/OneCameraFactory.java
rc/com/android/camera/one/v2/OneCameraManagerImpl.java
rc/com/android/camera/one/v2/SimpleOneCameraFactory.java
rc/com/android/camera/one/v2/ZslOneCameraFactory.java
rc/com/android/camera/one/v2/imagesaver/ImageSaver.java
rc/com/android/camera/one/v2/imagesaver/MostRecentImageSaver.java
rc/com/android/camera/one/v2/imagesaver/SingleImageSaver.java
rc/com/android/camera/one/v2/imagesaver/YuvImageBackendImageSaver.java
rc/com/android/camera/one/v2/photo/ImageCaptureCommand.java
rc/com/android/camera/one/v2/photo/ImageSaver.java
rc/com/android/camera/one/v2/photo/PictureTakerFactory.java
rc/com/android/camera/one/v2/photo/PictureTakerImpl.java
rc/com/android/camera/one/v2/photo/SimpleImageCaptureCommand.java
rc/com/android/camera/one/v2/photo/YuvImageBackendImageSaver.java
rc/com/android/camera/one/v2/photo/ZslImageCaptureCommand.java
rc/com/android/camera/one/v2/photo/ZslPictureTakerFactory.java
rc_pd/com/android/camera/one/v2/OneCameraCreator.java
|
ee58ed7df88c10a77c3648c6d69e99941c08ce9d |
13-Jan-2015 |
Radford Juang <radford@google.com> |
Merge "Fix crash that occurs when two consecutive smartburst captures taken." into ub-camera-haleakala
|
54fd406458c01fec7711dea3c7af3fba9d96f9ec |
12-Jan-2015 |
Shashi Shekhar <shashishekhar@google.com> |
Merge "Save media items in burst with sequential timestamps." into ub-camera-haleakala
|
f3bcfa9d5981f3afefed19aa86dd49c428de53a4 |
12-Jan-2015 |
I-Jong Lin <ijonglin@google.com> |
Merge "Enable ZSL for Nexus 5 Back Camera, 1 of 2, Redux" into ub-camera-haleakala
|
593a03b147a0388530cc63ca83e23fea6107693f |
12-Jan-2015 |
I-Jong Lin <ijonglin@google.com> |
Enable ZSL for Nexus 5 Back Camera, 1 of 2, Redux Allow ZSL implementation to be used with Nexus 5. We still need to drop the frame rate, if the current camera is facing back. Screwed up last submission. Will always build locally next time no matter how small the change. Bug: 18964282 Change-Id: I975129d7262b904f8b0b31a4cdbe95526e88a521
rc/com/android/camera/one/v2/ZslOneCameraFactory.java
|
662082d70ce8dc5f679a25322a00c2733f0339f2 |
12-Jan-2015 |
Alan Newberger <alann@google.com> |
Remove exception when releasing a requested, not yet opened camera From monkey tests, we see a spike in an exception from new device which is likely due to slow close performance. If we camera B is open, and we request camera A, B will be closed then A opened. If we release A during this process but B is not yet closed, don't crash, just let the pending underlying open of A happen and release the request. Preserve the exception for application errors where truly unrequested cameras are released. Bug: 17975345 Change-Id: I9aa3b0575e130f516cea6a3df120e4812df55bce
rc/com/android/camera/app/CameraController.java
|
39cc6d07fa2f798b3915848087d6baf77a28874f |
12-Jan-2015 |
I-Jong Lin <ijonglin@google.com> |
Merge "Revert "Enable ZSL for Nexus 5 Back Camera, 1 of 2"" into ub-camera-haleakala
|
7f876055505ae9a82734580dbc872cec9a9f838b |
12-Jan-2015 |
I-Jong Lin <ijonglin@google.com> |
Revert "Enable ZSL for Nexus 5 Back Camera, 1 of 2" This reverts commit f7803cb20b39aa48dd399c5768902593a22d3104. Change-Id: Ic9ebea1d723dc51c07bda01edd83cb2ac23dfe26
rc/com/android/camera/one/v2/ZslOneCameraFactory.java
|
cd040eb890472b749615154c2ae9e342efe769d6 |
12-Jan-2015 |
I-Jong Lin <ijonglin@google.com> |
Merge "Enable ZSL for Nexus 5 Back Camera, 1 of 2" into ub-camera-haleakala
|
f7803cb20b39aa48dd399c5768902593a22d3104 |
12-Jan-2015 |
I-Jong Lin <ijonglin@google.com> |
Enable ZSL for Nexus 5 Back Camera, 1 of 2 Allow ZSL implementation to be used with Nexus 5. We still need to drop the frame rate, if the current camera is facing back. Bug: 18964282 Change-Id: Ia733cbc7bd8766245bf668e8f9141b1ec6d5eaaf
rc/com/android/camera/one/v2/ZslOneCameraFactory.java
|
ce42965cff3c292b64de73545717bf2e696f233f |
10-Jan-2015 |
Alan Newberger <alann@google.com> |
Merge "Ensure button callbacks check lifecycle" into ub-camera-haleakala
|
f2b96b1e2325724f2a6251ec76636d26de37e730 |
10-Jan-2015 |
Senpo Hu <senpo@google.com> |
Merge "Add HeadingSensor." into ub-camera-haleakala
|
8b2a3ef10a7eea3e703397a3d94766029b0c5581 |
10-Jan-2015 |
Senpo Hu <senpo@google.com> |
Add HeadingSensor. A small step to clean up PhotoModule and CaptureModule... Bug: 17985028 Change-Id: Ic79dd5e2582479d8ed9705e8150c4438e39116c8
rc/com/android/camera/CaptureModule.java
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/hardware/HeadingSensor.java
|
22662ec73aed82eddb8e119f3f7b4a08d6a7af29 |
12-Dec-2014 |
Shashi Shekhar <shashishekhar@google.com> |
Save media items in burst with sequential timestamps. Save media items with at least one second difference for burst. Change-Id: I332a4f19ef754dcf4e82ee9c5725e09ef147bb24
rc/com/android/camera/burst/BurstFacadeImpl.java
|
30ef96534cc65c0ba4665f6da2fc36e879edf196 |
08-Jan-2015 |
I-Jong Lin <ijonglin@google.com> |
Passing an intermediate preview to the session. Generalized the image thumbnail preview task to create artifacts of multiple shape. Added this task before the full-sized JPEG decode. Added a field in the TaskInfo to specify the purpose of the imaging artifacts on the listener, since the processing of an image may result in multiple uncompressed/compress artifacts and need extra explicit identification to be properly routed by listener. Changed the default behavior of the ImageBackend to produce an intermediate-sized preview on job submission. Routed this intermediate-sized preview to the CaptureSession for an earlier Filmstrip update. Bug: 18841584 Change-Id: I8db2d3a7c30cddd1e0e9ddf0709b7867f841b056
rc/com/android/camera/one/v2/photo/YuvImageBackendImageSaver.java
rc/com/android/camera/processing/imagebackend/ImageBackend.java
rc/com/android/camera/processing/imagebackend/ImageProcessorProxyListener.java
rc/com/android/camera/processing/imagebackend/TaskChainedCompressImageToJpeg.java
rc/com/android/camera/processing/imagebackend/TaskCompressImageToJpeg.java
rc/com/android/camera/processing/imagebackend/TaskConvertImageToRGBPreview.java
rc/com/android/camera/processing/imagebackend/TaskImageContainer.java
rc/com/android/camera/processing/imagebackend/TaskJpegEncode.java
rc/com/android/camera/processing/imagebackend/TaskPreviewChainedJpeg.java
|
2356bd78cfeb51977845155b580104ce959083f2 |
10-Jan-2015 |
Alan Newberger <alann@google.com> |
Ensure button callbacks check lifecycle The button callbacks are asynchronous behind animators. Most in the codebase (i.e., all in CaptureModule) do paused checks, but the one in CameraAppUI for grid lines did not and is causing lots of feedback reports with null SettingsManagers (done in the activity onDestroy). Audited codebase, these two instances were the only ones not checking. Bug: 17905718 Change-Id: I31c26088ef1e7d600b4e3be42950b0ca70613e20
rc/com/android/camera/VideoModule.java
rc/com/android/camera/app/CameraAppUI.java
|
04c72e48f9b0a4600b8ecf4fbd57d4b9b4185e35 |
09-Jan-2015 |
Shashi Shekhar <shashishekhar@google.com> |
Merge "Change IllegalStateException to a log." into ub-camera-haleakala
|
bc735745e301191389d95c3e46e4cc2f78b424d0 |
09-Jan-2015 |
Senpo Hu <senpo@google.com> |
Add OneCamera.PictureSaverCallback. Remove the undesirable dependency between ImageBackend and CameraAppUI. Create a new interface rather than using PictureCallback since at some points we might consider retiring it. Change-Id: I6e02564c9ca9990aa847902d86806f8bbd9cd652
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/CaptureModule.java
rc/com/android/camera/one/OneCamera.java
rc/com/android/camera/one/v2/photo/ImageSaver.java
rc/com/android/camera/one/v2/photo/PictureTakerImpl.java
rc/com/android/camera/one/v2/photo/YuvImageBackendImageSaver.java
rc/com/android/camera/processing/imagebackend/ImageBackend.java
|
ed16f0c6b8bf7424054675d861ec29b3107826de |
09-Jan-2015 |
Shashi Shekhar <shashishekhar@google.com> |
Change IllegalStateException to a log. Change SurfaceTextureConsumer to ignore new frames when wrapped surface is null. Change-Id: I952bdb96c0debc53a0f1548fb66b3221f65f6f7f
rc/com/android/camera/gl/SurfaceTextureConsumer.java
|
fc1394dd9690497178ae1088468e08d13bf0423a |
09-Jan-2015 |
Senpo Hu <senpo@google.com> |
Fix placeholder bug. Bug: 18947927 Change-Id: I08542d614b15f31398150ea52caa6055ec63ccfb
rc/com/android/camera/processing/imagebackend/TaskCompressImageToJpeg.java
|
5d3ba3ed6a4046904237cac0b60189025209da16 |
08-Jan-2015 |
Radford Juang <radford@google.com> |
Fix crash that occurs when two consecutive smartburst captures taken. Change-Id: I771afdd180a0d162b2a8b3c0fc4b8e4cb04baaf0
rc/com/android/camera/burst/BurstFacadeImpl.java
|
10ab1989c2475d137a6db36a4d78d8b68fadf96b |
08-Jan-2015 |
Paul Rohde <codelogic@google.com> |
Merge "Refactor the filmstrip backing data." into ub-camera-haleakala
|
e250f88bc01267f03ae3ae192698b0f07c9e425b |
08-Jan-2015 |
Puneet Lall <puneetl@google.com> |
Fix bug in ReservableTicketPool not being fair Calls to acquire() by multiple threads could previously violate fairness and result in starvation in extreme cases. The associated unit-test was previously flaky and failed only occasionally. Change-Id: I7ae9bead2ac3cb6d7e81e88076bef2ea08e7d368
rc/com/android/camera/one/v2/sharedimagereader/ticketpool/ReservableTicketPool.java
|
f0e0f1fe9608ba829e1d6d44086fc063d7e98d9a |
08-Jan-2015 |
Senpo Hu <senpo@google.com> |
Merge "Instantiate a ImageSaver.Builder in CaptureModule." into ub-camera-haleakala
|
5aa7eb2930b813c97f3754d93fe7fa978651887b |
08-Jan-2015 |
Senpo Hu <senpo@google.com> |
Instantiate a ImageSaver.Builder in CaptureModule. We will need different image savers for capture intent. Since we plan to create a separate module for capture intent, this change allows modules to be able to choose a different builder. Bug: 18726217 Change-Id: I5871263123b06958d902cc8e3a4d911f14c83e66
rc/com/android/camera/CaptureModule.java
rc/com/android/camera/one/OneCameraManager.java
rc/com/android/camera/one/v1/OneCameraManagerImpl.java
rc/com/android/camera/one/v2/OneCameraFactory.java
rc/com/android/camera/one/v2/OneCameraManagerImpl.java
rc/com/android/camera/one/v2/SimpleOneCameraFactory.java
rc/com/android/camera/one/v2/ZslOneCameraFactory.java
rc/com/android/camera/processing/imagebackend/TaskCompressImageToJpeg.java
rc/com/android/camera/processing/imagebackend/TaskJpegEncode.java
rc_pd/com/android/camera/one/v2/OneCameraCreator.java
|
24145c4efbd4c48ca0558967b0bf02022b70e878 |
08-Jan-2015 |
I-Jong Lin <ijonglin@google.com> |
Merge "Image Plane Proxy for Image Content Testability" into ub-camera-haleakala
|
6e981cafa9cc57ebc7100cb84f68fb74dbd163da |
07-Jan-2015 |
I-Jong Lin <ijonglin@google.com> |
Image Plane Proxy for Image Content Testability Adds in an Image Plane wrapper level so that image content can be decoupled from the native Android Image objects whose constructors are privated and cannot be extended. Change-Id: Ia16418d18010e672f6c3e5db64bb7f6a9b3b2f3e
rc/com/android/camera/one/v2/ImageCaptureManager.java
rc/com/android/camera/one/v2/camera2proxy/AndroidImageProxy.java
rc/com/android/camera/one/v2/camera2proxy/ForwardingImageProxy.java
rc/com/android/camera/one/v2/camera2proxy/ImageProxy.java
rc/com/android/camera/processing/imagebackend/TaskChainedCompressImageToJpeg.java
rc/com/android/camera/processing/imagebackend/TaskConvertImageToRGBPreview.java
rc/com/android/camera/processing/imagebackend/TaskJpegEncode.java
rc/com/android/camera/util/JpegUtilNative.java
rc/com/android/camera/widget/FilmstripView.java
|
8ee16b8a323ffa20e6fb1270d498ec445f64defc |
18-Dec-2014 |
Paul Rohde <codelogic@google.com> |
Refactor the filmstrip backing data. - Remove unused fields and code. - Rename classes and methods to be consistent with usage - Make data more immutable - Add Location and Metadata classes for typed data access. - Use Date instead of long for DateTime representations. - Filmstrip prefix for filmstrip specific code. - Cleaner Glide implementations. - Initialize Glide bitmap pool. - Eagerly load large image sizes when scroll stops. Change-Id: I3b51d42416ca076c80bf7db441d257659174b47d
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/MediaSaverImpl.java
rc/com/android/camera/Storage.java
rc/com/android/camera/burst/BurstFacadeImpl.java
rc/com/android/camera/data/AbstractLocalDataAdapterWrapper.java
rc/com/android/camera/data/CameraDataAdapter.java
rc/com/android/camera/data/CameraFilmstripDataAdapter.java
rc/com/android/camera/data/FilmstripContentObserver.java
rc/com/android/camera/data/FilmstripContentQueries.java
rc/com/android/camera/data/FilmstripDataAdapterProxy.java
rc/com/android/camera/data/FilmstripItem.java
rc/com/android/camera/data/FilmstripItemAttributes.java
rc/com/android/camera/data/FilmstripItemBase.java
rc/com/android/camera/data/FilmstripItemData.java
rc/com/android/camera/data/FilmstripItemList.java
rc/com/android/camera/data/FilmstripItemType.java
rc/com/android/camera/data/FilmstripItemUtils.java
rc/com/android/camera/data/FixedFirstDataAdapter.java
rc/com/android/camera/data/FixedFirstProxyAdapter.java
rc/com/android/camera/data/FixedLastDataAdapter.java
rc/com/android/camera/data/FixedLastProxyAdapter.java
rc/com/android/camera/data/LocalData.java
rc/com/android/camera/data/LocalDataAdapter.java
rc/com/android/camera/data/LocalDataList.java
rc/com/android/camera/data/LocalDataQuery.java
rc/com/android/camera/data/LocalDataUtil.java
rc/com/android/camera/data/LocalDataViewType.java
rc/com/android/camera/data/LocalFilmstripDataAdapter.java
rc/com/android/camera/data/LocalMediaData.java
rc/com/android/camera/data/LocalMediaObserver.java
rc/com/android/camera/data/LocalSessionData.java
rc/com/android/camera/data/Location.java
rc/com/android/camera/data/MediaDetails.java
rc/com/android/camera/data/Metadata.java
rc/com/android/camera/data/MetadataLoader.java
rc/com/android/camera/data/NewestFirstComparator.java
rc/com/android/camera/data/PanoramaMetadataLoader.java
rc/com/android/camera/data/PhotoData.java
rc/com/android/camera/data/PhotoDataFactory.java
rc/com/android/camera/data/PhotoDataQuery.java
rc/com/android/camera/data/PhotoItem.java
rc/com/android/camera/data/PhotoItemFactory.java
rc/com/android/camera/data/PlaceholderItem.java
rc/com/android/camera/data/RgbzMetadataLoader.java
rc/com/android/camera/data/SessionItem.java
rc/com/android/camera/data/SimpleViewData.java
rc/com/android/camera/data/VideoData.java
rc/com/android/camera/data/VideoDataFactory.java
rc/com/android/camera/data/VideoDataQuery.java
rc/com/android/camera/data/VideoItem.java
rc/com/android/camera/data/VideoItemData.java
rc/com/android/camera/data/VideoItemFactory.java
rc/com/android/camera/data/VideoRotationMetadataLoader.java
rc/com/android/camera/filmstrip/DataAdapter.java
rc/com/android/camera/filmstrip/FilmstripController.java
rc/com/android/camera/filmstrip/FilmstripDataAdapter.java
rc/com/android/camera/filmstrip/ImageData.java
rc/com/android/camera/one/v2/photo/PictureCallbackAdapter.java
rc/com/android/camera/one/v2/photo/PictureCallbackAdaptor.java
rc/com/android/camera/one/v2/photo/PictureTakerImpl.java
rc/com/android/camera/session/CaptureSessionManagerImpl.java
rc/com/android/camera/ui/ZoomView.java
rc/com/android/camera/util/CameraUtil.java
rc/com/android/camera/widget/FilmstripLayout.java
rc/com/android/camera/widget/FilmstripView.java
rc_pd/com/android/camera/util/ReleaseHelper.java
|
e066c34825af2b3b41894030bed5dde6be6e0af0 |
07-Jan-2015 |
Alan Newberger <alann@google.com> |
Merge "Stop recording location in onPause" into ub-camera-haleakala
|
4708b9cf90be27eb425f9f06fb106039d7531515 |
07-Jan-2015 |
Alan Newberger <alann@google.com> |
Stop recording location in onPause This is a legitimate bug where the Legacy provider actually documents a no-op in disconnect with an intention to stop updates on pause, which never occurred. This also improves lifecycle of location updates for other providers. Bug: 14989298 Change-Id: If963241b01af83ab63bd8c1bccfcf1b5a1a616fa
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/app/LegacyLocationProvider.java
|
d2c7167019693fbd14fda64f2aa7362e7626f194 |
07-Jan-2015 |
Senpo Hu <senpo@google.com> |
Merge "Avoid using fast_out_slow_in on K devices." into ub-camera-haleakala
|
2fd316a867ac44421c6f3f7dc87cee20e1534d6b |
07-Jan-2015 |
Senpo Hu <senpo@google.com> |
Merge "Fix NPE crash in RoundedThumbnailView." into ub-camera-haleakala
|
daea74c9c1708908ae801d53ef3288500cc9532f |
02-Jan-2015 |
Senpo Hu <senpo@google.com> |
Fix NPE crash in RoundedThumbnailView. Bug: 18851937 Change-Id: I63f3084cd2ae7cd8bbb73507aefcf4192ed7bfd0
rc/com/android/camera/widget/RoundedThumbnailView.java
|
e376f016b93724d4776aa9397e7bb4409503b793 |
06-Jan-2015 |
I-Jong Lin <ijonglin@google.com> |
YUV Color conversion fix Bug: 18902605 More foolproof way of calculating the YUV multipliers at compile time. Fixes a previous off-by-one error that translated into an incorrect 2x in chroma magnitude (U,V components) by manual calculation. Change-Id: I0732ed0c5a1bf4b901f9eb86c6a20e09872134dc
rc/com/android/camera/processing/imagebackend/TaskConvertImageToRGBPreview.java
|
522d87380bdc8f4b8cdfe4b6f8337911d2cbc07f |
06-Jan-2015 |
Alan Newberger <alann@google.com> |
Adjust aspect ratio matching threshold for all devices Broadening a fix from Glacier now that we have time to test across devices. Bug: 18241645 Change-Id: Ic3a65a659009d0301255b608d4540bd15e9bd0fb
rc/com/android/camera/util/ApiHelper.java
rc/com/android/camera/util/CameraUtil.java
|
1408a7844cddfa357de224233c3181318f824fc2 |
06-Jan-2015 |
I-Jong Lin <ijonglin@google.com> |
Merge "Interface ImageTaskManager for Image-based Tasks" into ub-camera-haleakala
|
3c7b7ec6aa2e51859718a6d6dead3c12d10ea370 |
05-Jan-2015 |
I-Jong Lin <ijonglin@google.com> |
Interface ImageTaskManager for Image-based Tasks Clearly defined with relationship between derived ImageTasks and the respective ImageBackend. Once tasks are derived from TaskImageContainer, they should only have limited functionality back to the ImageBackend to spawn new tasks to describe their internal task graph and manage their image references. The new class ImageTaskManager defines this relationship and implies that most of functionality should be internal to the task itself rather than the ImageBackend. Also, included clean-up of some unused parameters in ImageConsumer interface as well. Change-Id: I6a0a5f72aea55adc8b846eb3cd945b61bc6d2a93
rc/com/android/camera/processing/imagebackend/ImageBackend.java
rc/com/android/camera/processing/imagebackend/ImageConsumer.java
rc/com/android/camera/processing/imagebackend/ImageTaskManager.java
rc/com/android/camera/processing/imagebackend/TaskChainedCompressImageToJpeg.java
rc/com/android/camera/processing/imagebackend/TaskCompressImageToJpeg.java
rc/com/android/camera/processing/imagebackend/TaskConvertImageToRGBPreview.java
rc/com/android/camera/processing/imagebackend/TaskImageContainer.java
rc/com/android/camera/processing/imagebackend/TaskJpegEncode.java
rc/com/android/camera/processing/imagebackend/TaskWriteImageToDisk.java
|
d8463954727c9f8b688e69476439830cadb7b45a |
30-Dec-2014 |
Puneet Lall <puneetl@google.com> |
Refactor camera factories to reduce code duplication Change-Id: I5f5c899f595dbbaa9fa181c5caa092d4bad69f07
rc/com/android/camera/async/HandlerFactory.java
rc/com/android/camera/async/MainThreadExecutor.java
rc/com/android/camera/async/Observable.java
rc/com/android/camera/one/OneCamera.java
rc/com/android/camera/one/OneCameraCharacteristics.java
rc/com/android/camera/one/OneCameraManager.java
rc/com/android/camera/one/v2/OneCameraCharacteristicsImpl.java
rc/com/android/camera/one/v2/OneCameraFactory.java
rc/com/android/camera/one/v2/OneCameraImpl.java
rc/com/android/camera/one/v2/OneCameraManagerImpl.java
rc/com/android/camera/one/v2/OneCameraZslImpl.java
rc/com/android/camera/one/v2/SimpleJpegOneCameraFactory.java
rc/com/android/camera/one/v2/SimpleOneCameraFactory.java
rc/com/android/camera/one/v2/SimpleYuvOneCameraFactory.java
rc/com/android/camera/one/v2/ZslOneCameraFactory.java
rc/com/android/camera/one/v2/autofocus/AEMeteringRegion.java
rc/com/android/camera/one/v2/autofocus/AFMeteringRegion.java
rc/com/android/camera/one/v2/autofocus/ManualAutoFocusFactory.java
rc/com/android/camera/one/v2/common/BasicCameraFactory.java
rc/com/android/camera/one/v2/common/ZoomedCropRegion.java
rc/com/android/camera/one/v2/core/FrameServerFactory.java
rc/com/android/camera/one/v2/initialization/CameraStarter.java
rc/com/android/camera/one/v2/initialization/GenericOneCameraImpl.java
rc/com/android/camera/one/v2/initialization/InitializedOneCameraFactory.java
rc/com/android/camera/one/v2/initialization/PreviewSizeSelector.java
rc/com/android/camera/one/v2/photo/ImageRotationCalculatorImpl.java
rc/com/android/camera/one/v2/photo/PictureTakerFactory.java
rc/com/android/camera/one/v2/photo/PictureTakerImpl.java
rc/com/android/camera/one/v2/photo/YuvImageBackendImageSaver.java
rc/com/android/camera/one/v2/photo/ZslPictureTakerFactory.java
rc_pd/com/android/camera/one/v2/OneCameraCreator.java
|
8897101881c0df691970deabd866d8ff96f07b0c |
06-Jan-2015 |
Senpo Hu <senpo@google.com> |
Avoid using fast_out_slow_in on K devices. Bug: 18895268 Change-Id: I9bcd799c5a27b2e05cf45bb5923dcf8e7d0f7123
rc/com/android/camera/widget/FilmstripLayout.java
|
20aa834e03da0af6d3d9c64086efb4a1f6f424b5 |
05-Jan-2015 |
Puneet Lall <puneetl@google.com> |
Fix possible ConcurrentModificationException Bug: 18895233 Change-Id: Iece6bd467c74082e2ea48df2ff9bb51767b75c17
rc/com/android/camera/one/v2/sharedimagereader/imagedistributor/ImageDistributor.java
rc/com/android/camera/one/v2/sharedimagereader/imagedistributor/ImageDistributorImpl.java
|
7420bfea6dc31ebb5388f6049ed3687b3b13f755 |
05-Jan-2015 |
Puneet Lall <puneetl@google.com> |
Merge "Add jsr305 to build" into ub-camera-haleakala
|
f3b10498e09d26a77b69506eae643aea5d8f5dcd |
05-Jan-2015 |
Puneet Lall <puneetl@google.com> |
Add jsr305 to build Change-Id: I0b8a9d07ca834cf2d58b0f4b9398cb2ac31f25b5
ndroid.mk
|
da46b2eb1d33522d781db0982c7e4799008035c2 |
05-Jan-2015 |
Puneet Lall <puneetl@google.com> |
Merge "Delete unused/unnecessary interfaces" into ub-camera-haleakala
|
465462e82b3f2855d41d2d8c2e7427287ebbb8b9 |
03-Jan-2015 |
Senpo Hu <senpo@google.com> |
Merge "Break the dependency from CaptureModuleUI to CaptureModule." into ub-camera-haleakala
|
6a4a38d2320ab4e840cf4ad2ffb9714b0d7c1539 |
31-Dec-2014 |
Paul Rohde <codelogic@google.com> |
Detect slow frames and provide smoothed preview FPS. Change-Id: Ie1a8feeb8d69f213791cd8b86e0f2e10e5b8cc08
rc/com/android/camera/async/NoOp.java
rc/com/android/camera/one/v2/ZslOneCameraFactory.java
rc/com/android/camera/one/v2/stats/PreviewFpsListener.java
|
8e8d3088e057df3a866e67b6d20ec950f9d4e4f6 |
23-Dec-2014 |
Senpo Hu <senpo@google.com> |
Break the dependency from CaptureModuleUI to CaptureModule. This doesn't change any logic. Mainly just moving things around. Change-Id: Ia130f3d0e5821095605219e50cc16008bc7ac143
rc/com/android/camera/CameraModule.java
rc/com/android/camera/CaptureModule.java
rc/com/android/camera/CaptureModuleUI.java
rc/com/android/camera/PhotoUI.java
rc/com/android/camera/VideoUI.java
rc/com/android/camera/ui/PreviewStatusListener.java
|
596ee58f6b9c6563f388566b29f1731f7ca42800 |
02-Jan-2015 |
Puneet Lall <puneetl@google.com> |
Delete unused/unnecessary interfaces Change-Id: Ic3cdad63236cf98db5eaeb45287393d4ec16fc0a
rc/com/android/camera/async/BlockingCloseable.java
rc/com/android/camera/async/BoundedBufferQueue.java
|
a9f8690dec58c14a453bf3628d672d58b0132a40 |
02-Jan-2015 |
Puneet Lall <puneetl@google.com> |
Fix race condition in which close() may deadlock Change-Id: I422471ed47216dafd7f3114fc3d1ea7f47d281c3
rc/com/android/camera/one/v2/sharedimagereader/ImageStreamImpl.java
rc/com/android/camera/one/v2/sharedimagereader/SingleAllocationImageStream.java
|
9ad0984f36ff9cd133c61c4e979032988b77a995 |
31-Dec-2014 |
Puneet Lall <puneetl@google.com> |
Replace Pollable with Guava Supplier Change-Id: Ibd4359cf5f0c7dbacb534dcb098d77a1f2f36133
rc/com/android/camera/async/ConcurrentState.java
rc/com/android/camera/async/ConstantPollable.java
rc/com/android/camera/async/Observable.java
rc/com/android/camera/async/Pollable.java
rc/com/android/camera/one/v2/SimpleJpegOneCameraFactory.java
rc/com/android/camera/one/v2/SimpleYuvOneCameraFactory.java
rc/com/android/camera/one/v2/ZslOneCameraFactory.java
rc/com/android/camera/one/v2/autofocus/AEMeteringRegion.java
rc/com/android/camera/one/v2/autofocus/AFMeteringRegion.java
rc/com/android/camera/one/v2/autofocus/ManualAutoFocusFactory.java
rc/com/android/camera/one/v2/autofocus/MeteringParameters.java
rc/com/android/camera/one/v2/common/FlashBasedAEMode.java
rc/com/android/camera/one/v2/common/ZoomedCropRegion.java
rc/com/android/camera/one/v2/core/RequestTemplate.java
rc/com/android/camera/one/v2/initialization/GenericOneCameraImpl.java
rc/com/android/camera/one/v2/initialization/InitializedOneCameraFactory.java
rc/com/android/camera/one/v2/initialization/PreviewStarter.java
rc/com/android/camera/one/v2/photo/FlashBasedPhotoCommand.java
rc/com/android/camera/one/v2/photo/PictureCallbackAdaptor.java
rc/com/android/camera/one/v2/sharedimagereader/ringbuffer/DynamicRingBufferFactory.java
rc/com/android/camera/one/v2/sharedimagereader/ringbuffer/TicketPoolPrioritizer.java
rc/com/android/camera/settings/Setting.java
|
5b4a6731387bbf8a405de9da973b113b5abea1df |
31-Dec-2014 |
Puneet Lall <puneetl@google.com> |
Merge "Replace FutureResult with guava SettableFuture" into ub-camera-haleakala
|
45e44632665ebac1d42de50b6d5173a65c7404dc |
31-Dec-2014 |
Puneet Lall <puneetl@google.com> |
Merge "Fix bug in CountableBufferQueue.getNext" into ub-camera-haleakala
|
92b2512020983a79fa5e4837c2ee9ac868612c0a |
30-Dec-2014 |
Puneet Lall <puneetl@google.com> |
Replace FutureResult with guava SettableFuture Change-Id: I2439909e2c6dd663b1bc31a828e7744e18a6daaf
rc/com/android/camera/async/FutureResult.java
rc/com/android/camera/one/v2/initialization/CaptureSessionCreator.java
rc/com/android/camera/one/v2/initialization/InitializedOneCameraFactory.java
rc/com/android/camera/one/v2/initialization/PreviewStarter.java
|
4007e751d3903dc319f764d54194abd8d0338e6f |
30-Dec-2014 |
Puneet Lall <puneetl@google.com> |
Fix bug in CountableBufferQueue.getNext Change-Id: I2eb19a692acb9e41da0c172364fdb285061de2e6
rc/com/android/camera/async/CountableBufferQueue.java
|
54bc2a2b15060c2cda8d03249588cfe22c1744eb |
30-Dec-2014 |
Puneet Lall <puneetl@google.com> |
Only run non-zsl fallback if the ring buffer is empty Change-Id: I5d85aa1a3bbb0035189fa0f178a6a0077740ae46
rc/com/android/camera/one/v2/photo/ZslImageCaptureCommand.java
|
c12b1671f4862376c556109020187d65b270d5bf |
30-Dec-2014 |
Puneet Lall <puneetl@google.com> |
Add Guava to Camera2 build Change-Id: I7a1f49df884a7660fbbd45322f135a0fb15dd78d
ndroid.mk
|
49b177beff5ed10e04f90c7615c273496fd3ba9b |
30-Dec-2014 |
Puneet Lall <puneetl@google.com> |
Merge "Rename to RequestTemplate" into ub-camera-haleakala
|
3c82bd08314c7599a1c261ee2f2afee3be2ec9eb |
30-Dec-2014 |
Puneet Lall <puneetl@google.com> |
Merge "Remove unused parameter to OneCamera.close" into ub-camera-haleakala
|
fba96c1611ecfb054a28287a7cf305c389e3b8f2 |
30-Dec-2014 |
Puneet Lall <puneetl@google.com> |
Merge "Simplify ImageSaver interface" into ub-camera-haleakala
|
2830a7261d786b9d024081b3c47fc38303709470 |
30-Dec-2014 |
Sascha Haeberling <haeberling@google.com> |
'Fix' ANR in holiday build happening frequently from lockscreen. Bug: 18854352 Note: This is more of a hack around the already pretty hacky camera open-close lock. Proper fix is to refactor the code to not require this lock anymore. But to get the holiday droidfood going further, this is a quick for now. Change-Id: Ib69821d4e6cb3b82f438aeee28c807cc7c33dd25
rc/com/android/camera/CaptureModule.java
|
0cd4a4481272ff00780291410237bcddd31c96a6 |
30-Dec-2014 |
Puneet Lall <puneetl@google.com> |
Simplify ImageSaver interface Change-Id: I92bdade418f39d852e972f18f58e5620d38067aa
rc/com/android/camera/one/v2/SimpleJpegOneCameraFactory.java
rc/com/android/camera/one/v2/SimpleYuvOneCameraFactory.java
rc/com/android/camera/one/v2/ZslOneCameraFactory.java
rc/com/android/camera/one/v2/photo/ImageSaver.java
rc/com/android/camera/one/v2/photo/PictureTakerImpl.java
rc/com/android/camera/one/v2/photo/YuvImageBackendImageSaver.java
rc/com/android/camera/one/v2/photo/ZslImageSaverImpl.java
|
11c72fc1a0645db28c04edc89429c8b82777520a |
29-Dec-2014 |
Sascha Häberling <haeberling@google.com> |
Revert "'Fix' ANR in holiday build happening frequently from lockscreen." This doesn't work well and introduces an issue with HDR+. This reverts commit 7b81135c88f01cb2ac7a958dcb66c0d2d2bde7c4. Change-Id: Ib7e412221c216d0cf6116817599d28a4d4afa3ef
rc/com/android/camera/CaptureModule.java
|
c7251753978f80dc40131e7676f69f7e86208fd1 |
29-Dec-2014 |
Puneet Lall <puneetl@google.com> |
Remove unused parameter to OneCamera.close Change-Id: Iea5dcb41eb5c387a7f19db280ea9c681e2aabc7e
rc/com/android/camera/CaptureModule.java
rc/com/android/camera/one/OneCamera.java
rc/com/android/camera/one/v2/OneCameraImpl.java
rc/com/android/camera/one/v2/OneCameraZslImpl.java
rc/com/android/camera/one/v2/initialization/GenericOneCameraImpl.java
|
7b81135c88f01cb2ac7a958dcb66c0d2d2bde7c4 |
29-Dec-2014 |
Sascha Haeberling <haeberling@google.com> |
'Fix' ANR in holiday build happening frequently from lockscreen. Bug: 18854352 Note: This is more of a hack around the already pretty hacky camera open-close lock. Proper fix is to refactor the code to not require this lock anymore. But to get the holiday droidfood going further, this is a quick for now. Change-Id: Iad974e91aae6ede3897ce3bb7d69f8764d9fd08a
rc/com/android/camera/CaptureModule.java
|
7f4a37d1885b2652b569291661120c1c1d415fe2 |
29-Dec-2014 |
Puneet Lall <puneetl@google.com> |
Rename to RequestTemplate Change-Id: I4f1dd9ac41d8c35c50eaead4be211d3bb108bc73
rc/com/android/camera/one/v2/SimpleJpegOneCameraFactory.java
rc/com/android/camera/one/v2/SimpleYuvOneCameraFactory.java
rc/com/android/camera/one/v2/ZslOneCameraFactory.java
rc/com/android/camera/one/v2/autofocus/ManualAutoFocusFactory.java
rc/com/android/camera/one/v2/core/DecoratingRequestBuilderBuilder.java
rc/com/android/camera/one/v2/core/RequestTemplate.java
|
f3573e6e39161d3e136d309a502f4078f96ea1b4 |
23-Dec-2014 |
Sascha Haeberling <haeberling@google.com> |
Make sure session is copied into ImageSaver. This prevents references to CaptureSession being basically randomly called. Change-Id: Ic63308a23c22a21ffe7572397697772c3f65ccfa
rc/com/android/camera/one/v2/photo/ZslImageSaverImpl.java
|
09d1f4473af1494572d77949ad87b95e21028135 |
23-Dec-2014 |
Sascha Haeberling <haeberling@google.com> |
Rotate images before storing them so that rotation for reading is always 0. This also fixed the filmstrip loading slowness issue. Change-Id: I920f5f136576c6812522d99bfed5063357593206
rc/com/android/camera/processing/imagebackend/TaskCompressImageToJpeg.java
rc/com/android/camera/util/Size.java
|
f7fa8392f881eb0c8aa329977d77ce45eafde017 |
23-Dec-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Fix bug in FirstRunDialog detection and re-enable CaptureModule on N9." into ub-camera-haleakala
|
e083a34da38a89f580c562e696da9180c373a009 |
23-Dec-2014 |
Sascha Haeberling <haeberling@google.com> |
Fix bug in FirstRunDialog detection and re-enable CaptureModule on N9. Bug: 18840830 Change-Id: I22abae32c5e55f779b5c645324f1f3a8421e4bde
rc/com/android/camera/CaptureModule.java
rc/com/android/camera/module/ModulesInfo.java
|
fd32492b6e86f30f4f87028154c23059cae61a04 |
23-Dec-2014 |
Puneet Lall <puneetl@google.com> |
Merge "Add logging to track the total number of open images." into ub-camera-haleakala
|
84427a8d1cf3fed4fd3937a24df101745c64cfda |
23-Dec-2014 |
Puneet Lall <puneetl@google.com> |
Add logging to track the total number of open images. Change-Id: I62e4cf54c856c537bebd557efc7215481ac6e383
rc/com/android/camera/one/v2/sharedimagereader/imagedistributor/ImageDistributorFactory.java
rc/com/android/camera/one/v2/sharedimagereader/imagedistributor/ImageDistributorOnImageAvailableListener.java
|
0038fc10f61f10a715fad3411f0d55a45d8ae50f |
23-Dec-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "CaptureModule is not yet working on N9, so switch it to PhotoModule." into ub-camera-haleakala
|
f6eb9329fe0d42a930ed2b599ea4407414a1cadf |
23-Dec-2014 |
Sascha Haeberling <haeberling@google.com> |
CaptureModule is not yet working on N9, so switch it to PhotoModule. Change-Id: I58aee4b7704840b0d89c8c2c0d96f54a2347c42b
rc/com/android/camera/module/ModulesInfo.java
|
b9aac76c3d6de7ec6b17c3f4d9d899e1d52b3418 |
23-Dec-2014 |
Puneet Lall <puneetl@google.com> |
Added shutter sound to CaptureModule for non-HDR cameras Change-Id: I11beb99633e116b8e0328f0021e09100e6d031e6
rc/com/android/camera/CaptureModule.java
|
5178d51d37e25bd314d17b188f33085d3b6936a3 |
23-Dec-2014 |
Senpo Hu <senpo@google.com> |
Merge "Fix NPE crash in RoundedThumbnailView." into ub-camera-haleakala
|
3b22eba411176d884e09d23544e69b8ec20f6677 |
23-Dec-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Store ZSL images in correct orientation and show progress in filmstrip." into ub-camera-haleakala
|
68d834ff57c8e20a8c040cdcbf50d0e3332d6385 |
23-Dec-2014 |
Senpo Hu <senpo@google.com> |
Fix NPE crash in RoundedThumbnailView. Bug: 18835171 Change-Id: Ib77e15cfeb93e3d73cf14e2459dfcdbe54d92073
rc/com/android/camera/widget/RoundedThumbnailView.java
|
3830d419691ef865f01b362fee9618bac2aa8888 |
20-Dec-2014 |
Sascha Haeberling <haeberling@google.com> |
Store ZSL images in correct orientation and show progress in filmstrip. Added an ImageRotationCalculator which calcuates the image rotation based on camera characteristics and the device orientation at the time of the shot. Also moves the image backend code into its own sub-package. Change-Id: I4b6b83e3e3cebece83215c19d0aff826ff853352
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/CaptureModule.java
rc/com/android/camera/TextureViewHelper.java
rc/com/android/camera/app/CameraAppUI.java
rc/com/android/camera/app/OrientationManager.java
rc/com/android/camera/one/v2/SimpleJpegOneCameraFactory.java
rc/com/android/camera/one/v2/SimpleYuvOneCameraFactory.java
rc/com/android/camera/one/v2/ZslOneCameraFactory.java
rc/com/android/camera/one/v2/initialization/DeferredPictureTaker.java
rc/com/android/camera/one/v2/initialization/InitializedOneCameraFactory.java
rc/com/android/camera/one/v2/photo/ImageRotationCalculator.java
rc/com/android/camera/one/v2/photo/ImageRotationCalculatorImpl.java
rc/com/android/camera/one/v2/photo/PictureTakerImpl.java
rc/com/android/camera/one/v2/photo/ZslImageSaverImpl.java
rc/com/android/camera/processing/ImageBackend.java
rc/com/android/camera/processing/ImageConsumer.java
rc/com/android/camera/processing/ImageProcessorListener.java
rc/com/android/camera/processing/ImageProcessorProxyListener.java
rc/com/android/camera/processing/ProcessingServiceManager.java
rc/com/android/camera/processing/TaskChainedCompressImageToJpeg.java
rc/com/android/camera/processing/TaskCompressImageToJpeg.java
rc/com/android/camera/processing/TaskConvertImageToRGBPreview.java
rc/com/android/camera/processing/TaskImageContainer.java
rc/com/android/camera/processing/TaskJpegEncode.java
rc/com/android/camera/processing/TaskWriteImageToDisk.java
rc/com/android/camera/processing/imagebackend/ImageBackend.java
rc/com/android/camera/processing/imagebackend/ImageConsumer.java
rc/com/android/camera/processing/imagebackend/ImageProcessorListener.java
rc/com/android/camera/processing/imagebackend/ImageProcessorProxyListener.java
rc/com/android/camera/processing/imagebackend/ImageToProcess.java
rc/com/android/camera/processing/imagebackend/TaskChainedCompressImageToJpeg.java
rc/com/android/camera/processing/imagebackend/TaskCompressImageToJpeg.java
rc/com/android/camera/processing/imagebackend/TaskConvertImageToRGBPreview.java
rc/com/android/camera/processing/imagebackend/TaskImageContainer.java
rc/com/android/camera/processing/imagebackend/TaskJpegEncode.java
rc/com/android/camera/processing/imagebackend/TaskWriteImageToDisk.java
rc/com/android/camera/session/CaptureSession.java
rc/com/android/camera/session/CaptureSessionManagerImpl.java
|
17fc13a74ff71e3c721218624815c244dccc33f7 |
22-Dec-2014 |
Puneet Lall <puneetl@google.com> |
Added thread-safe SettingsManager wrapper Change-Id: Ie2d2bb14e0dd4760e8f8d47e7a988ab20c8567fe
rc/com/android/camera/async/ConcurrentState.java
rc/com/android/camera/async/Observable.java
rc/com/android/camera/settings/Setting.java
|
53c82c7ed6b4799b05b7b982e480a5ae35c28cc7 |
22-Dec-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I3052b4c23d79c1a768011fd5c49904a896c7c8c1 Auto-generated-cl: translation import
es/values-ja/strings.xml
es/values-km-rKH/strings.xml
es/values-my-rMM/strings.xml
|
2db2f7917997f5aa67ddfd09a7cf7c8bd93d7d11 |
20-Dec-2014 |
Sascha Haeberling <haeberling@google.com> |
Until Camera2-based JPEG camera is ready, N4 uses PhotoModule. Change-Id: I3fc9503ae254a4d3975d9387f13f78e387ab0361
rc/com/android/camera/module/ModulesInfo.java
|
ec1ce0f53e3f747a9f61aa5b093dc2027ad2c38f |
20-Dec-2014 |
Puneet Lall <puneetl@google.com> |
Merge "Do not disableModeOptions() on shutter click" into ub-camera-haleakala
|
2aa9e849483b0706b3c613ffba6c39630c68b1fa |
20-Dec-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Changes to support complete disabling of Burst." into ub-camera-haleakala
|
0d32f29b2a82c2afa87b46e309c38f67f8b5e54c |
20-Dec-2014 |
Puneet Lall <puneetl@google.com> |
Do not disableModeOptions() on shutter click Change-Id: Ib4b226417ab992358231cbe96cf7d46c27926c7e
rc/com/android/camera/app/CameraAppUI.java
|
03bf6e15f06caba2cc9e3abcea380eae65944b02 |
20-Dec-2014 |
Puneet Lall <puneetl@google.com> |
Added non-zsl YUV OneCamera implementation Change-Id: Iea389f274ea453b81c3fba39c65e0ec2dc1ee5c6
rc/com/android/camera/one/v2/SimpleYuvOneCameraFactory.java
|
30ccdac56450e5b1927e14a6eede2b86a30c42eb |
19-Dec-2014 |
I-Jong Lin <ijonglin@google.com> |
Full end-to-end integration for ZSL Full end-to-end functionality using the ZSL integrated with the ImageBackend. Still some outstanding issues regarding image orientation, but the full pipeline is plumbed for ZSL. Change-Id: I636944fbd57e7d1bf6b1ef24e1e2c1317afdd28d
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/one/v2/OneCameraImpl.java
rc/com/android/camera/one/v2/OneCameraZslImpl.java
rc/com/android/camera/one/v2/SimpleJpegOneCameraFactory.java
rc/com/android/camera/one/v2/ZslOneCameraFactory.java
rc/com/android/camera/one/v2/photo/ImageSaver.java
rc/com/android/camera/one/v2/photo/PictureTakerImpl.java
rc/com/android/camera/one/v2/photo/ZslImageSaverImpl.java
rc/com/android/camera/processing/ImageBackend.java
rc/com/android/camera/processing/ImageConsumer.java
rc/com/android/camera/processing/ImageProcessorProxyListener.java
rc/com/android/camera/processing/ProcessingServiceManager.java
rc/com/android/camera/processing/TaskChainedCompressImageToJpeg.java
rc/com/android/camera/processing/TaskCompressImageToJpeg.java
rc/com/android/camera/processing/TaskConvertImageToRGBPreview.java
rc/com/android/camera/processing/TaskImageContainer.java
rc/com/android/camera/processing/TaskJpegEncode.java
rc/com/android/camera/processing/TaskWriteImageToDisk.java
rc/com/android/camera/util/JpegUtilNative.java
|
c51a121f0b4139e73ee7df23581ef551ff44e276 |
20-Dec-2014 |
Sascha Haeberling <haeberling@google.com> |
Changes to support complete disabling of Burst. Have the stub burst controller retain a reference to the preview surface texture. Change-Id: Iaf86f8cd30ac862b1f29f9edeca65fd20e825b52
rc/com/android/camera/CaptureModule.java
rc/com/android/camera/burst/BurstFacadeFactory.java
|
e0fe29b2477c8fd2c44be2547bcc5183ed2f7235 |
20-Dec-2014 |
Sascha Häberling <haeberling@google.com> |
Merge "Revert "Changes to support complete disabling of Burst."" into ub-camera-haleakala
|
0de97e1c2b9fadb27c3c08f5dde2d9f353714bec |
20-Dec-2014 |
Sascha Häberling <haeberling@google.com> |
Revert "Changes to support complete disabling of Burst." This reverts commit 8565f7695f41f0150ba096a75591ad7b2fe5de81. This crashes pre-MR1 devices. Will fix and re-submit. Change-Id: Ie645a63270e73b451d0a484928c98cf5104e320a
rc/com/android/camera/CaptureModule.java
rc/com/android/camera/burst/BurstFacadeFactory.java
|
71a42845d8b7302325abfc4e1314d099f7df9e00 |
20-Dec-2014 |
Puneet Lall <puneetl@google.com> |
Merge "Implement callbacks for focus indicator on zsl" into ub-camera-haleakala
|
0e08cd20de04edc8ad8a8aa7f677b7cc708f21d3 |
20-Dec-2014 |
Puneet Lall <puneetl@google.com> |
Implement callbacks for focus indicator on zsl Change-Id: I5348192a76222ac41923b680acb58ac6480affcf
rc/com/android/camera/one/OneCamera.java
rc/com/android/camera/one/v2/SimpleJpegOneCameraFactory.java
rc/com/android/camera/one/v2/ZslOneCameraFactory.java
rc/com/android/camera/one/v2/initialization/CameraStarter.java
rc/com/android/camera/one/v2/initialization/InitializedOneCameraFactory.java
rc/com/android/camera/one/v2/initialization/MetadataCallback.java
|
1fcb7a9b2b8b4fcac5547d63de08ba1703fd7897 |
20-Dec-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Changes to support complete disabling of Burst." into ub-camera-haleakala
|
8565f7695f41f0150ba096a75591ad7b2fe5de81 |
20-Dec-2014 |
Sascha Haeberling <haeberling@google.com> |
Changes to support complete disabling of Burst. Have the stub burst controller retain a reference to the preview surface texture. Change-Id: I9a966a87aac2c21cd6050f511ea4e648b6267744
rc/com/android/camera/CaptureModule.java
rc/com/android/camera/burst/BurstFacadeFactory.java
|
2fa1cc1b0d9a4f614dd84b34f41d9212d7fd7e41 |
19-Dec-2014 |
Alan Newberger <alann@google.com> |
Merge "Restore activity lifecycle when OneCameraManager fails to initialize" into ub-camera-haleakala
|
4540b9fd5af80bd9508cb56f526560a38780b186 |
19-Dec-2014 |
Alan Newberger <alann@google.com> |
Restore activity lifecycle when OneCameraManager fails to initialize The return in onCreateTasks when OneCameraManager catches an exception, cause camera crashes instead of showing the failure dialog as intended. The exception is an NPE in PanoramaViewHelper but is due to assumptions of things init'ed in onCreate not holding due to the return when onStart is executed. While we could proof out every object to assume lifecycle events exit, I prefer to maintain lifecycle and remove the return, and make anything that relies on OneCameraManager know that it could be null. This also moves the handling of the error dialog down to CaptureModule, in the unlikely case an API1 module would still work this enables it while preserving the same intended behavior for CaptureModule. Bug: 18048591 Change-Id: Ib81f8b42eaa26daae2d3354bae1ef5127a9cbcf1
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/CaptureModule.java
|
d2e29c342d49c47790c5f98b508bf6f00f54c04e |
19-Dec-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Refactor the interface of CaptureModule to Burst to allow disabling." into ub-camera-haleakala
|
0f989bab3bda93546d3eafd0a065e1162f83d8f0 |
19-Dec-2014 |
Sascha Haeberling <haeberling@google.com> |
Refactor the interface of CaptureModule to Burst to allow disabling. Change-Id: I87164c0cd8961ad929a63ff34248a12690f7d4d1
rc/com/android/camera/CaptureModule.java
rc/com/android/camera/burst/BurstFacade.java
rc/com/android/camera/burst/BurstFacadeFactory.java
rc/com/android/camera/burst/BurstFacadeImpl.java
rc/com/android/camera/burst/ToastingBurstFacadeDecorator.java
rc_pd/com/android/camera/burst/BurstControllerImpl.java
|
c57c79fccfedeeaf34c1847861464fb041260ddc |
19-Dec-2014 |
Puneet Lall <puneetl@google.com> |
Enable AE and fix metering regions for ZSL camera Change-Id: Icaf3bfe9b004e032e43ae600fb3e10ce201ce545
rc/com/android/camera/one/v2/ZslOneCameraFactory.java
rc/com/android/camera/one/v2/autofocus/ManualAutoFocusFactory.java
|
bed08ec6585a2cc7d909afa5843307d461928a9d |
19-Dec-2014 |
Puneet Lall <puneetl@google.com> |
Merge "Fix potential NPE in ConcurrentBufferQueue.getNext()" into ub-camera-haleakala
|
86b49644dba70ff37d1715feffa4a56a28e3bde7 |
19-Dec-2014 |
Puneet Lall <puneetl@google.com> |
Fix potential NPE in ConcurrentBufferQueue.getNext() Change-Id: Ieb6101d0cf9466f3ec3e1bff32797a247b0ecba3
rc/com/android/camera/async/ConcurrentBufferQueue.java
|
8d40d27547bccab77d448af2e92b4059b2e6d206 |
19-Dec-2014 |
Puneet Lall <puneetl@google.com> |
Fix ConcurrentModificationException in ImageDistributor Change-Id: Ibf250795189d2113b00f89a9d58bb78581c0dc0f
rc/com/android/camera/one/v2/sharedimagereader/imagedistributor/ImageDistributor.java
rc/com/android/camera/one/v2/sharedimagereader/imagedistributor/ImageDistributorImpl.java
|
48fbf15e2c8806fc518f4c881ab17b1b548887d9 |
19-Dec-2014 |
Puneet Lall <puneetl@google.com> |
Fix bug in which double close() increased ticket count Change-Id: Ic534cb436755cbb3fada8769e0f7f81e6167eb5f
rc/com/android/camera/one/v2/ZslOneCameraFactory.java
rc/com/android/camera/one/v2/sharedimagereader/ticketpool/ReservableTicketPool.java
rc/com/android/camera/one/v2/sharedimagereader/util/TicketImageProxy.java
|
3a7921d7712e56afc1745c80d346435b225f6a28 |
19-Dec-2014 |
Puneet Lall <puneetl@google.com> |
Merge "Added zero-shutter-lag capture implementation over the FrameServer" into ub-camera-haleakala
|
c75207e527f480c3afea3c0afcb7c1f95e67e586 |
19-Dec-2014 |
Sascha Haeberling <haeberling@google.com> |
Don't use glide if we have a bitmap already as a placeholder. Change-Id: I8e9676675c025cbfcd36e8c1b899a33d1b20f2d1
rc/com/android/camera/data/LocalSessionData.java
|
829afc7dfd69866beebb09052db3d228b916f352 |
19-Dec-2014 |
Sascha Haeberling <haeberling@google.com> |
Change placholder API to use Bitmap's instead of JPEG bytes. Change-Id: Id6f3b1e604bee56f3372b891bc44d8716b06478d
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/Storage.java
rc/com/android/camera/data/LocalSessionData.java
rc/com/android/camera/session/CaptureSessionManagerImpl.java
rc/com/android/camera/session/PlaceholderManager.java
|
12f608f3d2089439a108788a1908941eea4277b9 |
11-Dec-2014 |
Puneet Lall <puneetl@google.com> |
Added zero-shutter-lag capture implementation over the FrameServer Change-Id: Ia01244dba7013c5f81152dd90adc8d87e7004dd2
rc/com/android/camera/async/ConcurrentBufferQueue.java
rc/com/android/camera/async/CountableBufferQueue.java
rc/com/android/camera/async/ForwardingBufferQueue.java
rc/com/android/camera/async/Lifetime.java
rc/com/android/camera/async/ResettingDelayedExecutor.java
rc/com/android/camera/async/Updatable.java
rc/com/android/camera/one/v2/SimpleJpegOneCameraFactory.java
rc/com/android/camera/one/v2/ZslOneCameraFactory.java
rc/com/android/camera/one/v2/autofocus/AEMeteringRegion.java
rc/com/android/camera/one/v2/autofocus/AFMeteringRegion.java
rc/com/android/camera/one/v2/autofocus/AFScanHoldResetCommand.java
rc/com/android/camera/one/v2/autofocus/FullAFScanCommand.java
rc/com/android/camera/one/v2/autofocus/ManualAutoFocus.java
rc/com/android/camera/one/v2/autofocus/ManualAutoFocusFactory.java
rc/com/android/camera/one/v2/autofocus/ManualAutoFocusImpl.java
rc/com/android/camera/one/v2/autofocus/MeteringParameters.java
rc/com/android/camera/one/v2/autofocus/TriggeredAFScanStateResponseListener.java
rc/com/android/camera/one/v2/camera2proxy/CameraDeviceProxy.java
rc/com/android/camera/one/v2/camera2proxy/CameraDeviceRequestBuilderFactory.java
rc/com/android/camera/one/v2/commands/AFScanHoldReset.java
rc/com/android/camera/one/v2/commands/CameraCommand.java
rc/com/android/camera/one/v2/commands/CameraCommandExecutor.java
rc/com/android/camera/one/v2/commands/FlashBasedPhotoCommand.java
rc/com/android/camera/one/v2/commands/FullAFScanCommand.java
rc/com/android/camera/one/v2/commands/LoggingCameraCommand.java
rc/com/android/camera/one/v2/commands/PreviewCommand.java
rc/com/android/camera/one/v2/commands/StaticPictureCommand.java
rc/com/android/camera/one/v2/common/CaptureSessionCreator.java
rc/com/android/camera/one/v2/common/DeferredManualAutoFocus.java
rc/com/android/camera/one/v2/common/DeferredPictureTaker.java
rc/com/android/camera/one/v2/common/FlashBasedAEMode.java
rc/com/android/camera/one/v2/common/FrameworkFailureResponseListener.java
rc/com/android/camera/one/v2/common/FullSizeAspectRatioProvider.java
rc/com/android/camera/one/v2/common/GenericOneCameraImpl.java
rc/com/android/camera/one/v2/common/ManualAutoFocusImpl.java
rc/com/android/camera/one/v2/common/MetadataResponseListener.java
rc/com/android/camera/one/v2/common/MeteringParameters.java
rc/com/android/camera/one/v2/common/PictureCallbackAdaptor.java
rc/com/android/camera/one/v2/common/PollableAEMode.java
rc/com/android/camera/one/v2/common/PollableAERegion.java
rc/com/android/camera/one/v2/common/PollableAFRegion.java
rc/com/android/camera/one/v2/common/PollableZoomedCropRegion.java
rc/com/android/camera/one/v2/common/PreviewSizeSelector.java
rc/com/android/camera/one/v2/common/SensorOrientationProvider.java
rc/com/android/camera/one/v2/common/SimpleCaptureStream.java
rc/com/android/camera/one/v2/common/SupportedPreviewSizeProvider.java
rc/com/android/camera/one/v2/common/TimestampResponseListener.java
rc/com/android/camera/one/v2/common/TotalCaptureResultResponseListener.java
rc/com/android/camera/one/v2/common/ZoomedCropRegion.java
rc/com/android/camera/one/v2/core/CaptureStream.java
rc/com/android/camera/one/v2/core/DecoratingRequestBuilderBuilder.java
rc/com/android/camera/one/v2/core/FrameExposureResponseListener.java
rc/com/android/camera/one/v2/core/FrameServer.java
rc/com/android/camera/one/v2/core/FrameServerFactory.java
rc/com/android/camera/one/v2/core/FrameServerImpl.java
rc/com/android/camera/one/v2/core/FrameworkFailureResponseListener.java
rc/com/android/camera/one/v2/core/MetadataResponseListener.java
rc/com/android/camera/one/v2/core/RefCountedImageProxy.java
rc/com/android/camera/one/v2/core/Request.java
rc/com/android/camera/one/v2/core/RequestBuilder.java
rc/com/android/camera/one/v2/core/ResourceAcquisitionFailedException.java
rc/com/android/camera/one/v2/core/ResponseListenerBroadcaster.java
rc/com/android/camera/one/v2/core/SimpleCaptureStream.java
rc/com/android/camera/one/v2/core/SingleCloseImageProxy.java
rc/com/android/camera/one/v2/core/TagDispatchCaptureSession.java
rc/com/android/camera/one/v2/core/TimestampResponseListener.java
rc/com/android/camera/one/v2/core/TotalCaptureResultResponseListener.java
rc/com/android/camera/one/v2/core/TriggeredAFScanStateResponseListener.java
rc/com/android/camera/one/v2/initialization/CameraStarter.java
rc/com/android/camera/one/v2/initialization/CaptureSessionCreator.java
rc/com/android/camera/one/v2/initialization/DeferredManualAutoFocus.java
rc/com/android/camera/one/v2/initialization/DeferredPictureTaker.java
rc/com/android/camera/one/v2/initialization/GenericOneCameraImpl.java
rc/com/android/camera/one/v2/initialization/InitializedOneCameraFactory.java
rc/com/android/camera/one/v2/initialization/PreviewSizeSelector.java
rc/com/android/camera/one/v2/initialization/PreviewStarter.java
rc/com/android/camera/one/v2/photo/FlashBasedPhotoCommand.java
rc/com/android/camera/one/v2/photo/FrameExposureResponseListener.java
rc/com/android/camera/one/v2/photo/ImageCaptureCommand.java
rc/com/android/camera/one/v2/photo/ImageSaver.java
rc/com/android/camera/one/v2/photo/PictureCallbackAdaptor.java
rc/com/android/camera/one/v2/photo/PictureTaker.java
rc/com/android/camera/one/v2/photo/PictureTakerFactory.java
rc/com/android/camera/one/v2/photo/PictureTakerImpl.java
rc/com/android/camera/one/v2/photo/SimpleImageCaptureCommand.java
rc/com/android/camera/one/v2/photo/ZslImageCaptureCommand.java
rc/com/android/camera/one/v2/photo/ZslPictureTakerFactory.java
rc/com/android/camera/one/v2/sharedimagereader/BoundedImageBufferQueue.java
rc/com/android/camera/one/v2/sharedimagereader/ImageDistributor.java
rc/com/android/camera/one/v2/sharedimagereader/ImageDistributorOnImageAvailableListener.java
rc/com/android/camera/one/v2/sharedimagereader/ImageStreamFactory.java
rc/com/android/camera/one/v2/sharedimagereader/ImageStreamImpl.java
rc/com/android/camera/one/v2/sharedimagereader/SharedImageReader.java
rc/com/android/camera/one/v2/sharedimagereader/SharedImageReaderFactory.java
rc/com/android/camera/one/v2/sharedimagereader/SingleAllocationImageStream.java
rc/com/android/camera/one/v2/sharedimagereader/TicketRequiredFilter.java
rc/com/android/camera/one/v2/sharedimagereader/ZslSharedImageReaderFactory.java
rc/com/android/camera/one/v2/sharedimagereader/imagedistributor/ImageDistributor.java
rc/com/android/camera/one/v2/sharedimagereader/imagedistributor/ImageDistributorFactory.java
rc/com/android/camera/one/v2/sharedimagereader/imagedistributor/ImageDistributorImpl.java
rc/com/android/camera/one/v2/sharedimagereader/imagedistributor/ImageDistributorOnImageAvailableListener.java
rc/com/android/camera/one/v2/sharedimagereader/imagedistributor/ImageStream.java
rc/com/android/camera/one/v2/sharedimagereader/imagedistributor/RefCountedImageProxy.java
rc/com/android/camera/one/v2/sharedimagereader/imagedistributor/SingleCloseImageProxy.java
rc/com/android/camera/one/v2/sharedimagereader/ringbuffer/DynamicRingBuffer.java
rc/com/android/camera/one/v2/sharedimagereader/ringbuffer/DynamicRingBufferFactory.java
rc/com/android/camera/one/v2/sharedimagereader/ringbuffer/QueueFlusher.java
rc/com/android/camera/one/v2/sharedimagereader/ringbuffer/TicketPoolPrioritizer.java
rc/com/android/camera/one/v2/sharedimagereader/ticketpool/FiniteTicketPool.java
rc/com/android/camera/one/v2/sharedimagereader/ticketpool/ReservableTicketPool.java
rc/com/android/camera/one/v2/sharedimagereader/ticketpool/Ticket.java
rc/com/android/camera/one/v2/sharedimagereader/ticketpool/TicketPool.java
rc/com/android/camera/one/v2/sharedimagereader/ticketpool/TicketProvider.java
rc/com/android/camera/one/v2/sharedimagereader/util/ImageCloser.java
rc/com/android/camera/one/v2/sharedimagereader/util/TicketImageProxy.java
rc/com/android/camera/util/ScopedFactory.java
|
415db11a3fd1300d67a4484b683f39e6d10d8353 |
19-Dec-2014 |
Senpo Hu <senpo@google.com> |
Merge "Tune open filmstrip animation for capture indicator in Haleakala." into ub-camera-haleakala
|
d498ee7a23a4f04239909bdfc7b122d34ad13bca |
17-Dec-2014 |
Senpo Hu <senpo@google.com> |
Tune open filmstrip animation for capture indicator in Haleakala. Confirmed with zray@. UX team wants a smoother animation with fast_out_slow_in interpolator to open filmstrip. Change-Id: I8c7b82cf22f43df24bb27280364b2aacc97e46b3
rc/com/android/camera/widget/FilmstripLayout.java
|
2272f8a6bfc8adca8ada7a215bef038d45256085 |
16-Dec-2014 |
Senpo Hu <senpo@google.com> |
CaptureModule first run dialog. * Introduce FirstRunDialog. * Add OneCameraCharacteristics so we can query camera properties without opening the camera. * Refactor AspectRatioDialogLayout and LocationDialogLayout to clean up. * Refactor to move away from portability/Size class in Camera2. Bug: 18623223 Change-Id: I05f4eefe3ee2feeaa47b6296f8926f6be8e83051
es/layout-land/aspect_ratio_selector.xml
es/layout-port/aspect_ratio_selector.xml
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/CaptureModule.java
rc/com/android/camera/CaptureModuleUI.java
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/PhotoUI.java
rc/com/android/camera/VideoModule.java
rc/com/android/camera/app/AppController.java
rc/com/android/camera/app/FirstRunDialog.java
rc/com/android/camera/exif/Rational.java
rc/com/android/camera/one/OneCameraAccessException.java
rc/com/android/camera/one/OneCameraCharacteristics.java
rc/com/android/camera/one/OneCameraManager.java
rc/com/android/camera/one/v1/OneCameraManagerImpl.java
rc/com/android/camera/one/v2/OneCameraCharacteristicsImpl.java
rc/com/android/camera/one/v2/OneCameraManagerImpl.java
rc/com/android/camera/settings/AppUpgrader.java
rc/com/android/camera/settings/CameraPictureSizesCacher.java
rc/com/android/camera/settings/CameraSettingsActivity.java
rc/com/android/camera/settings/ResolutionUtil.java
rc/com/android/camera/settings/SettingsManager.java
rc/com/android/camera/settings/SettingsUtil.java
rc/com/android/camera/util/ApiHelper.java
rc/com/android/camera/util/CameraUtil.java
rc/com/android/camera/util/Size.java
rc/com/android/camera/widget/AspectRatioDialogLayout.java
rc/com/android/camera/widget/AspectRatioSelector.java
rc/com/android/camera/widget/LocationDialogLayout.java
|
01d56038a53487a9b7989bd17c732b8919da64f1 |
18-Dec-2014 |
Paul Rohde <codelogic@google.com> |
Delete unused code. Change-Id: I55e6da712199cb106781bea8a51cf98fd5ed7e31
es/layout-land/pano_review_control.xml
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/IntArray.java
rc/com/android/camera/OnClickAttr.java
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/Storage.java
rc/com/android/camera/ToggleImageButton.java
rc/com/android/camera/VideoModule.java
rc/com/android/camera/app/AppUi.java
rc/com/android/camera/drawable/TextDrawable.java
rc/com/android/camera/one/v2/ImageCaptureManager.java
rc/com/android/camera/one/v2/OneCameraZslImpl.java
rc/com/android/camera/ui/CheckedLinearLayout.java
rc/com/android/camera/ui/ExpandedGridView.java
rc/com/android/camera/ui/FaceView.java
rc/com/android/camera/ui/FocusIndicator.java
rc/com/android/camera/ui/OnIndicatorEventListener.java
rc/com/android/camera/ui/RotateImageView.java
rc/com/android/camera/ui/Switch.java
rc/com/android/camera/ui/TwoStateImageView.java
rc/com/android/camera/util/AccessibilityUtils.java
rc/com/android/camera/util/Callback.java
rc/com/android/camera/util/DoneHandler.java
rc/com/android/camera/util/Gusterpolator.java
rc/com/android/camera/util/ImageLoader.java
rc/com/android/camera/util/MotionEventHelper.java
rc/com/android/camera/util/Size.java
rc/com/android/camera/widget/FilmstripView.java
|
dfceadee0ac331d147263280d5d6ee0c09101c76 |
18-Dec-2014 |
Paul Rohde <codelogic@google.com> |
Merge "Refactor Photo and Video Data into seperate classes Delete unused RotationTask" into ub-camera-haleakala
|
3a8c31c09850dd75b28337003773b442e8097a0c |
18-Dec-2014 |
Paul Rohde <codelogic@google.com> |
Refactor Photo and Video Data into seperate classes Delete unused RotationTask Change-Id: I9c21d712546d7e8fae81704ac6e79314b4749be0
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/data/CameraDataAdapter.java
rc/com/android/camera/data/LocalData.java
rc/com/android/camera/data/LocalDataQuery.java
rc/com/android/camera/data/LocalMediaData.java
rc/com/android/camera/data/PhotoData.java
rc/com/android/camera/data/RotationTask.java
rc/com/android/camera/data/VideoData.java
|
d14b8f3aeea6ff567fc709b03c98808ca8eb9ca6 |
18-Dec-2014 |
I-Jong Lin <ijonglin@google.com> |
Merge "Second Pass at Integration of ImageBackend" into ub-camera-haleakala
|
ed68932f91b4b4ad6766e4e38732deb8be772426 |
12-Dec-2014 |
I-Jong Lin <ijonglin@google.com> |
Second Pass at Integration of ImageBackend Implementation of single service to centralize task submission and execution of Android Image dependent tasks to minimize the locking of system resources and to prioritize processing with thread priority and enforced temporal dependence. This implementation is ready to support the plumbing for Lucky Shot. Currently, the object are isolated and not wired into the Camera App itself. The integration of these objects will occur in a subsequent CL. The unit tests for these object are contained in a separate, but related CL: ag/602679 . Change-Id: Ia51d46651ed02ea2d5a014943d17cadb56e9006f
rc/com/android/camera/processing/ImageBackend.java
rc/com/android/camera/processing/ImageConsumer.java
rc/com/android/camera/processing/ImageProcessorListener.java
rc/com/android/camera/processing/ImageProcessorProxyListener.java
rc/com/android/camera/processing/TaskChainedCompressImageToJpeg.java
rc/com/android/camera/processing/TaskCompressImageToJpeg.java
rc/com/android/camera/processing/TaskConvertImageToRGBPreview.java
rc/com/android/camera/processing/TaskImageContainer.java
rc/com/android/camera/processing/TaskJpegEncode.java
rc/com/android/camera/processing/TaskWriteImageToDisk.java
|
987ee64612e2510004fdf08536746c87234d01c1 |
05-Dec-2014 |
Paul Rohde <codelogic@google.com> |
Drop new focus indicator into Camera2. * Create a new custom focus view that interacts with physical lens diopter changes. * Replace all occurances of the old focus indicator with the new one. Change-Id: Ia02646ce4d1eb059ecb8a1dfccc15dfc9c167e1b
es/layout/camera.xml
es/raw/material_camera_focus.ogg
es/values/colors.xml
es/values/dimens.xml
rc/com/android/camera/CaptureModule.java
rc/com/android/camera/CaptureModuleUI.java
rc/com/android/camera/FocusOverlayManager.java
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/PhotoUI.java
rc/com/android/camera/SoundPlayer.java
rc/com/android/camera/VideoModule.java
rc/com/android/camera/VideoUI.java
rc/com/android/camera/app/CameraAppUI.java
rc/com/android/camera/one/AbstractOneCamera.java
rc/com/android/camera/one/OneCamera.java
rc/com/android/camera/one/v2/ImageCaptureManager.java
rc/com/android/camera/one/v2/OneCameraImpl.java
rc/com/android/camera/one/v2/OneCameraZslImpl.java
rc/com/android/camera/one/v2/SimpleJpegOneCameraFactory.java
rc/com/android/camera/one/v2/common/GenericOneCameraImpl.java
rc/com/android/camera/ui/FocusOverlay.java
rc/com/android/camera/ui/focus/AutoFocusRing.java
rc/com/android/camera/ui/focus/CameraCoordinateTransformer.java
rc/com/android/camera/ui/focus/FocusController.java
rc/com/android/camera/ui/focus/FocusRing.java
rc/com/android/camera/ui/focus/FocusRingRenderer.java
rc/com/android/camera/ui/focus/FocusRingView.java
rc/com/android/camera/ui/focus/FocusSound.java
rc/com/android/camera/ui/focus/ManualFocusRing.java
rc/com/android/camera/ui/motion/AnimationClock.java
rc/com/android/camera/ui/motion/DampedSpring.java
rc/com/android/camera/ui/motion/DynamicAnimation.java
rc/com/android/camera/ui/motion/DynamicAnimator.java
rc/com/android/camera/ui/motion/InterpolateUtils.java
rc/com/android/camera/ui/motion/Invalidator.java
rc/com/android/camera/ui/motion/UnitBezier.java
rc/com/android/camera/ui/motion/UnitCurve.java
rc/com/android/camera/ui/motion/UnitCurves.java
rc/com/android/camera/util/CameraUtil.java
rc/com/android/camera/widget/FilmstripView.java
|
b79279f49e365cc6da75c1bc44b4c786036d0aa7 |
17-Dec-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Adding stack support and hooking SmartBurst up to the new API." into ub-camera-haleakala
|
24069e7a9cc9b4f908f18a71301285ccf5e164f6 |
09-Dec-2014 |
Sascha Haeberling <haeberling@google.com> |
Adding stack support and hooking SmartBurst up to the new API. Change-Id: Icc023aed65e1e31f0b808de648067b3628fff838
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/CaptureModule.java
rc/com/android/camera/Storage.java
rc/com/android/camera/app/CameraApp.java
rc/com/android/camera/burst/BurstFacade.java
rc/com/android/camera/burst/BurstFacadeFactory.java
rc/com/android/camera/burst/BurstFacadeImpl.java
rc/com/android/camera/burst/BurstReadyStateChangeListener.java
rc/com/android/camera/burst/ToastingBurstFacadeDecorator.java
rc/com/android/camera/data/LocalMediaData.java
rc/com/android/camera/session/CaptureSession.java
rc/com/android/camera/session/CaptureSessionManager.java
rc/com/android/camera/session/CaptureSessionManagerImpl.java
rc/com/android/camera/session/StackSaver.java
rc/com/android/camera/session/StackSaverFactory.java
rc/com/android/camera/session/StackSaverImpl.java
|
b530f7d637117e7c014d72d7692579d9dda6caa9 |
16-Dec-2014 |
Senpo Hu <senpo@google.com> |
Merge "Bug fixes for capture indicator UI." into ub-camera-haleakala
|
1321823277e30b0be46f4911418b7b64cfc7d1c0 |
08-Dec-2014 |
Radford Juang <radford@google.com> |
Setting AF mode for SmartBurst to CONTINUOUS_VIDEO to prevent focus issues when capturing action with SmartBurst. (Note: b/16984793 prevents this from working properly on Nexus 5) Change-Id: I3b046030ccf1264a339fa1e8dc15ae92d7157e7f
rc/com/android/camera/one/v2/OneCameraZslImpl.java
|
45ca73a06106fa8a9e12c7f3b108ef249d103cbb |
15-Dec-2014 |
Geoff Mendal <mendal@google.com> |
Import translations. DO NOT MERGE Change-Id: I62152f8e6276d0c2f7f37a2888b225793065f7f7 Auto-generated-cl: translation import
es/values-uz-rUZ/strings.xml
|
367d13813ff5b72824b20df84989074dd48e4a6c |
11-Dec-2014 |
Sascha Haeberling <haeberling@google.com> |
Make sure to only silence if the mediarecorder was started. Bug: 11538882 Change-Id: I43991b40fb9312cc59b34132457b5e6b201a8c19
rc/com/android/camera/VideoModule.java
|
a45abcb3cfc48f1718b77a616e000d1678fbd85b |
11-Dec-2014 |
Senpo Hu <senpo@google.com> |
Bug fixes for capture indicator UI. * Don't show capture indicator in Photo Sphere. * Fix the layout on Nexus 6. * Don't transform thumbnail image if the size is matched. Change-Id: I03c9c09071b63ed8143236a242b6435b4ea19018
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/widget/RoundedThumbnailView.java
|
331366164fe985d5fc6671f5544fa1da7a6b1276 |
11-Dec-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Disable systems sounds and vibrations during video recording." into ub-camera-haleakala
|
92217bd306b612336ccbd0bac348defc09f49dd3 |
11-Dec-2014 |
Sascha Haeberling <haeberling@google.com> |
Disable systems sounds and vibrations during video recording. Bug: 11538882 Change-Id: If06bdc33ee68d079b581a2e97879dae5c34492fd
rc/com/android/camera/VideoModule.java
|
aec3613f416e910ea3638c6c44bb75035eef4fe3 |
10-Dec-2014 |
Puneet Lall <puneetl@google.com> |
Merge "Initial frameserver/OneCamera integration" into ub-camera-haleakala
|
3d653d3254d9f4411f0b7a4dd56fd739bacd255d |
10-Dec-2014 |
Senpo Hu <senpo@google.com> |
Merge "New capture indicator design for Haleakala." into ub-camera-haleakala
|
427a915be4bcc84fa1c32d9e9e1b7473c522f732 |
20-Nov-2014 |
Senpo Hu <senpo@google.com> |
New capture indicator design for Haleakala. * Introduce RoundedThumbnailView and retire PeekView. * Rename BottomBarModeOptionsWrapper to StickyBottomCaptureLayout. * Verified on K and L devices. Thumbnail cropping: * 100% width and vertically centered for portrait. * 100% height and horizontally centered for landscape. General behavior spec: * Hide the capture indicatorby fading out using fast_out_linear_in (150ms): 1) User open filmstrip. 2) User switch module. 3) User switch front/back camera. 4) User close app. Behavior spec for non-photo modules: * Photosphere is stripped of UI so there is no need to show capture indicator. When a photo sphere is taken (and user is in another mode), the preview frame used in filmstrip is used in the capture indicator. * Video: show in viewfinder prior or after capture. Hide during capture. When a video is taken, the preview frame used in filmstrip is used in the capture indicator. * Panorama: Show in viewfinder prior or after capture. Hide during capture. When a panorama is taken, the preview frame used in filmstrip is used in the capture indicator. * Lens blue: Show in viewfinder prior or after capture. Hide during capture. When a lens blur is taken, the preview frame used in filmstrip is used in the capture indicator. Visual spec: A 12dp spacing between mode option overlay and thumbnail. 1. A circular mask that excludes the corners of the preview image. 2. A solid white layer that sits on top of the preview and is also masked by (1). 3. The preview image. 4. A 'ripple' which is just a white circular stroke. Animation spec: (1) only the scale animates, from 50%(24dp) to 114%(54dp) in 200ms then falls back to 100%(48dp) in 200ms. Both steps use the same easing: fast_out_slow_in. (2) opacity, from 50% to 0% over 150ms, easing is exponential. (3) doesn't animate. (4) starts animating after 100ms, when (1) is at its peak radius and all animations take 200ms, using linear_out_slow in. Opacity goes from 40% to 0%, radius goes from 40dp to 70dp, stroke width goes from 5dp to 1dp. Bug: 18317565 Change-Id: Ib8d4f065b98fc3b9b0b627633232ce8cee96eb61
es/layout/activity_main.xml
es/layout/camera.xml
es/layout/mode_options_bottombar.xml
es/layout/sticky_bottom_capture_layout.xml
es/values/dimens.xml
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/CaptureModule.java
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/VideoController.java
rc/com/android/camera/VideoModule.java
rc/com/android/camera/VideoUI.java
rc/com/android/camera/app/AppController.java
rc/com/android/camera/app/CameraAppUI.java
rc/com/android/camera/ui/BottomBarModeOptionsWrapper.java
rc/com/android/camera/ui/ModeListView.java
rc/com/android/camera/ui/StickyBottomCaptureLayout.java
rc/com/android/camera/widget/RoundedThumbnailView.java
|
1009712bc3d2406c9df3811c5caf5a1883d19eee |
09-Dec-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Clean up unused CameraPreviewData." into ub-camera-haleakala
|
f671a3f23d1591b1aeeb549f5ceed509e432430d |
09-Dec-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Remove unused SoundClips class." into ub-camera-haleakala
|
eb9fae80e9f8f8ca8db806c59488f08f85251d9a |
09-Dec-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Remove unused sound files." into ub-camera-haleakala
|
fcbe0bdf25571217bea08c980a654295bee57217 |
09-Dec-2014 |
Alan Newberger <alann@google.com> |
am a8923a75: Avoid resetting touch to focus in onPreviewStarted for N4 * commit 'a8923a75b4c1ffa2158687221fd679b2dea60013': Avoid resetting touch to focus in onPreviewStarted for N4
|
a8923a75b4c1ffa2158687221fd679b2dea60013 |
09-Dec-2014 |
Alan Newberger <alann@google.com> |
Avoid resetting touch to focus in onPreviewStarted for N4 N4 HAL stability issues seem to be exacerbated by resetting focus in onPreviewStarted. Removing this call yields OK performance for N4 and removes any repros for the known issue. Bug: 18681082 Change-Id: I7f78ad648ff55dee412abb18560276cba99ab988
rc/com/android/camera/FocusOverlayManager.java
|
0d1764dcd9f21de0647831713e4e6094f9566641 |
09-Dec-2014 |
Sascha Haeberling <haeberling@google.com> |
Remove unused SoundClips class. Change-Id: I71e5cedb8e70d33172fc0c48fcf3bebfd6e35f88
rc/com/android/camera/SoundClips.java
rc/com/android/camera/SoundPlayer.java
|
a07cce2e5987d716451dbcac559b100ad1499842 |
09-Dec-2014 |
Sascha Haeberling <haeberling@google.com> |
Remove unused sound files. Change-Id: I60898c83c0087696a448cefb1e608525c1bd13a2
ounds/shutter.wav
ounds/staged_shot_complete.wav
ounds/timer_final_second.wav
ounds/timer_increment.wav
|
9c94ab32a69a1ad3642a0f1e38e68bcfd97d3511 |
02-Dec-2014 |
Puneet Lall <puneetl@google.com> |
Initial frameserver/OneCamera integration Change-Id: I2fe0d8acf9ce927a6a0a1dea599299c715503462
rc/com/android/camera/async/BlockingCloseable.java
rc/com/android/camera/async/BufferQueueController.java
rc/com/android/camera/async/CallbackRunnable.java
rc/com/android/camera/async/CloseableHandlerThread.java
rc/com/android/camera/async/ConcurrentBufferQueue.java
rc/com/android/camera/async/ConcurrentState.java
rc/com/android/camera/async/ConstantPollable.java
rc/com/android/camera/async/FilteredUpdatable.java
rc/com/android/camera/async/FutureResult.java
rc/com/android/camera/async/HandlerExecutor.java
rc/com/android/camera/async/Listenable.java
rc/com/android/camera/async/ListenableConcurrentState.java
rc/com/android/camera/async/Pollable.java
rc/com/android/camera/async/RefCountedBufferQueueController.java
rc/com/android/camera/async/ResettingDelayedExecutor.java
rc/com/android/camera/async/SafeCloseable.java
rc/com/android/camera/async/Updatable.java
rc/com/android/camera/async/UpdatableCountDownLatch.java
rc/com/android/camera/one/AbstractOneCamera.java
rc/com/android/camera/one/OneCamera.java
rc/com/android/camera/one/v2/SimpleJpegOneCameraFactory.java
rc/com/android/camera/one/v2/camera2proxy/AndroidCameraCaptureSessionProxy.java
rc/com/android/camera/one/v2/camera2proxy/AndroidImageProxy.java
rc/com/android/camera/one/v2/camera2proxy/CameraCaptureSessionClosedException.java
rc/com/android/camera/one/v2/camera2proxy/CameraCaptureSessionProxy.java
rc/com/android/camera/one/v2/camera2proxy/CameraDeviceProxy.java
rc/com/android/camera/one/v2/camera2proxy/ForwardingImageProxy.java
rc/com/android/camera/one/v2/camera2proxy/ImageProxy.java
rc/com/android/camera/one/v2/commands/AFScanHoldReset.java
rc/com/android/camera/one/v2/commands/CameraCommand.java
rc/com/android/camera/one/v2/commands/CameraCommandExecutor.java
rc/com/android/camera/one/v2/commands/FlashBasedPhotoCommand.java
rc/com/android/camera/one/v2/commands/FullAFScanCommand.java
rc/com/android/camera/one/v2/commands/LoggingCameraCommand.java
rc/com/android/camera/one/v2/commands/PreviewCommand.java
rc/com/android/camera/one/v2/commands/RunnableCameraCommand.java
rc/com/android/camera/one/v2/commands/StaticPictureCommand.java
rc/com/android/camera/one/v2/common/CaptureSessionCreator.java
rc/com/android/camera/one/v2/common/DeferredManualAutoFocus.java
rc/com/android/camera/one/v2/common/DeferredPictureTaker.java
rc/com/android/camera/one/v2/common/FullSizeAspectRatioProvider.java
rc/com/android/camera/one/v2/common/GenericOneCameraImpl.java
rc/com/android/camera/one/v2/common/ManualAutoFocusImpl.java
rc/com/android/camera/one/v2/common/MeteringParameters.java
rc/com/android/camera/one/v2/common/PictureCallbackAdaptor.java
rc/com/android/camera/one/v2/common/PollableAEMode.java
rc/com/android/camera/one/v2/common/PollableAERegion.java
rc/com/android/camera/one/v2/common/PollableAFRegion.java
rc/com/android/camera/one/v2/common/PollableZoomedCropRegion.java
rc/com/android/camera/one/v2/common/PreviewSizeSelector.java
rc/com/android/camera/one/v2/common/SensorOrientationProvider.java
rc/com/android/camera/one/v2/common/SupportedPreviewSizeProvider.java
rc/com/android/camera/one/v2/components/AutoFocusMonitor.java
rc/com/android/camera/one/v2/components/CameraCommand.java
rc/com/android/camera/one/v2/components/FullAFScanCommand.java
rc/com/android/camera/one/v2/components/ImageSaver.java
rc/com/android/camera/one/v2/components/PreviewCommand.java
rc/com/android/camera/one/v2/components/StaticPictureCommand.java
rc/com/android/camera/one/v2/core/DecoratingRequestBuilderBuilder.java
rc/com/android/camera/one/v2/core/DecoratingRequestBuilderFactory.java
rc/com/android/camera/one/v2/core/FrameExposureResponseListener.java
rc/com/android/camera/one/v2/core/FrameServer.java
rc/com/android/camera/one/v2/core/FrameworkFailureResponseListener.java
rc/com/android/camera/one/v2/core/MetadataChangeResponseListener.java
rc/com/android/camera/one/v2/core/MetadataResponseListener.java
rc/com/android/camera/one/v2/core/RefCountedImageProxy.java
rc/com/android/camera/one/v2/core/RequestBuilder.java
rc/com/android/camera/one/v2/core/ResponseListener.java
rc/com/android/camera/one/v2/core/ResponseListenerBroadcaster.java
rc/com/android/camera/one/v2/core/SingleCloseImageProxy.java
rc/com/android/camera/one/v2/core/TagDispatchCaptureSession.java
rc/com/android/camera/one/v2/core/TimestampResponseListener.java
rc/com/android/camera/one/v2/core/TotalCaptureResultResponseListener.java
rc/com/android/camera/one/v2/core/TriggeredAFScanStateResponseListener.java
rc/com/android/camera/one/v2/sharedimagereader/BoundedImageBufferQueue.java
rc/com/android/camera/one/v2/sharedimagereader/ImageDistributor.java
rc/com/android/camera/one/v2/sharedimagereader/ImageDistributorOnImageAvailableListener.java
rc/com/android/camera/one/v2/sharedimagereader/SharedImageReader.java
rc/com/android/camera/util/ScopedFactory.java
|
82fcb43b69e2e0be2c702966f989096c090850d3 |
08-Dec-2014 |
Geoff Mendal <mendal@google.com> |
Import translations. DO NOT MERGE Change-Id: Ia95123f33dc8869e69b4b3e92523697d0f50b67f Auto-generated-cl: translation import
es/values-km-rKH/strings.xml
es/values-my-rMM/strings.xml
|
2fda232c3f89a5f42fa804fd083cbe1750402e0c |
06-Dec-2014 |
Shashi Shekhar <shashishekhar@google.com> |
Merge "Fix orientation for preview frames in burst." into ub-camera-haleakala
|
a7216e47fcfae70fd65a25753a93ec246be3633f |
04-Dec-2014 |
Shashi Shekhar <shashishekhar@google.com> |
Fix orientation for preview frames in burst. Fix orientation of preview frames in burst. Set the correct orientation when starting the burst. BUG: 18117847 Change-Id: I4ed2f0387a5a35a5f43f0528d179b273828ea699
rc/com/android/camera/burst/BurstFacadeImpl.java
|
092082a18e23713b4dc66efe1f5a6d1896b52d34 |
05-Dec-2014 |
Sascha Haeberling <haeberling@google.com> |
Clean up unused CameraPreviewData. Change-Id: I86d60a553d84e0f625fa596c1029394ff110c5d0
rc/com/android/camera/data/CameraPreviewData.java
|
f100ab2f2e0ea16c45658d7c227a3cdfbee71b13 |
05-Dec-2014 |
Shashi Shekhar <shashishekhar@google.com> |
Fix some timestamp issues with burst. 1. Set timezone to UTC, as the timestamp is in UTC. 2. Use timestamp from mediaItem.getTimestamp() 3. Change the format of filename to include artifact as well as mediaitem index. BUG: 18625548 Change-Id: I91196fefda780c3a262619e97c6684086adf845d
rc/com/android/camera/burst/BurstFacadeImpl.java
|
a88887f4f586f69b71aa61c38a3b997ce076eed1 |
04-Dec-2014 |
Alan Newberger <alann@google.com> |
Merge "When checking for scene mode, use NO_SCENE_MODE in addition to AUTO" into ub-camera-haleakala
|
529d5f670e363fdfd76b05634faf1169a821a3ec |
04-Dec-2014 |
Alan Newberger <alann@google.com> |
When checking for scene mode, use NO_SCENE_MODE in addition to AUTO Some devices don't have any scene modes, in that case don't try to override parameters like flash, a code path that should only be used for actual scene modes active. Bug: 18600226 Change-Id: If094d8be6bb4f9d8bc66d033374e17898ed98bee
rc/com/android/camera/PhotoModule.java
|
94053036462de5df6982ef3efa15bf9055e8ea1f |
04-Dec-2014 |
Senpo Hu <senpo@google.com> |
Merge "Fix the orientation issue for front camera." into ub-camera-haleakala
|
bc3b9f1bf63dd70ef11e54ea6d4687a5174f5ddf |
02-Dec-2014 |
Senpo Hu <senpo@google.com> |
Fix the orientation issue for front camera. This bug is introduced by the refactoring done in ag/589395. Bug: 18520267 Change-Id: If0df6a7d6fe3ca630839ef92dccaa78f0136bb7d
rc/com/android/camera/util/CameraUtil.java
|
61408dd1fc96641fee532fe7c3a19dce1b58ab2f |
27-Nov-2014 |
Sam Hasinoff <hasinoff@google.com> |
Add support to dump LensShadingMap metadata, related cleanup - Add custom toString() for LensShadingMap to workaround b/16899576. - Remove several now-unneeded custom toString() methods, since lmp-release provides them in: frameworks/base/core/java/android/hardware/camera2/params/ - Picky formatting fix. Bug: 16899576 Change-Id: Iebf0b03ea27f291bc0f633b3760d5bd696df906d
rc/com/android/camera/util/CaptureDataSerializer.java
|
5777607add70d227aa194635a2c93d03f81ab7fe |
27-Nov-2014 |
Shashi Shekhar <shashishekhar@google.com> |
Bump memory limit for saving images. Bump the memory limit for saving images in MediaSaver from 20 to 30 MB. Allows bursts to be saved without hitting memory limit issues. Change-Id: I5795cd1b2870a9a4e48738fe5d60c1b819011d23
rc/com/android/camera/MediaSaverImpl.java
|
dd7c15c4b89a7410545f9efe62e2dea18cd1aaa8 |
26-Nov-2014 |
Sascha Haeberling <haeberling@google.com> |
Make sure we only show the toast when burst was actually stopped. Change-Id: I057bd7217d09f4754584f77c3911749d2ac0fa5f
rc/com/android/camera/CaptureModule.java
rc/com/android/camera/burst/BurstFacade.java
rc/com/android/camera/burst/BurstFacadeFactory.java
rc/com/android/camera/burst/BurstFacadeImpl.java
rc/com/android/camera/burst/ToastingBurstFacadeDecorator.java
|
a82b4ef46cdd963feee9076510ff29a93ad6a23e |
26-Nov-2014 |
Geoff Mendal <mendal@google.com> |
Import translations. DO NOT MERGE Change-Id: I3de383ec886b063b307b75aef057547e60689945 Auto-generated-cl: translation import
es/values-eu-rES/strings.xml
|
06c2b7f396e3d575b43e9e938fee04ff3ff87ba5 |
26-Nov-2014 |
Sascha Haeberling <haeberling@google.com> |
Add a temporary toast message decorator so users know when a burst is on. Change-Id: If6164f636f60de6f7303a5d54f432648a25e012a
rc/com/android/camera/CaptureModule.java
rc/com/android/camera/burst/ToastingBurstFacadeDecorator.java
|
913d2ba7ee1b404e58e9287dbc37ffbc3ae604bb |
26-Nov-2014 |
Puneet Lall <puneetl@google.com> |
Merge "Move async package to com.android.camera" into ub-camera-haleakala
|
de15a5ad14da2e9069642e6f616b66b4ae660e01 |
25-Nov-2014 |
Puneet Lall <puneetl@google.com> |
Move async package to com.android.camera Change-Id: I937dbdc07fde9fa134f169538243e8c5ee1b6a46
rc/com/android/camera/async/BoundedBufferQueue.java
rc/com/android/camera/async/BufferQueue.java
rc/com/android/camera/async/BufferQueueController.java
rc/com/android/camera/async/ConcurrentBufferQueue.java
rc/com/android/camera/async/FutureResult.java
rc/com/android/camera/async/RefCountBase.java
rc/com/android/camera/async/RefCountedBufferQueueController.java
rc/com/android/camera/async/SafeCloseable.java
rc/com/android/camera/one/v2/async/BoundedBufferQueue.java
rc/com/android/camera/one/v2/async/BufferQueue.java
rc/com/android/camera/one/v2/async/BufferQueueController.java
rc/com/android/camera/one/v2/async/ConcurrentBufferQueue.java
rc/com/android/camera/one/v2/async/FutureResult.java
rc/com/android/camera/one/v2/async/RefCountBase.java
rc/com/android/camera/one/v2/async/RefCountedBufferQueueController.java
rc/com/android/camera/one/v2/async/SafeCloseable.java
rc/com/android/camera/one/v2/camera2proxy/ImageProxy.java
rc/com/android/camera/one/v2/components/FullAFScanCommand.java
rc/com/android/camera/one/v2/components/StaticPictureCommand.java
rc/com/android/camera/one/v2/core/CaptureStream.java
rc/com/android/camera/one/v2/core/FrameworkFailureResponseListener.java
rc/com/android/camera/one/v2/core/MetadataChangeResponseListener.java
rc/com/android/camera/one/v2/core/RefCountedImageProxy.java
rc/com/android/camera/one/v2/core/RequestBuilder.java
rc/com/android/camera/one/v2/core/SimpleCaptureStream.java
rc/com/android/camera/one/v2/core/TimestampResponseListener.java
rc/com/android/camera/one/v2/core/TotalCaptureResultResponseListener.java
rc/com/android/camera/one/v2/sharedimagereader/BoundedImageBufferQueue.java
rc/com/android/camera/one/v2/sharedimagereader/ImageDistributor.java
rc/com/android/camera/one/v2/sharedimagereader/SharedImageReader.java
|
5f074b68846bbb420be9ad55f1d5c367f75f07e1 |
25-Nov-2014 |
Alan Newberger <alann@google.com> |
Merge "Separate enable/disable and show/hide logic in ButtonManager" into ub-camera-haleakala
|
9ceed0d5535e8453f8b5f77959134760dac01ec5 |
25-Nov-2014 |
Puneet Lall <puneetl@google.com> |
Refactor OneCamera * Removed CaptureParameter "sanityCheck" * Removed unused OneCamera interface methods Change-Id: I2464cedf4ad9122e6ca72055e1cc8c0ba633a164
rc/com/android/camera/CaptureModule.java
rc/com/android/camera/burst/BurstFacadeImpl.java
rc/com/android/camera/one/CameraDirectionProvider.java
rc/com/android/camera/one/OneCamera.java
rc/com/android/camera/one/v2/OneCameraImpl.java
rc/com/android/camera/one/v2/OneCameraZslImpl.java
|
e29804fdace7b653932314407a5bdcf58569e590 |
25-Nov-2014 |
Alan Newberger <alann@google.com> |
Separate enable/disable and show/hide logic in ButtonManager Show/hide occurs during module init, and should not be overridden during operation when buttons are enabled/disabled. Rather than make all enabling code handle the complexity of button visibility, this change just configures buttons to be visible once. Addresses bug where flash button becomes visible on devices without flash when toggling HDR, due to logic that enables/disables flash and HDR together. Bug: 18376973 Change-Id: I787858ccde1fed9833fd24ac51d3b0bd3cc90df7
rc/com/android/camera/ButtonManager.java
rc/com/android/camera/PhotoModule.java
|
a2c1b41da5f169fb9c816449e1dedc32d2335c4a |
24-Nov-2014 |
Puneet Lall <puneetl@google.com> |
Merge "Initial Frameserver Implementation" into ub-camera-haleakala
|
5d4fb6accab3bcbe737d52747c328de5cc092d02 |
31-Oct-2014 |
Puneet Lall <puneetl@google.com> |
Initial Frameserver Implementation Change-Id: Ia683adb31136030b98e7ec429163987ae32da0c2
rc/com/android/camera/one/v2/async/BoundedBufferQueue.java
rc/com/android/camera/one/v2/async/BufferQueue.java
rc/com/android/camera/one/v2/async/BufferQueueController.java
rc/com/android/camera/one/v2/async/ConcurrentBufferQueue.java
rc/com/android/camera/one/v2/async/FutureResult.java
rc/com/android/camera/one/v2/async/RefCountBase.java
rc/com/android/camera/one/v2/async/RefCountedBufferQueueController.java
rc/com/android/camera/one/v2/async/SafeCloseable.java
rc/com/android/camera/one/v2/camera2proxy/CameraDeviceRequestBuilderFactory.java
rc/com/android/camera/one/v2/camera2proxy/CaptureRequestBuilderProxy.java
rc/com/android/camera/one/v2/camera2proxy/ImageProxy.java
rc/com/android/camera/one/v2/components/AutoFocusMonitor.java
rc/com/android/camera/one/v2/components/CameraCommand.java
rc/com/android/camera/one/v2/components/FullAFScanCommand.java
rc/com/android/camera/one/v2/components/ImageSaver.java
rc/com/android/camera/one/v2/components/PreviewCommand.java
rc/com/android/camera/one/v2/components/StaticPictureCommand.java
rc/com/android/camera/one/v2/core/CaptureStream.java
rc/com/android/camera/one/v2/core/DecoratingRequestBuilderFactory.java
rc/com/android/camera/one/v2/core/FrameServer.java
rc/com/android/camera/one/v2/core/FrameworkFailureResponseListener.java
rc/com/android/camera/one/v2/core/MetadataChangeResponseListener.java
rc/com/android/camera/one/v2/core/RefCountedImageProxy.java
rc/com/android/camera/one/v2/core/Request.java
rc/com/android/camera/one/v2/core/RequestBuilder.java
rc/com/android/camera/one/v2/core/ResponseListener.java
rc/com/android/camera/one/v2/core/ResponseListenerBroadcaster.java
rc/com/android/camera/one/v2/core/SimpleCaptureStream.java
rc/com/android/camera/one/v2/core/SingleCloseImageProxy.java
rc/com/android/camera/one/v2/core/TagDispatchCaptureSession.java
rc/com/android/camera/one/v2/core/TimestampResponseListener.java
rc/com/android/camera/one/v2/core/TotalCaptureResultResponseListener.java
rc/com/android/camera/one/v2/sharedimagereader/BoundedImageBufferQueue.java
rc/com/android/camera/one/v2/sharedimagereader/ImageDistributor.java
rc/com/android/camera/one/v2/sharedimagereader/SharedImageReader.java
|
99730c79d3ddd6140d11bdba0cc3dbee751c9d09 |
24-Nov-2014 |
Geoff Mendal <mendal@google.com> |
Import translations. DO NOT MERGE Change-Id: Id17d2fde0913ca354da4bd6eedfa34d9c21044bd Auto-generated-cl: translation import
es/values-km-rKH/strings.xml
es/values-my-rMM/strings.xml
|
659cb59fcaf2ab49a6087ca7d10ab5be16503bf3 |
20-Nov-2014 |
Alan Newberger <alann@google.com> |
am fdefc726: Add renderscript helper value * commit 'fdefc72616d55de5f4e13a3e60fb9561cc8488cb': Add renderscript helper value
|
fdefc72616d55de5f4e13a3e60fb9561cc8488cb |
20-Nov-2014 |
Alan Newberger <alann@google.com> |
Add renderscript helper value Capture new architecture/API-level constraints on renderscript in the ApiHelper. Bug: 18435492 Change-Id: I4d06a0c8448cde587f8a9cb3a042768a4a61872a
rc/com/android/camera/util/ApiHelper.java
|
1709466272b9e57d9f6bde7ae4b82cf5d7f12690 |
20-Nov-2014 |
Shashi Shekhar <shashishekhar@google.com> |
Merge "Hook burst controller to the shutter button long press." into ub-camera-haleakala
|
6e48c66805cb43c3abe5b0e01b0d6fe9e691cb59 |
20-Nov-2014 |
Senpo Hu <senpo@google.com> |
Remove the old unit tests. Change-Id: Ia08785e21f27c0d6f22f5533eab65d8726f52169
ests/src/com/android/camera/unittest/CameraUnitTest.java
ests_camera/src/com/android/camera/unittest/CameraUnitTest.java
|
82d592f64966766ac4e4181e08b0d2989d4ed9c3 |
12-Nov-2014 |
Shashi Shekhar <shashishekhar@google.com> |
Hook burst controller to the shutter button long press. Hooks up the shutter button long press to start the burst. Introduces a BurstManager to interact with burst. Provides an implementation of BurstManager that listens to burst and saves results when burst is complete. The burst eviction handler is now installed on the ring buffer on shutter button press and uninstalled on shutter button release. The ring buffer is cleared before starting and after completion of the burst. Also provides a stub implementation of the BurstController that has a static method which controls if burst is enabled or not. Bug: 18332704 Change-Id: I1098937bf348af7acbf55da1a5eeb423c30fb901
rc/com/android/camera/CameraModule.java
rc/com/android/camera/CaptureModule.java
rc/com/android/camera/MediaSaverImpl.java
rc/com/android/camera/ShutterButton.java
rc/com/android/camera/Storage.java
rc/com/android/camera/app/CameraAppUI.java
rc/com/android/camera/app/MediaSaver.java
rc/com/android/camera/burst/BurstController.java
rc/com/android/camera/burst/BurstFacade.java
rc/com/android/camera/burst/BurstFacadeFactory.java
rc/com/android/camera/burst/BurstFacadeImpl.java
rc/com/android/camera/data/LocalData.java
rc/com/android/camera/one/AbstractOneCamera.java
rc/com/android/camera/one/OneCamera.java
rc/com/android/camera/one/v2/ImageCaptureManager.java
rc/com/android/camera/one/v2/OneCameraZslImpl.java
rc/com/android/camera/util/ConcurrentSharedRingBuffer.java
rc/com/android/camera/widget/ModeOptionsOverlay.java
rc_pd/com/android/camera/burst/BurstControllerImpl.java
|
0bdc4b54a18c18d7094b2e4cea1e238005c5c4a2 |
18-Nov-2014 |
Senpo Hu <senpo@google.com> |
Unify orientation calculation logic. Camera API takes clockwise degrees for JPEG rotation and OrientationEventListener reports clockwise device orientation. The easiest formula of calculating output image rotation degree is: "camera sensor orientation" + "device orientation" Since front cameras face in opposite direction. The result needs to be mirrored for front camera. Detailed changes: * Refactor OrientationManager to remove unnecessary complexity. * Add OrientationManager.DeviceOrientation enum and OrientationManager.getDeviceOrientation * Remove CameraUtil.roundOrientation. * Fix the weird calculation which is hard to understand in CameraUtil.getJpegRotation and add CameraUtil.getImageRotation * Clean up image rotation logic in all modules: * Always look up the current device orientation via OrientationManager.getDeviceOrientation * Fix the doc for copyImagePlaneToBitmap() which actually rotates image counterclockwise. * Clean up CameraActivity: * Remove CameraActivity.onOrientationChanged and ModuleController.onOrientationChanged. Any individual module which wants to listen orientation change should register itself to OrientationManager. Now only VideoModule needs to do that. Bug: 17443789 Change-Id: I6d54cac5bde950acae0c3226448c27a816266df0
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/CaptureModule.java
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/VideoModule.java
rc/com/android/camera/VideoUI.java
rc/com/android/camera/app/OrientationManager.java
rc/com/android/camera/app/OrientationManagerImpl.java
rc/com/android/camera/module/ModuleController.java
rc/com/android/camera/one/v2/OneCameraZslImpl.java
rc/com/android/camera/util/CameraUtil.java
rc/com/android/camera/util/JpegUtilNative.java
rc/com/android/camera/widget/VideoRecordingHints.java
|
77f7eda5a0608256f266c3ba952b2042791c7209 |
19-Nov-2014 |
Shashi Shekhar <shashishekhar@google.com> |
Merge "Wrap FrameDistributor in a thread safe accessor." into ub-camera-haleakala
|
0180fd43f41d5ec4771579d5249f295ee8c683a5 |
18-Nov-2014 |
Shashi Shekhar <shashishekhar@google.com> |
Wrap FrameDistributor in a thread safe accessor. Wrap FrameDistributo in a thread safe accessor and make the instance to accessor a final field in CaptureModule. This should help in avoiding null checks and NPEs. BUG: 18414956 Change-Id: I8d25c5a2923a7382f98c523e88f7547f16217a6f
rc/com/android/camera/CaptureModule.java
rc/com/android/camera/gl/FrameDistributorImpl.java
rc/com/android/camera/gl/FrameDistributorWrapper.java
|
151b35587b9e9ab0436fa2675b2bf546dd830f72 |
19-Nov-2014 |
Geoff Mendal <mendal@google.com> |
Import translations. DO NOT MERGE Change-Id: I2e1828d9441e71a14227c0bdd12bdae31c3ecac2 Auto-generated-cl: translation import
es/values-km-rKH/strings.xml
es/values-my-rMM/strings.xml
|
446c254f3b293f736d6df5b71e6febcdc56a25f8 |
17-Nov-2014 |
Geoff Mendal <mendal@google.com> |
Import translations. DO NOT MERGE Change-Id: I3a5e24362b8267881312a266c32b7ce0f28adc30 Auto-generated-cl: translation import
es/values-bn-rBD/strings.xml
es/values-el/strings.xml
es/values-es/strings.xml
es/values-eu-rES/strings.xml
es/values-fr/strings.xml
es/values-gl-rES/strings.xml
es/values-hi/strings.xml
es/values-is-rIS/strings.xml
es/values-kk-rKZ/strings.xml
es/values-km-rKH/strings.xml
es/values-kn-rIN/strings.xml
es/values-ky-rKG/strings.xml
es/values-mk-rMK/strings.xml
es/values-ml-rIN/strings.xml
es/values-mr-rIN/strings.xml
es/values-my-rMM/strings.xml
es/values-ne-rNP/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-si-rLK/strings.xml
es/values-sk/strings.xml
es/values-ta-rIN/strings.xml
es/values-te-rIN/strings.xml
es/values-ur-rPK/strings.xml
es/values-uz-rUZ/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
|
9d0680cd2809a738cc14e64eb69b37c67636f32b |
15-Nov-2014 |
Dan Sandler <dsandler@android.com> |
am 793ab5bf: am fa47b949: am 9149a9b6: Merge "Vector version of camera preview graphic." into lmp-mr1-dev * commit '793ab5bf002940885ae7b0be2c3ddd59103cac49': Vector version of camera preview graphic.
|
81ed291b96da65568ed3d1dd1e928536138132c0 |
15-Nov-2014 |
Dan Sandler <dsandler@android.com> |
am 6942b796: am 180c7904: am 005533a9: Merge "Trim transparent pixels off camera preview bitmaps." into lmp-mr1-dev * commit '6942b796aac2b7adcb03bfe4f192fe2f6e08e156': Trim transparent pixels off camera preview bitmaps.
|
793ab5bf002940885ae7b0be2c3ddd59103cac49 |
15-Nov-2014 |
Dan Sandler <dsandler@android.com> |
am fa47b949: am 9149a9b6: Merge "Vector version of camera preview graphic." into lmp-mr1-dev * commit 'fa47b94911982e6f04354cd395b1251043f3a42c': Vector version of camera preview graphic.
|
6942b796aac2b7adcb03bfe4f192fe2f6e08e156 |
15-Nov-2014 |
Dan Sandler <dsandler@android.com> |
am 180c7904: am 005533a9: Merge "Trim transparent pixels off camera preview bitmaps." into lmp-mr1-dev * commit '180c790421d67744db71ff2bf310eb21d5a3326e': Trim transparent pixels off camera preview bitmaps.
|
9be0d3214459d42475be109b943366c44e7c8be1 |
15-Nov-2014 |
Alan Newberger <alann@google.com> |
Merge "Vector version of camera preview graphic." into ub-camera-haleakala
|
081a6a53bebf9e83f1e7e8e9d84a5967f0bb3292 |
14-Nov-2014 |
Dan Sandler <dsandler@android.com> |
Vector version of camera preview graphic. Even less RAM required to hang onto this in the lockscreen. Bug: 18369196 Change-Id: I7ed5ad098b77c96b40d0b76e4a20a7fea12e362a
es/drawable-anydpi-v21/ic_camera_blanket.xml
|
3384c81415b7671fae9a5da806ac103d03d8195a |
14-Nov-2014 |
Dan Sandler <dsandler@android.com> |
Trim transparent pixels off camera preview bitmaps. Since SysUI holds these bitmaps in memory for jank-free drawing, these pixels are just wasted RAM. Since the transition code assumes uniform square bitmaps, these are all 64x64dp, which is still a teensy bit wasteful but much better than before (144x144dp). Bug: 18369196 Change-Id: Idf10b2048190ac44eff3e5da467149c460067347
es/drawable-hdpi/ic_camera_blanket.png
es/drawable-hdpi/ic_video_blanket.png
es/drawable-mdpi/ic_camera_blanket.png
es/drawable-mdpi/ic_video_blanket.png
es/drawable-xhdpi/ic_camera_blanket.png
es/drawable-xhdpi/ic_video_blanket.png
es/drawable-xxhdpi/ic_camera_blanket.png
es/drawable-xxhdpi/ic_video_blanket.png
es/drawable-xxxhdpi/ic_camera_blanket.png
es/drawable-xxxhdpi/ic_video_blanket.png
es/values/dimens.xml
es_p/drawable-hdpi/ic_pano_blanket.png
es_p/drawable-hdpi/ic_photosphere_blanket.png
es_p/drawable-hdpi/ic_refocus_blanket.png
es_p/drawable-mdpi/ic_pano_blanket.png
es_p/drawable-mdpi/ic_photosphere_blanket.png
es_p/drawable-mdpi/ic_refocus_blanket.png
es_p/drawable-xhdpi/ic_pano_blanket.png
es_p/drawable-xhdpi/ic_photosphere_blanket.png
es_p/drawable-xhdpi/ic_refocus_blanket.png
es_p/drawable-xxhdpi/ic_pano_blanket.png
es_p/drawable-xxhdpi/ic_photosphere_blanket.png
es_p/drawable-xxhdpi/ic_refocus_blanket.png
|
fa47b94911982e6f04354cd395b1251043f3a42c |
14-Nov-2014 |
Dan Sandler <dsandler@android.com> |
am 9149a9b6: Merge "Vector version of camera preview graphic." into lmp-mr1-dev * commit '9149a9b657a66c786e2325678e948817c43b1c4c': Vector version of camera preview graphic.
|
180c790421d67744db71ff2bf310eb21d5a3326e |
14-Nov-2014 |
Dan Sandler <dsandler@android.com> |
am 005533a9: Merge "Trim transparent pixels off camera preview bitmaps." into lmp-mr1-dev * commit '005533a92a3b56ef8bceb456063ed0ac12c767cf': Trim transparent pixels off camera preview bitmaps.
|
9149a9b657a66c786e2325678e948817c43b1c4c |
14-Nov-2014 |
Dan Sandler <dsandler@android.com> |
Merge "Vector version of camera preview graphic." into lmp-mr1-dev
|
005533a92a3b56ef8bceb456063ed0ac12c767cf |
14-Nov-2014 |
Dan Sandler <dsandler@android.com> |
Merge "Trim transparent pixels off camera preview bitmaps." into lmp-mr1-dev
|
e6cd71d4a38dac9d218892df203a5951c96cb134 |
14-Nov-2014 |
Dan Sandler <dsandler@android.com> |
Vector version of camera preview graphic. Even less RAM required to hang onto this in the lockscreen. Bug: 18369196 Change-Id: I7ed5ad098b77c96b40d0b76e4a20a7fea12e362a
es/drawable-anydpi-v21/ic_camera_blanket.xml
|
b7a22419659b11e28cddf43c60feeddf468ff295 |
14-Nov-2014 |
Dan Sandler <dsandler@android.com> |
Trim transparent pixels off camera preview bitmaps. Since SysUI holds these bitmaps in memory for jank-free drawing, these pixels are just wasted RAM. Since the transition code assumes uniform square bitmaps, these are all 64x64dp, which is still a teensy bit wasteful but much better than before (144x144dp). Bug: 18369196 Change-Id: Idf10b2048190ac44eff3e5da467149c460067347
es/drawable-hdpi/ic_camera_blanket.png
es/drawable-hdpi/ic_video_blanket.png
es/drawable-mdpi/ic_camera_blanket.png
es/drawable-mdpi/ic_video_blanket.png
es/drawable-xhdpi/ic_camera_blanket.png
es/drawable-xhdpi/ic_video_blanket.png
es/drawable-xxhdpi/ic_camera_blanket.png
es/drawable-xxhdpi/ic_video_blanket.png
es/drawable-xxxhdpi/ic_camera_blanket.png
es/drawable-xxxhdpi/ic_video_blanket.png
es/values/dimens.xml
es_p/drawable-hdpi/ic_pano_blanket.png
es_p/drawable-hdpi/ic_photosphere_blanket.png
es_p/drawable-hdpi/ic_refocus_blanket.png
es_p/drawable-mdpi/ic_pano_blanket.png
es_p/drawable-mdpi/ic_photosphere_blanket.png
es_p/drawable-mdpi/ic_refocus_blanket.png
es_p/drawable-xhdpi/ic_pano_blanket.png
es_p/drawable-xhdpi/ic_photosphere_blanket.png
es_p/drawable-xhdpi/ic_refocus_blanket.png
es_p/drawable-xxhdpi/ic_pano_blanket.png
es_p/drawable-xxhdpi/ic_photosphere_blanket.png
es_p/drawable-xxhdpi/ic_refocus_blanket.png
|
060b6b434a8f7ffbcbbae54831506e4b2fd0e458 |
13-Nov-2014 |
Qiwen Zhao <zhao@google.com> |
reset to e75230e with history.
|
ed74abe89935efe0c3d83d00970c3ab05a3600a8 |
12-Nov-2014 |
Alan Newberger <alann@google.com> |
am 437a1869: Use NEW_DOCUMENT vs NEW_TASK when starting Activities from Camera * commit '437a186929173ad576e0eac04bd5b79939816158': Use NEW_DOCUMENT vs NEW_TASK when starting Activities from Camera
|
331729589cc670bf607c9faaa5cb5b56756090e6 |
12-Nov-2014 |
Alan Newberger <alann@google.com> |
am 5c9d7f34: Fix error in settings key from refactor * commit '5c9d7f34039ac96b3a136ccd6b16162e3b220848': Fix error in settings key from refactor
|
fedf255e5d2f1d799dabf562324f47bb16eddcc6 |
12-Nov-2014 |
Alan Newberger <alann@google.com> |
am 5db8e20d: Only allow one draw call pending at a time * commit '5db8e20db77bf86eba25ec713c76da783dd98b19': Only allow one draw call pending at a time
|
18b23e26ce41398f4470bd12766e4de1aad94033 |
12-Nov-2014 |
Senpo Hu <senpo@google.com> |
am 31d816f6: Merge "Stability: call stopPreview() before switching off video module." into ub-camera-glacier * commit '31d816f64eebfd24e662ff21f611a70b957d4859': Stability: call stopPreview() before switching off video module.
|
b11efbaffc0ee0bc67526e5bda9947380d3b2883 |
12-Nov-2014 |
Spike Sprague <spikuru@google.com> |
am c19d97b3: Let VideoModule override default mode options enable/disable * commit 'c19d97b385261312399b67b538f8faa074314beb': Let VideoModule override default mode options enable/disable
|
301394bae6954f831927b713ff71123be38dee3e |
12-Nov-2014 |
Puneet Lall <puneetl@google.com> |
am 7c703ced: Cleanup: Move api check to ApiHelper * commit '7c703ced0248d6a368a216e9d7699ab8e9565415': Cleanup: Move api check to ApiHelper
|
5d5e097b6f9ab970047a36654f4e0b3fc66d7c46 |
12-Nov-2014 |
Spike Sprague <spikuru@google.com> |
am 2d512cc6: Merge "for intent capture and pano, fix the redo/ok/cancel button sizes so touch ripples show up right." into ub-camera-glacier * commit '2d512cc688a6e46bb8b34e293e87d2f0088a1abb': for intent capture and pano, fix the redo/ok/cancel button sizes so touch ripples show up right.
|
24481bc434aabdbf86545a7e237599a2ae5f61e5 |
12-Nov-2014 |
Spike Sprague <spikuru@google.com> |
am 5ea5dc09: Merge "tweaking peephole animation time from 350 to 500, per in-person request" into ub-camera-glacier * commit '5ea5dc090151f857ba3787e8c29d1269e3dd6da4': tweaking peephole animation time from 350 to 500, per in-person request
|
368e6121761b7b057aca7cde4a3d0e27702a7312 |
12-Nov-2014 |
Alan Newberger <alann@google.com> |
am 535eed78: Merge "Avoid building filmstrip item data if activity is destroyed" into ub-camera-glacier * commit '535eed78310ff5774f544c8c8bb584585304e7ec': Avoid building filmstrip item data if activity is destroyed
|
ee359bca28ad61e3a2c747a9dafc03db8ec1d157 |
12-Nov-2014 |
Spike Sprague <spikuru@google.com> |
am 56afe395: Merge "new share icon" into ub-camera-glacier * commit '56afe3958ddc1b0880c7f4cbb8604caca0a32469': new share icon
|
9f271181ee2bda6be8f4c0ad6266df40388dc9b4 |
12-Nov-2014 |
Alan Newberger <alann@google.com> |
am a530b688: Merge "WIP: Add recursive thumbnail call to LocalMediaData" into ub-camera-glacier * commit 'a530b688ce6e5b61e7cea8dc500fd2642ccdb82c': WIP: Add recursive thumbnail call to LocalMediaData
|
e75230ea137b6b20f63ee2a5653f90fff8e29679 |
12-Nov-2014 |
Qiwen Zhao <zhao@google.com> |
reset to ea0e399 with history.
|
ea0e39945f28665d2874e2f6a5fa3eb66e189737 |
12-Nov-2014 |
Qiwen Zhao <zhao@google.com> |
Merge branch 'lmp-mr1-ub-dev' of persistent-https://googleplex-android.git.corp.google.com/platform/packages/apps/Camera2 into lmp-mr1-ub-dev
|
bc6bb3b6428d7e41282d3d171d73f5305b04c437 |
06-Nov-2014 |
Shaohan Zou <szou@google.com> |
Fix camera latency test b/18239042 Change-Id: Ia59b4c10551038bf2cbe9b9770f21c63f49731f3
ests/src/com/android/camera/stress/CameraLatency.java
|
4772655a579d58035dba53b03ec01095a65607b3 |
12-Nov-2014 |
Qiwen Zhao <zhao@google.com> |
reset to 8dd164a with history.
|
9ae303df246577ee1293ef8e731e18ae63f4d3c9 |
11-Nov-2014 |
Shashi Shekhar <shashishekhar@google.com> |
Merge "Initial version of new module to distribute camera frames to consumers." into ub-camera-haleakala
|
57c233a21fbe50611c1ea8162e9a2ad0b84493b3 |
07-Nov-2014 |
Shashi Shekhar <shashishekhar@google.com> |
Initial version of new module to distribute camera frames to consumers. Add FrameDistributor class, that allows passing frames from a SurfaceTexture to multiple consumers in an efficient manner. In the CaptureModule, this distributor is used to handle frames coming from the Camera. It then hooks up a single FrameConsumer to render frames into a SurfaceTexture. Note, that this particular FrameConsumer is atypical in the sense that it reuses the FrameDistributors GL context for efficiency. Other consumers will typically use their own GL contexts and threads for processing. Bug: 18142762 Change-Id: Iee258d108004c23b7d9777204b58c013a9999215
rc/com/android/camera/CaptureModule.java
rc/com/android/camera/burst/BurstController.java
rc/com/android/camera/gl/CopyShader.java
rc/com/android/camera/gl/FrameDistributor.java
rc/com/android/camera/gl/FrameDistributorImpl.java
rc/com/android/camera/gl/GLToolbox.java
rc/com/android/camera/gl/RenderTarget.java
rc/com/android/camera/gl/SurfaceTextureConsumer.java
|
c6da1a12fe8b78e2fbebe1af5efee514bc8e25ee |
06-Nov-2014 |
Sascha Haeberling <haeberling@google.com> |
Add experimental RAW(DNG) support. Bug: 18272977 This adds RAW writing behind a new debug property: adb shell setprop persist.camera.capture_dng 1 This will switch to the non-ZSL implementation of one Camera. The resulting files are stored in a "DNG" folder under DCIM/Camera. Caveats: - Preview aspect ratio will not match. - No item in filmstrip Change-Id: I9d990de119f22a12d37b22d36d84dc15aeee9340
es/drawable/ic_panorama.xml
rc/com/android/camera/CaptureModuleUtil.java
rc/com/android/camera/debug/DebugPropertyHelper.java
rc/com/android/camera/one/OneCamera.java
rc/com/android/camera/one/v2/OneCameraImpl.java
rc/com/android/camera/one/v2/OneCameraZslImpl.java
rc/com/android/camera/util/CameraUtil.java
|
87ffa1c9505cea14d498ac2baf7212e7a6b037d7 |
06-Nov-2014 |
Shashi Shekhar <shashishekhar@google.com> |
Merge "Initial interface for the burst module." into ub-camera-haleakala
|
17dfcd5d149e3532d2c40f10b225ceb8f53fc1e7 |
06-Nov-2014 |
Andy Huibers <andyhuibers@google.com> |
Merge "Center zoom UI." into ub-camera-haleakala
|
fda210123a0570a3c0cb4ef9210c47bd980cbc53 |
17-Oct-2014 |
Shashi Shekhar <shashishekhar@google.com> |
Initial interface for the burst module. Interface for the burst module. Burst module controls the internal camera buffer and keeps images that best represent a burst at any given point in time. The burst module decides which frames to keep by analyzing low-res preview frames and then keeping corresponding high-res images in the internal camera buffer. At the end of the burst, the burst module retrieves results from the internal camera buffer and can do post processing on the results. Change-Id: I09d4031ad1566232a5d4641084523c3e3e0aace6
rc/com/android/camera/burst/BurstArtifact.java
rc/com/android/camera/burst/BurstConfiguration.java
rc/com/android/camera/burst/BurstController.java
rc/com/android/camera/burst/BurstImage.java
rc/com/android/camera/burst/BurstMediaItem.java
rc/com/android/camera/burst/BurstResult.java
rc/com/android/camera/burst/BurstResultsListener.java
rc/com/android/camera/burst/ResultsAccessor.java
|
dda4a88508c721200857b6ecc4dc2bfab6731a94 |
06-Nov-2014 |
Sascha Haeberling <haeberling@google.com> |
Poke build server, nothing to see here. Change-Id: I3cbd26744539c2c6cf5e68ecd4c5401a003097b1
|
b7772a86edacf9d0ae9568ae6d255c7f86d475fd |
06-Nov-2014 |
Shaohan Zou <szou@google.com> |
am 6a6fddf8: am 3f57f7a9: am 6e1f4125: Fix camera latency test b/18239042 * commit '6a6fddf8e3c32d956d4c176b1216365fdb2f0d81': Fix camera latency test b/18239042
|
6a6fddf8e3c32d956d4c176b1216365fdb2f0d81 |
06-Nov-2014 |
Shaohan Zou <szou@google.com> |
am 3f57f7a9: am 6e1f4125: Fix camera latency test b/18239042 * commit '3f57f7a95e6f82bcb30df5bfc2870aa022fa4a17': Fix camera latency test b/18239042
|
3f57f7a95e6f82bcb30df5bfc2870aa022fa4a17 |
06-Nov-2014 |
Shaohan Zou <szou@google.com> |
am 6e1f4125: Fix camera latency test b/18239042 * commit '6e1f41253728e6870de800f88b5aa2cfde60ee8b': Fix camera latency test b/18239042
|
6e1f41253728e6870de800f88b5aa2cfde60ee8b |
06-Nov-2014 |
Shaohan Zou <szou@google.com> |
Fix camera latency test b/18239042 Change-Id: Ia59b4c10551038bf2cbe9b9770f21c63f49731f3
ests/src/com/android/camera/stress/CameraLatency.java
|
e2f4237ef722eeb36574f7974ea5e22bc9c54177 |
05-Nov-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Update project.properties to use proper SDK 21 instead of preview L." into ub-camera-haleakala
|
a27a5368025cf2d7c3de62a81234f4478d8b35ca |
05-Nov-2014 |
Sascha Haeberling <haeberling@google.com> |
Update project.properties to use proper SDK 21 instead of preview L. Change-Id: I737bdfcfea80a6e722cebf50a2f1ad67542690e1
roject.properties
|
e4d31fbb23ce5ab88474a22d81d0b1c315e2fd5d |
04-Nov-2014 |
Alan Newberger <alann@google.com> |
am 8dd164a3: Merge "Relax aspect ratio matching tolerance for devices with 1.347 ratios" into ub-camera-glacier * commit '8dd164a39a43cdf1a5de5f1e178b42d471316cac': Relax aspect ratio matching tolerance for devices with 1.347 ratios
|
8dd164a39a43cdf1a5de5f1e178b42d471316cac |
04-Nov-2014 |
Alan Newberger <alann@google.com> |
Merge "Relax aspect ratio matching tolerance for devices with 1.347 ratios" into ub-camera-glacier
|
2ebdbd55522df5ceb93c2a0c423e3515c030bd05 |
04-Nov-2014 |
Alan Newberger <alann@google.com> |
Relax aspect ratio matching tolerance for devices with 1.347 ratios Our .01 tolerance omits valid 4:3 previews when the image capture is more than 0.01 over true 4:3. Relax matching in Glacier just for affected builds. Bug: 18241645 Change-Id: I5868bc9535e4c9bb886f0de0daf0e83cd2f4dc78
rc/com/android/camera/util/ApiHelper.java
rc/com/android/camera/util/CameraUtil.java
|
d8bcdbe3162aee50b3a56039d2e678f130727c2e |
04-Nov-2014 |
Alan Newberger <alann@google.com> |
am 5a64d117: move size parameter setting before other settings * commit '5a64d117ceccc8572a426e7d27306d81aa5c5663': move size parameter setting before other settings
|
5a64d117ceccc8572a426e7d27306d81aa5c5663 |
04-Nov-2014 |
Alan Newberger <alann@google.com> |
move size parameter setting before other settings Update picture size before applying parameters prior to starting preview. This is required to avoid a 640x480 default picture stream on the Nexus 4 which is causing lowered preview frame rates (for unknown reasons). Bug: 18227551 Change-Id: I2b7648146ff57d5a7d78a22f884643c6d62497e6
rc/com/android/camera/PhotoModule.java
|
692c29b3e3a672a6357e1e71528bc44dd4c213fd |
31-Oct-2014 |
Baligh Uddin <baligh@google.com> |
am bef77cbb: (-s ours) am 6871a7ea: (-s ours) Import translations. DO NOT MERGE * commit 'bef77cbbf6ae879613a98db21385fa2d43c9ce20': Import translations. DO NOT MERGE
|
bef77cbbf6ae879613a98db21385fa2d43c9ce20 |
31-Oct-2014 |
Baligh Uddin <baligh@google.com> |
am 6871a7ea: (-s ours) Import translations. DO NOT MERGE * commit '6871a7eaf8695f70bb39d7bd78c66b1dcffa6459': Import translations. DO NOT MERGE
|
6871a7eaf8695f70bb39d7bd78c66b1dcffa6459 |
30-Oct-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I0e5bc66edc17019f34219cfc25061b9332b1e56e Auto-generated-cl: translation import
es/values-am/strings.xml
es/values-bn-rBD/strings.xml
es/values-cs/strings.xml
es/values-el/strings.xml
es/values-es/strings.xml
es/values-eu-rES/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-km-rKH/strings.xml
es/values-mk-rMK/strings.xml
es/values-my-rMM/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-si-rLK/strings.xml
es/values-sk/strings.xml
es/values-ta-rIN/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
|
f96cc4efbef89edb3c11930eea078aed324a99f6 |
29-Oct-2014 |
Sascha Haeberling <haeberling@google.com> |
am 06a4e103: Forcefully drop 4k recording from pre-L releases. * commit '06a4e103aefa3303a6995d465a53c81d6581995f': Forcefully drop 4k recording from pre-L releases.
|
06a4e103aefa3303a6995d465a53c81d6581995f |
29-Oct-2014 |
Sascha Haeberling <haeberling@google.com> |
Forcefully drop 4k recording from pre-L releases. Bug: 18172081 Change-Id: I26b09f19757e059d3567b3cb707592696531d0b3
rc/com/android/camera/settings/SettingsUtil.java
|
2e7e1355adde8b4de6a9c75cef3b87a5fa2bf5e4 |
28-Oct-2014 |
Sascha Haeberling <haeberling@google.com> |
am 1332fc02: Remove additional dependencies on FloatMath * commit '1332fc023ea9941ff4afac0a43d13930d5b59771': Remove additional dependencies on FloatMath
|
3120e645372058a0e6bc28f60839cc381623bbc1 |
28-Oct-2014 |
Andy Huibers <andyhuibers@google.com> |
Center zoom UI. Bug: 18153777 Change-Id: I27fc0d0ceb8a707214d7dda821a2d5b8c25c955b
rc/com/android/camera/ui/PreviewOverlay.java
|
1332fc023ea9941ff4afac0a43d13930d5b59771 |
28-Oct-2014 |
Sascha Haeberling <haeberling@google.com> |
Remove additional dependencies on FloatMath See frameworks/base commit 33253a4baa6279f81a73425b49dfb6abe5f5416e for details. Bug: https://code.google.com/p/android/issues/detail?id=36199 Change-Id: I70a3ad8a9264c320b5e2d6a9097a05d473e4fcfa
rc/com/android/camera/util/CameraUtil.java
|
90b300e86f90a51f1c5227333ed21aa649dc4f06 |
28-Oct-2014 |
Sascha Haeberling <haeberling@google.com> |
am c7beaf11: Fix wear interaction of CaptureModule * commit 'c7beaf110667df54d7ef97cc73e0fe28e31149de': Fix wear interaction of CaptureModule
|
8055989ea8496b68c429469f9fdb2c46e93f9f90 |
28-Oct-2014 |
I-Jong Lin <ijonglin@google.com> |
am e11795bf: Merge "Volantis Device Identifier Helper" into ub-camera-glacier * commit 'e11795bf44b2c0e5668c7ef6660cffb94b690a9b': Volantis Device Identifier Helper
|
577843ae34e9bae36554489eb56da3ba1bc538c3 |
28-Oct-2014 |
Spike Sprague <spikuru@google.com> |
am 775b6e6d: Merge "consistent style for titles on user education screens" into ub-camera-glacier * commit '775b6e6d8adab73fcae820c6600b173b258d5162': consistent style for titles on user education screens
|
a0be86aaad41aad562f54d928992f9ff5e935e08 |
28-Oct-2014 |
Spike Sprague <spikuru@google.com> |
am 7d7d12b2: Merge "Prevent unnecessary setVisibility calls in Filmstrip while zooming" into ub-camera-glacier * commit '7d7d12b23cb246c5aa8ebf03a98d189d5b6e0f30': Prevent unnecessary setVisibility calls in Filmstrip while zooming
|
9d25217c83967682cf580e8360be2883be232e01 |
28-Oct-2014 |
Alan Newberger <alann@google.com> |
am 8644ffce: Align id selection from QueryTask to sort order from Media query * commit '8644ffceaa0968cb3c4e8736d37ef1683aa30977': Align id selection from QueryTask to sort order from Media query
|
c7beaf110667df54d7ef97cc73e0fe28e31149de |
28-Oct-2014 |
Sascha Haeberling <haeberling@google.com> |
Fix wear interaction of CaptureModule Bug: 18121865 - Make sure we announce that the module is exiting. - Send postview image to wear device. - Make sure we can take a picture when timer is on. Change-Id: I1cbc2e9a1725fdd6d8724ce93f547c87eab8b4aa
rc/com/android/camera/CaptureModule.java
rc/com/android/camera/one/OneCamera.java
|
e11795bf44b2c0e5668c7ef6660cffb94b690a9b |
28-Oct-2014 |
I-Jong Lin <ijonglin@google.com> |
Merge "Volantis Device Identifier Helper" into ub-camera-glacier
|
838095ae165f8a16bde986a9853c1d835358aea9 |
27-Oct-2014 |
I-Jong Lin <ijonglin@google.com> |
Volantis Device Identifier Helper Bug: 17868158 Part of a multi-project commit, along with ag/575889 Adds a helper function to identify when the Android device is a Nexus 9. Change-Id: I36c3b6e4472d08d1be7b1197fd62f4766fcc81ed
rc/com/android/camera/util/ApiHelper.java
|
775b6e6d8adab73fcae820c6600b173b258d5162 |
27-Oct-2014 |
Spike Sprague <spikuru@google.com> |
Merge "consistent style for titles on user education screens" into ub-camera-glacier
|
7d7d12b23cb246c5aa8ebf03a98d189d5b6e0f30 |
27-Oct-2014 |
Spike Sprague <spikuru@google.com> |
Merge "Prevent unnecessary setVisibility calls in Filmstrip while zooming" into ub-camera-glacier
|
9351e87558b7cb6cbc21d817a585ef769567e347 |
27-Oct-2014 |
Spike Sprague <spikuru@google.com> |
Prevent unnecessary setVisibility calls in Filmstrip while zooming bug: 18122644 Change-Id: I2681e5f104527553c4f6d71d96c0b659685813fa
rc/com/android/camera/widget/FilmstripView.java
|
8644ffceaa0968cb3c4e8736d37ef1683aa30977 |
27-Oct-2014 |
Alan Newberger <alann@google.com> |
Align id selection from QueryTask to sort order from Media query In QueryTask we pick the id from the first result and consider it the max id, yet we query ordered by date taken. On most phones they're the same but by correcting the query to satisfy the assumption in QueryTask, we remove costly scenarios where most photos are reprocessed in LoadNewPhotosTask. One line fix in LocalMediaData with more verbose logging added in CameraDataAdapter. Bug: 17437217 Change-Id: Ia643f38d1bfb77ff0beaba989f0effe9a4dec31c
rc/com/android/camera/data/CameraDataAdapter.java
rc/com/android/camera/data/LocalMediaData.java
|
29ea83651b382caf90b5f6d2f5d842818c55dcb8 |
24-Oct-2014 |
Spike Sprague <spikuru@google.com> |
consistent style for titles on user education screens bug: 18115448 Change-Id: I9d1caaa0903d6f3c2c47ca3e8457a4f85aad910c
es/layout-land/aspect_ratio_dialog_content.xml
es/layout-land/location_dialog_content.xml
es/layout-port/aspect_ratio_dialog_content.xml
es/layout-port/location_dialog_content.xml
es/values/styles.xml
|
2ca3272a0f4606985de15020fd5acb5734b6cf15 |
27-Oct-2014 |
Baligh Uddin <baligh@google.com> |
am 7c2cbc43: (-s ours) am 2e1d2ed6: (-s ours) am 91bceebd: (-s ours) Import translations. DO NOT MERGE * commit '7c2cbc434014cdafd0cfd3c45e6f0949bccdc6c4':
|
24e44065e50f37dd347bfee2846fc872cfa6f4cf |
27-Oct-2014 |
Neil Fuller <nfuller@google.com> |
am 18f6c519: am 49bcaafb: resolved conflicts for merge of c0dd3adf to lmp-dev-plus-aosp * commit '18f6c5193afd753455bec5f4edef43c1e1a99838':
|
027a2264078f3f71ec5f6033cf774735b5e8ec69 |
27-Oct-2014 |
Dianne Hackborn <hackbod@google.com> |
am 10ec344e: am 45ca5c80: am 2d440350: Update to use real L codename. * commit '10ec344ebc012bebb7b07ce596ddecacae6836d7':
|
f89e50cd94ec1ccf71bb80583dbfc3f77b750938 |
27-Oct-2014 |
Alan Newberger <alann@google.com> |
am e3d446cd: am 4828ce4c: am 7ba23fed: Fix preference copy migration and incorrect HDR+ sticky bit * commit 'e3d446cd1aa3434de4b29ea24e24bc75a9e246ab':
|
4933a49b44c70640a47f92c03a9823945f852436 |
27-Oct-2014 |
Alan Newberger <alann@google.com> |
am 570f65dc: am d4760214: am 0ac0b733: Merge "Fix incorrect key translation in Settings refactor" into lmp-dev * commit '570f65dc60163d8cac713ca78bce3e8dacd4354f':
|
e73cf561af719e010ab970ea472dd54694b23a9c |
27-Oct-2014 |
Alan Newberger <alann@google.com> |
am 6843a0ad: am eaed8186: am d30fdee3: Merge "Trap CameraAgentFactory RTEs during recycle" into lmp-dev * commit '6843a0ad7a017c7266152ad9dd0ace17d17fa3d3':
|
b8990a3710836488b7409c85d34cf030d00c4cc3 |
27-Oct-2014 |
Alan Newberger <alann@google.com> |
am edd29484: am 6ac0378f: am b0be8f53: Merge "Trap camera close exceptions on pause" into lmp-dev * commit 'edd29484d0211f20f7b526be78d5379aedd86113':
|
5836887901126da4ced0024e42d057404ec943b0 |
27-Oct-2014 |
Alan Newberger <alann@google.com> |
am f035b2de: am 375d5482: am 0021c301: Merge "Avoid porting null keys when copying preferences into new system" into lmp-dev * commit 'f035b2de27a3bde2a83d240d1976bc4fb8c3d518':
|
5f132212adc9b7d5ce7333a46b3eb5ccf8292863 |
27-Oct-2014 |
Alan Newberger <alann@google.com> |
am f9888d1d: am 198f078b: am a9ed2418: Only set preview size before starting preview * commit 'f9888d1de2d0d0b6f2632af268073cad77248e50':
|
d143b693470a18ccf0fab1428744d391733bab65 |
27-Oct-2014 |
Alan Newberger <alann@google.com> |
am 31642b9c: am c17b9383: am e1eb82bc: Use NEW_DOCUMENT vs NEW_TASK when starting Activities from Camera * commit '31642b9ce046b646526374a2dbbd947872e6828c':
|
587a2e031bafb22904eb48f2af9237309f3bfab7 |
27-Oct-2014 |
Alan Newberger <alann@google.com> |
am a3c0f1a4: am 2fc13a0f: am dae542a3: Fix error in settings key from refactor * commit 'a3c0f1a48804c23f80b570c18ea6f3c600d0da22':
|
c36bd80f7700c6c5ff209b3bd47f8fd80e230427 |
27-Oct-2014 |
Alan Newberger <alann@google.com> |
am 528024db: am ff1bfbf5: am d822d1cf: Only allow one draw call pending at a time * commit '528024db3a84deb04f6d128e756c1077a647239e':
|
6ce374ff55dd68d163b73d98d70c7cea1713fff7 |
27-Oct-2014 |
Senpo Hu <senpo@google.com> |
am 876f7108: am 952779b5: am 2499af48: Stability: call stopPreview() before switching off video module. * commit '876f71085d4a503d259dc4dc5cf5eaa64348d9dd':
|
5afde77b103d77caf139b07c7239f6fb79cfd48b |
27-Oct-2014 |
Baligh Uddin <baligh@google.com> |
am a4a3b647: (-s ours) am 97750cc8: (-s ours) am 2f727aff: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit 'a4a3b647921cf595ca57c422d00fd2cbcaf3e247':
|
bd7f79cbce5907ca928aeb8f4c0ed1184382bc89 |
27-Oct-2014 |
Senpo Hu <senpo@google.com> |
am 0c9822f3: am fd696d77: am ed0fea9b: am 2d3475ae: Fix crash in VideoModule - Method called after release() * commit '0c9822f377fdb8f1e01375b3535d2dfb77d7c160':
|
e805f993e94bdce837609eee542e742626fd4563 |
27-Oct-2014 |
Puneet Lall <puneetl@google.com> |
am 67c78543: am fe297a35: am 6014e168: am 022ce61e: Synchronize CaptureModule camera open/close operations * commit '67c785431164b2afa5ed2750a244436e1da74a03':
|
6fd7d8b9cbce729543ca78a0c5f58e09ca6c80fc |
27-Oct-2014 |
Senpo Hu <senpo@google.com> |
am 2b2c9c29: am 8d5639bf: am 93e01102: am feb07ea4: Merge "Stability: add null check for all CameraProxy obj references in VideoModule." into ub-camera-glacier * commit '2b2c9c2998c86ee284aa597a67d8ccc9df705282':
|
19879b2c89f1fb09365063ee69652eebe26419c4 |
27-Oct-2014 |
Andy Huibers <andyhuibers@google.com> |
am d5d61e9e: am 556370c3: am d3a7c5af: am ad12363e: Revert app workaround for bug 17614203 now that HAL is fixed. This reverts ag/543302. * commit 'd5d61e9efecb68234b5b216849ec2bed1bbf8a5f':
|
e464a584b206e2d322d699726a2d3d8b9e71c8de |
27-Oct-2014 |
Alan Newberger <alann@google.com> |
am e8c58ca5: am 6956d11a: am f379211c: am 47c4474e: Merge "Force filmstrip images to generate in JPEG compression format" into ub-camera-glacier * commit 'e8c58ca5e95c9e20bf0ff7e6f85229a6f5b4f1b4':
|
ec69035cb9c500fb05ebd4e0c5f8fffab0497d85 |
27-Oct-2014 |
Puneet Lall <puneetl@google.com> |
am 406b3d1f: am 051fddec: am fc0e5d89: am 4d2f3bf4: Merge "Recreate a OneCameraManager instance for each Activity." into ub-camera-glacier * commit '406b3d1fa83f5497e49cc8bc3adaf83cb8154414':
|
f706d0c1977ca34d60c65239d95ede79d110370f |
27-Oct-2014 |
Senpo Hu <senpo@google.com> |
am cac9f0a2: am dbfd18d2: am 437fd924: am ee3123ba: Stability: add null check for all CameraProxy obj references in PhotoModule. * commit 'cac9f0a2a52aa9d70ff678204eb8b041b8176618':
|
f713ca2414279967d2f69fc14cb3194061a69662 |
27-Oct-2014 |
Alan Newberger <alann@google.com> |
am 8c6eda78: am 90665968: am 3f8c75b2: am da6f3acc: Skip disk caching for session data * commit '8c6eda78be7603847b313e9be059346e4e9f8c93':
|
0454d1ddd7ca7124e621ac71dbdd52a6039c5835 |
27-Oct-2014 |
Alan Newberger <alann@google.com> |
am 041d20ec: am 87d802c2: am 92db2cb4: am 6b2d1e0b: Merge "Revert temporary session images in filmstrip to RGB_565" into ub-camera-glacier * commit '041d20ec22456ac6c525a4f72d3f7707787331eb':
|
6dd7cadbf3689997953839f5344b60cbdc915c26 |
27-Oct-2014 |
Alan Newberger <alann@google.com> |
am 80d6250c: am 45cf7b25: am af73f898: am 347dccbe: Ensure Camera doesn\'t attempt access of back camera on Nakasi * commit '80d6250cabde4dfceac343a7e5e1c43e47246232':
|
eb8e43dc60b93e2bfac91b5af0abbc5d3661267c |
27-Oct-2014 |
Alan Newberger <alann@google.com> |
am b193c857: am d6567402: am 9db50c18: am 2631a15a: Don\'t show aspect ratio UI if using API2 portability * commit 'b193c857c2699319cdacb0e1575c91a416d91fbc':
|
5d8308720b5b89d6b97a06aa4da69611c9feb062 |
27-Oct-2014 |
Spike Sprague <spikuru@google.com> |
am 42a20015: am 10279d29: am 3e8f9db9: am d8dbf53c: am eeeed4fa: new sounds for timer ticker and pano / photosphere intermediate captures * commit '42a20015c3055afc312f94846d9a43144fc1f860':
|
a1b3478fadc02d6fa813a43fcf19367ab5b4bde2 |
27-Oct-2014 |
Spike Sprague <spikuru@google.com> |
am 19193b9d: am 03a2759c: am e31c82c2: am c89420a6: am 7d1fb593: Merge "monkey test NPE fix, another null check on mCameraDevice" into ub-camera-glacier * commit '19193b9d4d975d4ad179ab7c8f3411496145a732':
|
ce99fea47238fcbe88a34b9829afefe660ab2e85 |
27-Oct-2014 |
Alan Newberger <alann@google.com> |
am 12a535ec: am 78bd5555: am 4c571d7e: am 1db7f286: am b60af188: Merge "Fix filmstrip item bounds to filmstrip scale" into ub-camera-glacier * commit '12a535ec491ec9e20a6825e5e1ef7927fc7aedd1':
|
1bd1d04920dd85a5cc4615f12e6414340ebb0c20 |
27-Oct-2014 |
Alan Newberger <alann@google.com> |
am 29d21bfb: am 4c1e6e8f: am b4ed71c2: am 9f3628da: am 5f86f7fd: Cleanup gesture UI hide code * commit '29d21bfbaf0c590bd9680a0e93d034d03e41d82d':
|
cf4141dd0acb4fadab817f7ea0705b4449df8942 |
27-Oct-2014 |
Alan Newberger <alann@google.com> |
am c72106ed: am 306a986c: am 42b799ac: am 8f1ffed7: am b2b0e02c: Clean up unused code * commit 'c72106edf3572137e79b9f74a2d53c3fa298602a':
|
dc64565777ea1e43ad202ccc046c15b8e6613133 |
27-Oct-2014 |
Alan Newberger <alann@google.com> |
am 5677ac23: am 2d4b0949: (-s ours) am d0927687: (-s ours) Merge "Add scrolling support with a mouse wheel" * commit '5677ac239cfab0b0feb959b0fe783048d472796b':
|
7c2cbc434014cdafd0cfd3c45e6f0949bccdc6c4 |
27-Oct-2014 |
Baligh Uddin <baligh@google.com> |
am 2e1d2ed6: (-s ours) am 91bceebd: (-s ours) Import translations. DO NOT MERGE * commit '2e1d2ed664bf9a0b91424d19d158f1ea2b58c8fd':
|
18f6c5193afd753455bec5f4edef43c1e1a99838 |
27-Oct-2014 |
Neil Fuller <nfuller@google.com> |
am 49bcaafb: resolved conflicts for merge of c0dd3adf to lmp-dev-plus-aosp * commit '49bcaafb0ac92b2a2ae6b35deb640714b2a02bd9':
|
10ec344ebc012bebb7b07ce596ddecacae6836d7 |
27-Oct-2014 |
Dianne Hackborn <hackbod@google.com> |
am 45ca5c80: am 2d440350: Update to use real L codename. * commit '45ca5c80496b0c6e8b0e73273a02e6eb0683971e':
|
e3d446cd1aa3434de4b29ea24e24bc75a9e246ab |
27-Oct-2014 |
Alan Newberger <alann@google.com> |
am 4828ce4c: am 7ba23fed: Fix preference copy migration and incorrect HDR+ sticky bit * commit '4828ce4cafbc0f56ca8add88938e7094559d8765':
|
570f65dc60163d8cac713ca78bce3e8dacd4354f |
27-Oct-2014 |
Alan Newberger <alann@google.com> |
am d4760214: am 0ac0b733: Merge "Fix incorrect key translation in Settings refactor" into lmp-dev * commit 'd47602140064760f5a540bab7335664930b771e3':
|
6843a0ad7a017c7266152ad9dd0ace17d17fa3d3 |
27-Oct-2014 |
Alan Newberger <alann@google.com> |
am eaed8186: am d30fdee3: Merge "Trap CameraAgentFactory RTEs during recycle" into lmp-dev * commit 'eaed81862f73ff88ef215779efcbfbaf6782cf0c':
|
edd29484d0211f20f7b526be78d5379aedd86113 |
27-Oct-2014 |
Alan Newberger <alann@google.com> |
am 6ac0378f: am b0be8f53: Merge "Trap camera close exceptions on pause" into lmp-dev * commit '6ac0378ffbc78c42c3fb950c663c44d70e3bfdfc':
|
f035b2de27a3bde2a83d240d1976bc4fb8c3d518 |
27-Oct-2014 |
Alan Newberger <alann@google.com> |
am 375d5482: am 0021c301: Merge "Avoid porting null keys when copying preferences into new system" into lmp-dev * commit '375d5482b56df31818aa37a41dfb0951c5fb9005':
|
f9888d1de2d0d0b6f2632af268073cad77248e50 |
27-Oct-2014 |
Alan Newberger <alann@google.com> |
am 198f078b: am a9ed2418: Only set preview size before starting preview * commit '198f078b6a57dad83341cac8a254f24422f0cdcd':
|
31642b9ce046b646526374a2dbbd947872e6828c |
27-Oct-2014 |
Alan Newberger <alann@google.com> |
am c17b9383: am e1eb82bc: Use NEW_DOCUMENT vs NEW_TASK when starting Activities from Camera * commit 'c17b9383ba663529c126207c7fdd96bbf2ec618f':
|
a3c0f1a48804c23f80b570c18ea6f3c600d0da22 |
27-Oct-2014 |
Alan Newberger <alann@google.com> |
am 2fc13a0f: am dae542a3: Fix error in settings key from refactor * commit '2fc13a0fd476c0e427c433444486936db6fa3937':
|
528024db3a84deb04f6d128e756c1077a647239e |
27-Oct-2014 |
Alan Newberger <alann@google.com> |
am ff1bfbf5: am d822d1cf: Only allow one draw call pending at a time * commit 'ff1bfbf59b2259c6904370a146d1c0e83a99fe09':
|
876f71085d4a503d259dc4dc5cf5eaa64348d9dd |
27-Oct-2014 |
Senpo Hu <senpo@google.com> |
am 952779b5: am 2499af48: Stability: call stopPreview() before switching off video module. * commit '952779b558cab573da0c2a2943da51df1abbca85':
|
a4a3b647921cf595ca57c422d00fd2cbcaf3e247 |
27-Oct-2014 |
Baligh Uddin <baligh@google.com> |
am 97750cc8: (-s ours) am 2f727aff: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit '97750cc8eff73e2d3826739894f40950dcd2691f':
|
0c9822f377fdb8f1e01375b3535d2dfb77d7c160 |
27-Oct-2014 |
Senpo Hu <senpo@google.com> |
am fd696d77: am ed0fea9b: am 2d3475ae: Fix crash in VideoModule - Method called after release() * commit 'fd696d77ab1bd1e4b3dd4f3ec74744ef29f22bc3':
|
67c785431164b2afa5ed2750a244436e1da74a03 |
27-Oct-2014 |
Puneet Lall <puneetl@google.com> |
am fe297a35: am 6014e168: am 022ce61e: Synchronize CaptureModule camera open/close operations * commit 'fe297a353be6c363870f67cc84597ceecd6cef85':
|
2b2c9c2998c86ee284aa597a67d8ccc9df705282 |
27-Oct-2014 |
Senpo Hu <senpo@google.com> |
am 8d5639bf: am 93e01102: am feb07ea4: Merge "Stability: add null check for all CameraProxy obj references in VideoModule." into ub-camera-glacier * commit '8d5639bf7fb4d1be533ed60aa5a17271901b8fcb':
|
d5d61e9efecb68234b5b216849ec2bed1bbf8a5f |
27-Oct-2014 |
Andy Huibers <andyhuibers@google.com> |
am 556370c3: am d3a7c5af: am ad12363e: Revert app workaround for bug 17614203 now that HAL is fixed. This reverts ag/543302. * commit '556370c333c5e522f0b3118af45440ca91d4702f':
|
e8c58ca5e95c9e20bf0ff7e6f85229a6f5b4f1b4 |
27-Oct-2014 |
Alan Newberger <alann@google.com> |
am 6956d11a: am f379211c: am 47c4474e: Merge "Force filmstrip images to generate in JPEG compression format" into ub-camera-glacier * commit '6956d11a742e3f19d63a7f318a750dd91362d17f':
|
406b3d1fa83f5497e49cc8bc3adaf83cb8154414 |
27-Oct-2014 |
Puneet Lall <puneetl@google.com> |
am 051fddec: am fc0e5d89: am 4d2f3bf4: Merge "Recreate a OneCameraManager instance for each Activity." into ub-camera-glacier * commit '051fddec10fc62788d6a50d2a9133ce99a26251a':
|
cac9f0a2a52aa9d70ff678204eb8b041b8176618 |
27-Oct-2014 |
Senpo Hu <senpo@google.com> |
am dbfd18d2: am 437fd924: am ee3123ba: Stability: add null check for all CameraProxy obj references in PhotoModule. * commit 'dbfd18d24e748d9b6d20ca20abb6be5812a00916':
|
8c6eda78be7603847b313e9be059346e4e9f8c93 |
27-Oct-2014 |
Alan Newberger <alann@google.com> |
am 90665968: am 3f8c75b2: am da6f3acc: Skip disk caching for session data * commit '90665968526c8bf039686a8fa6ab3bd296e056d0':
|
041d20ec22456ac6c525a4f72d3f7707787331eb |
27-Oct-2014 |
Alan Newberger <alann@google.com> |
am 87d802c2: am 92db2cb4: am 6b2d1e0b: Merge "Revert temporary session images in filmstrip to RGB_565" into ub-camera-glacier * commit '87d802c2fc7a9052e667ce895b7bae37bdbe7390':
|
80d6250cabde4dfceac343a7e5e1c43e47246232 |
27-Oct-2014 |
Alan Newberger <alann@google.com> |
am 45cf7b25: am af73f898: am 347dccbe: Ensure Camera doesn\'t attempt access of back camera on Nakasi * commit '45cf7b2546aff7c9bf406b1dc648e6f7b56bf84e':
|
b193c857c2699319cdacb0e1575c91a416d91fbc |
27-Oct-2014 |
Alan Newberger <alann@google.com> |
am d6567402: am 9db50c18: am 2631a15a: Don\'t show aspect ratio UI if using API2 portability * commit 'd6567402bce2705528bf271008d5166b8f49dd56':
|
42a20015c3055afc312f94846d9a43144fc1f860 |
27-Oct-2014 |
Spike Sprague <spikuru@google.com> |
am 10279d29: am 3e8f9db9: am d8dbf53c: am eeeed4fa: new sounds for timer ticker and pano / photosphere intermediate captures * commit '10279d29063c1976b341f2d8ca9772684cd363df':
|
19193b9d4d975d4ad179ab7c8f3411496145a732 |
27-Oct-2014 |
Spike Sprague <spikuru@google.com> |
am 03a2759c: am e31c82c2: am c89420a6: am 7d1fb593: Merge "monkey test NPE fix, another null check on mCameraDevice" into ub-camera-glacier * commit '03a2759c642203985e59106e33ff460df0cf6523':
|
12a535ec491ec9e20a6825e5e1ef7927fc7aedd1 |
27-Oct-2014 |
Alan Newberger <alann@google.com> |
am 78bd5555: am 4c571d7e: am 1db7f286: am b60af188: Merge "Fix filmstrip item bounds to filmstrip scale" into ub-camera-glacier * commit '78bd55551657d78e43375439f45b6cbf3424308e':
|
29d21bfbaf0c590bd9680a0e93d034d03e41d82d |
27-Oct-2014 |
Alan Newberger <alann@google.com> |
am 4c1e6e8f: am b4ed71c2: am 9f3628da: am 5f86f7fd: Cleanup gesture UI hide code * commit '4c1e6e8f040e60be33c2c044246bddcb5d38a354':
|
c72106edf3572137e79b9f74a2d53c3fa298602a |
27-Oct-2014 |
Alan Newberger <alann@google.com> |
am 306a986c: am 42b799ac: am 8f1ffed7: am b2b0e02c: Clean up unused code * commit '306a986c73f24f15b1093590e9cd9a94db869b02':
|
5677ac239cfab0b0feb959b0fe783048d472796b |
27-Oct-2014 |
Alan Newberger <alann@google.com> |
am 2d4b0949: (-s ours) am d0927687: (-s ours) Merge "Add scrolling support with a mouse wheel" * commit '2d4b0949cf60ec96162bb3436df35db61abd6e09':
|
18ccdd377e52b69a5848864f7a1dc8a4ae63487c |
27-Oct-2014 |
Baligh Uddin <baligh@google.com> |
am 7eb9e062: (-s ours) am 8929aecc: (-s ours) am 41a13974: (-s ours) am 82da5e95: (-s ours) am 02758e4c: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-glacier * commit '7eb9e0629bf53bf7d9c050cccb252e0789c8aac8':
|
df64605af228b1e588ad75a63e78c757a6d7d25c |
27-Oct-2014 |
Jiawen Chen <jiawen@google.com> |
am 484375dd: am 0a9e31f5: am 6dfb91e0: am 284a9b48: am 30ae8c64: Merge "Changed tap-to-meter rectangle and weights." into ub-camera-glacier * commit '484375dda2adbcbeb9389efb2c9d3a8b63cc4870':
|
4e27a1896eb17b42040c18e3baa6636101af3f4b |
27-Oct-2014 |
Alan Newberger <alann@google.com> |
am 2df3de6f: am 04408f74: am 2aa7189d: am 40b52050: am e684ea54: Merge "Fix CameraSettingsActivityHelper" into ub-camera-glacier * commit '2df3de6fea68410b6709d0a81d9ffae18006e255':
|
97e87dd0ea389588012659e47557e369a5c93dcb |
27-Oct-2014 |
Spike Sprague <spikuru@google.com> |
am 74fb79f8: am 9e6b902f: am 11c70fb3: am 94cd6522: am 19942a17: Merge "implement new trash icon, plus some asset cleanup" into ub-camera-glacier * commit '74fb79f8a7a4e9e6bc37820acac0df254a3137b2':
|
ef159773a0cc05fe2a57eb429a2915fe66a0ef60 |
27-Oct-2014 |
Spike Sprague <spikuru@google.com> |
am bee1f5ab: am 037e25a6: am f608095c: am baae9e84: am 8bbb5122: Merge "add null check to updateCameraParametersPreferences to apease the monkey" into ub-camera-glacier * commit 'bee1f5ab503ad62b65d67d04ca18eb5e6d0bb56f':
|
802134b427e6c0d4b76f318a2dd39a290d0a6b27 |
27-Oct-2014 |
Spike Sprague <spikuru@google.com> |
am 1e391c0b: am 0d9b4776: am 0f44eb07: am 476a9e24: am 963775c3: portability layer doesn\'t work well with startPreviewWithCallback() here\'s a dirty dirty workaround. * commit '1e391c0bd5c4e525ad28293217ee7336fcee5835':
|
fab1427c91fa600c546961839dc59b3ff548dc70 |
27-Oct-2014 |
Spike Sprague <spikuru@google.com> |
am 44202558: am 23f27f22: am d99f98a3: am af25fb04: am 3c3b31df: mode switch jank fixes * commit '442025589db979185f23c4ea6a479c3f027b16f2':
|
2a834b661d93477e66e5b2b350b2a2b3854e7676 |
27-Oct-2014 |
Baligh Uddin <baligh@google.com> |
am 1003077a: (-s ours) am 6eba7685: (-s ours) am 3cb0aab3: (-s ours) am 9a275f5e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit '1003077aa045b6c4bff64d8b8fa5a579ded13132':
|
709e1905dbb030e9f03ea76cdf35f2d8678bc699 |
27-Oct-2014 |
Puneet Lall <puneetl@google.com> |
am 8c7cc87e: am 38827648: am a82d6ce2: am 0d7a8c08: am 6f1dfe69: Merge "Don\'t set mCameraAppUI to null in onDestroy" into ub-camera-glacier * commit '8c7cc87eca5cec68e3aad7bea9425a202c203014':
|
36e5051e5b46bc6f7cd67e47661ff5baf8aa8c05 |
27-Oct-2014 |
Spike Sprague <spikuru@google.com> |
am 657664a9: am 023a45e8: am 22173edc: am ad1462a9: am a16219d5: set proper alpha on shutter button on mode switch, eliminates a janky alpha flash * commit '657664a9f43614459a46017dad169af34a6f9e14':
|
7eb9e0629bf53bf7d9c050cccb252e0789c8aac8 |
27-Oct-2014 |
Baligh Uddin <baligh@google.com> |
am 8929aecc: (-s ours) am 41a13974: (-s ours) am 82da5e95: (-s ours) am 02758e4c: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-glacier * commit '8929aeccd3772d9a4cf1a1ddbd91562952638825':
|
484375dda2adbcbeb9389efb2c9d3a8b63cc4870 |
27-Oct-2014 |
Jiawen Chen <jiawen@google.com> |
am 0a9e31f5: am 6dfb91e0: am 284a9b48: am 30ae8c64: Merge "Changed tap-to-meter rectangle and weights." into ub-camera-glacier * commit '0a9e31f5bfd4bf4044f090b209c8fbf39356cee7':
|
2df3de6fea68410b6709d0a81d9ffae18006e255 |
27-Oct-2014 |
Alan Newberger <alann@google.com> |
am 04408f74: am 2aa7189d: am 40b52050: am e684ea54: Merge "Fix CameraSettingsActivityHelper" into ub-camera-glacier * commit '04408f74cee92e6712d548ce10561562f4e5248d':
|
74fb79f8a7a4e9e6bc37820acac0df254a3137b2 |
27-Oct-2014 |
Spike Sprague <spikuru@google.com> |
am 9e6b902f: am 11c70fb3: am 94cd6522: am 19942a17: Merge "implement new trash icon, plus some asset cleanup" into ub-camera-glacier * commit '9e6b902fcb0b350159fd3dfd3eea9f481cb6ef07':
|
bee1f5ab503ad62b65d67d04ca18eb5e6d0bb56f |
27-Oct-2014 |
Spike Sprague <spikuru@google.com> |
am 037e25a6: am f608095c: am baae9e84: am 8bbb5122: Merge "add null check to updateCameraParametersPreferences to apease the monkey" into ub-camera-glacier * commit '037e25a68613cc95add0e8da3f39f820ddee4ab8':
|
1e391c0bd5c4e525ad28293217ee7336fcee5835 |
27-Oct-2014 |
Spike Sprague <spikuru@google.com> |
am 0d9b4776: am 0f44eb07: am 476a9e24: am 963775c3: portability layer doesn\'t work well with startPreviewWithCallback() here\'s a dirty dirty workaround. * commit '0d9b4776f5300bf451533df628cde15c4d826565':
|
442025589db979185f23c4ea6a479c3f027b16f2 |
27-Oct-2014 |
Spike Sprague <spikuru@google.com> |
am 23f27f22: am d99f98a3: am af25fb04: am 3c3b31df: mode switch jank fixes * commit '23f27f22033525b5ea428a4a387ae528502759dc':
|
1003077aa045b6c4bff64d8b8fa5a579ded13132 |
27-Oct-2014 |
Baligh Uddin <baligh@google.com> |
am 6eba7685: (-s ours) am 3cb0aab3: (-s ours) am 9a275f5e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit '6eba768550a5fe7c3dba506bdaf19c6de83b3819':
|
8c7cc87eca5cec68e3aad7bea9425a202c203014 |
27-Oct-2014 |
Puneet Lall <puneetl@google.com> |
am 38827648: am a82d6ce2: am 0d7a8c08: am 6f1dfe69: Merge "Don\'t set mCameraAppUI to null in onDestroy" into ub-camera-glacier * commit '38827648c2fae431b106c8845bfb7be49d67ecab':
|
657664a9f43614459a46017dad169af34a6f9e14 |
27-Oct-2014 |
Spike Sprague <spikuru@google.com> |
am 023a45e8: am 22173edc: am ad1462a9: am a16219d5: set proper alpha on shutter button on mode switch, eliminates a janky alpha flash * commit '023a45e82a1cf7486d7a142308f27b5683b9c238':
|
a9dd8259a76a179c944c80de6eef2299b7795435 |
25-Oct-2014 |
Senpo Hu <senpo@google.com> |
am f2d18ca0: am 1c5f87e4: am 8fb9e06b: Adopt the new error handling mechanism in portability. * commit 'f2d18ca0069a57e2d4354c460b7b145b9db8c5ce': Adopt the new error handling mechanism in portability.
|
f2d18ca0069a57e2d4354c460b7b145b9db8c5ce |
24-Oct-2014 |
Senpo Hu <senpo@google.com> |
am 1c5f87e4: am 8fb9e06b: Adopt the new error handling mechanism in portability. * commit '1c5f87e4b6a5d2c7c25449fd84f09c999e1046dd': Adopt the new error handling mechanism in portability.
|
1c5f87e4b6a5d2c7c25449fd84f09c999e1046dd |
24-Oct-2014 |
Senpo Hu <senpo@google.com> |
am 8fb9e06b: Adopt the new error handling mechanism in portability. * commit '8fb9e06bbace9fe5b548cea02bcc8ce7f3129e25': Adopt the new error handling mechanism in portability.
|
8fb9e06bbace9fe5b548cea02bcc8ce7f3129e25 |
07-Oct-2014 |
Senpo Hu <senpo@google.com> |
Adopt the new error handling mechanism in portability. Show camera fatal dialog to guide users exiting the app when 1) camera framework throws RTE or 2) DispatchThread job is timeout. If users hit home button while error dialog is shown, just exit the app. Bug: 16189216 Change-Id: Ia0f1c64d452735ec62549f50ab62646d8d873c65 Conflicts: src/com/android/camera/CameraActivity.java
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/app/CameraController.java
rc/com/android/camera/app/CameraProvider.java
rc/com/android/camera/debug/DebugCameraProxy.java
|
ab07ad8b9974b0ff772a58285f09658ee44a0eb9 |
24-Oct-2014 |
Spike Sprague <spikuru@google.com> |
am f4857ffa: Merge "When option buttons are disabled, make sure the HDR / HDR+ button has the correct icons." into ub-camera-glacier * commit 'f4857ffa50a4fe6fcead0abde524376c0e9d6a5a': When option buttons are disabled, make sure the HDR / HDR+ button has the correct icons.
|
5c4d018437beafa654622c660e08e2817a62c28a |
24-Oct-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge commit '770c2b3e' into stuff1 Conflicts: src/com/android/camera/data/LocalSessionData.java Change-Id: Id7113ce6ba3b95ac78511dbbb8391b3bf2a17ecd
|
f77470f781c85eda535a98be430b8a3d016b281e |
24-Oct-2014 |
Alan Newberger <alann@google.com> |
am 47e9f17a: Merge "Clean up orientation logging" into ub-camera-glacier * commit '47e9f17a13b391554c8121aae049e91b553688cf': Clean up orientation logging
|
f4857ffa50a4fe6fcead0abde524376c0e9d6a5a |
24-Oct-2014 |
Spike Sprague <spikuru@google.com> |
Merge "When option buttons are disabled, make sure the HDR / HDR+ button has the correct icons." into ub-camera-glacier
|
770c2b3e82326d6272b1d2f65a65e5330c951abb |
24-Oct-2014 |
Sascha Haeberling <haeberling@google.com> |
Introduce ActionCallback for LocalData items. Bug: 18105354 Fixes the bug where we try to cast a context to an activity. Change-Id: I3e82a2cda5fe004768276a4d48c07d75738b2a5e
rc/com/android/camera/data/CameraDataAdapter.java
rc/com/android/camera/data/FixedFirstDataAdapter.java
rc/com/android/camera/data/FixedLastDataAdapter.java
rc/com/android/camera/data/LocalData.java
rc/com/android/camera/data/LocalMediaData.java
rc/com/android/camera/data/LocalSessionData.java
rc/com/android/camera/data/SimpleViewData.java
rc/com/android/camera/filmstrip/DataAdapter.java
rc/com/android/camera/widget/FilmstripView.java
|
f3d360e4d97e724286a530e30cba9fa19e2304d8 |
24-Oct-2014 |
Spike Sprague <spikuru@google.com> |
When option buttons are disabled, make sure the HDR / HDR+ button has the correct icons. bug: 18104680 Change-Id: Ifd56369ca8177d40317f6af76bbc55a2110d6f5c
rc/com/android/camera/ButtonManager.java
rc/com/android/camera/MultiToggleImageButton.java
|
9df271b68ac1cadc6097c46e0647d0b9b3384f7b |
23-Oct-2014 |
Spike Sprague <spikuru@google.com> |
am 1c758c88: Merge "new colors for GAR contrast compliance" into ub-camera-glacier * commit '1c758c88d5f69b613da4e50d7a06e28804993170': new colors for GAR contrast compliance
|
097c9fb1e8850521502efabd41b22daa5e2fbf2c |
23-Oct-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge commit '5aad0cb4' into stuff1 Conflicts: src/com/android/camera/CameraActivity.java src/com/android/camera/one/OneCameraManager.java Change-Id: I9495daa600356ffcef21bba506dc5a3fce365af3
|
dff4bbdd81a63a3861c5ff288630a84458e39f01 |
23-Oct-2014 |
Alan Newberger <alann@google.com> |
am f7a18c7f: Merge "Null check for buildItemFromData" into ub-camera-glacier * commit 'f7a18c7feaeef3c8398376aaeea22e39dc1bbf5d': Null check for buildItemFromData
|
0b6a64b2ca46dcda8fc8f9c078f92605c86e3fbf |
23-Oct-2014 |
Alan Newberger <alann@google.com> |
am f4084e35: Check for null when deleting preference groups * commit 'f4084e35eac8a8b86e807573647d4a7b43852a59': Check for null when deleting preference groups
|
a6faa5522973dfa693c181e8189105b6f6eee7cc |
23-Oct-2014 |
Alan Newberger <alann@google.com> |
am 05edd2ee: Increase VERBOSE logging for PhotoModule orientation use * commit '05edd2eec40d2a3ce7a76dc9f4d7dfe65e576ab7': Increase VERBOSE logging for PhotoModule orientation use
|
8d4187ccf00f40fe66f59a0cf76b5320fdbfbe81 |
23-Oct-2014 |
I-Jong Lin <ijonglin@google.com> |
am b20cf71a: Merge "Secure Camera App survives phone unlock screen" into ub-camera-glacier * commit 'b20cf71a817e1835a5ea8d084c9896c2aae706d9': Secure Camera App survives phone unlock screen
|
11a6282bac98cf55a50fca620f5d638d75ac5ec2 |
23-Oct-2014 |
Alan Newberger <alann@google.com> |
am 7eeb897b: Merge "Catch exceptions in settings remove helpers" into ub-camera-glacier * commit '7eeb897bc342f3f0d201464f37d5e6bfa7fe8b37': Catch exceptions in settings remove helpers
|
1d69742c23f06bceb4b5c96ae7b9dce4e62c4ea0 |
23-Oct-2014 |
I-Jong Lin <ijonglin@google.com> |
am 783fe31b: Merge "Button fix for torch when no flash available in hw" into ub-camera-glacier * commit '783fe31b1d6ed43c3c2ed24db2ecd78c14578ddf': Button fix for torch when no flash available in hw
|
04142851d4e31456fc3cf5e486025ad255ec9287 |
23-Oct-2014 |
Sascha Haeberling <haeberling@google.com> |
am ea77c6b2: Don\'t release resources until camera is closed. * commit 'ea77c6b2f9a602712c19ed0f441c6439b2f168de': Don't release resources until camera is closed.
|
732e5c323f495346a7d938b31c180741f95a4a48 |
17-Oct-2014 |
Radford Juang <radford@google.com> |
Changes to enable previewing animated GIFs in Camera. Also additional refactoring to incorporate updated Glide. Change-Id: Ied4170884cbc70805a7145adc84bcd14fc8dda2c
rc/com/android/camera/data/LocalDataUtil.java
rc/com/android/camera/data/LocalMediaData.java
|
47e9f17a13b391554c8121aae049e91b553688cf |
23-Oct-2014 |
Alan Newberger <alann@google.com> |
Merge "Clean up orientation logging" into ub-camera-glacier
|
e9f7b2dd640eb893e682413ddbebc4cd88582300 |
23-Oct-2014 |
Alan Newberger <alann@google.com> |
Clean up orientation logging Making it a bit easier to compare rotation vs capture metrics. Bug: 18055323 Change-Id: I15904a00fcb463739b5d7e4c2ca7627be2ecb2b7
rc/com/android/camera/PhotoModule.java
|
1c758c88d5f69b613da4e50d7a06e28804993170 |
23-Oct-2014 |
Spike Sprague <spikuru@google.com> |
Merge "new colors for GAR contrast compliance" into ub-camera-glacier
|
f44f9312d8a3208b5ce46e73144f49649ec0a963 |
23-Oct-2014 |
Spike Sprague <spikuru@google.com> |
new colors for GAR contrast compliance Change-Id: I2e1a05b9670c01c9729ed9e7b8b146add95ab88f
es/drawable-hdpi/btn_cling.9.png
es/drawable-hdpi/btn_cling_pressed.9.png
es/drawable-hdpi/stgs_cling.9.png
es/drawable-hdpi/stgs_cling_pressed.9.png
es/drawable-mdpi/btn_cling.9.png
es/drawable-mdpi/btn_cling_pressed.9.png
es/drawable-mdpi/stgs_cling.9.png
es/drawable-mdpi/stgs_cling_pressed.9.png
es/drawable-xhdpi/btn_cling.9.png
es/drawable-xhdpi/btn_cling_pressed.9.png
es/drawable-xhdpi/stgs_cling.9.png
es/drawable-xhdpi/stgs_cling_pressed.9.png
es/drawable-xxhdpi/btn_cling.9.png
es/drawable-xxhdpi/btn_cling_pressed.9.png
es/drawable-xxhdpi/stgs_cling.9.png
es/drawable-xxhdpi/stgs_cling_pressed.9.png
es/drawable-xxxhdpi/btn_cling.9.png
es/drawable-xxxhdpi/btn_cling_pressed.9.png
es/drawable/settings_cling.xml
es/layout-land/location_dialog_content.xml
es/layout-port/location_dialog_content.xml
es/layout/settings_cling.xml
es/values/colors.xml
es/values/styles.xml
|
5aad0cb47483e4896303cff3a84547dd83948cf8 |
22-Oct-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Stop activity leaks" into ub-camera-glacier
|
375f9d11af33688eb0074e3828c870076cfa21b3 |
18-Oct-2014 |
Sascha Haeberling <haeberling@google.com> |
Stop activity leaks Bug: 12805279 This CL fixes all known activity leaks that occur from our app. One leak remains that is caused by Camera Framework and is tracked under b/18077200. For details on how to find and chase these leaks down, see http://go/camera-activity-leaks Change-Id: I9608e2fcf77fe97528b883ed40e0c08bbbf45bdf
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/FocusOverlayManager.java
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/one/OneCameraManager.java
rc/com/android/camera/widget/FilmstripView.java
rc/com/android/camera/widget/VideoRecordingHints.java
|
f7a18c7feaeef3c8398376aaeea22e39dc1bbf5d |
22-Oct-2014 |
Alan Newberger <alann@google.com> |
Merge "Null check for buildItemFromData" into ub-camera-glacier
|
61c5f9f86b5fd8937fac3d082398086bac0d8db6 |
22-Oct-2014 |
Alan Newberger <alann@google.com> |
Null check for buildItemFromData This can return null in some scenarios and other invocations do null checks, one was missing here. Bug: 18005946 Change-Id: I14c4b31569ace7e84886228a638757ab1cd4710f
rc/com/android/camera/widget/FilmstripView.java
|
f4084e35eac8a8b86e807573647d4a7b43852a59 |
22-Oct-2014 |
Alan Newberger <alann@google.com> |
Check for null when deleting preference groups No glacier incidents but with hundreds of Fishlake incidents implying that sometimes we fail to find the preference to remove, protect against nulls here to avoid crashing in Settings. Bug: 14625519 Change-Id: Iebc1a103abae7524e6ab0aca96d5c2479e62d9ee
rc/com/android/camera/settings/CameraSettingsActivity.java
|
ffc9b8805b1d7033122e5fed5059040eeab8629f |
22-Oct-2014 |
Alan Newberger <alann@google.com> |
Update to latest Glide Fixes compile and runtime compatibility issues with the latest Glide update into external/glide Bug: 18059638 Change-Id: I73dfc37d726284864a07d347015b13d32e084cc0
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/data/LocalMediaData.java
rc/com/android/camera/data/LocalSessionData.java
|
05edd2eec40d2a3ce7a76dc9f4d7dfe65e576ab7 |
21-Oct-2014 |
Alan Newberger <alann@google.com> |
Increase VERBOSE logging for PhotoModule orientation use Log all orientation values to diagnose capture orientation behavior. Bug: 18055323 Change-Id: If63455104f7b96f5797f2651d1aadcadee67e1af
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/PhotoModule.java
|
b20cf71a817e1835a5ea8d084c9896c2aae706d9 |
21-Oct-2014 |
I-Jong Lin <ijonglin@google.com> |
Merge "Secure Camera App survives phone unlock screen" into ub-camera-glacier
|
7eeb897bc342f3f0d201464f37d5e6bfa7fe8b37 |
20-Oct-2014 |
Alan Newberger <alann@google.com> |
Merge "Catch exceptions in settings remove helpers" into ub-camera-glacier
|
0aa8c2564832770570002be8b2933412d1b9b19d |
20-Oct-2014 |
Alan Newberger <alann@google.com> |
Catch exceptions in settings remove helpers Saw just one case of this and my hypothesis is that it was due to another now-fixed exception resulting in a partial upgrade. But in no case should these remove issues fail, so fixing to remove and return the default if the underlying value is not readable. There is some possibility for behavior error in this case since perhaps e.g. a String-based 'true' was written and we upgrade instead to a default 'false', but allowing users to enter camera is better and I've audited all uses of these, behavior should be fine/recoverable vs and preferable to startup crash. Bug: 18042161 Change-Id: If2453a819311bfd9233fdf65d7a97d8a243b393a
rc/com/android/camera/settings/SettingsUpgrader.java
|
783fe31b1d6ed43c3c2ed24db2ecd78c14578ddf |
20-Oct-2014 |
I-Jong Lin <ijonglin@google.com> |
Merge "Button fix for torch when no flash available in hw" into ub-camera-glacier
|
718c43d79bd080ccacc8eb962637c51811616fda |
17-Oct-2014 |
I-Jong Lin <ijonglin@google.com> |
Secure Camera App survives phone unlock screen Bug: 17883828 There is UI path to start the secure camera app from the lock screen, and then unlock the phone and find the secure camera app on the task manager. This live instance of secure camera app is confusing to the user who is expecting to interact with a full camera app. This fix kills the secure camera app when the phone is unlocked and ensures that the user cannot easily restart the secure camera app from the currently running tasks in task manager. Change-Id: Ia6a6d077c460e66807d4be9836fe192184aa8eaf
rc/com/android/camera/CameraActivity.java
|
0784a835e917e1dab7bb963cb9a9b92b506fba94 |
17-Oct-2014 |
I-Jong Lin <ijonglin@google.com> |
Button fix for torch when no flash available in hw Bug: 17952997 The logic to show and disable the flash button was NOT paired with the torch button and sometimes allowed the enabled torch button to be shown, even the flash button was disabled. A bit confusing, since the torch and flash button look exactly the same. Torch button logic to show/hide and enable/disable now follows the flash logic. Change-Id: Ie14b07815b6d5e1f8d7ce792ef9ee36dfdf8e3ad
rc/com/android/camera/app/CameraAppUI.java
|
9ef30417f1e28ca083db09aeaa76f3e0b38409fd |
20-Oct-2014 |
Geoff Mendal <mendal@google.com> |
Import translations. DO NOT MERGE Change-Id: Idcfa92fed757530d6fcb3d4b323804be0b965841 Auto-generated-cl: translation import
es/values-hi/strings.xml
es/values-km-rKH/strings.xml
es/values-my-rMM/strings.xml
|
5863a7fecb8196ebac587cccc61ddeca5dfe66c2 |
20-Oct-2014 |
Baligh Uddin <baligh@google.com> |
am 4162c991: (-s ours) am 5e4a50d3: (-s ours) am 0d283729: (-s ours) am 9d87600a: (-s ours) am 91bceebd: (-s ours) Import translations. DO NOT MERGE * commit '4162c9915bfff0632504ae28d9f39dc4ab2a8788': Import translations. DO NOT MERGE
|
4162c9915bfff0632504ae28d9f39dc4ab2a8788 |
20-Oct-2014 |
Baligh Uddin <baligh@google.com> |
am 5e4a50d3: (-s ours) am 0d283729: (-s ours) am 9d87600a: (-s ours) am 91bceebd: (-s ours) Import translations. DO NOT MERGE * commit '5e4a50d3bf220af8c8e5170ef0e0115595c582d6': Import translations. DO NOT MERGE
|
5e4a50d3bf220af8c8e5170ef0e0115595c582d6 |
20-Oct-2014 |
Baligh Uddin <baligh@google.com> |
am 0d283729: (-s ours) am 9d87600a: (-s ours) am 91bceebd: (-s ours) Import translations. DO NOT MERGE * commit '0d283729f3cb0bdc3f5afd992e5f49e56d1e5728': Import translations. DO NOT MERGE
|
0d283729f3cb0bdc3f5afd992e5f49e56d1e5728 |
20-Oct-2014 |
Baligh Uddin <baligh@google.com> |
am 9d87600a: (-s ours) am 91bceebd: (-s ours) Import translations. DO NOT MERGE * commit '9d87600a24c9b9b1c7a1d85b46971dba51d48e2c': Import translations. DO NOT MERGE
|
9d87600a24c9b9b1c7a1d85b46971dba51d48e2c |
20-Oct-2014 |
Baligh Uddin <baligh@google.com> |
am 91bceebd: (-s ours) Import translations. DO NOT MERGE * commit '91bceebd0bb15a5d20d43f8eca808114b96eb5ce': Import translations. DO NOT MERGE
|
2e1d2ed664bf9a0b91424d19d158f1ea2b58c8fd |
20-Oct-2014 |
Baligh Uddin <baligh@google.com> |
am 91bceebd: (-s ours) Import translations. DO NOT MERGE * commit '91bceebd0bb15a5d20d43f8eca808114b96eb5ce': Import translations. DO NOT MERGE
|
91bceebd0bb15a5d20d43f8eca808114b96eb5ce |
19-Oct-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I9aa9830e9e60b0a774c9001f6cd5bb48f7c7d0cd Auto-generated-cl: translation import
es/values-el/strings.xml
es/values-eu-rES/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-km-rKH/strings.xml
es/values-mk-rMK/strings.xml
es/values-zh-rHK/strings.xml
|
ea77c6b2f9a602712c19ed0f441c6439b2f168de |
17-Oct-2014 |
Sascha Haeberling <haeberling@google.com> |
Don't release resources until camera is closed. Bug: 17788328 Change-Id: Id7112b698c8d49f9816e5e1bf6a133272fa2f65a
rc/com/android/camera/CaptureModule.java
|
9617f0458075fdd2211e252b80bd9853bb97fdea |
17-Oct-2014 |
Neil Fuller <nfuller@google.com> |
am 50cd017d: resolved conflicts for merge of c0dd3adf to lmp-mr1-dev-plus-aosp * commit '50cd017d439aed15eaa6da4e4767cff7e9b9532c': Remove dependencies on FloatMath
|
49bcaafb0ac92b2a2ae6b35deb640714b2a02bd9 |
17-Oct-2014 |
Neil Fuller <nfuller@google.com> |
resolved conflicts for merge of c0dd3adf to lmp-dev-plus-aosp Change-Id: Iec8753c5b81b84c99adff38b36cf2727c997e5bc
|
50cd017d439aed15eaa6da4e4767cff7e9b9532c |
17-Oct-2014 |
Neil Fuller <nfuller@google.com> |
resolved conflicts for merge of c0dd3adf to lmp-mr1-dev-plus-aosp Change-Id: I48ff6962b8b24f6b9714a660e706b35336a99a06
|
c0dd3adffa1eb2fdeb281ea08ce9a085b463ff04 |
17-Oct-2014 |
Neil Fuller <nfuller@google.com> |
Merge "Remove dependencies on FloatMath"
|
edc92b0a0e2554574210adaff0f20bb1a0b6a9ce |
17-Oct-2014 |
Puneet Lall <puneetl@google.com> |
Merge "Fix orientation for front-facing cameras using CaptureModule" into ub-camera-haleakala
|
2b06c90bbd9a72414aa55a354a82958a8b7cb26b |
17-Oct-2014 |
Puneet Lall <puneetl@google.com> |
Fix orientation for front-facing cameras using CaptureModule Change-Id: Ibf4a9c7601fbc3e42ec03d18c54a23b604d42249
rc/com/android/camera/CaptureModule.java
|
81471c40e896fbe5cc4d2619cae83364f1a5b87e |
17-Oct-2014 |
Puneet Lall <puneetl@google.com> |
Enable shutter button when preview is started Change-Id: I93d378976c1c34dc05ce40cfb93310572f2ada98
rc/com/android/camera/CaptureModule.java
|
9aaa1444c47515d04af510b9b41688cf6c2f84dd |
16-Oct-2014 |
Puneet Lall <puneetl@google.com> |
Merge "Rename ListenerCombiner" into ub-camera-haleakala
|
c2387dc7fa82fafb2dd2eac0e7280ff71dece0f4 |
16-Oct-2014 |
Puneet Lall <puneetl@google.com> |
Rename ListenerCombiner Change-Id: Id293c9cd3a04229524a4fc5047d69e6b37837e62
rc/com/android/camera/one/v2/OneCameraZslImpl.java
rc/com/android/camera/util/ConjunctionListenerMux.java
rc/com/android/camera/util/ListenerCombiner.java
|
2b7e02e60c30e4920cb7173676227e098b58dbc1 |
16-Oct-2014 |
Spike Sprague <spikuru@google.com> |
am e6649574: Merge "disable startup shimmy on sd card error" into ub-camera-glacier * commit 'e664957471663effaa0cf1998b5a1134f5e19aa4': disable startup shimmy on sd card error
|
e664957471663effaa0cf1998b5a1134f5e19aa4 |
16-Oct-2014 |
Spike Sprague <spikuru@google.com> |
Merge "disable startup shimmy on sd card error" into ub-camera-glacier
|
4c96d840aeff669011a9e8697cbac77fe8f4eda2 |
16-Oct-2014 |
Spike Sprague <spikuru@google.com> |
disable startup shimmy on sd card error bug: 15841887 Change-Id: If1cbb463a9de916b9fdd2926d8b47db04934535c
rc/com/android/camera/app/CameraAppUI.java
rc/com/android/camera/ui/ModeListView.java
|
d3313e8e2fcdca937f1b8be38b7d5770301409af |
16-Oct-2014 |
Puneet Lall <puneetl@google.com> |
Merge "Enable CaptureModule/ZSL" into ub-camera-haleakala
|
9cd94d77bcafad38f15b318ea5c9dbc0849c1ecd |
14-Oct-2014 |
Puneet Lall <puneetl@google.com> |
Enable CaptureModule/ZSL * Close the image reader in ZSL impl * Enable CaptureModule for API2 * Set ZSL ring-buffer to 10 images Change-Id: I19eb6bf9102ba8397fa073c98b1a3b5f84b74601
rc/com/android/camera/debug/DebugPropertyHelper.java
rc/com/android/camera/module/ModulesInfo.java
rc/com/android/camera/one/OneCameraManager.java
rc/com/android/camera/one/v2/OneCameraImpl.java
rc/com/android/camera/one/v2/OneCameraZslImpl.java
|
2ffef84cb9d1330d59b54b0e1eefcec8296c8823 |
16-Oct-2014 |
Alan Newberger <alann@google.com> |
am 7dabda68: Show capturing UI before review UI in intent countdown timer * commit '7dabda684367122fa2dc2097e198ac6241279bcd': Show capturing UI before review UI in intent countdown timer
|
7dabda684367122fa2dc2097e198ac6241279bcd |
16-Oct-2014 |
Alan Newberger <alann@google.com> |
Show capturing UI before review UI in intent countdown timer Going prematurely to the review UI means you can hit the checkbox before we have JPEG data. With this change, after countdown you see a grayed out capture button like normal capture animation, then the checkbox review UI when the picture is ready. Bug: 18002016 Change-Id: Ieddd71636f962c127aa470ec0f150987d3d287ab
rc/com/android/camera/CaptureModule.java
rc/com/android/camera/PhotoModule.java
|
3ee2cc0ded3de20341eb21e0f3f55bda4a60fefe |
15-Oct-2014 |
I-Jong Lin <ijonglin@google.com> |
am 1cf0679c: Merge "Fix for crash when PhotoApp deletes last Cam pic" into ub-camera-glacier * commit '1cf0679c861c280f4bdb801e42ba4882851d3e63': Fix for crash when PhotoApp deletes last Cam pic
|
1cf0679c861c280f4bdb801e42ba4882851d3e63 |
15-Oct-2014 |
I-Jong Lin <ijonglin@google.com> |
Merge "Fix for crash when PhotoApp deletes last Cam pic" into ub-camera-glacier
|
4f55a065cdece81f1da7c81d8e43cc3a4ad3fc20 |
15-Oct-2014 |
Sascha Haeberling <haeberling@google.com> |
am 20a5930f: Merge "Make string comparison robust against null values." into ub-camera-glacier * commit '20a5930f5e7de203e8a8cbb2f19e87cf0a57d592': Make string comparison robust against null values.
|
20a5930f5e7de203e8a8cbb2f19e87cf0a57d592 |
15-Oct-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Make string comparison robust against null values." into ub-camera-glacier
|
47008b2595452102ff8389b84e44509f0389bef5 |
15-Oct-2014 |
Sascha Haeberling <haeberling@google.com> |
Make string comparison robust against null values. Bug: 17999505 Change-Id: Ic255603a5664e7d9be80d9e18435924e18d4ba66
rc/com/android/camera/util/QuickActivity.java
|
9efa64a16a691e6aeb56dc844aa00c8ea057ef99 |
15-Oct-2014 |
I-Jong Lin <ijonglin@google.com> |
Fix for crash when PhotoApp deletes last Cam pic Bug: 17496363 This crash occurs when there is only one picture in the Camera filmstrip. When you switch out of the Camera App into the Photo App and delete it, and then switch back, the Filmstrip attempts to draw a removal animation with invalid data, and crashes via trying to call functions on null object. This fix is simple and catches the null object and does NOT attempt to draw the invalid object. The larger issue may be that the Camera App is buffering/caching invalid or stale data that it is illegally trying to act on. I've left a warning message in the code to warn on any bad behavior, but we should catch the invariant that's being violated and fix the deeper problem. Change-Id: I2487f753b5c7bb57e34c65d687a2236fa3a23f9f
rc/com/android/camera/widget/FilmstripView.java
|
16b63de0f89235664ec941ddd79be3f78d4fe01a |
15-Oct-2014 |
Senpo Hu <senpo@google.com> |
am 4a1fd997: Merge "Fix the build break due to ag/567355." into ub-camera-glacier * commit '4a1fd9976fc47a732058e764c00a36f538ca430c': Fix the build break due to ag/567355.
|
4a1fd9976fc47a732058e764c00a36f538ca430c |
15-Oct-2014 |
Senpo Hu <senpo@google.com> |
Merge "Fix the build break due to ag/567355." into ub-camera-glacier
|
4af3ac5b6fd690c937f9602231096f26d5c936e8 |
15-Oct-2014 |
Senpo Hu <senpo@google.com> |
Fix the build break due to ag/567355. Change-Id: I3f8b657bea9fdd22287115230709dda0a26b8ae4
rc_pd/com/google/common/logging/eventprotos.java
|
c75d0b4c9d634afc234aea08448dace460de6edf |
15-Oct-2014 |
Senpo Hu <senpo@google.com> |
am 828081f5: Merge "Log camera exception via UsageStatistics." into ub-camera-glacier * commit '828081f5f947abb8930f084386492efde8c5b83b': Log camera exception via UsageStatistics.
|
828081f5f947abb8930f084386492efde8c5b83b |
15-Oct-2014 |
Senpo Hu <senpo@google.com> |
Merge "Log camera exception via UsageStatistics." into ub-camera-glacier
|
9047a60aabd5cccd124065bcf4ca39894872925d |
14-Oct-2014 |
Spike Sprague <spikuru@google.com> |
am c6a48876: Merge "disable shutter button as soon as possible to avoid double shutter presses" into ub-camera-glacier * commit 'c6a488761b2b9deb11bdcac051dfeacd212ee90f': disable shutter button as soon as possible to avoid double shutter presses
|
58738e64e05b96f4246a6cc5040997b3f3a34757 |
14-Oct-2014 |
Alan Newberger <alann@google.com> |
am 54985c97: Merge "Revert "Make CameraDataAdapter background new data loading and post to listener"" into ub-camera-glacier * commit '54985c973140b896db75f086ac0f904d0228f8aa': Revert "Make CameraDataAdapter background new data loading and post to listener"
|
af10e78ab07ea1cc3f37b98ed7f180c07e6aa350 |
14-Oct-2014 |
Alan Newberger <alann@google.com> |
am 3972da65: Merge "Migrate Settings Fragment to use arguments" into ub-camera-glacier * commit '3972da65f958edcfed26f1c32e0cf4e8361306e7': Migrate Settings Fragment to use arguments
|
74b723c7093e5d8acf6f7170dd98f813a2185442 |
14-Oct-2014 |
Senpo Hu <senpo@google.com> |
Log camera exception via UsageStatistics. Change-Id: I2b80338dd489ece87d94e20a303c5e43e972c3b0
rc/com/android/camera/CameraActivity.java
rc_pd/com/android/camera/util/UsageStatistics.java
|
c6a488761b2b9deb11bdcac051dfeacd212ee90f |
14-Oct-2014 |
Spike Sprague <spikuru@google.com> |
Merge "disable shutter button as soon as possible to avoid double shutter presses" into ub-camera-glacier
|
54985c973140b896db75f086ac0f904d0228f8aa |
14-Oct-2014 |
Alan Newberger <alann@google.com> |
Merge "Revert "Make CameraDataAdapter background new data loading and post to listener"" into ub-camera-glacier
|
7387c534242dd5c48714c5df1ee79f60c7b2ba4e |
14-Oct-2014 |
Alan Newberger <alann@google.com> |
Revert "Make CameraDataAdapter background new data loading and post to listener" Reverting out of concerns on thread safety, need to more carefully assess the change. Synchronizing may just reintroduce deadlock for affected user. This reverts commit cc93255f596b47d1a860461dd0d4be697422964f. Change-Id: I8b003f978d680942d380cc3563bccd055ab28fe9
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/data/CameraDataAdapter.java
|
3972da65f958edcfed26f1c32e0cf4e8361306e7 |
14-Oct-2014 |
Alan Newberger <alann@google.com> |
Merge "Migrate Settings Fragment to use arguments" into ub-camera-glacier
|
bda2da2ec52bf2cc4c4df058bac20be6eb9ceab3 |
14-Oct-2014 |
Alan Newberger <alann@google.com> |
Migrate Settings Fragment to use arguments Fix error in settings fragment using a constructor vs argument bundle. Bug: 17626333 Change-Id: I5842706a3b5060dac1f997ca4035b4cc31ce0287
rc/com/android/camera/settings/CameraSettingsActivity.java
|
0fa0bacef1edf450e358f0574bcaf9436b70ddc7 |
14-Oct-2014 |
Senpo Hu <senpo@google.com> |
am 7a3ce60c: Merge "Prevent NullPointerException of PhotoModule in quick resume-pause." into ub-camera-glacier * commit '7a3ce60cfe7f5a554ab8edeb08c203196b17b164': Prevent NullPointerException of PhotoModule in quick resume-pause.
|
7a3ce60cfe7f5a554ab8edeb08c203196b17b164 |
14-Oct-2014 |
Senpo Hu <senpo@google.com> |
Merge "Prevent NullPointerException of PhotoModule in quick resume-pause." into ub-camera-glacier
|
9746ebec86df2f276ee18eeaf070ff0fc4ad06ec |
14-Oct-2014 |
Senpo Hu <senpo@google.com> |
Prevent NullPointerException of PhotoModule in quick resume-pause. Bug: 17984743 Change-Id: Ie597dbddb383004deace8933f51f091029c0a9b4
rc/com/android/camera/PhotoModule.java
|
a3fb78f030bdb92d1f46bde935e3a1a5bed24f2e |
14-Oct-2014 |
I-Jong Lin <ijonglin@google.com> |
am 4ed861a7: Preview vs Video Camera Resolution Mismatch * commit '4ed861a70de7db31a7d4b9227b523bef684d7eed': Preview vs Video Camera Resolution Mismatch
|
4ed861a70de7db31a7d4b9227b523bef684d7eed |
11-Oct-2014 |
I-Jong Lin <ijonglin@google.com> |
Preview vs Video Camera Resolution Mismatch Bug: 17458889 This bug is programmatic and reproduces on all devices. Basically, the current app defaults to the highest resolution preview that matches the aspect ratio of the recording, even if the recording video resolution is lower. Since it is more important to be WYSIWYG, in the cases where the preview show at the same resolution of the recording video resolution, we should preview at same resolution for truest (but not necessarily best) quality that most faithfully represents the content that is to be recorded under the constraint of the UI resolution. Change-Id: I0ec5a76834cbffa59f0e144f1fe271de25e92523
rc/com/android/camera/VideoModule.java
rc/com/android/camera/util/CameraUtil.java
|
8d1ac99f4c6f43fc093f787128f729ba12aa9332 |
13-Oct-2014 |
Spike Sprague <spikuru@google.com> |
disable shutter button as soon as possible to avoid double shutter presses bug: 17939465 Change-Id: Iac19b8fa78774b525fbaf0d4742d97764d401b78
rc/com/android/camera/PhotoModule.java
|
4e2da33b49e44c54a1ae3757f19cd02cb3c7d414 |
14-Oct-2014 |
Puneet Lall <puneetl@google.com> |
am e9dedb39: Merge "Don\'t re-open the camera if already open" into ub-camera-glacier * commit 'e9dedb39b240e87e854918d544de66820b41700c': Don't re-open the camera if already open
|
e9dedb39b240e87e854918d544de66820b41700c |
14-Oct-2014 |
Puneet Lall <puneetl@google.com> |
Merge "Don't re-open the camera if already open" into ub-camera-glacier
|
f289ee11203f19d36235246504d90d0081a0c970 |
14-Oct-2014 |
Alan Newberger <alann@google.com> |
am b7378210: Merge "Make CameraDataAdapter background new data loading and post to listener" into ub-camera-glacier * commit 'b7378210663a1ac9c6692b9a0d8ae5e414da9370': Make CameraDataAdapter background new data loading and post to listener
|
b7378210663a1ac9c6692b9a0d8ae5e414da9370 |
14-Oct-2014 |
Alan Newberger <alann@google.com> |
Merge "Make CameraDataAdapter background new data loading and post to listener" into ub-camera-glacier
|
cc93255f596b47d1a860461dd0d4be697422964f |
14-Oct-2014 |
Alan Newberger <alann@google.com> |
Make CameraDataAdapter background new data loading and post to listener To avoid potentially expensive operations in main thread, only call back to filmstrip on the main thread. Do all processing in background. Consistently enforce that all listener callbacks are main thread by posting to a main thread handler. Bug: 17437217 Change-Id: I6a96690218043cc42644d12a4162322cc2ee7e8f
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/data/CameraDataAdapter.java
|
0e0c55a11c5bc47b14023054f2c5597ea5197fa8 |
14-Oct-2014 |
Puneet Lall <puneetl@google.com> |
Don't re-open the camera if already open Bug: 17870967 Change-Id: Ibafc8c563b6188c4c743a60a3b42b93e107523bc
rc/com/android/camera/CaptureModule.java
|
4232c89296d6290e2e8abcf22869502315eee278 |
14-Oct-2014 |
Geoff Mendal <mendal@google.com> |
Import translations. DO NOT MERGE Change-Id: I619f23160f7f403272293d70cc1821e560011ebc Auto-generated-cl: translation import
es/values-hi/strings.xml
|
a2ebb87daf7de427bd1a58470f082079322a6758 |
14-Oct-2014 |
Senpo Hu <senpo@google.com> |
am a5db8beb: Merge "Refine camera fatal error handling in CameraActivity." into ub-camera-glacier * commit 'a5db8bebb51ff666b4fa4bbadc3d0457f36041f2': Refine camera fatal error handling in CameraActivity.
|
a5db8bebb51ff666b4fa4bbadc3d0457f36041f2 |
14-Oct-2014 |
Senpo Hu <senpo@google.com> |
Merge "Refine camera fatal error handling in CameraActivity." into ub-camera-glacier
|
68b906d74512117e1a4b5936ab1cd47bcd729da5 |
13-Oct-2014 |
Alan Newberger <alann@google.com> |
am 890ab9be: Merge "Refine in-place conversion semantics for Settings" into ub-camera-glacier * commit '890ab9beb8642bc9278f9914013be2fd65d740f8': Refine in-place conversion semantics for Settings
|
890ab9beb8642bc9278f9914013be2fd65d740f8 |
13-Oct-2014 |
Alan Newberger <alann@google.com> |
Merge "Refine in-place conversion semantics for Settings" into ub-camera-glacier
|
6293c579bce8356f10cda31637917537a4501437 |
13-Oct-2014 |
Alan Newberger <alann@google.com> |
Refine in-place conversion semantics for Settings Since settings are now stored as strings, avoid app crashes for settings which are still around as other types, and just treat it as if those settings are absent (return default). This requires re-working the version number tracker itself, which is done by making it a new key and migrating just the old key in the getLastVersion override. This is somewhat cleaner and overall the change should increase stability given the change to use in place values of different types. Bug: 17949433 Change-Id: Icaf0d9653eabb9e144f3946a51b4038d3ed48ea9
rc/com/android/camera/settings/AppUpgrader.java
rc/com/android/camera/settings/Keys.java
rc/com/android/camera/settings/SettingsManager.java
|
df93cdd91f8f47794f26a066be3630e178b9ce36 |
13-Oct-2014 |
Alan Newberger <alann@google.com> |
am 7839867c: Merge "Update to use real L codename." into ub-camera-glacier * commit '7839867c4c6eb837d5e7c1c5851741d4933f5fb1': Update to use real L codename.
|
7839867c4c6eb837d5e7c1c5851741d4933f5fb1 |
13-Oct-2014 |
Alan Newberger <alann@google.com> |
Merge "Update to use real L codename." into ub-camera-glacier
|
131591967bb4f27b8b55347e367a144047320c30 |
13-Oct-2014 |
Senpo Hu <senpo@google.com> |
Refine camera fatal error handling in CameraActivity. Use Log.e() to clearly indicate what action has been taken to handle the error. Bug: 17964147 Change-Id: I073e06d99a89e6e1e697766736791ef419339944
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/util/CameraUtil.java
|
2d450e66c32c4a928ad59928428114f85df77927 |
13-Oct-2014 |
Spike Sprague <spikuru@google.com> |
am 89ac2e10: Merge "change cahching Drawables to caching ConstantStates, also apply CircelDrawable as necessary at runtime" into ub-camera-glacier * commit '89ac2e10477b03fbd5addb7da46933626748ed3a': change cahching Drawables to caching ConstantStates, also apply CircelDrawable as necessary at runtime
|
89ac2e10477b03fbd5addb7da46933626748ed3a |
13-Oct-2014 |
Spike Sprague <spikuru@google.com> |
Merge "change cahching Drawables to caching ConstantStates, also apply CircelDrawable as necessary at runtime" into ub-camera-glacier
|
5219b73ee64296a38d0fa93f7eb1faf1e0a5a101 |
13-Oct-2014 |
Spike Sprague <spikuru@google.com> |
am eb81de1d: Merge "Native 16x9 viewfinder stream for Gcam to reduce switching jank and eliminate black bar overlay hack." into ub-camera-glacier * commit 'eb81de1d250a5c61f378428f590238ce5c7e16a4': Native 16x9 viewfinder stream for Gcam to reduce switching jank and eliminate black bar overlay hack.
|
85d0eee0e7da3790a116d61780b8a8d65adb5df0 |
13-Oct-2014 |
Puneet Lall <puneetl@google.com> |
am 6a07363b: Always close the camera * commit '6a07363be15d11735b0b47059bf8d0e9998693ef': Always close the camera
|
eb81de1d250a5c61f378428f590238ce5c7e16a4 |
13-Oct-2014 |
Spike Sprague <spikuru@google.com> |
Merge "Native 16x9 viewfinder stream for Gcam to reduce switching jank and eliminate black bar overlay hack." into ub-camera-glacier
|
d25eac4c69ccda0a9e91f6af8032b0624554e7ac |
09-Oct-2014 |
Spike Sprague <spikuru@google.com> |
Native 16x9 viewfinder stream for Gcam to reduce switching jank and eliminate black bar overlay hack. companion CL: ag/562183 bug: 17669070 Change-Id: I4d5402df3848423c236108716f7065a87ce95f6d
es/layout/camera.xml
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/CaptureModule.java
rc/com/android/camera/app/CameraAppUI.java
rc/com/android/camera/util/ApiHelper.java
|
6a07363be15d11735b0b47059bf8d0e9998693ef |
11-Oct-2014 |
Puneet Lall <puneetl@google.com> |
Always close the camera Previous logic had a race condition in which the camera may not be closed if it was in the process of being opened. Bug: 17939709 Change-Id: Ife9d96b73dac17625b3344fcf8553d181a74024e
rc/com/android/camera/app/CameraController.java
|
fcc9143368d134ce26dec7d904f21e06676b2a02 |
10-Oct-2014 |
Spike Sprague <spikuru@google.com> |
change cahching Drawables to caching ConstantStates, also apply CircelDrawable as necessary at runtime bug: 17907551 Change-Id: I9bddfc599f15c3e0b09b98f14a9804296d51015b
rc/com/android/camera/ui/BottomBar.java
|
aabe27d57568b4aa303c83888650159fb8d845a0 |
11-Oct-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Make temp session directory creation more robust and efficient." into ub-camera-haleakala
|
8111aa0a298688da560dcac6bc4c3f92b878dbc7 |
09-Oct-2014 |
Sascha Haeberling <haeberling@google.com> |
Make temp session directory creation more robust and efficient. Also rename some methods for clarity. Change-Id: Ic6d3e7902ae5396f33231f1471df9eae89234132
rc/com/android/camera/session/CaptureSession.java
rc/com/android/camera/session/CaptureSessionManagerImpl.java
rc/com/android/camera/session/SessionStorageManagerImpl.java
|
f4b6e53b71309d70c0b5aab6b850cb4146bdcb36 |
11-Oct-2014 |
Sascha Haeberling <haeberling@google.com> |
am 4d4585da: Merge "Pass NamedEntity to saveFinalPhoto since it can be nulled in pause()." into ub-camera-glacier * commit '4d4585da32d9b5a47bffad1deeb08fc5cd128311': Pass NamedEntity to saveFinalPhoto since it can be nulled in pause().
|
eb6fa710251cc38867c7d6dac272f92596a5afcf |
11-Oct-2014 |
Senpo Hu <senpo@google.com> |
am ac9070ee: Migrate old CameraErrorCallback class to agent\'s CameraExceptionHandler. * commit 'ac9070ee24d2db6e7804cdd26df578e7ab76895e': Migrate old CameraErrorCallback class to agent's CameraExceptionHandler.
|
4d4585da32d9b5a47bffad1deeb08fc5cd128311 |
11-Oct-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Pass NamedEntity to saveFinalPhoto since it can be nulled in pause()." into ub-camera-glacier
|
ac9070ee24d2db6e7804cdd26df578e7ab76895e |
11-Oct-2014 |
Senpo Hu <senpo@google.com> |
Migrate old CameraErrorCallback class to agent's CameraExceptionHandler. Per ag/565603, clean up the old CameraErrorCallback. Bug: 17931297 Change-Id: Id750581850680ed6cf85738daf5ebdebf67f4800
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/CameraErrorCallback.java
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/VideoModule.java
rc/com/android/camera/debug/DebugCameraProxy.java
|
ce90f7b459272f16be1983012ec118f4069a3766 |
11-Oct-2014 |
Sascha Haeberling <haeberling@google.com> |
Pass NamedEntity to saveFinalPhoto since it can be nulled in pause(). Bug: 15289634 Change-Id: I551f73f5f0ceecf2d8a1e3b379dd34fd06b044d8
rc/com/android/camera/PhotoModule.java
|
022af5b3a81b3c172a6044e679e266f771e7b85e |
10-Oct-2014 |
Dianne Hackborn <hackbod@google.com> |
am c749dddf: am d0501b04: am 55157d27: am cc933608: am 2d440350: Update to use real L codename. * commit 'c749dddf4853dcd01954e394cd37bf1b51458d3e': Update to use real L codename.
|
53e6ff4b908a79eca819d558b602018249c896e3 |
10-Oct-2014 |
Alan Newberger <alann@google.com> |
am 4fe4680c: Merge "Add verbose logging for os/apk debug builds" into ub-camera-glacier * commit '4fe4680cca29994e0c070b9b5ea5ef9bcf087a65': Add verbose logging for os/apk debug builds
|
4fe4680cca29994e0c070b9b5ea5ef9bcf087a65 |
10-Oct-2014 |
Alan Newberger <alann@google.com> |
Merge "Add verbose logging for os/apk debug builds" into ub-camera-glacier
|
37c8be86ac9db4d60c4453fe1e7dbec7cc45cefa |
10-Oct-2014 |
Alan Newberger <alann@google.com> |
Add verbose logging for os/apk debug builds Relax VERBOSE screening so that by default, we log more when not in a release configuration. Bug: 17950234 Change-Id: I30250974456607b4fb64c15d6ecfa288ceb2f133
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/debug/Log.java
rc_pd/com/android/camera/util/ReleaseDialogHelper.java
rc_pd/com/android/camera/util/ReleaseHelper.java
|
c749dddf4853dcd01954e394cd37bf1b51458d3e |
10-Oct-2014 |
Dianne Hackborn <hackbod@google.com> |
am d0501b04: am 55157d27: am cc933608: am 2d440350: Update to use real L codename. * commit 'd0501b049bd9b979fdef671df2e3115b7403bb34': Update to use real L codename.
|
d0501b049bd9b979fdef671df2e3115b7403bb34 |
10-Oct-2014 |
Dianne Hackborn <hackbod@google.com> |
am 55157d27: am cc933608: am 2d440350: Update to use real L codename. * commit '55157d27305d06569f0bd7d3c47ec51855f87da4': Update to use real L codename.
|
55157d27305d06569f0bd7d3c47ec51855f87da4 |
10-Oct-2014 |
Dianne Hackborn <hackbod@google.com> |
am cc933608: am 2d440350: Update to use real L codename. * commit 'cc93360812c822eb4cac8056a0848c74338b3776': Update to use real L codename.
|
ee7c0238a7621c5b7b17633255f4ebf20ffb3ead |
10-Oct-2014 |
Spike Sprague <spikuru@google.com> |
am a9731952: Merge "change text color to white for tutorial and onboarding screens." into ub-camera-glacier * commit 'a9731952fb824f78d033ae360ff8324ae6cf2d6a': change text color to white for tutorial and onboarding screens.
|
a9731952fb824f78d033ae360ff8324ae6cf2d6a |
10-Oct-2014 |
Spike Sprague <spikuru@google.com> |
Merge "change text color to white for tutorial and onboarding screens." into ub-camera-glacier
|
b5a5c4d4dfcb09fd1be2cc184bb10139c1345477 |
09-Oct-2014 |
Spike Sprague <spikuru@google.com> |
change text color to white for tutorial and onboarding screens. Change-Id: If431ce0b321991e15f33f850acc3cc6c4474ffb4
es/values/colors.xml
|
cc93360812c822eb4cac8056a0848c74338b3776 |
09-Oct-2014 |
Dianne Hackborn <hackbod@google.com> |
am 2d440350: Update to use real L codename. * commit '2d4403500d0bb55794aecbe9a33a03dd09f8ea0a': Update to use real L codename.
|
45ca5c80496b0c6e8b0e73273a02e6eb0683971e |
09-Oct-2014 |
Dianne Hackborn <hackbod@google.com> |
am 2d440350: Update to use real L codename. * commit '2d4403500d0bb55794aecbe9a33a03dd09f8ea0a': Update to use real L codename.
|
b24e1aa6fe599c56c9e37e962237ed19f29737bb |
09-Oct-2014 |
Alan Newberger <alann@google.com> |
Merge "resolved conflicts for merge of d0927687 to lmp-mr1-dev-plus-aosp" into ub-camera-haleakala
|
345fd4a5fc7702d49b802a707712a4366714229b |
09-Oct-2014 |
Puneet Lall <puneetl@google.com> |
am 59d337b4: Use a separate activity for capture intents * commit '59d337b422cc373666609fb0ef7fcc422884b683': Use a separate activity for capture intents
|
59d337b422cc373666609fb0ef7fcc422884b683 |
09-Oct-2014 |
Puneet Lall <puneetl@google.com> |
Use a separate activity for capture intents Bug: 17911061 Change-Id: Id5d3e5347c1830dc43b8962c1494bb4bf5195136
ndroidManifest.xml
rc/com/android/camera/CaptureActivity.java
|
43d66a0cac75bbb0adb0933124002e1eb1f439b9 |
08-Oct-2014 |
Dianne Hackborn <hackbod@google.com> |
Update to use real L codename. Change-Id: If6e5f02f693848f6cb0014084dccf910be4c958d
rc/com/android/camera/one/v2/ImageCaptureManager.java
rc/com/android/camera/one/v2/OneCameraZslImpl.java
rc/com/android/camera/util/ApiHelper.java
rc/com/android/camera/widget/FilmstripView.java
|
2d4403500d0bb55794aecbe9a33a03dd09f8ea0a |
08-Oct-2014 |
Dianne Hackborn <hackbod@google.com> |
Update to use real L codename. Change-Id: If6e5f02f693848f6cb0014084dccf910be4c958d
rc/com/android/camera/one/v2/ImageCaptureManager.java
rc/com/android/camera/one/v2/OneCameraZslImpl.java
rc/com/android/camera/util/ApiHelper.java
rc/com/android/camera/widget/FilmstripView.java
|
5b24860169c509c5c89a8c992e4c74951354953a |
08-Oct-2014 |
Sascha Haeberling <haeberling@google.com> |
am e11ad6d6: Make sure a null mimetype is not crashing the app. * commit 'e11ad6d67ad95a9ecab8a594bcb55a05708abc0f': Make sure a null mimetype is not crashing the app.
|
e11ad6d67ad95a9ecab8a594bcb55a05708abc0f |
08-Oct-2014 |
Sascha Haeberling <haeberling@google.com> |
Make sure a null mimetype is not crashing the app. Bug: 17398971 Though at this point something else is already horribly wrong with mediaserver, otherwise this cannot happen. Change-Id: I837dfd5992611ded0c34ea7cc1e677ac1456c0c0
rc/com/android/camera/data/LocalDataUtil.java
|
2f0ec76794038c577bffc6b0900668c038ff8a24 |
08-Oct-2014 |
Puneet Lall <puneetl@google.com> |
am 0d4cdba2: Revert "More lockscreen tuning" * commit '0d4cdba26b5fe4b7ca03796c5a2644a09e2c7144': Revert "More lockscreen tuning"
|
0d4cdba26b5fe4b7ca03796c5a2644a09e2c7144 |
08-Oct-2014 |
Puneet Lall <puneetl@google.com> |
Revert "More lockscreen tuning" This reverts commit 7ac13f5f3644c8de53ebd625f195d757166bf9c9. Change-Id: I3c59f4d71efe80290731e55421011c16e5dd4a41
rc/com/android/camera/util/QuickActivity.java
|
2ae123a72584cc8cacb4d462889e0e710e715d18 |
08-Oct-2014 |
Spike Sprague <spikuru@google.com> |
am fe7eb164: reverting b/559979 * commit 'fe7eb1640b1aca8500b2cab152648a699833d6fd': reverting b/559979
|
fe7eb1640b1aca8500b2cab152648a699833d6fd |
08-Oct-2014 |
Spike Sprague <spikuru@google.com> |
reverting b/559979 Change-Id: If4e58c67d4424ade68198a16c1d2d21595504efd
rc/com/android/camera/ui/BottomBar.java
|
bf5a1d3a587cef3a36e05df300759ddd0d47533d |
08-Oct-2014 |
Jiawen Chen <jiawen@google.com> |
am fd8c804c: Merge "Tweaked constants for Gcam." into ub-camera-glacier * commit 'fd8c804c9429f150f6028c6f371d34352934f964': Tweaked constants for Gcam.
|
fd8c804c9429f150f6028c6f371d34352934f964 |
08-Oct-2014 |
Jiawen Chen <jiawen@google.com> |
Merge "Tweaked constants for Gcam." into ub-camera-glacier
|
7dc464c4f0e29ddc36c6ce323e208fe773e651e3 |
08-Oct-2014 |
Senpo Hu <senpo@google.com> |
am 2a0e18e2: Adopt the new error handling mechanism in portability. * commit '2a0e18e280dfe541d4740345511ad299099cda79': Adopt the new error handling mechanism in portability.
|
2a0e18e280dfe541d4740345511ad299099cda79 |
07-Oct-2014 |
Senpo Hu <senpo@google.com> |
Adopt the new error handling mechanism in portability. Show camera fatal dialog to guide users exiting the app when 1) camera framework throws RTE or 2) DispatchThread job is timeout. If users hit home button while error dialog is shown, just exit the app. Bug: 16189216 Change-Id: Ia0f1c64d452735ec62549f50ab62646d8d873c65
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/app/CameraController.java
rc/com/android/camera/app/CameraProvider.java
rc/com/android/camera/debug/DebugCameraProxy.java
|
6807832ae4f044e26e7b661c0e76be27028cdae9 |
07-Oct-2014 |
Sascha Haeberling <haeberling@google.com> |
am 1b19bc80: Merge "Catch error where framework is broken and returns no cameras." into ub-camera-glacier * commit '1b19bc806b42ad405a3ea60e5e6c4e278e0aaee2': Catch error where framework is broken and returns no cameras.
|
1b19bc806b42ad405a3ea60e5e6c4e278e0aaee2 |
07-Oct-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Catch error where framework is broken and returns no cameras." into ub-camera-glacier
|
6c98fe1de38d587469f05c58126b7ca4100327e3 |
07-Oct-2014 |
Sascha Haeberling <haeberling@google.com> |
Catch error where framework is broken and returns no cameras. Bug: 17868174 Exit the app with the "Cannot connect to camera" error. Change-Id: Ic5a6e0af222a3740b8bd3f6e66ee575f9443008e
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/one/OneCameraException.java
rc/com/android/camera/one/OneCameraManager.java
|
97339c1bf93e2e6caf24770f2982a4efc7712428 |
07-Oct-2014 |
Puneet Lall <puneetl@google.com> |
am b2f15652: Merge "More lockscreen tuning" into ub-camera-glacier * commit 'b2f156527da437c1c4901c03bd004eb49eae23f6': More lockscreen tuning
|
b2f156527da437c1c4901c03bd004eb49eae23f6 |
07-Oct-2014 |
Puneet Lall <puneetl@google.com> |
Merge "More lockscreen tuning" into ub-camera-glacier
|
7ac13f5f3644c8de53ebd625f195d757166bf9c9 |
07-Oct-2014 |
Puneet Lall <puneetl@google.com> |
More lockscreen tuning Delay all onResume calls since we cannot always determine if we will be immediately paused due to a lockscreen start. Bug: 16035858 Change-Id: I96928814708eb8026bea8d0087341fda4b04bcbc
rc/com/android/camera/util/QuickActivity.java
|
d5e92998ad6441cf2a02821f8d14aec1ca2e5359 |
07-Oct-2014 |
Spike Sprague <spikuru@google.com> |
am c9a33037: Merge "adjust margin on TextViews and ImageViews in onboarding and tutorial screens" into ub-camera-glacier * commit 'c9a3303761d72edd579406bdf6b6a1f29a16a8bc': adjust margin on TextViews and ImageViews in onboarding and tutorial screens
|
c9a3303761d72edd579406bdf6b6a1f29a16a8bc |
07-Oct-2014 |
Spike Sprague <spikuru@google.com> |
Merge "adjust margin on TextViews and ImageViews in onboarding and tutorial screens" into ub-camera-glacier
|
48e32cdd8d75e8d2bf2500ae32e8d9af1039ffe7 |
04-Oct-2014 |
Spike Sprague <spikuru@google.com> |
adjust margin on TextViews and ImageViews in onboarding and tutorial screens bug: 17654418 Change-Id: I10633495ae04fd00ac97c055094a6097f5f7c0a0
es/layout-land/aspect_ratio_dialog_content.xml
es/layout-land/location_dialog_content.xml
es/layout-port/aspect_ratio_dialog_content.xml
es/layout-port/location_dialog_content.xml
|
00f555e611f0ef082e7ffa0c9ae1b958126dde98 |
07-Oct-2014 |
Puneet Lall <puneetl@google.com> |
am 3e236cc8: Lockscreen workaround tuning * commit '3e236cc8e33be40e434e73f7777bd81446277512': Lockscreen workaround tuning
|
3e236cc8e33be40e434e73f7777bd81446277512 |
07-Oct-2014 |
Puneet Lall <puneetl@google.com> |
Lockscreen workaround tuning * Remove delay of onStartTasks. This fixes b/17868175, and appears to result in ~50ms improvements to cold starts from the lockscreen and warm starts from the secure lockscreen. * Disabled double-onResume() workaround for non-secure lockscreen launches since this no longer happens when singleTask is enabled. * Reduced the delay for the double-onResume() workaround by eliminating the delay on the second call to onResume() Bug:17868175 Bug:16035858 Change-Id: I7f7611901133e429def9a03d4009e1a99caaabd0
rc/com/android/camera/util/QuickActivity.java
|
604984a518f693b95ef3520104c0c8ae3fbb0bd6 |
07-Oct-2014 |
Spike Sprague <spikuru@google.com> |
am 0dd0d5ef: Merge "disable all user interactions (including mode switching) on SD Card errors" into ub-camera-glacier * commit '0dd0d5ef549b489d7711d60ea1988834313851a5': disable all user interactions (including mode switching) on SD Card errors
|
0dd0d5ef549b489d7711d60ea1988834313851a5 |
07-Oct-2014 |
Spike Sprague <spikuru@google.com> |
Merge "disable all user interactions (including mode switching) on SD Card errors" into ub-camera-glacier
|
d2d8b711c14ee47f6f4ea16cb9fe27128462ad5b |
02-Oct-2014 |
Spike Sprague <spikuru@google.com> |
disable all user interactions (including mode switching) on SD Card errors bug: 15841887 Change-Id: I8e7e92a884dda54d9b8385b29d9ef4b7bb7fbd14
es/layout-land/on_screen_hint.xml
es/layout-port/on_screen_hint.xml
es/layout/camera.xml
es/values/dimens.xml
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/OnScreenHint.java
rc/com/android/camera/app/CameraAppUI.java
|
ae8402676c154b77e4a01d070fdd12b605e64759 |
07-Oct-2014 |
Spike Sprague <spikuru@google.com> |
am 97563a79: color changes for modes, onboarding screens, and tutorial screens * commit '97563a7926f87ac350bff7f644d43209fe874185': color changes for modes, onboarding screens, and tutorial screens
|
97563a7926f87ac350bff7f644d43209fe874185 |
03-Oct-2014 |
Spike Sprague <spikuru@google.com> |
color changes for modes, onboarding screens, and tutorial screens bug: 17785834 Change-Id: Idaf26517399a07471f2b6a98fdb9629baf41afcf
es/drawable-hdpi/aspect_ratio_16x9_selected.jpg
es/drawable-hdpi/aspect_ratio_16x9_selected.png
es/drawable-hdpi/aspect_ratio_16x9_unselected.jpg
es/drawable-hdpi/aspect_ratio_16x9_unselected.png
es/drawable-hdpi/aspect_ratio_4x3_selected.jpg
es/drawable-hdpi/aspect_ratio_4x3_selected.png
es/drawable-hdpi/aspect_ratio_4x3_unselected.jpg
es/drawable-hdpi/aspect_ratio_4x3_unselected.png
es/drawable-hdpi/geo_opt_in_graphic.jpg
es/drawable-hdpi/geo_opt_in_graphic.png
es/drawable-mdpi/aspect_ratio_16x9_selected.jpg
es/drawable-mdpi/aspect_ratio_16x9_selected.png
es/drawable-mdpi/aspect_ratio_16x9_unselected.jpg
es/drawable-mdpi/aspect_ratio_16x9_unselected.png
es/drawable-mdpi/aspect_ratio_4x3_selected.jpg
es/drawable-mdpi/aspect_ratio_4x3_selected.png
es/drawable-mdpi/aspect_ratio_4x3_unselected.jpg
es/drawable-mdpi/aspect_ratio_4x3_unselected.png
es/drawable-mdpi/geo_opt_in_graphic.jpg
es/drawable-mdpi/geo_opt_in_graphic.png
es/drawable-xhdpi/aspect_ratio_16x9_selected.jpg
es/drawable-xhdpi/aspect_ratio_16x9_selected.png
es/drawable-xhdpi/aspect_ratio_16x9_unselected.jpg
es/drawable-xhdpi/aspect_ratio_16x9_unselected.png
es/drawable-xhdpi/aspect_ratio_4x3_selected.jpg
es/drawable-xhdpi/aspect_ratio_4x3_selected.png
es/drawable-xhdpi/aspect_ratio_4x3_unselected.jpg
es/drawable-xhdpi/aspect_ratio_4x3_unselected.png
es/drawable-xhdpi/geo_opt_in_graphic.jpg
es/drawable-xhdpi/geo_opt_in_graphic.png
es/drawable-xxhdpi/aspect_ratio_16x9_selected.jpg
es/drawable-xxhdpi/aspect_ratio_16x9_selected.png
es/drawable-xxhdpi/aspect_ratio_16x9_unselected.jpg
es/drawable-xxhdpi/aspect_ratio_16x9_unselected.png
es/drawable-xxhdpi/aspect_ratio_4x3_selected.jpg
es/drawable-xxhdpi/aspect_ratio_4x3_selected.png
es/drawable-xxhdpi/aspect_ratio_4x3_unselected.jpg
es/drawable-xxhdpi/aspect_ratio_4x3_unselected.png
es/drawable-xxhdpi/geo_opt_in_graphic.jpg
es/drawable-xxhdpi/geo_opt_in_graphic.png
es/drawable-xxxhdpi/aspect_ratio_16x9_selected.jpg
es/drawable-xxxhdpi/aspect_ratio_16x9_selected.png
es/drawable-xxxhdpi/aspect_ratio_16x9_unselected.jpg
es/drawable-xxxhdpi/aspect_ratio_16x9_unselected.png
es/drawable-xxxhdpi/aspect_ratio_4x3_selected.jpg
es/drawable-xxxhdpi/aspect_ratio_4x3_selected.png
es/drawable-xxxhdpi/aspect_ratio_4x3_unselected.jpg
es/drawable-xxxhdpi/aspect_ratio_4x3_unselected.png
es/drawable-xxxhdpi/geo_opt_in_graphic.jpg
es/drawable-xxxhdpi/geo_opt_in_graphic.png
es/values-v21/styles.xml
es/values/colors.xml
es/values/styles.xml
|
e85660d0cdf294364d38e55dca53729f3e5a6e0f |
07-Oct-2014 |
Alan Newberger <alann@google.com> |
am 11c307b2: am 017050a5: am d014ce87: am 49123263: am 7ba23fed: Fix preference copy migration and incorrect HDR+ sticky bit * commit '11c307b29af21336e8d4367e154c346c4b130ef6': Fix preference copy migration and incorrect HDR+ sticky bit
|
baa56fd8d1d45c54ede2f4e06552d3b76d0e6f85 |
07-Oct-2014 |
Spike Sprague <spikuru@google.com> |
am 39fe5d96: Merge "implement proper mode color for cancel button" into ub-camera-glacier * commit '39fe5d96cc0787f0ea3f8eb0b18108ef2abd3be6': implement proper mode color for cancel button
|
39fe5d96cc0787f0ea3f8eb0b18108ef2abd3be6 |
07-Oct-2014 |
Spike Sprague <spikuru@google.com> |
Merge "implement proper mode color for cancel button" into ub-camera-glacier
|
11c307b29af21336e8d4367e154c346c4b130ef6 |
07-Oct-2014 |
Alan Newberger <alann@google.com> |
am 017050a5: am d014ce87: am 49123263: am 7ba23fed: Fix preference copy migration and incorrect HDR+ sticky bit * commit '017050a539676b08da5df0e478d706b04ff081e2': Fix preference copy migration and incorrect HDR+ sticky bit
|
017050a539676b08da5df0e478d706b04ff081e2 |
07-Oct-2014 |
Alan Newberger <alann@google.com> |
am d014ce87: am 49123263: am 7ba23fed: Fix preference copy migration and incorrect HDR+ sticky bit * commit 'd014ce874af7d21e527213d65070af17905ecf36': Fix preference copy migration and incorrect HDR+ sticky bit
|
2e1e7dc6d597d2632f45ef0851202dcd223ea3ac |
07-Oct-2014 |
Alan Newberger <alann@google.com> |
am dd897b39: am ca29a477: am f4c28525: am 0424d264: am 0ac0b733: Merge "Fix incorrect key translation in Settings refactor" into lmp-dev * commit 'dd897b39cd8562b3dfbb526736a1dcdab49ddc75': Fix incorrect key translation in Settings refactor
|
d014ce874af7d21e527213d65070af17905ecf36 |
07-Oct-2014 |
Alan Newberger <alann@google.com> |
am 49123263: am 7ba23fed: Fix preference copy migration and incorrect HDR+ sticky bit * commit '4912326305fbd05fe7ceff82aa2d2ecbd9f3127a': Fix preference copy migration and incorrect HDR+ sticky bit
|
dd897b39cd8562b3dfbb526736a1dcdab49ddc75 |
07-Oct-2014 |
Alan Newberger <alann@google.com> |
am ca29a477: am f4c28525: am 0424d264: am 0ac0b733: Merge "Fix incorrect key translation in Settings refactor" into lmp-dev * commit 'ca29a477126fb0c849155cce3c998f8c4f44fe4c': Fix incorrect key translation in Settings refactor
|
ca29a477126fb0c849155cce3c998f8c4f44fe4c |
07-Oct-2014 |
Alan Newberger <alann@google.com> |
am f4c28525: am 0424d264: am 0ac0b733: Merge "Fix incorrect key translation in Settings refactor" into lmp-dev * commit 'f4c28525f56c34d0659d6b0657fc15289814905d': Fix incorrect key translation in Settings refactor
|
4912326305fbd05fe7ceff82aa2d2ecbd9f3127a |
07-Oct-2014 |
Alan Newberger <alann@google.com> |
am 7ba23fed: Fix preference copy migration and incorrect HDR+ sticky bit * commit '7ba23fed935fa796c9c76b16c9bae79bf3f8b969': Fix preference copy migration and incorrect HDR+ sticky bit
|
f4c28525f56c34d0659d6b0657fc15289814905d |
07-Oct-2014 |
Alan Newberger <alann@google.com> |
am 0424d264: am 0ac0b733: Merge "Fix incorrect key translation in Settings refactor" into lmp-dev * commit '0424d26413389555335ac941de632a1afa1485b7': Fix incorrect key translation in Settings refactor
|
4828ce4cafbc0f56ca8add88938e7094559d8765 |
07-Oct-2014 |
Alan Newberger <alann@google.com> |
am 7ba23fed: Fix preference copy migration and incorrect HDR+ sticky bit * commit '7ba23fed935fa796c9c76b16c9bae79bf3f8b969': Fix preference copy migration and incorrect HDR+ sticky bit
|
db36c55942b84a6ed09a779ea0340f243be2d081 |
07-Oct-2014 |
Sascha Haeberling <haeberling@google.com> |
am 2dcf912d: Merge "Make Camera V2 creation more robust agains failures." into ub-camera-glacier * commit '2dcf912d17f2ed7197c783d1273ff6200709e6d3': Make Camera V2 creation more robust agains failures.
|
2dcf912d17f2ed7197c783d1273ff6200709e6d3 |
07-Oct-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Make Camera V2 creation more robust agains failures." into ub-camera-glacier
|
9929d4d47d602c4a32bf75f5c1eef5625298a5e3 |
07-Oct-2014 |
Andy Huibers <andyhuibers@google.com> |
am 877c2b65: Unload timer sounds on pause in PhotoModule; release SoundPLayer on destroy. * commit '877c2b65415ad43eb424f8a4a27bbeee7771d5bf': Unload timer sounds on pause in PhotoModule; release SoundPLayer on destroy.
|
0424d26413389555335ac941de632a1afa1485b7 |
07-Oct-2014 |
Alan Newberger <alann@google.com> |
am 0ac0b733: Merge "Fix incorrect key translation in Settings refactor" into lmp-dev * commit '0ac0b733d510fc17d072c61055c0e2ad446689ff': Fix incorrect key translation in Settings refactor
|
d47602140064760f5a540bab7335664930b771e3 |
07-Oct-2014 |
Alan Newberger <alann@google.com> |
am 0ac0b733: Merge "Fix incorrect key translation in Settings refactor" into lmp-dev * commit '0ac0b733d510fc17d072c61055c0e2ad446689ff': Fix incorrect key translation in Settings refactor
|
877c2b65415ad43eb424f8a4a27bbeee7771d5bf |
04-Oct-2014 |
Andy Huibers <andyhuibers@google.com> |
Unload timer sounds on pause in PhotoModule; release SoundPLayer on destroy. Bug: 17740679 Change-Id: Ia15749971f45f6579a19c379ee95c83c9ce20ccc
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/PhotoModule.java
|
7ba23fed935fa796c9c76b16c9bae79bf3f8b969 |
06-Oct-2014 |
Alan Newberger <alann@google.com> |
Fix preference copy migration and incorrect HDR+ sticky bit A sticky bit upgrader particularly for HDR+ was looking in globals but was actually a module setting. The copy migrator was not properly handling booleans! Modified the copy migrator to properly handle supported types and removed the custom incorrect upgrader. Bug: 17875895 Change-Id: Id36abc429d12a77c5462e5c49ef7786e3d092f2c (cherry picked from commit 90672aa08379e598426c12b529a86afd4b61011e)
rc/com/android/camera/settings/AppUpgrader.java
rc/com/android/camera/settings/SettingsManager.java
|
0ac0b733d510fc17d072c61055c0e2ad446689ff |
06-Oct-2014 |
Alan Newberger <alann@google.com> |
Merge "Fix incorrect key translation in Settings refactor" into lmp-dev
|
0f56c13c06521f091a1222eeafbba5e4a6cf7b41 |
25-Sep-2014 |
Jiawen Chen <jiawen@google.com> |
Tweaked constants for Gcam. Bug: 17629128 Bug: 17550818 - In HDR+ mode only, change tap-to-expose/focus rectangle to 12% of the viewfinder - works much better and matches final output. - Changed post-shot return-to-continuous-AF constant to 1 second (3 seconds was too long). Submit together with ag/554414. Change-Id: I56afb19e4378dbfa25f38376b05293fdb3908d47
rc/com/android/camera/one/Settings3A.java
rc/com/android/camera/one/v2/AutoFocusHelper.java
|
61d53fb5ddbcd77b19311cac820071ce3732ac17 |
06-Oct-2014 |
Alan Newberger <alann@google.com> |
am 5381549f: Re-run settings files migrations * commit '5381549fe58cd3c5a28dc18e2416c37d3c2d300b': Re-run settings files migrations
|
5381549fe58cd3c5a28dc18e2416c37d3c2d300b |
06-Oct-2014 |
Alan Newberger <alann@google.com> |
Re-run settings files migrations Increment version number for upgrade and re-run copying. This will be a no-op for a first time glacier upgrader, copying runs in the same sequence for this case. For alpha users who hit crashes, this will re-run the copy, potentially overwriting some values but ensuring all values are valid. Tested both N4 and N5 upgrade scenarios that had previously seen issues, this addresses issues without the need to clear data. Bug: 17875895 Change-Id: I37c469c1b03151d03ee0d32ce0ba62983af32a36
rc/com/android/camera/settings/AppUpgrader.java
|
46863d94926686af593571882a22e41e8edd96ec |
06-Oct-2014 |
Sascha Haeberling <haeberling@google.com> |
Make Camera V2 creation more robust agains failures. Bug: 17878708 Change-Id: I9e64f89a1b3eb56e7f3afc774d8823a7666d8208
rc/com/android/camera/one/OneCameraManager.java
|
1a814a409b982bed5288c1920630c311b73fbb3f |
06-Oct-2014 |
Alan Newberger <alann@google.com> |
am 90672aa0: Fix preference copy migration and incorrect HDR+ sticky bit * commit '90672aa08379e598426c12b529a86afd4b61011e': Fix preference copy migration and incorrect HDR+ sticky bit
|
90672aa08379e598426c12b529a86afd4b61011e |
06-Oct-2014 |
Alan Newberger <alann@google.com> |
Fix preference copy migration and incorrect HDR+ sticky bit A sticky bit upgrader particularly for HDR+ was looking in globals but was actually a module setting. The copy migrator was not properly handling booleans! Modified the copy migrator to properly handle supported types and removed the custom incorrect upgrader. Bug: 17875895 Change-Id: Id36abc429d12a77c5462e5c49ef7786e3d092f2c
rc/com/android/camera/settings/AppUpgrader.java
rc/com/android/camera/settings/SettingsManager.java
|
455a41fa9bd97b9f3b75a36dad6c307d74e58572 |
06-Oct-2014 |
Geoff Mendal <mendal@google.com> |
Import translations. DO NOT MERGE Change-Id: I65c06993baa5710a7d559820a4c3fa3fb36c77a1 Auto-generated-cl: translation import
es/values-km-rKH/strings.xml
es/values-my-rMM/strings.xml
|
399fb3f12168348de9d054de047e20c82c8e01e5 |
05-Oct-2014 |
Alan Newberger <alann@google.com> |
am 4b80f1d0: am 2101ab4b: am b1a810b2: am c6dfd609: am d30fdee3: Merge "Trap CameraAgentFactory RTEs during recycle" into lmp-dev * commit '4b80f1d03532f629f934618b659fd865da8ebd14': Trap CameraAgentFactory RTEs during recycle
|
7fcfd96603af4aed76040d3e2f520da3809bc977 |
05-Oct-2014 |
Alan Newberger <alann@google.com> |
am 8989fae6: am 450cef14: am ead83e3e: am 57177a77: am b0be8f53: Merge "Trap camera close exceptions on pause" into lmp-dev * commit '8989fae6bf5e7a7aa67986d13d2c78368f01e483': Trap camera close exceptions on pause
|
4b80f1d03532f629f934618b659fd865da8ebd14 |
05-Oct-2014 |
Alan Newberger <alann@google.com> |
am 2101ab4b: am b1a810b2: am c6dfd609: am d30fdee3: Merge "Trap CameraAgentFactory RTEs during recycle" into lmp-dev * commit '2101ab4b214a2a92ee32ce42d799192e46e71ea4': Trap CameraAgentFactory RTEs during recycle
|
8989fae6bf5e7a7aa67986d13d2c78368f01e483 |
05-Oct-2014 |
Alan Newberger <alann@google.com> |
am 450cef14: am ead83e3e: am 57177a77: am b0be8f53: Merge "Trap camera close exceptions on pause" into lmp-dev * commit '450cef14657b876fa30d9c31cf35e1ce80611cde': Trap camera close exceptions on pause
|
2101ab4b214a2a92ee32ce42d799192e46e71ea4 |
05-Oct-2014 |
Alan Newberger <alann@google.com> |
am b1a810b2: am c6dfd609: am d30fdee3: Merge "Trap CameraAgentFactory RTEs during recycle" into lmp-dev * commit 'b1a810b21391ff37db16e08f705bb968142ac146': Trap CameraAgentFactory RTEs during recycle
|
450cef14657b876fa30d9c31cf35e1ce80611cde |
05-Oct-2014 |
Alan Newberger <alann@google.com> |
am ead83e3e: am 57177a77: am b0be8f53: Merge "Trap camera close exceptions on pause" into lmp-dev * commit 'ead83e3eeb6c28944afe59594a90a99c75bf2daf': Trap camera close exceptions on pause
|
b1a810b21391ff37db16e08f705bb968142ac146 |
05-Oct-2014 |
Alan Newberger <alann@google.com> |
am c6dfd609: am d30fdee3: Merge "Trap CameraAgentFactory RTEs during recycle" into lmp-dev * commit 'c6dfd6093850f93cd54987c6ec3613a80b2bf641': Trap CameraAgentFactory RTEs during recycle
|
ead83e3eeb6c28944afe59594a90a99c75bf2daf |
05-Oct-2014 |
Alan Newberger <alann@google.com> |
am 57177a77: am b0be8f53: Merge "Trap camera close exceptions on pause" into lmp-dev * commit '57177a77c9c872779ef93332f53958c82634381d': Trap camera close exceptions on pause
|
c6dfd6093850f93cd54987c6ec3613a80b2bf641 |
05-Oct-2014 |
Alan Newberger <alann@google.com> |
am d30fdee3: Merge "Trap CameraAgentFactory RTEs during recycle" into lmp-dev * commit 'd30fdee360db38e93e4639bd1c28049d0b6b09e0': Trap CameraAgentFactory RTEs during recycle
|
57177a77c9c872779ef93332f53958c82634381d |
05-Oct-2014 |
Alan Newberger <alann@google.com> |
am b0be8f53: Merge "Trap camera close exceptions on pause" into lmp-dev * commit 'b0be8f5321605380110ca03a3ae6880b042fe187': Trap camera close exceptions on pause
|
eaed81862f73ff88ef215779efcbfbaf6782cf0c |
05-Oct-2014 |
Alan Newberger <alann@google.com> |
am d30fdee3: Merge "Trap CameraAgentFactory RTEs during recycle" into lmp-dev * commit 'd30fdee360db38e93e4639bd1c28049d0b6b09e0': Trap CameraAgentFactory RTEs during recycle
|
6ac0378ffbc78c42c3fb950c663c44d70e3bfdfc |
05-Oct-2014 |
Alan Newberger <alann@google.com> |
am b0be8f53: Merge "Trap camera close exceptions on pause" into lmp-dev * commit 'b0be8f5321605380110ca03a3ae6880b042fe187': Trap camera close exceptions on pause
|
d30fdee360db38e93e4639bd1c28049d0b6b09e0 |
05-Oct-2014 |
Alan Newberger <alann@google.com> |
Merge "Trap CameraAgentFactory RTEs during recycle" into lmp-dev
|
b0be8f5321605380110ca03a3ae6880b042fe187 |
05-Oct-2014 |
Alan Newberger <alann@google.com> |
Merge "Trap camera close exceptions on pause" into lmp-dev
|
bc06654bcc6581745aafbcd224c98d3c8daf0d82 |
05-Oct-2014 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE"
|
337a652628fa355f7e8a6f165c17a7996b283f28 |
05-Oct-2014 |
Alan Newberger <alann@google.com> |
am 555b5182: am f1d421a6: am 833c7cbe: am ce06a319: am 0021c301: Merge "Avoid porting null keys when copying preferences into new system" into lmp-dev * commit '555b51829c4e801b8b7ac3764cbd316106b513cf': Avoid porting null keys when copying preferences into new system
|
15642b3aa33c154adce2381c873557d072f2f35a |
05-Oct-2014 |
Alan Newberger <alann@google.com> |
am 5d3a2795: am 82ee8abb: am cea8512a: am d0590b34: am a9ed2418: Only set preview size before starting preview * commit '5d3a2795bb47b6071d7536f98ac8ba223a9002d0': Only set preview size before starting preview
|
555b51829c4e801b8b7ac3764cbd316106b513cf |
05-Oct-2014 |
Alan Newberger <alann@google.com> |
am f1d421a6: am 833c7cbe: am ce06a319: am 0021c301: Merge "Avoid porting null keys when copying preferences into new system" into lmp-dev * commit 'f1d421a6e2d319068c74b983954e0a57951b1c07': Avoid porting null keys when copying preferences into new system
|
5d3a2795bb47b6071d7536f98ac8ba223a9002d0 |
05-Oct-2014 |
Alan Newberger <alann@google.com> |
am 82ee8abb: am cea8512a: am d0590b34: am a9ed2418: Only set preview size before starting preview * commit '82ee8abb56494966d2bf03c064ec1c2c05dfa5e1': Only set preview size before starting preview
|
f1d421a6e2d319068c74b983954e0a57951b1c07 |
05-Oct-2014 |
Alan Newberger <alann@google.com> |
am 833c7cbe: am ce06a319: am 0021c301: Merge "Avoid porting null keys when copying preferences into new system" into lmp-dev * commit '833c7cbe3aabf49d95c504e5e6503e0436225859': Avoid porting null keys when copying preferences into new system
|
82ee8abb56494966d2bf03c064ec1c2c05dfa5e1 |
05-Oct-2014 |
Alan Newberger <alann@google.com> |
am cea8512a: am d0590b34: am a9ed2418: Only set preview size before starting preview * commit 'cea8512a91fb033aca5aceecc326e78658054fef': Only set preview size before starting preview
|
833c7cbe3aabf49d95c504e5e6503e0436225859 |
05-Oct-2014 |
Alan Newberger <alann@google.com> |
am ce06a319: am 0021c301: Merge "Avoid porting null keys when copying preferences into new system" into lmp-dev * commit 'ce06a31953255060dded6a60acaa32f1dd203751': Avoid porting null keys when copying preferences into new system
|
cea8512a91fb033aca5aceecc326e78658054fef |
05-Oct-2014 |
Alan Newberger <alann@google.com> |
am d0590b34: am a9ed2418: Only set preview size before starting preview * commit 'd0590b34b9ab925ece8b9473757c83e8691d4da5': Only set preview size before starting preview
|
ce06a31953255060dded6a60acaa32f1dd203751 |
05-Oct-2014 |
Alan Newberger <alann@google.com> |
am 0021c301: Merge "Avoid porting null keys when copying preferences into new system" into lmp-dev * commit '0021c30190af49119ee319af6b207643b417c6c3': Avoid porting null keys when copying preferences into new system
|
d0590b34b9ab925ece8b9473757c83e8691d4da5 |
05-Oct-2014 |
Alan Newberger <alann@google.com> |
am a9ed2418: Only set preview size before starting preview * commit 'a9ed2418a9d52d07bcbddfbb1bb144d9a0c6e8cd': Only set preview size before starting preview
|
375d5482b56df31818aa37a41dfb0951c5fb9005 |
05-Oct-2014 |
Alan Newberger <alann@google.com> |
am 0021c301: Merge "Avoid porting null keys when copying preferences into new system" into lmp-dev * commit '0021c30190af49119ee319af6b207643b417c6c3': Avoid porting null keys when copying preferences into new system
|
198f078b6a57dad83341cac8a254f24422f0cdcd |
05-Oct-2014 |
Alan Newberger <alann@google.com> |
am a9ed2418: Only set preview size before starting preview * commit 'a9ed2418a9d52d07bcbddfbb1bb144d9a0c6e8cd': Only set preview size before starting preview
|
0021c30190af49119ee319af6b207643b417c6c3 |
05-Oct-2014 |
Alan Newberger <alann@google.com> |
Merge "Avoid porting null keys when copying preferences into new system" into lmp-dev
|
bca3d518a0ffc5dbf4b5aa84be1b98136a45d050 |
05-Oct-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I283738746e427de780e609a7f8a7579b125fcbd1 Auto-generated-cl: translation import
es/values-el/strings.xml
es/values-mk-rMK/strings.xml
|
4748076136ac638e5482cbb44474f008bbf04c9e |
04-Oct-2014 |
Alan Newberger <alann@google.com> |
am 19597371: Only set preview size before starting preview * commit '19597371a18921bb03337e4fa24c28dd2d8f06ed': Only set preview size before starting preview
|
a9ed2418a9d52d07bcbddfbb1bb144d9a0c6e8cd |
04-Oct-2014 |
Alan Newberger <alann@google.com> |
Only set preview size before starting preview Remove recursive call to startPreview when updating preview size. Avoid invoking preview size parameter updates for all calls to updateCameraParametersPreference, and only adjust preview size immediately before starting preview. Also added info logging for all call paths into startPreview() to better diagnose sequence of events in logs if we still see any races or ordering issues. Bug: 17809876 Change-Id: I626c913bb154c54aaffb451c24a63c6750553a52 (cherry picked from commit 19597371a18921bb03337e4fa24c28dd2d8f06ed)
rc/com/android/camera/PhotoModule.java
|
19597371a18921bb03337e4fa24c28dd2d8f06ed |
04-Oct-2014 |
Alan Newberger <alann@google.com> |
Only set preview size before starting preview Remove recursive call to startPreview when updating preview size. Avoid invoking preview size parameter updates for all calls to updateCameraParametersPreference, and only adjust preview size immediately before starting preview. Also added info logging for all call paths into startPreview() to better diagnose sequence of events in logs if we still see any races or ordering issues. Bug: 17809876 Change-Id: I626c913bb154c54aaffb451c24a63c6750553a52
rc/com/android/camera/PhotoModule.java
|
449c6ceb78279b8a2eecba31e1731d4df45345bc |
04-Oct-2014 |
Alan Newberger <alann@google.com> |
Avoid porting null keys when copying preferences into new system Testing on Fishlake shows certain preferences are of 'null' type in shared preferences. Avoid an NPE on porting a null. From testing, this can happen with focus mode, best to just skip porting the key and let the app use a default. Bug: 17829562 Change-Id: I483cb5beb160d3fb7fc8a42aa5085531e3fccb63 (cherry picked from commit d560aabf7baef81a14e78341af81994efc1d4f17)
rc/com/android/camera/settings/AppUpgrader.java
|
46e2c9cce99e09f1593504a34734bda492ea9449 |
04-Oct-2014 |
Alan Newberger <alann@google.com> |
am 4032a773: Fix incorrect key translation in Settings refactor * commit '4032a773c4605894a2b6137590c7124ea16b7ab2': Fix incorrect key translation in Settings refactor
|
9523a81e2ec56644b994eb6345006ab4d93f74fb |
04-Oct-2014 |
Alan Newberger <alann@google.com> |
Fix incorrect key translation in Settings refactor Bug: 17832052 Change-Id: Ie3ac25a1b9b813295b2bbd6ce723669d30cdb652 (cherry picked from commit 4032a773c4605894a2b6137590c7124ea16b7ab2)
rc/com/android/camera/widget/IndicatorIconController.java
|
4032a773c4605894a2b6137590c7124ea16b7ab2 |
04-Oct-2014 |
Alan Newberger <alann@google.com> |
Fix incorrect key translation in Settings refactor Bug: 17832052 Change-Id: Ie3ac25a1b9b813295b2bbd6ce723669d30cdb652
rc/com/android/camera/widget/IndicatorIconController.java
|
5dc742580c4f1e355a443cb15291a8bf3f7bc64c |
04-Oct-2014 |
Alan Newberger <alann@google.com> |
am 6c1ef468: Merge "Avoid porting null keys when copying preferences into new system" into ub-camera-glacier * commit '6c1ef468d480520f706efe3264c5da48238f878d': Avoid porting null keys when copying preferences into new system
|
6c1ef468d480520f706efe3264c5da48238f878d |
04-Oct-2014 |
Alan Newberger <alann@google.com> |
Merge "Avoid porting null keys when copying preferences into new system" into ub-camera-glacier
|
d560aabf7baef81a14e78341af81994efc1d4f17 |
04-Oct-2014 |
Alan Newberger <alann@google.com> |
Avoid porting null keys when copying preferences into new system Testing on Fishlake shows certain preferences are of 'null' type in shared preferences. Avoid an NPE on porting a null. From testing, this can happen with focus mode, best to just skip porting the key and let the app use a default. Bug: 17829562 Change-Id: I483cb5beb160d3fb7fc8a42aa5085531e3fccb63
rc/com/android/camera/settings/AppUpgrader.java
|
346373007da08005d92b3a5778c01dcd804bd1ec |
04-Oct-2014 |
Puneet Lall <puneetl@google.com> |
am 64cb0bf0: Merge "Use singleTask to improve unsecure lockscreen startup" into ub-camera-glacier * commit '64cb0bf0e5c3efb62b34cd2871723a56f3cc7787': Use singleTask to improve unsecure lockscreen startup
|
64cb0bf0e5c3efb62b34cd2871723a56f3cc7787 |
04-Oct-2014 |
Puneet Lall <puneetl@google.com> |
Merge "Use singleTask to improve unsecure lockscreen startup" into ub-camera-glacier
|
4de9b72f79fe256766f25497bff44cb5533b7508 |
26-Sep-2014 |
Puneet Lall <puneetl@google.com> |
Use singleTask to improve unsecure lockscreen startup This enables warm-starts from the lockscreen by reusing the same activity if possible. Bug: 16035858 Change-Id: I4b1ce0c290e209a5098e3f3e71509e0ca86e1845
ndroidManifest.xml
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/CaptureModule.java
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/util/QuickActivity.java
|
3d31b167f0c2c00f530ee7698fe41ee6363dd573 |
03-Oct-2014 |
Alan Newberger <alann@google.com> |
am 365ef4ca: Suppress \'help feedback\' message pre-L in secure camera * commit '365ef4ca63d2c3e988cb54887f0f58a33d92aacc': Suppress 'help feedback' message pre-L in secure camera
|
365ef4ca63d2c3e988cb54887f0f58a33d92aacc |
03-Oct-2014 |
Alan Newberger <alann@google.com> |
Suppress 'help feedback' message pre-L in secure camera Becase we see issues when starting activities above lockscreen from filmstrip menu in K, disable unless we are on L. Bug: 17767821 Change-Id: Ic59defd3fef5e283b356e94a952a2b75f4e9f1d6
rc/com/android/camera/CameraActivity.java
|
2fda5303b73e01ecc976ad66db8ad40a3f2c90d5 |
03-Oct-2014 |
Andy Huibers <andyhuibers@google.com> |
am edb2c4bb: Merge "Add zoom value and timer duration to capture parameters, for logging." into ub-camera-glacier * commit 'edb2c4bb2acbc0dcfbb32ef9c14cdede37868662': Add zoom value and timer duration to capture parameters, for logging.
|
edb2c4bb2acbc0dcfbb32ef9c14cdede37868662 |
03-Oct-2014 |
Andy Huibers <andyhuibers@google.com> |
Merge "Add zoom value and timer duration to capture parameters, for logging." into ub-camera-glacier
|
30036280b41db7cc09e62144fa6acb94b6767aa7 |
03-Oct-2014 |
Puneet Lall <puneetl@google.com> |
am 42c6acb6: Merge "Close dangling camera proxy" into ub-camera-glacier * commit '42c6acb68103692ce4142d1b013dfced203c2271': Close dangling camera proxy
|
42c6acb68103692ce4142d1b013dfced203c2271 |
03-Oct-2014 |
Puneet Lall <puneetl@google.com> |
Merge "Close dangling camera proxy" into ub-camera-glacier
|
626e4272456e9478b59b503d6fbd56c8339e0cad |
03-Oct-2014 |
Puneet Lall <puneetl@google.com> |
Close dangling camera proxy Bug: 17677971 Change-Id: I2cf2df7a12a44b3f9f33d0d9eac479c5281da356
rc/com/android/camera/app/CameraController.java
|
7a02c1146cd465aa89e4f7249d60bf52ac596dc5 |
02-Oct-2014 |
Andy Huibers <andyhuibers@google.com> |
Add zoom value and timer duration to capture parameters, for logging. Bug: 17204955 Change-Id: I13e087a8e87c9722b83b83d90af491966ff30c9e
rc/com/android/camera/CaptureModule.java
rc/com/android/camera/one/OneCamera.java
|
bfec41e5a5b57715e91ca273d3d1bde65bbcc154 |
02-Oct-2014 |
Spike Sprague <spikuru@google.com> |
implement proper mode color for cancel button bug: 17780517 Change-Id: I522fb223b4aa78d1acd8f18ebf20dbfe20ea8c99
rc/com/android/camera/ui/BottomBar.java
|
cfa5fbf08303fe7edf08ac0fe5d678d6c55419d0 |
02-Oct-2014 |
Alan Newberger <alann@google.com> |
am 4d0fe41c: Trap CameraAgentFactory RTEs during recycle * commit '4d0fe41c92819ac4c70b5d0e75ec544be6cdfbb1': Trap CameraAgentFactory RTEs during recycle
|
3200ab3acf775fa4651c90e64e8d6ad5ea8dd2e0 |
02-Oct-2014 |
Alan Newberger <alann@google.com> |
Trap CameraAgentFactory RTEs during recycle Bug: 17759456 Change-Id: I5d6577f4175963168bb4186d70dd7cee68b5466e (cherry picked from commit 4d0fe41c92819ac4c70b5d0e75ec544be6cdfbb1)
rc/com/android/camera/CameraActivity.java
|
4d0fe41c92819ac4c70b5d0e75ec544be6cdfbb1 |
02-Oct-2014 |
Alan Newberger <alann@google.com> |
Trap CameraAgentFactory RTEs during recycle Bug: 17759456 Change-Id: I5d6577f4175963168bb4186d70dd7cee68b5466e
rc/com/android/camera/CameraActivity.java
|
23e7ad375f694c11285a7e82c7698b40749d1e78 |
02-Oct-2014 |
Alan Newberger <alann@google.com> |
am 48d4c8f1: Trap camera close exceptions on pause * commit '48d4c8f1856503d88f4e2e42fa729f2556173694': Trap camera close exceptions on pause
|
749682fa2c27556f50bf02ff79ccb35282e5e9be |
02-Oct-2014 |
Alan Newberger <alann@google.com> |
Trap camera close exceptions on pause Bug: 17759456 Change-Id: I5e5fd39829bd0ebf3f37b354ca380cf6396bef55 (cherry picked from commit 48d4c8f1856503d88f4e2e42fa729f2556173694)
rc/com/android/camera/CameraActivity.java
|
48d4c8f1856503d88f4e2e42fa729f2556173694 |
02-Oct-2014 |
Alan Newberger <alann@google.com> |
Trap camera close exceptions on pause Bug: 17759456 Change-Id: I5e5fd39829bd0ebf3f37b354ca380cf6396bef55
rc/com/android/camera/CameraActivity.java
|
35f0ea43b34d848178d04b31f3f53a62994331b6 |
02-Oct-2014 |
Neil Fuller <nfuller@google.com> |
Remove dependencies on FloatMath See frameworks/base commit 33253a4baa6279f81a73425b49dfb6abe5f5416e for details. Bug: https://code.google.com/p/android/issues/detail?id=36199 Change-Id: Iae56fa116b5e00e78b294073802d48478a2c9eda
rc/com/android/camera/crop/GeometryMathUtils.java
rc/com/android/camera/ui/PieRenderer.java
rc/com/android/camera/util/CameraUtil.java
|
08497cd6bb4479265c233a7bbf6726cb39a2fb27 |
02-Oct-2014 |
Alan Newberger <alann@google.com> |
am 8068ed74: am 9ee244aa: am 673ae4a4: am 04b6e4c0: am e1eb82bc: Use NEW_DOCUMENT vs NEW_TASK when starting Activities from Camera * commit '8068ed740fd7bd0e5318cefc8a2b5aad9a17acd2': Use NEW_DOCUMENT vs NEW_TASK when starting Activities from Camera
|
a11709e8da19bfb5f7b394b25add546a9ff4f7d4 |
02-Oct-2014 |
Alan Newberger <alann@google.com> |
am 80ea2488: am 4011ad4b: am 985efe10: am 36cb7fb8: am dae542a3: Fix error in settings key from refactor * commit '80ea2488837cc35dd8941a94afee733539400033': Fix error in settings key from refactor
|
8068ed740fd7bd0e5318cefc8a2b5aad9a17acd2 |
02-Oct-2014 |
Alan Newberger <alann@google.com> |
am 9ee244aa: am 673ae4a4: am 04b6e4c0: am e1eb82bc: Use NEW_DOCUMENT vs NEW_TASK when starting Activities from Camera * commit '9ee244aa0a1858abd554070780b82645650efe65': Use NEW_DOCUMENT vs NEW_TASK when starting Activities from Camera
|
80ea2488837cc35dd8941a94afee733539400033 |
02-Oct-2014 |
Alan Newberger <alann@google.com> |
am 4011ad4b: am 985efe10: am 36cb7fb8: am dae542a3: Fix error in settings key from refactor * commit '4011ad4bb2183c9a3d56919bd11ba552cd15016a': Fix error in settings key from refactor
|
9ee244aa0a1858abd554070780b82645650efe65 |
02-Oct-2014 |
Alan Newberger <alann@google.com> |
am 673ae4a4: am 04b6e4c0: am e1eb82bc: Use NEW_DOCUMENT vs NEW_TASK when starting Activities from Camera * commit '673ae4a4cd57d61f9558d2d45a62045e9024b2c3': Use NEW_DOCUMENT vs NEW_TASK when starting Activities from Camera
|
4011ad4bb2183c9a3d56919bd11ba552cd15016a |
02-Oct-2014 |
Alan Newberger <alann@google.com> |
am 985efe10: am 36cb7fb8: am dae542a3: Fix error in settings key from refactor * commit '985efe1003d0bf57f52cf215ba582257e8e2071f': Fix error in settings key from refactor
|
673ae4a4cd57d61f9558d2d45a62045e9024b2c3 |
02-Oct-2014 |
Alan Newberger <alann@google.com> |
am 04b6e4c0: am e1eb82bc: Use NEW_DOCUMENT vs NEW_TASK when starting Activities from Camera * commit '04b6e4c08b279b4237f294cb00912e0bb54ae284': Use NEW_DOCUMENT vs NEW_TASK when starting Activities from Camera
|
c17b9383ba663529c126207c7fdd96bbf2ec618f |
02-Oct-2014 |
Alan Newberger <alann@google.com> |
am e1eb82bc: Use NEW_DOCUMENT vs NEW_TASK when starting Activities from Camera * commit 'e1eb82bcd8050608ec3bda7ddcb7c0de961d93bd': Use NEW_DOCUMENT vs NEW_TASK when starting Activities from Camera
|
04b6e4c08b279b4237f294cb00912e0bb54ae284 |
02-Oct-2014 |
Alan Newberger <alann@google.com> |
am e1eb82bc: Use NEW_DOCUMENT vs NEW_TASK when starting Activities from Camera * commit 'e1eb82bcd8050608ec3bda7ddcb7c0de961d93bd': Use NEW_DOCUMENT vs NEW_TASK when starting Activities from Camera
|
985efe1003d0bf57f52cf215ba582257e8e2071f |
02-Oct-2014 |
Alan Newberger <alann@google.com> |
am 36cb7fb8: am dae542a3: Fix error in settings key from refactor * commit '36cb7fb8b3f89a3759f0c30709eea36ac03ae8b7': Fix error in settings key from refactor
|
6e13821ab4fcc2eb27de3d838094c76d6187b8d0 |
02-Oct-2014 |
Alan Newberger <alann@google.com> |
am 437a1869: Use NEW_DOCUMENT vs NEW_TASK when starting Activities from Camera * commit '437a186929173ad576e0eac04bd5b79939816158': Use NEW_DOCUMENT vs NEW_TASK when starting Activities from Camera
|
36cb7fb8b3f89a3759f0c30709eea36ac03ae8b7 |
02-Oct-2014 |
Alan Newberger <alann@google.com> |
am dae542a3: Fix error in settings key from refactor * commit 'dae542a3c94b1663c72cb4be29d5edf1a7aa4f30': Fix error in settings key from refactor
|
2fc13a0fd476c0e427c433444486936db6fa3937 |
02-Oct-2014 |
Alan Newberger <alann@google.com> |
am dae542a3: Fix error in settings key from refactor * commit 'dae542a3c94b1663c72cb4be29d5edf1a7aa4f30': Fix error in settings key from refactor
|
e1eb82bcd8050608ec3bda7ddcb7c0de961d93bd |
02-Oct-2014 |
Alan Newberger <alann@google.com> |
Use NEW_DOCUMENT vs NEW_TASK when starting Activities from Camera To ensure items are placed in separate affinity in document mode. Bug: 17758840 Change-Id: I7ea1c9c841f3e60271307ed67e760be494835855
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/util/CameraUtil.java
|
437a186929173ad576e0eac04bd5b79939816158 |
02-Oct-2014 |
Alan Newberger <alann@google.com> |
Use NEW_DOCUMENT vs NEW_TASK when starting Activities from Camera To ensure items are placed in separate affinity in document mode. Bug: 17758840 Change-Id: I7ea1c9c841f3e60271307ed67e760be494835855
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/util/CameraUtil.java
|
eed1068945c1e07acbfd07c06ba1f47eec507b80 |
02-Oct-2014 |
Alan Newberger <alann@google.com> |
am 6d51d357: am ff91a347: am 51a625d1: am 07c463d3: am d822d1cf: Only allow one draw call pending at a time * commit '6d51d357864a4925fbfc7110364d7ed5d9b0665a': Only allow one draw call pending at a time
|
b3e1dc726e8769a26ff5aa94a88888bcb21c9b3c |
02-Oct-2014 |
Senpo Hu <senpo@google.com> |
am cf7bf23e: am c127873a: am fdd98e0f: am f0e685d9: am 2499af48: Stability: call stopPreview() before switching off video module. * commit 'cf7bf23e1c6da40817f13a8683509c9be642c756': Stability: call stopPreview() before switching off video module.
|
5fa7944781a3ac152a5429a4c3c695ec9f611af6 |
02-Oct-2014 |
Baligh Uddin <baligh@google.com> |
am 0c66df80: (-s ours) am ef7c510a: (-s ours) am 12dd2669: (-s ours) am d51f2cc7: (-s ours) am 2f727aff: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit '0c66df806701a64cfe48e3b6f6070940f1eaa2d3': Import translations. DO NOT MERGE
|
6277acbd5d6eddd37224f5d04c016b65d03e2148 |
02-Oct-2014 |
Senpo Hu <senpo@google.com> |
am 8b6fed86: am 94adfd2e: am 89206e4b: am 8838aba5: am ed0fea9b: am 2d3475ae: Fix crash in VideoModule - Method called after release() * commit '8b6fed862417b0809a0aacadce467795a9f10ea4': Fix crash in VideoModule - Method called after release()
|
6d51d357864a4925fbfc7110364d7ed5d9b0665a |
02-Oct-2014 |
Alan Newberger <alann@google.com> |
am ff91a347: am 51a625d1: am 07c463d3: am d822d1cf: Only allow one draw call pending at a time * commit 'ff91a347a81136bf1972b6357c08d5b09d5563ed': Only allow one draw call pending at a time
|
cf7bf23e1c6da40817f13a8683509c9be642c756 |
02-Oct-2014 |
Senpo Hu <senpo@google.com> |
am c127873a: am fdd98e0f: am f0e685d9: am 2499af48: Stability: call stopPreview() before switching off video module. * commit 'c127873af2d001f64e214f25402833eeb1fc6341': Stability: call stopPreview() before switching off video module.
|
0c66df806701a64cfe48e3b6f6070940f1eaa2d3 |
02-Oct-2014 |
Baligh Uddin <baligh@google.com> |
am ef7c510a: (-s ours) am 12dd2669: (-s ours) am d51f2cc7: (-s ours) am 2f727aff: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit 'ef7c510a2104992f74e1041f5fd8e030babb7699': Import translations. DO NOT MERGE
|
8b6fed862417b0809a0aacadce467795a9f10ea4 |
02-Oct-2014 |
Senpo Hu <senpo@google.com> |
am 94adfd2e: am 89206e4b: am 8838aba5: am ed0fea9b: am 2d3475ae: Fix crash in VideoModule - Method called after release() * commit '94adfd2e7b491155327d8ef6e0e0b5a8b8b57517': Fix crash in VideoModule - Method called after release()
|
ff1bfbf59b2259c6904370a146d1c0e83a99fe09 |
02-Oct-2014 |
Alan Newberger <alann@google.com> |
am d822d1cf: Only allow one draw call pending at a time * commit 'd822d1cfc893faa6f3d5b566a50c628ec83fa4e6': Only allow one draw call pending at a time
|
8d01bf7a3af6362ba186a9a7f178568014db215d |
01-Oct-2014 |
Alan Newberger <alann@google.com> |
am 5c9d7f34: Fix error in settings key from refactor * commit '5c9d7f34039ac96b3a136ccd6b16162e3b220848': Fix error in settings key from refactor
|
ff91a347a81136bf1972b6357c08d5b09d5563ed |
01-Oct-2014 |
Alan Newberger <alann@google.com> |
am 51a625d1: am 07c463d3: am d822d1cf: Only allow one draw call pending at a time * commit '51a625d1257b77c6b0d78ff548db2e70b0eb9f6f': Only allow one draw call pending at a time
|
c127873af2d001f64e214f25402833eeb1fc6341 |
01-Oct-2014 |
Senpo Hu <senpo@google.com> |
am fdd98e0f: am f0e685d9: am 2499af48: Stability: call stopPreview() before switching off video module. * commit 'fdd98e0f4b573e3bde9ad0ecbf536ac5db528fbf': Stability: call stopPreview() before switching off video module.
|
dae542a3c94b1663c72cb4be29d5edf1a7aa4f30 |
01-Oct-2014 |
Alan Newberger <alann@google.com> |
Fix error in settings key from refactor PANO_ORIENTATION indicator icon was using an incorrect key to sync state. Bug: 17752154 Change-Id: I587b2ee7eeab3758b05386540f62b79ca48299f2 (cherry picked from commit 5c9d7f34039ac96b3a136ccd6b16162e3b220848)
rc/com/android/camera/widget/IndicatorIconController.java
|
5c9d7f34039ac96b3a136ccd6b16162e3b220848 |
01-Oct-2014 |
Alan Newberger <alann@google.com> |
Fix error in settings key from refactor PANO_ORIENTATION indicator icon was using an incorrect key to sync state. Bug: 17752154 Change-Id: I587b2ee7eeab3758b05386540f62b79ca48299f2
rc/com/android/camera/widget/IndicatorIconController.java
|
51a625d1257b77c6b0d78ff548db2e70b0eb9f6f |
01-Oct-2014 |
Alan Newberger <alann@google.com> |
am 07c463d3: am d822d1cf: Only allow one draw call pending at a time * commit '07c463d36c00055b10532ab3fd54393ff4e2e3a5': Only allow one draw call pending at a time
|
fdd98e0f4b573e3bde9ad0ecbf536ac5db528fbf |
01-Oct-2014 |
Senpo Hu <senpo@google.com> |
am f0e685d9: am 2499af48: Stability: call stopPreview() before switching off video module. * commit 'f0e685d91a2736ba5fd5b43db32858bdf7a70e43': Stability: call stopPreview() before switching off video module.
|
07c463d36c00055b10532ab3fd54393ff4e2e3a5 |
01-Oct-2014 |
Alan Newberger <alann@google.com> |
am d822d1cf: Only allow one draw call pending at a time * commit 'd822d1cfc893faa6f3d5b566a50c628ec83fa4e6': Only allow one draw call pending at a time
|
f0e685d91a2736ba5fd5b43db32858bdf7a70e43 |
01-Oct-2014 |
Senpo Hu <senpo@google.com> |
am 2499af48: Stability: call stopPreview() before switching off video module. * commit '2499af485d19e9e9843f7f8ea9a566ee24e62a33': Stability: call stopPreview() before switching off video module.
|
5f7b1c8c3657f4102ff5462224bfb29b18efd076 |
01-Oct-2014 |
Alan Newberger <alann@google.com> |
am 5db8e20d: Only allow one draw call pending at a time * commit '5db8e20db77bf86eba25ec713c76da783dd98b19': Only allow one draw call pending at a time
|
d822d1cfc893faa6f3d5b566a50c628ec83fa4e6 |
30-Sep-2014 |
Alan Newberger <alann@google.com> |
Only allow one draw call pending at a time If modules call draw aggressively, there should only be one pending at a time. If we get another, just drop it, there will be a draw momentarily. Bug: 17703978 Change-Id: I60b3b9e257ae4e064287a97973b1de878ce66de1 (cherry picked from commit 5db8e20db77bf86eba25ec713c76da783dd98b19)
rc/com/android/camera/SurfaceTextureRenderer.java
|
5db8e20db77bf86eba25ec713c76da783dd98b19 |
30-Sep-2014 |
Alan Newberger <alann@google.com> |
Only allow one draw call pending at a time If modules call draw aggressively, there should only be one pending at a time. If we get another, just drop it, there will be a draw momentarily. Bug: 17703978 Change-Id: I60b3b9e257ae4e064287a97973b1de878ce66de1
rc/com/android/camera/SurfaceTextureRenderer.java
|
f748fe3e3a631bff454679b9f36377fa6f930057 |
30-Sep-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I388355a9851606cbedd257f2b6ab6094d692fc27 Auto-generated-cl: translation import
es/values-bn-rBD/strings.xml
es/values-es/strings.xml
es/values-eu-rES/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-km-rKH/strings.xml
es/values-my-rMM/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-si-rLK/strings.xml
es/values-sk/strings.xml
es/values-ta-rIN/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
|
952779b558cab573da0c2a2943da51df1abbca85 |
30-Sep-2014 |
Senpo Hu <senpo@google.com> |
am 2499af48: Stability: call stopPreview() before switching off video module. * commit '2499af485d19e9e9843f7f8ea9a566ee24e62a33': Stability: call stopPreview() before switching off video module.
|
0b079c62b13e71545cfd68246b49d9f52c4e80b0 |
30-Sep-2014 |
Senpo Hu <senpo@google.com> |
am 31d816f6: Merge "Stability: call stopPreview() before switching off video module." into ub-camera-glacier * commit '31d816f64eebfd24e662ff21f611a70b957d4859': Stability: call stopPreview() before switching off video module.
|
2499af485d19e9e9843f7f8ea9a566ee24e62a33 |
30-Sep-2014 |
Senpo Hu <senpo@google.com> |
Stability: call stopPreview() before switching off video module. If the preview is not stopped, the following camera operations posted by other modules such as "apply settings" will turn camera object in turmoil. The camera object could start throwing exception and eventually hang. Bug: 16300704 Bug: 17403384 Change-Id: Idd2360869d51b9dfc06309f8ac185a65add8d0c9 (cherry picked from commit 36e045a43d9b8949d9a219b84cf894cf21f8e98a)
rc/com/android/camera/VideoModule.java
|
31d816f64eebfd24e662ff21f611a70b957d4859 |
30-Sep-2014 |
Senpo Hu <senpo@google.com> |
Merge "Stability: call stopPreview() before switching off video module." into ub-camera-glacier
|
b150c84dec9e90f6b555c12678479a4aa8a869c7 |
30-Sep-2014 |
Spike Sprague <spikuru@google.com> |
am c19d97b3: Let VideoModule override default mode options enable/disable * commit 'c19d97b385261312399b67b538f8faa074314beb': Let VideoModule override default mode options enable/disable
|
c19d97b385261312399b67b538f8faa074314beb |
22-Sep-2014 |
Spike Sprague <spikuru@google.com> |
Let VideoModule override default mode options enable/disable bug: 17553759 Change-Id: Iadb2690d81e3efce4e84c8c49f6e684a700c247b
rc/com/android/camera/VideoModule.java
rc/com/android/camera/app/CameraAppUI.java
|
36e045a43d9b8949d9a219b84cf894cf21f8e98a |
30-Sep-2014 |
Senpo Hu <senpo@google.com> |
Stability: call stopPreview() before switching off video module. If the preview is not stopped, the following camera operations posted by other modules such as "apply settings" will turn camera object in turmoil. The camera object could start throwing exception and eventually hang. Bug: 16300704 Bug: 17403384 Change-Id: Idd2360869d51b9dfc06309f8ac185a65add8d0c9
rc/com/android/camera/VideoModule.java
|
39201eef313d305d9551483e0ce81bec6da1a756 |
30-Sep-2014 |
Puneet Lall <puneetl@google.com> |
am 7c703ced: Cleanup: Move api check to ApiHelper * commit '7c703ced0248d6a368a216e9d7699ab8e9565415': Cleanup: Move api check to ApiHelper
|
7c703ced0248d6a368a216e9d7699ab8e9565415 |
26-Sep-2014 |
Puneet Lall <puneetl@google.com> |
Cleanup: Move api check to ApiHelper Change-Id: Ifc0b080713329d09cdeaeec5ccdf88d8515e5543
rc/com/android/camera/one/OneCameraManager.java
rc/com/android/camera/util/ApiHelper.java
|
a5eaaff7c3fcdf3d57e045bc3573cc4c23e48c72 |
30-Sep-2014 |
Spike Sprague <spikuru@google.com> |
am 2d512cc6: Merge "for intent capture and pano, fix the redo/ok/cancel button sizes so touch ripples show up right." into ub-camera-glacier * commit '2d512cc688a6e46bb8b34e293e87d2f0088a1abb': for intent capture and pano, fix the redo/ok/cancel button sizes so touch ripples show up right.
|
a9c5db3a329f66315e7893ed63504d7143328950 |
30-Sep-2014 |
Spike Sprague <spikuru@google.com> |
am 5ea5dc09: Merge "tweaking peephole animation time from 350 to 500, per in-person request" into ub-camera-glacier * commit '5ea5dc090151f857ba3787e8c29d1269e3dd6da4': tweaking peephole animation time from 350 to 500, per in-person request
|
2d512cc688a6e46bb8b34e293e87d2f0088a1abb |
30-Sep-2014 |
Spike Sprague <spikuru@google.com> |
Merge "for intent capture and pano, fix the redo/ok/cancel button sizes so touch ripples show up right." into ub-camera-glacier
|
5ea5dc090151f857ba3787e8c29d1269e3dd6da4 |
30-Sep-2014 |
Spike Sprague <spikuru@google.com> |
Merge "tweaking peephole animation time from 350 to 500, per in-person request" into ub-camera-glacier
|
7dae6bb5ec44da5d7b51a4b98c45821ee5e2860e |
30-Sep-2014 |
Spike Sprague <spikuru@google.com> |
tweaking peephole animation time from 350 to 500, per in-person request Change-Id: I13cd63b00217f8beb079a3ea219d878971756c67
rc/com/android/camera/ui/ModeListView.java
|
bcf7285021aad0891099dfa07d9ded198b7274be |
30-Sep-2014 |
Alan Newberger <alann@google.com> |
am 535eed78: Merge "Avoid building filmstrip item data if activity is destroyed" into ub-camera-glacier * commit '535eed78310ff5774f544c8c8bb584585304e7ec': Avoid building filmstrip item data if activity is destroyed
|
880a4be9a4007f124b5171c54eba7504ed3f945e |
30-Sep-2014 |
Spike Sprague <spikuru@google.com> |
am 56afe395: Merge "new share icon" into ub-camera-glacier * commit '56afe3958ddc1b0880c7f4cbb8604caca0a32469': new share icon
|
535eed78310ff5774f544c8c8bb584585304e7ec |
30-Sep-2014 |
Alan Newberger <alann@google.com> |
Merge "Avoid building filmstrip item data if activity is destroyed" into ub-camera-glacier
|
56afe3958ddc1b0880c7f4cbb8604caca0a32469 |
29-Sep-2014 |
Spike Sprague <spikuru@google.com> |
Merge "new share icon" into ub-camera-glacier
|
281624c713fb29d4be690fc980d2001efcf20daf |
25-Sep-2014 |
Alan Newberger <alann@google.com> |
Avoid building filmstrip item data if activity is destroyed Multiple AsyncTasks result in Glide execution after CameraActivity is destroyed, via FilmstripView.buildItemData. Return early if destroyed so that no Glide tasks are initiated and no views are added to the hierarchy. Bug: 17527470 Bug: 17339652 Change-Id: I7d24197791df812dc012d8b4fadff9246b289b81
rc/com/android/camera/widget/FilmstripView.java
|
b34fe6bea0dfee2ee89c6730e6f2bb6e3b4e7cce |
29-Sep-2014 |
Alan Newberger <alann@google.com> |
am a530b688: Merge "WIP: Add recursive thumbnail call to LocalMediaData" into ub-camera-glacier * commit 'a530b688ce6e5b61e7cea8dc500fd2642ccdb82c': WIP: Add recursive thumbnail call to LocalMediaData
|
ef7c510a2104992f74e1041f5fd8e030babb7699 |
29-Sep-2014 |
Baligh Uddin <baligh@google.com> |
am 12dd2669: (-s ours) am d51f2cc7: (-s ours) am 2f727aff: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit '12dd2669561a70c4dd97572ba3e065b571060b00': Import translations. DO NOT MERGE
|
a530b688ce6e5b61e7cea8dc500fd2642ccdb82c |
29-Sep-2014 |
Alan Newberger <alann@google.com> |
Merge "WIP: Add recursive thumbnail call to LocalMediaData" into ub-camera-glacier
|
12dd2669561a70c4dd97572ba3e065b571060b00 |
29-Sep-2014 |
Baligh Uddin <baligh@google.com> |
am d51f2cc7: (-s ours) am 2f727aff: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit 'd51f2cc7176f29e1b7b950a2ef2ed533d1fba72f': Import translations. DO NOT MERGE
|
94adfd2e7b491155327d8ef6e0e0b5a8b8b57517 |
29-Sep-2014 |
Senpo Hu <senpo@google.com> |
am 89206e4b: am 8838aba5: am ed0fea9b: am 2d3475ae: Fix crash in VideoModule - Method called after release() * commit '89206e4b26e8c0e4ded0474e019568c9b331c5e9': Fix crash in VideoModule - Method called after release()
|
d51f2cc7176f29e1b7b950a2ef2ed533d1fba72f |
29-Sep-2014 |
Baligh Uddin <baligh@google.com> |
am 2f727aff: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit '2f727affa9fa62c8395f628c193c36b1ab299d81': Import translations. DO NOT MERGE
|
97750cc8eff73e2d3826739894f40950dcd2691f |
29-Sep-2014 |
Baligh Uddin <baligh@google.com> |
am 2f727aff: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit '2f727affa9fa62c8395f628c193c36b1ab299d81': Import translations. DO NOT MERGE
|
89206e4b26e8c0e4ded0474e019568c9b331c5e9 |
29-Sep-2014 |
Senpo Hu <senpo@google.com> |
am 8838aba5: am ed0fea9b: am 2d3475ae: Fix crash in VideoModule - Method called after release() * commit '8838aba5db3395a5b0fd2f85c4c8c4ce25da5a7f': Fix crash in VideoModule - Method called after release()
|
ef3c5d5877f6fdf999dd1d9ea2f552a2ab5fcb44 |
29-Sep-2014 |
Puneet Lall <puneetl@google.com> |
am bcd64fdd: am 98802754: am c109ad76: am f9d6b067: am 6014e168: am 022ce61e: Synchronize CaptureModule camera open/close operations * commit 'bcd64fddb4065a394db32b30a719a609b2c4ba80': Synchronize CaptureModule camera open/close operations
|
2c61f40e926f4e57d7f8b39ab5f28ec1ed71c4da |
29-Sep-2014 |
Spike Sprague <spikuru@google.com> |
new share icon bug: 17671676 Change-Id: I1b681efdb3129cdd532002d85ad3257cef962d92
es/drawable-hdpi/ic_share_disabled.png
es/drawable-hdpi/ic_share_normal.png
es/drawable-mdpi/ic_share_disabled.png
es/drawable-mdpi/ic_share_normal.png
es/drawable-xhdpi/ic_share_disabled.png
es/drawable-xhdpi/ic_share_normal.png
es/drawable-xxhdpi/ic_share_disabled.png
es/drawable-xxhdpi/ic_share_normal.png
es/drawable-xxxhdpi/ic_share_disabled.png
es/drawable-xxxhdpi/ic_share_normal.png
es/drawable/ic_menu_share.xml
es/drawable/ic_share.xml
es/layout/filmstrip_bottom_controls.xml
|
2f727affa9fa62c8395f628c193c36b1ab299d81 |
29-Sep-2014 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into lmp-dev
|
3d1f2cdf013f4a0651468139c6b1d045f5ab04c0 |
29-Sep-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ie18b982e8d98467e41cc4b3a26c9ac5c5a405730 Auto-generated-cl: translation import
es/values-bn-rBD/strings.xml
es/values-es/strings.xml
es/values-hi/strings.xml
es/values-my-rMM/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-si-rLK/strings.xml
es/values-sk/strings.xml
es/values-ta-rIN/strings.xml
es/values-zh-rCN/strings.xml
|
fd696d77ab1bd1e4b3dd4f3ec74744ef29f22bc3 |
29-Sep-2014 |
Senpo Hu <senpo@google.com> |
am ed0fea9b: am 2d3475ae: Fix crash in VideoModule - Method called after release() * commit 'ed0fea9b36e2f645f06e04d8ac28142333621010': Fix crash in VideoModule - Method called after release()
|
8838aba5db3395a5b0fd2f85c4c8c4ce25da5a7f |
29-Sep-2014 |
Senpo Hu <senpo@google.com> |
am ed0fea9b: am 2d3475ae: Fix crash in VideoModule - Method called after release() * commit 'ed0fea9b36e2f645f06e04d8ac28142333621010': Fix crash in VideoModule - Method called after release()
|
aa8e3eb7a1cfcfc2c3c54e475a942fdd5b5b765c |
29-Sep-2014 |
Senpo Hu <senpo@google.com> |
am 2d3475ae: Fix crash in VideoModule - Method called after release() * commit '2d3475ae1f045a2062119f352bec874cd78e9d3b': Fix crash in VideoModule - Method called after release()
|
ed0fea9b36e2f645f06e04d8ac28142333621010 |
29-Sep-2014 |
Senpo Hu <senpo@google.com> |
am 2d3475ae: Fix crash in VideoModule - Method called after release() * commit '2d3475ae1f045a2062119f352bec874cd78e9d3b': Fix crash in VideoModule - Method called after release()
|
2d3475ae1f045a2062119f352bec874cd78e9d3b |
28-Sep-2014 |
Senpo Hu <senpo@google.com> |
Fix crash in VideoModule - Method called after release() Completely eliminate the runtime exception caused by monkey. Sample stack trace: java.lang.RuntimeException: Method called after release() at android.media.MediaRecorder.setCamera(Native Method) at com.android.camera.VideoModule.initializeRecorder(VideoModule.java:1101) at com.android.camera.VideoModule.access$2000(VideoModule.java:88) at com.android.camera.VideoModule$10.onStorageUpdateDone(VideoModule.java:1320) at com.android.camera.CameraActivity$20.onPostExecute(CameraActivity.java:2014) Bug: 17313985 Change-Id: I7ecaf375c26ebd1608d7098599ab1528609287ce
rc/com/android/camera/VideoModule.java
|
bcd64fddb4065a394db32b30a719a609b2c4ba80 |
27-Sep-2014 |
Puneet Lall <puneetl@google.com> |
am 98802754: am c109ad76: am f9d6b067: am 6014e168: am 022ce61e: Synchronize CaptureModule camera open/close operations * commit '98802754fd721be3c4b67e71f4aafdc4e0cf7fe6': Synchronize CaptureModule camera open/close operations
|
98802754fd721be3c4b67e71f4aafdc4e0cf7fe6 |
27-Sep-2014 |
Puneet Lall <puneetl@google.com> |
am c109ad76: am f9d6b067: am 6014e168: am 022ce61e: Synchronize CaptureModule camera open/close operations * commit 'c109ad762ff2ff67ce042c1bf55fa0fc658ec01d': Synchronize CaptureModule camera open/close operations
|
c109ad762ff2ff67ce042c1bf55fa0fc658ec01d |
27-Sep-2014 |
Puneet Lall <puneetl@google.com> |
am f9d6b067: am 6014e168: am 022ce61e: Synchronize CaptureModule camera open/close operations * commit 'f9d6b067c5b115e08d38fc2df769012702a95ec1': Synchronize CaptureModule camera open/close operations
|
f9d6b067c5b115e08d38fc2df769012702a95ec1 |
27-Sep-2014 |
Puneet Lall <puneetl@google.com> |
am 6014e168: am 022ce61e: Synchronize CaptureModule camera open/close operations * commit '6014e1682d94b687c4525cf49e6c4b20bbb4380a': Synchronize CaptureModule camera open/close operations
|
fe297a353be6c363870f67cc84597ceecd6cef85 |
27-Sep-2014 |
Puneet Lall <puneetl@google.com> |
am 6014e168: am 022ce61e: Synchronize CaptureModule camera open/close operations * commit '6014e1682d94b687c4525cf49e6c4b20bbb4380a': Synchronize CaptureModule camera open/close operations
|
f3fed29b0f471e3c937193f954f5a26968b7f864 |
27-Sep-2014 |
Puneet Lall <puneetl@google.com> |
am 022ce61e: Synchronize CaptureModule camera open/close operations * commit '022ce61e1c4f338a79585e8656ab57990ecd32c1': Synchronize CaptureModule camera open/close operations
|
6014e1682d94b687c4525cf49e6c4b20bbb4380a |
27-Sep-2014 |
Puneet Lall <puneetl@google.com> |
am 022ce61e: Synchronize CaptureModule camera open/close operations * commit '022ce61e1c4f338a79585e8656ab57990ecd32c1': Synchronize CaptureModule camera open/close operations
|
022ce61e1c4f338a79585e8656ab57990ecd32c1 |
26-Sep-2014 |
Puneet Lall <puneetl@google.com> |
Synchronize CaptureModule camera open/close operations This fixes a race condition in which CaptureModule gets a pause() immediately after it is asked to open the camera. pause() MUST wait/block to close the camera to ensure that we can later open it (a fast open()->pause() sequence is reproducible via the lockscreen under certain cases when we get a rapid onResume()->onPause()->onResume), so this adds the necessary threading logic to wait, if necessary, for the camera to finish opening so that it can be closed. Bug: 17642065 Change-Id: Ic88bd32fc5acc2b333de367019085a8cd539c5a5
rc/com/android/camera/CaptureModule.java
rc/com/android/camera/one/OneCamera.java
rc/com/android/camera/one/OneCameraManager.java
rc/com/android/camera/one/v1/OneCameraManagerImpl.java
rc/com/android/camera/one/v2/OneCameraManagerImpl.java
|
8d5639bf7fb4d1be533ed60aa5a17271901b8fcb |
26-Sep-2014 |
Senpo Hu <senpo@google.com> |
am 93e01102: am feb07ea4: Merge "Stability: add null check for all CameraProxy obj references in VideoModule." into ub-camera-glacier * commit '93e01102a49b199a085647141739c02478268e5b': Stability: add null check for all CameraProxy obj references in VideoModule.
|
556370c333c5e522f0b3118af45440ca91d4702f |
26-Sep-2014 |
Andy Huibers <andyhuibers@google.com> |
am d3a7c5af: am ad12363e: Revert app workaround for bug 17614203 now that HAL is fixed. This reverts ag/543302. * commit 'd3a7c5af7ecd8cf6f32129e6c6936c6b487f8c24': Revert app workaround for bug 17614203 now that HAL is fixed. This reverts ag/543302.
|
b15fa3e9b88af49c97b2ea8243c894afe1a32efd |
26-Sep-2014 |
Senpo Hu <senpo@google.com> |
am 25d0ca30: am 9ce01bc6: am 4389f14a: am 900c5aa9: am 93e01102: am feb07ea4: Merge "Stability: add null check for all CameraProxy obj references in VideoModule." into ub-camera-glacier * commit '25d0ca30e42d675296b28a590af88ac92baf2280': Stability: add null check for all CameraProxy obj references in VideoModule.
|
1be5d757197e6a97e65706cf0800b2215795f961 |
26-Sep-2014 |
Andy Huibers <andyhuibers@google.com> |
am 6bd32a1d: am 5a00ce47: am 757a0873: am bbf0e352: am d3a7c5af: am ad12363e: Revert app workaround for bug 17614203 now that HAL is fixed. This reverts ag/543302. * commit '6bd32a1d7c0499f899dbec105f82c084e9f5f12d': Revert app workaround for bug 17614203 now that HAL is fixed. This reverts ag/543302.
|
25d0ca30e42d675296b28a590af88ac92baf2280 |
26-Sep-2014 |
Senpo Hu <senpo@google.com> |
am 9ce01bc6: am 4389f14a: am 900c5aa9: am 93e01102: am feb07ea4: Merge "Stability: add null check for all CameraProxy obj references in VideoModule." into ub-camera-glacier * commit '9ce01bc6cee4082a1330e1746e8b7aa4d81e805a': Stability: add null check for all CameraProxy obj references in VideoModule.
|
6bd32a1d7c0499f899dbec105f82c084e9f5f12d |
26-Sep-2014 |
Andy Huibers <andyhuibers@google.com> |
am 5a00ce47: am 757a0873: am bbf0e352: am d3a7c5af: am ad12363e: Revert app workaround for bug 17614203 now that HAL is fixed. This reverts ag/543302. * commit '5a00ce477a111400573a3839f49e0e045131f288': Revert app workaround for bug 17614203 now that HAL is fixed. This reverts ag/543302.
|
9ce01bc6cee4082a1330e1746e8b7aa4d81e805a |
26-Sep-2014 |
Senpo Hu <senpo@google.com> |
am 4389f14a: am 900c5aa9: am 93e01102: am feb07ea4: Merge "Stability: add null check for all CameraProxy obj references in VideoModule." into ub-camera-glacier * commit '4389f14a85f65e21dcac743557a3cd9dec58308b': Stability: add null check for all CameraProxy obj references in VideoModule.
|
5a00ce477a111400573a3839f49e0e045131f288 |
26-Sep-2014 |
Andy Huibers <andyhuibers@google.com> |
am 757a0873: am bbf0e352: am d3a7c5af: am ad12363e: Revert app workaround for bug 17614203 now that HAL is fixed. This reverts ag/543302. * commit '757a0873ff6f0c09434448c2a43280e5a24a4fe1': Revert app workaround for bug 17614203 now that HAL is fixed. This reverts ag/543302.
|
4389f14a85f65e21dcac743557a3cd9dec58308b |
26-Sep-2014 |
Senpo Hu <senpo@google.com> |
am 900c5aa9: am 93e01102: am feb07ea4: Merge "Stability: add null check for all CameraProxy obj references in VideoModule." into ub-camera-glacier * commit '900c5aa9b314fd3d2f565a780000c48d6680f13e': Stability: add null check for all CameraProxy obj references in VideoModule.
|
900c5aa9b314fd3d2f565a780000c48d6680f13e |
26-Sep-2014 |
Senpo Hu <senpo@google.com> |
am 93e01102: am feb07ea4: Merge "Stability: add null check for all CameraProxy obj references in VideoModule." into ub-camera-glacier * commit '93e01102a49b199a085647141739c02478268e5b': Stability: add null check for all CameraProxy obj references in VideoModule.
|
93e01102a49b199a085647141739c02478268e5b |
26-Sep-2014 |
Senpo Hu <senpo@google.com> |
am feb07ea4: Merge "Stability: add null check for all CameraProxy obj references in VideoModule." into ub-camera-glacier * commit 'feb07ea4e32c7dcc4488515220a4a1881b5e6585': Stability: add null check for all CameraProxy obj references in VideoModule.
|
6d6925e7a614e99a3fa92ec6cddcd195d198a5e2 |
26-Sep-2014 |
Senpo Hu <senpo@google.com> |
am feb07ea4: Merge "Stability: add null check for all CameraProxy obj references in VideoModule." into ub-camera-glacier * commit 'feb07ea4e32c7dcc4488515220a4a1881b5e6585': Stability: add null check for all CameraProxy obj references in VideoModule.
|
feb07ea4e32c7dcc4488515220a4a1881b5e6585 |
26-Sep-2014 |
Senpo Hu <senpo@google.com> |
Merge "Stability: add null check for all CameraProxy obj references in VideoModule." into ub-camera-glacier
|
4ba2829246afa91db18d4ed41d08eddac8d91bc0 |
26-Sep-2014 |
Senpo Hu <senpo@google.com> |
Stability: add null check for all CameraProxy obj references in VideoModule. Bug: 17657161 Bug: 17653725 Change-Id: Icca2b9dffdfe954e979d9af7e47d78b539dc2b9d
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/VideoModule.java
|
757a0873ff6f0c09434448c2a43280e5a24a4fe1 |
26-Sep-2014 |
Andy Huibers <andyhuibers@google.com> |
am bbf0e352: am d3a7c5af: am ad12363e: Revert app workaround for bug 17614203 now that HAL is fixed. This reverts ag/543302. * commit 'bbf0e352000eb6386982bdc36e9d61bdeccf43c8': Revert app workaround for bug 17614203 now that HAL is fixed. This reverts ag/543302.
|
bbf0e352000eb6386982bdc36e9d61bdeccf43c8 |
26-Sep-2014 |
Andy Huibers <andyhuibers@google.com> |
am d3a7c5af: am ad12363e: Revert app workaround for bug 17614203 now that HAL is fixed. This reverts ag/543302. * commit 'd3a7c5af7ecd8cf6f32129e6c6936c6b487f8c24': Revert app workaround for bug 17614203 now that HAL is fixed. This reverts ag/543302.
|
d3a7c5af7ecd8cf6f32129e6c6936c6b487f8c24 |
26-Sep-2014 |
Andy Huibers <andyhuibers@google.com> |
am ad12363e: Revert app workaround for bug 17614203 now that HAL is fixed. This reverts ag/543302. * commit 'ad12363ecaba370c2425677eef6e562bf7c98e3e': Revert app workaround for bug 17614203 now that HAL is fixed. This reverts ag/543302.
|
1cfbbf2d4741cadb03eeada24141c7bf6ab0f004 |
26-Sep-2014 |
Andy Huibers <andyhuibers@google.com> |
am ad12363e: Revert app workaround for bug 17614203 now that HAL is fixed. This reverts ag/543302. * commit 'ad12363ecaba370c2425677eef6e562bf7c98e3e': Revert app workaround for bug 17614203 now that HAL is fixed. This reverts ag/543302.
|
ad12363ecaba370c2425677eef6e562bf7c98e3e |
26-Sep-2014 |
Andy Huibers <andyhuibers@google.com> |
Revert app workaround for bug 17614203 now that HAL is fixed. This reverts ag/543302. Bug: 17614203 Bug: 17145703 Change-Id: I3ec21902e59156ea30c181ecd6a7728f7262110a
rc/com/android/camera/PhotoModule.java
|
d85a7cb3a20430117dca4e76b269bbe1640df4eb |
26-Sep-2014 |
Alan Newberger <alann@google.com> |
am 5dce70b7: am f0f2461c: am 6e27443e: am e9541583: am f379211c: am 47c4474e: Merge "Force filmstrip images to generate in JPEG compression format" into ub-camera-glacier * commit '5dce70b766c83cd9a80be557523a304e73d8c261': Force filmstrip images to generate in JPEG compression format
|
d8fad313057fb2f0232f8de741ac5d2d11c1d2af |
26-Sep-2014 |
Puneet Lall <puneetl@google.com> |
am 33c4252f: am 006eb6e3: am 0950ed17: am d0f873b9: am fc0e5d89: am 4d2f3bf4: Merge "Recreate a OneCameraManager instance for each Activity." into ub-camera-glacier * commit '33c4252fb9df13f26dffa97e92560792b17935a1': Recreate a OneCameraManager instance for each Activity.
|
106228d29f00ec900dd3c4d9c355a8b64cbd38fc |
26-Sep-2014 |
Senpo Hu <senpo@google.com> |
am 431b52cc: am b45fb88b: am 2fbe8a6e: am 814310de: am 437fd924: am ee3123ba: Stability: add null check for all CameraProxy obj references in PhotoModule. * commit '431b52ccad2c83f57e207d7e084a17e6d045f38a': Stability: add null check for all CameraProxy obj references in PhotoModule.
|
5dce70b766c83cd9a80be557523a304e73d8c261 |
26-Sep-2014 |
Alan Newberger <alann@google.com> |
am f0f2461c: am 6e27443e: am e9541583: am f379211c: am 47c4474e: Merge "Force filmstrip images to generate in JPEG compression format" into ub-camera-glacier * commit 'f0f2461c3e064432423cb9989d0b0596c6946a88': Force filmstrip images to generate in JPEG compression format
|
33c4252fb9df13f26dffa97e92560792b17935a1 |
26-Sep-2014 |
Puneet Lall <puneetl@google.com> |
am 006eb6e3: am 0950ed17: am d0f873b9: am fc0e5d89: am 4d2f3bf4: Merge "Recreate a OneCameraManager instance for each Activity." into ub-camera-glacier * commit '006eb6e33e4a2c47a9aad17867a9758765183772': Recreate a OneCameraManager instance for each Activity.
|
431b52ccad2c83f57e207d7e084a17e6d045f38a |
26-Sep-2014 |
Senpo Hu <senpo@google.com> |
am b45fb88b: am 2fbe8a6e: am 814310de: am 437fd924: am ee3123ba: Stability: add null check for all CameraProxy obj references in PhotoModule. * commit 'b45fb88b7b869cbd6178049f0b6f6bcaf5a6b264': Stability: add null check for all CameraProxy obj references in PhotoModule.
|
f0f2461c3e064432423cb9989d0b0596c6946a88 |
25-Sep-2014 |
Alan Newberger <alann@google.com> |
am 6e27443e: am e9541583: am f379211c: am 47c4474e: Merge "Force filmstrip images to generate in JPEG compression format" into ub-camera-glacier * commit '6e27443e6aa16b4407a67deaea22a37d04f3050c': Force filmstrip images to generate in JPEG compression format
|
6e27443e6aa16b4407a67deaea22a37d04f3050c |
25-Sep-2014 |
Alan Newberger <alann@google.com> |
am e9541583: am f379211c: am 47c4474e: Merge "Force filmstrip images to generate in JPEG compression format" into ub-camera-glacier * commit 'e9541583a10a2de2f0cbd8ea7aa8b79f02431760': Force filmstrip images to generate in JPEG compression format
|
006eb6e33e4a2c47a9aad17867a9758765183772 |
25-Sep-2014 |
Puneet Lall <puneetl@google.com> |
am 0950ed17: am d0f873b9: am fc0e5d89: am 4d2f3bf4: Merge "Recreate a OneCameraManager instance for each Activity." into ub-camera-glacier * commit '0950ed171aa8b9949d9ed976ad66b11c899a8c0a': Recreate a OneCameraManager instance for each Activity.
|
b45fb88b7b869cbd6178049f0b6f6bcaf5a6b264 |
25-Sep-2014 |
Senpo Hu <senpo@google.com> |
am 2fbe8a6e: am 814310de: am 437fd924: am ee3123ba: Stability: add null check for all CameraProxy obj references in PhotoModule. * commit '2fbe8a6e67674c614b898d65addb1a320d14c404': Stability: add null check for all CameraProxy obj references in PhotoModule.
|
e97d4894f237237c543e90030f8de543d2500e84 |
25-Sep-2014 |
Alan Newberger <alann@google.com> |
am b4c549cb: am b86a4faf: am 36d08ae0: am f49e3882: am 3f8c75b2: am da6f3acc: Skip disk caching for session data * commit 'b4c549cb92d2c858e28df5965d575efb935ca88d': Skip disk caching for session data
|
0950ed171aa8b9949d9ed976ad66b11c899a8c0a |
25-Sep-2014 |
Puneet Lall <puneetl@google.com> |
am d0f873b9: am fc0e5d89: am 4d2f3bf4: Merge "Recreate a OneCameraManager instance for each Activity." into ub-camera-glacier * commit 'd0f873b9c6cab64d549287254175f48acf78ab6d': Recreate a OneCameraManager instance for each Activity.
|
2fbe8a6e67674c614b898d65addb1a320d14c404 |
25-Sep-2014 |
Senpo Hu <senpo@google.com> |
am 814310de: am 437fd924: am ee3123ba: Stability: add null check for all CameraProxy obj references in PhotoModule. * commit '814310de540722dd71c07a4aa35cbb511f78e2e0': Stability: add null check for all CameraProxy obj references in PhotoModule.
|
4eaf9b29a298210df336874f746ee056a7a6149a |
25-Sep-2014 |
Alan Newberger <alann@google.com> |
am 9bce5da5: am 997d696b: am 359c1b20: am e25f2203: am 92db2cb4: am 6b2d1e0b: Merge "Revert temporary session images in filmstrip to RGB_565" into ub-camera-glacier * commit '9bce5da59ff70502bb843ffe5012e663eb30079c': Revert temporary session images in filmstrip to RGB_565
|
8350fa90697009913b12011f1f4b54663d53b13e |
25-Sep-2014 |
Alan Newberger <alann@google.com> |
am 3695ef51: am c9ae403c: am 5d104d6e: am 68a63db4: am af73f898: am 347dccbe: Ensure Camera doesn\'t attempt access of back camera on Nakasi * commit '3695ef51934df045817414336e071efd103d8425': Ensure Camera doesn't attempt access of back camera on Nakasi
|
e9541583a10a2de2f0cbd8ea7aa8b79f02431760 |
25-Sep-2014 |
Alan Newberger <alann@google.com> |
am f379211c: am 47c4474e: Merge "Force filmstrip images to generate in JPEG compression format" into ub-camera-glacier * commit 'f379211cc6ec4ca292d100a53a8e1ea49958fcae': Force filmstrip images to generate in JPEG compression format
|
6956d11a742e3f19d63a7f318a750dd91362d17f |
25-Sep-2014 |
Alan Newberger <alann@google.com> |
am f379211c: am 47c4474e: Merge "Force filmstrip images to generate in JPEG compression format" into ub-camera-glacier * commit 'f379211cc6ec4ca292d100a53a8e1ea49958fcae': Force filmstrip images to generate in JPEG compression format
|
051fddec10fc62788d6a50d2a9133ce99a26251a |
25-Sep-2014 |
Puneet Lall <puneetl@google.com> |
am fc0e5d89: am 4d2f3bf4: Merge "Recreate a OneCameraManager instance for each Activity." into ub-camera-glacier * commit 'fc0e5d895cbad548cb2cb1d874d1c0fed49333c9': Recreate a OneCameraManager instance for each Activity.
|
dbfd18d24e748d9b6d20ca20abb6be5812a00916 |
25-Sep-2014 |
Senpo Hu <senpo@google.com> |
am 437fd924: am ee3123ba: Stability: add null check for all CameraProxy obj references in PhotoModule. * commit '437fd924f0bcffafa9aafcb719e233c68d81042b': Stability: add null check for all CameraProxy obj references in PhotoModule.
|
d0f873b9c6cab64d549287254175f48acf78ab6d |
25-Sep-2014 |
Puneet Lall <puneetl@google.com> |
am fc0e5d89: am 4d2f3bf4: Merge "Recreate a OneCameraManager instance for each Activity." into ub-camera-glacier * commit 'fc0e5d895cbad548cb2cb1d874d1c0fed49333c9': Recreate a OneCameraManager instance for each Activity.
|
814310de540722dd71c07a4aa35cbb511f78e2e0 |
25-Sep-2014 |
Senpo Hu <senpo@google.com> |
am 437fd924: am ee3123ba: Stability: add null check for all CameraProxy obj references in PhotoModule. * commit '437fd924f0bcffafa9aafcb719e233c68d81042b': Stability: add null check for all CameraProxy obj references in PhotoModule.
|
f379211cc6ec4ca292d100a53a8e1ea49958fcae |
25-Sep-2014 |
Alan Newberger <alann@google.com> |
am 47c4474e: Merge "Force filmstrip images to generate in JPEG compression format" into ub-camera-glacier * commit '47c4474ea9e51a58f2ba1795de90c9aaf135f442': Force filmstrip images to generate in JPEG compression format
|
4cab79861178af52948a4b05d63eaf6eaed7e9ff |
25-Sep-2014 |
Alan Newberger <alann@google.com> |
am 47c4474e: Merge "Force filmstrip images to generate in JPEG compression format" into ub-camera-glacier * commit '47c4474ea9e51a58f2ba1795de90c9aaf135f442': Force filmstrip images to generate in JPEG compression format
|
b4c549cb92d2c858e28df5965d575efb935ca88d |
25-Sep-2014 |
Alan Newberger <alann@google.com> |
am b86a4faf: am 36d08ae0: am f49e3882: am 3f8c75b2: am da6f3acc: Skip disk caching for session data * commit 'b86a4faf80f455919e59e93f5409812a5e8ac7d9': Skip disk caching for session data
|
9bce5da59ff70502bb843ffe5012e663eb30079c |
25-Sep-2014 |
Alan Newberger <alann@google.com> |
am 997d696b: am 359c1b20: am e25f2203: am 92db2cb4: am 6b2d1e0b: Merge "Revert temporary session images in filmstrip to RGB_565" into ub-camera-glacier * commit '997d696ba6b46d64c8cebc2a97adaee7cba79ec3': Revert temporary session images in filmstrip to RGB_565
|
3695ef51934df045817414336e071efd103d8425 |
25-Sep-2014 |
Alan Newberger <alann@google.com> |
am c9ae403c: am 5d104d6e: am 68a63db4: am af73f898: am 347dccbe: Ensure Camera doesn\'t attempt access of back camera on Nakasi * commit 'c9ae403cbcbcc65862129e011d2d8eb3ab833ecd': Ensure Camera doesn't attempt access of back camera on Nakasi
|
47c4474ea9e51a58f2ba1795de90c9aaf135f442 |
25-Sep-2014 |
Alan Newberger <alann@google.com> |
Merge "Force filmstrip images to generate in JPEG compression format" into ub-camera-glacier
|
fc0e5d895cbad548cb2cb1d874d1c0fed49333c9 |
25-Sep-2014 |
Puneet Lall <puneetl@google.com> |
am 4d2f3bf4: Merge "Recreate a OneCameraManager instance for each Activity." into ub-camera-glacier * commit '4d2f3bf448d8546920a3d94ce15033357388d2cc': Recreate a OneCameraManager instance for each Activity.
|
437fd924f0bcffafa9aafcb719e233c68d81042b |
25-Sep-2014 |
Senpo Hu <senpo@google.com> |
am ee3123ba: Stability: add null check for all CameraProxy obj references in PhotoModule. * commit 'ee3123ba4b4cc107423441bb8d687c14a2dc4b9a': Stability: add null check for all CameraProxy obj references in PhotoModule.
|
b861d6221c438e119297e119370c8fe020573dc4 |
25-Sep-2014 |
Puneet Lall <puneetl@google.com> |
am 4d2f3bf4: Merge "Recreate a OneCameraManager instance for each Activity." into ub-camera-glacier * commit '4d2f3bf448d8546920a3d94ce15033357388d2cc': Recreate a OneCameraManager instance for each Activity.
|
a66160ff7a470bd5bcb1523071cea888f6208d29 |
25-Sep-2014 |
Senpo Hu <senpo@google.com> |
am ee3123ba: Stability: add null check for all CameraProxy obj references in PhotoModule. * commit 'ee3123ba4b4cc107423441bb8d687c14a2dc4b9a': Stability: add null check for all CameraProxy obj references in PhotoModule.
|
65ab02000f65a8677adf9fab5c296e0d3ef64cbc |
25-Sep-2014 |
Alan Newberger <alann@google.com> |
Force filmstrip images to generate in JPEG compression format Due to https://github.com/bumptech/glide/issues/156, we sometimes were getting PNG cache image generation which greatly increased latency and introduced jank. As workaround, explicitly forcing images to utilize JPEG format. Bug: 17597861 Change-Id: I49d7266d4ff0173d253877612b3076489a6b385a
rc/com/android/camera/data/LocalMediaData.java
|
4d2f3bf448d8546920a3d94ce15033357388d2cc |
25-Sep-2014 |
Puneet Lall <puneetl@google.com> |
Merge "Recreate a OneCameraManager instance for each Activity." into ub-camera-glacier
|
ee3123ba4b4cc107423441bb8d687c14a2dc4b9a |
25-Sep-2014 |
Senpo Hu <senpo@google.com> |
Stability: add null check for all CameraProxy obj references in PhotoModule. Bug: 17643705 Bug: 17604028 Change-Id: I6073f32bae286168c040f5667494ede1384ce3fc
rc/com/android/camera/PhotoModule.java
|
e67bcfdb989f80c8e0870bd6a74b7e2a2cf1181a |
25-Sep-2014 |
Puneet Lall <puneetl@google.com> |
Recreate a OneCameraManager instance for each Activity. Bug: 17484715 Change-Id: If484e3b40ef32324fa77629b1687cd4317466e2e
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/one/OneCameraManager.java
|
b86a4faf80f455919e59e93f5409812a5e8ac7d9 |
25-Sep-2014 |
Alan Newberger <alann@google.com> |
am 36d08ae0: am f49e3882: am 3f8c75b2: am da6f3acc: Skip disk caching for session data * commit '36d08ae04d6465ef8ee4bc10760b6f8977ae7984': Skip disk caching for session data
|
997d696ba6b46d64c8cebc2a97adaee7cba79ec3 |
25-Sep-2014 |
Alan Newberger <alann@google.com> |
am 359c1b20: am e25f2203: am 92db2cb4: am 6b2d1e0b: Merge "Revert temporary session images in filmstrip to RGB_565" into ub-camera-glacier * commit '359c1b20bc2e830a76a0a2f20193673995be8e59': Revert temporary session images in filmstrip to RGB_565
|
c9ae403cbcbcc65862129e011d2d8eb3ab833ecd |
25-Sep-2014 |
Alan Newberger <alann@google.com> |
am 5d104d6e: am 68a63db4: am af73f898: am 347dccbe: Ensure Camera doesn\'t attempt access of back camera on Nakasi * commit '5d104d6eccfcf698f555a8c4cc7da759a20f4c9a': Ensure Camera doesn't attempt access of back camera on Nakasi
|
36d08ae04d6465ef8ee4bc10760b6f8977ae7984 |
25-Sep-2014 |
Alan Newberger <alann@google.com> |
am f49e3882: am 3f8c75b2: am da6f3acc: Skip disk caching for session data * commit 'f49e3882849e68acda0eaa39ad11e4cd207e2cd1': Skip disk caching for session data
|
359c1b20bc2e830a76a0a2f20193673995be8e59 |
25-Sep-2014 |
Alan Newberger <alann@google.com> |
am e25f2203: am 92db2cb4: am 6b2d1e0b: Merge "Revert temporary session images in filmstrip to RGB_565" into ub-camera-glacier * commit 'e25f22030ee7f3628824c3cc74ec8bda7bb9d681': Revert temporary session images in filmstrip to RGB_565
|
5d104d6eccfcf698f555a8c4cc7da759a20f4c9a |
25-Sep-2014 |
Alan Newberger <alann@google.com> |
am 68a63db4: am af73f898: am 347dccbe: Ensure Camera doesn\'t attempt access of back camera on Nakasi * commit '68a63db488679cca1e9723813fe692fc1a9ace82': Ensure Camera doesn't attempt access of back camera on Nakasi
|
f49e3882849e68acda0eaa39ad11e4cd207e2cd1 |
25-Sep-2014 |
Alan Newberger <alann@google.com> |
am 3f8c75b2: am da6f3acc: Skip disk caching for session data * commit '3f8c75b21820b64551a3226ab71bdb7707b286f9': Skip disk caching for session data
|
e25f22030ee7f3628824c3cc74ec8bda7bb9d681 |
25-Sep-2014 |
Alan Newberger <alann@google.com> |
am 92db2cb4: am 6b2d1e0b: Merge "Revert temporary session images in filmstrip to RGB_565" into ub-camera-glacier * commit '92db2cb42b74da6dbf94f79edb2671d517441aeb': Revert temporary session images in filmstrip to RGB_565
|
68a63db488679cca1e9723813fe692fc1a9ace82 |
25-Sep-2014 |
Alan Newberger <alann@google.com> |
am af73f898: am 347dccbe: Ensure Camera doesn\'t attempt access of back camera on Nakasi * commit 'af73f89883e9386cf309c029efba19c82597b136': Ensure Camera doesn't attempt access of back camera on Nakasi
|
90665968526c8bf039686a8fa6ab3bd296e056d0 |
25-Sep-2014 |
Alan Newberger <alann@google.com> |
am 3f8c75b2: am da6f3acc: Skip disk caching for session data * commit '3f8c75b21820b64551a3226ab71bdb7707b286f9': Skip disk caching for session data
|
87d802c2fc7a9052e667ce895b7bae37bdbe7390 |
25-Sep-2014 |
Alan Newberger <alann@google.com> |
am 92db2cb4: am 6b2d1e0b: Merge "Revert temporary session images in filmstrip to RGB_565" into ub-camera-glacier * commit '92db2cb42b74da6dbf94f79edb2671d517441aeb': Revert temporary session images in filmstrip to RGB_565
|
45cf7b2546aff7c9bf406b1dc648e6f7b56bf84e |
25-Sep-2014 |
Alan Newberger <alann@google.com> |
am af73f898: am 347dccbe: Ensure Camera doesn\'t attempt access of back camera on Nakasi * commit 'af73f89883e9386cf309c029efba19c82597b136': Ensure Camera doesn't attempt access of back camera on Nakasi
|
6f9115deafdb18312a578ecafc1c5d1190f2d00a |
25-Sep-2014 |
Alan Newberger <alann@google.com> |
am da6f3acc: Skip disk caching for session data * commit 'da6f3accc02c942b1f2dd1c248edb6a0bd66ee10': Skip disk caching for session data
|
3f8c75b21820b64551a3226ab71bdb7707b286f9 |
25-Sep-2014 |
Alan Newberger <alann@google.com> |
am da6f3acc: Skip disk caching for session data * commit 'da6f3accc02c942b1f2dd1c248edb6a0bd66ee10': Skip disk caching for session data
|
da6f3accc02c942b1f2dd1c248edb6a0bd66ee10 |
25-Sep-2014 |
Alan Newberger <alann@google.com> |
Skip disk caching for session data Bring back full color depth but don't bother with a disk cache for temporary session images, since they will go away and be replaced by mediastore entries anyway. Bug: 17642071 Change-Id: I1a8483b71d69967033074fc4d8c69c9dfb17651e
rc/com/android/camera/data/LocalSessionData.java
|
92db2cb42b74da6dbf94f79edb2671d517441aeb |
25-Sep-2014 |
Alan Newberger <alann@google.com> |
am 6b2d1e0b: Merge "Revert temporary session images in filmstrip to RGB_565" into ub-camera-glacier * commit '6b2d1e0b660e931c6cbc91a25ec85df070712e65': Revert temporary session images in filmstrip to RGB_565
|
af73f89883e9386cf309c029efba19c82597b136 |
25-Sep-2014 |
Alan Newberger <alann@google.com> |
am 347dccbe: Ensure Camera doesn\'t attempt access of back camera on Nakasi * commit '347dccbe1ed10ceec190af4d3797a197426f1caf': Ensure Camera doesn't attempt access of back camera on Nakasi
|
fdf694fc4db7e97ff20d2822e5d116a7ed793850 |
25-Sep-2014 |
Alan Newberger <alann@google.com> |
am 6b2d1e0b: Merge "Revert temporary session images in filmstrip to RGB_565" into ub-camera-glacier * commit '6b2d1e0b660e931c6cbc91a25ec85df070712e65': Revert temporary session images in filmstrip to RGB_565
|
56942877229b252b6d00242a5c021a1b3c341b21 |
25-Sep-2014 |
Alan Newberger <alann@google.com> |
am 347dccbe: Ensure Camera doesn\'t attempt access of back camera on Nakasi * commit '347dccbe1ed10ceec190af4d3797a197426f1caf': Ensure Camera doesn't attempt access of back camera on Nakasi
|
6b2d1e0b660e931c6cbc91a25ec85df070712e65 |
25-Sep-2014 |
Alan Newberger <alann@google.com> |
Merge "Revert temporary session images in filmstrip to RGB_565" into ub-camera-glacier
|
728c6fe4e719976ab4bd7a7937c6b25548418041 |
25-Sep-2014 |
Alan Newberger <alann@google.com> |
Revert temporary session images in filmstrip to RGB_565 A simple way to avoid performance issues for now until we get around the significant load issues seen in writing ARGB_8888 to disk cache. Bug: 17642071 Change-Id: I6017980fce6e633b52dce93f3f46931e5bcc3d9c
rc/com/android/camera/data/LocalSessionData.java
|
347dccbe1ed10ceec190af4d3797a197426f1caf |
25-Sep-2014 |
Alan Newberger <alann@google.com> |
Ensure Camera doesn't attempt access of back camera on Nakasi Bug: 17647004 Change-Id: I823f98cfdfcc7429b6acf98215e4a08787bc1bb9
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/app/CameraAppUI.java
|
f58d3aa05d34769fff9fd00068b79993e3947124 |
25-Sep-2014 |
Alan Newberger <alann@google.com> |
am 2d939be4: am 8ab931b5: am 4d7f8bdc: am 59cfca2f: am 9db50c18: am 2631a15a: Don\'t show aspect ratio UI if using API2 portability * commit '2d939be4e5f7f7d39d210479e01beb55cca38a58': Don't show aspect ratio UI if using API2 portability
|
2d939be4e5f7f7d39d210479e01beb55cca38a58 |
25-Sep-2014 |
Alan Newberger <alann@google.com> |
am 8ab931b5: am 4d7f8bdc: am 59cfca2f: am 9db50c18: am 2631a15a: Don\'t show aspect ratio UI if using API2 portability * commit '8ab931b56f3b3c6a5911918c221c9c5c0edf002a': Don't show aspect ratio UI if using API2 portability
|
8ab931b56f3b3c6a5911918c221c9c5c0edf002a |
25-Sep-2014 |
Alan Newberger <alann@google.com> |
am 4d7f8bdc: am 59cfca2f: am 9db50c18: am 2631a15a: Don\'t show aspect ratio UI if using API2 portability * commit '4d7f8bdcfdc694ca64bc0349aa017cc468c33ac0': Don't show aspect ratio UI if using API2 portability
|
4d7f8bdcfdc694ca64bc0349aa017cc468c33ac0 |
25-Sep-2014 |
Alan Newberger <alann@google.com> |
am 59cfca2f: am 9db50c18: am 2631a15a: Don\'t show aspect ratio UI if using API2 portability * commit '59cfca2fd973402ca1de8486ed38d005707d5556': Don't show aspect ratio UI if using API2 portability
|
59cfca2fd973402ca1de8486ed38d005707d5556 |
25-Sep-2014 |
Alan Newberger <alann@google.com> |
am 9db50c18: am 2631a15a: Don\'t show aspect ratio UI if using API2 portability * commit '9db50c18fdd35f98d45fec66db55693bb9f1d9ae': Don't show aspect ratio UI if using API2 portability
|
d6567402bce2705528bf271008d5166b8f49dd56 |
25-Sep-2014 |
Alan Newberger <alann@google.com> |
am 9db50c18: am 2631a15a: Don\'t show aspect ratio UI if using API2 portability * commit '9db50c18fdd35f98d45fec66db55693bb9f1d9ae': Don't show aspect ratio UI if using API2 portability
|
a397027ccc69e4ab092f26d8f8bb93d777e5846b |
25-Sep-2014 |
Alan Newberger <alann@google.com> |
am 2631a15a: Don\'t show aspect ratio UI if using API2 portability * commit '2631a15a37b890f4ee720c5a4bbe3e654524deb6': Don't show aspect ratio UI if using API2 portability
|
9db50c18fdd35f98d45fec66db55693bb9f1d9ae |
25-Sep-2014 |
Alan Newberger <alann@google.com> |
am 2631a15a: Don\'t show aspect ratio UI if using API2 portability * commit '2631a15a37b890f4ee720c5a4bbe3e654524deb6': Don't show aspect ratio UI if using API2 portability
|
2631a15a37b890f4ee720c5a4bbe3e654524deb6 |
24-Sep-2014 |
Alan Newberger <alann@google.com> |
Don't show aspect ratio UI if using API2 portability Avoid preview size changes due to current state of locking in API2 portability implementation. Bug: 17462976 Change-Id: I9426380699988d67b21ce86850ef00736e84a5d6
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/PhotoUI.java
rc/com/android/camera/util/ApiHelper.java
|
7acacc71e2ddcf74d8cee26d77efa273536daff5 |
24-Sep-2014 |
Spike Sprague <spikuru@google.com> |
am a1ce321c: am c8b10f95: am d93dcf9a: am a02991d9: am d8dbf53c: am eeeed4fa: new sounds for timer ticker and pano / photosphere intermediate captures * commit 'a1ce321ce175fc2c6976b1f53fc0705402194c2c': new sounds for timer ticker and pano / photosphere intermediate captures
|
82bf39abc9c52f477f048b819fa01ee3ee600b7e |
24-Sep-2014 |
Spike Sprague <spikuru@google.com> |
am 0ab9387b: am 15a1d51c: am b2e8901a: am 668f0efc: am c89420a6: am 7d1fb593: Merge "monkey test NPE fix, another null check on mCameraDevice" into ub-camera-glacier * commit '0ab9387b8de15d46cfda2f8534de50e26922fc86': monkey test NPE fix, another null check on mCameraDevice
|
a1ce321ce175fc2c6976b1f53fc0705402194c2c |
24-Sep-2014 |
Spike Sprague <spikuru@google.com> |
am c8b10f95: am d93dcf9a: am a02991d9: am d8dbf53c: am eeeed4fa: new sounds for timer ticker and pano / photosphere intermediate captures * commit 'c8b10f956392bc4c53b41915c7a4091d1a2715e9': new sounds for timer ticker and pano / photosphere intermediate captures
|
0ab9387b8de15d46cfda2f8534de50e26922fc86 |
24-Sep-2014 |
Spike Sprague <spikuru@google.com> |
am 15a1d51c: am b2e8901a: am 668f0efc: am c89420a6: am 7d1fb593: Merge "monkey test NPE fix, another null check on mCameraDevice" into ub-camera-glacier * commit '15a1d51c64edd5da6c8ce805a053f2a4d7b0f9d2': monkey test NPE fix, another null check on mCameraDevice
|
c8b10f956392bc4c53b41915c7a4091d1a2715e9 |
24-Sep-2014 |
Spike Sprague <spikuru@google.com> |
am d93dcf9a: am a02991d9: am d8dbf53c: am eeeed4fa: new sounds for timer ticker and pano / photosphere intermediate captures * commit 'd93dcf9a532a0d6ba88d8c220f629dd783503ad3': new sounds for timer ticker and pano / photosphere intermediate captures
|
15a1d51c64edd5da6c8ce805a053f2a4d7b0f9d2 |
24-Sep-2014 |
Spike Sprague <spikuru@google.com> |
am b2e8901a: am 668f0efc: am c89420a6: am 7d1fb593: Merge "monkey test NPE fix, another null check on mCameraDevice" into ub-camera-glacier * commit 'b2e8901aaa5e53faf5c4d449f1ab57b0906dcb20': monkey test NPE fix, another null check on mCameraDevice
|
d93dcf9a532a0d6ba88d8c220f629dd783503ad3 |
24-Sep-2014 |
Spike Sprague <spikuru@google.com> |
am a02991d9: am d8dbf53c: am eeeed4fa: new sounds for timer ticker and pano / photosphere intermediate captures * commit 'a02991d9523775e60a349e1deced9a63ad145237': new sounds for timer ticker and pano / photosphere intermediate captures
|
b2e8901aaa5e53faf5c4d449f1ab57b0906dcb20 |
24-Sep-2014 |
Spike Sprague <spikuru@google.com> |
am 668f0efc: am c89420a6: am 7d1fb593: Merge "monkey test NPE fix, another null check on mCameraDevice" into ub-camera-glacier * commit '668f0efca1d8864c50787b39927a5e0fdf6c415a': monkey test NPE fix, another null check on mCameraDevice
|
10279d29063c1976b341f2d8ca9772684cd363df |
24-Sep-2014 |
Spike Sprague <spikuru@google.com> |
am 3e8f9db9: am d8dbf53c: am eeeed4fa: new sounds for timer ticker and pano / photosphere intermediate captures * commit '3e8f9db9b1e7b3549df88d5daa7ade9dde8abbf1': new sounds for timer ticker and pano / photosphere intermediate captures
|
03a2759c642203985e59106e33ff460df0cf6523 |
24-Sep-2014 |
Spike Sprague <spikuru@google.com> |
am e31c82c2: am c89420a6: am 7d1fb593: Merge "monkey test NPE fix, another null check on mCameraDevice" into ub-camera-glacier * commit 'e31c82c2817f4b966673274896679cd956bd7dd2': monkey test NPE fix, another null check on mCameraDevice
|
3e8f9db9b1e7b3549df88d5daa7ade9dde8abbf1 |
24-Sep-2014 |
Spike Sprague <spikuru@google.com> |
am d8dbf53c: am eeeed4fa: new sounds for timer ticker and pano / photosphere intermediate captures * commit 'd8dbf53c7235456fc2fd3e0e77e50e5d6c00a753': new sounds for timer ticker and pano / photosphere intermediate captures
|
a02991d9523775e60a349e1deced9a63ad145237 |
24-Sep-2014 |
Spike Sprague <spikuru@google.com> |
am d8dbf53c: am eeeed4fa: new sounds for timer ticker and pano / photosphere intermediate captures * commit 'd8dbf53c7235456fc2fd3e0e77e50e5d6c00a753': new sounds for timer ticker and pano / photosphere intermediate captures
|
48453f10a76af8c0b3b649ca9d54f13d3af3b518 |
24-Sep-2014 |
Spike Sprague <spikuru@google.com> |
am eeeed4fa: new sounds for timer ticker and pano / photosphere intermediate captures * commit 'eeeed4fa00ed842050bc7e0edd3b37c262802a5b': new sounds for timer ticker and pano / photosphere intermediate captures
|
d8dbf53c7235456fc2fd3e0e77e50e5d6c00a753 |
24-Sep-2014 |
Spike Sprague <spikuru@google.com> |
am eeeed4fa: new sounds for timer ticker and pano / photosphere intermediate captures * commit 'eeeed4fa00ed842050bc7e0edd3b37c262802a5b': new sounds for timer ticker and pano / photosphere intermediate captures
|
e31c82c2817f4b966673274896679cd956bd7dd2 |
24-Sep-2014 |
Spike Sprague <spikuru@google.com> |
am c89420a6: am 7d1fb593: Merge "monkey test NPE fix, another null check on mCameraDevice" into ub-camera-glacier * commit 'c89420a6c2e44b17a7dcc556f9a633db58ba4ab5': monkey test NPE fix, another null check on mCameraDevice
|
668f0efca1d8864c50787b39927a5e0fdf6c415a |
24-Sep-2014 |
Spike Sprague <spikuru@google.com> |
am c89420a6: am 7d1fb593: Merge "monkey test NPE fix, another null check on mCameraDevice" into ub-camera-glacier * commit 'c89420a6c2e44b17a7dcc556f9a633db58ba4ab5': monkey test NPE fix, another null check on mCameraDevice
|
eeeed4fa00ed842050bc7e0edd3b37c262802a5b |
27-Aug-2014 |
Spike Sprague <spikuru@google.com> |
new sounds for timer ticker and pano / photosphere intermediate captures companions CL: ag/534823 bug: 17281234 Change-Id: I9d98d8e869dcefdbd0f7e0b53dea6b8e024a8e3b
es/raw/beep_once.ogg
es/raw/beep_twice.ogg
es/raw/shutter.ogg
es/raw/staged_shot_complete.ogg
es/raw/timer_final_second.ogg
es/raw/timer_increment.ogg
ounds/shutter.wav
ounds/staged_shot_complete.wav
ounds/timer_final_second.wav
ounds/timer_increment.wav
rc/com/android/camera/CaptureModule.java
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/SoundClips.java
|
2d8f6ed6d821b38f6305a96e7f6997d07e089653 |
24-Sep-2014 |
Spike Sprague <spikuru@google.com> |
am 7d1fb593: Merge "monkey test NPE fix, another null check on mCameraDevice" into ub-camera-glacier * commit '7d1fb593ae26e4f327e47bcbb857057da4ea23a0': monkey test NPE fix, another null check on mCameraDevice
|
c89420a6c2e44b17a7dcc556f9a633db58ba4ab5 |
24-Sep-2014 |
Spike Sprague <spikuru@google.com> |
am 7d1fb593: Merge "monkey test NPE fix, another null check on mCameraDevice" into ub-camera-glacier * commit '7d1fb593ae26e4f327e47bcbb857057da4ea23a0': monkey test NPE fix, another null check on mCameraDevice
|
2268fbb50d07e327c9ac00642db0a83a49c8f3e3 |
20-Sep-2014 |
Spike Sprague <spikuru@google.com> |
for intent capture and pano, fix the redo/ok/cancel button sizes so touch ripples show up right. bug: 17505149 Change-Id: I29d8222ff0588d0410cf1f8a94bed963b4bf32f6
es/layout-land-v21/retake_done_cancel_layout.xml
es/layout-land/retake_done_cancel_layout.xml
es/layout-port-v21/retake_done_cancel_layout.xml
es/layout-port/retake_done_cancel_layout.xml
rc/com/android/camera/ui/BottomBar.java
|
7d1fb593ae26e4f327e47bcbb857057da4ea23a0 |
24-Sep-2014 |
Spike Sprague <spikuru@google.com> |
Merge "monkey test NPE fix, another null check on mCameraDevice" into ub-camera-glacier
|
de614ed2bc0fae054d119a424b775e4cfe42117e |
23-Sep-2014 |
Alan Newberger <alann@google.com> |
WIP: Add recursive thumbnail call to LocalMediaData This should allow for flicker free scaling once glide is submitted. Bug: 17597861 Change-Id: I7a4d874a95f884bc54bea940facc68fd9a1ad7b5
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/data/LocalMediaData.java
|
180b17d0412fc8fe5ab5996daf836e9f74e0b961 |
23-Sep-2014 |
Alan Newberger <alann@google.com> |
am 406b615c: am bdc2965c: am 42be3d72: am fe8184af: am 1db7f286: am b60af188: Merge "Fix filmstrip item bounds to filmstrip scale" into ub-camera-glacier * commit '406b615ca80621edabfd4dd29a279200c53ba5f8': Fix filmstrip item bounds to filmstrip scale
|
1548a60204cb61cec9a93dae454f2461adbd884b |
23-Sep-2014 |
Alan Newberger <alann@google.com> |
am 1e2f127f: am 2e3a6b84: am 78f0b51a: am 7e08f366: am 9f3628da: am 5f86f7fd: Cleanup gesture UI hide code * commit '1e2f127f4ec920bf07515ae8075391c16ca50118': Cleanup gesture UI hide code
|
f74e8045d60b26df6e091e947405d43c16a58918 |
23-Sep-2014 |
Alan Newberger <alann@google.com> |
am 79d34ede: am e998a0a5: am b3c72147: am 34920701: am 8f1ffed7: am b2b0e02c: Clean up unused code * commit '79d34ede7dc740f5e2809753ef240173761b71b9': Clean up unused code
|
406b615ca80621edabfd4dd29a279200c53ba5f8 |
23-Sep-2014 |
Alan Newberger <alann@google.com> |
am bdc2965c: am 42be3d72: am fe8184af: am 1db7f286: am b60af188: Merge "Fix filmstrip item bounds to filmstrip scale" into ub-camera-glacier * commit 'bdc2965ccbf7b0fb120fe96e773674dc7ea08613': Fix filmstrip item bounds to filmstrip scale
|
bdc2965ccbf7b0fb120fe96e773674dc7ea08613 |
23-Sep-2014 |
Alan Newberger <alann@google.com> |
am 42be3d72: am fe8184af: am 1db7f286: am b60af188: Merge "Fix filmstrip item bounds to filmstrip scale" into ub-camera-glacier * commit '42be3d72dedda974e9001f8c81d075aa4a18c095': Fix filmstrip item bounds to filmstrip scale
|
78bd55551657d78e43375439f45b6cbf3424308e |
23-Sep-2014 |
Alan Newberger <alann@google.com> |
am 4c571d7e: am 1db7f286: am b60af188: Merge "Fix filmstrip item bounds to filmstrip scale" into ub-camera-glacier * commit '4c571d7e967bad041c17c7f7c7c6b5bd5cab640c': Fix filmstrip item bounds to filmstrip scale
|
42be3d72dedda974e9001f8c81d075aa4a18c095 |
23-Sep-2014 |
Alan Newberger <alann@google.com> |
am fe8184af: am 1db7f286: am b60af188: Merge "Fix filmstrip item bounds to filmstrip scale" into ub-camera-glacier * commit 'fe8184af85604e6a87fe1e74df026a78732f08ce': Fix filmstrip item bounds to filmstrip scale
|
4c571d7e967bad041c17c7f7c7c6b5bd5cab640c |
23-Sep-2014 |
Alan Newberger <alann@google.com> |
am 1db7f286: am b60af188: Merge "Fix filmstrip item bounds to filmstrip scale" into ub-camera-glacier * commit '1db7f2860a5117ad2082802f9e3ce7c0314bfee8': Fix filmstrip item bounds to filmstrip scale
|
fe8184af85604e6a87fe1e74df026a78732f08ce |
23-Sep-2014 |
Alan Newberger <alann@google.com> |
am 1db7f286: am b60af188: Merge "Fix filmstrip item bounds to filmstrip scale" into ub-camera-glacier * commit '1db7f2860a5117ad2082802f9e3ce7c0314bfee8': Fix filmstrip item bounds to filmstrip scale
|
1db7f2860a5117ad2082802f9e3ce7c0314bfee8 |
23-Sep-2014 |
Alan Newberger <alann@google.com> |
am b60af188: Merge "Fix filmstrip item bounds to filmstrip scale" into ub-camera-glacier * commit 'b60af188e3bc712a7f06700c591c428834237dff': Fix filmstrip item bounds to filmstrip scale
|
29aa8adf1972ae2274525e49703983ded22c9db1 |
23-Sep-2014 |
Alan Newberger <alann@google.com> |
am b60af188: Merge "Fix filmstrip item bounds to filmstrip scale" into ub-camera-glacier * commit 'b60af188e3bc712a7f06700c591c428834237dff': Fix filmstrip item bounds to filmstrip scale
|
b60af188e3bc712a7f06700c591c428834237dff |
23-Sep-2014 |
Alan Newberger <alann@google.com> |
Merge "Fix filmstrip item bounds to filmstrip scale" into ub-camera-glacier
|
1e2f127f4ec920bf07515ae8075391c16ca50118 |
23-Sep-2014 |
Alan Newberger <alann@google.com> |
am 2e3a6b84: am 78f0b51a: am 7e08f366: am 9f3628da: am 5f86f7fd: Cleanup gesture UI hide code * commit '2e3a6b84278883b27c53aafc40967223892f2ac2': Cleanup gesture UI hide code
|
79d34ede7dc740f5e2809753ef240173761b71b9 |
23-Sep-2014 |
Alan Newberger <alann@google.com> |
am e998a0a5: am b3c72147: am 34920701: am 8f1ffed7: am b2b0e02c: Clean up unused code * commit 'e998a0a53ede163e7aa8f53ef89c6a60c8092f0b': Clean up unused code
|
4c1e6e8f040e60be33c2c044246bddcb5d38a354 |
23-Sep-2014 |
Alan Newberger <alann@google.com> |
am b4ed71c2: am 9f3628da: am 5f86f7fd: Cleanup gesture UI hide code * commit 'b4ed71c29eed54dd1a8ba36960264ff03aa24eb8': Cleanup gesture UI hide code
|
306a986c73f24f15b1093590e9cd9a94db869b02 |
23-Sep-2014 |
Alan Newberger <alann@google.com> |
am 42b799ac: am 8f1ffed7: am b2b0e02c: Clean up unused code * commit '42b799ac283f322259fbb2d21ef1f946cb20af45': Clean up unused code
|
2e3a6b84278883b27c53aafc40967223892f2ac2 |
23-Sep-2014 |
Alan Newberger <alann@google.com> |
am 78f0b51a: am 7e08f366: am 9f3628da: am 5f86f7fd: Cleanup gesture UI hide code * commit '78f0b51ac319dbed8f845612947d954d530fb74e': Cleanup gesture UI hide code
|
e998a0a53ede163e7aa8f53ef89c6a60c8092f0b |
23-Sep-2014 |
Alan Newberger <alann@google.com> |
am b3c72147: am 34920701: am 8f1ffed7: am b2b0e02c: Clean up unused code * commit 'b3c7214788b78af1366417d0acef2245745b18af': Clean up unused code
|
78f0b51ac319dbed8f845612947d954d530fb74e |
23-Sep-2014 |
Alan Newberger <alann@google.com> |
am 7e08f366: am 9f3628da: am 5f86f7fd: Cleanup gesture UI hide code * commit '7e08f3666544edb0fc096a78e82ebc4070674527': Cleanup gesture UI hide code
|
b3c7214788b78af1366417d0acef2245745b18af |
23-Sep-2014 |
Alan Newberger <alann@google.com> |
am 34920701: am 8f1ffed7: am b2b0e02c: Clean up unused code * commit '349207016a09a174c6a4a8c5b2698cdd11145183': Clean up unused code
|
7e08f3666544edb0fc096a78e82ebc4070674527 |
23-Sep-2014 |
Alan Newberger <alann@google.com> |
am 9f3628da: am 5f86f7fd: Cleanup gesture UI hide code * commit '9f3628da2cbef7db47e5f9f5e0e2f69a451ee4b9': Cleanup gesture UI hide code
|
349207016a09a174c6a4a8c5b2698cdd11145183 |
23-Sep-2014 |
Alan Newberger <alann@google.com> |
am 8f1ffed7: am b2b0e02c: Clean up unused code * commit '8f1ffed79db5d7e17f56501b5d62157846fb55bd': Clean up unused code
|
b4ed71c29eed54dd1a8ba36960264ff03aa24eb8 |
23-Sep-2014 |
Alan Newberger <alann@google.com> |
am 9f3628da: am 5f86f7fd: Cleanup gesture UI hide code * commit '9f3628da2cbef7db47e5f9f5e0e2f69a451ee4b9': Cleanup gesture UI hide code
|
42b799ac283f322259fbb2d21ef1f946cb20af45 |
23-Sep-2014 |
Alan Newberger <alann@google.com> |
am 8f1ffed7: am b2b0e02c: Clean up unused code * commit '8f1ffed79db5d7e17f56501b5d62157846fb55bd': Clean up unused code
|
3190d3a8fa271f424d09550fb665b1898637b3e2 |
23-Sep-2014 |
Alan Newberger <alann@google.com> |
am 5f86f7fd: Cleanup gesture UI hide code * commit '5f86f7fdd19dad9cdf670e0504cfaddefd4a89fc': Cleanup gesture UI hide code
|
0a21e2096c29cfa8a0a260ffed8e225d354da5e1 |
23-Sep-2014 |
Alan Newberger <alann@google.com> |
am b2b0e02c: Clean up unused code * commit 'b2b0e02cb5f0aba8fed9389193fa98150da75efc': Clean up unused code
|
9f3628da2cbef7db47e5f9f5e0e2f69a451ee4b9 |
23-Sep-2014 |
Alan Newberger <alann@google.com> |
am 5f86f7fd: Cleanup gesture UI hide code * commit '5f86f7fdd19dad9cdf670e0504cfaddefd4a89fc': Cleanup gesture UI hide code
|
8f1ffed79db5d7e17f56501b5d62157846fb55bd |
23-Sep-2014 |
Alan Newberger <alann@google.com> |
am b2b0e02c: Clean up unused code * commit 'b2b0e02cb5f0aba8fed9389193fa98150da75efc': Clean up unused code
|
5f86f7fdd19dad9cdf670e0504cfaddefd4a89fc |
22-Sep-2014 |
Alan Newberger <alann@google.com> |
Cleanup gesture UI hide code Relocate show/hide of zoom UI in the onScaleBegin/onScaleEnd classes. Bug: 17613719 Change-Id: I400161c95c08c7f3b6b36487de703296236595bb
rc/com/android/camera/ui/PreviewOverlay.java
|
b2b0e02cb5f0aba8fed9389193fa98150da75efc |
22-Sep-2014 |
Alan Newberger <alann@google.com> |
Clean up unused code This UI code is completely unused, and has no reference from rest of app. Delete for cleanup. Bug: 17613719 Change-Id: I1d9d443ef6642cd434725fe71e59fa0220258789
rc/com/android/camera/PreviewGestures.java
rc/com/android/camera/ui/OverlayRenderer.java
rc/com/android/camera/ui/PieItem.java
rc/com/android/camera/ui/PieMenuButton.java
rc/com/android/camera/ui/PieRenderer.java
rc/com/android/camera/ui/RenderOverlay.java
rc/com/android/camera/ui/ZoomRenderer.java
|
5cc48d6032b9412d5825c82ab70f145c3c3056a4 |
22-Sep-2014 |
Spike Sprague <spikuru@google.com> |
monkey test NPE fix, another null check on mCameraDevice bug: 17604028 Change-Id: I7b45c101045b765562146ebe2c779e227a6227bd
rc/com/android/camera/PhotoModule.java
|
a62ed04fc1af31c1fdfa0e9ac9cc0acfec1b1f12 |
22-Sep-2014 |
Alan Newberger <alann@google.com> |
Fix filmstrip item bounds to filmstrip scale There's no reason to scale filmstrip items to anything other than the fixed filmstrip scale, and doing otherwise interferes with Glide caching and introduces flickers upon zoom. Bug: 17597708 Change-Id: Ia143b4d95a48e9e23bbf36ec0edf93599caaa01b
rc/com/android/camera/widget/FilmstripView.java
|
7f0cb468a6f32b0190d5c07b28f5353c428afd6d |
21-Sep-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I81a3dfdc6550fc8f9022690d936748769b23c966 Auto-generated-cl: translation import
es/values-hi/strings.xml
es/values-pt/strings.xml
|
5a0573dc52b4b6b42faa459b5e6c2e6a94c37534 |
20-Sep-2014 |
Alan Newberger <alann@google.com> |
am e6f258ba: resolved conflicts for merge of d0927687 to lmp-mr1-dev-plus-aosp * commit 'e6f258bab71af79e2c6131afaf26def437b110c6': Add scrolling support with a mouse wheel
|
9652134e6e1b312e348ed3565343741239907f11 |
20-Sep-2014 |
Alan Newberger <alann@google.com> |
resolved conflicts for merge of d0927687 to lmp-mr1-dev-plus-aosp Change-Id: If3841e2f9946db14bef7244bd29bcd7fd11168f6 (cherry picked from commit e6f258bab71af79e2c6131afaf26def437b110c6)
rc/com/android/camera/ui/FilmstripGestureRecognizer.java
rc/com/android/camera/widget/FilmstripLayout.java
rc/com/android/camera/widget/FilmstripView.java
|
e6f258bab71af79e2c6131afaf26def437b110c6 |
20-Sep-2014 |
Alan Newberger <alann@google.com> |
resolved conflicts for merge of d0927687 to lmp-mr1-dev-plus-aosp Change-Id: If3841e2f9946db14bef7244bd29bcd7fd11168f6
|
2d4b0949cf60ec96162bb3436df35db61abd6e09 |
20-Sep-2014 |
Alan Newberger <alann@google.com> |
am d0927687: (-s ours) Merge "Add scrolling support with a mouse wheel" * commit 'd0927687682a7ad433b23d25e87379177bb8edc7': Add scrolling support with a mouse wheel
|
fd575faad8b03125484f50e255ba553dc0c88db1 |
20-Sep-2014 |
Baligh Uddin <baligh@google.com> |
am 0f175802: (-s ours) am 78cb750d: (-s ours) am 8399a0c5: (-s ours) am 67bcd21a: (-s ours) am 82da5e95: (-s ours) am 02758e4c: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-glacier * commit '0f1758028c8d962cf524a9b273836ec19ca038e9': Import translations. DO NOT MERGE
|
d0927687682a7ad433b23d25e87379177bb8edc7 |
20-Sep-2014 |
Alan Newberger <alann@google.com> |
Merge "Add scrolling support with a mouse wheel"
|
0f1758028c8d962cf524a9b273836ec19ca038e9 |
20-Sep-2014 |
Baligh Uddin <baligh@google.com> |
am 78cb750d: (-s ours) am 8399a0c5: (-s ours) am 67bcd21a: (-s ours) am 82da5e95: (-s ours) am 02758e4c: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-glacier * commit '78cb750dc7a3be6f28b14c4bd45726d752afac95': Import translations. DO NOT MERGE
|
73cbb7dab6c53a311b9c81cfda4e1b3b2c6d6591 |
20-Sep-2014 |
Jiawen Chen <jiawen@google.com> |
am 24ccd5c2: am 6b748fa2: am 8867d3d0: am 5b88b83a: am 284a9b48: am 30ae8c64: Merge "Changed tap-to-meter rectangle and weights." into ub-camera-glacier * commit '24ccd5c23bdc6fa8f808383dcb713ebe7545d31c': Changed tap-to-meter rectangle and weights.
|
39c7568b20baa68171618b7e34dcc9f2ecf6e0ba |
20-Sep-2014 |
Baligh Uddin <baligh@google.com> |
am 41ed8da9: (-s ours) am 78462033: (-s ours) am dc3d4642: (-s ours) am 5628cfde: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev * commit '41ed8da9512741303d7ed131eeb4ff8fa70ad9ae': Import translations. DO NOT MERGE
|
d38eb93ffdda96e79ef48476fc767255315545d9 |
20-Sep-2014 |
Alan Newberger <alann@google.com> |
am cb7d69a6: am 6eb08885: am 0d4ad844: am 14f9d310: am 40b52050: am e684ea54: Merge "Fix CameraSettingsActivityHelper" into ub-camera-glacier * commit 'cb7d69a6558c7f2f32a21ea4e9264ce867e63d3f': Fix CameraSettingsActivityHelper
|
e4b772a426a11f268519785f3ac4e56cf4aedeed |
20-Sep-2014 |
Spike Sprague <spikuru@google.com> |
am 786cc4e9: am 10f6e1c7: am a34f0972: am 545c313a: am 94cd6522: am 19942a17: Merge "implement new trash icon, plus some asset cleanup" into ub-camera-glacier * commit '786cc4e93a75c47bfa584c822fd12393908bf6ce': implement new trash icon, plus some asset cleanup
|
6ab1bd6ada16c295d3fee01a187d7e7f0f1012bb |
20-Sep-2014 |
Spike Sprague <spikuru@google.com> |
am 0dc452ff: am 3110a91c: am 028374b4: am 7a133b82: am baae9e84: am 8bbb5122: Merge "add null check to updateCameraParametersPreferences to apease the monkey" into ub-camera-glacier * commit '0dc452ffc78e9eb007763986be16165f89870b5d': add null check to updateCameraParametersPreferences to apease the monkey
|
78cb750dc7a3be6f28b14c4bd45726d752afac95 |
20-Sep-2014 |
Baligh Uddin <baligh@google.com> |
am 8399a0c5: (-s ours) am 67bcd21a: (-s ours) am 82da5e95: (-s ours) am 02758e4c: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-glacier * commit '8399a0c584316d499b191b6ab9764faa38a289b2': Import translations. DO NOT MERGE
|
24ccd5c23bdc6fa8f808383dcb713ebe7545d31c |
20-Sep-2014 |
Jiawen Chen <jiawen@google.com> |
am 6b748fa2: am 8867d3d0: am 5b88b83a: am 284a9b48: am 30ae8c64: Merge "Changed tap-to-meter rectangle and weights." into ub-camera-glacier * commit '6b748fa26107cfe5ea8d960a0399f3f7fa7948ca': Changed tap-to-meter rectangle and weights.
|
41ed8da9512741303d7ed131eeb4ff8fa70ad9ae |
20-Sep-2014 |
Baligh Uddin <baligh@google.com> |
am 78462033: (-s ours) am dc3d4642: (-s ours) am 5628cfde: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev * commit '7846203368d89fdd1f976434e7820984f1ab878b': Import translations. DO NOT MERGE
|
8399a0c584316d499b191b6ab9764faa38a289b2 |
20-Sep-2014 |
Baligh Uddin <baligh@google.com> |
am 67bcd21a: (-s ours) am 82da5e95: (-s ours) am 02758e4c: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-glacier * commit '67bcd21a8245e4f478dd581085902a644dfeacdf': Import translations. DO NOT MERGE
|
8929aeccd3772d9a4cf1a1ddbd91562952638825 |
20-Sep-2014 |
Baligh Uddin <baligh@google.com> |
am 41a13974: (-s ours) am 82da5e95: (-s ours) am 02758e4c: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-glacier * commit '41a1397435ab2b20519f19a6ce07dabf540118b1': Import translations. DO NOT MERGE
|
fa85c84f2ae41198caadf6bcc890186dbaf3af4b |
12-Sep-2014 |
Olivier Gay <ogay@logitech.com> |
Add scrolling support with a mouse wheel When a physical mouse is connected, support scroll events from the mouse when pictures are displayed. In film strip view (full screen or not), both vertical and horizontal scroll events have the same bevahior: pictures are horizontally scrolled. In full screen, pictures are flinged. When a picture is zoomed the scroll is done either vertically or horizontally depending on user action. Change-Id: Idb3b12b0ff86e8a590fa7f1a54111700db84e543 Signed-off-by: Olivier Gay <ogay@logitech.com>
rc/com/android/camera/ui/FilmStripGestureRecognizer.java
rc/com/android/camera/ui/FilmStripView.java
|
6b748fa26107cfe5ea8d960a0399f3f7fa7948ca |
20-Sep-2014 |
Jiawen Chen <jiawen@google.com> |
am 8867d3d0: am 5b88b83a: am 284a9b48: am 30ae8c64: Merge "Changed tap-to-meter rectangle and weights." into ub-camera-glacier * commit '8867d3d04af805ce9b7b54ddb2cb81a6467ab1d9': Changed tap-to-meter rectangle and weights.
|
7846203368d89fdd1f976434e7820984f1ab878b |
20-Sep-2014 |
Baligh Uddin <baligh@google.com> |
am dc3d4642: (-s ours) am 5628cfde: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev * commit 'dc3d4642ee30ab8b34a1e73b705a66cc5348a835': Import translations. DO NOT MERGE
|
67bcd21a8245e4f478dd581085902a644dfeacdf |
20-Sep-2014 |
Baligh Uddin <baligh@google.com> |
am 82da5e95: (-s ours) am 02758e4c: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-glacier * commit '82da5e9543cf97c5e25a78b90ae94ea9cb32f5ee': Import translations. DO NOT MERGE
|
41a1397435ab2b20519f19a6ce07dabf540118b1 |
20-Sep-2014 |
Baligh Uddin <baligh@google.com> |
am 82da5e95: (-s ours) am 02758e4c: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-glacier * commit '82da5e9543cf97c5e25a78b90ae94ea9cb32f5ee': Import translations. DO NOT MERGE
|
0a9e31f5bfd4bf4044f090b209c8fbf39356cee7 |
20-Sep-2014 |
Jiawen Chen <jiawen@google.com> |
am 6dfb91e0: am 284a9b48: am 30ae8c64: Merge "Changed tap-to-meter rectangle and weights." into ub-camera-glacier * commit '6dfb91e02fe2a9b83550f599f9b35d70a64d3a48': Changed tap-to-meter rectangle and weights.
|
8867d3d04af805ce9b7b54ddb2cb81a6467ab1d9 |
20-Sep-2014 |
Jiawen Chen <jiawen@google.com> |
am 5b88b83a: am 284a9b48: am 30ae8c64: Merge "Changed tap-to-meter rectangle and weights." into ub-camera-glacier * commit '5b88b83ac82974c0b80343175c29644d226ee772': Changed tap-to-meter rectangle and weights.
|
dc3d4642ee30ab8b34a1e73b705a66cc5348a835 |
20-Sep-2014 |
Baligh Uddin <baligh@google.com> |
am 5628cfde: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev * commit '5628cfde3c815fdfd6814be94c536dedd69e79e9': Import translations. DO NOT MERGE
|
ea767114ce7e11d2d73c80f68af19beac3439bb4 |
20-Sep-2014 |
Baligh Uddin <baligh@google.com> |
am 02758e4c: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-glacier * commit '02758e4c60ea1ff5a78c6d7d8d77ee353a2bf6f5': Import translations. DO NOT MERGE
|
82da5e9543cf97c5e25a78b90ae94ea9cb32f5ee |
20-Sep-2014 |
Baligh Uddin <baligh@google.com> |
am 02758e4c: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-glacier * commit '02758e4c60ea1ff5a78c6d7d8d77ee353a2bf6f5': Import translations. DO NOT MERGE
|
5b88b83ac82974c0b80343175c29644d226ee772 |
20-Sep-2014 |
Jiawen Chen <jiawen@google.com> |
am 284a9b48: am 30ae8c64: Merge "Changed tap-to-meter rectangle and weights." into ub-camera-glacier * commit '284a9b48c896d4435362e7f757885b47ff748a1b': Changed tap-to-meter rectangle and weights.
|
6dfb91e02fe2a9b83550f599f9b35d70a64d3a48 |
20-Sep-2014 |
Jiawen Chen <jiawen@google.com> |
am 284a9b48: am 30ae8c64: Merge "Changed tap-to-meter rectangle and weights." into ub-camera-glacier * commit '284a9b48c896d4435362e7f757885b47ff748a1b': Changed tap-to-meter rectangle and weights.
|
5628cfde3c815fdfd6814be94c536dedd69e79e9 |
20-Sep-2014 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
|
96787364a92102472c756ffbb02e8735dda6e431 |
20-Sep-2014 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE"
|
02758e4c60ea1ff5a78c6d7d8d77ee353a2bf6f5 |
20-Sep-2014 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into ub-camera-glacier
|
512e5b46196dd097aca0a47bd7b95bf37950877b |
20-Sep-2014 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into ub-camera-haleakala
|
284a9b48c896d4435362e7f757885b47ff748a1b |
20-Sep-2014 |
Jiawen Chen <jiawen@google.com> |
am 30ae8c64: Merge "Changed tap-to-meter rectangle and weights." into ub-camera-glacier * commit '30ae8c64cec9313fc050daf94ae3fbddedf80b36': Changed tap-to-meter rectangle and weights.
|
ff35f85800f42e36c4c766e777b6251edaef33d3 |
20-Sep-2014 |
Jiawen Chen <jiawen@google.com> |
am 30ae8c64: Merge "Changed tap-to-meter rectangle and weights." into ub-camera-glacier * commit '30ae8c64cec9313fc050daf94ae3fbddedf80b36': Changed tap-to-meter rectangle and weights.
|
30ae8c64cec9313fc050daf94ae3fbddedf80b36 |
20-Sep-2014 |
Jiawen Chen <jiawen@google.com> |
Merge "Changed tap-to-meter rectangle and weights." into ub-camera-glacier
|
cb7d69a6558c7f2f32a21ea4e9264ce867e63d3f |
19-Sep-2014 |
Alan Newberger <alann@google.com> |
am 6eb08885: am 0d4ad844: am 14f9d310: am 40b52050: am e684ea54: Merge "Fix CameraSettingsActivityHelper" into ub-camera-glacier * commit '6eb08885f73fd05f10a1a6031ba9ae607ac04bbf': Fix CameraSettingsActivityHelper
|
786cc4e93a75c47bfa584c822fd12393908bf6ce |
19-Sep-2014 |
Spike Sprague <spikuru@google.com> |
am 10f6e1c7: am a34f0972: am 545c313a: am 94cd6522: am 19942a17: Merge "implement new trash icon, plus some asset cleanup" into ub-camera-glacier * commit '10f6e1c707609bf7abca1c7b97a6d616bf80e668': implement new trash icon, plus some asset cleanup
|
6eb08885f73fd05f10a1a6031ba9ae607ac04bbf |
19-Sep-2014 |
Alan Newberger <alann@google.com> |
am 0d4ad844: am 14f9d310: am 40b52050: am e684ea54: Merge "Fix CameraSettingsActivityHelper" into ub-camera-glacier * commit '0d4ad84475bc930a7303df8f2fa29eacdbb148aa': Fix CameraSettingsActivityHelper
|
10f6e1c707609bf7abca1c7b97a6d616bf80e668 |
19-Sep-2014 |
Spike Sprague <spikuru@google.com> |
am a34f0972: am 545c313a: am 94cd6522: am 19942a17: Merge "implement new trash icon, plus some asset cleanup" into ub-camera-glacier * commit 'a34f0972185ee99ad34d9828ae5b4ada2bf9f5cd': implement new trash icon, plus some asset cleanup
|
0d4ad84475bc930a7303df8f2fa29eacdbb148aa |
19-Sep-2014 |
Alan Newberger <alann@google.com> |
am 14f9d310: am 40b52050: am e684ea54: Merge "Fix CameraSettingsActivityHelper" into ub-camera-glacier * commit '14f9d3102161b59b46988cd6bfd48ff3b2a6aa7a': Fix CameraSettingsActivityHelper
|
a34f0972185ee99ad34d9828ae5b4ada2bf9f5cd |
19-Sep-2014 |
Spike Sprague <spikuru@google.com> |
am 545c313a: am 94cd6522: am 19942a17: Merge "implement new trash icon, plus some asset cleanup" into ub-camera-glacier * commit '545c313a87e04b6a66888359144dbe91e7e62311': implement new trash icon, plus some asset cleanup
|
04408f74cee92e6712d548ce10561562f4e5248d |
19-Sep-2014 |
Alan Newberger <alann@google.com> |
am 2aa7189d: am 40b52050: am e684ea54: Merge "Fix CameraSettingsActivityHelper" into ub-camera-glacier * commit '2aa7189d020e5fc63fb626ae8a932f6e19c87a8d': Fix CameraSettingsActivityHelper
|
9e6b902fcb0b350159fd3dfd3eea9f481cb6ef07 |
19-Sep-2014 |
Spike Sprague <spikuru@google.com> |
am 11c70fb3: am 94cd6522: am 19942a17: Merge "implement new trash icon, plus some asset cleanup" into ub-camera-glacier * commit '11c70fb3f0115379acbe3596fc4cb2465c7ea506': implement new trash icon, plus some asset cleanup
|
2aa7189d020e5fc63fb626ae8a932f6e19c87a8d |
19-Sep-2014 |
Alan Newberger <alann@google.com> |
am 40b52050: am e684ea54: Merge "Fix CameraSettingsActivityHelper" into ub-camera-glacier * commit '40b52050078c664295b7bb830110587e64119bbb': Fix CameraSettingsActivityHelper
|
14f9d3102161b59b46988cd6bfd48ff3b2a6aa7a |
19-Sep-2014 |
Alan Newberger <alann@google.com> |
am 40b52050: am e684ea54: Merge "Fix CameraSettingsActivityHelper" into ub-camera-glacier * commit '40b52050078c664295b7bb830110587e64119bbb': Fix CameraSettingsActivityHelper
|
11c70fb3f0115379acbe3596fc4cb2465c7ea506 |
19-Sep-2014 |
Spike Sprague <spikuru@google.com> |
am 94cd6522: am 19942a17: Merge "implement new trash icon, plus some asset cleanup" into ub-camera-glacier * commit '94cd65226208eed1b9f350d0b8f5e8b82fa39290': implement new trash icon, plus some asset cleanup
|
545c313a87e04b6a66888359144dbe91e7e62311 |
19-Sep-2014 |
Spike Sprague <spikuru@google.com> |
am 94cd6522: am 19942a17: Merge "implement new trash icon, plus some asset cleanup" into ub-camera-glacier * commit '94cd65226208eed1b9f350d0b8f5e8b82fa39290': implement new trash icon, plus some asset cleanup
|
b062ae78a8f85a8143b58d37c930a900465d03ec |
19-Sep-2014 |
Alan Newberger <alann@google.com> |
am e684ea54: Merge "Fix CameraSettingsActivityHelper" into ub-camera-glacier * commit 'e684ea54121ef885a0aa84cd3bea50c5a345d55e': Fix CameraSettingsActivityHelper
|
d510e3e8814838f2ba9f0b5109f40d8fc6017ccc |
19-Sep-2014 |
Spike Sprague <spikuru@google.com> |
am 19942a17: Merge "implement new trash icon, plus some asset cleanup" into ub-camera-glacier * commit '19942a171844d6bd361026a6b8df2eebaa0661db': implement new trash icon, plus some asset cleanup
|
40b52050078c664295b7bb830110587e64119bbb |
19-Sep-2014 |
Alan Newberger <alann@google.com> |
am e684ea54: Merge "Fix CameraSettingsActivityHelper" into ub-camera-glacier * commit 'e684ea54121ef885a0aa84cd3bea50c5a345d55e': Fix CameraSettingsActivityHelper
|
94cd65226208eed1b9f350d0b8f5e8b82fa39290 |
19-Sep-2014 |
Spike Sprague <spikuru@google.com> |
am 19942a17: Merge "implement new trash icon, plus some asset cleanup" into ub-camera-glacier * commit '19942a171844d6bd361026a6b8df2eebaa0661db': implement new trash icon, plus some asset cleanup
|
e684ea54121ef885a0aa84cd3bea50c5a345d55e |
19-Sep-2014 |
Alan Newberger <alann@google.com> |
Merge "Fix CameraSettingsActivityHelper" into ub-camera-glacier
|
19942a171844d6bd361026a6b8df2eebaa0661db |
19-Sep-2014 |
Spike Sprague <spikuru@google.com> |
Merge "implement new trash icon, plus some asset cleanup" into ub-camera-glacier
|
0dc452ffc78e9eb007763986be16165f89870b5d |
19-Sep-2014 |
Spike Sprague <spikuru@google.com> |
am 3110a91c: am 028374b4: am 7a133b82: am baae9e84: am 8bbb5122: Merge "add null check to updateCameraParametersPreferences to apease the monkey" into ub-camera-glacier * commit '3110a91c041e36a34d52df3d364b450539840704': add null check to updateCameraParametersPreferences to apease the monkey
|
3110a91c041e36a34d52df3d364b450539840704 |
19-Sep-2014 |
Spike Sprague <spikuru@google.com> |
am 028374b4: am 7a133b82: am baae9e84: am 8bbb5122: Merge "add null check to updateCameraParametersPreferences to apease the monkey" into ub-camera-glacier * commit '028374b4a75decc2a31740dabcfc338fd74d2b54': add null check to updateCameraParametersPreferences to apease the monkey
|
028374b4a75decc2a31740dabcfc338fd74d2b54 |
19-Sep-2014 |
Spike Sprague <spikuru@google.com> |
am 7a133b82: am baae9e84: am 8bbb5122: Merge "add null check to updateCameraParametersPreferences to apease the monkey" into ub-camera-glacier * commit '7a133b82a571188d56a4aa8b7773af5dffa11f6f': add null check to updateCameraParametersPreferences to apease the monkey
|
7a133b82a571188d56a4aa8b7773af5dffa11f6f |
19-Sep-2014 |
Spike Sprague <spikuru@google.com> |
am baae9e84: am 8bbb5122: Merge "add null check to updateCameraParametersPreferences to apease the monkey" into ub-camera-glacier * commit 'baae9e8478990258edc7e6d014a68e0796859de9': add null check to updateCameraParametersPreferences to apease the monkey
|
037e25a68613cc95add0e8da3f39f820ddee4ab8 |
19-Sep-2014 |
Spike Sprague <spikuru@google.com> |
am f608095c: am baae9e84: am 8bbb5122: Merge "add null check to updateCameraParametersPreferences to apease the monkey" into ub-camera-glacier * commit 'f608095cf8dfae6759186a4148878c01797b4b34': add null check to updateCameraParametersPreferences to apease the monkey
|
f608095cf8dfae6759186a4148878c01797b4b34 |
19-Sep-2014 |
Spike Sprague <spikuru@google.com> |
am baae9e84: am 8bbb5122: Merge "add null check to updateCameraParametersPreferences to apease the monkey" into ub-camera-glacier * commit 'baae9e8478990258edc7e6d014a68e0796859de9': add null check to updateCameraParametersPreferences to apease the monkey
|
baae9e8478990258edc7e6d014a68e0796859de9 |
19-Sep-2014 |
Spike Sprague <spikuru@google.com> |
am 8bbb5122: Merge "add null check to updateCameraParametersPreferences to apease the monkey" into ub-camera-glacier * commit '8bbb51221106c12b0cf7e933fc2af2a63b84b1c1': add null check to updateCameraParametersPreferences to apease the monkey
|
4c96d4bdeada782c08a993cc1871a03bbd3c1509 |
19-Sep-2014 |
Spike Sprague <spikuru@google.com> |
am 8bbb5122: Merge "add null check to updateCameraParametersPreferences to apease the monkey" into ub-camera-glacier * commit '8bbb51221106c12b0cf7e933fc2af2a63b84b1c1': add null check to updateCameraParametersPreferences to apease the monkey
|
8bbb51221106c12b0cf7e933fc2af2a63b84b1c1 |
19-Sep-2014 |
Spike Sprague <spikuru@google.com> |
Merge "add null check to updateCameraParametersPreferences to apease the monkey" into ub-camera-glacier
|
ae56c121dcf772e1c7bc77c5e9009b1bc5ee4e44 |
19-Sep-2014 |
Spike Sprague <spikuru@google.com> |
add null check to updateCameraParametersPreferences to apease the monkey bug: 17580046 Change-Id: I4a109c1134684f6d5b2dafdb138137ef36f208f0
rc/com/android/camera/PhotoModule.java
|
695a0f428a6e884e362cb4c28bf1d5767eec005f |
19-Sep-2014 |
Spike Sprague <spikuru@google.com> |
am 0ddc84de: am af30546e: am a87a589c: am 3c1f4c48: am 476a9e24: am 963775c3: portability layer doesn\'t work well with startPreviewWithCallback() here\'s a dirty dirty workaround. * commit '0ddc84ded0bb0ee8f73cfff5429d1627b887584b': portability layer doesn't work well with startPreviewWithCallback() here's a dirty dirty workaround.
|
0ddc84ded0bb0ee8f73cfff5429d1627b887584b |
19-Sep-2014 |
Spike Sprague <spikuru@google.com> |
am af30546e: am a87a589c: am 3c1f4c48: am 476a9e24: am 963775c3: portability layer doesn\'t work well with startPreviewWithCallback() here\'s a dirty dirty workaround. * commit 'af30546e0c6d4a0fd4f9dc9a6b0a0275419634a1': portability layer doesn't work well with startPreviewWithCallback() here's a dirty dirty workaround.
|
af30546e0c6d4a0fd4f9dc9a6b0a0275419634a1 |
19-Sep-2014 |
Spike Sprague <spikuru@google.com> |
am a87a589c: am 3c1f4c48: am 476a9e24: am 963775c3: portability layer doesn\'t work well with startPreviewWithCallback() here\'s a dirty dirty workaround. * commit 'a87a589c25dd95d4606ac6dba5f38aee11c0c2b2': portability layer doesn't work well with startPreviewWithCallback() here's a dirty dirty workaround.
|
3d345a13a9c7a0a3ffc4821a64adfdfd3f685ccf |
19-Sep-2014 |
Spike Sprague <spikuru@google.com> |
am 26631415: am b9d2a0f1: am 3194f409: am f18e95bc: am af25fb04: am 3c3b31df: mode switch jank fixes * commit '26631415ba50661d92daef45ce73bc7761301442':
|
94a3a5ce9fd30258bb4ee436b87cf3b85043e224 |
19-Sep-2014 |
Baligh Uddin <baligh@google.com> |
am a60f2d5b: (-s ours) am 81ff40a8: (-s ours) am d40843f2: (-s ours) am 56d1c6bd: (-s ours) am 9a275f5e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit 'a60f2d5b6224e26f6c4075726feee02f3aba762b':
|
b2a742f99d9cca6c037e662688ba06fd57763626 |
19-Sep-2014 |
Puneet Lall <puneetl@google.com> |
am ca1cb95a: am da99b974: am dfa43009: am b99765c2: am 0d7a8c08: am 6f1dfe69: Merge "Don\'t set mCameraAppUI to null in onDestroy" into ub-camera-glacier * commit 'ca1cb95a01bb45a3a8b3ea0d70ca0cc7cd865822':
|
73cdc92cabd3169214d6970f56fd94e6e0d551d6 |
19-Sep-2014 |
Spike Sprague <spikuru@google.com> |
am 55be791b: am 360ff04e: am d9532ea7: am 778c50fc: am ad1462a9: am a16219d5: set proper alpha on shutter button on mode switch, eliminates a janky alpha flash * commit '55be791b3bbe53d34f47a7001cd79d7226c4ab09':
|
a87a589c25dd95d4606ac6dba5f38aee11c0c2b2 |
19-Sep-2014 |
Spike Sprague <spikuru@google.com> |
am 3c1f4c48: am 476a9e24: am 963775c3: portability layer doesn\'t work well with startPreviewWithCallback() here\'s a dirty dirty workaround. * commit '3c1f4c48c69d8946d2ff65bf4b30e48e8124fded': portability layer doesn't work well with startPreviewWithCallback() here's a dirty dirty workaround.
|
0d9b4776f5300bf451533df628cde15c4d826565 |
19-Sep-2014 |
Spike Sprague <spikuru@google.com> |
am 0f44eb07: am 476a9e24: am 963775c3: portability layer doesn\'t work well with startPreviewWithCallback() here\'s a dirty dirty workaround. * commit '0f44eb07f8eb99d87556db76c4b5d20fc399b765': portability layer doesn't work well with startPreviewWithCallback() here's a dirty dirty workaround.
|
3c1f4c48c69d8946d2ff65bf4b30e48e8124fded |
19-Sep-2014 |
Spike Sprague <spikuru@google.com> |
am 476a9e24: am 963775c3: portability layer doesn\'t work well with startPreviewWithCallback() here\'s a dirty dirty workaround. * commit '476a9e2490d91a125fc608d4e4b4b31768b65ee7': portability layer doesn't work well with startPreviewWithCallback() here's a dirty dirty workaround.
|
0f44eb07f8eb99d87556db76c4b5d20fc399b765 |
19-Sep-2014 |
Spike Sprague <spikuru@google.com> |
am 476a9e24: am 963775c3: portability layer doesn\'t work well with startPreviewWithCallback() here\'s a dirty dirty workaround. * commit '476a9e2490d91a125fc608d4e4b4b31768b65ee7': portability layer doesn't work well with startPreviewWithCallback() here's a dirty dirty workaround.
|
476a9e2490d91a125fc608d4e4b4b31768b65ee7 |
19-Sep-2014 |
Spike Sprague <spikuru@google.com> |
am 963775c3: portability layer doesn\'t work well with startPreviewWithCallback() here\'s a dirty dirty workaround. * commit '963775c3092e2553ae8157df9e5d307d4f711de1': portability layer doesn't work well with startPreviewWithCallback() here's a dirty dirty workaround.
|
d5214254cd05a9695ffc0a39b88b3b2b9692a937 |
19-Sep-2014 |
Spike Sprague <spikuru@google.com> |
am 963775c3: portability layer doesn\'t work well with startPreviewWithCallback() here\'s a dirty dirty workaround. * commit '963775c3092e2553ae8157df9e5d307d4f711de1': portability layer doesn't work well with startPreviewWithCallback() here's a dirty dirty workaround.
|
d4e597e69c777ef219f252a0e1aef87c32baef35 |
19-Sep-2014 |
Puneet Lall <puneetl@google.com> |
am 3517ef7a: am 5042ba32: am a072e605: am 7aa59807: am 5c56b2c4: am 70a96525: Don\'t send redundant requests to start the preview * commit '3517ef7a378d3b2c224621d77c7d7f7c8c0984b2':
|
6e8bcbcb71c022f3ddb855986e61fc3d6c1872d1 |
19-Sep-2014 |
Alan Newberger <alann@google.com> |
am 66703800: am b720bcfc: am 4a3de2cf: am 5677bb5e: am 3c324d34: am 486ba1da: Revert layout change for Camera * commit '66703800d2f064710cf5379501a2fa62c19d4997':
|
692620785e8486fa33846032fcf6447cb5940160 |
19-Sep-2014 |
Alan Newberger <alann@google.com> |
am d38d8416: am 2d6e0f7c: am de156744: am 30969a92: am 4a7668d7: am ca5173d8: Move launcher icons to mipmap * commit 'd38d84163a5e0057ac9a533455ad5e3502c7f5d6':
|
e13e52be94bd2f9e1583005bdbc75a83d414e443 |
19-Sep-2014 |
Alan Newberger <alann@google.com> |
am 7aacb364: am fe77ecfa: am 1da8d800: am 5e8d579a: am 1bbdb135: am 45f316bc: Establish synchronous camera closing when app utilizes API1/API2 * commit '7aacb3644467dc85c44269c719dcb30662826c27':
|
e625e5c8672bc521591d76e4d453940248424f3c |
19-Sep-2014 |
Baligh Uddin <baligh@google.com> |
am 79e49fce: (-s ours) am a3a6c5b1: (-s ours) am 25361e3f: (-s ours) am 522466e6: (-s ours) am f2382657: (-s ours) am 0c5fc1d3: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-glacier * commit '79e49fce885951bbe98bbae5067758153c7a2622':
|
b1ed943ceaf0f388b656a743d73669fbe7940f33 |
19-Sep-2014 |
Baligh Uddin <baligh@google.com> |
am 80becaa7: (-s ours) am eee44b53: (-s ours) am 0f1acda2: (-s ours) am 03b392d9: (-s ours) am 91225f8b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit '80becaa7e4dedf532847ee384abf210fbde00c97':
|
4f921c353964d8bca0fdc1e88dea24ce8f458660 |
19-Sep-2014 |
Andy Huibers <andyhuibers@google.com> |
am 245a5dd0: am 7756833e: am 29eae70b: am 02a24bc0: am d3db7916: am e6ebf3d7: If we are using CaptureModule for Gcam only, turn off flash. * commit '245a5dd01bc7de8a68c6c67064810b95bd972a1b':
|
025646331bc15489617ca311e24e0e3e2e0fb172 |
19-Sep-2014 |
Alan Newberger <alann@google.com> |
am 89c9269d: am 5420d57f: am 74b1d995: am 893acd56: am 11d3405c: am 0c9af933: Merge "Revert "Delay PhotoModule preview cover removal to address jank"" into ub-camera-glacier * commit '89c9269d8adf4567c875c4ab3c2c4aca994a0594':
|
73e9025fc0d79e7ca61b56d1ef1ef1610b5cc96c |
19-Sep-2014 |
Alan Newberger <alann@google.com> |
am 6d11d4d1: am bb4b7f13: am 168ca8e3: am c0e5cc1e: am 73d569d4: am 7351415d: Reset aspect ratio on pause * commit '6d11d4d1caae89d8c1dcf6cd55303a5ce36db34b':
|
0d09837c4aa81efc7a0af10ac55f4aecac322b24 |
19-Sep-2014 |
Spike Sprague <spikuru@google.com> |
am c63799c8: am 89ab5057: am 925b1a0c: am cfaa646d: am ac1dd2f6: am 87a2300f: Merge "workaround fix" into ub-camera-glacier * commit 'c63799c8bf4e38429b80492be30373fd9ad8ebf2':
|
143652f757df14460cb8f6591862f36ae2bc841e |
19-Sep-2014 |
Alan Newberger <alann@google.com> |
am 3e0c8d32: am 73bae32e: am 219d86fa: am 3861e387: am 3d330a60: am 3096e672: Merge "Delay PhotoModule preview cover removal to address jank" into ub-camera-glacier * commit '3e0c8d3209ed4ea6c76690ba617f1c3fbdfdda24':
|
279c355682c0a5eecf8c6ad4aa1c80c69a1892b6 |
19-Sep-2014 |
Senpo Hu <senpo@google.com> |
am adc2e32e: am b524167d: am 9a2ff1e8: am 89e485e0: am cdf62f78: am d3ee86b7: Merge "Return to filmstrip when video playback finishes." into ub-camera-glacier * commit 'adc2e32e60a3e33c8bfbd2463b8b01a83bed8c6e':
|
61646c9aaf2b0dafb0ecdc8081234f9a729ab3e3 |
19-Sep-2014 |
Baligh Uddin <baligh@google.com> |
am 2573f791: (-s ours) am f1eeedb7: (-s ours) am 4bd2b9b5: (-s ours) am f5cafa5a: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev * commit '2573f7917166f837dae1e79c377279ea5d5741ad': Import translations. DO NOT MERGE
|
0f3333b8ac11def76ba57067442537a32a0f301b |
19-Sep-2014 |
Senpo Hu <senpo@google.com> |
am a8b58fd3: am 31e3d15f: am dcf60eea: am 5675b8af: Fix the upside-down orienation bug in CaptureModule. * commit 'a8b58fd36b62996f63d73e1b3cbcc9c12bfeefc3':
|
cd78bbef9b3edd91f598ae9355d3bd32b6762d4e |
19-Sep-2014 |
Alan Newberger <alann@google.com> |
am 67eaeed4: am 8f6e750d: am 45090bab: am d79b38d6: Merge "Remove jank on camera options switching" into ub-camera-glacier * commit '67eaeed4bf11bc38bb966f0919adf0feb9df8d0e':
|
d2b2c3072a78bbf19be62f6611a1a4bce86a6ba8 |
19-Sep-2014 |
Jiawen Chen <jiawen@google.com> |
am f129d9eb: am edf2b787: am d7a4c3e2: am 9cefdd49: Changed double to float. viewFinder -> viewfinder. * commit 'f129d9eb617cadfc3866327812bc5b8c172a1a58':
|
fc96a3b811a030e51a82f80b905db80a117f96f0 |
19-Sep-2014 |
Alan Newberger <alann@google.com> |
am 6b4e11b8: am 59a9d83b: am 0a156cf6: am ffc395d6: Reinitialize shutter button in Camera mode upon preview start * commit '6b4e11b80fe56bc195fb4fa32f4e0ed23d13be81':
|
9316885aed2c2ae7165dca968ece775368703a14 |
19-Sep-2014 |
Alan Newberger <alann@google.com> |
am 0e7b4567: am 309cdabd: am 2acdb01d: am 5c4bd6b5: Reduce logging for unknown camera scope * commit '0e7b45670a16afae88fa4c5f8fe8f0577349b4f0':
|
263da4f0251cba90999ad4cbca3aeae2fa9811bd |
19-Sep-2014 |
Andy Huibers <andyhuibers@google.com> |
am 1a0b19e1: am 5af3ed93: am 91c1c555: am a710f371: Merge "This fixes Bitmap.createBitmap offset bug in L, not sure why." into ub-camera-glacier * commit '1a0b19e14b280c38c64c5efecb5b69cccaf0fa6f':
|
e0dccb205cb32743bf871a2954463ff2092242c1 |
19-Sep-2014 |
Qiwen Zhao <zhao@google.com> |
am a605959f: (-s ours) am c6456b7b: am 031bcdbd: am fd97c6da: (-s ours) Merge "DO NOT MERGE: Adjust for camera2 API changes" into ub-camera-glacier * commit 'a605959fe487264591fa7f3b1d541b07b1e8bd7a':
|
b720720992842966e0ebd84382b2737e873b19d1 |
19-Sep-2014 |
Nicolas Prevot <nprevot@google.com> |
am eed1539e: am 0c7af463: am aefc884c: am 42a5ad5a: Merge "Granting read permission in the result intent for VIDEO_CAPTURE." into ub-camera-glacier * commit 'eed1539e431b8e757f70e387e9d84c052b729c84':
|
d4a3638cf66e93070825bddb9ec1a6d35a6e9b39 |
19-Sep-2014 |
Andy Huibers <andyhuibers@google.com> |
am a665c7da: am 614e05da: am 458590b6: am 5e3bf4cc: Remove toast. This reverts commit 779414e8bfe23d66de310570ff2314654e45ec9f. * commit 'a665c7da57b42a67d85cab722e63fa7165376542':
|
47b3415ffa0a62a28d541aa25b8e951b93bc8960 |
19-Sep-2014 |
Senpo Hu <senpo@google.com> |
am 5e442857: am 877489aa: am c4f2f4d9: am b954b3e8: Merge "Always match camera orientation with device orientation regardless portrait lock." into ub-camera-glacier * commit '5e44285741e1034d7d417aa896a4bad34d2470cd':
|
7095168a0e7aeefeaabcabfb806c443cc96c2699 |
19-Sep-2014 |
Senpo Hu <senpo@google.com> |
am 7d63dbcf: am 12f408cc: am 7a3bdb23: am 65c00136: Set video quality pref default values at startup. * commit '7d63dbcf80b79358269f9ed902266cf9aaa86e43':
|
d21abcc3d4d15ef8a2e4d197f4ab8d511ddb9e64 |
19-Sep-2014 |
Eino-Ville Talvala <etalvala@google.com> |
am c8db704b: am 58eb8853: am 420c2c42: Merge "Adjust for camera2 API changes" into lmp-dev * commit 'c8db704bc6f41afcbee0cabdb2ecb135a42a3765':
|
963775c3092e2553ae8157df9e5d307d4f711de1 |
19-Sep-2014 |
Spike Sprague <spikuru@google.com> |
portability layer doesn't work well with startPreviewWithCallback() here's a dirty dirty workaround. bug: 17576554 Change-Id: Ief40b65ce49712153f6ef604a3513348e493d4d9
rc/com/android/camera/PhotoModule.java
|
e264942b1969987b9cf97c4b2cedbe0290fce21b |
19-Sep-2014 |
bulic <bulic@google.com> |
am 03b99c42: Merge branch \'lmp-mr1-dev-plus-aosp\' of https://googleplex-android.googlesource.com/_direct/platform/packages/apps/Camera2 into lmp-mr1-dev-plus-aosp * commit '03b99c42afcbe367f4db6358b7e76510106b8a43':
|
40a3f598507169c070ab18289053ee55a86a6535 |
19-Sep-2014 |
Spike Sprague <spikuru@google.com> |
am b40e7d28: am ba677c7e: am b8555b66: am 767a1186: Merge "back to bigger HDR+ icons" into ub-camera-glacier * commit 'b40e7d2834030fd3bd80f17eed27c7e0265e2d7e':
|
8645781c1e16a75db9112fdc5bf43db751df6dc1 |
19-Sep-2014 |
Baligh Uddin <baligh@google.com> |
am 6bb99f62: am 5d3bebde: keep history after reset to lmp-dev * commit '6bb99f623bf8ca7d9624705193483413314a7f3c': Import translations. DO NOT MERGE
|
f112737405fdd387fae584f5148fe4556db5bc07 |
18-Sep-2014 |
Spike Sprague <spikuru@google.com> |
am 23f27f22: am d99f98a3: am af25fb04: am 3c3b31df: mode switch jank fixes * commit '23f27f22033525b5ea428a4a387ae528502759dc': mode switch jank fixes
|
26631415ba50661d92daef45ce73bc7761301442 |
18-Sep-2014 |
Spike Sprague <spikuru@google.com> |
am b9d2a0f1: am 3194f409: am f18e95bc: am af25fb04: am 3c3b31df: mode switch jank fixes * commit 'b9d2a0f156eb7cdc6d40d1fdb91231ef2a250b7b': mode switch jank fixes
|
23f27f22033525b5ea428a4a387ae528502759dc |
18-Sep-2014 |
Spike Sprague <spikuru@google.com> |
am d99f98a3: am af25fb04: am 3c3b31df: mode switch jank fixes * commit 'd99f98a3751fe414aaa03ad85e66625c3cf481e6': mode switch jank fixes
|
b9d2a0f156eb7cdc6d40d1fdb91231ef2a250b7b |
18-Sep-2014 |
Spike Sprague <spikuru@google.com> |
am 3194f409: am f18e95bc: am af25fb04: am 3c3b31df: mode switch jank fixes * commit '3194f4099bd441629242d52a6ff9f1974cf9cce2': mode switch jank fixes
|
3194f4099bd441629242d52a6ff9f1974cf9cce2 |
18-Sep-2014 |
Spike Sprague <spikuru@google.com> |
am f18e95bc: am af25fb04: am 3c3b31df: mode switch jank fixes * commit 'f18e95bc5548f9c05e4debd47d43cc9d2be0655d': mode switch jank fixes
|
f18e95bc5548f9c05e4debd47d43cc9d2be0655d |
18-Sep-2014 |
Spike Sprague <spikuru@google.com> |
am af25fb04: am 3c3b31df: mode switch jank fixes * commit 'af25fb04968d9212ec47367f6ba78ee20ca76d05': mode switch jank fixes
|
d99f98a3751fe414aaa03ad85e66625c3cf481e6 |
18-Sep-2014 |
Spike Sprague <spikuru@google.com> |
am af25fb04: am 3c3b31df: mode switch jank fixes * commit 'af25fb04968d9212ec47367f6ba78ee20ca76d05': mode switch jank fixes
|
a967b8c13a44128aa358778ab4d4dc19d1e8e329 |
18-Sep-2014 |
Spike Sprague <spikuru@google.com> |
am 3c3b31df: mode switch jank fixes * commit '3c3b31dfd5ec7a43e89cd4695cc8c498afc3a91d': mode switch jank fixes
|
af25fb04968d9212ec47367f6ba78ee20ca76d05 |
18-Sep-2014 |
Spike Sprague <spikuru@google.com> |
am 3c3b31df: mode switch jank fixes * commit '3c3b31dfd5ec7a43e89cd4695cc8c498afc3a91d': mode switch jank fixes
|
3c3b31dfd5ec7a43e89cd4695cc8c498afc3a91d |
08-Sep-2014 |
Spike Sprague <spikuru@google.com> |
mode switch jank fixes puts many ValueAnimators news into initialize methods changes startPreview() calls to startPreviewWithCallback() puts MultToggleImageButton's bitmap combine into an AsyncTask bug: 17070332 Change-Id: Idea6396264588b345ed27b9f96f9434ff3e7e77c
rc/com/android/camera/MultiToggleImageButton.java
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/VideoModule.java
rc/com/android/camera/app/CameraAppUI.java
rc/com/android/camera/ui/ModeIconView.java
rc/com/android/camera/ui/ModeListView.java
rc/com/android/camera/ui/ModeSelectorItem.java
|
d5a242b36b29abaaf760f7a2a9bcd5a04766eafb |
18-Sep-2014 |
Spike Sprague <spikuru@google.com> |
implement new trash icon, plus some asset cleanup bug: 17566685 Change-Id: Ia7b55ad3b6fed939c19abcde12cbf34726ba919c
es/drawable-hdpi/ic_discard_disabled.png
es/drawable-hdpi/ic_discard_normal.png
es/drawable-hdpi/ic_menu_trash_holo_light.png
es/drawable-mdpi/ic_discard_disabled.png
es/drawable-mdpi/ic_discard_normal.png
es/drawable-mdpi/ic_menu_trash_holo_light.png
es/drawable-xhdpi/ic_discard_disabled.png
es/drawable-xhdpi/ic_discard_normal.png
es/drawable-xxhdpi/ic_discard_disabled.png
es/drawable-xxhdpi/ic_discard_normal.png
es/drawable/ic_menu_trash.xml
|
0971376b0ddf12c8aa886ad9109f6a8929095154 |
17-Sep-2014 |
Jiawen Chen <jiawen@google.com> |
Changed tap-to-meter rectangle and weights. Bug: 17417649 - Clarified widths in Settings3A. - For Gcam only, reduced AE box to 12.25% of the shorter edge of the crop rectangle. This matches the setting on Nexus 5. - For Gcam only, changed AE weight to 22 after consultations with Ryan. - Tested with Gcam and it final shots look great in HDR scenes. - Does not fully address b/17417649: ISP AE ignores the weight completely and overcompensates for the tap region. - Changed AutoFocusHelper to take touch points in normalized portrait coordinates along with a sensor orientation. The output is a MeteringRectangle in sensor pixels. - Fixed a bug where a digital-zoomed tap doesn't work when the rect intersects edges. It should have been clamp, not check for intersection and return the full crop rectangle if it doesn't intersect. - Submit simultaneously with ag/549706. Change-Id: If084e64ecbfc4a08ece96a7cebfcaf835d92b9d1
rc/com/android/camera/one/OneCamera.java
rc/com/android/camera/one/Settings3A.java
rc/com/android/camera/one/v2/AutoFocusHelper.java
rc/com/android/camera/one/v2/OneCameraImpl.java
rc/com/android/camera/one/v2/OneCameraZslImpl.java
rc/com/android/camera/util/CameraUtil.java
|
afba9c16af87f36942a8af0b62efa7855e8b48b6 |
17-Sep-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I54ded7422ba6bf54292d5a7c784bd52a4ba13e06 Auto-generated-cl: translation import
es/values-am/strings.xml
es/values-es/strings.xml
es/values-hi/strings.xml
|
b9cb467a2cdcc48e61123c6596f1541bd82e7c5c |
17-Sep-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I6541f685bfc16e910b5689acbe74e15e07c5bd5b Auto-generated-cl: translation import
es/values-am/strings.xml
es/values-es/strings.xml
es/values-hi/strings.xml
|
36d9e12f7ed5efedb46f891902552339c5a4c69d |
17-Sep-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I88577c129a8174574d3909e0464122dbc5065620 Auto-generated-cl: translation import
es/values-am/strings.xml
es/values-es/strings.xml
es/values-hi/strings.xml
es/values-my-rMM/strings.xml
|
cbe1c5655bbe64dc308a32477d7d8342b2d7ecbb |
17-Sep-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I0e2143a94dd0c23a9f09be19f9e269405bc5de88 Auto-generated-cl: translation import
es/values-am/strings.xml
es/values-es/strings.xml
es/values-hi/strings.xml
|
577e351abe784f3da8074ce3d83f0d2e532a2895 |
17-Sep-2014 |
Alan Newberger <alann@google.com> |
Fix CameraSettingsActivityHelper Previous hack to allow activity up button to work, interfered with custom preference merging we use to conditonally add items to Settings. Now fixed by allowing internal control of whether the full preference tree is returned by the fragment or just the desired subtree, so that the Helper can access the full tree. Bug: 17534830 Change-Id: I11510f365b9e212f07009b2233bb5d8036228774
rc/com/android/camera/settings/CameraSettingsActivity.java
|
a60f2d5b6224e26f6c4075726feee02f3aba762b |
16-Sep-2014 |
Baligh Uddin <baligh@google.com> |
am 81ff40a8: (-s ours) am d40843f2: (-s ours) am 56d1c6bd: (-s ours) am 9a275f5e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit '81ff40a8897f685b927212c3c6dec373d4078d16': Import translations. DO NOT MERGE
|
ca1cb95a01bb45a3a8b3ea0d70ca0cc7cd865822 |
16-Sep-2014 |
Puneet Lall <puneetl@google.com> |
am da99b974: am dfa43009: am b99765c2: am 0d7a8c08: am 6f1dfe69: Merge "Don\'t set mCameraAppUI to null in onDestroy" into ub-camera-glacier * commit 'da99b97491aefbb0ca1eb9b389a95210024b23e2': Don't set mCameraAppUI to null in onDestroy
|
55be791b3bbe53d34f47a7001cd79d7226c4ab09 |
16-Sep-2014 |
Spike Sprague <spikuru@google.com> |
am 360ff04e: am d9532ea7: am 778c50fc: am ad1462a9: am a16219d5: set proper alpha on shutter button on mode switch, eliminates a janky alpha flash * commit '360ff04ebd3048e6031854e65038a4e98a110c15': set proper alpha on shutter button on mode switch, eliminates a janky alpha flash
|
d88d90962f4bc579c4fc6300035e8e6c5d8c97b9 |
16-Sep-2014 |
Baligh Uddin <baligh@google.com> |
am 6eba7685: (-s ours) am 3cb0aab3: (-s ours) am 9a275f5e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit '6eba768550a5fe7c3dba506bdaf19c6de83b3819': Import translations. DO NOT MERGE
|
6eba768550a5fe7c3dba506bdaf19c6de83b3819 |
16-Sep-2014 |
Baligh Uddin <baligh@google.com> |
am 3cb0aab3: (-s ours) am 9a275f5e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit '3cb0aab3eb4e17c86f91160d476eca00a85a1017': Import translations. DO NOT MERGE
|
81ff40a8897f685b927212c3c6dec373d4078d16 |
16-Sep-2014 |
Baligh Uddin <baligh@google.com> |
am d40843f2: (-s ours) am 56d1c6bd: (-s ours) am 9a275f5e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit 'd40843f2b306e460e02217a83787bf37c17bf7a6': Import translations. DO NOT MERGE
|
da99b97491aefbb0ca1eb9b389a95210024b23e2 |
16-Sep-2014 |
Puneet Lall <puneetl@google.com> |
am dfa43009: am b99765c2: am 0d7a8c08: am 6f1dfe69: Merge "Don\'t set mCameraAppUI to null in onDestroy" into ub-camera-glacier * commit 'dfa430095eb5555c8fa07b2b21e9c39e551861cd': Don't set mCameraAppUI to null in onDestroy
|
360ff04ebd3048e6031854e65038a4e98a110c15 |
16-Sep-2014 |
Spike Sprague <spikuru@google.com> |
am d9532ea7: am 778c50fc: am ad1462a9: am a16219d5: set proper alpha on shutter button on mode switch, eliminates a janky alpha flash * commit 'd9532ea7d345bf596c3bf8c4e29c12047c398d27': set proper alpha on shutter button on mode switch, eliminates a janky alpha flash
|
d40843f2b306e460e02217a83787bf37c17bf7a6 |
16-Sep-2014 |
Baligh Uddin <baligh@google.com> |
am 56d1c6bd: (-s ours) am 9a275f5e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit '56d1c6bdbf75d851078a08b755d7895c70b6b053': Import translations. DO NOT MERGE
|
dfa430095eb5555c8fa07b2b21e9c39e551861cd |
16-Sep-2014 |
Puneet Lall <puneetl@google.com> |
am b99765c2: am 0d7a8c08: am 6f1dfe69: Merge "Don\'t set mCameraAppUI to null in onDestroy" into ub-camera-glacier * commit 'b99765c252c9410e232fe8747553f549c5417540': Don't set mCameraAppUI to null in onDestroy
|
d9532ea7d345bf596c3bf8c4e29c12047c398d27 |
16-Sep-2014 |
Spike Sprague <spikuru@google.com> |
am 778c50fc: am ad1462a9: am a16219d5: set proper alpha on shutter button on mode switch, eliminates a janky alpha flash * commit '778c50fc562c12f794a0d3b65317c719ce8f1425': set proper alpha on shutter button on mode switch, eliminates a janky alpha flash
|
56d1c6bdbf75d851078a08b755d7895c70b6b053 |
16-Sep-2014 |
Baligh Uddin <baligh@google.com> |
am 9a275f5e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit '9a275f5eed1e0b6fdcafd9fdd42cd2568db2cfc6': Import translations. DO NOT MERGE
|
3cb0aab3eb4e17c86f91160d476eca00a85a1017 |
16-Sep-2014 |
Baligh Uddin <baligh@google.com> |
am 9a275f5e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit '9a275f5eed1e0b6fdcafd9fdd42cd2568db2cfc6': Import translations. DO NOT MERGE
|
3517ef7a378d3b2c224621d77c7d7f7c8c0984b2 |
16-Sep-2014 |
Puneet Lall <puneetl@google.com> |
am 5042ba32: am a072e605: am 7aa59807: am 5c56b2c4: am 70a96525: Don\'t send redundant requests to start the preview * commit '5042ba328d8007c53bcff9b9218681803a32e29c':
|
66703800d2f064710cf5379501a2fa62c19d4997 |
16-Sep-2014 |
Alan Newberger <alann@google.com> |
am b720bcfc: am 4a3de2cf: am 5677bb5e: am 3c324d34: am 486ba1da: Revert layout change for Camera * commit 'b720bcfc945b460148b54504cf84855cfdcb87da':
|
d38d84163a5e0057ac9a533455ad5e3502c7f5d6 |
16-Sep-2014 |
Alan Newberger <alann@google.com> |
am 2d6e0f7c: am de156744: am 30969a92: am 4a7668d7: am ca5173d8: Move launcher icons to mipmap * commit '2d6e0f7cb9c8dd1635de27a87e5ba61e652461f6':
|
7aacb3644467dc85c44269c719dcb30662826c27 |
16-Sep-2014 |
Alan Newberger <alann@google.com> |
am fe77ecfa: am 1da8d800: am 5e8d579a: am 1bbdb135: am 45f316bc: Establish synchronous camera closing when app utilizes API1/API2 * commit 'fe77ecfa30feb51476447b1f43d73e08f027fac8':
|
79e49fce885951bbe98bbae5067758153c7a2622 |
16-Sep-2014 |
Baligh Uddin <baligh@google.com> |
am a3a6c5b1: (-s ours) am 25361e3f: (-s ours) am 522466e6: (-s ours) am f2382657: (-s ours) am 0c5fc1d3: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-glacier * commit 'a3a6c5b14225782b4e78505d31ebb163e61c8307':
|
80becaa7e4dedf532847ee384abf210fbde00c97 |
16-Sep-2014 |
Baligh Uddin <baligh@google.com> |
am eee44b53: (-s ours) am 0f1acda2: (-s ours) am 03b392d9: (-s ours) am 91225f8b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit 'eee44b535bbb617bf03c76038dcd4bfbae4ff0f7':
|
245a5dd01bc7de8a68c6c67064810b95bd972a1b |
16-Sep-2014 |
Andy Huibers <andyhuibers@google.com> |
am 7756833e: am 29eae70b: am 02a24bc0: am d3db7916: am e6ebf3d7: If we are using CaptureModule for Gcam only, turn off flash. * commit '7756833e8a9fe9ffe3e9e97c106f2191969a5143':
|
89c9269d8adf4567c875c4ab3c2c4aca994a0594 |
16-Sep-2014 |
Alan Newberger <alann@google.com> |
am 5420d57f: am 74b1d995: am 893acd56: am 11d3405c: am 0c9af933: Merge "Revert "Delay PhotoModule preview cover removal to address jank"" into ub-camera-glacier * commit '5420d57fa25c421252bdb703338c2806c18d7b09':
|
6d11d4d1caae89d8c1dcf6cd55303a5ce36db34b |
16-Sep-2014 |
Alan Newberger <alann@google.com> |
am bb4b7f13: am 168ca8e3: am c0e5cc1e: am 73d569d4: am 7351415d: Reset aspect ratio on pause * commit 'bb4b7f1350742c0e59e15768ba78437e54ed9297':
|
c63799c8bf4e38429b80492be30373fd9ad8ebf2 |
16-Sep-2014 |
Spike Sprague <spikuru@google.com> |
am 89ab5057: am 925b1a0c: am cfaa646d: am ac1dd2f6: am 87a2300f: Merge "workaround fix" into ub-camera-glacier * commit '89ab5057339dc38a9290acb24755868a0d31700d':
|
3e0c8d3209ed4ea6c76690ba617f1c3fbdfdda24 |
16-Sep-2014 |
Alan Newberger <alann@google.com> |
am 73bae32e: am 219d86fa: am 3861e387: am 3d330a60: am 3096e672: Merge "Delay PhotoModule preview cover removal to address jank" into ub-camera-glacier * commit '73bae32e3118623e58cf725f1eee6e1873656843':
|
adc2e32e60a3e33c8bfbd2463b8b01a83bed8c6e |
16-Sep-2014 |
Senpo Hu <senpo@google.com> |
am b524167d: am 9a2ff1e8: am 89e485e0: am cdf62f78: am d3ee86b7: Merge "Return to filmstrip when video playback finishes." into ub-camera-glacier * commit 'b524167dbf8bce0c73657486e21347c75482b453':
|
2573f7917166f837dae1e79c377279ea5d5741ad |
16-Sep-2014 |
Baligh Uddin <baligh@google.com> |
am f1eeedb7: (-s ours) am 4bd2b9b5: (-s ours) am f5cafa5a: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev * commit 'f1eeedb796786fc060cc38f10809d0593a6ca40a': Import translations. DO NOT MERGE
|
a8b58fd36b62996f63d73e1b3cbcc9c12bfeefc3 |
16-Sep-2014 |
Senpo Hu <senpo@google.com> |
am 31e3d15f: am dcf60eea: am 5675b8af: Fix the upside-down orienation bug in CaptureModule. * commit '31e3d15fff19598aebf89b29a2dc56488c50a219':
|
67eaeed4bf11bc38bb966f0919adf0feb9df8d0e |
16-Sep-2014 |
Alan Newberger <alann@google.com> |
am 8f6e750d: am 45090bab: am d79b38d6: Merge "Remove jank on camera options switching" into ub-camera-glacier * commit '8f6e750d8adadad2044da945f47da2aea3492925':
|
f129d9eb617cadfc3866327812bc5b8c172a1a58 |
16-Sep-2014 |
Jiawen Chen <jiawen@google.com> |
am edf2b787: am d7a4c3e2: am 9cefdd49: Changed double to float. viewFinder -> viewfinder. * commit 'edf2b787e94d7b9af0aee07412da0925e9515082':
|
6b4e11b80fe56bc195fb4fa32f4e0ed23d13be81 |
16-Sep-2014 |
Alan Newberger <alann@google.com> |
am 59a9d83b: am 0a156cf6: am ffc395d6: Reinitialize shutter button in Camera mode upon preview start * commit '59a9d83b968077f9267b15bac3395d51fda22021':
|
0e7b45670a16afae88fa4c5f8fe8f0577349b4f0 |
16-Sep-2014 |
Alan Newberger <alann@google.com> |
am 309cdabd: am 2acdb01d: am 5c4bd6b5: Reduce logging for unknown camera scope * commit '309cdabd062de6dae4fb5387948a4ad823f965ae':
|
1a0b19e14b280c38c64c5efecb5b69cccaf0fa6f |
16-Sep-2014 |
Andy Huibers <andyhuibers@google.com> |
am 5af3ed93: am 91c1c555: am a710f371: Merge "This fixes Bitmap.createBitmap offset bug in L, not sure why." into ub-camera-glacier * commit '5af3ed93aa84ee5360681cad6db385c0e89bdc35':
|
a605959fe487264591fa7f3b1d541b07b1e8bd7a |
16-Sep-2014 |
Qiwen Zhao <zhao@google.com> |
am c6456b7b: am 031bcdbd: am fd97c6da: (-s ours) Merge "DO NOT MERGE: Adjust for camera2 API changes" into ub-camera-glacier * commit 'c6456b7b90fdc367888a50009821c916e04c143a':
|
eed1539e431b8e757f70e387e9d84c052b729c84 |
16-Sep-2014 |
Nicolas Prevot <nprevot@google.com> |
am 0c7af463: am aefc884c: am 42a5ad5a: Merge "Granting read permission in the result intent for VIDEO_CAPTURE." into ub-camera-glacier * commit '0c7af4631f8764c89626f16e47cfe88bb212db0a':
|
a665c7da57b42a67d85cab722e63fa7165376542 |
16-Sep-2014 |
Andy Huibers <andyhuibers@google.com> |
am 614e05da: am 458590b6: am 5e3bf4cc: Remove toast. This reverts commit 779414e8bfe23d66de310570ff2314654e45ec9f. * commit '614e05da970792a02e11d35f5d0cb519a7b758e8':
|
5e44285741e1034d7d417aa896a4bad34d2470cd |
16-Sep-2014 |
Senpo Hu <senpo@google.com> |
am 877489aa: am c4f2f4d9: am b954b3e8: Merge "Always match camera orientation with device orientation regardless portrait lock." into ub-camera-glacier * commit '877489aae0927c0038e9d29b79717d6f1e12800a':
|
7d63dbcf80b79358269f9ed902266cf9aaa86e43 |
16-Sep-2014 |
Senpo Hu <senpo@google.com> |
am 12f408cc: am 7a3bdb23: am 65c00136: Set video quality pref default values at startup. * commit '12f408cc7acbdcf6f742841a21166f26e9ce12fc':
|
c8db704bc6f41afcbee0cabdb2ecb135a42a3765 |
16-Sep-2014 |
Eino-Ville Talvala <etalvala@google.com> |
am 58eb8853: am 420c2c42: Merge "Adjust for camera2 API changes" into lmp-dev * commit '58eb8853bc9002dfcb7caf48c251d90070eda5a0':
|
9a275f5eed1e0b6fdcafd9fdd42cd2568db2cfc6 |
16-Sep-2014 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into lmp-dev
|
de0af857065a7034c4be3d96202a8b6d4d3b0abf |
16-Sep-2014 |
Puneet Lall <puneetl@google.com> |
am 38827648: am a82d6ce2: am 0d7a8c08: am 6f1dfe69: Merge "Don\'t set mCameraAppUI to null in onDestroy" into ub-camera-glacier * commit '38827648c2fae431b106c8845bfb7be49d67ecab': Don't set mCameraAppUI to null in onDestroy
|
b3964912c22d68d55e87e57eceaf31fa7cf864c4 |
16-Sep-2014 |
Spike Sprague <spikuru@google.com> |
am 023a45e8: am 22173edc: am ad1462a9: am a16219d5: set proper alpha on shutter button on mode switch, eliminates a janky alpha flash * commit '023a45e82a1cf7486d7a142308f27b5683b9c238': set proper alpha on shutter button on mode switch, eliminates a janky alpha flash
|
38827648c2fae431b106c8845bfb7be49d67ecab |
16-Sep-2014 |
Puneet Lall <puneetl@google.com> |
am a82d6ce2: am 0d7a8c08: am 6f1dfe69: Merge "Don\'t set mCameraAppUI to null in onDestroy" into ub-camera-glacier * commit 'a82d6ce220f6bd972aa24d73642cee503dbbf5f8': Don't set mCameraAppUI to null in onDestroy
|
023a45e82a1cf7486d7a142308f27b5683b9c238 |
16-Sep-2014 |
Spike Sprague <spikuru@google.com> |
am 22173edc: am ad1462a9: am a16219d5: set proper alpha on shutter button on mode switch, eliminates a janky alpha flash * commit '22173edc3ebcadfa30de386794cb0a72ad72fbe2': set proper alpha on shutter button on mode switch, eliminates a janky alpha flash
|
a82d6ce220f6bd972aa24d73642cee503dbbf5f8 |
16-Sep-2014 |
Puneet Lall <puneetl@google.com> |
am 0d7a8c08: am 6f1dfe69: Merge "Don\'t set mCameraAppUI to null in onDestroy" into ub-camera-glacier * commit '0d7a8c08446f94264870538f76bc0c2846e0dd48': Don't set mCameraAppUI to null in onDestroy
|
b99765c252c9410e232fe8747553f549c5417540 |
16-Sep-2014 |
Puneet Lall <puneetl@google.com> |
am 0d7a8c08: am 6f1dfe69: Merge "Don\'t set mCameraAppUI to null in onDestroy" into ub-camera-glacier * commit '0d7a8c08446f94264870538f76bc0c2846e0dd48': Don't set mCameraAppUI to null in onDestroy
|
22173edc3ebcadfa30de386794cb0a72ad72fbe2 |
16-Sep-2014 |
Spike Sprague <spikuru@google.com> |
am ad1462a9: am a16219d5: set proper alpha on shutter button on mode switch, eliminates a janky alpha flash * commit 'ad1462a9492cdf9e98bb0c94cdd4b6c89e0dd47f': set proper alpha on shutter button on mode switch, eliminates a janky alpha flash
|
778c50fc562c12f794a0d3b65317c719ce8f1425 |
16-Sep-2014 |
Spike Sprague <spikuru@google.com> |
am ad1462a9: am a16219d5: set proper alpha on shutter button on mode switch, eliminates a janky alpha flash * commit 'ad1462a9492cdf9e98bb0c94cdd4b6c89e0dd47f': set proper alpha on shutter button on mode switch, eliminates a janky alpha flash
|
63c8f5a66a4e5a6ba380a8df4600a21ec0701842 |
16-Sep-2014 |
Puneet Lall <puneetl@google.com> |
am 6f1dfe69: Merge "Don\'t set mCameraAppUI to null in onDestroy" into ub-camera-glacier * commit '6f1dfe69b93bfb42c11d456901e9d3ffee826cce': Don't set mCameraAppUI to null in onDestroy
|
0d7a8c08446f94264870538f76bc0c2846e0dd48 |
16-Sep-2014 |
Puneet Lall <puneetl@google.com> |
am 6f1dfe69: Merge "Don\'t set mCameraAppUI to null in onDestroy" into ub-camera-glacier * commit '6f1dfe69b93bfb42c11d456901e9d3ffee826cce': Don't set mCameraAppUI to null in onDestroy
|
6f1dfe69b93bfb42c11d456901e9d3ffee826cce |
15-Sep-2014 |
Puneet Lall <puneetl@google.com> |
Merge "Don't set mCameraAppUI to null in onDestroy" into ub-camera-glacier
|
dbb048f11d6be915b855089ceaf1bca5ccb57991 |
15-Sep-2014 |
Puneet Lall <puneetl@google.com> |
Don't set mCameraAppUI to null in onDestroy BUG: 17408047 Note that we originally set this to null to address BUG: 12805279 which involved leaking Views. However, this has regressed and will require another look regardless. The number of views leaked with and without the null assignment is the same, so this change does not make the regression any worse. Change-Id: If90aeebb081073eb4f5b928919fc67ef710e1054
rc/com/android/camera/CameraActivity.java
|
a609e49f4e0d6855f9f081f66d7d71d7928ea851 |
15-Sep-2014 |
Spike Sprague <spikuru@google.com> |
am a16219d5: set proper alpha on shutter button on mode switch, eliminates a janky alpha flash * commit 'a16219d51937bda5f3e69c0e77171ae0fb893823': set proper alpha on shutter button on mode switch, eliminates a janky alpha flash
|
ad1462a9492cdf9e98bb0c94cdd4b6c89e0dd47f |
15-Sep-2014 |
Spike Sprague <spikuru@google.com> |
am a16219d5: set proper alpha on shutter button on mode switch, eliminates a janky alpha flash * commit 'a16219d51937bda5f3e69c0e77171ae0fb893823': set proper alpha on shutter button on mode switch, eliminates a janky alpha flash
|
03b99c42afcbe367f4db6358b7e76510106b8a43 |
15-Sep-2014 |
bulic <bulic@google.com> |
Merge branch 'lmp-mr1-dev-plus-aosp' of https://googleplex-android.googlesource.com/_direct/platform/packages/apps/Camera2 into lmp-mr1-dev-plus-aosp
|
0027d01b3e7a45ca611f864600d2ab14affcafe2 |
15-Sep-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I7ec96a5d9c1e761e23af43c5b61dd537e1577346 Auto-generated-cl: translation import
es/values-am/strings.xml
es/values-es/strings.xml
es/values-hi/strings.xml
es/values-my-rMM/strings.xml
|
5042ba328d8007c53bcff9b9218681803a32e29c |
13-Sep-2014 |
Puneet Lall <puneetl@google.com> |
am a072e605: am 7aa59807: am 5c56b2c4: am 70a96525: Don\'t send redundant requests to start the preview * commit 'a072e605f4ba0167333f5914f97fe9e1e3dee07d': Don't send redundant requests to start the preview
|
c2e9c0b70d48e6cf66ac2d0cd318da43431cb8e2 |
13-Sep-2014 |
Puneet Lall <puneetl@google.com> |
am 909506d7: am a4d1c140: am 5c56b2c4: am 70a96525: Don\'t send redundant requests to start the preview * commit '909506d73801fb0036c076220e7c92cd928d12aa': Don't send redundant requests to start the preview
|
b40e7d2834030fd3bd80f17eed27c7e0265e2d7e |
13-Sep-2014 |
Spike Sprague <spikuru@google.com> |
am ba677c7e: am b8555b66: am 767a1186: Merge "back to bigger HDR+ icons" into ub-camera-glacier * commit 'ba677c7e1234ebfa8893eac40281217d7901f05a':
|
6bb99f623bf8ca7d9624705193483413314a7f3c |
13-Sep-2014 |
Baligh Uddin <baligh@google.com> |
am 5d3bebde: keep history after reset to lmp-dev * commit '5d3bebdef686cb5af4a765b30bf92ad88230bf45': Import translations. DO NOT MERGE
|
b720bcfc945b460148b54504cf84855cfdcb87da |
13-Sep-2014 |
Alan Newberger <alann@google.com> |
am 4a3de2cf: am 5677bb5e: am 3c324d34: am 486ba1da: Revert layout change for Camera * commit '4a3de2cfd992bfee6d44fb88bd1cdcc293e8e39f': Revert layout change for Camera
|
2d6e0f7cb9c8dd1635de27a87e5ba61e652461f6 |
13-Sep-2014 |
Alan Newberger <alann@google.com> |
am de156744: am 30969a92: am 4a7668d7: am ca5173d8: Move launcher icons to mipmap * commit 'de156744855520e0187f978cfb95bc879547bfb0': Move launcher icons to mipmap
|
fe77ecfa30feb51476447b1f43d73e08f027fac8 |
13-Sep-2014 |
Alan Newberger <alann@google.com> |
am 1da8d800: am 5e8d579a: am 1bbdb135: am 45f316bc: Establish synchronous camera closing when app utilizes API1/API2 * commit '1da8d8005e551ba82be3ec9a1d3dcd5da740532a': Establish synchronous camera closing when app utilizes API1/API2
|
a3a6c5b14225782b4e78505d31ebb163e61c8307 |
13-Sep-2014 |
Baligh Uddin <baligh@google.com> |
am 25361e3f: (-s ours) am 522466e6: (-s ours) am f2382657: (-s ours) am 0c5fc1d3: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-glacier * commit '25361e3f3451bd92daed383fc8338f807cb862d7': Import translations. DO NOT MERGE
|
eee44b535bbb617bf03c76038dcd4bfbae4ff0f7 |
13-Sep-2014 |
Baligh Uddin <baligh@google.com> |
am 0f1acda2: (-s ours) am 03b392d9: (-s ours) am 91225f8b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit '0f1acda2713c7581ea99ef1e9186d4eee9b8f4cb': Import translations. DO NOT MERGE
|
7756833e8a9fe9ffe3e9e97c106f2191969a5143 |
13-Sep-2014 |
Andy Huibers <andyhuibers@google.com> |
am 29eae70b: am 02a24bc0: am d3db7916: am e6ebf3d7: If we are using CaptureModule for Gcam only, turn off flash. * commit '29eae70b8fda7aba1775e8346c9476910475823b': If we are using CaptureModule for Gcam only, turn off flash.
|
5420d57fa25c421252bdb703338c2806c18d7b09 |
13-Sep-2014 |
Alan Newberger <alann@google.com> |
am 74b1d995: am 893acd56: am 11d3405c: am 0c9af933: Merge "Revert "Delay PhotoModule preview cover removal to address jank"" into ub-camera-glacier * commit '74b1d99566bac77d698c19d5a7b5e9017df2867e': Revert "Delay PhotoModule preview cover removal to address jank"
|
bb4b7f1350742c0e59e15768ba78437e54ed9297 |
13-Sep-2014 |
Alan Newberger <alann@google.com> |
am 168ca8e3: am c0e5cc1e: am 73d569d4: am 7351415d: Reset aspect ratio on pause * commit '168ca8e31f6ad8e10797fca5d9bce75e13784b11': Reset aspect ratio on pause
|
89ab5057339dc38a9290acb24755868a0d31700d |
13-Sep-2014 |
Spike Sprague <spikuru@google.com> |
am 925b1a0c: am cfaa646d: am ac1dd2f6: am 87a2300f: Merge "workaround fix" into ub-camera-glacier * commit '925b1a0c718fbba459cc9c4d494613c718ee0225': workaround fix
|
73bae32e3118623e58cf725f1eee6e1873656843 |
13-Sep-2014 |
Alan Newberger <alann@google.com> |
am 219d86fa: am 3861e387: am 3d330a60: am 3096e672: Merge "Delay PhotoModule preview cover removal to address jank" into ub-camera-glacier * commit '219d86faf1f03d0614d73c8a0e3ca334e4c22a9b': Delay PhotoModule preview cover removal to address jank
|
b524167dbf8bce0c73657486e21347c75482b453 |
13-Sep-2014 |
Senpo Hu <senpo@google.com> |
am 9a2ff1e8: am 89e485e0: am cdf62f78: am d3ee86b7: Merge "Return to filmstrip when video playback finishes." into ub-camera-glacier * commit '9a2ff1e83b45c6ed00a7133a6d701ccb2a7f4a7f': Return to filmstrip when video playback finishes.
|
f1eeedb796786fc060cc38f10809d0593a6ca40a |
13-Sep-2014 |
Baligh Uddin <baligh@google.com> |
am 4bd2b9b5: (-s ours) am f5cafa5a: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev * commit '4bd2b9b5c5b55c48e2775e627caf2a7a73722e9a': Import translations. DO NOT MERGE
|
a16219d51937bda5f3e69c0e77171ae0fb893823 |
13-Sep-2014 |
Spike Sprague <spikuru@google.com> |
set proper alpha on shutter button on mode switch, eliminates a janky alpha flash bug: 17487040 Change-Id: I08e66b5be53e58e9e16d32c09ef50081e90e9284
rc/com/android/camera/app/CameraAppUI.java
|
573e542850b50366c0f85bf497911683621fe136 |
12-Sep-2014 |
Alan Newberger <alann@google.com> |
am 87ab720d: am 55e9bf0f: am 3c324d34: am 486ba1da: Revert layout change for Camera * commit '87ab720d3ebc5a8da5488bab1b52c317840f36c6': Revert layout change for Camera
|
3950bb2d66509cf0fee3ddc26c6ed8e5fc73881e |
12-Sep-2014 |
Alan Newberger <alann@google.com> |
am 3da05094: am 85fb40bc: am 4a7668d7: am ca5173d8: Move launcher icons to mipmap * commit '3da05094f62baa070a39c803fc232122af1d5778': Move launcher icons to mipmap
|
bbb1847088b98f35a991be90ee3166b3724bb667 |
12-Sep-2014 |
Alan Newberger <alann@google.com> |
am 5c4cb7d0: am 1f58c3d8: am 1bbdb135: am 45f316bc: Establish synchronous camera closing when app utilizes API1/API2 * commit '5c4cb7d07af7b9962960ddf342db4ed630452a9f': Establish synchronous camera closing when app utilizes API1/API2
|
909506d73801fb0036c076220e7c92cd928d12aa |
12-Sep-2014 |
Puneet Lall <puneetl@google.com> |
am a4d1c140: am 5c56b2c4: am 70a96525: Don\'t send redundant requests to start the preview * commit 'a4d1c14021a2b46597ecbe3bea1d4efb37d205e0': Don't send redundant requests to start the preview
|
a072e605f4ba0167333f5914f97fe9e1e3dee07d |
12-Sep-2014 |
Puneet Lall <puneetl@google.com> |
am 7aa59807: am 5c56b2c4: am 70a96525: Don\'t send redundant requests to start the preview * commit '7aa59807154b16be087fb84dbde6a8923c17592e': Don't send redundant requests to start the preview
|
6155107e3ab733f9542eb7a52d2407ba8c65ed4a |
12-Sep-2014 |
Baligh Uddin <baligh@google.com> |
am cab39e0a: (-s ours) am 95d4d6bc: (-s ours) am f2382657: (-s ours) am 0c5fc1d3: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-glacier * commit 'cab39e0ac32583367e916380d3170c4fb4187d4d': Import translations. DO NOT MERGE
|
9feb0a0ba96dc26f648a8ea5d1982045e4794719 |
12-Sep-2014 |
Baligh Uddin <baligh@google.com> |
am 96c2fe9d: (-s ours) am 5d5362ef: (-s ours) am 91225f8b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit '96c2fe9d2cde671442b5aa5e6fbc87e4ec9bd108': Import translations. DO NOT MERGE
|
7aa59807154b16be087fb84dbde6a8923c17592e |
12-Sep-2014 |
Puneet Lall <puneetl@google.com> |
am 5c56b2c4: am 70a96525: Don\'t send redundant requests to start the preview * commit '5c56b2c4bf6b31dee65806fcfa67b877657c3975': Don't send redundant requests to start the preview
|
a4d1c14021a2b46597ecbe3bea1d4efb37d205e0 |
12-Sep-2014 |
Puneet Lall <puneetl@google.com> |
am 5c56b2c4: am 70a96525: Don\'t send redundant requests to start the preview * commit '5c56b2c4bf6b31dee65806fcfa67b877657c3975': Don't send redundant requests to start the preview
|
4a3de2cfd992bfee6d44fb88bd1cdcc293e8e39f |
12-Sep-2014 |
Alan Newberger <alann@google.com> |
am 5677bb5e: am 3c324d34: am 486ba1da: Revert layout change for Camera * commit '5677bb5e9602de252f51687397fec4345638e7f9': Revert layout change for Camera
|
de156744855520e0187f978cfb95bc879547bfb0 |
12-Sep-2014 |
Alan Newberger <alann@google.com> |
am 30969a92: am 4a7668d7: am ca5173d8: Move launcher icons to mipmap * commit '30969a926cfecacb6ef151a6adf90f6ea2fb1a5a': Move launcher icons to mipmap
|
5c56b2c4bf6b31dee65806fcfa67b877657c3975 |
12-Sep-2014 |
Puneet Lall <puneetl@google.com> |
am 70a96525: Don\'t send redundant requests to start the preview * commit '70a96525f16ca6c6abb9a7a9dab26ba1e61235dd': Don't send redundant requests to start the preview
|
1da8d8005e551ba82be3ec9a1d3dcd5da740532a |
12-Sep-2014 |
Alan Newberger <alann@google.com> |
am 5e8d579a: am 1bbdb135: am 45f316bc: Establish synchronous camera closing when app utilizes API1/API2 * commit '5e8d579ae1f6a19f80aac00b35d385cb505e20c9': Establish synchronous camera closing when app utilizes API1/API2
|
25361e3f3451bd92daed383fc8338f807cb862d7 |
12-Sep-2014 |
Baligh Uddin <baligh@google.com> |
am 522466e6: (-s ours) am f2382657: (-s ours) am 0c5fc1d3: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-glacier * commit '522466e6a32a83b81d988e14c6ddb8b0a37f19ad': Import translations. DO NOT MERGE
|
0f1acda2713c7581ea99ef1e9186d4eee9b8f4cb |
12-Sep-2014 |
Baligh Uddin <baligh@google.com> |
am 03b392d9: (-s ours) am 91225f8b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit '03b392d9ba5423c0b77e2f872dad5e8ede9086ae': Import translations. DO NOT MERGE
|
29eae70b8fda7aba1775e8346c9476910475823b |
12-Sep-2014 |
Andy Huibers <andyhuibers@google.com> |
am 02a24bc0: am d3db7916: am e6ebf3d7: If we are using CaptureModule for Gcam only, turn off flash. * commit '02a24bc091ba28a0415d7bd22aeccac34ded0039': If we are using CaptureModule for Gcam only, turn off flash.
|
74b1d99566bac77d698c19d5a7b5e9017df2867e |
12-Sep-2014 |
Alan Newberger <alann@google.com> |
am 893acd56: am 11d3405c: am 0c9af933: Merge "Revert "Delay PhotoModule preview cover removal to address jank"" into ub-camera-glacier * commit '893acd56c4a2e55f9c533bce80cc1f1eb19ee171': Revert "Delay PhotoModule preview cover removal to address jank"
|
168ca8e31f6ad8e10797fca5d9bce75e13784b11 |
12-Sep-2014 |
Alan Newberger <alann@google.com> |
am c0e5cc1e: am 73d569d4: am 7351415d: Reset aspect ratio on pause * commit 'c0e5cc1eb3dbde021713c8d78b3ff039d8d4bd15': Reset aspect ratio on pause
|
925b1a0c718fbba459cc9c4d494613c718ee0225 |
12-Sep-2014 |
Spike Sprague <spikuru@google.com> |
am cfaa646d: am ac1dd2f6: am 87a2300f: Merge "workaround fix" into ub-camera-glacier * commit 'cfaa646d2c3b3cf45df6faf7354b9bf461935fbe': workaround fix
|
219d86faf1f03d0614d73c8a0e3ca334e4c22a9b |
12-Sep-2014 |
Alan Newberger <alann@google.com> |
am 3861e387: am 3d330a60: am 3096e672: Merge "Delay PhotoModule preview cover removal to address jank" into ub-camera-glacier * commit '3861e38769d06057910a2219562916e172d8caef': Delay PhotoModule preview cover removal to address jank
|
9a2ff1e83b45c6ed00a7133a6d701ccb2a7f4a7f |
12-Sep-2014 |
Senpo Hu <senpo@google.com> |
am 89e485e0: am cdf62f78: am d3ee86b7: Merge "Return to filmstrip when video playback finishes." into ub-camera-glacier * commit '89e485e0970bce2e1e2ec011738a50090bc6a2ac': Return to filmstrip when video playback finishes.
|
4bd2b9b5c5b55c48e2775e627caf2a7a73722e9a |
12-Sep-2014 |
Baligh Uddin <baligh@google.com> |
am f5cafa5a: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev * commit 'f5cafa5afec323e34315ee20934365360282926b': Import translations. DO NOT MERGE
|
87ab720d3ebc5a8da5488bab1b52c317840f36c6 |
12-Sep-2014 |
Alan Newberger <alann@google.com> |
am 55e9bf0f: am 3c324d34: am 486ba1da: Revert layout change for Camera * commit '55e9bf0fe8060bc43bfe5d0f02618cb530ed6596': Revert layout change for Camera
|
3da05094f62baa070a39c803fc232122af1d5778 |
12-Sep-2014 |
Alan Newberger <alann@google.com> |
am 85fb40bc: am 4a7668d7: am ca5173d8: Move launcher icons to mipmap * commit '85fb40bc72bdc6e38ecb80e0a74b8285ccd6b0e6': Move launcher icons to mipmap
|
5677bb5e9602de252f51687397fec4345638e7f9 |
12-Sep-2014 |
Alan Newberger <alann@google.com> |
am 3c324d34: am 486ba1da: Revert layout change for Camera * commit '3c324d34bd0930c615bac32bdb6bbbf7d9cf31c5': Revert layout change for Camera
|
30969a926cfecacb6ef151a6adf90f6ea2fb1a5a |
12-Sep-2014 |
Alan Newberger <alann@google.com> |
am 4a7668d7: am ca5173d8: Move launcher icons to mipmap * commit '4a7668d72b2f80e90156bfae4befbe37b10c4d2e': Move launcher icons to mipmap
|
55e9bf0fe8060bc43bfe5d0f02618cb530ed6596 |
12-Sep-2014 |
Alan Newberger <alann@google.com> |
am 3c324d34: am 486ba1da: Revert layout change for Camera * commit '3c324d34bd0930c615bac32bdb6bbbf7d9cf31c5': Revert layout change for Camera
|
85fb40bc72bdc6e38ecb80e0a74b8285ccd6b0e6 |
12-Sep-2014 |
Alan Newberger <alann@google.com> |
am 4a7668d7: am ca5173d8: Move launcher icons to mipmap * commit '4a7668d72b2f80e90156bfae4befbe37b10c4d2e': Move launcher icons to mipmap
|
363ef8aab507c125252fea609a1bbd498e78e149 |
12-Sep-2014 |
Puneet Lall <puneetl@google.com> |
am 70a96525: Don\'t send redundant requests to start the preview * commit '70a96525f16ca6c6abb9a7a9dab26ba1e61235dd': Don't send redundant requests to start the preview
|
70a96525f16ca6c6abb9a7a9dab26ba1e61235dd |
12-Sep-2014 |
Puneet Lall <puneetl@google.com> |
Don't send redundant requests to start the preview Change-Id: I43d8a2917bbe0140f1e9367cce21f68b19807aa8
rc/com/android/camera/PhotoModule.java
|
3c324d34bd0930c615bac32bdb6bbbf7d9cf31c5 |
12-Sep-2014 |
Alan Newberger <alann@google.com> |
am 486ba1da: Revert layout change for Camera * commit '486ba1da145f70b07235617e5f1f64186daa0fc0': Revert layout change for Camera
|
4a7668d72b2f80e90156bfae4befbe37b10c4d2e |
12-Sep-2014 |
Alan Newberger <alann@google.com> |
am ca5173d8: Move launcher icons to mipmap * commit 'ca5173d84722383d2d9ef49dd85fba28af035429': Move launcher icons to mipmap
|
9dc23a3526548731abe966fdc33d1ed0f744f203 |
12-Sep-2014 |
Alan Newberger <alann@google.com> |
am 486ba1da: Revert layout change for Camera * commit '486ba1da145f70b07235617e5f1f64186daa0fc0': Revert layout change for Camera
|
aa0b8d7b336fe8d7465d810da625a9670cf93900 |
12-Sep-2014 |
Alan Newberger <alann@google.com> |
am ca5173d8: Move launcher icons to mipmap * commit 'ca5173d84722383d2d9ef49dd85fba28af035429': Move launcher icons to mipmap
|
fa29fbcffbd6b80feda104299735c748ea90e5d3 |
12-Sep-2014 |
Puneet Lall <puneetl@google.com> |
Merge "Don't force ZSL/Camera2 API" into ub-camera-haleakala
|
5fbfab23afb0a76e34c3e2146ec06846fb597c9c |
12-Sep-2014 |
Puneet Lall <puneetl@google.com> |
Don't force ZSL/Camera2 API Change-Id: Id91ba7697335371a4f68ef87b507d1f4eb71a3a5
rc/com/android/camera/debug/DebugPropertyHelper.java
|
486ba1da145f70b07235617e5f1f64186daa0fc0 |
12-Sep-2014 |
Alan Newberger <alann@google.com> |
Revert layout change for Camera Changing from LAYOUT_FULLSCREEN to FULLSCREEN interferes with layout of Action Bar. Bug: 17477202 Change-Id: I029a84adbe4c5017cc8185c5c0c2601a03196bde
rc/com/android/camera/CameraActivity.java
|
ca5173d84722383d2d9ef49dd85fba28af035429 |
11-Sep-2014 |
Alan Newberger <alann@google.com> |
Move launcher icons to mipmap Bug: 17457682 Change-Id: I6a626c8547f3eea8a06fc47fc70c1a587767b040
ndroidManifest.xml
es_p/drawable-hdpi/logo_camera_color_44in48dp.png
es_p/drawable-mdpi/logo_camera_color_44in48dp.png
es_p/drawable-xhdpi/logo_camera_color_44in48dp.png
es_p/drawable-xxhdpi/logo_camera_color_44in48dp.png
es_p/drawable-xxxhdpi/logo_camera_color_44in48dp.png
es_p/mipmap-hdpi/logo_camera_color_44in48dp.png
es_p/mipmap-mdpi/logo_camera_color_44in48dp.png
es_p/mipmap-xhdpi/logo_camera_color_44in48dp.png
es_p/mipmap-xxhdpi/logo_camera_color_44in48dp.png
es_p/mipmap-xxxhdpi/logo_camera_color_44in48dp.png
|
5c4cb7d07af7b9962960ddf342db4ed630452a9f |
11-Sep-2014 |
Alan Newberger <alann@google.com> |
am 1f58c3d8: am 1bbdb135: am 45f316bc: Establish synchronous camera closing when app utilizes API1/API2 * commit '1f58c3d8ee90a39ee37e480ead1e00d944a24074': Establish synchronous camera closing when app utilizes API1/API2
|
1f58c3d8ee90a39ee37e480ead1e00d944a24074 |
11-Sep-2014 |
Alan Newberger <alann@google.com> |
am 1bbdb135: am 45f316bc: Establish synchronous camera closing when app utilizes API1/API2 * commit '1bbdb135f84e0c223bac9ee68e5ef6960e03ae62': Establish synchronous camera closing when app utilizes API1/API2
|
5e8d579ae1f6a19f80aac00b35d385cb505e20c9 |
11-Sep-2014 |
Alan Newberger <alann@google.com> |
am 1bbdb135: am 45f316bc: Establish synchronous camera closing when app utilizes API1/API2 * commit '1bbdb135f84e0c223bac9ee68e5ef6960e03ae62': Establish synchronous camera closing when app utilizes API1/API2
|
1bbdb135f84e0c223bac9ee68e5ef6960e03ae62 |
11-Sep-2014 |
Alan Newberger <alann@google.com> |
am 45f316bc: Establish synchronous camera closing when app utilizes API1/API2 * commit '45f316bcecb8713cbb217507981fd657fcdaa274': Establish synchronous camera closing when app utilizes API1/API2
|
bd321d2fb0984a005be450df931e8fa66670bd86 |
11-Sep-2014 |
Alan Newberger <alann@google.com> |
am 45f316bc: Establish synchronous camera closing when app utilizes API1/API2 * commit '45f316bcecb8713cbb217507981fd657fcdaa274': Establish synchronous camera closing when app utilizes API1/API2
|
45f316bcecb8713cbb217507981fd657fcdaa274 |
11-Sep-2014 |
Alan Newberger <alann@google.com> |
Establish synchronous camera closing when app utilizes API1/API2 To ensure API1 and API2 portability implementations coordinate together, if app uses API2 for any mode, lock both modes into synchronouse camera closing. Bug: 17464089 Change-Id: If4cf1eb02053ec9e56b7b8df97c21e012467aa3a
rc/com/android/camera/app/CameraController.java
|
dfa92fb3f71576b8333b62840b866d1254bb5d5e |
11-Sep-2014 |
Andy Huibers <andyhuibers@google.com> |
am ac7d02e4: am bc96895d: am d3db7916: am e6ebf3d7: If we are using CaptureModule for Gcam only, turn off flash. * commit 'ac7d02e4bb0b650a59733fab324681a47ac9ff3d': If we are using CaptureModule for Gcam only, turn off flash.
|
2d31b820322cf2f7a2accd7afc29a2d155b8268f |
11-Sep-2014 |
Alan Newberger <alann@google.com> |
am 6a016780: am 23ccf2e8: am 11d3405c: am 0c9af933: Merge "Revert "Delay PhotoModule preview cover removal to address jank"" into ub-camera-glacier * commit '6a016780ab57b96545c15c2696a9b43a2a9d55ce': Revert "Delay PhotoModule preview cover removal to address jank"
|
42dd1846592502e7e7fe956d08a12cdec7bbfdeb |
11-Sep-2014 |
Alan Newberger <alann@google.com> |
am a645b993: am e2508ea0: am 73d569d4: am 7351415d: Reset aspect ratio on pause * commit 'a645b993b29897026d0bbb9b86a7b42391d96da4': Reset aspect ratio on pause
|
732cc6887404b9b26b08ae7499dc4b94b25786fd |
11-Sep-2014 |
Spike Sprague <spikuru@google.com> |
am d4b3211d: am cda65018: am ac1dd2f6: am 87a2300f: Merge "workaround fix" into ub-camera-glacier * commit 'd4b3211d6c3f5d9ce908f2fd68e16cd5d3835b7f': workaround fix
|
2f622bce26631303b8a2ae383cd832109bf6ab4c |
11-Sep-2014 |
Alan Newberger <alann@google.com> |
am 98c7ab3c: am 6743394f: am 3d330a60: am 3096e672: Merge "Delay PhotoModule preview cover removal to address jank" into ub-camera-glacier * commit '98c7ab3c6841589a7ae547fb9afa704e349b1520': Delay PhotoModule preview cover removal to address jank
|
34f4ede25f5c3ddcd68498dbdd0faa4d69685ccd |
11-Sep-2014 |
Senpo Hu <senpo@google.com> |
am 2454e9b6: am 60226c1f: am cdf62f78: am d3ee86b7: Merge "Return to filmstrip when video playback finishes." into ub-camera-glacier * commit '2454e9b65b164624883f7b8874154b52a73d64e9': Return to filmstrip when video playback finishes.
|
32afb5d822091dfdefaa65a2893ba6cc74c58d1d |
11-Sep-2014 |
Senpo Hu <senpo@google.com> |
am 917aa5f3: am c03da30a: am dcf60eea: am 5675b8af: Fix the upside-down orienation bug in CaptureModule. * commit '917aa5f359bcfa7955be5af6f6c034acde15fc64': Fix the upside-down orienation bug in CaptureModule.
|
47753ab7acd799047c1ccbee7a2fd79a21eb6285 |
11-Sep-2014 |
Alan Newberger <alann@google.com> |
am 0e1adc06: am 4fb8cfb6: am 45090bab: am d79b38d6: Merge "Remove jank on camera options switching" into ub-camera-glacier * commit '0e1adc061bfd635896c0856660c1c0f3b7004ba5': Remove jank on camera options switching
|
fca83ac69cd3becf6ed1dc1ce595b51d5168fe7c |
11-Sep-2014 |
Jiawen Chen <jiawen@google.com> |
am c558a866: am f06952f8: am d7a4c3e2: am 9cefdd49: Changed double to float. viewFinder -> viewfinder. * commit 'c558a866abb327773a9801addab0fea910617a59': Changed double to float. viewFinder -> viewfinder.
|
78b6dfe4c02d11b8adefeb35fdef8452b7a19e32 |
11-Sep-2014 |
Alan Newberger <alann@google.com> |
am 38968eb2: am 54434532: am 0a156cf6: am ffc395d6: Reinitialize shutter button in Camera mode upon preview start * commit '38968eb27f927667167d3533b940d12d97113cf9': Reinitialize shutter button in Camera mode upon preview start
|
cab39e0ac32583367e916380d3170c4fb4187d4d |
11-Sep-2014 |
Baligh Uddin <baligh@google.com> |
am 95d4d6bc: (-s ours) am f2382657: (-s ours) am 0c5fc1d3: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-glacier * commit '95d4d6bc9b095ef61930ceaf7b9c0a8107b4112d': Import translations. DO NOT MERGE
|
96c2fe9d2cde671442b5aa5e6fbc87e4ec9bd108 |
11-Sep-2014 |
Baligh Uddin <baligh@google.com> |
am 5d5362ef: (-s ours) am 91225f8b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit '5d5362ef5fe47dae6f4ecd43a83b57d5c8b8e31a': Import translations. DO NOT MERGE
|
522466e6a32a83b81d988e14c6ddb8b0a37f19ad |
11-Sep-2014 |
Baligh Uddin <baligh@google.com> |
am f2382657: (-s ours) am 0c5fc1d3: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-glacier * commit 'f238265746c8769bdbba8091d6ae0b30f7ee8697': Import translations. DO NOT MERGE
|
03b392d9ba5423c0b77e2f872dad5e8ede9086ae |
11-Sep-2014 |
Baligh Uddin <baligh@google.com> |
am 91225f8b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit '91225f8b7d51be3f2ca8c187de70e775551b3ce4': Import translations. DO NOT MERGE
|
95d4d6bc9b095ef61930ceaf7b9c0a8107b4112d |
11-Sep-2014 |
Baligh Uddin <baligh@google.com> |
am f2382657: (-s ours) am 0c5fc1d3: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-glacier * commit 'f238265746c8769bdbba8091d6ae0b30f7ee8697': Import translations. DO NOT MERGE
|
5d5362ef5fe47dae6f4ecd43a83b57d5c8b8e31a |
11-Sep-2014 |
Baligh Uddin <baligh@google.com> |
am 91225f8b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit '91225f8b7d51be3f2ca8c187de70e775551b3ce4': Import translations. DO NOT MERGE
|
02a24bc091ba28a0415d7bd22aeccac34ded0039 |
11-Sep-2014 |
Andy Huibers <andyhuibers@google.com> |
am d3db7916: am e6ebf3d7: If we are using CaptureModule for Gcam only, turn off flash. * commit 'd3db7916c770c33feffa34dc2da486af66ab8a13': If we are using CaptureModule for Gcam only, turn off flash.
|
893acd56c4a2e55f9c533bce80cc1f1eb19ee171 |
11-Sep-2014 |
Alan Newberger <alann@google.com> |
am 11d3405c: am 0c9af933: Merge "Revert "Delay PhotoModule preview cover removal to address jank"" into ub-camera-glacier * commit '11d3405c96e68888e9d8088f35c77a81e941164c': Revert "Delay PhotoModule preview cover removal to address jank"
|
c0e5cc1eb3dbde021713c8d78b3ff039d8d4bd15 |
11-Sep-2014 |
Alan Newberger <alann@google.com> |
am 73d569d4: am 7351415d: Reset aspect ratio on pause * commit '73d569d4939008528be950f055c571048af6e648': Reset aspect ratio on pause
|
dec21ce4a19a5009d9f6a661ea29cb85d5b691c4 |
11-Sep-2014 |
Baligh Uddin <baligh@google.com> |
am 0c5fc1d3: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-glacier * commit '0c5fc1d311eaa82dff09cee6332140fda21d473e': Import translations. DO NOT MERGE
|
f238265746c8769bdbba8091d6ae0b30f7ee8697 |
11-Sep-2014 |
Baligh Uddin <baligh@google.com> |
am 0c5fc1d3: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-glacier * commit '0c5fc1d311eaa82dff09cee6332140fda21d473e': Import translations. DO NOT MERGE
|
cfaa646d2c3b3cf45df6faf7354b9bf461935fbe |
11-Sep-2014 |
Spike Sprague <spikuru@google.com> |
am ac1dd2f6: am 87a2300f: Merge "workaround fix" into ub-camera-glacier * commit 'ac1dd2f67a60aebbac54b779fa419b4c90e49bf9': workaround fix
|
3861e38769d06057910a2219562916e172d8caef |
11-Sep-2014 |
Alan Newberger <alann@google.com> |
am 3d330a60: am 3096e672: Merge "Delay PhotoModule preview cover removal to address jank" into ub-camera-glacier * commit '3d330a601da095e86735d7b58f35d22aa8c4e469': Delay PhotoModule preview cover removal to address jank
|
89e485e0970bce2e1e2ec011738a50090bc6a2ac |
11-Sep-2014 |
Senpo Hu <senpo@google.com> |
am cdf62f78: am d3ee86b7: Merge "Return to filmstrip when video playback finishes." into ub-camera-glacier * commit 'cdf62f7876cbf24fd8a645a95d1948e65c33c88b': Return to filmstrip when video playback finishes.
|
91225f8b7d51be3f2ca8c187de70e775551b3ce4 |
11-Sep-2014 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into lmp-dev
|
f5cafa5afec323e34315ee20934365360282926b |
11-Sep-2014 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
|
332e1d35695946620f1e7c9b414d11ad72ccebea |
11-Sep-2014 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE"
|
0c5fc1d311eaa82dff09cee6332140fda21d473e |
11-Sep-2014 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into ub-camera-glacier
|
1212779833e59afcb9c21480b3d61144b72c742a |
11-Sep-2014 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into ub-camera-haleakala
|
9d3fe51dcbc676c3d0b288768c63c81c7e8d1709 |
11-Sep-2014 |
Alan Newberger <alann@google.com> |
am b980192d: am 4992dc71: am 2acdb01d: am 5c4bd6b5: Reduce logging for unknown camera scope * commit 'b980192d3cdd2e193d0e6d324121df9dbfd61fab': Reduce logging for unknown camera scope
|
c741bd95c3bc9717109931ef872e652479056066 |
11-Sep-2014 |
Andy Huibers <andyhuibers@google.com> |
am 7b10d1ea: am ff9ee29a: am 91c1c555: am a710f371: Merge "This fixes Bitmap.createBitmap offset bug in L, not sure why." into ub-camera-glacier * commit '7b10d1ea709307b599bde4c3547fd1c3aad774e2': This fixes Bitmap.createBitmap offset bug in L, not sure why.
|
1f5638b73db32e242e614411933e990dc245c45a |
11-Sep-2014 |
Qiwen Zhao <zhao@google.com> |
am 905c7748: (-s ours) am 14f31379: am 031bcdbd: am fd97c6da: (-s ours) Merge "DO NOT MERGE: Adjust for camera2 API changes" into ub-camera-glacier * commit '905c774860941760ddb5a98bf26ab90250628cac': DO NOT MERGE: Adjust for camera2 API changes
|
9d54e466ebfd53e2d99294f840b17599abfcac70 |
11-Sep-2014 |
Nicolas Prevot <nprevot@google.com> |
am c5c872cb: am b780cffa: am aefc884c: am 42a5ad5a: Merge "Granting read permission in the result intent for VIDEO_CAPTURE." into ub-camera-glacier * commit 'c5c872cb1ac62de63d5fb77bc4d6765b15560cbb': Granting read permission in the result intent for VIDEO_CAPTURE.
|
ac7d02e4bb0b650a59733fab324681a47ac9ff3d |
11-Sep-2014 |
Andy Huibers <andyhuibers@google.com> |
am bc96895d: am d3db7916: am e6ebf3d7: If we are using CaptureModule for Gcam only, turn off flash. * commit 'bc96895d1644651dcf8cb8abad75b34dd85afec6': If we are using CaptureModule for Gcam only, turn off flash.
|
bc96895d1644651dcf8cb8abad75b34dd85afec6 |
11-Sep-2014 |
Andy Huibers <andyhuibers@google.com> |
am d3db7916: am e6ebf3d7: If we are using CaptureModule for Gcam only, turn off flash. * commit 'd3db7916c770c33feffa34dc2da486af66ab8a13': If we are using CaptureModule for Gcam only, turn off flash.
|
337c47be3bdd01111a7733dd62b1ac8fca16d252 |
11-Sep-2014 |
Andy Huibers <andyhuibers@google.com> |
am e6ebf3d7: If we are using CaptureModule for Gcam only, turn off flash. * commit 'e6ebf3d73bb3f337413bdde437fbb8fde6cee436': If we are using CaptureModule for Gcam only, turn off flash.
|
d3db7916c770c33feffa34dc2da486af66ab8a13 |
11-Sep-2014 |
Andy Huibers <andyhuibers@google.com> |
am e6ebf3d7: If we are using CaptureModule for Gcam only, turn off flash. * commit 'e6ebf3d73bb3f337413bdde437fbb8fde6cee436': If we are using CaptureModule for Gcam only, turn off flash.
|
e6ebf3d73bb3f337413bdde437fbb8fde6cee436 |
11-Sep-2014 |
Andy Huibers <andyhuibers@google.com> |
If we are using CaptureModule for Gcam only, turn off flash. Bug: 17460394 Change-Id: I4743e9c31f516d12537b2ceedc9e1fe35fbd8381
rc/com/android/camera/CaptureModule.java
|
6a016780ab57b96545c15c2696a9b43a2a9d55ce |
11-Sep-2014 |
Alan Newberger <alann@google.com> |
am 23ccf2e8: am 11d3405c: am 0c9af933: Merge "Revert "Delay PhotoModule preview cover removal to address jank"" into ub-camera-glacier * commit '23ccf2e8f0096712ae980a7b14e76fbc5d4e9d2d': Revert "Delay PhotoModule preview cover removal to address jank"
|
23ccf2e8f0096712ae980a7b14e76fbc5d4e9d2d |
11-Sep-2014 |
Alan Newberger <alann@google.com> |
am 11d3405c: am 0c9af933: Merge "Revert "Delay PhotoModule preview cover removal to address jank"" into ub-camera-glacier * commit '11d3405c96e68888e9d8088f35c77a81e941164c': Revert "Delay PhotoModule preview cover removal to address jank"
|
11d3405c96e68888e9d8088f35c77a81e941164c |
11-Sep-2014 |
Alan Newberger <alann@google.com> |
am 0c9af933: Merge "Revert "Delay PhotoModule preview cover removal to address jank"" into ub-camera-glacier * commit '0c9af933b7227577003f462ddab12a1ca49208fe': Revert "Delay PhotoModule preview cover removal to address jank"
|
5ee9c8c1827af023ed02f74436cdc8fd2f1b27ac |
11-Sep-2014 |
Alan Newberger <alann@google.com> |
am 0c9af933: Merge "Revert "Delay PhotoModule preview cover removal to address jank"" into ub-camera-glacier * commit '0c9af933b7227577003f462ddab12a1ca49208fe': Revert "Delay PhotoModule preview cover removal to address jank"
|
0c9af933b7227577003f462ddab12a1ca49208fe |
11-Sep-2014 |
Alan Newberger <alann@google.com> |
Merge "Revert "Delay PhotoModule preview cover removal to address jank"" into ub-camera-glacier
|
843e0e18458e9249b2d7364aa09e739eec7e50b3 |
11-Sep-2014 |
Alan Newberger <alann@google.com> |
Revert "Delay PhotoModule preview cover removal to address jank" This CL introduced PhotoModule state corruption, multiple picture taking was not possible. Need to deal with stopPreview during picture taking vs module initialization. Bug: 17451185 This reverts commit 49fb93b5517e12606eb747f0a5d218b4d03df821. Change-Id: I0a1eec8147ce859d2e83ee7bdd17655b4054f904
rc/com/android/camera/PhotoModule.java
|
a645b993b29897026d0bbb9b86a7b42391d96da4 |
11-Sep-2014 |
Alan Newberger <alann@google.com> |
am e2508ea0: am 73d569d4: am 7351415d: Reset aspect ratio on pause * commit 'e2508ea0601ac6cc5bb479eb5bbb34608478d40a': Reset aspect ratio on pause
|
e2508ea0601ac6cc5bb479eb5bbb34608478d40a |
11-Sep-2014 |
Alan Newberger <alann@google.com> |
am 73d569d4: am 7351415d: Reset aspect ratio on pause * commit '73d569d4939008528be950f055c571048af6e648': Reset aspect ratio on pause
|
73d569d4939008528be950f055c571048af6e648 |
11-Sep-2014 |
Alan Newberger <alann@google.com> |
am 7351415d: Reset aspect ratio on pause * commit '7351415ddfaf7f563a4a12c9204e6feb20fdf49d': Reset aspect ratio on pause
|
f97ed01ccd64888d35b2eacefecff58524534a43 |
11-Sep-2014 |
Alan Newberger <alann@google.com> |
am 7351415d: Reset aspect ratio on pause * commit '7351415ddfaf7f563a4a12c9204e6feb20fdf49d': Reset aspect ratio on pause
|
7351415ddfaf7f563a4a12c9204e6feb20fdf49d |
11-Sep-2014 |
Alan Newberger <alann@google.com> |
Reset aspect ratio on pause When resuming the app we do resize things but the old aspect ratio is cached, thus skipping a reset of the transform matrices because the app thinks it is already at the correct aspect ratio. In certain cases (changing orientation when paused) this leads to layout bugs. Bug: 17304671 Change-Id: Ia171190b3c76dc05519bdf4d1947d9664d5fb604
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/PhotoUI.java
rc/com/android/camera/TextureViewHelper.java
rc/com/android/camera/VideoModule.java
rc/com/android/camera/VideoUI.java
|
d4b3211d6c3f5d9ce908f2fd68e16cd5d3835b7f |
11-Sep-2014 |
Spike Sprague <spikuru@google.com> |
am cda65018: am ac1dd2f6: am 87a2300f: Merge "workaround fix" into ub-camera-glacier * commit 'cda65018a7029fd2af183c6d9b21368da2561cae': workaround fix
|
cda65018a7029fd2af183c6d9b21368da2561cae |
11-Sep-2014 |
Spike Sprague <spikuru@google.com> |
am ac1dd2f6: am 87a2300f: Merge "workaround fix" into ub-camera-glacier * commit 'ac1dd2f67a60aebbac54b779fa419b4c90e49bf9': workaround fix
|
98c7ab3c6841589a7ae547fb9afa704e349b1520 |
11-Sep-2014 |
Alan Newberger <alann@google.com> |
am 6743394f: am 3d330a60: am 3096e672: Merge "Delay PhotoModule preview cover removal to address jank" into ub-camera-glacier * commit '6743394fad922dba0aca7a9920c2079767bf2408': Delay PhotoModule preview cover removal to address jank
|
2fcd98c34a77d2d73e93ab3582891046a7b87598 |
11-Sep-2014 |
Spike Sprague <spikuru@google.com> |
am 87a2300f: Merge "workaround fix" into ub-camera-glacier * commit '87a2300ff2b49b8bd6a69815d1e4f3db477fcf4d': workaround fix
|
ac1dd2f67a60aebbac54b779fa419b4c90e49bf9 |
11-Sep-2014 |
Spike Sprague <spikuru@google.com> |
am 87a2300f: Merge "workaround fix" into ub-camera-glacier * commit '87a2300ff2b49b8bd6a69815d1e4f3db477fcf4d': workaround fix
|
747356715e55355cdd828a87572c0730a42dac61 |
11-Sep-2014 |
Alan Newberger <alann@google.com> |
am 3096e672: Merge "Delay PhotoModule preview cover removal to address jank" into ub-camera-glacier * commit '3096e6729b72a47ee3ed0a68a455bc978036de5c': Delay PhotoModule preview cover removal to address jank
|
6db448795f28a7d50854802f47f9c29b9d1542bc |
11-Sep-2014 |
Senpo Hu <senpo@google.com> |
am d3ee86b7: Merge "Return to filmstrip when video playback finishes." into ub-camera-glacier * commit 'd3ee86b7c1f1973119619f8e1b356d9707dd0493': Return to filmstrip when video playback finishes.
|
cfcaefc5e65ee04c4e33d18f77da84912f863f6a |
11-Sep-2014 |
Senpo Hu <senpo@google.com> |
am 5675b8af: Fix the upside-down orienation bug in CaptureModule. * commit '5675b8af3fddca8d73d0ce0c8aa2f2a38592f556': Fix the upside-down orienation bug in CaptureModule.
|
98cc13dbacb914000febf4f4d6a928f7ce9ad9dd |
11-Sep-2014 |
Alan Newberger <alann@google.com> |
am d79b38d6: Merge "Remove jank on camera options switching" into ub-camera-glacier * commit 'd79b38d669e9e61a954b02f3aca63810476f6fc5': Remove jank on camera options switching
|
87a2300ff2b49b8bd6a69815d1e4f3db477fcf4d |
11-Sep-2014 |
Spike Sprague <spikuru@google.com> |
Merge "workaround fix" into ub-camera-glacier
|
6743394fad922dba0aca7a9920c2079767bf2408 |
11-Sep-2014 |
Alan Newberger <alann@google.com> |
am 3d330a60: am 3096e672: Merge "Delay PhotoModule preview cover removal to address jank" into ub-camera-glacier * commit '3d330a601da095e86735d7b58f35d22aa8c4e469': Delay PhotoModule preview cover removal to address jank
|
07722e5a91e52ac26aec2503d11645922300fa39 |
11-Sep-2014 |
Jiawen Chen <jiawen@google.com> |
resolved conflicts for merge of 9cefdd49 to ub-camera-haleakala Change-Id: I5aa115c3469cdff71c410e016155d0c83d6e51c1
|
3d330a601da095e86735d7b58f35d22aa8c4e469 |
11-Sep-2014 |
Alan Newberger <alann@google.com> |
am 3096e672: Merge "Delay PhotoModule preview cover removal to address jank" into ub-camera-glacier * commit '3096e6729b72a47ee3ed0a68a455bc978036de5c': Delay PhotoModule preview cover removal to address jank
|
3096e6729b72a47ee3ed0a68a455bc978036de5c |
11-Sep-2014 |
Alan Newberger <alann@google.com> |
Merge "Delay PhotoModule preview cover removal to address jank" into ub-camera-glacier
|
49fb93b5517e12606eb747f0a5d218b4d03df821 |
11-Sep-2014 |
Alan Newberger <alann@google.com> |
Delay PhotoModule preview cover removal to address jank Cover should stay in place at least until startPreview completes. Since it is async, we should call handlers in a callback. Bug: 17451185 Change-Id: I220c49b9bb75ad977d92780c6eea0ff126a7dcb8
rc/com/android/camera/PhotoModule.java
|
2454e9b65b164624883f7b8874154b52a73d64e9 |
11-Sep-2014 |
Senpo Hu <senpo@google.com> |
am 60226c1f: am cdf62f78: am d3ee86b7: Merge "Return to filmstrip when video playback finishes." into ub-camera-glacier * commit '60226c1fc1b4791f68334db7df207041de69d7d4': Return to filmstrip when video playback finishes.
|
60226c1fc1b4791f68334db7df207041de69d7d4 |
11-Sep-2014 |
Senpo Hu <senpo@google.com> |
am cdf62f78: am d3ee86b7: Merge "Return to filmstrip when video playback finishes." into ub-camera-glacier * commit 'cdf62f7876cbf24fd8a645a95d1948e65c33c88b': Return to filmstrip when video playback finishes.
|
cdf62f7876cbf24fd8a645a95d1948e65c33c88b |
11-Sep-2014 |
Senpo Hu <senpo@google.com> |
am d3ee86b7: Merge "Return to filmstrip when video playback finishes." into ub-camera-glacier * commit 'd3ee86b7c1f1973119619f8e1b356d9707dd0493': Return to filmstrip when video playback finishes.
|
2ab141f8d5e53fa7483763ba20aa237424bab691 |
10-Sep-2014 |
Spike Sprague <spikuru@google.com> |
workaround fix change View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN to View.SYSTEM_UI_FLAG_FULLSCREEN on L, with View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN the entire camera app window is shifted down by the height of the status bar. with View.SYSTEM_UI_FLAG_FULLSCREEN thw window lays out correctly. note: with either flag on KitKat the window lays out correctly. bug: 17457492 Change-Id: I6534fcedaafbbb525967289db7fb759ba50fca42
rc/com/android/camera/CameraActivity.java
|
d3ee86b7c1f1973119619f8e1b356d9707dd0493 |
11-Sep-2014 |
Senpo Hu <senpo@google.com> |
Merge "Return to filmstrip when video playback finishes." into ub-camera-glacier
|
917aa5f359bcfa7955be5af6f6c034acde15fc64 |
10-Sep-2014 |
Senpo Hu <senpo@google.com> |
am c03da30a: am dcf60eea: am 5675b8af: Fix the upside-down orienation bug in CaptureModule. * commit 'c03da30aba2eb202adad6353198ce1dd7c144e5e': Fix the upside-down orienation bug in CaptureModule.
|
be70731da3f2b9ef1ed1bda09d458c779459c772 |
10-Sep-2014 |
Senpo Hu <senpo@google.com> |
Return to filmstrip when video playback finishes. Bug: 17091348 Change-Id: I9703d014029bf29431b099b129b1ed8bce0ffa03
rc/com/android/camera/VideoModule.java
rc/com/android/camera/util/CameraUtil.java
|
c03da30aba2eb202adad6353198ce1dd7c144e5e |
10-Sep-2014 |
Senpo Hu <senpo@google.com> |
am dcf60eea: am 5675b8af: Fix the upside-down orienation bug in CaptureModule. * commit 'dcf60eeab39218adc901a3ba3a736a0f7ccdc05e': Fix the upside-down orienation bug in CaptureModule.
|
31e3d15fff19598aebf89b29a2dc56488c50a219 |
10-Sep-2014 |
Senpo Hu <senpo@google.com> |
am dcf60eea: am 5675b8af: Fix the upside-down orienation bug in CaptureModule. * commit 'dcf60eeab39218adc901a3ba3a736a0f7ccdc05e': Fix the upside-down orienation bug in CaptureModule.
|
dcf60eeab39218adc901a3ba3a736a0f7ccdc05e |
10-Sep-2014 |
Senpo Hu <senpo@google.com> |
am 5675b8af: Fix the upside-down orienation bug in CaptureModule. * commit '5675b8af3fddca8d73d0ce0c8aa2f2a38592f556': Fix the upside-down orienation bug in CaptureModule.
|
0e1adc061bfd635896c0856660c1c0f3b7004ba5 |
10-Sep-2014 |
Alan Newberger <alann@google.com> |
am 4fb8cfb6: am 45090bab: am d79b38d6: Merge "Remove jank on camera options switching" into ub-camera-glacier * commit '4fb8cfb6e50c12649395b71e49daf6185e475cd1': Remove jank on camera options switching
|
c558a866abb327773a9801addab0fea910617a59 |
10-Sep-2014 |
Jiawen Chen <jiawen@google.com> |
am f06952f8: am d7a4c3e2: am 9cefdd49: Changed double to float. viewFinder -> viewfinder. * commit 'f06952f88acf04e746ff70835b0db3f880026ab2': Changed double to float. viewFinder -> viewfinder.
|
4fb8cfb6e50c12649395b71e49daf6185e475cd1 |
10-Sep-2014 |
Alan Newberger <alann@google.com> |
am 45090bab: am d79b38d6: Merge "Remove jank on camera options switching" into ub-camera-glacier * commit '45090babe6f614243a179bc7712e75dbf4666fb5': Remove jank on camera options switching
|
8f6e750d8adadad2044da945f47da2aea3492925 |
10-Sep-2014 |
Alan Newberger <alann@google.com> |
am 45090bab: am d79b38d6: Merge "Remove jank on camera options switching" into ub-camera-glacier * commit '45090babe6f614243a179bc7712e75dbf4666fb5': Remove jank on camera options switching
|
f06952f88acf04e746ff70835b0db3f880026ab2 |
10-Sep-2014 |
Jiawen Chen <jiawen@google.com> |
am d7a4c3e2: am 9cefdd49: Changed double to float. viewFinder -> viewfinder. * commit 'd7a4c3e265889c010cdf99170c51701019fb64f0': Changed double to float. viewFinder -> viewfinder.
|
edf2b787e94d7b9af0aee07412da0925e9515082 |
10-Sep-2014 |
Jiawen Chen <jiawen@google.com> |
am d7a4c3e2: am 9cefdd49: Changed double to float. viewFinder -> viewfinder. * commit 'd7a4c3e265889c010cdf99170c51701019fb64f0': Changed double to float. viewFinder -> viewfinder.
|
45090babe6f614243a179bc7712e75dbf4666fb5 |
10-Sep-2014 |
Alan Newberger <alann@google.com> |
am d79b38d6: Merge "Remove jank on camera options switching" into ub-camera-glacier * commit 'd79b38d669e9e61a954b02f3aca63810476f6fc5': Remove jank on camera options switching
|
5675b8af3fddca8d73d0ce0c8aa2f2a38592f556 |
10-Sep-2014 |
Senpo Hu <senpo@google.com> |
Fix the upside-down orienation bug in CaptureModule. Bug: 17369697 Change-Id: I5beb0ec45f2dbf372dda88ffd8a92b1632b3ab90
rc/com/android/camera/CaptureModule.java
|
d79b38d669e9e61a954b02f3aca63810476f6fc5 |
10-Sep-2014 |
Alan Newberger <alann@google.com> |
Merge "Remove jank on camera options switching" into ub-camera-glacier
|
d7a4c3e265889c010cdf99170c51701019fb64f0 |
10-Sep-2014 |
Jiawen Chen <jiawen@google.com> |
am 9cefdd49: Changed double to float. viewFinder -> viewfinder. * commit '9cefdd495332719d987ffb942742ec602793d8d4': Changed double to float. viewFinder -> viewfinder.
|
38968eb27f927667167d3533b940d12d97113cf9 |
10-Sep-2014 |
Alan Newberger <alann@google.com> |
am 54434532: am 0a156cf6: am ffc395d6: Reinitialize shutter button in Camera mode upon preview start * commit '54434532594362c4891c5553254437b7ee06307a': Reinitialize shutter button in Camera mode upon preview start
|
59a9d83b968077f9267b15bac3395d51fda22021 |
10-Sep-2014 |
Alan Newberger <alann@google.com> |
am 0a156cf6: am ffc395d6: Reinitialize shutter button in Camera mode upon preview start * commit '0a156cf6c8543433e1188da2873241bdb1869c11': Reinitialize shutter button in Camera mode upon preview start
|
54434532594362c4891c5553254437b7ee06307a |
10-Sep-2014 |
Alan Newberger <alann@google.com> |
am 0a156cf6: am ffc395d6: Reinitialize shutter button in Camera mode upon preview start * commit '0a156cf6c8543433e1188da2873241bdb1869c11': Reinitialize shutter button in Camera mode upon preview start
|
9cefdd495332719d987ffb942742ec602793d8d4 |
09-Sep-2014 |
Jiawen Chen <jiawen@google.com> |
Changed double to float. viewFinder -> viewfinder. Change-Id: I5f10a5e8dae40f56457b863d5e8c703e7bf68e49
rc/com/android/camera/one/OneCamera.java
rc/com/android/camera/one/v2/OneCameraImpl.java
rc/com/android/camera/one/v2/OneCameraZslImpl.java
|
0a156cf6c8543433e1188da2873241bdb1869c11 |
10-Sep-2014 |
Alan Newberger <alann@google.com> |
am ffc395d6: Reinitialize shutter button in Camera mode upon preview start * commit 'ffc395d6e7eaafcdcd283e183188de16aa14aa4c': Reinitialize shutter button in Camera mode upon preview start
|
7f938d6ecac51e2cd4bda17b9c7d45fd77a18d41 |
10-Sep-2014 |
Alan Newberger <alann@google.com> |
am ffc395d6: Reinitialize shutter button in Camera mode upon preview start * commit 'ffc395d6e7eaafcdcd283e183188de16aa14aa4c': Reinitialize shutter button in Camera mode upon preview start
|
ffc395d6e7eaafcdcd283e183188de16aa14aa4c |
10-Sep-2014 |
Alan Newberger <alann@google.com> |
Reinitialize shutter button in Camera mode upon preview start VideoModule already does this here, and by adding to PhotoModule we address a bug where pausing when capturing leaves the button disabled on resume. Bug: 17426670 Change-Id: I8333b52a72c0da8b58070d689406975332ae632e
rc/com/android/camera/PhotoModule.java
|
b980192d3cdd2e193d0e6d324121df9dbfd61fab |
10-Sep-2014 |
Alan Newberger <alann@google.com> |
am 4992dc71: am 2acdb01d: am 5c4bd6b5: Reduce logging for unknown camera scope * commit '4992dc710154ff1f9a82dde65b475c99b7930620': Reduce logging for unknown camera scope
|
4992dc710154ff1f9a82dde65b475c99b7930620 |
10-Sep-2014 |
Alan Newberger <alann@google.com> |
am 2acdb01d: am 5c4bd6b5: Reduce logging for unknown camera scope * commit '2acdb01dfb3ce662220f801fb9733cbdca4d6233': Reduce logging for unknown camera scope
|
309cdabd062de6dae4fb5387948a4ad823f965ae |
10-Sep-2014 |
Alan Newberger <alann@google.com> |
am 2acdb01d: am 5c4bd6b5: Reduce logging for unknown camera scope * commit '2acdb01dfb3ce662220f801fb9733cbdca4d6233': Reduce logging for unknown camera scope
|
2acdb01dfb3ce662220f801fb9733cbdca4d6233 |
10-Sep-2014 |
Alan Newberger <alann@google.com> |
am 5c4bd6b5: Reduce logging for unknown camera scope * commit '5c4bd6b5348a3464783270ea0bb10d4968d3b0cb': Reduce logging for unknown camera scope
|
967fbd0875243a5c299a2c61a025218bf6e03c1e |
10-Sep-2014 |
Alan Newberger <alann@google.com> |
am 5c4bd6b5: Reduce logging for unknown camera scope * commit '5c4bd6b5348a3464783270ea0bb10d4968d3b0cb': Reduce logging for unknown camera scope
|
5c4bd6b5348a3464783270ea0bb10d4968d3b0cb |
10-Sep-2014 |
Alan Newberger <alann@google.com> |
Reduce logging for unknown camera scope Still log a warning, but remove stack trace logging. Change-Id: I28e47feb5d2700fd05e7ff4e6faeb1d5a9e38de5
rc/com/android/camera/CameraActivity.java
|
7b10d1ea709307b599bde4c3547fd1c3aad774e2 |
10-Sep-2014 |
Andy Huibers <andyhuibers@google.com> |
am ff9ee29a: am 91c1c555: am a710f371: Merge "This fixes Bitmap.createBitmap offset bug in L, not sure why." into ub-camera-glacier * commit 'ff9ee29a99a8d01f21e75ee29e47a1636c567b03': This fixes Bitmap.createBitmap offset bug in L, not sure why.
|
ff9ee29a99a8d01f21e75ee29e47a1636c567b03 |
10-Sep-2014 |
Andy Huibers <andyhuibers@google.com> |
am 91c1c555: am a710f371: Merge "This fixes Bitmap.createBitmap offset bug in L, not sure why." into ub-camera-glacier * commit '91c1c555ec75e66d35ed57dfe6134b50c46ee525': This fixes Bitmap.createBitmap offset bug in L, not sure why.
|
5af3ed93aa84ee5360681cad6db385c0e89bdc35 |
10-Sep-2014 |
Andy Huibers <andyhuibers@google.com> |
am 91c1c555: am a710f371: Merge "This fixes Bitmap.createBitmap offset bug in L, not sure why." into ub-camera-glacier * commit '91c1c555ec75e66d35ed57dfe6134b50c46ee525': This fixes Bitmap.createBitmap offset bug in L, not sure why.
|
905c774860941760ddb5a98bf26ab90250628cac |
10-Sep-2014 |
Qiwen Zhao <zhao@google.com> |
am 14f31379: am 031bcdbd: am fd97c6da: (-s ours) Merge "DO NOT MERGE: Adjust for camera2 API changes" into ub-camera-glacier * commit '14f3137946007d7100ac62db10e167046940cbce': DO NOT MERGE: Adjust for camera2 API changes
|
91c1c555ec75e66d35ed57dfe6134b50c46ee525 |
10-Sep-2014 |
Andy Huibers <andyhuibers@google.com> |
am a710f371: Merge "This fixes Bitmap.createBitmap offset bug in L, not sure why." into ub-camera-glacier * commit 'a710f371b8e454d37b8b2be50e001b79e37c67f2': This fixes Bitmap.createBitmap offset bug in L, not sure why.
|
efdac383e982fcaf61c847e03f118e25325cad16 |
10-Sep-2014 |
Andy Huibers <andyhuibers@google.com> |
am a710f371: Merge "This fixes Bitmap.createBitmap offset bug in L, not sure why." into ub-camera-glacier * commit 'a710f371b8e454d37b8b2be50e001b79e37c67f2': This fixes Bitmap.createBitmap offset bug in L, not sure why.
|
65c0dad8a189bc4cbb59bcf0ac277c5003d3880f |
09-Sep-2014 |
Eino-Ville Talvala <etalvala@google.com> |
DO NOT MERGE: Adjust for camera2 API changes Add frameNumber to CaptureCallback#onCaptureStarted Bug: 17421092 Change-Id: I6e66bd1abc2ecec4dd8346cf4313dc7261ffa26b (cherry picked from commit dd38b94c6f21b528f0de706a69d853f24a9c9561)
rc/com/android/camera/one/v2/OneCameraImpl.java
|
a710f371b8e454d37b8b2be50e001b79e37c67f2 |
10-Sep-2014 |
Andy Huibers <andyhuibers@google.com> |
Merge "This fixes Bitmap.createBitmap offset bug in L, not sure why." into ub-camera-glacier
|
14f3137946007d7100ac62db10e167046940cbce |
10-Sep-2014 |
Qiwen Zhao <zhao@google.com> |
am 031bcdbd: am fd97c6da: (-s ours) Merge "DO NOT MERGE: Adjust for camera2 API changes" into ub-camera-glacier * commit '031bcdbd1ce646d11542165f626f7590bfa85130': DO NOT MERGE: Adjust for camera2 API changes
|
c6456b7b90fdc367888a50009821c916e04c143a |
10-Sep-2014 |
Qiwen Zhao <zhao@google.com> |
am 031bcdbd: am fd97c6da: (-s ours) Merge "DO NOT MERGE: Adjust for camera2 API changes" into ub-camera-glacier * commit '031bcdbd1ce646d11542165f626f7590bfa85130': DO NOT MERGE: Adjust for camera2 API changes
|
0f625c97eef59fb23597885ed72fe218a83e7eb0 |
10-Sep-2014 |
Qiwen Zhao <zhao@google.com> |
am fd97c6da: (-s ours) Merge "DO NOT MERGE: Adjust for camera2 API changes" into ub-camera-glacier * commit 'fd97c6da954f3e3e6f8547f6f7363cddba6c1b9a': DO NOT MERGE: Adjust for camera2 API changes
|
031bcdbd1ce646d11542165f626f7590bfa85130 |
10-Sep-2014 |
Qiwen Zhao <zhao@google.com> |
am fd97c6da: (-s ours) Merge "DO NOT MERGE: Adjust for camera2 API changes" into ub-camera-glacier * commit 'fd97c6da954f3e3e6f8547f6f7363cddba6c1b9a': DO NOT MERGE: Adjust for camera2 API changes
|
fd97c6da954f3e3e6f8547f6f7363cddba6c1b9a |
10-Sep-2014 |
Qiwen Zhao <zhao@google.com> |
Merge "DO NOT MERGE: Adjust for camera2 API changes" into ub-camera-glacier
|
c5c872cb1ac62de63d5fb77bc4d6765b15560cbb |
10-Sep-2014 |
Nicolas Prevot <nprevot@google.com> |
am b780cffa: am aefc884c: am 42a5ad5a: Merge "Granting read permission in the result intent for VIDEO_CAPTURE." into ub-camera-glacier * commit 'b780cffa09be568dc7fc94ee227c5918a93199b2': Granting read permission in the result intent for VIDEO_CAPTURE.
|
0c7af4631f8764c89626f16e47cfe88bb212db0a |
10-Sep-2014 |
Nicolas Prevot <nprevot@google.com> |
am aefc884c: am 42a5ad5a: Merge "Granting read permission in the result intent for VIDEO_CAPTURE." into ub-camera-glacier * commit 'aefc884cf5bd12b8caa0a657c33072010cd3234c': Granting read permission in the result intent for VIDEO_CAPTURE.
|
b780cffa09be568dc7fc94ee227c5918a93199b2 |
10-Sep-2014 |
Nicolas Prevot <nprevot@google.com> |
am aefc884c: am 42a5ad5a: Merge "Granting read permission in the result intent for VIDEO_CAPTURE." into ub-camera-glacier * commit 'aefc884cf5bd12b8caa0a657c33072010cd3234c': Granting read permission in the result intent for VIDEO_CAPTURE.
|
aefc884cf5bd12b8caa0a657c33072010cd3234c |
10-Sep-2014 |
Nicolas Prevot <nprevot@google.com> |
am 42a5ad5a: Merge "Granting read permission in the result intent for VIDEO_CAPTURE." into ub-camera-glacier * commit '42a5ad5a9c7e660854fd0552b81e025c16db9f05': Granting read permission in the result intent for VIDEO_CAPTURE.
|
32dc1e5bc05eaa7972a628640e91c80bbb9bcc43 |
10-Sep-2014 |
Nicolas Prevot <nprevot@google.com> |
am 42a5ad5a: Merge "Granting read permission in the result intent for VIDEO_CAPTURE." into ub-camera-glacier * commit '42a5ad5a9c7e660854fd0552b81e025c16db9f05': Granting read permission in the result intent for VIDEO_CAPTURE.
|
42a5ad5a9c7e660854fd0552b81e025c16db9f05 |
10-Sep-2014 |
Nicolas Prevot <nprevot@google.com> |
Merge "Granting read permission in the result intent for VIDEO_CAPTURE." into ub-camera-glacier
|
e9293d34df1b98b68aac1c741c81d3b643a8498b |
10-Sep-2014 |
Andy Huibers <andyhuibers@google.com> |
am 7d83470a: am 0d66b901: am 458590b6: am 5e3bf4cc: Remove toast. This reverts commit 779414e8bfe23d66de310570ff2314654e45ec9f. * commit '7d83470ad16a61e214beb11754d1de4d47cd8526': Remove toast. This reverts commit 779414e8bfe23d66de310570ff2314654e45ec9f.
|
7d83470ad16a61e214beb11754d1de4d47cd8526 |
10-Sep-2014 |
Andy Huibers <andyhuibers@google.com> |
am 0d66b901: am 458590b6: am 5e3bf4cc: Remove toast. This reverts commit 779414e8bfe23d66de310570ff2314654e45ec9f. * commit '0d66b9018ea1539cd160d912d621b45cfce37aea': Remove toast. This reverts commit 779414e8bfe23d66de310570ff2314654e45ec9f.
|
0d66b9018ea1539cd160d912d621b45cfce37aea |
10-Sep-2014 |
Andy Huibers <andyhuibers@google.com> |
am 458590b6: am 5e3bf4cc: Remove toast. This reverts commit 779414e8bfe23d66de310570ff2314654e45ec9f. * commit '458590b60a75ea60a6d30d7713b5d5e6e08302e1': Remove toast. This reverts commit 779414e8bfe23d66de310570ff2314654e45ec9f.
|
614e05da970792a02e11d35f5d0cb519a7b758e8 |
10-Sep-2014 |
Andy Huibers <andyhuibers@google.com> |
am 458590b6: am 5e3bf4cc: Remove toast. This reverts commit 779414e8bfe23d66de310570ff2314654e45ec9f. * commit '458590b60a75ea60a6d30d7713b5d5e6e08302e1': Remove toast. This reverts commit 779414e8bfe23d66de310570ff2314654e45ec9f.
|
458590b60a75ea60a6d30d7713b5d5e6e08302e1 |
10-Sep-2014 |
Andy Huibers <andyhuibers@google.com> |
am 5e3bf4cc: Remove toast. This reverts commit 779414e8bfe23d66de310570ff2314654e45ec9f. * commit '5e3bf4cc84a186c5e89dfa692f3af95007751877': Remove toast. This reverts commit 779414e8bfe23d66de310570ff2314654e45ec9f.
|
22eb5039c0ef4c057d876b8416230a042ab95a39 |
10-Sep-2014 |
Andy Huibers <andyhuibers@google.com> |
am 5e3bf4cc: Remove toast. This reverts commit 779414e8bfe23d66de310570ff2314654e45ec9f. * commit '5e3bf4cc84a186c5e89dfa692f3af95007751877': Remove toast. This reverts commit 779414e8bfe23d66de310570ff2314654e45ec9f.
|
c91c8d273b8884468dfd66a5b82526dc8245934e |
10-Sep-2014 |
Alan Newberger <alann@google.com> |
Remove jank on camera options switching There are two main causes of jank on encountered on options switching: 1. When requesting camera in requestCamera, a portability refactor introduced a regression where we blocked in the main thread to close the camera. This main thread blockage is unacceptable as it caused a preview freeze in addition to the freeze we were trying to create during the switch, leading to a two-frame preview freeze. 2. The mode options animations which delay the button state transition, also resulted in preview stutters. Unsure of cause but reverting first and will assess fixes and reintroduce. Bug: 17414652 Change-Id: Ib72e331f1bbb5d3b608d8bdc5656c2ff2836ed42
rc/com/android/camera/MultiToggleImageButton.java
rc/com/android/camera/app/CameraAppUI.java
rc/com/android/camera/app/CameraController.java
|
5e3bf4cc84a186c5e89dfa692f3af95007751877 |
10-Sep-2014 |
Andy Huibers <andyhuibers@google.com> |
Remove toast. This reverts commit 779414e8bfe23d66de310570ff2314654e45ec9f. Change-Id: Idf04e0bbb69822792327fd17634a4f95f7eb2092
rc/com/android/camera/CaptureModule.java
|
3f08fa1fd60f6a62e6d7d8e51c826be867494186 |
10-Sep-2014 |
Senpo Hu <senpo@google.com> |
am 25a1991c: am e2345197: am c4f2f4d9: am b954b3e8: Merge "Always match camera orientation with device orientation regardless portrait lock." into ub-camera-glacier * commit '25a1991c549659fcf204c962601523d8cd6e2deb': Always match camera orientation with device orientation regardless portrait lock.
|
8940b4f1f89cf04becabfc0d39d48a3de87cfa47 |
10-Sep-2014 |
Senpo Hu <senpo@google.com> |
am f94fa21c: am a43fd263: am 7a3bdb23: am 65c00136: Set video quality pref default values at startup. * commit 'f94fa21c9a241bf5d203c9179a41fb5abacfcef9': Set video quality pref default values at startup.
|
2a51fefaab4f5cce4fd9890c2ccb37a6adb269f8 |
10-Sep-2014 |
Eino-Ville Talvala <etalvala@google.com> |
am ee59e725: am 2ce061b7: am 420c2c42: Merge "Adjust for camera2 API changes" into lmp-dev * commit 'ee59e725b8c271b046e1a8908de16288747bbdbd': Adjust for camera2 API changes
|
25a1991c549659fcf204c962601523d8cd6e2deb |
10-Sep-2014 |
Senpo Hu <senpo@google.com> |
am e2345197: am c4f2f4d9: am b954b3e8: Merge "Always match camera orientation with device orientation regardless portrait lock." into ub-camera-glacier * commit 'e2345197ecd8d1728b53d71be817e51f7d1369b3': Always match camera orientation with device orientation regardless portrait lock.
|
f94fa21c9a241bf5d203c9179a41fb5abacfcef9 |
10-Sep-2014 |
Senpo Hu <senpo@google.com> |
am a43fd263: am 7a3bdb23: am 65c00136: Set video quality pref default values at startup. * commit 'a43fd263f123b0f42fefa2154b028fcc54b986b7': Set video quality pref default values at startup.
|
ee59e725b8c271b046e1a8908de16288747bbdbd |
10-Sep-2014 |
Eino-Ville Talvala <etalvala@google.com> |
am 2ce061b7: am 420c2c42: Merge "Adjust for camera2 API changes" into lmp-dev * commit '2ce061b7766b222c3af0eb9eb1f762c7abb9cb6d': Adjust for camera2 API changes
|
e2345197ecd8d1728b53d71be817e51f7d1369b3 |
10-Sep-2014 |
Senpo Hu <senpo@google.com> |
am c4f2f4d9: am b954b3e8: Merge "Always match camera orientation with device orientation regardless portrait lock." into ub-camera-glacier * commit 'c4f2f4d922530270ba0b586320bb5228e706e04f': Always match camera orientation with device orientation regardless portrait lock.
|
877489aae0927c0038e9d29b79717d6f1e12800a |
10-Sep-2014 |
Senpo Hu <senpo@google.com> |
am c4f2f4d9: am b954b3e8: Merge "Always match camera orientation with device orientation regardless portrait lock." into ub-camera-glacier * commit 'c4f2f4d922530270ba0b586320bb5228e706e04f': Always match camera orientation with device orientation regardless portrait lock.
|
a43fd263f123b0f42fefa2154b028fcc54b986b7 |
10-Sep-2014 |
Senpo Hu <senpo@google.com> |
am 7a3bdb23: am 65c00136: Set video quality pref default values at startup. * commit '7a3bdb2341c88dd6d1aac86ea8685ff4fa5ccbc9': Set video quality pref default values at startup.
|
12f408cc7acbdcf6f742841a21166f26e9ce12fc |
10-Sep-2014 |
Senpo Hu <senpo@google.com> |
am 7a3bdb23: am 65c00136: Set video quality pref default values at startup. * commit '7a3bdb2341c88dd6d1aac86ea8685ff4fa5ccbc9': Set video quality pref default values at startup.
|
c4f2f4d922530270ba0b586320bb5228e706e04f |
10-Sep-2014 |
Senpo Hu <senpo@google.com> |
am b954b3e8: Merge "Always match camera orientation with device orientation regardless portrait lock." into ub-camera-glacier * commit 'b954b3e8b9fff8adf82808bd6cac1f9a7ac9505a': Always match camera orientation with device orientation regardless portrait lock.
|
5de493f5a088466e050d53fb5fbd83c1cd5ae471 |
10-Sep-2014 |
Senpo Hu <senpo@google.com> |
am b954b3e8: Merge "Always match camera orientation with device orientation regardless portrait lock." into ub-camera-glacier * commit 'b954b3e8b9fff8adf82808bd6cac1f9a7ac9505a': Always match camera orientation with device orientation regardless portrait lock.
|
b954b3e8b9fff8adf82808bd6cac1f9a7ac9505a |
10-Sep-2014 |
Senpo Hu <senpo@google.com> |
Merge "Always match camera orientation with device orientation regardless portrait lock." into ub-camera-glacier
|
7a3bdb2341c88dd6d1aac86ea8685ff4fa5ccbc9 |
10-Sep-2014 |
Senpo Hu <senpo@google.com> |
am 65c00136: Set video quality pref default values at startup. * commit '65c00136cde07e050d05e3da61876199df90dd18': Set video quality pref default values at startup.
|
d29a0163c118c3c0049349deed767eb7ef6619b7 |
10-Sep-2014 |
Senpo Hu <senpo@google.com> |
am 65c00136: Set video quality pref default values at startup. * commit '65c00136cde07e050d05e3da61876199df90dd18': Set video quality pref default values at startup.
|
58eb8853bc9002dfcb7caf48c251d90070eda5a0 |
10-Sep-2014 |
Eino-Ville Talvala <etalvala@google.com> |
am 420c2c42: Merge "Adjust for camera2 API changes" into lmp-dev * commit '420c2c42f42c1cf9b123a773479d476cede38818': Adjust for camera2 API changes
|
65c00136cde07e050d05e3da61876199df90dd18 |
09-Sep-2014 |
Senpo Hu <senpo@google.com> |
Set video quality pref default values at startup. The problem of the old approach is the default values never got set until switching on video module. The caveat of the this CL is that the default value tweak is only applied for Shamu. Rather than basing on device model string, detecting CamcorderProfile capability is a better way to get this job done. However, |CamcorderProfile.hasProfile| needs camera id info so I'd argue this CL is good enough for the Shamu/L release. Bug: 17060480 Change-Id: Ia53ff6aecad44fe7a32257fa1415163f167c09bf
rc/com/android/camera/VideoModule.java
rc/com/android/camera/settings/Keys.java
|
bb1c72f7b9b8659071bc74e7949f8a360be0578d |
08-Sep-2014 |
Senpo Hu <senpo@google.com> |
Always match camera orientation with device orientation regardless portrait lock. Verified that this CL fixes the orientation issue for portrait/landscape photos taken in PhotoModule with all configuration combinations such as Camera API1/API2 devices, K/L devices, front/back camera. Bug: 17360176 Change-Id: If84244726cf7e2ade470c231b8ac16e9b80366fe
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/app/OrientationManagerImpl.java
|
2ce061b7766b222c3af0eb9eb1f762c7abb9cb6d |
10-Sep-2014 |
Eino-Ville Talvala <etalvala@google.com> |
am 420c2c42: Merge "Adjust for camera2 API changes" into lmp-dev * commit '420c2c42f42c1cf9b123a773479d476cede38818': Adjust for camera2 API changes
|
420c2c42f42c1cf9b123a773479d476cede38818 |
10-Sep-2014 |
Eino-Ville Talvala <etalvala@google.com> |
Merge "Adjust for camera2 API changes" into lmp-dev
|
0f54d2840314efdccb98fcc48bb1e32d6a774a33 |
09-Sep-2014 |
Andy Huibers <andyhuibers@google.com> |
This fixes Bitmap.createBitmap offset bug in L, not sure why. Bug: 17145703 Change-Id: I18a673a5cac4400a2d6e80a851b1fb12381dc995
rc/com/android/camera/PhotoModule.java
|
44917f6b63804715be666a01ad79b262fb041b80 |
09-Sep-2014 |
Nicolas Prevot <nprevot@google.com> |
Granting read permission in the result intent for VIDEO_CAPTURE. BUG:17437266 Change-Id: I84d1a69a3d314a05a7e3b5c949c896700426644e
rc/com/android/camera/VideoModule.java
|
ba677c7e1234ebfa8893eac40281217d7901f05a |
09-Sep-2014 |
Spike Sprague <spikuru@google.com> |
am b8555b66: am 767a1186: Merge "back to bigger HDR+ icons" into ub-camera-glacier * commit 'b8555b66ca0c4571b0a4434321950dc0a6a36505': back to bigger HDR+ icons
|
3b4a898e91187c37415851e9ac46bd4f681785da |
09-Sep-2014 |
Spike Sprague <spikuru@google.com> |
am f56195e3: am 38312764: am b8555b66: am 767a1186: Merge "back to bigger HDR+ icons" into ub-camera-glacier * commit 'f56195e349b25859d3fc4d2f59988ec28071b4cc': back to bigger HDR+ icons
|
f56195e349b25859d3fc4d2f59988ec28071b4cc |
09-Sep-2014 |
Spike Sprague <spikuru@google.com> |
am 38312764: am b8555b66: am 767a1186: Merge "back to bigger HDR+ icons" into ub-camera-glacier * commit '38312764d182f16ad9e44d19bcc3f488c816ac45': back to bigger HDR+ icons
|
dd38b94c6f21b528f0de706a69d853f24a9c9561 |
09-Sep-2014 |
Eino-Ville Talvala <etalvala@google.com> |
DO NOT MERGE: Adjust for camera2 API changes Add frameNumber to CaptureCallback#onCaptureStarted Bug: 17421092 Change-Id: I6e66bd1abc2ecec4dd8346cf4313dc7261ffa26b
rc/com/android/camera/one/v2/OneCameraImpl.java
|
38312764d182f16ad9e44d19bcc3f488c816ac45 |
09-Sep-2014 |
Spike Sprague <spikuru@google.com> |
am b8555b66: am 767a1186: Merge "back to bigger HDR+ icons" into ub-camera-glacier * commit 'b8555b66ca0c4571b0a4434321950dc0a6a36505': back to bigger HDR+ icons
|
b8555b66ca0c4571b0a4434321950dc0a6a36505 |
09-Sep-2014 |
Spike Sprague <spikuru@google.com> |
am 767a1186: Merge "back to bigger HDR+ icons" into ub-camera-glacier * commit '767a1186a1127f070785d50054a0e1a02975eb4a': back to bigger HDR+ icons
|
1ccdc3b70368b5358ad881611963b99ec05cbffe |
09-Sep-2014 |
Spike Sprague <spikuru@google.com> |
am 767a1186: Merge "back to bigger HDR+ icons" into ub-camera-glacier * commit '767a1186a1127f070785d50054a0e1a02975eb4a': back to bigger HDR+ icons
|
767a1186a1127f070785d50054a0e1a02975eb4a |
09-Sep-2014 |
Spike Sprague <spikuru@google.com> |
Merge "back to bigger HDR+ icons" into ub-camera-glacier
|
82071a3ef7d113f6d033fa3d361baefe8d594966 |
09-Sep-2014 |
Spike Sprague <spikuru@google.com> |
back to bigger HDR+ icons bug: 17304734 Change-Id: I9b2b22101003b2d13f386367245622d4e13c0309
es/drawable-hdpi/ic_hdr_plus_off_disabled.png
es/drawable-hdpi/ic_hdr_plus_off_indicator.png
es/drawable-hdpi/ic_hdr_plus_off_normal.png
es/drawable-hdpi/ic_hdr_plus_on_disabled.png
es/drawable-hdpi/ic_hdr_plus_on_indicator.png
es/drawable-hdpi/ic_hdr_plus_on_normal.png
es/drawable-mdpi/ic_hdr_plus_off_disabled.png
es/drawable-mdpi/ic_hdr_plus_off_indicator.png
es/drawable-mdpi/ic_hdr_plus_off_normal.png
es/drawable-mdpi/ic_hdr_plus_on_disabled.png
es/drawable-mdpi/ic_hdr_plus_on_indicator.png
es/drawable-mdpi/ic_hdr_plus_on_normal.png
es/drawable-xhdpi/ic_hdr_plus_off_disabled.png
es/drawable-xhdpi/ic_hdr_plus_off_indicator.png
es/drawable-xhdpi/ic_hdr_plus_off_normal.png
es/drawable-xhdpi/ic_hdr_plus_on_disabled.png
es/drawable-xhdpi/ic_hdr_plus_on_indicator.png
es/drawable-xhdpi/ic_hdr_plus_on_normal.png
es/drawable-xxhdpi/ic_hdr_plus_off_disabled.png
es/drawable-xxhdpi/ic_hdr_plus_off_indicator.png
es/drawable-xxhdpi/ic_hdr_plus_off_normal.png
es/drawable-xxhdpi/ic_hdr_plus_on_disabled.png
es/drawable-xxhdpi/ic_hdr_plus_on_indicator.png
es/drawable-xxhdpi/ic_hdr_plus_on_normal.png
es/drawable-xxxhdpi/ic_hdr_plus_off_disabled.png
es/drawable-xxxhdpi/ic_hdr_plus_off_indicator.png
es/drawable-xxxhdpi/ic_hdr_plus_off_normal.png
es/drawable-xxxhdpi/ic_hdr_plus_on_disabled.png
es/drawable-xxxhdpi/ic_hdr_plus_on_indicator.png
es/drawable-xxxhdpi/ic_hdr_plus_on_normal.png
|
36dadb15c915831391a286c7ec2a8fd8bf359391 |
09-Sep-2014 |
Baligh Uddin <baligh@google.com> |
am 7a6d5d9d: am 946b7e44: keep history after reset to lmp-dev * commit '7a6d5d9d6bc79d2acc3a1758c8249b2ea4c775c0':
|
da29ffb97008854d40a77f3c81c5f6119a94839b |
09-Sep-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I83df86cc3423782b31ba85d1f225569d58b08e87 Auto-generated-cl: translation import
es/values-cs/strings.xml
|
c4ab1de83e0cc2f6f725589063f277eb8988e3ed |
09-Sep-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I73e4af5066d39bdf6921ef9ac2e6cd1bcb07183c Auto-generated-cl: translation import
es/values-cs/strings.xml
|
d7b3623a581dfe23493b0bdee20870076cbd274c |
09-Sep-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I1f7884b40c4ba0621c141becc1ef288cabafe20d Auto-generated-cl: translation import
es/values-cs/strings.xml
es/values-my-rMM/strings.xml
|
2fcfdf8f652d2af230df96bc8ab38e68437937d5 |
09-Sep-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ia40a8978cc1d1529d9d521fb9d3c4ee50473566f Auto-generated-cl: translation import
es/values-cs/strings.xml
|
1ea15e2397e698317ec214003bdaf8dab6362d29 |
09-Sep-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I2ffdd38d5234e2c80101f73b329aca5656e167e4 Auto-generated-cl: translation import
es/values-cs/strings.xml
es/values-my-rMM/strings.xml
|
7a6d5d9d6bc79d2acc3a1758c8249b2ea4c775c0 |
09-Sep-2014 |
Baligh Uddin <baligh@google.com> |
am 946b7e44: keep history after reset to lmp-dev * commit '946b7e44c43bf521cd9eaf4d4550bb49c1526e13':
|
f879e95bb2facf2f1d037181e3589e9bd56def09 |
09-Sep-2014 |
Baligh Uddin <baligh@google.com> |
am 55aad624: keep history after reset to lmp-dev * commit '55aad624920017cdc9ec182754e4bdb9627ac424':
|
f35cdb2c79271626d6b79529a85db23816d0dd58 |
09-Sep-2014 |
Baligh Uddin <baligh@google.com> |
keep history after reset to lmp-dev
|
55aad624920017cdc9ec182754e4bdb9627ac424 |
09-Sep-2014 |
Baligh Uddin <baligh@google.com> |
keep history after reset to lmp-dev
|
5d3bebdef686cb5af4a765b30bf92ad88230bf45 |
09-Sep-2014 |
Baligh Uddin <baligh@google.com> |
keep history after reset to lmp-dev
|
946b7e44c43bf521cd9eaf4d4550bb49c1526e13 |
09-Sep-2014 |
Baligh Uddin <baligh@google.com> |
keep history after reset to lmp-dev
|
56a1e252eb36906686fd800e817cd13d1c642386 |
09-Sep-2014 |
Eino-Ville Talvala <etalvala@google.com> |
Adjust for camera2 API changes Add frameNumber to CaptureCallback#onCaptureStarted Bug: 17421092 Change-Id: I6e66bd1abc2ecec4dd8346cf4313dc7261ffa26b
rc/com/android/camera/one/v2/OneCameraImpl.java
|
d31e610544dda6356dc4aeeb5e910cd8f80387f4 |
09-Sep-2014 |
Alan Newberger <alann@google.com> |
am 51407c29: am d4c8d110: am 3da669a0: am f974ba71: Additional logging for CAPTURE intent handling * commit '51407c293ffbc88f62e114768f527add98f75e11': Additional logging for CAPTURE intent handling
|
51407c293ffbc88f62e114768f527add98f75e11 |
09-Sep-2014 |
Alan Newberger <alann@google.com> |
am d4c8d110: am 3da669a0: am f974ba71: Additional logging for CAPTURE intent handling * commit 'd4c8d1100457e35cb1738828318681ed1c080faa': Additional logging for CAPTURE intent handling
|
d59b766bd5413a872c9a37b0839456405db58ae0 |
09-Sep-2014 |
Alan Newberger <alann@google.com> |
am 3da669a0: am f974ba71: Additional logging for CAPTURE intent handling * commit '3da669a022b8c43633288eb5f3fd736a2fe82e53': Additional logging for CAPTURE intent handling
|
d4c8d1100457e35cb1738828318681ed1c080faa |
09-Sep-2014 |
Alan Newberger <alann@google.com> |
am 3da669a0: am f974ba71: Additional logging for CAPTURE intent handling * commit '3da669a022b8c43633288eb5f3fd736a2fe82e53': Additional logging for CAPTURE intent handling
|
90aa96b8c71900edfda60ce779b5f71ab7d2566e |
09-Sep-2014 |
Alan Newberger <alann@google.com> |
am f974ba71: Additional logging for CAPTURE intent handling * commit 'f974ba719a1255b6bda1b214842641fb5736a877': Additional logging for CAPTURE intent handling
|
3da669a022b8c43633288eb5f3fd736a2fe82e53 |
09-Sep-2014 |
Alan Newberger <alann@google.com> |
am f974ba71: Additional logging for CAPTURE intent handling * commit 'f974ba719a1255b6bda1b214842641fb5736a877': Additional logging for CAPTURE intent handling
|
f974ba719a1255b6bda1b214842641fb5736a877 |
08-Sep-2014 |
Alan Newberger <alann@google.com> |
Additional logging for CAPTURE intent handling Adds verbose logging and some exception log warnings to help diagnose issues in CAPTURE intents. Bug: 17421140 Change-Id: Ib0afe4219418b1e7ee5ca4879e39a4448ec13cc0
rc/com/android/camera/PhotoModule.java
|
5a94dcf994f369f21136be84cec411eea726dad4 |
08-Sep-2014 |
Andy Huibers <andyhuibers@google.com> |
am bc33cb77: am 962ff27d: am 28785c93: am 6281a794: Merge "In debug_ui mode, show CAF result state, length of AF scan, fps, for camera2 API." into ub-camera-glacier * commit 'bc33cb77e0e4c087214d0f1332c19c9299f665c4': In debug_ui mode, show CAF result state, length of AF scan, fps, for camera2 API.
|
4a748623618f2bae149c8cf385046666c717a7a9 |
08-Sep-2014 |
Andy Huibers <andyhuibers@google.com> |
[try 2] resolved conflicts for merge of 6281a794 to ub-camera-haleakala Change-Id: Ie98a22f57af23c80e08e47c841e22fef02036799
rc/com/android/camera/one/v2/OneCameraZslImpl.java
|
bc33cb77e0e4c087214d0f1332c19c9299f665c4 |
08-Sep-2014 |
Andy Huibers <andyhuibers@google.com> |
am 962ff27d: am 28785c93: am 6281a794: Merge "In debug_ui mode, show CAF result state, length of AF scan, fps, for camera2 API." into ub-camera-glacier * commit '962ff27d9e715fe6f1384b3a037a7dab6d022de4': In debug_ui mode, show CAF result state, length of AF scan, fps, for camera2 API.
|
e89b2c119e5167d1f03d207e3e6c62876b57895a |
08-Sep-2014 |
Andy Huibers <andyhuibers@google.com> |
resolved conflicts for merge of 6281a794 to ub-camera-haleakala Change-Id: Ie488ba4103bc69f5a03bff8ef9be23a93aec51f6
|
962ff27d9e715fe6f1384b3a037a7dab6d022de4 |
08-Sep-2014 |
Andy Huibers <andyhuibers@google.com> |
am 28785c93: am 6281a794: Merge "In debug_ui mode, show CAF result state, length of AF scan, fps, for camera2 API." into ub-camera-glacier * commit '28785c932cf6c4cf42142fb2f31cd1d1f7ca5c47': In debug_ui mode, show CAF result state, length of AF scan, fps, for camera2 API.
|
4487754a26513d4ebe8cc6c670167113b555f869 |
08-Sep-2014 |
Andy Huibers <andyhuibers@google.com> |
am 28785c93: am 6281a794: Merge "In debug_ui mode, show CAF result state, length of AF scan, fps, for camera2 API." into ub-camera-glacier * commit '28785c932cf6c4cf42142fb2f31cd1d1f7ca5c47': In debug_ui mode, show CAF result state, length of AF scan, fps, for camera2 API.
|
28785c932cf6c4cf42142fb2f31cd1d1f7ca5c47 |
08-Sep-2014 |
Andy Huibers <andyhuibers@google.com> |
am 6281a794: Merge "In debug_ui mode, show CAF result state, length of AF scan, fps, for camera2 API." into ub-camera-glacier * commit '6281a7942de9e55386c20c6f41bfb656b126a364': In debug_ui mode, show CAF result state, length of AF scan, fps, for camera2 API.
|
6281a7942de9e55386c20c6f41bfb656b126a364 |
08-Sep-2014 |
Andy Huibers <andyhuibers@google.com> |
Merge "In debug_ui mode, show CAF result state, length of AF scan, fps, for camera2 API." into ub-camera-glacier
|
c74193be63816088816a2f6121bd94c633e9575c |
08-Sep-2014 |
Alan Newberger <alann@google.com> |
am 6761dcda: (-s ours) am 410456b5: am 96892115: Merge "DO NOT MERGE Pipe context through to camera" into lmp-dev * commit '6761dcda41f081bc25f65b9c2f856ff321624959': DO NOT MERGE Pipe context through to camera
|
6761dcda41f081bc25f65b9c2f856ff321624959 |
08-Sep-2014 |
Alan Newberger <alann@google.com> |
am 410456b5: am 96892115: Merge "DO NOT MERGE Pipe context through to camera" into lmp-dev * commit '410456b59fb532d0294ef737e1c40c3f1aba01ac': DO NOT MERGE Pipe context through to camera
|
e73c033198c38d9a8b9d620d06bd4b4b493dc110 |
08-Sep-2014 |
Alan Newberger <alann@google.com> |
am 96892115: Merge "DO NOT MERGE Pipe context through to camera" into lmp-dev * commit '96892115f49712fde5fe16d352d24691632d74a4': DO NOT MERGE Pipe context through to camera
|
410456b59fb532d0294ef737e1c40c3f1aba01ac |
08-Sep-2014 |
Alan Newberger <alann@google.com> |
am 96892115: Merge "DO NOT MERGE Pipe context through to camera" into lmp-dev * commit '96892115f49712fde5fe16d352d24691632d74a4': DO NOT MERGE Pipe context through to camera
|
96892115f49712fde5fe16d352d24691632d74a4 |
08-Sep-2014 |
Alan Newberger <alann@google.com> |
Merge "DO NOT MERGE Pipe context through to camera" into lmp-dev
|
ca3c564536f154b83e380e37382bc7b9f6049302 |
07-Sep-2014 |
Andy Huibers <andyhuibers@google.com> |
In debug_ui mode, show CAF result state, length of AF scan, fps, for camera2 API. Bug: 17397777 Bug: 17028594 Bug: 17391241 Change-Id: Id5a7fe748f988755cb2d786a2103e375eb97b08f
es/values/colors.xml
rc/com/android/camera/CaptureModule.java
rc/com/android/camera/CaptureModuleUI.java
rc/com/android/camera/FocusOverlayManager.java
rc/com/android/camera/one/OneCamera.java
rc/com/android/camera/one/v2/OneCameraImpl.java
rc/com/android/camera/one/v2/OneCameraZslImpl.java
rc/com/android/camera/ui/FocusOverlay.java
|
cb3e3ca137affadb496873bf85b20b60a8691a44 |
08-Sep-2014 |
Alan Newberger <alann@google.com> |
am 482f7bb7: (-s ours) am d00d160c: am 03812d8c: am 76215c98: (-s ours) DO NOT MERGE Update Camera2 to use latest APIs * commit '482f7bb7bf8c0f805abfc4d31b21dc75ff161630': DO NOT MERGE Update Camera2 to use latest APIs
|
482f7bb7bf8c0f805abfc4d31b21dc75ff161630 |
08-Sep-2014 |
Alan Newberger <alann@google.com> |
am d00d160c: am 03812d8c: am 76215c98: (-s ours) DO NOT MERGE Update Camera2 to use latest APIs * commit 'd00d160c75986dc6244515c3b150a92c137e3614': DO NOT MERGE Update Camera2 to use latest APIs
|
f5c62537715e8ab5e586491b75e8ddff9a3d9f6a |
08-Sep-2014 |
Alan Newberger <alann@google.com> |
DO NOT MERGE Update Camera2 to use latest APIs Bug: 17423266 Change-Id: I1f1d79619d89971b387a78756b8f3b4d4b45d76e (cherry picked from commit 76215c98a9a11d87b5ce9d2b4198654c2b8bbddf)
rc/com/android/camera/one/v2/ImageCaptureManager.java
rc/com/android/camera/one/v2/OneCameraImpl.java
rc/com/android/camera/one/v2/OneCameraManagerImpl.java
rc/com/android/camera/one/v2/OneCameraZslImpl.java
|
6b42daa8073ecc291cde3680098bc0fece537691 |
08-Sep-2014 |
Alan Newberger <alann@google.com> |
am 03812d8c: am 76215c98: (-s ours) DO NOT MERGE Update Camera2 to use latest APIs * commit '03812d8c8cb03d56b5dda9d17b8066e4b39906d0': DO NOT MERGE Update Camera2 to use latest APIs
|
d00d160c75986dc6244515c3b150a92c137e3614 |
08-Sep-2014 |
Alan Newberger <alann@google.com> |
am 03812d8c: am 76215c98: (-s ours) DO NOT MERGE Update Camera2 to use latest APIs * commit '03812d8c8cb03d56b5dda9d17b8066e4b39906d0': DO NOT MERGE Update Camera2 to use latest APIs
|
b00999e292b54e562d3e49e46c6a5901cba67501 |
08-Sep-2014 |
Alan Newberger <alann@google.com> |
am 76215c98: (-s ours) DO NOT MERGE Update Camera2 to use latest APIs * commit '76215c98a9a11d87b5ce9d2b4198654c2b8bbddf': DO NOT MERGE Update Camera2 to use latest APIs
|
03812d8c8cb03d56b5dda9d17b8066e4b39906d0 |
08-Sep-2014 |
Alan Newberger <alann@google.com> |
am 76215c98: (-s ours) DO NOT MERGE Update Camera2 to use latest APIs * commit '76215c98a9a11d87b5ce9d2b4198654c2b8bbddf': DO NOT MERGE Update Camera2 to use latest APIs
|
156831104045ba4d2199a36d1a00fd8f748b7ae4 |
06-Sep-2014 |
Sascha Häberling <haeberling@google.com> |
DO NOT MERGE Pipe context through to camera Bug: 17203825 Not merging since a CL depending on this one cannot be merged cleanly into lmp-dev right now: http://ag/541468 Will also apply this one to haleakala. Change-Id: I7a386b92cf6168185bd28bd02a78d87c5826639a (cherry picked from commit 13d07d0ecb3bc808fb6f5b65508b1948ab3149d8)
rc/com/android/camera/CaptureModule.java
rc/com/android/camera/one/OneCameraManager.java
rc/com/android/camera/one/v2/OneCameraManagerImpl.java
rc_pd/com/android/camera/one/v2/OneCameraCreator.java
|
5d9098e1e5b372f2f90632b4cd2ec164069bceb8 |
08-Sep-2014 |
Spike Sprague <spikuru@google.com> |
am b5825fcb: am f63357a7: am 994d9136: am 954b9b1c: Merge "wait for filmstrip bottom panel buttons to finish animating to show clings" into ub-camera-glacier * commit 'b5825fcb5a42ecdaebe65e86a9cbcc91b83a23df': wait for filmstrip bottom panel buttons to finish animating to show clings
|
76215c98a9a11d87b5ce9d2b4198654c2b8bbddf |
08-Sep-2014 |
Alan Newberger <alann@google.com> |
DO NOT MERGE Update Camera2 to use latest APIs Bug: 17423266 Change-Id: I1f1d79619d89971b387a78756b8f3b4d4b45d76e
rc/com/android/camera/one/v2/ImageCaptureManager.java
rc/com/android/camera/one/v2/OneCameraImpl.java
rc/com/android/camera/one/v2/OneCameraManagerImpl.java
rc/com/android/camera/one/v2/OneCameraZslImpl.java
|
b5825fcb5a42ecdaebe65e86a9cbcc91b83a23df |
08-Sep-2014 |
Spike Sprague <spikuru@google.com> |
am f63357a7: am 994d9136: am 954b9b1c: Merge "wait for filmstrip bottom panel buttons to finish animating to show clings" into ub-camera-glacier * commit 'f63357a76a742d5ca28d8545ea1b74b68e0827c2': wait for filmstrip bottom panel buttons to finish animating to show clings
|
f63357a76a742d5ca28d8545ea1b74b68e0827c2 |
08-Sep-2014 |
Spike Sprague <spikuru@google.com> |
am 994d9136: am 954b9b1c: Merge "wait for filmstrip bottom panel buttons to finish animating to show clings" into ub-camera-glacier * commit '994d9136e0085e2fbb30f260ec140c8d2c6295df': wait for filmstrip bottom panel buttons to finish animating to show clings
|
7f7512bdbdca0ebfb6139955ca6eae09d5918f46 |
08-Sep-2014 |
Puneet Lall <puneetl@google.com> |
Merge "Enable more rapid zsl capture" into ub-camera-haleakala
|
36962011479c9b2e6105ec6ef3f78d4dfad680c8 |
08-Sep-2014 |
Spike Sprague <spikuru@google.com> |
am 994d9136: am 954b9b1c: Merge "wait for filmstrip bottom panel buttons to finish animating to show clings" into ub-camera-glacier * commit '994d9136e0085e2fbb30f260ec140c8d2c6295df': wait for filmstrip bottom panel buttons to finish animating to show clings
|
994d9136e0085e2fbb30f260ec140c8d2c6295df |
08-Sep-2014 |
Spike Sprague <spikuru@google.com> |
am 954b9b1c: Merge "wait for filmstrip bottom panel buttons to finish animating to show clings" into ub-camera-glacier * commit '954b9b1ce7cd3e7b4a4c0fa35f8ca873fba5ac14': wait for filmstrip bottom panel buttons to finish animating to show clings
|
7691fbf5dbba83a3435e193648a1330182e15423 |
08-Sep-2014 |
Spike Sprague <spikuru@google.com> |
am 954b9b1c: Merge "wait for filmstrip bottom panel buttons to finish animating to show clings" into ub-camera-glacier * commit '954b9b1ce7cd3e7b4a4c0fa35f8ca873fba5ac14': wait for filmstrip bottom panel buttons to finish animating to show clings
|
954b9b1ce7cd3e7b4a4c0fa35f8ca873fba5ac14 |
08-Sep-2014 |
Spike Sprague <spikuru@google.com> |
Merge "wait for filmstrip bottom panel buttons to finish animating to show clings" into ub-camera-glacier
|
1b80092da487a5643e8125c1340ea893a0268513 |
06-Sep-2014 |
Sascha Häberling <haeberling@google.com> |
am dc563a37: am 13d07d0e: (-s ours) DO NOT MERGE Pipe context through to camera * commit 'dc563a3713e1cd6c4cc2c1681cac081b753e161b': DO NOT MERGE Pipe context through to camera
|
5676336e347f8c8cb1ebe670081b3a7c9b6378b2 |
06-Sep-2014 |
Sascha Häberling <haeberling@google.com> |
am 4a9de272: am bcc384ea: Revert "Pipe context through to camera" * commit '4a9de272c251432c100986f8167618d101e5a522': Revert "Pipe context through to camera"
|
eee70ce7caa75c866ab66e6652fbb949d5585d0b |
06-Sep-2014 |
Sascha Haeberling <haeberling@google.com> |
am 8b239e7d: am f6bf65e9: Pipe context through to camera * commit '8b239e7d9021d9c674f68e688c131fb95fa4daa7': Pipe context through to camera
|
dfceae14e5db7290a10619ac1a4d9cb3999b1afe |
06-Sep-2014 |
Sascha Häberling <haeberling@google.com> |
am 7ab57266: (-s ours) am 34668064: am dc563a37: am 13d07d0e: (-s ours) DO NOT MERGE Pipe context through to camera * commit '7ab57266d33d2481aea1494ac94334d03366fb04': DO NOT MERGE Pipe context through to camera
|
d66a2fabb01b5fe7ce98437cba798dc2b9ec436d |
06-Sep-2014 |
Sascha Häberling <haeberling@google.com> |
am af53bfd9: am 0957c854: am 4a9de272: am bcc384ea: Revert "Pipe context through to camera" * commit 'af53bfd91c7754d8842770e40ccdbb74d0becf85': Revert "Pipe context through to camera"
|
029adebbe89dfe17ed60a373ee421153aa76608c |
06-Sep-2014 |
Sascha Haeberling <haeberling@google.com> |
am 89e58112: am 3675e6e9: am 8b239e7d: am f6bf65e9: Pipe context through to camera * commit '89e58112c83152d7c3d8d23e9b23a13614864b19': Pipe context through to camera
|
7ab57266d33d2481aea1494ac94334d03366fb04 |
06-Sep-2014 |
Sascha Häberling <haeberling@google.com> |
am 34668064: am dc563a37: am 13d07d0e: (-s ours) DO NOT MERGE Pipe context through to camera * commit '34668064f6e443417904a0bee89ae877c7610854': DO NOT MERGE Pipe context through to camera
|
af53bfd91c7754d8842770e40ccdbb74d0becf85 |
06-Sep-2014 |
Sascha Häberling <haeberling@google.com> |
am 0957c854: am 4a9de272: am bcc384ea: Revert "Pipe context through to camera" * commit '0957c85465fb95e746fde94e36ac0f6a5a7a8ce9': Revert "Pipe context through to camera"
|
89e58112c83152d7c3d8d23e9b23a13614864b19 |
06-Sep-2014 |
Sascha Haeberling <haeberling@google.com> |
am 3675e6e9: am 8b239e7d: am f6bf65e9: Pipe context through to camera * commit '3675e6e9b152678b892010fcc75690861d1e9bc5': Pipe context through to camera
|
34668064f6e443417904a0bee89ae877c7610854 |
06-Sep-2014 |
Sascha Häberling <haeberling@google.com> |
am dc563a37: am 13d07d0e: (-s ours) DO NOT MERGE Pipe context through to camera * commit 'dc563a3713e1cd6c4cc2c1681cac081b753e161b': DO NOT MERGE Pipe context through to camera
|
0957c85465fb95e746fde94e36ac0f6a5a7a8ce9 |
06-Sep-2014 |
Sascha Häberling <haeberling@google.com> |
am 4a9de272: am bcc384ea: Revert "Pipe context through to camera" * commit '4a9de272c251432c100986f8167618d101e5a522': Revert "Pipe context through to camera"
|
0df5434d2b4ad20291346085ee48f84e041ea080 |
06-Sep-2014 |
Sascha Häberling <haeberling@google.com> |
DO NOT MERGE Pipe context through to camera Bug: 17203825 Not merging since a CL depending on this one cannot be merged cleanly into lmp-dev right now: http://ag/541468 Will also apply this one to haleakala. Change-Id: Ie64f9500fe4e8044797132e3762521f68b5bc80e
rc/com/android/camera/CaptureModule.java
rc/com/android/camera/one/OneCameraManager.java
rc/com/android/camera/one/v2/OneCameraManagerImpl.java
rc_pd/com/android/camera/one/v2/OneCameraCreator.java
|
3675e6e9b152678b892010fcc75690861d1e9bc5 |
06-Sep-2014 |
Sascha Haeberling <haeberling@google.com> |
am 8b239e7d: am f6bf65e9: Pipe context through to camera * commit '8b239e7d9021d9c674f68e688c131fb95fa4daa7': Pipe context through to camera
|
dc563a3713e1cd6c4cc2c1681cac081b753e161b |
06-Sep-2014 |
Sascha Häberling <haeberling@google.com> |
am 13d07d0e: (-s ours) DO NOT MERGE Pipe context through to camera * commit '13d07d0ecb3bc808fb6f5b65508b1948ab3149d8': DO NOT MERGE Pipe context through to camera
|
4a9de272c251432c100986f8167618d101e5a522 |
06-Sep-2014 |
Sascha Häberling <haeberling@google.com> |
am bcc384ea: Revert "Pipe context through to camera" * commit 'bcc384ea15fc9d25ee3efd934c2ac7ec7a059a52': Revert "Pipe context through to camera"
|
9d9f6ffbcf2c119bcaa66f0386a404a6ac8a790a |
06-Sep-2014 |
Sascha Häberling <haeberling@google.com> |
am 13d07d0e: (-s ours) DO NOT MERGE Pipe context through to camera * commit '13d07d0ecb3bc808fb6f5b65508b1948ab3149d8': DO NOT MERGE Pipe context through to camera
|
9534f87cce03ca7ff6b0a175b177dd9b6804746b |
06-Sep-2014 |
Sascha Häberling <haeberling@google.com> |
am bcc384ea: Revert "Pipe context through to camera" * commit 'bcc384ea15fc9d25ee3efd934c2ac7ec7a059a52': Revert "Pipe context through to camera"
|
13d07d0ecb3bc808fb6f5b65508b1948ab3149d8 |
06-Sep-2014 |
Sascha Häberling <haeberling@google.com> |
DO NOT MERGE Pipe context through to camera Bug: 17203825 Not merging since a CL depending on this one cannot be merged cleanly into lmp-dev right now: http://ag/541468 Will also apply this one to haleakala. Change-Id: I7a386b92cf6168185bd28bd02a78d87c5826639a
rc/com/android/camera/CaptureModule.java
rc/com/android/camera/one/OneCameraManager.java
rc/com/android/camera/one/v2/OneCameraManagerImpl.java
rc_pd/com/android/camera/one/v2/OneCameraCreator.java
|
8b239e7d9021d9c674f68e688c131fb95fa4daa7 |
06-Sep-2014 |
Sascha Haeberling <haeberling@google.com> |
am f6bf65e9: Pipe context through to camera * commit 'f6bf65e9442f2fb7042e37ec21bf1c6c4fbd9bb6': Pipe context through to camera
|
bcc384ea15fc9d25ee3efd934c2ac7ec7a059a52 |
06-Sep-2014 |
Sascha Häberling <haeberling@google.com> |
Revert "Pipe context through to camera" Second half of the CL didn't make it through to lmp-dev due to Camera API change craziness. Reverting this one to unbreak the build and will submit again to G and H Camera branches only. This reverts commit f6bf65e9442f2fb7042e37ec21bf1c6c4fbd9bb6. Change-Id: I5e11c5c1b29586110ed504fbb1be2dfe76accab0
rc/com/android/camera/CaptureModule.java
rc/com/android/camera/one/OneCameraManager.java
rc/com/android/camera/one/v2/OneCameraManagerImpl.java
rc_pd/com/android/camera/one/v2/OneCameraCreator.java
|
7bd928c2767d21680fdc291daa14d224d01aaec5 |
06-Sep-2014 |
Sascha Haeberling <haeberling@google.com> |
am f6bf65e9: Pipe context through to camera * commit 'f6bf65e9442f2fb7042e37ec21bf1c6c4fbd9bb6': Pipe context through to camera
|
f6bf65e9442f2fb7042e37ec21bf1c6c4fbd9bb6 |
06-Sep-2014 |
Sascha Haeberling <haeberling@google.com> |
Pipe context through to camera Bug: 17203825 Also don't just activate the shutter after a picture has been taken since some cameras might not be ready for another picture yet. This decision should be up to the camera. Change-Id: I5991da1d8fc942b48fe085b18ec93b07bfafe889
rc/com/android/camera/CaptureModule.java
rc/com/android/camera/one/OneCameraManager.java
rc/com/android/camera/one/v2/OneCameraManagerImpl.java
rc_pd/com/android/camera/one/v2/OneCameraCreator.java
|
863a5abf144db5c50c459d1c2f66543598aa26fc |
06-Sep-2014 |
Puneet Lall <puneetl@google.com> |
Enable more rapid zsl capture Change-Id: I0f036a60f2f5f53092e544e8ec4890bbfeb9e659
rc/com/android/camera/one/v2/OneCameraZslImpl.java
|
1168d1b41c8dbd59b33e439bcd9676d2afe51067 |
06-Sep-2014 |
Alan Newberger <alann@google.com> |
am 392c218a: (-s ours) am d1357db3: am 02965e8c: am 9eb0eb55: (-s ours) Merge "DO NOT MERGE Revert "Update camera2 API usage"" into ub-camera-glacier * commit '392c218a92b8c8875d86f38901d2f2774ef0bed5': DO NOT MERGE Revert "Update camera2 API usage"
|
71f134c48d68c81a39c740d4a09134421b3f8400 |
06-Sep-2014 |
Alan Newberger <alann@google.com> |
am 5a4db638: am bd74f511: am 626a1450: am 200d5f83: Merge "Close the camera when the async open callback runs after pause" into ub-camera-glacier * commit '5a4db638bc5c1738396062508c9f959da9fb8c90': Close the camera when the async open callback runs after pause
|
392c218a92b8c8875d86f38901d2f2774ef0bed5 |
06-Sep-2014 |
Alan Newberger <alann@google.com> |
am d1357db3: am 02965e8c: am 9eb0eb55: (-s ours) Merge "DO NOT MERGE Revert "Update camera2 API usage"" into ub-camera-glacier * commit 'd1357db3bdd29d45e310b1f7630e6cc29f2dad33': DO NOT MERGE Revert "Update camera2 API usage"
|
5a4db638bc5c1738396062508c9f959da9fb8c90 |
06-Sep-2014 |
Alan Newberger <alann@google.com> |
am bd74f511: am 626a1450: am 200d5f83: Merge "Close the camera when the async open callback runs after pause" into ub-camera-glacier * commit 'bd74f511c391e781605dcabe783011ec30e6ebb8': Close the camera when the async open callback runs after pause
|
d1357db3bdd29d45e310b1f7630e6cc29f2dad33 |
06-Sep-2014 |
Alan Newberger <alann@google.com> |
am 02965e8c: am 9eb0eb55: (-s ours) Merge "DO NOT MERGE Revert "Update camera2 API usage"" into ub-camera-glacier * commit '02965e8c82a707c037d72fe4c887e6270e900d54': DO NOT MERGE Revert "Update camera2 API usage"
|
bd74f511c391e781605dcabe783011ec30e6ebb8 |
06-Sep-2014 |
Alan Newberger <alann@google.com> |
am 626a1450: am 200d5f83: Merge "Close the camera when the async open callback runs after pause" into ub-camera-glacier * commit '626a14505d709202c9949df1bb3376d93c755d5b': Close the camera when the async open callback runs after pause
|
f4cbd76e31209b3ef6a1e183cdbad59ef81876f6 |
06-Sep-2014 |
Alan Newberger <alann@google.com> |
am 02965e8c: am 9eb0eb55: (-s ours) Merge "DO NOT MERGE Revert "Update camera2 API usage"" into ub-camera-glacier * commit '02965e8c82a707c037d72fe4c887e6270e900d54': DO NOT MERGE Revert "Update camera2 API usage"
|
66c74ad9ba6b9b04ae4dc1665c9e28af692dffd0 |
06-Sep-2014 |
Alan Newberger <alann@google.com> |
am 626a1450: am 200d5f83: Merge "Close the camera when the async open callback runs after pause" into ub-camera-glacier * commit '626a14505d709202c9949df1bb3376d93c755d5b': Close the camera when the async open callback runs after pause
|
f78afae19d95443cfddf4c1d2df860ad7a4af900 |
06-Sep-2014 |
Puneet Lall <puneetl@google.com> |
Merge "Zsl, handle null CaptureResults, increase ring buffer size" into ub-camera-haleakala
|
15238a035da8d0ba8d90a42ce273510e53453edc |
06-Sep-2014 |
Alan Newberger <alann@google.com> |
Merge "DO NOT MERGE Revert "Update camera2 API usage"" into ub-camera-haleakala
|
02965e8c82a707c037d72fe4c887e6270e900d54 |
06-Sep-2014 |
Alan Newberger <alann@google.com> |
am 9eb0eb55: (-s ours) Merge "DO NOT MERGE Revert "Update camera2 API usage"" into ub-camera-glacier * commit '9eb0eb55e686c84d0003cdcd60c76e08ed369468': DO NOT MERGE Revert "Update camera2 API usage"
|
626a14505d709202c9949df1bb3376d93c755d5b |
06-Sep-2014 |
Alan Newberger <alann@google.com> |
am 200d5f83: Merge "Close the camera when the async open callback runs after pause" into ub-camera-glacier * commit '200d5f833a70616465fecb200d45bc2726bd1499': Close the camera when the async open callback runs after pause
|
fed4d8b466af304ba4b8db8719383fe4d287881e |
06-Sep-2014 |
Alan Newberger <alann@google.com> |
am 9eb0eb55: (-s ours) Merge "DO NOT MERGE Revert "Update camera2 API usage"" into ub-camera-glacier * commit '9eb0eb55e686c84d0003cdcd60c76e08ed369468': DO NOT MERGE Revert "Update camera2 API usage"
|
5f04890518b4b9663fd9d1d79b3ae63bf80ecc01 |
06-Sep-2014 |
Alan Newberger <alann@google.com> |
am 200d5f83: Merge "Close the camera when the async open callback runs after pause" into ub-camera-glacier * commit '200d5f833a70616465fecb200d45bc2726bd1499': Close the camera when the async open callback runs after pause
|
4fc7b8182f0f9b67d77539ff2bffa7ae2cac619f |
06-Sep-2014 |
Alan Newberger <alann@google.com> |
DO NOT MERGE Revert "Update camera2 API usage" This temporarily reverts commit for unbundled branch 9c84812bba91831e1759c23e8c92082a8a5f44fd. Change-Id: Ic4767cd27373c36dd77df4469f5006ced8746f9f (cherry picked from commit 21fdb9db957973fa00777b65787db7e887fc070d)
rc/com/android/camera/one/v2/ImageCaptureManager.java
rc/com/android/camera/one/v2/OneCameraImpl.java
rc/com/android/camera/one/v2/OneCameraManagerImpl.java
rc/com/android/camera/one/v2/OneCameraZslImpl.java
|
9eb0eb55e686c84d0003cdcd60c76e08ed369468 |
06-Sep-2014 |
Alan Newberger <alann@google.com> |
Merge "DO NOT MERGE Revert "Update camera2 API usage"" into ub-camera-glacier
|
200d5f833a70616465fecb200d45bc2726bd1499 |
06-Sep-2014 |
Alan Newberger <alann@google.com> |
Merge "Close the camera when the async open callback runs after pause" into ub-camera-glacier
|
21fdb9db957973fa00777b65787db7e887fc070d |
06-Sep-2014 |
Alan Newberger <alann@google.com> |
DO NOT MERGE Revert "Update camera2 API usage" This temporarily reverts commit for unbundled branch 9c84812bba91831e1759c23e8c92082a8a5f44fd. Change-Id: Ic4767cd27373c36dd77df4469f5006ced8746f9f
rc/com/android/camera/one/v2/ImageCaptureManager.java
rc/com/android/camera/one/v2/OneCameraImpl.java
rc/com/android/camera/one/v2/OneCameraManagerImpl.java
rc/com/android/camera/one/v2/OneCameraZslImpl.java
|
3c56192fac54644a301251aae8d1e33c8d60c3e5 |
06-Sep-2014 |
Spike Sprague <spikuru@google.com> |
wait for filmstrip bottom panel buttons to finish animating to show clings bug: 17321626 Change-Id: Ib810157a2821ed40b2d1e30bee80bf1cc243ee59
rc/com/android/camera/app/FilmstripBottomPanel.java
rc/com/android/camera/widget/Cling.java
rc/com/android/camera/widget/ExternalViewerButton.java
|
d686e6d6fd331d617ff7ec8a09572797b1cc8081 |
06-Sep-2014 |
Puneet Lall <puneetl@google.com> |
Merge "Implemented rotation of zsl images" into ub-camera-haleakala
|
0ad7ab0b0a0d17a96438a503d0c918979b5d6480 |
05-Sep-2014 |
Puneet Lall <puneetl@google.com> |
Implemented rotation of zsl images Bug: 17370310 Change-Id: Ida437d817482d19224d7afd2f06b00960480bd1c
ni/Android.mk
ni/jpegutilnative.cpp
rc/com/android/camera/one/v2/ImageCaptureManager.java
rc/com/android/camera/one/v2/OneCameraZslImpl.java
rc/com/android/camera/util/JpegUtilNative.java
|
e55801f83dd9e63276ba9ad20c8ce4e825ee242d |
06-Sep-2014 |
Alan Newberger <alann@google.com> |
Close the camera when the async open callback runs after pause Current implementation leaves the camera device open if callback returns after app is paused, since activity/module pausing is already complete before the camera opened. This CL adds a close if the opened callback returns when the activity is already paused. Bug: 17397753 Change-Id: Iec5d16445201b4e308b16e9237fd98ed8599fddc
rc/com/android/camera/CameraActivity.java
|
bbd6516a5aedf3173954ee0ece85a45ebb9d73aa |
06-Sep-2014 |
Puneet Lall <puneetl@google.com> |
Zsl, handle null CaptureResults, increase ring buffer size Change-Id: I288b85eab04666718af61a07d0db8382ac4f72e2
rc/com/android/camera/one/v2/OneCameraZslImpl.java
|
01cf09929ccabc0c3f9a7de04526facb9a1cf24e |
06-Sep-2014 |
Eino-Ville Talvala <etalvala@google.com> |
am 9f5358c9: am 60e2b6bd: am fb69fffc: am 82465c1c: Merge "Update camera2 API usage" into ub-camera-glacier * commit '9f5358c9b18a8ef9de99dd6ee18c0d55312062c7': Update camera2 API usage
|
9f5358c9b18a8ef9de99dd6ee18c0d55312062c7 |
05-Sep-2014 |
Eino-Ville Talvala <etalvala@google.com> |
am 60e2b6bd: am fb69fffc: am 82465c1c: Merge "Update camera2 API usage" into ub-camera-glacier * commit '60e2b6bde0ff7570e5879520355f1d8669b06d57': Update camera2 API usage
|
b94930e3803d779b57e7cfcb0324294442eadc2a |
05-Sep-2014 |
Alan Newberger <alann@google.com> |
am 0515ad58: am e71143b8: am 252394a7: am 29a009c9: Add additional lifecycle logging to Camera * commit '0515ad5889f33d0a26e6086a57e38a177c84320b': Add additional lifecycle logging to Camera
|
67c11b6ffd3ebecd92ccbe8aea2821068ef0d106 |
05-Sep-2014 |
Eino-Ville Talvala <etalvala@google.com> |
am fb69fffc: am 82465c1c: Merge "Update camera2 API usage" into ub-camera-glacier * commit 'fb69fffc74f3768ca13881770e884a55c66e6edd': Update camera2 API usage
|
60e2b6bde0ff7570e5879520355f1d8669b06d57 |
05-Sep-2014 |
Eino-Ville Talvala <etalvala@google.com> |
am fb69fffc: am 82465c1c: Merge "Update camera2 API usage" into ub-camera-glacier * commit 'fb69fffc74f3768ca13881770e884a55c66e6edd': Update camera2 API usage
|
1e9a294273b5d22e2fbf3bb52d805783cf700d0b |
05-Sep-2014 |
Eino-Ville Talvala <etalvala@google.com> |
am 82465c1c: Merge "Update camera2 API usage" into ub-camera-glacier * commit '82465c1c603d3d76bf8c7487779766d5ea38a5cd': Update camera2 API usage
|
fb69fffc74f3768ca13881770e884a55c66e6edd |
05-Sep-2014 |
Eino-Ville Talvala <etalvala@google.com> |
am 82465c1c: Merge "Update camera2 API usage" into ub-camera-glacier * commit '82465c1c603d3d76bf8c7487779766d5ea38a5cd': Update camera2 API usage
|
82465c1c603d3d76bf8c7487779766d5ea38a5cd |
05-Sep-2014 |
Eino-Ville Talvala <etalvala@google.com> |
Merge "Update camera2 API usage" into ub-camera-glacier
|
0515ad5889f33d0a26e6086a57e38a177c84320b |
05-Sep-2014 |
Alan Newberger <alann@google.com> |
am e71143b8: am 252394a7: am 29a009c9: Add additional lifecycle logging to Camera * commit 'e71143b80c5966dded05d71a3c4d1f30be8cbf60': Add additional lifecycle logging to Camera
|
e71143b80c5966dded05d71a3c4d1f30be8cbf60 |
05-Sep-2014 |
Alan Newberger <alann@google.com> |
am 252394a7: am 29a009c9: Add additional lifecycle logging to Camera * commit '252394a7175ed6b072ebb383aec010094dda29ee': Add additional lifecycle logging to Camera
|
38ac80fc70a79bffce929b3e9d5e0c99fab1fee1 |
05-Sep-2014 |
Alan Newberger <alann@google.com> |
am 252394a7: am 29a009c9: Add additional lifecycle logging to Camera * commit '252394a7175ed6b072ebb383aec010094dda29ee': Add additional lifecycle logging to Camera
|
252394a7175ed6b072ebb383aec010094dda29ee |
05-Sep-2014 |
Alan Newberger <alann@google.com> |
am 29a009c9: Add additional lifecycle logging to Camera * commit '29a009c974f153f72cd5e28851a8cb85a691e215': Add additional lifecycle logging to Camera
|
e75df71e5b38d314a958279e8fb110dc4fb792c1 |
05-Sep-2014 |
Alan Newberger <alann@google.com> |
am 29a009c9: Add additional lifecycle logging to Camera * commit '29a009c974f153f72cd5e28851a8cb85a691e215': Add additional lifecycle logging to Camera
|
29a009c974f153f72cd5e28851a8cb85a691e215 |
05-Sep-2014 |
Alan Newberger <alann@google.com> |
Add additional lifecycle logging to Camera To assist in diagnosing startup issues, added some logging. Bug: 17397753 Change-Id: Icc47ec278c0b68c8834bfb52554425ff7f371ea0
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/app/CameraController.java
|
9c84812bba91831e1759c23e8c92082a8a5f44fd |
05-Sep-2014 |
Eino-Ville Talvala <etalvala@google.com> |
Update camera2 API usage Rename listeners to callbacks Bug: 17389922 Change-Id: I33affcaeec331eca2d084ded4eb199f86fa58765
rc/com/android/camera/one/v2/ImageCaptureManager.java
rc/com/android/camera/one/v2/OneCameraImpl.java
rc/com/android/camera/one/v2/OneCameraManagerImpl.java
rc/com/android/camera/one/v2/OneCameraZslImpl.java
|
31227045d4443456057a26c29b4f133c6e578207 |
05-Sep-2014 |
Sascha Haeberling <haeberling@google.com> |
am 3a12e5ce: am d316c8f9: am 9bb10857: am dc0369f3: Merge "Load Gcam OneCamera in CaptureModule when it\'s also doing normal shots." into ub-camera-glacier * commit '3a12e5ce74dc81be0949c64c4ace9afad7466a5f': Load Gcam OneCamera in CaptureModule when it's also doing normal shots.
|
3a12e5ce74dc81be0949c64c4ace9afad7466a5f |
05-Sep-2014 |
Sascha Haeberling <haeberling@google.com> |
am d316c8f9: am 9bb10857: am dc0369f3: Merge "Load Gcam OneCamera in CaptureModule when it\'s also doing normal shots." into ub-camera-glacier * commit 'd316c8f9929481ad9b273256c0608987213a8f6e': Load Gcam OneCamera in CaptureModule when it's also doing normal shots.
|
d316c8f9929481ad9b273256c0608987213a8f6e |
05-Sep-2014 |
Sascha Haeberling <haeberling@google.com> |
am 9bb10857: am dc0369f3: Merge "Load Gcam OneCamera in CaptureModule when it\'s also doing normal shots." into ub-camera-glacier * commit '9bb108571e7e6ddcef5bdf0e9ee03dad57ebc44f': Load Gcam OneCamera in CaptureModule when it's also doing normal shots.
|
4aba3d0512ab7dde1932fd2b04ae6aebcf2da042 |
05-Sep-2014 |
Sascha Haeberling <haeberling@google.com> |
am 9bb10857: am dc0369f3: Merge "Load Gcam OneCamera in CaptureModule when it\'s also doing normal shots." into ub-camera-glacier * commit '9bb108571e7e6ddcef5bdf0e9ee03dad57ebc44f': Load Gcam OneCamera in CaptureModule when it's also doing normal shots.
|
9bb108571e7e6ddcef5bdf0e9ee03dad57ebc44f |
05-Sep-2014 |
Sascha Haeberling <haeberling@google.com> |
am dc0369f3: Merge "Load Gcam OneCamera in CaptureModule when it\'s also doing normal shots." into ub-camera-glacier * commit 'dc0369f37b07adb4355113540af3c1f7c82a404e': Load Gcam OneCamera in CaptureModule when it's also doing normal shots.
|
df435d0e26b6fa5f0d8443b2d9098d61b54a9f00 |
05-Sep-2014 |
Sascha Haeberling <haeberling@google.com> |
am dc0369f3: Merge "Load Gcam OneCamera in CaptureModule when it\'s also doing normal shots." into ub-camera-glacier * commit 'dc0369f37b07adb4355113540af3c1f7c82a404e': Load Gcam OneCamera in CaptureModule when it's also doing normal shots.
|
dc0369f37b07adb4355113540af3c1f7c82a404e |
05-Sep-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Load Gcam OneCamera in CaptureModule when it's also doing normal shots." into ub-camera-glacier
|
961805e8fafa3ef21d1984eeb1429b40df6ffcde |
04-Sep-2014 |
Sascha Haeberling <haeberling@google.com> |
Load Gcam OneCamera in CaptureModule when it's also doing normal shots. Bug: 16654225 Change-Id: I939e4793125cc996e26bbd5a13579f2f4ebab663
rc/com/android/camera/CaptureModule.java
|
9a7410feea0bfd717bc7e661c830701a0a969b75 |
05-Sep-2014 |
Spike Sprague <spikuru@google.com> |
am f8b42f26: am 6a350833: am 844827b9: am eacf9460: Merge "remove stray bool resource for determining if OS is L or not, moved to more universal ApiHelper for that." into ub-camera-glacier * commit 'f8b42f2673ff30b391af29716bf9044c9cd6a46d': remove stray bool resource for determining if OS is L or not, moved to more universal ApiHelper for that.
|
f8b42f2673ff30b391af29716bf9044c9cd6a46d |
05-Sep-2014 |
Spike Sprague <spikuru@google.com> |
am 6a350833: am 844827b9: am eacf9460: Merge "remove stray bool resource for determining if OS is L or not, moved to more universal ApiHelper for that." into ub-camera-glacier * commit '6a350833e973f5851b2b20339df088997b44c598': remove stray bool resource for determining if OS is L or not, moved to more universal ApiHelper for that.
|
6a350833e973f5851b2b20339df088997b44c598 |
05-Sep-2014 |
Spike Sprague <spikuru@google.com> |
am 844827b9: am eacf9460: Merge "remove stray bool resource for determining if OS is L or not, moved to more universal ApiHelper for that." into ub-camera-glacier * commit '844827b9d6f1f1ecdf94e82493bfa0f9ae527090': remove stray bool resource for determining if OS is L or not, moved to more universal ApiHelper for that.
|
b6f2400882faeac5b858772e9b1137ba9ec7bdf7 |
05-Sep-2014 |
Spike Sprague <spikuru@google.com> |
am 844827b9: am eacf9460: Merge "remove stray bool resource for determining if OS is L or not, moved to more universal ApiHelper for that." into ub-camera-glacier * commit '844827b9d6f1f1ecdf94e82493bfa0f9ae527090': remove stray bool resource for determining if OS is L or not, moved to more universal ApiHelper for that.
|
844827b9d6f1f1ecdf94e82493bfa0f9ae527090 |
05-Sep-2014 |
Spike Sprague <spikuru@google.com> |
am eacf9460: Merge "remove stray bool resource for determining if OS is L or not, moved to more universal ApiHelper for that." into ub-camera-glacier * commit 'eacf94608e5358a028c64dd1523270e61093e8b2': remove stray bool resource for determining if OS is L or not, moved to more universal ApiHelper for that.
|
2615ec286fe2b14e0c5ab59b08aa8a570dca049f |
05-Sep-2014 |
Spike Sprague <spikuru@google.com> |
am eacf9460: Merge "remove stray bool resource for determining if OS is L or not, moved to more universal ApiHelper for that." into ub-camera-glacier * commit 'eacf94608e5358a028c64dd1523270e61093e8b2': remove stray bool resource for determining if OS is L or not, moved to more universal ApiHelper for that.
|
eacf94608e5358a028c64dd1523270e61093e8b2 |
04-Sep-2014 |
Spike Sprague <spikuru@google.com> |
Merge "remove stray bool resource for determining if OS is L or not, moved to more universal ApiHelper for that." into ub-camera-glacier
|
79150ed3f8963016e1dc4576e6acab507bef4228 |
04-Sep-2014 |
Spike Sprague <spikuru@google.com> |
remove stray bool resource for determining if OS is L or not, moved to more universal ApiHelper for that. this brings back the fade-in on shutter button touchDown. bug: 17389859 Change-Id: I7c7d24db30bfbb149f84e6f5acf3e211c282c1ec
es/values/bool.xml
rc/com/android/camera/ui/BottomBar.java
|
47771ae4cf0bbd5a41a478b3d310da72da9dfce6 |
04-Sep-2014 |
Andy Huibers <andyhuibers@google.com> |
am eeb21f9f: am 80b320ea: am dc3d3e52: am 17d9084e: Add short flash animation and shutter sound to ZSL camera. * commit 'eeb21f9f73f58fc08521d1a0bf0adecb96d0934e': Add short flash animation and shutter sound to ZSL camera.
|
eeb21f9f73f58fc08521d1a0bf0adecb96d0934e |
04-Sep-2014 |
Andy Huibers <andyhuibers@google.com> |
am 80b320ea: am dc3d3e52: am 17d9084e: Add short flash animation and shutter sound to ZSL camera. * commit '80b320eaabd6a4ead7d821c4bf07bc642a447af0': Add short flash animation and shutter sound to ZSL camera.
|
aee257e18562d57b4bfbe8c462d47b4f275dd261 |
04-Sep-2014 |
Andy Huibers <andyhuibers@google.com> |
am dc3d3e52: am 17d9084e: Add short flash animation and shutter sound to ZSL camera. * commit 'dc3d3e520cafecd8024b08c5a5162c13ae438f1c': Add short flash animation and shutter sound to ZSL camera.
|
80b320eaabd6a4ead7d821c4bf07bc642a447af0 |
04-Sep-2014 |
Andy Huibers <andyhuibers@google.com> |
am dc3d3e52: am 17d9084e: Add short flash animation and shutter sound to ZSL camera. * commit 'dc3d3e520cafecd8024b08c5a5162c13ae438f1c': Add short flash animation and shutter sound to ZSL camera.
|
dc3d3e520cafecd8024b08c5a5162c13ae438f1c |
04-Sep-2014 |
Andy Huibers <andyhuibers@google.com> |
am 17d9084e: Add short flash animation and shutter sound to ZSL camera. * commit '17d9084e38e64f06a9d411d64fe3c2739d299cda': Add short flash animation and shutter sound to ZSL camera.
|
db943ef7dc6c6882a77dca49e1628f484ae591ad |
04-Sep-2014 |
Andy Huibers <andyhuibers@google.com> |
am 17d9084e: Add short flash animation and shutter sound to ZSL camera. * commit '17d9084e38e64f06a9d411d64fe3c2739d299cda': Add short flash animation and shutter sound to ZSL camera.
|
17d9084e38e64f06a9d411d64fe3c2739d299cda |
29-Aug-2014 |
Andy Huibers <andyhuibers@google.com> |
Add short flash animation and shutter sound to ZSL camera. Bug: 17217567 Change-Id: I9a75fdd15e03f47029ef4a631287899718794c5c
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/CaptureModule.java
rc/com/android/camera/app/AppController.java
rc/com/android/camera/app/CameraAppUI.java
rc/com/android/camera/one/OneCamera.java
rc/com/android/camera/one/v2/ImageCaptureManager.java
rc/com/android/camera/one/v2/OneCameraImpl.java
rc/com/android/camera/one/v2/OneCameraZslImpl.java
rc/com/android/camera/ui/CaptureAnimationOverlay.java
|
c31df15f15d4e8230e6511426cf765133bcc78ae |
04-Sep-2014 |
Baligh Uddin <baligh@google.com> |
am 62c49d47: (-s ours) am 40ac020c: (-s ours) am b43f973a: (-s ours) am f096e898: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-glacier * commit '62c49d479fb47d30c49672ee88457798616a5a35': Import translations. DO NOT MERGE
|
dbb6b7f92f7eb93be15eebab1053038b3e0b7fda |
04-Sep-2014 |
Baligh Uddin <baligh@google.com> |
am 6c0832c7: (-s ours) am 7f10a8c0: (-s ours) am 9351f22c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit '6c0832c79cf061c41da82a72b910ef5b4ae6fa3f': Import translations. DO NOT MERGE
|
62c49d479fb47d30c49672ee88457798616a5a35 |
04-Sep-2014 |
Baligh Uddin <baligh@google.com> |
am 40ac020c: (-s ours) am b43f973a: (-s ours) am f096e898: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-glacier * commit '40ac020ce150d1ee8d19d48edc6e70fb0c92f708': Import translations. DO NOT MERGE
|
6c0832c79cf061c41da82a72b910ef5b4ae6fa3f |
04-Sep-2014 |
Baligh Uddin <baligh@google.com> |
am 7f10a8c0: (-s ours) am 9351f22c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit '7f10a8c0a0cfbf6d99c10f951192f6915dd56699': Import translations. DO NOT MERGE
|
40ac020ce150d1ee8d19d48edc6e70fb0c92f708 |
04-Sep-2014 |
Baligh Uddin <baligh@google.com> |
am b43f973a: (-s ours) am f096e898: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-glacier * commit 'b43f973a2389f4d9e45d35bffee92e70b4bce704': Import translations. DO NOT MERGE
|
7f10a8c0a0cfbf6d99c10f951192f6915dd56699 |
04-Sep-2014 |
Baligh Uddin <baligh@google.com> |
am 9351f22c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit '9351f22c49705fc1df51bb5f3c9afc9e08f95b94': Import translations. DO NOT MERGE
|
fad133aeabbafd8749cf36995f2b818e427deb09 |
04-Sep-2014 |
Baligh Uddin <baligh@google.com> |
am b43f973a: (-s ours) am f096e898: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-glacier * commit 'b43f973a2389f4d9e45d35bffee92e70b4bce704': Import translations. DO NOT MERGE
|
dd218c5b8f52173780cca58cfc7c6dbe5ac6b3ef |
04-Sep-2014 |
Baligh Uddin <baligh@google.com> |
am 9351f22c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit '9351f22c49705fc1df51bb5f3c9afc9e08f95b94': Import translations. DO NOT MERGE
|
575d78c70e929344998e3262cc9d45f308bffb3d |
04-Sep-2014 |
Puneet Lall <puneetl@google.com> |
am 8d2eeb52: am ab541776: am 6fa0451d: am f1e3dc86: Merge "Added log for first preview frame" into ub-camera-glacier * commit '8d2eeb525c89b58172dc973cc7dc7ebe0ac7cb1c': Added log for first preview frame
|
b43f973a2389f4d9e45d35bffee92e70b4bce704 |
04-Sep-2014 |
Baligh Uddin <baligh@google.com> |
am f096e898: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-glacier * commit 'f096e898055178994d372525139fd47f625aa85f': Import translations. DO NOT MERGE
|
45e496813c438886b1cca69d61ddb48d00eb7c86 |
04-Sep-2014 |
Baligh Uddin <baligh@google.com> |
am f096e898: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-glacier * commit 'f096e898055178994d372525139fd47f625aa85f': Import translations. DO NOT MERGE
|
9351f22c49705fc1df51bb5f3c9afc9e08f95b94 |
04-Sep-2014 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into lmp-dev
|
574322a4e8841335aa1041eb44f2906bedb737f1 |
04-Sep-2014 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
|
035bf3fb88ca17d0b938a93546d6fc61edc31309 |
04-Sep-2014 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE"
|
8d2eeb525c89b58172dc973cc7dc7ebe0ac7cb1c |
04-Sep-2014 |
Puneet Lall <puneetl@google.com> |
am ab541776: am 6fa0451d: am f1e3dc86: Merge "Added log for first preview frame" into ub-camera-glacier * commit 'ab541776f9db60aa1475589e753e452a0242432e': Added log for first preview frame
|
f096e898055178994d372525139fd47f625aa85f |
04-Sep-2014 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into ub-camera-glacier
|
e069d11a272e54f0b2fa3bb6dd370199dba0b425 |
04-Sep-2014 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into ub-camera-haleakala
|
ab541776f9db60aa1475589e753e452a0242432e |
04-Sep-2014 |
Puneet Lall <puneetl@google.com> |
am 6fa0451d: am f1e3dc86: Merge "Added log for first preview frame" into ub-camera-glacier * commit '6fa0451dc863184c4b052d6e8e85bfe37a33f5fe': Added log for first preview frame
|
6fa0451dc863184c4b052d6e8e85bfe37a33f5fe |
04-Sep-2014 |
Puneet Lall <puneetl@google.com> |
am f1e3dc86: Merge "Added log for first preview frame" into ub-camera-glacier * commit 'f1e3dc865aa7dfcb3fee584b8e37fd24c23e78c0': Added log for first preview frame
|
732748991348f84939a769a8daaa2b685a8a70fe |
04-Sep-2014 |
Puneet Lall <puneetl@google.com> |
am f1e3dc86: Merge "Added log for first preview frame" into ub-camera-glacier * commit 'f1e3dc865aa7dfcb3fee584b8e37fd24c23e78c0': Added log for first preview frame
|
f1e3dc865aa7dfcb3fee584b8e37fd24c23e78c0 |
04-Sep-2014 |
Puneet Lall <puneetl@google.com> |
Merge "Added log for first preview frame" into ub-camera-glacier
|
54092780951fd84ffd98cc6ea3e54ad388e7db4c |
04-Sep-2014 |
Puneet Lall <puneetl@google.com> |
Added log for first preview frame Bug: 17386943 Change-Id: I17907402c9d1cd4678634e2ceb8cbf921f010d9f
rc/android/util/CameraPerformanceTracker.java
|
6b8b09749fc809a746879d06931fad610bc4f187 |
04-Sep-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I4a0c742753c71d076d00fd5b1da46ce942289377 Auto-generated-cl: translation import
es/values-ca/strings.xml
|
ba380c6bffeb51bf3cf69fc77de96b2263dba6c0 |
04-Sep-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I9f25ac4e3c13fcd64389cf61422fd64c831c8d02 Auto-generated-cl: translation import
es/values-ca/strings.xml
|
b49065f5df30c006a3c5f306cbac5cc03d987a2e |
04-Sep-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ic6a46172bb51bfa2e6faa75d8f9ddeb1e46a5c35 Auto-generated-cl: translation import
es/values-ca/strings.xml
es/values-my-rMM/strings.xml
|
0585413d41ab5ba1d2540aa0c9a3bc7680643c2d |
04-Sep-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I2febfad7ce62ec047f11dedd59afd86682a4bf33 Auto-generated-cl: translation import
es/values-ca/strings.xml
|
17afb876d3e174aa8d8f88a3fb745d81b8cd7adc |
04-Sep-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I95951618c47241ab89d780f6ebe39e30ae08d332 Auto-generated-cl: translation import
es/values-ca/strings.xml
es/values-my-rMM/strings.xml
|
9ba17a8d674ff91ccf68b2ef7389bccc9f864125 |
04-Sep-2014 |
Puneet Lall <puneetl@google.com> |
am 4442501d: am b80e7562: am f8ae4fb6: am ae6e94f5: Merge "Re-enable shutter-button when switching between front and back cameras." into ub-camera-glacier * commit '4442501d5e2cb59b2da52c4fabad166eedb8d93e': Re-enable shutter-button when switching between front and back cameras.
|
ecb51c231ff22249aec2c27ce37773b2e7f598d2 |
04-Sep-2014 |
Alan Newberger <alann@google.com> |
am 7c1cddea: am f3e53dc1: am a4258d82: am 2ef0f9dc: Fix unnecessary string cast * commit '7c1cddea0f14258d582bded9fa48014d2a251857': Fix unnecessary string cast
|
4442501d5e2cb59b2da52c4fabad166eedb8d93e |
04-Sep-2014 |
Puneet Lall <puneetl@google.com> |
am b80e7562: am f8ae4fb6: am ae6e94f5: Merge "Re-enable shutter-button when switching between front and back cameras." into ub-camera-glacier * commit 'b80e75620c339ec360c5e3769adefe7c239ea940': Re-enable shutter-button when switching between front and back cameras.
|
7c1cddea0f14258d582bded9fa48014d2a251857 |
04-Sep-2014 |
Alan Newberger <alann@google.com> |
am f3e53dc1: am a4258d82: am 2ef0f9dc: Fix unnecessary string cast * commit 'f3e53dc11e59e0b0416edd924f0b2e267e484d6b': Fix unnecessary string cast
|
b80e75620c339ec360c5e3769adefe7c239ea940 |
04-Sep-2014 |
Puneet Lall <puneetl@google.com> |
am f8ae4fb6: am ae6e94f5: Merge "Re-enable shutter-button when switching between front and back cameras." into ub-camera-glacier * commit 'f8ae4fb65167cf669b7788ac035b31575005964b': Re-enable shutter-button when switching between front and back cameras.
|
f3e53dc11e59e0b0416edd924f0b2e267e484d6b |
04-Sep-2014 |
Alan Newberger <alann@google.com> |
am a4258d82: am 2ef0f9dc: Fix unnecessary string cast * commit 'a4258d829019884b2b6396b4728765d2cdb79923': Fix unnecessary string cast
|
0793b92914e7770a49fa7993f8b1e3e38b08eb5b |
04-Sep-2014 |
Puneet Lall <puneetl@google.com> |
am ae6e94f5: Merge "Re-enable shutter-button when switching between front and back cameras." into ub-camera-glacier * commit 'ae6e94f570a8436715384993f2e06b2193915b78': Re-enable shutter-button when switching between front and back cameras.
|
f1688031d0f1add1de7ea072aad1170261113aa8 |
04-Sep-2014 |
Alan Newberger <alann@google.com> |
am 2ef0f9dc: Fix unnecessary string cast * commit '2ef0f9dc95527a354846940bae675741c464e6ae': Fix unnecessary string cast
|
f8ae4fb65167cf669b7788ac035b31575005964b |
04-Sep-2014 |
Puneet Lall <puneetl@google.com> |
am ae6e94f5: Merge "Re-enable shutter-button when switching between front and back cameras." into ub-camera-glacier * commit 'ae6e94f570a8436715384993f2e06b2193915b78': Re-enable shutter-button when switching between front and back cameras.
|
a4258d829019884b2b6396b4728765d2cdb79923 |
04-Sep-2014 |
Alan Newberger <alann@google.com> |
am 2ef0f9dc: Fix unnecessary string cast * commit '2ef0f9dc95527a354846940bae675741c464e6ae': Fix unnecessary string cast
|
ae6e94f570a8436715384993f2e06b2193915b78 |
04-Sep-2014 |
Puneet Lall <puneetl@google.com> |
Merge "Re-enable shutter-button when switching between front and back cameras." into ub-camera-glacier
|
2ef0f9dc95527a354846940bae675741c464e6ae |
04-Sep-2014 |
Alan Newberger <alann@google.com> |
Fix unnecessary string cast Code was taking a setting as a string, which when empty returns null, then tried to parseInt it. Instead ask for an int, which will default to zero, and things will work. Bug: 16827108 Change-Id: I5bbed091ec29fc98257a5eb18948891c43caa29f
rc/com/android/camera/widget/IndicatorIconController.java
|
321487682758042208fdb7b5f6f7c459a5eae697 |
04-Sep-2014 |
Alan Newberger <alann@google.com> |
am adda4d26: am 54bc8e44: am 64e4bc9f: am 2b084ec5: Merge "Fixing settings upgrades" into ub-camera-glacier * commit 'adda4d263a3c84643a15d7b564221b6ecc3ee27b': Fixing settings upgrades
|
adda4d263a3c84643a15d7b564221b6ecc3ee27b |
04-Sep-2014 |
Alan Newberger <alann@google.com> |
am 54bc8e44: am 64e4bc9f: am 2b084ec5: Merge "Fixing settings upgrades" into ub-camera-glacier * commit '54bc8e449e5ff47ccbd04b34365411c109a53c05': Fixing settings upgrades
|
54bc8e449e5ff47ccbd04b34365411c109a53c05 |
04-Sep-2014 |
Alan Newberger <alann@google.com> |
am 64e4bc9f: am 2b084ec5: Merge "Fixing settings upgrades" into ub-camera-glacier * commit '64e4bc9f0dc63a440143f17803f6e86f80139a2c': Fixing settings upgrades
|
64e4bc9f0dc63a440143f17803f6e86f80139a2c |
04-Sep-2014 |
Alan Newberger <alann@google.com> |
am 2b084ec5: Merge "Fixing settings upgrades" into ub-camera-glacier * commit '2b084ec5c7c262003581be3584825300269adae2': Fixing settings upgrades
|
5c6a72e2d3a954221d00e297ac924d608d2d6b15 |
04-Sep-2014 |
Alan Newberger <alann@google.com> |
am 2b084ec5: Merge "Fixing settings upgrades" into ub-camera-glacier * commit '2b084ec5c7c262003581be3584825300269adae2': Fixing settings upgrades
|
1509fb7424dd9f78da344318314de6e8d27d4d7c |
04-Sep-2014 |
Puneet Lall <puneetl@google.com> |
am 50bafb27: am b87b255a: am fb730076: am 4d6d676c: Refactor default picture size selection in zsl cam. * commit '50bafb27f091e44a5e3d5b778af559eb14540604': Refactor default picture size selection in zsl cam.
|
2b084ec5c7c262003581be3584825300269adae2 |
04-Sep-2014 |
Alan Newberger <alann@google.com> |
Merge "Fixing settings upgrades" into ub-camera-glacier
|
50bafb27f091e44a5e3d5b778af559eb14540604 |
04-Sep-2014 |
Puneet Lall <puneetl@google.com> |
am b87b255a: am fb730076: am 4d6d676c: Refactor default picture size selection in zsl cam. * commit 'b87b255a53f91b000484e29b3fe56d6a3b367467': Refactor default picture size selection in zsl cam.
|
a830b1aefc9d5f29b512817ac96c68e38a38a13b |
03-Sep-2014 |
Alan Newberger <alann@google.com> |
Fixing settings upgrades Did a full audit of upgrade scenarios and performed the following fixes. * restored pre-existing location upgrade code that handled old upgrades. preserves location choice from C straight to G. * added string type format conversion for "old global" values that were not implemented in the refactor : hdr, hdr+, grid buttons * moved a "reset" that existed in upgraders that put the user in Camera mode on upgrade. it should run for everglades upgraders along with size changes. Bug: 17317510 Change-Id: I87db511bfa89676525ee727620cb546c180a8ef6
rc/com/android/camera/settings/AppUpgrader.java
rc/com/android/camera/settings/SettingsManager.java
rc/com/android/camera/settings/SettingsUpgrader.java
|
91eb5f1e9578a91c996dd40ebd91f8988654ae00 |
04-Sep-2014 |
Puneet Lall <puneetl@google.com> |
Merge "Force ZSL and CaptureModule to be enabled." into ub-camera-haleakala
|
142b5bf5e10db858c2d2e69fd93d6565ba51363b |
03-Sep-2014 |
Puneet Lall <puneetl@google.com> |
Re-enable shutter-button when switching between front and back cameras. Bug: 16961251 Change-Id: Ie3075bf711ab44dfe5e6cdd6b3645dd6583708b5
rc/com/android/camera/one/v2/OneCameraZslImpl.java
rc/com/android/camera/util/ConjunctionListenerMux.java
|
b87b255a53f91b000484e29b3fe56d6a3b367467 |
03-Sep-2014 |
Puneet Lall <puneetl@google.com> |
am fb730076: am 4d6d676c: Refactor default picture size selection in zsl cam. * commit 'fb7300764d996191e4d6610c7e6558ec5d3c89a6': Refactor default picture size selection in zsl cam.
|
fb7300764d996191e4d6610c7e6558ec5d3c89a6 |
03-Sep-2014 |
Puneet Lall <puneetl@google.com> |
am 4d6d676c: Refactor default picture size selection in zsl cam. * commit '4d6d676c368b70e8c0fcf462e51de1d59fe34028': Refactor default picture size selection in zsl cam.
|
447a570cca5f53ff243827cd2c60bdc58050b5fa |
03-Sep-2014 |
Puneet Lall <puneetl@google.com> |
am 4d6d676c: Refactor default picture size selection in zsl cam. * commit '4d6d676c368b70e8c0fcf462e51de1d59fe34028': Refactor default picture size selection in zsl cam.
|
4d6d676c368b70e8c0fcf462e51de1d59fe34028 |
03-Sep-2014 |
Puneet Lall <puneetl@google.com> |
Refactor default picture size selection in zsl cam. Bug: 17322843 Change-Id: Ib34584937db639f984689042bd8371443a33bb64
rc/com/android/camera/one/v2/OneCameraZslImpl.java
|
63b1e06976cf037b0f52a081bec3ec181c204eaf |
03-Sep-2014 |
Puneet Lall <puneetl@google.com> |
am fdfdc797: am 40c0567b: am d8934fdf: am 686c7b55: Merge "[ZSL Cam] Use largest supported size if no picture size is already set." into ub-camera-glacier * commit 'fdfdc7973df4edadae3ae7dae77b7d938cbd2a4a': [ZSL Cam] Use largest supported size if no picture size is already set.
|
9b0b5e70fb448a1140fef83be913748f9a906c0a |
03-Sep-2014 |
Andy Huibers <andyhuibers@google.com> |
am f78de871: am f5bd183a: am 648c05aa: am 4d7f3be8: CaptureModule countdown timer fixes: ability to cancel, and remove premature SoundPlayer release. * commit 'f78de87148eb89c47dd02c1e742d43082c4e0f81': CaptureModule countdown timer fixes: ability to cancel, and remove premature SoundPlayer release.
|
fdfdc7973df4edadae3ae7dae77b7d938cbd2a4a |
03-Sep-2014 |
Puneet Lall <puneetl@google.com> |
am 40c0567b: am d8934fdf: am 686c7b55: Merge "[ZSL Cam] Use largest supported size if no picture size is already set." into ub-camera-glacier * commit '40c0567bc065234e95a92be455527d9e52e02b97': [ZSL Cam] Use largest supported size if no picture size is already set.
|
f78de87148eb89c47dd02c1e742d43082c4e0f81 |
03-Sep-2014 |
Andy Huibers <andyhuibers@google.com> |
am f5bd183a: am 648c05aa: am 4d7f3be8: CaptureModule countdown timer fixes: ability to cancel, and remove premature SoundPlayer release. * commit 'f5bd183a14cd3045425f6464bcaf90cefe10ae52': CaptureModule countdown timer fixes: ability to cancel, and remove premature SoundPlayer release.
|
40c0567bc065234e95a92be455527d9e52e02b97 |
03-Sep-2014 |
Puneet Lall <puneetl@google.com> |
am d8934fdf: am 686c7b55: Merge "[ZSL Cam] Use largest supported size if no picture size is already set." into ub-camera-glacier * commit 'd8934fdfc5e9612b284721b6354ca772854bcbbb': [ZSL Cam] Use largest supported size if no picture size is already set.
|
636e7e7a9d842a1871c3ee03b70c6fc1c0a873dc |
03-Sep-2014 |
Puneet Lall <puneetl@google.com> |
am 686c7b55: Merge "[ZSL Cam] Use largest supported size if no picture size is already set." into ub-camera-glacier * commit '686c7b55a6b0c9c7202383e0589b190e5439ce69': [ZSL Cam] Use largest supported size if no picture size is already set.
|
d8934fdfc5e9612b284721b6354ca772854bcbbb |
03-Sep-2014 |
Puneet Lall <puneetl@google.com> |
am 686c7b55: Merge "[ZSL Cam] Use largest supported size if no picture size is already set." into ub-camera-glacier * commit '686c7b55a6b0c9c7202383e0589b190e5439ce69': [ZSL Cam] Use largest supported size if no picture size is already set.
|
f5bd183a14cd3045425f6464bcaf90cefe10ae52 |
03-Sep-2014 |
Andy Huibers <andyhuibers@google.com> |
am 648c05aa: am 4d7f3be8: CaptureModule countdown timer fixes: ability to cancel, and remove premature SoundPlayer release. * commit '648c05aa3f96abf8a973a6584e471baff1cfc718': CaptureModule countdown timer fixes: ability to cancel, and remove premature SoundPlayer release.
|
686c7b55a6b0c9c7202383e0589b190e5439ce69 |
03-Sep-2014 |
Puneet Lall <puneetl@google.com> |
Merge "[ZSL Cam] Use largest supported size if no picture size is already set." into ub-camera-glacier
|
89b48fd082cdb2a8e75caa577cbe25a422ee85e0 |
03-Sep-2014 |
Andy Huibers <andyhuibers@google.com> |
am 4d7f3be8: CaptureModule countdown timer fixes: ability to cancel, and remove premature SoundPlayer release. * commit '4d7f3be87a92c7efac7cf92bbd4ce7dd61f46e0d': CaptureModule countdown timer fixes: ability to cancel, and remove premature SoundPlayer release.
|
648c05aa3f96abf8a973a6584e471baff1cfc718 |
03-Sep-2014 |
Andy Huibers <andyhuibers@google.com> |
am 4d7f3be8: CaptureModule countdown timer fixes: ability to cancel, and remove premature SoundPlayer release. * commit '4d7f3be87a92c7efac7cf92bbd4ce7dd61f46e0d': CaptureModule countdown timer fixes: ability to cancel, and remove premature SoundPlayer release.
|
80f44448e13b5d6d33f4aad63448d7b39b6dda0f |
03-Sep-2014 |
Puneet Lall <puneetl@google.com> |
[ZSL Cam] Use largest supported size if no picture size is already set. Fixes crash due to null size when zsl is started for the first time on a fresh device. Bug: 17322843 Change-Id: I31ef4202c13cee1270af59231f93842fa0e86009
rc/com/android/camera/one/v2/OneCameraZslImpl.java
|
9d4a51b5fb8e855feaf47fd4cabda2b412475939 |
03-Sep-2014 |
Andy Huibers <andyhuibers@google.com> |
am b3bd30ea: am 6836d716: am a00adf62: am d568e524: Merge "Add countdown timer to CaptureModule." into ub-camera-glacier * commit 'b3bd30eaaed80d720df43ffea635bfb1687ad69d': Add countdown timer to CaptureModule.
|
b3bd30eaaed80d720df43ffea635bfb1687ad69d |
03-Sep-2014 |
Andy Huibers <andyhuibers@google.com> |
am 6836d716: am a00adf62: am d568e524: Merge "Add countdown timer to CaptureModule." into ub-camera-glacier * commit '6836d71609c49d0da9fe6d4d7702b8d60cf0d3b0': Add countdown timer to CaptureModule.
|
521f56e020829303e437fc30587b30e77e315169 |
03-Sep-2014 |
Sascha Haeberling <haeberling@google.com> |
am 6d275521: am ca6ca413: am 13a221a2: am 7718b87b: Merge "A few Size clean-ups to support live metering changes." into ub-camera-glacier * commit '6d2755213a333d3a1dd75313b62ef200f53e1771': A few Size clean-ups to support live metering changes.
|
2c98f609008b2240be944c014951a1e2b0093f38 |
03-Sep-2014 |
Spike Sprague <spikuru@google.com> |
am c87f4f8a: am 8693a3f3: am 39b7e060: am b9f4b931: Merge "actionbar opactiy tweaks" into ub-camera-glacier * commit 'c87f4f8adc97ff2f9e398340be5cd56d4df74853': actionbar opactiy tweaks
|
a2887576dc3851fa1cd685f1f7651d967e9b35fe |
03-Sep-2014 |
Spike Sprague <spikuru@google.com> |
am 0966903c: am b27bc8ec: am 12a615c8: am 9bfd6bdd: shutter button color fix (pre-L) * commit '0966903c583f5d02ff5e03aba2389056265bfc36': shutter button color fix (pre-L)
|
6d2755213a333d3a1dd75313b62ef200f53e1771 |
03-Sep-2014 |
Sascha Haeberling <haeberling@google.com> |
am ca6ca413: am 13a221a2: am 7718b87b: Merge "A few Size clean-ups to support live metering changes." into ub-camera-glacier * commit 'ca6ca4136c77b2c2f7692ab5f954fa0571b7c9e3': A few Size clean-ups to support live metering changes.
|
c87f4f8adc97ff2f9e398340be5cd56d4df74853 |
03-Sep-2014 |
Spike Sprague <spikuru@google.com> |
am 8693a3f3: am 39b7e060: am b9f4b931: Merge "actionbar opactiy tweaks" into ub-camera-glacier * commit '8693a3f347ac6eabea0403030c71dcaec27c7f40': actionbar opactiy tweaks
|
0966903c583f5d02ff5e03aba2389056265bfc36 |
03-Sep-2014 |
Spike Sprague <spikuru@google.com> |
am b27bc8ec: am 12a615c8: am 9bfd6bdd: shutter button color fix (pre-L) * commit 'b27bc8eca2ed8b3da9c4ce45ecd32df8d2069a97': shutter button color fix (pre-L)
|
4d7f3be87a92c7efac7cf92bbd4ce7dd61f46e0d |
03-Sep-2014 |
Andy Huibers <andyhuibers@google.com> |
CaptureModule countdown timer fixes: ability to cancel, and remove premature SoundPlayer release. Bug: 17204673 Change-Id: I438c3d4e7a9aad3f8fc709d255a249399bb05b57
rc/com/android/camera/CaptureModule.java
|
db4bf9fac5b437648beac185928241ba015cc6ee |
03-Sep-2014 |
Andy Huibers <andyhuibers@google.com> |
am 4ee52d8e: am be020925: am 4cd2a6ab: am 5ca2e0b9: Merge "Remove android.hardware.camera2 import from Settings3A." into ub-camera-glacier * commit '4ee52d8e54343030ef79a80682101f4968dc75c5': Remove android.hardware.camera2 import from Settings3A.
|
6836d71609c49d0da9fe6d4d7702b8d60cf0d3b0 |
03-Sep-2014 |
Andy Huibers <andyhuibers@google.com> |
am a00adf62: am d568e524: Merge "Add countdown timer to CaptureModule." into ub-camera-glacier * commit 'a00adf6218dd771f15cbb77eb203999f6dfc2107': Add countdown timer to CaptureModule.
|
a00adf6218dd771f15cbb77eb203999f6dfc2107 |
03-Sep-2014 |
Andy Huibers <andyhuibers@google.com> |
am d568e524: Merge "Add countdown timer to CaptureModule." into ub-camera-glacier * commit 'd568e524029dc538d774d3d7b45586639549c79a': Add countdown timer to CaptureModule.
|
716876f9b254cc020a75e6acec7333c015f90023 |
03-Sep-2014 |
Andy Huibers <andyhuibers@google.com> |
am d568e524: Merge "Add countdown timer to CaptureModule." into ub-camera-glacier * commit 'd568e524029dc538d774d3d7b45586639549c79a': Add countdown timer to CaptureModule.
|
d568e524029dc538d774d3d7b45586639549c79a |
03-Sep-2014 |
Andy Huibers <andyhuibers@google.com> |
Merge "Add countdown timer to CaptureModule." into ub-camera-glacier
|
15bc0dcc293720baa0424afa5a901475982465be |
03-Sep-2014 |
Puneet Lall <puneetl@google.com> |
Force ZSL and CaptureModule to be enabled. Temporary setting for testing zsl. Bug: 17322843 Change-Id: I71befcd30d5ff60a52e041dbbef95fec66691a14
rc/com/android/camera/debug/DebugPropertyHelper.java
|
a31162ce3ab4f9c68e46658b16b2c49f4dc0d145 |
02-Sep-2014 |
Andy Huibers <andyhuibers@google.com> |
Add countdown timer to CaptureModule. Bug: 16654225 Bug: 17204673 Change-Id: I914094b204743ddbe786ef1a7621564e864ed834
es/layout/capture_module.xml
es/layout/photo_module.xml
rc/com/android/camera/CaptureModule.java
rc/com/android/camera/CaptureModuleUI.java
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/PhotoUI.java
|
ca6ca4136c77b2c2f7692ab5f954fa0571b7c9e3 |
03-Sep-2014 |
Sascha Haeberling <haeberling@google.com> |
am 13a221a2: am 7718b87b: Merge "A few Size clean-ups to support live metering changes." into ub-camera-glacier * commit '13a221a28fe6512f132c9929243ffb19ec25ade6': A few Size clean-ups to support live metering changes.
|
3caff61220ea3f41671c783bdcf8ba893581e596 |
03-Sep-2014 |
Sascha Haeberling <haeberling@google.com> |
am 7718b87b: Merge "A few Size clean-ups to support live metering changes." into ub-camera-glacier * commit '7718b87b566b20d11dfa2dd97f60018e601ad409': A few Size clean-ups to support live metering changes.
|
13a221a28fe6512f132c9929243ffb19ec25ade6 |
03-Sep-2014 |
Sascha Haeberling <haeberling@google.com> |
am 7718b87b: Merge "A few Size clean-ups to support live metering changes." into ub-camera-glacier * commit '7718b87b566b20d11dfa2dd97f60018e601ad409': A few Size clean-ups to support live metering changes.
|
7718b87b566b20d11dfa2dd97f60018e601ad409 |
03-Sep-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "A few Size clean-ups to support live metering changes." into ub-camera-glacier
|
8693a3f347ac6eabea0403030c71dcaec27c7f40 |
03-Sep-2014 |
Spike Sprague <spikuru@google.com> |
am 39b7e060: am b9f4b931: Merge "actionbar opactiy tweaks" into ub-camera-glacier * commit '39b7e0608e143811f2cca5bd8eb72936e961130e': actionbar opactiy tweaks
|
7ba98601bc9903b15ec00b66d79b389375a429d4 |
03-Sep-2014 |
Spike Sprague <spikuru@google.com> |
am b9f4b931: Merge "actionbar opactiy tweaks" into ub-camera-glacier * commit 'b9f4b931949dbddeba61b0a6bfcc52d24e01c97c': actionbar opactiy tweaks
|
39b7e0608e143811f2cca5bd8eb72936e961130e |
03-Sep-2014 |
Spike Sprague <spikuru@google.com> |
am b9f4b931: Merge "actionbar opactiy tweaks" into ub-camera-glacier * commit 'b9f4b931949dbddeba61b0a6bfcc52d24e01c97c': actionbar opactiy tweaks
|
b27bc8eca2ed8b3da9c4ce45ecd32df8d2069a97 |
03-Sep-2014 |
Spike Sprague <spikuru@google.com> |
am 12a615c8: am 9bfd6bdd: shutter button color fix (pre-L) * commit '12a615c836c71ce44e9480f0819feb663038b0e9': shutter button color fix (pre-L)
|
b9f4b931949dbddeba61b0a6bfcc52d24e01c97c |
03-Sep-2014 |
Spike Sprague <spikuru@google.com> |
Merge "actionbar opactiy tweaks" into ub-camera-glacier
|
df6c9e2750206bd768e8abe7a508fa5677b53f26 |
29-Aug-2014 |
Spike Sprague <spikuru@google.com> |
actionbar opactiy tweaks bug: 17319586 Change-Id: I2bfde2db9cff62b6ac8d8f416c1f8512c25bd900
es/values-v21/bool.xml
rc/com/android/camera/CameraActivity.java
|
0b2e533440acf3a2e2d7cfc56c3305eb61ae645f |
03-Sep-2014 |
Spike Sprague <spikuru@google.com> |
am 9bfd6bdd: shutter button color fix (pre-L) * commit '9bfd6bddaa09ccdadabf3b0e7e2b81bc1bcf175d': shutter button color fix (pre-L)
|
12a615c836c71ce44e9480f0819feb663038b0e9 |
03-Sep-2014 |
Spike Sprague <spikuru@google.com> |
am 9bfd6bdd: shutter button color fix (pre-L) * commit '9bfd6bddaa09ccdadabf3b0e7e2b81bc1bcf175d': shutter button color fix (pre-L)
|
9bfd6bddaa09ccdadabf3b0e7e2b81bc1bcf175d |
18-Aug-2014 |
Spike Sprague <spikuru@google.com> |
shutter button color fix (pre-L) bug: 17011894 Change-Id: Ic7626f89c811c08f1d16bb5e42fa9169b1e65759
rc/com/android/camera/ui/BottomBar.java
|
f2627903d11faf47c5052884bc2b23e27b8d5f94 |
02-Sep-2014 |
Sascha Haeberling <haeberling@google.com> |
A few Size clean-ups to support live metering changes. Bug: 16948752 Change-Id: I262a6b3caa42ecd7a4da40d1eaca6a7eaa96be98
rc/com/android/camera/CaptureModuleUtil.java
rc/com/android/camera/util/CameraUtil.java
rc/com/android/camera/util/Size.java
|
4ee52d8e54343030ef79a80682101f4968dc75c5 |
02-Sep-2014 |
Andy Huibers <andyhuibers@google.com> |
am be020925: am 4cd2a6ab: am 5ca2e0b9: Merge "Remove android.hardware.camera2 import from Settings3A." into ub-camera-glacier * commit 'be0209252151382e41c9033eb20e9abb0000cadd': Remove android.hardware.camera2 import from Settings3A.
|
be0209252151382e41c9033eb20e9abb0000cadd |
02-Sep-2014 |
Andy Huibers <andyhuibers@google.com> |
am 4cd2a6ab: am 5ca2e0b9: Merge "Remove android.hardware.camera2 import from Settings3A." into ub-camera-glacier * commit '4cd2a6abfe628ee0d19cb0f373a438ac305a6fe4': Remove android.hardware.camera2 import from Settings3A.
|
4cd2a6abfe628ee0d19cb0f373a438ac305a6fe4 |
02-Sep-2014 |
Andy Huibers <andyhuibers@google.com> |
am 5ca2e0b9: Merge "Remove android.hardware.camera2 import from Settings3A." into ub-camera-glacier * commit '5ca2e0b94a3031ff2117c5e68f8198a2f174b8eb': Remove android.hardware.camera2 import from Settings3A.
|
64983a28aed593ac09015c6f17c497b3c7a2dac0 |
02-Sep-2014 |
Andy Huibers <andyhuibers@google.com> |
am 5ca2e0b9: Merge "Remove android.hardware.camera2 import from Settings3A." into ub-camera-glacier * commit '5ca2e0b94a3031ff2117c5e68f8198a2f174b8eb': Remove android.hardware.camera2 import from Settings3A.
|
5ca2e0b94a3031ff2117c5e68f8198a2f174b8eb |
02-Sep-2014 |
Andy Huibers <andyhuibers@google.com> |
Merge "Remove android.hardware.camera2 import from Settings3A." into ub-camera-glacier
|
527706e2957fe26f301d991d86d4359ab433408d |
02-Sep-2014 |
Andy Huibers <andyhuibers@google.com> |
Remove android.hardware.camera2 import from Settings3A. Bug: 17358060 Change-Id: I7e4442a4257acf9e4b58981be697949aba62a31f
rc/com/android/camera/one/Settings3A.java
rc/com/android/camera/one/v2/AutoFocusHelper.java
rc/com/android/camera/one/v2/OneCameraImpl.java
rc/com/android/camera/one/v2/OneCameraZslImpl.java
|
e9e98095f2887352147a877f1cf0ae953f6992c1 |
02-Sep-2014 |
Senpo Hu <senpo@google.com> |
am 6c689300: am 8435131b: am 76061e1f: am 10fcde55: Merge "Starting share/edit/play activities in its own task." into ub-camera-glacier * commit '6c689300088e7d644c7526ebef1d9c8bd261ebef': Starting share/edit/play activities in its own task.
|
6c689300088e7d644c7526ebef1d9c8bd261ebef |
02-Sep-2014 |
Senpo Hu <senpo@google.com> |
am 8435131b: am 76061e1f: am 10fcde55: Merge "Starting share/edit/play activities in its own task." into ub-camera-glacier * commit '8435131b69208f53c6e1c4422964fe7f4dc77464': Starting share/edit/play activities in its own task.
|
8435131b69208f53c6e1c4422964fe7f4dc77464 |
02-Sep-2014 |
Senpo Hu <senpo@google.com> |
am 76061e1f: am 10fcde55: Merge "Starting share/edit/play activities in its own task." into ub-camera-glacier * commit '76061e1fb8615c808e496a09cc3a7b715372feb7': Starting share/edit/play activities in its own task.
|
76061e1fb8615c808e496a09cc3a7b715372feb7 |
02-Sep-2014 |
Senpo Hu <senpo@google.com> |
am 10fcde55: Merge "Starting share/edit/play activities in its own task." into ub-camera-glacier * commit '10fcde551bddb786e4cae0da3ed81a687cf2d470': Starting share/edit/play activities in its own task.
|
4177782099827421e4c6486748f29ebfa4805d73 |
02-Sep-2014 |
Senpo Hu <senpo@google.com> |
am 10fcde55: Merge "Starting share/edit/play activities in its own task." into ub-camera-glacier * commit '10fcde551bddb786e4cae0da3ed81a687cf2d470': Starting share/edit/play activities in its own task.
|
10fcde551bddb786e4cae0da3ed81a687cf2d470 |
02-Sep-2014 |
Senpo Hu <senpo@google.com> |
Merge "Starting share/edit/play activities in its own task." into ub-camera-glacier
|
9f2b20a389fa79f35e1e12878e3cbd8db3e1ff95 |
30-Aug-2014 |
Senpo Hu <senpo@google.com> |
Starting share/edit/play activities in its own task. Bug: 17091348 Change-Id: Ib90173e164fab2a1aba753ab4d4f05d305d3d522
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/VideoModule.java
rc/com/android/camera/util/CameraUtil.java
|
e0672c9ff532a5a00923ca365b7ae6bc8d2d5d26 |
02-Sep-2014 |
Alan Newberger <alann@google.com> |
am 13970b5d: am e48f098a: am 2c25a7cb: am ef481910: Merge "Ensure ZoomView appears on top of other views in L" into ub-camera-glacier * commit '13970b5dba6fb074088b899052cd709940631dbc': Ensure ZoomView appears on top of other views in L
|
d1970d0c8d77bf2b4800cc8ae02d1dde6c80e348 |
02-Sep-2014 |
Andy Huibers <andyhuibers@google.com> |
am d5d01fc7: am b2b1ea96: am a394ea69: am b868274c: Simplify AF in CaptureModule and OneCameraImpl and share code in AutoFocusHelper. * commit 'd5d01fc75ba551a6679afc6961f14ef016fc0672': Simplify AF in CaptureModule and OneCameraImpl and share code in AutoFocusHelper.
|
13970b5dba6fb074088b899052cd709940631dbc |
30-Aug-2014 |
Alan Newberger <alann@google.com> |
am e48f098a: am 2c25a7cb: am ef481910: Merge "Ensure ZoomView appears on top of other views in L" into ub-camera-glacier * commit 'e48f098aebd68f6e13c4faaa1dfc9249fe327423': Ensure ZoomView appears on top of other views in L
|
e48f098aebd68f6e13c4faaa1dfc9249fe327423 |
30-Aug-2014 |
Alan Newberger <alann@google.com> |
am 2c25a7cb: am ef481910: Merge "Ensure ZoomView appears on top of other views in L" into ub-camera-glacier * commit '2c25a7cbcdb8fe18a3663f849584fcb9160b1f52': Ensure ZoomView appears on top of other views in L
|
2c25a7cbcdb8fe18a3663f849584fcb9160b1f52 |
30-Aug-2014 |
Alan Newberger <alann@google.com> |
am ef481910: Merge "Ensure ZoomView appears on top of other views in L" into ub-camera-glacier * commit 'ef4819104fa5e69b7654afcf2f388760e7989b24': Ensure ZoomView appears on top of other views in L
|
12ee27a1a2986c31c64c7afb5bde68eca1b3f8d9 |
30-Aug-2014 |
Alan Newberger <alann@google.com> |
am ef481910: Merge "Ensure ZoomView appears on top of other views in L" into ub-camera-glacier * commit 'ef4819104fa5e69b7654afcf2f388760e7989b24': Ensure ZoomView appears on top of other views in L
|
ef4819104fa5e69b7654afcf2f388760e7989b24 |
30-Aug-2014 |
Alan Newberger <alann@google.com> |
Merge "Ensure ZoomView appears on top of other views in L" into ub-camera-glacier
|
d5d01fc75ba551a6679afc6961f14ef016fc0672 |
30-Aug-2014 |
Andy Huibers <andyhuibers@google.com> |
am b2b1ea96: am a394ea69: am b868274c: Simplify AF in CaptureModule and OneCameraImpl and share code in AutoFocusHelper. * commit 'b2b1ea96321c09aff30a1b72869f373aef835b78': Simplify AF in CaptureModule and OneCameraImpl and share code in AutoFocusHelper.
|
b9535998da7a02f22156b70615c3e211401d14b0 |
30-Aug-2014 |
Alan Newberger <alann@google.com> |
Ensure ZoomView appears on top of other views in L Since our normal image view now has an elevation on L, just calling bringChildToFront() is not enough, elevation supersedes z order. So we also ensure the ZoomView is at max elevation when we bring it to front. Bug: 17331586 Change-Id: I34b06949d063daa08d964003b28a245eb6133f95
rc/com/android/camera/ui/ZoomView.java
rc/com/android/camera/widget/FilmstripView.java
|
b2b1ea96321c09aff30a1b72869f373aef835b78 |
30-Aug-2014 |
Andy Huibers <andyhuibers@google.com> |
am a394ea69: am b868274c: Simplify AF in CaptureModule and OneCameraImpl and share code in AutoFocusHelper. * commit 'a394ea695b3ac0b09f370cba5d47e732762d690e': Simplify AF in CaptureModule and OneCameraImpl and share code in AutoFocusHelper.
|
cd5fcb9bfee2cf5879135fcbae462bc4c6dfea0e |
30-Aug-2014 |
Andy Huibers <andyhuibers@google.com> |
am b868274c: Simplify AF in CaptureModule and OneCameraImpl and share code in AutoFocusHelper. * commit 'b868274c9dc8d9c772ec89fb5955215cc7911087': Simplify AF in CaptureModule and OneCameraImpl and share code in AutoFocusHelper.
|
a394ea695b3ac0b09f370cba5d47e732762d690e |
30-Aug-2014 |
Andy Huibers <andyhuibers@google.com> |
am b868274c: Simplify AF in CaptureModule and OneCameraImpl and share code in AutoFocusHelper. * commit 'b868274c9dc8d9c772ec89fb5955215cc7911087': Simplify AF in CaptureModule and OneCameraImpl and share code in AutoFocusHelper.
|
b868274c9dc8d9c772ec89fb5955215cc7911087 |
28-Aug-2014 |
Andy Huibers <andyhuibers@google.com> |
Simplify AF in CaptureModule and OneCameraImpl and share code in AutoFocusHelper. Bug: 17202848 Change-Id: I08e92c9701d5b92938612137c87ca37c4305411f
rc/com/android/camera/CaptureModule.java
rc/com/android/camera/CaptureModuleUI.java
rc/com/android/camera/FocusOverlayManager.java
rc/com/android/camera/debug/DebugPropertyHelper.java
rc/com/android/camera/one/OneCamera.java
rc/com/android/camera/one/Settings3A.java
rc/com/android/camera/one/v2/AutoFocusHelper.java
rc/com/android/camera/one/v2/OneCameraImpl.java
rc/com/android/camera/one/v2/OneCameraZslImpl.java
rc/com/android/camera/ui/FocusOverlay.java
|
8621929edded7fab524bfc43a8c63b47a1967b97 |
29-Aug-2014 |
Puneet Lall <puneetl@google.com> |
am dc7e80f7: am aef43423: am 0767876e: am 68c25ac5: ZSL refactoring * commit 'dc7e80f7735360a7851503d5f895406bd59e9435': ZSL refactoring
|
267e500b1a0c872d2a7f378a044fc4b1f2e18622 |
29-Aug-2014 |
Puneet Lall <puneetl@google.com> |
am 0a799a46: am 8b672ff2: am 42b0b25e: am d308d001: Add missing copyright header in Open Source code. * commit '0a799a46ed5666ab4ecb8a008f3307107fb43d56': Add missing copyright header in Open Source code.
|
b0979bc4b123c577f66514fc2726edcb48ec4a45 |
29-Aug-2014 |
Puneet Lall <puneetl@google.com> |
am 69d20ef1: am e8126a13: am 53c98a3e: am 82d70ea0: Merge "[ZSL Cam] Fixed shutter button, compress on threadpool." into ub-camera-glacier * commit '69d20ef14a72bb29ce883ee11afcdc7d22010a02': [ZSL Cam] Fixed shutter button, compress on threadpool.
|
b1e1a281044a411a5e710f7faa26dbd813e337f9 |
29-Aug-2014 |
Spike Sprague <spikuru@google.com> |
am 61b52f32: am a86ca43f: am 70e387a7: am b8c3e31c: Merge "fix for a regression introduced in ag/534531" into ub-camera-glacier * commit '61b52f32f6621dd3faa21cb250b1a302b6b873f1': fix for a regression introduced in ag/534531
|
5935987606c3abb2f2b4215d773d6c73bc6f2795 |
29-Aug-2014 |
Alan Newberger <alann@google.com> |
am 73810ab7: am d6164f47: am 4deea574: am 475a1935: Merge "Increasing JPEG compression quality for filmstrip" into ub-camera-glacier * commit '73810ab7edb172bce0bc91a94b54f3afd53fa8aa': Increasing JPEG compression quality for filmstrip
|
dc7e80f7735360a7851503d5f895406bd59e9435 |
29-Aug-2014 |
Puneet Lall <puneetl@google.com> |
am aef43423: am 0767876e: am 68c25ac5: ZSL refactoring * commit 'aef434230582ce6788051b09875062914fc4b7d3': ZSL refactoring
|
0a799a46ed5666ab4ecb8a008f3307107fb43d56 |
29-Aug-2014 |
Puneet Lall <puneetl@google.com> |
am 8b672ff2: am 42b0b25e: am d308d001: Add missing copyright header in Open Source code. * commit '8b672ff2d9c5b37c3ea4c93baa4f7d88abf6622a': Add missing copyright header in Open Source code.
|
69d20ef14a72bb29ce883ee11afcdc7d22010a02 |
29-Aug-2014 |
Puneet Lall <puneetl@google.com> |
am e8126a13: am 53c98a3e: am 82d70ea0: Merge "[ZSL Cam] Fixed shutter button, compress on threadpool." into ub-camera-glacier * commit 'e8126a131bff5b5f094303956276c56ea6ff8cdf': [ZSL Cam] Fixed shutter button, compress on threadpool.
|
61b52f32f6621dd3faa21cb250b1a302b6b873f1 |
29-Aug-2014 |
Spike Sprague <spikuru@google.com> |
am a86ca43f: am 70e387a7: am b8c3e31c: Merge "fix for a regression introduced in ag/534531" into ub-camera-glacier * commit 'a86ca43f9b52d43dae603b56e241e303c6545896': fix for a regression introduced in ag/534531
|
73810ab7edb172bce0bc91a94b54f3afd53fa8aa |
29-Aug-2014 |
Alan Newberger <alann@google.com> |
am d6164f47: am 4deea574: am 475a1935: Merge "Increasing JPEG compression quality for filmstrip" into ub-camera-glacier * commit 'd6164f478629643719ba1e355a1b4cd145005f24': Increasing JPEG compression quality for filmstrip
|
aef434230582ce6788051b09875062914fc4b7d3 |
29-Aug-2014 |
Puneet Lall <puneetl@google.com> |
am 0767876e: am 68c25ac5: ZSL refactoring * commit '0767876e281e55fe9ea60a878e16f1ec05cda987': ZSL refactoring
|
8b672ff2d9c5b37c3ea4c93baa4f7d88abf6622a |
29-Aug-2014 |
Puneet Lall <puneetl@google.com> |
am 42b0b25e: am d308d001: Add missing copyright header in Open Source code. * commit '42b0b25e5fae0ec49362539c124492799226a430': Add missing copyright header in Open Source code.
|
e8126a131bff5b5f094303956276c56ea6ff8cdf |
29-Aug-2014 |
Puneet Lall <puneetl@google.com> |
am 53c98a3e: am 82d70ea0: Merge "[ZSL Cam] Fixed shutter button, compress on threadpool." into ub-camera-glacier * commit '53c98a3e6b0320614aeb4cbcd4ec1a194b1e3e07': [ZSL Cam] Fixed shutter button, compress on threadpool.
|
a86ca43f9b52d43dae603b56e241e303c6545896 |
29-Aug-2014 |
Spike Sprague <spikuru@google.com> |
am 70e387a7: am b8c3e31c: Merge "fix for a regression introduced in ag/534531" into ub-camera-glacier * commit '70e387a78aa95817280d1c9c74bf866bbbaa1ce6': fix for a regression introduced in ag/534531
|
d6164f478629643719ba1e355a1b4cd145005f24 |
29-Aug-2014 |
Alan Newberger <alann@google.com> |
am 4deea574: am 475a1935: Merge "Increasing JPEG compression quality for filmstrip" into ub-camera-glacier * commit '4deea5747493574b6707eff85a350815576ac367': Increasing JPEG compression quality for filmstrip
|
0767876e281e55fe9ea60a878e16f1ec05cda987 |
29-Aug-2014 |
Puneet Lall <puneetl@google.com> |
am 68c25ac5: ZSL refactoring * commit '68c25ac5373126670cb6c2324e40537bb47e72d9': ZSL refactoring
|
7bc74efd65f9bd8a628dd300735b9a7c4c9e60ce |
29-Aug-2014 |
Puneet Lall <puneetl@google.com> |
am 68c25ac5: ZSL refactoring * commit '68c25ac5373126670cb6c2324e40537bb47e72d9': ZSL refactoring
|
68c25ac5373126670cb6c2324e40537bb47e72d9 |
29-Aug-2014 |
Puneet Lall <puneetl@google.com> |
ZSL refactoring Bug: 16961251 Change-Id: I19642f5de088135db6650df98a62dd8dd462e0da
rc/com/android/camera/one/v2/OneCameraZslImpl.java
rc/com/android/camera/util/ConjunctionListenerMux.java
|
42b0b25e5fae0ec49362539c124492799226a430 |
29-Aug-2014 |
Puneet Lall <puneetl@google.com> |
am d308d001: Add missing copyright header in Open Source code. * commit 'd308d001e876b7036fba2727b18b6b9d652ecffb': Add missing copyright header in Open Source code.
|
53c98a3e6b0320614aeb4cbcd4ec1a194b1e3e07 |
29-Aug-2014 |
Puneet Lall <puneetl@google.com> |
am 82d70ea0: Merge "[ZSL Cam] Fixed shutter button, compress on threadpool." into ub-camera-glacier * commit '82d70ea06c58df44cfefdc4e1a34644f8f817a23': [ZSL Cam] Fixed shutter button, compress on threadpool.
|
70e387a78aa95817280d1c9c74bf866bbbaa1ce6 |
29-Aug-2014 |
Spike Sprague <spikuru@google.com> |
am b8c3e31c: Merge "fix for a regression introduced in ag/534531" into ub-camera-glacier * commit 'b8c3e31c32601095488a09c457a5cb154599c6a7': fix for a regression introduced in ag/534531
|
4deea5747493574b6707eff85a350815576ac367 |
29-Aug-2014 |
Alan Newberger <alann@google.com> |
am 475a1935: Merge "Increasing JPEG compression quality for filmstrip" into ub-camera-glacier * commit '475a1935894830d3006c29d1155b5d98b62cc006': Increasing JPEG compression quality for filmstrip
|
9cd04236ffdc2ef3d03f3bd6a8ac9adf636bbbe0 |
29-Aug-2014 |
Puneet Lall <puneetl@google.com> |
am d308d001: Add missing copyright header in Open Source code. * commit 'd308d001e876b7036fba2727b18b6b9d652ecffb': Add missing copyright header in Open Source code.
|
e65cb334be7f8e4e90a401978879855e25f7d2ce |
29-Aug-2014 |
Puneet Lall <puneetl@google.com> |
am 82d70ea0: Merge "[ZSL Cam] Fixed shutter button, compress on threadpool." into ub-camera-glacier * commit '82d70ea06c58df44cfefdc4e1a34644f8f817a23': [ZSL Cam] Fixed shutter button, compress on threadpool.
|
d7ccf67f9f349ce0d40e461713f13629ef2dcb92 |
29-Aug-2014 |
Spike Sprague <spikuru@google.com> |
am b8c3e31c: Merge "fix for a regression introduced in ag/534531" into ub-camera-glacier * commit 'b8c3e31c32601095488a09c457a5cb154599c6a7': fix for a regression introduced in ag/534531
|
d7fdc639b5ec8530fd7de58e66dcf059c24d1753 |
29-Aug-2014 |
Alan Newberger <alann@google.com> |
am 475a1935: Merge "Increasing JPEG compression quality for filmstrip" into ub-camera-glacier * commit '475a1935894830d3006c29d1155b5d98b62cc006': Increasing JPEG compression quality for filmstrip
|
d308d001e876b7036fba2727b18b6b9d652ecffb |
29-Aug-2014 |
Puneet Lall <puneetl@google.com> |
Add missing copyright header in Open Source code. Change-Id: I07703e0f55544204645396423ced09f957214d73
rc/com/android/camera/util/ConjunctionListenerMux.java
|
82d70ea06c58df44cfefdc4e1a34644f8f817a23 |
29-Aug-2014 |
Puneet Lall <puneetl@google.com> |
Merge "[ZSL Cam] Fixed shutter button, compress on threadpool." into ub-camera-glacier
|
b8c3e31c32601095488a09c457a5cb154599c6a7 |
29-Aug-2014 |
Spike Sprague <spikuru@google.com> |
Merge "fix for a regression introduced in ag/534531" into ub-camera-glacier
|
af984b23a3140a16e5b0433dbb9693a076cfcf04 |
29-Aug-2014 |
Spike Sprague <spikuru@google.com> |
fix for a regression introduced in ag/534531 that CL kept the swipe-away-from-filmstip preview background from alpha-animating correctly. this CL fixes that and provides an alternate solution to bug 17301367 Change-Id: I04ba363a55dd9485d13e2d243fd1fb84df1d31e5
rc/com/android/camera/app/FilmstripBottomPanel.java
rc/com/android/camera/widget/FilmstripLayout.java
|
182ba6f13e9dab9a9c0341efe4c907ff7853352d |
29-Aug-2014 |
Puneet Lall <puneetl@google.com> |
[ZSL Cam] Fixed shutter button, compress on threadpool. Change-Id: I4c2167163ee35ba841f459ae76779f44647bcb28
rc/com/android/camera/one/v2/ImageCaptureManager.java
rc/com/android/camera/one/v2/OneCameraZslImpl.java
rc/com/android/camera/util/ConjunctionListenerMux.java
|
475a1935894830d3006c29d1155b5d98b62cc006 |
29-Aug-2014 |
Alan Newberger <alann@google.com> |
Merge "Increasing JPEG compression quality for filmstrip" into ub-camera-glacier
|
af79e4288559ddbee4ba6ed3cb3d1d9657fc23ea |
29-Aug-2014 |
Alan Newberger <alann@google.com> |
Increasing JPEG compression quality for filmstrip This CL increases JPEG quality for generated cache images in the filmstrip. This reduces overall artifacts for thumbnails. Bug: 17320690 Change-Id: If2d0483502c0d8d18755b42dff5ffe9fd74e540f
rc/com/android/camera/data/LocalMediaData.java
|
27ec33c2c3e70ba7a384f183dcb0acae02fd7553 |
29-Aug-2014 |
Puneet Lall <puneetl@google.com> |
am fa5a79d4: am 03ac1a09: am 97421aec: am 3724805a: Merge "Zsl flash, auto focus, and other minor fixes" into ub-camera-glacier * commit 'fa5a79d475fe3f4e5c3782e68e282c6e2c776561': Zsl flash, auto focus, and other minor fixes
|
fa5a79d475fe3f4e5c3782e68e282c6e2c776561 |
29-Aug-2014 |
Puneet Lall <puneetl@google.com> |
am 03ac1a09: am 97421aec: am 3724805a: Merge "Zsl flash, auto focus, and other minor fixes" into ub-camera-glacier * commit '03ac1a09c2b6436dd9bf62e68ee5f88120d93e0e': Zsl flash, auto focus, and other minor fixes
|
03ac1a09c2b6436dd9bf62e68ee5f88120d93e0e |
29-Aug-2014 |
Puneet Lall <puneetl@google.com> |
am 97421aec: am 3724805a: Merge "Zsl flash, auto focus, and other minor fixes" into ub-camera-glacier * commit '97421aecbefbd073442eff7028fe60f844fcc864': Zsl flash, auto focus, and other minor fixes
|
a7f9c7a40a45e661a26235c0a8ca6cc74c7a1b0a |
29-Aug-2014 |
Puneet Lall <puneetl@google.com> |
am 3724805a: Merge "Zsl flash, auto focus, and other minor fixes" into ub-camera-glacier * commit '3724805a043ac149b7bc103bb94787133c7e06a5': Zsl flash, auto focus, and other minor fixes
|
97421aecbefbd073442eff7028fe60f844fcc864 |
29-Aug-2014 |
Puneet Lall <puneetl@google.com> |
am 3724805a: Merge "Zsl flash, auto focus, and other minor fixes" into ub-camera-glacier * commit '3724805a043ac149b7bc103bb94787133c7e06a5': Zsl flash, auto focus, and other minor fixes
|
3724805a043ac149b7bc103bb94787133c7e06a5 |
29-Aug-2014 |
Puneet Lall <puneetl@google.com> |
Merge "Zsl flash, auto focus, and other minor fixes" into ub-camera-glacier
|
580f451fc85cc752e71eb730006b90d09aaafb55 |
28-Aug-2014 |
Puneet Lall <puneetl@google.com> |
Zsl flash, auto focus, and other minor fixes Bug: 17216526 Bug: 17221258 Change-Id: I5129c57674874d3a29789e0c9029eadeaa138788
rc/com/android/camera/CaptureModule.java
rc/com/android/camera/one/v2/ImageCaptureManager.java
rc/com/android/camera/one/v2/OneCameraZslImpl.java
|
8768fb1c4421c33bd1c91a05e300a7ec34e1ecf4 |
28-Aug-2014 |
Alan Newberger <alann@google.com> |
am cf537425: am 6655ec9f: am 1c390f77: am 965db3e8: Merge "Actually remove settings" into ub-camera-glacier * commit 'cf537425140fa54332e16fefa95ddbffe80fa348': Actually remove settings
|
cf537425140fa54332e16fefa95ddbffe80fa348 |
28-Aug-2014 |
Alan Newberger <alann@google.com> |
am 6655ec9f: am 1c390f77: am 965db3e8: Merge "Actually remove settings" into ub-camera-glacier * commit '6655ec9f012269050c65af771ab190a056d2589d': Actually remove settings
|
6655ec9f012269050c65af771ab190a056d2589d |
28-Aug-2014 |
Alan Newberger <alann@google.com> |
am 1c390f77: am 965db3e8: Merge "Actually remove settings" into ub-camera-glacier * commit '1c390f772c03e6eb748407f8c812c7eac8119e03': Actually remove settings
|
1c390f772c03e6eb748407f8c812c7eac8119e03 |
28-Aug-2014 |
Alan Newberger <alann@google.com> |
am 965db3e8: Merge "Actually remove settings" into ub-camera-glacier * commit '965db3e8ca1416e418990344486b1008d1ebc8dd': Actually remove settings
|
acf313fc2586c3ff7c19ba9cd8bb514ccb8873e1 |
28-Aug-2014 |
Alan Newberger <alann@google.com> |
am 965db3e8: Merge "Actually remove settings" into ub-camera-glacier * commit '965db3e8ca1416e418990344486b1008d1ebc8dd': Actually remove settings
|
965db3e8ca1416e418990344486b1008d1ebc8dd |
28-Aug-2014 |
Alan Newberger <alann@google.com> |
Merge "Actually remove settings" into ub-camera-glacier
|
508f2f6a33a0c457d4b009fb85e871c6e64b97e4 |
28-Aug-2014 |
Andy Huibers <andyhuibers@google.com> |
am 083b4c4e: am 15648c2a: am 640a8648: am 076efc03: Do not show AF UI prior to snapping a picture (for state STATE_FOCUSING_SNAP_ON_FINISH). * commit '083b4c4e0d791149bfaa4703a12869d36229df87': Do not show AF UI prior to snapping a picture (for state STATE_FOCUSING_SNAP_ON_FINISH).
|
b0c36b235198d6d9a38bf13f39aa25359aac9b1a |
28-Aug-2014 |
Alan Newberger <alann@google.com> |
Actually remove settings Correct settings removal, which wasn't occurring during upgrades. Will followup with scrub of preference file references -- there are likely additional reasons this wasn't causing more crashes, i.e. certain settings not being ported over earlier versions. Bug: 16879376 Change-Id: I720a3181958a4201508726d0f6e06803c456f737
rc/com/android/camera/settings/SettingsManager.java
rc/com/android/camera/settings/SettingsUpgrader.java
|
083b4c4e0d791149bfaa4703a12869d36229df87 |
28-Aug-2014 |
Andy Huibers <andyhuibers@google.com> |
am 15648c2a: am 640a8648: am 076efc03: Do not show AF UI prior to snapping a picture (for state STATE_FOCUSING_SNAP_ON_FINISH). * commit '15648c2afc0119da1b1ee301053473742c665fa8': Do not show AF UI prior to snapping a picture (for state STATE_FOCUSING_SNAP_ON_FINISH).
|
15648c2afc0119da1b1ee301053473742c665fa8 |
28-Aug-2014 |
Andy Huibers <andyhuibers@google.com> |
am 640a8648: am 076efc03: Do not show AF UI prior to snapping a picture (for state STATE_FOCUSING_SNAP_ON_FINISH). * commit '640a86481390c705576a9cd92f988d02dd4b7ab8': Do not show AF UI prior to snapping a picture (for state STATE_FOCUSING_SNAP_ON_FINISH).
|
6366cd8f947154688e1814122e5d27fe34ed29aa |
28-Aug-2014 |
Andy Huibers <andyhuibers@google.com> |
am 076efc03: Do not show AF UI prior to snapping a picture (for state STATE_FOCUSING_SNAP_ON_FINISH). * commit '076efc0354552ee3b0845ae3b5988e755f92d5b0': Do not show AF UI prior to snapping a picture (for state STATE_FOCUSING_SNAP_ON_FINISH).
|
640a86481390c705576a9cd92f988d02dd4b7ab8 |
28-Aug-2014 |
Andy Huibers <andyhuibers@google.com> |
am 076efc03: Do not show AF UI prior to snapping a picture (for state STATE_FOCUSING_SNAP_ON_FINISH). * commit '076efc0354552ee3b0845ae3b5988e755f92d5b0': Do not show AF UI prior to snapping a picture (for state STATE_FOCUSING_SNAP_ON_FINISH).
|
076efc0354552ee3b0845ae3b5988e755f92d5b0 |
28-Aug-2014 |
Andy Huibers <andyhuibers@google.com> |
Do not show AF UI prior to snapping a picture (for state STATE_FOCUSING_SNAP_ON_FINISH). Bug: 17312087 Change-Id: Ib706e35af5b1f49021efdd45b1e010e24dfbc333
rc/com/android/camera/FocusOverlayManager.java
|
edf4b135b5f1af2730942400b217c16cb4f6a51f |
28-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
am b5965cdc: am 3ed8f628: am 10438ec0: am 2d4be257: Add simple sound player to be used in Camera implementations. * commit 'b5965cdc4a283fe3e60ef903bf92366dca180442': Add simple sound player to be used in Camera implementations.
|
b5965cdc4a283fe3e60ef903bf92366dca180442 |
28-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
am 3ed8f628: am 10438ec0: am 2d4be257: Add simple sound player to be used in Camera implementations. * commit '3ed8f62847b65a36e85ab1cdbd1358f02a71bf27': Add simple sound player to be used in Camera implementations.
|
3ed8f62847b65a36e85ab1cdbd1358f02a71bf27 |
28-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
am 10438ec0: am 2d4be257: Add simple sound player to be used in Camera implementations. * commit '10438ec0d2e7b1986e473273c7daf09c27861561': Add simple sound player to be used in Camera implementations.
|
10438ec0d2e7b1986e473273c7daf09c27861561 |
28-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
am 2d4be257: Add simple sound player to be used in Camera implementations. * commit '2d4be2576b265a4abfbabbda20862fcea19c1395': Add simple sound player to be used in Camera implementations.
|
09abe98d56a46d016903f0671e94ca6cc966ed54 |
28-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
am 2d4be257: Add simple sound player to be used in Camera implementations. * commit '2d4be2576b265a4abfbabbda20862fcea19c1395': Add simple sound player to be used in Camera implementations.
|
2d4be2576b265a4abfbabbda20862fcea19c1395 |
28-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
Add simple sound player to be used in Camera implementations. Bug: 17205355 Change-Id: I04c4bf1a692c7a4555eafea794737e41a8fc342c
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/CaptureModule.java
rc/com/android/camera/SoundPlayer.java
rc/com/android/camera/app/AppController.java
rc/com/android/camera/one/OneCameraManager.java
rc/com/android/camera/one/v2/OneCameraManagerImpl.java
rc_pd/com/android/camera/one/v2/OneCameraCreator.java
|
1667c543649ca0b9c2479d3f5017e8ee06d35f73 |
28-Aug-2014 |
Alan Newberger <alann@google.com> |
am 0a75eff3: am 06d0ab5d: am 21bd2937: am 352de757: Merge "Remove FeedbackHelper" into ub-camera-glacier * commit '0a75eff37b7c9aeb03d8b66b50e41db2daebe491': Remove FeedbackHelper
|
83113915145c708ad995c7147accf2dadf13be1a |
28-Aug-2014 |
Sam Hasinoff <hasinoff@google.com> |
am e6bd6277: am 5cac58bd: am 0cfde67e: am 4f0d6384: gcam: Restore naming of Gcam debug folders. * commit 'e6bd62773151625260ae22ddc7cb11f2343c7567': gcam: Restore naming of Gcam debug folders.
|
dd5f125e5018685e2d17bcfc60e08b1f31edf6bb |
28-Aug-2014 |
Puneet Lall <puneetl@google.com> |
am 2e083c1b: am 0e724685: am 30a17805: am 2b3cf868: Merge "Add setprop to enable ZSL." into ub-camera-glacier * commit '2e083c1b482ec5995ce783007cffbb32eb0cfe05': Add setprop to enable ZSL.
|
0a75eff37b7c9aeb03d8b66b50e41db2daebe491 |
28-Aug-2014 |
Alan Newberger <alann@google.com> |
am 06d0ab5d: am 21bd2937: am 352de757: Merge "Remove FeedbackHelper" into ub-camera-glacier * commit '06d0ab5d3af79eeb14081228fdbd37f924c5bb0a': Remove FeedbackHelper
|
e6bd62773151625260ae22ddc7cb11f2343c7567 |
28-Aug-2014 |
Sam Hasinoff <hasinoff@google.com> |
am 5cac58bd: am 0cfde67e: am 4f0d6384: gcam: Restore naming of Gcam debug folders. * commit '5cac58bd94fb0ce59cf8a539d7c95ef8304fdc41': gcam: Restore naming of Gcam debug folders.
|
06d0ab5d3af79eeb14081228fdbd37f924c5bb0a |
28-Aug-2014 |
Alan Newberger <alann@google.com> |
am 21bd2937: am 352de757: Merge "Remove FeedbackHelper" into ub-camera-glacier * commit '21bd2937e08f72b73ed187e7667e2d3f4bd6880c': Remove FeedbackHelper
|
5cac58bd94fb0ce59cf8a539d7c95ef8304fdc41 |
28-Aug-2014 |
Sam Hasinoff <hasinoff@google.com> |
am 0cfde67e: am 4f0d6384: gcam: Restore naming of Gcam debug folders. * commit '0cfde67e18be1ed497987b53953b013b17a23b4c': gcam: Restore naming of Gcam debug folders.
|
2e083c1b482ec5995ce783007cffbb32eb0cfe05 |
28-Aug-2014 |
Puneet Lall <puneetl@google.com> |
am 0e724685: am 30a17805: am 2b3cf868: Merge "Add setprop to enable ZSL." into ub-camera-glacier * commit '0e724685729d36d834fdd588651d7f29bb29192f': Add setprop to enable ZSL.
|
23a5ac091ad6754f4c4d091a359f1c8a3b4fc48b |
28-Aug-2014 |
Alan Newberger <alann@google.com> |
am 352de757: Merge "Remove FeedbackHelper" into ub-camera-glacier * commit '352de757246fa28c6fdfa5d0d3e51659e23f8183': Remove FeedbackHelper
|
233f8deeb002069adb9e4182335323141d920940 |
28-Aug-2014 |
Sam Hasinoff <hasinoff@google.com> |
am 4f0d6384: gcam: Restore naming of Gcam debug folders. * commit '4f0d63848684cb7cbcde42b0bd714bb6d6f998f5': gcam: Restore naming of Gcam debug folders.
|
21bd2937e08f72b73ed187e7667e2d3f4bd6880c |
28-Aug-2014 |
Alan Newberger <alann@google.com> |
am 352de757: Merge "Remove FeedbackHelper" into ub-camera-glacier * commit '352de757246fa28c6fdfa5d0d3e51659e23f8183': Remove FeedbackHelper
|
0cfde67e18be1ed497987b53953b013b17a23b4c |
28-Aug-2014 |
Sam Hasinoff <hasinoff@google.com> |
am 4f0d6384: gcam: Restore naming of Gcam debug folders. * commit '4f0d63848684cb7cbcde42b0bd714bb6d6f998f5': gcam: Restore naming of Gcam debug folders.
|
352de757246fa28c6fdfa5d0d3e51659e23f8183 |
28-Aug-2014 |
Alan Newberger <alann@google.com> |
Merge "Remove FeedbackHelper" into ub-camera-glacier
|
4f0d63848684cb7cbcde42b0bd714bb6d6f998f5 |
27-Aug-2014 |
Sam Hasinoff <hasinoff@google.com> |
gcam: Restore naming of Gcam debug folders. When Gcam debugging is on, write output to per-burst folders named SSSS_YYYYMMDD_HHMMSS_XXX, where 'SSSS' is the last 4 digits of the device serial number and 'XXX' are the milliseconds of the timestamp. Bug: 17204023 Change-Id: Ie1d58dc3ecb5d9dc7389d24acc4937498f00dbc9
rc/com/android/camera/one/AbstractOneCamera.java
|
0e724685729d36d834fdd588651d7f29bb29192f |
28-Aug-2014 |
Puneet Lall <puneetl@google.com> |
am 30a17805: am 2b3cf868: Merge "Add setprop to enable ZSL." into ub-camera-glacier * commit '30a17805fbc3226eb02fd074658e2df723d34a22': Add setprop to enable ZSL.
|
3c3398db2d9d67ce61c88f1887dbe7dfcd8c47a6 |
28-Aug-2014 |
Alan Newberger <alann@google.com> |
Remove FeedbackHelper ag/393130 has comments pointing out that startFeedback has a leak. We don't use it anymore after Help library integration, so just remove it. Bug: 17302992 Change-Id: I519a2b0eb7a0ce06d6fcdcbfa2c851837e9a6579
rc/com/android/camera/CameraActivity.java
rc_pd/com/android/camera/util/FeedbackHelper.java
|
30a17805fbc3226eb02fd074658e2df723d34a22 |
28-Aug-2014 |
Puneet Lall <puneetl@google.com> |
am 2b3cf868: Merge "Add setprop to enable ZSL." into ub-camera-glacier * commit '2b3cf8689d68444dcf8f56a85d8525533d9d96aa': Add setprop to enable ZSL.
|
83fff453d7b37f7eaa778e71dd7728c8f588587d |
28-Aug-2014 |
Puneet Lall <puneetl@google.com> |
am 2b3cf868: Merge "Add setprop to enable ZSL." into ub-camera-glacier * commit '2b3cf8689d68444dcf8f56a85d8525533d9d96aa': Add setprop to enable ZSL.
|
2b3cf8689d68444dcf8f56a85d8525533d9d96aa |
28-Aug-2014 |
Puneet Lall <puneetl@google.com> |
Merge "Add setprop to enable ZSL." into ub-camera-glacier
|
4bf50982def4dd3c9a39b241ae20397267909f2d |
28-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
am 6bc470b3: am 98f99f70: am ba12c58f: am 969d606a: Merge "Make sure CaptureModule (and therefore Gcam) always resumes right." into ub-camera-glacier * commit '6bc470b3f114973b0ded4c8fe245f5373f2afbce': Make sure CaptureModule (and therefore Gcam) always resumes right.
|
e4ebe00f16c1ab61c8aed3ed75283d34fce9186a |
27-Aug-2014 |
Puneet Lall <puneetl@google.com> |
Add setprop to enable ZSL. Bug: 16961251 Change-Id: I997a47345f7c277abb43f2533fa5226e0c6a3e06
rc/com/android/camera/debug/DebugPropertyHelper.java
|
6bc470b3f114973b0ded4c8fe245f5373f2afbce |
27-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
am 98f99f70: am ba12c58f: am 969d606a: Merge "Make sure CaptureModule (and therefore Gcam) always resumes right." into ub-camera-glacier * commit '98f99f707027e8d226a7bdc6cea9ad8009da2b7e': Make sure CaptureModule (and therefore Gcam) always resumes right.
|
2134bbc27da5d6919aae8f909000f126e96cdb81 |
27-Aug-2014 |
Spike Sprague <spikuru@google.com> |
am 5eb589bc: am 8bd18378: am e77ca66d: am 480e58b1: Merge "fix for a doublebounce of the filmstip button on filmstip swipe out" into ub-camera-glacier * commit '5eb589bc4a53fb9a8c650ff619d4dddbfaaa69be': fix for a doublebounce of the filmstip button on filmstip swipe out
|
92457c8c08c3a02953c6ef878010fe1949f8382a |
27-Aug-2014 |
Puneet Lall <puneetl@google.com> |
am 6ebe1a3a: am ad505043: am ae182077: am c5b75258: Merge "Initial ZSL implementation" into ub-camera-glacier * commit '6ebe1a3a1ab2ed9c959dd4e17e9a0e31bb3961ac': Initial ZSL implementation
|
98f99f707027e8d226a7bdc6cea9ad8009da2b7e |
27-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
am ba12c58f: am 969d606a: Merge "Make sure CaptureModule (and therefore Gcam) always resumes right." into ub-camera-glacier * commit 'ba12c58f5cbe9a4698441e11c23bee5ae9d48e92': Make sure CaptureModule (and therefore Gcam) always resumes right.
|
ba12c58f5cbe9a4698441e11c23bee5ae9d48e92 |
27-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
am 969d606a: Merge "Make sure CaptureModule (and therefore Gcam) always resumes right." into ub-camera-glacier * commit '969d606acb2b2f6e755f9164348712306dc7b557': Make sure CaptureModule (and therefore Gcam) always resumes right.
|
8daec257bfe3575d008189df0a945a1ba2238cfa |
27-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
am 969d606a: Merge "Make sure CaptureModule (and therefore Gcam) always resumes right." into ub-camera-glacier * commit '969d606acb2b2f6e755f9164348712306dc7b557': Make sure CaptureModule (and therefore Gcam) always resumes right.
|
5eb589bc4a53fb9a8c650ff619d4dddbfaaa69be |
27-Aug-2014 |
Spike Sprague <spikuru@google.com> |
am 8bd18378: am e77ca66d: am 480e58b1: Merge "fix for a doublebounce of the filmstip button on filmstip swipe out" into ub-camera-glacier * commit '8bd183781acd048020cab0c5f81a073f68228673': fix for a doublebounce of the filmstip button on filmstip swipe out
|
6ebe1a3a1ab2ed9c959dd4e17e9a0e31bb3961ac |
27-Aug-2014 |
Puneet Lall <puneetl@google.com> |
am ad505043: am ae182077: am c5b75258: Merge "Initial ZSL implementation" into ub-camera-glacier * commit 'ad5050431d9692a41992e881fb80e0fe903479fc': Initial ZSL implementation
|
969d606acb2b2f6e755f9164348712306dc7b557 |
27-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Make sure CaptureModule (and therefore Gcam) always resumes right." into ub-camera-glacier
|
8bd183781acd048020cab0c5f81a073f68228673 |
27-Aug-2014 |
Spike Sprague <spikuru@google.com> |
am e77ca66d: am 480e58b1: Merge "fix for a doublebounce of the filmstip button on filmstip swipe out" into ub-camera-glacier * commit 'e77ca66d96c692d1d0b4560226a1a25a7c1fcce5': fix for a doublebounce of the filmstip button on filmstip swipe out
|
e77ca66d96c692d1d0b4560226a1a25a7c1fcce5 |
27-Aug-2014 |
Spike Sprague <spikuru@google.com> |
am 480e58b1: Merge "fix for a doublebounce of the filmstip button on filmstip swipe out" into ub-camera-glacier * commit '480e58b1020f853f6c71d2c3469b342d27084752': fix for a doublebounce of the filmstip button on filmstip swipe out
|
e9e8eedb57e9b2f96bbf92f040d7d398cbfe49d9 |
27-Aug-2014 |
Spike Sprague <spikuru@google.com> |
am 480e58b1: Merge "fix for a doublebounce of the filmstip button on filmstip swipe out" into ub-camera-glacier * commit '480e58b1020f853f6c71d2c3469b342d27084752': fix for a doublebounce of the filmstip button on filmstip swipe out
|
480e58b1020f853f6c71d2c3469b342d27084752 |
27-Aug-2014 |
Spike Sprague <spikuru@google.com> |
Merge "fix for a doublebounce of the filmstip button on filmstip swipe out" into ub-camera-glacier
|
f60d1335550bc6d34267b5039ccb6e907df0dadd |
27-Aug-2014 |
Spike Sprague <spikuru@google.com> |
fix for a doublebounce of the filmstip button on filmstip swipe out bug: 17301367 Change-Id: I305618ee5012de229c9cc1fd73f0b6506d701477
rc/com/android/camera/widget/FilmstripLayout.java
|
ad5050431d9692a41992e881fb80e0fe903479fc |
27-Aug-2014 |
Puneet Lall <puneetl@google.com> |
am ae182077: am c5b75258: Merge "Initial ZSL implementation" into ub-camera-glacier * commit 'ae182077951354bb2da0e2338a0ee777e2d004e1': Initial ZSL implementation
|
ae182077951354bb2da0e2338a0ee777e2d004e1 |
27-Aug-2014 |
Puneet Lall <puneetl@google.com> |
am c5b75258: Merge "Initial ZSL implementation" into ub-camera-glacier * commit 'c5b752589e2721c72f8b8f879838f94d816bf1f8': Initial ZSL implementation
|
8ace9601bb23ff67b33b74e039fd70fbfde4e4cc |
27-Aug-2014 |
Puneet Lall <puneetl@google.com> |
am c5b75258: Merge "Initial ZSL implementation" into ub-camera-glacier * commit 'c5b752589e2721c72f8b8f879838f94d816bf1f8': Initial ZSL implementation
|
c5b752589e2721c72f8b8f879838f94d816bf1f8 |
27-Aug-2014 |
Puneet Lall <puneetl@google.com> |
Merge "Initial ZSL implementation" into ub-camera-glacier
|
307c334002d4972b4a4a1d2b1303c1bdf9ed4e2d |
27-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
Make sure CaptureModule (and therefore Gcam) always resumes right. Bug: 17258531 Change-Id: I8a72fcd8f34eb95676ca939c2aff87fcac105e75
rc/com/android/camera/CaptureModule.java
|
512001df0211fa8999593717a0f186457a5a9cef |
14-Aug-2014 |
Puneet Lall <puneetl@google.com> |
Initial ZSL implementation Bug: 16961251 Change-Id: I03c7c1813f99d460495472addc7f733e1bfa6a97
rc/com/android/camera/one/v2/ImageCaptureManager.java
rc/com/android/camera/one/v2/OneCameraZslImpl.java
rc/com/android/camera/util/ConcurrentSharedRingBuffer.java
rc/com/android/camera/util/Task.java
|
2237e1a5de03b49b2bea168081f153ab7b5ff1fa |
27-Aug-2014 |
Spike Sprague <spikuru@google.com> |
am c6678674: am 0838d693: am 18422419: am a98b4b10: Merge "boatload of new assets" into ub-camera-glacier * commit 'c667867443a7d8591320d2d4e5f9fc8c07b962b8': boatload of new assets
|
c667867443a7d8591320d2d4e5f9fc8c07b962b8 |
27-Aug-2014 |
Spike Sprague <spikuru@google.com> |
am 0838d693: am 18422419: am a98b4b10: Merge "boatload of new assets" into ub-camera-glacier * commit '0838d69344926eac4684a2722e367f4724d5eea3': boatload of new assets
|
0838d69344926eac4684a2722e367f4724d5eea3 |
27-Aug-2014 |
Spike Sprague <spikuru@google.com> |
am 18422419: am a98b4b10: Merge "boatload of new assets" into ub-camera-glacier * commit '184224196f846533c764ce490301bb3cca519a4a': boatload of new assets
|
184224196f846533c764ce490301bb3cca519a4a |
27-Aug-2014 |
Spike Sprague <spikuru@google.com> |
am a98b4b10: Merge "boatload of new assets" into ub-camera-glacier * commit 'a98b4b10a1ce7a6ce6499f364ae33cebbb94d023': boatload of new assets
|
16231abbf182ffb21234c3097bfcf0959ae92c23 |
27-Aug-2014 |
Spike Sprague <spikuru@google.com> |
am a98b4b10: Merge "boatload of new assets" into ub-camera-glacier * commit 'a98b4b10a1ce7a6ce6499f364ae33cebbb94d023': boatload of new assets
|
a98b4b10a1ce7a6ce6499f364ae33cebbb94d023 |
27-Aug-2014 |
Spike Sprague <spikuru@google.com> |
Merge "boatload of new assets" into ub-camera-glacier
|
150c594dbc1062fcb771898c403f75de38eb82a4 |
27-Aug-2014 |
Baligh Uddin <baligh@google.com> |
am 45d74583: (-s ours) am fe8c2f29: (-s ours) am b95bfd1b: (-s ours) am 0043d830: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-glacier * commit '45d745836eee965688236ba78f67a5bd6b7e6014': Import translations. DO NOT MERGE
|
45d745836eee965688236ba78f67a5bd6b7e6014 |
27-Aug-2014 |
Baligh Uddin <baligh@google.com> |
am fe8c2f29: (-s ours) am b95bfd1b: (-s ours) am 0043d830: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-glacier * commit 'fe8c2f29aa855f0738e346ca6f7bda6088d9af44': Import translations. DO NOT MERGE
|
fe8c2f29aa855f0738e346ca6f7bda6088d9af44 |
27-Aug-2014 |
Baligh Uddin <baligh@google.com> |
am b95bfd1b: (-s ours) am 0043d830: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-glacier * commit 'b95bfd1b641db6de55aa10e2e5173261f151c567': Import translations. DO NOT MERGE
|
b95bfd1b641db6de55aa10e2e5173261f151c567 |
27-Aug-2014 |
Baligh Uddin <baligh@google.com> |
am 0043d830: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-glacier * commit '0043d830c7ae38ae938302c8ef1c862ba87eca90': Import translations. DO NOT MERGE
|
c08f4834667dd3c659a5af318bde446dbc8f234d |
27-Aug-2014 |
Baligh Uddin <baligh@google.com> |
am 0043d830: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-glacier * commit '0043d830c7ae38ae938302c8ef1c862ba87eca90': Import translations. DO NOT MERGE
|
84dfe6512889d7aafa14f5004e306887789f9932 |
27-Aug-2014 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE"
|
0043d830c7ae38ae938302c8ef1c862ba87eca90 |
27-Aug-2014 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into ub-camera-glacier
|
bad708419f275e87aea1ab4f9d90f31c2f3bed3f |
27-Aug-2014 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into ub-camera-haleakala
|
a0a991a856c6f5e9f74c9bc041717ae070cc19b8 |
27-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
am 3cdfe078: am 173a5f63: am e25590a9: am 95817308: Enable location and heading to be stored in picture EXIF. * commit '3cdfe0780cc6e10ff40be808963fb28bbd007ff4': Enable location and heading to be stored in picture EXIF.
|
9fa780ad36ab09294c2f5d57c431027213d8e2dd |
27-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
am c0434e8a: am b8b145c5: am a35ba87b: am 779414e8: Show a message to indicate that Gcam is not yet ready for quality feedback on Shamu. * commit 'c0434e8ad7d00adfd5a2ca1625ccbcddf1102fa9': Show a message to indicate that Gcam is not yet ready for quality feedback on Shamu.
|
3cdfe0780cc6e10ff40be808963fb28bbd007ff4 |
27-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
am 173a5f63: am e25590a9: am 95817308: Enable location and heading to be stored in picture EXIF. * commit '173a5f63962bc4ed0ce5929c6dea2dd7d50b19c6': Enable location and heading to be stored in picture EXIF.
|
173a5f63962bc4ed0ce5929c6dea2dd7d50b19c6 |
27-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
am e25590a9: am 95817308: Enable location and heading to be stored in picture EXIF. * commit 'e25590a998c05297fb151bdf089a292b5d0b59f0': Enable location and heading to be stored in picture EXIF.
|
e25590a998c05297fb151bdf089a292b5d0b59f0 |
27-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
am 95817308: Enable location and heading to be stored in picture EXIF. * commit '95817308fddad554c73cbe4539cb868dd4722ff9': Enable location and heading to be stored in picture EXIF.
|
e3935d713db003eb1dbb9535b03565055954bdda |
27-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
am 95817308: Enable location and heading to be stored in picture EXIF. * commit '95817308fddad554c73cbe4539cb868dd4722ff9': Enable location and heading to be stored in picture EXIF.
|
95817308fddad554c73cbe4539cb868dd4722ff9 |
27-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
Enable location and heading to be stored in picture EXIF. Bug: 17202845 Change-Id: Ic789c9a2d6078b35a09308d1b631166529f3f1bd
rc/com/android/camera/CaptureModule.java
rc/com/android/camera/one/OneCamera.java
|
c0434e8ad7d00adfd5a2ca1625ccbcddf1102fa9 |
27-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
am b8b145c5: am a35ba87b: am 779414e8: Show a message to indicate that Gcam is not yet ready for quality feedback on Shamu. * commit 'b8b145c5c50478db9953e2d9e1e3ab13d2549a4c': Show a message to indicate that Gcam is not yet ready for quality feedback on Shamu.
|
fbf49ec9294b2e26976a9af00113a331895c616f |
27-Aug-2014 |
Alan Newberger <alann@google.com> |
am 599784d1: am e8885dd0: am a6e9539a: am 26b224dd: Protect video recording callback from activity/module pauses * commit '599784d118b0ddecd85ba405ac3987f3ef0a6a04': Protect video recording callback from activity/module pauses
|
f41c3280d8d5206335daf21f7b1d9c5be0ea0b79 |
27-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
am d6717451: am dfe537bd: am b8383940: am d225ea60: Add volume key capture suppor to CaptureModule * commit 'd67174510531b03cf11405d46ebdacbcd3cc2291': Add volume key capture suppor to CaptureModule
|
f36f9ca43b408ef0cfab9e60c91185185dd2184d |
27-Aug-2014 |
Andy Huibers <andyhuibers@google.com> |
am b9c781f2: am 76cfbe7b: am 29d5bcd8: am 9d3ec039: Add timeout to touch to focus. * commit 'b9c781f2a3b74ae2b7fff3502903882cc0904fdc': Add timeout to touch to focus.
|
b8b145c5c50478db9953e2d9e1e3ab13d2549a4c |
27-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
am a35ba87b: am 779414e8: Show a message to indicate that Gcam is not yet ready for quality feedback on Shamu. * commit 'a35ba87b58db732b528930cd23d72cee33bcc03a': Show a message to indicate that Gcam is not yet ready for quality feedback on Shamu.
|
599784d118b0ddecd85ba405ac3987f3ef0a6a04 |
27-Aug-2014 |
Alan Newberger <alann@google.com> |
am e8885dd0: am a6e9539a: am 26b224dd: Protect video recording callback from activity/module pauses * commit 'e8885dd0c3f87e2c62e592809abbd6302068e0a0': Protect video recording callback from activity/module pauses
|
d67174510531b03cf11405d46ebdacbcd3cc2291 |
27-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
am dfe537bd: am b8383940: am d225ea60: Add volume key capture suppor to CaptureModule * commit 'dfe537bdd717b30bf6caef58dc92834aa57b0c08': Add volume key capture suppor to CaptureModule
|
b9c781f2a3b74ae2b7fff3502903882cc0904fdc |
27-Aug-2014 |
Andy Huibers <andyhuibers@google.com> |
am 76cfbe7b: am 29d5bcd8: am 9d3ec039: Add timeout to touch to focus. * commit '76cfbe7bbe402872308b77e6a0ad69136ba3bd2e': Add timeout to touch to focus.
|
4c33e2079768f3db66d3f5db110c7d2182c12f11 |
27-Aug-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I6109471f563f3bd69201ccb82fd27c6412eab06d Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-km-rKH/strings.xml
es/values-ko/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms-rMY/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
512d5c48c54d2a4e21e89621915f5794bf4514f6 |
27-Aug-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I785196ae077b6f1720086a546c115f6eec7e1043 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-km-rKH/strings.xml
es/values-ko/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms-rMY/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
a35ba87b58db732b528930cd23d72cee33bcc03a |
27-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
am 779414e8: Show a message to indicate that Gcam is not yet ready for quality feedback on Shamu. * commit '779414e8bfe23d66de310570ff2314654e45ec9f': Show a message to indicate that Gcam is not yet ready for quality feedback on Shamu.
|
3e879ec00bb6ea6bf7158d51cc96bd11ef1062f8 |
27-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
am 779414e8: Show a message to indicate that Gcam is not yet ready for quality feedback on Shamu. * commit '779414e8bfe23d66de310570ff2314654e45ec9f': Show a message to indicate that Gcam is not yet ready for quality feedback on Shamu.
|
0e0c76ba92a9b09449b0fea5eccaea1bda4a0bd9 |
27-Aug-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I577c1f6a3977db4d57e6b5be9ab9c1706b78e52d Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-bn-rBD/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-eu-rES/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-gl-rES/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-is-rIS/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-kk-rKZ/strings.xml
es/values-km-rKH/strings.xml
es/values-kn-rIN/strings.xml
es/values-ko/strings.xml
es/values-ky-rKG/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mk-rMK/strings.xml
es/values-ml-rIN/strings.xml
es/values-mr-rIN/strings.xml
es/values-ms-rMY/strings.xml
es/values-my-rMM/strings.xml
es/values-nb/strings.xml
es/values-ne-rNP/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-si-rLK/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-ta-rIN/strings.xml
es/values-te-rIN/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-ur-rPK/strings.xml
es/values-uz-rUZ/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
779414e8bfe23d66de310570ff2314654e45ec9f |
27-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
Show a message to indicate that Gcam is not yet ready for quality feedback on Shamu. Bug: 17204023 Change-Id: I03ac9df0e4df8f09f5a4527616add6fb12ff0fd8
rc/com/android/camera/CaptureModule.java
|
e8885dd0c3f87e2c62e592809abbd6302068e0a0 |
27-Aug-2014 |
Alan Newberger <alann@google.com> |
am a6e9539a: am 26b224dd: Protect video recording callback from activity/module pauses * commit 'a6e9539a30454f19b70e7fdf639bd22bc95cec4d': Protect video recording callback from activity/module pauses
|
dfe537bdd717b30bf6caef58dc92834aa57b0c08 |
27-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
am b8383940: am d225ea60: Add volume key capture suppor to CaptureModule * commit 'b8383940a87ddcadaa051fda93d02f92753cdcdb': Add volume key capture suppor to CaptureModule
|
76cfbe7bbe402872308b77e6a0ad69136ba3bd2e |
27-Aug-2014 |
Andy Huibers <andyhuibers@google.com> |
am 29d5bcd8: am 9d3ec039: Add timeout to touch to focus. * commit '29d5bcd89b8d5b61ce0698caa7c211ad11707d3a': Add timeout to touch to focus.
|
21637544ab7f60345bbffdce48bf762aef0c03b6 |
27-Aug-2014 |
Spike Sprague <spikuru@google.com> |
am 17422c3c: am a2e46e6c: am 1732f551: am 597c4d10: Merge "more consistently apply filmstip hide animations" into ub-camera-glacier * commit '17422c3c61aa8d92fdbc0177c7b33fce9f5ccdd1': more consistently apply filmstip hide animations
|
a6e9539a30454f19b70e7fdf639bd22bc95cec4d |
27-Aug-2014 |
Alan Newberger <alann@google.com> |
am 26b224dd: Protect video recording callback from activity/module pauses * commit '26b224dd3b4391dbbb8ee6ed35c40c431bdbec85': Protect video recording callback from activity/module pauses
|
06ebb079393fab517589249c8de507e0629167a9 |
27-Aug-2014 |
Alan Newberger <alann@google.com> |
am 26b224dd: Protect video recording callback from activity/module pauses * commit '26b224dd3b4391dbbb8ee6ed35c40c431bdbec85': Protect video recording callback from activity/module pauses
|
b8383940a87ddcadaa051fda93d02f92753cdcdb |
27-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
am d225ea60: Add volume key capture suppor to CaptureModule * commit 'd225ea6074a58021013c8c063abb51eb80b1feb7': Add volume key capture suppor to CaptureModule
|
4423de9a8b229facb723831b71ef78109033a476 |
27-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
am d225ea60: Add volume key capture suppor to CaptureModule * commit 'd225ea6074a58021013c8c063abb51eb80b1feb7': Add volume key capture suppor to CaptureModule
|
29d5bcd89b8d5b61ce0698caa7c211ad11707d3a |
27-Aug-2014 |
Andy Huibers <andyhuibers@google.com> |
am 9d3ec039: Add timeout to touch to focus. * commit '9d3ec0396b71d7b9068f83b2e820eee988df8215': Add timeout to touch to focus.
|
6a0c4d59318f2ed997b0d8909977b02bb67f2608 |
27-Aug-2014 |
Andy Huibers <andyhuibers@google.com> |
am 9d3ec039: Add timeout to touch to focus. * commit '9d3ec0396b71d7b9068f83b2e820eee988df8215': Add timeout to touch to focus.
|
26b224dd3b4391dbbb8ee6ed35c40c431bdbec85 |
27-Aug-2014 |
Alan Newberger <alann@google.com> |
Protect video recording callback from activity/module pauses This CL should eliminate MediaRecorder start exceptions, which appear to be due to ending the camera or switching the module. Storage I/O could take a while during which pauses can occur, so we check for them and avoid starting video in that case. Bug: 16298718 Change-Id: I9abca815400e9ce545fed96f6e31cb792860a1d0
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/VideoModule.java
|
d225ea6074a58021013c8c063abb51eb80b1feb7 |
27-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
Add volume key capture suppor to CaptureModule Bug: 17289383 Change-Id: If548c4ebe5f702aca6fc9a983ac4775812ad551f
rc/com/android/camera/CaptureModule.java
|
17422c3c61aa8d92fdbc0177c7b33fce9f5ccdd1 |
27-Aug-2014 |
Spike Sprague <spikuru@google.com> |
am a2e46e6c: am 1732f551: am 597c4d10: Merge "more consistently apply filmstip hide animations" into ub-camera-glacier * commit 'a2e46e6cb3eabb4469208bcd986a23637cb0013d': more consistently apply filmstip hide animations
|
a2e46e6cb3eabb4469208bcd986a23637cb0013d |
27-Aug-2014 |
Spike Sprague <spikuru@google.com> |
am 1732f551: am 597c4d10: Merge "more consistently apply filmstip hide animations" into ub-camera-glacier * commit '1732f551cc31e3f1f9fc47e98e0e3f41be531444': more consistently apply filmstip hide animations
|
9d3ec0396b71d7b9068f83b2e820eee988df8215 |
27-Aug-2014 |
Andy Huibers <andyhuibers@google.com> |
Add timeout to touch to focus. Bug: 17289205 Change-Id: Ide39b4b9c86691de36149fdd15d1db41f9fed342
rc/com/android/camera/CaptureModule.java
|
24d11545f95712862abd75fbc71a72d8b50d160b |
27-Aug-2014 |
Spike Sprague <spikuru@google.com> |
am 597c4d10: Merge "more consistently apply filmstip hide animations" into ub-camera-glacier * commit '597c4d10b9bf0174a81e617cb89bab1a196cbc3a': more consistently apply filmstip hide animations
|
1732f551cc31e3f1f9fc47e98e0e3f41be531444 |
27-Aug-2014 |
Spike Sprague <spikuru@google.com> |
am 597c4d10: Merge "more consistently apply filmstip hide animations" into ub-camera-glacier * commit '597c4d10b9bf0174a81e617cb89bab1a196cbc3a': more consistently apply filmstip hide animations
|
597c4d10b9bf0174a81e617cb89bab1a196cbc3a |
27-Aug-2014 |
Spike Sprague <spikuru@google.com> |
Merge "more consistently apply filmstip hide animations" into ub-camera-glacier
|
ec6914c3088fdba0f4d9d14c388ff7fca8ab0953 |
27-Aug-2014 |
Andy Huibers <andyhuibers@google.com> |
am 39a974d4: am 7958bb4d: am 67ba1d5b: am bd9b80b2: Reset metering and focus areas when touch focus period ends. * commit '39a974d4aa91c2c8430ed2ff5cff16addca36774': Reset metering and focus areas when touch focus period ends.
|
39a974d4aa91c2c8430ed2ff5cff16addca36774 |
27-Aug-2014 |
Andy Huibers <andyhuibers@google.com> |
am 7958bb4d: am 67ba1d5b: am bd9b80b2: Reset metering and focus areas when touch focus period ends. * commit '7958bb4d46f4e77e2ba1e585056a4140e3d970e7': Reset metering and focus areas when touch focus period ends.
|
b7d0a227fb0f842135dbc92a7e15c571f0e1a946 |
27-Aug-2014 |
Spike Sprague <spikuru@google.com> |
more consistently apply filmstip hide animations bug: 17278732 bug: 17279637 Change-Id: I2346dcd77c0afd84eb1167ad5d5df3770551c14f
rc/com/android/camera/widget/FilmstripLayout.java
rc/com/android/camera/widget/FilmstripView.java
|
7958bb4d46f4e77e2ba1e585056a4140e3d970e7 |
27-Aug-2014 |
Andy Huibers <andyhuibers@google.com> |
am 67ba1d5b: am bd9b80b2: Reset metering and focus areas when touch focus period ends. * commit '67ba1d5b6a5a7091f43c9e5a7883f56c297e9dc2': Reset metering and focus areas when touch focus period ends.
|
67ba1d5b6a5a7091f43c9e5a7883f56c297e9dc2 |
27-Aug-2014 |
Andy Huibers <andyhuibers@google.com> |
am bd9b80b2: Reset metering and focus areas when touch focus period ends. * commit 'bd9b80b267195f78a8514847d0f02629e761a334': Reset metering and focus areas when touch focus period ends.
|
17ae13e4222092c64c693fe5ffebe26bb04bb22a |
27-Aug-2014 |
Andy Huibers <andyhuibers@google.com> |
am bd9b80b2: Reset metering and focus areas when touch focus period ends. * commit 'bd9b80b267195f78a8514847d0f02629e761a334': Reset metering and focus areas when touch focus period ends.
|
bd9b80b267195f78a8514847d0f02629e761a334 |
27-Aug-2014 |
Andy Huibers <andyhuibers@google.com> |
Reset metering and focus areas when touch focus period ends. Bug: 17286539 Change-Id: I36e554cac3969d6d0422efd2cb169d7afb08911c
rc/com/android/camera/FocusOverlayManager.java
|
3004d34e50d0f306b149e36d8bfe8ff5ee680ba6 |
27-Aug-2014 |
Alan Newberger <alann@google.com> |
am c89ca925: am 984039c4: am dcc2eb04: am d4d1dbe0: Merge "Remove one shot callback workaround in VideoModule for L" into ub-camera-glacier * commit 'c89ca9251bff33f4437ddaad0aba861a8170b997': Remove one shot callback workaround in VideoModule for L
|
c89ca9251bff33f4437ddaad0aba861a8170b997 |
27-Aug-2014 |
Alan Newberger <alann@google.com> |
am 984039c4: am dcc2eb04: am d4d1dbe0: Merge "Remove one shot callback workaround in VideoModule for L" into ub-camera-glacier * commit '984039c4a6222363560e15f0f2ddb2fe491b9ed0': Remove one shot callback workaround in VideoModule for L
|
eacd9f506b200287cfbc6b4447ab5b054c8c5cea |
27-Aug-2014 |
Andy Huibers <andyhuibers@google.com> |
am eecf0aaf: am 88aef841: am 7a9fecd8: am 462d9c51: Merge "In 3A debug mode, show pass/fail for active scans and show exact AF, AE regions." into ub-camera-glacier * commit 'eecf0aaf674b057505cf586fc18e3ccb2be1743d': In 3A debug mode, show pass/fail for active scans and show exact AF, AE regions.
|
984039c4a6222363560e15f0f2ddb2fe491b9ed0 |
27-Aug-2014 |
Alan Newberger <alann@google.com> |
am dcc2eb04: am d4d1dbe0: Merge "Remove one shot callback workaround in VideoModule for L" into ub-camera-glacier * commit 'dcc2eb045c97a9ecee9b4621af41e1e7b1ceba03': Remove one shot callback workaround in VideoModule for L
|
eecf0aaf674b057505cf586fc18e3ccb2be1743d |
27-Aug-2014 |
Andy Huibers <andyhuibers@google.com> |
am 88aef841: am 7a9fecd8: am 462d9c51: Merge "In 3A debug mode, show pass/fail for active scans and show exact AF, AE regions." into ub-camera-glacier * commit '88aef841ac403e39b63f1d93f3e68f1172a4325c': In 3A debug mode, show pass/fail for active scans and show exact AF, AE regions.
|
dcc2eb045c97a9ecee9b4621af41e1e7b1ceba03 |
27-Aug-2014 |
Alan Newberger <alann@google.com> |
am d4d1dbe0: Merge "Remove one shot callback workaround in VideoModule for L" into ub-camera-glacier * commit 'd4d1dbe00b84285bd0d235d984b9d71ea63a9305': Remove one shot callback workaround in VideoModule for L
|
f88adf07fd7e601e28519ac657499d8be251e46e |
27-Aug-2014 |
Alan Newberger <alann@google.com> |
am d4d1dbe0: Merge "Remove one shot callback workaround in VideoModule for L" into ub-camera-glacier * commit 'd4d1dbe00b84285bd0d235d984b9d71ea63a9305': Remove one shot callback workaround in VideoModule for L
|
d4d1dbe00b84285bd0d235d984b9d71ea63a9305 |
27-Aug-2014 |
Alan Newberger <alann@google.com> |
Merge "Remove one shot callback workaround in VideoModule for L" into ub-camera-glacier
|
88aef841ac403e39b63f1d93f3e68f1172a4325c |
27-Aug-2014 |
Andy Huibers <andyhuibers@google.com> |
am 7a9fecd8: am 462d9c51: Merge "In 3A debug mode, show pass/fail for active scans and show exact AF, AE regions." into ub-camera-glacier * commit '7a9fecd8168ff9a067e4965e42795542472d2323': In 3A debug mode, show pass/fail for active scans and show exact AF, AE regions.
|
3cb3cb6bc2200d4f37b16cdf227e65e6e835afd8 |
27-Aug-2014 |
Andy Huibers <andyhuibers@google.com> |
am 462d9c51: Merge "In 3A debug mode, show pass/fail for active scans and show exact AF, AE regions." into ub-camera-glacier * commit '462d9c510bbd072c63fb5be1ec12df15b4775f5f': In 3A debug mode, show pass/fail for active scans and show exact AF, AE regions.
|
7a9fecd8168ff9a067e4965e42795542472d2323 |
27-Aug-2014 |
Andy Huibers <andyhuibers@google.com> |
am 462d9c51: Merge "In 3A debug mode, show pass/fail for active scans and show exact AF, AE regions." into ub-camera-glacier * commit '462d9c510bbd072c63fb5be1ec12df15b4775f5f': In 3A debug mode, show pass/fail for active scans and show exact AF, AE regions.
|
462d9c510bbd072c63fb5be1ec12df15b4775f5f |
27-Aug-2014 |
Andy Huibers <andyhuibers@google.com> |
Merge "In 3A debug mode, show pass/fail for active scans and show exact AF, AE regions." into ub-camera-glacier
|
659f5b69221e17f850770c96f4c33e86fa763977 |
27-Aug-2014 |
Spike Sprague <spikuru@google.com> |
am 95412355: am 3e6e9f33: am 1424be09: am 91098713: Merge "Material Ripple effect on filmstip buttons" into ub-camera-glacier * commit '954123550caee955a02af3bee8809c724bd1d894': Material Ripple effect on filmstip buttons
|
954123550caee955a02af3bee8809c724bd1d894 |
27-Aug-2014 |
Spike Sprague <spikuru@google.com> |
am 3e6e9f33: am 1424be09: am 91098713: Merge "Material Ripple effect on filmstip buttons" into ub-camera-glacier * commit '3e6e9f33dc4ac969fe4000b42443106ba46bb89f': Material Ripple effect on filmstip buttons
|
3e6e9f33dc4ac969fe4000b42443106ba46bb89f |
27-Aug-2014 |
Spike Sprague <spikuru@google.com> |
am 1424be09: am 91098713: Merge "Material Ripple effect on filmstip buttons" into ub-camera-glacier * commit '1424be09e51af9cbf8a8110a0fb3afd009e93fbe': Material Ripple effect on filmstip buttons
|
0b6a937c0b88ff0240ff8593edbe98147a7877d8 |
27-Aug-2014 |
Spike Sprague <spikuru@google.com> |
am 91098713: Merge "Material Ripple effect on filmstip buttons" into ub-camera-glacier * commit '9109871358e32726f23d9b4db9d6fbf55a03cddc': Material Ripple effect on filmstip buttons
|
1424be09e51af9cbf8a8110a0fb3afd009e93fbe |
27-Aug-2014 |
Spike Sprague <spikuru@google.com> |
am 91098713: Merge "Material Ripple effect on filmstip buttons" into ub-camera-glacier * commit '9109871358e32726f23d9b4db9d6fbf55a03cddc': Material Ripple effect on filmstip buttons
|
9109871358e32726f23d9b4db9d6fbf55a03cddc |
27-Aug-2014 |
Spike Sprague <spikuru@google.com> |
Merge "Material Ripple effect on filmstip buttons" into ub-camera-glacier
|
fa45b3585f374fe03d7cc25c4778d9decda7987b |
26-Aug-2014 |
Spike Sprague <spikuru@google.com> |
Material Ripple effect on filmstip buttons bug: 17281225 Change-Id: Ic2876527a6d1fedaeb9ecdddbc8627e1c4e396b1
es/values-v21/styles.xml
|
e2f5fdda4b19da650a7616853990624969d0f384 |
26-Aug-2014 |
Andy Huibers <andyhuibers@google.com> |
In 3A debug mode, show pass/fail for active scans and show exact AF, AE regions. Bug: 17028594 Change-Id: I9c85178926a68c5e3ce26d04107db65514d84169
es/values/colors.xml
es/values/dimens.xml
rc/com/android/camera/FocusOverlayManager.java
rc/com/android/camera/ui/FaceView.java
rc/com/android/camera/ui/FocusOverlay.java
|
25bd4cb053039ed3575b5ab6492dffa64381cb7c |
26-Aug-2014 |
Ruben Brunk <rubenbrunk@google.com> |
am 713c27a0: am f356c9d9: am bca02248: am 92ed7b6c: Merge "photosphere: Fix TextureView transforms." into ub-camera-glacier * commit '713c27a00eac8d795fef4e4af64d08a3c703b2ee': photosphere: Fix TextureView transforms.
|
d2aab66d28029922855f45b97e757890e1e399da |
23-Aug-2014 |
Spike Sprague <spikuru@google.com> |
boatload of new assets also: bug: 17255612 Change-Id: I8551e3162b8eedee9653a05abb88177e39f12be5
es/drawable-hdpi/aspect_ratio_16x9_selected.png
es/drawable-hdpi/aspect_ratio_16x9_unselected.png
es/drawable-hdpi/aspect_ratio_4x3_selected.png
es/drawable-hdpi/aspect_ratio_4x3_unselected.png
es/drawable-hdpi/geo_opt_in_graphic.png
es/drawable-hdpi/ic_camera_blanket.png
es/drawable-hdpi/ic_camera_disabled.png
es/drawable-hdpi/ic_camera_normal.png
es/drawable-hdpi/ic_capture_camera_disabled.png
es/drawable-hdpi/ic_capture_camera_normal.png
es/drawable-hdpi/ic_capture_video.png
es/drawable-hdpi/ic_capture_video_disabled.png
es/drawable-hdpi/ic_done_disabled.png
es/drawable-hdpi/ic_done_normal.png
es/drawable-hdpi/ic_edit_disabled.png
es/drawable-hdpi/ic_edit_normal.png
es/drawable-hdpi/ic_exposure_0.png
es/drawable-hdpi/ic_exposure_0_disabled.png
es/drawable-hdpi/ic_exposure_0_indicator.png
es/drawable-hdpi/ic_exposure_disabled.png
es/drawable-hdpi/ic_exposure_indicator.png
es/drawable-hdpi/ic_exposure_n1.png
es/drawable-hdpi/ic_exposure_n1_disabled.png
es/drawable-hdpi/ic_exposure_n1_indicator.png
es/drawable-hdpi/ic_exposure_n2.png
es/drawable-hdpi/ic_exposure_n2_disabled.png
es/drawable-hdpi/ic_exposure_n2_indicator.png
es/drawable-hdpi/ic_exposure_normal.png
es/drawable-hdpi/ic_exposure_p1.png
es/drawable-hdpi/ic_exposure_p1_disabled.png
es/drawable-hdpi/ic_exposure_p1_indicator.png
es/drawable-hdpi/ic_exposure_p2.png
es/drawable-hdpi/ic_exposure_p2_disabled.png
es/drawable-hdpi/ic_exposure_p2_indicator.png
es/drawable-hdpi/ic_flash_auto_disabled.png
es/drawable-hdpi/ic_flash_auto_indicator.png
es/drawable-hdpi/ic_flash_auto_normal.png
es/drawable-hdpi/ic_flash_off_disabled.png
es/drawable-hdpi/ic_flash_off_indicator.png
es/drawable-hdpi/ic_flash_off_normal.png
es/drawable-hdpi/ic_flash_on_disabled.png
es/drawable-hdpi/ic_flash_on_indicator.png
es/drawable-hdpi/ic_flash_on_normal.png
es/drawable-hdpi/ic_grid_off_disabled.png
es/drawable-hdpi/ic_grid_off_indicator.png
es/drawable-hdpi/ic_grid_off_normal.png
es/drawable-hdpi/ic_grid_on_disabled.png
es/drawable-hdpi/ic_grid_on_indicator.png
es/drawable-hdpi/ic_grid_on_normal.png
es/drawable-hdpi/ic_hdr_off_disabled.png
es/drawable-hdpi/ic_hdr_off_indicator.png
es/drawable-hdpi/ic_hdr_off_normal.png
es/drawable-hdpi/ic_hdr_on_disabled.png
es/drawable-hdpi/ic_hdr_on_indicator.png
es/drawable-hdpi/ic_hdr_on_normal.png
es/drawable-hdpi/ic_hdr_plus_off_disabled.png
es/drawable-hdpi/ic_hdr_plus_off_indicator.png
es/drawable-hdpi/ic_hdr_plus_off_normal.png
es/drawable-hdpi/ic_hdr_plus_on_disabled.png
es/drawable-hdpi/ic_hdr_plus_on_indicator.png
es/drawable-hdpi/ic_hdr_plus_on_normal.png
es/drawable-hdpi/ic_panorama_disabled.png
es/drawable-hdpi/ic_photo_sphere_disabled.png
es/drawable-hdpi/ic_refocus_disabled.png
es/drawable-hdpi/ic_share_disabled.png
es/drawable-hdpi/ic_share_normal.png
es/drawable-hdpi/ic_switch_camera_back_disabled.png
es/drawable-hdpi/ic_switch_camera_back_indicator.png
es/drawable-hdpi/ic_switch_camera_back_normal.png
es/drawable-hdpi/ic_switch_camera_front_disabled.png
es/drawable-hdpi/ic_switch_camera_front_indicator.png
es/drawable-hdpi/ic_switch_camera_front_normal.png
es/drawable-hdpi/ic_timer_10s_disabled.png
es/drawable-hdpi/ic_timer_10s_indicator.png
es/drawable-hdpi/ic_timer_10s_normal.png
es/drawable-hdpi/ic_timer_3s_disabled.png
es/drawable-hdpi/ic_timer_3s_indicator.png
es/drawable-hdpi/ic_timer_3s_normal.png
es/drawable-hdpi/ic_timer_auto_disabled.png
es/drawable-hdpi/ic_timer_auto_indicator.png
es/drawable-hdpi/ic_timer_auto_normal.png
es/drawable-hdpi/ic_timer_off_disabled.png
es/drawable-hdpi/ic_timer_off_indicator.png
es/drawable-hdpi/ic_timer_off_normal.png
es/drawable-hdpi/ic_trash_disabled.png
es/drawable-hdpi/ic_trash_normal.png
es/drawable-hdpi/ic_video_blanket.png
es/drawable-hdpi/ic_video_disabled.png
es/drawable-hdpi/ic_video_normal.png
es/drawable-mdpi/aspect_ratio_16x9_selected.png
es/drawable-mdpi/aspect_ratio_16x9_unselected.png
es/drawable-mdpi/aspect_ratio_4x3_selected.png
es/drawable-mdpi/aspect_ratio_4x3_unselected.png
es/drawable-mdpi/geo_opt_in_graphic.png
es/drawable-mdpi/ic_camera_blanket.png
es/drawable-mdpi/ic_camera_disabled.png
es/drawable-mdpi/ic_camera_normal.png
es/drawable-mdpi/ic_capture_camera_disabled.png
es/drawable-mdpi/ic_capture_camera_normal.png
es/drawable-mdpi/ic_capture_video.png
es/drawable-mdpi/ic_capture_video_disabled.png
es/drawable-mdpi/ic_done_disabled.png
es/drawable-mdpi/ic_done_normal.png
es/drawable-mdpi/ic_edit_disabled.png
es/drawable-mdpi/ic_edit_normal.png
es/drawable-mdpi/ic_exposure_0.png
es/drawable-mdpi/ic_exposure_0_disabled.png
es/drawable-mdpi/ic_exposure_0_indicator.png
es/drawable-mdpi/ic_exposure_disabled.png
es/drawable-mdpi/ic_exposure_indicator.png
es/drawable-mdpi/ic_exposure_n1.png
es/drawable-mdpi/ic_exposure_n1_disabled.png
es/drawable-mdpi/ic_exposure_n1_indicator.png
es/drawable-mdpi/ic_exposure_n2.png
es/drawable-mdpi/ic_exposure_n2_disabled.png
es/drawable-mdpi/ic_exposure_n2_indicator.png
es/drawable-mdpi/ic_exposure_normal.png
es/drawable-mdpi/ic_exposure_p1.png
es/drawable-mdpi/ic_exposure_p1_disabled.png
es/drawable-mdpi/ic_exposure_p1_indicator.png
es/drawable-mdpi/ic_exposure_p2.png
es/drawable-mdpi/ic_exposure_p2_disabled.png
es/drawable-mdpi/ic_exposure_p2_indicator.png
es/drawable-mdpi/ic_flash_auto_disabled.png
es/drawable-mdpi/ic_flash_auto_indicator.png
es/drawable-mdpi/ic_flash_auto_normal.png
es/drawable-mdpi/ic_flash_off_disabled.png
es/drawable-mdpi/ic_flash_off_indicator.png
es/drawable-mdpi/ic_flash_off_normal.png
es/drawable-mdpi/ic_flash_on_disabled.png
es/drawable-mdpi/ic_flash_on_indicator.png
es/drawable-mdpi/ic_flash_on_normal.png
es/drawable-mdpi/ic_grid_off_disabled.png
es/drawable-mdpi/ic_grid_off_indicator.png
es/drawable-mdpi/ic_grid_off_normal.png
es/drawable-mdpi/ic_grid_on_disabled.png
es/drawable-mdpi/ic_grid_on_indicator.png
es/drawable-mdpi/ic_grid_on_normal.png
es/drawable-mdpi/ic_hdr_off_disabled.png
es/drawable-mdpi/ic_hdr_off_indicator.png
es/drawable-mdpi/ic_hdr_off_normal.png
es/drawable-mdpi/ic_hdr_on_disabled.png
es/drawable-mdpi/ic_hdr_on_indicator.png
es/drawable-mdpi/ic_hdr_on_normal.png
es/drawable-mdpi/ic_hdr_plus_off_disabled.png
es/drawable-mdpi/ic_hdr_plus_off_indicator.png
es/drawable-mdpi/ic_hdr_plus_off_normal.png
es/drawable-mdpi/ic_hdr_plus_on_disabled.png
es/drawable-mdpi/ic_hdr_plus_on_indicator.png
es/drawable-mdpi/ic_hdr_plus_on_normal.png
es/drawable-mdpi/ic_panorama_disabled.png
es/drawable-mdpi/ic_refocus_disabled.png
es/drawable-mdpi/ic_share_disabled.png
es/drawable-mdpi/ic_share_normal.png
es/drawable-mdpi/ic_switch_camera_back_disabled.png
es/drawable-mdpi/ic_switch_camera_back_indicator.png
es/drawable-mdpi/ic_switch_camera_back_normal.png
es/drawable-mdpi/ic_switch_camera_front_disabled.png
es/drawable-mdpi/ic_switch_camera_front_indicator.png
es/drawable-mdpi/ic_switch_camera_front_normal.png
es/drawable-mdpi/ic_timer_10s_disabled.png
es/drawable-mdpi/ic_timer_10s_indicator.png
es/drawable-mdpi/ic_timer_10s_normal.png
es/drawable-mdpi/ic_timer_3s_disabled.png
es/drawable-mdpi/ic_timer_3s_indicator.png
es/drawable-mdpi/ic_timer_3s_normal.png
es/drawable-mdpi/ic_timer_auto_disabled.png
es/drawable-mdpi/ic_timer_auto_indicator.png
es/drawable-mdpi/ic_timer_auto_normal.png
es/drawable-mdpi/ic_timer_off_disabled.png
es/drawable-mdpi/ic_timer_off_indicator.png
es/drawable-mdpi/ic_timer_off_normal.png
es/drawable-mdpi/ic_trash_disabled.png
es/drawable-mdpi/ic_trash_normal.png
es/drawable-mdpi/ic_video_blanket.png
es/drawable-mdpi/ic_video_disabled.png
es/drawable-mdpi/ic_video_normal.png
es/drawable-xhdpi/aspect_ratio_16x9_selected.png
es/drawable-xhdpi/aspect_ratio_16x9_unselected.png
es/drawable-xhdpi/aspect_ratio_4x3_selected.png
es/drawable-xhdpi/aspect_ratio_4x3_unselected.png
es/drawable-xhdpi/geo_opt_in_graphic.png
es/drawable-xhdpi/ic_camera_blanket.png
es/drawable-xhdpi/ic_camera_disabled.png
es/drawable-xhdpi/ic_camera_normal.png
es/drawable-xhdpi/ic_capture_camera_disabled.png
es/drawable-xhdpi/ic_capture_camera_normal.png
es/drawable-xhdpi/ic_capture_video.png
es/drawable-xhdpi/ic_capture_video_disabled.png
es/drawable-xhdpi/ic_done_disabled.png
es/drawable-xhdpi/ic_done_normal.png
es/drawable-xhdpi/ic_edit_disabled.png
es/drawable-xhdpi/ic_edit_normal.png
es/drawable-xhdpi/ic_exposure_0.png
es/drawable-xhdpi/ic_exposure_0_disabled.png
es/drawable-xhdpi/ic_exposure_0_indicator.png
es/drawable-xhdpi/ic_exposure_disabled.png
es/drawable-xhdpi/ic_exposure_indicator.png
es/drawable-xhdpi/ic_exposure_n1.png
es/drawable-xhdpi/ic_exposure_n1_disabled.png
es/drawable-xhdpi/ic_exposure_n1_indicator.png
es/drawable-xhdpi/ic_exposure_n2.png
es/drawable-xhdpi/ic_exposure_n2_disabled.png
es/drawable-xhdpi/ic_exposure_n2_indicator.png
es/drawable-xhdpi/ic_exposure_normal.png
es/drawable-xhdpi/ic_exposure_p1.png
es/drawable-xhdpi/ic_exposure_p1_disabled.png
es/drawable-xhdpi/ic_exposure_p1_indicator.png
es/drawable-xhdpi/ic_exposure_p2.png
es/drawable-xhdpi/ic_exposure_p2_disabled.png
es/drawable-xhdpi/ic_exposure_p2_indicator.png
es/drawable-xhdpi/ic_flash_auto_disabled.png
es/drawable-xhdpi/ic_flash_auto_indicator.png
es/drawable-xhdpi/ic_flash_auto_normal.png
es/drawable-xhdpi/ic_flash_off_disabled.png
es/drawable-xhdpi/ic_flash_off_indicator.png
es/drawable-xhdpi/ic_flash_off_normal.png
es/drawable-xhdpi/ic_flash_on_disabled.png
es/drawable-xhdpi/ic_flash_on_indicator.png
es/drawable-xhdpi/ic_flash_on_normal.png
es/drawable-xhdpi/ic_grid_off_disabled.png
es/drawable-xhdpi/ic_grid_off_indicator.png
es/drawable-xhdpi/ic_grid_off_normal.png
es/drawable-xhdpi/ic_grid_on_disabled.png
es/drawable-xhdpi/ic_grid_on_indicator.png
es/drawable-xhdpi/ic_grid_on_normal.png
es/drawable-xhdpi/ic_hdr_off_disabled.png
es/drawable-xhdpi/ic_hdr_off_indicator.png
es/drawable-xhdpi/ic_hdr_off_normal.png
es/drawable-xhdpi/ic_hdr_on_disabled.png
es/drawable-xhdpi/ic_hdr_on_indicator.png
es/drawable-xhdpi/ic_hdr_on_normal.png
es/drawable-xhdpi/ic_hdr_plus_off_disabled.png
es/drawable-xhdpi/ic_hdr_plus_off_indicator.png
es/drawable-xhdpi/ic_hdr_plus_off_normal.png
es/drawable-xhdpi/ic_hdr_plus_on_disabled.png
es/drawable-xhdpi/ic_hdr_plus_on_indicator.png
es/drawable-xhdpi/ic_hdr_plus_on_normal.png
es/drawable-xhdpi/ic_panorama_disabled.png
es/drawable-xhdpi/ic_photo_sphere_disabled.png
es/drawable-xhdpi/ic_refocus_disabled.png
es/drawable-xhdpi/ic_share_disabled.png
es/drawable-xhdpi/ic_share_normal.png
es/drawable-xhdpi/ic_switch_camera_back_disabled.png
es/drawable-xhdpi/ic_switch_camera_back_indicator.png
es/drawable-xhdpi/ic_switch_camera_back_normal.png
es/drawable-xhdpi/ic_switch_camera_front_disabled.png
es/drawable-xhdpi/ic_switch_camera_front_indicator.png
es/drawable-xhdpi/ic_switch_camera_front_normal.png
es/drawable-xhdpi/ic_timer_10s_disabled.png
es/drawable-xhdpi/ic_timer_10s_indicator.png
es/drawable-xhdpi/ic_timer_10s_normal.png
es/drawable-xhdpi/ic_timer_3s_disabled.png
es/drawable-xhdpi/ic_timer_3s_indicator.png
es/drawable-xhdpi/ic_timer_3s_normal.png
es/drawable-xhdpi/ic_timer_auto_disabled.png
es/drawable-xhdpi/ic_timer_auto_indicator.png
es/drawable-xhdpi/ic_timer_auto_normal.png
es/drawable-xhdpi/ic_timer_off_disabled.png
es/drawable-xhdpi/ic_timer_off_indicator.png
es/drawable-xhdpi/ic_timer_off_normal.png
es/drawable-xhdpi/ic_trash_disabled.png
es/drawable-xhdpi/ic_trash_normal.png
es/drawable-xhdpi/ic_video_blanket.png
es/drawable-xhdpi/ic_video_disabled.png
es/drawable-xhdpi/ic_video_normal.png
es/drawable-xxhdpi/aspect_ratio_16x9_selected.png
es/drawable-xxhdpi/aspect_ratio_16x9_unselected.png
es/drawable-xxhdpi/aspect_ratio_4x3_selected.png
es/drawable-xxhdpi/aspect_ratio_4x3_unselected.png
es/drawable-xxhdpi/geo_opt_in_graphic.png
es/drawable-xxhdpi/ic_camera_blanket.png
es/drawable-xxhdpi/ic_camera_disabled.png
es/drawable-xxhdpi/ic_camera_normal.png
es/drawable-xxhdpi/ic_capture_camera_disabled.png
es/drawable-xxhdpi/ic_capture_camera_normal.png
es/drawable-xxhdpi/ic_capture_video.png
es/drawable-xxhdpi/ic_capture_video_disabled.png
es/drawable-xxhdpi/ic_done_disabled.png
es/drawable-xxhdpi/ic_done_normal.png
es/drawable-xxhdpi/ic_edit_disabled.png
es/drawable-xxhdpi/ic_edit_normal.png
es/drawable-xxhdpi/ic_exposure_0.png
es/drawable-xxhdpi/ic_exposure_0_disabled.png
es/drawable-xxhdpi/ic_exposure_0_indicator.png
es/drawable-xxhdpi/ic_exposure_disabled.png
es/drawable-xxhdpi/ic_exposure_indicator.png
es/drawable-xxhdpi/ic_exposure_n1.png
es/drawable-xxhdpi/ic_exposure_n1_disabled.png
es/drawable-xxhdpi/ic_exposure_n1_indicator.png
es/drawable-xxhdpi/ic_exposure_n2.png
es/drawable-xxhdpi/ic_exposure_n2_disabled.png
es/drawable-xxhdpi/ic_exposure_n2_indicator.png
es/drawable-xxhdpi/ic_exposure_normal.png
es/drawable-xxhdpi/ic_exposure_p1.png
es/drawable-xxhdpi/ic_exposure_p1_disabled.png
es/drawable-xxhdpi/ic_exposure_p1_indicator.png
es/drawable-xxhdpi/ic_exposure_p2.png
es/drawable-xxhdpi/ic_exposure_p2_disabled.png
es/drawable-xxhdpi/ic_exposure_p2_indicator.png
es/drawable-xxhdpi/ic_flash_auto_disabled.png
es/drawable-xxhdpi/ic_flash_auto_indicator.png
es/drawable-xxhdpi/ic_flash_auto_normal.png
es/drawable-xxhdpi/ic_flash_off_disabled.png
es/drawable-xxhdpi/ic_flash_off_indicator.png
es/drawable-xxhdpi/ic_flash_off_normal.png
es/drawable-xxhdpi/ic_flash_on_disabled.png
es/drawable-xxhdpi/ic_flash_on_indicator.png
es/drawable-xxhdpi/ic_flash_on_normal.png
es/drawable-xxhdpi/ic_grid_off_disabled.png
es/drawable-xxhdpi/ic_grid_off_indicator.png
es/drawable-xxhdpi/ic_grid_off_normal.png
es/drawable-xxhdpi/ic_grid_on_disabled.png
es/drawable-xxhdpi/ic_grid_on_indicator.png
es/drawable-xxhdpi/ic_grid_on_normal.png
es/drawable-xxhdpi/ic_hdr_off_disabled.png
es/drawable-xxhdpi/ic_hdr_off_indicator.png
es/drawable-xxhdpi/ic_hdr_off_normal.png
es/drawable-xxhdpi/ic_hdr_on_disabled.png
es/drawable-xxhdpi/ic_hdr_on_indicator.png
es/drawable-xxhdpi/ic_hdr_on_normal.png
es/drawable-xxhdpi/ic_hdr_plus_off_disabled.png
es/drawable-xxhdpi/ic_hdr_plus_off_indicator.png
es/drawable-xxhdpi/ic_hdr_plus_off_normal.png
es/drawable-xxhdpi/ic_hdr_plus_on_disabled.png
es/drawable-xxhdpi/ic_hdr_plus_on_indicator.png
es/drawable-xxhdpi/ic_hdr_plus_on_normal.png
es/drawable-xxhdpi/ic_panorama_disabled.png
es/drawable-xxhdpi/ic_photo_sphere_disabled.png
es/drawable-xxhdpi/ic_refocus_disabled.png
es/drawable-xxhdpi/ic_refocus_normal.png
es/drawable-xxhdpi/ic_share_disabled.png
es/drawable-xxhdpi/ic_share_normal.png
es/drawable-xxhdpi/ic_switch_camera_back_disabled.png
es/drawable-xxhdpi/ic_switch_camera_back_indicator.png
es/drawable-xxhdpi/ic_switch_camera_back_normal.png
es/drawable-xxhdpi/ic_switch_camera_front_disabled.png
es/drawable-xxhdpi/ic_switch_camera_front_indicator.png
es/drawable-xxhdpi/ic_switch_camera_front_normal.png
es/drawable-xxhdpi/ic_timer_10s_disabled.png
es/drawable-xxhdpi/ic_timer_10s_indicator.png
es/drawable-xxhdpi/ic_timer_10s_normal.png
es/drawable-xxhdpi/ic_timer_3s_disabled.png
es/drawable-xxhdpi/ic_timer_3s_indicator.png
es/drawable-xxhdpi/ic_timer_3s_normal.png
es/drawable-xxhdpi/ic_timer_auto_disabled.png
es/drawable-xxhdpi/ic_timer_auto_indicator.png
es/drawable-xxhdpi/ic_timer_auto_normal.png
es/drawable-xxhdpi/ic_timer_off_disabled.png
es/drawable-xxhdpi/ic_timer_off_indicator.png
es/drawable-xxhdpi/ic_timer_off_normal.png
es/drawable-xxhdpi/ic_trash_disabled.png
es/drawable-xxhdpi/ic_trash_normal.png
es/drawable-xxhdpi/ic_video_blanket.png
es/drawable-xxhdpi/ic_video_disabled.png
es/drawable-xxhdpi/ic_video_normal.png
es/drawable-xxxhdpi/aspect_ratio_16x9_selected.png
es/drawable-xxxhdpi/aspect_ratio_16x9_unselected.png
es/drawable-xxxhdpi/aspect_ratio_4x3_selected.png
es/drawable-xxxhdpi/aspect_ratio_4x3_unselected.png
es/drawable-xxxhdpi/geo_opt_in_graphic.png
es/drawable-xxxhdpi/ic_camera_blanket.png
es/drawable-xxxhdpi/ic_camera_disabled.png
es/drawable-xxxhdpi/ic_camera_normal.png
es/drawable-xxxhdpi/ic_capture_camera_disabled.png
es/drawable-xxxhdpi/ic_capture_camera_normal.png
es/drawable-xxxhdpi/ic_capture_pano.png
es/drawable-xxxhdpi/ic_capture_pano_disabled.png
es/drawable-xxxhdpi/ic_capture_refocus.png
es/drawable-xxxhdpi/ic_capture_refocus_disabled.png
es/drawable-xxxhdpi/ic_capture_video.png
es/drawable-xxxhdpi/ic_capture_video_disabled.png
es/drawable-xxxhdpi/ic_edit_disabled.png
es/drawable-xxxhdpi/ic_edit_normal.png
es/drawable-xxxhdpi/ic_exposure_0.png
es/drawable-xxxhdpi/ic_exposure_0_disabled.png
es/drawable-xxxhdpi/ic_exposure_0_indicator.png
es/drawable-xxxhdpi/ic_exposure_disabled.png
es/drawable-xxxhdpi/ic_exposure_indicator.png
es/drawable-xxxhdpi/ic_exposure_n1.png
es/drawable-xxxhdpi/ic_exposure_n1_disabled.png
es/drawable-xxxhdpi/ic_exposure_n1_indicator.png
es/drawable-xxxhdpi/ic_exposure_n2.png
es/drawable-xxxhdpi/ic_exposure_n2_disabled.png
es/drawable-xxxhdpi/ic_exposure_n2_indicator.png
es/drawable-xxxhdpi/ic_exposure_normal.png
es/drawable-xxxhdpi/ic_exposure_p1.png
es/drawable-xxxhdpi/ic_exposure_p1_disabled.png
es/drawable-xxxhdpi/ic_exposure_p1_indicator.png
es/drawable-xxxhdpi/ic_exposure_p2.png
es/drawable-xxxhdpi/ic_exposure_p2_disabled.png
es/drawable-xxxhdpi/ic_exposure_p2_indicator.png
es/drawable-xxxhdpi/ic_flash_auto_disabled.png
es/drawable-xxxhdpi/ic_flash_auto_indicator.png
es/drawable-xxxhdpi/ic_flash_auto_normal.png
es/drawable-xxxhdpi/ic_flash_off_disabled.png
es/drawable-xxxhdpi/ic_flash_off_indicator.png
es/drawable-xxxhdpi/ic_flash_off_normal.png
es/drawable-xxxhdpi/ic_flash_on_disabled.png
es/drawable-xxxhdpi/ic_flash_on_indicator.png
es/drawable-xxxhdpi/ic_flash_on_normal.png
es/drawable-xxxhdpi/ic_grid_off_disabled.png
es/drawable-xxxhdpi/ic_grid_off_indicator.png
es/drawable-xxxhdpi/ic_grid_off_normal.png
es/drawable-xxxhdpi/ic_grid_on_disabled.png
es/drawable-xxxhdpi/ic_grid_on_indicator.png
es/drawable-xxxhdpi/ic_grid_on_normal.png
es/drawable-xxxhdpi/ic_hdr_off_disabled.png
es/drawable-xxxhdpi/ic_hdr_off_indicator.png
es/drawable-xxxhdpi/ic_hdr_off_normal.png
es/drawable-xxxhdpi/ic_hdr_on_disabled.png
es/drawable-xxxhdpi/ic_hdr_on_indicator.png
es/drawable-xxxhdpi/ic_hdr_on_normal.png
es/drawable-xxxhdpi/ic_hdr_plus_off_disabled.png
es/drawable-xxxhdpi/ic_hdr_plus_off_indicator.png
es/drawable-xxxhdpi/ic_hdr_plus_off_normal.png
es/drawable-xxxhdpi/ic_hdr_plus_on_disabled.png
es/drawable-xxxhdpi/ic_hdr_plus_on_indicator.png
es/drawable-xxxhdpi/ic_hdr_plus_on_normal.png
es/drawable-xxxhdpi/ic_share_disabled.png
es/drawable-xxxhdpi/ic_share_normal.png
es/drawable-xxxhdpi/ic_switch_camera_back_disabled.png
es/drawable-xxxhdpi/ic_switch_camera_back_indicator.png
es/drawable-xxxhdpi/ic_switch_camera_back_normal.png
es/drawable-xxxhdpi/ic_switch_camera_front_disabled.png
es/drawable-xxxhdpi/ic_switch_camera_front_indicator.png
es/drawable-xxxhdpi/ic_switch_camera_front_normal.png
es/drawable-xxxhdpi/ic_timer_10s_disabled.png
es/drawable-xxxhdpi/ic_timer_10s_indicator.png
es/drawable-xxxhdpi/ic_timer_10s_normal.png
es/drawable-xxxhdpi/ic_timer_3s_disabled.png
es/drawable-xxxhdpi/ic_timer_3s_indicator.png
es/drawable-xxxhdpi/ic_timer_3s_normal.png
es/drawable-xxxhdpi/ic_timer_auto_disabled.png
es/drawable-xxxhdpi/ic_timer_auto_indicator.png
es/drawable-xxxhdpi/ic_timer_auto_normal.png
es/drawable-xxxhdpi/ic_timer_off_disabled.png
es/drawable-xxxhdpi/ic_timer_off_indicator.png
es/drawable-xxxhdpi/ic_timer_off_normal.png
es/drawable-xxxhdpi/ic_trash_disabled.png
es/drawable-xxxhdpi/ic_trash_normal.png
es/drawable-xxxhdpi/ic_video_blanket.png
es/drawable-xxxhdpi/ic_video_disabled.png
es/drawable-xxxhdpi/ic_video_normal.png
es/drawable/ic_camera.xml
es/drawable/ic_capture_camera.xml
es/drawable/ic_capture_panorama.xml
es/drawable/ic_capture_refocus.xml
es/drawable/ic_capture_video.xml
es/drawable/ic_refocus.xml
es/layout-land/location_dialog_content.xml
es/values/arrays.xml
es/values/colors.xml
es_p/drawable-hdpi/ic_camera_blanket.png
es_p/drawable-hdpi/ic_camera_normal.png
es_p/drawable-hdpi/ic_panorama_disabled.png
es_p/drawable-hdpi/ic_photo_sphere_blanket.png
es_p/drawable-hdpi/ic_photo_sphere_normal.png
es_p/drawable-hdpi/ic_photosphere_blanket.png
es_p/drawable-hdpi/ic_photosphere_disabled.png
es_p/drawable-hdpi/ic_photosphere_normal.png
es_p/drawable-hdpi/ic_refocus_disabled.png
es_p/drawable-hdpi/ic_video_blanket.png
es_p/drawable-hdpi/ic_video_disabled.png
es_p/drawable-hdpi/ic_video_normal.png
es_p/drawable-mdpi/ic_camera_blanket.png
es_p/drawable-mdpi/ic_camera_normal.png
es_p/drawable-mdpi/ic_panorama_disabled.png
es_p/drawable-mdpi/ic_photo_sphere_blanket.png
es_p/drawable-mdpi/ic_photo_sphere_normal.png
es_p/drawable-mdpi/ic_photosphere_blanket.png
es_p/drawable-mdpi/ic_photosphere_disabled.png
es_p/drawable-mdpi/ic_photosphere_normal.png
es_p/drawable-mdpi/ic_refocus_disabled.png
es_p/drawable-mdpi/ic_video_blanket.png
es_p/drawable-mdpi/ic_video_disabled.png
es_p/drawable-mdpi/ic_video_normal.png
es_p/drawable-xhdpi/ic_camera_blanket.png
es_p/drawable-xhdpi/ic_camera_normal.png
es_p/drawable-xhdpi/ic_panorama_disabled.png
es_p/drawable-xhdpi/ic_photo_sphere_blanket.png
es_p/drawable-xhdpi/ic_photo_sphere_normal.png
es_p/drawable-xhdpi/ic_photosphere_blanket.png
es_p/drawable-xhdpi/ic_photosphere_disabled.png
es_p/drawable-xhdpi/ic_photosphere_normal.png
es_p/drawable-xhdpi/ic_refocus_disabled.png
es_p/drawable-xhdpi/ic_video_blanket.png
es_p/drawable-xhdpi/ic_video_disabled.png
es_p/drawable-xhdpi/ic_video_normal.png
es_p/drawable-xxhdpi/ic_camera_blanket.png
es_p/drawable-xxhdpi/ic_camera_normal.png
es_p/drawable-xxhdpi/ic_panorama_disabled.png
es_p/drawable-xxhdpi/ic_photo_sphere_blanket.png
es_p/drawable-xxhdpi/ic_photo_sphere_normal.png
es_p/drawable-xxhdpi/ic_photosphere_blanket.png
es_p/drawable-xxhdpi/ic_photosphere_disabled.png
es_p/drawable-xxhdpi/ic_photosphere_normal.png
es_p/drawable-xxhdpi/ic_refocus_disabled.png
es_p/drawable-xxhdpi/ic_video_blanket.png
es_p/drawable-xxhdpi/ic_video_disabled.png
es_p/drawable-xxhdpi/ic_video_normal.png
es_p/drawable/ic_camera.xml
es_p/drawable/ic_refocus.xml
|
713c27a00eac8d795fef4e4af64d08a3c703b2ee |
26-Aug-2014 |
Ruben Brunk <rubenbrunk@google.com> |
am f356c9d9: am bca02248: am 92ed7b6c: Merge "photosphere: Fix TextureView transforms." into ub-camera-glacier * commit 'f356c9d9b8d278cc483714c4b125510c32a0e1e9': photosphere: Fix TextureView transforms.
|
f356c9d9b8d278cc483714c4b125510c32a0e1e9 |
26-Aug-2014 |
Ruben Brunk <rubenbrunk@google.com> |
am bca02248: am 92ed7b6c: Merge "photosphere: Fix TextureView transforms." into ub-camera-glacier * commit 'bca0224807455f85d7482aca7e0bcaeb255021ec': photosphere: Fix TextureView transforms.
|
7306adf97c75e56b3276148f47a9df7aef135dbf |
26-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
am 4effdf9b: am 47f855ca: am b3c9c2e0: am afb4c581: Merge "Enable mode options when capture is done." into ub-camera-glacier * commit '4effdf9b25e2d67e2942763823d2432ffcb58dd6': Enable mode options when capture is done.
|
6311e8e29872086608aa1f77595a6117395e8624 |
26-Aug-2014 |
Ruben Brunk <rubenbrunk@google.com> |
am 92ed7b6c: Merge "photosphere: Fix TextureView transforms." into ub-camera-glacier * commit '92ed7b6c6d8ca735c35f5bdc6de6d15f485e19bd': photosphere: Fix TextureView transforms.
|
bca0224807455f85d7482aca7e0bcaeb255021ec |
26-Aug-2014 |
Ruben Brunk <rubenbrunk@google.com> |
am 92ed7b6c: Merge "photosphere: Fix TextureView transforms." into ub-camera-glacier * commit '92ed7b6c6d8ca735c35f5bdc6de6d15f485e19bd': photosphere: Fix TextureView transforms.
|
4effdf9b25e2d67e2942763823d2432ffcb58dd6 |
26-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
am 47f855ca: am b3c9c2e0: am afb4c581: Merge "Enable mode options when capture is done." into ub-camera-glacier * commit '47f855ca63c7f209512b97db7fcddb98da05eefe': Enable mode options when capture is done.
|
92ed7b6c6d8ca735c35f5bdc6de6d15f485e19bd |
26-Aug-2014 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "photosphere: Fix TextureView transforms." into ub-camera-glacier
|
47f855ca63c7f209512b97db7fcddb98da05eefe |
26-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
am b3c9c2e0: am afb4c581: Merge "Enable mode options when capture is done." into ub-camera-glacier * commit 'b3c9c2e0e3e56d6bc38e3161b451cbf11a15b1ee': Enable mode options when capture is done.
|
7bae31a17a7913b58b96787185cd965baef97f76 |
26-Aug-2014 |
Ruben Brunk <rubenbrunk@google.com> |
photosphere: Fix TextureView transforms. Bug: 17098224 - WAR to set the SurfaceTexture default buffer dimensions to the TextureView's layout dimensions to avoid bad scaling/translation in TextureView's HardwareLayer transform. Change-Id: I9e7d6e6cb33d806470cb11f00d45b97218ee7c11
rc/com/android/camera/app/CameraAppUI.java
|
b3c9c2e0e3e56d6bc38e3161b451cbf11a15b1ee |
26-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
am afb4c581: Merge "Enable mode options when capture is done." into ub-camera-glacier * commit 'afb4c581786bb539e8753488e29a3d13fa8b43fd': Enable mode options when capture is done.
|
fb172acde20561b03b2279673857b8bea71d81e7 |
21-Aug-2014 |
Alan Newberger <alann@google.com> |
Remove one shot callback workaround in VideoModule for L Since there was a framework fix for the issue, we don't need to do an extra preview callback when entering video if on L. Bug: 16649297 Bug: 17241994 Change-Id: I67fc67ef34a661daea6991c3b895b1c1bf6b9b85
rc/com/android/camera/VideoModule.java
rc/com/android/camera/util/ApiHelper.java
|
2634d27cd8e29bc6c9da00b88d3206f4b417e367 |
26-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
am afb4c581: Merge "Enable mode options when capture is done." into ub-camera-glacier * commit 'afb4c581786bb539e8753488e29a3d13fa8b43fd': Enable mode options when capture is done.
|
afb4c581786bb539e8753488e29a3d13fa8b43fd |
26-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Enable mode options when capture is done." into ub-camera-glacier
|
cceaf1d5c7f9c26a9b38367412af066cd19c7e33 |
26-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
Enable mode options when capture is done. Bug: 17260403 Change-Id: I9e5c6c8516d5cdbb3fd303715af2a109b171c5f7
rc/com/android/camera/CaptureModule.java
|
682542ec625df324e4b4bc83363f08b5f4598499 |
26-Aug-2014 |
Igor Murashkin <iam@google.com> |
am bcb9c61c: am 67852ac3: am 64d7b3e0: am 666c80b0: Merge "util: Optimal preview size picks smaller-than-display size in case of tie" into ub-camera-glacier * commit 'bcb9c61cf963ac08596d4677d0c4228c29bc695c': util: Optimal preview size picks smaller-than-display size in case of tie
|
bcb9c61cf963ac08596d4677d0c4228c29bc695c |
26-Aug-2014 |
Igor Murashkin <iam@google.com> |
am 67852ac3: am 64d7b3e0: am 666c80b0: Merge "util: Optimal preview size picks smaller-than-display size in case of tie" into ub-camera-glacier * commit '67852ac33f6caa41aaac35aa1b67023bd4c29d0d': util: Optimal preview size picks smaller-than-display size in case of tie
|
67852ac33f6caa41aaac35aa1b67023bd4c29d0d |
26-Aug-2014 |
Igor Murashkin <iam@google.com> |
am 64d7b3e0: am 666c80b0: Merge "util: Optimal preview size picks smaller-than-display size in case of tie" into ub-camera-glacier * commit '64d7b3e0273f715ae3aa40bab29282c984fd9f02': util: Optimal preview size picks smaller-than-display size in case of tie
|
64d7b3e0273f715ae3aa40bab29282c984fd9f02 |
26-Aug-2014 |
Igor Murashkin <iam@google.com> |
am 666c80b0: Merge "util: Optimal preview size picks smaller-than-display size in case of tie" into ub-camera-glacier * commit '666c80b054d61bd813f0eaaa527632093f80ff02': util: Optimal preview size picks smaller-than-display size in case of tie
|
cee5f85cc5f4b11e2d3dfdb5f3693ae420543f6f |
26-Aug-2014 |
Igor Murashkin <iam@google.com> |
am 666c80b0: Merge "util: Optimal preview size picks smaller-than-display size in case of tie" into ub-camera-glacier * commit '666c80b054d61bd813f0eaaa527632093f80ff02': util: Optimal preview size picks smaller-than-display size in case of tie
|
666c80b054d61bd813f0eaaa527632093f80ff02 |
26-Aug-2014 |
Igor Murashkin <iam@google.com> |
Merge "util: Optimal preview size picks smaller-than-display size in case of tie" into ub-camera-glacier
|
ec142ed6d1b75352b82ead3c1868b043b889afd9 |
26-Aug-2014 |
Andy Huibers <andyhuibers@google.com> |
am 23bf3e57: am 6a980206: am 7c90d38d: am c0fe0b69: Show animated AF ring UI when lens is moving in continuous autofocus. * commit '23bf3e57009b4bba5c35e73c420dd24993e2d394': Show animated AF ring UI when lens is moving in continuous autofocus.
|
23bf3e57009b4bba5c35e73c420dd24993e2d394 |
26-Aug-2014 |
Andy Huibers <andyhuibers@google.com> |
am 6a980206: am 7c90d38d: am c0fe0b69: Show animated AF ring UI when lens is moving in continuous autofocus. * commit '6a980206bb5e0775470ccea7ff153ad400dfba1e': Show animated AF ring UI when lens is moving in continuous autofocus.
|
6a980206bb5e0775470ccea7ff153ad400dfba1e |
26-Aug-2014 |
Andy Huibers <andyhuibers@google.com> |
am 7c90d38d: am c0fe0b69: Show animated AF ring UI when lens is moving in continuous autofocus. * commit '7c90d38df458fb264ff22f93f0a4bffffd102a3e': Show animated AF ring UI when lens is moving in continuous autofocus.
|
7c90d38df458fb264ff22f93f0a4bffffd102a3e |
26-Aug-2014 |
Andy Huibers <andyhuibers@google.com> |
am c0fe0b69: Show animated AF ring UI when lens is moving in continuous autofocus. * commit 'c0fe0b6915004303a550047e68a2124edae9fdb2': Show animated AF ring UI when lens is moving in continuous autofocus.
|
a48238515bd3b18335674098ac48c3e8633f53dd |
26-Aug-2014 |
Andy Huibers <andyhuibers@google.com> |
am c0fe0b69: Show animated AF ring UI when lens is moving in continuous autofocus. * commit 'c0fe0b6915004303a550047e68a2124edae9fdb2': Show animated AF ring UI when lens is moving in continuous autofocus.
|
ea06b98f93fbeb2c0c3620fa7469a0c03fb82311 |
26-Aug-2014 |
Andy Huibers <andyhuibers@google.com> |
am cac27d2b: am 5b1146f7: am 13381a39: am 4d04e99b: Merge "Enable Face rectangles for debugging." into ub-camera-glacier * commit 'cac27d2b25ff149ccb72aa14ac6350279be4c587': Enable Face rectangles for debugging.
|
3531ec304af0f526f46d06cad1a230f0fa596b8b |
26-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
am 9c6371b1: am 68580363: am 735e9734: am 46b3c730: Merge "Fix crash on Shamu since it\'s no longer camera 2 FULL." into ub-camera-glacier * commit '9c6371b1ddfcec76734d942443e754b90a8f3a14': Fix crash on Shamu since it's no longer camera 2 FULL.
|
c0fe0b6915004303a550047e68a2124edae9fdb2 |
26-Aug-2014 |
Andy Huibers <andyhuibers@google.com> |
Show animated AF ring UI when lens is moving in continuous autofocus. Bug: 17028594 Change-Id: I0bb7c7cb3f8264304d4375f9f2b73608c8bfc1e5
rc/com/android/camera/CaptureModuleUI.java
rc/com/android/camera/FocusOverlayManager.java
rc/com/android/camera/VideoModule.java
rc/com/android/camera/ui/FocusOverlay.java
|
cac27d2b25ff149ccb72aa14ac6350279be4c587 |
26-Aug-2014 |
Andy Huibers <andyhuibers@google.com> |
am 5b1146f7: am 13381a39: am 4d04e99b: Merge "Enable Face rectangles for debugging." into ub-camera-glacier * commit '5b1146f77a3d60885fb5884b3a40c51041b232c5': Enable Face rectangles for debugging.
|
9c6371b1ddfcec76734d942443e754b90a8f3a14 |
26-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
am 68580363: am 735e9734: am 46b3c730: Merge "Fix crash on Shamu since it\'s no longer camera 2 FULL." into ub-camera-glacier * commit '685803630e736272368bef027a5a7f925600217a': Fix crash on Shamu since it's no longer camera 2 FULL.
|
5b1146f77a3d60885fb5884b3a40c51041b232c5 |
26-Aug-2014 |
Andy Huibers <andyhuibers@google.com> |
am 13381a39: am 4d04e99b: Merge "Enable Face rectangles for debugging." into ub-camera-glacier * commit '13381a39ffd720c373f23de430faa58ac6522e14': Enable Face rectangles for debugging.
|
13381a39ffd720c373f23de430faa58ac6522e14 |
26-Aug-2014 |
Andy Huibers <andyhuibers@google.com> |
am 4d04e99b: Merge "Enable Face rectangles for debugging." into ub-camera-glacier * commit '4d04e99b46642381b1f80b2a324454ebe741c9f3': Enable Face rectangles for debugging.
|
7b6c337aa86e469ec344f9655d314ed60f34dac9 |
26-Aug-2014 |
Andy Huibers <andyhuibers@google.com> |
am 4d04e99b: Merge "Enable Face rectangles for debugging." into ub-camera-glacier * commit '4d04e99b46642381b1f80b2a324454ebe741c9f3': Enable Face rectangles for debugging.
|
4d04e99b46642381b1f80b2a324454ebe741c9f3 |
26-Aug-2014 |
Andy Huibers <andyhuibers@google.com> |
Merge "Enable Face rectangles for debugging." into ub-camera-glacier
|
62b4c3c0da3abd397b3790820359927784c50bc2 |
26-Aug-2014 |
Andy Huibers <andyhuibers@google.com> |
Enable Face rectangles for debugging. Bug: 17028594 Change-Id: I57521aed991f93da1f5abdace6a72be0f1057dbe
es/layout/camera.xml
es/values/colors.xml
es/values/dimens.xml
rc/com/android/camera/CaptureModule.java
rc/com/android/camera/PhotoUI.java
rc/com/android/camera/debug/DebugPropertyHelper.java
rc/com/android/camera/one/v2/OneCameraImpl.java
rc/com/android/camera/ui/FaceView.java
|
685803630e736272368bef027a5a7f925600217a |
26-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
am 735e9734: am 46b3c730: Merge "Fix crash on Shamu since it\'s no longer camera 2 FULL." into ub-camera-glacier * commit '735e9734dc46ec69676b349c8665a322afc90c78': Fix crash on Shamu since it's no longer camera 2 FULL.
|
735e9734dc46ec69676b349c8665a322afc90c78 |
26-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
am 46b3c730: Merge "Fix crash on Shamu since it\'s no longer camera 2 FULL." into ub-camera-glacier * commit '46b3c730aa059bf5103922ae0c36c13a12e98223': Fix crash on Shamu since it's no longer camera 2 FULL.
|
4c2d8069149b3ecc504f3973b2155ce08f813931 |
26-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
am 46b3c730: Merge "Fix crash on Shamu since it\'s no longer camera 2 FULL." into ub-camera-glacier * commit '46b3c730aa059bf5103922ae0c36c13a12e98223': Fix crash on Shamu since it's no longer camera 2 FULL.
|
46b3c730aa059bf5103922ae0c36c13a12e98223 |
26-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Fix crash on Shamu since it's no longer camera 2 FULL." into ub-camera-glacier
|
868fcdca9b616239b7ed1162c394dc11526735cf |
25-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
Fix crash on Shamu since it's no longer camera 2 FULL. Bug: 17258194 Shamu is no longer a FULL camera2 device. So we change our OneCamera API to create a V2 manager for partial deviced as well (but exclude legacy). Change-Id: Ic095a754494047bc18d6e5e729bd9dd8a915753c
rc/com/android/camera/one/OneCameraManager.java
|
cf2a8186cb72ea3df6f784cfdf259db5f5e67eb6 |
25-Aug-2014 |
Igor Murashkin <iam@google.com> |
util: Optimal preview size picks smaller-than-display size in case of tie This fixes the case when 1600x1200 was selected over 1280x960 on a Nexus 5 (display size 1920x1080); both preview sizes were equally close, but the larger one was arbitrarily winning out. Bug: 17216523 Change-Id: I163c29d5f46ad1b8b44825424c5202eb87855048
rc/com/android/camera/util/CameraUtil.java
|
2241a98163fd340906aacfa50ae8e34721e4903b |
25-Aug-2014 |
Spike Sprague <spikuru@google.com> |
am 10b6deb4: am b7a31f57: am b1e38771: am 4cc78bb3: set actionbar background to complete transparent * commit '10b6deb49d7e005e03d80f2d08df07a9a08984f0': set actionbar background to complete transparent
|
10b6deb49d7e005e03d80f2d08df07a9a08984f0 |
25-Aug-2014 |
Spike Sprague <spikuru@google.com> |
am b7a31f57: am b1e38771: am 4cc78bb3: set actionbar background to complete transparent * commit 'b7a31f57cd159744c6f7e00066201219f932536f': set actionbar background to complete transparent
|
b7a31f57cd159744c6f7e00066201219f932536f |
25-Aug-2014 |
Spike Sprague <spikuru@google.com> |
am b1e38771: am 4cc78bb3: set actionbar background to complete transparent * commit 'b1e38771fce22955c08905ce579a0d7c9c7b0acc': set actionbar background to complete transparent
|
6c64b406d4ce9597eb6b0ce2d9357d189d0753af |
25-Aug-2014 |
Spike Sprague <spikuru@google.com> |
am 4cc78bb3: set actionbar background to complete transparent * commit '4cc78bb37f57f1499fe3d2eaf27e2a3b3e2e19bf': set actionbar background to complete transparent
|
b1e38771fce22955c08905ce579a0d7c9c7b0acc |
25-Aug-2014 |
Spike Sprague <spikuru@google.com> |
am 4cc78bb3: set actionbar background to complete transparent * commit '4cc78bb37f57f1499fe3d2eaf27e2a3b3e2e19bf': set actionbar background to complete transparent
|
4cc78bb37f57f1499fe3d2eaf27e2a3b3e2e19bf |
21-Aug-2014 |
Spike Sprague <spikuru@google.com> |
set actionbar background to complete transparent bug: 17114270 Change-Id: I309c98ed1ddbc0c322129e185ca4cd2df1f73520
rc/com/android/camera/CameraActivity.java
|
dc6bcd61357e7c19b0f17046e4b52781690c7e77 |
25-Aug-2014 |
Baligh Uddin <baligh@google.com> |
am 97dc6f2e: (-s ours) am 174d3f23: (-s ours) am 4457862d: (-s ours) Import translations. DO NOT MERGE * commit '97dc6f2e5d20ee73f8dba0eed8521e4637e640f8': Import translations. DO NOT MERGE
|
97dc6f2e5d20ee73f8dba0eed8521e4637e640f8 |
25-Aug-2014 |
Baligh Uddin <baligh@google.com> |
am 174d3f23: (-s ours) am 4457862d: (-s ours) Import translations. DO NOT MERGE * commit '174d3f23ef14b9497a2b770a9d61ffe5c56d311b': Import translations. DO NOT MERGE
|
174d3f23ef14b9497a2b770a9d61ffe5c56d311b |
25-Aug-2014 |
Baligh Uddin <baligh@google.com> |
am 4457862d: (-s ours) Import translations. DO NOT MERGE * commit '4457862d909fd918f1acc2feb14d6c4df456649c': Import translations. DO NOT MERGE
|
e6242be37135c87f614d17697db33f695f211479 |
25-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
am 664cf140: am c14e1b7f: am ceff90aa: am 392f249b: Merge "Enable switching within CaptureModule to HDR+ and back." into ub-camera-glacier * commit '664cf140e50337aaf73d18d1ef68eb922691c25a': Enable switching within CaptureModule to HDR+ and back.
|
acedf331d2abe977d9c380835eb6dfb2a402a7e7 |
25-Aug-2014 |
Sol Boucher <solb@google.com> |
am b628ea06: am 80e48e63: am 0a395068: am 799acabb: Merge "Switch from stepwise index-based zoom to a ratio-based scale" into ub-camera-glacier * commit 'b628ea065d43bd6e1a35b4ff6467e18a6e722f78': Switch from stepwise index-based zoom to a ratio-based scale
|
4457862d909fd918f1acc2feb14d6c4df456649c |
24-Aug-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I56a23f46e36ba35f5731b16478f5e6c772291f53 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-bn-rBD/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-eu-rES/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-gl-rES/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-is-rIS/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-kk-rKZ/strings.xml
es/values-km-rKH/strings.xml
es/values-kn-rIN/strings.xml
es/values-ko/strings.xml
es/values-ky-rKG/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mk-rMK/strings.xml
es/values-ml-rIN/strings.xml
es/values-mr-rIN/strings.xml
es/values-ms-rMY/strings.xml
es/values-my-rMM/strings.xml
es/values-nb/strings.xml
es/values-ne-rNP/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-si-rLK/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-ta-rIN/strings.xml
es/values-te-rIN/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-ur-rPK/strings.xml
es/values-uz-rUZ/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
664cf140e50337aaf73d18d1ef68eb922691c25a |
23-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
am c14e1b7f: am ceff90aa: am 392f249b: Merge "Enable switching within CaptureModule to HDR+ and back." into ub-camera-glacier * commit 'c14e1b7f5de651910bc6ff58053f618e8e9b3f3c': Enable switching within CaptureModule to HDR+ and back.
|
b628ea065d43bd6e1a35b4ff6467e18a6e722f78 |
23-Aug-2014 |
Sol Boucher <solb@google.com> |
am 80e48e63: am 0a395068: am 799acabb: Merge "Switch from stepwise index-based zoom to a ratio-based scale" into ub-camera-glacier * commit '80e48e6327fc3ae01d559552b928511cd2ed36cc': Switch from stepwise index-based zoom to a ratio-based scale
|
c14e1b7f5de651910bc6ff58053f618e8e9b3f3c |
23-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
am ceff90aa: am 392f249b: Merge "Enable switching within CaptureModule to HDR+ and back." into ub-camera-glacier * commit 'ceff90aa9bcb2cfce2f48b187948af8bbbdc9172': Enable switching within CaptureModule to HDR+ and back.
|
ceff90aa9bcb2cfce2f48b187948af8bbbdc9172 |
23-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
am 392f249b: Merge "Enable switching within CaptureModule to HDR+ and back." into ub-camera-glacier * commit '392f249b8295509cf6c31984f2420b876ca5a7ac': Enable switching within CaptureModule to HDR+ and back.
|
9fc70c0dffa07335db1f5513814dfe53d0dd467c |
23-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
am 392f249b: Merge "Enable switching within CaptureModule to HDR+ and back." into ub-camera-glacier * commit '392f249b8295509cf6c31984f2420b876ca5a7ac': Enable switching within CaptureModule to HDR+ and back.
|
392f249b8295509cf6c31984f2420b876ca5a7ac |
23-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Enable switching within CaptureModule to HDR+ and back." into ub-camera-glacier
|
4c1bffecc94cedf56d188eca40bd65a854746413 |
21-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
Enable switching within CaptureModule to HDR+ and back. Bug: 16945820 Change-Id: If92371129c5bf2a78b7623d745a8b86d218d32e1
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/CaptureModule.java
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/PhotoUI.java
rc/com/android/camera/module/ModulesInfo.java
rc/com/android/camera/one/OneCameraManager.java
rc/com/android/camera/one/v1/OneCameraManagerImpl.java
rc/com/android/camera/one/v2/OneCameraManagerImpl.java
rc/com/android/camera/util/ApiHelper.java
rc_pd/com/android/camera/one/v2/OneCameraCreator.java
rc_pd_gcam/com/android/camera/util/GcamHelper.java
|
80e48e6327fc3ae01d559552b928511cd2ed36cc |
23-Aug-2014 |
Sol Boucher <solb@google.com> |
am 0a395068: am 799acabb: Merge "Switch from stepwise index-based zoom to a ratio-based scale" into ub-camera-glacier * commit '0a395068f1360aafdea215d4c182b0f3df57abd2': Switch from stepwise index-based zoom to a ratio-based scale
|
0a395068f1360aafdea215d4c182b0f3df57abd2 |
23-Aug-2014 |
Sol Boucher <solb@google.com> |
am 799acabb: Merge "Switch from stepwise index-based zoom to a ratio-based scale" into ub-camera-glacier * commit '799acabb5105aa1095740771457ce037422e492e': Switch from stepwise index-based zoom to a ratio-based scale
|
ad862d7bab6f0b9456e65984d009dab2a387f460 |
23-Aug-2014 |
Sol Boucher <solb@google.com> |
am 799acabb: Merge "Switch from stepwise index-based zoom to a ratio-based scale" into ub-camera-glacier * commit '799acabb5105aa1095740771457ce037422e492e': Switch from stepwise index-based zoom to a ratio-based scale
|
799acabb5105aa1095740771457ce037422e492e |
23-Aug-2014 |
Sol Boucher <solb@google.com> |
Merge "Switch from stepwise index-based zoom to a ratio-based scale" into ub-camera-glacier
|
2192fbaaf598d4440a8d537a70095ea56bc9a5eb |
20-Aug-2014 |
Sol Boucher <solb@google.com> |
Switch from stepwise index-based zoom to a ratio-based scale This brings the app up to date with the removal of the deprecated zoom methods in the portability layer's CameraSettings class. Bug: 17016658 Change-Id: Icb9f773188f7481d9af991d71feaff86379f5525
rc/com/android/camera/CaptureModuleUI.java
rc/com/android/camera/PhotoController.java
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/PhotoUI.java
rc/com/android/camera/VideoController.java
rc/com/android/camera/VideoModule.java
rc/com/android/camera/VideoUI.java
rc/com/android/camera/ui/PreviewOverlay.java
|
6f4f7c229f8e4ffa20fe9de99cf4b5cda22b55ff |
22-Aug-2014 |
Baligh Uddin <baligh@google.com> |
am dbff92db: (-s ours) am ee40c4e8: (-s ours) am 4fd9d28f: (-s ours) am 6a836bff: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-glacier * commit 'dbff92db83f72524cf087de9c7571ddfb6b8c278': Import translations. DO NOT MERGE
|
e69ad6463c5845da28ffe1e466ea3a848b3149cc |
22-Aug-2014 |
Spike Sprague <spikuru@google.com> |
am b968b1b7: am 64004fc9: am 4b852b28: am 0dec43e3: filmstrip actionbar tweaks * commit 'b968b1b7c7494140c5d8fd470fdedce19c0f8a7f': filmstrip actionbar tweaks
|
4026effc37315203dd3355bd7686738bc5dd9042 |
22-Aug-2014 |
Baligh Uddin <baligh@google.com> |
am 3949a498: (-s ours) am e215b936: (-s ours) am be89e7ed: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit '3949a4986dcb618ae393b06431f2186a1295e6e7': Import translations. DO NOT MERGE
|
dbff92db83f72524cf087de9c7571ddfb6b8c278 |
22-Aug-2014 |
Baligh Uddin <baligh@google.com> |
am ee40c4e8: (-s ours) am 4fd9d28f: (-s ours) am 6a836bff: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-glacier * commit 'ee40c4e815d7e3a1485919ff786fbf81885a1d6a': Import translations. DO NOT MERGE
|
b968b1b7c7494140c5d8fd470fdedce19c0f8a7f |
22-Aug-2014 |
Spike Sprague <spikuru@google.com> |
am 64004fc9: am 4b852b28: am 0dec43e3: filmstrip actionbar tweaks * commit '64004fc9422f6d236edf4c3eef0792d5832d9697': filmstrip actionbar tweaks
|
3949a4986dcb618ae393b06431f2186a1295e6e7 |
22-Aug-2014 |
Baligh Uddin <baligh@google.com> |
am e215b936: (-s ours) am be89e7ed: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit 'e215b936e59cad330c2d0dfb9bf5592222af9c14': Import translations. DO NOT MERGE
|
e2db1286a82c9bc68d3d7d02870d8df6e122388b |
22-Aug-2014 |
Spike Sprague <spikuru@google.com> |
am 2d1404bd: am a760a832: am 0b777ea6: am fe1af189: Merge "filmstrip actionbar tweaks" into ub-camera-glacier * commit '2d1404bd3bda017677c7f9b792540cd2f72946a9': filmstrip actionbar tweaks
|
ee40c4e815d7e3a1485919ff786fbf81885a1d6a |
22-Aug-2014 |
Baligh Uddin <baligh@google.com> |
am 4fd9d28f: (-s ours) am 6a836bff: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-glacier * commit '4fd9d28f6e144a06fb9ec27db30ba6c8ef81eaa1': Import translations. DO NOT MERGE
|
64004fc9422f6d236edf4c3eef0792d5832d9697 |
22-Aug-2014 |
Spike Sprague <spikuru@google.com> |
am 4b852b28: am 0dec43e3: filmstrip actionbar tweaks * commit '4b852b2827d6761783869b72f110ef866f6f8d57': filmstrip actionbar tweaks
|
e215b936e59cad330c2d0dfb9bf5592222af9c14 |
22-Aug-2014 |
Baligh Uddin <baligh@google.com> |
am be89e7ed: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit 'be89e7ed0b502f495e876cad9d68f36d47227a6f': Import translations. DO NOT MERGE
|
2d1404bd3bda017677c7f9b792540cd2f72946a9 |
22-Aug-2014 |
Spike Sprague <spikuru@google.com> |
am a760a832: am 0b777ea6: am fe1af189: Merge "filmstrip actionbar tweaks" into ub-camera-glacier * commit 'a760a8329eefadbf213e0cbf66e4ec09a445a16b': filmstrip actionbar tweaks
|
4fd9d28f6e144a06fb9ec27db30ba6c8ef81eaa1 |
22-Aug-2014 |
Baligh Uddin <baligh@google.com> |
am 6a836bff: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-glacier * commit '6a836bffd12d036e3c85c29134f2ada14df3c2f1': Import translations. DO NOT MERGE
|
4b852b2827d6761783869b72f110ef866f6f8d57 |
22-Aug-2014 |
Spike Sprague <spikuru@google.com> |
am 0dec43e3: filmstrip actionbar tweaks * commit '0dec43e3d77fd1f40093f2f3430a6e86d8d5307b': filmstrip actionbar tweaks
|
2e87004beca0c32fc5e56936962a11f56e5b88bd |
22-Aug-2014 |
Baligh Uddin <baligh@google.com> |
am 6a836bff: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-glacier * commit '6a836bffd12d036e3c85c29134f2ada14df3c2f1': Import translations. DO NOT MERGE
|
d260f0081ac69dbdef2ad9f012a76357dd603af0 |
22-Aug-2014 |
Spike Sprague <spikuru@google.com> |
am 0dec43e3: filmstrip actionbar tweaks * commit '0dec43e3d77fd1f40093f2f3430a6e86d8d5307b': filmstrip actionbar tweaks
|
031ce154ab790e3dd20a6868fad46cd9ce8a0ccd |
22-Aug-2014 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE"
|
be89e7ed0b502f495e876cad9d68f36d47227a6f |
22-Aug-2014 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into lmp-dev
|
6a836bffd12d036e3c85c29134f2ada14df3c2f1 |
22-Aug-2014 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into ub-camera-glacier
|
9272c78f08f4dc4cf5c0bfff30b973f90a1164ee |
22-Aug-2014 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into ub-camera-haleakala
|
a760a8329eefadbf213e0cbf66e4ec09a445a16b |
22-Aug-2014 |
Spike Sprague <spikuru@google.com> |
am 0b777ea6: am fe1af189: Merge "filmstrip actionbar tweaks" into ub-camera-glacier * commit '0b777ea643de9d6b13a03972d377a1a2a78d8c9a': filmstrip actionbar tweaks
|
0dec43e3d77fd1f40093f2f3430a6e86d8d5307b |
20-Aug-2014 |
Spike Sprague <spikuru@google.com> |
filmstrip actionbar tweaks bug: 17114274 Change-Id: I70e7b285d27f81c87442bcc9d28ae7391d028568
rc/com/android/camera/CameraActivity.java
|
0b777ea643de9d6b13a03972d377a1a2a78d8c9a |
22-Aug-2014 |
Spike Sprague <spikuru@google.com> |
am fe1af189: Merge "filmstrip actionbar tweaks" into ub-camera-glacier * commit 'fe1af189505e39b2d86af5b9fcec12f1661d1509': filmstrip actionbar tweaks
|
f10aa3a6734e85f7cfbf9551cb3733a8c5524b66 |
22-Aug-2014 |
Spike Sprague <spikuru@google.com> |
am fe1af189: Merge "filmstrip actionbar tweaks" into ub-camera-glacier * commit 'fe1af189505e39b2d86af5b9fcec12f1661d1509': filmstrip actionbar tweaks
|
fe1af189505e39b2d86af5b9fcec12f1661d1509 |
22-Aug-2014 |
Spike Sprague <spikuru@google.com> |
Merge "filmstrip actionbar tweaks" into ub-camera-glacier
|
4f93e19ddb504560752fd5da9fecc4b95a4f1733 |
20-Aug-2014 |
Spike Sprague <spikuru@google.com> |
filmstrip actionbar tweaks bug: 17114274 Change-Id: I0e9b3dd37325d39f5a16d81cbfaf71b98baf7510
es_p/values/strings.xml
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/util/CameraUtil.java
rc/com/android/camera/util/IntentHelper.java
rc_pd/com/android/camera/util/GalleryHelper.java
|
e788fee6371d6ac7a0410f3e61d180aee3d2127f |
22-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
am ff51ec99: am c5e91697: am 91891a0d: am f859793d: Merge "Pick the preview size based on the selected picture size." into ub-camera-glacier * commit 'ff51ec999dd0ae5c85d528fe45ecb389da1d1482': Pick the preview size based on the selected picture size.
|
ff51ec999dd0ae5c85d528fe45ecb389da1d1482 |
22-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
am c5e91697: am 91891a0d: am f859793d: Merge "Pick the preview size based on the selected picture size." into ub-camera-glacier * commit 'c5e91697905d75e4a40f4f422dd294cf76c02bf6': Pick the preview size based on the selected picture size.
|
c5e91697905d75e4a40f4f422dd294cf76c02bf6 |
22-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
am 91891a0d: am f859793d: Merge "Pick the preview size based on the selected picture size." into ub-camera-glacier * commit '91891a0db6e54d58290dcf6adfa68c914fc03327': Pick the preview size based on the selected picture size.
|
b56e20016dc15150e04cebcbda622b940a618de3 |
22-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
am f859793d: Merge "Pick the preview size based on the selected picture size." into ub-camera-glacier * commit 'f859793dddc0176774eb5bac28910e9783484d97': Pick the preview size based on the selected picture size.
|
91891a0db6e54d58290dcf6adfa68c914fc03327 |
22-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
am f859793d: Merge "Pick the preview size based on the selected picture size." into ub-camera-glacier * commit 'f859793dddc0176774eb5bac28910e9783484d97': Pick the preview size based on the selected picture size.
|
f859793dddc0176774eb5bac28910e9783484d97 |
22-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Pick the preview size based on the selected picture size." into ub-camera-glacier
|
9093ac60cc645e4e5606c015b0a8ad411119f858 |
21-Aug-2014 |
Spike Sprague <spikuru@google.com> |
am 4252cd90: am 2ae5785c: am 642af567: am ba97d192: animate filmstrip bottom button bar in and out from the bottom of the screen * commit '4252cd90d51aaedceca1a2b4d7ab677dae460ab0': animate filmstrip bottom button bar in and out from the bottom of the screen
|
4252cd90d51aaedceca1a2b4d7ab677dae460ab0 |
21-Aug-2014 |
Spike Sprague <spikuru@google.com> |
am 2ae5785c: am 642af567: am ba97d192: animate filmstrip bottom button bar in and out from the bottom of the screen * commit '2ae5785cebde82ffc7ac32e9cb28fa3133db9d39': animate filmstrip bottom button bar in and out from the bottom of the screen
|
2ae5785cebde82ffc7ac32e9cb28fa3133db9d39 |
21-Aug-2014 |
Spike Sprague <spikuru@google.com> |
am 642af567: am ba97d192: animate filmstrip bottom button bar in and out from the bottom of the screen * commit '642af5677ed627ec8d8ce61e7a86e8e2782c0b45': animate filmstrip bottom button bar in and out from the bottom of the screen
|
642af5677ed627ec8d8ce61e7a86e8e2782c0b45 |
21-Aug-2014 |
Spike Sprague <spikuru@google.com> |
am ba97d192: animate filmstrip bottom button bar in and out from the bottom of the screen * commit 'ba97d192b63ea81edf2dd6ca5cfbf6646a1f25a2': animate filmstrip bottom button bar in and out from the bottom of the screen
|
9a77507d67addb96f47aa6b0b65e3a5912dbfce2 |
21-Aug-2014 |
Spike Sprague <spikuru@google.com> |
am ba97d192: animate filmstrip bottom button bar in and out from the bottom of the screen * commit 'ba97d192b63ea81edf2dd6ca5cfbf6646a1f25a2': animate filmstrip bottom button bar in and out from the bottom of the screen
|
cbe861edcd0d094ee79d3eeaac48bb928017b600 |
21-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
Pick the preview size based on the selected picture size. Bug: 16654225 Also make this a function of the Camera device, since othe camera might have to override the picture size. Change-Id: Ieb6d1ffac0c3d7893416f9eae3232afde6d27240
rc/com/android/camera/CaptureModule.java
rc/com/android/camera/one/OneCamera.java
rc/com/android/camera/one/v2/OneCameraImpl.java
|
ba97d192b63ea81edf2dd6ca5cfbf6646a1f25a2 |
20-Aug-2014 |
Spike Sprague <spikuru@google.com> |
animate filmstrip bottom button bar in and out from the bottom of the screen bug: 17114515 Change-Id: If3024f149fc0be0e48a430468c53774893946938
es/layout/camera_filmstrip.xml
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/app/CameraAppUI.java
rc/com/android/camera/app/FilmstripBottomPanel.java
|
15de3db09cefeb451aa5a4518b15ade6f8ad4865 |
21-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
am a2953cc5: am 991a861b: am fda968ec: am 0382139c: Merge "Enable progress reporting for modules like HDR+." into ub-camera-glacier * commit 'a2953cc5d808476b00dc1f2c3ee9b486faee2507': Enable progress reporting for modules like HDR+.
|
8130ef64e4aeccc9b30688b61175040a66abf245 |
21-Aug-2014 |
Senpo Hu <senpo@google.com> |
am 9d33c2c4: am b63b1347: am 68664a2c: am 5b88f9a7: Merge "Change Shamu\'s default video resolution setting." into ub-camera-glacier * commit '9d33c2c42264d645381169b9378abc4f5c467685': Change Shamu's default video resolution setting.
|
89a87fa347b54a3e0cb5229d839f9c8be8b02f8d |
21-Aug-2014 |
Sol Boucher <solb@google.com> |
am 825a6d5e: am 1653188c: am c9a0c5dc: am dab267ce: Merge "TextureViewHelper workaround for SurfaceTexture/CameraProxy race" into ub-camera-glacier * commit '825a6d5ec07dacbfa3f7b6e4e24eee1c41cb7c2e': TextureViewHelper workaround for SurfaceTexture/CameraProxy race
|
f31bfa8c4be1897f112f8483af9c2d42fe0c43c2 |
21-Aug-2014 |
Andy Huibers <andyhuibers@google.com> |
am f7b85753: am 5997025b: am f9f990b4: am 2440815c: Merge "Add zoom to CaptureModule and OneCamera." into ub-camera-glacier * commit 'f7b85753e16b7067e1177828da76e5f7f286b80f': Add zoom to CaptureModule and OneCamera.
|
a2953cc5d808476b00dc1f2c3ee9b486faee2507 |
21-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
am 991a861b: am fda968ec: am 0382139c: Merge "Enable progress reporting for modules like HDR+." into ub-camera-glacier * commit '991a861b7887ccfa85ca87d6a5ab9e526ea6e21b': Enable progress reporting for modules like HDR+.
|
9d33c2c42264d645381169b9378abc4f5c467685 |
21-Aug-2014 |
Senpo Hu <senpo@google.com> |
am b63b1347: am 68664a2c: am 5b88f9a7: Merge "Change Shamu\'s default video resolution setting." into ub-camera-glacier * commit 'b63b1347b691256ccafc958c7b3afcea07662689': Change Shamu's default video resolution setting.
|
825a6d5ec07dacbfa3f7b6e4e24eee1c41cb7c2e |
21-Aug-2014 |
Sol Boucher <solb@google.com> |
am 1653188c: am c9a0c5dc: am dab267ce: Merge "TextureViewHelper workaround for SurfaceTexture/CameraProxy race" into ub-camera-glacier * commit '1653188c698863eb532413cf9f63331f62d53995': TextureViewHelper workaround for SurfaceTexture/CameraProxy race
|
f7b85753e16b7067e1177828da76e5f7f286b80f |
21-Aug-2014 |
Andy Huibers <andyhuibers@google.com> |
am 5997025b: am f9f990b4: am 2440815c: Merge "Add zoom to CaptureModule and OneCamera." into ub-camera-glacier * commit '5997025bafdf95cb82685bc5853bf9f49fefffe2': Add zoom to CaptureModule and OneCamera.
|
991a861b7887ccfa85ca87d6a5ab9e526ea6e21b |
21-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
am fda968ec: am 0382139c: Merge "Enable progress reporting for modules like HDR+." into ub-camera-glacier * commit 'fda968ec2ff1ce9caf79ee3f6c2e5b165f6249b0': Enable progress reporting for modules like HDR+.
|
2aa534973f753c1b428ffff631a8778eb74f3803 |
21-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
am 6bd546fd: am f3d59afa: am 31213adc: am e7476817: Remove logspam * commit '6bd546fdbe2cda2e5dcff95d656c5899bdbfcc0e': Remove logspam
|
104fa69c20f389d83fad0306421d88a01be79952 |
21-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
am 0382139c: Merge "Enable progress reporting for modules like HDR+." into ub-camera-glacier * commit '0382139c99988f0002afeafb4c35f3599b1fc02f': Enable progress reporting for modules like HDR+.
|
fda968ec2ff1ce9caf79ee3f6c2e5b165f6249b0 |
21-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
am 0382139c: Merge "Enable progress reporting for modules like HDR+." into ub-camera-glacier * commit '0382139c99988f0002afeafb4c35f3599b1fc02f': Enable progress reporting for modules like HDR+.
|
6bd546fdbe2cda2e5dcff95d656c5899bdbfcc0e |
21-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
am f3d59afa: am 31213adc: am e7476817: Remove logspam * commit 'f3d59afab5f25caa02d33f351fc0f437b0778ae7': Remove logspam
|
b63b1347b691256ccafc958c7b3afcea07662689 |
21-Aug-2014 |
Senpo Hu <senpo@google.com> |
am 68664a2c: am 5b88f9a7: Merge "Change Shamu\'s default video resolution setting." into ub-camera-glacier * commit '68664a2caf89b351671695f8b98bf4610d208733': Change Shamu's default video resolution setting.
|
68664a2caf89b351671695f8b98bf4610d208733 |
21-Aug-2014 |
Senpo Hu <senpo@google.com> |
am 5b88f9a7: Merge "Change Shamu\'s default video resolution setting." into ub-camera-glacier * commit '5b88f9a77fc997b922f99f0f5ec956b9caee42f9': Change Shamu's default video resolution setting.
|
d19eb82ad7d02e2dbced21674d64b42e6ee02eed |
21-Aug-2014 |
Senpo Hu <senpo@google.com> |
am 5b88f9a7: Merge "Change Shamu\'s default video resolution setting." into ub-camera-glacier * commit '5b88f9a77fc997b922f99f0f5ec956b9caee42f9': Change Shamu's default video resolution setting.
|
0382139c99988f0002afeafb4c35f3599b1fc02f |
21-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Enable progress reporting for modules like HDR+." into ub-camera-glacier
|
1653188c698863eb532413cf9f63331f62d53995 |
21-Aug-2014 |
Sol Boucher <solb@google.com> |
am c9a0c5dc: am dab267ce: Merge "TextureViewHelper workaround for SurfaceTexture/CameraProxy race" into ub-camera-glacier * commit 'c9a0c5dcb842913437fe7135fc40174156ec832a': TextureViewHelper workaround for SurfaceTexture/CameraProxy race
|
c9a0c5dcb842913437fe7135fc40174156ec832a |
21-Aug-2014 |
Sol Boucher <solb@google.com> |
am dab267ce: Merge "TextureViewHelper workaround for SurfaceTexture/CameraProxy race" into ub-camera-glacier * commit 'dab267ce77074883e7a3dd83f45c7722c16786dc': TextureViewHelper workaround for SurfaceTexture/CameraProxy race
|
4d601a6f546f72166bd89bba352e0c2370b0a8c2 |
21-Aug-2014 |
Sol Boucher <solb@google.com> |
am dab267ce: Merge "TextureViewHelper workaround for SurfaceTexture/CameraProxy race" into ub-camera-glacier * commit 'dab267ce77074883e7a3dd83f45c7722c16786dc': TextureViewHelper workaround for SurfaceTexture/CameraProxy race
|
90f158340db39bca9ee5da4cf1d246adbcb03453 |
21-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
Enable progress reporting for modules like HDR+. Bug: 16945820 Change-Id: If6aba8ff5d2b973f4ea8112110695a84f897d881
rc/com/android/camera/CaptureModule.java
rc/com/android/camera/one/OneCamera.java
rc/com/android/camera/one/OneCameraManager.java
rc/com/android/camera/one/v2/OneCameraManagerImpl.java
rc/com/android/camera/ui/ProgressRenderer.java
rc_pd/com/android/camera/one/v2/OneCameraCreator.java
|
5b88f9a77fc997b922f99f0f5ec956b9caee42f9 |
21-Aug-2014 |
Senpo Hu <senpo@google.com> |
Merge "Change Shamu's default video resolution setting." into ub-camera-glacier
|
20571ffe611c58d6d77e8d029b455f18c10181d5 |
19-Aug-2014 |
Senpo Hu <senpo@google.com> |
Change Shamu's default video resolution setting. Bug: 17060480 Change-Id: I5ce8d2d2960d21856c0f13e9599d80b0edc03ec9
es/values/arrays.xml
es/values/strings.xml
es/xml/camera_preferences.xml
rc/com/android/camera/VideoModule.java
rc/com/android/camera/settings/Keys.java
rc/com/android/camera/settings/SettingsManager.java
|
5997025bafdf95cb82685bc5853bf9f49fefffe2 |
20-Aug-2014 |
Andy Huibers <andyhuibers@google.com> |
am f9f990b4: am 2440815c: Merge "Add zoom to CaptureModule and OneCamera." into ub-camera-glacier * commit 'f9f990b433a416952691d4a632237a4f6a530c4d': Add zoom to CaptureModule and OneCamera.
|
f9f990b433a416952691d4a632237a4f6a530c4d |
20-Aug-2014 |
Andy Huibers <andyhuibers@google.com> |
am 2440815c: Merge "Add zoom to CaptureModule and OneCamera." into ub-camera-glacier * commit '2440815caec484357250ddf0442e7cde2f4241ca': Add zoom to CaptureModule and OneCamera.
|
0b832c3f870d0df792c64eebe46b14ff082e60d4 |
20-Aug-2014 |
Andy Huibers <andyhuibers@google.com> |
am 2440815c: Merge "Add zoom to CaptureModule and OneCamera." into ub-camera-glacier * commit '2440815caec484357250ddf0442e7cde2f4241ca': Add zoom to CaptureModule and OneCamera.
|
f3d59afab5f25caa02d33f351fc0f437b0778ae7 |
20-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
am 31213adc: am e7476817: Remove logspam * commit '31213adc650e5fa6652e4e0c646a3f18402137f3': Remove logspam
|
31213adc650e5fa6652e4e0c646a3f18402137f3 |
20-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
am e7476817: Remove logspam * commit 'e74768171ae2172f43ab69ce38ecad26fd6471e4': Remove logspam
|
c4ad932aa0616e9ddd4faa5cec2e10987bc29755 |
20-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
am e7476817: Remove logspam * commit 'e74768171ae2172f43ab69ce38ecad26fd6471e4': Remove logspam
|
e74768171ae2172f43ab69ce38ecad26fd6471e4 |
20-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
Remove logspam Bug: 17157295 Change-Id: I7b6b505a7d389b59ae440dde7b30da78aaefa0c0
rc/com/android/camera/data/CameraDataAdapter.java
|
2440815caec484357250ddf0442e7cde2f4241ca |
20-Aug-2014 |
Andy Huibers <andyhuibers@google.com> |
Merge "Add zoom to CaptureModule and OneCamera." into ub-camera-glacier
|
26b3334755ffccc039249005435d5cc598d0689e |
20-Aug-2014 |
Andy Huibers <andyhuibers@google.com> |
Add zoom to CaptureModule and OneCamera. Change-Id: Ia679d79a42e20e9033409939d0ca137ffcfbc75a
rc/com/android/camera/CaptureModule.java
rc/com/android/camera/CaptureModuleUI.java
rc/com/android/camera/debug/DebugPropertyHelper.java
rc/com/android/camera/one/AbstractOneCamera.java
rc/com/android/camera/one/OneCamera.java
rc/com/android/camera/one/v2/AutoFocusHelper.java
rc/com/android/camera/one/v2/OneCameraImpl.java
|
9e621f46a49b48ad2e9262413f128494a6c6eb24 |
20-Aug-2014 |
Alan Newberger <alann@google.com> |
am ee8012d1: am fac39daa: am 5f346aea: am 08c219b7: Merge "Update AOSP Camera product icon" into ub-camera-glacier * commit 'ee8012d1a39efff9fd4dc2aa4c7c383daabf3246': Update AOSP Camera product icon
|
ee8012d1a39efff9fd4dc2aa4c7c383daabf3246 |
20-Aug-2014 |
Alan Newberger <alann@google.com> |
am fac39daa: am 5f346aea: am 08c219b7: Merge "Update AOSP Camera product icon" into ub-camera-glacier * commit 'fac39daa2ea11fe7f5e6db98162d1b1c73e4f1ae': Update AOSP Camera product icon
|
fac39daa2ea11fe7f5e6db98162d1b1c73e4f1ae |
20-Aug-2014 |
Alan Newberger <alann@google.com> |
am 5f346aea: am 08c219b7: Merge "Update AOSP Camera product icon" into ub-camera-glacier * commit '5f346aea6711dd7b34b649f2294c6caf28a2bcfa': Update AOSP Camera product icon
|
5f346aea6711dd7b34b649f2294c6caf28a2bcfa |
20-Aug-2014 |
Alan Newberger <alann@google.com> |
am 08c219b7: Merge "Update AOSP Camera product icon" into ub-camera-glacier * commit '08c219b7ae2e32985eda869add10afa894f7140b': Update AOSP Camera product icon
|
f9dba5d3e7da1e5651c726d158bfe5ef3c7a306b |
20-Aug-2014 |
Alan Newberger <alann@google.com> |
am 08c219b7: Merge "Update AOSP Camera product icon" into ub-camera-glacier * commit '08c219b7ae2e32985eda869add10afa894f7140b': Update AOSP Camera product icon
|
ba564ba566e6d7b6bae8283cbd3026e05daff2b9 |
20-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
am 7bf15198: am 2225b2fc: am c946d235: am 6d7ed701: Merge "roduce debug output for android.util.Pair" into ub-camera-glacier * commit '7bf15198463abe8fc10cd44442fb0c582baf9fe8': roduce debug output for android.util.Pair
|
7bf15198463abe8fc10cd44442fb0c582baf9fe8 |
20-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
am 2225b2fc: am c946d235: am 6d7ed701: Merge "roduce debug output for android.util.Pair" into ub-camera-glacier * commit '2225b2fc7b7a532b431f188a9f9b8dd63e6d4505': roduce debug output for android.util.Pair
|
08c219b7ae2e32985eda869add10afa894f7140b |
20-Aug-2014 |
Alan Newberger <alann@google.com> |
Merge "Update AOSP Camera product icon" into ub-camera-glacier
|
97daada585797e57c16012bf43b67f191a218e7a |
20-Aug-2014 |
Alan Newberger <alann@google.com> |
Update AOSP Camera product icon Final updates for the icon. Keeping naming consistent with generated assets. Bug: 16985499 Change-Id: I389c2479b208dec05a0b3a1f2617d13b15913dcb
ndroidManifest.xml
es_p/drawable-hdpi/ic_camera_clr_48dp.png
es_p/drawable-hdpi/logo_camera_color_44in48dp.png
es_p/drawable-mdpi/ic_camera_clr_48dp.png
es_p/drawable-mdpi/logo_camera_color_44in48dp.png
es_p/drawable-xhdpi/ic_camera_clr_48dp.png
es_p/drawable-xhdpi/logo_camera_color_44in48dp.png
es_p/drawable-xxhdpi/ic_camera_clr_48dp.png
es_p/drawable-xxhdpi/logo_camera_color_44in48dp.png
es_p/drawable-xxxhdpi/ic_camera_clr_48dp.png
es_p/drawable-xxxhdpi/logo_camera_color_44in48dp.png
|
2225b2fc7b7a532b431f188a9f9b8dd63e6d4505 |
20-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
am c946d235: am 6d7ed701: Merge "roduce debug output for android.util.Pair" into ub-camera-glacier * commit 'c946d23543731f7a08fc8fa23160f287875d89c8': roduce debug output for android.util.Pair
|
9da2ad5e355ceef748d83ac98dbaf1ad1b9f968f |
20-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
am 6d7ed701: Merge "roduce debug output for android.util.Pair" into ub-camera-glacier * commit '6d7ed7016f28c240ae4901d076fc7f9583785c76': roduce debug output for android.util.Pair
|
c946d23543731f7a08fc8fa23160f287875d89c8 |
20-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
am 6d7ed701: Merge "roduce debug output for android.util.Pair" into ub-camera-glacier * commit '6d7ed7016f28c240ae4901d076fc7f9583785c76': roduce debug output for android.util.Pair
|
6d7ed7016f28c240ae4901d076fc7f9583785c76 |
20-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "roduce debug output for android.util.Pair" into ub-camera-glacier
|
7114133e8689ebc364cd4a6af222c5438b07bd74 |
19-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
roduce debug output for android.util.Pair Bug: 16945820 Change-Id: Ia19c6fbfcaf2b1497a76e05600afc5a5b7364e50
rc/com/android/camera/util/CaptureDataSerializer.java
|
6a8acfe406dff4c73aeb986092d053e6607b913c |
19-Aug-2014 |
Andy Huibers <andyhuibers@google.com> |
am fd6113a9: am 0ef4c88c: am 0624c03c: am 03e17a62: Start moving AF and 3A to separate class; improve logging. * commit 'fd6113a90dfeb4c217a51f222ff5e2575808e89a': Start moving AF and 3A to separate class; improve logging.
|
fd6113a90dfeb4c217a51f222ff5e2575808e89a |
19-Aug-2014 |
Andy Huibers <andyhuibers@google.com> |
am 0ef4c88c: am 0624c03c: am 03e17a62: Start moving AF and 3A to separate class; improve logging. * commit '0ef4c88cdd00831417dd004fc3b54246c61149b1': Start moving AF and 3A to separate class; improve logging.
|
0ef4c88cdd00831417dd004fc3b54246c61149b1 |
19-Aug-2014 |
Andy Huibers <andyhuibers@google.com> |
am 0624c03c: am 03e17a62: Start moving AF and 3A to separate class; improve logging. * commit '0624c03c9c59e095945821abb3fe34abd21149ea': Start moving AF and 3A to separate class; improve logging.
|
0624c03c9c59e095945821abb3fe34abd21149ea |
19-Aug-2014 |
Andy Huibers <andyhuibers@google.com> |
am 03e17a62: Start moving AF and 3A to separate class; improve logging. * commit '03e17a62b43e58c8da5cd6ee23fd0809a82ee448': Start moving AF and 3A to separate class; improve logging.
|
be53d810b2b02f066ca0ace89a2dc3d56feca339 |
19-Aug-2014 |
Andy Huibers <andyhuibers@google.com> |
am 03e17a62: Start moving AF and 3A to separate class; improve logging. * commit '03e17a62b43e58c8da5cd6ee23fd0809a82ee448': Start moving AF and 3A to separate class; improve logging.
|
03e17a62b43e58c8da5cd6ee23fd0809a82ee448 |
19-Aug-2014 |
Andy Huibers <andyhuibers@google.com> |
Start moving AF and 3A to separate class; improve logging. Change-Id: Ib73415ffd5569fab8c2c3bf5ac0f35616d3ee697
rc/com/android/camera/one/v2/AutoFocusHelper.java
rc/com/android/camera/one/v2/OneCameraImpl.java
|
25697e4ccde8f842258ff20124812fa8d6726d64 |
19-Aug-2014 |
Alan Newberger <alann@google.com> |
am 630418d4: am b68c00a8: am acb9e27b: am 34264dab: Merge "Remove extra parent mode from array, and make PhotoModule scope string public" into ub-camera-glacier * commit '630418d4d4dc01a14e277eaf389d1de10894e7b3': Remove extra parent mode from array, and make PhotoModule scope string public
|
7a6706df6bd14a6826f2de086f0edde4a37ffff1 |
19-Aug-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I14d24dceefdb4fe46ca51182b30174cff5b623de Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-km-rKH/strings.xml
es/values-ko/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mn-rMN/strings.xml
es/values-ms-rMY/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
dab267ce77074883e7a3dd83f45c7722c16786dc |
21-Aug-2014 |
Sol Boucher <solb@google.com> |
Merge "TextureViewHelper workaround for SurfaceTexture/CameraProxy race" into ub-camera-glacier
|
395bc17b71d13d97b3fd9f258fcf4d5748e66e5e |
21-Aug-2014 |
Sol Boucher <solb@google.com> |
TextureViewHelper workaround for SurfaceTexture/CameraProxy race CameraController#getCurrentCameraId() now returns the ID of the requested camera device if called after #requestCamera() but before the camera device has finished opening. Assuming the most recent request is for the desired API level and device, this resolves an issue where no transformation matrix was applied on returning from the settings activity. Bug: 17140996 Change-Id: Ideaec0072acd8aab77b98b213f260907f84270de
rc/com/android/camera/app/CameraController.java
|
5a10b9a547225513278f1afa13c2470d5a53e5f8 |
19-Aug-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I816f6a71f1c5fa754214261771e5dd4fc933949c Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-km-rKH/strings.xml
es/values-ko/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mn-rMN/strings.xml
es/values-ms-rMY/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
f79c0e06de8bac05309b9ab02ac5aad4c49280d7 |
19-Aug-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Iaff97f1a2a3825781ef7f07a14c34bfdc7d44082 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-bn-rBD/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-eu-rES/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-gl-rES/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-is-rIS/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-kk-rKZ/strings.xml
es/values-km-rKH/strings.xml
es/values-kn-rIN/strings.xml
es/values-ko/strings.xml
es/values-ky-rKG/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mk-rMK/strings.xml
es/values-ml-rIN/strings.xml
es/values-mn-rMN/strings.xml
es/values-mr-rIN/strings.xml
es/values-ms-rMY/strings.xml
es/values-my-rMM/strings.xml
es/values-nb/strings.xml
es/values-ne-rNP/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-si-rLK/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-ta-rIN/strings.xml
es/values-te-rIN/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-ur-rPK/strings.xml
es/values-uz-rUZ/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
f65d6dbea4017947af8dc4cd02b2f88b3306429a |
19-Aug-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I7c0b56efb936502a99d096109483b805cfa34fba Auto-generated-cl: translation import
es/values-el/strings.xml
es/values-my-rMM/strings.xml
|
630418d4d4dc01a14e277eaf389d1de10894e7b3 |
19-Aug-2014 |
Alan Newberger <alann@google.com> |
am b68c00a8: am acb9e27b: am 34264dab: Merge "Remove extra parent mode from array, and make PhotoModule scope string public" into ub-camera-glacier * commit 'b68c00a8143347121528c712e8eab45c8b341dd5': Remove extra parent mode from array, and make PhotoModule scope string public
|
b68c00a8143347121528c712e8eab45c8b341dd5 |
19-Aug-2014 |
Alan Newberger <alann@google.com> |
am acb9e27b: am 34264dab: Merge "Remove extra parent mode from array, and make PhotoModule scope string public" into ub-camera-glacier * commit 'acb9e27bb2bd53225ca3a9bf92729787be5fa6c7': Remove extra parent mode from array, and make PhotoModule scope string public
|
acb9e27bb2bd53225ca3a9bf92729787be5fa6c7 |
19-Aug-2014 |
Alan Newberger <alann@google.com> |
am 34264dab: Merge "Remove extra parent mode from array, and make PhotoModule scope string public" into ub-camera-glacier * commit '34264dab0b30bfcc3af38c3211d5a9cf9f9932e6': Remove extra parent mode from array, and make PhotoModule scope string public
|
5eef91210b46e16fe71d72d49bb580ce7d335525 |
19-Aug-2014 |
Alan Newberger <alann@google.com> |
am 34264dab: Merge "Remove extra parent mode from array, and make PhotoModule scope string public" into ub-camera-glacier * commit '34264dab0b30bfcc3af38c3211d5a9cf9f9932e6': Remove extra parent mode from array, and make PhotoModule scope string public
|
f0edf080b1b5937a62f2a2706a76e505c5636e26 |
19-Aug-2014 |
Spike Sprague <spikuru@google.com> |
am 4937acf8: am 9970bc03: am 724ab1ad: am 5f8927b9: Merge "tweak filmstrip show/hide background for Material Design" into ub-camera-glacier * commit '4937acf89283d137f6bf45bc79779b819920ca26': tweak filmstrip show/hide background for Material Design
|
4937acf89283d137f6bf45bc79779b819920ca26 |
19-Aug-2014 |
Spike Sprague <spikuru@google.com> |
am 9970bc03: am 724ab1ad: am 5f8927b9: Merge "tweak filmstrip show/hide background for Material Design" into ub-camera-glacier * commit '9970bc03512f1391409039446c49cd074b56e794': tweak filmstrip show/hide background for Material Design
|
9970bc03512f1391409039446c49cd074b56e794 |
19-Aug-2014 |
Spike Sprague <spikuru@google.com> |
am 724ab1ad: am 5f8927b9: Merge "tweak filmstrip show/hide background for Material Design" into ub-camera-glacier * commit '724ab1ad6daae48d7431c907ca8baa2b5fec2dc8': tweak filmstrip show/hide background for Material Design
|
b04889b8d20d138f0e8b63c21eaa1f3faa0f67ac |
19-Aug-2014 |
Spike Sprague <spikuru@google.com> |
am 5f8927b9: Merge "tweak filmstrip show/hide background for Material Design" into ub-camera-glacier * commit '5f8927b94ebed2a0710ed8c60acfbbe1d92bc437': tweak filmstrip show/hide background for Material Design
|
724ab1ad6daae48d7431c907ca8baa2b5fec2dc8 |
19-Aug-2014 |
Spike Sprague <spikuru@google.com> |
am 5f8927b9: Merge "tweak filmstrip show/hide background for Material Design" into ub-camera-glacier * commit '5f8927b94ebed2a0710ed8c60acfbbe1d92bc437': tweak filmstrip show/hide background for Material Design
|
5f8927b94ebed2a0710ed8c60acfbbe1d92bc437 |
19-Aug-2014 |
Spike Sprague <spikuru@google.com> |
Merge "tweak filmstrip show/hide background for Material Design" into ub-camera-glacier
|
3088f90d01e169c7b2ee626069a8714f695436f5 |
19-Aug-2014 |
Spike Sprague <spikuru@google.com> |
tweak filmstrip show/hide background for Material Design bug: 17113925 Change-Id: I5d478e3e72346e4a333aa2399d339130c5ca4187
rc/com/android/camera/widget/FilmstripLayout.java
|
8e1c80603ec195ba21aa6f86198e5d6e5ddc8b3f |
19-Aug-2014 |
Spike Sprague <spikuru@google.com> |
am b0216da2: am 346ead2f: am bbbfedc8: am 66d3d0d0: add functionality to enable/disable clicks on a MultiToggleImageButton without affecting its visual state. * commit 'b0216da25f034c5cd043e59dddbef7cb7d12a72a': add functionality to enable/disable clicks on a MultiToggleImageButton without affecting its visual state.
|
b0216da25f034c5cd043e59dddbef7cb7d12a72a |
19-Aug-2014 |
Spike Sprague <spikuru@google.com> |
am 346ead2f: am bbbfedc8: am 66d3d0d0: add functionality to enable/disable clicks on a MultiToggleImageButton without affecting its visual state. * commit '346ead2f7549940106226f18a0aeb37b52c208ca': add functionality to enable/disable clicks on a MultiToggleImageButton without affecting its visual state.
|
346ead2f7549940106226f18a0aeb37b52c208ca |
18-Aug-2014 |
Spike Sprague <spikuru@google.com> |
am bbbfedc8: am 66d3d0d0: add functionality to enable/disable clicks on a MultiToggleImageButton without affecting its visual state. * commit 'bbbfedc84be9763b344b598c8975b89235fa50a0': add functionality to enable/disable clicks on a MultiToggleImageButton without affecting its visual state.
|
bbbfedc84be9763b344b598c8975b89235fa50a0 |
18-Aug-2014 |
Spike Sprague <spikuru@google.com> |
am 66d3d0d0: add functionality to enable/disable clicks on a MultiToggleImageButton without affecting its visual state. * commit '66d3d0d0633324893b89e1ddec14a4710d8034c3': add functionality to enable/disable clicks on a MultiToggleImageButton without affecting its visual state.
|
a764124d1f239c23c687db52612cb7bbf64f77dd |
18-Aug-2014 |
Spike Sprague <spikuru@google.com> |
am 66d3d0d0: add functionality to enable/disable clicks on a MultiToggleImageButton without affecting its visual state. * commit '66d3d0d0633324893b89e1ddec14a4710d8034c3': add functionality to enable/disable clicks on a MultiToggleImageButton without affecting its visual state.
|
66d3d0d0633324893b89e1ddec14a4710d8034c3 |
18-Aug-2014 |
Spike Sprague <spikuru@google.com> |
add functionality to enable/disable clicks on a MultiToggleImageButton without affecting its visual state. bug: 17014507 Change-Id: I824e07d518cce9768cf48f4c50afe079ebff4121
rc/com/android/camera/ButtonManager.java
rc/com/android/camera/MultiToggleImageButton.java
rc/com/android/camera/PhotoModule.java
|
f4266c9f8b41be8fd382b344f0bfb51a5ebc1ca3 |
18-Aug-2014 |
Alan Newberger <alann@google.com> |
am e898713c: am def22aed: am d87030d6: am 251402b0: Merge "Protect Camera2 functions from null CameraDeviceInfo" into ub-camera-glacier * commit 'e898713cac74d85fe68da59fb86317e34205e885': Protect Camera2 functions from null CameraDeviceInfo
|
34a080bad7cc417f7eceba9f8569637c1976a1c7 |
18-Aug-2014 |
Spike Sprague <spikuru@google.com> |
am 93a6e7a2: am c40a1d00: am 4374a54d: am a675af27: Merge "change settings to use dark theme." into ub-camera-glacier * commit '93a6e7a277c6f0e355a6448f3f5e6df67a9930b3': change settings to use dark theme.
|
e898713cac74d85fe68da59fb86317e34205e885 |
18-Aug-2014 |
Alan Newberger <alann@google.com> |
am def22aed: am d87030d6: am 251402b0: Merge "Protect Camera2 functions from null CameraDeviceInfo" into ub-camera-glacier * commit 'def22aede439661af21ef7815755dfc901cc8fed': Protect Camera2 functions from null CameraDeviceInfo
|
93a6e7a277c6f0e355a6448f3f5e6df67a9930b3 |
18-Aug-2014 |
Spike Sprague <spikuru@google.com> |
am c40a1d00: am 4374a54d: am a675af27: Merge "change settings to use dark theme." into ub-camera-glacier * commit 'c40a1d00543e4121e7a09562b061b15a4ee58f6f': change settings to use dark theme.
|
def22aede439661af21ef7815755dfc901cc8fed |
18-Aug-2014 |
Alan Newberger <alann@google.com> |
am d87030d6: am 251402b0: Merge "Protect Camera2 functions from null CameraDeviceInfo" into ub-camera-glacier * commit 'd87030d6f3e2077f3a699abd9cad089449b834e2': Protect Camera2 functions from null CameraDeviceInfo
|
c40a1d00543e4121e7a09562b061b15a4ee58f6f |
18-Aug-2014 |
Spike Sprague <spikuru@google.com> |
am 4374a54d: am a675af27: Merge "change settings to use dark theme." into ub-camera-glacier * commit '4374a54d79483fbd501fd6ee5392be47bb0be7f5': change settings to use dark theme.
|
d87030d6f3e2077f3a699abd9cad089449b834e2 |
18-Aug-2014 |
Alan Newberger <alann@google.com> |
am 251402b0: Merge "Protect Camera2 functions from null CameraDeviceInfo" into ub-camera-glacier * commit '251402b0765e6ca2093ed674fa15ca295896273f': Protect Camera2 functions from null CameraDeviceInfo
|
4374a54d79483fbd501fd6ee5392be47bb0be7f5 |
18-Aug-2014 |
Spike Sprague <spikuru@google.com> |
am a675af27: Merge "change settings to use dark theme." into ub-camera-glacier * commit 'a675af27505aded7ba3ceeef7421a190232533bf': change settings to use dark theme.
|
d7c5f149afb234973fcfd362b641a74f7bf5da11 |
18-Aug-2014 |
Alan Newberger <alann@google.com> |
am 251402b0: Merge "Protect Camera2 functions from null CameraDeviceInfo" into ub-camera-glacier * commit '251402b0765e6ca2093ed674fa15ca295896273f': Protect Camera2 functions from null CameraDeviceInfo
|
c6d70ab0c434b52d41fc1f88619b81360de1828d |
18-Aug-2014 |
Spike Sprague <spikuru@google.com> |
am a675af27: Merge "change settings to use dark theme." into ub-camera-glacier * commit 'a675af27505aded7ba3ceeef7421a190232533bf': change settings to use dark theme.
|
2d0bb53fa1af124a08f59a952be19cd7623f933f |
17-Aug-2014 |
Baligh Uddin <baligh@google.com> |
am f3e82f6f: (-s ours) am fccbebfa: (-s ours) am 0938937f: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit 'f3e82f6f1d4a6acda48ee74ec037db1da32a1b74': Import translations. DO NOT MERGE
|
f3e82f6f1d4a6acda48ee74ec037db1da32a1b74 |
17-Aug-2014 |
Baligh Uddin <baligh@google.com> |
am fccbebfa: (-s ours) am 0938937f: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit 'fccbebfa0864d62cb1bc30b3807d9e357dac2f97': Import translations. DO NOT MERGE
|
fccbebfa0864d62cb1bc30b3807d9e357dac2f97 |
17-Aug-2014 |
Baligh Uddin <baligh@google.com> |
am 0938937f: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit '0938937f02462896b9640274ea8428e0c99939ac': Import translations. DO NOT MERGE
|
45be445f685d90f087eca0d3d299958db1426007 |
16-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
am 96b56a61: am 1ecc6e42: am 5d25fcf1: am a2dd9ea5: Fix orientation and move it to the util class so we can use it elsewhere. * commit '96b56a616f062f7fa7246e60f929371140b4cf1b': Fix orientation and move it to the util class so we can use it elsewhere.
|
96b56a616f062f7fa7246e60f929371140b4cf1b |
16-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
am 1ecc6e42: am 5d25fcf1: am a2dd9ea5: Fix orientation and move it to the util class so we can use it elsewhere. * commit '1ecc6e42783557ac54cb9458e65375323899a471': Fix orientation and move it to the util class so we can use it elsewhere.
|
1ecc6e42783557ac54cb9458e65375323899a471 |
16-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
am 5d25fcf1: am a2dd9ea5: Fix orientation and move it to the util class so we can use it elsewhere. * commit '5d25fcf1925561605defad987af3ecc27e685a3d': Fix orientation and move it to the util class so we can use it elsewhere.
|
5d25fcf1925561605defad987af3ecc27e685a3d |
16-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
am a2dd9ea5: Fix orientation and move it to the util class so we can use it elsewhere. * commit 'a2dd9ea5ba031128b9f0aa3852ff59991dd3008c': Fix orientation and move it to the util class so we can use it elsewhere.
|
f551a8afe83e77961f3d6a59d0ab3281f6038564 |
16-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
am a2dd9ea5: Fix orientation and move it to the util class so we can use it elsewhere. * commit 'a2dd9ea5ba031128b9f0aa3852ff59991dd3008c': Fix orientation and move it to the util class so we can use it elsewhere.
|
9ed64725307c6470453e1972bc8d30409ca2d0cd |
16-Aug-2014 |
Baligh Uddin <baligh@google.com> |
am 9be4d65e: (-s ours) am 59101ff6: (-s ours) am 115cbe5c: (-s ours) am 45144e03: (-s ours) am 69853a4e: (-s ours) Import translations. DO NOT MERGE * commit '9be4d65eb8de2a1f70af496e79aac1990499b5c4': Import translations. DO NOT MERGE
|
9be4d65eb8de2a1f70af496e79aac1990499b5c4 |
16-Aug-2014 |
Baligh Uddin <baligh@google.com> |
am 59101ff6: (-s ours) am 115cbe5c: (-s ours) am 45144e03: (-s ours) am 69853a4e: (-s ours) Import translations. DO NOT MERGE * commit '59101ff69658730e7b78e7a5b2c5192928b6b1cb': Import translations. DO NOT MERGE
|
59101ff69658730e7b78e7a5b2c5192928b6b1cb |
16-Aug-2014 |
Baligh Uddin <baligh@google.com> |
am 115cbe5c: (-s ours) am 45144e03: (-s ours) am 69853a4e: (-s ours) Import translations. DO NOT MERGE * commit '115cbe5ca190859f7d7db197f252bf128c6c6bf2': Import translations. DO NOT MERGE
|
34264dab0b30bfcc3af38c3211d5a9cf9f9932e6 |
19-Aug-2014 |
Alan Newberger <alann@google.com> |
Merge "Remove extra parent mode from array, and make PhotoModule scope string public" into ub-camera-glacier
|
00a390e17672cc81bc15b8478f27019358e6d6a4 |
19-Aug-2014 |
Alan Newberger <alann@google.com> |
Remove extra parent mode from array, and make PhotoModule scope string public When pruning modes, we neglected to remove one of the 'photo' parent modes. This still worked because the last two entries were both 'photo'. Also, making PhotoModule scope string public so it can be referred to by other modules, to accomplish the same parent function as the array. Bug: 17103121 Change-Id: I574e9a7c2db8bf2c86d810c930fbf510d5aa1a24
es/values/arrays.xml
rc/com/android/camera/PhotoModule.java
|
115cbe5ca190859f7d7db197f252bf128c6c6bf2 |
16-Aug-2014 |
Baligh Uddin <baligh@google.com> |
am 45144e03: (-s ours) am 69853a4e: (-s ours) Import translations. DO NOT MERGE * commit '45144e03cd84ba7748a782fbd3f5193804d45a39': Import translations. DO NOT MERGE
|
0938937f02462896b9640274ea8428e0c99939ac |
17-Aug-2014 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into lmp-dev
|
40b25e769dd5db8f2cc748592d9a3d66d4dca1a3 |
16-Aug-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I113288c4b072dce479ec8aa25cad01fcbf47501f Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-bn-rBD/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-eu-rES/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-gl-rES/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-is-rIS/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-kk-rKZ/strings.xml
es/values-km-rKH/strings.xml
es/values-kn-rIN/strings.xml
es/values-ko/strings.xml
es/values-ky-rKG/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mk-rMK/strings.xml
es/values-ml-rIN/strings.xml
es/values-mn-rMN/strings.xml
es/values-mr-rIN/strings.xml
es/values-ms-rMY/strings.xml
es/values-my-rMM/strings.xml
es/values-nb/strings.xml
es/values-ne-rNP/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-si-rLK/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-ta-rIN/strings.xml
es/values-te-rIN/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-ur-rPK/strings.xml
es/values-uz-rUZ/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
a675af27505aded7ba3ceeef7421a190232533bf |
18-Aug-2014 |
Spike Sprague <spikuru@google.com> |
Merge "change settings to use dark theme." into ub-camera-glacier
|
251402b0765e6ca2093ed674fa15ca295896273f |
18-Aug-2014 |
Alan Newberger <alann@google.com> |
Merge "Protect Camera2 functions from null CameraDeviceInfo" into ub-camera-glacier
|
5242f6fdaa8a988fe7fad9fae63d954eab447041 |
16-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
am 32e21563: (-s ours) am 9df3a83e: am 2c2a1ec4: am 096e5b73: (-s ours) DO NOT MERGE - Reverting accidentally merged 524943 into glacier. * commit '32e215630e29e7ec27a8a1e3c281f2d48e614d08': DO NOT MERGE - Reverting accidentally merged 524943 into glacier.
|
32e215630e29e7ec27a8a1e3c281f2d48e614d08 |
16-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
am 9df3a83e: am 2c2a1ec4: am 096e5b73: (-s ours) DO NOT MERGE - Reverting accidentally merged 524943 into glacier. * commit '9df3a83e669584002c28cad024f53e204829a501': DO NOT MERGE - Reverting accidentally merged 524943 into glacier.
|
9df3a83e669584002c28cad024f53e204829a501 |
16-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
am 2c2a1ec4: am 096e5b73: (-s ours) DO NOT MERGE - Reverting accidentally merged 524943 into glacier. * commit '2c2a1ec4f1e1182cd4c66a053a93315549f06d5e': DO NOT MERGE - Reverting accidentally merged 524943 into glacier.
|
2c2a1ec4f1e1182cd4c66a053a93315549f06d5e |
16-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
am 096e5b73: (-s ours) DO NOT MERGE - Reverting accidentally merged 524943 into glacier. * commit '096e5b734a18dae5bdca5cc312ad61ce09568f3f': DO NOT MERGE - Reverting accidentally merged 524943 into glacier.
|
28ae6407fb1ab40c48643f6f793860a43e8d8c9c |
16-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
am 096e5b73: (-s ours) DO NOT MERGE - Reverting accidentally merged 524943 into glacier. * commit '096e5b734a18dae5bdca5cc312ad61ce09568f3f': DO NOT MERGE - Reverting accidentally merged 524943 into glacier.
|
a2dd9ea5ba031128b9f0aa3852ff59991dd3008c |
16-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
Fix orientation and move it to the util class so we can use it elsewhere. Bug: 16948752 Change-Id: Ic7bf2f01176d8f6f1e1a70940c35531e1a5a1cbc
rc/com/android/camera/one/v2/OneCameraImpl.java
rc/com/android/camera/util/CameraUtil.java
|
096e5b734a18dae5bdca5cc312ad61ce09568f3f |
16-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
DO NOT MERGE - Reverting accidentally merged 524943 into glacier. We only want it in Haleakala, but it go into glacier through another CL. Change-Id: Ie08ec3e0d1ad7637650c45bf1908a04267464935
rc/com/android/camera/app/CameraApp.java
|
2040b56b1e0a93b38a558fa56e4b49970bd4b248 |
16-Aug-2014 |
Alan Newberger <alann@google.com> |
Protect Camera2 functions from null CameraDeviceInfo When the underlying camera fails, the camera1 agent returns null for CameraDeviceInfo. Guard against this case where it is used in app upgrading and settings. Bug: 16982203 Change-Id: I7e4686e508993f0d0fc03eaa9e0b5dc312016eae
rc/com/android/camera/settings/AppUpgrader.java
rc/com/android/camera/settings/CameraSettingsActivity.java
|
2f31d81f1deda263b1909db008604704765ead06 |
16-Aug-2014 |
Sol Boucher <solb@google.com> |
am 5270857a: am 9b00e62c: am 2745d3a0: am 8563d90f: Merge "Move preview transform matrix code into portability library" into ub-camera-glacier * commit '5270857aba669776b3b3c1d5343319bee0b414dc': Move preview transform matrix code into portability library
|
9ec89491277744644580c0ced7c41e3a7a23c93b |
16-Aug-2014 |
Sol Boucher <solb@google.com> |
am 90f7986c: am 5ce88303: am 060ed6e0: am f67f64f3: Merge "Enable seamless switching to/from camera2-backed Photo module" into ub-camera-glacier * commit '90f7986c00e15c8a2968ebfcdbfb8bd48271da76': Enable seamless switching to/from camera2-backed Photo module
|
435bda05ccbc4ef236cfa115426c9a9948f39164 |
16-Aug-2014 |
Andy Huibers <andyhuibers@google.com> |
am b62dc345: am c4312fbb: am 4b83e6e1: am a69d497f: Merge "Reset 3A regions during CONTINUOUS_PICTURE passive scanning per camera2 API." into ub-camera-glacier * commit 'b62dc345e9e5b65729ef25a6e2eadc7258de9f45': Reset 3A regions during CONTINUOUS_PICTURE passive scanning per camera2 API.
|
5270857aba669776b3b3c1d5343319bee0b414dc |
16-Aug-2014 |
Sol Boucher <solb@google.com> |
am 9b00e62c: am 2745d3a0: am 8563d90f: Merge "Move preview transform matrix code into portability library" into ub-camera-glacier * commit '9b00e62cefc04649e50e7ffc62f7ed85a02c5829': Move preview transform matrix code into portability library
|
90f7986c00e15c8a2968ebfcdbfb8bd48271da76 |
16-Aug-2014 |
Sol Boucher <solb@google.com> |
am 5ce88303: am 060ed6e0: am f67f64f3: Merge "Enable seamless switching to/from camera2-backed Photo module" into ub-camera-glacier * commit '5ce883033b9997193c1e3541c8d4ff000c6b2644': Enable seamless switching to/from camera2-backed Photo module
|
9b00e62cefc04649e50e7ffc62f7ed85a02c5829 |
16-Aug-2014 |
Sol Boucher <solb@google.com> |
am 2745d3a0: am 8563d90f: Merge "Move preview transform matrix code into portability library" into ub-camera-glacier * commit '2745d3a0e3de4c542ebf844dfd634803075bb181': Move preview transform matrix code into portability library
|
5ce883033b9997193c1e3541c8d4ff000c6b2644 |
16-Aug-2014 |
Sol Boucher <solb@google.com> |
am 060ed6e0: am f67f64f3: Merge "Enable seamless switching to/from camera2-backed Photo module" into ub-camera-glacier * commit '060ed6e0026222cf41fbe8a8bbd5abaa3f424479': Enable seamless switching to/from camera2-backed Photo module
|
2745d3a0e3de4c542ebf844dfd634803075bb181 |
16-Aug-2014 |
Sol Boucher <solb@google.com> |
am 8563d90f: Merge "Move preview transform matrix code into portability library" into ub-camera-glacier * commit '8563d90f706ac7505014d59fda2bcef92c221c6e': Move preview transform matrix code into portability library
|
7fc9ec53451c8bcbaa49cd85d4984e3e988d2f0d |
16-Aug-2014 |
Sol Boucher <solb@google.com> |
am 8563d90f: Merge "Move preview transform matrix code into portability library" into ub-camera-glacier * commit '8563d90f706ac7505014d59fda2bcef92c221c6e': Move preview transform matrix code into portability library
|
9b8baf73b9d2f450691c1718b329a4763be5513a |
16-Aug-2014 |
Sol Boucher <solb@google.com> |
am f67f64f3: Merge "Enable seamless switching to/from camera2-backed Photo module" into ub-camera-glacier * commit 'f67f64f3b5272d1da317b8eda8e1ea1e46539416': Enable seamless switching to/from camera2-backed Photo module
|
060ed6e0026222cf41fbe8a8bbd5abaa3f424479 |
16-Aug-2014 |
Sol Boucher <solb@google.com> |
am f67f64f3: Merge "Enable seamless switching to/from camera2-backed Photo module" into ub-camera-glacier * commit 'f67f64f3b5272d1da317b8eda8e1ea1e46539416': Enable seamless switching to/from camera2-backed Photo module
|
45144e03cd84ba7748a782fbd3f5193804d45a39 |
16-Aug-2014 |
Baligh Uddin <baligh@google.com> |
am 69853a4e: (-s ours) Import translations. DO NOT MERGE * commit '69853a4e0e38fd3a193ea872beb496a090de8364': Import translations. DO NOT MERGE
|
b62dc345e9e5b65729ef25a6e2eadc7258de9f45 |
16-Aug-2014 |
Andy Huibers <andyhuibers@google.com> |
am c4312fbb: am 4b83e6e1: am a69d497f: Merge "Reset 3A regions during CONTINUOUS_PICTURE passive scanning per camera2 API." into ub-camera-glacier * commit 'c4312fbb6284859576bdf70162dd016417c6abfc': Reset 3A regions during CONTINUOUS_PICTURE passive scanning per camera2 API.
|
c4312fbb6284859576bdf70162dd016417c6abfc |
15-Aug-2014 |
Andy Huibers <andyhuibers@google.com> |
am 4b83e6e1: am a69d497f: Merge "Reset 3A regions during CONTINUOUS_PICTURE passive scanning per camera2 API." into ub-camera-glacier * commit '4b83e6e19c099df66cea4c2a276b9b1d13940def': Reset 3A regions during CONTINUOUS_PICTURE passive scanning per camera2 API.
|
492cc95c7c89b9c4a89d7b89dc82dc8558860f4a |
15-Aug-2014 |
Andy Huibers <andyhuibers@google.com> |
am a69d497f: Merge "Reset 3A regions during CONTINUOUS_PICTURE passive scanning per camera2 API." into ub-camera-glacier * commit 'a69d497fd44faab8afe65b748dfede715ea7239f': Reset 3A regions during CONTINUOUS_PICTURE passive scanning per camera2 API.
|
4b83e6e19c099df66cea4c2a276b9b1d13940def |
15-Aug-2014 |
Andy Huibers <andyhuibers@google.com> |
am a69d497f: Merge "Reset 3A regions during CONTINUOUS_PICTURE passive scanning per camera2 API." into ub-camera-glacier * commit 'a69d497fd44faab8afe65b748dfede715ea7239f': Reset 3A regions during CONTINUOUS_PICTURE passive scanning per camera2 API.
|
69853a4e0e38fd3a193ea872beb496a090de8364 |
15-Aug-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ie72a2db813a20fb666e81f34c63733e34548387b Auto-generated-cl: translation import
es/values-am/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-in/strings.xml
es/values-km-rKH/strings.xml
es/values-th/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
|
1af830fad3e6e06c9869298c64beb23522d5d311 |
15-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
am 7641b175: am 26ab5c94: am ee5ebcf3: am fa7b92c1: Merge "Add ability to add a ready-state changed listener to the camera." into ub-camera-glacier * commit '7641b175cab0a080e497dc28eb61a891e9cbca3c': Add ability to add a ready-state changed listener to the camera.
|
f67f64f3b5272d1da317b8eda8e1ea1e46539416 |
16-Aug-2014 |
Sol Boucher <solb@google.com> |
Merge "Enable seamless switching to/from camera2-backed Photo module" into ub-camera-glacier
|
44ce4b26614f85518d548a6750c7a08908ae3596 |
05-Aug-2014 |
Sol Boucher <solb@google.com> |
Enable seamless switching to/from camera2-backed Photo module This supports running individual modules against the camera2 API framework while the rest of the modules use the legacy Camera class. Bug: 16875535 Change-Id: Ic0ae313a3dd96ba22bacc36c7b1712b183b713ff
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/app/CameraController.java
rc/com/android/camera/app/CameraProvider.java
rc/com/android/camera/settings/AppUpgrader.java
rc/com/android/camera/settings/CameraSettingsActivity.java
rc_pd/com/android/camera/util/GservicesHelper.java
|
7641b175cab0a080e497dc28eb61a891e9cbca3c |
15-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
am 26ab5c94: am ee5ebcf3: am fa7b92c1: Merge "Add ability to add a ready-state changed listener to the camera." into ub-camera-glacier * commit '26ab5c94bd4abf2ddeae533cb818c510b9996c1b': Add ability to add a ready-state changed listener to the camera.
|
dffed29bfdbbdab4cf0ed961fc3c69af9f378270 |
15-Aug-2014 |
Andy Huibers <andyhuibers@google.com> |
am c94de5c7: am a842409b: am 94f5b240: am 064f851a: Hold touch to focus target in 3A UI debug mode. * commit 'c94de5c7677fe979ff225b375fe706e278def87a': Hold touch to focus target in 3A UI debug mode.
|
c94de5c7677fe979ff225b375fe706e278def87a |
15-Aug-2014 |
Andy Huibers <andyhuibers@google.com> |
am a842409b: am 94f5b240: am 064f851a: Hold touch to focus target in 3A UI debug mode. * commit 'a842409b378b57cb15fb77a2e937cf63dc97436f': Hold touch to focus target in 3A UI debug mode.
|
26ab5c94bd4abf2ddeae533cb818c510b9996c1b |
15-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
am ee5ebcf3: am fa7b92c1: Merge "Add ability to add a ready-state changed listener to the camera." into ub-camera-glacier * commit 'ee5ebcf3ceb89022195f5708527d56f1199963ae': Add ability to add a ready-state changed listener to the camera.
|
ee5ebcf3ceb89022195f5708527d56f1199963ae |
15-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
am fa7b92c1: Merge "Add ability to add a ready-state changed listener to the camera." into ub-camera-glacier * commit 'fa7b92c1ee99bc6734c06bb50445cffae94e8197': Add ability to add a ready-state changed listener to the camera.
|
0ca1fecd6c942ad5590b5be2950d9dbd8d717266 |
15-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
am fa7b92c1: Merge "Add ability to add a ready-state changed listener to the camera." into ub-camera-glacier * commit 'fa7b92c1ee99bc6734c06bb50445cffae94e8197': Add ability to add a ready-state changed listener to the camera.
|
a69d497fd44faab8afe65b748dfede715ea7239f |
15-Aug-2014 |
Andy Huibers <andyhuibers@google.com> |
Merge "Reset 3A regions during CONTINUOUS_PICTURE passive scanning per camera2 API." into ub-camera-glacier
|
34ac0609e30601fe2ce9b2338a173d7740ab3f82 |
15-Aug-2014 |
Andy Huibers <andyhuibers@google.com> |
Reset 3A regions during CONTINUOUS_PICTURE passive scanning per camera2 API. Bug: 17028594 Change-Id: I8ce7dbd12f2b14a50068d8b034e7a80d8840f012
rc/com/android/camera/one/v2/OneCameraImpl.java
|
fa7b92c1ee99bc6734c06bb50445cffae94e8197 |
15-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Add ability to add a ready-state changed listener to the camera." into ub-camera-glacier
|
e3ad4352a23ddb21350d356e0947905d1e635911 |
15-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
Add ability to add a ready-state changed listener to the camera. Bug: 16945820 Bug: 16948752 This enables us to hook up memory intense cameras and make sure we don't activate the shutter button if the camera is not ready. Change-Id: I70a31c76e063d775c844404ee9e20e583fa233e3
rc/com/android/camera/CaptureModule.java
rc/com/android/camera/one/AbstractOneCamera.java
rc/com/android/camera/one/OneCamera.java
rc/com/android/camera/one/v2/OneCameraImpl.java
|
8563d90f706ac7505014d59fda2bcef92c221c6e |
16-Aug-2014 |
Sol Boucher <solb@google.com> |
Merge "Move preview transform matrix code into portability library" into ub-camera-glacier
|
8c8fb114ad4e121c4c1f3d726632dffbb32bda13 |
12-Aug-2014 |
Sol Boucher <solb@google.com> |
Move preview transform matrix code into portability library This allows it to be calculated differently depending on the backing camera API, which means that camera2 preview streams can be (and are!) displayed upright. Bug: 16875535 Change-Id: I58fa86098a8b8eddc8f864b93d1e92672c40a1de
rc/com/android/camera/TextureViewHelper.java
rc/com/android/camera/app/CameraAppUI.java
|
a842409b378b57cb15fb77a2e937cf63dc97436f |
15-Aug-2014 |
Andy Huibers <andyhuibers@google.com> |
am 94f5b240: am 064f851a: Hold touch to focus target in 3A UI debug mode. * commit '94f5b240d7a39e0f9da126fc57559d20a6cb6ba2': Hold touch to focus target in 3A UI debug mode.
|
274f312773fad819a84ffd2682d75781b1808b99 |
15-Aug-2014 |
Andy Huibers <andyhuibers@google.com> |
am 064f851a: Hold touch to focus target in 3A UI debug mode. * commit '064f851a063c80be4e6cc3f1716ff19b605e4865': Hold touch to focus target in 3A UI debug mode.
|
94f5b240d7a39e0f9da126fc57559d20a6cb6ba2 |
15-Aug-2014 |
Andy Huibers <andyhuibers@google.com> |
am 064f851a: Hold touch to focus target in 3A UI debug mode. * commit '064f851a063c80be4e6cc3f1716ff19b605e4865': Hold touch to focus target in 3A UI debug mode.
|
064f851a063c80be4e6cc3f1716ff19b605e4865 |
15-Aug-2014 |
Andy Huibers <andyhuibers@google.com> |
Hold touch to focus target in 3A UI debug mode. Bug: 17028594 Change-Id: I6d60f2a891cc8ab33c2165438295950bf46095b3
rc/com/android/camera/CaptureModule.java
|
19d3bcaf530c2ac1c59099bc5f88768843be315c |
15-Aug-2014 |
Andy Huibers <andyhuibers@google.com> |
am eb2d782b: am e67e9edc: am 2863604b: am 011c5cde: Merge "Consolidate properties for debugging." into ub-camera-glacier * commit 'eb2d782be68f7f295ddc220d686215a3edceccea': Consolidate properties for debugging.
|
eb2d782be68f7f295ddc220d686215a3edceccea |
15-Aug-2014 |
Andy Huibers <andyhuibers@google.com> |
am e67e9edc: am 2863604b: am 011c5cde: Merge "Consolidate properties for debugging." into ub-camera-glacier * commit 'e67e9edcf9d1a7441145e68bc2c2d2e513e8fff1': Consolidate properties for debugging.
|
e67e9edcf9d1a7441145e68bc2c2d2e513e8fff1 |
15-Aug-2014 |
Andy Huibers <andyhuibers@google.com> |
am 2863604b: am 011c5cde: Merge "Consolidate properties for debugging." into ub-camera-glacier * commit '2863604bc1c892294bda81609d46e06e02e6bc5d': Consolidate properties for debugging.
|
2863604bc1c892294bda81609d46e06e02e6bc5d |
15-Aug-2014 |
Andy Huibers <andyhuibers@google.com> |
am 011c5cde: Merge "Consolidate properties for debugging." into ub-camera-glacier * commit '011c5cde82df9fee23f21891ae1c3da63ebe27ae': Consolidate properties for debugging.
|
7176b849a030d48b2efcc15f69c674824ddaba51 |
15-Aug-2014 |
Andy Huibers <andyhuibers@google.com> |
am 011c5cde: Merge "Consolidate properties for debugging." into ub-camera-glacier * commit '011c5cde82df9fee23f21891ae1c3da63ebe27ae': Consolidate properties for debugging.
|
622307e3987aa9173200381fbd8c8ded93ac20c5 |
15-Aug-2014 |
Alan Newberger <alann@google.com> |
am d00fce0c: am 99911dd5: am 134e07ee: am c8c6efa0: Merge "Move preference subscreens to new Activities from Dialogs" into ub-camera-glacier * commit 'd00fce0c935600c203dee20f15d5e14818570054': Move preference subscreens to new Activities from Dialogs
|
d00fce0c935600c203dee20f15d5e14818570054 |
15-Aug-2014 |
Alan Newberger <alann@google.com> |
am 99911dd5: am 134e07ee: am c8c6efa0: Merge "Move preference subscreens to new Activities from Dialogs" into ub-camera-glacier * commit '99911dd5cf950b32ebc3a47eda6edc6c7317f505': Move preference subscreens to new Activities from Dialogs
|
99911dd5cf950b32ebc3a47eda6edc6c7317f505 |
15-Aug-2014 |
Alan Newberger <alann@google.com> |
am 134e07ee: am c8c6efa0: Merge "Move preference subscreens to new Activities from Dialogs" into ub-camera-glacier * commit '134e07ee01584a234073c379e3e6b8bb399a7c1e': Move preference subscreens to new Activities from Dialogs
|
5280921fc58652e8d7ae03db9c3008f5d847a5f4 |
15-Aug-2014 |
Alan Newberger <alann@google.com> |
am c8c6efa0: Merge "Move preference subscreens to new Activities from Dialogs" into ub-camera-glacier * commit 'c8c6efa020f830b54df4f06eba883ae8386d96b4': Move preference subscreens to new Activities from Dialogs
|
134e07ee01584a234073c379e3e6b8bb399a7c1e |
15-Aug-2014 |
Alan Newberger <alann@google.com> |
am c8c6efa0: Merge "Move preference subscreens to new Activities from Dialogs" into ub-camera-glacier * commit 'c8c6efa020f830b54df4f06eba883ae8386d96b4': Move preference subscreens to new Activities from Dialogs
|
886bcc4694071c6bf797d18754021af21a237eb9 |
15-Aug-2014 |
Alan Newberger <alann@google.com> |
Move preference subscreens to new Activities from Dialogs Dialogs are hard to override for action bar settings. The documented way to do navigation up is to receive menu events. So we no longer use Dialogs, instead here we set up intents back to the same Activity, and add an extra system to designate which subscreen to load. This uses activity stack to do subscreen navigation, and then all screens hit the same menu handler in the Activity which properly receives up navigation signals via 'home'. This is not awesome but a better hack than the Dialog one which depends on Action Bar internals; this approach only uses public APIs. Bug: 15756177 Change-Id: Iae2bd254e9cd5dde1d32d0997e5610f359662467
rc/com/android/camera/settings/CameraSettingsActivity.java
|
a6951e0e7c1e7b91cc4bf6f99181e9b10998f583 |
15-Aug-2014 |
Baligh Uddin <baligh@google.com> |
am bb3dc9e7: (-s ours) am 15f60923: (-s ours) am ca901d9a: (-s ours) am 31afb359: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-glacier * commit 'bb3dc9e733ef5aabb490c6e98d7a06f9e0545f72': Import translations. DO NOT MERGE
|
4e02bb8e5ebeb8f99d2acfe19cbffb1e2d354709 |
15-Aug-2014 |
Baligh Uddin <baligh@google.com> |
am 5d2419f4: (-s ours) am d9c187f5: (-s ours) am 417e6d55: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit '5d2419f4eadfe28b770cc295999405348cd45515': Import translations. DO NOT MERGE
|
189a23a1816cc38ad0598f319be8daa5d1c7a639 |
15-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
am 65d63893: am d3145056: am ad95f6ca: am 51163540: Move code from GoogleCamera that dumps capture request metadata. * commit '65d63893e506254ef6c8daf714417a41e5be5935': Move code from GoogleCamera that dumps capture request metadata.
|
bb3dc9e733ef5aabb490c6e98d7a06f9e0545f72 |
15-Aug-2014 |
Baligh Uddin <baligh@google.com> |
am 15f60923: (-s ours) am ca901d9a: (-s ours) am 31afb359: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-glacier * commit '15f609238d41466bf7500c34120a01b0aef75c71': Import translations. DO NOT MERGE
|
5d2419f4eadfe28b770cc295999405348cd45515 |
15-Aug-2014 |
Baligh Uddin <baligh@google.com> |
am d9c187f5: (-s ours) am 417e6d55: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit 'd9c187f533fd1eae508ce365d6a4e66991cd73dc': Import translations. DO NOT MERGE
|
65d63893e506254ef6c8daf714417a41e5be5935 |
15-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
am d3145056: am ad95f6ca: am 51163540: Move code from GoogleCamera that dumps capture request metadata. * commit 'd31450565d08b516beed36a6ec969ca888f9cfa9': Move code from GoogleCamera that dumps capture request metadata.
|
011c5cde82df9fee23f21891ae1c3da63ebe27ae |
15-Aug-2014 |
Andy Huibers <andyhuibers@google.com> |
Merge "Consolidate properties for debugging." into ub-camera-glacier
|
99a37d89f92cb0ad60cd57169c4845560ad0ffac |
15-Aug-2014 |
Andy Huibers <andyhuibers@google.com> |
Consolidate properties for debugging. Change-Id: I052492375bf176622b38382579b2189d22a05349
rc/com/android/camera/CaptureModule.java
rc/com/android/camera/debug/DebugPropertyHelper.java
rc/com/android/camera/module/ModulesInfo.java
rc/com/android/camera/one/v2/OneCameraImpl.java
|
15f609238d41466bf7500c34120a01b0aef75c71 |
15-Aug-2014 |
Baligh Uddin <baligh@google.com> |
am ca901d9a: (-s ours) am 31afb359: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-glacier * commit 'ca901d9a686e42fe07f6c69bd238be1c6588feea': Import translations. DO NOT MERGE
|
d9c187f533fd1eae508ce365d6a4e66991cd73dc |
15-Aug-2014 |
Baligh Uddin <baligh@google.com> |
am 417e6d55: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit '417e6d55072f48ae45ac39d586055204eb759177': Import translations. DO NOT MERGE
|
ca901d9a686e42fe07f6c69bd238be1c6588feea |
15-Aug-2014 |
Baligh Uddin <baligh@google.com> |
am 31afb359: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-glacier * commit '31afb359a2fb26a7491add2c4c76eeea89c93486': Import translations. DO NOT MERGE
|
c59d1b2fa40a4b5cb2aadee1b05928f9cb352e8c |
15-Aug-2014 |
Baligh Uddin <baligh@google.com> |
am 31afb359: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-glacier * commit '31afb359a2fb26a7491add2c4c76eeea89c93486': Import translations. DO NOT MERGE
|
c8c6efa020f830b54df4f06eba883ae8386d96b4 |
15-Aug-2014 |
Alan Newberger <alann@google.com> |
Merge "Move preference subscreens to new Activities from Dialogs" into ub-camera-glacier
|
1b69b712876cc0766fc7af6fab64c4e4257a43f1 |
15-Aug-2014 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE"
|
417e6d55072f48ae45ac39d586055204eb759177 |
15-Aug-2014 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into lmp-dev
|
31afb359a2fb26a7491add2c4c76eeea89c93486 |
15-Aug-2014 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into ub-camera-glacier
|
60acccaac08fcc3264652da73518822fc3828199 |
15-Aug-2014 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into ub-camera-haleakala
|
d31450565d08b516beed36a6ec969ca888f9cfa9 |
15-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
am ad95f6ca: am 51163540: Move code from GoogleCamera that dumps capture request metadata. * commit 'ad95f6ca81a9c41299d41115cb668c40d4a71a82': Move code from GoogleCamera that dumps capture request metadata.
|
ad95f6ca81a9c41299d41115cb668c40d4a71a82 |
15-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
am 51163540: Move code from GoogleCamera that dumps capture request metadata. * commit '51163540604bcb1deabfde4d83c54a86114cefd0': Move code from GoogleCamera that dumps capture request metadata.
|
9fde58ff5f44effe34eac931b73c392b6b839e22 |
15-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
am 51163540: Move code from GoogleCamera that dumps capture request metadata. * commit '51163540604bcb1deabfde4d83c54a86114cefd0': Move code from GoogleCamera that dumps capture request metadata.
|
51163540604bcb1deabfde4d83c54a86114cefd0 |
15-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
Move code from GoogleCamera that dumps capture request metadata. Bug: 16945820 Change-Id: Iff3f05b65687073a7272ed31644f34dc6187de21
rc/com/android/camera/app/CameraApp.java
rc/com/android/camera/one/AbstractOneCamera.java
rc/com/android/camera/one/v2/OneCameraImpl.java
rc/com/android/camera/util/CaptureDataSerializer.java
|
12d0b0afa6dccb6ce8d5d814dfe48ec884a80194 |
14-Aug-2014 |
Spike Sprague <spikuru@google.com> |
am a432d5f7: am facaab9e: am 843f226d: am 39384da0: add a range check in MultiToggleImageButton\'s bitmap combine function. * commit 'a432d5f7121ab162b1917066e37b65bf92a78ee3': add a range check in MultiToggleImageButton's bitmap combine function.
|
5fd6b1168bddd424c0d41f69446eea5a08643f27 |
14-Aug-2014 |
Alan Newberger <alann@google.com> |
am ae0de47c: am 4b960190: am b5409cef: am 7951206e: Merge "Revert our layout from FULLSCREEN to LAYOUT_FULLSCREEN" into ub-camera-glacier * commit 'ae0de47cab429d632ea226681ce2b48389832132': Revert our layout from FULLSCREEN to LAYOUT_FULLSCREEN
|
45e034c31a63b1f45e775c78c38fa97150fe2334 |
14-Aug-2014 |
Spike Sprague <spikuru@google.com> |
am 6d73624e: am b0999efe: am 837adf5b: am bbcf8774: Merge "Update option icon transitions" into ub-camera-glacier * commit '6d73624e95f9330727d15bf16c6ba955b6a614e7': Update option icon transitions
|
19f1c367a063722f2c30a0aebfc1f7b700868c29 |
14-Aug-2014 |
Spike Sprague <spikuru@google.com> |
am 40b1f905: am 54e4e74e: am 1784b09d: am 955ae1f8: another tweak of the mode switch expanding circle, no more pre-white circle expansion. * commit '40b1f905f8e8e78560ee8d220549662b3d620169': another tweak of the mode switch expanding circle, no more pre-white circle expansion.
|
a432d5f7121ab162b1917066e37b65bf92a78ee3 |
14-Aug-2014 |
Spike Sprague <spikuru@google.com> |
am facaab9e: am 843f226d: am 39384da0: add a range check in MultiToggleImageButton\'s bitmap combine function. * commit 'facaab9ef1fb6e5c4617b6e2ccee5d21a115e954': add a range check in MultiToggleImageButton's bitmap combine function.
|
ae0de47cab429d632ea226681ce2b48389832132 |
14-Aug-2014 |
Alan Newberger <alann@google.com> |
am 4b960190: am b5409cef: am 7951206e: Merge "Revert our layout from FULLSCREEN to LAYOUT_FULLSCREEN" into ub-camera-glacier * commit '4b96019051960f296afc39840c47d747d8797c28': Revert our layout from FULLSCREEN to LAYOUT_FULLSCREEN
|
6d73624e95f9330727d15bf16c6ba955b6a614e7 |
14-Aug-2014 |
Spike Sprague <spikuru@google.com> |
am b0999efe: am 837adf5b: am bbcf8774: Merge "Update option icon transitions" into ub-camera-glacier * commit 'b0999efeb960a547e24825101ca5606ceb578dcf': Update option icon transitions
|
40b1f905f8e8e78560ee8d220549662b3d620169 |
14-Aug-2014 |
Spike Sprague <spikuru@google.com> |
am 54e4e74e: am 1784b09d: am 955ae1f8: another tweak of the mode switch expanding circle, no more pre-white circle expansion. * commit '54e4e74e1577e818e694cbe730831fad8be241d9': another tweak of the mode switch expanding circle, no more pre-white circle expansion.
|
facaab9ef1fb6e5c4617b6e2ccee5d21a115e954 |
14-Aug-2014 |
Spike Sprague <spikuru@google.com> |
am 843f226d: am 39384da0: add a range check in MultiToggleImageButton\'s bitmap combine function. * commit '843f226d937f35bbfcd30ccc195631c0e4cd393a': add a range check in MultiToggleImageButton's bitmap combine function.
|
d3b24e24818ae23677e1db2761f61b8c43cb25dd |
14-Aug-2014 |
Spike Sprague <spikuru@google.com> |
am 39384da0: add a range check in MultiToggleImageButton\'s bitmap combine function. * commit '39384da05ba9ced9086dba64932878ce447c6230': add a range check in MultiToggleImageButton's bitmap combine function.
|
843f226d937f35bbfcd30ccc195631c0e4cd393a |
14-Aug-2014 |
Spike Sprague <spikuru@google.com> |
am 39384da0: add a range check in MultiToggleImageButton\'s bitmap combine function. * commit '39384da05ba9ced9086dba64932878ce447c6230': add a range check in MultiToggleImageButton's bitmap combine function.
|
39384da05ba9ced9086dba64932878ce447c6230 |
14-Aug-2014 |
Spike Sprague <spikuru@google.com> |
add a range check in MultiToggleImageButton's bitmap combine function. bug: overrideImageIds Change-Id: I6e6b60ff8bb269fb25f7b788009103d9b9d02f19
rc/com/android/camera/MultiToggleImageButton.java
|
4b96019051960f296afc39840c47d747d8797c28 |
14-Aug-2014 |
Alan Newberger <alann@google.com> |
am b5409cef: am 7951206e: Merge "Revert our layout from FULLSCREEN to LAYOUT_FULLSCREEN" into ub-camera-glacier * commit 'b5409cef0e9d072a4f9776f96e0a59ccf67fe734': Revert our layout from FULLSCREEN to LAYOUT_FULLSCREEN
|
b0999efeb960a547e24825101ca5606ceb578dcf |
14-Aug-2014 |
Spike Sprague <spikuru@google.com> |
am 837adf5b: am bbcf8774: Merge "Update option icon transitions" into ub-camera-glacier * commit '837adf5bf43d06385aad31e3b342fea801ed030e': Update option icon transitions
|
b5409cef0e9d072a4f9776f96e0a59ccf67fe734 |
14-Aug-2014 |
Alan Newberger <alann@google.com> |
am 7951206e: Merge "Revert our layout from FULLSCREEN to LAYOUT_FULLSCREEN" into ub-camera-glacier * commit '7951206e0157586d3c5676987343dc3ca81fc40e': Revert our layout from FULLSCREEN to LAYOUT_FULLSCREEN
|
869af1c823f5e68eebc9fa508eaf2569a08482ae |
14-Aug-2014 |
Alan Newberger <alann@google.com> |
am 7951206e: Merge "Revert our layout from FULLSCREEN to LAYOUT_FULLSCREEN" into ub-camera-glacier * commit '7951206e0157586d3c5676987343dc3ca81fc40e': Revert our layout from FULLSCREEN to LAYOUT_FULLSCREEN
|
f3e55a696822aa4a4dbd3d46e0edcf49dedf8ef4 |
14-Aug-2014 |
Spike Sprague <spikuru@google.com> |
am bbcf8774: Merge "Update option icon transitions" into ub-camera-glacier * commit 'bbcf8774821a0e09a4cf6ab2472f89c83981326b': Update option icon transitions
|
837adf5bf43d06385aad31e3b342fea801ed030e |
14-Aug-2014 |
Spike Sprague <spikuru@google.com> |
am bbcf8774: Merge "Update option icon transitions" into ub-camera-glacier * commit 'bbcf8774821a0e09a4cf6ab2472f89c83981326b': Update option icon transitions
|
54e4e74e1577e818e694cbe730831fad8be241d9 |
14-Aug-2014 |
Spike Sprague <spikuru@google.com> |
am 1784b09d: am 955ae1f8: another tweak of the mode switch expanding circle, no more pre-white circle expansion. * commit '1784b09d9822ba9e79c90067265794c64c9ac78c': another tweak of the mode switch expanding circle, no more pre-white circle expansion.
|
b8e22726a83045b2a7aea054022a1654da744459 |
14-Aug-2014 |
Spike Sprague <spikuru@google.com> |
am 955ae1f8: another tweak of the mode switch expanding circle, no more pre-white circle expansion. * commit '955ae1f8afc9c4fb0905e0baece959efac9326f6': another tweak of the mode switch expanding circle, no more pre-white circle expansion.
|
1784b09d9822ba9e79c90067265794c64c9ac78c |
14-Aug-2014 |
Spike Sprague <spikuru@google.com> |
am 955ae1f8: another tweak of the mode switch expanding circle, no more pre-white circle expansion. * commit '955ae1f8afc9c4fb0905e0baece959efac9326f6': another tweak of the mode switch expanding circle, no more pre-white circle expansion.
|
955ae1f8afc9c4fb0905e0baece959efac9326f6 |
14-Aug-2014 |
Spike Sprague <spikuru@google.com> |
another tweak of the mode switch expanding circle, no more pre-white circle expansion. bug: 16129873 Change-Id: I1f55dbd40be1801bf7bbf1f3646a8deeec5c353f
rc/com/android/camera/ui/TouchCircleDrawable.java
|
a42af2446589589ad11067a60c9377e0f8fb6edd |
13-Aug-2014 |
Spike Sprague <spikuru@google.com> |
change settings to use dark theme. bug: 16979040 Change-Id: I2e02884d2971a92d4a408712a0e952891eafb62e
es/values-v21/styles.xml
es/values/styles.xml
|
bc9d031ec1653cb9672bd950e4c7c0c83fb18c2c |
13-Aug-2014 |
Spike Sprague <spikuru@google.com> |
am 55d5fc59: am 0a81e22e: am b3656238: am eb944322: Merge "update mode switch transition anims" into ub-camera-glacier * commit '55d5fc59fd2f06b0399831c0c9dcd471a43f0c10': update mode switch transition anims
|
55d5fc59fd2f06b0399831c0c9dcd471a43f0c10 |
13-Aug-2014 |
Spike Sprague <spikuru@google.com> |
am 0a81e22e: am b3656238: am eb944322: Merge "update mode switch transition anims" into ub-camera-glacier * commit '0a81e22eb1b3ab3c3468d57c1092caace5e61eb3': update mode switch transition anims
|
0a81e22eb1b3ab3c3468d57c1092caace5e61eb3 |
13-Aug-2014 |
Spike Sprague <spikuru@google.com> |
am b3656238: am eb944322: Merge "update mode switch transition anims" into ub-camera-glacier * commit 'b365623865dcb69f505130dbfe42a622553c4457': update mode switch transition anims
|
fbc92ffe3818f931ecd7b8670134e96c2d6f8bb4 |
13-Aug-2014 |
Spike Sprague <spikuru@google.com> |
am eb944322: Merge "update mode switch transition anims" into ub-camera-glacier * commit 'eb9443226ee117779e2396c2f7cee9789af80cf8': update mode switch transition anims
|
b365623865dcb69f505130dbfe42a622553c4457 |
13-Aug-2014 |
Spike Sprague <spikuru@google.com> |
am eb944322: Merge "update mode switch transition anims" into ub-camera-glacier * commit 'eb9443226ee117779e2396c2f7cee9789af80cf8': update mode switch transition anims
|
1080c48c755e8dd1b0522e621c9f94ff8b7cba34 |
13-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
am 9258c67a: am 3240ca59: am 7680cff1: am 62c367f2: Merge "Fix potential multi-threading bug where size can change before deletion." into ub-camera-glacier * commit '9258c67a72bc5b239b879b25ff653aaa155b0fa8': Fix potential multi-threading bug where size can change before deletion.
|
03a34b672181b29ac041065b0b51b8f870ea339a |
13-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
am 5b714220: am f511d995: am 01507b17: am 4c96752b: Merge "Don\'t try to share null data" into ub-camera-glacier * commit '5b7142208a2f96e8802a0c0d8b709c801128a70e': Don't try to share null data
|
9258c67a72bc5b239b879b25ff653aaa155b0fa8 |
13-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
am 3240ca59: am 7680cff1: am 62c367f2: Merge "Fix potential multi-threading bug where size can change before deletion." into ub-camera-glacier * commit '3240ca59dc1be2de6b16388abd7475e46a753f85': Fix potential multi-threading bug where size can change before deletion.
|
3240ca59dc1be2de6b16388abd7475e46a753f85 |
13-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
am 7680cff1: am 62c367f2: Merge "Fix potential multi-threading bug where size can change before deletion." into ub-camera-glacier * commit '7680cff136c4cf9c1fd2b19b70f5396281023493': Fix potential multi-threading bug where size can change before deletion.
|
5b7142208a2f96e8802a0c0d8b709c801128a70e |
13-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
am f511d995: am 01507b17: am 4c96752b: Merge "Don\'t try to share null data" into ub-camera-glacier * commit 'f511d995b4e577042f5dc5f56e155a0acba6efc5': Don't try to share null data
|
7680cff136c4cf9c1fd2b19b70f5396281023493 |
13-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
am 62c367f2: Merge "Fix potential multi-threading bug where size can change before deletion." into ub-camera-glacier * commit '62c367f2199d826646cd2c665ed358b339c4b313': Fix potential multi-threading bug where size can change before deletion.
|
c2b036b114e1e115f900dc3627df7eb8bbebe918 |
13-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
am 62c367f2: Merge "Fix potential multi-threading bug where size can change before deletion." into ub-camera-glacier * commit '62c367f2199d826646cd2c665ed358b339c4b313': Fix potential multi-threading bug where size can change before deletion.
|
f511d995b4e577042f5dc5f56e155a0acba6efc5 |
13-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
am 01507b17: am 4c96752b: Merge "Don\'t try to share null data" into ub-camera-glacier * commit '01507b1737d6ec69e671caae1c888a0af8744100': Don't try to share null data
|
01507b1737d6ec69e671caae1c888a0af8744100 |
13-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
am 4c96752b: Merge "Don\'t try to share null data" into ub-camera-glacier * commit '4c96752bbcda3fa356ea2a028ec6a7c2fbfa06a6': Don't try to share null data
|
22abc18c1bb81d616d51a9b8a792d52965ee8e10 |
13-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
am 4c96752b: Merge "Don\'t try to share null data" into ub-camera-glacier * commit '4c96752bbcda3fa356ea2a028ec6a7c2fbfa06a6': Don't try to share null data
|
f73d4fb0dba43dcbb18dc8a9b35feebce043d54e |
13-Aug-2014 |
Alan Newberger <alann@google.com> |
am 1278dc83: am 68bbd18c: am e497c275: am a804e2d2: Merge "New Material icons for Camera2" into ub-camera-glacier * commit '1278dc832a9dd74147cade73d766153159c753ad': New Material icons for Camera2
|
1278dc832a9dd74147cade73d766153159c753ad |
13-Aug-2014 |
Alan Newberger <alann@google.com> |
am 68bbd18c: am e497c275: am a804e2d2: Merge "New Material icons for Camera2" into ub-camera-glacier * commit '68bbd18cf7d622b2b86668924f86f19ef70a6ffd': New Material icons for Camera2
|
68bbd18cf7d622b2b86668924f86f19ef70a6ffd |
13-Aug-2014 |
Alan Newberger <alann@google.com> |
am e497c275: am a804e2d2: Merge "New Material icons for Camera2" into ub-camera-glacier * commit 'e497c2754bd36e181babf96b4125bd536a5272e5': New Material icons for Camera2
|
e497c2754bd36e181babf96b4125bd536a5272e5 |
13-Aug-2014 |
Alan Newberger <alann@google.com> |
am a804e2d2: Merge "New Material icons for Camera2" into ub-camera-glacier * commit 'a804e2d29800fd66f6db552c9cb55117888be44b': New Material icons for Camera2
|
b66473e7406b30e93648df78a83567fa7689132c |
13-Aug-2014 |
Alan Newberger <alann@google.com> |
am a804e2d2: Merge "New Material icons for Camera2" into ub-camera-glacier * commit 'a804e2d29800fd66f6db552c9cb55117888be44b': New Material icons for Camera2
|
6b28d4f4aff67157339fef946d29a94ce093743c |
13-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
am d8b3511e: am 5a4d25d4: am 280ba48b: am 59c784bf: [OC] Gcam OneCamera implementation. * commit 'd8b3511ef27be1ecbe5a93576725ec8b81ca4bd5': [OC] Gcam OneCamera implementation.
|
7951206e0157586d3c5676987343dc3ca81fc40e |
14-Aug-2014 |
Alan Newberger <alann@google.com> |
Merge "Revert our layout from FULLSCREEN to LAYOUT_FULLSCREEN" into ub-camera-glacier
|
d67c02eaf17287bcb334ad050d0bc81e1beaf288 |
14-Aug-2014 |
Alan Newberger <alann@google.com> |
Revert our layout from FULLSCREEN to LAYOUT_FULLSCREEN We changed this while working on L prep, but FULLSCREEN suppresses the action bar. Changing back to LAYOUT_FULLSCREEN addresses this. Bug: 16986789 Change-Id: I561fe765ea5eb72b1d666a124c9810cf349ce56a
rc/com/android/camera/CameraActivity.java
|
eb9443226ee117779e2396c2f7cee9789af80cf8 |
13-Aug-2014 |
Spike Sprague <spikuru@google.com> |
Merge "update mode switch transition anims" into ub-camera-glacier
|
62c367f2199d826646cd2c665ed358b339c4b313 |
13-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Fix potential multi-threading bug where size can change before deletion." into ub-camera-glacier
|
16029b4a9e0d16cb05ca2202c0b91fe04d412443 |
13-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
Fix potential multi-threading bug where size can change before deletion. Bug: 16949503 Change-Id: I9b087cc257edfb2fe5368abaa7a73f910a6db3df
rc/com/android/camera/data/CameraDataAdapter.java
rc/com/android/camera/data/LocalDataList.java
|
d8b3511ef27be1ecbe5a93576725ec8b81ca4bd5 |
13-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
am 5a4d25d4: am 280ba48b: am 59c784bf: [OC] Gcam OneCamera implementation. * commit '5a4d25d4465ebb973d7347346b715e5e66bd0f07': [OC] Gcam OneCamera implementation.
|
5a4d25d4465ebb973d7347346b715e5e66bd0f07 |
13-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
am 280ba48b: am 59c784bf: [OC] Gcam OneCamera implementation. * commit '280ba48b64d92d8b8e9308d50287148732cc35d0': [OC] Gcam OneCamera implementation.
|
d5d8bfdc9707299a2b35aa2130a48b1e89e2938d |
13-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
am 59c784bf: [OC] Gcam OneCamera implementation. * commit '59c784bf588b9e0994e9769001f624200e9b1027': [OC] Gcam OneCamera implementation.
|
280ba48b64d92d8b8e9308d50287148732cc35d0 |
13-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
am 59c784bf: [OC] Gcam OneCamera implementation. * commit '59c784bf588b9e0994e9769001f624200e9b1027': [OC] Gcam OneCamera implementation.
|
58b851abfafc1a833ac97f17cd6aefeaf40c347f |
13-Aug-2014 |
Senpo Hu <senpo@google.com> |
am 89095a98: am 2247a2e8: am c490dd5c: am 11186318: Enable 4K video for Shamu. * commit '89095a982a68134b82b55fe744d7ffb1b124d93b': Enable 4K video for Shamu.
|
59c784bf588b9e0994e9769001f624200e9b1027 |
05-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
[OC] Gcam OneCamera implementation. Bug: 16948752 Change-Id: I0160de117c4ff7024e0d546f594b5777847d1833
rc/com/android/camera/CaptureModule.java
rc/com/android/camera/app/CameraApp.java
rc/com/android/camera/one/OneCamera.java
rc/com/android/camera/one/OneCameraManager.java
rc/com/android/camera/one/v2/OneCameraManagerImpl.java
rc/com/android/camera/util/CameraUtil.java
rc_pd/com/android/camera/one/v2/OneCameraCreator.java
|
89095a982a68134b82b55fe744d7ffb1b124d93b |
13-Aug-2014 |
Senpo Hu <senpo@google.com> |
am 2247a2e8: am c490dd5c: am 11186318: Enable 4K video for Shamu. * commit '2247a2e899f7df17121738f637e7f3d8755f4d5c': Enable 4K video for Shamu.
|
2247a2e899f7df17121738f637e7f3d8755f4d5c |
13-Aug-2014 |
Senpo Hu <senpo@google.com> |
am c490dd5c: am 11186318: Enable 4K video for Shamu. * commit 'c490dd5c7b6caae2af1ef7a2006f9d3ea412e288': Enable 4K video for Shamu.
|
c490dd5c7b6caae2af1ef7a2006f9d3ea412e288 |
13-Aug-2014 |
Senpo Hu <senpo@google.com> |
am 11186318: Enable 4K video for Shamu. * commit '111863182bcc4b99bdaa727304d5800fc91dfd51': Enable 4K video for Shamu.
|
04b826e0a17b67cad6c9ee95b0e594287d2861de |
13-Aug-2014 |
Senpo Hu <senpo@google.com> |
am 11186318: Enable 4K video for Shamu. * commit '111863182bcc4b99bdaa727304d5800fc91dfd51': Enable 4K video for Shamu.
|
111863182bcc4b99bdaa727304d5800fc91dfd51 |
08-Aug-2014 |
Senpo Hu <senpo@google.com> |
Enable 4K video for Shamu. - Add a new resolution setting for back camera video: "UHD 4K" Bug: 16206549 Change-Id: I0b72f8100bc26b556099ad08e093273ccda0f25d
es/values/arrays.xml
es/values/strings.xml
rc/com/android/camera/VideoModule.java
rc/com/android/camera/settings/SettingsUtil.java
|
bbcf8774821a0e09a4cf6ab2472f89c83981326b |
14-Aug-2014 |
Spike Sprague <spikuru@google.com> |
Merge "Update option icon transitions" into ub-camera-glacier
|
18b22b5963e8871e539edf669d96862eec72bb5d |
09-Aug-2014 |
Spike Sprague <spikuru@google.com> |
Update option icon transitions bug: 16458864 Change-Id: Idaf4b60d357fa08635b55c1356450d3a4b2b48c2
es/layout-port/mode_options.xml
rc/com/android/camera/MultiToggleImageButton.java
rc/com/android/camera/widget/ModeOptions.java
|
4c96752bbcda3fa356ea2a028ec6a7c2fbfa06a6 |
13-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Don't try to share null data" into ub-camera-glacier
|
c2e6813aadeb94f8ec7f093e56c986aac796e783 |
13-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
Don't try to share null data Bug: 16875556 Also add warning logs for null check cases. Change-Id: Ic1e7e81b416d24a748b9572d63c145612b38d822
rc/com/android/camera/CameraActivity.java
|
a804e2d29800fd66f6db552c9cb55117888be44b |
13-Aug-2014 |
Alan Newberger <alann@google.com> |
Merge "New Material icons for Camera2" into ub-camera-glacier
|
f88a9e160454ac0f55fa76908cc963124e351f2e |
13-Aug-2014 |
Alan Newberger <alann@google.com> |
New Material icons for Camera2 This CL adds new Material icons for Camera2. Bug: 16985499 Change-Id: I91972418f7ee9592fc7685e2c4dfd9bb73c3bcc9
ndroidManifest.xml
es_p/drawable-hdpi/ic_camera_clr_48dp.png
es_p/drawable-mdpi/ic_camera_clr_48dp.png
es_p/drawable-xhdpi/ic_camera_clr_48dp.png
es_p/drawable-xxhdpi/ic_camera_clr_48dp.png
es_p/drawable-xxxhdpi/ic_camera_clr_48dp.png
es_p/mipmap-hdpi/ic_launcher_camera.png
es_p/mipmap-hdpi/ic_launcher_video_camera.png
es_p/mipmap-mdpi/ic_launcher_camera.png
es_p/mipmap-mdpi/ic_launcher_video_camera.png
es_p/mipmap-xhdpi/ic_launcher_camera.png
es_p/mipmap-xxhdpi/ic_launcher_camera.png
|
0496fcaa51f88f6c753975473b971941e4090cfa |
25-Jul-2014 |
Spike Sprague <spikuru@google.com> |
update mode switch transition anims bug: 16129873 Change-Id: Ibcb2e31162dc353de250db2a7d24726b05768ab1
es/values/colors.xml
rc/com/android/camera/app/CameraAppUI.java
rc/com/android/camera/ui/ModeIconView.java
rc/com/android/camera/ui/ModeListView.java
rc/com/android/camera/ui/ModeSelectorItem.java
rc/com/android/camera/ui/TouchCircleDrawable.java
|
ea8c99c9566b2c6701d14448199e7c1309747ee4 |
12-Aug-2014 |
Alan Newberger <alann@google.com> |
am 57686070: am ffba908e: am 2881f369: am 2307b60a: Refactor Upgrade/UpgradeAosp into SettingsUpgrader * commit '57686070b147fc9221be2005700acec60f631657': Refactor Upgrade/UpgradeAosp into SettingsUpgrader
|
57686070b147fc9221be2005700acec60f631657 |
12-Aug-2014 |
Alan Newberger <alann@google.com> |
am ffba908e: am 2881f369: am 2307b60a: Refactor Upgrade/UpgradeAosp into SettingsUpgrader * commit 'ffba908e89a078127e2c75bf0662955e1633ba2d': Refactor Upgrade/UpgradeAosp into SettingsUpgrader
|
ffba908e89a078127e2c75bf0662955e1633ba2d |
12-Aug-2014 |
Alan Newberger <alann@google.com> |
am 2881f369: am 2307b60a: Refactor Upgrade/UpgradeAosp into SettingsUpgrader * commit '2881f36989b41c1f8a11dc44917ac6580c3379ba': Refactor Upgrade/UpgradeAosp into SettingsUpgrader
|
2881f36989b41c1f8a11dc44917ac6580c3379ba |
12-Aug-2014 |
Alan Newberger <alann@google.com> |
am 2307b60a: Refactor Upgrade/UpgradeAosp into SettingsUpgrader * commit '2307b60abdf0af8639d71ba53cf10fdaf8dfe7e7': Refactor Upgrade/UpgradeAosp into SettingsUpgrader
|
c7d31ec12994ce0452ffd4bc2be00eebf9a5f25f |
12-Aug-2014 |
Alan Newberger <alann@google.com> |
am 2307b60a: Refactor Upgrade/UpgradeAosp into SettingsUpgrader * commit '2307b60abdf0af8639d71ba53cf10fdaf8dfe7e7': Refactor Upgrade/UpgradeAosp into SettingsUpgrader
|
2307b60abdf0af8639d71ba53cf10fdaf8dfe7e7 |
05-Aug-2014 |
Alan Newberger <alann@google.com> |
Refactor Upgrade/UpgradeAosp into SettingsUpgrader This CL does three things: - removes the Upgrade/UpgradeAosp classes which were bunches of statics, in favor of a SettingsUpgrader abstract class that can be overridden - moves 'upgrade to strings' hack logic into AppUpgrader so it only is checked and run once, not for any of the former UpgradeSteps. logic used to be in Upgrade and run regardless of key, when it was using detection only meant for KEY.KEY_UPGRADE_VERSION - adds existence checks for all hack in-place key string upgrades so they are no-ops if the key was not persisted in the first place. Bug: 16573087 Change-Id: Ife42f7aa4a7611ba2d143410a3450057b7464901
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/settings/AppUpgrader.java
rc/com/android/camera/settings/SettingsUpgrader.java
rc/com/android/camera/settings/Upgrade.java
rc/com/android/camera/settings/UpgradeAosp.java
|
8070e76df43106c0b47633bdbc54a5a383a20b29 |
12-Aug-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I45975436aef4ecd4fe3850ccb9febea195c5c799 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-km-rKH/strings.xml
es/values-ko/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mn-rMN/strings.xml
es/values-ms-rMY/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
2c5f724408ac0f5b17e6116f4662a781070cbf71 |
12-Aug-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I969568c49246ac278c8c68e025f1ce279a5323a5 Auto-generated-cl: translation import
es/values-in/strings.xml
es/values-km-rKH/strings.xml
|
9cd18873b2141df29d7cf8529a0a9b5968b602c8 |
12-Aug-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I3911c582f902e4be0819f168f671922136609c4c Auto-generated-cl: translation import
es/values-in/strings.xml
es/values-km-rKH/strings.xml
es/values-my-rMM/strings.xml
|
8e04b0bad1bfcc514ad10b385b51d80c6b27bd98 |
12-Aug-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I4ed26c9802040fbd81197d0562975848ccecb0c5 Auto-generated-cl: translation import
es/values-in/strings.xml
es/values-km-rKH/strings.xml
es/values-my-rMM/strings.xml
|
e4beb6612010e4593a61c46063a95114f4028c3a |
12-Aug-2014 |
Puneet Lall <puneetl@google.com> |
am dae4de47: am 7d2d5402: am 22b28172: am 967b7828: Implemented NDK libjpeg wrapper for YUV420 encoding. * commit 'dae4de4745e8597b0d38b4958f9221c55536fe81': Implemented NDK libjpeg wrapper for YUV420 encoding.
|
dae4de4745e8597b0d38b4958f9221c55536fe81 |
12-Aug-2014 |
Puneet Lall <puneetl@google.com> |
am 7d2d5402: am 22b28172: am 967b7828: Implemented NDK libjpeg wrapper for YUV420 encoding. * commit '7d2d540219770ee6f2a427c471a3f32abf50c6f2': Implemented NDK libjpeg wrapper for YUV420 encoding.
|
7d2d540219770ee6f2a427c471a3f32abf50c6f2 |
11-Aug-2014 |
Puneet Lall <puneetl@google.com> |
am 22b28172: am 967b7828: Implemented NDK libjpeg wrapper for YUV420 encoding. * commit '22b281725d5cbc75165fb1a8cbda7153d92279cc': Implemented NDK libjpeg wrapper for YUV420 encoding.
|
22b281725d5cbc75165fb1a8cbda7153d92279cc |
11-Aug-2014 |
Puneet Lall <puneetl@google.com> |
am 967b7828: Implemented NDK libjpeg wrapper for YUV420 encoding. * commit '967b782837a22974f565f5bbc71bef7bc05fc878': Implemented NDK libjpeg wrapper for YUV420 encoding.
|
66ec90f583598b0c17aeba32dc78cc1d55cbeee7 |
11-Aug-2014 |
Puneet Lall <puneetl@google.com> |
am 967b7828: Implemented NDK libjpeg wrapper for YUV420 encoding. * commit '967b782837a22974f565f5bbc71bef7bc05fc878': Implemented NDK libjpeg wrapper for YUV420 encoding.
|
967b782837a22974f565f5bbc71bef7bc05fc878 |
08-Aug-2014 |
Puneet Lall <puneetl@google.com> |
Implemented NDK libjpeg wrapper for YUV420 encoding. Bug: 16676082 Change-Id: I588b8023b401d5e713762563c9265ec3d774a678
ndroid.mk
ni/Android.mk
ni/jpegutil.cpp
ni/jpegutil.h
ni/jpegutilnative.cpp
roject.properties
rc/com/android/camera/exif/ExifData.java
rc/com/android/camera/one/v2/OneCameraImpl.java
rc/com/android/camera/util/JpegUtilNative.java
|
0ed1093affc5eabc23f7de5160c1d5b54dbe3c0b |
09-Aug-2014 |
Andy Huibers <andyhuibers@google.com> |
am b61299a1: am 193e1899: am fd782106: am 30ffce08: [OC] Add autofocus (tap-to-focus, UI and pre-shot focus) to OneCamera. * commit 'b61299a1229ffb5aeaf822d22a881d278a1e03cf': [OC] Add autofocus (tap-to-focus, UI and pre-shot focus) to OneCamera.
|
b61299a1229ffb5aeaf822d22a881d278a1e03cf |
09-Aug-2014 |
Andy Huibers <andyhuibers@google.com> |
am 193e1899: am fd782106: am 30ffce08: [OC] Add autofocus (tap-to-focus, UI and pre-shot focus) to OneCamera. * commit '193e18990a2ffd5644e784bd4e6fc81255eba6a5': [OC] Add autofocus (tap-to-focus, UI and pre-shot focus) to OneCamera.
|
193e18990a2ffd5644e784bd4e6fc81255eba6a5 |
09-Aug-2014 |
Andy Huibers <andyhuibers@google.com> |
am fd782106: am 30ffce08: [OC] Add autofocus (tap-to-focus, UI and pre-shot focus) to OneCamera. * commit 'fd7821064bdbd3bda515d03f19b7ca6a1d42947d': [OC] Add autofocus (tap-to-focus, UI and pre-shot focus) to OneCamera.
|
078b75798b39891f2b2544773f3e201231b4ce7b |
09-Aug-2014 |
Andy Huibers <andyhuibers@google.com> |
am 30ffce08: [OC] Add autofocus (tap-to-focus, UI and pre-shot focus) to OneCamera. * commit '30ffce08f511fbed4cf18daa743778b541583351': [OC] Add autofocus (tap-to-focus, UI and pre-shot focus) to OneCamera.
|
fd7821064bdbd3bda515d03f19b7ca6a1d42947d |
09-Aug-2014 |
Andy Huibers <andyhuibers@google.com> |
am 30ffce08: [OC] Add autofocus (tap-to-focus, UI and pre-shot focus) to OneCamera. * commit '30ffce08f511fbed4cf18daa743778b541583351': [OC] Add autofocus (tap-to-focus, UI and pre-shot focus) to OneCamera.
|
30ffce08f511fbed4cf18daa743778b541583351 |
01-Aug-2014 |
Andy Huibers <andyhuibers@google.com> |
[OC] Add autofocus (tap-to-focus, UI and pre-shot focus) to OneCamera. Change-Id: Ic88359ad27b8e9ee0e74c8d1bd6ecb71fe3c24f0
rc/com/android/camera/CaptureModule.java
rc/com/android/camera/CaptureModuleUI.java
rc/com/android/camera/one/OneCamera.java
rc/com/android/camera/one/v2/OneCameraImpl.java
|
4964caf35068f755230d49152d751d00058cd10e |
08-Aug-2014 |
Alan Newberger <alann@google.com> |
am c3e863ea: am 2582aec8: am 82acfc9b: am e9a226f6: Merge "Route zoom value through to zoomIndex in device API" into ub-camera-glacier * commit 'c3e863ea7f36ffd40d0ab73a9c6fbb93a7b2ff49': Route zoom value through to zoomIndex in device API
|
c3e863ea7f36ffd40d0ab73a9c6fbb93a7b2ff49 |
08-Aug-2014 |
Alan Newberger <alann@google.com> |
am 2582aec8: am 82acfc9b: am e9a226f6: Merge "Route zoom value through to zoomIndex in device API" into ub-camera-glacier * commit '2582aec8b8a036b522c4610a0c6f85617e2213ac': Route zoom value through to zoomIndex in device API
|
62cad2aebbb3f71eb0cf4ffa077a83676a52e67c |
08-Aug-2014 |
Sol Boucher <solb@google.com> |
am a30d6936: am 19d7cefc: am 3d7e6066: am 7f112487: Merge "Move display orientation calculations out of app code" into ub-camera-glacier * commit 'a30d6936a1d818858496a289f69397e1ad07c76a': Move display orientation calculations out of app code
|
0346647b87e951e84db19e03754b62cd9874fc67 |
08-Aug-2014 |
Spike Sprague <spikuru@google.com> |
am e6a02aa0: am 03f635b4: am 30f0029b: am 0be64680: rollback of b/16632474 and ag/518674 * commit 'e6a02aa0e9ca66351986398b40b1ed85c75e96ba': rollback of b/16632474 and ag/518674
|
2582aec8b8a036b522c4610a0c6f85617e2213ac |
08-Aug-2014 |
Alan Newberger <alann@google.com> |
am 82acfc9b: am e9a226f6: Merge "Route zoom value through to zoomIndex in device API" into ub-camera-glacier * commit '82acfc9b0db65d14c5f9028ad38445eee34ea0de': Route zoom value through to zoomIndex in device API
|
82acfc9b0db65d14c5f9028ad38445eee34ea0de |
08-Aug-2014 |
Alan Newberger <alann@google.com> |
am e9a226f6: Merge "Route zoom value through to zoomIndex in device API" into ub-camera-glacier * commit 'e9a226f6c9cf7e59a57bab7e99926647fd0fc23f': Route zoom value through to zoomIndex in device API
|
087a655ddbc7a8c6fcb35262362863adfd211d7f |
08-Aug-2014 |
Alan Newberger <alann@google.com> |
am e9a226f6: Merge "Route zoom value through to zoomIndex in device API" into ub-camera-glacier * commit 'e9a226f6c9cf7e59a57bab7e99926647fd0fc23f': Route zoom value through to zoomIndex in device API
|
a30d6936a1d818858496a289f69397e1ad07c76a |
08-Aug-2014 |
Sol Boucher <solb@google.com> |
am 19d7cefc: am 3d7e6066: am 7f112487: Merge "Move display orientation calculations out of app code" into ub-camera-glacier * commit '19d7cefc7099d4b64df5df09f7c96bb6dc9e4d2a': Move display orientation calculations out of app code
|
e6a02aa0e9ca66351986398b40b1ed85c75e96ba |
08-Aug-2014 |
Spike Sprague <spikuru@google.com> |
am 03f635b4: am 30f0029b: am 0be64680: rollback of b/16632474 and ag/518674 * commit '03f635b493c9010144187c6c424b72fce088b1db': rollback of b/16632474 and ag/518674
|
19d7cefc7099d4b64df5df09f7c96bb6dc9e4d2a |
08-Aug-2014 |
Sol Boucher <solb@google.com> |
am 3d7e6066: am 7f112487: Merge "Move display orientation calculations out of app code" into ub-camera-glacier * commit '3d7e6066de7683a272bbe2cdf893aa655e7de99c': Move display orientation calculations out of app code
|
3d7e6066de7683a272bbe2cdf893aa655e7de99c |
08-Aug-2014 |
Sol Boucher <solb@google.com> |
am 7f112487: Merge "Move display orientation calculations out of app code" into ub-camera-glacier * commit '7f112487e7c19983fe36164494486a0a289a4831': Move display orientation calculations out of app code
|
ea78cafbfc07c454f197a6e6924d7076b6f244fb |
08-Aug-2014 |
Sol Boucher <solb@google.com> |
am 7f112487: Merge "Move display orientation calculations out of app code" into ub-camera-glacier * commit '7f112487e7c19983fe36164494486a0a289a4831': Move display orientation calculations out of app code
|
03f635b493c9010144187c6c424b72fce088b1db |
08-Aug-2014 |
Spike Sprague <spikuru@google.com> |
am 30f0029b: am 0be64680: rollback of b/16632474 and ag/518674 * commit '30f0029bd5d4c3fbefbbe0b0dce357000b0cf297': rollback of b/16632474 and ag/518674
|
30f0029bd5d4c3fbefbbe0b0dce357000b0cf297 |
08-Aug-2014 |
Spike Sprague <spikuru@google.com> |
am 0be64680: rollback of b/16632474 and ag/518674 * commit '0be64680fb9b5a982b1b92730236ebb85e76624a': rollback of b/16632474 and ag/518674
|
f8d6fe2a757f0d9924adb003f95966a9450d4b26 |
08-Aug-2014 |
Spike Sprague <spikuru@google.com> |
am 0be64680: rollback of b/16632474 and ag/518674 * commit '0be64680fb9b5a982b1b92730236ebb85e76624a': rollback of b/16632474 and ag/518674
|
0be64680fb9b5a982b1b92730236ebb85e76624a |
07-Aug-2014 |
Spike Sprague <spikuru@google.com> |
rollback of b/16632474 and ag/518674 Change-Id: I77af6135ff339240bd52881550a0f42ec996f9c4
ndroidManifest.xml
rc/com/android/camera/CameraActivity.java
|
7f112487e7c19983fe36164494486a0a289a4831 |
08-Aug-2014 |
Sol Boucher <solb@google.com> |
Merge "Move display orientation calculations out of app code" into ub-camera-glacier
|
e9a226f6c9cf7e59a57bab7e99926647fd0fc23f |
08-Aug-2014 |
Alan Newberger <alann@google.com> |
Merge "Route zoom value through to zoomIndex in device API" into ub-camera-glacier
|
282655f4d66c24c5d2f4ea696f53a345e31926dd |
08-Aug-2014 |
Alan Newberger <alann@google.com> |
Route zoom value through to zoomIndex in device API Current UI is wired to track zoom index, so pass that in rather than the unfinished new zoom ratio API. This finishes the fix for zoom in the app. Extended TODO already there. App should continue to operate until one big refactor moves it form working with zoom indices, to working with zoom ratios, no breakage in between. Bug: 16527845 Change-Id: I8d88c3d34ba9ad85b1a115cf1249548a16722a38
rc/com/android/camera/PhotoModule.java
|
7a3fc8aa19d9ac0e7712a4990405aee265d5b2a3 |
07-Aug-2014 |
Alan Newberger <alann@google.com> |
am a61190a0: am d70feb97: am 0ec6e56d: am 60c02b43: Merge "fix NPE in action switch" into ub-camera-glacier * commit 'a61190a0567f84e3b8f46b68815ded3c4b83060e': fix NPE in action switch
|
9d676dab23f06fb4ac35fecdead5af63ddc3a43f |
07-Aug-2014 |
Spike Sprague <spikuru@google.com> |
am ffbce1d4: am d0765e61: am 48882a81: am c7ab9c4a: update system ui flags for full screen on android L * commit 'ffbce1d4245c46560ca1ac329c79d4b14ad79b19': update system ui flags for full screen on android L
|
a61190a0567f84e3b8f46b68815ded3c4b83060e |
07-Aug-2014 |
Alan Newberger <alann@google.com> |
am d70feb97: am 0ec6e56d: am 60c02b43: Merge "fix NPE in action switch" into ub-camera-glacier * commit 'd70feb97027ddb476b2d5c098ed2688765e0068b': fix NPE in action switch
|
d70feb97027ddb476b2d5c098ed2688765e0068b |
07-Aug-2014 |
Alan Newberger <alann@google.com> |
am 0ec6e56d: am 60c02b43: Merge "fix NPE in action switch" into ub-camera-glacier * commit '0ec6e56da56a04aa63328e45f2c155db6e594555': fix NPE in action switch
|
938f9a4c4af008baa0b8040a37362328794e06e1 |
06-Aug-2014 |
Alan Newberger <alann@google.com> |
am 60c02b43: Merge "fix NPE in action switch" into ub-camera-glacier * commit '60c02b437771c8fe959b233bcdcb28e4314c7489': fix NPE in action switch
|
0ec6e56da56a04aa63328e45f2c155db6e594555 |
06-Aug-2014 |
Alan Newberger <alann@google.com> |
am 60c02b43: Merge "fix NPE in action switch" into ub-camera-glacier * commit '60c02b437771c8fe959b233bcdcb28e4314c7489': fix NPE in action switch
|
ffbce1d4245c46560ca1ac329c79d4b14ad79b19 |
06-Aug-2014 |
Spike Sprague <spikuru@google.com> |
am d0765e61: am 48882a81: am c7ab9c4a: update system ui flags for full screen on android L * commit 'd0765e619112b81a79aa1ef9fd2aa64596ad28b6': update system ui flags for full screen on android L
|
d0765e619112b81a79aa1ef9fd2aa64596ad28b6 |
06-Aug-2014 |
Spike Sprague <spikuru@google.com> |
am 48882a81: am c7ab9c4a: update system ui flags for full screen on android L * commit '48882a812bea675dc48bfdaa4492c5ad0a45c212': update system ui flags for full screen on android L
|
48882a812bea675dc48bfdaa4492c5ad0a45c212 |
06-Aug-2014 |
Spike Sprague <spikuru@google.com> |
am c7ab9c4a: update system ui flags for full screen on android L * commit 'c7ab9c4ab2912f2c2777f907ca4c6f845ce98cef': update system ui flags for full screen on android L
|
58da8da6e9ecb10313208005d0e170ce5b073abf |
06-Aug-2014 |
Spike Sprague <spikuru@google.com> |
am c7ab9c4a: update system ui flags for full screen on android L * commit 'c7ab9c4ab2912f2c2777f907ca4c6f845ce98cef': update system ui flags for full screen on android L
|
c7ab9c4ab2912f2c2777f907ca4c6f845ce98cef |
06-Aug-2014 |
Spike Sprague <spikuru@google.com> |
update system ui flags for full screen on android L bug: 16632474 Change-Id: I5b555492587df103b41ad13a6893a334b8c71b68
rc/com/android/camera/CameraActivity.java
|
32ea49ecb0bb200f14b33c61a8badabee607bce9 |
06-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
am 02000a2b: am 30cf93d3: am da841435: am 0024b57e: Merge "[OC] Enable flash support." into ub-camera-glacier * commit '02000a2ba67ebe12b95748d504222c7b260ad1bc': [OC] Enable flash support.
|
3c896b6b403269c5893291a7e86dfddcc22e7e0e |
06-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
am 59b25c4c: am 8b0355dc: am 3fafd0cc: am e3dfd5a4: [OC] Migrate away from android.util.Size sinc we cannot use it in K. * commit '59b25c4c780d52345a05c147d058789f005134ae': [OC] Migrate away from android.util.Size sinc we cannot use it in K.
|
02000a2ba67ebe12b95748d504222c7b260ad1bc |
06-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
am 30cf93d3: am da841435: am 0024b57e: Merge "[OC] Enable flash support." into ub-camera-glacier * commit '30cf93d38df111c1622d0b7fab0f3d9c594233b5': [OC] Enable flash support.
|
59b25c4c780d52345a05c147d058789f005134ae |
06-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
am 8b0355dc: am 3fafd0cc: am e3dfd5a4: [OC] Migrate away from android.util.Size sinc we cannot use it in K. * commit '8b0355dc2f55968e48cc4da9c2c87a3494ed3222': [OC] Migrate away from android.util.Size sinc we cannot use it in K.
|
30cf93d38df111c1622d0b7fab0f3d9c594233b5 |
06-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
am da841435: am 0024b57e: Merge "[OC] Enable flash support." into ub-camera-glacier * commit 'da841435d5fbf1611c5e67e22e8a632f45d8c066': [OC] Enable flash support.
|
8b0355dc2f55968e48cc4da9c2c87a3494ed3222 |
06-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
am 3fafd0cc: am e3dfd5a4: [OC] Migrate away from android.util.Size sinc we cannot use it in K. * commit '3fafd0cc331ee2fa92c95a4c3a10431f76e3eabb': [OC] Migrate away from android.util.Size sinc we cannot use it in K.
|
da841435d5fbf1611c5e67e22e8a632f45d8c066 |
06-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
am 0024b57e: Merge "[OC] Enable flash support." into ub-camera-glacier * commit '0024b57e54c674d86ff15011867a0f44029e0c48': [OC] Enable flash support.
|
5e3b138823bf74458271cf8998954d7d2182dbd8 |
06-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
am 0024b57e: Merge "[OC] Enable flash support." into ub-camera-glacier * commit '0024b57e54c674d86ff15011867a0f44029e0c48': [OC] Enable flash support.
|
699358e952e34d7efa85fe27688f59057b746b4b |
06-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
am e3dfd5a4: [OC] Migrate away from android.util.Size sinc we cannot use it in K. * commit 'e3dfd5a433e39d76578b379fe1539864cf924cee': [OC] Migrate away from android.util.Size sinc we cannot use it in K.
|
3fafd0cc331ee2fa92c95a4c3a10431f76e3eabb |
06-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
am e3dfd5a4: [OC] Migrate away from android.util.Size sinc we cannot use it in K. * commit 'e3dfd5a433e39d76578b379fe1539864cf924cee': [OC] Migrate away from android.util.Size sinc we cannot use it in K.
|
e3dfd5a433e39d76578b379fe1539864cf924cee |
06-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
[OC] Migrate away from android.util.Size sinc we cannot use it in K. Bug: 16654225 Change-Id: I2c0ea6b387b8ad38d6e49c84dca8bf2bde34e249
rc/com/android/camera/CaptureModule.java
rc/com/android/camera/CaptureModuleUtil.java
rc/com/android/camera/one/OneCamera.java
rc/com/android/camera/one/OneCameraManager.java
rc/com/android/camera/one/v1/OneCameraManagerImpl.java
rc/com/android/camera/one/v2/OneCameraImpl.java
rc/com/android/camera/one/v2/OneCameraManagerImpl.java
rc/com/android/camera/settings/ResolutionUtil.java
rc/com/android/camera/settings/SettingsManager.java
rc/com/android/camera/util/Size.java
rc_pd/com/android/camera/one/v2/OneCameraCreator.java
|
f9eb682425146171fe3dafe90b0e83ea24d4bc91 |
05-Aug-2014 |
Geoff Mendal <mendal@google.com> |
am b455b071: (-s ours) am e8d21649: (-s ours) am 69309ffd: (-s ours) am 1b9926df: (-s ours) Import translations. DO NOT MERGE * commit 'b455b0717890a596fc12878925c8906e44b67740': Import translations. DO NOT MERGE
|
b455b0717890a596fc12878925c8906e44b67740 |
05-Aug-2014 |
Geoff Mendal <mendal@google.com> |
am e8d21649: (-s ours) am 69309ffd: (-s ours) am 1b9926df: (-s ours) Import translations. DO NOT MERGE * commit 'e8d216493611376ccc9d10338f7524400eebfa41': Import translations. DO NOT MERGE
|
a0e83092845f40aecdb831bd7204077e3dfded7c |
05-Aug-2014 |
Geoff Mendal <mendal@google.com> |
am 42af2305: (-s ours) am 8b9dcb95: (-s ours) am d753c629: (-s ours) Import translations. DO NOT MERGE * commit '42af23058f644ceaa4735049999e8d579418c81a': Import translations. DO NOT MERGE
|
e8d216493611376ccc9d10338f7524400eebfa41 |
05-Aug-2014 |
Geoff Mendal <mendal@google.com> |
am 69309ffd: (-s ours) am 1b9926df: (-s ours) Import translations. DO NOT MERGE * commit '69309ffd3c992d7e46d2602ef2efefced4d66326': Import translations. DO NOT MERGE
|
42af23058f644ceaa4735049999e8d579418c81a |
05-Aug-2014 |
Geoff Mendal <mendal@google.com> |
am 8b9dcb95: (-s ours) am d753c629: (-s ours) Import translations. DO NOT MERGE * commit '8b9dcb95cce5529cd448a886bd1893b93e2678ce': Import translations. DO NOT MERGE
|
8b9dcb95cce5529cd448a886bd1893b93e2678ce |
05-Aug-2014 |
Geoff Mendal <mendal@google.com> |
am d753c629: (-s ours) Import translations. DO NOT MERGE * commit 'd753c629adcc8079ed9eea3efb4934135874b713': Import translations. DO NOT MERGE
|
45a851a6e7defa70f4ff70097298da89e93f51f8 |
05-Aug-2014 |
Geoff Mendal <mendal@google.com> |
am 1b9926df: (-s ours) Import translations. DO NOT MERGE * commit '1b9926dfadedfe77badd2f7fb4eeeebfd3138652': Import translations. DO NOT MERGE
|
69309ffd3c992d7e46d2602ef2efefced4d66326 |
05-Aug-2014 |
Geoff Mendal <mendal@google.com> |
am 1b9926df: (-s ours) Import translations. DO NOT MERGE * commit '1b9926dfadedfe77badd2f7fb4eeeebfd3138652': Import translations. DO NOT MERGE
|
1b9926dfadedfe77badd2f7fb4eeeebfd3138652 |
05-Aug-2014 |
Geoff Mendal <mendal@google.com> |
Import translations. DO NOT MERGE Change-Id: Iefb086b8135a5efef30d53c06147a6415f824fb8 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-km-rKH/strings.xml
es/values-ko/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mn-rMN/strings.xml
es/values-ms-rMY/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
e8d7648d549db43b82ae2461f423442034ccea4a |
05-Aug-2014 |
Geoff Mendal <mendal@google.com> |
Import translations. DO NOT MERGE Change-Id: Ieca2a52f6a502b3f890060a2cd8bc9e39aff5acb Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-bn-rBD/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-eu-rES/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-gl-rES/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-is-rIS/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-kk-rKZ/strings.xml
es/values-km-rKH/strings.xml
es/values-kn-rIN/strings.xml
es/values-ko/strings.xml
es/values-ky-rKG/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mk-rMK/strings.xml
es/values-ml-rIN/strings.xml
es/values-mn-rMN/strings.xml
es/values-mr-rIN/strings.xml
es/values-ms-rMY/strings.xml
es/values-my-rMM/strings.xml
es/values-nb/strings.xml
es/values-ne-rNP/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-si-rLK/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-ta-rIN/strings.xml
es/values-te-rIN/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-ur-rPK/strings.xml
es/values-uz-rUZ/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
d753c629adcc8079ed9eea3efb4934135874b713 |
05-Aug-2014 |
Geoff Mendal <mendal@google.com> |
Import translations. DO NOT MERGE Change-Id: I311bccfefd549388b880de2138dcaf3d87d34431 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-bn-rBD/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-eu-rES/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-gl-rES/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-is-rIS/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-kk-rKZ/strings.xml
es/values-km-rKH/strings.xml
es/values-kn-rIN/strings.xml
es/values-ko/strings.xml
es/values-ky-rKG/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mk-rMK/strings.xml
es/values-ml-rIN/strings.xml
es/values-mn-rMN/strings.xml
es/values-mr-rIN/strings.xml
es/values-ms-rMY/strings.xml
es/values-my-rMM/strings.xml
es/values-nb/strings.xml
es/values-ne-rNP/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-si-rLK/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-ta-rIN/strings.xml
es/values-te-rIN/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-ur-rPK/strings.xml
es/values-uz-rUZ/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
60c02b437771c8fe959b233bcdcb28e4314c7489 |
06-Aug-2014 |
Alan Newberger <alann@google.com> |
Merge "fix NPE in action switch" into ub-camera-glacier
|
ea7db650e3468f913bbea5bad52875c93bde9ba9 |
06-Aug-2014 |
Alan Newberger <alann@google.com> |
fix NPE in action switch Recent conversion of action condition from if/else to switch overlooked need for switch to be non-null. Fixing here. Bug: 16847376 Change-Id: I919c585c414d0d3c4ef7fcdefccfda9118ef8104
rc/com/android/camera/CameraActivity.java
|
0024b57e54c674d86ff15011867a0f44029e0c48 |
06-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "[OC] Enable flash support." into ub-camera-glacier
|
0cf4a02c13a7710dc9b26ac39bea15a95ac48baf |
31-Jul-2014 |
Sascha Haeberling <haeberling@google.com> |
[OC] Enable flash support. Bug: 16654225 Also show an error and exit the app if camera could not be opened. Change-Id: Iddccaff35b081ba98efe2aaae51d9ee10bb7726f
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/CaptureModule.java
rc/com/android/camera/app/AppController.java
rc/com/android/camera/app/CameraAppUI.java
rc/com/android/camera/one/OneCamera.java
rc/com/android/camera/one/v2/OneCameraImpl.java
rc/com/android/camera/one/v2/OneCameraManagerImpl.java
|
c88c35cbe7807017ca8630244828be7944b781d0 |
03-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
am eb7a967d: am 6ee34fd6: am a8e0177a: am 822b8e29: Merge "[OC] Introduce OneCameraCreator so we can dynamically create a different version." into ub-camera-glacier * commit 'eb7a967dbcf86233e0b93f840832f7047d21d041': [OC] Introduce OneCameraCreator so we can dynamically create a different version.
|
32b8c30221e500d99c31548767982c4d07362df5 |
03-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
am b1abcbe3: am f9e10f20: am 3ccdfe36: am ad87534c: Merge "Prevent monkey crash when deleting without data" into ub-camera-glacier * commit 'b1abcbe340f09a3cc8a0e699e9b0f793d40be0e8': Prevent monkey crash when deleting without data
|
eb7a967dbcf86233e0b93f840832f7047d21d041 |
03-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
am 6ee34fd6: am a8e0177a: am 822b8e29: Merge "[OC] Introduce OneCameraCreator so we can dynamically create a different version." into ub-camera-glacier * commit '6ee34fd670dcb5e665c9cff682a5cd49870deecd': [OC] Introduce OneCameraCreator so we can dynamically create a different version.
|
b1abcbe340f09a3cc8a0e699e9b0f793d40be0e8 |
03-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
am f9e10f20: am 3ccdfe36: am ad87534c: Merge "Prevent monkey crash when deleting without data" into ub-camera-glacier * commit 'f9e10f2023a795402f877ae965bbb59f9b3c4fb1': Prevent monkey crash when deleting without data
|
6ee34fd670dcb5e665c9cff682a5cd49870deecd |
03-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
am a8e0177a: am 822b8e29: Merge "[OC] Introduce OneCameraCreator so we can dynamically create a different version." into ub-camera-glacier * commit 'a8e0177abe80dd0fd2b9e44f455b78098bddf77d': [OC] Introduce OneCameraCreator so we can dynamically create a different version.
|
f9e10f2023a795402f877ae965bbb59f9b3c4fb1 |
03-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
am 3ccdfe36: am ad87534c: Merge "Prevent monkey crash when deleting without data" into ub-camera-glacier * commit '3ccdfe36f8a067ab4f4a3c9a8fd1aa3b28b0559c': Prevent monkey crash when deleting without data
|
1adf80f389d412fd61be9b9a52a051157cf22584 |
03-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
am 822b8e29: Merge "[OC] Introduce OneCameraCreator so we can dynamically create a different version." into ub-camera-glacier * commit '822b8e291d7141932837b1f3a9bf9bb670da9b6e': [OC] Introduce OneCameraCreator so we can dynamically create a different version.
|
a8e0177abe80dd0fd2b9e44f455b78098bddf77d |
03-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
am 822b8e29: Merge "[OC] Introduce OneCameraCreator so we can dynamically create a different version." into ub-camera-glacier * commit '822b8e291d7141932837b1f3a9bf9bb670da9b6e': [OC] Introduce OneCameraCreator so we can dynamically create a different version.
|
3ccdfe36f8a067ab4f4a3c9a8fd1aa3b28b0559c |
03-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
am ad87534c: Merge "Prevent monkey crash when deleting without data" into ub-camera-glacier * commit 'ad87534c5a9e77e3d8fa09ed0b8692caf2a34937': Prevent monkey crash when deleting without data
|
de756478a540eb1864efd962252b23f4eda63e03 |
03-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
am ad87534c: Merge "Prevent monkey crash when deleting without data" into ub-camera-glacier * commit 'ad87534c5a9e77e3d8fa09ed0b8692caf2a34937': Prevent monkey crash when deleting without data
|
36aa2484ca4860a2616910fe3a83ef585e3d6564 |
01-Aug-2014 |
Alan Newberger <alann@google.com> |
am b2760315: am 19cfa18e: am 45464e1c: am 517f32a7: Restore grid initialization logic to fix grid display on startup * commit 'b276031589bfc3bedd64b5409fb6af3b21ab8f99': Restore grid initialization logic to fix grid display on startup
|
b276031589bfc3bedd64b5409fb6af3b21ab8f99 |
01-Aug-2014 |
Alan Newberger <alann@google.com> |
am 19cfa18e: am 45464e1c: am 517f32a7: Restore grid initialization logic to fix grid display on startup * commit '19cfa18ec726af2a3a779c35f7931a426723df01': Restore grid initialization logic to fix grid display on startup
|
19cfa18ec726af2a3a779c35f7931a426723df01 |
01-Aug-2014 |
Alan Newberger <alann@google.com> |
am 45464e1c: am 517f32a7: Restore grid initialization logic to fix grid display on startup * commit '45464e1cfb754c7aed164a0684e38c68e35988e0': Restore grid initialization logic to fix grid display on startup
|
c5338515007e353786d7d7b0cb93e92734dc2b40 |
01-Aug-2014 |
Alan Newberger <alann@google.com> |
am 517f32a7: Restore grid initialization logic to fix grid display on startup * commit '517f32a7cb9b154ddde61d91f1f562d2f1889984': Restore grid initialization logic to fix grid display on startup
|
45464e1cfb754c7aed164a0684e38c68e35988e0 |
01-Aug-2014 |
Alan Newberger <alann@google.com> |
am 517f32a7: Restore grid initialization logic to fix grid display on startup * commit '517f32a7cb9b154ddde61d91f1f562d2f1889984': Restore grid initialization logic to fix grid display on startup
|
517f32a7cb9b154ddde61d91f1f562d2f1889984 |
01-Aug-2014 |
Alan Newberger <alann@google.com> |
Restore grid initialization logic to fix grid display on startup The large settings refactor in ag/484817 not only changed settings calls in ButtonManager.initializeGridLinesButton, it altered the order of calls to create the button callback and to set the button state. The prior implementation and this CL creates the callback, and then sets state so that the callback, which controls display, runs upon initial state setup of the button. Otherwise the grid is not shown correctly on module startup. Bug: 16687954 Change-Id: I482906d2d54a8545066dded3209b55ae4ad48bdb
rc/com/android/camera/ButtonManager.java
|
1019bf8cc813d5d0a6ac9cc69651ea414fa78a9b |
01-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
am 4967064a: am 9492f32f: am 816acdb9: am 57bcd92f: [OC] Refactoring the session API before intgrating GCam into OneCamera * commit '4967064a362967bced0e4a558e250a96473dc8c7': [OC] Refactoring the session API before intgrating GCam into OneCamera
|
7bb6fc67b044948fe202f5d1f851126ca753cf6d |
01-Aug-2014 |
Andy Huibers <andyhuibers@google.com> |
am 272bfed1: am 3e0aa456: am 37f28367: am 9a9a1086: Improved logging of foreground source type. * commit '272bfed10df84896f06105883f7fad3ae171bc7c': Improved logging of foreground source type.
|
4967064a362967bced0e4a558e250a96473dc8c7 |
01-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
am 9492f32f: am 816acdb9: am 57bcd92f: [OC] Refactoring the session API before intgrating GCam into OneCamera * commit '9492f32f589ccdfe7c49f7ca691e1448b8e86522': [OC] Refactoring the session API before intgrating GCam into OneCamera
|
272bfed10df84896f06105883f7fad3ae171bc7c |
01-Aug-2014 |
Andy Huibers <andyhuibers@google.com> |
am 3e0aa456: am 37f28367: am 9a9a1086: Improved logging of foreground source type. * commit '3e0aa456090df2c87b1ce7e89157f8757cb19bfb': Improved logging of foreground source type.
|
822b8e291d7141932837b1f3a9bf9bb670da9b6e |
03-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "[OC] Introduce OneCameraCreator so we can dynamically create a different version." into ub-camera-glacier
|
2b99192dea8a56097e2b9da13c01e4bbea59967a |
03-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
[OC] Introduce OneCameraCreator so we can dynamically create a different version. Bug: 16654225 Change-Id: Iaf7d738b4405fa2e58cc5fc8af99d5ff2718f5a9
rc/com/android/camera/one/v2/OneCameraManagerImpl.java
rc_pd/com/android/camera/one/v2/OneCameraCreator.java
|
ad87534c5a9e77e3d8fa09ed0b8692caf2a34937 |
03-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Prevent monkey crash when deleting without data" into ub-camera-glacier
|
9492f32f589ccdfe7c49f7ca691e1448b8e86522 |
01-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
am 816acdb9: am 57bcd92f: [OC] Refactoring the session API before intgrating GCam into OneCamera * commit '816acdb9945537d7eab6a9dea9c88331f5289546': [OC] Refactoring the session API before intgrating GCam into OneCamera
|
816acdb9945537d7eab6a9dea9c88331f5289546 |
01-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
am 57bcd92f: [OC] Refactoring the session API before intgrating GCam into OneCamera * commit '57bcd92f39d85427102f30be2c749c4a7bd4be96': [OC] Refactoring the session API before intgrating GCam into OneCamera
|
b3ae8fe650dc65c6bb0b19a07fbb2e7de006b88e |
01-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
am 57bcd92f: [OC] Refactoring the session API before intgrating GCam into OneCamera * commit '57bcd92f39d85427102f30be2c749c4a7bd4be96': [OC] Refactoring the session API before intgrating GCam into OneCamera
|
57bcd92f39d85427102f30be2c749c4a7bd4be96 |
01-Aug-2014 |
Sascha Haeberling <haeberling@google.com> |
[OC] Refactoring the session API before intgrating GCam into OneCamera Bug: 16654225 Change-Id: I3fe6f46847ed6424310a81722c93c63be8b807a3
rc/com/android/camera/CaptureModule.java
rc/com/android/camera/one/OneCamera.java
rc/com/android/camera/one/v2/OneCameraImpl.java
rc/com/android/camera/processing/ProcessingService.java
rc/com/android/camera/session/CaptureSession.java
rc/com/android/camera/session/CaptureSessionManager.java
rc/com/android/camera/session/CaptureSessionManagerImpl.java
rc/com/android/camera/ui/BottomBar.java
|
73ec9851f8e92968ac50193916526afd8f1343fc |
25-Jul-2014 |
Sol Boucher <solb@google.com> |
Move display orientation calculations out of app code Because they're needed by every app, these are being relocated into the portability layer. As such, the CameraUtil#getDisplayOrientation() and CameraUtil#getJpegRotation() methods are being replaced by the API-agnostic CameraDeviceInfo.Characteristics#getPreviewOrientation() and CameraDeviceInfo.Characteristics#getJpegOrientation() calls, respectively. Change-Id: I5048e6f1a5ff655e4ea260b109e7c104bbe790b0
rc/com/android/camera/CaptureModule.java
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/VideoModule.java
rc/com/android/camera/util/CameraUtil.java
|
3e0aa456090df2c87b1ce7e89157f8757cb19bfb |
31-Jul-2014 |
Andy Huibers <andyhuibers@google.com> |
am 37f28367: am 9a9a1086: Improved logging of foreground source type. * commit '37f283677283a648805485d930b86434d3512e37': Improved logging of foreground source type.
|
c63db69fe4e017f0e697d53a7c679cb2f5049c8d |
31-Jul-2014 |
Andy Huibers <andyhuibers@google.com> |
am 9a9a1086: Improved logging of foreground source type. * commit '9a9a1086c10ea39ae9a2a5bdeeb600c2d7f940b6': Improved logging of foreground source type.
|
37f283677283a648805485d930b86434d3512e37 |
31-Jul-2014 |
Andy Huibers <andyhuibers@google.com> |
am 9a9a1086: Improved logging of foreground source type. * commit '9a9a1086c10ea39ae9a2a5bdeeb600c2d7f940b6': Improved logging of foreground source type.
|
9a9a1086c10ea39ae9a2a5bdeeb600c2d7f940b6 |
31-Jul-2014 |
Andy Huibers <andyhuibers@google.com> |
Improved logging of foreground source type. Change-Id: I6fdd5a52ec136f76352e006a8e95e88aac0ac1af
rc/com/android/camera/CameraActivity.java
rc_pd/com/google/common/logging/eventprotos.java
|
798414e2ecd0f80cd309695c941c37574e264433 |
31-Jul-2014 |
Sascha Haeberling <haeberling@google.com> |
am 7a3a0854: am 4f8f2807: am 4d8d2e6f: am 00d8bbc9: Merge "[OC] Hook new Capture module up, behind a system property." into ub-camera-glacier * commit '7a3a0854768f8ebe7ebb228c9b4a1bef0cffa776': [OC] Hook new Capture module up, behind a system property.
|
7a3a0854768f8ebe7ebb228c9b4a1bef0cffa776 |
31-Jul-2014 |
Sascha Haeberling <haeberling@google.com> |
am 4f8f2807: am 4d8d2e6f: am 00d8bbc9: Merge "[OC] Hook new Capture module up, behind a system property." into ub-camera-glacier * commit '4f8f2807295d2ad3151320b3e7a948fae69ce810': [OC] Hook new Capture module up, behind a system property.
|
3d0821af81d46cae1d6e61acf5061f5c08a7b38a |
31-Jul-2014 |
Sascha Haeberling <haeberling@google.com> |
am 5e881cf9: am aa58ea97: am f7a50058: am 08b3c94a: [OC] Adds the new CaptureModule and UI. * commit '5e881cf9c6ab1ddca7d2063b557a87eb3fdf3c57': [OC] Adds the new CaptureModule and UI.
|
4f8f2807295d2ad3151320b3e7a948fae69ce810 |
31-Jul-2014 |
Sascha Haeberling <haeberling@google.com> |
am 4d8d2e6f: am 00d8bbc9: Merge "[OC] Hook new Capture module up, behind a system property." into ub-camera-glacier * commit '4d8d2e6f1419a609bc78e42fd6fa26f274e7ffbd': [OC] Hook new Capture module up, behind a system property.
|
4d8d2e6f1419a609bc78e42fd6fa26f274e7ffbd |
31-Jul-2014 |
Sascha Haeberling <haeberling@google.com> |
am 00d8bbc9: Merge "[OC] Hook new Capture module up, behind a system property." into ub-camera-glacier * commit '00d8bbc97d970db9604474210554caa18935c7eb': [OC] Hook new Capture module up, behind a system property.
|
5e881cf9c6ab1ddca7d2063b557a87eb3fdf3c57 |
31-Jul-2014 |
Sascha Haeberling <haeberling@google.com> |
am aa58ea97: am f7a50058: am 08b3c94a: [OC] Adds the new CaptureModule and UI. * commit 'aa58ea978a43c4588eecfa91f0aecb9bcc5abec9': [OC] Adds the new CaptureModule and UI.
|
dd3fda4375e32b9c72154334430d89fc8a46e53d |
31-Jul-2014 |
Sascha Haeberling <haeberling@google.com> |
am 00d8bbc9: Merge "[OC] Hook new Capture module up, behind a system property." into ub-camera-glacier * commit '00d8bbc97d970db9604474210554caa18935c7eb': [OC] Hook new Capture module up, behind a system property.
|
aa58ea978a43c4588eecfa91f0aecb9bcc5abec9 |
31-Jul-2014 |
Sascha Haeberling <haeberling@google.com> |
am f7a50058: am 08b3c94a: [OC] Adds the new CaptureModule and UI. * commit 'f7a50058176fd499379dd5eedc5a8a34db447361': [OC] Adds the new CaptureModule and UI.
|
60706d3f5fa5c224495a014ee6d5bab3daf7f8d4 |
31-Jul-2014 |
Sascha Haeberling <haeberling@google.com> |
am 08b3c94a: [OC] Adds the new CaptureModule and UI. * commit '08b3c94a7d7aff30b5da8e99649346e37b67a5c5': [OC] Adds the new CaptureModule and UI.
|
f7a50058176fd499379dd5eedc5a8a34db447361 |
31-Jul-2014 |
Sascha Haeberling <haeberling@google.com> |
am 08b3c94a: [OC] Adds the new CaptureModule and UI. * commit '08b3c94a7d7aff30b5da8e99649346e37b67a5c5': [OC] Adds the new CaptureModule and UI.
|
08b3c94a7d7aff30b5da8e99649346e37b67a5c5 |
31-Jul-2014 |
Sascha Haeberling <haeberling@google.com> |
[OC] Adds the new CaptureModule and UI. Bug: 16654225 This is essentially a version of the GCamModule without GCam, plus a few things we need from PhotoModule. Some code is commented out to be added back in later as a reminder. CLs to hook the module up will be following up. Change-Id: I70108529f81a8b0b744dc846287ea2ac121c85da
es/layout/capture_module.xml
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/CaptureModule.java
rc/com/android/camera/CaptureModuleUI.java
rc/com/android/camera/app/AppController.java
rc/com/android/camera/app/CameraAppUI.java
rc/com/android/camera/settings/ResolutionUtil.java
|
00d8bbc97d970db9604474210554caa18935c7eb |
31-Jul-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "[OC] Hook new Capture module up, behind a system property." into ub-camera-glacier
|
f8df06c4a7d77b61e0f64448d15c50a2a61e263f |
31-Jul-2014 |
Sascha Haeberling <haeberling@google.com> |
[OC] Hook new Capture module up, behind a system property. Bug: 16654225 Change-Id: I6be44fefce66c09425a1bebc1942489f6af7636c
rc/com/android/camera/module/ModulesInfo.java
|
095593e0148868fbdaa7c60d02a3e9eab2025162 |
30-Jul-2014 |
Sascha Haeberling <haeberling@google.com> |
am 5d6232a0: am 77d49f93: am 3c52c014: am ef66e813: Cleaning up unused strings. * commit '5d6232a03de4f799e3728d18ea5f0dee24a5063e': Cleaning up unused strings.
|
5d6232a03de4f799e3728d18ea5f0dee24a5063e |
30-Jul-2014 |
Sascha Haeberling <haeberling@google.com> |
am 77d49f93: am 3c52c014: am ef66e813: Cleaning up unused strings. * commit '77d49f93848e02e6d9387c8c0e1af2be45252a85': Cleaning up unused strings.
|
77d49f93848e02e6d9387c8c0e1af2be45252a85 |
30-Jul-2014 |
Sascha Haeberling <haeberling@google.com> |
am 3c52c014: am ef66e813: Cleaning up unused strings. * commit '3c52c0143597633f4224d49f9e129f6ba82d7f49': Cleaning up unused strings.
|
3c52c0143597633f4224d49f9e129f6ba82d7f49 |
30-Jul-2014 |
Sascha Haeberling <haeberling@google.com> |
am ef66e813: Cleaning up unused strings. * commit 'ef66e81388982b89c710e75a9d9ae314b1de97f9': Cleaning up unused strings.
|
d3dac2029dc350a2a77fbdf926c6cac8d7c4efdd |
30-Jul-2014 |
Sascha Haeberling <haeberling@google.com> |
am ef66e813: Cleaning up unused strings. * commit 'ef66e81388982b89c710e75a9d9ae314b1de97f9': Cleaning up unused strings.
|
2fe3a3ee942690f3b88218fcd941d6c93039bf82 |
30-Jul-2014 |
Sascha Haeberling <haeberling@google.com> |
Prevent monkey crash when deleting without data Bug: 16536894 Change-Id: I960c0d8f61b2909c7020d3c259fbad8f8c33bc05
rc/com/android/camera/CameraActivity.java
|
c5531714a35cf82b5736cb309947ee5622818f4e |
30-Jul-2014 |
Sascha Haeberling <haeberling@google.com> |
am 7a154374: am c584cd65: am 8a25239a: am f5e51ec4: [OC] Camera2-based OneCamera implementation. * commit '7a154374e255792978bed230c4fe1f5c3ba50526': [OC] Camera2-based OneCamera implementation.
|
7fb04314376f0819ad0f4fff4fc3f3d2691000da |
30-Jul-2014 |
Sascha Haeberling <haeberling@google.com> |
am 3f04b7e8: am 79f4bfea: am 91469c4a: am 2f001066: Merge "Put conversion from string to size into SettingsManager." into ub-camera-glacier * commit '3f04b7e861af155e21584fd6f37c79a6f61077c0': Put conversion from string to size into SettingsManager.
|
3c54b207f0c7d7ee5c759d33105d5b7a477fcf9e |
30-Jul-2014 |
Sascha Haeberling <haeberling@google.com> |
am 13fec59c: am c0fe8ca4: am 26529cab: am d674447d: Add empty version of SystemProperties interface. * commit '13fec59ca243fb56771be5a4b48eeae464fb08c2': Add empty version of SystemProperties interface.
|
549a65e35df3b065a317976ba170add52220421a |
30-Jul-2014 |
Sascha Haeberling <haeberling@google.com> |
am 141e4390: am a0ee9a9f: am 94a31ced: am ee36c5f5: Minor clean-up around the code base. * commit '141e4390b06f8b9eb15b482dc52bc939333d968c': Minor clean-up around the code base.
|
c8dc375c5d8aaed0cc353a99b27bbc1055a20cfa |
30-Jul-2014 |
Sascha Haeberling <haeberling@google.com> |
am 9b0ad18d: am a53b2b49: am facae275: am b0d171e8: [OC] Adding the OneCamera manager API. * commit '9b0ad18d29454247d65c4a473ff9d8a41d30be33': [OC] Adding the OneCamera manager API.
|
d5c1686ad192a93160dce1f5d1b4890eaca7ab6a |
30-Jul-2014 |
Sascha Haeberling <haeberling@google.com> |
am eabf56fe: am 9af7311a: am 242f3445: am 8c34b30b: [OC] Add common abstract OneCamera class. * commit 'eabf56fe46cc942a5fc34c7984f305940192fb8b': [OC] Add common abstract OneCamera class.
|
7a154374e255792978bed230c4fe1f5c3ba50526 |
30-Jul-2014 |
Sascha Haeberling <haeberling@google.com> |
am c584cd65: am 8a25239a: am f5e51ec4: [OC] Camera2-based OneCamera implementation. * commit 'c584cd65472d393fb1e48de3acdd12cd22da416c': [OC] Camera2-based OneCamera implementation.
|
3f04b7e861af155e21584fd6f37c79a6f61077c0 |
30-Jul-2014 |
Sascha Haeberling <haeberling@google.com> |
am 79f4bfea: am 91469c4a: am 2f001066: Merge "Put conversion from string to size into SettingsManager." into ub-camera-glacier * commit '79f4bfeae5269d12faa08856d02c7181ae700557': Put conversion from string to size into SettingsManager.
|
13fec59ca243fb56771be5a4b48eeae464fb08c2 |
30-Jul-2014 |
Sascha Haeberling <haeberling@google.com> |
am c0fe8ca4: am 26529cab: am d674447d: Add empty version of SystemProperties interface. * commit 'c0fe8ca434223e9c0d34113e848cb2a1fe671ffc': Add empty version of SystemProperties interface.
|
141e4390b06f8b9eb15b482dc52bc939333d968c |
30-Jul-2014 |
Sascha Haeberling <haeberling@google.com> |
am a0ee9a9f: am 94a31ced: am ee36c5f5: Minor clean-up around the code base. * commit 'a0ee9a9f7a8ab06fc4f827f54a2d3941547518d0': Minor clean-up around the code base.
|
9b0ad18d29454247d65c4a473ff9d8a41d30be33 |
30-Jul-2014 |
Sascha Haeberling <haeberling@google.com> |
am a53b2b49: am facae275: am b0d171e8: [OC] Adding the OneCamera manager API. * commit 'a53b2b49836e40cd29491157d82feddbf6bd7b14': [OC] Adding the OneCamera manager API.
|
eabf56fe46cc942a5fc34c7984f305940192fb8b |
30-Jul-2014 |
Sascha Haeberling <haeberling@google.com> |
am 9af7311a: am 242f3445: am 8c34b30b: [OC] Add common abstract OneCamera class. * commit '9af7311a2124de2a2b3eff989fc73a4c2ba9d3d5': [OC] Add common abstract OneCamera class.
|
54844de42f0b9bddce9bb91c6737dfca8f60ea34 |
30-Jul-2014 |
Sascha Haeberling <haeberling@google.com> |
am 579bc2e8: am 4900ca46: am e3ee6745: am 00c122a5: [OC] Version 1 of the nterface for OneCamera. * commit '579bc2e8aa3898b6dfe71af7e96bb0c09fd6da1d': [OC] Version 1 of the nterface for OneCamera.
|
e14df225c675e8ec5236c70e8308b93080817fc0 |
30-Jul-2014 |
Sascha Haeberling <haeberling@google.com> |
am 8087a0ba: am 8ef539bf: am 2513da81: am c7223fa9: Merge "[OC] Adds a class with common utility functions for capture modules." into ub-camera-glacier * commit '8087a0ba94a17555827f6453b37deccf2461f25b': [OC] Adds a class with common utility functions for capture modules.
|
579bc2e8aa3898b6dfe71af7e96bb0c09fd6da1d |
30-Jul-2014 |
Sascha Haeberling <haeberling@google.com> |
am 4900ca46: am e3ee6745: am 00c122a5: [OC] Version 1 of the nterface for OneCamera. * commit '4900ca464fd8656f34d1119605464c003126c751': [OC] Version 1 of the nterface for OneCamera.
|
8087a0ba94a17555827f6453b37deccf2461f25b |
30-Jul-2014 |
Sascha Haeberling <haeberling@google.com> |
am 8ef539bf: am 2513da81: am c7223fa9: Merge "[OC] Adds a class with common utility functions for capture modules." into ub-camera-glacier * commit '8ef539bf95ecda8f1b3d272fc2b413dcc316a6c6': [OC] Adds a class with common utility functions for capture modules.
|
ef66e81388982b89c710e75a9d9ae314b1de97f9 |
30-Jul-2014 |
Sascha Haeberling <haeberling@google.com> |
Cleaning up unused strings. 'et' and 'ms' are deprecated and have already been removed from master: http://ag/506364 Change-Id: I0acb1a5225f0b7c9c3dcf449b0a16bb7f77118ed
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-km-rKH/strings.xml
es/values-ko/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mn-rMN/strings.xml
es/values-ms-rMY/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-w1024dp/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
es/values/strings.xml
|
c584cd65472d393fb1e48de3acdd12cd22da416c |
30-Jul-2014 |
Sascha Haeberling <haeberling@google.com> |
am 8a25239a: am f5e51ec4: [OC] Camera2-based OneCamera implementation. * commit '8a25239af8cb5c874a888d22fba5b15bf6fa82ba': [OC] Camera2-based OneCamera implementation.
|
8a25239af8cb5c874a888d22fba5b15bf6fa82ba |
30-Jul-2014 |
Sascha Haeberling <haeberling@google.com> |
am f5e51ec4: [OC] Camera2-based OneCamera implementation. * commit 'f5e51ec44934d6d687267d2aff6386f5b728dd9f': [OC] Camera2-based OneCamera implementation.
|
acb486be758fee80654c3a58628cd1c3c30584aa |
30-Jul-2014 |
Sascha Haeberling <haeberling@google.com> |
am f5e51ec4: [OC] Camera2-based OneCamera implementation. * commit 'f5e51ec44934d6d687267d2aff6386f5b728dd9f': [OC] Camera2-based OneCamera implementation.
|
f5e51ec44934d6d687267d2aff6386f5b728dd9f |
30-Jul-2014 |
Sascha Haeberling <haeberling@google.com> |
[OC] Camera2-based OneCamera implementation. Bug: 16654225 Change-Id: Icc544eac762b5494e6bb6c9e768b810c44e11cd9
rc/com/android/camera/one/v2/OneCameraImpl.java
rc/com/android/camera/one/v2/OneCameraManagerImpl.java
|
79f4bfeae5269d12faa08856d02c7181ae700557 |
30-Jul-2014 |
Sascha Haeberling <haeberling@google.com> |
am 91469c4a: am 2f001066: Merge "Put conversion from string to size into SettingsManager." into ub-camera-glacier * commit '91469c4add9ed9b71172787208c96d3ddeedd857': Put conversion from string to size into SettingsManager.
|
c0fe8ca434223e9c0d34113e848cb2a1fe671ffc |
30-Jul-2014 |
Sascha Haeberling <haeberling@google.com> |
am 26529cab: am d674447d: Add empty version of SystemProperties interface. * commit '26529cab53f4c71a02b07e704f122c3e42038efe': Add empty version of SystemProperties interface.
|
91469c4add9ed9b71172787208c96d3ddeedd857 |
30-Jul-2014 |
Sascha Haeberling <haeberling@google.com> |
am 2f001066: Merge "Put conversion from string to size into SettingsManager." into ub-camera-glacier * commit '2f0010669ea789c1767527e960468b157796dfd4': Put conversion from string to size into SettingsManager.
|
26529cab53f4c71a02b07e704f122c3e42038efe |
30-Jul-2014 |
Sascha Haeberling <haeberling@google.com> |
am d674447d: Add empty version of SystemProperties interface. * commit 'd674447d33e21fcaca64ee916953d8b3c0288390': Add empty version of SystemProperties interface.
|
c19b72f7435475c1ce50f31e6f069e45cdf026eb |
30-Jul-2014 |
Sascha Haeberling <haeberling@google.com> |
am 2f001066: Merge "Put conversion from string to size into SettingsManager." into ub-camera-glacier * commit '2f0010669ea789c1767527e960468b157796dfd4': Put conversion from string to size into SettingsManager.
|
b9948e61dd0673ec8ef22754752b85588b912427 |
30-Jul-2014 |
Sascha Haeberling <haeberling@google.com> |
am d674447d: Add empty version of SystemProperties interface. * commit 'd674447d33e21fcaca64ee916953d8b3c0288390': Add empty version of SystemProperties interface.
|
a0ee9a9f7a8ab06fc4f827f54a2d3941547518d0 |
30-Jul-2014 |
Sascha Haeberling <haeberling@google.com> |
am 94a31ced: am ee36c5f5: Minor clean-up around the code base. * commit '94a31cedabac92345d6f2c019e8b58aef61a9a96': Minor clean-up around the code base.
|
a53b2b49836e40cd29491157d82feddbf6bd7b14 |
30-Jul-2014 |
Sascha Haeberling <haeberling@google.com> |
am facae275: am b0d171e8: [OC] Adding the OneCamera manager API. * commit 'facae2755eff8b8ecf3b19edd3250ff924c13c06': [OC] Adding the OneCamera manager API.
|
70aafc98520a33d7a44409b23ea4bc6faac19200 |
30-Jul-2014 |
Sascha Haeberling <haeberling@google.com> |
am ee36c5f5: Minor clean-up around the code base. * commit 'ee36c5f591ac181a10692b2ec2b96de5251c4abb': Minor clean-up around the code base.
|
ba501625594f9a5aabc61e87e1f78f8380046b29 |
30-Jul-2014 |
Sascha Haeberling <haeberling@google.com> |
am b0d171e8: [OC] Adding the OneCamera manager API. * commit 'b0d171e892dffbc7ce0caf7415f96fa513c6f3fc': [OC] Adding the OneCamera manager API.
|
94a31cedabac92345d6f2c019e8b58aef61a9a96 |
30-Jul-2014 |
Sascha Haeberling <haeberling@google.com> |
am ee36c5f5: Minor clean-up around the code base. * commit 'ee36c5f591ac181a10692b2ec2b96de5251c4abb': Minor clean-up around the code base.
|
facae2755eff8b8ecf3b19edd3250ff924c13c06 |
30-Jul-2014 |
Sascha Haeberling <haeberling@google.com> |
am b0d171e8: [OC] Adding the OneCamera manager API. * commit 'b0d171e892dffbc7ce0caf7415f96fa513c6f3fc': [OC] Adding the OneCamera manager API.
|
d674447d33e21fcaca64ee916953d8b3c0288390 |
30-Jul-2014 |
Sascha Haeberling <haeberling@google.com> |
Add empty version of SystemProperties interface. This is so that we can use it in Camera2 code. Change-Id: I764adb7377b91b5b54a33535188eb6d0d5159253
rc_pd/com/android/camera/util/SystemProperties.java
|
ee36c5f591ac181a10692b2ec2b96de5251c4abb |
30-Jul-2014 |
Sascha Haeberling <haeberling@google.com> |
Minor clean-up around the code base. Change-Id: I2ed422dd4e0383739ccfa85a2e1e0e49e093e51d
rc/com/android/camera/FocusOverlayManager.java
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/TextureViewHelper.java
rc/com/android/camera/VideoModule.java
rc/com/android/camera/data/CameraDataAdapter.java
rc/com/android/camera/settings/SettingsUtil.java
|
b0d171e892dffbc7ce0caf7415f96fa513c6f3fc |
30-Jul-2014 |
Sascha Haeberling <haeberling@google.com> |
[OC] Adding the OneCamera manager API. Bug: 16654225 Change-Id: I070f36a6e6c1e756223ff69b74c3171547090f97
rc/com/android/camera/one/OneCameraManager.java
rc/com/android/camera/one/v1/OneCameraManagerImpl.java
rc/com/android/camera/one/v2/OneCameraManagerImpl.java
|
9af7311a2124de2a2b3eff989fc73a4c2ba9d3d5 |
30-Jul-2014 |
Sascha Haeberling <haeberling@google.com> |
am 242f3445: am 8c34b30b: [OC] Add common abstract OneCamera class. * commit '242f3445b06887c0e1617026891878a30d01fcdd': [OC] Add common abstract OneCamera class.
|
242f3445b06887c0e1617026891878a30d01fcdd |
30-Jul-2014 |
Sascha Haeberling <haeberling@google.com> |
am 8c34b30b: [OC] Add common abstract OneCamera class. * commit '8c34b30b2ae23ceb13f2912fe8b6f83c27940306': [OC] Add common abstract OneCamera class.
|
154f4a983808c33347758f5cbeba7bfbba77b970 |
30-Jul-2014 |
Sascha Haeberling <haeberling@google.com> |
am 8c34b30b: [OC] Add common abstract OneCamera class. * commit '8c34b30b2ae23ceb13f2912fe8b6f83c27940306': [OC] Add common abstract OneCamera class.
|
8c34b30b2ae23ceb13f2912fe8b6f83c27940306 |
30-Jul-2014 |
Sascha Haeberling <haeberling@google.com> |
[OC] Add common abstract OneCamera class. Bug: 16654225 Change-Id: I31c0ab4d8f4aa91447d384444258616648633de4
rc/com/android/camera/one/AbstractOneCamera.java
rc/com/android/camera/one/OneCamera.java
|
4900ca464fd8656f34d1119605464c003126c751 |
30-Jul-2014 |
Sascha Haeberling <haeberling@google.com> |
am e3ee6745: am 00c122a5: [OC] Version 1 of the nterface for OneCamera. * commit 'e3ee6745eeb2c37176a836caf3bf4497b50e95e8': [OC] Version 1 of the nterface for OneCamera.
|
e3ee6745eeb2c37176a836caf3bf4497b50e95e8 |
30-Jul-2014 |
Sascha Haeberling <haeberling@google.com> |
am 00c122a5: [OC] Version 1 of the nterface for OneCamera. * commit '00c122a56f76d8ba523c324638e5083f721da01a': [OC] Version 1 of the nterface for OneCamera.
|
ad3e35da398956d7c9f8185e7036fa5cab895744 |
30-Jul-2014 |
Sascha Haeberling <haeberling@google.com> |
am 00c122a5: [OC] Version 1 of the nterface for OneCamera. * commit '00c122a56f76d8ba523c324638e5083f721da01a': [OC] Version 1 of the nterface for OneCamera.
|
8ef539bf95ecda8f1b3d272fc2b413dcc316a6c6 |
30-Jul-2014 |
Sascha Haeberling <haeberling@google.com> |
am 2513da81: am c7223fa9: Merge "[OC] Adds a class with common utility functions for capture modules." into ub-camera-glacier * commit '2513da81d582aee92d26340ba2432026e4bcb8c4': [OC] Adds a class with common utility functions for capture modules.
|
00c122a56f76d8ba523c324638e5083f721da01a |
30-Jul-2014 |
Sascha Haeberling <haeberling@google.com> |
[OC] Version 1 of the nterface for OneCamera. Bug: 16654225 Change-Id: Id4a6755577e327849ce60db7c5f64d76fb0a55b2
rc/com/android/camera/one/OneCamera.java
|
2513da81d582aee92d26340ba2432026e4bcb8c4 |
30-Jul-2014 |
Sascha Haeberling <haeberling@google.com> |
am c7223fa9: Merge "[OC] Adds a class with common utility functions for capture modules." into ub-camera-glacier * commit 'c7223fa97a33c3e8e51d26566a32558d6257e9b9': [OC] Adds a class with common utility functions for capture modules.
|
01f387320559b5e6de35949412eac9a48c66fb07 |
30-Jul-2014 |
Sascha Haeberling <haeberling@google.com> |
am c7223fa9: Merge "[OC] Adds a class with common utility functions for capture modules." into ub-camera-glacier * commit 'c7223fa97a33c3e8e51d26566a32558d6257e9b9': [OC] Adds a class with common utility functions for capture modules.
|
c7223fa97a33c3e8e51d26566a32558d6257e9b9 |
30-Jul-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "[OC] Adds a class with common utility functions for capture modules." into ub-camera-glacier
|
88d9fb0f37395b7077e1297b29d623a258f35175 |
29-Jul-2014 |
Spike Sprague <spikuru@google.com> |
am 8f8ce3d6: am c00359da: am bbd15092: am 6a8aceef: AndroidManifest formatting cleanup * commit '8f8ce3d6205f72844c7c42579a68585c81c01ad9': AndroidManifest formatting cleanup
|
8f8ce3d6205f72844c7c42579a68585c81c01ad9 |
29-Jul-2014 |
Spike Sprague <spikuru@google.com> |
am c00359da: am bbd15092: am 6a8aceef: AndroidManifest formatting cleanup * commit 'c00359da05df0fdadf99e1eaabb4caab8233d75a': AndroidManifest formatting cleanup
|
c00359da05df0fdadf99e1eaabb4caab8233d75a |
29-Jul-2014 |
Spike Sprague <spikuru@google.com> |
am bbd15092: am 6a8aceef: AndroidManifest formatting cleanup * commit 'bbd1509219b5657faf4996afaafeea5a62577519': AndroidManifest formatting cleanup
|
d6a65febd582654306c16011c03b163ffb0438e0 |
29-Jul-2014 |
Spike Sprague <spikuru@google.com> |
am 6a8aceef: AndroidManifest formatting cleanup * commit '6a8aceef5e9c886db04e82c913db7b8a719cdfc1': AndroidManifest formatting cleanup
|
bbd1509219b5657faf4996afaafeea5a62577519 |
29-Jul-2014 |
Spike Sprague <spikuru@google.com> |
am 6a8aceef: AndroidManifest formatting cleanup * commit '6a8aceef5e9c886db04e82c913db7b8a719cdfc1': AndroidManifest formatting cleanup
|
a5c41b83304218f05a6454bf40fc6d236c218338 |
29-Jul-2014 |
Sascha Haeberling <haeberling@google.com> |
[OC] Adds a class with common utility functions for capture modules. Bug: 16654225 Change-Id: I7bc2eaaa928fd152d20777086abef984421cc320
rc/com/android/camera/CaptureModuleUtil.java
|
bb21364a1577bc9a68e054ea8b32871fe4063eb7 |
29-Jul-2014 |
Baligh Uddin <baligh@google.com> |
am f0b95e2e: (-s ours) am 1dc62fcb: (-s ours) am f2d2938e: (-s ours) Import translations. DO NOT MERGE * commit 'f0b95e2ec3ef5f479b80ace5727787901dc6211d': Import translations. DO NOT MERGE
|
f0b95e2ec3ef5f479b80ace5727787901dc6211d |
29-Jul-2014 |
Baligh Uddin <baligh@google.com> |
am 1dc62fcb: (-s ours) am f2d2938e: (-s ours) Import translations. DO NOT MERGE * commit '1dc62fcbb69003eb1932781f4cdf1cdf7f869049': Import translations. DO NOT MERGE
|
1dc62fcbb69003eb1932781f4cdf1cdf7f869049 |
29-Jul-2014 |
Baligh Uddin <baligh@google.com> |
am f2d2938e: (-s ours) Import translations. DO NOT MERGE * commit 'f2d2938eaacd6ab4f904a0582b5876c7572e2828': Import translations. DO NOT MERGE
|
6a8aceef5e9c886db04e82c913db7b8a719cdfc1 |
29-Jul-2014 |
Spike Sprague <spikuru@google.com> |
AndroidManifest formatting cleanup Change-Id: I279e764987fea743aa78575748a831e31ba28c0c
ndroidManifest.xml
|
f2d2938eaacd6ab4f904a0582b5876c7572e2828 |
28-Jul-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I7a73765663393c9ad64c5b2456b11b3deca91c0f Auto-generated-cl: translation import
es/values-bn-rBD/strings.xml
es/values-eu-rES/strings.xml
es/values-gl-rES/strings.xml
es/values-is-rIS/strings.xml
es/values-kk-rKZ/strings.xml
es/values-kn-rIN/strings.xml
es/values-ky-rKG/strings.xml
es/values-mk-rMK/strings.xml
es/values-ml-rIN/strings.xml
es/values-mr-rIN/strings.xml
es/values-my-rMM/strings.xml
es/values-ne-rNP/strings.xml
es/values-si-rLK/strings.xml
es/values-ta-rIN/strings.xml
es/values-te-rIN/strings.xml
es/values-ur-rPK/strings.xml
es/values-uz-rUZ/strings.xml
es/values-zh-rTW/strings.xml
|
91a2647d2d33daab8abb4405c5ca6ad94df4e2b0 |
25-Jul-2014 |
Spike Sprague <spikuru@google.com> |
am 7619060b: am 8ad14279: am 47edeec6: am 2f92712c: re-added color and background entries for gcam * commit '7619060bf592fb66f87147b0d0e58c4e11e37b77': re-added color and background entries for gcam
|
7619060bf592fb66f87147b0d0e58c4e11e37b77 |
25-Jul-2014 |
Spike Sprague <spikuru@google.com> |
am 8ad14279: am 47edeec6: am 2f92712c: re-added color and background entries for gcam * commit '8ad142798419c37f4801aee9c5e194e6e0e6bdae': re-added color and background entries for gcam
|
8ad142798419c37f4801aee9c5e194e6e0e6bdae |
25-Jul-2014 |
Spike Sprague <spikuru@google.com> |
am 47edeec6: am 2f92712c: re-added color and background entries for gcam * commit '47edeec6fc05942676e9eae5861ca177237b8392': re-added color and background entries for gcam
|
304341aa70040ff259d4b378a84c249aff90e6f7 |
25-Jul-2014 |
Spike Sprague <spikuru@google.com> |
am 2f92712c: re-added color and background entries for gcam * commit '2f92712cdb0598eead6631a0b8366a592c8c19c2': re-added color and background entries for gcam
|
47edeec6fc05942676e9eae5861ca177237b8392 |
25-Jul-2014 |
Spike Sprague <spikuru@google.com> |
am 2f92712c: re-added color and background entries for gcam * commit '2f92712cdb0598eead6631a0b8366a592c8c19c2': re-added color and background entries for gcam
|
c40613cd5bedc5ee64341fd3cee346513921f1dc |
25-Jul-2014 |
Spike Sprague <spikuru@google.com> |
am 3ed57173: am 50623dc1: am e70248ff: am ffa2ff02: added a mutate() call when loading LayerDrawables. * commit '3ed571735d8d5aa3e1776d55fb0dcd53fa1c482f': added a mutate() call when loading LayerDrawables.
|
2f0010669ea789c1767527e960468b157796dfd4 |
30-Jul-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Put conversion from string to size into SettingsManager." into ub-camera-glacier
|
fafb8d03af87476aa2986edeb2f6906292df516f |
30-Jul-2014 |
Sascha Haeberling <haeberling@google.com> |
Put conversion from string to size into SettingsManager. This way we don't have to spread this logic throughout the codebase. Change-Id: I2d534d0756a9030e6d67b479a67c86c1cf596589
rc/com/android/camera/settings/SettingsManager.java
|
3ed571735d8d5aa3e1776d55fb0dcd53fa1c482f |
25-Jul-2014 |
Spike Sprague <spikuru@google.com> |
am 50623dc1: am e70248ff: am ffa2ff02: added a mutate() call when loading LayerDrawables. * commit '50623dc16d101d6633ffc068ced766d846f54a37': added a mutate() call when loading LayerDrawables.
|
2f92712cdb0598eead6631a0b8366a592c8c19c2 |
25-Jul-2014 |
Spike Sprague <spikuru@google.com> |
re-added color and background entries for gcam bug: 16567671 Change-Id: Ifbe7bd68f0f6c47f645b420ef35d6eb6478c4a7e
es/values-v21/arrays.xml
es/values/arrays.xml
|
50623dc16d101d6633ffc068ced766d846f54a37 |
25-Jul-2014 |
Spike Sprague <spikuru@google.com> |
am e70248ff: am ffa2ff02: added a mutate() call when loading LayerDrawables. * commit 'e70248ff6ad4ae0cb23ecd4b681a8d3b32198644': added a mutate() call when loading LayerDrawables.
|
e70248ff6ad4ae0cb23ecd4b681a8d3b32198644 |
25-Jul-2014 |
Spike Sprague <spikuru@google.com> |
am ffa2ff02: added a mutate() call when loading LayerDrawables. * commit 'ffa2ff02c19d3b3a22e7ea700587a1c95bbf08b7': added a mutate() call when loading LayerDrawables.
|
2f62d5aafa430f6b29749cd45e5ae86ad79a2be6 |
25-Jul-2014 |
Spike Sprague <spikuru@google.com> |
am ffa2ff02: added a mutate() call when loading LayerDrawables. * commit 'ffa2ff02c19d3b3a22e7ea700587a1c95bbf08b7': added a mutate() call when loading LayerDrawables.
|
ffa2ff02c19d3b3a22e7ea700587a1c95bbf08b7 |
25-Jul-2014 |
Spike Sprague <spikuru@google.com> |
added a mutate() call when loading LayerDrawables. bug: 16566825 Change-Id: I71a3a9787b73957f9c34bf1ffa52df41c3a5f6e6
rc/com/android/camera/ui/BottomBar.java
|
1ab5d29662d630c3d3fb9a53f7ada179f7ebf737 |
25-Jul-2014 |
Qiwen Zhao <zhao@google.com> |
reset to 32d3641 with history
|
32d364133a623982a442a70f15587eb172c60b29 |
25-Jul-2014 |
Qiwen Zhao <zhao@google.com> |
reset to 446edb9 with history
|
446edb9d0addacb48ad2bf2dff1353fec7132920 |
25-Jul-2014 |
Qiwen Zhao <zhao@google.com> |
reset to df5989b with history
|
2442f75749e2a6761cf0f87a09d41c15690d076b |
25-Jul-2014 |
Qiwen Zhao <zhao@google.com> |
Reset to ub-camera-glacier at sha1 df5989b with history.
|
024574968fb931b54dff5622be446e18b4710b28 |
25-Jul-2014 |
Sascha Haeberling <haeberling@google.com> |
am b538ef36: am 09ef7be7: am 67e71a3d: am 7266b9c7: am 4af3b04d: Merge "Adds an API for temporary session storage." into gb-ub-photos-denali * commit 'b538ef3628aff84fa871eeb07c0bb7311f689632':
|
6d483af932c8d73ba31963c14c4393b4d78e0261 |
25-Jul-2014 |
Erin Dahlgren <edahlgren@google.com> |
am 3e05d0ba: am dbb348ac: am ee806b64: am 82387f3d: am 0cccc1b2: Merge "Use ninepatch for indicator background." into gb-ub-photos-denali * commit '3e05d0ba5632a697c0c4555dbe1062d3a5fed944':
|
9a20e572ee159aab6937a123423d793d887585d6 |
25-Jul-2014 |
Baligh Uddin <baligh@google.com> |
am 5199bd16: (-s ours) am 9082fab9: (-s ours) am 5993205f: (-s ours) am ba0bccbf: (-s ours) am 72b2f85f: (-s ours) Import translations. DO NOT MERGE * commit '5199bd16488840aaa27cc889d4956e5f1e061916':
|
b538ef3628aff84fa871eeb07c0bb7311f689632 |
25-Jul-2014 |
Sascha Haeberling <haeberling@google.com> |
am 09ef7be7: am 67e71a3d: am 7266b9c7: am 4af3b04d: Merge "Adds an API for temporary session storage." into gb-ub-photos-denali * commit '09ef7be7d70d93462b1d3588360fc9e7fb38e965':
|
3e05d0ba5632a697c0c4555dbe1062d3a5fed944 |
25-Jul-2014 |
Erin Dahlgren <edahlgren@google.com> |
am dbb348ac: am ee806b64: am 82387f3d: am 0cccc1b2: Merge "Use ninepatch for indicator background." into gb-ub-photos-denali * commit 'dbb348ac3da33490295931bb40ce2b2ae0ed57d6':
|
5199bd16488840aaa27cc889d4956e5f1e061916 |
25-Jul-2014 |
Baligh Uddin <baligh@google.com> |
am 9082fab9: (-s ours) am 5993205f: (-s ours) am ba0bccbf: (-s ours) am 72b2f85f: (-s ours) Import translations. DO NOT MERGE * commit '9082fab9e46ca3a5e82917fb47940ca49730cdd3':
|
d83efa01763efad2f11fcee2fac768ca4c02457e |
25-Jul-2014 |
Alan Newberger <alann@google.com> |
am df5989b0: Merge "Ensure default focus mode is continuous-picture" into ub-camera-glacier * commit 'df5989b01e4075d666b7d9e59ac70876b64b8932': Ensure default focus mode is continuous-picture
|
e6e4dbd140a28b2638de61e5727e6f020eec22fa |
25-Jul-2014 |
Spike Sprague <spikuru@google.com> |
am 141263e2: Merge "ripple drawable on shutter button" into ub-camera-glacier * commit '141263e22b53dadde54afbf416dec76812746578': ripple drawable on shutter button
|
49f43bdadb06bc666253f949c667644a742edc26 |
25-Jul-2014 |
Baligh Uddin <baligh@google.com> |
am 036400b3: (-s ours) am 21b8cb69: (-s ours) Import translations. DO NOT MERGE * commit '036400b3389a8f5707ce7ce14138cbf65f891e4b': Import translations. DO NOT MERGE
|
f4a12f94ba26dc45657651463f173359318019a8 |
25-Jul-2014 |
Baligh Uddin <baligh@google.com> |
am 01afd999: (-s ours) Import translations. DO NOT MERGE * commit '01afd9992560775e0c7420a0f86d11d625717f80': Import translations. DO NOT MERGE
|
09ef7be7d70d93462b1d3588360fc9e7fb38e965 |
25-Jul-2014 |
Sascha Haeberling <haeberling@google.com> |
am 67e71a3d: am 7266b9c7: am 4af3b04d: Merge "Adds an API for temporary session storage." into gb-ub-photos-denali * commit '67e71a3dd8c6b1e974e3235080fb99784d7e7ce3':
|
dbb348ac3da33490295931bb40ce2b2ae0ed57d6 |
25-Jul-2014 |
Erin Dahlgren <edahlgren@google.com> |
am ee806b64: am 82387f3d: am 0cccc1b2: Merge "Use ninepatch for indicator background." into gb-ub-photos-denali * commit 'ee806b647f5a2c7b363245063ea22253aa06680c':
|
9082fab9e46ca3a5e82917fb47940ca49730cdd3 |
25-Jul-2014 |
Baligh Uddin <baligh@google.com> |
am 5993205f: (-s ours) am ba0bccbf: (-s ours) am 72b2f85f: (-s ours) Import translations. DO NOT MERGE * commit '5993205fe867e2a48bf19fc066b9a5d6231c9ec6':
|
67e71a3dd8c6b1e974e3235080fb99784d7e7ce3 |
25-Jul-2014 |
Sascha Haeberling <haeberling@google.com> |
am 7266b9c7: am 4af3b04d: Merge "Adds an API for temporary session storage." into gb-ub-photos-denali * commit '7266b9c7fefe80ece12b44b129b49759c8d1ad90':
|
ee806b647f5a2c7b363245063ea22253aa06680c |
25-Jul-2014 |
Erin Dahlgren <edahlgren@google.com> |
am 82387f3d: am 0cccc1b2: Merge "Use ninepatch for indicator background." into gb-ub-photos-denali * commit '82387f3da8eadb15d32e79f40e8ef917efebe9c3':
|
5993205fe867e2a48bf19fc066b9a5d6231c9ec6 |
25-Jul-2014 |
Baligh Uddin <baligh@google.com> |
am ba0bccbf: (-s ours) am 72b2f85f: (-s ours) Import translations. DO NOT MERGE * commit 'ba0bccbf9124f5d6662c1421ceb965800309ffb8':
|
df5989b01e4075d666b7d9e59ac70876b64b8932 |
25-Jul-2014 |
Alan Newberger <alann@google.com> |
Merge "Ensure default focus mode is continuous-picture" into ub-camera-glacier
|
ec4a3fc5e87bf545fb718189b37538f1f1da68df |
25-Jul-2014 |
Alan Newberger <alann@google.com> |
Ensure default focus mode is continuous-picture The new Settings infrastructure created a bug where the default focus mode was 'auto', it needs to be continuous-picture. Fixing here. Also adding verbose logging to the focus manager, could be helpful in the future. Bug: 16536583 Change-Id: I80b5905524f7fdaf69097ff8d2780da9f4ee2428
es/values/strings.xml
rc/com/android/camera/FocusOverlayManager.java
|
141263e22b53dadde54afbf416dec76812746578 |
25-Jul-2014 |
Spike Sprague <spikuru@google.com> |
Merge "ripple drawable on shutter button" into ub-camera-glacier
|
d9516f276cd45f87edc7eafe6aa476eeab7c29e7 |
19-Jul-2014 |
Spike Sprague <spikuru@google.com> |
ripple drawable on shutter button bug: 16123188 Change-Id: I390279acb7a4599f1aeba71b415f1261b9a9b97b
ndroidManifest.xml
es/drawable-hdpi/actionbar_translucent.9.png
es/drawable-mdpi/actionbar_translucent.9.png
es/drawable-v21/shutter_button_background_camera.xml
es/drawable-v21/shutter_button_background_panorama.xml
es/drawable-v21/shutter_button_background_photosphere.xml
es/drawable-v21/shutter_button_background_refocus.xml
es/drawable-v21/shutter_button_background_video.xml
es/drawable-xhdpi/actionbar_translucent.9.png
es/drawable/shutter_button_background_refocus.xml
es/drawable/shutter_button_background_still.xml
es/drawable/shutter_button_background_video.xml
es/layout-land-v21/retake_done_cancel_layout.xml
es/layout-land/retake_done_cancel_layout.xml
es/layout-port-v21/retake_done_cancel_layout.xml
es/layout-port/retake_done_cancel_layout.xml
es/layout/bottom_bar_contents.xml
es/values-v20/styles.xml
es/values-v21/arrays.xml
es/values-v21/bool.xml
es/values-v21/styles.xml
es/values/arrays.xml
es/values/bool.xml
es/xml/camera_preferences.xml
rc/com/android/camera/app/CameraAppUI.java
rc/com/android/camera/ui/AnimatedCircleDrawable.java
rc/com/android/camera/ui/BottomBar.java
|
036400b3389a8f5707ce7ce14138cbf65f891e4b |
24-Jul-2014 |
Baligh Uddin <baligh@google.com> |
am 21b8cb69: (-s ours) Import translations. DO NOT MERGE * commit '21b8cb696c05ef5207d290f3a1ed52453e58f525': Import translations. DO NOT MERGE
|
01afd9992560775e0c7420a0f86d11d625717f80 |
24-Jul-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I6bef6048568c35ef35de13ca1cfb42e663622877 Auto-generated-cl: translation import
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
|
21b8cb696c05ef5207d290f3a1ed52453e58f525 |
24-Jul-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I991834972e54ce3ad2020dc2244a5c139aa66c32 Auto-generated-cl: translation import
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
|
8e49108a98e554a765a7f6815b2d48b8e4c2b1d5 |
24-Jul-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I84a5b3026c004a7d63f52d2a1b3770b4aaaf2c85 Auto-generated-cl: translation import
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
|
28a6b1a9ac8668a3d7f4bf2d46074d99cdea32a4 |
24-Jul-2014 |
Alan Newberger <alann@google.com> |
am 7bc335f4: Upgrade mode index settings after mode indices were cleaned * commit '7bc335f4c69b8630f1619b2235991173fd8540a5': Upgrade mode index settings after mode indices were cleaned
|
7bc335f4c69b8630f1619b2235991173fd8540a5 |
23-Jul-2014 |
Alan Newberger <alann@google.com> |
Upgrade mode index settings after mode indices were cleaned Because we removed a mode index from the camera_mode_* sequence in res/values/arrays.xml, upgrades were found to crash when settings referred to the old, now nonexistent mode value. This CL preserves the arrays cleanup and adds a settings upgrade to convert modes to the new value. Tested and works properly with mode preservation. Bug: 16467318 Change-Id: I1352a940285687af38290250d7a06b5b7c421338
rc/com/android/camera/settings/UpgradeAosp.java
rc/com/android/camera/util/CameraUtil.java
|
c2246664488a82b252a4841af590cb6847a87fe8 |
23-Jul-2014 |
Alan Newberger <alann@google.com> |
am 62c20bfb: Modify Camera settings scope enforcement from crash to warning * commit '62c20bfb063743d636300ba49b89f16c6f2546d0': Modify Camera settings scope enforcement from crash to warning
|
62c20bfb063743d636300ba49b89f16c6f2546d0 |
23-Jul-2014 |
Alan Newberger <alann@google.com> |
Modify Camera settings scope enforcement from crash to warning Several bugs have appeared particularly for flash settings, where the app is attempting to get a scope per the new SettingsManager, and the camera is already closed meaning there is no valid scope. With this change, such situations will be logged with call stack traces, so if we see deviant user behavior we'll know the source. Monkeys should no longer trip settings crashes with this change. Bug: 16483952 Bug: 16491601 Change-Id: I26487bc58909a05183563f59ae3cfba571f2504e
rc/com/android/camera/CameraActivity.java
|
4e6b6bfc757d9d45f701694ab09825e768cf55c9 |
22-Jul-2014 |
Spike Sprague <spikuru@google.com> |
am dde95571: Merge "filmstip quantumification" into ub-camera-glacier * commit 'dde95571f3c1ea5f733dbdcf7a8e4ffe15a83e08': filmstip quantumification
|
ef0a598e3a1ee58bc9fb185c7ca0241d68cdcd37 |
22-Jul-2014 |
Baligh Uddin <baligh@google.com> |
am 3736714d: (-s ours) am 373c970d: (-s ours) Import translations. DO NOT MERGE * commit '3736714d7aecbd26124e575ce84a1a34187c32b5': Import translations. DO NOT MERGE
|
3736714d7aecbd26124e575ce84a1a34187c32b5 |
22-Jul-2014 |
Baligh Uddin <baligh@google.com> |
am 373c970d: (-s ours) Import translations. DO NOT MERGE * commit '373c970d5d2c7877890f912e072f232438831b76': Import translations. DO NOT MERGE
|
13da89c1958dcda4bba209cc3fe647a54e3f9661 |
22-Jul-2014 |
Baligh Uddin <baligh@google.com> |
am f953e32e: (-s ours) Import translations. DO NOT MERGE * commit 'f953e32e36cbfa80dc801d344f65776f95493617': Import translations. DO NOT MERGE
|
d001fe89f21d675f24acd54c1c525cd520519a3b |
22-Jul-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I0744574beeef51f9608dee64748795e6b9d2c852 Auto-generated-cl: translation import
es/values-th/strings.xml
es/values-vi/strings.xml
|
f953e32e36cbfa80dc801d344f65776f95493617 |
22-Jul-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I27bcda4f98bb79dca1e4e06cd5b4abd036245357 Auto-generated-cl: translation import
es/values-th/strings.xml
es/values-vi/strings.xml
|
85f59f20418b4c34d69ce1d46beddd9e4262067a |
22-Jul-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I3254935e82c0382a9560b37d1f9d48af26526307 Auto-generated-cl: translation import
es/values-eu-rES/strings.xml
es/values-my-rMM/strings.xml
es/values-th/strings.xml
es/values-vi/strings.xml
|
373c970d5d2c7877890f912e072f232438831b76 |
22-Jul-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I90b31e5a34b7ae3463e8006f501b45b031c58025 Auto-generated-cl: translation import
es/values-th/strings.xml
es/values-vi/strings.xml
|
b5ae21a309d356a7e6b2e9fbe5cdf0e14716c46e |
21-Jul-2014 |
Baligh Uddin <baligh@google.com> |
am 64198199: (-s ours) am 042fa8ca: am cec3a4ba: Merge "Remove deprecated locales - DO NOT MERGE" into lmp-dev * commit '64198199d26076855b2bfec0d380eaa7b6c7d1ca': Remove deprecated locales - DO NOT MERGE
|
e4fc7034e127fa9af22e2a3406208c748993a2c2 |
21-Jul-2014 |
Baligh Uddin <baligh@google.com> |
am a2d9a999: (-s ours) am 24f048aa: (-s ours) am 16788cc3: (-s ours) Import translations. DO NOT MERGE * commit 'a2d9a999f1b12969d4cf693dbad66692f62ef958': Import translations. DO NOT MERGE
|
5cef93f14acf2c774c94ecaf27f01d3e7db29352 |
21-Jul-2014 |
Spike Sprague <spikuru@google.com> |
am dd19c33c: Merge "fixing mode -> color mapping" into ub-camera-glacier * commit 'dd19c33c1b41c0f888431a46cf8fa4bb8d1bf366': fixing mode -> color mapping
|
8fe7329a586c319951d3ad3403b32a1d57d3e32e |
21-Jul-2014 |
Sascha Haeberling <haeberling@google.com> |
am f15d63e8: Make sure to set an audio source using MediaRecorder. * commit 'f15d63e82af0ecf141ae16cae11b1cffbb8a8ab8': Make sure to set an audio source using MediaRecorder.
|
f15d63e82af0ecf141ae16cae11b1cffbb8a8ab8 |
21-Jul-2014 |
Sascha Haeberling <haeberling@google.com> |
Make sure to set an audio source using MediaRecorder. Bug: 16454543 Change-Id: Ic3bfb14bd7d37e5feda43e50eafcf2e687dee0ce
rc/com/android/camera/VideoModule.java
|
dd19c33c1b41c0f888431a46cf8fa4bb8d1bf366 |
21-Jul-2014 |
Spike Sprague <spikuru@google.com> |
Merge "fixing mode -> color mapping" into ub-camera-glacier
|
06e44c89a48ce5001088561a213195dc0526e8dc |
21-Jul-2014 |
Spike Sprague <spikuru@google.com> |
fixing mode -> color mapping bug: 16123081 Change-Id: I3694e575e8461f4faf6dec076f5afe2a320eaecc
es/values/arrays.xml
es/values/colors.xml
|
64198199d26076855b2bfec0d380eaa7b6c7d1ca |
20-Jul-2014 |
Baligh Uddin <baligh@google.com> |
am 042fa8ca: am cec3a4ba: Merge "Remove deprecated locales - DO NOT MERGE" into lmp-dev * commit '042fa8ca909e0635360a39ed0b56b12e72340728': Remove deprecated locales - DO NOT MERGE
|
a2d9a999f1b12969d4cf693dbad66692f62ef958 |
20-Jul-2014 |
Baligh Uddin <baligh@google.com> |
am 24f048aa: (-s ours) am 16788cc3: (-s ours) Import translations. DO NOT MERGE * commit '24f048aaac7a24202f93262540bfe4576a2e555e': Import translations. DO NOT MERGE
|
042fa8ca909e0635360a39ed0b56b12e72340728 |
20-Jul-2014 |
Baligh Uddin <baligh@google.com> |
am cec3a4ba: Merge "Remove deprecated locales - DO NOT MERGE" into lmp-dev * commit 'cec3a4bacb58ac44d8bc0baa5c3a1a6d1a48b0f4': Remove deprecated locales - DO NOT MERGE
|
24f048aaac7a24202f93262540bfe4576a2e555e |
19-Jul-2014 |
Baligh Uddin <baligh@google.com> |
am 16788cc3: (-s ours) Import translations. DO NOT MERGE * commit '16788cc303637128cf37eaa2abea353239935908': Import translations. DO NOT MERGE
|
ed0428f5f2359610dd2a42edc4a90a3abb204b73 |
18-Jul-2014 |
Baligh Uddin <baligh@google.com> |
Remove deprecated locales Change-Id: I82aca4492c14a2e933dc8614f526beb1e89621e4
es/values-et/strings.xml
es/values-ms/strings.xml
|
95a374bb3994efa616638a213037aac0744222ef |
18-Jul-2014 |
Spike Sprague <spikuru@google.com> |
am 17038432: Merge "clean out timelapse stuff from codebase" into ub-camera-glacier * commit '170384322694cbcebc2dc3e889ad1a5fb4bf0f25': clean out timelapse stuff from codebase
|
a68baf9d2f88b38b48cdcb2b6a49a3c7c067c76f |
18-Jul-2014 |
Alan Newberger <alann@google.com> |
am 39529585: Route switch preferences through SettingManager * commit '39529585aee23703553c551eadceca78742cf52b': Route switch preferences through SettingManager
|
39529585aee23703553c551eadceca78742cf52b |
17-Jul-2014 |
Alan Newberger <alann@google.com> |
Route switch preferences through SettingManager This CL adds a custom switch which uses SettingsManager to control boolean settings. It relocates SettingsManager to the application to allow access from multiple activities. Bug: 16327665 Change-Id: I6af084a4443ea79ca270dab382a66ea527897a38
es/xml/camera_preferences.xml
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/app/CameraApp.java
rc/com/android/camera/app/CameraServices.java
rc/com/android/camera/settings/ManagedSwitchPreference.java
rc/com/android/camera/settings/SettingsManager.java
rc/com/android/camera/widget/IndicatorIconController.java
|
16788cc303637128cf37eaa2abea353239935908 |
18-Jul-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I5e5505148539141d3ffd944794e07e4623da2ef2 Auto-generated-cl: translation import
es/values-eu-rES/strings.xml
es/values-my-rMM/strings.xml
|
10b9bb6028da7b9e7d27a8eb79a5b51fb633e70a |
18-Jul-2014 |
Baligh Uddin <baligh@google.com> |
Remove deprecated locales Change-Id: Id308d34595adc89de9d773b1ce9df2cb96013d57
es/values-bn-rWB/strings.xml
es/values-eu-rPV/strings.xml
es/values-gl-rGA/strings.xml
es/values-kn-rKA/strings.xml
es/values-ml-rKL/strings.xml
es/values-mr-rMH/strings.xml
es/values-ta-rTN/strings.xml
es/values-te-rAP/strings.xml
|
f6c64f1de59e6cf62403b9649c743996f1662a86 |
18-Jul-2014 |
Sascha Haeberling <haeberling@google.com> |
am 71ae986c: resolved conflicts for merge of dcea7639 to ub-camera-glacier * commit '71ae986c611c49674d53af48e56da629de0ace93': Speed up lockscreen start-up time.
|
71ae986c611c49674d53af48e56da629de0ace93 |
18-Jul-2014 |
Sascha Haeberling <haeberling@google.com> |
resolved conflicts for merge of dcea7639 to ub-camera-glacier Change-Id: I151b172d3e415a529375351ba8c038308e593cd5
|
dcea7639255d5bc4b17a5976bb84de1f6dba0ed1 |
17-Jul-2014 |
Sascha Haeberling <haeberling@google.com> |
Speed up lockscreen start-up time. Bug: 16375664 - Avoid unnecessary camera open/close loop (~350ms) - Don't load sounds and do other init work when not needed. Change-Id: I5d297913dcbd3100034c3915119cc3c818f330d3
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/app/CameraController.java
|
170384322694cbcebc2dc3e889ad1a5fb4bf0f25 |
18-Jul-2014 |
Spike Sprague <spikuru@google.com> |
Merge "clean out timelapse stuff from codebase" into ub-camera-glacier
|
d020fbf12aff20c0a4b5cd1df67da6c2054e7408 |
17-Jul-2014 |
Spike Sprague <spikuru@google.com> |
clean out timelapse stuff from codebase Change-Id: Ibcf07302f3eea2800d1f36c918ffe1c3d93b8018
es/drawable-hdpi/ic_timelapse_none.png
es/drawable-hdpi/ic_timelapse_none_large.png
es/drawable-hdpi/ic_timelapse_none_xlarge.png
es/drawable-hdpi/ic_timelapse_normal.png
es/drawable-mdpi/ic_timelapse_none.png
es/drawable-mdpi/ic_timelapse_none_xlarge.png
es/drawable-mdpi/ic_timelapse_normal.png
es/drawable-xhdpi/ic_timelapse_none.png
es/drawable-xhdpi/ic_timelapse_none_xlarge.png
es/drawable-xhdpi/ic_timelapse_normal.png
es/drawable-xxhdpi/ic_timelapse_normal.png
es/values-large-hdpi/drawable.xml
es/values-sw600dp-hdpi/drawable.xml
es/values-sw640dp/drawable.xml
es/values-xlarge/drawable.xml
es/values/arrays.xml
rc/com/android/camera/VideoModule.java
rc/com/android/camera/VideoUI.java
rc/com/android/camera/settings/Keys.java
|
dde95571f3c1ea5f733dbdcf7a8e4ffe15a83e08 |
22-Jul-2014 |
Spike Sprague <spikuru@google.com> |
Merge "filmstip quantumification" into ub-camera-glacier
|
919bea1a10464f23aeb090a254ff36169d012e9a |
21-Jul-2014 |
Spike Sprague <spikuru@google.com> |
filmstip quantumification bug: 16456504 Change-Id: I7c4c309671ae08179f22c35ffa7f3f9f5b4ee7ce
ndroidManifest.xml
es/drawable/dummy_rect_background.xml
es/layout/filmstrip_image.xml
es/layout/filmstrip_video.xml
es/values/colors.xml
rc/com/android/camera/data/LocalMediaData.java
rc/com/android/camera/widget/FilmstripLayout.java
|
cec3a4bacb58ac44d8bc0baa5c3a1a6d1a48b0f4 |
20-Jul-2014 |
Baligh Uddin <baligh@google.com> |
Merge "Remove deprecated locales - DO NOT MERGE" into lmp-dev
|
ead3339ddda81ea83b9e15aa5e79bea5e34f6e05 |
19-Jul-2014 |
Baligh Uddin <baligh@google.com> |
Remove deprecated locales - DO NOT MERGE Change-Id: I10b8ab1136680b93ac3184df47f8d6c4f663e9d1
es/values-bn-rWB/strings.xml
es/values-et/strings.xml
es/values-eu-rPV/strings.xml
es/values-gl-rGA/strings.xml
es/values-kn-rKA/strings.xml
es/values-ml-rKL/strings.xml
es/values-mr-rMH/strings.xml
es/values-ms/strings.xml
es/values-ta-rTN/strings.xml
es/values-te-rAP/strings.xml
|
26b1504ddcf9f93a8723606da3bac9951203681c |
17-Jul-2014 |
Baligh Uddin <baligh@google.com> |
am 8df930f3: (-s ours) am 926f6fa0: (-s ours) am f0010a8d: (-s ours) Import translations. DO NOT MERGE * commit '8df930f3dbd504c3010dc1eaebe0583200f4d336':
|
fbe1fb2ea216118251d41dbc703c5401909b1b67 |
17-Jul-2014 |
Baligh Uddin <baligh@google.com> |
am 926f6fa0: (-s ours) am f0010a8d: (-s ours) Import translations. DO NOT MERGE * commit '926f6fa0b3b89d3b74e33695122cfb766cd11ee2': Import translations. DO NOT MERGE
|
8df930f3dbd504c3010dc1eaebe0583200f4d336 |
17-Jul-2014 |
Baligh Uddin <baligh@google.com> |
am 926f6fa0: (-s ours) am f0010a8d: (-s ours) Import translations. DO NOT MERGE * commit '926f6fa0b3b89d3b74e33695122cfb766cd11ee2': Import translations. DO NOT MERGE
|
926f6fa0b3b89d3b74e33695122cfb766cd11ee2 |
17-Jul-2014 |
Baligh Uddin <baligh@google.com> |
am f0010a8d: (-s ours) Import translations. DO NOT MERGE * commit 'f0010a8deac30400c8dfe05653ccdba157419d89': Import translations. DO NOT MERGE
|
f0010a8deac30400c8dfe05653ccdba157419d89 |
17-Jul-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ia34a7098f9d27c72cb4cb97b2f447666e615da52 Auto-generated-cl: translation import
es/values-th/strings.xml
es/values-vi/strings.xml
|
381b8f7924b15501f056cb994469b14736ec1a66 |
17-Jul-2014 |
Spike Sprague <spikuru@google.com> |
am 609ee052: updating mode selector colors * commit '609ee052e3e9a62319afe9a8d4a1377dee0b9c4f': updating mode selector colors
|
609ee052e3e9a62319afe9a8d4a1377dee0b9c4f |
16-Jul-2014 |
Spike Sprague <spikuru@google.com> |
updating mode selector colors bug: 16123081 Change-Id: Ibe0b886f73fa934a94e7a1b534a67b56fdeb60d7
es/values/arrays.xml
es/values/colors.xml
|
be2a587ce10d57191c81c55c20bae15fc7a6757a |
16-Jul-2014 |
Sascha Haeberling <haeberling@google.com> |
am 78683612: Store temp session data in \'cache\' directory, not data. * commit '7868361295f07205fb49d3d03e886f1c7d2eb08b': Store temp session data in 'cache' directory, not data.
|
7868361295f07205fb49d3d03e886f1c7d2eb08b |
16-Jul-2014 |
Sascha Haeberling <haeberling@google.com> |
Store temp session data in 'cache' directory, not data. Bug: 16010129 Change-Id: I06ff67d2917580e1f44bdb6686a9371239bccfef
rc/com/android/camera/session/SessionStorageManagerImpl.java
|
6d1cf304e750bde3d104d8502f5631817cdc2953 |
15-Jul-2014 |
Sascha Haeberling <haeberling@google.com> |
am ca82f50d: Don\'t try to show storage hint if activity is no longer running. * commit 'ca82f50dc211daad82abb91bcc35f50d1d81d4e3': Don't try to show storage hint if activity is no longer running.
|
ca82f50dc211daad82abb91bcc35f50d1d81d4e3 |
15-Jul-2014 |
Sascha Haeberling <haeberling@google.com> |
Don't try to show storage hint if activity is no longer running. Bug: 16198208 Change-Id: I6a6c92286c98cff8b55434a7a0d011bf5043d183
rc/com/android/camera/CameraActivity.java
|
53fa8a31a254c350b3d527034d9e3bb381265d21 |
15-Jul-2014 |
Sascha Haeberling <haeberling@google.com> |
am a899a5a5: am 3c6de14b: Work in #onPictureTaken will be on a forked, so no need to fork the call. * commit 'a899a5a5052921b6e5f172b8ebe06d1e2f84c7f4': Work in #onPictureTaken will be on a forked, so no need to fork the call.
|
db5564e51f92e121dcbe1a78d75deaa3c733b32c |
15-Jul-2014 |
Sascha Haeberling <haeberling@google.com> |
am 27450ecc: Don\'t crash if filename could not be found for ID. * commit '27450ecc1adc01ea7bc4355edcfe549c8a31b0a9': Don't crash if filename could not be found for ID.
|
a899a5a5052921b6e5f172b8ebe06d1e2f84c7f4 |
15-Jul-2014 |
Sascha Haeberling <haeberling@google.com> |
am 3c6de14b: Work in #onPictureTaken will be on a forked, so no need to fork the call. * commit '3c6de14b6e771b6eab84428d53543b066324b8f0': Work in #onPictureTaken will be on a forked, so no need to fork the call.
|
27450ecc1adc01ea7bc4355edcfe549c8a31b0a9 |
15-Jul-2014 |
Sascha Haeberling <haeberling@google.com> |
Don't crash if filename could not be found for ID. Bug: 15890671 This is only used for logging but Monkey's crash on master. Change-Id: I0d08d0a82fd6a7073c7aa1924c21beeb66859577
rc/com/android/camera/CameraActivity.java
|
3c6de14b6e771b6eab84428d53543b066324b8f0 |
14-Jul-2014 |
Sascha Haeberling <haeberling@google.com> |
Work in #onPictureTaken will be on a forked, so no need to fork the call. Bug: 16217551 Change-Id: Id9f6e129d402d5e58cf5f63380c5bf13ab996431
rc/com/android/camera/PhotoModule.java
|
7384809462143ca4d9af183e6ea3deb61ef09bc5 |
11-Jul-2014 |
Sascha Haeberling <haeberling@google.com> |
am 49e49add: am c17a5664: Prevent a monkey-generated crash. * commit '49e49adde177d7009df9682ce56e8c74cb6ed240': Prevent a monkey-generated crash.
|
49e49adde177d7009df9682ce56e8c74cb6ed240 |
11-Jul-2014 |
Sascha Haeberling <haeberling@google.com> |
am c17a5664: Prevent a monkey-generated crash. * commit 'c17a56643186dee671bf6e7dec54cd558a7ecb2f': Prevent a monkey-generated crash.
|
c17a56643186dee671bf6e7dec54cd558a7ecb2f |
10-Jul-2014 |
Sascha Haeberling <haeberling@google.com> |
Prevent a monkey-generated crash. Bug: 16191092 Change-Id: Ic6488381ed6f80184401c925dd6891126736019f
rc/com/android/camera/widget/FilmstripView.java
|
ee189bcb6ea8cb55c77c398b289ae3c59574e15e |
10-Jul-2014 |
Sol Boucher <solb@google.com> |
am 3755aefa: Merge "Eliminate unnecessary context in FragmentActivity constructor" into ub-camera-glacier * commit '3755aefaafc21860394b3101177d9f730706e846': Eliminate unnecessary context in FragmentActivity constructor
|
3755aefaafc21860394b3101177d9f730706e846 |
10-Jul-2014 |
Sol Boucher <solb@google.com> |
Merge "Eliminate unnecessary context in FragmentActivity constructor" into ub-camera-glacier
|
c230d391d55b5ba7a3356695cd6d653e2b8d6ffb |
10-Jul-2014 |
Sol Boucher <solb@google.com> |
Eliminate unnecessary context in FragmentActivity constructor Use the one that was already being obtained from getApplicationContext() instead Change-Id: I1e0a62449b3ac9d02404fa623c0c62063069aae2
rc/com/android/camera/settings/CameraSettingsActivity.java
|
526b012aaf4336cecc669f50e368b91b1d91a5c6 |
09-Jul-2014 |
Sol Boucher <solb@google.com> |
am c8f40886: Merge "Make app build against updated frameworks/ex portability library" into ub-camera-glacier * commit 'c8f408861d5703f74eb8f6d31961c0768953f966': Make app build against updated frameworks/ex portability library
|
83c4a74c0bf7fe27171df29e4b43129c451eae70 |
09-Jul-2014 |
Sam Judd <judds@google.com> |
am e36bb1bc: Merge commit \'acfad92c\' into merge_crash_fix * commit 'e36bb1bc05a9bc3ca795a6fd918979a05b284aad': Fix crash when dimensions are <= 0.
|
e36bb1bc05a9bc3ca795a6fd918979a05b284aad |
09-Jul-2014 |
Sam Judd <judds@google.com> |
Merge commit 'acfad92c' into merge_crash_fix Conflicts: src/com/android/camera/data/LocalMediaData.java Change-Id: I7000054e53f1258a3de2253a816b091689d62da5
|
acfad92c88807c99cf5165b201f24b9d76a8cdf4 |
09-Jul-2014 |
Sam Judd <judds@google.com> |
Fix crash when dimensions are <= 0. Change-Id: I78531a025cf209b59f768ab38ea96ce0fe44c401
rc/com/android/camera/data/LocalMediaData.java
|
c8f408861d5703f74eb8f6d31961c0768953f966 |
09-Jul-2014 |
Sol Boucher <solb@google.com> |
Merge "Make app build against updated frameworks/ex portability library" into ub-camera-glacier
|
d8cc3ea58938f78012991360cef7a6b3a2e51ccc |
02-Jul-2014 |
Sol Boucher <solb@google.com> |
Make app build against updated frameworks/ex portability library This is necessary to make the app build and run against the updated library, and specifically the CameraAgentFactory, CameraAgent, and CameraAgent.CameraProxy contracts. Change-Id: I2dde04df7ae552eec022d31f78b0ce05525282cd
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/debug/DebugCameraProxy.java
rc/com/android/camera/settings/CameraSettingsActivity.java
rc/com/android/camera/settings/UpgradeAosp.java
|
dd061446cbb0cd8dff676ad4b7bf151ff23ec6ce |
08-Jul-2014 |
Spike Sprague <spikuru@google.com> |
am 10a16544: am 1d1af906: Merge "previous CL ag/496035 disabled shutter button clicks during shimmy, scaling back a11y disabling on shutter button" into ub-camera-fishlake * commit '10a16544048c3e5e1b380219144d501351163dc1': previous CL ag/496035 disabled shutter button clicks during shimmy, scaling back a11y disabling on shutter button
|
10a16544048c3e5e1b380219144d501351163dc1 |
08-Jul-2014 |
Spike Sprague <spikuru@google.com> |
am 1d1af906: Merge "previous CL ag/496035 disabled shutter button clicks during shimmy, scaling back a11y disabling on shutter button" into ub-camera-fishlake * commit '1d1af90609b7a896f74dda83b7f22f91b50e70cf': previous CL ag/496035 disabled shutter button clicks during shimmy, scaling back a11y disabling on shutter button
|
01f7813da3407cc7f44886343d3b7e37c365ab0b |
07-Jul-2014 |
Spike Sprague <spikuru@google.com> |
am d921ee08: am 04ebcbba: make ProgressOverlay obey left and top of its bounding Rect * commit 'd921ee087e7becd6c99db9f9ef971e9611198414': make ProgressOverlay obey left and top of its bounding Rect
|
d921ee087e7becd6c99db9f9ef971e9611198414 |
07-Jul-2014 |
Spike Sprague <spikuru@google.com> |
am 04ebcbba: make ProgressOverlay obey left and top of its bounding Rect * commit '04ebcbbab90b1ccb263247c39b45ade232de7b0a': make ProgressOverlay obey left and top of its bounding Rect
|
04ebcbbab90b1ccb263247c39b45ade232de7b0a |
07-Jul-2014 |
Spike Sprague <spikuru@google.com> |
make ProgressOverlay obey left and top of its bounding Rect bug: 16061226 Change-Id: If2e3748963191963f6e9223699cb0144a9710d5d
rc/com/android/camera/ui/ProgressOverlay.java
|
036c09a87160246404e910e2a274a82848eb7da5 |
07-Jul-2014 |
Spike Sprague <spikuru@google.com> |
am a59e9fc9: am 90defd62: Merge "disable shutter button when mode list is open" into ub-camera-fishlake * commit 'a59e9fc9eef42219cd5a3ec5018de309139782a5': disable shutter button when mode list is open
|
a59e9fc9eef42219cd5a3ec5018de309139782a5 |
07-Jul-2014 |
Spike Sprague <spikuru@google.com> |
am 90defd62: Merge "disable shutter button when mode list is open" into ub-camera-fishlake * commit '90defd62b3d0eed8cf3906c7f8394fc9ad401759': disable shutter button when mode list is open
|
4509eef06d18a8514f318f7671e332aadb5374f0 |
07-Jul-2014 |
Sascha Haeberling <haeberling@google.com> |
am c78ffd70: resolved conflicts for merge of ff899495 to ub-camera-glacier * commit 'c78ffd7011c9841697a75bdc48c7011e806afaee': Fix regression: Update summary when quality settings change.
|
c78ffd7011c9841697a75bdc48c7011e806afaee |
07-Jul-2014 |
Sascha Haeberling <haeberling@google.com> |
resolved conflicts for merge of ff899495 to ub-camera-glacier Change-Id: Iffdde32e6f2b70d6a2fc560c6347a159678a7c60
|
1611f497989f4daf748539fc6a4c43df272c5f6f |
07-Jul-2014 |
Sam Judd <judds@google.com> |
am 336e533e: am 950fb6b8: Merge "Ensure photosphere/pano thumbs are always shown." into ub-camera-fishlake * commit '336e533e6f41239bef2b236beabaae93e11301af': Ensure photosphere/pano thumbs are always shown.
|
336e533e6f41239bef2b236beabaae93e11301af |
07-Jul-2014 |
Sam Judd <judds@google.com> |
am 950fb6b8: Merge "Ensure photosphere/pano thumbs are always shown." into ub-camera-fishlake * commit '950fb6b8e8e7663f09428f25f2f788a3a191baef': Ensure photosphere/pano thumbs are always shown.
|
1d1af90609b7a896f74dda83b7f22f91b50e70cf |
08-Jul-2014 |
Spike Sprague <spikuru@google.com> |
Merge "previous CL ag/496035 disabled shutter button clicks during shimmy, scaling back a11y disabling on shutter button" into ub-camera-fishlake
|
b7e41a734a9cf9b5789fd3221ba10833f669b7c5 |
08-Jul-2014 |
Spike Sprague <spikuru@google.com> |
previous CL ag/496035 disabled shutter button clicks during shimmy, scaling back a11y disabling on shutter button Change-Id: I1c788ccbd946b43774f9f4a7bf629c4e019f20f9
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/app/CameraAppUI.java
rc/com/android/camera/ui/BottomBar.java
|
ff8994953ada97684f7c894151754d8631b719fa |
07-Jul-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Fix regression: Update summary when quality settings change." into ub-camera-fishlake
|
5697927e1650ba368916000a67b8f59dadbc59aa |
07-Jul-2014 |
Sascha Haeberling <haeberling@google.com> |
Fix regression: Update summary when quality settings change. Bug: 16062378 Change-Id: I8532ac5bcc73a36b9666903d985bf13424819a0f
rc/com/android/camera/settings/CameraSettingsActivity.java
|
950fb6b8e8e7663f09428f25f2f788a3a191baef |
07-Jul-2014 |
Sam Judd <judds@google.com> |
Merge "Ensure photosphere/pano thumbs are always shown." into ub-camera-fishlake
|
8aa154952b2d32776759a83dd61437313069e1c8 |
07-Jul-2014 |
Sam Judd <judds@google.com> |
Ensure photosphere/pano thumbs are always shown. Bug: 16061224 Change-Id: I93f1dd8a094cd4f00d06c02c13f51ef8545aa26c
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/Storage.java
rc/com/android/camera/data/LocalSessionData.java
|
ead2117f8e596bf38aa5cc77b030a6f808813d49 |
07-Jul-2014 |
Spike Sprague <spikuru@google.com> |
am 6d427e30: am 1e89c919: Merge "disable talkback a11y navigation on mode list during shimmy" into ub-camera-fishlake * commit '6d427e305cdd6e8a539b7d30858609868598feab': disable talkback a11y navigation on mode list during shimmy
|
6d427e305cdd6e8a539b7d30858609868598feab |
07-Jul-2014 |
Spike Sprague <spikuru@google.com> |
am 1e89c919: Merge "disable talkback a11y navigation on mode list during shimmy" into ub-camera-fishlake * commit '1e89c9196d91175bcc3d878c95b230d93cd5280c': disable talkback a11y navigation on mode list during shimmy
|
50173938f5c8e6fe6dd795668dd07f83491dc8d5 |
06-Jul-2014 |
Baligh Uddin <baligh@google.com> |
am 7947c9d8: (-s ours) am a833093a: (-s ours) am 8b602ee0: (-s ours) am cc3796fa: (-s ours) Import translations. DO NOT MERGE * commit '7947c9d85c830c8b8a5c577097f6564967beeff6': Import translations. DO NOT MERGE
|
89181f43dc11cd49206ff37d0e0c2a30202bd886 |
06-Jul-2014 |
Baligh Uddin <baligh@google.com> |
am 7e329db9: (-s ours) am 3c866166: (-s ours) am c0f06431: (-s ours) am cb0f330b: (-s ours) Import translations. DO NOT MERGE * commit '7e329db98adb636bf2e39595ca9a00db095915d8': Import translations. DO NOT MERGE
|
7947c9d85c830c8b8a5c577097f6564967beeff6 |
06-Jul-2014 |
Baligh Uddin <baligh@google.com> |
am a833093a: (-s ours) am 8b602ee0: (-s ours) am cc3796fa: (-s ours) Import translations. DO NOT MERGE * commit 'a833093ad71bb38ba445502ddffdb9188f5d5cdb': Import translations. DO NOT MERGE
|
f5ce69d19f2c400693ce221b30eeeca384deee40 |
06-Jul-2014 |
Baligh Uddin <baligh@google.com> |
am c1659ce7: (-s ours) am cd89e549: (-s ours) Import translations. DO NOT MERGE * commit 'c1659ce75231b2f7a5d0921d363168d7093c2bfc': Import translations. DO NOT MERGE
|
64d0044a1da9bf9f2473f08d1a43fcf5b18ef1e4 |
06-Jul-2014 |
Baligh Uddin <baligh@google.com> |
am 86018cbd: (-s ours) am 23d07fed: (-s ours) Import translations. DO NOT MERGE * commit '86018cbd26dbc6ab34f0de9fd95a88c71462e6bc': Import translations. DO NOT MERGE
|
62cbe24e94182a01d2643984e7a7440c19030030 |
06-Jul-2014 |
Baligh Uddin <baligh@google.com> |
am 3be1f8f8: (-s ours) am e8fa640f: (-s ours) Import translations. DO NOT MERGE * commit '3be1f8f8c76cb8823b087de98ae1e2df8420f0bf': Import translations. DO NOT MERGE
|
00e78fdfb7eb0c69a51bb311bf604bae94fca84d |
06-Jul-2014 |
Baligh Uddin <baligh@google.com> |
am 1b00c5da: (-s ours) am aca13396: (-s ours) am 2ee019be: (-s ours) Import translations. DO NOT MERGE * commit '1b00c5da58469bbcbe97b5b62e06d3c9be200c38': Import translations. DO NOT MERGE
|
7e329db98adb636bf2e39595ca9a00db095915d8 |
06-Jul-2014 |
Baligh Uddin <baligh@google.com> |
am 3c866166: (-s ours) am c0f06431: (-s ours) am cb0f330b: (-s ours) Import translations. DO NOT MERGE * commit '3c8661666ceb9049061ebf2b120cb51276c1cece': Import translations. DO NOT MERGE
|
2802ea2599b96675f386e28f648d94e40e5a0c60 |
06-Jul-2014 |
Baligh Uddin <baligh@google.com> |
am 025a5b22: (-s ours) am e6828fb6: (-s ours) Import translations. DO NOT MERGE * commit '025a5b2237e617985f39002b9da7ea413a644394': Import translations. DO NOT MERGE
|
3c8661666ceb9049061ebf2b120cb51276c1cece |
06-Jul-2014 |
Baligh Uddin <baligh@google.com> |
am c0f06431: (-s ours) am cb0f330b: (-s ours) Import translations. DO NOT MERGE * commit 'c0f064313c2fa318a4c21947ab57e7c1e3c67fc9': Import translations. DO NOT MERGE
|
1b00c5da58469bbcbe97b5b62e06d3c9be200c38 |
06-Jul-2014 |
Baligh Uddin <baligh@google.com> |
am aca13396: (-s ours) am 2ee019be: (-s ours) Import translations. DO NOT MERGE * commit 'aca13396a6d18542c9550f7ff5b6a262c4e1937d': Import translations. DO NOT MERGE
|
a833093ad71bb38ba445502ddffdb9188f5d5cdb |
06-Jul-2014 |
Baligh Uddin <baligh@google.com> |
am 8b602ee0: (-s ours) am cc3796fa: (-s ours) Import translations. DO NOT MERGE * commit '8b602ee06eb668246fb43be849e6e4b047707253': Import translations. DO NOT MERGE
|
c1659ce75231b2f7a5d0921d363168d7093c2bfc |
06-Jul-2014 |
Baligh Uddin <baligh@google.com> |
am cd89e549: (-s ours) Import translations. DO NOT MERGE * commit 'cd89e5497d4a6aabbe8d96d5d11584c7c73ef6ea': Import translations. DO NOT MERGE
|
86018cbd26dbc6ab34f0de9fd95a88c71462e6bc |
06-Jul-2014 |
Baligh Uddin <baligh@google.com> |
am 23d07fed: (-s ours) Import translations. DO NOT MERGE * commit '23d07fedc57934972132598b1c84a8668256d1b9': Import translations. DO NOT MERGE
|
90155f6d0bc0cc80b7b027ee62ebf1013c9cd149 |
06-Jul-2014 |
Baligh Uddin <baligh@google.com> |
am 7558467a: (-s ours) Import translations. DO NOT MERGE * commit '7558467ab12ddd4f74c4844de50e9c1813099293': Import translations. DO NOT MERGE
|
aca13396a6d18542c9550f7ff5b6a262c4e1937d |
06-Jul-2014 |
Baligh Uddin <baligh@google.com> |
am 2ee019be: (-s ours) Import translations. DO NOT MERGE * commit '2ee019bee75241d3e1f338d04491900a65c1c79f': Import translations. DO NOT MERGE
|
8b602ee06eb668246fb43be849e6e4b047707253 |
06-Jul-2014 |
Baligh Uddin <baligh@google.com> |
am cc3796fa: (-s ours) Import translations. DO NOT MERGE * commit 'cc3796fa75862209529d847f7d2e1a3aa5dd5ec7': Import translations. DO NOT MERGE
|
c0f064313c2fa318a4c21947ab57e7c1e3c67fc9 |
06-Jul-2014 |
Baligh Uddin <baligh@google.com> |
am cb0f330b: (-s ours) Import translations. DO NOT MERGE * commit 'cb0f330b34124e72504e58e9a15de5cd2e08a2dd': Import translations. DO NOT MERGE
|
025a5b2237e617985f39002b9da7ea413a644394 |
06-Jul-2014 |
Baligh Uddin <baligh@google.com> |
am e6828fb6: (-s ours) Import translations. DO NOT MERGE * commit 'e6828fb681ad7e70afaaf9cee54300f870b51cff': Import translations. DO NOT MERGE
|
a7ddfe905160e797a67e3cde420f910e5fc0bc61 |
06-Jul-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I2729ddae57af6f814e3939d2d275363d5cb3429d Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-km-rKH/strings.xml
es/values-ko/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mn-rMN/strings.xml
es/values-ms-rMY/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
7558467ab12ddd4f74c4844de50e9c1813099293 |
06-Jul-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I1c7a134d69f9dfe74dd2fa8dfbf4b807d455d211 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-km-rKH/strings.xml
es/values-ko/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mn-rMN/strings.xml
es/values-ms-rMY/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
e6828fb681ad7e70afaaf9cee54300f870b51cff |
06-Jul-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ia3403c2c617c86e31b946c9343176c600da4349d Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-km-rKH/strings.xml
es/values-ko/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mn-rMN/strings.xml
es/values-ms-rMY/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
2ee019bee75241d3e1f338d04491900a65c1c79f |
06-Jul-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: If1c48d20759de0043d1a2252af132382c02f1b5a Auto-generated-cl: translation import
es/values-hi/strings.xml
es/values-km-rKH/strings.xml
es/values-th/strings.xml
|
5405672ae441819d40202979d24b97dd42272aaf |
06-Jul-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I1416b45718317dd3a6758fe45bd738dd5e71f65d Auto-generated-cl: translation import
es/values-bn-rBD/strings.xml
es/values-eu-rES/strings.xml
es/values-gl-rES/strings.xml
es/values-hi/strings.xml
es/values-kn-rIN/strings.xml
es/values-ml-rIN/strings.xml
es/values-mr-rIN/strings.xml
es/values-ne-rNP/strings.xml
es/values-ta-rIN/strings.xml
es/values-te-rIN/strings.xml
es/values-th/strings.xml
|
cd89e5497d4a6aabbe8d96d5d11584c7c73ef6ea |
06-Jul-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I5aec334ac3b10a0ed1d1362e2deff676d73dbddb Auto-generated-cl: translation import
es/values-hi/strings.xml
es/values-km-rKH/strings.xml
es/values-th/strings.xml
|
cc3796fa75862209529d847f7d2e1a3aa5dd5ec7 |
06-Jul-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I605c7e89993f067c6acbaeca1721a7668e50376f Auto-generated-cl: translation import
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-es/strings.xml
es/values-hi/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-km-rKH/strings.xml
es/values-lo-rLA/strings.xml
es/values-mn-rMN/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
|
cb0f330b34124e72504e58e9a15de5cd2e08a2dd |
06-Jul-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I90257ae7d06ce7585fa4293cbe18703d2e9c1e6c Auto-generated-cl: translation import
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-el/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-fi/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-it/strings.xml
es/values-km-rKH/strings.xml
es/values-mn-rMN/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-sk/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
|
543baf11fcdaa40e5b808f3691057cb5e460cad1 |
02-Jul-2014 |
Erin Dahlgren <edahlgren@google.com> |
am e81455fa: Change HDR plus flash default to off. * commit 'e81455faed1929f5af2dd89812c437efcb60c7c4': Change HDR plus flash default to off.
|
90defd62b3d0eed8cf3906c7f8394fc9ad401759 |
07-Jul-2014 |
Spike Sprague <spikuru@google.com> |
Merge "disable shutter button when mode list is open" into ub-camera-fishlake
|
38989540cb1488cb7b8062ff74b9dedcd76c047f |
03-Jul-2014 |
Spike Sprague <spikuru@google.com> |
disable shutter button when mode list is open bug: 16042076 Change-Id: I0b8fad7b40bb348a3be0fa3c9457a1ceb6a49b05
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/ui/BottomBar.java
rc/com/android/camera/ui/ModeListView.java
|
e81455faed1929f5af2dd89812c437efcb60c7c4 |
02-Jul-2014 |
Erin Dahlgren <edahlgren@google.com> |
Change HDR plus flash default to off. As Gcam is still experimenting with their flash setting, turn it off so there is no accidental auto flash. Change-Id: Id7a372a0b0123a43ff11d9a0ec8267e30d15a2b4
es/values/strings.xml
|
1e89c9196d91175bcc3d878c95b230d93cd5280c |
07-Jul-2014 |
Spike Sprague <spikuru@google.com> |
Merge "disable talkback a11y navigation on mode list during shimmy" into ub-camera-fishlake
|
c064750b7a02c4e495a30d2ec8d25319a9e49e9c |
03-Jul-2014 |
Spike Sprague <spikuru@google.com> |
disable talkback a11y navigation on mode list during shimmy bug: 16042079 Change-Id: Ied2c91326d924bbd032853c84bba19a6dc75c992
rc/com/android/camera/ui/ModeListView.java
|
2babf19ce24447b2ca461d9a8ea5dbb0a21f41b7 |
02-Jul-2014 |
Spike Sprague <spikuru@google.com> |
am 5f828150: am 02b9b9af: move intent review image view to proper spot in view hierachy * commit '5f828150c228d69fdeafb06609918073d5be47f5': move intent review image view to proper spot in view hierachy
|
5f828150c228d69fdeafb06609918073d5be47f5 |
02-Jul-2014 |
Spike Sprague <spikuru@google.com> |
am 02b9b9af: move intent review image view to proper spot in view hierachy * commit '02b9b9af097ac7886ec1d23392cd87c9fbcb186f': move intent review image view to proper spot in view hierachy
|
02b9b9af097ac7886ec1d23392cd87c9fbcb186f |
02-Jul-2014 |
Spike Sprague <spikuru@google.com> |
move intent review image view to proper spot in view hierachy bug: 15729563 Change-Id: Id0952399cc0577f728665843826dcc6f12c4429a
es/layout/camera.xml
es/layout/intent_review_imageview.xml
rc/com/android/camera/PhotoUI.java
|
7589b952e988d7c73465cdf66740bf6b6e7352bf |
02-Jul-2014 |
Sascha Häberling <haeberling@google.com> |
am 70310d79: am d2922674: Merge "Pass the real file length to MediaStore." into ub-camera-fishlake * commit '70310d793f9b2e80bd85698718818da7bf8b72e3': Pass the real file length to MediaStore.
|
3dbf4ddfbeac7af07799b572fc25e073b94eccfc |
02-Jul-2014 |
Doris Liu <tianliu@google.com> |
am 2b21a99b: (-s ours) am af374822: (-s ours) Merge "DO NOT MERGE Revert "Remove workaround for K-MR1 that registers redundant preview callbacks"" into ub-camera-fishlake * commit '2b21a99b96fc1679ce914fd4fcccc4b54426f7dd': DO NOT MERGE Revert "Remove workaround for K-MR1 that registers redundant preview callbacks"
|
dfed47148d98815a9c1b75ace5d233ac571d887c |
02-Jul-2014 |
Sascha Haeberling <haeberling@google.com> |
am 6f283264: am aa52b3d2: Prevent crash for when newData cannot be found. * commit '6f2832644260b7ddf540c43d4fb28d22fe679b7f': Prevent crash for when newData cannot be found.
|
70310d793f9b2e80bd85698718818da7bf8b72e3 |
02-Jul-2014 |
Sascha Häberling <haeberling@google.com> |
am d2922674: Merge "Pass the real file length to MediaStore." into ub-camera-fishlake * commit 'd2922674e622c924b288c42d8e468812ad548de2': Pass the real file length to MediaStore.
|
2b21a99b96fc1679ce914fd4fcccc4b54426f7dd |
02-Jul-2014 |
Doris Liu <tianliu@google.com> |
am af374822: (-s ours) Merge "DO NOT MERGE Revert "Remove workaround for K-MR1 that registers redundant preview callbacks"" into ub-camera-fishlake * commit 'af374822959b95dd8ede91a03fa43b9bcf60cd83': DO NOT MERGE Revert "Remove workaround for K-MR1 that registers redundant preview callbacks"
|
6f2832644260b7ddf540c43d4fb28d22fe679b7f |
02-Jul-2014 |
Sascha Haeberling <haeberling@google.com> |
am aa52b3d2: Prevent crash for when newData cannot be found. * commit 'aa52b3d28a0285b71be342158386422ed53244b2': Prevent crash for when newData cannot be found.
|
184fde347d760c058584ba2f3e1cf4af594c759f |
02-Jul-2014 |
Sascha Haeberling <haeberling@google.com> |
am 7629fbf9: am b46c1855: New blue for clings and tutorials graphics * commit '7629fbf93e232071e63efd086caab6d92e2ed958': New blue for clings and tutorials graphics
|
7629fbf93e232071e63efd086caab6d92e2ed958 |
02-Jul-2014 |
Sascha Haeberling <haeberling@google.com> |
am b46c1855: New blue for clings and tutorials graphics * commit 'b46c1855c48f1efe3268d7ba73d89032b9dfff09': New blue for clings and tutorials graphics
|
aa52b3d28a0285b71be342158386422ed53244b2 |
01-Jul-2014 |
Sascha Haeberling <haeberling@google.com> |
Prevent crash for when newData cannot be found. Bug: 15842040 This should never happen, but could if e.g. there is a UI bug that causes the 'done button on Photo Sphere / Panorama to be visible when no actual session is active. Change-Id: Iadd3c1786a4cb204d8a4d3222864aba2807ec36e
rc/com/android/camera/CameraActivity.java
|
b46c1855c48f1efe3268d7ba73d89032b9dfff09 |
01-Jul-2014 |
Sascha Haeberling <haeberling@google.com> |
New blue for clings and tutorials graphics Bug: 15754001 Change-Id: I44f536dbd052aa896018660352732565ce792055
es/drawable-hdpi/aspect_ratio_16x9_selected.png
es/drawable-hdpi/aspect_ratio_4x3_selected.png
es/drawable-hdpi/btn_cling.9.png
es/drawable-hdpi/btn_cling_pressed.9.png
es/drawable-hdpi/cling.9.png
es/drawable-mdpi/aspect_ratio_16x9_selected.png
es/drawable-mdpi/aspect_ratio_4x3_selected.png
es/drawable-mdpi/btn_cling.9.png
es/drawable-mdpi/btn_cling_pressed.9.png
es/drawable-mdpi/cling.9.png
es/drawable-xhdpi/aspect_ratio_16x9_selected.png
es/drawable-xhdpi/aspect_ratio_4x3_selected.png
es/drawable-xhdpi/btn_cling.9.png
es/drawable-xhdpi/btn_cling_pressed.9.png
es/drawable-xhdpi/cling.9.png
es/drawable-xxhdpi/aspect_ratio_16x9_selected.png
es/drawable-xxhdpi/aspect_ratio_4x3_selected.png
es/drawable-xxhdpi/btn_cling.9.png
es/drawable-xxhdpi/btn_cling_pressed.9.png
es/drawable-xxhdpi/cling.9.png
es/values/colors.xml
|
af374822959b95dd8ede91a03fa43b9bcf60cd83 |
01-Jul-2014 |
Doris Liu <tianliu@google.com> |
Merge "DO NOT MERGE Revert "Remove workaround for K-MR1 that registers redundant preview callbacks"" into ub-camera-fishlake
|
1b515da04984c90d4f43dbd921503c20ebda9201 |
01-Jul-2014 |
Doris Liu <tianliu@google.com> |
DO NOT MERGE Revert "Remove workaround for K-MR1 that registers redundant preview callbacks" Since there is a small percentage of users still on K-MR1 as of June 30, we will revert this CL for fishlake (only). This reverts commit 2c8ac0ad7e1951d1c7314f4ac304dc7a920bd20d. Bug: 15986316 Change-Id: I10283032e2873d07a51cfc697801b04977b3b18f
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/util/ApiHelper.java
|
d2922674e622c924b288c42d8e468812ad548de2 |
01-Jul-2014 |
Sascha Häberling <haeberling@google.com> |
Merge "Pass the real file length to MediaStore." into ub-camera-fishlake
|
c66ab6c9dee4aa8ce8eb9c2f737eae07f881b6de |
27-Jun-2014 |
Angus Kong <shkong@google.com> |
Pass the real file length to MediaStore. Bug:15115507 And also a little code clean/rearrangement. Change-Id: I65ceec4c0489f965473c29cad684190f966b9218
rc/com/android/camera/MediaSaverImpl.java
rc/com/android/camera/Storage.java
|
e42d3d4cc1b39d01a093691d1a5d0f731b1c4811 |
01-Jul-2014 |
Spike Sprague <spikuru@google.com> |
am 8d92caac: am 9f3d01d9: volume button cancels ongoing countdown prevent volume button from doing anything during intent capture review * commit '8d92caac9849e962de3c22b5e327ab4f8fb9b0bc': volume button cancels ongoing countdown prevent volume button from doing anything during intent capture review
|
8d92caac9849e962de3c22b5e327ab4f8fb9b0bc |
01-Jul-2014 |
Spike Sprague <spikuru@google.com> |
am 9f3d01d9: volume button cancels ongoing countdown prevent volume button from doing anything during intent capture review * commit '9f3d01d9c5d2200882de76e309db55d74d950110': volume button cancels ongoing countdown prevent volume button from doing anything during intent capture review
|
9f3d01d9c5d2200882de76e309db55d74d950110 |
30-Jun-2014 |
Spike Sprague <spikuru@google.com> |
volume button cancels ongoing countdown prevent volume button from doing anything during intent capture review bug: 15141921 Change-Id: Icf974de09eb59e92bcce4a14aaa4775e21043c13
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/app/CameraAppUI.java
rc/com/android/camera/ui/BottomBar.java
|
aac4c714ad7ca6f65445c9f430c6693e4317cc67 |
30-Jun-2014 |
Andy Huibers <andyhuibers@google.com> |
am 6a8321ca: am 0b3f9d51: Clean up foregrounding stats so that they are balanced with backgrounding stats. * commit '6a8321ca6932ed484e5b10483079dcf75beeec4f': Clean up foregrounding stats so that they are balanced with backgrounding stats.
|
6a8321ca6932ed484e5b10483079dcf75beeec4f |
30-Jun-2014 |
Andy Huibers <andyhuibers@google.com> |
am 0b3f9d51: Clean up foregrounding stats so that they are balanced with backgrounding stats. * commit '0b3f9d515df7a36d6e73acd4900b2537f4e54c8d': Clean up foregrounding stats so that they are balanced with backgrounding stats.
|
0b3f9d515df7a36d6e73acd4900b2537f4e54c8d |
30-Jun-2014 |
Andy Huibers <andyhuibers@google.com> |
Clean up foregrounding stats so that they are balanced with backgrounding stats. Change-Id: Ib694e8a98822cb475b5dfb2f92a56a34e31ae5dd
rc/com/android/camera/CameraActivity.java
|
74e68137cd2912bc6583f886352405fb78cdee58 |
30-Jun-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I9c230702e9c14397fc8738e328793efa9b8de0a7 Auto-generated-cl: translation import
es/values-bn-rWB/strings.xml
es/values-eu-rPV/strings.xml
es/values-gl-rGA/strings.xml
es/values-is-rIS/strings.xml
es/values-kk-rKZ/strings.xml
es/values-kn-rKA/strings.xml
es/values-ky-rKG/strings.xml
es/values-mk-rMK/strings.xml
es/values-ml-rKL/strings.xml
es/values-mr-rMH/strings.xml
es/values-my-rMM/strings.xml
es/values-ne-rNP/strings.xml
es/values-si-rLK/strings.xml
es/values-ta-rTN/strings.xml
es/values-te-rAP/strings.xml
es/values-ur-rPK/strings.xml
es/values-uz-rUZ/strings.xml
|
64902de02230c626b8e2b919f920e4908c79828a |
28-Jun-2014 |
Baligh Uddin <baligh@google.com> |
am e568ae9d: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-glacier * commit 'e568ae9d16d5f31c173f09ba4a2f6bf8ac8e6986': Import translations. DO NOT MERGE
|
09e134056bf85ee87855a44bfc5d8e7b055fe2e9 |
28-Jun-2014 |
Andy Huibers <andyhuibers@google.com> |
Fix build. Change-Id: I463f525e6097f8705257c5d18a88689216e40123
rc/com/android/camera/FocusOverlayManager.java
|
121306fb375e753481dd04c2efc2a9c5ecb57fc8 |
27-Jun-2014 |
Erin Dahlgren <edahlgren@google.com> |
am 78e5a83a: Merge "fix Camera2 stubs for GoogleHelpHelper" into ub-camera-fishlake * commit '78e5a83a137a33452dd6500ddc60407bfe494bd2': fix Camera2 stubs for GoogleHelpHelper
|
eb88b3c4aa4f83e35c60e8932d83100be1b8bbb0 |
27-Jun-2014 |
Erin Dahlgren <edahlgren@google.com> |
resolved conflicts for merge of deb09a7c to ub-camera-glacier Change-Id: I98982ef41a2b2dc1175bb8f2ae9f881eb183c53d
|
6762d50aca72f1cf9d56709e2cd5da3a44749fb7 |
27-Jun-2014 |
Sascha Haeberling <haeberling@google.com> |
am 1dc99323: Updated resources to comply with GAR. * commit '1dc9932347ea735f8b4e06382d36af3cf65421e7': Updated resources to comply with GAR.
|
1dc9932347ea735f8b4e06382d36af3cf65421e7 |
27-Jun-2014 |
Sascha Haeberling <haeberling@google.com> |
Updated resources to comply with GAR. Bug: 15754001 Change-Id: I1236cd51ef20dfeeb3b09f473dbd1e9ccfeff971
es/drawable-hdpi/aspect_ratio_16x9_selected.png
es/drawable-hdpi/aspect_ratio_16x9_unselected.png
es/drawable-hdpi/aspect_ratio_4x3_selected.png
es/drawable-hdpi/aspect_ratio_4x3_unselected.png
es/drawable-hdpi/btn_cling.9.png
es/drawable-hdpi/btn_cling_pressed.9.png
es/drawable-hdpi/cling.9.png
es/drawable-mdpi/aspect_ratio_16x9_selected.png
es/drawable-mdpi/aspect_ratio_16x9_unselected.png
es/drawable-mdpi/aspect_ratio_4x3_selected.png
es/drawable-mdpi/aspect_ratio_4x3_unselected.png
es/drawable-mdpi/btn_cling.9.png
es/drawable-mdpi/btn_cling_pressed.9.png
es/drawable-mdpi/cling.9.png
es/drawable-xhdpi/aspect_ratio_16x9_selected.png
es/drawable-xhdpi/aspect_ratio_16x9_unselected.png
es/drawable-xhdpi/aspect_ratio_4x3_selected.png
es/drawable-xhdpi/aspect_ratio_4x3_unselected.png
es/drawable-xhdpi/btn_cling.9.png
es/drawable-xhdpi/btn_cling_pressed.9.png
es/drawable-xhdpi/cling.9.png
es/drawable-xxhdpi/aspect_ratio_16x9_selected.png
es/drawable-xxhdpi/aspect_ratio_16x9_unselected.png
es/drawable-xxhdpi/aspect_ratio_4x3_selected.png
es/drawable-xxhdpi/aspect_ratio_4x3_unselected.png
es/drawable-xxhdpi/btn_cling.9.png
es/drawable-xxhdpi/btn_cling_pressed.9.png
es/drawable-xxhdpi/cling.9.png
es/layout/aspect_ratio_dialog_layout.xml
es/layout/camera.xml
es/layout/location_dialog_layout.xml
es/values/colors.xml
|
deb09a7cf4303c9f5eda8fc4dbb0e5f75712d43e |
27-Jun-2014 |
Erin Dahlgren <edahlgren@google.com> |
Merge "GoogleHelp launch edits." into ub-camera-fishlake
|
26a4bb961a4b1bd9c6a161cffe39089b2a7b7138 |
27-Jun-2014 |
Erin Dahlgren <edahlgren@google.com> |
GoogleHelp launch edits. * Change Help to "Help & feedback" * Move open source to the overflow menu in Help & feedback * Remove send feedback * Consolidate to one single group of settings (no General Settings and About) * Put "Help & feedback" in the filmstrip overflow Bug: 8426295 Change-Id: I3f0dad33b3e0c9ce150dce5c96cf7b9d7d7650da
es/menu/filmstrip_menu.xml
es/values/strings.xml
es/xml/camera_preferences.xml
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/settings/CameraSettingsActivity.java
|
e524b786a8bbc6c9c2fb978245d1fb0f1ac2692c |
27-Jun-2014 |
Sam Judd <judds@google.com> |
am 632eaafd: Pull Glide forward. * commit '632eaafda53eb59b15c81ddeaf2080e6d8515f59': Pull Glide forward.
|
e568ae9d16d5f31c173f09ba4a2f6bf8ac8e6986 |
28-Jun-2014 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into ub-camera-glacier
|
632eaafda53eb59b15c81ddeaf2080e6d8515f59 |
24-Jun-2014 |
Sam Judd <judds@google.com> |
Pull Glide forward. Bug: 15669246 Change-Id: Icdcc5cb7c3ec2bbf5b970ee95ea121e10ac341d7
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/data/CameraDataAdapter.java
rc/com/android/camera/data/ImageModelLoader.java
rc/com/android/camera/data/LocalData.java
rc/com/android/camera/data/LocalMediaData.java
rc/com/android/camera/data/LocalSessionData.java
rc/com/android/camera/data/VideoModelLoader.java
|
4db887668a02bf3b66b8bc793bcda47c46d9948b |
27-Jun-2014 |
Sascha Haeberling <haeberling@google.com> |
resolved conflicts for merge of b0870db3 to ub-camera-glacier Change-Id: If06d585dbbe2d47ea92679bf63428fc2c0bca923
|
2a9e954e752831bb95c4ab8f34d363571031c6b0 |
26-Jun-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I572257c9914387e5c2e0b02561d6b6c0413bf17a Auto-generated-cl: translation import
es/values-hr/strings.xml
|
78e5a83a137a33452dd6500ddc60407bfe494bd2 |
27-Jun-2014 |
Erin Dahlgren <edahlgren@google.com> |
Merge "fix Camera2 stubs for GoogleHelpHelper" into ub-camera-fishlake
|
ad8fa7668539063bb0a066efcdd6b4c431be8d8c |
27-Jun-2014 |
Erin Dahlgren <edahlgren@google.com> |
fix Camera2 stubs for GoogleHelpHelper Change-Id: Iba9d55c22cf3e3811072b14f1f0e74e9bd3814cf
rc_pd/com/android/camera/util/GoogleHelpHelper.java
|
c8df26bf7eae262a13036fb63eb1a4926735cabf |
25-Jun-2014 |
Sascha Haeberling <haeberling@google.com> |
am 57d4f74f: Ensure focusAndCapture() is called on the main thread. * commit '57d4f74f9c4a122d87748d1ace36b0ec9bbd54a5': Ensure focusAndCapture() is called on the main thread.
|
57d4f74f9c4a122d87748d1ace36b0ec9bbd54a5 |
25-Jun-2014 |
Sascha Haeberling <haeberling@google.com> |
Ensure focusAndCapture() is called on the main thread. Bug: 15863231 Change-Id: Ieeb6e61e5a8a1d49832ea8ded6de2575afb0bdad
rc/com/android/camera/PhotoModule.java
|
23d07fedc57934972132598b1c84a8668256d1b9 |
25-Jun-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I05a11bbf99ef18a35251224313bec8ff4135f49b Auto-generated-cl: translation import
es/values-da/strings.xml
es/values-el/strings.xml
es/values-km-rKH/strings.xml
es/values-pl/strings.xml
es/values-zh-rTW/strings.xml
|
b0870db3a70635da8994a7fac688060d73a1dd8f |
25-Jun-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Clean-Up formatting." into ub-camera-fishlake
|
e3f9ce2932f65ad537c550d0ff1f0c5fa4856ee7 |
25-Jun-2014 |
Sascha Haeberling <haeberling@google.com> |
Clean-Up formatting. Change-Id: I6278a2fe8e0bf8059021d5a247c0282c16cfd3c8
rc/com/android/camera/FocusOverlayManager.java
|
da954448a5ec6fc7cac1612732cbb742d966c570 |
25-Jun-2014 |
Baligh Uddin <baligh@google.com> |
am dc9aeb52: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-fishlake * commit 'dc9aeb524de81438e5a524890fbe9109e2afe7ab': Import translations. DO NOT MERGE
|
e970956b43223876e9f202b697aca419c53782d7 |
25-Jun-2014 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into ub-camera-glacier
|
dc9aeb524de81438e5a524890fbe9109e2afe7ab |
25-Jun-2014 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into ub-camera-fishlake
|
b7c7d9a067cd52a27cfbaf0714a2074f972d836d |
19-Jun-2014 |
Andy Huibers <andyhuibers@google.com> |
Add metadata to capture and tap to focus events. Bug: 15646701 Change-Id: Id290935839a81cfe86e9a503849207d828f33225
rc/com/android/camera/FocusOverlayManager.java
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/ShutterButton.java
rc/com/android/camera/VideoModule.java
rc/com/android/camera/app/CameraAppUI.java
rc/com/android/camera/ui/FocusOverlay.java
rc/com/android/camera/ui/TouchCoordinate.java
rc/com/android/camera/widget/ModeOptionsOverlay.java
rc_pd/com/android/camera/util/UsageStatistics.java
|
3689d13faefecdaf96d3f880b9095edf443a3c07 |
24-Jun-2014 |
Sol Boucher <solb@google.com> |
Merge "Replace uses of CameraDevice#getCameraInfos() and CameraInfo" into ub-camera-glacier
|
b6605381f4c2d5d086cdd04c8d3972f22e525be5 |
24-Jun-2014 |
Andy Huibers <andyhuibers@google.com> |
Fix merge conflict. Change-Id: Ie3a66e4c362355d0dfff1597efcb9d69234266e6
rc/com/android/camera/FocusOverlayManager.java
|
4a0042759b9521bf36dc0d8576a628f4a29b2bb5 |
24-Jun-2014 |
Andy Huibers <andyhuibers@google.com> |
am b7c7d9a0: Add metadata to capture and tap to focus events. * commit 'b7c7d9a067cd52a27cfbaf0714a2074f972d836d': Add metadata to capture and tap to focus events.
|
d3580417d6347c52c35b008bf9e333c08b771e8e |
24-Jun-2014 |
Andy Huibers <andyhuibers@google.com> |
am 03fd3baf: Merge "Add maximum zoom level and time to view events." into ub-camera-fishlake * commit '03fd3baf01447f30246b095f816ce337562d15f7': Add maximum zoom level and time to view events.
|
21a623616162d75978945766f2c2246655c1e4f4 |
24-Jun-2014 |
Erin Dahlgren <edahlgren@google.com> |
resolved conflicts for merge of e1547937 to ub-camera-glacier Change-Id: I15a68218f95e0f9192d91628ad972a7815e4ec73
|
e154793797851ebbfac13e209ae49696e9c43912 |
24-Jun-2014 |
Erin Dahlgren <edahlgren@google.com> |
Hard reset HDR off if HDR+ is supported. HDR and HDR+ should not be activatable on the same phone. Our app depends on this assumption, so in case the app is killed in some way to prevents us from going to gms core to get the right information about hdr/hdr+ support, force HDR off if HDR+ at any point is supported. Bug: 15310749 Change-Id: I450671d1218679ac8d413a01c5857030ba6ea32a
rc/com/android/camera/PhotoModule.java
|
03fd3baf01447f30246b095f816ce337562d15f7 |
24-Jun-2014 |
Andy Huibers <andyhuibers@google.com> |
Merge "Add maximum zoom level and time to view events." into ub-camera-fishlake
|
43e1813a5d4a59ef107768eb523d76ae2781cb02 |
20-Jun-2014 |
Sol Boucher <solb@google.com> |
Replace uses of CameraDevice#getCameraInfos() and CameraInfo This API 1--specific portability library method has been removed. All non-debugging direct uses of the Camera.CameraInfo class are also addressed by this commit. Change-Id: I551bb1476a26f79c101892336d0bf99e4fa823cc
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/VideoModule.java
rc/com/android/camera/app/CameraController.java
rc/com/android/camera/app/CameraProvider.java
rc/com/android/camera/debug/DebugCameraProxy.java
rc/com/android/camera/settings/CameraSettingsActivity.java
rc/com/android/camera/settings/SettingsUtil.java
rc/com/android/camera/settings/UpgradeAosp.java
rc/com/android/camera/util/CameraUtil.java
|
c8924b2ec3788ca6d0f0af5ca749e5fe7be125ce |
21-May-2014 |
Andy Huibers <andyhuibers@google.com> |
Add maximum zoom level and time to view events. Bug: 15646701 Change-Id: I7c1de761fc10486b417a25ebc8469cebaf840a1c
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/data/LocalSessionData.java
rc/com/android/camera/filmstrip/FilmstripController.java
rc/com/android/camera/widget/FilmstripLayout.java
rc/com/android/camera/widget/FilmstripView.java
rc_pd/com/android/camera/util/UsageStatistics.java
|
d4fb63b5ccbffb248a362e0150bcaaccf361b116 |
23-Jun-2014 |
Sascha Haeberling <haeberling@google.com> |
am c37ab9dd: (-s ours) DO NOT MERGE - Remove Material from Fishlake. But not glacier. * commit 'c37ab9dd8222db47f9aac89d4d4bb24357ab90f1': DO NOT MERGE - Remove Material from Fishlake. But not glacier.
|
c37ab9dd8222db47f9aac89d4d4bb24357ab90f1 |
23-Jun-2014 |
Sascha Haeberling <haeberling@google.com> |
DO NOT MERGE - Remove Material from Fishlake. But not glacier. Bug: 15757384 Change-Id: I3367a96e1059ab4e0f2fc65353a13853a33767ca
es/values-v20/styles.xml
|
79aea615a111e346296711c1c41200bbb9b7efab |
23-Jun-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I4bc3eec56992652a44c6b128f9dd0e2297400efe Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-km-rKH/strings.xml
es/values-ko/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mn-rMN/strings.xml
es/values-ms-rMY/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
4695117dd1845521bff5659a04e11d38e8913208 |
23-Jun-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ib47ffbe27c9f6a559677c77ad94cf6d2b2e9ed1b Auto-generated-cl: translation import
es/values-km-rKH/strings.xml
|
88c988acb017dccc0e441b4ffb591da9780449f2 |
23-Jun-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I6d221b8366c7a27f055fbb5ca32cfedd272d6d5c Auto-generated-cl: translation import
es/values-km-rKH/strings.xml
es/values-mn-rMN/strings.xml
|
a458754b8d65d11724843e56ef2aebccea848f0d |
23-Jun-2014 |
Angus Kong <shkong@google.com> |
Merge "Migrate to use new CameraSettings." into ub-camera-glacier
|
c7e26a25faa6df772c7d2423ca439f84e9541f07 |
21-Jun-2014 |
Sascha Häberling <haeberling@google.com> |
am ecf1014c: Merge "Revert "Memory window analysis in Camera2. Bug: 13280671"" into ub-camera-fishlake * commit 'ecf1014c0349e42cb7689eb61fb33d91aa69590e': Revert "Memory window analysis in Camera2. Bug: 13280671"
|
788e709d3028ea5751312a180727a8ad899de8db |
21-Jun-2014 |
Erin Dahlgren <edahlgren@google.com> |
am 5802ea97: (-s ours) Protect settings logging with a verbose flag * commit '5802ea97c0bab7cf17e3567ea31ec943e812b31d': Protect settings logging with a verbose flag
|
5802ea97c0bab7cf17e3567ea31ec943e812b31d |
20-Jun-2014 |
Erin Dahlgren <edahlgren@google.com> |
Protect settings logging with a verbose flag Change-Id: Icacc7c01971ed2077b9e5999e042a2b9ba031cfd
rc/com/android/camera/settings/SettingsManager.java
|
ecf1014c0349e42cb7689eb61fb33d91aa69590e |
21-Jun-2014 |
Sascha Häberling <haeberling@google.com> |
Merge "Revert "Memory window analysis in Camera2. Bug: 13280671"" into ub-camera-fishlake
|
1fc61197e36b25c593e8b0e95a10a9167d7d621e |
21-Jun-2014 |
Sascha Häberling <haeberling@google.com> |
Revert "Memory window analysis in Camera2. Bug: 13280671" This seems to introduce jank in the app. This reverts commit b4f3483bfb5c2edcaefd0b44e84bb080e46502c8. Change-Id: Iad87e32a411eae1e2fdf09d6829c0e006a8eb5f8
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/app/MemoryManager.java
rc/com/android/camera/app/MemoryManagerImpl.java
rc/com/android/camera/app/MemoryQuery.java
rc_pd/com/android/camera/util/UsageStatistics.java
|
93ab9e8c784c8f0f39183e2e19df3a76131d4007 |
20-Jun-2014 |
Erin Dahlgren <edahlgren@google.com> |
am 28973902: (-s ours) dump default and global shared preferences * commit '28973902b2fb8158ece59282218938ca3e060f6b': dump default and global shared preferences
|
28973902b2fb8158ece59282218938ca3e060f6b |
20-Jun-2014 |
Erin Dahlgren <edahlgren@google.com> |
dump default and global shared preferences Change-Id: Ia9f3780dc6a0725badb3214fc9388fab9007dbb5
rc/com/android/camera/settings/SettingsManager.java
|
f42886ea5b07a08b0c88e00bbadd598b103a7323 |
20-Jun-2014 |
Kevin Gabayan <gabayan@google.com> |
am 2b04dc42: Merge "Memory window analysis in Camera2. Bug: 13280671" into ub-camera-fishlake * commit '2b04dc42f691257742a7f73f4d9e803ea4a0d7ed': Memory window analysis in Camera2. Bug: 13280671
|
949e4abef1a74b2d8c9e8b85b94d8ea0a8d83e42 |
19-Jun-2014 |
Bill Yi <byi@google.com> |
am fba6d189: (-s ours) am ece4866d: Merge commit \'f9525d410de0b840f0da5a8659734f91a66f8ed2\' into HEAD * commit 'fba6d18904fb719a64fb99fd3174063258559d51':
|
332ff9d1b4e7b9c3015089c504eff704ad33b947 |
19-Jun-2014 |
Baligh Uddin <baligh@google.com> |
am 7d0c9f68: (-s ours) am 0e343cde: (-s ours) Import translations. DO NOT MERGE * commit '7d0c9f68718f4d631b24d105144f252c928c7e71': Import translations. DO NOT MERGE
|
32a04996219a0fd5dc41cc130cd7541691da8e11 |
19-Jun-2014 |
Baligh Uddin <baligh@google.com> |
am c9feac67: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-fishlake * commit 'c9feac671fb51fa343138b1e93906e57b1ba0e64': Import translations. DO NOT MERGE
|
7d0c9f68718f4d631b24d105144f252c928c7e71 |
19-Jun-2014 |
Baligh Uddin <baligh@google.com> |
am 0e343cde: (-s ours) Import translations. DO NOT MERGE * commit '0e343cde9c36a7f3d4cc192839d4938cc048159b': Import translations. DO NOT MERGE
|
b4f3483bfb5c2edcaefd0b44e84bb080e46502c8 |
17-Apr-2014 |
Kevin Gabayan <gabayan@google.com> |
Memory window analysis in Camera2. Bug: 13280671 Change-Id: I22249e6aeb76dca2fe79e49d3bd75c089fa7936f
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/app/MemoryManager.java
rc/com/android/camera/app/MemoryManagerImpl.java
rc/com/android/camera/app/MemoryQuery.java
rc_pd/com/android/camera/util/UsageStatistics.java
|
831347d9cb5c0e3f03db7aadfc89e91b231104e7 |
17-Jun-2014 |
Angus Kong <shkong@google.com> |
Migrate to use new CameraSettings. Totally get rid of Camera.Parameters. Change-Id: I147b88f77ecab52600088a10417c3eac3d7fd340
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/CurrentModuleProvider.java
rc/com/android/camera/FocusOverlayManager.java
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/VideoModule.java
rc/com/android/camera/app/AppController.java
rc/com/android/camera/hardware/HardwareSpecImpl.java
rc/com/android/camera/settings/SettingsManager.java
rc/com/android/camera/settings/SettingsUtil.java
rc/com/android/camera/util/CameraUtil.java
|
ca8d97fda9470f575de1f68ee90d6ab0047644e0 |
19-Jun-2014 |
Sascha Haeberling <haeberling@google.com> |
Fixing bad manual merge to fix build. Change-Id: I0a96593e72240de5e1ffa562704b30932fddb4f3
rc/com/android/camera/PhotoModule.java
|
2b04dc42f691257742a7f73f4d9e803ea4a0d7ed |
19-Jun-2014 |
Kevin Gabayan <gabayan@google.com> |
Merge "Memory window analysis in Camera2. Bug: 13280671" into ub-camera-fishlake
|
c0e03f7d0ace14431e2390d76c90080d4970cf69 |
19-Jun-2014 |
Sascha Haeberling <haeberling@google.com> |
resolved conflicts for merge of 1bf0889d to ub-camera-glacier Change-Id: I5281f7c362165bc5a9d0790601fd8d1b29a71d4e
|
32048fec74f6b964c07aa71608e26a8eb1343fa6 |
19-Jun-2014 |
Angus Kong <shkong@google.com> |
Fix the build. Change-Id: Id8acdcfa54721042e61e16a9c50381e61414f778
rc/com/android/camera/debug/DebugCameraProxy.java
|
6190c36db653e848f29d1caefc4fa1bb61e8a662 |
13-Jun-2014 |
Erin Dahlgren <edahlgren@google.com> |
New Settings API Based on discussions from last week and comments on the design doc, this api begins to implement the following: 1. Adds a "Scope" variable to api, which tells the SettingsManager whether the setting can be stored globally (so that it is visible to all parts of the app), or per-camera, or per-module, or per- custom scope that the api user provides. 2. Separates keys and default values from SettingsManager, to make it easy to add new settings/defaults from third party modules. 3. Stores all settings as strings, to avoid upgrade errors, and handles casting to type requested. Only String, Integer, and boolean are supported. 4. Opens SharedPreferences files on demand, depending on scope argument. 5. Creates a "DefaultsStore" to hold the defaults and possible values of a setting. Then a user can request the default or possible values of a setting at any time. Change-Id: I03e0e1dd0955c519f54112e89716014aa963a425
es/values/arrays.xml
es/values/strings.xml
es/xml/camera_preferences.xml
rc/com/android/camera/ButtonManager.java
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/FocusOverlayManager.java
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/VideoModule.java
rc/com/android/camera/app/AppController.java
rc/com/android/camera/app/CameraAppUI.java
rc/com/android/camera/app/CameraController.java
rc/com/android/camera/app/CameraProvider.java
rc/com/android/camera/app/ModuleManagerImpl.java
rc/com/android/camera/module/ModuleController.java
rc/com/android/camera/settings/CameraSettingsActivity.java
rc/com/android/camera/settings/DefaultsStore.java
rc/com/android/camera/settings/Keys.java
rc/com/android/camera/settings/SettingsCache.java
rc/com/android/camera/settings/SettingsManager.java
rc/com/android/camera/settings/SettingsUtil.java
rc/com/android/camera/settings/Upgrade.java
rc/com/android/camera/settings/UpgradeAosp.java
rc/com/android/camera/widget/IndicatorIconController.java
rc_pd/com/android/camera/util/CameraSettingsActivityHelper.java
rc_pd/com/android/camera/util/SettingsHelper.java
|
1bf0889d8a40ef9f1a56439563ae76688fd69716 |
18-Jun-2014 |
Sascha Haeberling <haeberling@google.com> |
Remote shutter should focus before taking a photo. Bug: 13929364 Change-Id: Ib6fd83186100c67aef613f93bb8f9ea780da9ceb
rc/com/android/camera/PhotoModule.java
|
0e343cde9c36a7f3d4cc192839d4938cc048159b |
18-Jun-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ic51f4fc00312470d6a28b0a8347016eaf525c402 Auto-generated-cl: translation import
es/values-km-rKH/strings.xml
|
e819eeecf9d7d2173d1483e7db60767dcaaad49a |
18-Jun-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I93b61c1b615017ec6068f0609e172797ba5408f2 Auto-generated-cl: translation import
es/values-km-rKH/strings.xml
|
5a344964cb003525727c31d295ca3a592c245606 |
17-Jun-2014 |
Sol Boucher <solb@google.com> |
Remove cameradevice subpackage and point references at ex library This code is being relocated into frameworks/ex for availability to other apps. Change-Id: Icada261ac7a795b08dd8b187dfd17077077b37c3
ndroid.mk
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/CameraErrorCallback.java
rc/com/android/camera/CameraModule.java
rc/com/android/camera/CameraTestDevice.java
rc/com/android/camera/FocusOverlayManager.java
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/PhotoUI.java
rc/com/android/camera/VideoModule.java
rc/com/android/camera/VideoUI.java
rc/com/android/camera/app/CameraController.java
rc/com/android/camera/app/CameraProvider.java
rc/com/android/camera/cameradevice/AndroidCameraCapabilities.java
rc/com/android/camera/cameradevice/AndroidCameraManagerImpl.java
rc/com/android/camera/cameradevice/AndroidCameraSettings.java
rc/com/android/camera/cameradevice/CameraActions.java
rc/com/android/camera/cameradevice/CameraCapabilities.java
rc/com/android/camera/cameradevice/CameraCapabilitiesFactory.java
rc/com/android/camera/cameradevice/CameraDeviceInfo.java
rc/com/android/camera/cameradevice/CameraManager.java
rc/com/android/camera/cameradevice/CameraManagerFactory.java
rc/com/android/camera/cameradevice/CameraSettings.java
rc/com/android/camera/cameradevice/CameraStateHolder.java
rc/com/android/camera/cameradevice/DispatchThread.java
rc/com/android/camera/cameradevice/HistoryHandler.java
rc/com/android/camera/cameradevice/Size.java
rc/com/android/camera/debug/DebugCameraProxy.java
rc/com/android/camera/hardware/HardwareSpecImpl.java
rc/com/android/camera/module/ModuleController.java
rc/com/android/camera/settings/CameraPictureSizesCacher.java
rc/com/android/camera/settings/CameraSettingsActivity.java
rc/com/android/camera/settings/ResolutionUtil.java
rc/com/android/camera/settings/SettingsManager.java
rc/com/android/camera/settings/SettingsUtil.java
rc/com/android/camera/util/CameraUtil.java
ests_camera/src/com/android/camera/activity/CameraTestCase.java
|
bc51a078e217ba79daf19df66b523d864123436b |
19-Jun-2014 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into ub-camera-glacier
|
4822967556c78c9cf4cc7244b3ccbd041239e494 |
18-Jun-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ibbb0fdf0ac471f6a59db931f5b818540bb932556 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-km-rKH/strings.xml
es/values-ko/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mn-rMN/strings.xml
es/values-ms-rMY/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
c9feac671fb51fa343138b1e93906e57b1ba0e64 |
19-Jun-2014 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into ub-camera-fishlake
|
41f83ae83e149a82f836e0a59bab5c6edbe083ee |
18-Jun-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I03bddcd1e554a1b26e0c8f9e691e0ac4d83f6feb Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-cs/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-hr/strings.xml
es/values-hy-rAM/strings.xml
es/values-ka-rGE/strings.xml
es/values-km-rKH/strings.xml
es/values-ko/strings.xml
es/values-ms-rMY/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-tr/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
|
1ec930eb7cc0ef2b02e997833b712bd8b768bdf9 |
17-Jun-2014 |
Kevin Gabayan <gabayan@google.com> |
am 09a46ccb: Merge "MotionManager for motion-aware focus unlock in Camera2. Second revision. Bug: 14222601" into ub-camera-fishlake * commit '09a46ccb10504579417609d2486dc28e92458bf7': MotionManager for motion-aware focus unlock in Camera2. Second revision. Bug: 14222601
|
55c14934415cecc0d816ad6ca035fdf317095d95 |
17-Jun-2014 |
Spike Sprague <spikuru@google.com> |
Clarify filmstrip accessibility strings and comments bug: 15600867 bug: 15595791 bug: 15586834 Change-Id: Ic20b693a85df0c76cea7b175f561a60d82b8d446
es/values/strings.xml
|
c76549ecf4fec695f00ab48cf03a02aece7327a9 |
17-Jun-2014 |
Baligh Uddin <baligh@google.com> |
am 18179f40: (-s ours) am e2a0db87: (-s ours) Import translations. DO NOT MERGE * commit '18179f40c7c4e8b893354b9b17ae6b6b1b412b8a': Import translations. DO NOT MERGE
|
18179f40c7c4e8b893354b9b17ae6b6b1b412b8a |
17-Jun-2014 |
Baligh Uddin <baligh@google.com> |
am e2a0db87: (-s ours) Import translations. DO NOT MERGE * commit 'e2a0db8780a0283fec98cf5ff5235eb4e956a0bc': Import translations. DO NOT MERGE
|
6a393ee98128f7745fb4deff672af751745c21f6 |
17-Jun-2014 |
Baligh Uddin <baligh@google.com> |
am cae93db7: (-s ours) Import translations. DO NOT MERGE * commit 'cae93db7c84d83946a13c792ca46b32e396bf6c6': Import translations. DO NOT MERGE
|
09a46ccb10504579417609d2486dc28e92458bf7 |
17-Jun-2014 |
Kevin Gabayan <gabayan@google.com> |
Merge "MotionManager for motion-aware focus unlock in Camera2. Second revision. Bug: 14222601" into ub-camera-fishlake
|
fb33336bc6f4b70b0686b5e060819d6bd41f3b6f |
02-Jun-2014 |
Kevin Gabayan <gabayan@google.com> |
MotionManager for motion-aware focus unlock in Camera2. Second revision. Bug: 14222601 Change-Id: I36637483b0d7efa2950cd93482de8f1e83bfa8aa
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/FocusOverlayManager.java
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/app/CameraApp.java
rc/com/android/camera/app/CameraServices.java
rc_pd/com/android/camera/app/MotionManager.java
|
008ccc645644bb9edb3484e1e3b528cdb3c48017 |
16-Jun-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I9ef9c0d484fbad4b924941b6e1aeb213d47f909c Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-km-rKH/strings.xml
es/values-ko/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mn-rMN/strings.xml
es/values-ms-rMY/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
cae93db7c84d83946a13c792ca46b32e396bf6c6 |
16-Jun-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I9f900c918cdcbca9f631ef6997b102cdae44f30b Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-km-rKH/strings.xml
es/values-ko/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mn-rMN/strings.xml
es/values-ms-rMY/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
e2a0db8780a0283fec98cf5ff5235eb4e956a0bc |
16-Jun-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I31efcdcda865c4cad85019eaba9e6c57a8a6e1bf Auto-generated-cl: translation import
es/values-zh-rTW/strings.xml
|
89a020b14d0aa1538ac7fbd6b7b29723e48dd52d |
16-Jun-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Id30a10e97d1d17c40e544f10b7010151f324a60c Auto-generated-cl: translation import
es/values-zh-rTW/strings.xml
|
766e255259eb3a1a4dceeb4c36d4cead5845000c |
15-Jun-2014 |
Baligh Uddin <baligh@google.com> |
am daebadaa: (-s ours) am 65345934: (-s ours) Import translations. DO NOT MERGE * commit 'daebadaabddabc7ee246251b711a7a137ca6042b': Import translations. DO NOT MERGE
|
daebadaabddabc7ee246251b711a7a137ca6042b |
15-Jun-2014 |
Baligh Uddin <baligh@google.com> |
am 65345934: (-s ours) Import translations. DO NOT MERGE * commit '653459343b06a87b6be5fe329365c37352fb182d': Import translations. DO NOT MERGE
|
8d7a77f24c5f6375cc2aeb8f4afb591c8e5efa85 |
15-Jun-2014 |
Baligh Uddin <baligh@google.com> |
am 63949bb0: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-fishlake * commit '63949bb0372b08ab12c78d2fac6f0bf224df8db6': Import translations. DO NOT MERGE
|
653459343b06a87b6be5fe329365c37352fb182d |
14-Jun-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I65d653aa397dcf26ccb8451d087224a181c313d5 Auto-generated-cl: translation import
es/values-fi/strings.xml
|
7d15069965ccec9f68772496d73fae8c1fc5d2c1 |
14-Jun-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I21c8f0ea535a5814f6ce86c61a567df39aee5c7b Auto-generated-cl: translation import
es/values-fi/strings.xml
|
4d3aff03506b361feb71a8583e3786157dccdec5 |
15-Jun-2014 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into ub-camera-glacier
|
25ffdc70a9b81f90ec60b14884e2ba9ac004610c |
14-Jun-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ibdbe21956c33c6ed635e5472d2a6fed4360c6ef6 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-km-rKH/strings.xml
es/values-ko/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mn-rMN/strings.xml
es/values-ms-rMY/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
d24c9b02d6e1a72af01e0acbd654fc199100a10a |
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
rc/com/android/camera/cameradevice/AndroidCameraManagerImpl.java
|
120e20acf7005fcc66f3b751521db998c2cb4531 |
13-Jun-2014 |
Kevin Gabayan <gabayan@google.com> |
am 811a814d: Merge "Revert "MotionManager for motion-aware focus unlock in Camera2 Bug: 14222601"" into ub-camera-fishlake * commit '811a814dc3a2221048c1b23206a9d0a4bf9b6901': Revert "MotionManager for motion-aware focus unlock in Camera2 Bug: 14222601"
|
a51ccbf170d65079c159d9754fbfe1f5164c8539 |
13-Jun-2014 |
Kevin Gabayan <gabayan@google.com> |
am bacc2584: Merge "MotionManager for motion-aware focus unlock in Camera2 Bug: 14222601" into ub-camera-fishlake * commit 'bacc2584a7c03931643dd4c2d95d6c3f302e4a00': MotionManager for motion-aware focus unlock in Camera2 Bug: 14222601
|
e19cd7103df8ed7df0a7f43a4f6cbc9476a2e317 |
13-Jun-2014 |
Erin Dahlgren <edahlgren@google.com> |
am 40d67958: Adjust the GoogleHelp interface so Camera2 will build * commit '40d67958ecc152879a9aca554245d7e1341bb908': Adjust the GoogleHelp interface so Camera2 will build
|
40d67958ecc152879a9aca554245d7e1341bb908 |
13-Jun-2014 |
Erin Dahlgren <edahlgren@google.com> |
Adjust the GoogleHelp interface so Camera2 will build Change-Id: I7aea16e8e967bd671cee2b07ee7cd93865df8cc5
rc_pd/com/android/camera/util/GoogleHelpHelper.java
|
85b403a59418d198204ec50d0807c2fdd30247a7 |
13-Jun-2014 |
Erin Dahlgren <edahlgren@google.com> |
am 51c55dac: Merge "GoogleHelp affordance in CameraSettingsActivity" into ub-camera-fishlake * commit '51c55dac6950dca94a40b3fb685fb075ca47120e': GoogleHelp affordance in CameraSettingsActivity
|
0f54163a7b0ee554e7083e0108153cbc6c9f32e5 |
13-Jun-2014 |
Doris Liu <tianliu@google.com> |
resolved conflicts for merge of 2c8ac0ad to ub-camera-glacier Change-Id: If25e388378acefe505c6bd8fed530eacb0bef6eb
|
2c8ac0ad7e1951d1c7314f4ac304dc7a920bd20d |
13-Jun-2014 |
Doris Liu <tianliu@google.com> |
Remove workaround for K-MR1 that registers redundant preview callbacks as MR2 has already started rollout, and is expected to finish before F release. Change-Id: Ifa37a91f5270bb820d5bfb8db03bf21a71f225ff
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/util/ApiHelper.java
|
811a814dc3a2221048c1b23206a9d0a4bf9b6901 |
13-Jun-2014 |
Kevin Gabayan <gabayan@google.com> |
Merge "Revert "MotionManager for motion-aware focus unlock in Camera2 Bug: 14222601"" into ub-camera-fishlake
|
516c11a6885f6e524927bd369567f5bbd592f8ef |
13-Jun-2014 |
Kevin Gabayan <gabayan@google.com> |
Revert "MotionManager for motion-aware focus unlock in Camera2 Bug: 14222601" This reverts commit ebba3288da5628c9ea7579b63139aa7b7312e137. Change-Id: Ie82d81aa0440339aba1b762fa78caeb7f7d55312
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/FocusOverlayManager.java
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/app/CameraApp.java
rc/com/android/camera/app/CameraServices.java
rc_pd/com/android/camera/app/MotionManager.java
|
ebba3288da5628c9ea7579b63139aa7b7312e137 |
02-Jun-2014 |
Kevin Gabayan <gabayan@google.com> |
MotionManager for motion-aware focus unlock in Camera2 Bug: 14222601 Change-Id: Id118e12c8f789c74c8fc2e32ec208ff943b97e49
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/FocusOverlayManager.java
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/app/CameraApp.java
rc/com/android/camera/app/CameraServices.java
rc_pd/com/android/camera/app/MotionManager.java
|
51c55dac6950dca94a40b3fb685fb075ca47120e |
13-Jun-2014 |
Erin Dahlgren <edahlgren@google.com> |
Merge "GoogleHelp affordance in CameraSettingsActivity" into ub-camera-fishlake
|
c78accd603200e0e7e61056b259c2ac9758abf4b |
09-Jun-2014 |
Erin Dahlgren <edahlgren@google.com> |
GoogleHelp affordance in CameraSettingsActivity Uses the first Account available to launch a GoogleHelp Activity from the CameraSettingsActivity. We remove the affordance if the phone has no registered Accounts. Bug: 8426295 Change-Id: I02f8f0accd76c19d42cbbd68c4043c174f13d424
es/values/strings.xml
es/xml/camera_preferences.xml
rc/com/android/camera/settings/CameraSettingsActivity.java
rc_pd/com/android/camera/util/GoogleHelpHelper.java
|
63949bb0372b08ab12c78d2fac6f0bf224df8db6 |
15-Jun-2014 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into ub-camera-fishlake
|
92dae3e0de6674383117eb2dc71dbd63446fc716 |
14-Jun-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ieb03ca010902aff60a08f74e382fa0e22bde4bd3 Auto-generated-cl: translation import
es/values-fi/strings.xml
|
6fbfe5173803b303c883ab2d446f50983cf43c2e |
12-Jun-2014 |
Angus Kong <shkong@google.com> |
Merge "Refactor out Camera.Parameters." into ub-camera-glacier
|
6607dae6c4d1ee5bbf572695c2042d4d9129a730 |
11-Jun-2014 |
Angus Kong <shkong@google.com> |
Refactor out Camera.Parameters. Change-Id: Ibc1ddac509381530e887b7491069e6367e9a6088
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/PhotoUI.java
rc/com/android/camera/VideoModule.java
rc/com/android/camera/VideoUI.java
rc/com/android/camera/cameradevice/AndroidCameraCapabilities.java
rc/com/android/camera/cameradevice/AndroidCameraManagerImpl.java
rc/com/android/camera/cameradevice/AndroidCameraSettings.java
rc/com/android/camera/cameradevice/CameraActions.java
rc/com/android/camera/cameradevice/CameraCapabilities.java
rc/com/android/camera/cameradevice/CameraManager.java
rc/com/android/camera/cameradevice/CameraSettings.java
rc/com/android/camera/cameradevice/Size.java
rc/com/android/camera/debug/DebugCameraProxy.java
rc/com/android/camera/hardware/HardwareSpecImpl.java
rc/com/android/camera/settings/CameraPictureSizesCacher.java
rc/com/android/camera/settings/CameraSettingsActivity.java
rc/com/android/camera/settings/ResolutionUtil.java
rc/com/android/camera/settings/SettingsManager.java
rc/com/android/camera/settings/SettingsUtil.java
rc/com/android/camera/util/CameraUtil.java
rc/com/android/camera/util/Size.java
|
40468e76810596e1dd9ec6bfeb05d0ab7bf38b4e |
11-Jun-2014 |
Spike Sprague <spikuru@google.com> |
Merge "intent captrue review gets its own ImageView! instead of relying on a stopped preview TextureView" into ub-camera-fishlake
|
ba0e617e663bd95f0440ae2eac27ea5f7b3dc662 |
11-Jun-2014 |
Spike Sprague <spikuru@google.com> |
Merge "disambiguate media types in capture/filmstrip a11y descriptions" into ub-camera-glacier
|
aebd86d6c0a06bc142091f4aa830ce67d5e88fd5 |
11-Jun-2014 |
Spike Sprague <spikuru@google.com> |
am 40468e76: Merge "intent captrue review gets its own ImageView! instead of relying on a stopped preview TextureView" into ub-camera-fishlake * commit '40468e76810596e1dd9ec6bfeb05d0ab7bf38b4e': intent captrue review gets its own ImageView! instead of relying on a stopped preview TextureView
|
159e6e9ca0d0ecb53d49765c75fd7a0b2afef965 |
28-May-2014 |
Spike Sprague <spikuru@google.com> |
disambiguate media types in capture/filmstrip a11y descriptions capture uses current mode for better description string. filmstrip uses metadata util functions for better description. bug: 14473074 Change-Id: Id7c87a2cbd3ce5f072f433e74ca6139bf47f2fc7
es/values/strings.xml
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/CameraModule.java
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/VideoModule.java
rc/com/android/camera/app/CameraAppUI.java
rc/com/android/camera/data/LocalMediaData.java
rc/com/android/camera/widget/PeekView.java
|
bacc2584a7c03931643dd4c2d95d6c3f302e4a00 |
13-Jun-2014 |
Kevin Gabayan <gabayan@google.com> |
Merge "MotionManager for motion-aware focus unlock in Camera2 Bug: 14222601" into ub-camera-fishlake
|
8209d56912082748b5422f1e9611726c13c14e3c |
10-Jun-2014 |
Sol Boucher <solb@google.com> |
Merge "Refactor CameraManager hierarchy to support new implementations" into ub-camera-glacier
|
acb1786d3b47a4a3f445b3810ea94fad38d7bc76 |
10-Jun-2014 |
Baligh Uddin <baligh@google.com> |
am a389de32: (-s ours) am a77630c8: (-s ours) Import translations. DO NOT MERGE * commit 'a389de32f22c94cc443641477a738cca1ebd5927': Import translations. DO NOT MERGE
|
6cee03fc01771518424caaec3c7ef456776ab7e6 |
10-Jun-2014 |
Baligh Uddin <baligh@google.com> |
am dcb8cb1f: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-fishlake * commit 'dcb8cb1fbb5ca544b81a8ebcbb7539362ffb0f54': Import translations. DO NOT MERGE
|
a389de32f22c94cc443641477a738cca1ebd5927 |
10-Jun-2014 |
Baligh Uddin <baligh@google.com> |
am a77630c8: (-s ours) Import translations. DO NOT MERGE * commit 'a77630c81f874d93ab0563f722f20f62a5682fdb': Import translations. DO NOT MERGE
|
0e5960b26627f3f57691e7fb1f0e31aa978ff111 |
10-Jun-2014 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into ub-camera-glacier
|
dcb8cb1fbb5ca544b81a8ebcbb7539362ffb0f54 |
10-Jun-2014 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into ub-camera-fishlake
|
514d6872acfcbf683f72bd9a4a67480b08e576c6 |
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
rc/com/android/camera/cameradevice/AndroidCameraManagerImpl.java
rc/com/android/camera/cameradevice/CameraActions.java
rc/com/android/camera/cameradevice/CameraManager.java
rc/com/android/camera/cameradevice/CameraStateHolder.java
rc/com/android/camera/cameradevice/DispatchThread.java
rc/com/android/camera/cameradevice/HistoryHandler.java
|
b4a2222950f627a39267636fba19649974cb8734 |
22-May-2014 |
Spike Sprague <spikuru@google.com> |
intent captrue review gets its own ImageView! instead of relying on a stopped preview TextureView bug: 13526027 Change-Id: I40d2a97d15ed5d27b0000fa0a6d96af03ad55cf9
es/layout-land/retake_done_cancel_layout.xml
es/layout-port/retake_done_cancel_layout.xml
es/layout/bottom_bar_contents.xml
es/layout/intent_review_imageview.xml
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/PhotoUI.java
rc/com/android/camera/TextureViewHelper.java
rc/com/android/camera/ui/BottomBar.java
|
21b22837035c5b25762fe1b3bf9c442338ea22ba |
09-Jun-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: If468268b7ede5727c56030acad04cefc7c3ec0c8 Auto-generated-cl: translation import
es/values-km-rKH/strings.xml
|
e14709fdd42811b4e42174bbb5afbe20968f7992 |
09-Jun-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I68c296f9c040ad1a8e2badb6eacda78af7dffe7e Auto-generated-cl: translation import
es/values-km-rKH/strings.xml
|
a77630c81f874d93ab0563f722f20f62a5682fdb |
09-Jun-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ifcad76652c0875b764733db288edea03f043c8b0 Auto-generated-cl: translation import
es/values-km-rKH/strings.xml
|
61fb7a578c7d99e7eb2d4837bbc92668e4ae5d25 |
09-Jun-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ie4fec80d0883890997238a065d30ffe2946d0412 Auto-generated-cl: translation import
es/values-km-rKH/strings.xml
|
6b81277e6135961cdd4bc39f44cebf617dc019c6 |
09-Jun-2014 |
Spike Sprague <spikuru@google.com> |
am 6ed97734: Merge "CL in preparation of the s/Theme.Quantum/Theme.Material/ change" into ub-camera-fishlake * commit '6ed977348c44c262b2d0e2c96bfdd13698ca8f77': CL in preparation of the s/Theme.Quantum/Theme.Material/ change
|
6ed977348c44c262b2d0e2c96bfdd13698ca8f77 |
09-Jun-2014 |
Spike Sprague <spikuru@google.com> |
Merge "CL in preparation of the s/Theme.Quantum/Theme.Material/ change" into ub-camera-fishlake
|
e81b43f9574486562b0abeee0ddaba107452a3de |
06-Jun-2014 |
Spike Sprague <spikuru@google.com> |
CL in preparation of the s/Theme.Quantum/Theme.Material/ change Change-Id: I416320dadc36cf0f0c76b2755ef9339838b39e13
es/values-v20/styles.xml
|
b2c34cfc415cf56e9a706f339794892535011d43 |
07-Jun-2014 |
Baligh Uddin <baligh@google.com> |
am f5e1977e: (-s ours) am 8979bf79: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-everglades * commit 'f5e1977e04c7367cdfb675635ab1b5f67eefc81d': Import translations. DO NOT MERGE
|
89625b6530b0057f3c77ae62c4bfbae9eb75999e |
07-Jun-2014 |
Baligh Uddin <baligh@google.com> |
am d4050ce8: (-s ours) am 6a710139: (-s ours) Import translations. DO NOT MERGE * commit 'd4050ce8589c5c337d57bd9a66e482709a20bf60': Import translations. DO NOT MERGE
|
f5e1977e04c7367cdfb675635ab1b5f67eefc81d |
07-Jun-2014 |
Baligh Uddin <baligh@google.com> |
am 8979bf79: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-everglades * commit '8979bf79a7ea5ec0163ed50df7c9b0261c67ba26': Import translations. DO NOT MERGE
|
d4050ce8589c5c337d57bd9a66e482709a20bf60 |
07-Jun-2014 |
Baligh Uddin <baligh@google.com> |
am 6a710139: (-s ours) Import translations. DO NOT MERGE * commit '6a710139c464b50faad802150785f17775d06a48': Import translations. DO NOT MERGE
|
dd28bc3b033abef05b1dca1cc934335544d10e53 |
07-Jun-2014 |
Baligh Uddin <baligh@google.com> |
am 9829d385: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-fishlake * commit '9829d38573469056c9104e489284f371f8ffa358': Import translations. DO NOT MERGE
|
2884c4e6ceaac01e1fadbdd3366bb76f3e2cd2c6 |
07-Jun-2014 |
Baligh Uddin <baligh@google.com> |
am a374f387: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-fishlake * commit 'a374f3878beb190930bb600baed4903d49fd14d2': Import translations. DO NOT MERGE
|
8979bf79a7ea5ec0163ed50df7c9b0261c67ba26 |
07-Jun-2014 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into ub-camera-everglades
|
9829d38573469056c9104e489284f371f8ffa358 |
07-Jun-2014 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into ub-camera-fishlake
|
50bd51733f9ef32eb6460a579241c7713a46c677 |
07-Jun-2014 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into ub-camera-glacier
|
db4cadacbc3bf6c29025c4e778c1719576c9ad68 |
07-Jun-2014 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE"
|
a374f3878beb190930bb600baed4903d49fd14d2 |
07-Jun-2014 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into ub-camera-fishlake
|
383e1fff483dc68af1c1f63772f63b6fba57fbad |
07-Jun-2014 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into ub-camera-glacier
|
879ef29820267be2ea5d7db2986d1de4f721da10 |
06-Jun-2014 |
The Android Automerger <android-build@google.com> |
am 11a1ca95: merge in master-release history after reset to e52edeeebe1a0ce82bd7e9b05b926d1301a51a2f * commit '11a1ca95b759da81023b0d5e8aa91f9fdccc57ea': (2378 commits) Import translations. DO NOT MERGE Import translations. DO NOT MERGE LOCAL_JNI_SHARED_LIBRARIES now works for both bundled and unbundled build. LOCAL_JNI_SHARED_LIBRARIES now works for both bundled and unbundled build. Import translations. DO NOT MERGE Import translations. DO NOT MERGE Add CameraPerformanceTracker to Carlsbad to make future comparisons easy. Import translations. DO NOT MERGE Import translations. DO NOT MERGE Import translations. DO NOT MERGE Fix build dependencies Import translations. DO NOT MERGE Import translations. DO NOT MERGE Build against the NDK for all archs. Import translations. DO NOT MERGE Import translations. DO NOT MERGE Import translations. DO NOT MERGE Revert "Remove deprecated locales" Remove deprecated locales Import translations. DO NOT MERGE ...
|
5270ac158e30ee28664790b29ebda2567e0738e5 |
05-Jun-2014 |
Spike Sprague <spikuru@google.com> |
am ec8c2697: Merge "add Quantum theme to styles that were Holo (shows on android L, backwards compatible for K)" into ub-camera-fishlake * commit 'ec8c26973947fe7a1a6ca43dcaa3b0bcde30a74c': add Quantum theme to styles that were Holo (shows on android L, backwards compatible for K)
|
ec8c26973947fe7a1a6ca43dcaa3b0bcde30a74c |
05-Jun-2014 |
Spike Sprague <spikuru@google.com> |
Merge "add Quantum theme to styles that were Holo (shows on android L, backwards compatible for K)" into ub-camera-fishlake
|
baba48f1066ab775fbd03ab698bc6382449b3e9f |
04-Jun-2014 |
Spike Sprague <spikuru@google.com> |
add Quantum theme to styles that were Holo (shows on android L, backwards compatible for K) bug: 15345347 Change-Id: I1044e10e00ff136b0b5c095a7a9f4e56fd75c49a
es/values-v20/styles.xml
|
39cf9f9eac6f04dcbd0dfbccf145859ee44676de |
04-Jun-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I4bca0e17fdbfe9dc4922ae3d9cb8074f023f1621 Auto-generated-cl: translation import
es/values-km-rKH/strings.xml
|
d548e825bdeccec8db7787ce96ca725cbc1129d3 |
04-Jun-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I102e1be18ad21865e4d292a87c8c5ebfe1e4cff0 Auto-generated-cl: translation import
es/values-km-rKH/strings.xml
|
6a710139c464b50faad802150785f17775d06a48 |
04-Jun-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I0dc60f6fc74d80bbbca4ed390e2065e1e90166ea Auto-generated-cl: translation import
es/values-km-rKH/strings.xml
|
c44f08a7913cdfd5922a365d9e1df9a13f9c4c4e |
04-Jun-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I34fcb61280eea32eead210f70e5b2ffd74003482 Auto-generated-cl: translation import
es/values-cs/strings.xml
es/values-km-rKH/strings.xml
|
fe8120a33e1ac5f173aa9853cc8303097a4f3491 |
04-Jun-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Iea72efcd91cf5cc1c0b9a3b52c11fa73853cab56 Auto-generated-cl: translation import
es/values-km-rKH/strings.xml
|
4473f8aa33621cf6f0d6de058f87acffa9179bce |
04-Jun-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I27f224443b51df2971493ffd12fedf83ce261c05 Auto-generated-cl: translation import
es/values-km-rKH/strings.xml
|
4706d179bf9f0d1020dfef9c916992462c99c1e2 |
04-Jun-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ic312c304754442fb29c4f3151f7a0ff5cb043ffd Auto-generated-cl: translation import
es/values-km-rKH/strings.xml
|
f19bc172c506e07de0ed2503269fa0e3b4fff3cd |
04-Jun-2014 |
Baligh Uddin <baligh@google.com> |
am 2e6f38f0: (-s ours) am 97ab5266: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-everglades * commit '2e6f38f07917adb06cc41da8d14b0b197909aa0d': Import translations. DO NOT MERGE
|
fd6b90b44b3603bd52c8afcf43f3f3d16c6594d7 |
04-Jun-2014 |
Baligh Uddin <baligh@google.com> |
am 6e83e00d: (-s ours) am 5adb7fc5: (-s ours) Import translations. DO NOT MERGE * commit '6e83e00da8766429240c2e33e4650f6466f66b1c': Import translations. DO NOT MERGE
|
2e6f38f07917adb06cc41da8d14b0b197909aa0d |
04-Jun-2014 |
Baligh Uddin <baligh@google.com> |
am 97ab5266: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-everglades * commit '97ab5266dbfe130944728fef86058ab6583595ef': Import translations. DO NOT MERGE
|
6e83e00da8766429240c2e33e4650f6466f66b1c |
04-Jun-2014 |
Baligh Uddin <baligh@google.com> |
am 5adb7fc5: (-s ours) Import translations. DO NOT MERGE * commit '5adb7fc5407e23244ab6c9b53290a29d82da7776': Import translations. DO NOT MERGE
|
679010daf2fbcba5698a91637e75fdf8065ead88 |
04-Jun-2014 |
Baligh Uddin <baligh@google.com> |
am cd32e4b9: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-fishlake * commit 'cd32e4b9c0e37be25f9d49f94b9cfc32dcf80e89': Import translations. DO NOT MERGE
|
676ef5376fffd34afbe5ae247d6b0c10e7c6231c |
04-Jun-2014 |
Baligh Uddin <baligh@google.com> |
am 993b9075: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-fishlake * commit '993b9075c383194ccd06d4ef3be781a09ab3ebfd': Import translations. DO NOT MERGE
|
97ab5266dbfe130944728fef86058ab6583595ef |
04-Jun-2014 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into ub-camera-everglades
|
cd32e4b9c0e37be25f9d49f94b9cfc32dcf80e89 |
04-Jun-2014 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into ub-camera-fishlake
|
6f5894c7e6ee08258150b81cd8f8e6795321ec30 |
04-Jun-2014 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into ub-camera-glacier
|
993b9075c383194ccd06d4ef3be781a09ab3ebfd |
04-Jun-2014 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into ub-camera-fishlake
|
835f102bb6b4c11ba8f70b496d62d9cd474cbff8 |
04-Jun-2014 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into ub-camera-glacier
|
7067d6854131bdc553a12d25b443c8334ffa9712 |
02-Jun-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I50368d2ef080ee0bfbcfeccbaf54542c60d0d780 Auto-generated-cl: translation import
es/values-ca/strings.xml
es/values-km-rKH/strings.xml
|
3d3cf5b4c20b312bdc3cbb5f1554d46038aa58b9 |
02-Jun-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I409bd9865c2823ca1e822eca638d4af579e3e7dd Auto-generated-cl: translation import
es/values-ca/strings.xml
es/values-km-rKH/strings.xml
|
5adb7fc5407e23244ab6c9b53290a29d82da7776 |
02-Jun-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Idf334424ca5efd7ee7201b779c1eba028a39b269 Auto-generated-cl: translation import
es/values-ca/strings.xml
es/values-km-rKH/strings.xml
|
051c1347e820f53bdc7347513028bf6ef8ccfbea |
02-Jun-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I0a3c1e4151d3f6c9f5a96be0433b03acdce8f5d6 Auto-generated-cl: translation import
es/values-ca/strings.xml
es/values-km-rKH/strings.xml
|
67ecc3ae22a6ffe8a1bdf4b45165f32f01561d58 |
02-Jun-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I2ee97c52c3b811326344cec02cb845b32ee88171 Auto-generated-cl: translation import
es/values-ca/strings.xml
es/values-km-rKH/strings.xml
|
cd2b1524351d6c235b9cc3ac9945d453002344ab |
02-Jun-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I7447f4cc622840cb2ae4e13fd3d0fac1f93b40cb Auto-generated-cl: translation import
es/values-ca/strings.xml
es/values-km-rKH/strings.xml
|
425507c2200ab8c199545b7acb278c6d8449d79b |
02-Jun-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I9752938f549f6839fb071ef1da037bb9c4d76cc6 Auto-generated-cl: translation import
es/values-ca/strings.xml
es/values-km-rKH/strings.xml
|
84b40c7defd0a7a0028c39fcd78543ad68862fc0 |
02-Jun-2014 |
Erin Dahlgren <edahlgren@google.com> |
Merge "Timeout on wait lock and throw exception to prevent ANR." into ub-camera-fishlake
|
d832f3173eab04a0c1838e0aefcd72ff5c45228b |
22-May-2014 |
Spike Sprague <spikuru@google.com> |
secure camera -> gallery launch hardcoded to launch G+ photos bug: 15141761 Change-Id: I5009d58917bbc1ea41b01d22b4c2e0f168f6b5cc
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/util/IntentHelper.java
rc_pd/com/android/camera/util/GalleryHelper.java
|
776136749e89fd8156914b67f6e8db7d653ee3ce |
28-May-2014 |
Geoff Mendal <mendal@google.com> |
am b758e1f7: (-s ours) Import translations. DO NOT MERGE * commit 'b758e1f7c874d03b69f08987d9f104a38b1461bd': Import translations. DO NOT MERGE
|
d0aa385267823b615bebc9a932faeb3f62af773f |
28-May-2014 |
Geoff Mendal <mendal@google.com> |
Import translations. DO NOT MERGE Change-Id: Ie4dc2b76d6f38334833b22ea7fabf3860c27751b Auto-generated-cl: translation import
es/values-km-rKH/strings.xml
|
9fa3f303d64e59d6de120b306e57baff23cbd89f |
28-May-2014 |
Geoff Mendal <mendal@google.com> |
Import translations. DO NOT MERGE Change-Id: I77b01e3ceec1241e2bf623d19c027e0ae9d142fa Auto-generated-cl: translation import
es/values-ar/strings.xml
es/values-km-rKH/strings.xml
es/values-ms-rMY/strings.xml
|
b758e1f7c874d03b69f08987d9f104a38b1461bd |
28-May-2014 |
Geoff Mendal <mendal@google.com> |
Import translations. DO NOT MERGE Change-Id: I76ec30918ff673b26642a565be3894db87602484 Auto-generated-cl: translation import
es/values-km-rKH/strings.xml
|
77d9085e2837dd0ac5bf25931e22edbe75a209b0 |
27-May-2014 |
Baligh Uddin <baligh@google.com> |
am a27e4263: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-everglades * commit 'a27e42633b3ae306e97b830646a613f5ff91e704': Import translations. DO NOT MERGE
|
a27e42633b3ae306e97b830646a613f5ff91e704 |
27-May-2014 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into ub-camera-everglades
|
8ed8f05e8121ed50ffe926dc8af2da0f967975e4 |
27-May-2014 |
Sascha Haeberling <haeberling@google.com> |
am d58c9ccb: Fix build by removing references to removed strings. * commit 'd58c9ccba64914e2c7c98927a9aca8c673ba9172': Fix build by removing references to removed strings.
|
3872738404c18e569c7f9f6565b18c6ece690273 |
27-May-2014 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into ub-camera-fishlake
|
d58c9ccba64914e2c7c98927a9aca8c673ba9172 |
27-May-2014 |
Sascha Haeberling <haeberling@google.com> |
Fix build by removing references to removed strings. These got removed in 469821 but the build didn't fail beause we still had translations. Change-Id: Id74cbff53bc1859c3f35083b2f167374c87775b1
es/values/arrays.xml
|
03f680f1bad60a5f1d3e2dc082646f0ee41f647e |
27-May-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I93478e89dc0ab82c5ba16525b74efeae88677dea Auto-generated-cl: translation import
es/values-ar/strings.xml
|
2321d7ade0013a877fa94ad23185419ebf29c98b |
27-May-2014 |
Seth Raphael <magicseth@google.com> |
am cbf2efe0: Merge "Fix NPE in CountdownSoundPlayer." into ub-camera-everglades * commit 'cbf2efe047cc9db55076fca6e69116c32c72845a': Fix NPE in CountdownSoundPlayer.
|
f156a4e86b84f49d08cdd4369f7a193dca9fbeb0 |
27-May-2014 |
Baligh Uddin <baligh@google.com> |
am 1b490ba4: (-s ours) Import translations. DO NOT MERGE * commit '1b490ba4f04c93cc58b5ffb3cb61eeef119cb762': Import translations. DO NOT MERGE
|
cbf2efe047cc9db55076fca6e69116c32c72845a |
27-May-2014 |
Seth Raphael <magicseth@google.com> |
Merge "Fix NPE in CountdownSoundPlayer." into ub-camera-everglades
|
20e20c91089b37e0c6cec07899d6cbe4e6e8151c |
27-May-2014 |
Seth Raphael <magicseth@google.com> |
Fix NPE in CountdownSoundPlayer. Bug: 15222673 Change-Id: I7068bbc8f4c063691647131160bf53fa4dd5f0f3
rc/com/android/camera/PhotoModule.java
|
fbaed3dde742bdc47e6227f0c219ebb11e6cdc64 |
27-May-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I5520095cf925eee15bddcbe3b3f633141fb2d5f8 Auto-generated-cl: translation import
es/values-da/strings.xml
es/values-el/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-hr/strings.xml
es/values-pl/strings.xml
es/values-sk/strings.xml
es/values-sw/strings.xml
es/values-zh-rTW/strings.xml
|
4e91ab331fdf2ee81d155de66373c263958e6a36 |
27-May-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I401fc80ba039b72713163157c447761666734bb8 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-km-rKH/strings.xml
es/values-ko/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mn-rMN/strings.xml
es/values-ms-rMY/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
1b490ba4f04c93cc58b5ffb3cb61eeef119cb762 |
27-May-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I69865a9c8ae65cd6bdecea6b46de2f8518866e15 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-km-rKH/strings.xml
es/values-ko/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mn-rMN/strings.xml
es/values-ms-rMY/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
2b64549838ad847101434e68c5cec0e3c40ea994 |
24-May-2014 |
Erin Dahlgren <edahlgren@google.com> |
Timeout on wait lock and throw exception to prevent ANR. Change-Id: I5b0d2b8c0384d32ed0d870e5db6003991524fc38
rc/com/android/camera/cameradevice/AndroidCameraManagerImpl.java
|
3fcd36f648b4ec966cd64aad28ad5014a2d9b948 |
24-May-2014 |
Angus Kong <shkong@google.com> |
am 7dc0fade: Merge "Restore the flash setting after HDR is off." into ub-camera-everglades * commit '7dc0fade17f0ee776997b7400870265a65d52dd4': Restore the flash setting after HDR is off.
|
7dc0fade17f0ee776997b7400870265a65d52dd4 |
24-May-2014 |
Angus Kong <shkong@google.com> |
Merge "Restore the flash setting after HDR is off." into ub-camera-everglades
|
3699c41faa811a872f4dc1ab152d9a7ea89a0590 |
24-May-2014 |
Angus Kong <shkong@google.com> |
Restore the flash setting after HDR is off. bug:15162517 Change-Id: I4b159b6f9067ddde975d3b7692b781a9b18c8eed
rc/com/android/camera/PhotoModule.java
|
2a6ef32408d199826c11cdc209db913c51ebd402 |
23-May-2014 |
Sam Judd <judds@google.com> |
am 8f93077d: Merge "Include signature in cache keys for Glide." into ub-camera-everglades * commit '8f93077d99183cb0f4d1af365e696a251d89ec4d': Include signature in cache keys for Glide.
|
8f93077d99183cb0f4d1af365e696a251d89ec4d |
23-May-2014 |
Sam Judd <judds@google.com> |
Merge "Include signature in cache keys for Glide." into ub-camera-everglades
|
837d8f2687cdf53e657c03c1d01b1c5df3902442 |
23-May-2014 |
Sam Judd <judds@google.com> |
Include signature in cache keys for Glide. Bug: 14625920 Change-Id: Id010bae14ac163523215e3afad712a423aad5875
rc/com/android/camera/Storage.java
rc/com/android/camera/data/ImageModelLoader.java
rc/com/android/camera/data/VideoModelLoader.java
|
9121356f88e6d86afac340e06aa23adf3960d55a |
23-May-2014 |
Sascha Haeberling <haeberling@google.com> |
am c02d0773: Merge "Don\'t use translated strings for video sized until they\'re sane." into ub-camera-everglades * commit 'c02d077353bcfe92f1fe4b8c642e50d4689b3528': Don't use translated strings for video sized until they're sane.
|
c02d077353bcfe92f1fe4b8c642e50d4689b3528 |
23-May-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Don't use translated strings for video sized until they're sane." into ub-camera-everglades
|
8212f073b08bd13ee95385d356e6cad1fbc6d490 |
23-May-2014 |
Sascha Haeberling <haeberling@google.com> |
Don't use translated strings for video sized until they're sane. Bug: 15131043 Change-Id: Ib134bee9094cb082a37133942f0606f5fb638f21
es/values/arrays.xml
es/values/strings.xml
|
35a25188cbed3d0bebdb9294cc700ac2427c3511 |
23-May-2014 |
Doris Liu <tianliu@google.com> |
resolved conflicts for merge of 26aa92bf to ub-camera-fishlake Change-Id: Ifa2422c520a78357b6e920b88ec5a744bb694a95
|
26aa92bf5942bfde16621c6833c14ba0e1ea8b5e |
23-May-2014 |
Doris Liu <tianliu@google.com> |
Add cling for settings button Bug: 14683799 Change-Id: Id3785036f2b1642963dfa43f3272da314d952f2d
es/layout/settings_cling.xml
es/values/colors.xml
es/values/dimens.xml
rc/com/android/camera/app/CameraAppUI.java
rc/com/android/camera/settings/SettingsCache.java
rc/com/android/camera/settings/SettingsManager.java
rc/com/android/camera/ui/ModeListView.java
rc/com/android/camera/widget/SettingsCling.java
|
9d1d4f46fe60ce4d3e6f61ce1c108e4ec1530d2e |
23-May-2014 |
Angus Kong <shkong@google.com> |
am 293b9628: Merge "Disable flash when HDR mode is on." into ub-camera-everglades * commit '293b9628a54ee3871f448e6f66fdc00d82d4adf2': Disable flash when HDR mode is on.
|
293b9628a54ee3871f448e6f66fdc00d82d4adf2 |
23-May-2014 |
Angus Kong <shkong@google.com> |
Merge "Disable flash when HDR mode is on." into ub-camera-everglades
|
566c1a949c34b532ff74ac4a9f5264fca73039bb |
23-May-2014 |
Seth Raphael <magicseth@google.com> |
am b0800488: Merge "Address some code style nits." into ub-camera-everglades * commit 'b0800488c841a3bd5238e5f9015c941c2c4f8f8c': Address some code style nits.
|
8ec64616380fca92a10a264b232f49af83bf539e |
23-May-2014 |
Seth Raphael <magicseth@google.com> |
am 75b16d7d: Merge "Convert camera size settings on upgrade" into ub-camera-everglades * commit '75b16d7da5922cec46c1385bc3c175a09cbb1b08': Convert camera size settings on upgrade
|
b0800488c841a3bd5238e5f9015c941c2c4f8f8c |
22-May-2014 |
Seth Raphael <magicseth@google.com> |
Merge "Address some code style nits." into ub-camera-everglades
|
75b16d7da5922cec46c1385bc3c175a09cbb1b08 |
22-May-2014 |
Seth Raphael <magicseth@google.com> |
Merge "Convert camera size settings on upgrade" into ub-camera-everglades
|
313a52110de0a0dabfdadc604637127700f28220 |
22-May-2014 |
Seth Raphael <magicseth@google.com> |
Address some code style nits. Change-Id: I0672216f0d2ccbd7f708a974a573a46e732d4580
rc/com/android/camera/TextureViewHelper.java
|
5b577a679eb790c4c8ad410436cca0a8cad28f7d |
22-May-2014 |
Seth Raphael <magicseth@google.com> |
Convert camera size settings on upgrade In older versions of the camera, the settings wsere stored as “small”, “medium”, or “default”. Now the app expects absolute resolutions to be stored in the settings. Bug: 14617489 Change-Id: I9d9373b6bc98c1c2ba25cb51de122673b3edef6a
rc/com/android/camera/settings/CameraSettingsActivity.java
rc/com/android/camera/settings/SettingsManager.java
rc/com/android/camera/settings/SettingsUtil.java
|
8c07fe97bc1b28e3c612ab9979e439cdeb8e59f2 |
22-May-2014 |
Angus Kong <shkong@google.com> |
Disable flash when HDR mode is on. bug:15162517 Change-Id: Ia63b36e5c83e805080ed518a1d6a9bdf686b7d44
rc/com/android/camera/PhotoModule.java
|
a60fe3aa4ec6a9998f489319a1b09269e01e90a7 |
22-May-2014 |
Sascha Haeberling <haeberling@google.com> |
am 3538157f: Merge "Add back contentDescription for the aspect ratio image buttons." into ub-camera-everglades * commit '3538157ff362d7c8a074220c88a547dd529526fe': Add back contentDescription for the aspect ratio image buttons.
|
3538157ff362d7c8a074220c88a547dd529526fe |
22-May-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Add back contentDescription for the aspect ratio image buttons." into ub-camera-everglades
|
f39318cd2dce5e77e60667b94cf3ffe08a68d4c8 |
22-May-2014 |
Sascha Haeberling <haeberling@google.com> |
Add back contentDescription for the aspect ratio image buttons. Bug: 15162440 Change-Id: I1ac11ebf7a666877a56a5e08da2dd7a2827f3125
es/layout-land/aspect_ratio_selector.xml
es/layout-port/aspect_ratio_selector.xml
|
164916d6c6caac9e87bf4422ad128f87af02c1b7 |
22-May-2014 |
Seth Raphael <magicseth@google.com> |
am 73b109e7: Merge "Fix jank when switching in and out of hdr+ Also, fix alignment of grid and progress indicator" into ub-camera-everglades * commit '73b109e793fb8ca3c894eb3df5ee42e1f2a7e27f': Fix jank when switching in and out of hdr+ Also, fix alignment of grid and progress indicator
|
73b109e793fb8ca3c894eb3df5ee42e1f2a7e27f |
22-May-2014 |
Seth Raphael <magicseth@google.com> |
Merge "Fix jank when switching in and out of hdr+ Also, fix alignment of grid and progress indicator" into ub-camera-everglades
|
274f6e962e9e7f94cfc4ceb9cad3fa8dc0a80abb |
22-May-2014 |
Seth Raphael <magicseth@google.com> |
Fix jank when switching in and out of hdr+ Also, fix alignment of grid and progress indicator Bug: 15140487 Bug: 14470553 Change-Id: I09303f16b01a380e617343fa0f3cbe2c12fda147
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/TextureViewHelper.java
rc/com/android/camera/app/CameraAppUI.java
|
b8600b2b798f6b28e405380a17bd5f6fc23fcc82 |
22-May-2014 |
Andy Huibers <andyhuibers@google.com> |
Change naming to indicate that date taken is in milliseconds. Change-Id: I5c78e897113c5b1405201b29b4f6f90850112ab6
rc/com/android/camera/data/LocalData.java
rc/com/android/camera/data/LocalMediaData.java
|
11a1ca95b759da81023b0d5e8aa91f9fdccc57ea |
22-May-2014 |
The Android Automerger <android-build@google.com> |
merge in master-release history after reset to e52edeeebe1a0ce82bd7e9b05b926d1301a51a2f
|
7c53a5104616e9d57abb93f44bcc75e5ac9505f1 |
22-May-2014 |
The Android Automerger <android-build@google.com> |
merge in master-release history after reset to e52edeeebe1a0ce82bd7e9b05b926d1301a51a2f
|
3be1f8f8c76cb8823b087de98ae1e2df8420f0bf |
22-May-2014 |
Baligh Uddin <baligh@google.com> |
am e8fa640f: (-s ours) Import translations. DO NOT MERGE * commit 'e8fa640f5d7fe6fed32176ef541aa78114771dec': Import translations. DO NOT MERGE
|
abc33bf4b6e39c4a9327e944122551d827f7ddb9 |
22-May-2014 |
Sascha Haeberling <haeberling@google.com> |
am e177717d: Merge "Make video options translatable." into ub-camera-everglades * commit 'e177717ddb644947b913c79ada37b7ceeb32a4e3': Make video options translatable.
|
721c26135557442771a4b444178292d30eab8543 |
22-May-2014 |
Andy Huibers <andyhuibers@google.com> |
am 404126e3: Merge "Cache queries to Camera.Parameters.getSupportedPictureSizes() to speed up opening of Settings page." into ub-camera-everglades * commit '404126e35045c82ca89a090407cd3ad4a8cf2c3b': Cache queries to Camera.Parameters.getSupportedPictureSizes() to speed up opening of Settings page.
|
e177717ddb644947b913c79ada37b7ceeb32a4e3 |
22-May-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Make video options translatable." into ub-camera-everglades
|
62d1c14a1f6ea7395f7c09210968bec3ed4b035e |
22-May-2014 |
Sascha Haeberling <haeberling@google.com> |
Make video options translatable. Bug: 15131043 Change-Id: I0613be0497c2a03d4c6483c070f4821fd33c5e10
es/values/strings.xml
|
e8fa640f5d7fe6fed32176ef541aa78114771dec |
22-May-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I35934d85aec95adacdc0a8be34dbb0fea9c95dee Auto-generated-cl: translation import
es/values-de/strings.xml
es/values-km-rKH/strings.xml
es/values-mn-rMN/strings.xml
es/values-sk/strings.xml
es/values-sv/strings.xml
es/values-th/strings.xml
es/values-zh-rHK/strings.xml
|
53b6bde32a3d77fcd583f398aacc42cbec3fc8c5 |
21-May-2014 |
Doris Liu <tianliu@google.com> |
am 6809eb84: Freeze the screen during camera switch to hide visual distraction * commit '6809eb840f358430d3032c0532fb42d6dcfd06ef': Freeze the screen during camera switch to hide visual distraction
|
cb6f97e6ab9327c96e4970cbb0eaf10f088752b6 |
21-May-2014 |
Spike Sprague <spikuru@google.com> |
am 42c07cc1: Merge "added Filmstrip viewtype tags for session, secure album placeholder, and camera preview" into ub-camera-everglades * commit '42c07cc1cca3460c67a4243747074c822e11025f': added Filmstrip viewtype tags for session, secure album placeholder, and camera preview
|
a47397fbc04c90de4b47f98040d558821b369a01 |
21-May-2014 |
Andy Huibers <andyhuibers@google.com> |
am 489293d4: Merge "Add timer duration to UsageStatistics." into ub-camera-everglades * commit '489293d47c7c9f8e63b3462c87fe8e30ebe138e8': Add timer duration to UsageStatistics.
|
92f48c51f3bb4bf66867f6c5a29df41d50ed91b5 |
21-May-2014 |
Angus Kong <shkong@google.com> |
am ff988f23: Merge "Reset the decoder in ZoomView when data updated." into ub-camera-everglades * commit 'ff988f235df9d4d8c26a976be2c57ede41d7f7b6': Reset the decoder in ZoomView when data updated.
|
cc520451ef4fd0a4936d1ec4f54ed6b4fd2aeaf4 |
21-May-2014 |
Angus Kong <shkong@google.com> |
am cfe9acc2: Ignore metadata update callback after paused. * commit 'cfe9acc23fcc5f2c00dde46e7e5c3c5192f5e9f0': Ignore metadata update callback after paused.
|
b62bc74e2f1f0d926f467a58a30ef998f0ee76cf |
21-May-2014 |
Seth Raphael <magicseth@google.com> |
am 6fe6beb5: Merge "Fix the build" into ub-camera-everglades * commit '6fe6beb57c56547d88e96e312f623a9e1eeafad7': Fix the build
|
dc5243e6e9689c7ac4386862bb354e614d58f44f |
21-May-2014 |
Seth Raphael <magicseth@google.com> |
Merge commit '3cfd962f' into manualmerge Conflicts: src/com/android/camera/app/CameraAppUI.java Change-Id: I662798190c39dc889291a6eb3add77244875467f
|
404126e35045c82ca89a090407cd3ad4a8cf2c3b |
21-May-2014 |
Andy Huibers <andyhuibers@google.com> |
Merge "Cache queries to Camera.Parameters.getSupportedPictureSizes() to speed up opening of Settings page." into ub-camera-everglades
|
070004c7f63c65d47643773418a307e09523098c |
21-May-2014 |
Baligh Uddin <baligh@google.com> |
am 64776e64: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-everglades * commit '64776e64d758342f58252e17e8d86f76c18f23b3': Import translations. DO NOT MERGE
|
58412088cc93f90078e88692c6616c1f63a4c45d |
21-May-2014 |
Erin Dahlgren <edahlgren@google.com> |
am 0b283b41: Merge "Maximize space for Large Text in aspect ratio dialog." into ub-camera-everglades * commit '0b283b41482254254f0a17ada6415f7cc8b8c46f': Maximize space for Large Text in aspect ratio dialog.
|
c0a85390c2045ae1a8a7c9686c24c5136509a620 |
21-May-2014 |
Sascha Haeberling <haeberling@google.com> |
am b514cdea: Merge "Show timer option in HDR+ mode and as disabled." into ub-camera-everglades * commit 'b514cdeaffca52da323481293e3b9117de04d375': Show timer option in HDR+ mode and as disabled.
|
a1b1f0e7bacb9b01c1b6f2a824a230b0cf940c41 |
21-May-2014 |
Spike Sprague <spikuru@google.com> |
am 6522c97a: Merge "add null check to RadioOptions set selected option" into ub-camera-everglades * commit '6522c97a8bbbc7834dfd9f10dba4ddef910334a7': add null check to RadioOptions set selected option
|
6809eb840f358430d3032c0532fb42d6dcfd06ef |
21-May-2014 |
Doris Liu <tianliu@google.com> |
Freeze the screen during camera switch to hide visual distraction Bug: 14818897 Change-Id: If6df2a6d0783e27807f01f8518244df33c24647f
es/layout/camera.xml
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/app/AppController.java
rc/com/android/camera/app/CameraAppUI.java
rc/com/android/camera/ui/ModeTransitionView.java
|
b4dd5659a53c625a611080db0d41f52f2b421354 |
21-May-2014 |
Sam Hasinoff <hasinoff@google.com> |
Rename HDR+ torch to flash For consistency, and to better reflect the meaning of the flash button in HDR+ mode, change the naming from 'torch' to 'flash'. Even though flash in HDR+ mode is implemented by turning the flash on in torch mode for a burst of frames, HDR+ flash is closer in meaning to a regular photographic flash than a flashlight/torch. Bug: 15133661 Change-Id: I3ac4bb3dac455be1341575966910c2a86e29644b
es/values/strings.xml
rc/com/android/camera/ButtonManager.java
rc/com/android/camera/app/CameraAppUI.java
|
90c7ad5159145227349b389074d2d9437a1243a4 |
21-May-2014 |
Andy Huibers <andyhuibers@google.com> |
Cache queries to Camera.Parameters.getSupportedPictureSizes() to speed up opening of Settings page. Bug: 15090067 Change-Id: I1eea24adbf55bf6a73b02b129b725415edca859c
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/settings/CameraPictureSizesCacher.java
rc/com/android/camera/settings/CameraSettingsActivity.java
rc/com/android/camera/util/Size.java
|
42c07cc1cca3460c67a4243747074c822e11025f |
21-May-2014 |
Spike Sprague <spikuru@google.com> |
Merge "added Filmstrip viewtype tags for session, secure album placeholder, and camera preview" into ub-camera-everglades
|
a93ba0dbd8e4000f3643567809a4a3fac554fd3c |
21-May-2014 |
Spike Sprague <spikuru@google.com> |
added Filmstrip viewtype tags for session, secure album placeholder, and camera preview bug: 15136020 Change-Id: Ib9d4c93317a1c1603c6368e1f8bb03438922f4a8
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/data/CameraPreviewData.java
rc/com/android/camera/data/LocalMediaData.java
rc/com/android/camera/data/LocalSessionData.java
|
489293d47c7c9f8e63b3462c87fe8e30ebe138e8 |
21-May-2014 |
Andy Huibers <andyhuibers@google.com> |
Merge "Add timer duration to UsageStatistics." into ub-camera-everglades
|
ff988f235df9d4d8c26a976be2c57ede41d7f7b6 |
21-May-2014 |
Angus Kong <shkong@google.com> |
Merge "Reset the decoder in ZoomView when data updated." into ub-camera-everglades
|
d1d28254c1413b4d7725df7d7b38e2a1f2f42e28 |
20-May-2014 |
Angus Kong <shkong@google.com> |
Reset the decoder in ZoomView when data updated. The BitmapRegionDecoder has to be reset to load the new bitmap when the data is updated. Also recycle() should be called when the decoder is not used anymore. bug:14625920 Change-Id: Ib7284059320a71adb66204c4834e5b75802142fc
rc/com/android/camera/ui/ZoomView.java
rc/com/android/camera/widget/FilmstripView.java
|
cfe9acc23fcc5f2c00dde46e7e5c3c5192f5e9f0 |
21-May-2014 |
Angus Kong <shkong@google.com> |
Ignore metadata update callback after paused. bug:14814811 Change-Id: Iaa2185ce533b88b75ec13840b30a6df7c04b0ddb
rc/com/android/camera/CameraActivity.java
|
6fe6beb57c56547d88e96e312f623a9e1eeafad7 |
21-May-2014 |
Seth Raphael <magicseth@google.com> |
Merge "Fix the build" into ub-camera-everglades
|
183bd9c65a98e7f599d47b6bb3f9655814142bee |
21-May-2014 |
Seth Raphael <magicseth@google.com> |
Fix the build Change-Id: Ib3cc2c6f63fae47d1c438525106a8dd4684e83af
es/layout/camera.xml
|
3cfd962fc550918a4003daabc90678a00766957d |
21-May-2014 |
Seth Raphael <magicseth@google.com> |
Merge "Add Letterboxing for HDR+" into ub-camera-everglades
|
64776e64d758342f58252e17e8d86f76c18f23b3 |
21-May-2014 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into ub-camera-everglades
|
e451c963c6146181c4667a5cc5bf3858ac97231d |
21-May-2014 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into ub-camera-fishlake
|
6382c70a769b9ec94a3b0372ee27c0cd075e8be8 |
20-May-2014 |
Seth Raphael <magicseth@google.com> |
Add Letterboxing for HDR+ Bug: 14470553 Change-Id: I37d9270b5ad2917c8c19a8aa4abc04967f03621c
es/layout/camera.xml
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/TextureViewHelper.java
rc/com/android/camera/app/AppController.java
rc/com/android/camera/app/CameraAppUI.java
|
d9906f8812861b1f74525cb240c4e4390f59597e |
21-May-2014 |
The Android Automerger <android-build@google.com> |
merge in master-release history after reset to 4d120b8746d5b842ca30338404ca5f7677e31b78
|
547d7c840265e645a41a9f58ad296e4fbdfcbaca |
21-May-2014 |
Andy Huibers <andyhuibers@google.com> |
Add timer duration to UsageStatistics. Bug: 14364757 Change-Id: I74505834d4d7b94154722c63cf52110d410c955b
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/VideoModule.java
rc_pd/com/android/camera/util/UsageStatistics.java
|
0b283b41482254254f0a17ada6415f7cc8b8c46f |
21-May-2014 |
Erin Dahlgren <edahlgren@google.com> |
Merge "Maximize space for Large Text in aspect ratio dialog." into ub-camera-everglades
|
f142fcf45c93ee674b976cc68883ea30c904a9d1 |
21-May-2014 |
Erin Dahlgren <edahlgren@google.com> |
Maximize space for Large Text in aspect ratio dialog. This evenly places the vertical element in portrait mode of the aspect ratio dialog. This gives the maximum space for translations. If the translations don't fit, it is because we are taking up all of the space on the screen. Tested: French, German, Turkish, English In both Large Text and normal Text mode. Bug: 14993598 Change-Id: I76ce1c00bbbb05733211d6e498a8bcf44777933a
es/layout-port/aspect_ratio_dialog_content.xml
es/layout-port/aspect_ratio_selector.xml
|
b514cdeaffca52da323481293e3b9117de04d375 |
21-May-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Show timer option in HDR+ mode and as disabled." into ub-camera-everglades
|
4333fac867f6f6a11235b16d305dd197093b44d5 |
21-May-2014 |
Sascha Haeberling <haeberling@google.com> |
Show timer option in HDR+ mode and as disabled. Bug: 15089347 Change-Id: I366cd0b553808d55136c141bc1efec6ada9ee9b0
es/drawable-hdpi/ic_timer_10s_disabled.png
es/drawable-hdpi/ic_timer_3s_disabled.png
es/drawable-hdpi/ic_timer_off_disabled.png
es/drawable-mdpi/ic_timer_10s_disabled.png
es/drawable-mdpi/ic_timer_3s_disabled.png
es/drawable-mdpi/ic_timer_off_disabled.png
es/drawable-xhdpi/ic_timer_10s_disabled.png
es/drawable-xhdpi/ic_timer_3s_disabled.png
es/drawable-xhdpi/ic_timer_off_disabled.png
es/drawable-xxhdpi/ic_timer_10s_disabled.png
es/drawable-xxhdpi/ic_timer_3s_disabled.png
es/drawable-xxhdpi/ic_timer_off_disabled.png
es/drawable/ic_timer_10s.xml
es/drawable/ic_timer_3s.xml
es/drawable/ic_timer_off.xml
es/values/arrays.xml
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/app/CameraAppUI.java
|
6522c97a8bbbc7834dfd9f10dba4ddef910334a7 |
21-May-2014 |
Spike Sprague <spikuru@google.com> |
Merge "add null check to RadioOptions set selected option" into ub-camera-everglades
|
5c3ef9c902ca797ab5d5688f7e712d0ec7f7b2fc |
21-May-2014 |
Seth Raphael <magicseth@google.com> |
am ffc06a4e: Merge "Preparatory commit for 16:9 hdr+" into ub-camera-everglades * commit 'ffc06a4e9d20712c216b93878e16feaaa291bbf5': Preparatory commit for 16:9 hdr+
|
b99f53c73484434e599ac55e779a72e3f92e700c |
21-May-2014 |
Spike Sprague <spikuru@google.com> |
am 0bd76752: Merge "a little string resource cleanup" into ub-camera-everglades * commit '0bd76752a3bce1052cd6d12db6b310a201727aa9': a little string resource cleanup
|
8ff6155613e5ed4f924589a1e63d5edc22b8b1bc |
21-May-2014 |
Doris Liu <tianliu@google.com> |
am 47b8baa1: Merge "Change timer icon position" into ub-camera-everglades * commit '47b8baa1b04e3da92b965b7d6b0929fc24ebc940': Change timer icon position
|
ffc06a4e9d20712c216b93878e16feaaa291bbf5 |
21-May-2014 |
Seth Raphael <magicseth@google.com> |
Merge "Preparatory commit for 16:9 hdr+" into ub-camera-everglades
|
774f110f1aab1c28ca039943f5c3093cc0b27d98 |
21-May-2014 |
Spike Sprague <spikuru@google.com> |
add null check to RadioOptions set selected option bug: 15080601 Change-Id: Icbe0baedc0f629ec0946ea6f94862d29edbb4fce
rc/com/android/camera/ButtonManager.java
rc/com/android/camera/ui/RadioOptions.java
|
0bd76752a3bce1052cd6d12db6b310a201727aa9 |
21-May-2014 |
Spike Sprague <spikuru@google.com> |
Merge "a little string resource cleanup" into ub-camera-everglades
|
0640828601e3c13a3045df70709a84b9c8fdf552 |
21-May-2014 |
Spike Sprague <spikuru@google.com> |
a little string resource cleanup bug: 12894481 Change-Id: I7f5ac1fce49b875161c1b728c0f8a6bd09c2c3f6
es/values/strings.xml
|
47b8baa1b04e3da92b965b7d6b0929fc24ebc940 |
21-May-2014 |
Doris Liu <tianliu@google.com> |
Merge "Change timer icon position" into ub-camera-everglades
|
4beae4d625333bae0eef81212caef8bf9905763d |
21-May-2014 |
Doris Liu <tianliu@google.com> |
Change timer icon position Bug: 15101701 Change-Id: I721ee385daacb104c6fd473d80b68792b56ad8ed
es/layout-land/mode_options.xml
es/layout-port/mode_options.xml
|
556a174d0f7cbd49cd8aaec6a5359440b42352c6 |
21-May-2014 |
Doris Liu <tianliu@google.com> |
am cf404d02: Merge "Fix mode list layout issue after initial aspect ratio selection" into ub-camera-everglades * commit 'cf404d02a998629bda92a05dfb2bcb9c800e693a': Fix mode list layout issue after initial aspect ratio selection
|
cf404d02a998629bda92a05dfb2bcb9c800e693a |
21-May-2014 |
Doris Liu <tianliu@google.com> |
Merge "Fix mode list layout issue after initial aspect ratio selection" into ub-camera-everglades
|
c50c15162fa8073720df885cf4d4ec2612c91c55 |
21-May-2014 |
Sascha Haeberling <haeberling@google.com> |
am d849d5f0: Merge "Update cling in filmstrip at the right times." into ub-camera-everglades * commit 'd849d5f00977194276053396d8bceb438b0bbea6': Update cling in filmstrip at the right times.
|
d849d5f00977194276053396d8bceb438b0bbea6 |
21-May-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Update cling in filmstrip at the right times." into ub-camera-everglades
|
b908d933736a4ec042aad065b7ebf2059bbcac97 |
21-May-2014 |
Doris Liu <tianliu@google.com> |
Fix mode list layout issue after initial aspect ratio selection Bug: 15088302 Change-Id: I10e6dcc7ce026c3ebb3fa676ebf0b7d7e0eda732
rc/com/android/camera/app/CameraAppUI.java
rc/com/android/camera/ui/ModeListView.java
|
a9845c7cda0b2c820158b9b8017b8d10b54c2150 |
21-May-2014 |
Spike Sprague <spikuru@google.com> |
am 99ec3b37: Merge "make recycleView() look at the view type passed in (via a view tag) instead of relying on the data adapter" into ub-camera-everglades * commit '99ec3b376058a7beef96490fda29cea987ee7b04': make recycleView() look at the view type passed in (via a view tag) instead of relying on the data adapter
|
99ec3b376058a7beef96490fda29cea987ee7b04 |
21-May-2014 |
Spike Sprague <spikuru@google.com> |
Merge "make recycleView() look at the view type passed in (via a view tag) instead of relying on the data adapter" into ub-camera-everglades
|
bb3b39b13a7097a55e585e8d6197057500847708 |
20-May-2014 |
Spike Sprague <spikuru@google.com> |
make recycleView() look at the view type passed in (via a view tag) instead of relying on the data adapter bug: 14599203 Change-Id: I5809aef03a0b6e29dd80512ee0593aac0001d0a5
es/values/ids.xml
rc/com/android/camera/data/LocalMediaData.java
rc/com/android/camera/widget/FilmstripView.java
|
d8d674ab7267cc4b7184f853a73242b47a9e4abd |
20-May-2014 |
Alan Newberger <alann@google.com> |
am 36ea98a7: Merge "Port Glide loading to use Files rather than String URIs" into ub-camera-everglades * commit '36ea98a790be5bd08817a8b194bd9be48b6be3de': Port Glide loading to use Files rather than String URIs
|
36ea98a790be5bd08817a8b194bd9be48b6be3de |
20-May-2014 |
Alan Newberger <alann@google.com> |
Merge "Port Glide loading to use Files rather than String URIs" into ub-camera-everglades
|
3c33ca256349fabf9cea404291f60ae261860441 |
20-May-2014 |
Alan Newberger <alann@google.com> |
Port Glide loading to use Files rather than String URIs We encountered a bug with colons in filenames. Current integration passes file paths as basic URIs into Glide, which then gets confuses detecting paths with colons as they parse into schemes. This CL instead bakes the assumption that LocalMedia paths are file paths, into the app level. Tested with all modes and captures, formerly buggy filmstrip items now display. Bug: 15025417 Change-Id: I91efa1e7b66d630e402b23a36b2a05c9783370a3
rc/com/android/camera/data/ImageModelLoader.java
rc/com/android/camera/data/VideoModelLoader.java
|
0fa27e89c7ad6128197fcfe6e6e916e538244ec0 |
20-May-2014 |
Sascha Haeberling <haeberling@google.com> |
Update cling in filmstrip at the right times. Bug: 14885868 Change-Id: I5ffc6eb59c949cb6317923eba05cedb0f4065629
rc/com/android/camera/widget/ExternalViewerButton.java
|
f4b7cf9f3dce05c1e093c577cfc0030d8fcb0161 |
20-May-2014 |
Doris Liu <tianliu@google.com> |
am c40bb33f: Merge "Fix squished preview after startup apsect ratio selection" into ub-camera-everglades * commit 'c40bb33fef476f0edccc2234520eb48f49571118': Fix squished preview after startup apsect ratio selection
|
c40bb33fef476f0edccc2234520eb48f49571118 |
20-May-2014 |
Doris Liu <tianliu@google.com> |
Merge "Fix squished preview after startup apsect ratio selection" into ub-camera-everglades
|
6a8ae81aac9487e87d23a8afc65b2dc0c409c418 |
20-May-2014 |
Doris Liu <tianliu@google.com> |
Fix squished preview after startup apsect ratio selection Bug: 15085976 Change-Id: I7f787799201caf13da42d4f7b56806a494ae7c80
rc/com/android/camera/PhotoModule.java
|
02c129a598b6a165885fe950275675d62993d2ee |
20-May-2014 |
Seth Raphael <magicseth@google.com> |
Preparatory commit for 16:9 hdr+ This exposes some necessary functions for hdr+ to go 16:9. It allows you to pass a preview matrix that is pre scaled, so that hdr+ can calculate its own matrix Bug: 14470553 Change-Id: I56f2c033ff58a9ff6793c6ee4d2317cb9ce5065a
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/CaptureLayoutHelper.java
rc/com/android/camera/TextureViewHelper.java
rc/com/android/camera/app/AppController.java
rc/com/android/camera/app/CameraAppUI.java
rc/com/android/camera/settings/SettingsUtil.java
|
7f66b84a542934a2295f44e9d6bccd4bbc0176a9 |
20-May-2014 |
Sam Hasinoff <hasinoff@google.com> |
Merge "Add new hdr plus flash setting." into ub-camera-fishlake
|
a14a03fce201655f6977780ef53f7c3128d7330c |
20-May-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I9848db1ebbfbc1dda81dda9702e7ecadf411d159 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-km-rKH/strings.xml
es/values-ko/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mn-rMN/strings.xml
es/values-ms-rMY/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
de5da00df6008abf9ca89e2262bf9049ba7933b9 |
20-May-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I857898c13dc3abe007c44788077d815298edd691 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-km-rKH/strings.xml
es/values-ko/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mn-rMN/strings.xml
es/values-ms-rMY/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
e52edeeebe1a0ce82bd7e9b05b926d1301a51a2f |
20-May-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I9e6aea58c94d2f7b13cba27d1b8b25e4a5c81837 Auto-generated-cl: translation import
es/values-it/strings.xml
es/values-mn-rMN/strings.xml
es/values-pt-rPT/strings.xml
es/values-th/strings.xml
es/values-zh-rHK/strings.xml
|
4d09f919b96ebbeacf7ecff10ad5b1ed8074fe6e |
20-May-2014 |
Erin Dahlgren <edahlgren@google.com> |
am c808dc9e: Adjust the margins around the aspect ratio dialog for Large Text. * commit 'c808dc9e18865ad3d188729b3d79a17a0ee983c8': Adjust the margins around the aspect ratio dialog for Large Text.
|
c808dc9e18865ad3d188729b3d79a17a0ee983c8 |
20-May-2014 |
Erin Dahlgren <edahlgren@google.com> |
Adjust the margins around the aspect ratio dialog for Large Text. This solution works for both normal and Large Text modes. Bug: 14993598 Change-Id: I211dc68685ae736e1e19408cbeb42285dd17f13e
es/layout-port/aspect_ratio_dialog_content.xml
|
15473d4b69f4ad619aa10430e4bc86ab4fa815d0 |
14-May-2014 |
Erin Dahlgren <edahlgren@google.com> |
Add new hdr plus flash setting. This setting will be used by GcamModule to manage their torch mode. It should be different from the Camera 1 api flash mode setting, because they are semantically different. GcamModule needs to set enableHdrPlusFlash in the BottomBarSpec to enable this feature. Also normalize names, HDRPLUS/hdrplus -> HDR_PLUS/hdr_plus, for consistency, to reflect the clear majority usage. Depends on: * GcamModule ag/465936 Bug: 13076855 Change-Id: I6fe5ab8b1c7b9fa1acd1181445748c0257d21ea4
es/values/arrays.xml
es/values/strings.xml
rc/com/android/camera/ButtonManager.java
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/app/CameraAppUI.java
rc/com/android/camera/settings/SettingsCache.java
rc/com/android/camera/settings/SettingsManager.java
rc/com/android/camera/widget/IndicatorIconController.java
|
6daaf77bf91b67e1d2200439dd39486ff1d66ac5 |
20-May-2014 |
Andy Huibers <andyhuibers@google.com> |
am 203abe59: Add grid lines and flash states to capture logging. * commit '203abe5913394239a1e888d71d56597b68f84f62': Add grid lines and flash states to capture logging.
|
3d74cc8e62cf4d1f3b87805244a5470429cac1e4 |
20-May-2014 |
The Android Automerger <android-build@google.com> |
merge in master-release history after reset to 4d120b8746d5b842ca30338404ca5f7677e31b78
|
203abe5913394239a1e888d71d56597b68f84f62 |
19-May-2014 |
Andy Huibers <andyhuibers@google.com> |
Add grid lines and flash states to capture logging. Bug: 14364757 Change-Id: Ibf40c041d508f4406ead273dfdcb1c051a6f83a2
rc/com/android/camera/MediaSaverImpl.java
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/VideoModule.java
rc/com/android/camera/app/MediaSaver.java
rc_pd/com/android/camera/util/UsageStatistics.java
|
c7a9a6a2072f08ded7a1a6014b8d8e2b4223d5e2 |
20-May-2014 |
Sascha Haeberling <haeberling@google.com> |
am 29a2914d: Merge "Only show accessibility buttons when spoken feedback is enabled." into ub-camera-everglades * commit '29a2914d2e943e1ccc5bd3d3721a100c98617267': Only show accessibility buttons when spoken feedback is enabled.
|
29a2914d2e943e1ccc5bd3d3721a100c98617267 |
20-May-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Only show accessibility buttons when spoken feedback is enabled." into ub-camera-everglades
|
d4c3333c99ece20b3125e86e1e3f6105b2bc9bdd |
20-May-2014 |
Sascha Haeberling <haeberling@google.com> |
Only show accessibility buttons when spoken feedback is enabled. Bug: 15082416 Change-Id: I9d953781fd9107dd81058afab183e044a784fba9
rc/com/android/camera/app/CameraAppUI.java
|
e85ddaffc72e74228f800e76a6505de1be9bb660 |
20-May-2014 |
Doris Liu <tianliu@google.com> |
am 4245502e: Merge "Add back countdown timer" into ub-camera-everglades * commit '4245502e9bba736e425c190894cfc928ae0b5e48': Add back countdown timer
|
4245502e9bba736e425c190894cfc928ae0b5e48 |
20-May-2014 |
Doris Liu <tianliu@google.com> |
Merge "Add back countdown timer" into ub-camera-everglades
|
6c75164c89f3bbd4f894b9c49a7914a24268a999 |
06-May-2014 |
Doris Liu <tianliu@google.com> |
Add back countdown timer Bug: 14222651 Change-Id: I482ec942dd9d79c4ea0432140a96ba2fc5b29c57
es/anim/count_down_exit.xml
es/drawable-hdpi/ic_timer_10s_indicator.png
es/drawable-hdpi/ic_timer_10s_normal.png
es/drawable-hdpi/ic_timer_3s_indicator.png
es/drawable-hdpi/ic_timer_3s_normal.png
es/drawable-hdpi/ic_timer_off_indicator.png
es/drawable-hdpi/ic_timer_off_normal.png
es/drawable-mdpi/ic_timer_10s_indicator.png
es/drawable-mdpi/ic_timer_10s_normal.png
es/drawable-mdpi/ic_timer_3s_indicator.png
es/drawable-mdpi/ic_timer_3s_normal.png
es/drawable-mdpi/ic_timer_off_indicator.png
es/drawable-mdpi/ic_timer_off_normal.png
es/drawable-xhdpi/ic_timer_10s_indicator.png
es/drawable-xhdpi/ic_timer_10s_normal.png
es/drawable-xhdpi/ic_timer_3s_indicator.png
es/drawable-xhdpi/ic_timer_3s_normal.png
es/drawable-xhdpi/ic_timer_off_indicator.png
es/drawable-xhdpi/ic_timer_off_normal.png
es/drawable-xxhdpi/ic_timer_10s_indicator.png
es/drawable-xxhdpi/ic_timer_10s_normal.png
es/drawable-xxhdpi/ic_timer_3s_indicator.png
es/drawable-xxhdpi/ic_timer_3s_normal.png
es/drawable-xxhdpi/ic_timer_off_indicator.png
es/drawable-xxhdpi/ic_timer_off_normal.png
es/layout-land/indicators.xml
es/layout-land/mode_options.xml
es/layout-port/indicators.xml
es/layout-port/mode_options.xml
es/layout/photo_module.xml
es/values/arrays.xml
rc/com/android/camera/ButtonManager.java
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/PhotoUI.java
rc/com/android/camera/app/CameraAppUI.java
rc/com/android/camera/settings/SettingsCache.java
rc/com/android/camera/settings/SettingsManager.java
rc/com/android/camera/ui/BottomBar.java
rc/com/android/camera/ui/CountDownView.java
rc/com/android/camera/widget/IndicatorIconController.java
|
a00bce70ba6b08a7170eca636f782227fa4dd8fa |
20-May-2014 |
Sascha Haeberling <haeberling@google.com> |
am e811b29f: Change the texts in the aspect ratio selector screen. * commit 'e811b29f6707a6ea8f066e6f5b9cb0fc99d2dcd6': Change the texts in the aspect ratio selector screen.
|
e811b29f6707a6ea8f066e6f5b9cb0fc99d2dcd6 |
19-May-2014 |
Sascha Haeberling <haeberling@google.com> |
Change the texts in the aspect ratio selector screen. Bug: 15024081 As per request from Jake, we don't show the megapixel count anymore but instead show whether the result is cropped or full sensor. As we limit this screen to N4 and N5, the texts can be static to cropped 16:9 and full-sensor 4:3. Change-Id: I309d52c050ddbce5fe3c85db417adf79129cd141
es/layout-land/aspect_ratio_selector.xml
es/layout-port/aspect_ratio_selector.xml
es/values/strings.xml
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/PhotoUI.java
rc/com/android/camera/widget/AspectRatioDialogLayout.java
rc/com/android/camera/widget/AspectRatioSelector.java
|
150649b7fc20400c8dbaf74054e96cdc5c788d4f |
19-May-2014 |
Sascha Haeberling <haeberling@google.com> |
am 4561c7c1: Merge "Limit start-up screen to N4 + N5" into ub-camera-everglades * commit '4561c7c13a31a134ef9f713a4c56dfb634bee034': Limit start-up screen to N4 + N5
|
bc190d14f7f0236b66a8a4f2a0bab55c93b05b12 |
19-May-2014 |
Sascha Haeberling <haeberling@google.com> |
am ca722aa5: Update the aspect ratio selector drawables. * commit 'ca722aa501b31dd17b5c369420a984a4074768d2': Update the aspect ratio selector drawables.
|
4561c7c13a31a134ef9f713a4c56dfb634bee034 |
19-May-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Limit start-up screen to N4 + N5" into ub-camera-everglades
|
ca722aa501b31dd17b5c369420a984a4074768d2 |
19-May-2014 |
Sascha Haeberling <haeberling@google.com> |
Update the aspect ratio selector drawables. Bug: 15024081 Change-Id: Ie9d7f4079c615d9fcb4eff05eea726a9a3edc9fd
es/drawable-hdpi/aspect_ratio_16x9_selected.png
es/drawable-hdpi/aspect_ratio_16x9_unselected.png
es/drawable-hdpi/aspect_ratio_4x3_selected.png
es/drawable-hdpi/aspect_ratio_4x3_unselected.png
es/drawable-mdpi/aspect_ratio_16x9_selected.png
es/drawable-mdpi/aspect_ratio_16x9_unselected.png
es/drawable-mdpi/aspect_ratio_4x3_selected.png
es/drawable-mdpi/aspect_ratio_4x3_unselected.png
es/drawable-xhdpi/aspect_ratio_16x9_selected.png
es/drawable-xhdpi/aspect_ratio_16x9_unselected.png
es/drawable-xhdpi/aspect_ratio_4x3_selected.png
es/drawable-xhdpi/aspect_ratio_4x3_unselected.png
es/drawable-xxhdpi/aspect_ratio_16x9_selected.png
es/drawable-xxhdpi/aspect_ratio_16x9_unselected.png
es/drawable-xxhdpi/aspect_ratio_4x3_selected.png
es/drawable-xxhdpi/aspect_ratio_4x3_unselected.png
|
1d943647c5b632588c4858ded04770e846341f1b |
19-May-2014 |
Sascha Haeberling <haeberling@google.com> |
Limit start-up screen to N4 + N5 Bug: 15024081 Change-Id: I1333a753bc3741d176765ab026cacc1358ab2fca
rc/com/android/camera/PhotoUI.java
|
4781288f8e70b71df2dc520b1502dd1e7cb67ed9 |
19-May-2014 |
Doris Liu <tianliu@google.com> |
am 05927e46: Merge "Set a preview callback with a buffer size to force update preview callback stream" into ub-camera-everglades * commit '05927e466d0288a0ea971ac543f5039246875f3b': Set a preview callback with a buffer size to force update preview callback stream
|
05927e466d0288a0ea971ac543f5039246875f3b |
19-May-2014 |
Doris Liu <tianliu@google.com> |
Merge "Set a preview callback with a buffer size to force update preview callback stream" into ub-camera-everglades
|
cb8215ef6efaf379adf0e0c45c655ac3ec9a5638 |
19-May-2014 |
Doris Liu <tianliu@google.com> |
Set a preview callback with a buffer size to force update preview callback stream This is the workaround for the same issue that causes b/12210027. It was fixed in KitKat MR2, so we are applying the workaround on KitKat and MR1. Bug: 14954941 Change-Id: Ifba3f9d47769884e81a41277f858e5c7aef41803
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/util/ApiHelper.java
|
5e6596fc2f30d774b5093c34cb5c6855b209a656 |
19-May-2014 |
Erin Dahlgren <edahlgren@google.com> |
am a7919c72: Add hooks for disabling/enable the mode options toggle between captures. * commit 'a7919c720c49d7aa9a033366a92f8b1828619a0f': Add hooks for disabling/enable the mode options toggle between captures.
|
a7919c720c49d7aa9a033366a92f8b1828619a0f |
16-May-2014 |
Erin Dahlgren <edahlgren@google.com> |
Add hooks for disabling/enable the mode options toggle between captures. Bug: 13982230 Change-Id: Ib2582420c2f7fd0038555aed0b23bfa8f151721b
rc/com/android/camera/app/CameraAppUI.java
rc/com/android/camera/widget/ModeOptionsOverlay.java
|
b7d070fa3765e243d7670949af30e7ded88487af |
19-May-2014 |
The Android Automerger <android-build@google.com> |
merge in master-release history after reset to 4d120b8746d5b842ca30338404ca5f7677e31b78
|
2c7db06338d622aa3cc1afeb3de73a2d5a92ab6f |
18-May-2014 |
The Android Automerger <android-build@google.com> |
merge in master-release history after reset to 4d120b8746d5b842ca30338404ca5f7677e31b78
|
812eb9d040b8cc4cdd2f8c45aed936b57c306d26 |
17-May-2014 |
The Android Automerger <android-build@google.com> |
merge in master-release history after reset to 4d120b8746d5b842ca30338404ca5f7677e31b78
|
4be73f3bd7930773fb4fc658407d8276eb6a8d2d |
17-May-2014 |
Sascha Haeberling <haeberling@google.com> |
am 09f70da3: Fix the build, we need button_cling in camera2. * commit '09f70da39bcc93a1e418243f71e248382f17854b': Fix the build, we need button_cling in camera2.
|
09f70da39bcc93a1e418243f71e248382f17854b |
17-May-2014 |
Sascha Haeberling <haeberling@google.com> |
Fix the build, we need button_cling in camera2. Change-Id: I8150d87567ed0e8598e59a806859b00bf51b70c8
es/drawable/button_cling.xml
|
328faf03f7b099100c359f6f7b1129fe3a51b15f |
17-May-2014 |
Sascha Haeberling <haeberling@google.com> |
am a434d7b4: Merge "Unify the blue button styles across the app." into ub-camera-everglades * commit 'a434d7b4d8fbbcc53616ee624482e33e12332fa9': Unify the blue button styles across the app.
|
a434d7b4d8fbbcc53616ee624482e33e12332fa9 |
17-May-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Unify the blue button styles across the app." into ub-camera-everglades
|
b8b26f32295d4b4e3405c219c9211f5954ece1e5 |
17-May-2014 |
Sascha Haeberling <haeberling@google.com> |
Unify the blue button styles across the app. Bug: 14901436 Change-Id: I9603806a47c41896e25d2e5509a898758e82aebd
es/layout-land/aspect_ratio_dialog_content.xml
es/layout-land/location_dialog_content.xml
es/layout-port/aspect_ratio_dialog_content.xml
es/layout-port/location_dialog_content.xml
es/values/styles.xml
|
3ac3011067bdab19c82e33fb6ece13226190b631 |
16-May-2014 |
Angus Kong <shkong@google.com> |
am 96867dc1: Merge "Update session data properly." into ub-camera-everglades * commit '96867dc15d3a7582d94450adfdd6e33bbcb4c507': Update session data properly.
|
96867dc15d3a7582d94450adfdd6e33bbcb4c507 |
16-May-2014 |
Angus Kong <shkong@google.com> |
Merge "Update session data properly." into ub-camera-everglades
|
d4f7d47cb3b6d9555a29dd0dc41ec74e524d6348 |
16-May-2014 |
Alan Newberger <alann@google.com> |
am f27f6348: Merge "Avoid creating dialog on an activity that is finishing" into ub-camera-everglades * commit 'f27f634824dcbd483a724ee05fb5d5f2bb7df01e': Avoid creating dialog on an activity that is finishing
|
f27f634824dcbd483a724ee05fb5d5f2bb7df01e |
16-May-2014 |
Alan Newberger <alann@google.com> |
Merge "Avoid creating dialog on an activity that is finishing" into ub-camera-everglades
|
b19aba9c16bc68da92fae302c69c0200af0d6d13 |
16-May-2014 |
Alan Newberger <alann@google.com> |
Avoid creating dialog on an activity that is finishing We have some stack traces in the wild indicating we are trying to create a dialog on the CameraActivity while it is not in a valid state to attach views. Adding an isFinishing check, see more info in the following issue: Bug: 13967353 Change-Id: Ic3c45fa362408f2641527497b15f67686d3aed79
rc/com/android/camera/util/CameraUtil.java
|
d19b9b512d0dccd7faa3b7b8206b5d9117175107 |
16-May-2014 |
Angus Kong <shkong@google.com> |
Update session data properly. bug:14969759 Change-Id: I39ba063e23482a03cf108931b6c686755dbec91e
rc/com/android/camera/data/LocalSessionData.java
|
2c50e69aa3e80f85e19dd18a11697e993370b735 |
16-May-2014 |
Sascha Haeberling <haeberling@google.com> |
am b32af4fa: Format the megapixel value on the start screen same as settings. * commit 'b32af4faa94a06aaefdd0e49392c9da0ec10bfb8': Format the megapixel value on the start screen same as settings.
|
b32af4faa94a06aaefdd0e49392c9da0ec10bfb8 |
16-May-2014 |
Sascha Haeberling <haeberling@google.com> |
Format the megapixel value on the start screen same as settings. Bug: 14955075 Change-Id: I1a57a0f9c884ce62cae97c77323c19c390fe2ee7
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hu/strings.xml
es/values-it/strings.xml
es/values-km-rKH/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mn-rMN/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-sv/strings.xml
es/values-uk/strings.xml
es/values-zh-rHK/strings.xml
es/values-zu/strings.xml
es/values/strings.xml
rc/com/android/camera/PhotoModule.java
|
b3fedd9b8a2b61c95664fc32e7e3ce3344fc616b |
16-May-2014 |
Sascha Haeberling <haeberling@google.com> |
am 20cc3ad8: Merge "Make new start-up screen accessible." into ub-camera-everglades * commit '20cc3ad8d462ab36c055dfeb12f6e5257df61db5': Make new start-up screen accessible.
|
20cc3ad8d462ab36c055dfeb12f6e5257df61db5 |
16-May-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Make new start-up screen accessible." into ub-camera-everglades
|
f1786266e09abac25e6764120fdb5d34e2039877 |
16-May-2014 |
Sascha Haeberling <haeberling@google.com> |
am 0d4f2b8f: Merge "Close mode options and mode list when needed." into ub-camera-everglades * commit '0d4f2b8fe779e66d1b8f0201fd0b92e5ea8e900b': Close mode options and mode list when needed.
|
0d4f2b8fe779e66d1b8f0201fd0b92e5ea8e900b |
16-May-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Close mode options and mode list when needed." into ub-camera-everglades
|
256427babcb93dd3cdb11b6e23c47ecf82e5af19 |
15-May-2014 |
Sascha Haeberling <haeberling@google.com> |
Close mode options and mode list when needed. Bug: 14834384 Bug: 14834783 Change-Id: Id96859d57a84c66489a0e764ba2950cc47f7c886
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/app/CameraAppUI.java
rc/com/android/camera/widget/ModeOptionsOverlay.java
|
46bccc2a9a112d33c58c8f0254b09d1453819717 |
16-May-2014 |
Spike Sprague <spikuru@google.com> |
am aea8fc9f: Merge "fix some lingering exposure comp value calculation errors hide exposure comp button if not supported in hardware" into ub-camera-everglades * commit 'aea8fc9fd14cb8be4f9e492fd3f95286f090c42c': fix some lingering exposure comp value calculation errors hide exposure comp button if not supported in hardware
|
aea8fc9fd14cb8be4f9e492fd3f95286f090c42c |
16-May-2014 |
Spike Sprague <spikuru@google.com> |
Merge "fix some lingering exposure comp value calculation errors hide exposure comp button if not supported in hardware" into ub-camera-everglades
|
156f3e5b41cd2049230b1423c455763d31738693 |
16-May-2014 |
Spike Sprague <spikuru@google.com> |
fix some lingering exposure comp value calculation errors hide exposure comp button if not supported in hardware bug: 13967706 Change-Id: I6aa6963929c00ed06122fa2e2dfd778844bcc280
rc/com/android/camera/ButtonManager.java
rc/com/android/camera/app/CameraAppUI.java
rc/com/android/camera/widget/IndicatorIconController.java
|
a4e20a7161d74285955ff6d64d6b4c1ccf0d388b |
15-May-2014 |
Seth Raphael <magicseth@google.com> |
am 1cced0e8: Use approximate descriptions of aspect ratios. * commit '1cced0e893b6a2f37d447a049c1c3c08affd2d41': Use approximate descriptions of aspect ratios.
|
5fad0cadb4268c15ae765a538c5b287d8a3c1a5b |
15-May-2014 |
Sascha Haeberling <haeberling@google.com> |
Make new start-up screen accessible. Bug: 14994854 - Make the text on locaiton dialog a label of checkbox - Add content description to aspect ratio image buttons Change-Id: Idbb633205eec35be2ec891e7c8ea079475c5ea3d
es/layout-land/location_dialog_content.xml
es/layout-port/location_dialog_content.xml
rc/com/android/camera/widget/AspectRatioSelector.java
rc/com/android/camera/widget/LocationDialogLayout.java
|
1cced0e893b6a2f37d447a049c1c3c08affd2d41 |
15-May-2014 |
Seth Raphael <magicseth@google.com> |
Use approximate descriptions of aspect ratios. 165:98 should be considered close enough and described as 16:9 Bug: 14970245 Change-Id: I75ca9507e453d057c6db3e4fd99cebb0ee01d4f7
rc/com/android/camera/settings/CameraSettingsActivity.java
rc/com/android/camera/settings/ResolutionUtil.java
|
f8a39e90e2f76d496576e7b44f54043a05a59ccc |
15-May-2014 |
Spike Sprague <spikuru@google.com> |
am 86ea01ab: Merge "pass FilmstripView accessibilty focus events to children" into ub-camera-everglades * commit '86ea01ab99c34b2391b90bc0526ede283377f73c': pass FilmstripView accessibilty focus events to children
|
86ea01ab99c34b2391b90bc0526ede283377f73c |
15-May-2014 |
Spike Sprague <spikuru@google.com> |
Merge "pass FilmstripView accessibilty focus events to children" into ub-camera-everglades
|
2234bca0e604fb40850910319b29d6d2b6ce7a5e |
15-May-2014 |
Sascha Haeberling <haeberling@google.com> |
am 8670da6b: Always reset position and visibility of newly added views. * commit '8670da6b3631e82d864e55d36a1ccaf9b2c7a8ce': Always reset position and visibility of newly added views.
|
ae5fa1499ab1d6d1d421228859d13ac45ad1d437 |
13-May-2014 |
Spike Sprague <spikuru@google.com> |
pass FilmstripView accessibilty focus events to children bug: 14815653 Change-Id: I48c381f87600f2eb11ce29942cdbc7e5f2dae446
rc/com/android/camera/data/LocalMediaData.java
rc/com/android/camera/widget/FilmstripView.java
|
8670da6b3631e82d864e55d36a1ccaf9b2c7a8ce |
15-May-2014 |
Sascha Haeberling <haeberling@google.com> |
Always reset position and visibility of newly added views. Bug: 14887734 Bug: 14832742 Change-Id: I9d41a9e89f9c008aad819b52c4d9f0e0d3f54a19
rc/com/android/camera/widget/FilmstripView.java
|
885158ad546dba0d3f63918045b38619b8473c81 |
15-May-2014 |
Baligh Uddin <baligh@google.com> |
am d73130b1: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-everglades * commit 'd73130b1c265d21edcea3d0fbe3cbb137b3db483': Import translations. DO NOT MERGE
|
d73130b1c265d21edcea3d0fbe3cbb137b3db483 |
15-May-2014 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into ub-camera-everglades
|
60c1209724940e7d27005851ca192be20548f161 |
15-May-2014 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into ub-camera-fishlake
|
e4b371301b236e9226a709e9b52fe76addd2f1f4 |
15-May-2014 |
The Android Automerger <android-build@google.com> |
merge in master-release history after reset to 4d120b8746d5b842ca30338404ca5f7677e31b78
|
6a4e716616b98b734d20dd149286804df9a00624 |
15-May-2014 |
Spike Sprague <spikuru@google.com> |
am 7bc89466: Merge "talkbacK: SCROLL_BACKWARD on first filmstrip item takes you back to cam preview bug: 14837911" into ub-camera-everglades * commit '7bc894663b7f529b77ec135367e298fbd3b79805': talkbacK: SCROLL_BACKWARD on first filmstrip item takes you back to cam preview bug: 14837911
|
7bc894663b7f529b77ec135367e298fbd3b79805 |
15-May-2014 |
Spike Sprague <spikuru@google.com> |
Merge "talkbacK: SCROLL_BACKWARD on first filmstrip item takes you back to cam preview bug: 14837911" into ub-camera-everglades
|
4c01c907191da6207093e0bcdf41bc40228b62ea |
15-May-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Idf0de06257129c9fd8f7357b70e1bc0ec5a39f3b Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-km-rKH/strings.xml
es/values-ko/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mn-rMN/strings.xml
es/values-ms-rMY/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
b39e291c06f44dd271833a336a06c1902b36e17c |
15-May-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I04d50e69dc8e4c193fbd386c29d675284e12bd8f Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-km-rKH/strings.xml
es/values-ko/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mn-rMN/strings.xml
es/values-ms-rMY/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
5c92c9ec5e21a57646d6eca4360c0f6bb141a237 |
14-May-2014 |
Spike Sprague <spikuru@google.com> |
talkbacK: SCROLL_BACKWARD on first filmstrip item takes you back to cam preview bug: 14837911 Change-Id: If96a32fbb74da769483f10666e84f89ba14c1735
rc/com/android/camera/widget/FilmstripView.java
|
0e6e2dfc13292b489ac2268f6cffef43d840cbce |
14-May-2014 |
Doris Liu <tianliu@google.com> |
am 7dcefe14: Merge "Refine initial dialog layout for tablet" into ub-camera-everglades * commit '7dcefe14e3399401550293586cfbdf43907bfe25': Refine initial dialog layout for tablet
|
7dcefe14e3399401550293586cfbdf43907bfe25 |
14-May-2014 |
Doris Liu <tianliu@google.com> |
Merge "Refine initial dialog layout for tablet" into ub-camera-everglades
|
4fc158466e501f187838576e043ed17e89022801 |
14-May-2014 |
Doris Liu <tianliu@google.com> |
Refine initial dialog layout for tablet Change-Id: I146f55381c2918a40b7f6550f047a05b0fd05847
es/layout-land/aspect_ratio_dialog_content.xml
es/layout-land/location_dialog_content.xml
es/layout-port/aspect_ratio_dialog_content.xml
es/layout-port/location_dialog_content.xml
es/layout/aspect_ratio_dialog_layout.xml
es/layout/location_dialog_layout.xml
es/values-sw600dp-land/styles.xml
es/values-sw600dp-port/styles.xml
es/values/styles.xml
|
553d11168286f60a9af901a24d657a4f8a0a8417 |
14-May-2014 |
Spike Sprague <spikuru@google.com> |
am f75c1fdf: Merge "fixed a list range check" into ub-camera-everglades * commit 'f75c1fdfe3a6b5d63c31ed50c5fea6a6ff9f046f': fixed a list range check
|
f75c1fdfe3a6b5d63c31ed50c5fea6a6ff9f046f |
14-May-2014 |
Spike Sprague <spikuru@google.com> |
Merge "fixed a list range check" into ub-camera-everglades
|
d8b8b2a4181fce00b2025c7f085a52f258957c59 |
14-May-2014 |
Doris Liu <tianliu@google.com> |
am 40caf256: Merge "Reduce jank after aspect ratio change." into ub-camera-everglades * commit '40caf2569cf1d27fd4a4aa9e3cf41f44a9a24075': Reduce jank after aspect ratio change.
|
40caf2569cf1d27fd4a4aa9e3cf41f44a9a24075 |
14-May-2014 |
Doris Liu <tianliu@google.com> |
Merge "Reduce jank after aspect ratio change." into ub-camera-everglades
|
08b0cddea8e7390bd21053d3049ea165c759d4db |
14-May-2014 |
Doris Liu <tianliu@google.com> |
Reduce jank after aspect ratio change. Also addressed the comment for persisting size in ag/464575 Change-Id: Ief38bf53fdb12016fb6106d712b93dc4aaf048ee
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/PhotoUI.java
|
ed78e45823ca82fea2c0e755c63558a31e97096c |
14-May-2014 |
Spike Sprague <spikuru@google.com> |
fixed a list range check bug: 14929888 Change-Id: I1d494cd13d754bbe3c8a4a15b98dbae0be941dc1
rc/com/android/camera/data/CameraDataAdapter.java
|
bada532f9902f9d7054c752b1bb4d8e6b5775ce6 |
14-May-2014 |
Spike Sprague <spikuru@google.com> |
am 9d2c5f91: Merge "added null check to PhotoModule bottom bar spec for exposure comp params" into ub-camera-everglades * commit '9d2c5f91da124ad118ce6fef2baaa5832e4e4655': added null check to PhotoModule bottom bar spec for exposure comp params
|
9d2c5f91da124ad118ce6fef2baaa5832e4e4655 |
14-May-2014 |
Spike Sprague <spikuru@google.com> |
Merge "added null check to PhotoModule bottom bar spec for exposure comp params" into ub-camera-everglades
|
f244c94484cd3b09e6cb9ea39a22fc5dcc68c9d0 |
14-May-2014 |
The Android Automerger <android-build@google.com> |
merge in master-release history after reset to 4d120b8746d5b842ca30338404ca5f7677e31b78
|
33547c54ad19aafa038de93d8dafddd269cc7c28 |
14-May-2014 |
Doris Liu <tianliu@google.com> |
am db8f9758: Start up screen * commit 'db8f97582d09cd36eee8cfe4ed43182bff63f8bd': Start up screen
|
db8f97582d09cd36eee8cfe4ed43182bff63f8bd |
13-May-2014 |
Doris Liu <tianliu@google.com> |
Start up screen This is the 2-step full screen popup: Step 1: (Only for new users) Choose whether geo-tagging should be on Step 2: For new users and upgraders to choose 4:3 or 16:9 preview resolution to take advantage of the screen size. Change-Id: Ibffe5a807cc622a3945b9fd869de1bf7dd660849
es/drawable-hdpi/aspect_ratio_16x9_selected.png
es/drawable-hdpi/aspect_ratio_16x9_unselected.png
es/drawable-hdpi/aspect_ratio_4x3_selected.png
es/drawable-hdpi/aspect_ratio_4x3_unselected.png
es/drawable-hdpi/geo_opt_in_graphic.png
es/drawable-mdpi/aspect_ratio_16x9_selected.png
es/drawable-mdpi/aspect_ratio_16x9_unselected.png
es/drawable-mdpi/aspect_ratio_4x3_selected.png
es/drawable-mdpi/aspect_ratio_4x3_unselected.png
es/drawable-mdpi/geo_opt_in_graphic.png
es/drawable-xhdpi/aspect_ratio_16x9_selected.png
es/drawable-xhdpi/aspect_ratio_16x9_unselected.png
es/drawable-xhdpi/aspect_ratio_4x3_selected.png
es/drawable-xhdpi/aspect_ratio_4x3_unselected.png
es/drawable-xhdpi/geo_opt_in_graphic.png
es/drawable-xxhdpi/aspect_ratio_16x9_selected.png
es/drawable-xxhdpi/aspect_ratio_16x9_unselected.png
es/drawable-xxhdpi/aspect_ratio_4x3_selected.png
es/drawable-xxhdpi/aspect_ratio_4x3_unselected.png
es/drawable-xxhdpi/geo_opt_in_graphic.png
es/drawable/aspect_ratio_16x9.xml
es/drawable/aspect_ratio_4x3.xml
es/layout-land/aspect_ratio_dialog_content.xml
es/layout-land/aspect_ratio_selector.xml
es/layout-land/location_dialog_content.xml
es/layout-port/aspect_ratio_dialog_content.xml
es/layout-port/aspect_ratio_selector.xml
es/layout-port/location_dialog_content.xml
es/layout/aspect_ratio_dialog_layout.xml
es/layout/location_dialog_layout.xml
es/values/colors.xml
es/values/strings.xml
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/PhotoUI.java
rc/com/android/camera/settings/SettingsCache.java
rc/com/android/camera/settings/SettingsManager.java
rc/com/android/camera/widget/AspectRatioDialogLayout.java
rc/com/android/camera/widget/AspectRatioSelector.java
rc/com/android/camera/widget/LocationDialogLayout.java
|
662294d5285967371fbfd2f4ce0a468f69c5a8ad |
14-May-2014 |
Andy Huibers <andyhuibers@google.com> |
am f56453af: Fix Camera2 build. * commit 'f56453afe262f1580eb4ebb501b7efe8fe8c2e3d': Fix Camera2 build.
|
f56453afe262f1580eb4ebb501b7efe8fe8c2e3d |
14-May-2014 |
Andy Huibers <andyhuibers@google.com> |
Fix Camera2 build. Change-Id: I32de2ab6542d4e3c45a6836033fa1cc29611c6a9
rc_pd/com/android/camera/util/UsageStatistics.java
|
1779db9f9535684527c2e9b3b0e47cc672dc13e8 |
13-May-2014 |
Andy Huibers <andyhuibers@google.com> |
am e10f6cff: Merge "Logging for Everglades release." into ub-camera-everglades * commit 'e10f6cff785050b251cfbd851160a89b68d6b781': Logging for Everglades release.
|
e10f6cff785050b251cfbd851160a89b68d6b781 |
13-May-2014 |
Andy Huibers <andyhuibers@google.com> |
Merge "Logging for Everglades release." into ub-camera-everglades
|
28c4514117a9560cfc1bc02163e0d6590f999649 |
13-May-2014 |
Angus Kong <shkong@google.com> |
am cc3b010b: Merge "Handle error getting camera info." into ub-camera-everglades * commit 'cc3b010bafb3a2aa027ef27bd8d53a8398e132df': Handle error getting camera info.
|
cc3b010bafb3a2aa027ef27bd8d53a8398e132df |
13-May-2014 |
Angus Kong <shkong@google.com> |
Merge "Handle error getting camera info." into ub-camera-everglades
|
8f7425cad99f6be58b76be9d8acc1f456ad0e868 |
12-May-2014 |
Spike Sprague <spikuru@google.com> |
added null check to PhotoModule bottom bar spec for exposure comp params bug: 14624240 Change-Id: Iafbf97d1a024583b81497e7c0ffe4c1848c184df
rc/com/android/camera/PhotoModule.java
|
c44c5d93a681d98719dfffdf7223c694e1cab715 |
13-May-2014 |
Angus Kong <shkong@google.com> |
Handle error getting camera info. bug:13877028 Change-Id: Iff0353738de3290244092076b2f955f0d7d57408
rc/com/android/camera/app/CameraController.java
rc/com/android/camera/cameradevice/AndroidCameraManagerImpl.java
rc/com/android/camera/cameradevice/CameraDeviceInfo.java
rc/com/android/camera/cameradevice/CameraManager.java
|
2d295678cd4fbe8d6313f39f0cc426c302988202 |
13-May-2014 |
Sascha Haeberling <haeberling@google.com> |
am 910c1a94: Add custom share and edit intent chooser titles. * commit '910c1a94340163181a35bb60cd347ffbed0fbbf1': Add custom share and edit intent chooser titles.
|
910c1a94340163181a35bb60cd347ffbed0fbbf1 |
13-May-2014 |
Sascha Haeberling <haeberling@google.com> |
Add custom share and edit intent chooser titles. Bug: 14834379 Change-Id: I4534a8129ebc540c86d022d758aabfa0c8fbf23a
es/values/strings.xml
rc/com/android/camera/CameraActivity.java
|
bf1b885d94f83199e1ee2834ec35044e7d5149da |
13-May-2014 |
Sascha Haeberling <haeberling@google.com> |
am 08f6a7f5: Merge "Fix wrongly placed null check to prevent app crashes." into ub-camera-everglades * commit '08f6a7f5c693c3e3de02a8285efd5b7af323b574': Fix wrongly placed null check to prevent app crashes.
|
08f6a7f5c693c3e3de02a8285efd5b7af323b574 |
13-May-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Fix wrongly placed null check to prevent app crashes." into ub-camera-everglades
|
f7cb78b5ebbae7d4be6c884142a82629fadb1eb1 |
13-May-2014 |
Alan Newberger <alann@google.com> |
am 5126895d: am 1e73e7a0: added \'+\' to ImageView id * commit '5126895d96decd8d0a1918dc34799349bbed8b59': added '+' to ImageView id
|
5126895d96decd8d0a1918dc34799349bbed8b59 |
13-May-2014 |
Alan Newberger <alann@google.com> |
am 1e73e7a0: added \'+\' to ImageView id * commit '1e73e7a05ea4a6f199482e5b64ac729665e2c8b7': added '+' to ImageView id
|
3619cc37e473e38ec36ec2828cac12605e2db0c4 |
13-May-2014 |
Spike Sprague <spikuru@google.com> |
am e541dc2d: fix pano buttons order in landscape orientation * commit 'e541dc2d520aae8d45f3c605c3d732e33dd3b616': fix pano buttons order in landscape orientation
|
e541dc2d520aae8d45f3c605c3d732e33dd3b616 |
13-May-2014 |
Spike Sprague <spikuru@google.com> |
fix pano buttons order in landscape orientation bug: 14886267 Change-Id: I111f24cb1f4f8a07bb96de8c36edeebeba80526a
rc/com/android/camera/ButtonManager.java
|
ebd95379407dc99471d8091c7f23189ac0997d82 |
12-May-2014 |
Andy Huibers <andyhuibers@google.com> |
Logging for Everglades release. Bug: 14364757 Change-Id: Ic29b41e7385378e022e388a02af7e4842e7ab9b5
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/app/CameraApp.java
rc_pd/com/android/camera/util/UsageStatistics.java
|
3f192ccf03d0d25521b96304c4464b4bad28150a |
13-May-2014 |
Sascha Haeberling <haeberling@google.com> |
Fix wrongly placed null check to prevent app crashes. Bug: 13923937 Change-Id: I2a144ba5d7057acb6f49d624695293fd39ed366a
rc/com/android/camera/widget/FilmstripView.java
|
f989cd65084b1a5bfe4d5d1dfd0b74c6528b98ed |
13-May-2014 |
Scott Ettinger <settinger@google.com> |
am 0be183b3: Merge "Add wide angle and fish eye capture modes. bug: 14883143" into ub-camera-everglades * commit '0be183b3a0297ea40cb3415d291c142002facafa': Add wide angle and fish eye capture modes. bug: 14883143
|
0be183b3a0297ea40cb3415d291c142002facafa |
13-May-2014 |
Scott Ettinger <settinger@google.com> |
Merge "Add wide angle and fish eye capture modes. bug: 14883143" into ub-camera-everglades
|
9f9cc190b39d142b731be6c5bd55818d51fbb7d0 |
13-May-2014 |
Scott Ettinger <settinger@google.com> |
Add wide angle and fish eye capture modes. bug: 14883143 Change-Id: I57d1257652b3d6d9a2d7a05abea7a45337ec6a03
rc/com/android/camera/ButtonManager.java
|
a2faa7715ee7da251c06ea2263ce0d712a0aff36 |
13-May-2014 |
Baligh Uddin <baligh@google.com> |
am 14e881aa: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-everglades * commit '14e881aa7e7b741342c0afea4c07eba29270b73f': Import translations. DO NOT MERGE
|
4d120b8746d5b842ca30338404ca5f7677e31b78 |
13-May-2014 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE"
|
14e881aa7e7b741342c0afea4c07eba29270b73f |
13-May-2014 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into ub-camera-everglades
|
b770792fce40aec31598f785761824326749f5cd |
13-May-2014 |
The Android Automerger <android-build@google.com> |
merge in master-release history after reset to 1f06cbf8c529a6416e93d2b0801902d9e8e54d81
|
1e73e7a05ea4a6f199482e5b64ac729665e2c8b7 |
12-May-2014 |
Alan Newberger <alann@google.com> |
added '+' to ImageView id in landscape counterpart this id is already marked with '+', looks like a longstanding omission that is now causing build errors on master. Change-Id: Iecd8c69346d396449fe1b90a5d74ccb31cf9ea3e (cherry picked from commit 2b39b3eea496c968b68b108ccafcc2455a942668)
es/layout-port/pano_review_control.xml
|
30b61234608ad081332742d27ffbf9d4ecfbb073 |
13-May-2014 |
Seth Raphael <magicseth@google.com> |
am 0b7f494a: Merge "Localize aspect ratios in settings summaries" into ub-camera-everglades * commit '0b7f494a6fb9bc861bdad529bf07618e63093fa9': Localize aspect ratios in settings summaries
|
12ae68136c9dd0d58dedaa5e436e52160d9093a6 |
13-May-2014 |
Seth Raphael <magicseth@google.com> |
am d63b0fce: Merge "Add new string for describing resolutions." into ub-camera-everglades * commit 'd63b0fce3b8bb993dba76c08a53d923b25f853ff': Add new string for describing resolutions.
|
0b7f494a6fb9bc861bdad529bf07618e63093fa9 |
13-May-2014 |
Seth Raphael <magicseth@google.com> |
Merge "Localize aspect ratios in settings summaries" into ub-camera-everglades
|
d63b0fce3b8bb993dba76c08a53d923b25f853ff |
13-May-2014 |
Seth Raphael <magicseth@google.com> |
Merge "Add new string for describing resolutions." into ub-camera-everglades
|
dbc82a93a63d8c37280418ad0aebf20251eeefb4 |
12-May-2014 |
Seth Raphael <magicseth@google.com> |
am 5fc3c7a0: Merge "Do not mutate the List of Sizes passed to helpers" into ub-camera-everglades * commit '5fc3c7a0f577419bbf0ef32dc43f6cf9c13d2999': Do not mutate the List of Sizes passed to helpers
|
5fc3c7a0f577419bbf0ef32dc43f6cf9c13d2999 |
12-May-2014 |
Seth Raphael <magicseth@google.com> |
Merge "Do not mutate the List of Sizes passed to helpers" into ub-camera-everglades
|
d074fffd7c85df39893125f29fb3d487864feaf1 |
12-May-2014 |
Seth Raphael <magicseth@google.com> |
Localize aspect ratios in settings summaries Bug: 14496248 Change-Id: I392dc627d09a09980d450ad1dfc93d0e4e5a237c
rc/com/android/camera/settings/CameraSettingsActivity.java
rc/com/android/camera/settings/ResolutionUtil.java
|
b60c8e8002b0ef8bf42720a4ef14101a852760e9 |
12-May-2014 |
Seth Raphael <magicseth@google.com> |
Add new string for describing resolutions. Now it includes aspect ratios as well as megapixels Bug: 14496248 Change-Id: I797cda0def8ba06b1a8c2098beaf94c875a90896
es/values/strings.xml
|
2c18f5439850e3d2bbe823139e6a16d9b2b0230f |
12-May-2014 |
Spike Sprague <spikuru@google.com> |
am 92c4a17d: Merge "new pano icons preliminary support for wide-angle and fisheye pano modes" into ub-camera-everglades * commit '92c4a17d580fdbebac0c07d90ec52d6024de86ae': new pano icons preliminary support for wide-angle and fisheye pano modes
|
92c4a17d580fdbebac0c07d90ec52d6024de86ae |
12-May-2014 |
Spike Sprague <spikuru@google.com> |
Merge "new pano icons preliminary support for wide-angle and fisheye pano modes" into ub-camera-everglades
|
e06ad2887d24171f30951e4236a7e848ca913607 |
08-May-2014 |
Spike Sprague <spikuru@google.com> |
new pano icons preliminary support for wide-angle and fisheye pano modes Change-Id: I6cb6c62f7f1f1f3a9943501e2de0ba9d718540dd
es/values/arrays.xml
es/values/strings.xml
rc/com/android/camera/ButtonManager.java
|
59c85801c6fa9f6a083ad0fe1976284a2d5bf610 |
12-May-2014 |
Seth Raphael <magicseth@google.com> |
Do not mutate the List of Sizes passed to helpers This was causing a bug by removing resolutions from a list that was being reused other places. Bug: 14826712 Change-Id: Iaab3bd279b7c517f2a51e582bc4047ef97192122
rc/com/android/camera/settings/SettingsUtil.java
|
be96bfb2e6f72e0bbd665677e60b036f14894497 |
12-May-2014 |
Sascha Haeberling <haeberling@google.com> |
am 80670484: Merge "Don\'t use stale parameters for capabilities." into ub-camera-everglades * commit '80670484772338535c41346a405fb49989095692': Don't use stale parameters for capabilities.
|
80670484772338535c41346a405fb49989095692 |
12-May-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Don't use stale parameters for capabilities." into ub-camera-everglades
|
5c74ea5eb4e887cb7526d9966152bcabddb81eb2 |
12-May-2014 |
Seth Raphael <magicseth@google.com> |
am cbe717f3: Merge "Do not display large 16x9 option on N5 front cam" into ub-camera-everglades * commit 'cbe717f3d0dd3fcb4627827a1833f1aa8129b8f3': Do not display large 16x9 option on N5 front cam
|
080bf50e9da85808b4142f497373e7d30eb07db7 |
12-May-2014 |
Sascha Haeberling <haeberling@google.com> |
Don't use stale parameters for capabilities. Bug: 14823111 Change-Id: I524de9a6dd774c3aa8b6c47092657d66447565bc
rc/com/android/camera/cameradevice/AndroidCameraManagerImpl.java
|
cbe717f3d0dd3fcb4627827a1833f1aa8129b8f3 |
12-May-2014 |
Seth Raphael <magicseth@google.com> |
Merge "Do not display large 16x9 option on N5 front cam" into ub-camera-everglades
|
686d16d9f0e04ca6bb316efdcc998a538a3a3996 |
12-May-2014 |
Alan Newberger <alann@google.com> |
am 2b39b3ee: added \'+\' to ImageView id * commit '2b39b3eea496c968b68b108ccafcc2455a942668': added '+' to ImageView id
|
1f06cbf8c529a6416e93d2b0801902d9e8e54d81 |
12-May-2014 |
Alan Newberger <alann@google.com> |
added '+' to ImageView id in landscape counterpart this id is already marked with '+', looks like a longstanding omission that is now causing build errors on master. cherrypicking into master snapshot. Change-Id: Iecd8c69346d396449fe1b90a5d74ccb31cf9ea3e
es/layout-port/pano_review_control.xml
|
adb6d24de8bf66d2c8bc33e91ec4b61cc371d9e5 |
12-May-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I18735bd12c181000e7d093a007c3182b0ce07244 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-km-rKH/strings.xml
es/values-ko/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mn-rMN/strings.xml
es/values-ms-rMY/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
68e0e413a8312da5e9521ea431098dfaf88134d0 |
12-May-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I98eccb9715b98a5ebed2e6e7aec840af30482b81 Auto-generated-cl: translation import
es/values-km-rKH/strings.xml
|
2b39b3eea496c968b68b108ccafcc2455a942668 |
12-May-2014 |
Alan Newberger <alann@google.com> |
added '+' to ImageView id in landscape counterpart this id is already marked with '+', looks like a longstanding omission that is now causing build errors on master. Change-Id: Iecd8c69346d396449fe1b90a5d74ccb31cf9ea3e
es/layout-port/pano_review_control.xml
|
a4b0118d15d4a3c6b77827feb63c3809c61c0fcf |
12-May-2014 |
Seth Raphael <magicseth@google.com> |
Do not display large 16x9 option on N5 front cam It was erroneously added to the list of supported resolutions for the Nexus 5 front facing camera Bug: 14819623 Change-Id: I4481c68a473cb790fa67a9648e80302f19bf3065
rc/com/android/camera/settings/CameraSettingsActivity.java
rc/com/android/camera/settings/ResolutionUtil.java
|
e50c7f2197e5a4647c6df0de30cc04d8ebb15f06 |
12-May-2014 |
The Android Automerger <android-build@google.com> |
merge in master-release history after reset to 745aabad1d2fa690c31a6f43f0ba16f9ab371170
|
6509f73317bd37a834c6ae76eb81e504c14f0eb2 |
11-May-2014 |
The Android Automerger <android-build@google.com> |
merge in master-release history after reset to 745aabad1d2fa690c31a6f43f0ba16f9ab371170
|
2af0dcc31c60fd13177c5fedfc624310b31bfce1 |
10-May-2014 |
The Android Automerger <android-build@google.com> |
merge in master-release history after reset to 745aabad1d2fa690c31a6f43f0ba16f9ab371170
|
60455901ab684900914dcf30b648377e70ca22b7 |
10-May-2014 |
Spike Sprague <spikuru@google.com> |
am 66f5c1aa: Merge "add content descriptions for exposure comp buttons." into ub-camera-everglades * commit '66f5c1aaf06950be74f59a0f52c2cb53a69b4208': add content descriptions for exposure comp buttons.
|
494d81277153968870456db6b9b710f4b3efe015 |
10-May-2014 |
Doris Liu <tianliu@google.com> |
am 7bbe169b: Merge "Add new strings for timely translation" into ub-camera-everglades * commit '7bbe169bc1013c27f804783913394c3c30a25e3c': Add new strings for timely translation
|
1ecbabd42633542bdd6fcd2b209799e324260df4 |
10-May-2014 |
Alan Newberger <alann@google.com> |
am 21478465: Merge "String modifications for Everglades" into ub-camera-everglades * commit '214784657958ca2235d424f337055a69f27221ef': String modifications for Everglades
|
66f5c1aaf06950be74f59a0f52c2cb53a69b4208 |
10-May-2014 |
Spike Sprague <spikuru@google.com> |
Merge "add content descriptions for exposure comp buttons." into ub-camera-everglades
|
7bbe169bc1013c27f804783913394c3c30a25e3c |
10-May-2014 |
Doris Liu <tianliu@google.com> |
Merge "Add new strings for timely translation" into ub-camera-everglades
|
77fca86d9f88a33475e5addf29c97a6c8e0f1347 |
10-May-2014 |
Spike Sprague <spikuru@google.com> |
am 71fa0ba6: Merge "filmstrip accessibility" into ub-camera-everglades * commit '71fa0ba6a52abd71bd8c56526cbd3f9a07cf3537': filmstrip accessibility
|
214784657958ca2235d424f337055a69f27221ef |
10-May-2014 |
Alan Newberger <alann@google.com> |
Merge "String modifications for Everglades" into ub-camera-everglades
|
71fa0ba6a52abd71bd8c56526cbd3f9a07cf3537 |
10-May-2014 |
Spike Sprague <spikuru@google.com> |
Merge "filmstrip accessibility" into ub-camera-everglades
|
676de30393b09b13ec97e2dfc0043dfb52b94c65 |
10-May-2014 |
Spike Sprague <spikuru@google.com> |
am abe3cdf1: Merge "CL for string translation" into ub-camera-everglades * commit 'abe3cdf17c70bd5fb1f27444ea28865ebab15f47': CL for string translation
|
12067f7973dfd715dbb37c13fbaaf94ef6b847a9 |
10-May-2014 |
Doris Liu <tianliu@google.com> |
Add new strings for timely translation Change-Id: I41e9f3332f412c077656fc235a26be96bd442101
es/values/strings.xml
|
2dc82fd3d7005caa5d3e71a3d5357e56f20776c5 |
10-May-2014 |
Alan Newberger <alann@google.com> |
String modifications for Everglades Modifications as specfied in the following bugs. Also modded licences and feedback to use sentence casing. Bug: 14254875 Bug: 14254738 Change-Id: I7d8446ac5dc0ef593938a38bedd841219b8716a8
es/values/strings.xml
|
abe3cdf17c70bd5fb1f27444ea28865ebab15f47 |
10-May-2014 |
Spike Sprague <spikuru@google.com> |
Merge "CL for string translation" into ub-camera-everglades
|
893ca79bdea899fe3f3ed700c22235cc5b460527 |
06-May-2014 |
Spike Sprague <spikuru@google.com> |
filmstrip accessibility add support for ACTION_SCROLL_BACKWARD/FORWARD events note: to test this do this 1) turn on talkback 2) launch camera, get into filmstrip 3a) trigger FORWARD event with a left->right->left swipe 3b) trigger BACKWARD event with a right->left->right swipe bug: 14108635 Change-Id: Iabe2d13c6ed96163a5b9139b6674b3457dd1abc1
rc/com/android/camera/widget/FilmstripView.java
|
8267271af55ef4662aeda24ff33fe805fbb6761f |
10-May-2014 |
Spike Sprague <spikuru@google.com> |
CL for string translation Change-Id: Icb44757c1e4c0d7c67dea26868b8c201dddd381b
es/values/strings.xml
|
a3f350ff54bb03da1b5d517d7086aa870e14b5ea |
10-May-2014 |
Spike Sprague <spikuru@google.com> |
add content descriptions for exposure comp buttons. Change-Id: Ie37e49f913574f76de1b6c39c5207411fe1ab255
es/layout-land/mode_options.xml
es/layout-port/mode_options.xml
es/values/strings.xml
|
86c5890ac2f170a52223233e033964c66f3ea5f9 |
08-May-2014 |
Doris Liu <tianliu@google.com> |
am 6b8d928e: am 1b0fb15d: Do not scale down preview when preview asp is close to screen asp. * commit '6b8d928e3b52c319a7b321638edb72cd58d31ff9': Do not scale down preview when preview asp is close to screen asp.
|
6b8d928e3b52c319a7b321638edb72cd58d31ff9 |
08-May-2014 |
Doris Liu <tianliu@google.com> |
am 1b0fb15d: Do not scale down preview when preview asp is close to screen asp. * commit '1b0fb15dcb5388ec07a382536d188461bc2d74da': Do not scale down preview when preview asp is close to screen asp.
|
1b0fb15dcb5388ec07a382536d188461bc2d74da |
08-May-2014 |
Doris Liu <tianliu@google.com> |
Do not scale down preview when preview asp is close to screen asp. The logic for transforming preview when preview aspect ratio is greater than 14/9 is brought back to achieve the same behavior for preview positioning as we did in Denali release. Bug: 14626812 Change-Id: Ife38efc342cd218aca7d9473ede4db92daebcf54
rc/com/android/camera/CaptureLayoutHelper.java
|
00f3f958ea23876d7542f56965ad7d8051638a2e |
08-May-2014 |
Baligh Uddin <baligh@google.com> |
am 7658b354: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-everglades * commit '7658b354a4172e137f13460e5910bf3101fb60ec': Import translations. DO NOT MERGE
|
7658b354a4172e137f13460e5910bf3101fb60ec |
08-May-2014 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into ub-camera-everglades
|
9ed663782fc310d4cc32749f789fa238dcbf55b8 |
08-May-2014 |
The Android Automerger <android-build@google.com> |
merge in master-release history after reset to 745aabad1d2fa690c31a6f43f0ba16f9ab371170
|
134003f65b11f9cad775f389b4091090decbd882 |
08-May-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ie563933c90e4701279e4b250ba1835de1f7d7e77 Auto-generated-cl: translation import
es/values-hy-rAM/strings.xml
es/values-nb/strings.xml
es/values-pt-rPT/strings.xml
es/values-zh-rCN/strings.xml
|
b0d5fd52fbd1035f173e307d2675861bb3910d50 |
07-May-2014 |
Angus Kong <shkong@google.com> |
am 1dad685a: Merge "First Step: CameraCapabilities intead of Parameter" into ub-camera-everglades * commit '1dad685ad3a16136b0b2108e566535c460f2a965': First Step: CameraCapabilities intead of Parameter
|
1dad685ad3a16136b0b2108e566535c460f2a965 |
07-May-2014 |
Angus Kong <shkong@google.com> |
Merge "First Step: CameraCapabilities intead of Parameter" into ub-camera-everglades
|
cc19cc238aee524ba16351a3b2d7c45dfcf118e6 |
07-May-2014 |
Angus Kong <shkong@google.com> |
am f8fc8d74: Merge "Add cropping for nexus 5 to support 16:9 sizes." into ub-camera-everglades * commit 'f8fc8d7451b54790740b63c759a869dd8fd22c0c': Add cropping for nexus 5 to support 16:9 sizes.
|
f8fc8d7451b54790740b63c759a869dd8fd22c0c |
07-May-2014 |
Angus Kong <shkong@google.com> |
Merge "Add cropping for nexus 5 to support 16:9 sizes." into ub-camera-everglades
|
88289047ba6928e317d17f2e1d4b013693545c67 |
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
rc/com/android/camera/FocusOverlayManager.java
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/VideoModule.java
rc/com/android/camera/cameradevice/AndroidCameraCapabilities.java
rc/com/android/camera/cameradevice/AndroidCameraManagerImpl.java
rc/com/android/camera/cameradevice/CameraCapabilities.java
rc/com/android/camera/cameradevice/CameraCapabilitiesFactory.java
rc/com/android/camera/cameradevice/CameraManager.java
rc/com/android/camera/debug/DebugCameraProxy.java
rc/com/android/camera/settings/SettingsUtil.java
rc/com/android/camera/util/CameraUtil.java
|
454d63f617489281971fb151abfe14730209c047 |
06-May-2014 |
Angus Kong <shkong@google.com> |
Add cropping for nexus 5 to support 16:9 sizes. Based on Seth's proposal of faking a new resolution setting. Improvements made: 1. Move the cropping to a background thread. 2. Refactored to start the preview early to avoid jankness from waiting for the cropping. 3. Fix the wrong width and hight in EXIF. The original logic is to use width and height from the camera parameters. Now this is not true anymore. 4. Add check for Nexus 5 for the support to take effect. Change-Id: I37515fc394b31539644a33b6d32840baf205e15c
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/settings/ResolutionUtil.java
rc/com/android/camera/settings/SettingsUtil.java
rc/com/android/camera/util/ApiHelper.java
|
e115387ee58025dbe239e43b42a5bf55d5044283 |
07-May-2014 |
The Android Automerger <android-build@google.com> |
merge in master-release history after reset to 745aabad1d2fa690c31a6f43f0ba16f9ab371170
|
745ae4606944b096d8b7db67c0bec04475b59522 |
07-May-2014 |
The Android Automerger <android-build@google.com> |
merge in master-release history after reset to 745aabad1d2fa690c31a6f43f0ba16f9ab371170
|
acf08d8511549377f1e02d27a56444bc3ac072a0 |
07-May-2014 |
Doris Liu <tianliu@google.com> |
am 1a2fb901: Merge "Use last still camera for INTENT_ACTION_STILL_IMAGE_CAMERA" into ub-camera-everglades * commit '1a2fb9018bb839185a0fae352d72d5ea18aa3c3f': Use last still camera for INTENT_ACTION_STILL_IMAGE_CAMERA
|
1a2fb9018bb839185a0fae352d72d5ea18aa3c3f |
07-May-2014 |
Doris Liu <tianliu@google.com> |
Merge "Use last still camera for INTENT_ACTION_STILL_IMAGE_CAMERA" into ub-camera-everglades
|
982ea105afc128bdb021b92170c8ab6f3edf251b |
07-May-2014 |
Alan Newberger <alann@google.com> |
am 08d63f0f: Merge "Move share evaluation into ReleaseDialogHelper" into ub-camera-everglades * commit '08d63f0f77aa9b70fa5ba39da2e776fe091dc0bf': Move share evaluation into ReleaseDialogHelper
|
08d63f0f77aa9b70fa5ba39da2e776fe091dc0bf |
07-May-2014 |
Alan Newberger <alann@google.com> |
Merge "Move share evaluation into ReleaseDialogHelper" into ub-camera-everglades
|
443a1a60eb42e26832f9b543cc32ba0aae7f4cda |
07-May-2014 |
Alan Newberger <alann@google.com> |
Move share evaluation into ReleaseDialogHelper Now delegating to ReleaseDialogHelper the evaluation whether it should be shown on share. Bug: 14592653 Change-Id: I9ffc82511237d3a4ff6349feffb068520e4baa9f
rc/com/android/camera/CameraActivity.java
rc_pd/com/android/camera/util/ReleaseDialogHelper.java
|
19ec2fcdf0940cdd205a02d00bae009d7ea76d4d |
07-May-2014 |
Spike Sprague <spikuru@google.com> |
am 46acdc54: moved set exposure limits code into an enabled check * commit '46acdc5401956ee4951d25d047ae892b78c13d86': moved set exposure limits code into an enabled check
|
46acdc5401956ee4951d25d047ae892b78c13d86 |
06-May-2014 |
Spike Sprague <spikuru@google.com> |
moved set exposure limits code into an enabled check bug: 14462164 Change-Id: Ia75449e92ffb46c8f19326828c81c40c053e7ad0
rc/com/android/camera/app/CameraAppUI.java
rc/com/android/camera/settings/SettingsManager.java
|
e903d53c56302d10fffb8065164816db742c44e3 |
06-May-2014 |
Doris Liu <tianliu@google.com> |
Use last still camera for INTENT_ACTION_STILL_IMAGE_CAMERA Bug: 14496045 Change-Id: I96eafa829fafe935880d16239420412d04fe2b3b
rc/com/android/camera/CameraActivity.java
|
6e7da5b3cae0e0568f14f7648220f9bb49738a52 |
06-May-2014 |
Baligh Uddin <baligh@google.com> |
am 49cee87a: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-everglades * commit '49cee87a04dd5f78bf7016043f5ba4ba787e53f3': Import translations. DO NOT MERGE
|
49cee87a04dd5f78bf7016043f5ba4ba787e53f3 |
06-May-2014 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into ub-camera-everglades
|
0023c3715f723234f78743da9e8bd4772cf022bd |
06-May-2014 |
The Android Automerger <android-build@google.com> |
merge in master-release history after reset to 745aabad1d2fa690c31a6f43f0ba16f9ab371170
|
5894041dc58dd013054966db2e104e2b6d0c5dd7 |
06-May-2014 |
Spike Sprague <spikuru@google.com> |
am 0c8b9b92: Merge "change exposure comp and pano orientation to use the new RadioOptions" into ub-camera-everglades * commit '0c8b9b92d6dc075430199b00e8c8b15b7232deca': change exposure comp and pano orientation to use the new RadioOptions
|
0c8b9b92d6dc075430199b00e8c8b15b7232deca |
06-May-2014 |
Spike Sprague <spikuru@google.com> |
Merge "change exposure comp and pano orientation to use the new RadioOptions" into ub-camera-everglades
|
59345144c4bde59b81bb19c95cdd977c1d1a9cd4 |
23-Apr-2014 |
Spike Sprague <spikuru@google.com> |
change exposure comp and pano orientation to use the new RadioOptions bug: 13780101 Change-Id: Ie7b12199a96272827cc381560a5b801f87a5b81a
es/drawable/button_background_selected_pano.xml
es/layout-land/mode_options.xml
es/layout-land/mode_options_overlay.xml
es/layout-port/mode_options.xml
es/layout-port/mode_options_overlay.xml
es/layout/mode_options_imagebutton_template.xml
es/layout/mode_options_overlay.xml
es/values/attrs.xml
rc/com/android/camera/ButtonManager.java
rc/com/android/camera/app/CameraAppUI.java
rc/com/android/camera/ui/RadioOptions.java
rc/com/android/camera/widget/IndicatorIconController.java
rc/com/android/camera/widget/ModeOptions.java
|
74accf54ddbc4e415c1218ba757cc5d42f006c56 |
06-May-2014 |
Angus Kong <shkong@google.com> |
am 8888e16a: Merge "Cancel onResumeTask when the app is paused." into ub-camera-everglades * commit '8888e16a42e0b5a260917e0bb77ba69b9eb81a72': Cancel onResumeTask when the app is paused.
|
8888e16a42e0b5a260917e0bb77ba69b9eb81a72 |
06-May-2014 |
Angus Kong <shkong@google.com> |
Merge "Cancel onResumeTask when the app is paused." into ub-camera-everglades
|
0b9eb5bb8d2ef409e8c88196c0c82c8ece65728b |
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
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/app/CameraController.java
rc/com/android/camera/cameradevice/AndroidCameraManagerImpl.java
rc/com/android/camera/cameradevice/CameraManager.java
rc/com/android/camera/debug/DebugCameraProxy.java
|
7a2f10f6324b05a6f2045d6a36af877fedc96bb7 |
06-May-2014 |
Doris Liu <tianliu@google.com> |
am eec46c2a: Merge "Support for rotation lock in video recording hints" into ub-camera-everglades * commit 'eec46c2ab3536159d9446b5731a26eb47155e3c7': Support for rotation lock in video recording hints
|
eec46c2ab3536159d9446b5731a26eb47155e3c7 |
06-May-2014 |
Doris Liu <tianliu@google.com> |
Merge "Support for rotation lock in video recording hints" into ub-camera-everglades
|
8dc878f5537fbd27dbf82bc322aced410e5148f4 |
05-May-2014 |
Doris Liu <tianliu@google.com> |
Support for rotation lock in video recording hints Bug: 13545160 Change-Id: I73c20e5a6701cc9b89ce6871b6541320fe7317e1
rc/com/android/camera/VideoModule.java
rc/com/android/camera/VideoUI.java
rc/com/android/camera/ui/CameraControls.java
rc/com/android/camera/ui/RotatableLayout.java
rc/com/android/camera/util/CameraUtil.java
rc/com/android/camera/widget/VideoRecordingHints.java
|
3735afb48a336d87064399279530680cb88a4f79 |
05-May-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I58c87aaf832ffaf43d728b30cab2e68e0235eced Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-km-rKH/strings.xml
es/values-ko/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mn-rMN/strings.xml
es/values-ms-rMY/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
5c3032467a9c41da291345382305d0ba8c43a34a |
05-May-2014 |
Spike Sprague <spikuru@google.com> |
am d634bf63: Make ModeOptionsOverlay sizing a little more robust * commit 'd634bf630b64a938d785366fd6af26136ab04ae7': Make ModeOptionsOverlay sizing a little more robust
|
d634bf630b64a938d785366fd6af26136ab04ae7 |
05-May-2014 |
Spike Sprague <spikuru@google.com> |
Make ModeOptionsOverlay sizing a little more robust bug: 13352479 bug: 14414850 Change-Id: I27c6515d79db8df630f5a5ddfac6345005926931
rc/com/android/camera/widget/ModeOptionsOverlay.java
|
cf7c507fb04c9bf8f942899359cd1e0159a46b60 |
05-May-2014 |
The Android Automerger <android-build@google.com> |
merge in master-release history after reset to 745aabad1d2fa690c31a6f43f0ba16f9ab371170
|
24328d621afb912a88c01a91b0d96b928e4587a6 |
04-May-2014 |
The Android Automerger <android-build@google.com> |
merge in master-release history after reset to 745aabad1d2fa690c31a6f43f0ba16f9ab371170
|
f7b1f0232a20dc0ad4afa0c8c44a1c3db0e4d121 |
03-May-2014 |
The Android Automerger <android-build@google.com> |
merge in master-release history after reset to 745aabad1d2fa690c31a6f43f0ba16f9ab371170
|
f56181290304c981c98e4e6e1e6d0b70aace74e6 |
03-May-2014 |
Seth Raphael <magicseth@google.com> |
am b19eaa0b: Allow multiple aspect ratios to be set for the resolution setting. * commit 'b19eaa0bb37a1252015eafd3e965a011e6e98727': Allow multiple aspect ratios to be set for the resolution setting.
|
b19eaa0bb37a1252015eafd3e965a011e6e98727 |
02-May-2014 |
Seth Raphael <magicseth@google.com> |
Allow multiple aspect ratios to be set for the resolution setting. Bug: 13328191 Change-Id: Ie067d18b70bc1ae84dc284f881b7f6030f6a6622
rc/com/android/camera/settings/CameraSettingsActivity.java
rc/com/android/camera/settings/ResolutionUtil.java
rc/com/android/camera/settings/SettingsManager.java
rc/com/android/camera/settings/SettingsUtil.java
|
23a668047c177310b10ea4a91f5cb412d03d9472 |
02-May-2014 |
Doris Liu <tianliu@google.com> |
am 74d4ecff: am d80cd803: Merge "Fix rounding error" into gb-ub-photos-denali * commit '74d4ecffbb932dbdfb54f1cb521108ee51ef28a0': Fix rounding error
|
74d4ecffbb932dbdfb54f1cb521108ee51ef28a0 |
02-May-2014 |
Doris Liu <tianliu@google.com> |
am d80cd803: Merge "Fix rounding error" into gb-ub-photos-denali * commit 'd80cd80371540af0bc44245bdee330a8f32647f3': Fix rounding error
|
d80cd80371540af0bc44245bdee330a8f32647f3 |
02-May-2014 |
Doris Liu <tianliu@google.com> |
Merge "Fix rounding error" into gb-ub-photos-denali
|
a558a24553ca5e36ff6230bcdbae474f6b9b1ee3 |
02-May-2014 |
Doris Liu <tianliu@google.com> |
Fix rounding error Bug: 14446168 Change-Id: Ic3fc882eab96f4d6e94fdb25928c362e5b33153f
rc/com/android/camera/CaptureLayoutHelper.java
|
64310b2d213af6631e247c523f4af97e66f1c4fc |
01-May-2014 |
Baligh Uddin <baligh@google.com> |
am 61069613: (-s ours) am 3385c6e6: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-denali * commit '61069613a1fc2d9fb2a2df6ad5ad6739169f4030': Import translations. DO NOT MERGE
|
f610cd0da725b2358d0750b9ce89144bd219157d |
01-May-2014 |
Baligh Uddin <baligh@google.com> |
am b51d4e9d: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-everglades * commit 'b51d4e9d4d655db06780e00ae752ebc2baa679a5': Import translations. DO NOT MERGE
|
61069613a1fc2d9fb2a2df6ad5ad6739169f4030 |
01-May-2014 |
Baligh Uddin <baligh@google.com> |
am 3385c6e6: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-denali * commit '3385c6e6b4e6849d256ee2fe173d9b22169416d7': Import translations. DO NOT MERGE
|
b51d4e9d4d655db06780e00ae752ebc2baa679a5 |
01-May-2014 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into ub-camera-everglades
|
745aabad1d2fa690c31a6f43f0ba16f9ab371170 |
01-May-2014 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE"
|
3385c6e6b4e6849d256ee2fe173d9b22169416d7 |
01-May-2014 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-denali
|
9142696f50b184740372bf109919e3573bb92351 |
01-May-2014 |
The Android Automerger <android-build@google.com> |
merge in master-release history after reset to ef0a732964a6a5600ef6be3028a198f8b85a2236
|
8f56dd8ac8c955d9c5f5903f2501d83250395a77 |
01-May-2014 |
Angus Kong <shkong@google.com> |
am f3da6cf0: am 92537afd: Merge "Preload metadata for new videos." into gb-ub-photos-denali * commit 'f3da6cf0b26be00afe43323b7fac74a317d0f5f5': Preload metadata for new videos.
|
f3da6cf0b26be00afe43323b7fac74a317d0f5f5 |
01-May-2014 |
Angus Kong <shkong@google.com> |
am 92537afd: Merge "Preload metadata for new videos." into gb-ub-photos-denali * commit '92537afd29b1dd756e73c0bb58249521a6f65624': Preload metadata for new videos.
|
92537afd29b1dd756e73c0bb58249521a6f65624 |
01-May-2014 |
Angus Kong <shkong@google.com> |
Merge "Preload metadata for new videos." into gb-ub-photos-denali
|
57aec057acdf2cfe21c46c119d4b95567d5818fa |
01-May-2014 |
Alan Newberger <alann@google.com> |
am e5a7c3cb: am 39f1c22b: Merge "Fix storage warning hint crash" into gb-ub-photos-denali * commit 'e5a7c3cbb3aa2f0d28dba21579b530bdfe1331fe': Fix storage warning hint crash
|
e5a7c3cbb3aa2f0d28dba21579b530bdfe1331fe |
01-May-2014 |
Alan Newberger <alann@google.com> |
am 39f1c22b: Merge "Fix storage warning hint crash" into gb-ub-photos-denali * commit '39f1c22bbe02a5d8edaa1e0ba60e49ed27215e4b': Fix storage warning hint crash
|
39f1c22bbe02a5d8edaa1e0ba60e49ed27215e4b |
01-May-2014 |
Alan Newberger <alann@google.com> |
Merge "Fix storage warning hint crash" into gb-ub-photos-denali
|
e95aefe4461e8e3192e227d98076b75975ed3ec5 |
01-May-2014 |
Alan Newberger <alann@google.com> |
Fix storage warning hint crash We rarely hit this warning, but indications are that it crashes 100%. This is an old class, not even sure why we're using it vs a Toast, but for now fixing the existing implementation. OnScreenHint accepted a context but attempted to add views which requires an Activity. Likely started failing when we used to in practice pass Activity contexts but converted to Application contexts. I have converted OnScreenHint to require an Activity. We have one device afflicted by this 100% which I used to test, and it now works with this CL and shows a storage warning. Bug: 14134552 Change-Id: I1d8a7a7dce799c81c821b9974e8d8d62c6daab39
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/OnScreenHint.java
|
eadcdeee529e734638ea6aa5a51958f89ff0becc |
30-Apr-2014 |
Doris Liu <tianliu@google.com> |
am 8dfa3c7d: am efcc8f0c: Merge "Log warning when video snapshot is requested on devices not supporting it" into gb-ub-photos-denali * commit '8dfa3c7d5d676590e4f4f200805fe711b88fef8c': Log warning when video snapshot is requested on devices not supporting it
|
8dfa3c7d5d676590e4f4f200805fe711b88fef8c |
30-Apr-2014 |
Doris Liu <tianliu@google.com> |
am efcc8f0c: Merge "Log warning when video snapshot is requested on devices not supporting it" into gb-ub-photos-denali * commit 'efcc8f0c67340ce2ad7d1477cbb7d33e6b7ea73f': Log warning when video snapshot is requested on devices not supporting it
|
efcc8f0c67340ce2ad7d1477cbb7d33e6b7ea73f |
30-Apr-2014 |
Doris Liu <tianliu@google.com> |
Merge "Log warning when video snapshot is requested on devices not supporting it" into gb-ub-photos-denali
|
3500ce97767d5296296ecaee3fd6c31016f1bf88 |
30-Apr-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ib2564547a34a62f1afbb783d06211750c7678ea0 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-km-rKH/strings.xml
es/values-ko/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mn-rMN/strings.xml
es/values-ms-rMY/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
4e39cbbcc1073443b3658f9ce03e1dc5d4636292 |
30-Apr-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I242c05a79286e2d01bda27447ec025bddafc1c66 Auto-generated-cl: translation import
es/values-de/strings.xml
es/values-sv/strings.xml
|
0e1bbf5dc351fffddafd4927396093800ab3bd99 |
30-Apr-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I4d3ab5fe50004b5b1a2254ac2870cff8352cf336 Auto-generated-cl: translation import
es/values-sv/strings.xml
|
810b0b6c5e1539ddd94c3a268b3f03301c35998b |
30-Apr-2014 |
Angus Kong <shkong@google.com> |
Preload metadata for new videos. bug:14279339 Change-Id: I4733199fecc45b24abc41a241fdb5af3421f5652
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/data/MetadataLoader.java
|
ef0a732964a6a5600ef6be3028a198f8b85a2236 |
30-Apr-2014 |
Geoff Mendal <mendal@google.com> |
am 94ba9b8c: (-s ours) am dc0fc0c0: (-s ours) am 3360879d: (-s ours) am 2ecb5944: (-s ours) am be55432c: (-s ours) Import translations. DO NOT MERGE * commit '94ba9b8c36fc49f0522d586b3a92b8b96d6cd537': Import translations. DO NOT MERGE
|
cfefc612ae4fbd995db4328444a66d4dbaf54b76 |
30-Apr-2014 |
Geoff Mendal <mendal@google.com> |
am 9ccd5016: (-s ours) am ac917a1d: (-s ours) am 2450dd6d: (-s ours) am ecaad7a2: (-s ours) Import translations. DO NOT MERGE * commit '9ccd5016088578628066bc482178220ab1b9a6c3': Import translations. DO NOT MERGE
|
96d39026c318ed248707a7df17c61db42cc2da96 |
30-Apr-2014 |
Michael Kolb <kolby@google.com> |
am a1a012a0: (-s ours) am 7fe487c4: am 240b5cab: am d75b9aee: Fix samsung video recording * commit 'a1a012a08ea33a0b84bee2d419ae1caba5a2259a': Fix samsung video recording
|
1fe2dadd616f53cf07531059b7a929327591577c |
30-Apr-2014 |
Michael Kolb <kolby@google.com> |
am e4e01f79: (-s ours) am fef79bde: am 795812fd: am 13350e5e: Fix WB indicator override * commit 'e4e01f7966d782d63d5806bd9dd270c414b20dea': Fix WB indicator override
|
2390b676b161050333015c43f4954b4e0513f483 |
30-Apr-2014 |
Michael Kolb <kolby@google.com> |
am c5da5393: (-s ours) am 153a52b3: am 1e5baa47: am 0f7d5488: Revert fixed focus area in CAF mode * commit 'c5da53936350c1f5cc5e8f7f4b0dfe2ff24b0f25': Revert fixed focus area in CAF mode
|
427f7741fc83c6c9fee53fe5cd1a00fce6d46b84 |
30-Apr-2014 |
Alan Newberger <alann@google.com> |
am 0ea86760: (-s ours) am 69818e57: am a3b92891: am 0d5505dd: Merge "Add another HTC picture resolution" into gb-ub-photos-carlsbad * commit '0ea8676082f28f7a975c4316e9bd43ae30b72ed3': Add another HTC picture resolution
|
99f01fe245839c1ef3bdff57b5a9a009e326116d |
30-Apr-2014 |
Michael Kolb <kolby@google.com> |
am 9e71a438: (-s ours) am a43545d1: am 8850f6d8: am 7993f452: Always set focus mode first before applying scene mode * commit '9e71a438c750d69ac1b20b4f1486745ae338e22f': Always set focus mode first before applying scene mode
|
29ad3b3c07e4fa9e3d526265495273bdb26d40b9 |
30-Apr-2014 |
Seth Raphael <magicseth@google.com> |
am 871fedc1: (-s ours) am ff67e2a6: am 3a46bed6: am 88f9b3e7: Reduce logging of flattened Preferences * commit '871fedc18a1e5db6c32ea3c7fa3ed105ae032e89': Reduce logging of flattened Preferences
|
6dc7a01e77aa9fda27b88a5cabb4ab86de7d3718 |
30-Apr-2014 |
The Android Open Source Project <initial-contribution@android.com> |
am 1ef065f3: (-s ours) am c4cffe22: am 31b29bdf: Merge in Android 4.4 * commit '1ef065f3dfb4798c81b3a9d63c41d478404c4c7d':
|
bd6cca262632bf3d7108e2f583642f66ee76eae3 |
30-Apr-2014 |
Baligh Uddin <baligh@google.com> |
am 963fc7c2: (-s ours) am 790c7e9a: am 7f18027e: Merge remote-tracking branch \'origin/kitkat-dev\' * commit '963fc7c20643f01206ebac0c8109fc5b1e14272a': Initial empty repository
|
a3ce81dc0485564b9fceaf433bce7969efde1679 |
30-Apr-2014 |
Geoff Mendal <mendal@google.com> |
am fbfe22e6: (-s ours) am a08365d6: (-s ours) am 3e44cad5: (-s ours) am adf70222: (-s ours) Import translations. DO NOT MERGE * commit 'fbfe22e611be62d062dca552cb7262e0157d76a1': Import translations. DO NOT MERGE
|
8efd49638cb6c84ba4b8842715d4ea7b3423dd2f |
30-Apr-2014 |
Geoff Mendal <mendal@google.com> |
am b88897d7: (-s ours) am 7b1d7e46: (-s ours) am 7191c955: (-s ours) Import translations. DO NOT MERGE * commit 'b88897d758596209047bc525ff10ef06386eacbb': Import translations. DO NOT MERGE
|
95550dcb0adf92c7f9e1b87420e2f63dc2cef403 |
30-Apr-2014 |
The Android Open Source Project <initial-contribution@android.com> |
am de315ef3: (-s ours) am 621a6721: Merge commit \'957de9a560e24d120dfc76c4b2c1d72581a250fd\' into HEAD * commit 'de315ef32fe0f7bf66d99c7ecf5bf63a122989cb':
|
f177a5c14054e17a64da59e1e702f74822874ef1 |
30-Apr-2014 |
Baligh Uddin <baligh@google.com> |
am 1dd617a7: (-s ours) am 8cbdfb97: (-s ours) am 98578f40: (-s ours) am 18eb2e4e: (-s ours) Import translations. DO NOT MERGE * commit '1dd617a7ffde72bef08c99df44cb8dadae3129fd': Import translations. DO NOT MERGE
|
015e467c90b982e84a350edad3e9105c674a6518 |
30-Apr-2014 |
Baligh Uddin <baligh@google.com> |
am 577910d0: (-s ours) am 0c7ea745: (-s ours) am ae13f34c: (-s ours) Import translations. DO NOT MERGE * commit '577910d049c6c66733985c44b0602a0179327471': Import translations. DO NOT MERGE
|
c7b037fca4dd37c8e1048b79cb5ee4d9cb2b73d1 |
30-Apr-2014 |
ztenghui <ztenghui@google.com> |
am bfe61934: (-s ours) am e04982ad: The initial focus value should be true. * commit 'bfe619349ff66c5b5cc0dc1cdc2e02b99b959ec0': The initial focus value should be true.
|
a6838252aab11fe2c89c4fb743b426b5956273b4 |
30-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
am 0fa732e0: (-s ours) am 63565c83: Don\'t crash when preview surface could not be set. * commit '0fa732e0359169b43bd448718377c3578c443ae1': Don't crash when preview surface could not be set.
|
24801b0e536285ca89ce5e386ebab1a3cbeb2e49 |
30-Apr-2014 |
Doris Liu <tianliu@google.com> |
am 36f5e5e1: (-s ours) am aa67d847: Fix SRI orientation on manta * commit '36f5e5e151614d379d7428aadadd1236e3b09e63': Fix SRI orientation on manta
|
1c71caa15a706c9d44668e60d86be4e1c63b1935 |
30-Apr-2014 |
Andy Huibers <andyhuibers@google.com> |
am 88d8d997: (-s ours) am 6ea5eab7: am 6cff6768: am 7dc6e97c: Delay onResume tasks to speed up lockscreen onResume->onPause->onResume launch sequence. * commit '88d8d9973e96bc5a1d58f48d642e2f4451ffd071': Delay onResume tasks to speed up lockscreen onResume->onPause->onResume launch sequence.
|
8fe050c929120a2a2a4e8b810e2ccb62fc56c329 |
30-Apr-2014 |
Baligh Uddin <baligh@google.com> |
am da6d9776: (-s ours) am a46752ca: (-s ours) am 9b75b682: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit 'da6d9776befd7f03cd863654c03327806025f8b6': Import translations. DO NOT MERGE
|
b36c61dc770f2098abe59518d9444731ae4806b5 |
30-Apr-2014 |
Ruben Brunk <rubenbrunk@google.com> |
am d1e68328: (-s ours) am 47e9cc73: am a390c5b4: am 3bf1cda5: gcam: Clean up placeholders, and add deletion robustness. * commit 'd1e683285f4aee83bd0e363957beaa4787df952e': gcam: Clean up placeholders, and add deletion robustness.
|
96029f2feee8098f8e752093ebc1d280e1a98458 |
30-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
am 6474693c: (-s ours) am 8415d85c: am 1a1e24f0: am 9db4ac80: Merge "Fix issue of focus indicator staying on without being hidden" into gb-ub-photos-carlsbad * commit '6474693c585b6d9190d90c0954acb0a0fe21e10a': Fix issue of focus indicator staying on without being hidden
|
49b0ffa7c8c46c21b725f3e753ee978d59e80dbf |
30-Apr-2014 |
Doris Liu <tianliu@google.com> |
am 9d94bba7: (-s ours) am 48fd528a: am e8bab2cd: am fc7b8341: Ensure view size gets updated after phone decors change. * commit '9d94bba7339dd8284297ab1d129a23ff0212fa86': Ensure view size gets updated after phone decors change.
|
b3d007f6fe60a72bfadc07cd6a978d9cd43b31fd |
30-Apr-2014 |
Ed Heyl <edheyl@google.com> |
am 86b76ca8: (-s ours) am 6592443c: am aa08cd8f: merge in release branch changes (no-op). * commit '86b76ca83825bc303449811cdd7d6fa12822569a': Add logging to various actions Ensure mOpenCameraThread has been setup before dereferencing.
|
813414c15c7b87dd6f597a8de967dd3ac76fdf8b |
30-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
am 03995ce9: (-s ours) am feb472b0: am e04f9709: am ff3a994a: Merge "Show the 100% state of the progress at least one frame." into gb-ub-photos-carlsbad * commit '03995ce964203036eee90a918fd515062afc4284': Show the 100% state of the progress at least one frame.
|
4fb1273f50fcc50a690e89776207ddc44623e0cd |
30-Apr-2014 |
Seth Raphael <magicseth@google.com> |
am 4077c5ac: (-s ours) am ef9d3aea: am 79da4498: am 9c861f7a: Merge "Add parameters and deduplicate parameter changes" into gb-ub-photos-carlsbad * commit '4077c5ac42d53c0a7ec1a5c18a3817fa705e284b': Add parameters and deduplicate parameter changes
|
0d3081e33da12810bf7cdd1203a19abe27da53c1 |
30-Apr-2014 |
Erin Dahlgren <edahlgren@google.com> |
am 9483c308: (-s ours) am f3dd012d: am 03cb9721: am cc70702c: Revert parallel opening camera in photo mode. * commit '9483c308e4203ee91aa25ee9a393b2cd8c209180': Revert parallel opening camera in photo mode.
|
7f56c6454dfe943ae30e3e17c60fb1fa2a7c9090 |
30-Apr-2014 |
Andy Huibers <andyhuibers@google.com> |
am 1220c57e: (-s ours) am 9bd8ff21: am 9b9b0db9: am a7c84bac: Merge "Close mode menus if another control is touched" into gb-ub-photos-carlsbad * commit '1220c57e65a7344a24426fe6c9d161548cb52648':
|
c7b41337dd441b9e677045212b23b4e5605b7cc0 |
30-Apr-2014 |
ztenghui <ztenghui@google.com> |
am 66c00be2: (-s ours) am d8606879: am ad98a63f: am aae09fb1: Merge "Differentiate the InProgressData from the normal PhotoData." into gb-ub-photos-carlsbad * commit '66c00be2d759877fa81b850a40df18d3e50145aa':
|
188a9f50ec85a3ab0467d2f909211fe7a2bb5804 |
30-Apr-2014 |
Ruben Brunk <rubenbrunk@google.com> |
am 57a66517: (-s ours) am 03732aed: am fe9fef97: am baffb73c: Start gcam module directly when handling capture intent. * commit '57a665173bcf8ee9b85506c29843ebfca3e1f406':
|
94e7333aa87a3bec4e8b252b54569f057fb83741 |
30-Apr-2014 |
Baligh Uddin <baligh@google.com> |
am b5159f56: (-s ours) am 1e4591d6: (-s ours) am 292e119c: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit 'b5159f56d45d294efd39cc085e475a1c452c531e': Import translations. DO NOT MERGE
|
783e8172a4426e6acf6c2737ec87666a0f18dd56 |
30-Apr-2014 |
ztenghui <ztenghui@google.com> |
am 3a1ab872: (-s ours) am 65d1169f: am d12bbb8a: am 6a42c3ae: Add a null check to fix NPE * commit '3a1ab872bd051bedab63aa75acbcce6bd34597f9':
|
19fceb621de720ff4b935708e1af13c77e8ae596 |
30-Apr-2014 |
Ed Heyl <edheyl@google.com> |
am 33c2b60b: (-s ours) am 1c9a6a14: am 2b5aa3e3: merge in release branch changes (no-op). * commit '33c2b60b9561487af3ecf4f5e52c1d345fd7f265': Add GCam progress indicator. hide preview cover on arrival of new preview data if hidden Fix photo mode is getting stuck in a single CameraState. Show chooser on EDIT intents that have no activity for action. Parallelize opening the camera with view handling in photo mode. Decouple the visibility check for system UI from action bar Don't crash Photo Sphere on back button press in filmstrip. Check for media service being present before capture.
|
10adca396c11e8c901c97d2474ea7c1635f632c6 |
30-Apr-2014 |
Seth Raphael <magicseth@google.com> |
am 203511fd: (-s ours) am 2aa0d2b3: am 05f23b7d: am cbd8267e: Add logging to various actions * commit '203511fd372df4e7f9c1a2e3b2822b60981e653f':
|
4ec50da787c3e4325736f06e5304a7bc1457bb8b |
30-Apr-2014 |
Ruben Brunk <rubenbrunk@google.com> |
am eaaca513: (-s ours) am 6911bfca: am 56960b7e: am 36d84c1d: Merge "Ensure mOpenCameraThread has been setup before dereferencing." into gb-ub-photos-carlsbad * commit 'eaaca5130356a9bb2e38d590b63072ed507f5f9d':
|
f8fc74bbaca02e23bfe5c1dcdce64c2cc5556e94 |
30-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
am 176b0992: (-s ours) am aa158f2f: am 0351d05d: am 2b78c0c0: Merge "Add GCam progress indicator." into gb-ub-photos-carlsbad * commit '176b099253e3a0eeec3ad2665157c126629b2ae2':
|
76b002c20569c835da10d87a07af78e3b41ae3fb |
30-Apr-2014 |
Andy Huibers <andyhuibers@google.com> |
am 02cdd0a4: (-s ours) am 8bc966eb: am c504af14: am fccf83bd: hide preview cover on arrival of new preview data if hidden * commit '02cdd0a4fc53f91ba11e191527b90720e10f8929':
|
edfc7a7635a9df05f98eaf01485518785aea3a55 |
30-Apr-2014 |
Erin Dahlgren <edahlgren@google.com> |
am 40b6b458: (-s ours) am 30ac3520: am cbe9fc1f: am 2f878d54: Merge "Fix photo mode is getting stuck in a single CameraState." into gb-ub-photos-carlsbad * commit '40b6b4585c7ac59667b32e3e0f275423c665c8b8':
|
b6be315da3d25d010a6de40ee9d8e16a4274f713 |
30-Apr-2014 |
Erin Dahlgren <edahlgren@google.com> |
am 71e8e91d: (-s ours) am 570d8da0: am 5a0475e4: am 05a04924: Show chooser on EDIT intents that have no activity for action. * commit '71e8e91d2b4ff73c7d63241a947b03c74ecd9e8c':
|
69fabdf9168c9df7c8038bf382c6cd99a284d778 |
30-Apr-2014 |
Erin Dahlgren <edahlgren@google.com> |
am 1ffe5c18: (-s ours) am d2aeec25: am c8761589: am 7e6e947f: Merge "Parallelize opening the camera with view handling in photo mode." into gb-ub-photos-carlsbad * commit '1ffe5c18a3f219496a0d85f50aeb31f4e8643758':
|
91d903dae20bb76802ad8e8854dbeeff22c72ed7 |
30-Apr-2014 |
ztenghui <ztenghui@google.com> |
am e77b0b74: (-s ours) am 2c14fb02: am d2b57761: am 9070def9: Merge "Decouple the visibility check for system UI from action bar" into gb-ub-photos-carlsbad * commit 'e77b0b74c1fb085ed247697226a5d8642932e83d':
|
f98fffeaf7f9e0444d415fe7906844bb8f239e66 |
30-Apr-2014 |
Baligh Uddin <baligh@google.com> |
am c54d55f6: (-s ours) am fef07e22: (-s ours) am f5d6fc67: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit 'c54d55f60cf80e82353a407fe61fb9b13238fb24': Import translations. DO NOT MERGE
|
bc8bf20a0d702dbc578948ba88d8ea92c9c079a1 |
30-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
am 35965b92: (-s ours) am ef339df9: am 107e93ee: am eb605b4a: Don\'t crash Photo Sphere on back button press in filmstrip. * commit '35965b92472f0751e3c1a3b9737b4daff05c3efd':
|
597680d288fa660b7d776674baa899da4ab63eea |
30-Apr-2014 |
ztenghui <ztenghui@google.com> |
am 57933be4: (-s ours) am f82f66c1: am 970cd50b: am 189bfea2: Merge "Fix the RTL layout in the app\'s manifest." into gb-ub-photos-carlsbad * commit '57933be4248be055cdc0a273fe1a92fe94fb7bdf':
|
e3b06ece740a900f0726315b3b3346514b03fd54 |
30-Apr-2014 |
Erin Dahlgren <edahlgren@google.com> |
am 718da285: (-s ours) am dffe3cb6: am f41109d8: am 98254270: Merge "Make image editor intent general." into gb-ub-photos-carlsbad * commit '718da2850e443f6df9ebc1fef19344dcfe7cb412':
|
327d2753deeca0408dd6587d40c876d789701190 |
30-Apr-2014 |
Alan Newberger <alann@google.com> |
am d6384381: (-s ours) am 4fc8f6bd: am 6fddfed2: am 2bcb8d1f: add \'capturing\' string for in process indicators * commit 'd6384381abf59003702e20371fca2ba607eea33f':
|
ce48dc2007b1fd770a1a68e83be14a5bafc3e522 |
30-Apr-2014 |
Ruben Brunk <rubenbrunk@google.com> |
am d37b3039: (-s ours) am bb8a79f3: am 998f49eb: am 404d7eb0: Merge "camera: Ensure camera release for lockscreen transition." into gb-ub-photos-carlsbad * commit 'd37b303959e43d518405226c389231f7bb3927e6':
|
e0c497008e65f5b2df64e84e68575f6b1565a0c4 |
30-Apr-2014 |
Doris Liu <tianliu@google.com> |
am 4d2c4c02: (-s ours) am f71d895f: am bb9e67ec: am d1b4ab3e: Merge "Make sure preview aspect ratio is updated" into gb-ub-photos-carlsbad * commit '4d2c4c02e6931a14476f048e35eb522cf2dc20f0':
|
dabc54955250be262a4f924191fc18072d9939ad |
30-Apr-2014 |
Baligh Uddin <baligh@google.com> |
am 42b4a018: (-s ours) am 19107fdb: (-s ours) am 29b0a905: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '42b4a018584f9f75ad6cd87f242e1417950cd5a0': Import translations. DO NOT MERGE
|
a4ab13db8ddc9574e60901e269b92bbc253cc760 |
30-Apr-2014 |
Alan Newberger <alann@google.com> |
am d7c174fb: (-s ours) am 32056926: am ff41c047: am bf4ce93c: Merge "adjust keyguard camera layout to make buttons match" into gb-ub-photos-carlsbad * commit 'd7c174fbef4048e70766fc671867d674baf101e5':
|
286cd5b6dcd7ba11a2a680b55965441f37101100 |
30-Apr-2014 |
Doris Liu <tianliu@google.com> |
am 725dc526: (-s ours) am b56d49b1: am 52086855: am 3493ba2a: Merge "Preserve high resolution image on touch during zoom" into gb-ub-photos-carlsbad * commit '725dc526fe501dd4ac57d2ee3910e16b5d1371b9':
|
aeea6cd46ea8ed31760845f01ef202cfb4296401 |
30-Apr-2014 |
Alan Newberger <alann@google.com> |
am 4e17ec56: (-s ours) am 07acdd2f: am ade5bb1d: am 7f044e2e: Merge "Adjust HDR options menu details" into gb-ub-photos-carlsbad * commit '4e17ec5654efa550da1efd82d00995889df5ddf1':
|
997e2a6c6a432e278722d6364643265b5126c486 |
30-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
am c9bb52c8: (-s ours) am 9ac245ed: am fecd573a: am ba1b30b7: Check for media service being present before capture. * commit 'c9bb52c8f26f7f9800649716816aae55131c46c8':
|
61be687bd68fd0a7e73a40d77997115345f17bce |
30-Apr-2014 |
Alan Newberger <alann@google.com> |
am 14fbb56f: (-s ours) am dd5fe0f1: am 1e8e8cec: am ccfafd95: Merge "Add Samsung front camera resolutions" into gb-ub-photos-carlsbad * commit '14fbb56f1b148c2c9e1ca901b58e62bd271542e7':
|
9e79b01812f3cbfb4266c7a52f35f2f3b0f087e5 |
30-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
am 693bec84: (-s ours) am 1ff5923f: am d07f6ac0: am 238d6ec7: Add new notification icon. * commit '693bec84a418e693181ee3fe711481e3497f7ae6':
|
4e9527b527e8fbdad3ab3bcd95d19a7aa022ce46 |
30-Apr-2014 |
Baligh Uddin <baligh@google.com> |
am bc19c633: (-s ours) am 035174b3: (-s ours) am eb224748: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit 'bc19c6335fd92293686eea79229bfae5ccd9a113': Import translations. DO NOT MERGE
|
7259895927dc1db690f5382db5d8f7770af5a3ab |
30-Apr-2014 |
Ruben Brunk <rubenbrunk@google.com> |
am dc06cfbb: (-s ours) am 74c47a95: am f5230ffd: am 6ff701f5: Merge "gcam: Add generic preview fps range selection." into gb-ub-photos-carlsbad * commit 'dc06cfbbe835e9b8e448b64e83d94528893bce25':
|
f60befc93fe603fa38b392a8b668f869d9e85e25 |
30-Apr-2014 |
Alan Newberger <alann@google.com> |
am 3dd5f10c: (-s ours) am 4f78acab: am c0dd6624: am 761306fa: Remove CameraUtil.launchGallery, ensure SecureCamera uses Gallery up icon * commit '3dd5f10cd5e0ed7566fa3c16db3fc70d638047ef':
|
d85d0872ae77e9b90b1c4c07d52762f09979152b |
30-Apr-2014 |
Andy Huibers <andyhuibers@google.com> |
am 0d3a8663: (-s ours) am 8b639c63: am fabdb282: am cec75e40: Fix rotation bug for animated thumbnail shown after capture. * commit '0d3a8663efa63800bf88160548fc660d2d81afaf':
|
fbeada7e338b89c8e614d9f2b7d0c8caf5fdfd98 |
30-Apr-2014 |
Doris Liu <tianliu@google.com> |
am 30bdaea6: (-s ours) am 70a6c065: am 2879b7eb: am af714f9e: Merge "Fix the mapping between preview UI and camera sensor" into gb-ub-photos-carlsbad * commit '30bdaea66e7e7df1cf41fc476bb943672a4378ce':
|
c6cec73681c7622b9671541a6944538c73c1a6c1 |
30-Apr-2014 |
ztenghui <ztenghui@google.com> |
am c4fd17f9: (-s ours) am cbde8aa1: am a16d166a: am e546d48b: Merge "Fix crash when trying to reopen the camera." into gb-ub-photos-carlsbad * commit 'c4fd17f92aa6148e04de53e256ac6cddfe01e488':
|
2b89f9f7562553393cf072e5f49353542e68c462 |
30-Apr-2014 |
Ruben Brunk <rubenbrunk@google.com> |
am c683acb9: (-s ours) am 82339072: am 72e1e639: am 0a64e00e: Merge "gcam: Add placeholder image." into gb-ub-photos-carlsbad * commit 'c683acb9881131c424c1a53c07a15ca229766ebb':
|
bee1f361a137ebec7fb6c33a2cbd9c529dad719b |
30-Apr-2014 |
ztenghui <ztenghui@google.com> |
am 1bb489b2: (-s ours) am 7835245c: am 24e0f4d7: am 5250fb28: Merge "Fix memory leak due to inner class for handler." into gb-ub-photos-carlsbad * commit '1bb489b2d0b7dbb5162a7c9a2c4d709d370d0e11':
|
e46c110f36182504d83276b5e2611d09b87aab35 |
30-Apr-2014 |
Doris Liu <tianliu@google.com> |
am c1fd1819: (-s ours) am 318b4eab: am f59776db: am d053a5b2: Update aspect ratio when preview aspect ratio changes * commit 'c1fd1819619de7b07a61fb9773ce1fea90f8ecd1':
|
4830dda946f313ff8c3a114f130364f402ea7775 |
30-Apr-2014 |
Doris Liu <tianliu@google.com> |
am 9cf8ca5a: (-s ours) am 4db1e03e: am cf940d9e: am 5737b932: Fix skipped hide review layout calls * commit '9cf8ca5a407e6935496ea670e467fd203dff0747':
|
f27a1d85c5277fc1a54e966f2f30c49bc74d4f4a |
30-Apr-2014 |
Baligh Uddin <baligh@google.com> |
am 3dcf811e: (-s ours) am 91fb860e: (-s ours) am 865c72a4: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '3dcf811edb748aad766a08c547f0303f74009e76': Import translations. DO NOT MERGE
|
f3bb972beb794ec0b0550eb2bba3b866abc1f4ca |
30-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
am 1f3611ec: (-s ours) am fb99a782: am 080fb578: am 156ea57c: Merge "Bump version number for MR1" into gb-ub-photos-carlsbad * commit '1f3611ecd283e22b4d9e0de16c2bff9185666971':
|
2386f41568bc0302e44d3f7fdb50c502905e0231 |
30-Apr-2014 |
Erin Dahlgren <edahlgren@google.com> |
am dcf88e4f: (-s ours) am 17a63bdb: am 4432abe0: am 65e2389b: Merge "Update preview controls on deleting all items." into gb-ub-photos-carlsbad * commit 'dcf88e4f8c7e39e7cb5635d452ffef3e54567a30':
|
cb5e61bd07a6e1ab4b577d10866e67ae704010fd |
30-Apr-2014 |
ztenghui <ztenghui@google.com> |
am b0c2602f: (-s ours) am 3128bfa8: am b67d1401: am 68c1c1e0: The initial focus value should be true. * commit 'b0c2602feca65d86d7924b39bd77a1dc0d7ca4ad':
|
2620a97a62cfb16b52c55716b714b17136e3dc62 |
30-Apr-2014 |
ztenghui <ztenghui@google.com> |
am a50c1824: (-s ours) am be1a8c82: am f1d7d405: am 56e44af2: Don\'t call onCurrentDataChanged for CameraPreview when reloading. * commit 'a50c1824053118e8622e3eab28c5c0a34379dcd4':
|
5d7766bd1643632e3261b47ecdf784c0b9280674 |
30-Apr-2014 |
Doris Liu <tianliu@google.com> |
am 4d7f78f5: (-s ours) am c57947b7: am 8be9183c: am 891a8075: Merge "Fix SRI orientation on manta" into gb-ub-photos-carlsbad * commit '4d7f78f54b3493d7fc47518fffbe47b7d61a52ca':
|
2c49d0d69ce598467ddedac6fd98e2f74a1e0ba4 |
30-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
am 0740a277: (-s ours) am 12bbd6e8: am 734d2e67: am 464f2201: Don\'t crash when preview surface could not be set. * commit '0740a277e9c1ba3f38aba7939ebaa8d9206e3170':
|
ee554d8ba17c05adc2bb6ca09cbc145960d6f753 |
30-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
am ccd23b8e: (-s ours) am 914192b7: am a6e7579c: am f302a391: Update HDR/HDR+ arc menu hover messages. * commit 'ccd23b8e756add1ca7cff8a0522def01187f17b5':
|
ab20b7fe91faa39a608728faeae0e3080c405afa |
30-Apr-2014 |
Doris Liu <tianliu@google.com> |
am 17a7ab03: (-s ours) am b8475d8c: am 9ff2635a: am 8470cae9: Merge "Show a preview cover until real preview is ready" into gb-ub-photos-carlsbad * commit '17a7ab0386f879e28c310096bb1d7dc83361cf36':
|
6941754263f049aad493881a432d4ff978e81019 |
30-Apr-2014 |
ztenghui <ztenghui@google.com> |
am c99f99f2: (-s ours) am 0e0fa5f8: am b1c2d554: am f149ec53: Merge "Don\'t allow swipe into the film strip view when swipe is disabled" into gb-ub-photos-carlsbad * commit 'c99f99f2b4f0ba553f2c907dd68628cf01945cfa':
|
1fa83cb909ec756f41ee4a0c71ff401896a0b793 |
30-Apr-2014 |
Baligh Uddin <baligh@google.com> |
am fa715a80: (-s ours) am c8e13e3f: (-s ours) am a7d9bf6c: (-s ours) am 270b64e9: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-carlsbad * commit 'fa715a8023054b137eed06737e6038202d996c0b':
|
2c1413d0cb19ee74337b51060475cd1c81a83e01 |
30-Apr-2014 |
Baligh Uddin <baligh@google.com> |
am c959f029: (-s ours) am 88b7b007: (-s ours) am 3cdc6f0a: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit 'c959f0296af028e9666e0c4679adf724449d5934': Import translations. DO NOT MERGE
|
c5712c82f73c688db837b3b24310206d7ba01d03 |
30-Apr-2014 |
Ed Heyl <edheyl@google.com> |
am 957de9a5: (-s ours) am cfba2a22: am 071cfe6c: merge in klp-release (no-op) * commit '957de9a560e24d120dfc76c4b2c1d72581a250fd': Only delete the Uri coming from onMediaSaved Avoid unnecessary bringChildToFront() calls. Increased time to wait in all tests. For CameraLAtency.java got rid of the key event to get rid of geo tagging dialog on first launch of camera. That will be taken care of by pushing the shared_pref file. Add missing crop message. Prevent NPE in gesture handling. Restore HQ preference in GCam module. Fix memory leak of context in LocalMediaObserver Add HQ icon indicator support. Remove PopupManager to remove a memory leak Make ROI size 1/8 of longer edge of the image Sort and select the preview fps range for still image.
|
bc059989aa0587a0f670feff9f8589833813b663 |
30-Apr-2014 |
ztenghui <ztenghui@google.com> |
am 0bc5cc2e: (-s ours) am 22673cc0: am 089c19ac: am 9db92826: Merge "Send an message to decouple the gcam module change." into gb-ub-photos-carlsbad * commit '0bc5cc2e240ce0aff7d80d0bbaa1393f7d3aa2e2':
|
991d628a206e99d973b95d9a3a9cbd61920dee1a |
30-Apr-2014 |
Ari Sachter-Zeltzer <asz@google.com> |
am 5b868a44: (-s ours) am 839cac61: am 7015ae63: am 66f39483: Merge "update camera launcher icon" into gb-ub-photos-carlsbad * commit '5b868a441dcc14dc626c086c4bd7b43d97516ffb':
|
600e580e390cb2731fe6779b675e584fe73e972e |
30-Apr-2014 |
Doris Liu <tianliu@google.com> |
am 99bd2b3c: (-s ours) am 57d192c7: am 1f4e2b9e: am 7bd95307: Merge "Fix shutter covering pie menu" into gb-ub-photos-carlsbad * commit '99bd2b3c282002ce3f3ae5d2607e345ee75fb96c':
|
f9772a3eabc9c8e2b5e3e1f8b655837566a6e347 |
30-Apr-2014 |
Igor Murashkin <iam@google.com> |
am 3102e3dc: (-s ours) am 3a34ec7d: am 4baeda1f: am 5e82f81a: Merge "gcam: Fix AF spinner not to reset when changing position" into gb-ub-photos-carlsbad * commit '3102e3dcf6f19cd89c986d24d0b563f15c4197f1':
|
d7821ad989fa4c61027d0cd5da6a6fec96b54baf |
30-Apr-2014 |
Doris Liu <tianliu@google.com> |
am e897bfd3: (-s ours) am 5813c768: am 6cf14f19: am 08749a4e: Merge "Dismiss switcher popup when shutter button is clicked" into gb-ub-photos-carlsbad * commit 'e897bfd36e5bcdbc2d8cf00f23e531d589e4c09f':
|
19478bba0e891b28437d122b8ffb873576ef88fe |
30-Apr-2014 |
Igor Murashkin <iam@google.com> |
am 1d064e06: (-s ours) am 5e0c9071: am eb1538d7: am d3e75bd7: Merge "CameraUtil: add float clamp function" into gb-ub-photos-carlsbad * commit '1d064e06be80fb71d1b635d72ec1e0979aee4bb3':
|
8dba7eb779818b535e9c4ea705de064ff087ee45 |
30-Apr-2014 |
Erin Dahlgren <edahlgren@google.com> |
am 4f6611c6: (-s ours) am 02eee819: am f983b7b3: am 177c4b05: Merge "Do not show any bottom controls in secure camera to prevent launching out of app behavior." into gb-ub-photos-carlsbad * commit '4f6611c641c6def93859524e9752681343158400':
|
0e53db4669f79ba63540aa7a004cddf27f492344 |
30-Apr-2014 |
Erin Dahlgren <edahlgren@google.com> |
am fee0a72e: (-s ours) am 34e79039: am 5e07d4fc: am 487200db: Merge "Prevent crash after deleting album from Gallery by checking for more null pointers." into gb-ub-photos-carlsbad * commit 'fee0a72e365dd0c42b55c2f3398d9f1d73e447a2':
|
c74a35a33135edc45805a89801aae1f4d5c7b7c2 |
30-Apr-2014 |
ztenghui <ztenghui@google.com> |
am 8ce2d138: (-s ours) am 37ba3571: am df36ec57: am 0e6efbcc: Merge "NPE fix when we failed to open the camera" into gb-ub-photos-carlsbad * commit '8ce2d1388a37d9bd5e3fa05f563598a1481c290b':
|
12cfa3688cef09c41953a285b861ee10f546adcd |
30-Apr-2014 |
Mangesh Ghiware <mghiware@google.com> |
am 3c2a2701: (-s ours) am 2abaa8ed: am 5152eb13: am 4f4a1678: Fix Camera2 build. * commit '3c2a2701777c1ccb5b067be6ef5b9e0f1ad2efee':
|
74968846d8713fa05986713f6b541733f70f9b22 |
30-Apr-2014 |
Mangesh Ghiware <mghiware@google.com> |
am 376d5c8e: (-s ours) am 3d6c8291: am 5782f4c1: am 2d939fe7: Use Gallery intents by default. * commit '376d5c8e814e3c403e808eae29e5bf58f26aa8d8':
|
6acca3f0ee7d12b26d86b7dbb65b446d3328c3b5 |
30-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
am 4e587d83: (-s ours) am 78d2c5a3: am 85beb3cb: am d8b555b8: Merge "Updating shutter button resources" into gb-ub-photos-carlsbad * commit '4e587d834902918d1d417687d5b691573b21144e':
|
3e7c283119cb14f6c3494b26a373a14e2f241b58 |
30-Apr-2014 |
Erin Dahlgren <edahlgren@google.com> |
am 1c950cc2: (-s ours) am 2be61f66: am dfca664a: am 831da613: Merge "Set camera controls visibility based on whether the camera preview is centered." into gb-ub-photos-carlsbad * commit '1c950cc26a213c08715ee7a7d9fa7265826277bb':
|
997afb2348284c577a4a803dbb2643107e414149 |
30-Apr-2014 |
Baligh Uddin <baligh@google.com> |
am c906bf82: (-s ours) am 8b3398ed: (-s ours) am 62cfac54: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit 'c906bf82d1a49c743914793bf12013581b1f19a6': Import translations. DO NOT MERGE
|
0ede4a8412cef2cb4aa71d56a7c00f94114804b4 |
30-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
am d6b84c0a: (-s ours) am f294584d: am 147887f4: am 2670f3e4: Updating button assets, follow-up to http://ag/373177 * commit 'd6b84c0aa8f427b9fc8ab64f0256698dffcc388e':
|
5dbfdfed9e84ef98351edbcbda2cccf5cb614d6f |
30-Apr-2014 |
Doris Liu <tianliu@google.com> |
am 38e32e0f: (-s ours) am c74eee91: am 713cb961: am ce75de57: Merge "Fix SRI upside down preview in reverse landscape and reverse portrait" into gb-ub-photos-carlsbad * commit '38e32e0fdd2cab77d1805502cc186ee529cf6348':
|
fa5f95c2532dd66c4c77a4cc8be1485206de9d7b |
30-Apr-2014 |
ztenghui <ztenghui@google.com> |
am 8d516822: (-s ours) am ac6fffd7: am 46132e66: am b27668f0: Merge "Only delete the Uri coming from onMediaSaved" into gb-ub-photos-carlsbad * commit '8d516822fd559404020585b2ae157345bd13b422':
|
298269e5d0f54ad1ba2c649e4c66d7cb21eab722 |
30-Apr-2014 |
Angus Kong <shkong@google.com> |
am 21018360: (-s ours) am e75d5db8: am 4a0a1ff8: am ae169730: Merge "Ignore clicks on disabled pie menu items." into gb-ub-photos-carlsbad * commit '21018360c934db4661a4f3c7f84ee7cde4871401':
|
2266187e18cb2899c57cfcd98a102c9aa111f895 |
30-Apr-2014 |
Angus Kong <shkong@google.com> |
am 01084cdb: (-s ours) am 38ddd91e: am 7da0c4cd: am 24d94d61: Merge "Workaround to prevent the data focus callback." into gb-ub-photos-carlsbad * commit '01084cdb183aad8506c88feb8f745eb1e63f99f7':
|
15ae035bdac8a472ac23d7aa8facc38d6f309903 |
30-Apr-2014 |
Alan Newberger <alann@google.com> |
am 049d6337: (-s ours) am fa44b8ec: am ae9a7783: am 28019abc: Change keyguard camera layout to show no menu options in indicator * commit '049d6337952bce6100e174ffdbbfbf9bf9b284e8':
|
7aee063721ee42932b639a36fdf47ebec3beb296 |
30-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
am a435a073: (-s ours) am d762e17f: am 23a2aa99: am 704530ed: Merge "Add \'disabled\' state for when Gcam is unable to take another shot." into gb-ub-photos-carlsbad * commit 'a435a073f422d169e581feeb44a4f8e131d74b64':
|
d932118d97774a8f4d6b7691c1f0072967a52119 |
30-Apr-2014 |
Doris Liu <tianliu@google.com> |
am c3bb004e: (-s ours) am d3316978: am 33120140: am c937ab7f: Merge "Fix for mis-placed camera controls" into gb-ub-photos-carlsbad * commit 'c3bb004e141911ca30b0fb717737eba978d4bcd5':
|
ed5e8836496c8f4e2fe3e9d1093234f8774858db |
30-Apr-2014 |
Angus Kong <shkong@google.com> |
am c6805c7f: (-s ours) am 252c76a8: am 22b0d455: am 2d5c7478: Don\'t load data when it\'s secure camera. * commit 'c6805c7f7a3817980b297b5c8b5ece315a12874a':
|
60669e63dfa534c8d99dcd65bb222a6860754e70 |
30-Apr-2014 |
Angus Kong <shkong@google.com> |
am 33fd2fd8: (-s ours) am 6b0fd1f5: am 8fa9c2b5: am f1582c9c: Adjust the position after layout change. * commit '33fd2fd8f4f5772cd30a6eff44d39c920f9e59ae':
|
c74e41504070b470e2481c0286dda9086744f27c |
30-Apr-2014 |
Baligh Uddin <baligh@google.com> |
am c22619b2: (-s ours) am e4a63aa1: (-s ours) am 8052407d: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit 'c22619b2af71276e2d714129ab07948c6e08436a':
|
eac1b8d1abe038a2d6d7e875d4c45fd68caabd6c |
30-Apr-2014 |
Doris Liu <tianliu@google.com> |
am 2222f0ac: (-s ours) am 3f8ba6d4: am 193da1b0: am a5002410: Merge "Correct initial orientation of camera controls" into gb-ub-photos-carlsbad * commit '2222f0ac4688958b9fb4e1b3ccb3210e1d000e6f':
|
666ffb9a36cf52347ca5adf59bccb49c67844801 |
30-Apr-2014 |
ztenghui <ztenghui@google.com> |
am 1f23079a: (-s ours) am 2337cc64: am 25d6a81e: am 27562534: Merge "Finish the secure camera activity when user try to play a video." into gb-ub-photos-carlsbad * commit '1f23079a272f6605d8c8a9b22ec2f268ebd4dccd':
|
02bcf3355358bdba3773d287e93a47e70dd73a8c |
30-Apr-2014 |
Doris Liu <tianliu@google.com> |
am d4ddb980: (-s ours) am 9ab431e5: am 3a6c47dd: am 87d093d6: Merge "Bring full screen window flag back to camera" into gb-ub-photos-carlsbad * commit 'd4ddb980eb3b92a550e89664f847d63752908fb9':
|
d7177201ca005253695434ce6ff1c207fd5ce9ba |
30-Apr-2014 |
Seth Raphael <magicseth@google.com> |
am 9a5a2c5b: (-s ours) am f6ed47dc: am c065ae53: am 3772d2f4: restore Usage Statistics * commit '9a5a2c5b2236a36ffebc74e2f6454349b897c268':
|
afee88c508a4d5a5e0200b473b2576c67a1d4956 |
30-Apr-2014 |
Alan Newberger <alann@google.com> |
am 86ab6dc5: (-s ours) am 07fdfac4: am 46455ec8: am c13cc22b: Add strings to better describe HDR mode menus * commit '86ab6dc52335cefa2ffd96e79b2ad39b64da367b':
|
febe524d5c9a20f211ec02fdeb9bc2c9af64ac5d |
30-Apr-2014 |
Ruben Brunk <rubenbrunk@google.com> |
am 5c64fd7a: (-s ours) am b0d295b2: am 2e30f90a: am f0622191: Merge "gcam: Allow debugging postcapture image to be added to mediastore." into gb-ub-photos-carlsbad * commit '5c64fd7a4e09c6fe49a5c466532613c7381eab0f':
|
63aa2fcc9c3d6096d203761f4a131630b1ecc25a |
30-Apr-2014 |
Sameer Padala <sxp@google.com> |
am 6cc86d7a: (-s ours) am 005a9ee5: am 1f8c4241: Fix build break. * commit '6cc86d7ae0e6b6bb3b0fae12335183da075b518c':
|
bfba121fe83eaf173b487b16258b87080c24f768 |
30-Apr-2014 |
Baligh Uddin <baligh@google.com> |
am 2751b289: (-s ours) am 58fdde61: (-s ours) am 6d9353a7: (-s ours) Merge "Revert "Revert "Import translations. DO NOT MERGE""" into klp-dev * commit '2751b289f327acd05e7be319271091c59d011a05':
|
cb730e4d12c7d15cca74b25f5b93445541f0cd37 |
30-Apr-2014 |
Angus Kong <shkong@google.com> |
am fcee8b10: (-s ours) am 8ffb3c16: am 28875b52: am 81ef40bc: Merge "Avoid unnecessary bringChildToFront() calls." into gb-ub-photos-carlsbad * commit 'fcee8b10aba17cf2fefa4a9cbbf95d99060ad8c7':
|
13e9cc57b631e87bb24fb98c96e4a9a63391eba7 |
30-Apr-2014 |
Baligh Uddin <baligh@google.com> |
am 379c809f: (-s ours) am 4b04b755: (-s ours) Merge "Revert "Import translations. DO NOT MERGE"" into klp-ub-dev * commit '379c809f6ebb2ab0dfe73ac2182466dda80ab5e3': Revert "Import translations. DO NOT MERGE"
|
405865159b97e5d4e7abe026547314e9ae0e2800 |
30-Apr-2014 |
Baligh Uddin <baligh@google.com> |
am c7caa91b: (-s ours) am 01a0d87d: (-s ours) am cdbd8a64: (-s ours) Merge "Revert "Import translations. DO NOT MERGE"" into klp-dev * commit 'c7caa91b9b6311279703b012f4cfb0eaa82e137e':
|
66d604ea6e03643550f1b92c2ce7507e7076afac |
30-Apr-2014 |
Baligh Uddin <baligh@google.com> |
am 7e063111: (-s ours) am ddabe772: (-s ours) am 32445d3b: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '7e0631118605195586b74abf1ba56c4c8b70e313':
|
a9184922c5053de639bff79b6260f586bae420a2 |
30-Apr-2014 |
Baligh Uddin <baligh@google.com> |
am 83b99712: (-s ours) am 11b56e6d: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev * commit '83b99712f151f5c124febed2b09fe8ce484b3841': Import translations. DO NOT MERGE
|
b9c715849c93fc219a7e3a5a2abc07acea609601 |
30-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
am 9b0799aa: (-s ours) am b4a40684: am 3b9f618b: am 64cea6aa: Don\'t show a details dialog if there are no details. * commit '9b0799aae6b8b4d0418cf871cc76f0cde85d66be':
|
0977624b8eb27a00b546ebe4095dc7027fc27ef3 |
30-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
am e9c899a3: (-s ours) am 6dbd0a25: am 886c3a5f: am 2a959b83: Merge "Don\'t initialize photo module if it\'s paused." into gb-ub-photos-carlsbad * commit 'e9c899a3437f40958a77f4d7b765a018e9e83fa3':
|
601b2e48248468ff204a800f9977b9e66ddd2b81 |
30-Apr-2014 |
Erin Dahlgren <edahlgren@google.com> |
am 0d3abc89: (-s ours) am 8ca32464: am 6cad9e09: am 36c21ca1: Merge "Check both the requestId of current item and total items in filmstrip for bottom controls." into gb-ub-photos-carlsbad * commit '0d3abc895a7b2606edee71f8321cdc47fd601666':
|
79531fc4e69db12787b21f269e9f0d81be6771fa |
30-Apr-2014 |
Doris Liu <tianliu@google.com> |
am 42694ac4: (-s ours) am 2ae69122: am bc7ecede: am d70f0fb6: Add fling support in zoom view * commit '42694ac4d55d28cf09e98a12f14eb66047681121':
|
789d506f290fa06ef2b643d1d39d0f8db2ede98e |
30-Apr-2014 |
Doris Liu <tianliu@google.com> |
am b9245c0b: (-s ours) am bfe7e483: am 8a310a39: am 8c807823: Merge "Remove display change listener for mode switch" into gb-ub-photos-carlsbad * commit 'b9245c0b9fbf485f66153df4b7daa41c2b421868':
|
85a52006995481bff87806bdcc1633ab3ae3f6ea |
30-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
am 0c81fca3: (-s ours) am f69c7569: am 86ecc992: am ada31cbe: Merge "Hide the status bar and switch into lights-out mode when popup is dimissed." into gb-ub-photos-carlsbad * commit '0c81fca3ea3e6f1a72c60ba885c09cca1d43fd7f':
|
4b378ee0f8b02369a5f49a3432f877ae002699e8 |
30-Apr-2014 |
priya <priyar@google.com> |
am bc99ab0f: (-s ours) am 1d266660: am f51bebd5: Merge "Increased time to wait in all tests. For CameraLAtency.java got rid of the key event to get rid of geo tagging dialog on first launch of camera. That will be taken care of by pushing the shared_pref file." into klp-dev * commit 'bc99ab0fcabce48468185c1b0bce8c498ab18a62':
|
cb87caaa3a7bb2c7a653c40d7b8d9fad9d10b1a5 |
30-Apr-2014 |
Doris Liu <tianliu@google.com> |
am da67719b: (-s ours) am f7b3f37d: am 364c8830: am 23df6752: Merge "Workaround for re-applying transform on new surface texuture" into gb-ub-photos-carlsbad * commit 'da67719ba3989288ddfa7530530d40720d8a4174':
|
5b60612048bcf7bf71931625fb946e199cd74036 |
30-Apr-2014 |
Mindy Pereira <mindyp@google.com> |
am a723b07d: (-s ours) am d6a639f3: am fca08fd3: am 47e437de: Merge "Update shutter recording assets." into gb-ub-photos-carlsbad * commit 'a723b07d3104a68b23a92a0801d0ba2c31db540b':
|
01ad3159cf6f8088794869a007f91c7422fcb384 |
30-Apr-2014 |
ztenghui <ztenghui@google.com> |
am aebc3468: (-s ours) am d6f2c5c0: am 8d2bc8ef: am d46d6f8e: Merge "Fix flash issue" into gb-ub-photos-carlsbad * commit 'aebc34684139e4cb0bb819ef1eb3d97ed644a89e':
|
b2250632c45a112b34e788c08b21c28a5a517eb5 |
30-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
am 7013d125: (-s ours) am 552150ab: am 030b6a41: am 048bf4d0: Initialize GCam with GServices values. * commit '7013d125866cda5ecb4e4e0c27a5c91f2661b8ee':
|
2df015d5a3404e70fb907086dddf27a2c92e8f37 |
30-Apr-2014 |
Ruben Brunk <rubenbrunk@google.com> |
am 5f034d19: (-s ours) am 69782f4e: am cb17c7f8: am c14bfe6a: Merge "gcam: Add postcapture for gcam debugging." into gb-ub-photos-carlsbad * commit '5f034d1903b85560093798e74b75ae203473fee4':
|
25b840ba6357f2c8d6c8f6d7bcd0cf2106210351 |
30-Apr-2014 |
Ruben Brunk <rubenbrunk@google.com> |
am 34a4a375: (-s ours) am 8b226af5: am c89b9122: am b5eb1ffa: Merge "gcam: Fix preview FOV." into gb-ub-photos-carlsbad * commit '34a4a375b48d4cba96ecb333e8f9e6e7042c3384':
|
4ae79c2d5c0b2bf91cfb13e8b7d44ac402d2dd04 |
30-Apr-2014 |
Erin Dahlgren <edahlgren@google.com> |
am a96aa546: (-s ours) am 6ee3c8e0: am 3f552685: am 71686048: Merge "Update bottom edit control for photos inside secure and insecure mode." into gb-ub-photos-carlsbad * commit 'a96aa5466807bc8b6decd5ae1ec3f1c01db9eef5':
|
e21d272c38fa911ab38d8cc73f12acf385b5f52c |
30-Apr-2014 |
ztenghui <ztenghui@google.com> |
am 8f375272: (-s ours) am 90da6872: am 3cac767e: am 70d24b5b: Merge "Fix another potential issue related to video capture intent." into gb-ub-photos-carlsbad * commit '8f3752727d89161569dc728b19a0fd46961e4a24':
|
4636d1e99bf56e58a20c4853ea7b6bc44b6babd6 |
30-Apr-2014 |
Doris Liu <tianliu@google.com> |
am 4702a593: (-s ours) am 3152c957: am 7c2e7cce: am ef4dccf6: Merge "Workaround to disable swiping for SRI during capture" into gb-ub-photos-carlsbad * commit '4702a593eaad74a524834822e210bc615238835f':
|
82f2238793dd9db0f495d9e737ffa9e6def5cd1e |
30-Apr-2014 |
Erin Dahlgren <edahlgren@google.com> |
am 19b7517f: (-s ours) am c3075c38: am 82223508: am 26862c30: Update bottom controls and action bar with a tighter bounds on data change. * commit '19b7517f812dbadc6b58f88daf8e2152ad1bde58':
|
d9d6787dd5a478fb4b431d045d378350e58e37d6 |
30-Apr-2014 |
ztenghui <ztenghui@google.com> |
am bbd228fc: (-s ours) am e158f707: am 676b89ca: am 52beb04d: Merge "Fix NPE in video intent." into gb-ub-photos-carlsbad * commit 'bbd228fcdfe92deb9ecfdcf94f5e8a20177bf760':
|
9eaa7e13fceb9543e36aacf869156d21207cd83e |
30-Apr-2014 |
Angus Kong <shkong@google.com> |
am 4ba3f4e0: (-s ours) am 2393fa30: am 59f24eeb: am 6939d143: Merge "Make the transition animation identical." into gb-ub-photos-carlsbad * commit '4ba3f4e0524a2063defb2bbb5c04b145c727dadc':
|
d1a08a224a168af333021026f1d12521d7f770c9 |
30-Apr-2014 |
Angus Kong <shkong@google.com> |
am d33edf4f: (-s ours) am 2df4a3c5: am a584528f: am 6ddd31b9: Enter fullscreen if all items are removed. * commit 'd33edf4fcb1f5b4c479d18b7496acad96e3c5bbe':
|
afdcc39a8e987722e468b020ead67b280ec60f1c |
30-Apr-2014 |
Angus Kong <shkong@google.com> |
am cf076416: (-s ours) am 7693a4f0: am 762d8cb0: am b04dcdb5: Merge "Don\'t go into Gcam when it\'s capture intent." into gb-ub-photos-carlsbad * commit 'cf076416c755d05e133705b882b9cab1437e711d':
|
3bfdecd7e890aa2e4767a99983147db2648f50ea |
30-Apr-2014 |
Doris Liu <tianliu@google.com> |
am 08339ae8: (-s ours) am eba2ebbd: am 52fab3a0: am 3179f6a4: Allow scaling beyond 1:1 in zoom view * commit '08339ae81ea680fc08244c873127a8aaa9ecfe8a':
|
d9f2d48d7d40f6b80461581ec128b3761be5c4d9 |
30-Apr-2014 |
Doris Liu <tianliu@google.com> |
am ad0e2958: (-s ours) am e5543c5c: am 89a8a1c3: am 607634ca: Merge "Do not allow navigation to filmstrip during video recording" into gb-ub-photos-carlsbad * commit 'ad0e295839ce7357e25fdb3f2423bc36e7196ea5':
|
58e4d3e2d35b3979dd3aa62b0b9487cdee3cf43f |
30-Apr-2014 |
Mindy DelliCarpini <mindyp@google.com> |
am 2f0e2e07: (-s ours) am fdcc07eb: am 51d86937: am 2ca6c0f7: Merge "Update camera assets for de-blue effort" into gb-ub-photos-carlsbad * commit '2f0e2e0796990a57cfce189bed1edf8b600939d0':
|
9652db7fd5b146112cfbd960f4907ea26f95cecb |
30-Apr-2014 |
Ed Heyl <edheyl@google.com> |
am 55cce949: (-s ours) am 57067df0: am 3e69e4ee: merge in KFS78N (no-op) * commit '55cce949bd819241828e3f52099eb036319f28fa':
|
4eade7bb08650901bf648a7abc542118e306a224 |
30-Apr-2014 |
Ed Heyl <edheyl@google.com> |
am 2ceaed66: (-s ours) am a6f80df8: am 2c042f21: merge in KQS81M * commit '2ceaed66837c94a7be837e3e101e93988450afbd':
|
6932467a50453c846f111f69046f462dacd51243 |
30-Apr-2014 |
Angus Kong <shkong@google.com> |
am 768d99eb: (-s ours) am 2f0b7b19: am 3c27dd36: am f5aa51e6: Add shutter click sound in SoundClips. * commit '768d99eb74ffff1ef082262e3af2b4468bb91d92':
|
f22f69b28b25f6a208feba27c527ebc9a72d029b |
30-Apr-2014 |
Baligh Uddin <baligh@google.com> |
am b9358143: (-s ours) am 6f1346f8: (-s ours) am d0fff8a7: (-s ours) Merge "Revert "Import translations. DO NOT MERGE"" into klp-dev * commit 'b9358143036925d4a0fd88e3ee26b00d6f0eaf59':
|
694c2eff80740d35d3f232cd78fce21820551d04 |
30-Apr-2014 |
Baligh Uddin <baligh@google.com> |
am 2f97233f: (-s ours) am a8771ede: (-s ours) Merge "Revert "Import translations. DO NOT MERGE"" into klp-ub-dev * commit '2f97233f8ae7678c19d4a6fb729be1eb9238d2a3': Revert "Import translations. DO NOT MERGE"
|
aeb86be1d8a396fd950ca0de5820ab0f6b6a1e09 |
30-Apr-2014 |
Baligh Uddin <baligh@google.com> |
am 51d0d9c8: (-s ours) am db2ec4a6: (-s ours) am 9d8a48ca: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '51d0d9c8bc7ade9606619d30137bf39e9d1e592d':
|
686b4d661acd93ae88e6ea6cb5fb2b4a12b6e984 |
30-Apr-2014 |
Baligh Uddin <baligh@google.com> |
am 8c77d184: (-s ours) am 5d0f4b37: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev * commit '8c77d184a1dcdbb875263b01c19aa45e79bb2cd0': Import translations. DO NOT MERGE
|
563ffb698394675072a540dcfa5377f5d55f55a5 |
30-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
am fe180475: (-s ours) am 230d79b6: am a406decd: am 94f5f216: Merge "Increase character limit." into gb-ub-photos-carlsbad * commit 'fe18047502691b1443d45b2556ee1e339577e70f':
|
5868f24b9fae37a4d6b934e03befa2475584e2a7 |
30-Apr-2014 |
Doris Liu <tianliu@google.com> |
am 9fb17011: (-s ours) am 867c6364: am 4e90efbc: am c502bc9d: Correct sample factor for rotated images in zoom view * commit '9fb17011a40e71543775b3a951a4d983da9a125c':
|
6a558c0aa87768c9b8514774e7656764ee8a0751 |
30-Apr-2014 |
ztenghui <ztenghui@google.com> |
am 2225732d: (-s ours) am aaad00a7: am 6cd0dfeb: am 73809edd: Merge "Keep the ImageData size info consistent with MediaStore and Exif" into gb-ub-photos-carlsbad * commit '2225732d02a73df625f4641c19a14ddc09f37c61':
|
e0aaa4eb35a1bd7180aa6209186196e4ede74f65 |
30-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
am a16cc411: (-s ours) am 5dce0fee: am d820c0c6: am 2a2f33fe: (-s ours) Fix missing filtershow string. DO NOT MERGE * commit 'a16cc41137119819847b7095c0446d96201e2d8c':
|
da7cac1e6d46ce33b9c8e097b9b17e622535c865 |
30-Apr-2014 |
Baligh Uddin <baligh@google.com> |
am 494c02aa: (-s ours) am 8f850b1b: am eb418dba: Merge "Revert "Remove translated filtershow_strings.xml files."" into klp-dev * commit '494c02aabeafeab31d7e4f325f68ffd6a2765574':
|
6eb8cfa7d4530c773ef880b411baba397df23eb6 |
30-Apr-2014 |
Baligh Uddin <baligh@google.com> |
am 3e322d6e: (-s ours) am 1bb8a000: am 591fbff2: Merge "Remove translated filtershow_strings.xml files." into klp-dev * commit '3e322d6ec7b6fc8286441bb3bcfc0455ed609daa':
|
8c56c008ea9224bcd10c27a3c381b691ddb9efb8 |
30-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
am e6e00e74: (-s ours) am 5eaa6237: am b439aa31: am 4de78806: Revert CL that added broadcast receivers for shutter control. * commit 'e6e00e74536115db5707c9c0488f1f8c891f3d34':
|
431808694fc4a145e85edc450fea3f55f9fdde45 |
30-Apr-2014 |
Baligh Uddin <baligh@google.com> |
am f5b77cb7: (-s ours) am afcf9bbd: am e5b45eaf: (-s ours) Merge "Build broken." into klp-dev * commit 'f5b77cb72f028b663ea3117c9e3185a76658f049':
|
9cee7aafd10988328ba46df19fe39b87e07e1893 |
30-Apr-2014 |
Baligh Uddin <baligh@google.com> |
am 6137316b: (-s ours) am bf33451e: (-s ours) Merge "Build broken Revert "Import translations. DO NOT MERGE"" into klp-ub-dev * commit '6137316bb6e5b727a63ff4505828d3334aa8d4b7': Build broken Revert "Import translations. DO NOT MERGE"
|
14542a7bc24458f430dbbf7a41b3afb8459a6984 |
30-Apr-2014 |
Baligh Uddin <baligh@google.com> |
am 2c5ad7cc: (-s ours) am 4bb6f6e2: (-s ours) am 57913c82: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '2c5ad7cc54e89cbb29f43ea503e371c7d66195d8':
|
436fc7a9506df08e5c7f667bc88e2f66692ce6e9 |
30-Apr-2014 |
Baligh Uddin <baligh@google.com> |
am 7ef6f5be: (-s ours) am 47becad6: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev * commit '7ef6f5be7aa363b5200b9e4ec9405a8752e31ee7': Import translations. DO NOT MERGE
|
73fdf89dc5057387bb43d4af7a099e5d09b88391 |
30-Apr-2014 |
ztenghui <ztenghui@google.com> |
am 82d2091c: (-s ours) am d094939d: am e0c413ca: am 4ab4879e: Don\'t show the option for Gcam when using front camera. * commit '82d2091c5d6796cd461eb8d0748f338872760040':
|
cfaf4ad2663c6f448b8f3259da72f13415bce33f |
30-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
am d652388c: (-s ours) am 8db842dc: am 872257af: am 18709218: Update the HDR+ assets. * commit 'd652388c438875b6ef109d39621272f81335d564':
|
19d95916642ad6776e72ba4f5ad95985d1a7b1e6 |
30-Apr-2014 |
Doris Liu <tianliu@google.com> |
am 2294bfcc: (-s ours) am 5e233f82: am 309cd179: am b0fbd543: Merge "Prevent picture taking via volumn key in filmstrip mode" into gb-ub-photos-carlsbad * commit '2294bfccdf07dc5c641a13b3c6d653d4dcc0412b':
|
cf5c13c6456f098cbd9208f6bd53bf01c11f69cd |
30-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
am e65a190d: (-s ours) am 2e2467c3: am 7c1ae08c: am 7ba4a88e: Merge "Sync Camera2 permissions to GoogleCamera permissions." into gb-ub-photos-carlsbad * commit 'e65a190d2635c8a5c7ce8fd1b4b14f33bbbe5cc1':
|
3a45163061752921cbe6f9b7b33f2129fe5eaa48 |
30-Apr-2014 |
Erin Dahlgren <edahlgren@google.com> |
am 6f10aec6: (-s ours) am f56cc71e: am 88b31b09: am 77dd1493: Merge "Make space for photosphere rendering text" into gb-ub-photos-carlsbad * commit '6f10aec6765021e7c022880786e3a24339b116f9':
|
43c619f0d492fd015c71876e914decc32cf87ed7 |
30-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
am 205c049c: (-s ours) am 67747e3d: am 6b879500: am 238799e9: Merge "Change icons and code from HQ to HDR+ mode." into gb-ub-photos-carlsbad * commit '205c049ced1184fe4b28b52cf9c39c3a9bd2f59a':
|
cce20862065be2fd78dae99a90de99d6ff5bc2cf |
30-Apr-2014 |
Angus Kong <shkong@google.com> |
am e3903c3b: (-s ours) am 2e63f2e6: am 5f16c140: am 5bca6f4c: Merge "Don\'t allow actions on items in progress." into gb-ub-photos-carlsbad * commit 'e3903c3b848309747b433f14b67894364f4ec591':
|
f9fa956c7dff1d80c13ec8daa95b7e561a3517c1 |
30-Apr-2014 |
Doris Liu <tianliu@google.com> |
am e288dff3: (-s ours) am 37c96ec8: am 67510532: am 930b9b41: Merge "Leave ROI not set except in tap-to-focus scenario" into gb-ub-photos-carlsbad * commit 'e288dff3f14ba19dc3c259b25e82e0385201b73c':
|
30a3985dc1080d94eb9bf7b63f56555de21c1baf |
30-Apr-2014 |
Kevin Gabayan <gabayan@google.com> |
am 24e76b0a: (-s ours) am c421586c: am 5ed30cb7: am 68fc363b: Merge "Camera2 icon update for all resolutions." into gb-ub-photos-carlsbad * commit '24e76b0a5070fb993f13ee91e9cbddc6a8dcbb6a':
|
6d1d7ca85adcbdafab336ac99afbda63d49550d5 |
30-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
am 83f9b837: (-s ours) am 3c3c63ea: am 644c534f: am 623b74b6: Add HDR+ mode strings (to replace HQ mode) * commit '83f9b8371d7b863ca05e5db91fa611ceee2e3d71':
|
4055a63b22b7d7f52c9d72b1d907f46aab8df946 |
30-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
am 23b0a3f2: (-s ours) am 98461dca: am 8a605fad: am 3393a627: Merge "Add missing crop message." into gb-ub-photos-carlsbad * commit '23b0a3f21f748494717c991da6412900d3c56135':
|
d3e1a3f083e78ddf88e1bf38c90be25802981af0 |
30-Apr-2014 |
ztenghui <ztenghui@google.com> |
am 44c32d17: (-s ours) am 27408847: am 9a09d511: am 4c0aede4: Merge "Only show delete action when in secure camera mode." into gb-ub-photos-carlsbad * commit '44c32d1710482fd45aacfd077d206ad2de1df588':
|
25be3a9714f2aa8024d83730708996f359b5cf86 |
30-Apr-2014 |
ztenghui <ztenghui@google.com> |
am 092b7e31: (-s ours) am d915fa04: am cd324a25: am 9ac97492: Merge "Show the delete button if there is room in action bar." into gb-ub-photos-carlsbad * commit '092b7e316290d7ffbc4cc7d59ba426d85b502717':
|
a36772886958e59bc1dee0a13c11ac156fd23df9 |
30-Apr-2014 |
Mangesh Ghiware <mghiware@google.com> |
am baa0e6a4: (-s ours) am ac63f9c4: am 893981de: am 4f563f1d: Merge "Exit Camera on Up button if no APP_GALLERY handler found." into gb-ub-photos-carlsbad * commit 'baa0e6a41872a36b9bf967fd445f65d8ddbc8f82':
|
3d57513f9bdb805dd5a3a9ec7d39dda308755572 |
30-Apr-2014 |
Baligh Uddin <baligh@google.com> |
am 6e5ae500: (-s ours) am b5cdb04a: (-s ours) am 8bab49cd: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '6e5ae5008b647d996be7688db9a974ea00dd0be9':
|
efd3f6fba408f2d6b055d61a4e700b2d98518ae9 |
30-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
am d7b30dd2: (-s ours) am 81fa3622: am f8b53c38: am c60e2b09: Merge "Increase char limit for camera timer sound message." into gb-ub-photos-carlsbad * commit 'd7b30dd25a10169440241bb6c8053dfdc3023d1f':
|
3dc93624181759731599e1b652d448f2387d79d9 |
30-Apr-2014 |
Erin Dahlgren <edahlgren@google.com> |
am f0b608be: (-s ours) am 826b0631: am 03b10508: am cf7babd5: Merge "Reads PhotoSphere metadata once fully loaded so that PhotoSphere viewer icon is visible." into gb-ub-photos-carlsbad * commit 'f0b608be5bfd03200f32bb11cf0db999a3282417':
|
83749bc6096424c320cd3b7842e03a36171353a1 |
30-Apr-2014 |
Angus Kong <shkong@google.com> |
am 8c0263e2: (-s ours) am 81f859df: am 632afc19: am 45f5976f: Merge "Make scroll animation smoother." into gb-ub-photos-carlsbad * commit '8c0263e2b28973ba6a09ebc6dd8d8f2055202fda':
|
1eb59bef3081f0ae0ee922acfb4defa3832e7141 |
30-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
am 4f4e12c6: (-s ours) am 3c45c0c0: am b8968f2c: am 706c985f: Merge "Deactivate the backup agent in Camera2" into gb-ub-photos-carlsbad * commit '4f4e12c6cabe33152c6f974f8168e9f76d842c65':
|
8b6ee298754860c23f19131a816a17f490e99ce7 |
30-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
am cf087b41: (-s ours) am 5a55e6b8: am 607bb9a2: am 72a83bc2: Merge "Add content description to post-capture thumbnail." into gb-ub-photos-carlsbad * commit 'cf087b416532547626ec193b920757d5095ce0ac':
|
ff2294bf1ad6c1c9b437ce37afca9c7c8a5bd956 |
30-Apr-2014 |
Erin Dahlgren <edahlgren@google.com> |
am 5974e522: (-s ours) am b7633573: am 852853c8: am 6416ba8a: Merge "Fix FilmStrip crash by checking if photos are present before updating action bar" into gb-ub-photos-carlsbad * commit '5974e5221e3bf63358e6b42a9085ccc0b0f36b85':
|
cf3547760d6a638b9898f9b733f9e21097d196df |
30-Apr-2014 |
Doris Liu <tianliu@google.com> |
am 45385a9f: (-s ours) am c4810a33: am 148b65b0: am 1f69e36b: A workaround for crash in zoom view * commit '45385a9f3225e8e1504aa0fa4cefd84a5bc77104':
|
5d2affb41a4bc0c308821f476096f67b36b626ce |
30-Apr-2014 |
Angus Kong <shkong@google.com> |
am ee5aa8f1: (-s ours) am ee7f3963: am 9baebd5d: am 7fc104e4: Prevent NPE in gesture handling. * commit 'ee5aa8f11fdf08b28dcd935e8288a881f6703586':
|
38c3752478b2366618e80d1b7787fa28c7ec379d |
30-Apr-2014 |
Doris Liu <tianliu@google.com> |
am 58af6bfd: (-s ours) am 6f2be56c: am 5eb88117: am e2d59dcc: Merge "Double tap to full screen from filmstrip" into gb-ub-photos-carlsbad * commit '58af6bfdf86cbe797630b0cb9f1055369b01a103':
|
a5f9ed0b2e39fcb6315fa0265513a2d946b7e516 |
30-Apr-2014 |
Erin Dahlgren <edahlgren@google.com> |
am 791efd67: (-s ours) am ee8d0e11: am ed3a34fb: am ad3003bb: Merge "Updates newly centered photos in FilmStrip after a delete." into gb-ub-photos-carlsbad * commit '791efd67fcf00f4d1ab15153403908fe6813d99f':
|
0fd1e62de68dba540ee2c1454c81fe04c86f1653 |
30-Apr-2014 |
Baligh Uddin <baligh@google.com> |
am e096cec4: (-s ours) am bcdea4ae: (-s ours) am 16376616: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit 'e096cec4964acb5e82cd63df90d7c56c29008ac4':
|
4917ee5f5940c4f67cd9bd6f854c1ce8de976317 |
30-Apr-2014 |
Angus Kong <shkong@google.com> |
am 37123ea0: (-s ours) am 85be0ac8: am a1cb57be: Merge "Don\'t adjust the position while scrolling." into gb-ub-photos-carlsbad * commit '37123ea0a142e378e9c9033e99c0bf4e7e9cdf4a':
|
000948c4711636ca0d027444ed2887ee1e700df6 |
30-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
am 4b5dd651: (-s ours) am 7334597f: am 4d21fc2e: Merge "Show status bar in filmstrip mode" into gb-ub-photos-carlsbad * commit '4b5dd6514f5ef3026a325cfdb9d43b575c781df7':
|
a61e3f9f9fb3f6ca7e38b562a823fd95ee98b2a1 |
30-Apr-2014 |
ztenghui <ztenghui@google.com> |
am 954be135: (-s ours) am 293cf7e4: am 4feabff8: Fix MediaStore correction code. * commit '954be1350bfadaa45035880a817f2723e8a3585a':
|
bbef395316723d3d7280084f8a6a1e737fff29b9 |
30-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
am 2ef69c96: (-s ours) am 9c9244fc: am c4aa7c0e: Change crop label to avoid aapt dump badging from failing. * commit '2ef69c967b91fd3c12ab56f6e06ae392ae231a89':
|
b12d3f3dd816da0deefcb4b9543aca9168682a76 |
30-Apr-2014 |
Alan Newberger <alann@google.com> |
am d0a03f32: (-s ours) am f390ec0c: am fb344efd: Temporary removal of resize code to evaluate GCam image bug * commit 'd0a03f3293fe83c0bc3aa8d91ea17961baab0729':
|
05656ef732e1ccaa8e26572861dc96b25aae6ec8 |
30-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
am 604c0289: (-s ours) am 70d6ff76: am ac5cb243: Merge "Add basic EXIF to the tiny planet so that rotate succeeds." into gb-ub-photos-carlsbad * commit '604c02890925d5ad1086fe211c47f595c2647c81':
|
1197685322a6182b9308060c0e4a720773a04d07 |
30-Apr-2014 |
ztenghui <ztenghui@google.com> |
am a6491129: (-s ours) am d200ce9a: am b7be228d: Fix incorrect width and height from MediaStore. * commit 'a64911292be4e18c0c435b6914c777136b496045':
|
c2e5e05d52dde55ff89c268840a94515ad40b6d4 |
30-Apr-2014 |
Angus Kong <shkong@google.com> |
am bbe03add: (-s ours) am 5475e801: am 9ba47bf4: Merge "Restore HQ preference in GCam module." into gb-ub-photos-carlsbad * commit 'bbe03addaa5f2f8f2388b14ffadc0124bcd59c24':
|
a8bbe779f80d44315f92e060c044834c0c723749 |
30-Apr-2014 |
ztenghui <ztenghui@google.com> |
am 603b1711: (-s ours) am 2b0ce26b: am af41aaa4: Don\'t update the width and height in MediaStore after rotation * commit '603b1711e6876e07a8be49d68c98c29db7ce2574':
|
c04dbb306340dc07523998b284bcf9bbb66442e3 |
30-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
am 20afca67: (-s ours) am 2062cfd4: am 3cde3ece: Merge "Add orientation information to the details dialog." into gb-ub-photos-carlsbad * commit '20afca67e42ecc153c977e1d333c02b6f673be96':
|
5889bdf1703c0850d7c0e6690789a43381945abb |
30-Apr-2014 |
Doris Liu <tianliu@google.com> |
am 3c0a09f1: (-s ours) am 2b72f33b: am 2b86d873: Fix memory leak of context in LocalMediaObserver * commit '3c0a09f1c6ff14b3879808dc5cbe10440324d7b3':
|
f51b521f26de5f9ac917b5a6321e28770f4a4f8f |
30-Apr-2014 |
Seth Raphael <magicseth@google.com> |
am dce17630: (-s ours) am f86bdf5a: am 66788094: Remove PopupManager to remove a memory leak * commit 'dce17630b7c839854cb4a2a590ffe882fcbf69a6':
|
78ad95b9b643f72a0d0bc5d2c36a14ee08e1c30b |
30-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
am a0403285: (-s ours) am baa3fc46: am 67685a78: Add HQ icon indicator support. * commit 'a04032858eddcba24566e95d97c525c7ec677c53':
|
6da465ef9d2980e05e8184cc7870f1a6a7a4473c |
30-Apr-2014 |
Doris Liu <tianliu@google.com> |
am ef5b92a1: (-s ours) am 91e8fe94: am f5fc8d67: Merge "Finalize deletion when app exits and for last photo" into gb-ub-photos-carlsbad * commit 'ef5b92a1c79ae383664468f179e6dbd1ed72c7bf':
|
f74331dd012d394657d4ae72cf4566763ecdb12f |
30-Apr-2014 |
Doris Liu <tianliu@google.com> |
am 07e242de: (-s ours) am c2441f77: am 2ba03263: Make ROI size 1/8 of longer edge of the image * commit '07e242deb71cdd7e536671cd1ae0b634e1fbf1e7':
|
e8da8092b663767d3f630aa8df80cdd1a68fbc06 |
30-Apr-2014 |
Mangesh Ghiware <mghiware@google.com> |
am 67cf6167: (-s ours) am 61ea6472: am 22236064: Merge "Use Camcorder label and icon for video camera activity." into gb-ub-photos-carlsbad * commit '67cf6167e63df664260f12a91321a04e6abc9d5f':
|
ecc88b2fcae89910d73eb87fd7bcb6b1aafeec57 |
30-Apr-2014 |
Baligh Uddin <baligh@google.com> |
am 9b5e3ede: (-s ours) am d859daee: (-s ours) am 192686cf: (-s ours) Import translations. DO NOT MERGE * commit '9b5e3edebf62c7cd86e681ae874cc77949079517':
|
699cb68d5f55181e6d8d51b28e85e885087a1e64 |
30-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
am 6e7d944d: (-s ours) am b80c1e77: am 15ccccf6: Merge "Fix the checks for when to remove the HDR/HQ icons from the pie menu." into gb-ub-photos-carlsbad * commit '6e7d944d87c995091e193108a3fab0950a6825fc':
|
d2ff970b947d88071d382443b59764c210ee5deb |
30-Apr-2014 |
Angus Kong <shkong@google.com> |
am b714e5f9: (-s ours) am e8e2011d: am c9c15044: Merge "Checks for low storage in wide-angle pano mode." into gb-ub-photos-carlsbad * commit 'b714e5f93fe89ea7a82b2c0d78f8a35e6081ded6':
|
a4f57aae734ea22de1e12139a6b538d44d357f99 |
30-Apr-2014 |
Doris Liu <tianliu@google.com> |
am 39ce8333: (-s ours) am e8cb214b: am 0537d4f7: Merge "Increase ROI size to 1/8 of the image width" into gb-ub-photos-carlsbad * commit '39ce8333a33269e0ae59f01c3249cd6132fe1387':
|
2a220b54a16a513ba644d70ec1ca5bd35a5e78f7 |
30-Apr-2014 |
Baligh Uddin <baligh@google.com> |
am 83ec031a: (-s ours) am 71c85612: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '83ec031aa42c499255ccaf4ba683ed353ef9fa7a':
|
d3e1246f40278e24b1dc6441126e407f57d15dc3 |
30-Apr-2014 |
Angus Kong <shkong@google.com> |
am ceff97a0: (-s ours) am 2ba69209: am b998a491: Enlarge the native buffer of wide-angle-pano. * commit 'ceff97a001250fe4a7ea7bd084dc2aefcc4c8497':
|
ca97074a2f95a1b1e7bbc0d44615266cda45ffe1 |
30-Apr-2014 |
Ruben Brunk <rubenbrunk@google.com> |
am 6df4dbae: (-s ours) am acc3396d: am be7dc627: Fix HQ mode change to allow return to regular photo mode. * commit '6df4dbaee8cea8feec8781eeefc855641d435f0b':
|
7de21e9bdbe71e4cefec64a5616ea492b36f11e8 |
30-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
am d7e3a64e: (-s ours) am 531e36df: am 98f38bb0: Add HQ option and use it to switch to GCam. * commit 'd7e3a64e12cc9aaa9cde2f8416d2510e62924ce5':
|
9ed18fb0653d636495ad9a0e575f53323c1a7291 |
30-Apr-2014 |
Ruben Brunk <rubenbrunk@google.com> |
am 80842c45: (-s ours) am 7086b298: am 4601f5d9: Enable gcam as HDR pie menu option. * commit '80842c4529cccfd07a75e6a48f013a7795c5c392':
|
3cdca6d380d8873bce6750dedcb7a7e8d61c7000 |
30-Apr-2014 |
Kevin Gabayan <gabayan@google.com> |
am 3ad20d14: (-s ours) am 37f7a3ef: am e0bf566d: Merge "Removed unused assets from Camera2 Bug: 10493013 Change-Id: Id07878cbe1a89e0aaeb70942e0f4ca39cd4a3399" into gb-ub-photos-carlsbad * commit '3ad20d142f2901ab1b7a07050eb1c8ab6283d02f':
|
b256c2146b94160e0b4a36f183b823d27728a387 |
30-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
am fcdd3a0a: (-s ours) am 38bddcc4: am 601d8041: Don\'t expose the Camera crop intent. * commit 'fcdd3a0a7e36d18e5ff47c46766187a6bf67b7fd':
|
038044bd0c20d60c45de4ae412ebb07c5b0929cc |
30-Apr-2014 |
Baligh Uddin <baligh@google.com> |
am 18cc8cfa: (-s ours) am f1b81feb: (-s ours) am e5d39a52: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-carlsbad * commit '18cc8cfa592708c34d7f037cbb54949e9dc6f75a':
|
95b8c90ba2aa4b48dec13a61ebfd1e1693e73e37 |
30-Apr-2014 |
Baligh Uddin <baligh@google.com> |
am d4fb8e12: (-s ours) am e78ca833: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit 'd4fb8e12f84305fe8dc17017a697431593c77143':
|
3bb45b579cfffcb9bd3d38915ec924d2e2f1c19c |
30-Apr-2014 |
Mindy Pereira <mindyp@google.com> |
am cc14008a: (-s ours) am 106dc71a: am 29e7a34e: De-blue camera * commit 'cc14008a3889c821389c80f0b109379e8fb0bb7a':
|
3adb1d63f67cdfa99fb8e908e75018c36ee7544f |
30-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
am 79da0775: (-s ours) am 8c17960b: am 4863db01: Remove hideybars from Camera. * commit '79da0775133b804eeb595177d36436443af737eb':
|
b94015aeff726964aee6c75bbc3a516f88bb1fb5 |
30-Apr-2014 |
Doris Liu <tianliu@google.com> |
am 7a550178: (-s ours) am 5c1c3b38: am 3180ac90: Merge "Fix SRI UX issues and improve UI efficiency" into gb-ub-photos-carlsbad * commit '7a5501780604953a7d7d509f689d4698d100179c':
|
16417f11286cc1cd5377a8160d4ebcdc105e4c76 |
30-Apr-2014 |
Angus Kong <shkong@google.com> |
am e1fc04ba: (-s ours) am ee011517: am c74825b1: Merge "Allow user to tap on lock icon from secure camera." into gb-ub-photos-carlsbad * commit 'e1fc04babedcb425e8e9c329d18b833846225a37':
|
cd4d020206c901270d2b2e84ee03c3b3d281d6d5 |
30-Apr-2014 |
Kevin Gabayan <gabayan@google.com> |
am e8f235d6: (-s ours) am a014398a: am d897d5c9: Merge "192x192 icon added to mipmap-xxxhdpi." into gb-ub-photos-carlsbad * commit 'e8f235d6947f82d4a13cfa9db3804c832938eab5':
|
5820ff548aef31533d9d9a82fe4052e5979c143d |
30-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
am abe1edec: (-s ours) am 2377df9a: am 8fed926c: Merge "Localize the numbers in the time laps popup." into gb-ub-photos-carlsbad * commit 'abe1edecfaf06120b2c503f4566922762a580982':
|
96536dcccd8bf70b2a070c861c353bdc6885be32 |
30-Apr-2014 |
ztenghui <ztenghui@google.com> |
am da361548: (-s ours) am f58ec27a: am 4c478ffe: Merge "Sort and select the preview fps range for still image." into gb-ub-photos-carlsbad * commit 'da361548de0084d362a8a0ad4b3269632eff049e':
|
7ea6eabde308dd7753140c83b20799dfc7929d07 |
30-Apr-2014 |
Ruben Brunk <rubenbrunk@google.com> |
am aeeb5145: (-s ours) am a69f785c: am 283beaf6: Fix build: Don\'t build GCam for non-arm targets * commit 'aeeb5145d01d4d17f01854f4ccc4340f0c96a7e1':
|
3f20852a9c10e8d59a2624245f20b9a0f7c4701c |
30-Apr-2014 |
Angus Kong <shkong@google.com> |
am 8831725c: (-s ours) am 4d017ab2: am b21215a1: Improve the animation to filmstrip. * commit '8831725ce91d172b3331d339d1aa71189ce7fe2e':
|
f089dd40639f4c4a1ac400c5d677d14b79fc68d2 |
30-Apr-2014 |
Doris Liu <tianliu@google.com> |
am 3c60ff75: (-s ours) am 00258a68: am aa874428: Hide action bar after a timeout * commit '3c60ff751c1d2ada3848fea911f01fecef1daad7':
|
dd5d7088c38c0022c45e4dc9e9219ee1c14b2f5a |
30-Apr-2014 |
Angus Kong <shkong@google.com> |
am 98795bed: (-s ours) am cb736218: am cdbba4c8: Merge "Refine Filmstrip gesture/position handling." into gb-ub-photos-carlsbad * commit '98795bed91ab0340cbdabd917a4e619384e31d2b':
|
b6e51e81154ac7f0fdcbaf377a436b3ab779cd05 |
30-Apr-2014 |
Baligh Uddin <baligh@google.com> |
am a09cda9b: (-s ours) am 1106268f: (-s ours) am 4821c541: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-carlsbad * commit 'a09cda9b0b52ed01f616f9a3d33782edd29d6341':
|
82f291dc04acdd276d5f05ecc15a5d73db32e530 |
30-Apr-2014 |
Baligh Uddin <baligh@google.com> |
am 11db9bd4: (-s ours) am 3aac79f2: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '11db9bd48b5390e8b741ca1d77d19d0fe0f496cf':
|
65c61672c34ea85981f938d433ce3fe736270ac9 |
30-Apr-2014 |
Ruben Brunk <rubenbrunk@google.com> |
am 9403e4dc: (-s ours) am 75ad0584: am 30a21ea3: Merge "Fix drawable location." into gb-ub-photos-carlsbad * commit '9403e4dcb724fe9ee07625cba9339e769f71a7e2':
|
10b37581269bc6d2c0cb04aedb1c5bede28a5d05 |
30-Apr-2014 |
nicolasroard <nicolasroard@google.com> |
am e3155f4d: (-s ours) am 27d4468f: am 19ab725a: Add crop activity * commit 'e3155f4dd95120b8d7f8d8ea1d14b15b4da65a04':
|
22e00f2fc4cb36ff2b037cf5079f046fd3ca2f9a |
30-Apr-2014 |
ztenghui <ztenghui@google.com> |
am 79c8a1f0: (-s ours) am 9e7cb170: am 064d6000: Use contentObserver to refresh the data when dirty. * commit '79c8a1f0e1b97ac111d7b23daf476482e14f0d7d':
|
65f60d20a72d4ff46f2dd07799277b67f4b9d07e |
30-Apr-2014 |
Mangesh Ghiware <mghiware@google.com> |
am a6b977b3: (-s ours) am 7806200a: am a5682ab0: Bring back NFC beam support to filmstrip * commit 'a6b977b3600570f3e92a3677c628659bfa6db508':
|
5c76e16184e741406dc706fa23140a09a2d96c31 |
30-Apr-2014 |
Ruben Brunk <rubenbrunk@google.com> |
am cf3b5668: (-s ours) am e784eb4b: am 0374e092: Merge "Adding gcam module to Camera2 app." into gb-ub-photos-carlsbad * commit 'cf3b56681622e19a9876803dd6133e146f78bb25':
|
7c1563bb3e097cc7e61c33df6e16808703828005 |
30-Apr-2014 |
Mangesh Ghiware <mghiware@google.com> |
am e3568c49: (-s ours) am 247fa7b9: am 9426a38c: Merge "Make Up button in filmstrip go to Gallery." into gb-ub-photos-carlsbad * commit 'e3568c49558fb8cda93fd9f9995dcfaba07acf23':
|
99bc904f59584f134dda471f0e347e26ca4d48f4 |
30-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
am 53192fde: (-s ours) am 485f95e4: am b2d70d5b: Fix various message issues * commit '53192fdeb65c84bd69996f53130409fea0b98779':
|
1a21f4a44f542814a976d24d242e9ab6a0c68431 |
30-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
am 4911e6eb: (-s ours) am f0ec22b7: am 638e6f06: Clean up ApiHelper and remove unused code paths. * commit '4911e6eb754ace87120d7e4a739e2e79350779b8':
|
f8069963b47e285235d86c6ad9381e7784887e49 |
30-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
am 1847b431: (-s ours) am 18dcbd5d: am 4ed20592: Adding Hideybar support for K and up. * commit '1847b431dc8fb24e1c8ae65997b82387f08f7057':
|
5065bbfb89feec5a958d395f739d83e007bd2813 |
30-Apr-2014 |
ztenghui <ztenghui@google.com> |
am 2c5114b8: (-s ours) am eb0c0d3c: am e1f0f4f1: Merge "Delete the captured video if cancel in review." into gb-ub-photos-carlsbad * commit '2c5114b81ea373227f9dce4bb4747ba13824d900':
|
cb4f4b8ca63b8c0195f5e43ee5cf7f96362eac39 |
30-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
am 1ec6a26f: (-s ours) am c008cf33: am 15125661: Fall back to Photo module if stores index is illegal. * commit '1ec6a26f79e19b3672182a7a16d9cc3ffa5d648d':
|
f7031967ca71c7a0c499f52887e34b2fc7ae4f60 |
30-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
am a3ffd99c: (-s ours) am bfb14b9c: am 483d25a2: Merge "Don\'t crash the app if camera is not available." into gb-ub-photos-carlsbad * commit 'a3ffd99c264b60dc5389217b23f5895a9bbf639c':
|
261a333db64e8a4407b7ad97d23fac8a7d636538 |
30-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
am 86bdf145: (-s ours) am e7c77157: am 4ee4d99c: Merge "Adding a simple done handler interface." into gb-ub-photos-carlsbad * commit '86bdf1459770a56f642e0e4b08bdbd574d342770':
|
87c0c25c5642924ba311e316f1a3c41d3a936fec |
30-Apr-2014 |
Doris Liu <tianliu@google.com> |
am 63349606: (-s ours) am 1b3ffde9: am 9c0492a6: Merge "Fix camera controls rotation for secure camera" into gb-ub-photos-carlsbad * commit '63349606f71e617dae25958ba92455d62d64c028':
|
45ecac1be75345a6e76cc61c974387075b884538 |
30-Apr-2014 |
Angus Kong <shkong@google.com> |
am 1e1dd300: (-s ours) am 7315a189: am c2497d0a: Merge "Show dialog when camera device is not connected." into gb-ub-photos-carlsbad * commit '1e1dd300c5e31bfcef1f4d281f3fa88bed97f96d':
|
3c8fca46071ac5c86089a5800cbdc1991010c9a4 |
30-Apr-2014 |
ztenghui <ztenghui@google.com> |
am bd3e1882: (-s ours) am a4c33574: am 828c9190: Merge "Use a new Intent to work around issues in framework" into gb-ub-photos-carlsbad * commit 'bd3e1882df98ff32e1263a382b0d8164a7b97a73':
|
da83b9d37295826c2223a924ec423ec04a897cdc |
30-Apr-2014 |
Baligh Uddin <baligh@google.com> |
am 468592c2: (-s ours) am d313b92c: (-s ours) am 53304d69: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-carlsbad * commit '468592c24df7f395b4a38589cb70a0f750afb6d6':
|
18156a558a6832682d81967ec40e15f828d3a973 |
30-Apr-2014 |
Baligh Uddin <baligh@google.com> |
am 5c00ae40: (-s ours) am f72f347c: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '5c00ae404603943a5756e855e49f5e4d3d9271d8':
|
a5b3b8538c8a18b41cc3686130058e8f9085ccc4 |
30-Apr-2014 |
Doris Liu <tianliu@google.com> |
am 3bb7bf70: (-s ours) am 987a17d0: am 2065e606: Merge "Fix zoom for images with orientation tag" into gb-ub-photos-carlsbad * commit '3bb7bf702ee3c68b0ddd7ba6cd92ed4e95c9a76c':
|
f9bb12f2ca6cd3ed7b36be30d411880dde4f6b14 |
30-Apr-2014 |
Angus Kong <shkong@google.com> |
am 64e8a35d: (-s ours) am 1dffcefa: am 5bee41c6: Merge "Set correct alpha for views in filmstrip." into gb-ub-photos-carlsbad * commit '64e8a35d11e650e45420fed7bbe3c63a48aaa6f1':
|
079cbd88f703e3cfcb33302cfedcdd08b9905261 |
30-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
am a0283515: (-s ours) am 38cea6cf: am 3d91d906: Add HQ and HD strings. * commit 'a02835151e0a285f18dafec151b58a43c1b5da3a':
|
a6f7a20fe4be385af630b658db0aa25f999a6da6 |
30-Apr-2014 |
Doris Liu <tianliu@google.com> |
am 970235ac: (-s ours) am 9ca0842a: am d688c0c3: Merge "Fix flicker when zooming images smaller than screen" into gb-ub-photos-carlsbad * commit '970235aca30ec9a2d3fcb356bf6fe3e0e76b291d':
|
9baa8303754155fad62ff3452d3b32b778d40fd3 |
30-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
am 9602d9e1: (-s ours) am f546cdbd: am c2915695: Avoid expensive O(n) main-thread operation when adding Photo Sphere. * commit '9602d9e1c62773107ec0d68bc2f4b540bdde38c7':
|
c4211b063448d6af35459dcde53c406a28a11fd1 |
30-Apr-2014 |
Baligh Uddin <baligh@google.com> |
am 9bb3e1e5: (-s ours) am 0f9a86d8: (-s ours) am d095b79d: (-s ours) Import translations. DO NOT MERGE * commit '9bb3e1e52676f524c17ce0aae0ad6ebd6f0ab5ed':
|
76455f4319f14cf48cbb713927e407571754e916 |
30-Apr-2014 |
Baligh Uddin <baligh@google.com> |
am 317a468d: (-s ours) am d5fc134e: (-s ours) Import translations. DO NOT MERGE * commit '317a468d799fdc1d69eb3e50441d18d6944f93b9':
|
d7c78e92a3025d40e7e49f9443815b3136f5c585 |
30-Apr-2014 |
Angus Kong <shkong@google.com> |
am 064bcdae: (-s ours) am 14bbdd6a: am 44974d4b: Don\'t show menu/indicators in wide-angle mode. * commit '064bcdae140ebfca3ddb8f205a6200ee404468e7':
|
15edf292e70fc159fe975c4b8d06aef6f36fef01 |
30-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
am e30684d9: (-s ours) am 51da31a9: am 7e1e10f3: Merge "Fix potential deadlock while rendering the preview." into gb-ub-photos-carlsbad * commit 'e30684d94fa6717675d78427ef31ea503c653ec2':
|
fd0ad8d6ae268a10b0e432dbbfd928465ef377c9 |
30-Apr-2014 |
Angus Kong <shkong@google.com> |
am d831b816: (-s ours) am b3804596: am a29e0bfc: Merge "Always leave full-screen when swip from camera." into gb-ub-photos-carlsbad * commit 'd831b816e557a217ec3f2bebb284b7a670c19f1d':
|
a1f536fdf8d9f3f96e693fa5a9268e1ac2bec4e5 |
30-Apr-2014 |
Angus Kong <shkong@google.com> |
am 395505df: (-s ours) am caaffcc7: am 539b9eec: Merge "Avoid flickering after swipe to delete." into gb-ub-photos-carlsbad * commit '395505df7aedde20d9f733201329181adbba8377':
|
4cb7a72b24902659c9c58495378ac1fb5417409e |
30-Apr-2014 |
ztenghui <ztenghui@google.com> |
am 2907cb9d: (-s ours) am 755b36ac: am a7035394: Merge "Fix crash due to a hole in setDataSource." into gb-ub-photos-carlsbad * commit '2907cb9d667734cf8579518530e3693de3d326b9':
|
725dd1b6ece110c443a7aa454f15607890c2c630 |
30-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
am fe0ad8e0: (-s ours) am c54135c8: am 1e689c25: Fix DeadLock in TinyPlanet. * commit 'fe0ad8e0ca8a97124de56c0d61b5b2b0d2a8e910':
|
bc44faff6a74f973b456ec00c9c5b9ab1c254621 |
30-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
am b922e919: (-s ours) am 144ef251: am a5a08d76: Bring back tiny planet to the Camera filmstrip * commit 'b922e919fb53b5db1942990701857fecb97ae28c':
|
a1705773e82badfb1d740777f0130ecc76168dde |
30-Apr-2014 |
Doris Liu <tianliu@google.com> |
am b5c99151: (-s ours) am da414423: am 742cd5b1: Keep undo bar around until there is user interaciton * commit 'b5c991511c043bee7c2f85062133bec14d55e08d':
|
7046561ec599921dc4a5b8dae31fec87c9ce870a |
30-Apr-2014 |
ztenghui <ztenghui@google.com> |
am 9c52461d: (-s ours) am 99ba10e0: am a29a0ad0: Merge "When current data is preview, don\'t show the action bar." into gb-ub-photos-carlsbad * commit '9c52461daaa17250d3de2e0eade9a65a6941e63a':
|
8bbf0db217f228134123fcd261a3058cd122782c |
30-Apr-2014 |
Baligh Uddin <baligh@google.com> |
am 9768be7a: (-s ours) am 4988cf65: (-s ours) am d1b0801a: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-carlsbad * commit '9768be7af47e89bebc28f97ee6bc1a9401f83b8d':
|
761cb49beec1126eee9430a0f896b5b8220cd372 |
30-Apr-2014 |
Baligh Uddin <baligh@google.com> |
am 98c35e8c: (-s ours) am 11311445: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '98c35e8c2966170856463fe2931aba31d6b715f6':
|
004899a6e11fb052f400994f4944f71f6b858d40 |
30-Apr-2014 |
Doris Liu <tianliu@google.com> |
am 2031c48d: (-s ours) am c9293ebd: am 36e56fba: Show captured image rather than frozen preview for capture intent * commit '2031c48d687e74fa9a1adde74ee5016449243bd5':
|
6428be164b2cfb4110cc8b0d621a9219100901ff |
30-Apr-2014 |
ztenghui <ztenghui@google.com> |
am fedfb465: (-s ours) am c6cc7335: am 7b265a6b: Fix the flash mode transition in video mode * commit 'fedfb465bb28fd41c2ba1f25b5dc2f002e03d723':
|
e54f74f38ec8562fe2adfaddd3d2ce409910b746 |
30-Apr-2014 |
Angus Kong <shkong@google.com> |
am 6fd118b2: (-s ours) am 2e36dff3: am 20703f72: Merge "Flinging back should stop at the first photo first." into gb-ub-photos-carlsbad * commit '6fd118b2d6134337bd1801cf8cf08ac8e209cd74':
|
e2177a22fe51f0a5dc38971e0bbab762cff13b97 |
30-Apr-2014 |
Doris Liu <tianliu@google.com> |
am a2a5570a: (-s ours) am 005fbbbc: am e1d5ba4f: Hide zoom view when going to full screen * commit 'a2a5570a8012287ae0528ec505ceea9a327f6b82':
|
e2acf6cf1601935f9d06ea8dcceee95825d875c3 |
30-Apr-2014 |
Baligh Uddin <baligh@google.com> |
am 1b6b0f8d: (-s ours) am eff820b2: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '1b6b0f8d24c354427e3f68dfa8fe46aaefab35c5':
|
2f7ef59d95593449b3e3c6de5f14749b42b6088f |
30-Apr-2014 |
Baligh Uddin <baligh@google.com> |
am b9cbdd9c: (-s ours) am 359f2552: (-s ours) am 44c02874: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-carlsbad * commit 'b9cbdd9c55c75160d03a18d05a21dcb87d4e58ff':
|
28785fe744c0fa36974d1c2420d0c36afc758b79 |
30-Apr-2014 |
Angus Kong <shkong@google.com> |
am 21fb09d3: (-s ours) am 7f9cd2a5: am 6aae9177: Merge "Fix images being off-center in filmstrip." into gb-ub-photos-carlsbad * commit '21fb09d385d6fb5cbc4d3d3194f2cb3fbee4913b':
|
ecfd32159333dc8d988a9c74382804362462a825 |
30-Apr-2014 |
Doris Liu <tianliu@google.com> |
am 870067e8: (-s ours) am 66cfdf11: am e074fcbd: Merge "Hide zoom view when back is pressed" into gb-ub-photos-carlsbad * commit '870067e87e6d2d9a827196bdd0eb645b7c4ba1cb':
|
5d3b2673d09efea4a2344768634976111c599f14 |
30-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
am e1a9e908: (-s ours) am db0ea490: am f8b877c2: Update indicators at the right time to show the correct state. * commit 'e1a9e9083cc1edfb810550c739de640f9bb90b0e':
|
b21f94dc183fca1be3d50f7b4c97db192c27d1b8 |
30-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
am 15304725: (-s ours) am 790bc99b: am b7639c64: Make sure we switch to preview view when resuming. * commit '15304725e9ccb6ecd5a9c6e020bcc39cc8356ea2':
|
c19ad910a8bf6486f16d52311beb3166f473b6a1 |
30-Apr-2014 |
ztenghui <ztenghui@google.com> |
am 4997b532: (-s ours) am 8455977f: am 08d82bae: Merge "Update the data after edit." into gb-ub-photos-carlsbad * commit '4997b532b6c470d16ccc2681b592674119246100':
|
a2859ca64fe3987e94b9e0a9a63b21ff1f2a2859 |
30-Apr-2014 |
Angus Kong <shkong@google.com> |
am 72bc2821: (-s ours) am 31ee75ce: am a7194601: Disable swipe in capture intent mode. * commit '72bc2821eb873f42f68b28daf7519eccc194cb6f':
|
5b6e31a10e8558c42bafe5cb0984b950f46503ee |
30-Apr-2014 |
Angus Kong <shkong@google.com> |
am b32a26f7: (-s ours) am e9dba8ac: am 56ad83f7: Merge "Respect system auto-rotate setting." into gb-ub-photos-carlsbad * commit 'b32a26f769df19fa27ecebc1469309fa9ca18c30':
|
5b3af6e9324a2b16b1083eed631265b0020a6e05 |
30-Apr-2014 |
Angus Kong <shkong@google.com> |
am f322ed79: (-s ours) am 793729a5: am 080f8683: Merge "Improve swipe gesture in filmstrip." into gb-ub-photos-carlsbad * commit 'f322ed79ebc210abc501c9d39e8eff31339a09c9':
|
60b2f19da6a5f34100a86afdc1ad575d221cbd6d |
30-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
am 6792d81b: (-s ours) am 22610d24: am 5199c207: Set the system UI to low profile when we hide the action bar. * commit '6792d81b32998375a91bf4508bf0d62be15171c8':
|
87e768f3609ace1b622fd85f07661a585ddc9415 |
30-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
am dadcb042: (-s ours) am 5eca5f52: am cd7b8c13: Re-add a strings that should not have cleaned up. * commit 'dadcb0422a4bb181b4ea54a8ce395636a2b8b2e8':
|
fd2a9c29a0f2efde248da64d5b48a32665352c97 |
30-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
am d23a67e6: (-s ours) am 082fb573: am 46c09ba0: Remove unused strings. * commit 'd23a67e62aae529296709b1b3cee8e40738875f6':
|
6c4e2684e25adb00b56ccbe2d4dec6b0f68645be |
30-Apr-2014 |
Baligh Uddin <baligh@google.com> |
am 5ea52719: (-s ours) am 7ca24118: (-s ours) am 01f12724: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-carlsbad * commit '5ea5271924aab88f789f3708b7a224bee31b4c17':
|
0b721c2b34fadf8c4e56c0d885c20fc468d0ad79 |
30-Apr-2014 |
Baligh Uddin <baligh@google.com> |
am 7c86cd26: (-s ours) am 8ebeb744: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '7c86cd2607aa06c9b47bfd3e876997977a48d4fd':
|
c0842e190fb3bb1d9c5baaba224c418a202a9f0b |
30-Apr-2014 |
Doris Liu <tianliu@google.com> |
am 8f5708b3: (-s ours) am 364295ed: am fffc6a5a: Merge "Fix black screen in mode switching" into gb-ub-photos-carlsbad * commit '8f5708b3471bdad57936b32204981835f1fceec7':
|
824c0e4c40c9117367742fd485f23d6cd397f316 |
30-Apr-2014 |
Angus Kong <shkong@google.com> |
am 4df74700: (-s ours) am 4aac7d25: am 33bb2d47: Merge "Bring back wide angle panorama." into gb-ub-photos-carlsbad * commit '4df7470055b9e431987a561e57904848d35dc37a':
|
541e6e1daefa1c657addee3ba90bca0fb05db61e |
30-Apr-2014 |
Alan Newberger <alann@google.com> |
am a10ab337: (-s ours) am 364f1200: am 1ef76d4c: reintroduce action bar hiding for onDataChanged * commit 'a10ab337afcbacf31e6d426fe2d1145791a1ce56':
|
7c31b666c60dd1df7f7aac0139e7dd1fc90658f2 |
30-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
am efcd9eb0: (-s ours) am 540f719a: am 5633994e: Increase char limit. * commit 'efcd9eb0bde8ed1f334fa5f08c0c5120eaa7d221':
|
dca2e47081fec3ab55a75572725efa700f93c6b5 |
30-Apr-2014 |
Mangesh Ghiware <mghiware@google.com> |
am 56b63cdc: (-s ours) am 631c94a8: am 33035c19: Bring back \'share 360 photosphere\' to filmstrip * commit '56b63cdc4a85c919bdf939c218cb5c48fb79bafc':
|
af3975cb5379ccdb30f8bcdbe1463c4c638007f0 |
30-Apr-2014 |
Doris Liu <tianliu@google.com> |
am 06618394: (-s ours) am 194d84f1: am 121022cb: Double tap to zoom all the way in and out * commit '0661839460fe24bbead112bc22acd68e2a32cc90':
|
1c0bf00e492dc8467ef69472a6dbf1cd5a9c37e8 |
30-Apr-2014 |
Baligh Uddin <baligh@google.com> |
am 98680095: (-s ours) am 0ab8fabb: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '98680095aa996ffd2633ae1ab1a4bb7b237ce4ce':
|
67ebdb8cd16c93578083e1b5406a30a0d45267f2 |
30-Apr-2014 |
Baligh Uddin <baligh@google.com> |
am 659ea14a: (-s ours) am fb56e3fe: (-s ours) am 7ff7b04d: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-carlsbad * commit '659ea14a2d84b369f717d802e206027ed76d8a70':
|
d1615fa21e02c18faefb0c9f9faf672cf0a32e85 |
30-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
am d6e28ae1: (-s ours) am 52a0a4f0: am 26145e56: Use app_name label now that we have the correct translations. * commit 'd6e28ae1ee307ddaf0e52deb24db101e3592948e':
|
144a4901b85654f6cf6dd80c09b799c9a9860829 |
30-Apr-2014 |
ztenghui <ztenghui@google.com> |
am c346b81b: (-s ours) am 6d7237f2: am 269c824d: Merge "Don\'t show the action bar in the capture intent." into gb-ub-photos-carlsbad * commit 'c346b81bc0263206a41020f699a1a6e213b9d665':
|
bb239601bf33083a3f44e397f3b4e1771448e2c1 |
30-Apr-2014 |
ztenghui <ztenghui@google.com> |
am 549ac4b8: (-s ours) am 1247a8bc: am 2c3d9a58: Don\'t show action bar when in camera preview. * commit '549ac4b834781db9623a3debe01596a34adb6de6':
|
7134d34b5c8e7f004f348a6a317c8cede8362920 |
30-Apr-2014 |
Baligh Uddin <baligh@google.com> |
am 52790c96: (-s ours) am 95dd838a: (-s ours) am 5457782d: (-s ours) Import translations. DO NOT MERGE * commit '52790c9686ee475bbd8a1b3c0d11f5c2de60bb7b':
|
25daee09b6a9d82c7293946d9178980420176046 |
30-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
am d9746979: (-s ours) am cb46d560: am 1d9a8d7a: Rename renering message from panorama to photo sphere. * commit 'd974697911011ae8ff9fff59cbebc9a112698698':
|
8d4831c520f18d2b7db7ceb8ee10e2676ffb5bdc |
30-Apr-2014 |
Doris Liu <tianliu@google.com> |
am 5f296514: (-s ours) am 14f85082: am 0dff7ce1: Merge "Reset zoom view when user exits app or rotate device" into gb-ub-photos-carlsbad * commit '5f29651483526014b1c1a441ec17e1c0d7bd7cce':
|
5b0075151f4a812b74d8ef8f75550581ec447549 |
30-Apr-2014 |
Angus Kong <shkong@google.com> |
am 0a21bf1a: (-s ours) am 6e9cfebc: am b2f0968c: Merge "Make the preview thumbnail clicable after scaling." into gb-ub-photos-carlsbad * commit '0a21bf1a54f1f27df4849cd17174ec655ed988d7':
|
7b9238f53703f1970683fa6424b4ba1f5dbf6ebe |
30-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
am 466054a3: (-s ours) am 0ee2d8c1: am 72a57ddf: Merge "Automatic versioning for Camera." into gb-ub-photos-carlsbad * commit '466054a39b32b9049a65823a28d48e5876e824f6':
|
d1b74c156d66bdf2edf9a567e0e001ce78ed96f7 |
30-Apr-2014 |
Doris Liu <tianliu@google.com> |
am ee357766: (-s ours) am f55555e0: am 750e73c4: Merge "Measure all children to ensure correct layout position" into gb-ub-photos-carlsbad * commit 'ee3577666dd1918d3200087ae10b185221677d9b':
|
d26a5175b34db8e2f27fae748487a8f9d0949570 |
30-Apr-2014 |
Angus Kong <shkong@google.com> |
am 9f3f0fa0: (-s ours) am a5624237: am 8d2c6b83: Merge "Skip bitmaps with 0 dimension." into gb-ub-photos-carlsbad * commit '9f3f0fa035288787d7f64e110704080dc89688a9':
|
a8964679e774818a719a0f276305df51b60f046e |
30-Apr-2014 |
Alan Newberger <alann@google.com> |
am 8f32473b: (-s ours) am 5fff50b6: am 5f6b50de: Add back button handlng to CameraActivity. * commit '8f32473baf3655681d40ea649a1172e0104bb1a4':
|
854ebc471598879db6ad164bdd59b038ae870d23 |
30-Apr-2014 |
Alan Newberger <alann@google.com> |
am fc207c7a: (-s ours) am 0b51d31c: am 2581af9b: Merge "add up button support for filmstrip" into gb-ub-photos-carlsbad * commit 'fc207c7ae2becc4cd02a8a51088396205efa8743':
|
bece15c8b8d6ccc37e6069fc5abf9b129f828f97 |
30-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
am 951b41ac: (-s ours) am c36e3561: am 1b44336b: Merge "Let the Camera app remember which mode it was started in last." into gb-ub-photos-carlsbad * commit '951b41ac7087997c088dc43f69d088601ee592c6':
|
99c11f801690188b45239ce650ae90da4cdeefb8 |
30-Apr-2014 |
Baligh Uddin <baligh@google.com> |
am 9726d282: (-s ours) am 5c285d9c: (-s ours) am 6447ef1e: (-s ours) Import translations. DO NOT MERGE * commit '9726d2824862ee28a4db72953fd5d181ab81017f':
|
8c3e907eeec4ba5d44380380d82c80bbbdfec29c |
30-Apr-2014 |
Doris Liu <tianliu@google.com> |
am 43b75343: (-s ours) am d24a8d30: am b3d4d8e5: Merge "Fix gap between camera controls and nav bar" into gb-ub-photos-carlsbad * commit '43b75343803de33c55706d136c250532ba39814c':
|
29861bd18cfc7c6a5c9f245d6e8c90bc24408e65 |
30-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
am 7c7cf256: (-s ours) am 4feab753: am c09c5f03: Merge "Fix of memory issues with bitmaps in filmstrip." into gb-ub-photos-carlsbad * commit '7c7cf256269343e3b3e10575b601b59fa760e457':
|
366f87370c9997c1fcd94e3e23919b3767135a30 |
30-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
am 863fd808: (-s ours) am 3a5c8362: am f3d3a5c6: Merge "Disable shutter button while picture is being taken." into gb-ub-photos-carlsbad * commit '863fd8089276f355014550546821903fec4c73d7':
|
3c2226a608b8bad91ba65c5ca17886befe3de987 |
30-Apr-2014 |
Doris Liu <tianliu@google.com> |
am 8e1e749d: (-s ours) am b7a8e45e: am 8de13111: 1:1 zoom integration * commit '8e1e749d751efc62ec69a37c78500d3a9872f7d8':
|
1cfbca07c51818372d2614aba2bc38e3dcbc3955 |
30-Apr-2014 |
Doris Liu <tianliu@google.com> |
am e914c060: (-s ours) am 734c25b9: am 0df03318: Merge "Flip capture thumb when using front facing camera" into gb-ub-photos-carlsbad * commit 'e914c060fa847b24c9a5a2b4fd7a14093984b926':
|
b6b17cc321c2c118fcf25b2c64482f227d24fa76 |
30-Apr-2014 |
ztenghui <ztenghui@google.com> |
am 268e1ad7: (-s ours) am 72b0220a: am 2d1c49c2: Merge "Add rotate support in Film Strip" into gb-ub-photos-carlsbad * commit '268e1ad75e3c46d30b51087cc57851c37d6f2580':
|
f2bbe222087febb0a59576274109317817cd48b4 |
30-Apr-2014 |
Tenghui Zhu <ztenghui@google.com> |
am 4b422b02: (-s ours) am 659df48f: am 09d5983d: Merge "Revert "Add rotate support in Film Strip"" into gb-ub-photos-carlsbad * commit '4b422b02b0cd3eb639cd8da9d80cc6119b805f4e':
|
151ff0e91496d5d11dba942fd2ac79189301a8f8 |
30-Apr-2014 |
ztenghui <ztenghui@google.com> |
am d5f7d83c: (-s ours) am 7cd724ae: am 80e2e1ec: Merge "Add rotate support in Film Strip" into gb-ub-photos-carlsbad * commit 'd5f7d83c1bb4e8585c93b81c36d7e324fcbb4112':
|
239b8293fd8a0f4420e49823c768b756d7b26040 |
30-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
am 558c58da: (-s ours) am f4d1ee6e: am 7446e9fd: Use the well-translated camera_label instead of app_name. * commit '558c58dae93a13d24ceedea26f8e0ee1c52fe6b7':
|
166cf42f5c8f36e9323c283aa79ebe4f21924d39 |
30-Apr-2014 |
Mangesh Ghiware <mghiware@google.com> |
am f66afcb9: (-s ours) am accdf4ca: am 18d1d26a: Merge "Bring back Share to filmstrip" into gb-ub-photos-carlsbad * commit 'f66afcb9b503805f143065e2068ebc8563c7c2fa':
|
bbed1dbc917a4f696f1942c3f4cd308503165a0f |
30-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
am 92581f9c: (-s ours) am 8ada875a: am 00279bbc: Merge "Remove RefocusHelper." into gb-ub-photos-carlsbad * commit '92581f9cd82646c919cba83b3cf3338a8bed94de':
|
b179bbe7f54ac7a606afcd4a3e7e57c5246a44d0 |
30-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
am 174ebdd4: (-s ours) am 5d26fdfd: am 143eb46b: Merge "Remove Refocus string and icon" into gb-ub-photos-carlsbad * commit '174ebdd46e809eff1697b88bf29c99f95fd5b4b6':
|
eb362e0e7b8c567fd86a1758d37b944ae4761618 |
30-Apr-2014 |
Yu Shan Emily Lau <yslau@google.com> |
am 48f94999: (-s ours) am 1cc08fea: Merge "Adding back the camera tests to KLP-DEV after sorting them out in UB." into klp-dev * commit '48f9499953cc0b24a04c815a46d67b0ed8099d54':
|
988c705ea87d98256baca1260becc57eea4a6f7a |
30-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
am 96fceea0: (-s ours) am d9114beb: am 3be7f94c: Make parsing integers for details dialog more robust. * commit '96fceea07eef796bc6de38da2f5fe033cba236e4':
|
8b10360cfdf1b5fdfa9268c5268515cd656f0806 |
30-Apr-2014 |
Angus Kong <shkong@google.com> |
am 5da48574: (-s ours) am 919284cf: am 80af7dd8: Fix full-screen swipe layout. * commit '5da48574eae9856835247d82436230b544ec8975':
|
d720d9211718da230766959b399139bf79d09b8c |
30-Apr-2014 |
Angus Kong <shkong@google.com> |
am d1e70234: (-s ours) am dfb722fd: am a2818f58: Merge "Bring back undo delete confirmation." into gb-ub-photos-carlsbad * commit 'd1e70234619067b47367f124f24ddf8241aae33f':
|
d078d3bbae168dcb93ec27d2509c32814e94146f |
30-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
am 651c18fe: (-s ours) am f2b312dd: am e2fb9943: Proper I18N of the Details dialog, especially for RTL. * commit '651c18fee420b1b5eae1655d43c4b13d6289d1d7':
|
28c4c0c629b1c0c3f07e48c149bc35720ef2754b |
30-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
am 6196fadc: (-s ours) am 779160b3: am 00373f8a: Merge "Speed up filmstrip by not decoding with default 3000px." into gb-ub-photos-carlsbad * commit '6196fadc87d07d1269ed121b2423662c6b3eebbf':
|
8edbafc3daf0c467e3b3db900356e7759e67c42a |
30-Apr-2014 |
Doris Liu <tianliu@google.com> |
am 26a5082d: (-s ours) am d567d7d5: am ce2acbcb: Fix preview thumb orientation * commit '26a5082dbcf2b324550a0a44c7eb907fff086f67':
|
dfaacc98d122992dbf4347a6bd98e1e236d70930 |
30-Apr-2014 |
Angus Kong <shkong@google.com> |
am 7b1e22c7: (-s ours) am 0174828e: am f737ac48: Merge "Add support to "go-to-next" in film strip." into gb-ub-photos-carlsbad * commit '7b1e22c7d0083cc6da935f65bbf234b51258db52':
|
cf8e2d74b901bae71d9da8089ec0519afe983d1a |
30-Apr-2014 |
Doris Liu <tianliu@google.com> |
am 9191a598: (-s ours) am 64335cf3: am 56f16746: Merge "Fix video capture animation and video snapshot animation" into gb-ub-photos-carlsbad * commit '9191a598d8204d2756cc05564bdd6faeda1cb585':
|
446086ab216d8898298da83bcaf1409090ad0bc8 |
30-Apr-2014 |
Angus Kong <shkong@google.com> |
am d7f7649a: (-s ours) am 10096771: am 15396ca6: Merge "Fix delete animation in fullscreen mode." into gb-ub-photos-carlsbad * commit 'd7f7649add68ee85376e3cda81ffa5cf00c2bd7a':
|
58e5e43ca0b2802ed4b7c1bc3fe17f3b4df56dd0 |
30-Apr-2014 |
Angus Kong <shkong@google.com> |
am 963718bf: (-s ours) am 0d9217b4: am 7e374eb0: Stop the MediaSaveService after unbinding. * commit '963718bf313e849209f8acb050a58ac8016430d9':
|
e533ce604d15d69ce05063812a13b88baca2afaa |
30-Apr-2014 |
Angus Kong <shkong@google.com> |
am d43c559e: (-s ours) am ef851bf2: am 025136bb: Support filmstrip swipe in full-screen. * commit 'd43c559eb98bc0c431f5e1db196d2efc51a4dcc7':
|
3518b80c9e41416c147fd0b7673ae2722c677001 |
30-Apr-2014 |
Angus Kong <shkong@google.com> |
am fffbdc3f: (-s ours) am 78ad4a5a: am 87025351: Merge "Update the final PhotoSphere result correctly." into gb-ub-photos-carlsbad * commit 'fffbdc3f9b964d7d0414ae0ab811a3aa5bf6ff03':
|
81c99e50cc84351f7accfe0198e6c1f554d1cab7 |
30-Apr-2014 |
Doris Liu <tianliu@google.com> |
am 11dbe8af: (-s ours) am de07dbb6: am 304a6360: Merge "Fix nav bar overlapping camera bottom UI controls" into gb-ub-photos-carlsbad * commit '11dbe8af9d5656ae618ebb0c64e4d24321b5e3de':
|
a3c71231b5cbb74da8b3e5ce3f344f8e908c28a7 |
30-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
am 97ff12f9: (-s ours) am fd791ba4: am b5ca24e7: Merge "Remove the "button" part of the shutter button description." into gb-ub-photos-carlsbad * commit '97ff12f9ec3bef714d0434af5fb1691c65f38f45':
|
5c16f836dd980d9e55359ef75d617315ebeccaf1 |
30-Apr-2014 |
Doris Liu <tianliu@google.com> |
am 00a2e30d: (-s ours) am 2acc6ac5: am d7e01e25: Merge "Fix video snapshot aspect ratio" into gb-ub-photos-carlsbad * commit '00a2e30d5053a76e1b8474e5bbeecfa6ea699f75':
|
435ee1bc2089484e72aea045b92dcca635c715dc |
30-Apr-2014 |
Doris Liu <tianliu@google.com> |
am a0b114fa: (-s ours) am b8ff43a2: am 2b18ecec: Merge "Make camera preview full screen" into gb-ub-photos-carlsbad * commit 'a0b114fa27c91fcf742e68308db179c39c10f914':
|
2db0f43bc6a0a0b6d6a963acca1cb2bfe7305642 |
30-Apr-2014 |
Jason Noguchi <jnoguchi@google.com> |
am fc30eda1: (-s ours) am 17525fee: am 5ad4114f: (-s ours) Merge "Updating the Camera tests makefile and source to reflect recent split between camera and gallery apps." into gb-ub-photos-carlsbad * commit 'fc30eda12b5d1a1e0ad073c9137bfeed26540a50':
|
6bca84634b2f2c8390b2541013848411fe4af83f |
30-Apr-2014 |
Doris Liu <tianliu@google.com> |
am 6fa6de7a: (-s ours) am d049c85e: am 13ca71eb: Fix squished preview * commit '6fa6de7a4a12b6e09153fd35e057930e07e1cb8c':
|
6eba471268a1482b2c6f6f5ec470c0c62f56c608 |
30-Apr-2014 |
nicolasroard <nicolasroard@google.com> |
am 4921b308: (-s ours) am 9fd5ee8a: am 0819304b: Add "set as" capability in Film Strip * commit '4921b308d9b40a6f2ba7b3c5a7c1d91bd089cf66':
|
a44ea1dd7cd4df74583e8ae4a2435ec0516a749e |
30-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
am 054e5237: (-s ours) am cf43f817: am 722c8607: Rename accessibility text for Photo Sphere mode from \'new panorama\'. * commit '054e5237e9f901f1603c8f59c593b897e8ac7f15':
|
ad476d14a7f50031e02e56993059cc26c1da7ad1 |
30-Apr-2014 |
Angus Kong <shkong@google.com> |
am 31ffcf37: (-s ours) am 49ab978a: am b269061d: Merge "Implement deletion in the menu." into gb-ub-photos-carlsbad * commit '31ffcf377e348aeaea273f50c691037c140b59ef':
|
069d2ee964b0917d6b5abdfb96fefbdad4a23d00 |
30-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
am 08ae9e64: (-s ours) am 32ba33c6: am b0a5929b: Add video details to the details menu * commit '08ae9e647fbc9a35181ed0db5d982cce5791b3f5':
|
5fa9b8f677f21a4df8505f5a1074ed1cf3a58995 |
30-Apr-2014 |
ztenghui <ztenghui@google.com> |
am ac8455c9: (-s ours) am 397586f0: am 99a5ef6f: Merge "Update the action bar style to match Bryce" into gb-ub-photos-carlsbad * commit 'ac8455c9760ef793303d3f61f86a3cd09f774798':
|
4f58b91ccce15b7f532274d809b86a0104492b4d |
30-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
am fe0655c5: (-s ours) am 119bd7ec: am e98a59af: Merge "Don\'t refresh item on resume as it leads to a filmstrip bug." into gb-ub-photos-carlsbad * commit 'fe0655c5b50b5a3d3036b5f84cdd49445f1db9f7':
|
8cbe5cf2dc55c56076dff16fed4d473ac828e3ed |
30-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
am f39b9612: (-s ours) am b030d20d: am 58dfa0fb: Merge "Enable switching cameras in video mode." into gb-ub-photos-carlsbad * commit 'f39b9612dbfdea114c01ad6b3247f9d4378418ff':
|
ee4b312eb7041d4511b585ce5ac5a0daf5a25c6d |
30-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
am 1b27950b: (-s ours) am 2c9dc8eb: am 88ef7664: Bring back the bottom controls in Filmstrip. * commit '1b27950b1f52a70b78372f661e28ee83c9ea91cf':
|
cf8810b5164abc83a03011b96f545fea5bdad8cf |
30-Apr-2014 |
ztenghui <ztenghui@google.com> |
am 45bd3fe4: (-s ours) am 1a7fed5f: am 1571239c: Merge "Add the trim functionality back to FilmStripView" into gb-ub-photos-carlsbad * commit '45bd3fe4581677f4da04d4c558930244e60ada25':
|
92c917a1d941d6a0f3a64644bad9ce5236c19f2d |
30-Apr-2014 |
Doris Liu <tianliu@google.com> |
am 957da61b: (-s ours) am c5541a55: am e9d3428f: Merge "Add image 1:1 support" into gb-ub-photos-carlsbad * commit '957da61b9229361723f5df310e758033131519f5':
|
1bdb9a05dfba0434261abc19ea9ead25462f530c |
30-Apr-2014 |
Mangesh Ghiware <mghiware@google.com> |
am 03ce0b53: (-s ours) am 34a3b7fb: am 856d7ec4: Merge "Add back intent-filter for default category and main action." into gb-ub-photos-carlsbad * commit '03ce0b5310ed9edf78bd323ab00f1ed760701421':
|
97f6cfa48e8ae035c992adc1262cd05dd3abe53a |
30-Apr-2014 |
Angus Kong <shkong@google.com> |
am db109f7c: (-s ours) am 9e06215e: am 4ff5a1ab: Set views in filmstrip invisible when alpha = 0. * commit 'db109f7c9c058690c556430b2e3a9819b2599e15':
|
ab00548e201edd5becf8fb0d099a200fe5ccef72 |
30-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
am df651ff6: (-s ours) am 81d517a4: am 394023fb: Single-tap in fullscreen view toggles ActionBar. * commit 'df651ff65909e92fdc6b1189d857fe847688dd71':
|
26c022d49c6a6f7dccb6e06f1e4ae2e2f2d1a93c |
30-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
am 2cd5b165: (-s ours) am e14044ee: am fae11a16: Implent show-on-map functionality. Also make sure the show-on-map item is only shown for items with coordinates. and add the coordinate to the details view. * commit '2cd5b16540fae98487c639f6d2e84be52561003a':
|
d7b985a32ec7908f21f3041c31a1bce77b441c5f |
30-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
am d0fcc1bd: (-s ours) am ac87189c: am 29a27c76: Merge "Brings back the details menu with most EXIF data in it. Some are still missing and will come back later." into gb-ub-photos-carlsbad * commit 'd0fcc1bdc9e019179a3b2c69a632cc177e947be9':
|
7b624a76cde80b7d113e465c0b9995134bf37bfd |
30-Apr-2014 |
Dan Aminzade <monzy@google.com> |
am 2b3cee71: (-s ours) am 18aafe57: am fca1c5ec: Defining broadcast intent strings as constants in CameraUtil.java. For now I\'m leaving the definition within the Camera application. If we decide we want to publicize and document these intents as part of the Android API, we cou * commit '2b3cee71446e2468b534ac51103732c3d1e137ac':
|
69904482bb96a91119001724a3e6f623213bbfca |
30-Apr-2014 |
Angus Kong <shkong@google.com> |
am 8fc1610d: (-s ours) am a6e1f342: am 7e1c5fe2: Single tap to full screen mode. * commit '8fc1610d1eb6c91cf456bd522407e8cc0a41bf76':
|
591e0d581790727b6cddc34ac62d7b7a38f6f2d6 |
30-Apr-2014 |
Angus Kong <shkong@google.com> |
am c7283d99: (-s ours) am 690eba37: am 0689254e: Merge "Make current view center in filmstrip." into gb-ub-photos-carlsbad * commit 'c7283d9947482586e2a20b98028e86a4f2035f35':
|
b6b59ea523b22f5638efcc70408d460afd47290e |
30-Apr-2014 |
Dan Aminzade <monzy@google.com> |
am 139f3abf: (-s ours) am d0a780dc: am 92ae10ec: Add support for remote shutter control via broadcast intents. Send CAMERA_STOPPED and CAMERA_STARTED intents on pause/resume, to notify Gem to hide and show the camera card, and receive the SHUTTER broadcast intent to trigger the * commit '139f3abfa778e1280c5efc2f2b3b47237507b362':
|
991351d7f84c65bebc49bbb56bf10da245c898ac |
30-Apr-2014 |
The Android Open Source Project <initial-contribution@android.com> |
am 845dadec: (-s ours) Reconcile with klp-release - do not merge * commit '845dadec2a2cc619d316c44e706b15eba4d75293':
|
fad21ef3ec92e34f3974946456dc3b173eca066f |
30-Apr-2014 |
The Android Automerger <android-build@google.com> |
merge in master-release history after reset to a8e77ab86849156ea91758d1c1128f57ac5b7d21
|
46836730f2f4f872c90a108a0dac3c12dfaa663b |
30-Apr-2014 |
Doris Liu <tianliu@google.com> |
Log warning when video snapshot is requested on devices not supporting it Bug: 14413599 Change-Id: I483c3a02f39ca84f4d4a6d36f832e47276d70a38
rc/com/android/camera/VideoModule.java
|
6ed7d01df57498492b1ad6ff398fcfc1c670c653 |
30-Apr-2014 |
Spike Sprague <spikuru@google.com> |
am 48a38062: build broke, here\'s a fix * commit '48a380627793dfc11070505d5493bd8eb948969e': build broke, here's a fix
|
48a380627793dfc11070505d5493bd8eb948969e |
30-Apr-2014 |
Spike Sprague <spikuru@google.com> |
build broke, here's a fix Change-Id: Ifc2399e9c971aa9eb278b0b0b5c2cf4aac82509e
rc/com/android/camera/VideoModule.java
|
a6dda14e7a32e19711ede47223a24d9d715e2d5c |
30-Apr-2014 |
Spike Sprague <spikuru@google.com> |
am 6db1236e: resolved conflicts for merge of e903ae3f to ub-camera-everglades * commit '6db1236ecd6b33b4fd1042570cc0d725634a5276': fix free space calculation / querying timing problem
|
fba6d18904fb719a64fb99fd3174063258559d51 |
30-Apr-2014 |
Bill Yi <byi@google.com> |
am ece4866d: Merge commit \'f9525d410de0b840f0da5a8659734f91a66f8ed2\' into HEAD * commit 'ece4866dc575b956801f6dab2d6c4923e272c5fa':
|
6db1236ecd6b33b4fd1042570cc0d725634a5276 |
30-Apr-2014 |
Spike Sprague <spikuru@google.com> |
resolved conflicts for merge of e903ae3f to ub-camera-everglades Change-Id: Ic0ea3fdfd5bad7ea3a576c3bc1ab7fddd7b557bc
|
e903ae3fc0fc7a98bfc21129ac7ca8ee7ce98fec |
30-Apr-2014 |
Spike Sprague <spikuru@google.com> |
Merge "fix free space calculation / querying timing problem" into gb-ub-photos-denali
|
e6374b76bd10c7e9120b8530b2dae0f4b321ceea |
26-Apr-2014 |
Spike Sprague <spikuru@google.com> |
fix free space calculation / querying timing problem also, be (a little) more agressive about updating available storage space so app generally has the most up-to-date space calculation more often bug: 14275001 Change-Id: I1aa91419be017f1248bb4b3b0aa805bd4e1b05c6
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/VideoModule.java
|
43d2ac50995ae02216657f6541e610a476add460 |
30-Apr-2014 |
Doris Liu <tianliu@google.com> |
am 85cb6f2c: am 7f714038: Merge "Fix abrupt opacity change in mode switcher when a mode is selected" into gb-ub-photos-denali * commit '85cb6f2cbf4d3506a3cf423941f0e25f41f0b280': Fix abrupt opacity change in mode switcher when a mode is selected
|
85cb6f2cbf4d3506a3cf423941f0e25f41f0b280 |
30-Apr-2014 |
Doris Liu <tianliu@google.com> |
am 7f714038: Merge "Fix abrupt opacity change in mode switcher when a mode is selected" into gb-ub-photos-denali * commit '7f7140385c9a3811328fea3ca1c915809132fe6f': Fix abrupt opacity change in mode switcher when a mode is selected
|
7f7140385c9a3811328fea3ca1c915809132fe6f |
30-Apr-2014 |
Doris Liu <tianliu@google.com> |
Merge "Fix abrupt opacity change in mode switcher when a mode is selected" into gb-ub-photos-denali
|
ba01f86cac95ddb6f68cc628689df99f97c3059f |
30-Apr-2014 |
Doris Liu <tianliu@google.com> |
am 472e1ab8: Merge "Add affordance to toggle mode switcher and filmstrip for accessiblity" into ub-camera-everglades * commit '472e1ab8f5486ff40a9e8b1cb3da141ac63aaa7c': Add affordance to toggle mode switcher and filmstrip for accessiblity
|
472e1ab8f5486ff40a9e8b1cb3da141ac63aaa7c |
30-Apr-2014 |
Doris Liu <tianliu@google.com> |
Merge "Add affordance to toggle mode switcher and filmstrip for accessiblity" into ub-camera-everglades
|
dfb5a6f356f3287c5cc9cac20948ec14c1f68a35 |
29-Apr-2014 |
Doris Liu <tianliu@google.com> |
Add affordance to toggle mode switcher and filmstrip for accessiblity Bug: 14109115 Bug: 14106588 Change-Id: Ie5eea0f942739f2f0a1088ba7d568189bfe02b6b
es/layout/camera.xml
es/values/strings.xml
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/app/CameraAppUI.java
rc/com/android/camera/ui/ModeListView.java
|
bee2022d8dcde61d2b0c6cf9b709d8e34cdcb739 |
30-Apr-2014 |
Doris Liu <tianliu@google.com> |
Fix abrupt opacity change in mode switcher when a mode is selected Bug: 14408761 Change-Id: Icb526fd30fe764322f0fd6158b4d47eb0540bb30
rc/com/android/camera/ui/ModeListView.java
rc/com/android/camera/widget/AnimationEffects.java
|
21eb943e8dc465e89f8805a6041e05a3f27ac344 |
29-Apr-2014 |
Baligh Uddin <baligh@google.com> |
am 477d260a: (-s ours) am 5a3e74eb: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-denali * commit '477d260a9d5dd5287406c7f417cd5ef3aaa21d18': Import translations. DO NOT MERGE
|
477d260a9d5dd5287406c7f417cd5ef3aaa21d18 |
29-Apr-2014 |
Baligh Uddin <baligh@google.com> |
am 5a3e74eb: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-denali * commit '5a3e74eb0ebf75850a2d14fae598399c3e441b04': Import translations. DO NOT MERGE
|
bc92f2618402dd55ddbe42dd2269a1e7a28c4216 |
29-Apr-2014 |
Baligh Uddin <baligh@google.com> |
am 192edd1e: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-everglades * commit '192edd1e4aa69cfd987cb0d3d836b86c532e1175': Import translations. DO NOT MERGE
|
5a3e74eb0ebf75850a2d14fae598399c3e441b04 |
29-Apr-2014 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-denali
|
192edd1e4aa69cfd987cb0d3d836b86c532e1175 |
29-Apr-2014 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into ub-camera-everglades
|
ece4866dc575b956801f6dab2d6c4923e272c5fa |
29-Apr-2014 |
Bill Yi <byi@google.com> |
Merge commit 'f9525d410de0b840f0da5a8659734f91a66f8ed2' into HEAD
|
38e3f58b48a40abbffb6f75e7e280c52c3b9f175 |
29-Apr-2014 |
The Android Automerger <android-build@google.com> |
merge in master-release history after reset to a8e77ab86849156ea91758d1c1128f57ac5b7d21
|
62d6cb34b66ce81c5bba101b24915576545cad56 |
29-Apr-2014 |
Andy Huibers <andyhuibers@google.com> |
am 311372eb: am eaaf2930: Add logging for failure conditions. * commit '311372eb258ed6f3cf28f092ab529d3ff65020bb': Add logging for failure conditions.
|
311372eb258ed6f3cf28f092ab529d3ff65020bb |
29-Apr-2014 |
Andy Huibers <andyhuibers@google.com> |
am eaaf2930: Add logging for failure conditions. * commit 'eaaf29303c48c2befe216151bf9bedc008a1b616': Add logging for failure conditions.
|
eaaf29303c48c2befe216151bf9bedc008a1b616 |
28-Apr-2014 |
Andy Huibers <andyhuibers@google.com> |
Add logging for failure conditions. Bug: 14364757 Change-Id: I252b1d79b94dabdc8960c7e243c50c8d50cb1306
rc/com/android/camera/CameraActivity.java
rc_pd/com/android/camera/util/UsageStatistics.java
|
d676f0950be0319ae4e4e06dfea43ec65e3d3215 |
29-Apr-2014 |
Angus Kong <shkong@google.com> |
am b65117fb: am 1b9d4fb6: Add history info for camera open failure log. * commit 'b65117fbce9a0dc6d7568a6b7b802baf5df6ead5': Add history info for camera open failure log.
|
b65117fbce9a0dc6d7568a6b7b802baf5df6ead5 |
29-Apr-2014 |
Angus Kong <shkong@google.com> |
am 1b9d4fb6: Add history info for camera open failure log. * commit '1b9d4fb6f649262e491c0fa743229b4930a87802': Add history info for camera open failure log.
|
1b9d4fb6f649262e491c0fa743229b4930a87802 |
25-Apr-2014 |
Angus Kong <shkong@google.com> |
Add history info for camera open failure log. bug:14365703 Change-Id: I4b2259e12121cac5b8165f5c5dbacf9cb3a936a6
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/app/AndroidCameraManagerImpl.java
rc/com/android/camera/app/CameraController.java
rc/com/android/camera/app/CameraManager.java
|
ee7ea64656c2a898230ef0a31920e88e71e98209 |
28-Apr-2014 |
Angus Kong <shkong@google.com> |
am dafb9214: am 51a09680: Notify DataAdapter.Listener the changes of data. * commit 'dafb921412409c6884e8f9d44cba3da214489ce7': Notify DataAdapter.Listener the changes of data.
|
dafb921412409c6884e8f9d44cba3da214489ce7 |
28-Apr-2014 |
Angus Kong <shkong@google.com> |
am 51a09680: Notify DataAdapter.Listener the changes of data. * commit '51a09680b57aca64db91aaea11c11ca4b86a296b': Notify DataAdapter.Listener the changes of data.
|
51a09680b57aca64db91aaea11c11ca4b86a296b |
28-Apr-2014 |
Angus Kong <shkong@google.com> |
Notify DataAdapter.Listener the changes of data. The DataAdapter.Listener should be notified the changes of data due to the metadata change. bug:14279339 Change-Id: Ia6b7302a6967c10a53557d6953fa7888955e13a0
rc/com/android/camera/data/CameraDataAdapter.java
|
3b01117f21a8e728b9fb7f2533560d9da03663db |
28-Apr-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I5818776320d7d6e6dc770e05dad2776ef3fa7772 Auto-generated-cl: translation import
es/values-de/strings.xml
|
f305b4b7212babccc8ad7c7ce1e54e1c82eae19a |
28-Apr-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I355fea34ebf64b33482f053338468bff6abdfae5 Auto-generated-cl: translation import
es/values-de/strings.xml
|
51e9fe62030e7c5520c7a533f7711c2994741964 |
28-Apr-2014 |
Doris Liu <tianliu@google.com> |
am c7e85540: (-s ours) am a8e77ab8: (-s ours) Merge "DO NOT MERGE - Shutter button left handed support" into gb-ub-photos-denali * commit 'c7e85540010d43f905d94886304ea0a52be59831': DO NOT MERGE - Shutter button left handed support
|
0b7fc9be45f61c8e90889ac1a9a20ee2b4f6b45b |
28-Apr-2014 |
Doris Liu <tianliu@google.com> |
am 1fb5e00f: am e5ba601d: Merge "Bring back video snapshot" into gb-ub-photos-denali * commit '1fb5e00f051462ebe81b3e9c923608cbb553246e': Bring back video snapshot
|
2a57de2c563198f110a09da6d0dee8ffab2f7845 |
28-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
am 677a5b9b: am df8a3327: Avoid duplicate entries in the resolutions list. * commit '677a5b9bc43ed30cc7b4df9db7848deb6b45e93b': Avoid duplicate entries in the resolutions list.
|
5232c863075d02ce535ba935d7b1d107bcc3f576 |
28-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
am 4f1f5ece: am 837d8524: Properly remove the settings for an unavailable camera. * commit '4f1f5ecea11a8f06d213ea0aa963903882c4d727': Properly remove the settings for an unavailable camera.
|
8c239f062c98101bc34bb3d8111a61566bafc8ef |
28-Apr-2014 |
Doris Liu <tianliu@google.com> |
am 8a2bd564: (-s ours) am 8afc8e2e: (-s ours) DO NOT MERGE - Refactor preview position logic * commit '8a2bd564ecdb5218cd7e55e27600b562f9d27f16': DO NOT MERGE - Refactor preview position logic
|
c7e85540010d43f905d94886304ea0a52be59831 |
28-Apr-2014 |
Doris Liu <tianliu@google.com> |
am a8e77ab8: (-s ours) Merge "DO NOT MERGE - Shutter button left handed support" into gb-ub-photos-denali * commit 'a8e77ab86849156ea91758d1c1128f57ac5b7d21': DO NOT MERGE - Shutter button left handed support
|
1fb5e00f051462ebe81b3e9c923608cbb553246e |
28-Apr-2014 |
Doris Liu <tianliu@google.com> |
am e5ba601d: Merge "Bring back video snapshot" into gb-ub-photos-denali * commit 'e5ba601d4e3aa9419886e2ea4b3b2e5ba3d3e2e7': Bring back video snapshot
|
677a5b9bc43ed30cc7b4df9db7848deb6b45e93b |
28-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
am df8a3327: Avoid duplicate entries in the resolutions list. * commit 'df8a332710bbb1f2beee90b2b91f706c49ef5701': Avoid duplicate entries in the resolutions list.
|
4f1f5ecea11a8f06d213ea0aa963903882c4d727 |
28-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
am 837d8524: Properly remove the settings for an unavailable camera. * commit '837d8524a35731ce01e2a69fde846edc21b94071': Properly remove the settings for an unavailable camera.
|
8a2bd564ecdb5218cd7e55e27600b562f9d27f16 |
28-Apr-2014 |
Doris Liu <tianliu@google.com> |
am 8afc8e2e: (-s ours) DO NOT MERGE - Refactor preview position logic * commit '8afc8e2eaaa4fdeef3cf9060cc69613d37804f56': DO NOT MERGE - Refactor preview position logic
|
a8e77ab86849156ea91758d1c1128f57ac5b7d21 |
26-Apr-2014 |
Doris Liu <tianliu@google.com> |
Merge "DO NOT MERGE - Shutter button left handed support" into gb-ub-photos-denali
|
e5ba601d4e3aa9419886e2ea4b3b2e5ba3d3e2e7 |
26-Apr-2014 |
Doris Liu <tianliu@google.com> |
Merge "Bring back video snapshot" into gb-ub-photos-denali
|
057b21a03d71e92a7bf5d086059011d1976c4631 |
26-Apr-2014 |
Doris Liu <tianliu@google.com> |
Bring back video snapshot Bug: 14220490 Change-Id: Ibf20d169aae9de4eb9c1e2151d9c7335bcf7b3a3
rc/com/android/camera/VideoModule.java
rc/com/android/camera/app/AndroidCameraManagerImpl.java
|
6dba051a83b6bb569736c2cce6d55820ec596aab |
26-Apr-2014 |
Doris Liu <tianliu@google.com> |
am 344320c9: Shutter button left handed support * commit '344320c90639f823451ddac42e8f39b74727787c': Shutter button left handed support
|
4931664284b9473b705b2e278d5bf5d939d7887c |
22-Apr-2014 |
Doris Liu <tianliu@google.com> |
DO NOT MERGE - Shutter button left handed support Bug: 12823819 Change-Id: I77bdbf17557bdd9f545b98bab58acce68d01b51d (cherry picked from commit 344320c90639f823451ddac42e8f39b74727787c)
rc/com/android/camera/CaptureLayoutHelper.java
rc/com/android/camera/TextureViewHelper.java
rc/com/android/camera/app/CameraAppUI.java
rc/com/android/camera/ui/MainActivityLayout.java
rc/com/android/camera/widget/ModeOptionsOverlay.java
|
df8a332710bbb1f2beee90b2b91f706c49ef5701 |
25-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
Avoid duplicate entries in the resolutions list. Bug: 14277230 Dup entries indicate that a camera doesn't support at least three entries. Change-Id: Id3c18664637ba9cf80edada924695737863cf3a7
rc/com/android/camera/settings/CameraSettingsActivity.java
rc/com/android/camera/settings/SettingsUtil.java
|
344320c90639f823451ddac42e8f39b74727787c |
22-Apr-2014 |
Doris Liu <tianliu@google.com> |
Shutter button left handed support Bug: 12823819 Change-Id: I77bdbf17557bdd9f545b98bab58acce68d01b51d
rc/com/android/camera/CaptureLayoutHelper.java
rc/com/android/camera/TextureViewHelper.java
rc/com/android/camera/app/CameraAppUI.java
rc/com/android/camera/ui/MainActivityLayout.java
rc/com/android/camera/widget/ModeOptionsOverlay.java
|
f0a4213fc5a31083c7e2693fa0589cde42b04a67 |
25-Apr-2014 |
Angus Kong <shkong@google.com> |
am 00b7b109: Use Point to back up util.Size. * commit '00b7b10987b38c362cc88600aad58890d531bf35': Use Point to back up util.Size.
|
00b7b10987b38c362cc88600aad58890d531bf35 |
25-Apr-2014 |
Angus Kong <shkong@google.com> |
Use Point to back up util.Size. Change-Id: I125d290ee94c9acadf77c50c6c9c0b9b24df4a88
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/VideoModule.java
rc/com/android/camera/settings/CameraSettingsActivity.java
rc/com/android/camera/settings/SettingsUtil.java
rc/com/android/camera/util/CameraUtil.java
rc/com/android/camera/util/Size.java
|
837d8524a35731ce01e2a69fde846edc21b94071 |
24-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
Properly remove the settings for an unavailable camera. Bug: 14108948 Change-Id: I34222ab976a481e8e28ed0bbc8b773dd3d49e8bb
rc/com/android/camera/settings/CameraSettingsActivity.java
|
ea06acf8e4e1031a50ae1dfadfb800174ca90939 |
24-Apr-2014 |
Angus Kong <shkong@google.com> |
am 2c6eabec: Merge "Use util.Size to replace Camera.Size." into ub-camera-everglades * commit '2c6eabec7edbfa159e207449d575fa7bb64a9470': Use util.Size to replace Camera.Size.
|
2c6eabec7edbfa159e207449d575fa7bb64a9470 |
24-Apr-2014 |
Angus Kong <shkong@google.com> |
Merge "Use util.Size to replace Camera.Size." into ub-camera-everglades
|
634246650a5ae72bb80ab4fe4be5da1afa23b684 |
23-Apr-2014 |
Angus Kong <shkong@google.com> |
Use util.Size to replace Camera.Size. Change-Id: I77784d339a09f24afbf96dc5ef4ce2ac2702b356
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/VideoModule.java
rc/com/android/camera/settings/CameraSettingsActivity.java
rc/com/android/camera/settings/SettingsUtil.java
rc/com/android/camera/util/CameraUtil.java
rc/com/android/camera/util/Size.java
|
8afc8e2eaaa4fdeef3cf9060cc69613d37804f56 |
11-Apr-2014 |
Doris Liu <tianliu@google.com> |
DO NOT MERGE - Refactor preview position logic Centralize the logic of laying out bottom bar and transforming preview TextureView based on the total space to lay them out and preview aspect ratio. The layout is updated when either condition above has changed. Then the rect of the bottom bar and preview rect can be queried anywhere. This way, bottom bar, mode options layout, and any view that relies on the preview rect and bottom bar rect can be laid out without extra layout passes. Bug: 13795952 Change-Id: I13c38b566b5b5d8f37ec94f325554c089a86ca8e (cherry picked from commit 28a2950939614a0c1c83787960ce1a218fb69a5e)
es/layout/camera.xml
es/layout/generic_module.xml
es/layout/mode_list_layout.xml
rc/com/android/camera/CaptureLayoutHelper.java
rc/com/android/camera/TextureViewHelper.java
rc/com/android/camera/app/CameraAppUI.java
rc/com/android/camera/ui/BottomBar.java
rc/com/android/camera/ui/BottomBarModeOptionsWrapper.java
rc/com/android/camera/ui/MainActivityLayout.java
rc/com/android/camera/ui/ModeListView.java
rc/com/android/camera/ui/PreviewStatusListener.java
rc/com/android/camera/widget/ModeOptionsOverlay.java
rc/com/android/camera/widget/SettingsButton.java
|
4376165cca65104bc86acd6cdf61184534ead9d7 |
24-Apr-2014 |
Doris Liu <tianliu@google.com> |
am 28a29509: Refactor preview position logic * commit '28a2950939614a0c1c83787960ce1a218fb69a5e': Refactor preview position logic
|
28a2950939614a0c1c83787960ce1a218fb69a5e |
11-Apr-2014 |
Doris Liu <tianliu@google.com> |
Refactor preview position logic Centralize the logic of laying out bottom bar and transforming preview TextureView based on the total space to lay them out and preview aspect ratio. The layout is updated when either condition above has changed. Then the rect of the bottom bar and preview rect can be queried anywhere. This way, bottom bar, mode options layout, and any view that relies on the preview rect and bottom bar rect can be laid out without extra layout passes. Bug: 13795952 Change-Id: I13c38b566b5b5d8f37ec94f325554c089a86ca8e
es/layout/camera.xml
es/layout/generic_module.xml
es/layout/mode_list_layout.xml
rc/com/android/camera/CaptureLayoutHelper.java
rc/com/android/camera/TextureViewHelper.java
rc/com/android/camera/app/CameraAppUI.java
rc/com/android/camera/ui/BottomBar.java
rc/com/android/camera/ui/BottomBarModeOptionsWrapper.java
rc/com/android/camera/ui/MainActivityLayout.java
rc/com/android/camera/ui/ModeListView.java
rc/com/android/camera/ui/PreviewStatusListener.java
rc/com/android/camera/widget/ModeOptionsOverlay.java
rc/com/android/camera/widget/SettingsButton.java
|
43fe228b874e1d116ddca04daec893e325ff8590 |
23-Apr-2014 |
Baligh Uddin <baligh@google.com> |
am 10d904f3: (-s ours) am d2f894e1: (-s ours) Import translations. DO NOT MERGE * commit '10d904f3cb94500122061c2fc0d8997a2e2a798a': Import translations. DO NOT MERGE
|
10d904f3cb94500122061c2fc0d8997a2e2a798a |
23-Apr-2014 |
Baligh Uddin <baligh@google.com> |
am d2f894e1: (-s ours) Import translations. DO NOT MERGE * commit 'd2f894e1706a13c48bba886ff9664f2d8825ca80': Import translations. DO NOT MERGE
|
d2f894e1706a13c48bba886ff9664f2d8825ca80 |
23-Apr-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ide1548522aca9f5614dcc05f1bed282959611946 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-km-rKH/strings.xml
es/values-ko/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mn-rMN/strings.xml
es/values-ms-rMY/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
410c32f1d801c827c971f433dd8f23a8a3365acd |
22-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
Remove SmartCamera (Part 1/2) Bug: 14254411 Change-Id: I09488e8c39fce104a92659a989a275a5f72821bb
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/VideoModule.java
rc_pd/com/android/camera/util/SmartCameraHelper.java
|
f5bb7e170d171b31e359ef81ab5b3429d6edbd9c |
22-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
am 420595e8: (-s ours) Merge "DO NOT MERGE - Remove SmartCamera (Part 1/2)" into ub-camera-everglades * commit '420595e86147a691b9d06baf2e36a533b7e7c7fa': DO NOT MERGE - Remove SmartCamera (Part 1/2)
|
ab62e4e07b60241b24797fc3937b44992cdff5b8 |
22-Apr-2014 |
Angus Kong <shkong@google.com> |
am 7539e492: The coordinatations should be relative. * commit '7539e49296b993be37709f45385a6286618d464d': The coordinatations should be relative.
|
420595e86147a691b9d06baf2e36a533b7e7c7fa |
22-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "DO NOT MERGE - Remove SmartCamera (Part 1/2)" into ub-camera-everglades
|
f9cba4ed77bcac695c3b0a6bc7d20dc9dd07db02 |
22-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
DO NOT MERGE - Remove SmartCamera (Part 1/2) Bug: 14254411 Change-Id: I09488e8c39fce104a92659a989a275a5f72821bb
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/VideoModule.java
rc_pd/com/android/camera/util/SmartCameraHelper.java
|
7539e49296b993be37709f45385a6286618d464d |
22-Apr-2014 |
Angus Kong <shkong@google.com> |
The coordinatations should be relative. The coordinations we got in onLayout() is relative to its parent. FilmstripView doesn't not consider this and the layout can be wrong when it's not fullscreen. Change-Id: Icc3d40a9cb3c805f8b3a8a4652edbfd873296fa8
rc/com/android/camera/widget/FilmstripView.java
|
135216ae78ef35108bcbc97978c003ac89e9782a |
22-Apr-2014 |
Baligh Uddin <baligh@google.com> |
am 98842a62: (-s ours) am beeccf8d: (-s ours) Import translations. DO NOT MERGE * commit '98842a6267052afc13e3e4f31cbb543ff95ee320': Import translations. DO NOT MERGE
|
98842a6267052afc13e3e4f31cbb543ff95ee320 |
22-Apr-2014 |
Baligh Uddin <baligh@google.com> |
am beeccf8d: (-s ours) Import translations. DO NOT MERGE * commit 'beeccf8d6193d0153a1a3f43944ebeff2c5649f7': Import translations. DO NOT MERGE
|
2e7f85e5aa11ac6e4bfeadabdf2cd17517859ebb |
22-Apr-2014 |
Baligh Uddin <baligh@google.com> |
am e4027c46: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-everglades * commit 'e4027c4673a0639ab2a241ccb2dbb3ccdf9909d4': Import translations. DO NOT MERGE
|
e4027c4673a0639ab2a241ccb2dbb3ccdf9909d4 |
22-Apr-2014 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into ub-camera-everglades
|
c3cc3ae6e411e2472f63365189b621d846986b94 |
21-Apr-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I6a0277c0931817b9c1104b63ee108f074988111b Auto-generated-cl: translation import
es/values-zh-rTW/strings.xml
|
b88eed86af1cdab824a7f7dae1f1580e4f9985c7 |
21-Apr-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I652adab5004534bf34ad3baddf81e59b13e8c3b3 Auto-generated-cl: translation import
es/values-zh-rTW/strings.xml
|
beeccf8d6193d0153a1a3f43944ebeff2c5649f7 |
21-Apr-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I17b580bed7ccca78182ecff0eb47484d6ba5f0bc Auto-generated-cl: translation import
es/values-zh-rTW/strings.xml
|
1045fefdf22bd58fa911b100e7db5750f7efa3e6 |
21-Apr-2014 |
Angus Kong <shkong@google.com> |
Create cameradevice package for camera management. Change-Id: I73c69a70736b0b0eb0ef069a7876cf75fee91262
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/CameraErrorCallback.java
rc/com/android/camera/CameraModule.java
rc/com/android/camera/CameraTestDevice.java
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/PhotoUI.java
rc/com/android/camera/VideoModule.java
rc/com/android/camera/app/AndroidCameraManagerImpl.java
rc/com/android/camera/app/CameraController.java
rc/com/android/camera/app/CameraManager.java
rc/com/android/camera/app/CameraManagerFactory.java
rc/com/android/camera/app/CameraProvider.java
rc/com/android/camera/cameradevice/AndroidCameraManagerImpl.java
rc/com/android/camera/cameradevice/CameraManager.java
rc/com/android/camera/cameradevice/CameraManagerFactory.java
rc/com/android/camera/debug/DebugCameraProxy.java
rc/com/android/camera/module/ModuleController.java
rc/com/android/camera/settings/SettingsUtil.java
rc_pd/com/android/camera/util/SmartCameraHelper.java
ests_camera/src/com/android/camera/activity/CameraTestCase.java
|
4cd961400598ffb0c3381a4a1f76216ca6b328b7 |
21-Apr-2014 |
Ying Wang <wangying@google.com> |
am 3c8346e5: am c71e0154: Merge "LOCAL_JNI_SHARED_LIBRARIES now works for both bundled and unbundled build." * commit '3c8346e5229ca1b6a212046c68bcc78a0dc13d61': LOCAL_JNI_SHARED_LIBRARIES now works for both bundled and unbundled build.
|
53efdde1b01b4a98eba5c5dd1ba52985baba3b9a |
19-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Catch potential RTE from Camera." into ub-camera-everglades
|
3fff70c316ff1f3d6ec1cd93e1f34769ebc4f781 |
18-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
Catch potential RTE from Camera. I got this one on a Nexus S running CM. So maybe not a real problem in the wild. But given the amount of errors we see in the wild about camera not connection, we should revisit and see if any of these errors are catchable, like this one. Change-Id: I02421bb6a1b5256bf23c2b5fe81f11a78d02cd57
rc/com/android/camera/app/AndroidCameraManagerImpl.java
|
3c8346e5229ca1b6a212046c68bcc78a0dc13d61 |
19-Apr-2014 |
Ying Wang <wangying@google.com> |
am c71e0154: Merge "LOCAL_JNI_SHARED_LIBRARIES now works for both bundled and unbundled build." * commit 'c71e0154334ae6ebf561a483fbf0bae8ad08d5c5': LOCAL_JNI_SHARED_LIBRARIES now works for both bundled and unbundled build.
|
c71e0154334ae6ebf561a483fbf0bae8ad08d5c5 |
19-Apr-2014 |
Ying Wang <wangying@google.com> |
Merge "LOCAL_JNI_SHARED_LIBRARIES now works for both bundled and unbundled build."
|
877ed336f78fc14bd427d011edbdce2812978d2c |
18-Apr-2014 |
Ying Wang <wangying@google.com> |
LOCAL_JNI_SHARED_LIBRARIES now works for both bundled and unbundled build. Change-Id: If21a4f5ddab6ae9ecb37f6e7ebebef411028b2ef
ndroid.mk
|
264062c014713c05dfb5b122558654b0c994b7fb |
19-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
am e8766be4: Don\'t crash when less than two cameras are present. * commit 'e8766be48ed4c0bd17d68a45152a34fa2c860b94': Don't crash when less than two cameras are present.
|
e8766be48ed4c0bd17d68a45152a34fa2c860b94 |
18-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
Don't crash when less than two cameras are present. Bug: 14108948 Change-Id: Ib288f9fd2bd86f870df22c1fde03184f00cea219
rc/com/android/camera/settings/CameraSettingsActivity.java
|
25d118a3af67af182913ee620c210f36d89ea2a1 |
18-Apr-2014 |
Ying Wang <wangying@google.com> |
LOCAL_JNI_SHARED_LIBRARIES now works for both bundled and unbundled build. Change-Id: If21a4f5ddab6ae9ecb37f6e7ebebef411028b2ef
ndroid.mk
|
1762ef6398b2150657aa040d61ab1cd93faaf4bf |
17-Apr-2014 |
Spike Sprague <spikuru@google.com> |
Merge "trigger remaining storage calculation during init move ic_video_disabled.png icons to res_p" into ub-camera-everglades
|
30f339e53b305de5d95c727f14414419f828527b |
17-Apr-2014 |
Spike Sprague <spikuru@google.com> |
Merge "make manual exposure compensation settings work acrss different devices bug: 13967706" into ub-camera-everglades
|
e055159274e00f33f06ca71cfb4dd871109e6eb1 |
17-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Don't block the main thread on remote shutter code" into ub-camera-everglades
|
a479fcaad5b83c8fbb881f491d93145531b25cba |
12-Apr-2014 |
Spike Sprague <spikuru@google.com> |
make manual exposure compensation settings work acrss different devices bug: 13967706 Change-Id: I2ebe579c8b7df1218546dd888b5bbfb5486e9e55
rc/com/android/camera/ButtonManager.java
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/app/CameraAppUI.java
|
bca64bf23a875c5ebb2e342834550e98a30cd39f |
17-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
Don't block the main thread on remote shutter code Bug: 14135621 The current RemoreShutterBridge is doing a bunch of heavy listing, so it shouldn't happen on the main thread. Change-Id: Ic1a81e7dfd0a2fd5a7424058a6a27c712ed3ca51
rc/com/android/camera/PhotoModule.java
|
2256f1e0566ed5dc6ef8111582cf4ca529c3b627 |
17-Apr-2014 |
Baligh Uddin <baligh@google.com> |
am d6421724: (-s ours) Import translations. DO NOT MERGE * commit 'd64217247310efb38fc75133c896f2bd3cfe5ffb': Import translations. DO NOT MERGE
|
ffc28ccea31d80b9f0b7051ef4d1d3da1db9fd78 |
17-Apr-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ibef54163959c4247f3f6a6db39956b17f3420392 Auto-generated-cl: translation import
es/values-fi/strings.xml
es/values-ka-rGE/strings.xml
es/values-ms-rMY/strings.xml
es/values-ro/strings.xml
es/values-tr/strings.xml
|
d64217247310efb38fc75133c896f2bd3cfe5ffb |
17-Apr-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Iea2b9e573ea8ac74536e955f88b64178095e8205 Auto-generated-cl: translation import
es/values-fi/strings.xml
es/values-ka-rGE/strings.xml
es/values-ms-rMY/strings.xml
es/values-ro/strings.xml
es/values-tr/strings.xml
|
3f67379b38ebd1ff4c460c097b2ed1cca50f74c6 |
15-Apr-2014 |
Spike Sprague <spikuru@google.com> |
trigger remaining storage calculation during init move ic_video_disabled.png icons to res_p bug: 14062023 Change-Id: I93b506ce2c9f669067dc94259e63f44bc9378fea
es/drawable-hdpi/ic_video_disabled.png
es/drawable-mdpi/ic_video_disabled.png
es/drawable-xhdpi/ic_video_disabled.png
es/drawable-xxhdpi/ic_video_disabled.png
es_p/drawable-hdpi/ic_video_disabled.png
es_p/drawable-mdpi/ic_video_disabled.png
es_p/drawable-xhdpi/ic_video_disabled.png
es_p/drawable-xxhdpi/ic_video_disabled.png
rc/com/android/camera/VideoModule.java
|
bc34225d59a7d33fd0c1e0247af84ae11e4ee640 |
16-Apr-2014 |
Sascha Häberling <haeberling@google.com> |
am ace5f7f8: Merge "Fix edge case in supported video quality selection." into gb-ub-photos-denali * commit 'ace5f7f81899341d16bfea70c9bd4ec4b6ca2e56': Fix edge case in supported video quality selection.
|
ace5f7f81899341d16bfea70c9bd4ec4b6ca2e56 |
16-Apr-2014 |
Sascha Häberling <haeberling@google.com> |
Merge "Fix edge case in supported video quality selection." into gb-ub-photos-denali
|
7d3c2dba1afc28d823ef2305109a3f1be24542b3 |
16-Apr-2014 |
Seth Raphael <magicseth@google.com> |
am 1d891fe5: Do not crash when attempting to refocus a deleted image. * commit '1d891fe52f83d7be1d3a7f0b06b6fed327815c0a': Do not crash when attempting to refocus a deleted image.
|
8d85af5f43bf31f4988c616a7e93a09277b20bb4 |
24-Mar-2014 |
Paul Chang <paulchang@google.com> |
Fix edge case in supported video quality selection. Bug: 14108743 If less than three distinct video quality levels are supported, it's possible for getNextSupportedVideoQualityIndex() to return an out-of-range array index. Instead, just return the previous supported video quality -- this appears to be the intended behavior. Change-Id: I089571edf6ff748ce4914f188b4ef844ecb638c2
rc/com/android/camera/settings/SettingsUtil.java
|
1d891fe52f83d7be1d3a7f0b06b6fed327815c0a |
16-Apr-2014 |
Seth Raphael <magicseth@google.com> |
Do not crash when attempting to refocus a deleted image. Bug: 13546660 Change-Id: Ic260811ad2f45a44577609af0dc69a5c55c7fcfd
rc/com/android/camera/session/PlaceholderManager.java
|
604eb9e594f6486fa7c3333222bcbc612f137498 |
16-Apr-2014 |
Seth Raphael <magicseth@google.com> |
am 92f19760: Don\'t update metadata on local data insert. * commit '92f197607eb6303e11f88dc65e7e23614e384615': Don't update metadata on local data insert.
|
92f197607eb6303e11f88dc65e7e23614e384615 |
08-Apr-2014 |
Seth Raphael <magicseth@google.com> |
Don't update metadata on local data insert. It is possible for insert data to be called in a loop with many items, and this will cause un- needed lookups of meta data. The metadata lookup is already handled but the filmstrip lazily, so it is not necessary here. Bug: 13875458 Change-Id: I476eb1d44fa3d089f47b8b16f9be6d3255b4759e
rc/com/android/camera/data/CameraDataAdapter.java
|
fe073c6e57a5511a4c40e787eedb9eb55c729e94 |
15-Apr-2014 |
Doris Liu <tianliu@google.com> |
am 5dd85a13: Avoid using stale parameters to get focus mode in video * commit '5dd85a1399f795284c7f0e632d102b61bb82887a': Avoid using stale parameters to get focus mode in video
|
5dd85a1399f795284c7f0e632d102b61bb82887a |
15-Apr-2014 |
Doris Liu <tianliu@google.com> |
Avoid using stale parameters to get focus mode in video Bug: 13990664 Change-Id: If6a5b1cc9ce7d1ac67f0558a61036f228601b92b
rc/com/android/camera/VideoModule.java
|
0005db921df69ddf8a6cb049aa94be98cc369139 |
15-Apr-2014 |
Baligh Uddin <baligh@google.com> |
am fabcb7c7: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-denali * commit 'fabcb7c74fd7f6c1494902b9504f223c5a16bb26': Import translations. DO NOT MERGE
|
fabcb7c74fd7f6c1494902b9504f223c5a16bb26 |
15-Apr-2014 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-denali
|
54cdec43ce6a8d088922128a34ea02b21c054401 |
15-Apr-2014 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into ub-camera-everglades
|
6f174227f1459a6e71f80e2953acc0162f29f82b |
15-Apr-2014 |
Andy Huibers <andyhuibers@google.com> |
am 2d6a8abe: Merge "Set video-size key for Samsung Brand devices." into gb-ub-photos-denali * commit '2d6a8abe5dd22492dc098a63a33d7d9ea5888999': Set video-size key for Samsung Brand devices.
|
2d6a8abe5dd22492dc098a63a33d7d9ea5888999 |
15-Apr-2014 |
Andy Huibers <andyhuibers@google.com> |
Merge "Set video-size key for Samsung Brand devices." into gb-ub-photos-denali
|
34d73dd0a7335527d2294bb15bda35908c2a05e0 |
15-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
am 0fed7e62: Safeguard callback receiver to prevent crashes. * commit '0fed7e62bfa0d8351b91d3531228a113637963a3': Safeguard callback receiver to prevent crashes.
|
6dcf90c01f7f0e2fddd2d67c39158d15ba53c0a6 |
14-Apr-2014 |
Andy Huibers <andyhuibers@google.com> |
Set video-size key for Samsung Brand devices. Bug: 14060121 Change-Id: I5b8e5b0259a4105b8839112b13e58f2222848c7e
rc/com/android/camera/VideoModule.java
|
0fed7e62bfa0d8351b91d3531228a113637963a3 |
14-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
Safeguard callback receiver to prevent crashes. Bug: 13765929 It is safe to add these checks here. The receiver is only set in the constructor, and it's only created in one place, which is onCreate. And the parameter is the Activity itself, so it can never be null. This means the NPE can only happen if onCameraOpened is called after removeCallbackReceiver is called, which is in onDestroy of the activity. In this case it's safe to exit. Change-Id: Ibffd6d54679b564a11b3e83319896241f2e306ad
rc/com/android/camera/app/CameraController.java
|
c94ca6fdb4b63945802396af8543da8fc0342025 |
14-Apr-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I69d93a38d3052400b10ac110bf2e891a1c96181d Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-km-rKH/strings.xml
es/values-ko/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mn-rMN/strings.xml
es/values-ms-rMY/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
af479c873d8fa8cf9e92f248a3f53b82d9873cd1 |
14-Apr-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I569ed760c80fac566aed673dae4e91aae677e50f Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-km-rKH/strings.xml
es/values-ko/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mn-rMN/strings.xml
es/values-ms-rMY/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
f92d00ba6f0cdeefbcbf711e9043d53bf136026c |
12-Apr-2014 |
Andy Huibers <andyhuibers@google.com> |
am e08bc042: Check zoom enabled check and null check on zoom ratio list. * commit 'e08bc0428d3d5695d029f0b412d98db6ff8ac956': Check zoom enabled check and null check on zoom ratio list.
|
e08bc0428d3d5695d029f0b412d98db6ff8ac956 |
12-Apr-2014 |
Andy Huibers <andyhuibers@google.com> |
Check zoom enabled check and null check on zoom ratio list. Bug: 13987837 Change-Id: I45d3edc42a240c866f151c5e23431cd50eec7bc6
rc/com/android/camera/PhotoModule.java
|
49edf5203a792e5bab355f21eb0548f1baf7a46f |
12-Apr-2014 |
Sascha Häberling <haeberling@google.com> |
am c6ef756c: Merge "Revert "ZoomRatios might not exist, not crash for logging."" into gb-ub-photos-denali * commit 'c6ef756c0eb736c3e43cff13d593f5ad71d2cb7b': Revert "ZoomRatios might not exist, not crash for logging."
|
c6ef756c0eb736c3e43cff13d593f5ad71d2cb7b |
12-Apr-2014 |
Sascha Häberling <haeberling@google.com> |
Merge "Revert "ZoomRatios might not exist, not crash for logging."" into gb-ub-photos-denali
|
c35768c2ba6769fa8cd22ad88f69729ae216fb3d |
12-Apr-2014 |
Sascha Häberling <haeberling@google.com> |
Revert "ZoomRatios might not exist, not crash for logging." This reverts commit de26138f7821e33cac293e9c78c23b5c4612dcd2. Change-Id: Ia788ef858cf2bc8891a5bbbf1a538b49d583247d
rc/com/android/camera/PhotoModule.java
|
a122dc6148fd1f8e95d8b5ac5bb9a3593a43d027 |
12-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Remove an ICS workaround calling stopPreview." into ub-camera-everglades
|
670f46e11526674c46425ee0f54dd066f16b01ee |
12-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
am 08acce5b: (-s ours) Merge "DO NOT MERGE Don\'t call stopPreview after taking a picture on the m8" into gb-ub-photos-denali * commit '08acce5b16beef4be30c5d0567d3452aa7e99c26': DO NOT MERGE Don't call stopPreview after taking a picture on the m8
|
b44cc385e699d0cda1457dd2b9a1548248e9845a |
12-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
Remove an ICS workaround calling stopPreview. Bug: 13966525 Change-Id: I3592906a6220b6af228fa42ef77e5b0d6e19e7b8
rc/com/android/camera/PhotoModule.java
|
08acce5b16beef4be30c5d0567d3452aa7e99c26 |
12-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "DO NOT MERGE Don't call stopPreview after taking a picture on the m8" into gb-ub-photos-denali
|
c089fdce065ef216738dd2854345cc5c02a23b9f |
12-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
DO NOT MERGE Don't call stopPreview after taking a picture on the m8 Bug: 13966525 The proper solution is to remove the stopPreview call completely, but as we have only limited time for testing left, let's be careful and target specific devices only. Change-Id: I5aa90b7c72068bae5352a8396e39a2c82ac137b9
rc/com/android/camera/PhotoModule.java
|
dcb6f94d095b2e15a8c924d986a3d850b7b13b83 |
12-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
am 9ac314fb: Merge "ZoomRatios might not exist, not crash for logging." into gb-ub-photos-denali * commit '9ac314fb42435a090f33e9db051ab0f203484722': ZoomRatios might not exist, not crash for logging.
|
9ac314fb42435a090f33e9db051ab0f203484722 |
12-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "ZoomRatios might not exist, not crash for logging." into gb-ub-photos-denali
|
de26138f7821e33cac293e9c78c23b5c4612dcd2 |
12-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
ZoomRatios might not exist, not crash for logging. Bug: 13987837 Change-Id: I77b8863b60cf5311ffd326015e612dfaeb45daa2
rc/com/android/camera/PhotoModule.java
|
692166545bce2c83fb1053b0312b80e4acf2c7bf |
12-Apr-2014 |
Erin Dahlgren <edahlgren@google.com> |
am 3c62221a: Update mode options with hardware spec whenever hdr setting changes. * commit '3c62221afd869828ba867fce15755a582f2c2334': Update mode options with hardware spec whenever hdr setting changes.
|
3c62221afd869828ba867fce15755a582f2c2334 |
11-Apr-2014 |
Erin Dahlgren <edahlgren@google.com> |
Update mode options with hardware spec whenever hdr setting changes. Bug: 13965048 Change-Id: I7e718bb56cb5dc92c7583bef780d442c04644a56
rc/com/android/camera/ButtonManager.java
rc/com/android/camera/app/CameraAppUI.java
|
07b7f5491da4c73876f29e1acca1f5c912eb64f1 |
11-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
am 5209f79b: Shorten the preference string to fit * commit '5209f79bdaeefeb6e8f168917faa73c82d8d0290': Shorten the preference string to fit
|
5209f79bdaeefeb6e8f168917faa73c82d8d0290 |
11-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
Shorten the preference string to fit Bug: 13962104 Change-Id: Ie0ba57ad1644241748c8d0406c08be1c981b8f63
es/values/strings.xml
|
7b45c4c92680d8467dafa8993e70b006d574aa4a |
10-Apr-2014 |
Baligh Uddin <baligh@google.com> |
am 21257b76: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-denali * commit '21257b76d9018c7ea15cc41c9906bc3bd2950b9e': Import translations. DO NOT MERGE
|
918cc0274df61d037cba5cc14f887f58f07ea447 |
10-Apr-2014 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into ub-camera-everglades
|
21257b76d9018c7ea15cc41c9906bc3bd2950b9e |
10-Apr-2014 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-denali
|
5031c26af8d38b026d8af94f98acfe524cc2da33 |
10-Apr-2014 |
Alan Newberger <alann@google.com> |
am 63da42d6: Merge "Tweak log levels for photo, video" into gb-ub-photos-denali * commit '63da42d610376d2fc02c0ac453d5df3a1e885504': Tweak log levels for photo, video
|
63da42d610376d2fc02c0ac453d5df3a1e885504 |
10-Apr-2014 |
Alan Newberger <alann@google.com> |
Merge "Tweak log levels for photo, video" into gb-ub-photos-denali
|
d41766fc59fbcc184d891fde2873cca2309a2585 |
10-Apr-2014 |
Alan Newberger <alann@google.com> |
Tweak log levels for photo, video Adjusting log levels to insure some simple state flow statements are printed for all clients at info, plus a few other adjustments. Bug: 13737123 Change-Id: Ic58b2ad44067253960d68678c34d82895f49f6a6
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/VideoModule.java
|
e0e6d34a040fc14ef25000ad5b3d48427c8cdfb0 |
10-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
am f66eb70a: Don\'t crash when listener registration gets out of sync * commit 'f66eb70a66bb194f4bef54fe74a04d6c9a3515de': Don't crash when listener registration gets out of sync
|
f66eb70a66bb194f4bef54fe74a04d6c9a3515de |
10-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
Don't crash when listener registration gets out of sync Bug: 13914960 In some cases it can happen that resume/pause sequences happen on two CameraActivities at the same time, especially when switching from lock-screen to non-lockscreen activities. Change-Id: Ic0826fc4a1d601b0ba0e6ac9cef84c022d958ad4
rc/com/android/camera/app/MemoryManagerImpl.java
|
7981b91c47e098381750d25fe68835ff027fe6e1 |
10-Apr-2014 |
Doris Liu <tianliu@google.com> |
am f79de8d6: Merge "Fix the layout error in preview" into gb-ub-photos-denali * commit 'f79de8d69c2305660e287ec872fe500b34739e44': Fix the layout error in preview
|
f79de8d69c2305660e287ec872fe500b34739e44 |
10-Apr-2014 |
Doris Liu <tianliu@google.com> |
Merge "Fix the layout error in preview" into gb-ub-photos-denali
|
240b072f9a9cb2f0b4b08ca5b8a682d78c25ce9c |
10-Apr-2014 |
Doris Liu <tianliu@google.com> |
Fix the layout error in preview This bug is caused by view configuration and layout rect occasionally out of sync and bottom bar's incapability of correcting itself. To be specific, configuration can be out of sync with layout rect (i.e. configuration.orientation is landscape but onLayout() passes in portrait coordinates), but when that happens, configuration will soon correct itself through onConfigurationChanged(), then another layout pass will happen to make sure everything is laid out correctly. In this case, when configuration and layout coordinates are inconsistent, bottom bar lays out itself using the wrong alignment, and then changed the preview rect accordingly. When another layout pass happens to correct this inconsistency, bottom bar then lays out itself based on the correct alignment and a wrong preview rect previously adjusted, rendering correct alignment but wrong size. Bug: 13911202 Change-Id: I7cf6dbea582ce3888df11039de8f94687fe75784
rc/com/android/camera/ui/BottomBar.java
rc/com/android/camera/ui/BottomBarModeOptionsWrapper.java
|
1042e68a734ca32528afd4e1912cd8fcd5bc6213 |
09-Apr-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ied0dc3c8c443805a0f2bd22cfc7039ce69d550da Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-km-rKH/strings.xml
es/values-ko/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mn-rMN/strings.xml
es/values-ms-rMY/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
5f3f0ea7c9a0267a2b1a1817cb5bc56e35f99e36 |
09-Apr-2014 |
Alan Newberger <alann@google.com> |
am 2d0fdb5e: Merge "Add logging override helper" into gb-ub-photos-denali * commit '2d0fdb5e6582126bd554030c7432745ae589f515': Add logging override helper
|
b155c19ccc2a7c3494a910457cf6a0494a41ed6f |
09-Apr-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: If12b5ebc603aca98d3945094f159b33b08ef0cf6 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-km-rKH/strings.xml
es/values-ko/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mn-rMN/strings.xml
es/values-ms-rMY/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
2d0fdb5e6582126bd554030c7432745ae589f515 |
09-Apr-2014 |
Alan Newberger <alann@google.com> |
Merge "Add logging override helper" into gb-ub-photos-denali
|
92f89f4baff831d7e2166fba18ca595cbc40a03b |
09-Apr-2014 |
Kevin Gabayan <gabayan@google.com> |
am 05ee74dc: Log memory consumption at end of onCreate (Camera2). Bug: 13280671 * commit '05ee74dcf3b1c8e65229f43441d282fcf89744a6': Log memory consumption at end of onCreate (Camera2). Bug: 13280671
|
d3b81299b6c071aeddb160ab8294d422aeb11ebb |
09-Apr-2014 |
Kevin Gabayan <gabayan@google.com> |
am 0aeb0c82: Query memory consumption at end of onCreate. Bug: 13280671 * commit '0aeb0c82704401a050ad3b892ed1c9efa457013d': Query memory consumption at end of onCreate. Bug: 13280671
|
c00f209e861dba093eb3c267ddc5078b23928d05 |
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
rc/com/android/camera/app/CameraApp.java
rc/com/android/camera/debug/Config.java
rc/com/android/camera/debug/Configurations.java
rc/com/android/camera/debug/CurrentConfig.java
rc/com/android/camera/debug/Log.java
rc_pd/com/android/camera/debug/LogHelper.java
|
3d9722e0886b7e113c28c0f4177d216c05072bdc |
09-Apr-2014 |
Narayan Kamath <narayan@google.com> |
am 2e59a3fa: am b102c508: Merge "Fix build dependencies" * commit '2e59a3faa09927935d9a9fbb18e2f55a71412230': Fix build dependencies
|
2e59a3faa09927935d9a9fbb18e2f55a71412230 |
09-Apr-2014 |
Narayan Kamath <narayan@google.com> |
am b102c508: Merge "Fix build dependencies" * commit 'b102c5089dffd5d81394788560c69c7c743d86a5': Fix build dependencies
|
b102c5089dffd5d81394788560c69c7c743d86a5 |
09-Apr-2014 |
Narayan Kamath <narayan@google.com> |
Merge "Fix build dependencies"
|
05ee74dcf3b1c8e65229f43441d282fcf89744a6 |
09-Apr-2014 |
Kevin Gabayan <gabayan@google.com> |
Log memory consumption at end of onCreate (Camera2). Bug: 13280671 Change-Id: Ifdeadff2c89a08757cc2f3792ba61a2b54d19ae0
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/app/MemoryQuery.java
rc_pd/com/android/camera/util/UsageStatistics.java
|
0aeb0c82704401a050ad3b892ed1c9efa457013d |
08-Apr-2014 |
Kevin Gabayan <gabayan@google.com> |
Query memory consumption at end of onCreate. Bug: 13280671 Change-Id: Iedc4c8907a6e726a1835494bd6fad93e6ee8a666
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/app/MemoryManager.java
rc/com/android/camera/app/MemoryManagerImpl.java
rc/com/android/camera/app/MemoryQuery.java
|
1f8951e9fa956e1d1e9283141a11b8b1c2f1f9dd |
08-Apr-2014 |
Doris Liu <tianliu@google.com> |
am 39262608: Merge "Cancel touch event forwarding when transitioning from shimmy to scroll state" into gb-ub-photos-denali * commit '3926260864a25a7db00e5a7d629b363cc833ffb3': Cancel touch event forwarding when transitioning from shimmy to scroll state
|
3926260864a25a7db00e5a7d629b363cc833ffb3 |
08-Apr-2014 |
Doris Liu <tianliu@google.com> |
Merge "Cancel touch event forwarding when transitioning from shimmy to scroll state" into gb-ub-photos-denali
|
1c5a87b4301c4211d3e3b85be5c863c50d4eab7b |
08-Apr-2014 |
Doris Liu <tianliu@google.com> |
Cancel touch event forwarding when transitioning from shimmy to scroll state Bug: 13903149 Change-Id: I70badb1fdc959b3ce0a9d3385e664938ab7918a9
rc/com/android/camera/ui/ModeListView.java
|
c29db9f8ca2f6c8db2d30e0a90e0a145512f2fb6 |
08-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
am f773a11d: Merge "Keep lights out even if the system changes it." into gb-ub-photos-denali * commit 'f773a11d50fc48f3831f259075a0e64460f9baaa': Keep lights out even if the system changes it.
|
f773a11d50fc48f3831f259075a0e64460f9baaa |
08-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Keep lights out even if the system changes it." into gb-ub-photos-denali
|
099b49b8e9fce2b1e1e5c2f6f8756527852329b4 |
08-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
Keep lights out even if the system changes it. Bug: 13894148 Change-Id: Ie6d5b8fc1d3601082942a5c0843b447cb4805ceb
rc/com/android/camera/CameraActivity.java
|
300e332a777c77761d20825ee0bb699f9b4b598d |
08-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
am 298d4548: Merge "Switch visibility on AbstractTutorialOverlay removeOverlay." into gb-ub-photos-denali * commit '298d45483448de4493abadca286bba4eccab44ae': Switch visibility on AbstractTutorialOverlay removeOverlay.
|
298d45483448de4493abadca286bba4eccab44ae |
08-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Switch visibility on AbstractTutorialOverlay removeOverlay." into gb-ub-photos-denali
|
8ec052bad062927e767e24010db22aa55fdfb5ff |
08-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
Switch visibility on AbstractTutorialOverlay removeOverlay. Bug: 13337436 Bug: 12440059 Change-Id: I34dd96df02cedf33be72ae5563bbad3d4b307a12
rc/com/android/camera/ui/AbstractTutorialOverlay.java
|
c5f115010660a73b9f31051aa16991c594713b4c |
08-Apr-2014 |
Baligh Uddin <baligh@google.com> |
am bdb4f61d: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-denali * commit 'bdb4f61da7be41f2535e0bdc08225263c037be90': Import translations. DO NOT MERGE
|
bdb4f61da7be41f2535e0bdc08225263c037be90 |
08-Apr-2014 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-denali
|
4457208a68d24ac7be27a77a7db6ef70f713e8e5 |
08-Apr-2014 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into ub-camera-everglades
|
74a266639e4713d96102033b2420dc499befb0b0 |
08-Apr-2014 |
Alan Newberger <alann@google.com> |
am 0d4570a2: Merge "Replace isDebugging compiletime logging override with runtime property" into gb-ub-photos-denali * commit '0d4570a241f3e2505fa66fb81b4c297a3c1d4d09': Replace isDebugging compiletime logging override with runtime property
|
349fc845670a1ee51939d89c08c6ff817790dc5c |
08-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
am 829c8e92: Merge "Don\'t show the tutorial wrapper all the time." into gb-ub-photos-denali * commit '829c8e929949e1951b1562ef97cf447b02dcef45': Don't show the tutorial wrapper all the time.
|
0d4570a241f3e2505fa66fb81b4c297a3c1d4d09 |
08-Apr-2014 |
Alan Newberger <alann@google.com> |
Merge "Replace isDebugging compiletime logging override with runtime property" into gb-ub-photos-denali
|
829c8e929949e1951b1562ef97cf447b02dcef45 |
08-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Don't show the tutorial wrapper all the time." into gb-ub-photos-denali
|
de7633bbcfb08865175126713d97132086bff340 |
08-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
Don't show the tutorial wrapper all the time. Bug: 13337436 Bug: 12440059 Change-Id: I10a969a4c550b6ebbc101f7cdce8ef12c3029137
es/layout/generic_module.xml
rc/com/android/camera/app/CameraAppUI.java
rc/com/android/camera/ui/AbstractTutorialOverlay.java
|
af4bcb92d710f2cb74ddc0559397c49b55beb115 |
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
rc/com/android/camera/debug/Config.java
rc/com/android/camera/debug/Configurations.java
rc/com/android/camera/debug/Log.java
|
8387e379315e4352359935abe561eeaf20cd4404 |
08-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
am 13cdf16b: Merge "Make tutorials render in smaller layout on tablets." into gb-ub-photos-denali * commit '13cdf16bee5a46d20266a60230239a49cd0f22ac': Make tutorials render in smaller layout on tablets.
|
13cdf16bee5a46d20266a60230239a49cd0f22ac |
08-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Make tutorials render in smaller layout on tablets." into gb-ub-photos-denali
|
1e0810c88e791d0f658eb5a6f95d771ee03a7631 |
08-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
Make tutorials render in smaller layout on tablets. Bug: 13337436 Bug: 12440059 Change-Id: I7886a86189a94483775a5535c69e22090cec1530
es/layout-sw600dp-land/tutorials_placeholder.xml
es/layout-sw600dp-port/tutorials_placeholder.xml
es/layout/generic_module.xml
es/layout/tutorials_placeholder.xml
rc/com/android/camera/app/CameraAppUI.java
rc/com/android/camera/ui/AbstractTutorialOverlay.java
|
02bb5070ef1779d795f6e3064cf8975b48bebfa9 |
08-Apr-2014 |
Alan Newberger <alann@google.com> |
am 81e56a9f: Shorten ExternalViewerButton log * commit '81e56a9f6de8935a1200aafaaa6858662559517f': Shorten ExternalViewerButton log
|
81e56a9f6de8935a1200aafaaa6858662559517f |
08-Apr-2014 |
Alan Newberger <alann@google.com> |
Shorten ExternalViewerButton log While examining logs, noticed our Log proxy rejected this log line as too long. Bug: 13737123 Change-Id: I8ca2cf6be79539db0fd262ffd13a317f6fe20dcb
rc/com/android/camera/widget/ExternalViewerButton.java
|
bc862b509f14a0127eb5a13473e0773628950747 |
08-Apr-2014 |
Doris Liu <tianliu@google.com> |
am 77da836f: Merge "Hide mode switcher in selected state when window is no longer visible" into gb-ub-photos-denali * commit '77da836f524dbbf7fe92ff1ca6147595a540246f': Hide mode switcher in selected state when window is no longer visible
|
77da836f524dbbf7fe92ff1ca6147595a540246f |
08-Apr-2014 |
Doris Liu <tianliu@google.com> |
Merge "Hide mode switcher in selected state when window is no longer visible" into gb-ub-photos-denali
|
fa50f7d71a77dc730746c33fd17a570d42453759 |
08-Apr-2014 |
Doris Liu <tianliu@google.com> |
Hide mode switcher in selected state when window is no longer visible Bug: 13751149 Change-Id: Id479eeed06ec8965df2836c4825de6212c7efa7a
rc/com/android/camera/ui/ModeListView.java
|
bdc89828015599eff0f7f8c1374d581252c41354 |
08-Apr-2014 |
Alan Newberger <alann@google.com> |
am bd90f35e: Migrate LocationManager to use camera Logger * commit 'bd90f35edda63c039a68f24e647b3ce60a9622cd': Migrate LocationManager to use camera Logger
|
bd90f35edda63c039a68f24e647b3ce60a9622cd |
08-Apr-2014 |
Alan Newberger <alann@google.com> |
Migrate LocationManager to use camera Logger This is the last remaining non-test class in Camera2 using android.util.Log directly. Bug: 13737123 Change-Id: Ia90d1d91b651cace026d9fdd5867d556aa8bad72
rc_pd/com/android/camera/app/LocationManager.java
|
b95d06da818638429d1b092f024a5ff824a04af9 |
07-Apr-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I9fc8cd274bebccb0a39426246e9384cc9e018854 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-ca/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-es/strings.xml
es/values-fr/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ms-rMY/strings.xml
es/values-nb/strings.xml
es/values-pl/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sw/strings.xml
es/values-zu/strings.xml
|
05678bceb2ca8388883bf64a2b4448c8ec4e7bda |
07-Apr-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I5f9d929e89dcb54823c6ed4d26e88560a7f81a4f Auto-generated-cl: translation import
es/values-ar/strings.xml
es/values-es/strings.xml
es/values-ja/strings.xml
es/values-pl/strings.xml
es/values-ru/strings.xml
|
a99003843ba8414814db2565f9d5cb4b0f0cb951 |
07-Apr-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I2331700a1214d9a3518ef60cae0d454301e25788 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-ca/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-es/strings.xml
es/values-fr/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ms-rMY/strings.xml
es/values-nb/strings.xml
es/values-pl/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sw/strings.xml
es/values-zu/strings.xml
|
5633ecee6b8fa3cd4e7cd251194848c6374055fc |
07-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
am 71c43b6f: Merge "Make removeOverlay publicly available." into gb-ub-photos-denali * commit '71c43b6f062ced7cf239dc506718cf0825665b67': Make removeOverlay publicly available.
|
71c43b6f062ced7cf239dc506718cf0825665b67 |
07-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Make removeOverlay publicly available." into gb-ub-photos-denali
|
bd2fe32e729da9f500c9bb9f165da4d39e4dc463 |
07-Apr-2014 |
Doris Liu <tianliu@google.com> |
am 90d61209: Merge "Resize mode drawer content for tablet to 1.5x of that on phones" into gb-ub-photos-denali * commit '90d61209c885f2c570cb00ef505f8ccdf54eb627': Resize mode drawer content for tablet to 1.5x of that on phones
|
d462b8fff7198d080ca83c57dd24315e6a71aed9 |
07-Apr-2014 |
Andy Huibers <andyhuibers@google.com> |
am 937a2fc8: Remove unneeded log line. * commit '937a2fc8c2694353692a122dddd658754bd67cb6': Remove unneeded log line.
|
90d61209c885f2c570cb00ef505f8ccdf54eb627 |
07-Apr-2014 |
Doris Liu <tianliu@google.com> |
Merge "Resize mode drawer content for tablet to 1.5x of that on phones" into gb-ub-photos-denali
|
937a2fc8c2694353692a122dddd658754bd67cb6 |
07-Apr-2014 |
Andy Huibers <andyhuibers@google.com> |
Remove unneeded log line. Change-Id: Ibf22b2389ed898f68f7f9217f0d899dfae8aa767
rc/com/android/camera/CameraActivity.java
|
654afd821ec1471020c51de67c8c18d19c9727af |
07-Apr-2014 |
Doris Liu <tianliu@google.com> |
Resize mode drawer content for tablet to 1.5x of that on phones Bug: 13768342 Change-Id: I4c9017b9f003d5093e7153bf31a378d818caf788
es/values-sw600dp/dimens.xml
|
c938d7b424466ff899dd52864ad1b58ac0c0c68e |
07-Apr-2014 |
Doris Liu <tianliu@google.com> |
am f4d5afbc: Merge "Workaround for black sqaure issue caused by incorrectly recreated HW layer" into gb-ub-photos-denali * commit 'f4d5afbcdc31165caef741aa7c06371b01c91b45': Workaround for black sqaure issue caused by incorrectly recreated HW layer
|
f4d5afbcdc31165caef741aa7c06371b01c91b45 |
07-Apr-2014 |
Doris Liu <tianliu@google.com> |
Merge "Workaround for black sqaure issue caused by incorrectly recreated HW layer" into gb-ub-photos-denali
|
f4985d0f5183259c7b17ff61017a623828e8348f |
07-Apr-2014 |
Spike Sprague <spikuru@google.com> |
am abf54e29: exposure compensation control is back * commit 'abf54e2994961395a0feb0b08353e62718443f23': exposure compensation control is back
|
e4e51076aeeb7dbbdde509a4621379359f6cf273 |
07-Apr-2014 |
Seth Raphael <magicseth@google.com> |
am 3cd228a2: Merge "Fix Settings Activity" into gb-ub-photos-denali * commit '3cd228a2cce5ec89ddedd52d88fa5488e0e47bd9': Fix Settings Activity
|
51f409e3770eef615a4fa5314073ba132994cd82 |
07-Apr-2014 |
Erin Dahlgren <edahlgren@google.com> |
am 00b04884: Merge "Make the camera id setting have static possible values." into gb-ub-photos-denali * commit '00b04884a4f857ad5d34247c0ad1bed1cb4a164c': Make the camera id setting have static possible values.
|
342e68d3f3f38e333e3e05d2effedc3afc5e4e55 |
07-Apr-2014 |
Seth Raphael <magicseth@google.com> |
am 224b97cb: Merge "Add context to parameters passed to ExtraSettings" into gb-ub-photos-denali * commit '224b97cbde1ca050e8e74d34ba7c2f8046142fd4': Add context to parameters passed to ExtraSettings
|
c131692f733d297812c82f7fb04127ae996045b5 |
07-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
am 70f20249: Merge "Add resources for tutorials." into gb-ub-photos-denali * commit '70f2024930b66854724b205badedd2ba71196106': Add resources for tutorials.
|
c5f382f9c5921feec7ba4756ced8331474d976d0 |
07-Apr-2014 |
Andy Huibers <andyhuibers@google.com> |
am b5b2e4a7: Merge "Fix hdr check." into gb-ub-photos-denali * commit 'b5b2e4a762db8a8608df0508312d5329ddd243f9': Fix hdr check.
|
ab5f455956b79badf05f4b79e1b0c49cccc66b13 |
07-Apr-2014 |
Andy Huibers <andyhuibers@google.com> |
am 68e10629: Merge "Use only filename from path as reference." into gb-ub-photos-denali * commit '68e106296a350b8f0f0c8d6efde1545dca59b623': Use only filename from path as reference.
|
ec576e545168dde080d1e2a96d355c0d96e77907 |
07-Apr-2014 |
Baligh Uddin <baligh@google.com> |
am 30334b09: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-denali * commit '30334b09b30c9df4d675738c55c931274021d1a8': Import translations. DO NOT MERGE
|
f3e528c6928655b171ddca4d05d0d99e862bbf4f |
07-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
resolved conflicts for merge of 0bfc7619 to ub-camera-everglades Change-Id: Id95979da7701d52f1c25ddba710686465a8ba60d
|
eddb0743f60d0544be896043187a1981e78acf3b |
07-Apr-2014 |
Doris Liu <tianliu@google.com> |
am 76aaa187: Fix layout error during mode switch * commit '76aaa1870d77856c975283392d3a0fea3e1fb7ba': Fix layout error during mode switch
|
107172f82e8c9b7cbfab09f54f97af40b9dfabde |
07-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
resolved conflicts for merge of 79dd6876 to ub-camera-everglades Change-Id: Icba83583ffb5b6210ec084ca7e3193bedebe7da1
|
2aeeb7ac635ad5b490e7128884aa89efde862c67 |
07-Apr-2014 |
Doris Liu <tianliu@google.com> |
am 7933feb7: Fix for visibilty of cling out of sync with the external viewer button * commit '7933feb7d1bbb0342061584f623bb239266f5d91': Fix for visibilty of cling out of sync with the external viewer button
|
137e4810b02f2361d45260100d3b9b62dba2975e |
07-Apr-2014 |
Angus Kong <shkong@google.com> |
am c9638388: Merge "Add API to query the current auto-rotation setting" into gb-ub-photos-denali * commit 'c9638388b28c9eca448bb4279c0f2f519c6d342e': Add API to query the current auto-rotation setting
|
42f9a26ba6b217a4c451c03a239eda95e4a09b38 |
07-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
am 39675164: Turn Lights-Out mode back on. * commit '396751645d19012eec4fe1d94023c6b474f9fb91': Turn Lights-Out mode back on.
|
a7313da16f34aa714cc31d6ac677d248ef8102e6 |
07-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
am 3d022031: Merge "Remove unused ComboPreferences cruft." into gb-ub-photos-denali * commit '3d02203136fe7955f77529828756de9ebaf163dc': Remove unused ComboPreferences cruft.
|
e503446399a5a4073489490912ed6d6297b5222b |
07-Apr-2014 |
Seth Raphael <magicseth@google.com> |
am d3d78999: Avoid a race condition causing dup\'d images. * commit 'd3d789992f96e4598521a27f085d185044ec7cee': Avoid a race condition causing dup'd images.
|
da80fa8b7d3272a29201fb3357d862616507a461 |
07-Apr-2014 |
Seth Raphael <magicseth@google.com> |
am 59efb9af: When we reset app ui, re-enable shutter button. * commit '59efb9af8340a5e3500037b23fb3ac16011a1c7e': When we reset app ui, re-enable shutter button.
|
3f0286598e0bb0cf3924763ec0accae8d5b82027 |
07-Apr-2014 |
Seth Raphael <magicseth@google.com> |
am 55d5b4a6: Merge "Fix crash related to deleted items being processed" into gb-ub-photos-denali * commit '55d5b4a6a892b9c6265b2b6e43102396a6123493': Fix crash related to deleted items being processed
|
4607889d595311f07375a11e3264a49a8e7d969b |
07-Apr-2014 |
Erin Dahlgren <edahlgren@google.com> |
am 3578a8d9: Merge "Move disk IO from first time use background task." into gb-ub-photos-denali * commit '3578a8d937f1265eca854f82d9305a0d4a4259a0': Move disk IO from first time use background task.
|
92fb63699265997322a60c8b9c02a74de080cd4b |
07-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
resolved conflicts for merge of fed27f98 to ub-camera-everglades Change-Id: I772dce9ec63a3c60fd4a72b50460ef89dda06338
|
b5e96a53a312163bbe6177de405f2ac779daf090 |
07-Apr-2014 |
Erin Dahlgren <edahlgren@google.com> |
am 45810372: Merge "Fix broken shutter button enabling in Photo and Video." into gb-ub-photos-denali * commit '458103727c23134f3c9fb678dd757f31779f6db8': Fix broken shutter button enabling in Photo and Video.
|
f33880ba31aebb4d5e993bd8e8d7f715242fb984 |
07-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
am 94dea6e4: Merge "Refactor UsageStatistic so it can be disabled more easily." into gb-ub-photos-denali * commit '94dea6e4d1744aeaa5001a5023fb0a7ecb124128': Refactor UsageStatistic so it can be disabled more easily.
|
ceff11e73430af86fdf0b0819cd36a9f5dc7173f |
05-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
Make removeOverlay publicly available. Bug: 13337436 Change-Id: I222f3353230ad734db304f2068f853bdf8ef9de3
rc/com/android/camera/ui/AbstractTutorialOverlay.java
|
abf54e2994961395a0feb0b08353e62718443f23 |
27-Mar-2014 |
Spike Sprague <spikuru@google.com> |
exposure compensation control is back bug: 13607051 Change-Id: Ib4920ba3f8f3a548651a2d07613ccfdc28ca1d6e
es/drawable-hdpi/ic_exposure_0.png
es/drawable-hdpi/ic_exposure_0_indicator.png
es/drawable-hdpi/ic_exposure_disabled.png
es/drawable-hdpi/ic_exposure_n1.png
es/drawable-hdpi/ic_exposure_n1_indicator.png
es/drawable-hdpi/ic_exposure_n2.png
es/drawable-hdpi/ic_exposure_n2_indicator.png
es/drawable-hdpi/ic_exposure_normal.png
es/drawable-hdpi/ic_exposure_p1.png
es/drawable-hdpi/ic_exposure_p1_indicator.png
es/drawable-hdpi/ic_exposure_p2.png
es/drawable-hdpi/ic_exposure_p2_indicator.png
es/drawable-mdpi/ic_exposure_0.png
es/drawable-mdpi/ic_exposure_0_indicator.png
es/drawable-mdpi/ic_exposure_disabled.png
es/drawable-mdpi/ic_exposure_n1.png
es/drawable-mdpi/ic_exposure_n1_indicator.png
es/drawable-mdpi/ic_exposure_n2.png
es/drawable-mdpi/ic_exposure_n2_indicator.png
es/drawable-mdpi/ic_exposure_normal.png
es/drawable-mdpi/ic_exposure_p1.png
es/drawable-mdpi/ic_exposure_p1_indicator.png
es/drawable-mdpi/ic_exposure_p2.png
es/drawable-mdpi/ic_exposure_p2_indicator.png
es/drawable-xhdpi/ic_exposure_0.png
es/drawable-xhdpi/ic_exposure_0_indicator.png
es/drawable-xhdpi/ic_exposure_disabled.png
es/drawable-xhdpi/ic_exposure_n1.png
es/drawable-xhdpi/ic_exposure_n1_indicator.png
es/drawable-xhdpi/ic_exposure_n2.png
es/drawable-xhdpi/ic_exposure_n2_indicator.png
es/drawable-xhdpi/ic_exposure_normal.png
es/drawable-xhdpi/ic_exposure_p1.png
es/drawable-xhdpi/ic_exposure_p1_indicator.png
es/drawable-xhdpi/ic_exposure_p2.png
es/drawable-xhdpi/ic_exposure_p2_indicator.png
es/drawable-xxhdpi/ic_exposure_0.png
es/drawable-xxhdpi/ic_exposure_0_indicator.png
es/drawable-xxhdpi/ic_exposure_disabled.png
es/drawable-xxhdpi/ic_exposure_n1.png
es/drawable-xxhdpi/ic_exposure_n1_indicator.png
es/drawable-xxhdpi/ic_exposure_n2.png
es/drawable-xxhdpi/ic_exposure_n2_indicator.png
es/drawable-xxhdpi/ic_exposure_normal.png
es/drawable-xxhdpi/ic_exposure_p1.png
es/drawable-xxhdpi/ic_exposure_p1_indicator.png
es/drawable-xxhdpi/ic_exposure_p2.png
es/drawable-xxhdpi/ic_exposure_p2_indicator.png
es/drawable/button_background_selected_photo.xml
es/drawable/ic_exposure.xml
es/layout-land/indicators.xml
es/layout-land/mode_options_overlay.xml
es/layout-port/indicators.xml
es/layout-port/mode_options_overlay.xml
es/values/strings.xml
es/xml/camera_preferences.xml
rc/com/android/camera/ButtonManager.java
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/app/CameraAppUI.java
rc/com/android/camera/settings/CameraSettingsActivity.java
rc/com/android/camera/settings/SettingsCache.java
rc/com/android/camera/settings/SettingsManager.java
rc/com/android/camera/widget/IndicatorIconController.java
rc/com/android/camera/widget/ModeOptions.java
|
759122e8b3071b79fa2a388f00403af4e21be68c |
05-Apr-2014 |
Doris Liu <tianliu@google.com> |
Workaround for black sqaure issue caused by incorrectly recreated HW layer Bug: 12594617 Change-Id: I9209d4bc0d6ebd045b957b3c79eabdca0a4f7cc4
es/layout/activity_main.xml
es/layout/mode_list_layout.xml
rc/com/android/camera/ui/ModeListView.java
rc/com/android/camera/ui/ModeTransitionView.java
|
3cd228a2cce5ec89ddedd52d88fa5488e0e47bd9 |
05-Apr-2014 |
Seth Raphael <magicseth@google.com> |
Merge "Fix Settings Activity" into gb-ub-photos-denali
|
d054061c389cc09e96362266cfb166749c72c54f |
05-Apr-2014 |
Seth Raphael <magicseth@google.com> |
Fix Settings Activity Bug: 13817516 Change-Id: Idb8b95c3501b52519ae97b6d603ee59e8cc50ce4
rc/com/android/camera/settings/CameraSettingsActivity.java
|
00b04884a4f857ad5d34247c0ad1bed1cb4a164c |
04-Apr-2014 |
Erin Dahlgren <edahlgren@google.com> |
Merge "Make the camera id setting have static possible values." into gb-ub-photos-denali
|
224b97cbde1ca050e8e74d34ba7c2f8046142fd4 |
04-Apr-2014 |
Seth Raphael <magicseth@google.com> |
Merge "Add context to parameters passed to ExtraSettings" into gb-ub-photos-denali
|
4b531ae5ac0f18b1625b62884780f113667b2404 |
04-Apr-2014 |
Seth Raphael <magicseth@google.com> |
Add context to parameters passed to ExtraSettings Bug: 13791528 Change-Id: Ibcc4db1ab07b274f18f1ab369747d759180f155b
rc/com/android/camera/settings/CameraSettingsActivity.java
rc_pd/com/android/camera/util/SettingsHelper.java
|
70f2024930b66854724b205badedd2ba71196106 |
04-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Add resources for tutorials." into gb-ub-photos-denali
|
b5b2e4a762db8a8608df0508312d5329ddd243f9 |
04-Apr-2014 |
Andy Huibers <andyhuibers@google.com> |
Merge "Fix hdr check." into gb-ub-photos-denali
|
6b9743a03f4674974a8675c12f67149e2d7e017d |
04-Apr-2014 |
Andy Huibers <andyhuibers@google.com> |
Fix hdr check. Change-Id: I7ebd06a985fbc0661d71b189fe1fdbf620f1c341
rc/com/android/camera/PhotoModule.java
|
68e106296a350b8f0f0c8d6efde1545dca59b623 |
04-Apr-2014 |
Andy Huibers <andyhuibers@google.com> |
Merge "Use only filename from path as reference." into gb-ub-photos-denali
|
30334b09b30c9df4d675738c55c931274021d1a8 |
04-Apr-2014 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-denali
|
336b32dc855f0b13d4e83a5cd17f36d9b2bcc05e |
04-Apr-2014 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE"
|
4b85b5925c315bbe41414d2248989d0d818e2f10 |
04-Apr-2014 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into ub-camera-everglades
|
261e07eaf18cfff3c2ace3b6b9d2df28b5020291 |
04-Apr-2014 |
Erin Dahlgren <edahlgren@google.com> |
Make the camera id setting have static possible values. This is important because the dynamic hook for querying the supported number of cameras is currently only based on the camera 1 api. We want to make sure we can set the enabled/disabled state of back and front facing camera in the mode options, so it's necessasry to always have both possible values. Bug: 13769609 Change-Id: I9d526315dbe15e008542832f9b2c4c9d23d34021
es/values/arrays.xml
es/values/strings.xml
rc/com/android/camera/settings/SettingsManager.java
|
6388e638d36082138f58ad2c7ab8d7645f315ea1 |
04-Apr-2014 |
Andy Huibers <andyhuibers@google.com> |
Use only filename from path as reference. Change-Id: Ifa3dd1a8c89cab5b135953eebca70f4ed53c1102
rc/com/android/camera/MediaSaverImpl.java
|
0bfc76192fcd7060089a01be7dc022916308b03c |
04-Apr-2014 |
Andy Huibers <andyhuibers@google.com> |
Merge "Logging revisions." into gb-ub-photos-denali
|
10c5816e1ff3d30e4c4996643ba05d63d522b81a |
29-Mar-2014 |
Andy Huibers <andyhuibers@google.com> |
Logging revisions. Bug: 13747555 Change-Id: Ic5f735de89f9a69d981cdeab209b3966532697c7
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/FocusOverlayManager.java
rc/com/android/camera/MediaSaverImpl.java
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/VideoModule.java
rc/com/android/camera/app/CameraApp.java
rc/com/android/camera/app/CameraAppUI.java
rc/com/android/camera/app/MediaSaver.java
rc/com/android/camera/ui/FocusOverlay.java
rc/com/android/camera/ui/MainActivityLayout.java
rc/com/android/camera/ui/ModeListView.java
rc_pd/com/android/camera/util/SessionStatsCollector.java
rc_pd/com/android/camera/util/UsageStatistics.java
rc_pd/com/google/common/logging/eventprotos.java
|
76aaa1870d77856c975283392d3a0fea3e1fb7ba |
04-Apr-2014 |
Doris Liu <tianliu@google.com> |
Fix layout error during mode switch Cause for the incorrect layout: the two modes have a preview of the same aspect ratio, and therefore bottom bar did not need to re-layout after the mode switch and it incidentally skipped adjusting preview position. Bug: 13210080 Change-Id: Iad722abd682885633885ff0e8d9fba4efb4e5e6a
rc/com/android/camera/ui/BottomBar.java
|
79dd6876e5f5cb9d2a9d3d0597389811cc73c31f |
03-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Move SettingsManager back into Activity." into gb-ub-photos-denali
|
7933feb7d1bbb0342061584f623bb239266f5d91 |
03-Apr-2014 |
Doris Liu <tianliu@google.com> |
Fix for visibilty of cling out of sync with the external viewer button Due to no visiblity changed listener provided from Framework, a subclass of the image button was created to track the visiblity change of itself and more importantly its ancesters. This way cling is gauranteed to be in sync with the visility of the button. Also fixed preference type of showing refocus viewer cling. Bug: 13754204 Bug: 13752484 Change-Id: Iaf38c076d5b1e251f3d5d4b4ccba1bd8447999aa
es/layout/filmstrip_bottom_controls.xml
rc/com/android/camera/app/FilmstripBottomPanel.java
rc/com/android/camera/settings/SettingsManager.java
rc/com/android/camera/widget/ExternalViewerButton.java
|
e3e270f8004521d6acd71cefeea11bbda8ca20d4 |
03-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
Move SettingsManager back into Activity. We cannot easily share one instance between Activities as the manager needs the current module index. So this can cause crashes if two Activity instances are around and one gets destroyed. Change-Id: I964b14460669c4fbe3a51ab80cd385d5dfa0a16d
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/app/CameraApp.java
rc/com/android/camera/app/CameraServices.java
rc/com/android/camera/settings/SettingsManager.java
|
c9638388b28c9eca448bb4279c0f2f519c6d342e |
03-Apr-2014 |
Angus Kong <shkong@google.com> |
Merge "Add API to query the current auto-rotation setting" into gb-ub-photos-denali
|
396751645d19012eec4fe1d94023c6b474f9fb91 |
03-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
Turn Lights-Out mode back on. Bug: 13765919 This is reverting http://ag/436107 Change-Id: Id40645f2555d3133b0e866de57c8c951d8c3b86d
rc/com/android/camera/CameraActivity.java
|
3d02203136fe7955f77529828756de9ebaf163dc |
03-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Remove unused ComboPreferences cruft." into gb-ub-photos-denali
|
4044ab70586b15ae413f3f3751ad449fc775d16f |
03-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
Remove unused ComboPreferences cruft. Change-Id: Ib2e005e00316f8840e29fb559e34c6a5d9f28950
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/CameraPreference.java
rc/com/android/camera/CameraSettings.java
rc/com/android/camera/ComboPreferences.java
rc/com/android/camera/CountDownTimerPreference.java
rc/com/android/camera/IconListPreference.java
rc/com/android/camera/ListPreference.java
rc/com/android/camera/PreferenceGroup.java
rc/com/android/camera/VideoModule.java
rc/com/android/camera/settings/SettingsManager.java
|
122da23ce2ca42a3f6176a7d2f0b1b90d9b3b9f0 |
03-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
Add resources for tutorials. Bug: 13337436 Change-Id: I51eeb1def89d4bb0c0e6388454f65ca43d4afbb9
es/drawable-hdpi/btn_cling.9.png
es/drawable-hdpi/btn_cling_pressed.9.png
es/drawable-mdpi/btn_cling.9.png
es/drawable-mdpi/btn_cling_pressed.9.png
es/drawable-xhdpi/btn_cling.9.png
es/drawable-xhdpi/btn_cling_pressed.9.png
es/drawable-xxhdpi/btn_cling.9.png
es/drawable-xxhdpi/btn_cling_pressed.9.png
|
d3d789992f96e4598521a27f085d185044ec7cee |
02-Apr-2014 |
Seth Raphael <magicseth@google.com> |
Avoid a race condition causing dup'd images. When a session is finished, it is written to the media store. We now have a listener looking for new images in the media store. If that happens to fire before the session manager has updated the filmstrip, the photo ends up being added twice. Now, the listener checks to see if it is a photo already being handled by a session Bug: 13644124 Change-Id: I8a3c4a161ad0c326d9295f6714f6c6cbbcc6764e
rc/com/android/camera/Storage.java
rc/com/android/camera/data/CameraDataAdapter.java
|
59efb9af8340a5e3500037b23fb3ac16011a1c7e |
02-Apr-2014 |
Seth Raphael <magicseth@google.com> |
When we reset app ui, re-enable shutter button. This allows all modules to have a known state on resume. Change-Id: I8efab600b7c6df611e522bb20c8a164006a27a9d
rc/com/android/camera/app/CameraAppUI.java
|
55d5b4a6a892b9c6265b2b6e43102396a6123493 |
02-Apr-2014 |
Seth Raphael <magicseth@google.com> |
Merge "Fix crash related to deleted items being processed" into gb-ub-photos-denali
|
7acc5d51f0df785c8c314e3f17a311af49164aec |
02-Apr-2014 |
Seth Raphael <magicseth@google.com> |
Fix crash related to deleted items being processed If an item from the media store was being edited there is a race condition where the item may be deleted from the media store before it is finished The resulting update to the media store cannot find the original item, and therefore results in 0 rows being updated, which is what is desired, as the item was deleted by the user. Bug: 11598186 Change-Id: I1b2945f638676ccd63ab70ba201d2488df920eb3
rc/com/android/camera/Storage.java
|
c620dfef304ceb4e506f35096c4a085d6eeddb33 |
02-Apr-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I8818eba0245d483336ebc9d76f3c8070079bb683 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-km-rKH/strings.xml
es/values-ko/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mn-rMN/strings.xml
es/values-ms-rMY/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
1c1e2e7424dce7213166e869f0a8fd74eec30abd |
02-Apr-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ied02b6c2180eb906e8cd99a0fbcca8eff9786813 Auto-generated-cl: translation import
es/values-de/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-lo-rLA/strings.xml
es/values-nl/strings.xml
es/values-sk/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-zh-rCN/strings.xml
|
30c5db2a6ef0dcba126c27366d848309646fd633 |
02-Apr-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ic0dc01915c9a7fb61857cd2d5bb970a49cd720d1 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-km-rKH/strings.xml
es/values-ko/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mn-rMN/strings.xml
es/values-ms-rMY/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
3578a8d937f1265eca854f82d9305a0d4a4259a0 |
02-Apr-2014 |
Erin Dahlgren <edahlgren@google.com> |
Merge "Move disk IO from first time use background task." into gb-ub-photos-denali
|
fed27f98446ea62db3427a95abf63abf2e478bd7 |
02-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Make SettingsManager accessible on app-level, not Activity-level." into gb-ub-photos-denali
|
dcc49ad20eaf5e77fa6ebaec1a32aa42ba25d257 |
02-Apr-2014 |
Erin Dahlgren <edahlgren@google.com> |
am f6f8e307: am 0599fed5: am cd6dac16: am 1002a5fc: am 7abd26bb: Add CameraPerformanceTracker to Carlsbad to make future comparisons easy. * commit 'f6f8e307ffa30b21374ed2b23a3a3bb40a8d5f89': Add CameraPerformanceTracker to Carlsbad to make future comparisons easy.
|
f6f8e307ffa30b21374ed2b23a3a3bb40a8d5f89 |
02-Apr-2014 |
Erin Dahlgren <edahlgren@google.com> |
am 0599fed5: am cd6dac16: am 1002a5fc: am 7abd26bb: Add CameraPerformanceTracker to Carlsbad to make future comparisons easy. * commit '0599fed50abeb080f14f19811ade12f55d0b13c6': Add CameraPerformanceTracker to Carlsbad to make future comparisons easy.
|
0599fed50abeb080f14f19811ade12f55d0b13c6 |
02-Apr-2014 |
Erin Dahlgren <edahlgren@google.com> |
am cd6dac16: am 1002a5fc: am 7abd26bb: Add CameraPerformanceTracker to Carlsbad to make future comparisons easy. * commit 'cd6dac164505230324eaa7d8df2687ef1bebae12': Add CameraPerformanceTracker to Carlsbad to make future comparisons easy.
|
cd6dac164505230324eaa7d8df2687ef1bebae12 |
02-Apr-2014 |
Erin Dahlgren <edahlgren@google.com> |
am 1002a5fc: am 7abd26bb: Add CameraPerformanceTracker to Carlsbad to make future comparisons easy. * commit '1002a5fcffa2fd06aea1b0ef67ea0e077609e28f': Add CameraPerformanceTracker to Carlsbad to make future comparisons easy.
|
1002a5fcffa2fd06aea1b0ef67ea0e077609e28f |
02-Apr-2014 |
Erin Dahlgren <edahlgren@google.com> |
am 7abd26bb: Add CameraPerformanceTracker to Carlsbad to make future comparisons easy. * commit '7abd26bbcf361db8738d020f8880ec541a9e4ecb': Add CameraPerformanceTracker to Carlsbad to make future comparisons easy.
|
ad4cc5f6ccd7e40ca4ccc000b3ff3041e281577e |
02-Apr-2014 |
Doris Liu <tianliu@google.com> |
am 86f71de1: Merge "Fix capture button layout for RTL" into gb-ub-photos-denali * commit '86f71de115a1a7771d5505e10bce0262bc7093ba': Fix capture button layout for RTL
|
745a0fd223a979bfd5e61be96f74de228c8a701a |
02-Apr-2014 |
Doris Liu <tianliu@google.com> |
am 14320b47: Merge "Temp swipe interception to support swipe from capture button" into gb-ub-photos-denali * commit '14320b47a88a818b6cc341f4a15c294e28ef1dfe': Temp swipe interception to support swipe from capture button
|
ee2868d1a2f8f840bd36846f9a3d5b7ec8ed26c2 |
02-Apr-2014 |
Spike Sprague <spikuru@google.com> |
am 6446567c: Merge "properly resize capture flash anim overlay" into gb-ub-photos-denali * commit '6446567c51f99c500d4fff16052586495605a33d': properly resize capture flash anim overlay
|
458103727c23134f3c9fb678dd757f31779f6db8 |
02-Apr-2014 |
Erin Dahlgren <edahlgren@google.com> |
Merge "Fix broken shutter button enabling in Photo and Video." into gb-ub-photos-denali
|
6ee333404c996b02023746c80b5bf6b7bdf99d38 |
02-Apr-2014 |
Erin Dahlgren <edahlgren@google.com> |
resolved conflicts for merge of 3c4f7abe to ub-camera-everglades Change-Id: Ia618681d2bfd3ceb928f47f2b706b83eea2f93d1
|
9dc4262cea73123b2a73cc0b0f762bb9ce2d5622 |
02-Apr-2014 |
Angus Kong <shkong@google.com> |
Add API to query the current auto-rotation setting bug:13527779 Change-Id: I1ebcab1108bb03a997508033befeec26fb9a6b7e
rc/com/android/camera/app/OrientationManager.java
rc/com/android/camera/app/OrientationManagerImpl.java
|
fa9c38908429b9a5db5d738fae3b2963c4cb177f |
02-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
Make SettingsManager accessible on app-level, not Activity-level. Bug: 13754773 This also cleans up the SettingsManager and removes all constructor parameters except the context, which is needed. Change-Id: I60a8d5582771e5a1f53a761897f4d41c30e50166
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/CurrentModuleProvider.java
rc/com/android/camera/app/AppController.java
rc/com/android/camera/app/CameraApp.java
rc/com/android/camera/app/CameraServices.java
rc/com/android/camera/settings/SettingsManager.java
|
94dea6e4d1744aeaa5001a5023fb0a7ecb124128 |
02-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Refactor UsageStatistic so it can be disabled more easily." into gb-ub-photos-denali
|
667630d16a2b0cf3acecb817b3aa398abdd33623 |
01-Apr-2014 |
Erin Dahlgren <edahlgren@google.com> |
Fix broken shutter button enabling in Photo and Video. When I went in to implement globally disabling the shutter button during a certain state transition of the app, I realized that 1. enabling the shutter button in Photo and Video was totally broken: the methods being used for enabling the shutter button were totally empty! 2. setShutterEnabled in the AppController was totally empty. 3. we've done a horrible job with keeping names consistent: capture button != shutter button. So I've fixed all of these things, which should solve existing bugs and make my original task easier. Change-Id: If1ae3b8c740ef678fbd20c2ffbb93576f48c8c19
rc/com/android/camera/ButtonManager.java
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/PhotoUI.java
rc/com/android/camera/VideoModule.java
rc/com/android/camera/VideoUI.java
rc/com/android/camera/app/CameraAppUI.java
rc/com/android/camera/ui/BottomBar.java
|
86f71de115a1a7771d5505e10bce0262bc7093ba |
02-Apr-2014 |
Doris Liu <tianliu@google.com> |
Merge "Fix capture button layout for RTL" into gb-ub-photos-denali
|
a83ec8a3acb174e2688f0d31f2094e1aa72a06ee |
31-Mar-2014 |
Sascha Haeberling <haeberling@google.com> |
Refactor UsageStatistic so it can be disabled more easily. Change-Id: I2ca6e7d5642b1400d4b13f2c45cb48793b2fc178
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/FocusOverlayManager.java
rc/com/android/camera/ListPreference.java
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/VideoModule.java
rc/com/android/camera/app/CameraApp.java
rc/com/android/camera/app/CameraAppUI.java
rc/com/android/camera/ui/MainActivityLayout.java
rc_pd/com/android/camera/util/UsageStatistics.java
|
14320b47a88a818b6cc341f4a15c294e28ef1dfe |
02-Apr-2014 |
Doris Liu <tianliu@google.com> |
Merge "Temp swipe interception to support swipe from capture button" into gb-ub-photos-denali
|
9eb517f4c4bcf00fbe435a56f89d3abcaaa4d881 |
02-Apr-2014 |
Doris Liu <tianliu@google.com> |
Temp swipe interception to support swipe from capture button Bug: 13535296 Change-Id: I911336ce407abbfe51759bb38ffff9a534a49de6
rc/com/android/camera/app/CameraAppUI.java
rc/com/android/camera/ui/MainActivityLayout.java
rc/com/android/camera/ui/ModeListView.java
|
6446567c51f99c500d4fff16052586495605a33d |
02-Apr-2014 |
Spike Sprague <spikuru@google.com> |
Merge "properly resize capture flash anim overlay" into gb-ub-photos-denali
|
88ea520053c1911e013ba675136be7dfa28c6c3b |
01-Apr-2014 |
Doris Liu <tianliu@google.com> |
Fix capture button layout for RTL Created a class to handle the custom layout of mode options and bottom bar, simplied the dependency between the two in terms of positioning. Also did some restructuring in layout resources for better readability Bug: 13734579 Change-Id: I7088057e0c84f02f3cc6d598935d64b68dbc9526
es/layout-land/bottom_bar.xml
es/layout-land/mode_options_bottombar.xml
es/layout-land/mode_options_overlay.xml
es/layout-port/bottom_bar.xml
es/layout-port/mode_options_bottombar.xml
es/layout-port/mode_options_overlay.xml
es/layout/mode_options_bottombar.xml
rc/com/android/camera/ui/BottomBar.java
rc/com/android/camera/ui/BottomBarModeOptionsWrapper.java
rc/com/android/camera/ui/RotatableLinearLayout.java
|
c4fbb3d83031686b0bbe5612fa58db90d1d1c9dc |
02-Apr-2014 |
Erin Dahlgren <edahlgren@google.com> |
Move disk IO from first time use background task. Bug: 13251352 Change-Id: Ib6b0dbebb00f3210a649bb4d2782d65faaceb41c
rc/com/android/camera/CameraActivity.java
|
cd79ac8f3c6ca7faf2a6b8eef2fb8f3b8b7fccc5 |
01-Apr-2014 |
Spike Sprague <spikuru@google.com> |
properly resize capture flash anim overlay bug: 13651263 Change-Id: Icc9b23613185a0a5be606ec06c3e3ad4255be5c0
es/layout/generic_module.xml
rc/com/android/camera/ui/CaptureAnimationOverlay.java
|
7abd26bbcf361db8738d020f8880ec541a9e4ecb |
01-Apr-2014 |
Erin Dahlgren <edahlgren@google.com> |
Add CameraPerformanceTracker to Carlsbad to make future comparisons easy. Bug: 11376004 Change-Id: Ief4d47dd21bb23826c076e91ec5dc835b3a5175c
rc/android/util/CameraPerformanceTracker.java
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/PhotoUI.java
rc/com/android/camera/VideoUI.java
|
3c4f7abe28322f7882d50beffe892db08b4f7f2e |
01-Apr-2014 |
Erin Dahlgren <edahlgren@google.com> |
Merge "Move CameraPerformanceTracker methods to beginning of triggers." into gb-ub-photos-denali
|
86e363d0a2ead2266cb6cf64fe4b5f59817711f0 |
01-Apr-2014 |
Alan Newberger <alann@google.com> |
am 7bc10527: Move Camera2 launcher icons into res_p * commit '7bc10527e83321e5f01b56a8dca77877b9c4c5a6': Move Camera2 launcher icons into res_p
|
5f38da866e2f0eb057662619ef8703ace40eb64c |
01-Apr-2014 |
Erin Dahlgren <edahlgren@google.com> |
Move CameraPerformanceTracker methods to beginning of triggers. Bug: 11376004 Change-Id: I9aa5d632e4ca5462b4d2604a80346df6897fa413
rc/android/util/CameraPerformanceTracker.java
rc/com/android/camera/CameraActivity.java
|
7bc10527e83321e5f01b56a8dca77877b9c4c5a6 |
01-Apr-2014 |
Alan Newberger <alann@google.com> |
Move Camera2 launcher icons into res_p Relocate icons into res_p as they are primarily for Camera2. Bug: 13745522 Change-Id: If936a14350c4fa7443c7b6084dbb5386bd7d3fff
es/mipmap-hdpi/ic_launcher_camera.png
es/mipmap-hdpi/ic_launcher_camera_dogfood.png
es/mipmap-hdpi/ic_launcher_camera_fishfood.png
es/mipmap-hdpi/ic_launcher_gallery.png
es/mipmap-hdpi/ic_launcher_video_camera.png
es/mipmap-mdpi/ic_launcher_camera.png
es/mipmap-mdpi/ic_launcher_camera_dogfood.png
es/mipmap-mdpi/ic_launcher_camera_fishfood.png
es/mipmap-mdpi/ic_launcher_gallery.png
es/mipmap-mdpi/ic_launcher_video_camera.png
es/mipmap-xhdpi/ic_launcher_camera.png
es/mipmap-xhdpi/ic_launcher_camera_dogfood.png
es/mipmap-xhdpi/ic_launcher_camera_fishfood.png
es/mipmap-xhdpi/ic_launcher_gallery.png
es/mipmap-xxhdpi/ic_launcher_camera.png
es/mipmap-xxhdpi/ic_launcher_camera_dogfood.png
es/mipmap-xxhdpi/ic_launcher_camera_fishfood.png
es/mipmap-xxxhdpi/ic_launcher_camera_dogfood.png
es/mipmap-xxxhdpi/ic_launcher_camera_fishfood.png
es_p/mipmap-hdpi/ic_launcher_camera.png
es_p/mipmap-hdpi/ic_launcher_gallery.png
es_p/mipmap-hdpi/ic_launcher_video_camera.png
es_p/mipmap-mdpi/ic_launcher_camera.png
es_p/mipmap-mdpi/ic_launcher_gallery.png
es_p/mipmap-mdpi/ic_launcher_video_camera.png
es_p/mipmap-xhdpi/ic_launcher_camera.png
es_p/mipmap-xhdpi/ic_launcher_gallery.png
es_p/mipmap-xxhdpi/ic_launcher_camera.png
|
74d0037d0743b2c119ac4ab346529b7c88909948 |
01-Apr-2014 |
Angus Kong <shkong@google.com> |
am d210c295: Merge "Change flash animation duration and maximum alpha." into gb-ub-photos-denali * commit 'd210c2958806c8e63d8caa152e27799e278becde': Change flash animation duration and maximum alpha.
|
d210c2958806c8e63d8caa152e27799e278becde |
01-Apr-2014 |
Angus Kong <shkong@google.com> |
Merge "Change flash animation duration and maximum alpha." into gb-ub-photos-denali
|
95cc6c80438f9045b024fb50c54f07c0521fea8e |
01-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
am 265454d7: Enable all logging for dogfooding. * commit '265454d7861b3ec54656032de3d346b1711ab4c9': Enable all logging for dogfooding.
|
265454d7861b3ec54656032de3d346b1711ab4c9 |
01-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
Enable all logging for dogfooding. I will file a big to determine what logging level is right for launching. For now let's enable all logs again we had it before, otherwise we might miss some important logs. Change-Id: I2abc7ca47c92987d594002bf09c82a69a6d6b056
rc/com/android/camera/debug/CurrentConfig.java
|
aa90b599d6ef411c116edb1bb3ec9da6af6bedbc |
01-Apr-2014 |
Angus Kong <shkong@google.com> |
Change flash animation duration and maximum alpha. bug:13340312 Change-Id: Ic239e345dfe2d8dd501565f2ea4614d0505ac478
rc/com/android/camera/ui/CaptureAnimationOverlay.java
|
6b165b057209deaf30ba339a360e62d8ab524355 |
01-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
am 3aa83112: Merge "Re-add ongoing session when Activity is restarted." into gb-ub-photos-denali * commit '3aa83112286c2a0de39cb95f5010bc7882128578': Re-add ongoing session when Activity is restarted.
|
334002bb57bc843b73315b881fc779dbbcf6667f |
01-Apr-2014 |
Doris Liu <tianliu@google.com> |
am 84312832: Merge "New generic cling widget, add cling for refocus editor button" into gb-ub-photos-denali * commit '84312832d7dbae89df75046ce91bf3d675b4b928': New generic cling widget, add cling for refocus editor button
|
3aa83112286c2a0de39cb95f5010bc7882128578 |
01-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Re-add ongoing session when Activity is restarted." into gb-ub-photos-denali
|
84312832d7dbae89df75046ce91bf3d675b4b928 |
01-Apr-2014 |
Doris Liu <tianliu@google.com> |
Merge "New generic cling widget, add cling for refocus editor button" into gb-ub-photos-denali
|
adde93f26f39cd856fdf749c83d29f9022a310e1 |
01-Apr-2014 |
Sascha Haeberling <haeberling@google.com> |
Re-add ongoing session when Activity is restarted. Bug: 13637563 Change-Id: I0fd9a521479d8805f8c1d82b8f930a23d16b4217
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/data/AbstractLocalDataAdapterWrapper.java
rc/com/android/camera/data/CameraDataAdapter.java
rc/com/android/camera/data/LocalDataAdapter.java
rc/com/android/camera/session/CaptureSessionManager.java
rc/com/android/camera/session/CaptureSessionManagerImpl.java
|
281b7ec77677feadb9b1813b8edf819a7eea0fa0 |
01-Apr-2014 |
Spike Sprague <spikuru@google.com> |
am 7c696626: Merge "keep three dots option toggle on the screen" into gb-ub-photos-denali * commit '7c696626e213f010ab3027165b7c70bc2345fe01': keep three dots option toggle on the screen
|
7c696626e213f010ab3027165b7c70bc2345fe01 |
01-Apr-2014 |
Spike Sprague <spikuru@google.com> |
Merge "keep three dots option toggle on the screen" into gb-ub-photos-denali
|
b36c6b7a5262e2d80b4c6e3e17cc3cb79b6a522a |
31-Mar-2014 |
Spike Sprague <spikuru@google.com> |
keep three dots option toggle on the screen bug: 13716654 Change-Id: I142d2ce8c026ad4f4fded15475e4d2a42e10f859
es/drawable/ic_options_land.xml
es/drawable/ic_options_port.xml
es/layout-land/indicators.xml
es/layout-land/mode_options_bottombar.xml
es/layout-port/indicators.xml
es/layout-port/mode_options_bottombar.xml
es/layout/indicators.xml
rc/com/android/camera/app/CameraAppUI.java
rc/com/android/camera/widget/IndicatorIconController.java
rc/com/android/camera/widget/ModeOptionsOverlay.java
|
e7d7b9ef5e09ba464306565c6c62302a4d9bbe5e |
01-Apr-2014 |
Doris Liu <tianliu@google.com> |
New generic cling widget, add cling for refocus editor button Bug: 13307036 Change-Id: If3a1759cbc0cbc66de1d3d15a3ae18999bf0bd1f
es/drawable-hdpi/cling.9.png
es/drawable-mdpi/cling.9.png
es/drawable-xhdpi/cling.9.png
es/drawable-xxhdpi/cling.9.png
es/layout/cling_widget.xml
es/values/dimens.xml
es/values/strings.xml
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/app/CameraAppUI.java
rc/com/android/camera/app/FilmstripBottomPanel.java
rc/com/android/camera/settings/SettingsCache.java
rc/com/android/camera/settings/SettingsManager.java
rc/com/android/camera/widget/Cling.java
|
7a5854f3dc6e320fd5ae1622dd0916a8f32d2eb7 |
01-Apr-2014 |
Doris Liu <tianliu@google.com> |
am fb28f3bd: Fix mode switcher RTL layout * commit 'fb28f3bd35ecb390cb09c3e5c90906e1b0e7044e': Fix mode switcher RTL layout
|
fb28f3bd35ecb390cb09c3e5c90906e1b0e7044e |
01-Apr-2014 |
Doris Liu <tianliu@google.com> |
Fix mode switcher RTL layout Bug: 13732534 Change-Id: I30360263eb2aaf900be0e05101558fde41e6944c
es/layout/mode_selector.xml
|
a0e28c24c0b2d8cf5e5b8c5937f27e012b0cf579 |
31-Mar-2014 |
Erin Dahlgren <edahlgren@google.com> |
am 4e0a4641: Make last module used sticky after all camera launches. * commit '4e0a464166fca881fa93d51f43aeb334c874e4b1': Make last module used sticky after all camera launches.
|
4e0a464166fca881fa93d51f43aeb334c874e4b1 |
31-Mar-2014 |
Erin Dahlgren <edahlgren@google.com> |
Make last module used sticky after all camera launches. Bug: 13716653 Change-Id: If72a2dc7a3dfe94f5ff73b6034b6bafc8073f40c
rc/com/android/camera/CameraActivity.java
|
9858871ebed68889ce108588491055a40874a156 |
31-Mar-2014 |
Sascha Haeberling <haeberling@google.com> |
am 33e3133b: Merge "Enable a memory override through Gservices." into gb-ub-photos-denali * commit '33e3133bb7161fad5f97880facdf8bea97d930d0': Enable a memory override through Gservices.
|
33e3133bb7161fad5f97880facdf8bea97d930d0 |
31-Mar-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Enable a memory override through Gservices." into gb-ub-photos-denali
|
0b1acadf43507288d516618577c66e5e214fd6c3 |
31-Mar-2014 |
Angus Kong <shkong@google.com> |
am a5d07059: Add log for unfinished synchronous job. * commit 'a5d07059d1f9d61d918a0b33e781efd764032eba': Add log for unfinished synchronous job.
|
a5d07059d1f9d61d918a0b33e781efd764032eba |
31-Mar-2014 |
Angus Kong <shkong@google.com> |
Add log for unfinished synchronous job. bug:13566485 Change-Id: Ic3920bcc5c2c8ffdfd7f55f6e688ddfea44cad93
rc/com/android/camera/app/AndroidCameraManagerImpl.java
|
fe14c6811cfe88ff8cbfa28153ce4379b22cf838 |
31-Mar-2014 |
Sascha Haeberling <haeberling@google.com> |
am d1bb8e08: If debug is on, log everything. * commit 'd1bb8e084f4ef1dc0b6836d8de07454a80de3ac9': If debug is on, log everything.
|
23262280ef73104d909d23d0fa811c217a349497 |
29-Mar-2014 |
Sascha Haeberling <haeberling@google.com> |
Enable a memory override through Gservices. Bug: 13591498 Change-Id: I8515c57c2349279fb74071854b85021716895fa6
rc/com/android/camera/app/MemoryManagerImpl.java
rc_pd/com/android/camera/util/GservicesHelper.java
|
d1bb8e084f4ef1dc0b6836d8de07454a80de3ac9 |
29-Mar-2014 |
Sascha Haeberling <haeberling@google.com> |
If debug is on, log everything. Change-Id: I706874c9ea1b03c2fd9f987cda9581f72883c914
rc/com/android/camera/debug/Log.java
|
63ab7ed46e9c8a74d3bd95a4215ea7c392e938c5 |
28-Mar-2014 |
Erin Dahlgren <edahlgren@google.com> |
am 1ca516f2: Allow modules to hard reset settings to prevent out-of-sync errors. * commit '1ca516f2b612f91e0857ca87d978d39c2aba7c8c': Allow modules to hard reset settings to prevent out-of-sync errors.
|
60f4d74c66e47439c6213b331d73c8a50a284363 |
28-Mar-2014 |
Doris Liu <tianliu@google.com> |
am c51b5d24: Merge "Remove white balance and non-HDR scene mode settings" into gb-ub-photos-denali * commit 'c51b5d242f95442f75cd46e84bf91087c18f65be': Remove white balance and non-HDR scene mode settings
|
1ca516f2b612f91e0857ca87d978d39c2aba7c8c |
28-Mar-2014 |
Erin Dahlgren <edahlgren@google.com> |
Allow modules to hard reset settings to prevent out-of-sync errors. Bug: 13663716 Bug: 13507557 Change-Id: Ie4e66c356c69c3a75a568dae13ddd2d42f60179e
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/VideoModule.java
rc/com/android/camera/module/ModuleController.java
|
ed2097d63d327eeb6f0d0399da604e78dc1d1d9d |
28-Mar-2014 |
Sascha Haeberling <haeberling@google.com> |
resolved conflicts for merge of 366c13ba to ub-camera-everglades Change-Id: I6654367c0a761382c26c3bd09039fe8fc0f52f78
|
c51b5d242f95442f75cd46e84bf91087c18f65be |
28-Mar-2014 |
Doris Liu <tianliu@google.com> |
Merge "Remove white balance and non-HDR scene mode settings" into gb-ub-photos-denali
|
8ad8ad4841f65ee89e3c5e79f57d95cf8e4438b4 |
27-Mar-2014 |
Doris Liu <tianliu@google.com> |
Remove white balance and non-HDR scene mode settings Also hook up HDR setting with scene mode to ensure it functions correctly Bug: 13546569 Bug: 13546102 Change-Id: I71ef1841fc2bcb22f6ca0e286c31806ea049c79e
es/drawable-hdpi/ic_indicator_wb_cloudy.png
es/drawable-hdpi/ic_indicator_wb_daylight.png
es/drawable-hdpi/ic_indicator_wb_fluorescent.png
es/drawable-hdpi/ic_indicator_wb_off.png
es/drawable-hdpi/ic_indicator_wb_tungsten.png
es/drawable-hdpi/ic_sce.png
es/drawable-hdpi/ic_sce_action.png
es/drawable-hdpi/ic_sce_night.png
es/drawable-hdpi/ic_sce_off.png
es/drawable-hdpi/ic_sce_party.png
es/drawable-hdpi/ic_sce_sunset.png
es/drawable-hdpi/ic_wb_auto.png
es/drawable-hdpi/ic_wb_cloudy.png
es/drawable-hdpi/ic_wb_fluorescent.png
es/drawable-hdpi/ic_wb_incandescent.png
es/drawable-hdpi/ic_wb_sunlight.png
es/drawable-mdpi/ic_indicator_wb_cloudy.png
es/drawable-mdpi/ic_indicator_wb_daylight.png
es/drawable-mdpi/ic_indicator_wb_fluorescent.png
es/drawable-mdpi/ic_indicator_wb_off.png
es/drawable-mdpi/ic_indicator_wb_tungsten.png
es/drawable-mdpi/ic_sce.png
es/drawable-mdpi/ic_sce_action.png
es/drawable-mdpi/ic_sce_night.png
es/drawable-mdpi/ic_sce_off.png
es/drawable-mdpi/ic_sce_party.png
es/drawable-mdpi/ic_sce_sunset.png
es/drawable-mdpi/ic_wb_auto.png
es/drawable-mdpi/ic_wb_cloudy.png
es/drawable-mdpi/ic_wb_fluorescent.png
es/drawable-mdpi/ic_wb_incandescent.png
es/drawable-mdpi/ic_wb_sunlight.png
es/drawable-xhdpi/ic_indicator_wb_cloudy.png
es/drawable-xhdpi/ic_indicator_wb_daylight.png
es/drawable-xhdpi/ic_indicator_wb_fluorescent.png
es/drawable-xhdpi/ic_indicator_wb_off.png
es/drawable-xhdpi/ic_indicator_wb_tungsten.png
es/drawable-xhdpi/ic_sce.png
es/drawable-xhdpi/ic_sce_action.png
es/drawable-xhdpi/ic_sce_night.png
es/drawable-xhdpi/ic_sce_off.png
es/drawable-xhdpi/ic_sce_party.png
es/drawable-xhdpi/ic_sce_sunset.png
es/drawable-xhdpi/ic_wb_auto.png
es/drawable-xhdpi/ic_wb_cloudy.png
es/drawable-xhdpi/ic_wb_fluorescent.png
es/drawable-xhdpi/ic_wb_incandescent.png
es/drawable-xhdpi/ic_wb_sunlight.png
es/layout/menu_indicators.xml
es/layout/menu_indicators_keyguard.xml
es/values/arrays.xml
rc/com/android/camera/ButtonManager.java
rc/com/android/camera/OnScreenIndicators.java
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/VideoModule.java
rc/com/android/camera/app/CameraAppUI.java
rc/com/android/camera/settings/SettingsCache.java
rc/com/android/camera/settings/SettingsManager.java
rc/com/android/camera/widget/IndicatorIconController.java
|
366c13baa640bc597cac360c5a1ffad5a3618b11 |
28-Mar-2014 |
Sascha Haeberling <haeberling@google.com> |
Change processing logic so that it can be suspended Bug: 13591498 Change-Id: Ib6e86bd6da197415676a80b212ea910ad0215f5d
rc/com/android/camera/app/MemoryManagerImpl.java
rc/com/android/camera/data/LocalMediaData.java
rc/com/android/camera/processing/ProcessingService.java
rc/com/android/camera/processing/ProcessingServiceManager.java
|
31783c6849e3cb4df8a59753eaf32b883dfed168 |
27-Mar-2014 |
Baligh Uddin <baligh@google.com> |
am e375f047: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-denali * commit 'e375f047df74741d873ecd18b843a582697046c8': Import translations. DO NOT MERGE
|
e375f047df74741d873ecd18b843a582697046c8 |
27-Mar-2014 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-denali
|
cf955a31df2e4c3424a405e75931b1d8cc43ae31 |
27-Mar-2014 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into ub-camera-everglades
|
9f34b315eb38c99c860cfad99aed204a1bbd0911 |
27-Mar-2014 |
Alan Newberger <alann@google.com> |
am b6db6917: Hide bottom bar of Camera when filmstrip is visible * commit 'b6db6917db367e4ca0992ca8614a4cfc59d68d92': Hide bottom bar of Camera when filmstrip is visible
|
a293597032795e3f245e9f0d5b20701375904e04 |
27-Mar-2014 |
Alan Newberger <alann@google.com> |
resolved conflicts for merge of 1cfa3dd7 to ub-camera-everglades Change-Id: I82bd27a28ad5df4dda149e97bddc317ffe6914d0
|
b6db6917db367e4ca0992ca8614a4cfc59d68d92 |
26-Mar-2014 |
Alan Newberger <alann@google.com> |
Hide bottom bar of Camera when filmstrip is visible This CL hides the bottom bar, i.e. capture button and onscreen indicators, when the filmstrip is visible. We hide a wrapper; modules may independently control the visibility of the items in the wrapper e.g. Photo Sphere turns the actual buttons invisible even if the wrapper becomes visible. This change takes care of the most egregious issues with widgets visible to TalkBack under the filmstrip, but there are still others e.g. 'align to start' for Photo Sphere, can be navigated to. I'll file a separate bug to pursue a more aggressive wrapper visibility toggle which turns off the whole camera preview, mode switcher, etc. Bug: 13644558 Bug: 13589550 Change-Id: I1cf7e9079210c85f29b3e35e0f7dbf176b86976e
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/app/CameraAppUI.java
|
2d9fb0ddb2e9d64276506281a27ef1c9a17f01d3 |
26-Mar-2014 |
Alan Newberger <alann@google.com> |
am 62c6d864: Add content description for secure lockscreen filmstrip icon * commit '62c6d864f51fb7f77b598df914a3825e2cfc45fa': Add content description for secure lockscreen filmstrip icon
|
fa74d8bab8b01a28e956b646eed784f349bc662f |
26-Mar-2014 |
Alan Newberger <alann@google.com> |
am f2711925: Fix video recording announcements * commit 'f2711925113d405f83734ac81e3de36132e783ce': Fix video recording announcements
|
2c709ad2f6fd1f7d7c8070b773b70202be2122ac |
26-Mar-2014 |
Angus Kong <shkong@google.com> |
am 5596b4c9: (-s ours) Use debug.Log instead of android.util.Log. * commit '5596b4c902dcb685928b43678f428746ca5ffd08': Use debug.Log instead of android.util.Log.
|
2bca210e5fc8a77685775ffb403096167b017dce |
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
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/CameraErrorCallback.java
rc/com/android/camera/CameraSettings.java
rc/com/android/camera/DisableCameraReceiver.java
rc/com/android/camera/Exif.java
rc/com/android/camera/FocusOverlayManager.java
rc/com/android/camera/ListPreference.java
rc/com/android/camera/MediaSaverImpl.java
rc/com/android/camera/OnScreenHint.java
rc/com/android/camera/OnScreenIndicators.java
rc/com/android/camera/PanoProgressBar.java
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/PhotoUI.java
rc/com/android/camera/PreviewGestures.java
rc/com/android/camera/SoundClips.java
rc/com/android/camera/Storage.java
rc/com/android/camera/SurfaceTextureRenderer.java
rc/com/android/camera/TextureViewHelper.java
rc/com/android/camera/VideoModule.java
rc/com/android/camera/VideoUI.java
rc/com/android/camera/app/AndroidCameraManagerImpl.java
rc/com/android/camera/app/CameraAppUI.java
rc/com/android/camera/app/CameraController.java
rc/com/android/camera/app/CameraManager.java
rc/com/android/camera/app/LegacyLocationProvider.java
rc/com/android/camera/app/MemoryManagerImpl.java
rc/com/android/camera/app/ModuleManagerImpl.java
rc/com/android/camera/app/OrientationManagerImpl.java
rc/com/android/camera/data/CameraDataAdapter.java
rc/com/android/camera/data/FixedFirstDataAdapter.java
rc/com/android/camera/data/LocalData.java
rc/com/android/camera/data/LocalDataUtil.java
rc/com/android/camera/data/LocalMediaData.java
rc/com/android/camera/data/MediaDetails.java
rc/com/android/camera/data/RotationTask.java
rc/com/android/camera/data/SimpleViewData.java
rc/com/android/camera/data/VideoRotationMetadataLoader.java
rc/com/android/camera/debug/Config.java
rc/com/android/camera/debug/Configurations.java
rc/com/android/camera/debug/CurrentConfig.java
rc/com/android/camera/debug/DebugCameraProxy.java
rc/com/android/camera/debug/Log.java
rc/com/android/camera/exif/ExifData.java
rc/com/android/camera/exif/ExifModifier.java
rc/com/android/camera/exif/ExifOutputStream.java
rc/com/android/camera/exif/ExifParser.java
rc/com/android/camera/exif/ExifReader.java
rc/com/android/camera/module/ModulesInfo.java
rc/com/android/camera/processing/ProcessingService.java
rc/com/android/camera/processing/ProcessingServiceManager.java
rc/com/android/camera/session/CaptureSessionManagerImpl.java
rc/com/android/camera/session/PlaceholderManager.java
rc/com/android/camera/session/SessionStorageManagerImpl.java
rc/com/android/camera/settings/SettingsManager.java
rc/com/android/camera/settings/SettingsUtil.java
rc/com/android/camera/tinyplanet/TinyPlanetFragment.java
rc/com/android/camera/ui/BottomBar.java
rc/com/android/camera/ui/CaptureAnimationOverlay.java
rc/com/android/camera/ui/FaceView.java
rc/com/android/camera/ui/FilmstripGestureRecognizer.java
rc/com/android/camera/ui/MainActivityLayout.java
rc/com/android/camera/ui/ModeListView.java
rc/com/android/camera/ui/ModeTransitionView.java
rc/com/android/camera/ui/OverlayRenderer.java
rc/com/android/camera/ui/PieRenderer.java
rc/com/android/camera/ui/PreviewOverlay.java
rc/com/android/camera/ui/RenderOverlay.java
rc/com/android/camera/ui/RotatableLayout.java
rc/com/android/camera/ui/RotateImageView.java
rc/com/android/camera/ui/RotateLayout.java
rc/com/android/camera/ui/ZoomRenderer.java
rc/com/android/camera/ui/ZoomView.java
rc/com/android/camera/util/CameraUtil.java
rc/com/android/camera/util/ImageLoader.java
rc/com/android/camera/util/IntentHelper.java
rc/com/android/camera/util/XmpUtil.java
rc/com/android/camera/widget/FilmstripView.java
rc/com/android/camera/widget/IndicatorIconController.java
rc/com/android/camera/widget/ModeOptionsOverlay.java
rc/com/android/camera/widget/Preloader.java
|
eab90e4f804fdbdc8f5f70d4ec699fa2407083b1 |
26-Mar-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ib693ae9422c69746a140c9e4f7656094d8b5a558 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-km-rKH/strings.xml
es/values-ko/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mn-rMN/strings.xml
es/values-ms-rMY/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
5e5780137e9765900af2f8e23317cfd556c86426 |
26-Mar-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Icf2961b937e7085e614a1991af7335a16e8d23b2 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-km-rKH/strings.xml
es/values-ko/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mn-rMN/strings.xml
es/values-ms-rMY/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
1cfa3dd77d3828985d37beffbfad9388af054757 |
26-Mar-2014 |
Alan Newberger <alann@google.com> |
Add content description for filmstrip images, video button This CL corrects a missing content description for video icon in filmstrip. It also adds content description for images so that when a user in TalkBack highlights an image, it describes its timestamp. Bug: 13644357 Bug: 13589550 Change-Id: I029b141cee4ddc325a5e5569ef10de600734b0f4
es/values/strings.xml
rc/com/android/camera/data/LocalMediaData.java
rc/com/android/camera/data/LocalSessionData.java
|
62c6d864f51fb7f77b598df914a3825e2cfc45fa |
26-Mar-2014 |
Alan Newberger <alann@google.com> |
Add content description for secure lockscreen filmstrip icon This CL adds a description for the lock icon in the secure filmstrip. Bug: 13644391 Bug: 13589550 Change-Id: Ib81e3a419d51ca14d6d4d912de22d04bac4d3234
es/values/strings.xml
rc/com/android/camera/CameraActivity.java
|
f2711925113d405f83734ac81e3de36132e783ce |
26-Mar-2014 |
Alan Newberger <alann@google.com> |
Fix video recording announcements Video recording announcements were implemented in the past, but broken due to null shutter button View during attempt. I pushed the announcements into the VideoUI where IMO it belongs, and it encapsulates the implementation detail that I use the timer View (which works fine). Bug: 13644953 Bug: 13589550 Change-Id: I0d5135e5d23d9c4df594307d0beb5d5be934e409
rc/com/android/camera/VideoModule.java
rc/com/android/camera/VideoUI.java
|
5596b4c902dcb685928b43678f428746ca5ffd08 |
12-Mar-2014 |
Angus Kong <shkong@google.com> |
Use debug.Log instead of android.util.Log. 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
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/CameraErrorCallback.java
rc/com/android/camera/CameraSettings.java
rc/com/android/camera/DisableCameraReceiver.java
rc/com/android/camera/Exif.java
rc/com/android/camera/FocusOverlayManager.java
rc/com/android/camera/ListPreference.java
rc/com/android/camera/MediaSaverImpl.java
rc/com/android/camera/OnScreenHint.java
rc/com/android/camera/OnScreenIndicators.java
rc/com/android/camera/PanoProgressBar.java
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/PhotoUI.java
rc/com/android/camera/PreviewGestures.java
rc/com/android/camera/SoundClips.java
rc/com/android/camera/Storage.java
rc/com/android/camera/SurfaceTextureRenderer.java
rc/com/android/camera/TextureViewHelper.java
rc/com/android/camera/VideoModule.java
rc/com/android/camera/VideoUI.java
rc/com/android/camera/app/AndroidCameraManagerImpl.java
rc/com/android/camera/app/CameraAppUI.java
rc/com/android/camera/app/CameraController.java
rc/com/android/camera/app/CameraManager.java
rc/com/android/camera/app/LegacyLocationProvider.java
rc/com/android/camera/app/MemoryManagerImpl.java
rc/com/android/camera/app/ModuleManagerImpl.java
rc/com/android/camera/app/OrientationManagerImpl.java
rc/com/android/camera/data/CameraDataAdapter.java
rc/com/android/camera/data/FixedFirstDataAdapter.java
rc/com/android/camera/data/LocalData.java
rc/com/android/camera/data/LocalDataUtil.java
rc/com/android/camera/data/LocalMediaData.java
rc/com/android/camera/data/MediaDetails.java
rc/com/android/camera/data/RotationTask.java
rc/com/android/camera/data/SimpleViewData.java
rc/com/android/camera/data/VideoRotationMetadataLoader.java
rc/com/android/camera/debug/Config.java
rc/com/android/camera/debug/Configurations.java
rc/com/android/camera/debug/CurrentConfig.java
rc/com/android/camera/debug/DebugCameraProxy.java
rc/com/android/camera/debug/Log.java
rc/com/android/camera/exif/ExifData.java
rc/com/android/camera/exif/ExifModifier.java
rc/com/android/camera/exif/ExifOutputStream.java
rc/com/android/camera/exif/ExifParser.java
rc/com/android/camera/exif/ExifReader.java
rc/com/android/camera/module/ModulesInfo.java
rc/com/android/camera/processing/ProcessingService.java
rc/com/android/camera/processing/ProcessingServiceManager.java
rc/com/android/camera/session/CaptureSessionManagerImpl.java
rc/com/android/camera/session/PlaceholderManager.java
rc/com/android/camera/session/SessionStorageManagerImpl.java
rc/com/android/camera/settings/SettingsManager.java
rc/com/android/camera/settings/SettingsUtil.java
rc/com/android/camera/tinyplanet/TinyPlanetFragment.java
rc/com/android/camera/ui/BottomBar.java
rc/com/android/camera/ui/CaptureAnimationOverlay.java
rc/com/android/camera/ui/FaceView.java
rc/com/android/camera/ui/FilmstripGestureRecognizer.java
rc/com/android/camera/ui/MainActivityLayout.java
rc/com/android/camera/ui/ModeListView.java
rc/com/android/camera/ui/ModeTransitionView.java
rc/com/android/camera/ui/OverlayRenderer.java
rc/com/android/camera/ui/PieRenderer.java
rc/com/android/camera/ui/PreviewOverlay.java
rc/com/android/camera/ui/RenderOverlay.java
rc/com/android/camera/ui/RotatableLayout.java
rc/com/android/camera/ui/RotateImageView.java
rc/com/android/camera/ui/RotateLayout.java
rc/com/android/camera/ui/ZoomRenderer.java
rc/com/android/camera/ui/ZoomView.java
rc/com/android/camera/util/CameraUtil.java
rc/com/android/camera/util/ImageLoader.java
rc/com/android/camera/util/IntentHelper.java
rc/com/android/camera/util/XmpUtil.java
rc/com/android/camera/widget/FilmstripView.java
rc/com/android/camera/widget/IndicatorIconController.java
rc/com/android/camera/widget/ModeOptionsOverlay.java
rc/com/android/camera/widget/Preloader.java
|
ddbec4d1c3a0e2a796de65c226d5d2621a4d0d21 |
26-Mar-2014 |
Andy Huibers <andyhuibers@google.com> |
am 2fc87a73: Merge "Clean up stats stubs." into gb-ub-photos-denali * commit '2fc87a7338d34d8d7383eeea3a367893961a6ac5': Clean up stats stubs.
|
2fc87a7338d34d8d7383eeea3a367893961a6ac5 |
26-Mar-2014 |
Andy Huibers <andyhuibers@google.com> |
Merge "Clean up stats stubs." into gb-ub-photos-denali
|
f7d4ebac5b4a8093b37d35fd0d650380dae8c8e4 |
26-Mar-2014 |
Andy Huibers <andyhuibers@google.com> |
Clean up stats stubs. Change-Id: I3e2aefc2a1e4c5086af43fea18cc39963cfd0c82
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/VideoModule.java
rc_pd/com/android/camera/util/UsageStatistics.java
rc_pd/com/google/common/logging/eventprotos.java
|
93eb42683e939c790f2d31c43100ab79e283fdb7 |
26-Mar-2014 |
Carlos Hernandez <chernand@google.com> |
am 82cd60ca: Merge "Implement callbacks for setProgressMessage" into gb-ub-photos-denali * commit '82cd60ca5a3fd38e43b141c08336c5099777fdfa': Implement callbacks for setProgressMessage
|
82cd60ca5a3fd38e43b141c08336c5099777fdfa |
26-Mar-2014 |
Carlos Hernandez <chernand@google.com> |
Merge "Implement callbacks for setProgressMessage" into gb-ub-photos-denali
|
096d03d80a6c4554a6881242991ed59b9a8eff39 |
26-Mar-2014 |
Doris Liu <tianliu@google.com> |
am 744eee4a: Merge "Disconnect visibility change listener in onDestroy()" into gb-ub-photos-denali * commit '744eee4a13bb33449dba51e371a62257d6e7ef56': Disconnect visibility change listener in onDestroy()
|
744eee4a13bb33449dba51e371a62257d6e7ef56 |
26-Mar-2014 |
Doris Liu <tianliu@google.com> |
Merge "Disconnect visibility change listener in onDestroy()" into gb-ub-photos-denali
|
3cea8cc394ec2468de7b4ba1b5a68717b22f7c8a |
26-Mar-2014 |
Doris Liu <tianliu@google.com> |
Disconnect visibility change listener in onDestroy() Bug: 13642099 Change-Id: If31304db8eb7152aea4365e6c112e3254fd8820b
rc/com/android/camera/CameraActivity.java
|
3fb02b103804a24c404bb0db7f866df0e44aff3a |
25-Mar-2014 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into ub-camera-everglades
|
cbd058a6e3cd7a9b254c51e3db4d4aef2d31579f |
25-Mar-2014 |
Carlos Hernandez <chernand@google.com> |
Implement callbacks for setProgressMessage Change-Id: Id958d39c91ba3371d6b52b8f6005cc533ca38b45
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/session/CaptureSessionManager.java
rc/com/android/camera/session/CaptureSessionManagerImpl.java
|
3dc0b9db377bb776c56af352252da3a37280c835 |
25-Mar-2014 |
Baligh Uddin <baligh@google.com> |
am 832f143c: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-denali * commit '832f143cda87b5bffb9839c17c423f24c00f4f72': Import translations. DO NOT MERGE
|
71bd7248ab31bc9bb280dd56ef6be5c8fa749ba4 |
25-Mar-2014 |
Alan Newberger <alann@google.com> |
am 75fc98f2: provide announcements for peeks states * commit '75fc98f248f4383e3dc10048bfdf0292fd8dd970': provide announcements for peeks states
|
832f143cda87b5bffb9839c17c423f24c00f4f72 |
25-Mar-2014 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-denali
|
75fc98f248f4383e3dc10048bfdf0292fd8dd970 |
25-Mar-2014 |
Alan Newberger <alann@google.com> |
provide announcements for peeks states The peek is a visual element that with this CL, has an a11y accompaniment. Bug: 13589550 Change-Id: I92be51f64d43e1f3c1cdb90ac135986455bd2177
es/values/strings.xml
rc/com/android/camera/widget/PeekView.java
|
85ba9ecf5951b3f1afbec996c08580496ac4d741 |
25-Mar-2014 |
Alan Newberger <alann@google.com> |
am 26e901ed: Add a11y announcements for Mode List * commit '26e901ed46054fb6cc2cb4c09bef3a779a1cbf78': Add a11y announcements for Mode List
|
26e901ed46054fb6cc2cb4c09bef3a779a1cbf78 |
25-Mar-2014 |
Alan Newberger <alann@google.com> |
Add a11y announcements for Mode List This CL adds mode list announcements when shown, hidden, and for shimmy. Adds a Manager to guard access to current state, which calls an event on the state onCurrentState, in which announcements and other processing can be done. Bug: 13589550 Change-Id: Ib0f3b555978438426d158c33d3d97f72f3e83130
es/values/strings.xml
rc/com/android/camera/ui/ModeListView.java
|
f79ecd56c1f985c8b43aa5969a124541567fb611 |
25-Mar-2014 |
Alan Newberger <alann@google.com> |
am 735578a1: revert camera controls hiding to filmstrip * commit '735578a1f80c6c642ec96fca2e9b81986fc82d2b': revert camera controls hiding to filmstrip
|
735578a1f80c6c642ec96fca2e9b81986fc82d2b |
25-Mar-2014 |
Alan Newberger <alann@google.com> |
revert camera controls hiding to filmstrip A previous CL added hiding to filmstrip of camera controls, but not all modes have visible controls themselves, so this CL prevents those kinds of modes from having controls made visible after returning from filmstrip. Will pursue a followup CL to do it right. Bug: 13589550 Change-Id: I3820dad019c068586358d378a6c382f8f9d058be
rc/com/android/camera/CameraActivity.java
|
fdd34d2d28a3c8b88098772881afabac8f8c7957 |
25-Mar-2014 |
Alan Newberger <alann@google.com> |
am f495ea8c: Set capture controls invisible when in filmstrip * commit 'f495ea8ca078fc752b1ed1045ba22817d75e968e': Set capture controls invisible when in filmstrip
|
f495ea8ca078fc752b1ed1045ba22817d75e968e |
25-Mar-2014 |
Alan Newberger <alann@google.com> |
Set capture controls invisible when in filmstrip Though covered by the filmstrip, by being visible in filmstrip these controls are reachable in TalkBack when in filmstrip which is confusing. This CL makes them invisible in filmstrip and filmstrip Talkback is now clean Bug: 13589550 Change-Id: Ib92823a6efb07a4f56a83516e7decf08397c6edf
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/app/CameraAppUI.java
|
ad7d4540edd6fa8ed7789256a7f4cac16c3a0236 |
25-Mar-2014 |
Alan Newberger <alann@google.com> |
am dd9739a9: Merge "add filmstrip DPAD capabilities" into gb-ub-photos-denali * commit 'dd9739a98402b8d325ec34a1a2ce743b871aa325': add filmstrip DPAD capabilities
|
dd9739a98402b8d325ec34a1a2ce743b871aa325 |
25-Mar-2014 |
Alan Newberger <alann@google.com> |
Merge "add filmstrip DPAD capabilities" into gb-ub-photos-denali
|
e22e489c6b5b03b8e3c044dc25b97e8deff7b7e7 |
25-Mar-2014 |
Angus Kong <shkong@google.com> |
am 2ed67843: Show hint animations forever. * commit '2ed67843b7eb5cb67eaec51561770262f5fd36c7': Show hint animations forever.
|
8099a371048e45b9161ac63e4d6bd9644fcad5b5 |
25-Mar-2014 |
Alan Newberger <alann@google.com> |
add filmstrip DPAD capabilities this CL adds left/right DPAD handling to filmstrip. If you reach the first item, the filmstrip is hidden and user is back in capture. Bug: 13589550 Change-Id: Id2b2d52da31ef65cb568ce4ef3f5cdc9384caf1f
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/app/CameraAppUI.java
rc/com/android/camera/filmstrip/FilmstripController.java
rc/com/android/camera/widget/FilmstripView.java
|
92acdb86dcbce90c904e1682c49617614ab3dddc |
25-Mar-2014 |
Angus Kong <shkong@google.com> |
am 218ebb8f: Merge "Disable camera switch after it\'s pressed." into gb-ub-photos-denali * commit '218ebb8f396aa83de198f313f577d9710059bc8f': Disable camera switch after it's pressed.
|
2ed67843b7eb5cb67eaec51561770262f5fd36c7 |
25-Mar-2014 |
Angus Kong <shkong@google.com> |
Show hint animations forever. bug:13544174 Change-Id: I7d679c8e13b41a5d8266c2c2768e914ef3d5ea1b
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/app/AppController.java
rc/com/android/camera/app/CameraAppUI.java
rc/com/android/camera/settings/SettingsCache.java
rc/com/android/camera/settings/SettingsManager.java
|
218ebb8f396aa83de198f313f577d9710059bc8f |
25-Mar-2014 |
Angus Kong <shkong@google.com> |
Merge "Disable camera switch after it's pressed." into gb-ub-photos-denali
|
aec4d6c88aef0ce832753e0ce9c79cf04a3377a8 |
25-Mar-2014 |
Alan Newberger <alann@google.com> |
am 623dd0c6: Add DPAD support to capture window * commit '623dd0c68d64038ed2bcfd264348d9b6f1a13c8a': Add DPAD support to capture window
|
c8d9ad868e515ccebe1b6f52cb5fae1e6d13cbab |
25-Mar-2014 |
Angus Kong <shkong@google.com> |
Disable camera switch after it's pressed. bug:13477604 Change-Id: I478715b345ce39d6bff65c9eda3a5604fb9d7edb
rc/com/android/camera/ButtonManager.java
|
623dd0c68d64038ed2bcfd264348d9b6f1a13c8a |
24-Mar-2014 |
Alan Newberger <alann@google.com> |
Add DPAD support to capture window This CL adds DPAD support for capture screen gestures, in particular to mode switcher and to filmstrip. Left goes to mode switcher and again toggles it off; right goes to filmstrip. A followon CL will add additional filmstrip calls that control gestures within the filmstrip itself, namely navigation between items and hiding. Bug: 13589550 Change-Id: I7b6a7a37c5be8137c2503244dc178284139594dd
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/app/CameraAppUI.java
rc/com/android/camera/widget/FilmstripLayout.java
|
ac6b891fec84aa9b0750740bffd8aedeba21a86d |
24-Mar-2014 |
Alan Newberger <alann@google.com> |
am 07072c8a: Merge "add options announcement to onscreen options indicator" into gb-ub-photos-denali * commit '07072c8a213e1e884f372d0df8c98ac0429acf1b': add options announcement to onscreen options indicator
|
07072c8a213e1e884f372d0df8c98ac0429acf1b |
24-Mar-2014 |
Alan Newberger <alann@google.com> |
Merge "add options announcement to onscreen options indicator" into gb-ub-photos-denali
|
b3596fc4e44db6696a73f76fd2492acec9fb67ab |
24-Mar-2014 |
Kevin Gabayan <gabayan@google.com> |
am 8bfef0d5: Merge "Focus reset delay changed from 3 to 4 seconds. Bug: 12826152" into gb-ub-photos-denali * commit '8bfef0d567232aec9711790f66187588c67ae82a': Focus reset delay changed from 3 to 4 seconds. Bug: 12826152
|
8bfef0d567232aec9711790f66187588c67ae82a |
24-Mar-2014 |
Kevin Gabayan <gabayan@google.com> |
Merge "Focus reset delay changed from 3 to 4 seconds. Bug: 12826152" into gb-ub-photos-denali
|
d829d95be0bc45b6a8aa7973c7d739299fcda07e |
24-Mar-2014 |
Doris Liu <tianliu@google.com> |
am f6504fce: Merge "More efficient drawing during animation" into gb-ub-photos-denali * commit 'f6504fceb9a37b543368be6e5d943b1981434b31': More efficient drawing during animation
|
f6504fceb9a37b543368be6e5d943b1981434b31 |
24-Mar-2014 |
Doris Liu <tianliu@google.com> |
Merge "More efficient drawing during animation" into gb-ub-photos-denali
|
4936f1eb7c3e505a8c2c9f1a8ad38e7af5da2b98 |
24-Mar-2014 |
Alan Newberger <alann@google.com> |
add options announcement to onscreen options indicator this CL adds a content description to the onscreen indicator, whether populated or just '...', to allow TalkBack to describe it. bug: 13589550 Change-Id: Ic34d32fe466dfbabb93987c5466a3a5729acbcfd
es/layout-land/mode_options_bottombar.xml
es/layout-port/mode_options_bottombar.xml
es/layout/indicators.xml
es/values/strings.xml
|
d4a68ca4e34ad256cd4cd2f7b1faae234d240dfa |
24-Mar-2014 |
Kevin Gabayan <gabayan@google.com> |
Focus reset delay changed from 3 to 4 seconds. Bug: 12826152 Change-Id: I91a0dce343035b8d39de092a7f4bb1af26a44c55
rc/com/android/camera/FocusOverlayManager.java
|
9a617ec88bd3ebf7ce72428b4b4f10615f43d92b |
24-Mar-2014 |
Carlos Hernandez <chernand@google.com> |
am dc1afd4b: Merge "let ProcessingServiceManager report if the service is running" into gb-ub-photos-denali * commit 'dc1afd4bebd4ab220b1aca14295038ad790d5f6b': let ProcessingServiceManager report if the service is running
|
dc1afd4bebd4ab220b1aca14295038ad790d5f6b |
24-Mar-2014 |
Carlos Hernandez <chernand@google.com> |
Merge "let ProcessingServiceManager report if the service is running" into gb-ub-photos-denali
|
9f834952cbef4d8c2dbf67be77157192f7a70d90 |
24-Mar-2014 |
Carlos Hernandez <chernand@google.com> |
let ProcessingServiceManager report if the service is running Change-Id: Ib706f2446baa12d2b70ff5c5b3d5637214006340
rc/com/android/camera/processing/ProcessingService.java
rc/com/android/camera/processing/ProcessingServiceManager.java
|
7bce651b5711ae6ef35a473d6d2584ad4b1ee0a7 |
24-Mar-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I0e1c05dfde49524f89da1ae5b0a9c47c8714c303 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-km-rKH/strings.xml
es/values-ko/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mn-rMN/strings.xml
es/values-ms-rMY/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
74bccb402a737b9e3eff793d28747da1dadd8488 |
24-Mar-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ic8b843a8a674a83a5cad2dd58e39ef4e22e9cf71 Auto-generated-cl: translation import
es/values-da/strings.xml
es/values-pl/strings.xml
es/values-sk/strings.xml
es/values-sw/strings.xml
es/values-zh-rCN/strings.xml
|
591ea6dd6cd7f7affacb490b3ce3284999ff3a70 |
24-Mar-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ied6ab806ae434ebf92262d1de2049717112305ad Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-km-rKH/strings.xml
es/values-ko/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mn-rMN/strings.xml
es/values-ms-rMY/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
4fffd39dc7cec711f236fa98c480657e2e5ebc16 |
24-Mar-2014 |
Sascha Haeberling <haeberling@google.com> |
am c34c7700: Merge "Add more logging to the processing service." into gb-ub-photos-denali * commit 'c34c77005b15289c8198172c9ea9b7cbbb09d2ea': Add more logging to the processing service.
|
c34c77005b15289c8198172c9ea9b7cbbb09d2ea |
24-Mar-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Add more logging to the processing service." into gb-ub-photos-denali
|
d5f38f505d5a5445288677f839cf4d8b9222a6c8 |
24-Mar-2014 |
Sameer Padala <sxp@google.com> |
Merge "Enable SmartCamera in video mode" into ub-camera-everglades
|
b4dc6350a10464cbd73495425032ecb854f11c0b |
24-Mar-2014 |
Spike Sprague <spikuru@google.com> |
am 197e238d: Merge "moving m*Animator.end() out of onConfigurationChanged" into gb-ub-photos-denali * commit '197e238d3ccd2c758238f1bce27687644c4d0521': moving m*Animator.end() out of onConfigurationChanged
|
4df915872c25fe61640a94c7a2c5f27eee1a1048 |
22-Mar-2014 |
Doris Liu <tianliu@google.com> |
More efficient drawing during animation - Improved mode options animation and video capture animation - Changed the drawPath() calls to drawCircle() as drawing oval is generally optimized and therefore more efficient. The efficiency gained depends on the hardware/software specific implementation, depending on where it's rendered. But drawCircle() should always no more costly than drawPath(). - Move the video capture button animation to after MediaRecorder initialization/release to avoid animation being blocked by time consuming operations. Bug: 13589320 Change-Id: I9c01374e46d439e33a066cfba07d95749a3caebf
rc/com/android/camera/VideoModule.java
rc/com/android/camera/ui/BottomBar.java
rc/com/android/camera/widget/ModeOptions.java
|
085fc9ffa97b85b36a7368a2880e222efa0f9165 |
24-Mar-2014 |
Sascha Haeberling <haeberling@google.com> |
resolved conflicts for merge of e1cc77ad to ub-camera-everglades Change-Id: I5814d65c2dc5ae5f669881c2cf676277d1512684
|
197e238d3ccd2c758238f1bce27687644c4d0521 |
24-Mar-2014 |
Spike Sprague <spikuru@google.com> |
Merge "moving m*Animator.end() out of onConfigurationChanged" into gb-ub-photos-denali
|
d88c0011ab16c2a27962249a9896835f85576794 |
24-Mar-2014 |
Sam Judd <judds@google.com> |
resolved conflicts for merge of 2666dc8a to ub-camera-everglades Change-Id: I9e3733dc447ae6613c73c1a94e7cc3c5e400b1da
|
e1cc77ad1ce8a7d4fc1447792da4667b5f2b2073 |
24-Mar-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Clean up notifications again after the removal of the notifications manager." into gb-ub-photos-denali
|
2f845b851439b3500727742278876ae017a8f4c5 |
24-Mar-2014 |
Sascha Haeberling <haeberling@google.com> |
Clean up notifications again after the removal of the notifications manager. Bug: 12972656 Change-Id: I3b16689ae22bbebd61143f84b55657759da2fad5
rc/com/android/camera/app/CameraApp.java
|
4a5b9e0b9f4eab654f30588941749a25aeba97fe |
24-Mar-2014 |
Sascha Haeberling <haeberling@google.com> |
Add more logging to the processing service. Bug: 13567165 Change-Id: I759ba750e3c911454bad86c4397d02e22837322c
rc/com/android/camera/processing/ProcessingService.java
|
43ea41960cb4085965608db9e19ef357d9c03efb |
24-Mar-2014 |
Sam Judd <judds@google.com> |
am 777cbe66: Merge "Don\'t render the preview while it\'s not visible to the user." into gb-ub-photos-denali * commit '777cbe660a5dc236d120375ecd3a7b9939b1ad7c': Don't render the preview while it's not visible to the user.
|
2666dc8a1c23b7c2b7c80d7c09104f113fb7dbb2 |
22-Mar-2014 |
Sam Judd <judds@google.com> |
Decode fullsize bitmap dimensions on a background thread. Bug: 13587605 Change-Id: Ia40e0799947abae3089e66dfcea339a68ee0d8e4
rc/com/android/camera/data/LocalDataUtil.java
rc/com/android/camera/data/LocalMediaData.java
rc/com/android/camera/ui/ZoomView.java
|
777cbe660a5dc236d120375ecd3a7b9939b1ad7c |
24-Mar-2014 |
Sam Judd <judds@google.com> |
Merge "Don't render the preview while it's not visible to the user." into gb-ub-photos-denali
|
1b1253241a5a9b3a59037ba7a626bca68a9b06d8 |
22-Mar-2014 |
Sam Judd <judds@google.com> |
Don't render the preview while it's not visible to the user. Bug: 13586944 Change-Id: Ide777da080ce150cec601b4e6e88cd6c4ea19cda
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/app/CameraAppUI.java
|
2d697d09777cb9d662dcd7c414f8f228b8912526 |
22-Mar-2014 |
Sascha Haeberling <haeberling@google.com> |
am 0bb2a760: Merge "Processing service needs to start in foreground." into gb-ub-photos-denali * commit '0bb2a76095707d4ae4b147133bc1b0d65541c2cd': Processing service needs to start in foreground.
|
0bb2a76095707d4ae4b147133bc1b0d65541c2cd |
22-Mar-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Processing service needs to start in foreground." into gb-ub-photos-denali
|
4a400d7f09ea0655d4730e904892e3a9d96993eb |
21-Mar-2014 |
Sascha Haeberling <haeberling@google.com> |
Processing service needs to start in foreground. Bug: 13575616 This moves the notification logic into the processing service as we anyway only have one notification. Change-Id: I267966a0e34028cb72be373031562e9e9bc89bbb
rc/com/android/camera/app/CameraApp.java
rc/com/android/camera/processing/ProcessingService.java
rc/com/android/camera/session/CaptureSession.java
rc/com/android/camera/session/CaptureSessionManagerImpl.java
rc/com/android/camera/session/ProcessingNotificationManager.java
|
fd29a841a046c6a02306adc9e4df1a5eeb466f39 |
21-Mar-2014 |
Spike Sprague <spikuru@google.com> |
moving m*Animator.end() out of onConfigurationChanged bug: 13436761 Change-Id: Ife53c47d6076a9804dbbe87e4e2ab6344bac22ff
rc/com/android/camera/widget/ModeOptions.java
|
db81ce638be2782ba3313e721fcd4e062c0935fe |
21-Mar-2014 |
Sameer Padala <sxp@google.com> |
Enable SmartCamera in video mode Change-Id: Ic10715c961990aacba1c20f9678358856ed4081c
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/CameraModule.java
rc/com/android/camera/VideoModule.java
|
4021c896985d9ba43db0199f259ce4b8bfc0dc88 |
17-Mar-2014 |
Sam Judd <judds@google.com> |
Decreases jank/speeds image loading in filmstrip. Adds Glide, an image loading library, to handle image caching and bitmap reuse. This is working, but there are still some significant todos: 1. We're loading larger images than we need. 2. We're not aggressively cancelling loads so if you scroll far it takes longer than necessary for the image to appear. 3. Video thumbnail loading is slow (will require changes to Glide to improve). Change-Id: I01387429068451b923509f78c6d5f8ce115e74ad
ndroid.mk
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/data/CameraDataAdapter.java
rc/com/android/camera/data/FixedFirstDataAdapter.java
rc/com/android/camera/data/FixedLastDataAdapter.java
rc/com/android/camera/data/ImageModelLoader.java
rc/com/android/camera/data/LocalData.java
rc/com/android/camera/data/LocalMediaData.java
rc/com/android/camera/data/LocalSessionData.java
rc/com/android/camera/data/RotationTask.java
rc/com/android/camera/data/SimpleViewData.java
rc/com/android/camera/data/VideoModelLoader.java
rc/com/android/camera/filmstrip/ImageData.java
rc/com/android/camera/widget/FilmstripView.java
|
4227202694efe5b448b681f0041eb98b91c7cc04 |
21-Mar-2014 |
Spike Sprague <spikuru@google.com> |
am 82538f87: tablet ui tweaks (hacks?) * commit '82538f87d5fbd18cb0f01340357ddef4e81c1126': tablet ui tweaks (hacks?)
|
82538f87d5fbd18cb0f01340357ddef4e81c1126 |
21-Mar-2014 |
Spike Sprague <spikuru@google.com> |
tablet ui tweaks (hacks?) bug: 13169908 Change-Id: Ic1fd8031c4112ee3467615cd447cfff8c85639f5
es/layout/mode_selector.xml
es/values-sw600dp/dimens.xml
es/values/dimens.xml
|
553a0a5508d0a476c1cebc1297ca6385924376f2 |
21-Mar-2014 |
Sam Judd <judds@google.com> |
am 48d6492c: Merge "Best effort fix to prevent stretched videos." into gb-ub-photos-denali * commit '48d6492ccc56cb7d62a30ecc1f8576dc44e25718': Best effort fix to prevent stretched videos.
|
48d6492ccc56cb7d62a30ecc1f8576dc44e25718 |
21-Mar-2014 |
Sam Judd <judds@google.com> |
Merge "Best effort fix to prevent stretched videos." into gb-ub-photos-denali
|
de3e9abaa241dc2aa66e5d02ba8b7bd35e0d8f00 |
17-Mar-2014 |
Sam Judd <judds@google.com> |
Best effort fix to prevent stretched videos. To avoid increasing load times, we now only parse video headers asynchronously while the user scrolls. We make a best effort attempt to prefetch video headers while we're scrolling to avoid the layout jumping around when we update dimensions for an item that's visible to the user. Bug: 13505062 Change-Id: Ib7d7835c39d50f22f45db5673ec4c49d84b81124
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/VideoModule.java
rc/com/android/camera/data/AbstractLocalDataAdapterWrapper.java
rc/com/android/camera/data/CameraDataAdapter.java
rc/com/android/camera/data/FixedFirstDataAdapter.java
rc/com/android/camera/data/FixedLastDataAdapter.java
rc/com/android/camera/data/LocalDataAdapter.java
rc/com/android/camera/data/LocalDataUtil.java
rc/com/android/camera/data/LocalMediaData.java
rc/com/android/camera/data/MetadataLoader.java
rc/com/android/camera/data/VideoRotationMetadataLoader.java
rc/com/android/camera/filmstrip/FilmstripController.java
rc/com/android/camera/widget/FilmstripView.java
rc/com/android/camera/widget/Preloader.java
|
82411163a2467b2bc3dd42da183f98638365ad8a |
21-Mar-2014 |
Seth Raphael <magicseth@google.com> |
am 282dc2c3: Merge "Fix lookup type" into gb-ub-photos-denali * commit '282dc2c37ad1fa27dd5e28ff148f9432f6077078': Fix lookup type
|
282dc2c37ad1fa27dd5e28ff148f9432f6077078 |
21-Mar-2014 |
Seth Raphael <magicseth@google.com> |
Merge "Fix lookup type" into gb-ub-photos-denali
|
0708bb4cc97afb9ffb17dc2148c97ab95368767b |
21-Mar-2014 |
Seth Raphael <magicseth@google.com> |
Fix lookup type Bug: 13582743 Change-Id: I16ddf8fbedc1461c05aeadfad27930862aebc4ff
rc/com/android/camera/session/CaptureSessionManagerImpl.java
|
e6073afeeadada2e4440b1a921c0fad4cb287c24 |
21-Mar-2014 |
Sascha Häberling <haeberling@google.com> |
am 74b139ed: Merge "fix the build" into gb-ub-photos-denali * commit '74b139ed4bb6845ba3dff4231e93c89e3d94bdba': fix the build
|
74b139ed4bb6845ba3dff4231e93c89e3d94bdba |
21-Mar-2014 |
Sascha Häberling <haeberling@google.com> |
Merge "fix the build" into gb-ub-photos-denali
|
16bca01abfca562f0d9ad80de5dfa96a7a3b2544 |
21-Mar-2014 |
Seth Raphael <magicseth@google.com> |
fix the build Change-Id: I069ada1529de371e2d17351b9bee53484cac1f5f
rc/com/android/camera/CameraActivity.java
|
a063688b64705a860d8553ed5583918ea031b839 |
21-Mar-2014 |
Seth Raphael <magicseth@google.com> |
am 10d7803c: Merge "Avoid race condition when Sessions are finished" into gb-ub-photos-denali * commit '10d7803c6638992c97d2f7400b52fd3f695c8d1a': Avoid race condition when Sessions are finished
|
10d7803c6638992c97d2f7400b52fd3f695c8d1a |
21-Mar-2014 |
Seth Raphael <magicseth@google.com> |
Merge "Avoid race condition when Sessions are finished" into gb-ub-photos-denali
|
cc79da28315aa4cb346e06346df5e379272d5c92 |
21-Mar-2014 |
Seth Raphael <magicseth@google.com> |
Avoid race condition when Sessions are finished Bug: 13550276 Change-Id: I813f601a54708cd291cb0524c7b63724bd9c9fb8
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/session/CaptureSessionManager.java
rc/com/android/camera/session/CaptureSessionManagerImpl.java
|
6e014d74d8a93fe23cc7025891fc53a4b569b074 |
21-Mar-2014 |
Sascha Haeberling <haeberling@google.com> |
am de5cb2a3: Merge "Update processing API to support pause/resume." into gb-ub-photos-denali * commit 'de5cb2a3ac53eea54eae01268e98610aa5acdaba': Update processing API to support pause/resume.
|
de5cb2a3ac53eea54eae01268e98610aa5acdaba |
21-Mar-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Update processing API to support pause/resume." into gb-ub-photos-denali
|
58acf0df808ea67e8ad9ab6ffccff4548566580a |
20-Mar-2014 |
Sascha Haeberling <haeberling@google.com> |
Update processing API to support pause/resume. Bug: 12080035 BUg: 12211113 This has been ported over from the LightCycle service. We make use of this to pause processing while new memory-intense captures are going on. Change-Id: I9c7d8eb4199d290a2f35becce2541661636a26d4
rc/com/android/camera/processing/ProcessingService.java
rc/com/android/camera/processing/ProcessingTask.java
|
87ae86d3eb92cec95929dd2cabf521feb4ced37b |
20-Mar-2014 |
Spike Sprague <spikuru@google.com> |
am 5cc5f61e: Merge "video bottom bar stop button tweaking" into gb-ub-photos-denali * commit '5cc5f61e96ebc6bd0af2613b14d68c2cafd7ab78': video bottom bar stop button tweaking
|
5cc5f61e96ebc6bd0af2613b14d68c2cafd7ab78 |
20-Mar-2014 |
Spike Sprague <spikuru@google.com> |
Merge "video bottom bar stop button tweaking" into gb-ub-photos-denali
|
0f2af74e7e6861402a766301d7f9114f453b0aa1 |
20-Mar-2014 |
Sascha Haeberling <haeberling@google.com> |
am 4ef32fda: Merge "Add ability to add extra settings." into gb-ub-photos-denali * commit '4ef32fda7c6b084b9799e53e3071a1ce5e5b6ac3': Add ability to add extra settings.
|
0a6a6b2a7b2c9b24902e5e0d85ccf26f1c958f51 |
20-Mar-2014 |
Baligh Uddin <baligh@google.com> |
am 423c7835: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-denali * commit '423c7835e0d25375747e9a989411913dc3e49d22': Import translations. DO NOT MERGE
|
4ef32fda7c6b084b9799e53e3071a1ce5e5b6ac3 |
20-Mar-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Add ability to add extra settings." into gb-ub-photos-denali
|
ed107412eee6bdb7f24c09c41559b04fa80747f3 |
20-Mar-2014 |
Sascha Haeberling <haeberling@google.com> |
Add ability to add extra settings. Bug: 13077452 Change-Id: Id1159405d8cbbe3b84b94899b9f6352e64e428fa
es/values/strings.xml
es/xml/camera_preferences.xml
rc/com/android/camera/settings/CameraSettingsActivity.java
rc/com/android/camera/settings/SettingsCache.java
rc/com/android/camera/settings/SettingsManager.java
rc_pd/com/android/camera/util/SettingsHelper.java
|
423c7835e0d25375747e9a989411913dc3e49d22 |
20-Mar-2014 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-denali
|
f90867b4ee37e66605cf583eb81435be839ec3f9 |
20-Mar-2014 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into ub-camera-everglades
|
d26f305dd9eb20d23e808ed8a2f1f37de0d9261e |
20-Mar-2014 |
Erin Dahlgren <edahlgren@google.com> |
am 7a4364b0: Merge "Prevent rapid HDR+ switching from causing illegal state." into gb-ub-photos-denali * commit '7a4364b0ef54fe4b02a108b0181d10d3f7feda96': Prevent rapid HDR+ switching from causing illegal state.
|
7a4364b0ef54fe4b02a108b0181d10d3f7feda96 |
19-Mar-2014 |
Erin Dahlgren <edahlgren@google.com> |
Merge "Prevent rapid HDR+ switching from causing illegal state." into gb-ub-photos-denali
|
5110169eb91068c742244eb9b64677a284c44243 |
19-Mar-2014 |
Sascha Haeberling <haeberling@google.com> |
am dafb91f8: Disable lights-out mode. * commit 'dafb91f89d4b1ff9f944b6af4b0540c3c0424040': Disable lights-out mode.
|
dafb91f89d4b1ff9f944b6af4b0540c3c0424040 |
19-Mar-2014 |
Sascha Haeberling <haeberling@google.com> |
Disable lights-out mode. Bug: 13546760 Change-Id: Ia45d099d991819a2705c715fe3fcac9b0c332208
rc/com/android/camera/CameraActivity.java
|
b91e8bad0656857e8e33066c0284e5d8bf1f9add |
19-Mar-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ie10cb3fe1099a31013043ff67b3a235c6781ef4d Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-km-rKH/strings.xml
es/values-ko/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mn-rMN/strings.xml
es/values-ms-rMY/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
b268ed739a4f33902b4fb4b1fe00ceb9d3e7a0f9 |
19-Mar-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Idb21cc3c0bebb64e8b94ace646a3282f49cfbbd7 Auto-generated-cl: translation import
es/values-el/strings.xml
es/values-th/strings.xml
|
f86cc403d3c1c5abee19819cbb69b6a3dae41875 |
19-Mar-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I9a272ba8056cd32a6df33a5af4b84133c5b5f999 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-km-rKH/strings.xml
es/values-ko/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mn-rMN/strings.xml
es/values-ms-rMY/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
4cdaf5178704224673d0e7ba948830d1cabd8fa0 |
19-Mar-2014 |
Erin Dahlgren <edahlgren@google.com> |
Prevent rapid HDR+ switching from causing illegal state. Bug: 13524559 Change-Id: Id8b2ebbfcdbf5e9b32a0f580adb6fe4754143396
rc/com/android/camera/PhotoModule.java
|
e9ff9a5ff011da76b8539802b78367e03beda1ba |
19-Mar-2014 |
Sam Judd <judds@google.com> |
am 6383d975: Dont call requestLoadNewPhotos in secure camera mode. * commit '6383d97558433e39e4f43a5895d81bba0d0aafba': Dont call requestLoadNewPhotos in secure camera mode.
|
6383d97558433e39e4f43a5895d81bba0d0aafba |
19-Mar-2014 |
Sam Judd <judds@google.com> |
Dont call requestLoadNewPhotos in secure camera mode. Bug: 13530796 Change-Id: I6e9bb51ed529bc633511f7c29d3ac9268c617717
rc/com/android/camera/CameraActivity.java
|
43bf03f6e7f9a71b7553e7282b5799798997caf7 |
17-Mar-2014 |
Sam Judd <judds@google.com> |
Allow views to be reused in filmstrip. Change-Id: Ic2b8bbc251c9b19e658412ac3885a0cb83680809
es/layout/filmstrip_video.xml
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/data/CameraDataAdapter.java
rc/com/android/camera/data/CameraPreviewData.java
rc/com/android/camera/data/FixedFirstDataAdapter.java
rc/com/android/camera/data/FixedLastDataAdapter.java
rc/com/android/camera/data/LocalData.java
rc/com/android/camera/data/LocalDataViewType.java
rc/com/android/camera/data/LocalMediaData.java
rc/com/android/camera/data/LocalSessionData.java
rc/com/android/camera/data/SimpleViewData.java
rc/com/android/camera/filmstrip/DataAdapter.java
rc/com/android/camera/widget/FilmstripView.java
|
593e71a94441d1d21549f85712796cffd6983aef |
18-Mar-2014 |
Erin Dahlgren <edahlgren@google.com> |
am bd245b28: Reset startup module index to default on upgrade. * commit 'bd245b28022503b5f9060b384cb8b6601aba66b5': Reset startup module index to default on upgrade.
|
bd245b28022503b5f9060b384cb8b6601aba66b5 |
18-Mar-2014 |
Erin Dahlgren <edahlgren@google.com> |
Reset startup module index to default on upgrade. Bug: 13515204 Change-Id: I69370503b9af5a4dad40f0fea7509e616173ce43
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/settings/SettingsManager.java
|
6c59b629511240fd9a12bc2b1de6d11525f2a88a |
18-Mar-2014 |
Sascha Haeberling <haeberling@google.com> |
am 454a33f1: Merge "Put resolution settings in a sub-screen." into gb-ub-photos-denali * commit '454a33f1ceacdd4d5ce97e97c031385de208eace': Put resolution settings in a sub-screen.
|
454a33f1ceacdd4d5ce97e97c031385de208eace |
18-Mar-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Put resolution settings in a sub-screen." into gb-ub-photos-denali
|
04ca24b495c4b410dc8b6127b3af0ac29df74eb8 |
18-Mar-2014 |
Sascha Haeberling <haeberling@google.com> |
Put resolution settings in a sub-screen. Bug: 13512118 Also fixes a crash when going into settings. Change-Id: I354749e2e4180e46d888b82e2c4d479cc7c06aca
es/values/strings.xml
es/xml/camera_preferences.xml
rc/com/android/camera/settings/CameraSettingsActivity.java
|
0145c3ad793144abae142380e56800dc8bc97cdd |
18-Mar-2014 |
Angus Kong <shkong@google.com> |
am 0315eef6: Merge "Refactor data model." into gb-ub-photos-denali * commit '0315eef6893e7f349440bc116e0a30ee7694c7e1': Refactor data model.
|
0315eef6893e7f349440bc116e0a30ee7694c7e1 |
18-Mar-2014 |
Angus Kong <shkong@google.com> |
Merge "Refactor data model." into gb-ub-photos-denali
|
571a8c389798bd3f01429f6be34cd3e606ab34df |
13-Mar-2014 |
Angus Kong <shkong@google.com> |
Refactor data model. bug:13176987 bug:13410244 This refactor is to make the relationship between Controller, Model and View clearer. Now controller (CameraActivity in our case) takes the full responsibility to add/remove data. The model (CameraDataAdapter, LocalData and its subclasses) is only responsible to store the data with correct types and data structures. The view (Filmstrip) is a totally passive component who takes care of how the data is presented and define how the user can interactive with it. The session API should not be exposed to the filmstrip MVC architecture and instead we should make them as independent as possible. The controller should maintain the logics of how to interact between these components. Major changes in this CL: 1. ImageData.getContentUri() -> getUri(). The Uri is no longer a content Uri. 2. LocalDataAdapter: addNewSession() and finishSession() removed. We don't assume the session concept in data adapters anymore. 3. LocalDataAdapter: addPhotoData() removed. 4. LocalDataAdapter: addData() added (original private in CameraDataAdapter) 5. LocalDataAdapter.Listener: onNewDataAdded() removed (since it's actually triggered by the caller who is adding the data.) Session API change: CaptureSession.onPreviewUpdated() is changed to onPreviewAvailable. The module now should decide the timing to notify the availability of the preview through it. CaptureSession.updatePreview(String path) is added. Not all the module can have a preview when the session is created. Panorama/PhotoSphere creates the preview after a background processing. The preview is stored as a file and should be update to the internal preview storage through CaptureSession.updatePreview(). Change-Id: Id73c8f289bd4b3c13149da1b72c99fc6bab5849e
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/data/AbstractLocalDataAdapterWrapper.java
rc/com/android/camera/data/CameraDataAdapter.java
rc/com/android/camera/data/LocalDataAdapter.java
rc/com/android/camera/data/LocalDataList.java
rc/com/android/camera/data/LocalMediaData.java
rc/com/android/camera/data/LocalSessionData.java
rc/com/android/camera/data/MetadataLoader.java
rc/com/android/camera/data/RotationTask.java
rc/com/android/camera/data/SimpleViewData.java
rc/com/android/camera/filmstrip/ImageData.java
rc/com/android/camera/session/CaptureSession.java
rc/com/android/camera/session/CaptureSessionManager.java
rc/com/android/camera/session/CaptureSessionManagerImpl.java
rc/com/android/camera/widget/FilmstripView.java
|
de9bc921a3f50f345f56f79496683578df9cbf03 |
17-Mar-2014 |
Erin Dahlgren <edahlgren@google.com> |
am 18f1cb9b: Merge "Implement an upgrade path between old and new source files." into gb-ub-photos-denali * commit '18f1cb9bde8b21c9b75b74490609d5d51fdd9392': Implement an upgrade path between old and new source files.
|
18f1cb9bde8b21c9b75b74490609d5d51fdd9392 |
17-Mar-2014 |
Erin Dahlgren <edahlgren@google.com> |
Merge "Implement an upgrade path between old and new source files." into gb-ub-photos-denali
|
459c12ebaf5dbf71d2c775c4f3fbf5fd8d6a97c7 |
17-Mar-2014 |
Sascha Haeberling <haeberling@google.com> |
am 57a16b12: Merge "New resolution settings. Two for each camera." into gb-ub-photos-denali * commit '57a16b1204081250a7d510d30c47fdd5c2108fa5': New resolution settings. Two for each camera.
|
57a16b1204081250a7d510d30c47fdd5c2108fa5 |
17-Mar-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "New resolution settings. Two for each camera." into gb-ub-photos-denali
|
e2c646d1cd75ff0bd9654431f5419e9ccb612c5d |
17-Mar-2014 |
Sascha Haeberling <haeberling@google.com> |
am a57d3747: Merge "Disable time-lapse as Denali doesn\'t contain this feature." into gb-ub-photos-denali * commit 'a57d374727dc122ab16cffc73fa3950e3b3d0b96': Disable time-lapse as Denali doesn't contain this feature.
|
a57d374727dc122ab16cffc73fa3950e3b3d0b96 |
17-Mar-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Disable time-lapse as Denali doesn't contain this feature." into gb-ub-photos-denali
|
8c000c204fe676a3e791f65831f6e62f7fc46448 |
17-Mar-2014 |
Sascha Haeberling <haeberling@google.com> |
Disable time-lapse as Denali doesn't contain this feature. Bug: 13509556 Change-Id: Iad4b5f821c571627570b0bb85bafb7b5d832c0f4
rc/com/android/camera/VideoModule.java
|
e5d8c4933bb9a325581bc1f89817f062c39aa38b |
17-Mar-2014 |
Geoff Mendal <mendal@google.com> |
am 0a3171e4: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-denali * commit '0a3171e453c88825701a86d71012ad1e193f84de': Import translations. DO NOT MERGE
|
5f62614d07c07fbd9d8d6b791e94fd5d237a2b79 |
17-Mar-2014 |
Geoff Mendal <mendal@google.com> |
Merge "Import translations. DO NOT MERGE" into ub-camera-everglades
|
0a3171e453c88825701a86d71012ad1e193f84de |
17-Mar-2014 |
Geoff Mendal <mendal@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-denali
|
7299e4d4a185c2b2a9ae20decfd3f473ad310301 |
17-Mar-2014 |
Erin Dahlgren <edahlgren@google.com> |
am 9795ed47: Non-secure capture intents cannot support HDR+. * commit '9795ed47e73c99f0049f10a56a2910e3595fcea0': Non-secure capture intents cannot support HDR+.
|
a1a78dd197abd86e031a215add2dce3f57f4837d |
17-Mar-2014 |
Geoff Mendal <mendal@google.com> |
Import translations. DO NOT MERGE Change-Id: Ib94c4163606adf33ef8cc88d6f201b39f3497124 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-km-rKH/strings.xml
es/values-ko/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mn-rMN/strings.xml
es/values-ms-rMY/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
c8648f89c4bc302b9932ab804b9e43abec8481b9 |
17-Mar-2014 |
Geoff Mendal <mendal@google.com> |
Import translations. DO NOT MERGE Change-Id: Ic23a5cdcdf9b9540d847d7ea4860a7378edba118 Auto-generated-cl: translation import
es/values-am/strings.xml
|
8d594c67eb818bacb0fdb4b9298b64465570bd85 |
17-Mar-2014 |
Geoff Mendal <mendal@google.com> |
Import translations. DO NOT MERGE Change-Id: I93b03eeeb4f0e5f33d75b220bd79509e41cb166f Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-km-rKH/strings.xml
es/values-ko/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mn-rMN/strings.xml
es/values-ms-rMY/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
9795ed47e73c99f0049f10a56a2910e3595fcea0 |
17-Mar-2014 |
Erin Dahlgren <edahlgren@google.com> |
Non-secure capture intents cannot support HDR+. * We still need to find a way to avoid losing a user's HDR+ preference when they launch a capture intent (and get booted into photo module). Bug: 13475212 Change-Id: I9aeed950d0ace060eb2ea2a1822d91da2860fbaf
rc/com/android/camera/CameraActivity.java
|
9182ac8901cb10f83a8f9beb528e8a2bf1b5c64d |
17-Mar-2014 |
Erin Dahlgren <edahlgren@google.com> |
Implement an upgrade path between old and new source files. * applies the upgrade path to location, which needs to recovered from the old setting in both type and source file. Bug: 13165733 Change-Id: Icaef2c49c46acba57e59f3da3d0bc9c4f153d9cc
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/settings/SettingsManager.java
|
8e7a03046e6157c0c0f586748f76db9f000d810c |
17-Mar-2014 |
Erin Dahlgren <edahlgren@google.com> |
am 6d4b5e12: Merge "Support HDR+ secure camera is user prefers." into gb-ub-photos-denali * commit '6d4b5e12a281f38c1b3d42c971f438758e5d38bc': Support HDR+ secure camera is user prefers.
|
6d4b5e12a281f38c1b3d42c971f438758e5d38bc |
17-Mar-2014 |
Erin Dahlgren <edahlgren@google.com> |
Merge "Support HDR+ secure camera is user prefers." into gb-ub-photos-denali
|
6ccec205c8d43757bcefd0202eb0cde0df020574 |
11-Mar-2014 |
Sascha Haeberling <haeberling@google.com> |
New resolution settings. Two for each camera. Bug: 13025151 Bug: 13349351 Also fixes the issue of summaries not showing up before changing a resolution setting. Change-Id: I63482a79e742c0403ebf556148f7a12d4e6c8b0e
es/values/arrays.xml
es/values/strings.xml
es/xml/camera_preferences.xml
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/VideoModule.java
rc/com/android/camera/settings/CameraSettingsActivity.java
rc/com/android/camera/settings/SettingsCache.java
rc/com/android/camera/settings/SettingsManager.java
rc/com/android/camera/settings/SettingsUtil.java
|
ac4cce59e834d55e7f4e00f44fc617cfd7a7150b |
15-Mar-2014 |
Erin Dahlgren <edahlgren@google.com> |
am b8d4e380: Merge "Respond to menu button key events based on current view." into gb-ub-photos-denali * commit 'b8d4e380828a49ba2bb119ac2c676904ae0f15e8': Respond to menu button key events based on current view.
|
b8d4e380828a49ba2bb119ac2c676904ae0f15e8 |
14-Mar-2014 |
Erin Dahlgren <edahlgren@google.com> |
Merge "Respond to menu button key events based on current view." into gb-ub-photos-denali
|
5e255bfd80a12dbe4d0a02a80f89238a5e7a1345 |
14-Mar-2014 |
Erin Dahlgren <edahlgren@google.com> |
Support HDR+ secure camera is user prefers. Bug: 13475212 Change-Id: I2a061256ddc689cd6fdc6a0e9bd22c4f57aca9bb
rc/com/android/camera/CameraActivity.java
|
15691af76927d932fcc1250b4ffaefd31a61cf81 |
14-Mar-2014 |
Erin Dahlgren <edahlgren@google.com> |
Respond to menu button key events based on current view. Bug: 13347834 Change-Id: Id917bb488e7d67a233f65c4d95bdaf6c8facb33b
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/VideoModule.java
rc/com/android/camera/ui/ModeListView.java
|
45a821d43ae8d7287b649f670a66ab3d99eeccaf |
14-Mar-2014 |
Spike Sprague <spikuru@google.com> |
video bottom bar stop button tweaking bug: 13367909 Change-Id: I670350f77a1e86500a0d66f3a3fc5d7e772d0c93
rc/com/android/camera/VideoModule.java
rc/com/android/camera/app/CameraAppUI.java
rc/com/android/camera/ui/BottomBar.java
|
8db29371b01cf7c0b481826107b120f14235768e |
14-Mar-2014 |
Spike Sprague <spikuru@google.com> |
am 9e74a09f: Merge "mode options buttons animation tweaks" into gb-ub-photos-denali * commit '9e74a09fe2bf6d3fb988904dea9273ff6a2ffcbd': mode options buttons animation tweaks
|
9e74a09fe2bf6d3fb988904dea9273ff6a2ffcbd |
14-Mar-2014 |
Spike Sprague <spikuru@google.com> |
Merge "mode options buttons animation tweaks" into gb-ub-photos-denali
|
56d43cf80d40379d57ac1db697bc014d5c321b91 |
12-Mar-2014 |
Spike Sprague <spikuru@google.com> |
mode options buttons animation tweaks bug: 13327124 Change-Id: Iddf824d0ee9807f179501b8e391540f0e798f920
es/layout-land/mode_options_bottombar.xml
es/layout-port/mode_options_bottombar.xml
es/values/dimens.xml
rc/com/android/camera/widget/ModeOptions.java
|
32948419ac711279abdbb520ced3115dcfc5a80d |
14-Mar-2014 |
Sam Judd <judds@google.com> |
am 3cf55144: Merge "Show photos added to camera folder externally in filmstrip promptly." into gb-ub-photos-denali * commit '3cf55144483327b2b82af73b1a40335dba749f41': Show photos added to camera folder externally in filmstrip promptly.
|
3cf55144483327b2b82af73b1a40335dba749f41 |
14-Mar-2014 |
Sam Judd <judds@google.com> |
Merge "Show photos added to camera folder externally in filmstrip promptly." into gb-ub-photos-denali
|
aeed91f3777d08a4160d68ddfc2626808a08b92d |
13-Mar-2014 |
Sam Judd <judds@google.com> |
Show photos added to camera folder externally in filmstrip promptly. Bug: 13320658 Change-Id: I2f605674fdd23e31bc7567b28ba098fff59802c0
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/data/AbstractLocalDataAdapterWrapper.java
rc/com/android/camera/data/CameraDataAdapter.java
rc/com/android/camera/data/LocalDataAdapter.java
rc/com/android/camera/data/LocalDataList.java
rc/com/android/camera/data/LocalMediaData.java
rc/com/android/camera/data/LocalMediaObserver.java
rc/com/android/camera/data/LocalSessionData.java
|
bbf1b9e776d5a0316cd236013f167cf15b1b5585 |
14-Mar-2014 |
Doris Liu <tianliu@google.com> |
am 87ea428f: Merge "Mode switcher refactor for better state management" into gb-ub-photos-denali * commit '87ea428ffe1b52f4859aaa1b1c993a0bdf939f5e': Mode switcher refactor for better state management
|
87ea428ffe1b52f4859aaa1b1c993a0bdf939f5e |
14-Mar-2014 |
Doris Liu <tianliu@google.com> |
Merge "Mode switcher refactor for better state management" into gb-ub-photos-denali
|
7c4407d9b16ab65d8a3075b929c0735578bb2466 |
14-Mar-2014 |
Doris Liu <tianliu@google.com> |
am 469bdb40: Merge "Add content description to settings button for accessibility" into gb-ub-photos-denali * commit '469bdb40a7895588cb352e1bb635ad6252fadf60': Add content description to settings button for accessibility
|
469bdb40a7895588cb352e1bb635ad6252fadf60 |
14-Mar-2014 |
Doris Liu <tianliu@google.com> |
Merge "Add content description to settings button for accessibility" into gb-ub-photos-denali
|
f2ca672248463f9cfbf9f4f5ead156fad1763e00 |
13-Mar-2014 |
Doris Liu <tianliu@google.com> |
Add content description to settings button for accessibility Bug: 13196135 Change-Id: I5730d6d55dda6658e67098b9fd14c4946ea8ee71
es/layout/mode_list_layout.xml
|
a8a24e0241ad3a3d3c8d8b77ac5cbd7138736bd5 |
12-Mar-2014 |
Doris Liu <tianliu@google.com> |
Mode switcher refactor for better state management Also added support for mode selection during shimmy. Bug: 13441279 Bug: 13403920 Change-Id: If7093e833b83f093b779df1d497e20ea3054c0c1
rc/com/android/camera/ui/ModeListView.java
rc/com/android/camera/widget/AnimationEffects.java
|
a104f96ce2051d50a732e2860bcf5f1d38fbb5d6 |
13-Mar-2014 |
Seth Raphael <magicseth@google.com> |
am 93c6b617: Allow a session to know its content uri * commit '93c6b617868b73b73199cf93216fec7002290f55': Allow a session to know its content uri
|
93c6b617868b73b73199cf93216fec7002290f55 |
13-Mar-2014 |
Seth Raphael <magicseth@google.com> |
Allow a session to know its content uri Bug: 13442744 Change-Id: I8ec870ae81cf70dbdf6cab9295a4556cf9f66179
rc/com/android/camera/session/CaptureSession.java
rc/com/android/camera/session/CaptureSessionManagerImpl.java
rc/com/android/camera/session/PlaceholderManager.java
|
b3aaa8c08a1094ac1a80bf9c4d57a9405c8ccfc8 |
13-Mar-2014 |
Seth Raphael <magicseth@google.com> |
am deda5239: Don\'t crash if a placeholder session is not found * commit 'deda5239be336cd306a5750bdf3033099b0c767d': Don't crash if a placeholder session is not found
|
deda5239be336cd306a5750bdf3033099b0c767d |
13-Mar-2014 |
Seth Raphael <magicseth@google.com> |
Don't crash if a placeholder session is not found When the activity crashes, sessions may still be in progress in the service. On relaunch of the activity the service may complete process, and attempt to update an unknown session (as they are currently stored in the activity). Bug: 13421356 Change-Id: I87b1585bff1c46621aed1af18dae105f04e41268
rc/com/android/camera/data/CameraDataAdapter.java
|
7601bea7a4378866952f60d8c7917179408d39ce |
13-Mar-2014 |
Sascha Haeberling <haeberling@google.com> |
am 9906b209: Merge "Make preview visibility logic more robust." into gb-ub-photos-denali * commit '9906b20940dbd0b15550ef08d7437733eccd3c6c': Make preview visibility logic more robust.
|
9906b20940dbd0b15550ef08d7437733eccd3c6c |
13-Mar-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Make preview visibility logic more robust." into gb-ub-photos-denali
|
434ed6345f4ddc61cf177af60b4f13aafe3bfcc1 |
13-Mar-2014 |
Baligh Uddin <baligh@google.com> |
am e99b5738: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-denali * commit 'e99b5738d0706aacad12d9aaab77585e552bf94c': Import translations. DO NOT MERGE
|
e99b5738d0706aacad12d9aaab77585e552bf94c |
13-Mar-2014 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-denali
|
d611ff38b85e5d539ee20bab3a18e5e141bf39c5 |
13-Mar-2014 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into ub-camera-everglades
|
2d11fcfdfd7f28be7cb201d6fde3fbf560347db1 |
13-Mar-2014 |
Sascha Haeberling <haeberling@google.com> |
Make preview visibility logic more robust. Bug: 13213657 Bug: 13403920 Filmstrip and mode switcher are two separate entities so we need to track their visibilities separately and derive preview visibility from their joint state. Change-Id: I24b810b6c2bb0ac4ec60678f92c36172242b7b1c
rc/com/android/camera/CameraActivity.java
|
0bbaa0f5e9973afd9bd01b815e40ea99558f968c |
13-Mar-2014 |
Erin Dahlgren <edahlgren@google.com> |
am 6dbd5ae9: Merge "Prevent VideoModule from freezing forever without triggering ANR." into gb-ub-photos-denali * commit '6dbd5ae96714d3460bf31c4c41a29a7522a7d386': Prevent VideoModule from freezing forever without triggering ANR.
|
6dbd5ae96714d3460bf31c4c41a29a7522a7d386 |
13-Mar-2014 |
Erin Dahlgren <edahlgren@google.com> |
Merge "Prevent VideoModule from freezing forever without triggering ANR." into gb-ub-photos-denali
|
11213160bd8810a2874c47ed888b8c63cd200800 |
13-Mar-2014 |
Erin Dahlgren <edahlgren@google.com> |
Prevent VideoModule from freezing forever without triggering ANR. Bug: 13330215 Change-Id: I76a2c758c2e16454feebfed8b20fa0c967eda2cf
rc/com/android/camera/VideoModule.java
|
6edc4d51015688108439082207ff54a5e522bf05 |
13-Mar-2014 |
Sam Judd <judds@google.com> |
am cb4fbd73: Merge "Use velocity to allow easier filmstrip delete gestures." into gb-ub-photos-denali * commit 'cb4fbd73d5e46987035a84366c402dcebafdbbed': Use velocity to allow easier filmstrip delete gestures.
|
cb4fbd73d5e46987035a84366c402dcebafdbbed |
13-Mar-2014 |
Sam Judd <judds@google.com> |
Merge "Use velocity to allow easier filmstrip delete gestures." into gb-ub-photos-denali
|
bcd1152e8214b1fb4a17963ffe8c292681c81688 |
12-Mar-2014 |
Sam Judd <judds@google.com> |
Use velocity to allow easier filmstrip delete gestures. Bug: 12889007 Change-Id: I049119117a0d84e40dfa402af8cbf6313fc4d1de
rc/com/android/camera/widget/FilmstripView.java
|
17c12ec9107d5e5cb9f2adc92e8f3bdf094dddc3 |
13-Mar-2014 |
Seth Raphael <magicseth@google.com> |
am ca93cb14: Merge changes Ie0d123f0,I97c1f825 into gb-ub-photos-denali * commit 'ca93cb14e4f318698248ea28978ac2e9197102d3': Avoid showing old preview frames on restart. Support cancel layout for long captures
|
ca93cb14e4f318698248ea28978ac2e9197102d3 |
13-Mar-2014 |
Seth Raphael <magicseth@google.com> |
Merge changes Ie0d123f0,I97c1f825 into gb-ub-photos-denali * changes: Avoid showing old preview frames on restart. Support cancel layout for long captures
|
568a292e8a87ace79c5574a5b41a21639cc9f883 |
12-Mar-2014 |
Sam Judd <judds@google.com> |
am 29d9b3cd: Ensure the first filmstrip view appears instantly when swiping the filmstrip in. * commit '29d9b3cd08a7b31b8ccecf4792d5ae981faa205c': Ensure the first filmstrip view appears instantly when swiping the filmstrip in.
|
29d9b3cd08a7b31b8ccecf4792d5ae981faa205c |
12-Mar-2014 |
Sam Judd <judds@google.com> |
Ensure the first filmstrip view appears instantly when swiping the filmstrip in. Bug: 13329039 Change-Id: I97ae14f5a76e261ccef51f673c147297b49bc779
rc/com/android/camera/widget/FilmstripLayout.java
rc/com/android/camera/widget/FilmstripView.java
|
7dcf8b1864774192e6cbf58a801e6a42634484cb |
12-Mar-2014 |
Seth Raphael <magicseth@google.com> |
Avoid showing old preview frames on restart. We were previously waiting for onResume to display the mode cover. Now we do it in onStart if necessary. This prevents the display of the last preview frame or the film strip on turning the phone on and off. Change-Id: Ie0d123f0492cdced89d8479cb511d3e22b96b5c6
rc/com/android/camera/CameraActivity.java
|
2db51d761f8fb070f660b90913e131ab361cbbad |
11-Mar-2014 |
Seth Raphael <magicseth@google.com> |
Support cancel layout for long captures Bug: 12468010 Change-Id: I97c1f8254287b8a3648d21a9dbc54b5b5bc2424a
es/layout/bottom_bar_contents.xml
es/values/strings.xml
rc/com/android/camera/app/CameraAppUI.java
rc/com/android/camera/ui/BottomBar.java
|
654732fb40cf069562436ae19caba973e04fb5a0 |
12-Mar-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I8154e924d1a7113f0fe6408159e8555c59a901c0 Auto-generated-cl: translation import
es/values-es-rUS/strings.xml
es/values-ka-rGE/strings.xml
es/values-ms-rMY/strings.xml
es/values-zh-rCN/strings.xml
|
9d460a2d702f31890b5f76a191094afe9a088194 |
12-Mar-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I16f8bdb34a31f440c4bfb4581f7fe2b36f545ddf Auto-generated-cl: translation import
es/values-es-rUS/strings.xml
es/values-ka-rGE/strings.xml
es/values-ms-rMY/strings.xml
es/values-zh-rCN/strings.xml
|
ef70c05ccf14e17c525e69773c07b49ca57055a5 |
12-Mar-2014 |
Doris Liu <tianliu@google.com> |
am 70c8b953: Merge "New arrows for video recording hints" into gb-ub-photos-denali * commit '70c8b9532cc120e766936211f893c33158c0c99b': New arrows for video recording hints
|
70c8b9532cc120e766936211f893c33158c0c99b |
12-Mar-2014 |
Doris Liu <tianliu@google.com> |
Merge "New arrows for video recording hints" into gb-ub-photos-denali
|
5bd1205ae3c96b12d01f8e7c5d84e71689050e37 |
12-Mar-2014 |
Doris Liu <tianliu@google.com> |
New arrows for video recording hints Bug: 13355828 Change-Id: Ibdf4ab4a310672e86b1602e88a8a243578da0386
es/drawable-hdpi/rotate_arrows.png
es/drawable-mdpi/rotate_arrows.png
es/drawable-xhdpi/rotate_arrows.png
es/drawable-xxhdpi/rotate_arrows.png
es/values/dimens.xml
|
9668c055c6dde6112b1d1a2dea118eaa82dd6e86 |
12-Mar-2014 |
Doris Liu <tianliu@google.com> |
am d494e475: Merge "Swap order of photo and video in mode drawer" into gb-ub-photos-denali * commit 'd494e475dacef335541f56009b5d4e0e7831e7dd': Swap order of photo and video in mode drawer
|
d494e475dacef335541f56009b5d4e0e7831e7dd |
12-Mar-2014 |
Doris Liu <tianliu@google.com> |
Merge "Swap order of photo and video in mode drawer" into gb-ub-photos-denali
|
913c4c652104070d325f4a428e9325ea5a2448ef |
12-Mar-2014 |
Doris Liu <tianliu@google.com> |
Swap order of photo and video in mode drawer Bug: 13419987 Change-Id: Ic96dbb858d34beda38ec533db68ef509cc4e61a0
es/values/arrays.xml
|
b2abac9580c998931f8c9b52e14d335ac965a1aa |
12-Mar-2014 |
Erin Dahlgren <edahlgren@google.com> |
am d05374f1: Implement preview started callbacks. * commit 'd05374f1cb447615760665ec03fa3d6e2db55d21': Implement preview started callbacks.
|
d05374f1cb447615760665ec03fa3d6e2db55d21 |
12-Mar-2014 |
Erin Dahlgren <edahlgren@google.com> |
Implement preview started callbacks. This is used by RefocusModule to avoid blocking the main thread after startPreview. Bug: 13240688 Change-Id: Id9f719f51bb08493d6c736d90372e4dac6de1cac
rc/com/android/camera/app/AndroidCameraManagerImpl.java
rc/com/android/camera/app/CameraManager.java
|
6cf405e775e27b4f5ce00346adf3654ab6398fa1 |
12-Mar-2014 |
Seth Raphael <magicseth@google.com> |
am c45a75bc: Merge "Clear all notifications on relaunch" into gb-ub-photos-denali * commit 'c45a75bcc406e619bb0bad58a6752d47b27b3a83': Clear all notifications on relaunch
|
26ae561fbc814498c28dcf6c9e9b81c2116f8783 |
12-Mar-2014 |
Spike Sprague <spikuru@google.com> |
am 38d2c58a: moving assets around to unbreak build (Camera2 / GoogleCamera differences) * commit '38d2c58a55995d8713df391f5ef8102ccc90ebb5': moving assets around to unbreak build (Camera2 / GoogleCamera differences)
|
15219548ccf1c6360ea06b8a561959e1c95ae187 |
12-Mar-2014 |
Spike Sprague <spikuru@google.com> |
am 883ff162: Merge "capture button disabled states support" into gb-ub-photos-denali * commit '883ff162b22fc651f6c6429dc6da3537c0fcead4': capture button disabled states support
|
3c097d115cf3e6ce2cb25939582be2990c9f89fc |
12-Mar-2014 |
Seth Raphael <magicseth@google.com> |
am 4938c242: Only show one notification at a time Bug: 12211117 * commit '4938c2425cea1eed385eb0f8a2f69bf742bc1889': Only show one notification at a time Bug: 12211117
|
c45a75bcc406e619bb0bad58a6752d47b27b3a83 |
11-Mar-2014 |
Seth Raphael <magicseth@google.com> |
Merge "Clear all notifications on relaunch" into gb-ub-photos-denali
|
38d2c58a55995d8713df391f5ef8102ccc90ebb5 |
11-Mar-2014 |
Spike Sprague <spikuru@google.com> |
moving assets around to unbreak build (Camera2 / GoogleCamera differences) Change-Id: I1dfc3963d7d577a5404527317b0cf1813ca7f478
es/drawable/ic_camera.xml
es/drawable/ic_refocus.xml
es_p/drawable/ic_camera.xml
es_p/drawable/ic_refocus.xml
|
883ff162b22fc651f6c6429dc6da3537c0fcead4 |
11-Mar-2014 |
Spike Sprague <spikuru@google.com> |
Merge "capture button disabled states support" into gb-ub-photos-denali
|
4938c2425cea1eed385eb0f8a2f69bf742bc1889 |
11-Mar-2014 |
Seth Raphael <magicseth@google.com> |
Only show one notification at a time Bug: 12211117 Change-Id: I32fc474f4c85ce22106383d9a3ad854c02c8653a
rc/com/android/camera/session/ProcessingNotificationManager.java
|
411127a6b77db44b26c62a0a880cb3ad670eded5 |
11-Mar-2014 |
Seth Raphael <magicseth@google.com> |
Clear all notifications on relaunch Bug: 12972656 Change-Id: Id7d02685e975f12ad92e776168ea2c6728b5dab5
rc/com/android/camera/session/ProcessingNotificationManager.java
|
a93909ffe93c9f5e27e493f32a78aab6fbf3e06e |
08-Mar-2014 |
Spike Sprague <spikuru@google.com> |
capture button disabled states support bug: 13244592 Change-Id: I58b1b3dada9be60ec28be0e0bab81c9dc000511b
es/drawable/ic_camera.xml
es/drawable/ic_panorama.xml
es/drawable/ic_refocus.xml
es/drawable/ic_video.xml
es/layout/bottom_bar_contents.xml
es/values/arrays.xml
rc/com/android/camera/app/CameraAppUI.java
rc/com/android/camera/ui/BottomBar.java
|
3005f33c4821bace39242354447b2bc497a696b0 |
11-Mar-2014 |
Baligh Uddin <baligh@google.com> |
am 48a88b7d: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-denali * commit '48a88b7d91f854ac2057903b5f5feca95e586536': Import translations. DO NOT MERGE
|
48a88b7d91f854ac2057903b5f5feca95e586536 |
11-Mar-2014 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-denali
|
c2000232892d80965ab0fa4c0e9dd9d254531f52 |
11-Mar-2014 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into ub-camera-everglades
|
bd0164520726d75fbab38b6a01b2942d35549c33 |
11-Mar-2014 |
Sascha Haeberling <haeberling@google.com> |
Fix build. Got broken with last manual merge. Change-Id: I69131a478a26a15057acd1af7a96ab81149eb111
rc/com/android/camera/PhotoModule.java
|
de51c81f9870abf1e20868bbf00c20ecb6b2fb9e |
11-Mar-2014 |
Sascha Haeberling <haeberling@google.com> |
resolved conflicts for merge of 7cb8c791 to ub-camera-everglades Change-Id: Iad7e7f78ae8e48456493451a62b154fa0e6c8cb3
|
3bdfd384a4090b2e0ed216df3da32c03f73f7b48 |
07-Feb-2014 |
Kévin PETIT <kevin.petit@arm.com> |
Fix build dependencies Use LOCAL_SHARED_LIBRARIES instead of LDFLAGS to link with libraries. Change-Id: I958c2f0b8b149f5311285703d55f6f6e76d577a9 Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
ni/Android.mk
|
7cb8c791df0bcb48b2c3f2f34d7c7538c619b592 |
11-Mar-2014 |
Sascha Haeberling <haeberling@google.com> |
Spring cleaning. Throwing out old cruft. Change-Id: I99952405a0036c4a518b31e543a72a84dbe07995
ndroidManifest.xml
es/layout/count_down_to_capture.xml
es/layout/countdown_setting_popup.xml
es/layout/crop_actionbar.xml
es/layout/crop_activity.xml
es/layout/effect_setting_item.xml
es/layout/effect_setting_popup.xml
es/layout/in_line_setting_check_box.xml
es/layout/in_line_setting_menu.xml
es/layout/list_pref_setting_popup.xml
es/layout/more_setting_popup.xml
es/layout/rotate_dialog.xml
es/layout/rotate_text_toast.xml
es/layout/setting_item.xml
es/layout/settings_list_layout.xml
es/layout/settings_selector.xml
es/layout/time_interval_picker.xml
es/layout/time_interval_popup.xml
es/values/styles.xml
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/Storage.java
rc/com/android/camera/crop/BoundedRect.java
rc/com/android/camera/crop/CropActivity.java
rc/com/android/camera/crop/CropDrawingUtils.java
rc/com/android/camera/crop/CropExtras.java
rc/com/android/camera/crop/CropMath.java
rc/com/android/camera/crop/CropObject.java
rc/com/android/camera/crop/CropView.java
rc/com/android/camera/crop/GeometryMathUtils.java
rc/com/android/camera/crop/ImageLoader.java
rc/com/android/camera/crop/SaveImage.java
rc/com/android/camera/crop/Utils.java
rc/com/android/camera/ui/AbstractSettingPopup.java
rc/com/android/camera/ui/CountDownView.java
rc/com/android/camera/ui/CountdownTimerPopup.java
rc/com/android/camera/ui/InLineSettingCheckBox.java
rc/com/android/camera/ui/InLineSettingItem.java
rc/com/android/camera/ui/InLineSettingMenu.java
rc/com/android/camera/ui/RotateTextToast.java
rc/com/android/camera/util/ImageLoader.java
|
bbd121bda44794bcb9e11f394af803594c1a05ff |
11-Mar-2014 |
Doris Liu <tianliu@google.com> |
am cc855959: Merge "Fix mode drawer not properly hide itself" into gb-ub-photos-denali * commit 'cc855959c9a643a08bb10a41253720c04580dfe5': Fix mode drawer not properly hide itself
|
cc855959c9a643a08bb10a41253720c04580dfe5 |
11-Mar-2014 |
Doris Liu <tianliu@google.com> |
Merge "Fix mode drawer not properly hide itself" into gb-ub-photos-denali
|
5e5734b558013e23f21902ad96d0dc2949610b90 |
11-Mar-2014 |
Doris Liu <tianliu@google.com> |
Fix mode drawer not properly hide itself Bug: 13402877 Change-Id: I5c9777ea91fc9101a4d42f0bbf84f40c8e5fd15c
rc/com/android/camera/ui/ModeListView.java
|
062054f24ef6b98ac170f56cf19cd96beed97102 |
11-Mar-2014 |
Teresa Ko <teresako@google.com> |
Merge "Move startSmartCamera call back into onPreviewStarted(). (onPreviewInitialDataReceived() doesn't seem to be called anymore.)" into ub-camera-everglades
|
59953a2bd28fa476bcb200623fe21da2f64f46ad |
08-Mar-2014 |
Teresa Ko <teresako@google.com> |
Move startSmartCamera call back into onPreviewStarted(). (onPreviewInitialDataReceived() doesn't seem to be called anymore.) Change-Id: I25455dd8e1076150be37e419c73d5e5447c144d2
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/CameraModule.java
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/module/ModuleController.java
|
4979cd199da63d8d4215aec7fc904a83cff8b2c7 |
11-Mar-2014 |
Erin Dahlgren <edahlgren@google.com> |
am 3413517f: Merge "Handle uncaught runtime exceptions from the framework." into gb-ub-photos-denali * commit '3413517f52239cebe3261cfce32b00899f8bd1e5': Handle uncaught runtime exceptions from the framework.
|
3413517f52239cebe3261cfce32b00899f8bd1e5 |
11-Mar-2014 |
Erin Dahlgren <edahlgren@google.com> |
Merge "Handle uncaught runtime exceptions from the framework." into gb-ub-photos-denali
|
426ad0580b485d5b79fd00b4458d1b8e4bf6cbc4 |
11-Mar-2014 |
Seth Raphael <magicseth@google.com> |
am 5ac2bfbb: bring comment up to date * commit '5ac2bfbb23f6277947f284531237ea85c81a06e4': bring comment up to date
|
1398a1d6eab5aef198cce8cfd82f810572178a41 |
11-Mar-2014 |
Seth Raphael <magicseth@google.com> |
am 3020ba5d: Increase opacity of mode switcher * commit '3020ba5dc23723bab7503324d82dd5ae3830008c': Increase opacity of mode switcher
|
630d55ba8111357730119899565026be503264c0 |
10-Mar-2014 |
Erin Dahlgren <edahlgren@google.com> |
Handle uncaught runtime exceptions from the framework. Bug: 12529676 Change-Id: I0319b1fa7367076f33853200b8b09a6abe7b0bdf
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/app/AndroidCameraManagerImpl.java
rc/com/android/camera/app/CameraController.java
rc/com/android/camera/app/CameraManager.java
rc/com/android/camera/app/CameraProvider.java
|
5ac2bfbb23f6277947f284531237ea85c81a06e4 |
11-Mar-2014 |
Seth Raphael <magicseth@google.com> |
bring comment up to date Change-Id: If9f7d43e2680ac6210cefac30be953fb4f7a8bfb
rc/com/android/camera/ui/ModeListView.java
|
3020ba5dc23723bab7503324d82dd5ae3830008c |
11-Mar-2014 |
Seth Raphael <magicseth@google.com> |
Increase opacity of mode switcher Bug: 13213552 Change-Id: I4b9e710d20804aef68e58d571b4d7d7aab9e8397
rc/com/android/camera/ui/ModeListView.java
|
a2a2b9b2e5fefa8e4ff0e84c23bccf6c29351fcd |
11-Mar-2014 |
Seth Raphael <magicseth@google.com> |
am 3e848a84: Merge changes I5d7821f8,If58fa121 into gb-ub-photos-denali * commit '3e848a842800c0db7565acf78d5d90d0eb5280d5': Remove unused variables Allow processing tasks to supply their own sessions.
|
6face7add8c5827048dc72fecaadf99951297cca |
11-Mar-2014 |
Sascha Haeberling <haeberling@google.com> |
am 88d5e6df: Merge "Support an abstract API for tutorials." into gb-ub-photos-denali * commit '88d5e6df0f7dab24c6b5e74504ffece1f4d9f4bb': Support an abstract API for tutorials.
|
3e848a842800c0db7565acf78d5d90d0eb5280d5 |
11-Mar-2014 |
Seth Raphael <magicseth@google.com> |
Merge changes I5d7821f8,If58fa121 into gb-ub-photos-denali * changes: Remove unused variables Allow processing tasks to supply their own sessions.
|
88d5e6df0f7dab24c6b5e74504ffece1f4d9f4bb |
11-Mar-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Support an abstract API for tutorials." into gb-ub-photos-denali
|
d84c2f914c64138fcdaeadf48da89b9610a44a57 |
11-Mar-2014 |
Seth Raphael <magicseth@google.com> |
am 955b3580: Merge "Hold in-progress sessions in mem, not media store" into gb-ub-photos-denali * commit '955b3580a53dd3b032f95b161b2c79d807281308': Hold in-progress sessions in mem, not media store
|
f08f3acd270e93e534f71ee0c9170f73e26179f0 |
11-Mar-2014 |
Seth Raphael <magicseth@google.com> |
Remove unused variables Change-Id: I5d7821f8158438000b813bbba840c3d6fd51ab3a
rc/com/android/camera/session/CaptureSessionManagerImpl.java
|
955b3580a53dd3b032f95b161b2c79d807281308 |
11-Mar-2014 |
Seth Raphael <magicseth@google.com> |
Merge "Hold in-progress sessions in mem, not media store" into gb-ub-photos-denali
|
2a978f2b7b07ce4e5f6163910912e79fed38aff8 |
11-Mar-2014 |
Seth Raphael <magicseth@google.com> |
Allow processing tasks to supply their own sessions. This is part of a fix for Bug: 13100494 Change-Id: If58fa1212bf666be3f974c35c6be6ef964415405
rc/com/android/camera/processing/ProcessingService.java
rc/com/android/camera/processing/ProcessingTask.java
|
81418339a88afc66b53f371e0626165a9bf1abe0 |
11-Mar-2014 |
Angus Kong <shkong@google.com> |
am 6b95ed2f: Merge "Checks the on view size for video preview size." into gb-ub-photos-denali * commit '6b95ed2f82ba49a2fd7fe0ab8774161434af95b4': Checks the on view size for video preview size.
|
6b95ed2f82ba49a2fd7fe0ab8774161434af95b4 |
11-Mar-2014 |
Angus Kong <shkong@google.com> |
Merge "Checks the on view size for video preview size." into gb-ub-photos-denali
|
b2d9f5dcf76408a050b329b316cbe10a4e6f0bc0 |
10-Mar-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I7048563a8c137404f410d187efe21cd83d64e34c Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-km-rKH/strings.xml
es/values-ko/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mn-rMN/strings.xml
es/values-ms-rMY/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
43b33dd12b30b63d60d997ce1cbbeb638739c4ce |
10-Mar-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Id9135fb081b0aab3dbb8753844734dc806fb510e Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-km-rKH/strings.xml
es/values-ko/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mn-rMN/strings.xml
es/values-ms-rMY/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
c813ce181810a444b6fea4a399e6685aef4103e2 |
10-Mar-2014 |
Sascha Haeberling <haeberling@google.com> |
Support an abstract API for tutorials. Bug: 12440059 Change-Id: I5597c3c2dc28714405bd2e148093831039af1dd2
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/app/AppController.java
rc/com/android/camera/app/CameraAppUI.java
rc/com/android/camera/ui/AbstractTutorialOverlay.java
|
e94a343de763fa7e0b5a6319d895a8af8033c938 |
10-Mar-2014 |
Doris Liu <tianliu@google.com> |
am 64c04fcb: Merge "Fix shimmy cold start jank" into gb-ub-photos-denali * commit '64c04fcbf8e5680b835283a3094e68410082e560': Fix shimmy cold start jank
|
64c04fcbf8e5680b835283a3094e68410082e560 |
10-Mar-2014 |
Doris Liu <tianliu@google.com> |
Merge "Fix shimmy cold start jank" into gb-ub-photos-denali
|
8676e7802fb40f64a3b465c9b5e1a0a1ada9f699 |
10-Mar-2014 |
Doris Liu <tianliu@google.com> |
Fix shimmy cold start jank Bug: 13392593 Change-Id: I08a45bad9fc93a284a9966fa8aa8c6e13e674ae5
rc/com/android/camera/ui/ModeListView.java
rc/com/android/camera/ui/ModeSelectorItem.java
|
2264367a58d9d771995befc84a6bdbe35acabf72 |
10-Mar-2014 |
Spike Sprague <spikuru@google.com> |
am 8e75f99a: Merge "enable grid lines for video module" into gb-ub-photos-denali * commit '8e75f99af7873fe3d5f7dfe6e232e0690a490c75': enable grid lines for video module
|
8e75f99af7873fe3d5f7dfe6e232e0690a490c75 |
10-Mar-2014 |
Spike Sprague <spikuru@google.com> |
Merge "enable grid lines for video module" into gb-ub-photos-denali
|
5f8c30e3f6c921befc00bf1e0e6d93e181335e78 |
07-Mar-2014 |
Angus Kong <shkong@google.com> |
Checks the on view size for video preview size. bug:12016054 Change-Id: I602a814ba4616d842117242240447096da6530d4
rc/com/android/camera/VideoModule.java
rc/com/android/camera/VideoUI.java
rc/com/android/camera/util/CameraUtil.java
|
016c55c8a3e056aa35536113a8a1dd65e9cc2944 |
10-Mar-2014 |
Angus Kong <shkong@google.com> |
am 9d5f94b5: Merge "Respect the module configuration of preview." into gb-ub-photos-denali * commit '9d5f94b562228bf0053f902d1183b9f44eebd4b0': Respect the module configuration of preview.
|
9d5f94b562228bf0053f902d1183b9f44eebd4b0 |
10-Mar-2014 |
Angus Kong <shkong@google.com> |
Merge "Respect the module configuration of preview." into gb-ub-photos-denali
|
b259701e4f421b10404425d2a827cbe9d2571585 |
10-Mar-2014 |
Angus Kong <shkong@google.com> |
Respect the module configuration of preview. bug:13393521 Change-Id: I46e3df4948980eceb66f4109b52a59f93296cfc6
rc/com/android/camera/app/CameraAppUI.java
|
455ba5a146484d2af4a4fb44eb50ad294834dfa0 |
14-Feb-2014 |
Seth Raphael <magicseth@google.com> |
Hold in-progress sessions in mem, not media store Bug: 12457236 Change-Id: I88f7c3a822010744881b8be966adbcf2774a8115
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/Storage.java
rc/com/android/camera/data/AbstractLocalDataAdapterWrapper.java
rc/com/android/camera/data/CameraDataAdapter.java
rc/com/android/camera/data/InProgressDataWrapper.java
rc/com/android/camera/data/LocalDataAdapter.java
rc/com/android/camera/data/LocalDataUtil.java
rc/com/android/camera/data/LocalMediaData.java
rc/com/android/camera/data/LocalSessionData.java
rc/com/android/camera/session/CaptureSessionManagerImpl.java
rc/com/android/camera/session/PlaceholderManager.java
rc/com/android/camera/util/FileUtil.java
rc/com/android/camera/widget/FilmstripView.java
|
ab3adde8ca8e8e2461972c6fb946d5719673d339 |
10-Mar-2014 |
Spike Sprague <spikuru@google.com> |
enable grid lines for video module bug: 13000320 Change-Id: If0b7947d38aa91578913ffc6e67b840bf3016190
rc/com/android/camera/VideoModule.java
|
9a37466bd24e17de8ec3b203b2bb1bf8e664bd50 |
10-Mar-2014 |
Doris Liu <tianliu@google.com> |
am 557c77fe: Fix HDR+ landscape transform * commit '557c77fe3340780da3b016b09e691dc18eb71bb4': Fix HDR+ landscape transform
|
557c77fe3340780da3b016b09e691dc18eb71bb4 |
08-Mar-2014 |
Doris Liu <tianliu@google.com> |
Fix HDR+ landscape transform Some logic in resetting translation overlooked the fact that HDR+ has rotation baked in the transform matrix because camera2 api requires that surface texture gets rotated by app for device rotation. As a result, simply setting the translation to 0 for transform matrix when there is rotation set on the matrix as well offsets the preview off the screen. Bug: 13367662 Change-Id: I0529fe4913b55aebc058c93a901b6689da1208ba
rc/com/android/camera/TextureViewHelper.java
|
615f60f464c03591cda998799a84ab41cd542cbe |
08-Mar-2014 |
Sascha Haeberling <haeberling@google.com> |
am 597c1a09: Support for capture session errors. * commit '597c1a093f840af3c42e00af05da01ef124dc846': Support for capture session errors.
|
5798bcda75b1de93e6aabb9f81291f3b841b524b |
08-Mar-2014 |
Doris Liu <tianliu@google.com> |
am 69cb8407: New shimmy * commit '69cb84076c2f290ee2cd782ab668a661c9d5386e': New shimmy
|
3215592f607797d008402faea475d2280d9a0458 |
08-Mar-2014 |
Sascha Haeberling <haeberling@google.com> |
am 5775660a: Merge "Change session API to support location inside a task." into gb-ub-photos-denali * commit '5775660acd2a744ab92355d1366bfbc4e7b7ba4d': Change session API to support location inside a task.
|
597c1a093f840af3c42e00af05da01ef124dc846 |
06-Mar-2014 |
Sascha Haeberling <haeberling@google.com> |
Support for capture session errors. Bug: 13026663 Change-Id: I3713440483aa4732f94aff9eaff2fc34a04c0427
es/drawable-hdpi/ic_error_normal.png
es/drawable-mdpi/ic_error_normal.png
es/drawable-xhdpi/ic_error_normal.png
es/drawable-xxhdpi/ic_error_normal.png
es/layout/filmstrip_bottom_controls.xml
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/app/CameraAppUI.java
rc/com/android/camera/app/FilmstripBottomPanel.java
rc/com/android/camera/session/CaptureSession.java
rc/com/android/camera/session/CaptureSessionManager.java
rc/com/android/camera/session/CaptureSessionManagerImpl.java
rc/com/android/camera/ui/BottomBar.java
|
69cb84076c2f290ee2cd782ab668a661c9d5386e |
02-Mar-2014 |
Doris Liu <tianliu@google.com> |
New shimmy Add soft landing for quick swipe-to-open. Bug: 13183433 Change-Id: Ib51b3e401108c292f27ddb963d34cdbafa37f9ae
rc/com/android/camera/app/CameraAppUI.java
rc/com/android/camera/ui/MainActivityLayout.java
rc/com/android/camera/ui/ModeListView.java
rc/com/android/camera/ui/ModeSelectorItem.java
rc/com/android/camera/widget/AnimationEffects.java
|
5775660acd2a744ab92355d1366bfbc4e7b7ba4d |
08-Mar-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Change session API to support location inside a task." into gb-ub-photos-denali
|
b396a5c1d3cbda0e4b8c65d01310b3b629053434 |
08-Mar-2014 |
Spike Sprague <spikuru@google.com> |
am 4f8d5923: Merge "proper preview letterboxing for not-so-tall apsect ratios" into gb-ub-photos-denali * commit '4f8d5923212b4ac08226be5e86583d17e47a3848': proper preview letterboxing for not-so-tall apsect ratios
|
4f8d5923212b4ac08226be5e86583d17e47a3848 |
08-Mar-2014 |
Spike Sprague <spikuru@google.com> |
Merge "proper preview letterboxing for not-so-tall apsect ratios" into gb-ub-photos-denali
|
90599aa03447f9a836157d429c7a14e74d5b14aa |
07-Mar-2014 |
Spike Sprague <spikuru@google.com> |
proper preview letterboxing for not-so-tall apsect ratios bug: 13085409 Change-Id: If574ff5fe290f4b5eb5e2fdb75e9592e5018dce4
rc/com/android/camera/TextureViewHelper.java
rc/com/android/camera/app/CameraAppUI.java
rc/com/android/camera/ui/BottomBar.java
|
f9525d410de0b840f0da5a8659734f91a66f8ed2 |
07-Mar-2014 |
Ying Wang <wangying@google.com> |
am f88a1cfc: Merge "Build against the NDK for all archs." * commit 'f88a1cfcd8da4bf2987c7ceb904b18b1ae6e0980': Build against the NDK for all archs.
|
401d6fe906e6a3d67d3c6d2b37b7f3d169963db2 |
07-Mar-2014 |
Spike Sprague <spikuru@google.com> |
am f4d378c5: Merge "fix touch to focus in option bar area" into gb-ub-photos-denali * commit 'f4d378c58b0d33af652366e04a2a8b95bd2a0f9a': fix touch to focus in option bar area
|
f4d378c58b0d33af652366e04a2a8b95bd2a0f9a |
07-Mar-2014 |
Spike Sprague <spikuru@google.com> |
Merge "fix touch to focus in option bar area" into gb-ub-photos-denali
|
2a58938576e6d4220c02cf0b9a8226a1d3bcf176 |
07-Mar-2014 |
Spike Sprague <spikuru@google.com> |
fix touch to focus in option bar area bug: 13348926 Change-Id: Ibbf0f45f50d072e5251d49b9999642efc96b84bd
es/layout-land/mode_options_bottombar.xml
es/layout-port/mode_options_bottombar.xml
rc/com/android/camera/widget/ModeOptions.java
|
06d2a8f58a4ba3354b5ef7ba539e01c52eda32c9 |
07-Mar-2014 |
Andy Huibers <andyhuibers@google.com> |
am 85b7d387: Merge "Add extra space to undo bar." into gb-ub-photos-denali * commit '85b7d387ebdeb53044775445429a8c0629613ea3': Add extra space to undo bar.
|
85b7d387ebdeb53044775445429a8c0629613ea3 |
07-Mar-2014 |
Andy Huibers <andyhuibers@google.com> |
Merge "Add extra space to undo bar." into gb-ub-photos-denali
|
91a7bd1e83c6cf2dbf12a5b5eb7e5ab844087ab7 |
07-Mar-2014 |
Andy Huibers <andyhuibers@google.com> |
Add extra space to undo bar. Change-Id: I535c40bd89c39ba4e596ac1ecb757b8c76f2c0fb
es/layout/undo_bar.xml
|
dc5a16739fc125fe1195aabb51745b53522e596d |
07-Mar-2014 |
Kevin Gabayan <gabayan@google.com> |
am 261307a0: Merge "Manage location recording state only in CameraActivity. Bug: 13230126" into gb-ub-photos-denali * commit '261307a033cb3a5c2196ab4cdb3069d319dd64ae': Manage location recording state only in CameraActivity. Bug: 13230126
|
261307a033cb3a5c2196ab4cdb3069d319dd64ae |
07-Mar-2014 |
Kevin Gabayan <gabayan@google.com> |
Merge "Manage location recording state only in CameraActivity. Bug: 13230126" into gb-ub-photos-denali
|
477902cbd92148f66c5f89d5cdfde54e4a1d0ef9 |
07-Mar-2014 |
Andy Huibers <andyhuibers@google.com> |
am 94f46ee4: Merge "Remove video-size parameter setting causing 720p video issues on Palman." into gb-ub-photos-denali * commit '94f46ee421468cefbc6e914eba48a40bea7f50e2': Remove video-size parameter setting causing 720p video issues on Palman.
|
94f46ee421468cefbc6e914eba48a40bea7f50e2 |
07-Mar-2014 |
Andy Huibers <andyhuibers@google.com> |
Merge "Remove video-size parameter setting causing 720p video issues on Palman." into gb-ub-photos-denali
|
acad83540bd77c2c64e69fdbacd356985734fd87 |
07-Mar-2014 |
Kevin Gabayan <gabayan@google.com> |
Manage location recording state only in CameraActivity. Bug: 13230126 Change-Id: Ia36b55e6678d1caa2ab5ba553f991e26664ea9ba
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/VideoModule.java
|
66045bd2ab2aa2898436ead371f7a63f341eeba4 |
07-Mar-2014 |
Doris Liu <tianliu@google.com> |
am 630e500b: Merge "Hide video recording hint if starting in landscape" into gb-ub-photos-denali * commit '630e500b8c8763d160484a30693abaaa123c9cfe': Hide video recording hint if starting in landscape
|
630e500b8c8763d160484a30693abaaa123c9cfe |
07-Mar-2014 |
Doris Liu <tianliu@google.com> |
Merge "Hide video recording hint if starting in landscape" into gb-ub-photos-denali
|
7939e157d96471ecca47ee9b6f144cf348b06f04 |
07-Mar-2014 |
Doris Liu <tianliu@google.com> |
Hide video recording hint if starting in landscape Change-Id: I591dacf9aa2646dd465273580a21890c6abb072b
rc/com/android/camera/widget/VideoRecordingHints.java
|
8adfafed25ecf9ff22cdd6e815474dccb78c7a84 |
07-Mar-2014 |
Angus Kong <shkong@google.com> |
am 027ad26e: Merge "Allow touch event goes down to view in filmstrip" into gb-ub-photos-denali * commit '027ad26e2cc768a124653983643d01b897f139fe': Allow touch event goes down to view in filmstrip
|
89489880d0f0d3a6ede7a689ffb39c185f3897d7 |
07-Mar-2014 |
Andy Huibers <andyhuibers@google.com> |
Remove video-size parameter setting causing 720p video issues on Palman. Bug: 13304124 Change-Id: I3e449afe446941a5286f36fe739311a1bb9ab135
rc/com/android/camera/VideoModule.java
rc/com/android/camera/settings/SettingsUtil.java
|
027ad26e2cc768a124653983643d01b897f139fe |
07-Mar-2014 |
Angus Kong <shkong@google.com> |
Merge "Allow touch event goes down to view in filmstrip" into gb-ub-photos-denali
|
7e9e4b7bdf371afd37f43a331cef1672fac1a230 |
07-Mar-2014 |
Angus Kong <shkong@google.com> |
Allow touch event goes down to view in filmstrip bug:13027352 Change-Id: Iee5783a3698bea2fc5cd695d3b671c0206d2fbf2
rc/com/android/camera/widget/FilmstripView.java
|
8dbb33766ce284b0c82680078c6ccf325618bd63 |
07-Mar-2014 |
Angus Kong <shkong@google.com> |
am 26d32221: Merge "Align the peek to capture button in landscape" into gb-ub-photos-denali * commit '26d32221d8f2f70b0532a7bc459b24c61d490d6b': Align the peek to capture button in landscape
|
26d32221d8f2f70b0532a7bc459b24c61d490d6b |
07-Mar-2014 |
Angus Kong <shkong@google.com> |
Merge "Align the peek to capture button in landscape" into gb-ub-photos-denali
|
e67f38e158a7b9f0d74bb5a8dc829d34faca1b6b |
07-Mar-2014 |
Spike Sprague <spikuru@google.com> |
am ba3f02b0: Merge "options bar ui fixes" into gb-ub-photos-denali * commit 'ba3f02b0e9284e0127d730041ba1d4ac36411619': options bar ui fixes
|
5f2c54d0619a8b871bb30e1fd7ac9e720e900e3b |
07-Mar-2014 |
Spike Sprague <spikuru@google.com> |
am b88ed2c7: Merge "video intent ui" into gb-ub-photos-denali * commit 'b88ed2c7bb4c6ad28b163645b1d7f70b02423395': video intent ui
|
e43ca3a01337b062801f99993339d238c195435f |
07-Mar-2014 |
Angus Kong <shkong@google.com> |
Align the peek to capture button in landscape bug:13165526 Change-Id: Ib8bb3a1bfc6edd209061cff71567b66f0fe6525c
rc/com/android/camera/app/CameraAppUI.java
|
ba3f02b0e9284e0127d730041ba1d4ac36411619 |
07-Mar-2014 |
Spike Sprague <spikuru@google.com> |
Merge "options bar ui fixes" into gb-ub-photos-denali
|
b88ed2c7bb4c6ad28b163645b1d7f70b02423395 |
07-Mar-2014 |
Spike Sprague <spikuru@google.com> |
Merge "video intent ui" into gb-ub-photos-denali
|
591eec6465d29bbc053e164071c4c3a7c260a1d3 |
06-Mar-2014 |
Spike Sprague <spikuru@google.com> |
options bar ui fixes bug: 13331173 bug: 13330727 Change-Id: I270fd04feeb8f6a4db6fae21184fad150be5fcbe
es/layout-land/mode_options_bottombar.xml
es/layout-port/mode_options_bottombar.xml
rc/com/android/camera/widget/ModeOptions.java
rc/com/android/camera/widget/ModeOptionsOverlay.java
|
e170bb61df145495dc36c15043471c7e64dc862a |
06-Mar-2014 |
Angus Kong <shkong@google.com> |
am 8a86a838: Add null check for listeners in BottomBar. * commit '8a86a8384010aeaa252c21607d8dd2d2afee7bca': Add null check for listeners in BottomBar.
|
8a86a8384010aeaa252c21607d8dd2d2afee7bca |
06-Mar-2014 |
Angus Kong <shkong@google.com> |
Add null check for listeners in BottomBar. bug:13210080 Change-Id: Idd94318cbaed0bbb386ffc14fbdd58bf25adefc3
rc/com/android/camera/ui/BottomBar.java
|
b8a85766e235590cef30a058c733c5afe1153634 |
06-Mar-2014 |
Angus Kong <shkong@google.com> |
am 2bacca79: Align the gridlines with the preview area. * commit '2bacca795a1b0adb0daf515c43c48234b44bbba5': Align the gridlines with the preview area.
|
2bacca795a1b0adb0daf515c43c48234b44bbba5 |
06-Mar-2014 |
Angus Kong <shkong@google.com> |
Align the gridlines with the preview area. 1. Rename onPreviewAreaSizeChanged() to onPreviewAreaChanged() since it's passing in the real preview area and is called when the area is changed regardless of size changes. 2. GridLines.java now draws the lines based on the preview area. bug:13098715 Change-Id: Idbd2ba03cad4698689cee46d2aa04588a415fa3d
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/FocusOverlayManager.java
rc/com/android/camera/PhotoUI.java
rc/com/android/camera/TextureViewHelper.java
rc/com/android/camera/app/AppController.java
rc/com/android/camera/app/CameraAppUI.java
rc/com/android/camera/ui/BottomBar.java
rc/com/android/camera/ui/CaptureAnimationOverlay.java
rc/com/android/camera/ui/FaceView.java
rc/com/android/camera/ui/GridLines.java
rc/com/android/camera/ui/ModeListView.java
rc/com/android/camera/ui/PreviewOverlay.java
rc/com/android/camera/ui/PreviewStatusListener.java
rc/com/android/camera/widget/ModeOptionsOverlay.java
|
51c877c56e204ac29a4db72d46168afac3feb239 |
18-Feb-2014 |
Spike Sprague <spikuru@google.com> |
video intent ui bug: 13194672 Change-Id: I55ca912a4de78e75f4f6e23cf448beab4430a606
rc/com/android/camera/VideoModule.java
rc/com/android/camera/app/CameraAppUI.java
|
3869d657670d305928ca678f14abbbe211274d63 |
06-Mar-2014 |
Sascha Haeberling <haeberling@google.com> |
am 7865bb08: Merge "Add build version to settings and add settings headers." into gb-ub-photos-denali * commit '7865bb08e2989964dcbf9684090fb6c2b6e993df': Add build version to settings and add settings headers.
|
7ff26f939222fd86509fa1354ab17f0d4b3d8382 |
06-Mar-2014 |
Angus Kong <shkong@google.com> |
am 31162a64: Merge "Align preview to bottom bar." into gb-ub-photos-denali * commit '31162a6448fd4deaf702a3e0c67827a4a3426862': Align preview to bottom bar.
|
93be42a997b008fbd098ce8ad8e8bf1eb775b3f6 |
06-Mar-2014 |
Sascha Haeberling <haeberling@google.com> |
Change session API to support location inside a task. Bug: 13325568 Change-Id: I72f69803ab304d198e8c74c194a36bd0820ac187
rc/com/android/camera/Storage.java
rc/com/android/camera/processing/ProcessingService.java
rc/com/android/camera/processing/ProcessingTask.java
rc/com/android/camera/session/CaptureSession.java
rc/com/android/camera/session/CaptureSessionManager.java
rc/com/android/camera/session/CaptureSessionManagerImpl.java
rc/com/android/camera/session/PlaceholderManager.java
|
7865bb08e2989964dcbf9684090fb6c2b6e993df |
06-Mar-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Add build version to settings and add settings headers." into gb-ub-photos-denali
|
31162a6448fd4deaf702a3e0c67827a4a3426862 |
06-Mar-2014 |
Angus Kong <shkong@google.com> |
Merge "Align preview to bottom bar." into gb-ub-photos-denali
|
58b9b03f2bedc522bde5b4199121ea2e559c79a9 |
06-Mar-2014 |
Angus Kong <shkong@google.com> |
Align preview to bottom bar. bug:13210080 Change-Id: I6ec4071e2f21ef351b2b16a53662c2a3c1b29721
es/values/integers.xml
rc/com/android/camera/TextureViewHelper.java
rc/com/android/camera/app/CameraAppUI.java
rc/com/android/camera/ui/BottomBar.java
|
bbf7bb2da0e70b20bed4f82a915cb169a43f5585 |
06-Mar-2014 |
Andy Huibers <andyhuibers@google.com> |
am 03c58426: Merge "Update .gitignore file." into gb-ub-photos-denali * commit '03c584264a0704e611f94daf57bde08c2c35d2e8': Update .gitignore file.
|
e659f9775478d51094ccb6bf277cf4f33ba8bc85 |
06-Mar-2014 |
Doris Liu <tianliu@google.com> |
am 68f235b8: Merge "Add video recording hint to discourage vertical videos" into gb-ub-photos-denali * commit '68f235b8685fa9deaa55847ba972f28c2e558621': Add video recording hint to discourage vertical videos
|
03c584264a0704e611f94daf57bde08c2c35d2e8 |
06-Mar-2014 |
Andy Huibers <andyhuibers@google.com> |
Merge "Update .gitignore file." into gb-ub-photos-denali
|
68f235b8685fa9deaa55847ba972f28c2e558621 |
06-Mar-2014 |
Doris Liu <tianliu@google.com> |
Merge "Add video recording hint to discourage vertical videos" into gb-ub-photos-denali
|
82248d7d1209436bd01d3a8a1ff8b447f08f1d16 |
06-Mar-2014 |
Andy Huibers <andyhuibers@google.com> |
am 81187939: Avoid 720P video recording on Palman. * commit '81187939d5390e7fe1c0121e4bf902a6a20a1764': Avoid 720P video recording on Palman.
|
81187939d5390e7fe1c0121e4bf902a6a20a1764 |
06-Mar-2014 |
Andy Huibers <andyhuibers@google.com> |
Avoid 720P video recording on Palman. Bug: 13304124 Change-Id: I107a8669308f857df5970628872e702b142b14d0
rc/com/android/camera/settings/SettingsUtil.java
|
d6487c911dd1f5095723db2a1e9aaa609ebc5ee1 |
28-Feb-2014 |
Doris Liu <tianliu@google.com> |
Add video recording hint to discourage vertical videos Bug: 8654023 Change-Id: I336f9e6af2393985e223a44a8e877e2878add76d
es/drawable-hdpi/ic_phone_graphic.png
es/drawable-hdpi/rotate_arrows.png
es/drawable-mdpi/ic_phone_graphic.png
es/drawable-mdpi/rotate_arrows.png
es/drawable-xhdpi/ic_phone_graphic.png
es/drawable-xhdpi/rotate_arrows.png
es/drawable-xxhdpi/ic_phone_graphic.png
es/drawable-xxhdpi/rotate_arrows.png
es/layout/video_module.xml
es/values/dimens.xml
rc/com/android/camera/VideoModule.java
rc/com/android/camera/VideoUI.java
rc/com/android/camera/widget/VideoRecordingHints.java
|
f42bfdc9ecd4149c982833abc9993612fb4ab152 |
06-Mar-2014 |
Sascha Haeberling <haeberling@google.com> |
Add build version to settings and add settings headers. Bug: 13329975 Bug: 13025151 Change-Id: I0259ec91da68efe1eed07b396f42fc69631413fd
es/values/strings.xml
es/xml/camera_preferences.xml
rc/com/android/camera/settings/CameraSettingsActivity.java
|
79f764921dad482812b1980891d5b34d33cf59e6 |
06-Mar-2014 |
Sascha Haeberling <haeberling@google.com> |
am 1b98b97f: Merge "Tell the module it\'s visible when we start dragging out the filmstrip." into gb-ub-photos-denali * commit '1b98b97f458e4a2146384b840987e15a7d0dd4e5': Tell the module it's visible when we start dragging out the filmstrip.
|
1b98b97f458e4a2146384b840987e15a7d0dd4e5 |
06-Mar-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Tell the module it's visible when we start dragging out the filmstrip." into gb-ub-photos-denali
|
6779140675b31e0ce4e7e03e544d9326f2e7f323 |
06-Mar-2014 |
Sascha Haeberling <haeberling@google.com> |
Tell the module it's visible when we start dragging out the filmstrip. Bug: 13327997 Change-Id: I56193472ad80246c8a1fe98e2d2d350231d208ec
rc/com/android/camera/CameraActivity.java
|
3180a8a124a195844aa5bdd0e2ef2d41c308af3c |
05-Mar-2014 |
Sascha Haeberling <haeberling@google.com> |
am b4a579aa: Merge "Add placeholder to use for tutorial screens across modules." into gb-ub-photos-denali * commit 'b4a579aa0772a3e6140868a7e4ba03e0040f8353': Add placeholder to use for tutorial screens across modules.
|
b4a579aa0772a3e6140868a7e4ba03e0040f8353 |
05-Mar-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Add placeholder to use for tutorial screens across modules." into gb-ub-photos-denali
|
02f1f90809f5fee616dd64c7c5b60dc28510b9bb |
05-Mar-2014 |
Angus Kong <shkong@google.com> |
am 7d1d6057: Merge "No switch camera when switching camera" into gb-ub-photos-denali * commit '7d1d6057817ff5b47129a07ce355afb74cdab88b': No switch camera when switching camera
|
7d1d6057817ff5b47129a07ce355afb74cdab88b |
05-Mar-2014 |
Angus Kong <shkong@google.com> |
Merge "No switch camera when switching camera" into gb-ub-photos-denali
|
4baa6c53b04c0fa9951d0dff19ac97d910a9b6ae |
05-Mar-2014 |
Andy Huibers <andyhuibers@google.com> |
am a9a83bc9: Merge "Add details open event to logs." into gb-ub-photos-denali * commit 'a9a83bc93f386f5799f6f89936edcd138e5d22dc': Add details open event to logs.
|
a9a83bc93f386f5799f6f89936edcd138e5d22dc |
05-Mar-2014 |
Andy Huibers <andyhuibers@google.com> |
Merge "Add details open event to logs." into gb-ub-photos-denali
|
e340bd9dc8130a513aec237f38a59435f88f7265 |
05-Mar-2014 |
Spike Sprague <spikuru@google.com> |
am bf42b205: Merge "implement capture options animation" into gb-ub-photos-denali * commit 'bf42b2058ebb0298967a85ab750ad3ec18c24892': implement capture options animation
|
bf42b2058ebb0298967a85ab750ad3ec18c24892 |
05-Mar-2014 |
Spike Sprague <spikuru@google.com> |
Merge "implement capture options animation" into gb-ub-photos-denali
|
17f6a0672d764712beed3c50118ac037fb26c32c |
05-Mar-2014 |
Angus Kong <shkong@google.com> |
am 57fb2851: Merge "Flatten the parameter in calling thread." into gb-ub-photos-denali * commit '57fb2851530a0da741616ba75b5dc472c3cc7087': Flatten the parameter in calling thread.
|
57fb2851530a0da741616ba75b5dc472c3cc7087 |
05-Mar-2014 |
Angus Kong <shkong@google.com> |
Merge "Flatten the parameter in calling thread." into gb-ub-photos-denali
|
f0a683470f46fcf0b74960b378002852a86e6b9c |
05-Mar-2014 |
Andy Huibers <andyhuibers@google.com> |
Add details open event to logs. Change-Id: I6a468bcbb5dde0fb5703c629d0b305c0bc32f6cb
rc/com/android/camera/CameraActivity.java
rc_pd/com/google/common/logging/eventprotos.java
|
d494b9afc833b966863df04d5560e73fc7e0125d |
05-Mar-2014 |
Alan Newberger <alann@google.com> |
am acb0802c: Remove onPreviewReadyToStart from PhotoModule * commit 'acb0802ccfa23723686a154806c6ba2d6cba453f': Remove onPreviewReadyToStart from PhotoModule
|
acb0802ccfa23723686a154806c6ba2d6cba453f |
05-Mar-2014 |
Alan Newberger <alann@google.com> |
Remove onPreviewReadyToStart from PhotoModule Removing this call results in no jank or loss of function on tested devices, and resolves an issue on certain devices where starting the callback prior to the preview results in a permanent mode cover. This issue was not observed in any other mode, i.e. video is working on warm start for all tested devices before and after this change. Bug: 13078926 Change-Id: I7a63011dd96d40466d6bc3bb7f6867552a2b0dc8
rc/com/android/camera/PhotoModule.java
|
1958dfa1e4c382e684a550c188cc3d31cd675685 |
05-Mar-2014 |
Andy Huibers <andyhuibers@google.com> |
Update .gitignore file. Change-Id: I85a9319d50c1cc5465e338967bc2a3c09a643fa7
gitignore
|
a9a9d1558b87507905559918df5a144688269f5b |
05-Mar-2014 |
Sascha Haeberling <haeberling@google.com> |
Add placeholder to use for tutorial screens across modules. Bug: 13076376 Change-Id: Ia157040b460a296a61ce1c84e637c36f24072a15
es/layout/generic_module.xml
rc/com/android/camera/app/CameraAppUI.java
|
97e282a3764215ac193726e0d259e55bf94369fe |
05-Mar-2014 |
Angus Kong <shkong@google.com> |
No switch camera when switching camera bug:13234553 Change-Id: I1f26c2c69e5a0aee0ea1962a9cb2837bde94e02e
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/VideoModule.java
rc/com/android/camera/app/CameraController.java
rc/com/android/camera/app/CameraProvider.java
|
9d8fa68c734cc5671d71bc22e4f8b8d750bf2176 |
05-Mar-2014 |
Erin Dahlgren <edahlgren@google.com> |
am 8c1f9701: Only allow simple capture for image intents. * commit '8c1f97010898020ef7776a91aa1e437ce621fedb': Only allow simple capture for image intents.
|
8c1f97010898020ef7776a91aa1e437ce621fedb |
05-Mar-2014 |
Erin Dahlgren <edahlgren@google.com> |
Only allow simple capture for image intents. Bug: 13289606 Change-Id: Id753def11f6499940a284b6bc3d33f5e45363183
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/app/CameraAppUI.java
|
1da313cd8c2a1089ea6ddbc5a9e162600e0555dd |
05-Mar-2014 |
Erin Dahlgren <edahlgren@google.com> |
am 1ba90e3e: Implement return to hdr plus after switch to front facing camera. * commit '1ba90e3ea4b8280c28cf6d87e5b4cc6b3b5f1645': Implement return to hdr plus after switch to front facing camera.
|
1ba90e3ea4b8280c28cf6d87e5b4cc6b3b5f1645 |
03-Mar-2014 |
Erin Dahlgren <edahlgren@google.com> |
Implement return to hdr plus after switch to front facing camera. Bug: 12894444 Change-Id: Ia9c0cba83f0ee99f2156e9e58f4fff1af9b6100f
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/app/AppController.java
rc/com/android/camera/settings/SettingsCache.java
rc/com/android/camera/settings/SettingsManager.java
|
2a73f3646311204858deb27031be8fcadb2431e3 |
04-Mar-2014 |
Angus Kong <shkong@google.com> |
am d02de780: Reduce the amount of peek animation. * commit 'd02de7808c906f89c1d331feebcefba6696d8668': Reduce the amount of peek animation.
|
d02de7808c906f89c1d331feebcefba6696d8668 |
04-Mar-2014 |
Angus Kong <shkong@google.com> |
Reduce the amount of peek animation. bug:13165526 Change-Id: I3a338c0a770be2d53b8caa5f287d06e64f4549ef
rc/com/android/camera/widget/PeekView.java
|
723cfb9743edb21e39a4a127d6c026ac39beb5e8 |
04-Mar-2014 |
Angus Kong <shkong@google.com> |
Flatten the parameter in calling thread. bug:13246321 Change-Id: Id88714b7c8d9ff00c4ab85781f44d1e5ec5a0bae
rc/com/android/camera/app/AndroidCameraManagerImpl.java
|
82fa6ae85f7c07fef480eb1cd0cf7f578b150676 |
27-Feb-2014 |
Spike Sprague <spikuru@google.com> |
implement capture options animation bug: 13100962 Change-Id: I1baf64693d0e01e99bfa19d0bd8699fd33d5812a
es/drawable/button_background_pressed_dark.xml
es/drawable/button_background_pressed_light.xml
es/layout-land/mode_options_bottombar.xml
es/layout-port/mode_options_bottombar.xml
es/layout/mode_options_bottombar.xml
es/values/colors.xml
es/values/dimens.xml
rc/com/android/camera/widget/ModeOptions.java
rc/com/android/camera/widget/ModeOptionsOverlay.java
|
23590418495a5334d22d43eaaf86ba076e388cad |
04-Mar-2014 |
Angus Kong <shkong@google.com> |
am 4d1e5f75: Merge "Don\'t show peek anim after 20 swipes to filmstrip." into gb-ub-photos-denali * commit '4d1e5f7569e1728d9be2102f97c02a1213c3b940': Don't show peek anim after 20 swipes to filmstrip.
|
4d1e5f7569e1728d9be2102f97c02a1213c3b940 |
04-Mar-2014 |
Angus Kong <shkong@google.com> |
Merge "Don't show peek anim after 20 swipes to filmstrip." into gb-ub-photos-denali
|
dd58acfde980bace1229b89a9c85d5a337a08d9a |
04-Mar-2014 |
Angus Kong <shkong@google.com> |
am 19259ea4: Merge "Keep an reference count for CameraManager." into gb-ub-photos-denali * commit '19259ea42f1ff0537847c9b5b3c01b4d0433a7d4': Keep an reference count for CameraManager.
|
19259ea42f1ff0537847c9b5b3c01b4d0433a7d4 |
04-Mar-2014 |
Angus Kong <shkong@google.com> |
Merge "Keep an reference count for CameraManager." into gb-ub-photos-denali
|
44442f6f673a37e5d0fa9c7676f5147fffd97218 |
04-Mar-2014 |
Angus Kong <shkong@google.com> |
Don't show peek anim after 20 swipes to filmstrip. bug:13165526 Change-Id: I7e74ba9a92bb0e145ffda753c8a3475f1ea04417
es/values/strings.xml
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/settings/SettingsCache.java
rc/com/android/camera/settings/SettingsManager.java
|
233e8763e8befbf357d249f2593e3af9ae2b6233 |
04-Mar-2014 |
Baligh Uddin <baligh@google.com> |
am 37295fc3: (-s ours) Import translations. DO NOT MERGE * commit '37295fc3d8d76a9bf0e14fd4c73462dfb4feb1cf': Import translations. DO NOT MERGE
|
f5a78334a317f999e1bc88b726b8537474a1cd38 |
04-Mar-2014 |
Angus Kong <shkong@google.com> |
Keep an reference count for CameraManager. bug:13286589 Change-Id: Id4b44041044cb7439a4826c78b07411e68e2801e
rc/com/android/camera/app/CameraManagerFactory.java
|
44f78b0fda86041f6ef62be66b93f27df7fc971c |
03-Mar-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I2d47f42f35db94fecd0c30fafba733fc5746c801 Auto-generated-cl: translation import
es/values-zh-rTW/strings.xml
|
5abc35efe5524f2819fc36d2d28f11e3923394da |
03-Mar-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: If039abe56fc00facd7ddaf7f457f2f7ef4987bc5 Auto-generated-cl: translation import
es/values-zh-rTW/strings.xml
|
37295fc3d8d76a9bf0e14fd4c73462dfb4feb1cf |
03-Mar-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ic1b3d688201df2039aa11844348ca188a913ae9c Auto-generated-cl: translation import
es/values-zh-rTW/strings.xml
|
bd2b91f5202f9e5da20aba536086325a2c608825 |
01-Mar-2014 |
Sascha Haeberling <haeberling@google.com> |
am 7e016126: Merge "Add \'Details\' menu item in filmstrip" into gb-ub-photos-denali * commit '7e016126879908ec9b1edfa7b1dd91cf592556f1': Add 'Details' menu item in filmstrip
|
7e016126879908ec9b1edfa7b1dd91cf592556f1 |
01-Mar-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Add 'Details' menu item in filmstrip" into gb-ub-photos-denali
|
d114a7715445dba0dc06e12a574787242356ce57 |
01-Mar-2014 |
Sascha Haeberling <haeberling@google.com> |
Add 'Details' menu item in filmstrip Bug: 13029695 Bug: 13176584 ALso fixes the chevron color on the home button. Change-Id: I7f57da4ad94c5c89163fd6dfc724372ac84d0212
es/menu/filmstrip_menu.xml
es/menu/operations.xml
es/values/styles.xml
rc/com/android/camera/CameraActivity.java
|
ada870871a8e9cd00bd9cdf69349572167ddefd4 |
01-Mar-2014 |
Doris Liu <tianliu@google.com> |
am 0c0ff04e: Merge "New Shimmy" into gb-ub-photos-denali * commit '0c0ff04ed41aede510fe018633c7c4e1a05aec80': New Shimmy
|
0c0ff04ed41aede510fe018633c7c4e1a05aec80 |
01-Mar-2014 |
Doris Liu <tianliu@google.com> |
Merge "New Shimmy" into gb-ub-photos-denali
|
6308ac096ad755888e30363bf0ec3b2b6bd3d795 |
01-Mar-2014 |
Alan Newberger <alann@google.com> |
am 32f8842e: Merge "Force chooser for sharing actions" into gb-ub-photos-denali * commit '32f8842ecd394dae58304f16e5bce050b9ae249f': Force chooser for sharing actions
|
32f8842ecd394dae58304f16e5bce050b9ae249f |
01-Mar-2014 |
Alan Newberger <alann@google.com> |
Merge "Force chooser for sharing actions" into gb-ub-photos-denali
|
50c9cdce87ada203ad282c9dedd1cb65c7608736 |
01-Mar-2014 |
Alan Newberger <alann@google.com> |
Force chooser for sharing actions User should not be able to select 'always' in the Camera filmstrip, so this uses the system chooser. This does not do the same for panoramas. This is a simple implementation, no querying for counts of intent receivers, but having just one for images or videos is a corner case, showing the list is safe. Bug: 13229214 Change-Id: I0b7a8327b157828e03edf65579318b758e1873e8
rc/com/android/camera/CameraActivity.java
|
b00d64307ae77541f8576593a29214d649fb94e9 |
26-Feb-2014 |
Doris Liu <tianliu@google.com> |
New Shimmy - Two step shimmy: first show the mode switcher, then hide it with a shimmy animation. - Hiding will not start until after all the popups are dismissed TODO: - When mode switcher is shown for shimmy, text should be hidden ( this involves cooridnating the timing to show text with user interaction) - Need to have a graceful transition if user grabs the list on its way out Bug: 13183433 Change-Id: Idda5520c3c3663864be0f478787ef603fdb0f6da
rc/com/android/camera/app/CameraAppUI.java
rc/com/android/camera/ui/ModeListView.java
rc/com/android/camera/ui/ModeTransitionView.java
|
320245280b0340907d08fabe861069242837d2a6 |
28-Feb-2014 |
Angus Kong <shkong@google.com> |
am 0c76cbcb: Merge "Refine the logic in CameraController." into gb-ub-photos-denali * commit '0c76cbcb7e6406303f9e88d49034a73e58e1b426': Refine the logic in CameraController.
|
0c76cbcb7e6406303f9e88d49034a73e58e1b426 |
28-Feb-2014 |
Angus Kong <shkong@google.com> |
Merge "Refine the logic in CameraController." into gb-ub-photos-denali
|
432c964bb528a28600f19e18e81ff2b6407bb22d |
28-Feb-2014 |
Angus Kong <shkong@google.com> |
Refine the logic in CameraController. Define a constant for empty request and also add some documentation. bug:13234553 Change-Id: Ib491dc94304451a215dd09995233edf340f57d2b
rc/com/android/camera/app/CameraController.java
|
b3404379451ff6d135af937a2c9191842291165e |
28-Feb-2014 |
Angus Kong <shkong@google.com> |
am db4c1137: Merge "Change progress bar color" into gb-ub-photos-denali * commit 'db4c113771c78cf2c27b3bbcf83410cea4dd7d47': Change progress bar color
|
db4c113771c78cf2c27b3bbcf83410cea4dd7d47 |
28-Feb-2014 |
Angus Kong <shkong@google.com> |
Merge "Change progress bar color" into gb-ub-photos-denali
|
104a9fffa3948e1d17163f73a08e2ebec83ed646 |
28-Feb-2014 |
Sascha Haeberling <haeberling@google.com> |
am 7026368e: Merge "Remove unused refocus drawable." into gb-ub-photos-denali * commit '7026368e8c411458f5268f9d11d1ab0d9d073bed': Remove unused refocus drawable.
|
7026368e8c411458f5268f9d11d1ab0d9d073bed |
28-Feb-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Remove unused refocus drawable." into gb-ub-photos-denali
|
9b7fd5bf1743e2aeb0ae5a5d4f9e7d3300fc3a7f |
28-Feb-2014 |
Andy Huibers <andyhuibers@google.com> |
am 8e5cdddb: Merge "Make undo bar a bit wider to be more consistent with Android conventions." into gb-ub-photos-denali * commit '8e5cdddb30d4dc9437dc5ef833b701d3d9a20323': Make undo bar a bit wider to be more consistent with Android conventions.
|
af074336a654bc9eb52243662a711513afc4c098 |
28-Feb-2014 |
Sascha Haeberling <haeberling@google.com> |
Remove unused refocus drawable. Change-Id: I38922d8d8f3f98694d273b7902085ae6b828f359
es/drawable/ic_refocus.xml
es/drawable/ic_refocus_off.xml
|
8e5cdddb30d4dc9437dc5ef833b701d3d9a20323 |
28-Feb-2014 |
Andy Huibers <andyhuibers@google.com> |
Merge "Make undo bar a bit wider to be more consistent with Android conventions." into gb-ub-photos-denali
|
c0ddf4a72ccdf7fdc2855a533d2d6c3405f22ca4 |
28-Feb-2014 |
Erin Dahlgren <edahlgren@google.com> |
am 4037d675: Merge "Add disabled capture icons for implementing disabled shutter." into gb-ub-photos-denali * commit '4037d675f7b13d56c10ed16afa604e03d71bd492': Add disabled capture icons for implementing disabled shutter.
|
4037d675f7b13d56c10ed16afa604e03d71bd492 |
28-Feb-2014 |
Erin Dahlgren <edahlgren@google.com> |
Merge "Add disabled capture icons for implementing disabled shutter." into gb-ub-photos-denali
|
eaaf6dec6f7fe891c2f332c1c9c1b851c7f731e2 |
28-Feb-2014 |
Erin Dahlgren <edahlgren@google.com> |
Add disabled capture icons for implementing disabled shutter. Bug: 13244592 Change-Id: Ifb0c3181ef91e1fcd47b6ee6f6d2256a8a420e54
es/drawable-hdpi/ic_camera_disabled.png
es/drawable-hdpi/ic_panorama_disabled.png
es/drawable-hdpi/ic_photo_sphere_disabled.png
es/drawable-hdpi/ic_video_disabled.png
es/drawable-mdpi/ic_camera_disabled.png
es/drawable-mdpi/ic_panorama_disabled.png
es/drawable-mdpi/ic_photo_sphere_disabled.png
es/drawable-mdpi/ic_video_disabled.png
es/drawable-xhdpi/ic_camera_disabled.png
es/drawable-xhdpi/ic_panorama_disabled.png
es/drawable-xhdpi/ic_photo_sphere_disabled.png
es/drawable-xhdpi/ic_video_disabled.png
es/drawable-xxhdpi/ic_camera_disabled.png
es/drawable-xxhdpi/ic_panorama_disabled.png
es/drawable-xxhdpi/ic_photo_sphere_disabled.png
es/drawable-xxhdpi/ic_video_disabled.png
|
13771e5989c4771150626512d21673c5f7d1cf1a |
28-Feb-2014 |
Angus Kong <shkong@google.com> |
am d119afcb: Merge "Prevent crash during rapid switching camera" into gb-ub-photos-denali * commit 'd119afcb87f6ffc4dabf52e9fa57ddede9a5c933': Prevent crash during rapid switching camera
|
380fdaa69df80e845dc3827fef354a4ca46296de |
28-Feb-2014 |
Andy Huibers <andyhuibers@google.com> |
Make undo bar a bit wider to be more consistent with Android conventions. Change-Id: I2854c71f93009e3cbbb3d63319e2ca338c846df4
es/layout/undo_bar.xml
|
d119afcb87f6ffc4dabf52e9fa57ddede9a5c933 |
28-Feb-2014 |
Angus Kong <shkong@google.com> |
Merge "Prevent crash during rapid switching camera" into gb-ub-photos-denali
|
fcfa8a5ae0b61f3c150e1b7b15c77feaa5661256 |
28-Feb-2014 |
Doris Liu <tianliu@google.com> |
am 9fb887cb: Remove animation when going from pressed to selected state * commit '9fb887cb6cb1941726e7c0820d491eba950c64a0': Remove animation when going from pressed to selected state
|
9fb887cb6cb1941726e7c0820d491eba950c64a0 |
28-Feb-2014 |
Doris Liu <tianliu@google.com> |
Remove animation when going from pressed to selected state Bug: 13097259 Change-Id: I2098366fe68d11c68d8fb958680dcc33da7b4391
rc/com/android/camera/ui/ModeIconView.java
rc/com/android/camera/ui/ModeListView.java
|
e6a62c4cbe63a3b6b8cf6b710d21e1ee4856ceab |
28-Feb-2014 |
Angus Kong <shkong@google.com> |
Prevent crash during rapid switching camera 1. Don't request new camera when the previous request is not fulfilled yet. 2. Send camera open message through dispatch thread also. bug:13234553 Change-Id: I9962cf084bc7f39bcbf05946800fc28a39d204c7
rc/com/android/camera/app/AndroidCameraManagerImpl.java
rc/com/android/camera/app/CameraController.java
|
f747b78d0108da337e755eac6b26e2c3feb275d8 |
26-Feb-2014 |
Angus Kong <shkong@google.com> |
Change progress bar color bug:13026663 Change-Id: I81171fee34c8cba21a74c1fbadc25f82e853143d
es/drawable-hdpi/progress_bg.9.png
es/drawable-hdpi/progress_primary.9.png
es/drawable-mdpi/progress_bg.9.png
es/drawable-mdpi/progress_primary.9.png
es/drawable-xhdpi/progress_bg.9.png
es/drawable-xhdpi/progress_primary.9.png
es/drawable-xxhdpi/progress_bg.9.png
es/drawable-xxhdpi/progress_primary.9.png
es/drawable/bottom_progress_bar.xml
es/layout/filmstrip_bottom_controls.xml
|
81d5d7315c3b5993c1343e030267e2bd810df10c |
28-Feb-2014 |
Carlos Hernandez <chernand@google.com> |
am 7a9c4d1e: Add missing import * commit '7a9c4d1eb69bd33ec8fa0273a4da578327e98c89': Add missing import
|
7a9c4d1eb69bd33ec8fa0273a4da578327e98c89 |
28-Feb-2014 |
Carlos Hernandez <chernand@google.com> |
Add missing import Change-Id: Iaf8905808270399c35fa0c63f4839acc1edafaa3
rc_pd/com/android/camera/util/RefocusHelper.java
|
86d99e1a3aa6d96b3396a7e84fdf8caa61730104 |
28-Feb-2014 |
Carlos Hernandez <chernand@google.com> |
am 83eeb95f: Merge "Add IsRGBZ to RefocusHelper" into gb-ub-photos-denali * commit '83eeb95f610da6e01e97112a5979827de1376581': Add IsRGBZ to RefocusHelper
|
83eeb95f610da6e01e97112a5979827de1376581 |
28-Feb-2014 |
Carlos Hernandez <chernand@google.com> |
Merge "Add IsRGBZ to RefocusHelper" into gb-ub-photos-denali
|
ce6c00db0de3ac0370a65c308ec4c3d183be0a20 |
28-Feb-2014 |
Angus Kong <shkong@google.com> |
am df17a5dd: Remove spinner for in-progress data. * commit 'df17a5dd7e2834d09e1d56e4487ffddf78cb99d9': Remove spinner for in-progress data.
|
df17a5dd7e2834d09e1d56e4487ffddf78cb99d9 |
28-Feb-2014 |
Angus Kong <shkong@google.com> |
Remove spinner for in-progress data. bug:13195977 Change-Id: I5083c191583945192e2417ad208d1bfaf2f19be1
rc/com/android/camera/data/CameraDataAdapter.java
rc/com/android/camera/data/InProgressDataWrapper.java
|
20cc222a968adaec43c71a0ad045d6005de6356a |
28-Feb-2014 |
Angus Kong <shkong@google.com> |
am 589649e7: Merge "Show progress UI in secure camera." into gb-ub-photos-denali * commit '589649e705abca400cfbf88d44139192a767e07d': Show progress UI in secure camera.
|
589649e705abca400cfbf88d44139192a767e07d |
28-Feb-2014 |
Angus Kong <shkong@google.com> |
Merge "Show progress UI in secure camera." into gb-ub-photos-denali
|
001dc31f0b6e78b70db83c6d9b8cc7872e540965 |
28-Feb-2014 |
Angus Kong <shkong@google.com> |
Show progress UI in secure camera. bug:13226795 Change-Id: I9de44b1c802094b88797ab90ceb022a42b3589f9
es/layout/filmstrip_bottom_controls.xml
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/app/CameraAppUI.java
rc/com/android/camera/app/FilmstripBottomPanel.java
|
e8ce0ac3d520a8d48ade9c7faf2c15dcb52d4dec |
28-Feb-2014 |
Sascha Haeberling <haeberling@google.com> |
am 45382e86: Merge "Add exif util file." into gb-ub-photos-denali * commit '45382e86f640ef098f613c9208a64d14ef50c9f9': Add exif util file.
|
45382e86f640ef098f613c9208a64d14ef50c9f9 |
28-Feb-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Add exif util file." into gb-ub-photos-denali
|
6218e503a5d4f2fa566855022d14f5f96ca38120 |
28-Feb-2014 |
Sascha Haeberling <haeberling@google.com> |
Add exif util file. Bug: 12067030 Change-Id: If5898b44335c004e3e750598f55a98516065a0ae
rc/com/android/camera/util/ExifUtil.java
|
77377ad618ccedeeecdff880f73780605d7c0d9e |
28-Feb-2014 |
Carlos Hernandez <chernand@google.com> |
Add IsRGBZ to RefocusHelper Bug: 12210770 Change-Id: I4d030318f44b906a2f0e0d3f7c7d7387634098be
rc/com/android/camera/data/RgbzMetadataLoader.java
rc_pd/com/android/camera/util/RefocusHelper.java
|
c2a6f9996934dee97fbd86295482039e93787b26 |
28-Feb-2014 |
Doris Liu <tianliu@google.com> |
am b98b375d: Merge "30% transparent fill pressed state" into gb-ub-photos-denali * commit 'b98b375d2651d1a621022081563b6325b88bbda6': 30% transparent fill pressed state
|
b98b375d2651d1a621022081563b6325b88bbda6 |
28-Feb-2014 |
Doris Liu <tianliu@google.com> |
Merge "30% transparent fill pressed state" into gb-ub-photos-denali
|
1e299c4ed16bf92188348a6ea42ea98b131aa3da |
27-Feb-2014 |
Sascha Haeberling <haeberling@google.com> |
am 63c4532e: Merge "Make message more clear." into gb-ub-photos-denali * commit '63c4532e1979bb7d9c8c3bb87ad8ffcc3c311547': Make message more clear.
|
63c4532e1979bb7d9c8c3bb87ad8ffcc3c311547 |
27-Feb-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Make message more clear." into gb-ub-photos-denali
|
f8d2a296ac18ec74c4aa97a3653acabbbcd1580c |
27-Feb-2014 |
Sascha Haeberling <haeberling@google.com> |
Make message more clear. Change-Id: Id7d08bb544a7f8adf15d8ecbbfddc75f52f92def
rc_pd/com/android/camera/app/LocationManager.java
|
26740cc00ba3184997c35991542acd2c1188bb39 |
27-Feb-2014 |
Angus Kong <shkong@google.com> |
am 945acc87: Merge "Check whether the camera is opened when releasing" into gb-ub-photos-denali * commit '945acc87892de6a7c0059af31aa6466b1cc31951': Check whether the camera is opened when releasing
|
945acc87892de6a7c0059af31aa6466b1cc31951 |
27-Feb-2014 |
Angus Kong <shkong@google.com> |
Merge "Check whether the camera is opened when releasing" into gb-ub-photos-denali
|
658b7ccb52092077b5f732747a5d5d93e6beef88 |
27-Feb-2014 |
Seth Raphael <magicseth@google.com> |
am 98378965: Merge "Only use a media retriever when necessary." into gb-ub-photos-denali * commit '98378965b483df98fb1caaf63a14625df1c322e9': Only use a media retriever when necessary.
|
98378965b483df98fb1caaf63a14625df1c322e9 |
27-Feb-2014 |
Seth Raphael <magicseth@google.com> |
Merge "Only use a media retriever when necessary." into gb-ub-photos-denali
|
b21870f870e00d8dfa639a79c53a2c748092964f |
27-Feb-2014 |
Seth Raphael <magicseth@google.com> |
Only use a media retriever when necessary. Previously we created a media retriever to query the width and height of every video when making the filmstrip data model. This is extremely slow. Now we query the content resolver first, and only create a media retriever if it seems that the content resolver has poor values. Bug: 13225572 Change-Id: Ic366adbc8f82036ddd727fafe04077ccdee37c80
rc/com/android/camera/data/LocalMediaData.java
|
f578829a0f9a298fd5e4fdd9081b768f25811599 |
27-Feb-2014 |
Angus Kong <shkong@google.com> |
Check whether the camera is opened when releasing bug:13213439 Change-Id: I7360aca7de7533c920c1a1f5c7293a99a571a247
rc/com/android/camera/app/CameraController.java
|
d67a35b529242d7064e49bb6104eb1a890e1d4bc |
27-Feb-2014 |
Baligh Uddin <baligh@google.com> |
am 58321e80: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-denali * commit '58321e8024c3d55384887f6abc065cf90c23894a': Import translations. DO NOT MERGE
|
58321e8024c3d55384887f6abc065cf90c23894a |
27-Feb-2014 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-denali
|
e2529253ec812b8d387423a46c6dc1350281964a |
27-Feb-2014 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into ub-camera-everglades
|
06e0826c3ae8579bd301040607701e0065aa6848 |
26-Feb-2014 |
Doris Liu <tianliu@google.com> |
30% transparent fill pressed state Bug: 13097259 Change-Id: I2d22e78fd80b3069df74df1bee53ec6276aedc73
rc/com/android/camera/ui/ModeIconView.java
rc/com/android/camera/ui/ModeListView.java
rc/com/android/camera/ui/ModeSelectorItem.java
|
597d0daef984f896d34dd0cfc64a7e73978644bb |
27-Feb-2014 |
Sascha Haeberling <haeberling@google.com> |
am 8f4dba0d: Merge "Fix potential crash by moving OrientationManager init." into gb-ub-photos-denali * commit '8f4dba0d4e69cbd045a379f58e23cec7148894a7': Fix potential crash by moving OrientationManager init.
|
8f4dba0d4e69cbd045a379f58e23cec7148894a7 |
27-Feb-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Fix potential crash by moving OrientationManager init." into gb-ub-photos-denali
|
ba29a44d07272059686c51b2acf3b914f45d35ca |
27-Feb-2014 |
Sascha Haeberling <haeberling@google.com> |
Fix potential crash by moving OrientationManager init. Bug: 13195324 Change-Id: I620c192495317d5268823bc4cf4c8ff3e75f45b5
rc/com/android/camera/CameraActivity.java
|
0f1cd9fe6ea3a575fb25aa0dd1b78622d40595a3 |
27-Feb-2014 |
Angus Kong <shkong@google.com> |
am fc1c289d: Merge "Add camera state in CameraManager implementation" into gb-ub-photos-denali * commit 'fc1c289dff5b91cb9470009eb973325a38f91f4e': Add camera state in CameraManager implementation
|
fc1c289dff5b91cb9470009eb973325a38f91f4e |
27-Feb-2014 |
Angus Kong <shkong@google.com> |
Merge "Add camera state in CameraManager implementation" into gb-ub-photos-denali
|
5bea57cc0b47b81d11e903a4485f42eca039665f |
26-Feb-2014 |
Sascha Haeberling <haeberling@google.com> |
am 91c25e3d: First sweep to clean up unused preference code. * commit '91c25e3d33120d5466c42f17276565f99df79c56': First sweep to clean up unused preference code.
|
91c25e3d33120d5466c42f17276565f99df79c56 |
26-Feb-2014 |
Sascha Haeberling <haeberling@google.com> |
First sweep to clean up unused preference code. Change-Id: I7caa89c8b5cb70824821d7fba5d05fbaadc39a2f
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/CameraSettings.java
rc/com/android/camera/PieController.java
rc/com/android/camera/PreferenceInflater.java
rc/com/android/camera/RecordLocationPreference.java
rc/com/android/camera/VideoModule.java
rc/com/android/camera/ui/ListPrefSettingPopup.java
rc/com/android/camera/ui/MoreSettingPopup.java
rc/com/android/camera/ui/TimeIntervalPopup.java
|
44222ac83933b84f93e4e69691dc2c85c4457803 |
26-Feb-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ie53c8275e902eda9dafb717d4681aa38bd972f92 Auto-generated-cl: translation import
es/values-fi/strings.xml
es/values-ka-rGE/strings.xml
es/values-ms-rMY/strings.xml
es/values-nb/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sw/strings.xml
es/values-tl/strings.xml
|
7bad36b4baf04b5a58bea10f016a696c66ae05c5 |
26-Feb-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Id8f1e6ae069115045a5152304f109b2561a77b31 Auto-generated-cl: translation import
es/values-fi/strings.xml
es/values-ka-rGE/strings.xml
es/values-ms-rMY/strings.xml
es/values-nb/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sw/strings.xml
es/values-tl/strings.xml
|
b82dade76dd940764bfd043a7f7cf19e161c6b7d |
26-Feb-2014 |
Erin Dahlgren <edahlgren@google.com> |
am 5d18769f: Generalize shutter button listeners and add one for mode options. * commit '5d18769f53db81d401488811250570290a73626b': Generalize shutter button listeners and add one for mode options.
|
5d18769f53db81d401488811250570290a73626b |
26-Feb-2014 |
Erin Dahlgren <edahlgren@google.com> |
Generalize shutter button listeners and add one for mode options. Bug: 13099000 Change-Id: Ib0726c70a9e4aa06197550f29360bacb2dda4783
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/ShutterButton.java
rc/com/android/camera/VideoModule.java
rc/com/android/camera/app/CameraAppUI.java
rc/com/android/camera/module/ModuleController.java
rc/com/android/camera/widget/ModeOptionsOverlay.java
|
ec32d995d690c072561e4bfc68195bda214d805e |
26-Feb-2014 |
Erin Dahlgren <edahlgren@google.com> |
am 09a34b12: Merge "Pass Activity to GServices to launch panorama viewer." into gb-ub-photos-denali * commit '09a34b12c8049a6a0f4d09635af6742e3a40e70e': Pass Activity to GServices to launch panorama viewer.
|
09a34b12c8049a6a0f4d09635af6742e3a40e70e |
26-Feb-2014 |
Erin Dahlgren <edahlgren@google.com> |
Merge "Pass Activity to GServices to launch panorama viewer." into gb-ub-photos-denali
|
013ad4e1567f268b8ce2b630075ec2f604ce3da0 |
26-Feb-2014 |
Erin Dahlgren <edahlgren@google.com> |
Pass Activity to GServices to launch panorama viewer. Bug: 13206692 Change-Id: Ie3d76fa7b3fd427d9cd3c1cf283e48173a06f41c
rc/com/android/camera/CameraActivity.java
rc_pd/com/android/camera/util/PhotoSphereHelper.java
|
d99ff2c7076b28e0beea762b5ed9d14d1da7a53e |
26-Feb-2014 |
Angus Kong <shkong@google.com> |
am 73e09f39: Hide action bar upon filmstrip is off position. * commit '73e09f39f7d4075f3c95d20bb229f354211d05c0': Hide action bar upon filmstrip is off position.
|
73e09f39f7d4075f3c95d20bb229f354211d05c0 |
26-Feb-2014 |
Angus Kong <shkong@google.com> |
Hide action bar upon filmstrip is off position. bug:13184003 Change-Id: I6ad2bf2c4d0da45764907d819a5d4651a9887209
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/filmstrip/FilmstripContentPanel.java
rc/com/android/camera/widget/FilmstripLayout.java
|
a6e04167baa1e1c7ded376949e9b330d4b03828d |
26-Feb-2014 |
Angus Kong <shkong@google.com> |
am 7ae25c21: Align progress bar with filmstrip bottom controls. * commit '7ae25c21fefd8b7fd4c4e1c207631f751167cb0a': Align progress bar with filmstrip bottom controls.
|
7ae25c21fefd8b7fd4c4e1c207631f751167cb0a |
25-Feb-2014 |
Angus Kong <shkong@google.com> |
Align progress bar with filmstrip bottom controls. bug:13026663 Change-Id: Ic751bf26475fd27237690678715e399f0d987e82
es/layout/camera_filmstrip.xml
es/layout/filmstrip_bottom_controls.xml
es/values/dimens.xml
es/values/styles.xml
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/app/CameraAppUI.java
rc/com/android/camera/app/FilmstripBottomControls.java
rc/com/android/camera/app/FilmstripBottomPanel.java
|
a690296438e7b103b4e4b5f50098838a0414c406 |
26-Feb-2014 |
Teresa Ko <teresako@google.com> |
Merge "Revert "Add opt-in setting to everglades."" into ub-camera-everglades
|
62753ae94be2ae7c08bf24ebcf1c462975af230f |
10-Feb-2014 |
Angus Kong <shkong@google.com> |
Add camera state in CameraManager implementation 1. Add camera states. 2. Avoid potentially dangerous camera operations according the states. bug:11985910 Change-Id: I2bce5c778077473e07f281053a441097fa71e3fb
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/VideoModule.java
rc/com/android/camera/app/AndroidCameraManagerImpl.java
rc/com/android/camera/app/CameraController.java
rc/com/android/camera/app/CameraManager.java
rc/com/android/camera/app/CameraManagerFactory.java
|
84aa1f86dc22714970862818817165a71495f47c |
26-Feb-2014 |
Erin Dahlgren <edahlgren@google.com> |
am 37452547: Don\'t pass touch events from the mode options to the preview. * commit '374525475747ffe1c102d7b3c3fda989393fa44b': Don't pass touch events from the mode options to the preview.
|
374525475747ffe1c102d7b3c3fda989393fa44b |
26-Feb-2014 |
Erin Dahlgren <edahlgren@google.com> |
Don't pass touch events from the mode options to the preview. Bug: 13099000 Change-Id: I01bbfb335d893848b084542301d50919152fabe5
rc/com/android/camera/widget/ModeOptionsOverlay.java
|
0807b7eda871d2c5832e7650de6835ea5792b4e5 |
26-Feb-2014 |
Teresa Ko <teresako@google.com> |
Revert "Add opt-in setting to everglades." This reverts commit 72e51dbcb943d0de053e60978e6eb3d6c951d635. Change-Id: I595397f4d528e62c69021eaf25f60ebf288b5ab8
es/values/strings.xml
es/xml/camera_preferences.xml
rc/com/android/camera/settings/CameraSettingsActivity.java
rc/com/android/camera/settings/SettingsCache.java
rc/com/android/camera/settings/SettingsManager.java
|
72e51dbcb943d0de053e60978e6eb3d6c951d635 |
25-Feb-2014 |
Teresa Ko <teresako@google.com> |
Add opt-in setting to everglades. Change-Id: I0af5b7faffa29ca9194fe2764024335ff08bb131
es/values/strings.xml
es/xml/camera_preferences.xml
rc/com/android/camera/settings/CameraSettingsActivity.java
rc/com/android/camera/settings/SettingsCache.java
rc/com/android/camera/settings/SettingsManager.java
|
7317559db2798eaf3d1328a0d636a687d16c70c6 |
25-Feb-2014 |
Doris Liu <tianliu@google.com> |
am 9d52fc9e: Disable quick switch * commit '9d52fc9e1a529012de83d1fea415c2fb4cba836c': Disable quick switch
|
9d52fc9e1a529012de83d1fea415c2fb4cba836c |
25-Feb-2014 |
Doris Liu <tianliu@google.com> |
Disable quick switch Bug: 13098335 Change-Id: Ic0e019d0b58234975e2bbd0238d0cb7618afb0e5
rc/com/android/camera/app/CameraAppUI.java
|
0211a39266f3fc03c776f559affa7e4b0f128c2c |
25-Feb-2014 |
Doris Liu <tianliu@google.com> |
am d6cf8e35: Merge "Remove face view from photo module view hierarchy" into gb-ub-photos-denali * commit 'd6cf8e35b2d8d7d3f0721f8c6e2b6581829c452c': Remove face view from photo module view hierarchy
|
d6cf8e35b2d8d7d3f0721f8c6e2b6581829c452c |
25-Feb-2014 |
Doris Liu <tianliu@google.com> |
Merge "Remove face view from photo module view hierarchy" into gb-ub-photos-denali
|
b41d527fe31372a3e11cd6247cd13133de3fdeaf |
25-Feb-2014 |
Erin Dahlgren <edahlgren@google.com> |
am 87069e89: Merge "Support setting the bounds on a ProgressOverlay." into gb-ub-photos-denali * commit '87069e8903495e0272e2ff772884b3bd187c7fff': Support setting the bounds on a ProgressOverlay.
|
87069e8903495e0272e2ff772884b3bd187c7fff |
25-Feb-2014 |
Erin Dahlgren <edahlgren@google.com> |
Merge "Support setting the bounds on a ProgressOverlay." into gb-ub-photos-denali
|
90286f00664262de977ca1e9291abc1b4868ecda |
25-Feb-2014 |
Erin Dahlgren <edahlgren@google.com> |
Support setting the bounds on a ProgressOverlay. Bug: 12650252 Change-Id: Ic91a4716c3dafa9ca5133c3f0eff1a56424d2faa
rc/com/android/camera/ui/ProgressOverlay.java
|
5390ca143fc3c4cc467f37fb2e7537447f00598d |
25-Feb-2014 |
Sascha Haeberling <haeberling@google.com> |
am 94716816: Merge "Use the mode list parent visibility." into gb-ub-photos-denali * commit '947168164ea24087e29630a4c6888a650ed35c59': Use the mode list parent visibility.
|
947168164ea24087e29630a4c6888a650ed35c59 |
25-Feb-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Use the mode list parent visibility." into gb-ub-photos-denali
|
d27ea7be496ae823fa88b98760c1a9d9ce0d554d |
25-Feb-2014 |
Doris Liu <tianliu@google.com> |
Remove face view from photo module view hierarchy TODO: Remove face detection logic if UX does not bring this feature back within 2 months. Bug: 12837314 Change-Id: I9fe7d2d525c2607848f53d9287116cfeca0bd8c4
es/layout/photo_module.xml
rc/com/android/camera/PhotoUI.java
|
b49ab283fe6fce242901a1a09fc2b148b27fe123 |
25-Feb-2014 |
Sascha Haeberling <haeberling@google.com> |
Use the mode list parent visibility. Change-Id: I4a6ba89fc9027d526c60cfaef98b70c6faf0a2c1
rc/com/android/camera/ui/ModeListView.java
|
80642a556dc7a9c389a7534beb5df0c9650a45b9 |
25-Feb-2014 |
Sascha Haeberling <haeberling@google.com> |
am a71aa2a1: Merge "Make visibility support three states." into gb-ub-photos-denali * commit 'a71aa2a1b895b305a6eab7f334a92d8bb0b107f0': Make visibility support three states.
|
a71aa2a1b895b305a6eab7f334a92d8bb0b107f0 |
25-Feb-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Make visibility support three states." into gb-ub-photos-denali
|
8c1a922df154182b53f00c38198db7da0b4feb20 |
25-Feb-2014 |
Sascha Haeberling <haeberling@google.com> |
Make visibility support three states. Bug: 13169154 This will enable us to either stop preview rendering or pause picture taking in certain modes. Change-Id: I28014452ce43effeeaef9638b2f3a3bc42027257
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/CameraModule.java
rc/com/android/camera/VideoModule.java
rc/com/android/camera/module/ModuleController.java
rc/com/android/camera/ui/ModeListView.java
|
87cfe4df5e2bdd8186d40af42f2f008ae1d1fb2f |
25-Feb-2014 |
Erin Dahlgren <edahlgren@google.com> |
am 74913b43: Merge "Implement general upgrade recovery strategies and strict versioning." into gb-ub-photos-denali * commit '74913b43e731dda86745548fd2070788df2a9b58': Implement general upgrade recovery strategies and strict versioning.
|
74913b43e731dda86745548fd2070788df2a9b58 |
25-Feb-2014 |
Erin Dahlgren <edahlgren@google.com> |
Merge "Implement general upgrade recovery strategies and strict versioning." into gb-ub-photos-denali
|
618d2f743c793506719e5be3ae0168bda3e02a01 |
25-Feb-2014 |
Baligh Uddin <baligh@google.com> |
am 30838312: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-denali * commit '30838312a532bfc0f87d94b5d3e9ab8adc03614d': Import translations. DO NOT MERGE
|
30838312a532bfc0f87d94b5d3e9ab8adc03614d |
25-Feb-2014 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-denali
|
202a07533ec357714c6cedbfbddfcc5d8e250fb9 |
25-Feb-2014 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into ub-camera-everglades
|
4569b7089b4bc7ea6949505b7dd3637778011d7c |
24-Feb-2014 |
Erin Dahlgren <edahlgren@google.com> |
Implement general upgrade recovery strategies and strict versioning. Bug: 11984903 Bug: 13165733 Change-Id: I2e7f39778fb185c3276ec35f3cc7afc9bfa5a747
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/settings/SettingsCache.java
rc/com/android/camera/settings/SettingsManager.java
|
c7e3b4d996b3d3006a1ffb061a1aa98c7c70480d |
24-Feb-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Id75fa7845328027842e8945ff7617249667ad60b Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-fa/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-km-rKH/strings.xml
es/values-ko/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mn-rMN/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
850ac1f8176edeeed35b7ac72bb5040ce0128a3c |
24-Feb-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I626b87c1b49c4648826c2d5e99a02f5df63025c8 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-fa/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-km-rKH/strings.xml
es/values-ko/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mn-rMN/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
78a60dba7052adca9f750c9fc282ca30c686356a |
24-Feb-2014 |
Doris Liu <tianliu@google.com> |
am 40653930: Re-order camera modes * commit '40653930f9c381d7f25acc71aa272e2dae5b6fe6': Re-order camera modes
|
40653930f9c381d7f25acc71aa272e2dae5b6fe6 |
24-Feb-2014 |
Doris Liu <tianliu@google.com> |
Re-order camera modes Bug: 13101163 Change-Id: Ibdfb57148a298de601b69c86e124bcb597fdcc09
es/values/arrays.xml
|
9cd6155aeacf74d11097f7a1550719bde8a04af9 |
24-Feb-2014 |
Sascha Haeberling <haeberling@google.com> |
am a62a974a: (-s ours) Merge "Remove SmartCam from Denali. DO NOT MERGE" into gb-ub-photos-denali * commit 'a62a974adc9830190031d324b8fbb45898b4e3c9': Remove SmartCam from Denali. DO NOT MERGE
|
a62a974adc9830190031d324b8fbb45898b4e3c9 |
24-Feb-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Remove SmartCam from Denali. DO NOT MERGE" into gb-ub-photos-denali
|
1ce0345123e91068e17cb3c9ff120bf34dbd3148 |
22-Feb-2014 |
Doris Liu <tianliu@google.com> |
am 6ababe93: Add a pressed state on mode drawer items * commit '6ababe9379ecee4056a415085e28e7eb5e1249bf': Add a pressed state on mode drawer items
|
6ababe9379ecee4056a415085e28e7eb5e1249bf |
21-Feb-2014 |
Doris Liu <tianliu@google.com> |
Add a pressed state on mode drawer items Bug: 13097259 Change-Id: I63ba6a8200d69b451081b3ece8e8b71123b58a6e
es/drawable/mode_icon_highlight.xml
rc/com/android/camera/ui/ModeListView.java
rc/com/android/camera/ui/ModeSelectorItem.java
|
c8071ededeb967812f2122a3c29daea49b89c9c8 |
22-Feb-2014 |
Doris Liu <tianliu@google.com> |
am ab2cfcf7: Use the new blanket asset in secure camera static layout * commit 'ab2cfcf7bfa5969f60f6a84fd27bb7041dde1c45': Use the new blanket asset in secure camera static layout
|
5cb575db0bfab1686af0c379280e3f317f82bbcf |
22-Feb-2014 |
Sascha Haeberling <haeberling@google.com> |
Remove SmartCam from Denali. DO NOT MERGE Change-Id: I94813a13301eb3bcd89eeb96a757763b3e7b34ff
rc/com/android/camera/PhotoModule.java
rc_pd/com/android/camera/util/SmartCameraHelper.java
|
ab2cfcf7bfa5969f60f6a84fd27bb7041dde1c45 |
22-Feb-2014 |
Doris Liu <tianliu@google.com> |
Use the new blanket asset in secure camera static layout Change-Id: I6e579addc29068097bb10b82c6b39b8e37f8a9b3
es/layout/keyguard_widget.xml
|
d9f48fc84115606794de149689680ee912a34fce |
21-Feb-2014 |
Angus Kong <shkong@google.com> |
am 8dc0c487: Merge "Remove support for press and hold to focus." into gb-ub-photos-denali * commit '8dc0c487576d03c5cae3d0e4e609bd9262e2e5a1': Remove support for press and hold to focus.
|
8dc0c487576d03c5cae3d0e4e609bd9262e2e5a1 |
21-Feb-2014 |
Angus Kong <shkong@google.com> |
Merge "Remove support for press and hold to focus." into gb-ub-photos-denali
|
ec4a91ac3a1de45ae93c1683cd53a506bba6ed6f |
21-Feb-2014 |
Angus Kong <shkong@google.com> |
am 8a61374e: Merge "Avoid making wrong filmstrip layout callbacks." into gb-ub-photos-denali * commit '8a61374e37c99bdc6ef6b34b50405b454bc7cb85': Avoid making wrong filmstrip layout callbacks.
|
eaaf56d5ad909bf8d3eb23a2454983e7731e7644 |
20-Feb-2014 |
Angus Kong <shkong@google.com> |
Remove support for press and hold to focus. bug:11985910 Change-Id: Ibf37468236f1483fe622ffa6adfbde71ec21673a
rc/com/android/camera/FocusOverlayManager.java
rc/com/android/camera/PhotoModule.java
|
8a61374e37c99bdc6ef6b34b50405b454bc7cb85 |
21-Feb-2014 |
Angus Kong <shkong@google.com> |
Merge "Avoid making wrong filmstrip layout callbacks." into gb-ub-photos-denali
|
255c27360fd6802e458a0f5963943f9ccb8bfd56 |
21-Feb-2014 |
Sascha Haeberling <haeberling@google.com> |
am 96fe3f0b: Merge "Maybe show release information before sharing certain data types." into gb-ub-photos-denali * commit '96fe3f0b5cddbb13d452933d48f5408f7bb11b48': Maybe show release information before sharing certain data types.
|
96fe3f0b5cddbb13d452933d48f5408f7bb11b48 |
21-Feb-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Maybe show release information before sharing certain data types." into gb-ub-photos-denali
|
7190c6a9018e95ff0c49642442c7a069e16a6a7a |
21-Feb-2014 |
Sascha Haeberling <haeberling@google.com> |
Maybe show release information before sharing certain data types. Bug: 11984630 Change-Id: I22646291c50ae126ffa34ad451fc2969b566ecbc
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/data/PanoramaMetadataLoader.java
rc_pd/com/android/camera/util/ReleaseDialogHelper.java
|
6ae724120504967b1e37f7ae045134444013f00e |
21-Feb-2014 |
Angus Kong <shkong@google.com> |
Avoid making wrong filmstrip layout callbacks. bug:12589076 Change-Id: I755fee94261f983a3172dcef18c93cb01f47dcc0
rc/com/android/camera/widget/FilmstripLayout.java
|
571f275fe3bab7af10738ee43b1aaa593aaa1420 |
21-Feb-2014 |
Sascha Haeberling <haeberling@google.com> |
am 6dc2e724: Merge "Change camera theem to Holo.Light." into gb-ub-photos-denali * commit '6dc2e72424a73a14d95a35310e0b02cd687293f7': Change camera theem to Holo.Light.
|
6dc2e72424a73a14d95a35310e0b02cd687293f7 |
21-Feb-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Change camera theem to Holo.Light." into gb-ub-photos-denali
|
018e1dc0ae89fd43f8e317b9df701be8ea6186cf |
21-Feb-2014 |
Sascha Haeberling <haeberling@google.com> |
Change camera theem to Holo.Light. Bug: 13128236 Change-Id: I63f56ce5f4aee903d0b4d1b5551b04381be1595b
es/values/styles.xml
|
5e7becf4433f8b21b24ec980fbf414c740f635b3 |
21-Feb-2014 |
Angus Kong <shkong@google.com> |
am 43fd6d1e: Merge "Make up-affordance behavior consistent." into gb-ub-photos-denali * commit '43fd6d1e00a1290ec60a54d7b562594bdcc64676': Make up-affordance behavior consistent.
|
43fd6d1e00a1290ec60a54d7b562594bdcc64676 |
21-Feb-2014 |
Angus Kong <shkong@google.com> |
Merge "Make up-affordance behavior consistent." into gb-ub-photos-denali
|
601c8c12a032d863bd4fb072ad8df5b32399be32 |
21-Feb-2014 |
Angus Kong <shkong@google.com> |
Make up-affordance behavior consistent. bug:13026878 Change-Id: I8f547d379a79eb29872d5317df5bd329144d2cc0
rc/com/android/camera/CameraActivity.java
|
6dad5340b6b71682d5648f8c548fe04db839c57f |
21-Feb-2014 |
Sascha Haeberling <haeberling@google.com> |
am 267571a0: Merge "To support Refocus orientation refactoring." into gb-ub-photos-denali * commit '267571a094c55f4d7ebf87180d72e1d5e88b7c31': To support Refocus orientation refactoring.
|
267571a094c55f4d7ebf87180d72e1d5e88b7c31 |
21-Feb-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "To support Refocus orientation refactoring." into gb-ub-photos-denali
|
3938d0a7f7af03399394d12d36875b89def4da2c |
21-Feb-2014 |
Erin Dahlgren <edahlgren@google.com> |
am 0d2ba038: Merge "Show zoom ui on two finger preview touch." into gb-ub-photos-denali * commit '0d2ba0388fc214cc962c8bca7c7c8824bcbf4738': Show zoom ui on two finger preview touch.
|
0d2ba0388fc214cc962c8bca7c7c8824bcbf4738 |
21-Feb-2014 |
Erin Dahlgren <edahlgren@google.com> |
Merge "Show zoom ui on two finger preview touch." into gb-ub-photos-denali
|
a7cbfc04d888624858271facdbf68797c54df8b6 |
14-Feb-2014 |
Sascha Haeberling <haeberling@google.com> |
To support Refocus orientation refactoring. Bug: 13007150 Bug: 12996493 Change-Id: I360d0d0fcf8090d96277cd708bd8d0eb4e188b00
roject.properties
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/VideoModule.java
rc/com/android/camera/app/AppController.java
rc/com/android/camera/util/CameraUtil.java
|
950e8c4b4bc4ee630e8befd1e50508bc6a32ca75 |
21-Feb-2014 |
Angus Kong <shkong@google.com> |
am eb3f62f2: Merge "Tweak the peek animation image size." into gb-ub-photos-denali * commit 'eb3f62f20df0a97d25d2390904631caf32a12d54': Tweak the peek animation image size.
|
eb3f62f20df0a97d25d2390904631caf32a12d54 |
21-Feb-2014 |
Angus Kong <shkong@google.com> |
Merge "Tweak the peek animation image size." into gb-ub-photos-denali
|
c195e7a9208c90d7a55e184d4b2b9c747e9c90f1 |
21-Feb-2014 |
Angus Kong <shkong@google.com> |
Tweak the peek animation image size. bug:12451161 Change-Id: Ie5a8a2911ed4b5ce831331ca7e7600d6d13659b7
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/data/InProgressDataWrapper.java
rc/com/android/camera/data/LocalDataUtil.java
rc/com/android/camera/data/LocalMediaData.java
rc/com/android/camera/data/RotationTask.java
rc/com/android/camera/data/SimpleViewData.java
rc/com/android/camera/filmstrip/ImageData.java
rc/com/android/camera/util/CameraUtil.java
rc/com/android/camera/widget/FilmstripView.java
rc/com/android/camera/widget/PeekView.java
|
3e61c30c6b54d49ad6421456061709c6d1c25e6f |
21-Feb-2014 |
Baligh Uddin <baligh@google.com> |
am 33d4c4a3: (-s ours) am dbc5ddba: (-s ours) am 6d229a72: (-s ours) am fea074ff: (-s ours) am d8b9e39e: (-s ours) am 9d8187cb: (-s ours) Import translations. DO NOT MERGE * commit '33d4c4a38acdda17efd9db693be07bf5532e758b': Import translations. DO NOT MERGE
|
721e562bed02b463ae005d0ba7bbab05ce5c579b |
20-Feb-2014 |
Doris Liu <tianliu@google.com> |
am 948de99e: Dismiss mode drawer when tapped outside * commit '948de99e58b72e815224d4e12761863dfceffae0': Dismiss mode drawer when tapped outside
|
948de99e58b72e815224d4e12761863dfceffae0 |
20-Feb-2014 |
Doris Liu <tianliu@google.com> |
Dismiss mode drawer when tapped outside Change shutter button alpha to disabled alpha when mode drawer is open Bug: 13084332 Bug: 13084982 Change-Id: Ic6f8c0b910e653045b3f8c1c6f22dca3420f6802
es/layout/mode_selector.xml
rc/com/android/camera/ShutterButton.java
rc/com/android/camera/app/CameraAppUI.java
rc/com/android/camera/ui/ModeListView.java
|
33d4c4a38acdda17efd9db693be07bf5532e758b |
20-Feb-2014 |
Baligh Uddin <baligh@google.com> |
am dbc5ddba: (-s ours) am 6d229a72: (-s ours) am fea074ff: (-s ours) am d8b9e39e: (-s ours) am 9d8187cb: (-s ours) Import translations. DO NOT MERGE * commit 'dbc5ddbac09d934b045a51b0b7715a17e88f6188': Import translations. DO NOT MERGE
|
dbc5ddbac09d934b045a51b0b7715a17e88f6188 |
20-Feb-2014 |
Baligh Uddin <baligh@google.com> |
am 6d229a72: (-s ours) am fea074ff: (-s ours) am d8b9e39e: (-s ours) am 9d8187cb: (-s ours) Import translations. DO NOT MERGE * commit '6d229a723d645c5a3fc56e6034c2be80c06a596d': Import translations. DO NOT MERGE
|
b9f9163ecc7b66d91712f8991170dcb800a4a2ca |
20-Feb-2014 |
Baligh Uddin <baligh@google.com> |
am df2618c4: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-denali * commit 'df2618c4c2b56154e182f48384c728c327906e94': Import translations. DO NOT MERGE
|
6d229a723d645c5a3fc56e6034c2be80c06a596d |
20-Feb-2014 |
Baligh Uddin <baligh@google.com> |
am fea074ff: (-s ours) am d8b9e39e: (-s ours) am 9d8187cb: (-s ours) Import translations. DO NOT MERGE * commit 'fea074ffb8f91c9879e61a9985523f111890df65': Import translations. DO NOT MERGE
|
fea074ffb8f91c9879e61a9985523f111890df65 |
20-Feb-2014 |
Baligh Uddin <baligh@google.com> |
am d8b9e39e: (-s ours) am 9d8187cb: (-s ours) Import translations. DO NOT MERGE * commit 'd8b9e39ee80c5e828010c1091e4e77261356b235': Import translations. DO NOT MERGE
|
d8b9e39ee80c5e828010c1091e4e77261356b235 |
20-Feb-2014 |
Baligh Uddin <baligh@google.com> |
am 9d8187cb: (-s ours) Import translations. DO NOT MERGE * commit '9d8187cbdb82e36eae9a42eefda138b6d0925b1f': Import translations. DO NOT MERGE
|
a305154909ba09c44cc812f6cbf05e6870ab9888 |
20-Feb-2014 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into ub-camera-everglades
|
df2618c4c2b56154e182f48384c728c327906e94 |
20-Feb-2014 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-denali
|
b9ae797a8f7c95b74605a7d0f5a5990eec9b16d4 |
20-Feb-2014 |
Angus Kong <shkong@google.com> |
am a303a71f: Merge "A test for media details." into gb-ub-photos-denali * commit 'a303a71ff636535e59bd356bda40e9a324699357': A test for media details.
|
a303a71ff636535e59bd356bda40e9a324699357 |
20-Feb-2014 |
Angus Kong <shkong@google.com> |
Merge "A test for media details." into gb-ub-photos-denali
|
26795a9258c0815ca2a92d2c660438066f001022 |
20-Feb-2014 |
Angus Kong <shkong@google.com> |
A test for media details. Change-Id: If2615de75ed555c34316686de536d3289c834e75
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/data/LocalData.java
rc/com/android/camera/filmstrip/FilmstripController.java
rc/com/android/camera/ui/FilmstripGestureRecognizer.java
rc/com/android/camera/widget/FilmstripLayout.java
rc/com/android/camera/widget/FilmstripView.java
|
67c610f4876a9c7490488cec7318675b8446588b |
20-Feb-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I06a359e3f470346f5db30a9c004ad06b7eaf4d10 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-km-rKH/strings.xml
es/values-ko/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mn-rMN/strings.xml
es/values-ms-rMY/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
9d8187cbdb82e36eae9a42eefda138b6d0925b1f |
20-Feb-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I5f7c2232952457358858fc8d33d06c8c1de19efc Auto-generated-cl: translation import
es/values-km-rKH/strings.xml
|
9c4f3e2b81ec29705149282bcd25886987eb0a35 |
20-Feb-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ie9e11c5ec2c75ad309e71e56a741ab1fc22301a2 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-km-rKH/strings.xml
es/values-ko/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mn-rMN/strings.xml
es/values-ms-rMY/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
b386d8344cde01019f114f474d4e19b70c7de86f |
20-Feb-2014 |
Erin Dahlgren <edahlgren@google.com> |
am 791f211c: Merge "Don\'t show flash mode option if it\'s never supported." into gb-ub-photos-denali * commit '791f211c87d0e15e3264086a5ea75ff9066aa177': Don't show flash mode option if it's never supported.
|
791f211c87d0e15e3264086a5ea75ff9066aa177 |
20-Feb-2014 |
Erin Dahlgren <edahlgren@google.com> |
Merge "Don't show flash mode option if it's never supported." into gb-ub-photos-denali
|
14e7e5f62e738efbb70d4858b237f7dbc2cf8fa9 |
20-Feb-2014 |
Doris Liu <tianliu@google.com> |
am 0868a09e: Merge "Hide focus overlay when exiting a mode" into gb-ub-photos-denali * commit '0868a09ecd0fb17e63efae3b8b3b694bda32ca20': Hide focus overlay when exiting a mode
|
0868a09ecd0fb17e63efae3b8b3b694bda32ca20 |
20-Feb-2014 |
Doris Liu <tianliu@google.com> |
Merge "Hide focus overlay when exiting a mode" into gb-ub-photos-denali
|
c738070feb05f04884300202749978e4463d7e16 |
20-Feb-2014 |
Erin Dahlgren <edahlgren@google.com> |
Show zoom ui on two finger preview touch. Bug: 12114285 Change-Id: I9ab2db57c94eb5070f1c513062c69f3cb118a85f
rc/com/android/camera/ui/PreviewOverlay.java
|
e346fb291bd6209b0167d110e15f58576568f99c |
20-Feb-2014 |
Erin Dahlgren <edahlgren@google.com> |
Don't show flash mode option if it's never supported. The motivation behind this design is that if the camera id preference is cleared on every upgrade, we should be able to obtain the flash support setting before ever switching to front camera. Bug: 12192238 Change-Id: I01dbcf2f614e7359fd456665e58c922b347a46da
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/app/CameraAppUI.java
rc/com/android/camera/settings/SettingsCache.java
rc/com/android/camera/settings/SettingsManager.java
|
0f501026a5a18e81fd10ffe0972561cc26883c26 |
20-Feb-2014 |
Angus Kong <shkong@google.com> |
am b86a02cd: Merge "Filmstrip peek animation." into gb-ub-photos-denali * commit 'b86a02cddc807ac2f7524b786ff3c589cc340353': Filmstrip peek animation.
|
b86a02cddc807ac2f7524b786ff3c589cc340353 |
20-Feb-2014 |
Angus Kong <shkong@google.com> |
Merge "Filmstrip peek animation." into gb-ub-photos-denali
|
af65683681dbbb98063363ee776f5d357a7b5de5 |
19-Feb-2014 |
Doris Liu <tianliu@google.com> |
Hide focus overlay when exiting a mode Bug: 13005220 Change-Id: I48bc32b9137a850aefef43af44537b2c892a74a2
rc/com/android/camera/app/CameraAppUI.java
rc/com/android/camera/ui/FocusOverlay.java
|
0a47eb038a4e59c6d78ff36af6c3e6568746283a |
19-Feb-2014 |
Erin Dahlgren <edahlgren@google.com> |
am 71a74296: Bring back panorama indicator support. * commit '71a742968e6b9efe2f570e2876f67330bfddf8c1': Bring back panorama indicator support.
|
3febe33aaa85e82accee6114fa554066aab39d94 |
19-Feb-2014 |
Ying Wang <wangying@google.com> |
am 4fc082c0: am f88a1cfc: Merge "Build against the NDK for all archs." * commit '4fc082c01984752b89a76dbe91ff30bb5dc4b0e6': Build against the NDK for all archs.
|
4fc082c01984752b89a76dbe91ff30bb5dc4b0e6 |
19-Feb-2014 |
Ying Wang <wangying@google.com> |
am f88a1cfc: Merge "Build against the NDK for all archs." * commit 'f88a1cfcd8da4bf2987c7ceb904b18b1ae6e0980': Build against the NDK for all archs.
|
f88a1cfcd8da4bf2987c7ceb904b18b1ae6e0980 |
19-Feb-2014 |
Ying Wang <wangying@google.com> |
Merge "Build against the NDK for all archs."
|
415d8b2aced5ff89ad64c9d0069eca292abf9b93 |
19-Feb-2014 |
Ying Wang <wangying@google.com> |
Build against the NDK for all archs. Change-Id: I29e85f1cef5680d13e96e10154c101f0ad9ee7c8
ni/Android.mk
|
71a742968e6b9efe2f570e2876f67330bfddf8c1 |
19-Feb-2014 |
Erin Dahlgren <edahlgren@google.com> |
Bring back panorama indicator support. Bug: 13023569 Bug: 12977732 Change-Id: I188a2f1aa7fa70cd0c7a803707c74a9b23f7203b
es/layout/indicators.xml
rc/com/android/camera/widget/IndicatorIconController.java
rc_pd/com/android/camera/util/PhotoSphereHelper.java
|
ba19d22fee62611074ae44566bc210c827e11985 |
19-Feb-2014 |
Doris Liu <tianliu@google.com> |
am c179d4ae: Merge "Change mode drawer text to 16sp" into gb-ub-photos-denali * commit 'c179d4ae5c7ba46f8a198473f812ce252e218d26': Change mode drawer text to 16sp
|
c179d4ae5c7ba46f8a198473f812ce252e218d26 |
19-Feb-2014 |
Doris Liu <tianliu@google.com> |
Merge "Change mode drawer text to 16sp" into gb-ub-photos-denali
|
7f946f00d780c1508d6f3c85800ec8ece36b594e |
19-Feb-2014 |
Doris Liu <tianliu@google.com> |
Change mode drawer text to 16sp Bug: 12994786 Change-Id: Id4c9f1f573f7a19cc5450df599c0d36f7de2f94f
es/layout/mode_selector.xml
|
ae4a15617b55d5822c362620b626e38c729ec860 |
19-Feb-2014 |
Sascha Haeberling <haeberling@google.com> |
am be08ab09: Merge "Install a release dialog at start-up if necessary." into gb-ub-photos-denali * commit 'be08ab09c3f2228e07cace087d200169bbd3958e': Install a release dialog at start-up if necessary.
|
be08ab09c3f2228e07cace087d200169bbd3958e |
19-Feb-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Install a release dialog at start-up if necessary." into gb-ub-photos-denali
|
5ab797359c306419d6959bc223ea69d597efb1cf |
19-Feb-2014 |
Sascha Haeberling <haeberling@google.com> |
am 477d93d6: Merge "Rename Refocus to Lens Blur" into gb-ub-photos-denali * commit '477d93d6c50f1866ba142c2282efa6b8fea5e2c1': Rename Refocus to Lens Blur
|
477d93d6c50f1866ba142c2282efa6b8fea5e2c1 |
19-Feb-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Rename Refocus to Lens Blur" into gb-ub-photos-denali
|
8d0440567936b8f01150d17956af9f4c5c0d66ca |
19-Feb-2014 |
Sascha Haeberling <haeberling@google.com> |
Rename Refocus to Lens Blur Bug: 13095859 Change-Id: I20744aa0297445b78398937abcb517ec7de1e731
es/values/strings.xml
|
e6e019fcb02edbe4a99bb7a4d3d19ecc5ab8179f |
19-Feb-2014 |
Doris Liu <tianliu@google.com> |
am 6514fd91: Merge "Update mode cover icon assets and size" into gb-ub-photos-denali * commit '6514fd911e70b6ee679563ce25300876a719c67a': Update mode cover icon assets and size
|
6514fd911e70b6ee679563ce25300876a719c67a |
19-Feb-2014 |
Doris Liu <tianliu@google.com> |
Merge "Update mode cover icon assets and size" into gb-ub-photos-denali
|
c26a3286fc2b4816a5a077cde313a4908d4fb73b |
19-Feb-2014 |
Sascha Haeberling <haeberling@google.com> |
Install a release dialog at start-up if necessary. Bug: 11984630 Change-Id: I0619c82458b6f2d2dc4c9cbb8fca3a11b75a9ad5
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/settings/SettingsCache.java
rc/com/android/camera/settings/SettingsManager.java
rc_pd/com/android/camera/util/ReleaseDialogHelper.java
|
bb7434f26512f6e9d70627211ca017d1b1dc38ab |
19-Feb-2014 |
Angus Kong <shkong@google.com> |
am ceb24012: Update assets of filmstrip controls * commit 'ceb24012c795d85f9197fd4be7130821fe9ecb61': Update assets of filmstrip controls
|
ceb24012c795d85f9197fd4be7130821fe9ecb61 |
19-Feb-2014 |
Angus Kong <shkong@google.com> |
Update assets of filmstrip controls bug:13027163 Change-Id: I7a19a4ef35358566717e816a85a0ffa77ca7e48a
es/drawable-hdpi/ic_discard_disabled.png
es/drawable-hdpi/ic_discard_normal.png
es/drawable-hdpi/ic_edit_disabled.png
es/drawable-hdpi/ic_edit_normal.png
es/drawable-hdpi/ic_share_disabled.png
es/drawable-hdpi/ic_share_normal.png
es/drawable-mdpi/ic_discard_disabled.png
es/drawable-mdpi/ic_discard_normal.png
es/drawable-mdpi/ic_edit_disabled.png
es/drawable-mdpi/ic_edit_normal.png
es/drawable-mdpi/ic_share_disabled.png
es/drawable-mdpi/ic_share_normal.png
es/drawable-xhdpi/ic_discard_disabled.png
es/drawable-xhdpi/ic_discard_normal.png
es/drawable-xhdpi/ic_edit_disabled.png
es/drawable-xhdpi/ic_edit_normal.png
es/drawable-xhdpi/ic_share_disabled.png
es/drawable-xhdpi/ic_share_normal.png
es/drawable-xxhdpi/ic_discard_disabled.png
es/drawable-xxhdpi/ic_discard_normal.png
es/drawable-xxhdpi/ic_edit_disabled.png
es/drawable-xxhdpi/ic_edit_normal.png
es/drawable-xxhdpi/ic_share_disabled.png
es/drawable-xxhdpi/ic_share_normal.png
es/drawable/ic_menu_edit.xml
es/drawable/ic_menu_share.xml
es/drawable/ic_menu_trash.xml
es/layout/filmstrip_bottom_controls.xml
|
b520b97b89b0cf0389ea00d7e080971628cf6290 |
14-Feb-2014 |
Doris Liu <tianliu@google.com> |
Update mode cover icon assets and size Also increase the fade out duration. Bug: 12967901 Change-Id: I9573b234ad0c9123f5edc6cd40c115897ba14177
es/values/arrays.xml
es/values/dimens.xml
es_p/drawable-hdpi/ic_camera_blanket.png
es_p/drawable-hdpi/ic_pano_blanket.png
es_p/drawable-hdpi/ic_photo_sphere_blanket.png
es_p/drawable-hdpi/ic_refocus_blanket.png
es_p/drawable-hdpi/ic_video_blanket.png
es_p/drawable-mdpi/ic_camera_blanket.png
es_p/drawable-mdpi/ic_pano_blanket.png
es_p/drawable-mdpi/ic_photo_sphere_blanket.png
es_p/drawable-mdpi/ic_refocus_blanket.png
es_p/drawable-mdpi/ic_video_blanket.png
es_p/drawable-xhdpi/ic_camera_blanket.png
es_p/drawable-xhdpi/ic_pano_blanket.png
es_p/drawable-xhdpi/ic_photo_sphere_blanket.png
es_p/drawable-xhdpi/ic_refocus_blanket.png
es_p/drawable-xhdpi/ic_video_blanket.png
es_p/drawable-xxhdpi/ic_camera_blanket.png
es_p/drawable-xxhdpi/ic_pano_blanket.png
es_p/drawable-xxhdpi/ic_photo_sphere_blanket.png
es_p/drawable-xxhdpi/ic_refocus_blanket.png
es_p/drawable-xxhdpi/ic_video_blanket.png
rc/com/android/camera/app/CameraAppUI.java
rc/com/android/camera/ui/ModeTransitionView.java
rc/com/android/camera/util/CameraUtil.java
|
4a0a4c59a5f2f521c017fc17a12263cf2fcb4850 |
19-Feb-2014 |
Erin Dahlgren <edahlgren@google.com> |
am 7785b26b: Merge "Support panorama orientation toggle in mode options." into gb-ub-photos-denali * commit '7785b26b493b315da0a31c4a0a334d1d891ea9f4': Support panorama orientation toggle in mode options.
|
7785b26b493b315da0a31c4a0a334d1d891ea9f4 |
19-Feb-2014 |
Erin Dahlgren <edahlgren@google.com> |
Merge "Support panorama orientation toggle in mode options." into gb-ub-photos-denali
|
3fdb3f406848bf9b7ba3b13537e755dca4cd3811 |
18-Feb-2014 |
Spike Sprague <spikuru@google.com> |
am 6fc361e5: Merge "adding larger confirm button assets" into gb-ub-photos-denali * commit '6fc361e520896a136458c27095307345cb0a63d1': adding larger confirm button assets
|
6fc361e520896a136458c27095307345cb0a63d1 |
18-Feb-2014 |
Spike Sprague <spikuru@google.com> |
Merge "adding larger confirm button assets" into gb-ub-photos-denali
|
0748f083df4d0f53fc8d388facea3f2141e7fcf8 |
18-Feb-2014 |
Spike Sprague <spikuru@google.com> |
adding larger confirm button assets bug: 12969738 Change-Id: Ib65d26580fe86c909a4f8929bc440651e8348da4
es/drawable-hdpi/ic_confirm_disabled.png
es/drawable-hdpi/ic_confirm_normal.png
es/drawable-mdpi/ic_confirm_disabled.png
es/drawable-mdpi/ic_confirm_normal.png
es/drawable-xhdpi/ic_confirm_disabled.png
es/drawable-xhdpi/ic_confirm_normal.png
es/drawable-xxhdpi/ic_confirm_disabled.png
es/drawable-xxhdpi/ic_confirm_normal.png
|
a6fb9d2c1bc0a8bda37327b24414b09bf7656a28 |
18-Feb-2014 |
Doris Liu <tianliu@google.com> |
am 5842607d: Change gear icon background and implement pressed state * commit '5842607d1b9ec2b5e751a8aaf43ff97cc3f85d22': Change gear icon background and implement pressed state
|
5842607d1b9ec2b5e751a8aaf43ff97cc3f85d22 |
15-Feb-2014 |
Doris Liu <tianliu@google.com> |
Change gear icon background and implement pressed state Bug: 13004843 Bug: 13005562 Change-Id: I18b44283bb337ca0bb3eb4aae923398a8ac4bfbb
es/drawable/settings_gear_background.xml
es/drawable/settings_gear_background_normal.xml
es/drawable/settings_gear_background_pressed.xml
es/layout/mode_list_layout.xml
es/values/colors.xml
rc/com/android/camera/ui/ModeListView.java
|
b9c0335cb226a00971f05c521d34b3c21b921a56 |
18-Feb-2014 |
Spike Sprague <spikuru@google.com> |
am 1d4fe644: new minumum bottom bar height * commit '1d4fe64441b8384b3fbeed545f66675a16735074': new minumum bottom bar height
|
1d4fe64441b8384b3fbeed545f66675a16735074 |
18-Feb-2014 |
Spike Sprague <spikuru@google.com> |
new minumum bottom bar height bug: 12014742 Change-Id: I1761591c26eff716d30c824f157f7a4dbce7f0d7
es/values/dimens.xml
|
f80ac9ee5c66671c3a77ac6628fefc86cd39d57e |
18-Feb-2014 |
Erin Dahlgren <edahlgren@google.com> |
Support panorama orientation toggle in mode options. Bug: 12977732 Change-Id: I945d53e1f0a6e3ff4e831c9907936f4d4456def6
es/layout/mode_options_bottombar.xml
rc/com/android/camera/ButtonManager.java
rc/com/android/camera/MultiToggleImageButton.java
rc/com/android/camera/app/CameraAppUI.java
rc/com/android/camera/settings/SettingsManager.java
rc_pd/com/android/camera/util/PhotoSphereHelper.java
|
5052117cc429d85cf446421ca74859f4365747d3 |
18-Jan-2014 |
Angus Kong <shkong@google.com> |
Filmstrip peek animation. First version. bug:12451161 Change-Id: Ie49314569bf607efd9220977ad5ffb1ca26d161c
es/layout/activity_main.xml
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/app/CameraAppUI.java
rc/com/android/camera/data/CameraDataAdapter.java
rc/com/android/camera/data/LocalDataAdapter.java
rc/com/android/camera/data/LocalDataUtil.java
rc/com/android/camera/data/LocalMediaData.java
rc/com/android/camera/widget/FilmstripLayout.java
rc/com/android/camera/widget/PeekView.java
|
f534fa274544fd3e53668cffece791b620245c50 |
18-Feb-2014 |
Baligh Uddin <baligh@google.com> |
am 4bf57877: (-s ours) Import translations. DO NOT MERGE * commit '4bf57877b1a546fbc07f84834826935f50dbb165': Import translations. DO NOT MERGE
|
81c719995479d747cc8eae593f325f1785d5b38e |
18-Feb-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ifc52a4d06485bcd1ae771176e1312f8d20f924c1 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-km-rKH/strings.xml
es/values-ko/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mn-rMN/strings.xml
es/values-ms-rMY/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
4bf57877b1a546fbc07f84834826935f50dbb165 |
18-Feb-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: If537fa869c69077034d7c87310972061f703b25b Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-km-rKH/strings.xml
es/values-ko/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mn-rMN/strings.xml
es/values-ms-rMY/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
de68364bf8e003886eae0a92a15914aa7390b681 |
14-Feb-2014 |
Erin Dahlgren <edahlgren@google.com> |
am 9ec6c49e: Rotate three dots in landscape to make position sticky. * commit '9ec6c49e78715c63d9df71fa184761e47639e929': Rotate three dots in landscape to make position sticky.
|
9ec6c49e78715c63d9df71fa184761e47639e929 |
14-Feb-2014 |
Erin Dahlgren <edahlgren@google.com> |
Rotate three dots in landscape to make position sticky. Bug: 12369666 Change-Id: Iae8181c6656efce9de6701a4faf254be8d9396f7
es/layout/mode_options_bottombar.xml
rc/com/android/camera/widget/ModeOptionsOverlay.java
|
dcea5abdafe0a0f714602d953f4a685c565360c2 |
14-Feb-2014 |
Erin Dahlgren <edahlgren@google.com> |
am 0dfec639: Merge "Make grid lines more transparent to fake blending." into gb-ub-photos-denali * commit '0dfec63991916549efee10a3663de4c2afce2948': Make grid lines more transparent to fake blending.
|
8c5208b4e2219ed5408b140ba824f154eecf8bae |
14-Feb-2014 |
Sascha Haeberling <haeberling@google.com> |
am f5f1a1b6: Merge "Add Licenses Activity support." into gb-ub-photos-denali * commit 'f5f1a1b63630e9512801412ef32a6cda7b227a42': Add Licenses Activity support.
|
0dfec63991916549efee10a3663de4c2afce2948 |
14-Feb-2014 |
Erin Dahlgren <edahlgren@google.com> |
Merge "Make grid lines more transparent to fake blending." into gb-ub-photos-denali
|
f5f1a1b63630e9512801412ef32a6cda7b227a42 |
14-Feb-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Add Licenses Activity support." into gb-ub-photos-denali
|
70a89e89e2a3dda927935a69d76ae83570d0f6e3 |
14-Feb-2014 |
Sascha Haeberling <haeberling@google.com> |
am 818e1f17: Merge "Settings Activity needs existant label." into gb-ub-photos-denali * commit '818e1f174cf7e1d77e9e594126d234fe6ad8c8b1': Settings Activity needs existant label.
|
8806788b5e5433a132794239853dc161b64ef66d |
14-Feb-2014 |
Erin Dahlgren <edahlgren@google.com> |
Make grid lines more transparent to fake blending. Bug: 12970319 Change-Id: I4f460d704d0a5f43bb2f5e92df63beab259e3d2f
es/values/colors.xml
|
818e1f174cf7e1d77e9e594126d234fe6ad8c8b1 |
14-Feb-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Settings Activity needs existant label." into gb-ub-photos-denali
|
2553b7a74ca3cee7e55d8c29cc623522739074fb |
14-Feb-2014 |
Erin Dahlgren <edahlgren@google.com> |
am cb87251c: Merge "Remove grid lines indicator." into gb-ub-photos-denali * commit 'cb87251c72cf90bea9e05bcecb91fbcb743d250b': Remove grid lines indicator.
|
ced186e128dfd38f94ac414930ce38f1c6c4ecfc |
14-Feb-2014 |
Doris Liu <tianliu@google.com> |
am 537c8a92: Do not hide mode drawer when settings button is clicked * commit '537c8a92385476aac360e41ad0306001ad73974c': Do not hide mode drawer when settings button is clicked
|
cb87251c72cf90bea9e05bcecb91fbcb743d250b |
14-Feb-2014 |
Erin Dahlgren <edahlgren@google.com> |
Merge "Remove grid lines indicator." into gb-ub-photos-denali
|
a2d797bfe915ce414e4e90a2346aa44d4286e3f0 |
14-Feb-2014 |
Erin Dahlgren <edahlgren@google.com> |
Remove grid lines indicator. Bug: 12990795 Change-Id: Ibc25050523a0ea61cb6ec000d5dae02755a31016
es/layout/indicators.xml
rc/com/android/camera/widget/IndicatorIconController.java
|
537c8a92385476aac360e41ad0306001ad73974c |
14-Feb-2014 |
Doris Liu <tianliu@google.com> |
Do not hide mode drawer when settings button is clicked Change-Id: I4eefdbca124ee3656913877302cf32d32a6e9ec1
rc/com/android/camera/ui/ModeListView.java
|
1ee6869a08d6622e3c1c7cf710754e303faa77b5 |
14-Feb-2014 |
Sascha Haeberling <haeberling@google.com> |
Settings Activity needs existant label. Bug: 13016139 Change-Id: Iafa57e6385a39959fb18a674d5b030bd59a9104f
ndroidManifest.xml
|
cccd5023409b7d5185c26696e34ddf57226d5c17 |
14-Feb-2014 |
Sascha Haeberling <haeberling@google.com> |
Add Licenses Activity support. Bug: 13018845 Change-Id: I195d19da5430aa1c9ced068931be69d48d95efc0
es/values/strings.xml
es/xml/camera_preferences.xml
rc/com/android/camera/settings/CameraSettingsActivity.java
rc_pd/com/android/camera/util/SettingsHelper.java
|
2cd81f3c1fa615ebba00235fbe3810e1e0e868f7 |
14-Feb-2014 |
Spike Sprague <spikuru@google.com> |
am 389ed60d: removing level 1 button backround circles * commit '389ed60d8d58485df14c340649a1e24d12f7ae61': removing level 1 button backround circles
|
389ed60d8d58485df14c340649a1e24d12f7ae61 |
13-Feb-2014 |
Spike Sprague <spikuru@google.com> |
removing level 1 button backround circles Change-Id: I4ae7eae6ad80288f7113ad0480adc60c92c6c9a2
es/drawable/ic_flash_auto.xml
es/drawable/ic_flash_off.xml
es/drawable/ic_flash_on.xml
es/drawable/ic_grid_off.xml
es/drawable/ic_grid_on.xml
es/drawable/ic_hdr_off.xml
es/drawable/ic_hdr_on.xml
es/drawable/ic_hdr_plus_off.xml
es/drawable/ic_hdr_plus_on.xml
es/drawable/ic_refocus.xml
es/drawable/ic_refocus_off.xml
es/drawable/ic_switch_camera_back.xml
es/drawable/ic_switch_camera_front.xml
|
5d9f17010cd3486da21e71735cd0f875c16ebb3b |
14-Feb-2014 |
Doris Liu <tianliu@google.com> |
am d849d2ba: Merge "Hide focus ring when auto focusing in camera and video" into gb-ub-photos-denali * commit 'd849d2ba5f3d4ec6773d87dd16a89833a86a7856': Hide focus ring when auto focusing in camera and video
|
7bbb5af5a1e2c9c4885775184e748dc7e303cea6 |
14-Feb-2014 |
Spike Sprague <spikuru@google.com> |
am a84a728d: doubling padding on intent capture review cancel and retake buttons * commit 'a84a728d17c439d83a6ebd78e3e54b8480804600': doubling padding on intent capture review cancel and retake buttons
|
d849d2ba5f3d4ec6773d87dd16a89833a86a7856 |
14-Feb-2014 |
Doris Liu <tianliu@google.com> |
Merge "Hide focus ring when auto focusing in camera and video" into gb-ub-photos-denali
|
a84a728d17c439d83a6ebd78e3e54b8480804600 |
13-Feb-2014 |
Spike Sprague <spikuru@google.com> |
doubling padding on intent capture review cancel and retake buttons bug: 13006473 Change-Id: I881cc714c6a0fe9b1e4eebca123b0873f47a837f
es/layout/bottom_bar_contents.xml
rc/com/android/camera/ui/TopRightWeightedLayout.java
|
10a035c93e2cb3ed65f59258fa4d0aca89555bcd |
13-Feb-2014 |
Doris Liu <tianliu@google.com> |
Hide focus ring when auto focusing in camera and video Bug: 12467152 Change-Id: If3c44f6b424d9796a937387d48e3dfd0dd161182
rc/com/android/camera/FocusOverlayManager.java
rc/com/android/camera/ui/FocusOverlay.java
|
fe04865a800397c2b9fc40e36e51a1833e082648 |
13-Feb-2014 |
Alan Newberger <alann@google.com> |
am 653be9be: migrate secure cover to neutral background * commit '653be9be1f66ad6d14b2c45e6283c68aeb3216a1': migrate secure cover to neutral background
|
653be9be1f66ad6d14b2c45e6283c68aeb3216a1 |
13-Feb-2014 |
Alan Newberger <alann@google.com> |
migrate secure cover to neutral background screen covers were migrated to use a neutral background, but the static lockscreen cover was not updated. fixing here. Bug: 12954790 Change-Id: I352925959307d2622fce5d1af8374ff8a9e2bb27
es/layout/keyguard_widget.xml
|
ef026a7aed1ee5d050ddc40112b418e5fec5ad7f |
13-Feb-2014 |
Baligh Uddin <baligh@google.com> |
am 12c9e155: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-denali * commit '12c9e155a1070d026a9e69f1706c4acd289d9eec': Import translations. DO NOT MERGE
|
12c9e155a1070d026a9e69f1706c4acd289d9eec |
13-Feb-2014 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-denali
|
4db700067d8b0319bf9e81f657a5ee7b6a4e11ee |
13-Feb-2014 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into ub-camera-everglades
|
90d9f618072b2e2da93d8d08326d4558059ef25b |
13-Feb-2014 |
Doris Liu <tianliu@google.com> |
am 8b6c3e04: Merge "Center mode drawer in uncovered preview" into gb-ub-photos-denali * commit '8b6c3e04857a209e5a2e55ef837f34d9e8abc111': Center mode drawer in uncovered preview
|
8b6c3e04857a209e5a2e55ef837f34d9e8abc111 |
13-Feb-2014 |
Doris Liu <tianliu@google.com> |
Merge "Center mode drawer in uncovered preview" into gb-ub-photos-denali
|
e7e0c028d568c1a4c3e88ed75411b8b41c5aec69 |
12-Feb-2014 |
Doris Liu <tianliu@google.com> |
Center mode drawer in uncovered preview Also align the mode drawer to the left edge of the preview Bug: 12974095 Bug: 12971043 Change-Id: Ic7b9cb95352cba52d3ccf6c09667476f2ea04d69
es/layout/mode_list_layout.xml
rc/com/android/camera/app/CameraAppUI.java
rc/com/android/camera/ui/ModeListView.java
|
a456f23cdc7afeb8a8876495bb4450c414a91cbf |
12-Feb-2014 |
Erin Dahlgren <edahlgren@google.com> |
am c919ef37: Merge "Separate button references now that options are centered." into gb-ub-photos-denali * commit 'c919ef37fd3b8c17ebbcfc2107da0a7cb52a0878': Separate button references now that options are centered.
|
c919ef37fd3b8c17ebbcfc2107da0a7cb52a0878 |
12-Feb-2014 |
Erin Dahlgren <edahlgren@google.com> |
Merge "Separate button references now that options are centered." into gb-ub-photos-denali
|
ce020e6f5174986d149ae16edea2fccf8778174a |
12-Feb-2014 |
Erin Dahlgren <edahlgren@google.com> |
am 26b02441: Hide mode options overlay during video capture. * commit '26b024414efe17ca1afd9a2acfb77847d6c301df': Hide mode options overlay during video capture.
|
e17934722db4faa1bcf7f1b872436b779074787e |
12-Feb-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ib0996ce1a860bf638b9618ccdd6e0179844e1943 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-km-rKH/strings.xml
es/values-ko/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mn-rMN/strings.xml
es/values-ms-rMY/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
435a627eaf4ec143a7d1b93849ecdec24cb6cfae |
12-Feb-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ie024aa9141305d63354314b81474e32c1cf56568 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-km-rKH/strings.xml
es/values-ko/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mn-rMN/strings.xml
es/values-ms-rMY/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
26b024414efe17ca1afd9a2acfb77847d6c301df |
12-Feb-2014 |
Erin Dahlgren <edahlgren@google.com> |
Hide mode options overlay during video capture. Bug: 12976883 Change-Id: Ie832ebfaab74c80d1af45a7ca0ae853ebf179048
rc/com/android/camera/VideoModule.java
|
e22f526a64b242c1617c8f6f5d2b9abd5ab63940 |
12-Feb-2014 |
Seth Raphael <magicseth@google.com> |
am c893312b: Merge "Give Smart Camera a signal to start" into gb-ub-photos-denali * commit 'c893312b7639d1e9c9c73e29bbb4470e8b8147e3': Give Smart Camera a signal to start
|
0c3350d395eff01a05c9da04f57fefae9ef62d51 |
12-Feb-2014 |
Seth Raphael <magicseth@google.com> |
am e8855fae: Merge "Swap in new focus ring assets and increase the size" into gb-ub-photos-denali * commit 'e8855fae23c7efb6ac091a78ef96feaf542a42d3': Swap in new focus ring assets and increase the size
|
c893312b7639d1e9c9c73e29bbb4470e8b8147e3 |
12-Feb-2014 |
Seth Raphael <magicseth@google.com> |
Merge "Give Smart Camera a signal to start" into gb-ub-photos-denali
|
3083642a424b74e8f7b898f26a045f438edfa042 |
06-Feb-2014 |
Seth Raphael <magicseth@google.com> |
Give Smart Camera a signal to start Change-Id: I1b31d4cbf81a5865ef0807b07df0f644fa871247
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/CameraModule.java
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/module/ModuleController.java
|
e8855fae23c7efb6ac091a78ef96feaf542a42d3 |
12-Feb-2014 |
Seth Raphael <magicseth@google.com> |
Merge "Swap in new focus ring assets and increase the size" into gb-ub-photos-denali
|
046ed5f291f035db253ec0336f2e53e34df3d305 |
12-Feb-2014 |
Doris Liu <tianliu@google.com> |
Swap in new focus ring assets and increase the size Bug: 12954917 Change-Id: I1d9dda5033a5b80bdfa331c161115f237c1dc895
es/drawable-hdpi/focus_ring_touch_inner.png
es/drawable-hdpi/focus_ring_touch_outer.png
es/drawable-mdpi/focus_ring_touch_inner.png
es/drawable-mdpi/focus_ring_touch_outer.png
es/drawable-xhdpi/focus_ring_touch_inner.png
es/drawable-xhdpi/focus_ring_touch_outer.png
es/drawable-xxhdpi/focus_ring_touch_inner.png
es/drawable-xxhdpi/focus_ring_touch_outer.png
es/values/dimens.xml
|
a9ceaf76b72cb4b499d3d9d90f979bae93bd593d |
12-Feb-2014 |
Erin Dahlgren <edahlgren@google.com> |
Separate button references now that options are centered. Bug: 12976464 Change-Id: I8f492f4a6f243cb986cd1fee7b0f284c3020e8d4
es/layout/mode_options_bottombar.xml
rc/com/android/camera/ButtonManager.java
rc/com/android/camera/app/CameraAppUI.java
|
79c56d93266459310a3f3e3b26ee96b90f2ae35c |
12-Feb-2014 |
Spike Sprague <spikuru@google.com> |
am c4284574: Merge "new intent bottom bar ux" into gb-ub-photos-denali * commit 'c428457470c382ec8ccb1a2a41421e814a129431': new intent bottom bar ux
|
c428457470c382ec8ccb1a2a41421e814a129431 |
12-Feb-2014 |
Spike Sprague <spikuru@google.com> |
Merge "new intent bottom bar ux" into gb-ub-photos-denali
|
4a1219127cd2cf57da06afcd26bf692b622c13e0 |
12-Feb-2014 |
Angus Kong <shkong@google.com> |
am ac53715b: Invalidate background drawable of filmstrip layout * commit 'ac53715b1ca6704eff7e1142d2d3896cc91b8424': Invalidate background drawable of filmstrip layout
|
ac53715b1ca6704eff7e1142d2d3896cc91b8424 |
12-Feb-2014 |
Angus Kong <shkong@google.com> |
Invalidate background drawable of filmstrip layout bug:12974357 Change-Id: I4e0aaf470268e92274ee48d3045128876181577f
es/layout/camera_filmstrip.xml
rc/com/android/camera/widget/FilmstripLayout.java
|
1d346bc4df3d0258ee9db30c7232440ed38ee70c |
12-Feb-2014 |
Spike Sprague <spikuru@google.com> |
new intent bottom bar ux bug: 12969738 Change-Id: I938a7266a71ed6a6eb4cf3e8a0153d938df11e1f
es/drawable-hdpi/ic_confirm_disabled.png
es/drawable-hdpi/ic_confirm_normal.png
es/drawable-mdpi/ic_confirm_disabled.png
es/drawable-mdpi/ic_confirm_normal.png
es/drawable-xhdpi/ic_confirm_disabled.png
es/drawable-xhdpi/ic_confirm_normal.png
es/drawable-xxhdpi/ic_confirm_disabled.png
es/drawable-xxhdpi/ic_confirm_normal.png
es/drawable/ic_back.xml
es/drawable/ic_cancel.xml
es/drawable/ic_confirm.xml
es/layout/bottom_bar_contents.xml
rc/com/android/camera/ui/TopRightWeightedLayout.java
|
089123bc4a1fd11fe3dd54593aefc34fed50483e |
12-Feb-2014 |
Doris Liu <tianliu@google.com> |
am a45d9f7f: Merge "Add settings entry point into mode switcher" into gb-ub-photos-denali * commit 'a45d9f7f11e1e6917af811faf4c51008cf1969c1': Add settings entry point into mode switcher
|
a45d9f7f11e1e6917af811faf4c51008cf1969c1 |
12-Feb-2014 |
Doris Liu <tianliu@google.com> |
Merge "Add settings entry point into mode switcher" into gb-ub-photos-denali
|
9d264309a341c52601bdccdeff6647e0ce58c31f |
11-Feb-2014 |
Doris Liu <tianliu@google.com> |
Add settings entry point into mode switcher Bug: 12963148 Bug: 12964884 Change-Id: I11b45037abe1716d89fe723170284c61fbb33a87
es/drawable-hdpi/ic_settings_normal.png
es/drawable-mdpi/ic_settings_normal.png
es/drawable-xhdpi/ic_settings_normal.png
es/drawable-xxhdpi/ic_settings_normal.png
es/layout/mode_list_layout.xml
es/values/dimens.xml
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/app/AppController.java
rc/com/android/camera/app/CameraAppUI.java
rc/com/android/camera/ui/ModeListView.java
rc/com/android/camera/widget/SettingsButton.java
|
cca4bba995de3a0b3293e5963104bb5209950f0c |
12-Feb-2014 |
Angus Kong <shkong@google.com> |
am 3cd3d046: Merge "Use ImageView as background for filmstrip layout." into gb-ub-photos-denali * commit '3cd3d0460c87754c1f76da396cde609bcae27ee9': Use ImageView as background for filmstrip layout.
|
3cd3d0460c87754c1f76da396cde609bcae27ee9 |
12-Feb-2014 |
Angus Kong <shkong@google.com> |
Merge "Use ImageView as background for filmstrip layout." into gb-ub-photos-denali
|
2e090667b643a03c45033231399ec70d36b5b2e8 |
12-Feb-2014 |
Angus Kong <shkong@google.com> |
Use ImageView as background for filmstrip layout. This is a workaround. bug:12974357 Change-Id: I7e3601acddb623499776d689575bafb8f8a181d6
es/layout/camera_filmstrip.xml
rc/com/android/camera/widget/FilmstripLayout.java
|
ab064bef1cc71f5a4d711c475b4256fbc7e07798 |
12-Feb-2014 |
Doris Liu <tianliu@google.com> |
am 99d4ff96: Merge "Update focus ring indicator with new assets." into gb-ub-photos-denali * commit '99d4ff969ff015b22a2ec19b02b14694f7049198': Update focus ring indicator with new assets.
|
99d4ff969ff015b22a2ec19b02b14694f7049198 |
12-Feb-2014 |
Doris Liu <tianliu@google.com> |
Merge "Update focus ring indicator with new assets." into gb-ub-photos-denali
|
c5d230b407a4e8cbc029f1eaeb5f759f8ae2d0a9 |
12-Feb-2014 |
Doris Liu <tianliu@google.com> |
Update focus ring indicator with new assets. Bug: 12963258 Change-Id: I8f399aec05c2064b0b6dac0fc2e6fc31b68ca3ad
es/drawable-hdpi/focus_ring_touch_inner.png
es/drawable-hdpi/focus_ring_touch_outer.png
es/drawable-mdpi/focus_ring_touch_inner.png
es/drawable-mdpi/focus_ring_touch_outer.png
es/drawable-xhdpi/focus_ring_touch_inner.png
es/drawable-xhdpi/focus_ring_touch_outer.png
es/drawable-xxhdpi/focus_ring_touch_inner.png
es/drawable-xxhdpi/focus_ring_touch_outer.png
es/drawable/focus.png
es/drawable/focus_outer_ring.xml
es/values/dimens.xml
rc/com/android/camera/ui/FocusOverlay.java
|
9812206a5212b786ca1595c26adbddb2feabeee8 |
11-Feb-2014 |
Spike Sprague <spikuru@google.com> |
am 713c3cad: Merge "fixing video mode stop button (too big? not anymore)" into gb-ub-photos-denali * commit '713c3cad6358aa9bc961cded929fa2b20f682bc0': fixing video mode stop button (too big? not anymore)
|
713c3cad6358aa9bc961cded929fa2b20f682bc0 |
11-Feb-2014 |
Spike Sprague <spikuru@google.com> |
Merge "fixing video mode stop button (too big? not anymore)" into gb-ub-photos-denali
|
b0642b8b452aceebd7c9ce30502bdf5660d492f7 |
11-Feb-2014 |
Baligh Uddin <baligh@google.com> |
am 94599ebb: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-denali * commit '94599ebb6f581372442013e542556e4573a5fa6c': Import translations. DO NOT MERGE
|
29ac6316e3cdae01c8e40de6c7843446ec399f96 |
11-Feb-2014 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into ub-camera-everglades
|
94599ebb6f581372442013e542556e4573a5fa6c |
11-Feb-2014 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-denali
|
7c585bef83ecc3b46f68cefca5ffdf86108166a0 |
11-Feb-2014 |
Doris Liu <tianliu@google.com> |
am af6c1ef8: Merge "Move photosphere icon assets to protected res dir" into gb-ub-photos-denali * commit 'af6c1ef8b0ff460c9f8a9945e44a3102329401c0': Move photosphere icon assets to protected res dir
|
af6c1ef8b0ff460c9f8a9945e44a3102329401c0 |
11-Feb-2014 |
Doris Liu <tianliu@google.com> |
Merge "Move photosphere icon assets to protected res dir" into gb-ub-photos-denali
|
53cdde39df5009bfa16b9c3104fcf9e05d6cdf0c |
11-Feb-2014 |
Spike Sprague <spikuru@google.com> |
fixing video mode stop button (too big? not anymore) bug: 12970650 Change-Id: Idf22205919b295c0ca51beed93a187da11a327ed
es/drawable/ic_stop.xml
rc/com/android/camera/VideoModule.java
|
40d40c8023b2b77bf44861c624f9abf9855afeb7 |
11-Feb-2014 |
Doris Liu <tianliu@google.com> |
Move photosphere icon assets to protected res dir Bug: 12963334 Change-Id: I6b55564971e0db0fab7eed53ca033b4602acb8ed
es/drawable-hdpi/ic_photo_sphere_normal.png
es/drawable-mdpi/ic_photo_sphere_normal.png
es/drawable-xhdpi/ic_photo_sphere_normal.png
es/drawable-xxhdpi/ic_photo_sphere_normal.png
es_p/drawable-hdpi/ic_photo_sphere_normal.png
es_p/drawable-mdpi/ic_photo_sphere_normal.png
es_p/drawable-xhdpi/ic_photo_sphere_normal.png
es_p/drawable-xxhdpi/ic_photo_sphere_normal.png
|
13966ab7377d0a32814cf0767d9fe4fd3e3e8362 |
11-Feb-2014 |
Erin Dahlgren <edahlgren@google.com> |
am 04f4e6df: Add 6dp margins around mode options. * commit '04f4e6dfe3345f53b526a4a3f10ae549885afea1': Add 6dp margins around mode options.
|
04f4e6dfe3345f53b526a4a3f10ae549885afea1 |
11-Feb-2014 |
Erin Dahlgren <edahlgren@google.com> |
Add 6dp margins around mode options. Bug: 12954602 Change-Id: I3652fc62987a46626e198d5da694d7972be68547
es/values/styles.xml
|
63d87797929cf4c1fb4824f32f5b491c27e6d37c |
11-Feb-2014 |
Spike Sprague <spikuru@google.com> |
am 372c609a: Merge "min / max bottom bar height logic" into gb-ub-photos-denali * commit '372c609a2cd0c5aa2e42bcc68df3440d70daa114': min / max bottom bar height logic
|
372c609a2cd0c5aa2e42bcc68df3440d70daa114 |
11-Feb-2014 |
Spike Sprague <spikuru@google.com> |
Merge "min / max bottom bar height logic" into gb-ub-photos-denali
|
94c9b43061bee072a2322a2001d27e51dae023db |
06-Jan-2014 |
Spike Sprague <spikuru@google.com> |
min / max bottom bar height logic bug: 12668831 Change-Id: Iadccd4c150a37955b0c612539edb6b747f87acbb
rc/com/android/camera/TextureViewHelper.java
rc/com/android/camera/app/CameraAppUI.java
rc/com/android/camera/ui/BottomBar.java
|
f8d1e50ddcaa3c6835f89fd91d721b0aa7fbeaa7 |
11-Feb-2014 |
Doris Liu <tianliu@google.com> |
am dfe96eac: New focus indicator for touch to focus * commit 'dfe96eac810876659f831d2c9054f33b698916e7': New focus indicator for touch to focus
|
dfe96eac810876659f831d2c9054f33b698916e7 |
11-Feb-2014 |
Doris Liu <tianliu@google.com> |
New focus indicator for touch to focus Bug: 12954917 Change-Id: I103c1071c81c48bbbd3a90cce2e2a39df4bd633e
es/drawable/focus_outer_ring.xml
es/values/colors.xml
es/values/dimens.xml
rc/com/android/camera/ui/FocusOverlay.java
|
3ab5a4ac9bf568934dcfb625e86cc85c36d6e619 |
11-Feb-2014 |
Sascha Haeberling <haeberling@google.com> |
am 1b1583ee: Merge "New Settings UI and video quality selection logic." into gb-ub-photos-denali * commit '1b1583ee73c46ecdce8d8d432c39f8f7697ac4f1': New Settings UI and video quality selection logic.
|
1b1583ee73c46ecdce8d8d432c39f8f7697ac4f1 |
11-Feb-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "New Settings UI and video quality selection logic." into gb-ub-photos-denali
|
de30323ee0598ed0e1c8a1ab942c3e16160062d3 |
07-Feb-2014 |
Sascha Haeberling <haeberling@google.com> |
New Settings UI and video quality selection logic. Bug: 12467965 Bug: 12935910 Bug: 12575084 Implements the settings as a proper activity/fragment. Also cleans up some of the old logic we had for handling and displaying settings. Also has the new L/M/S logic for video quality. Change-Id: I412af424b74369cef15c7ead2cb09704875972e3
ndroidManifest.xml
es/layout/settings_list_layout.xml
es/values/arrays.xml
es/values/strings.xml
es/values/styles.xml
es/xml/camera_preferences.xml
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/SettingsController.java
rc/com/android/camera/VideoModule.java
rc/com/android/camera/app/AppController.java
rc/com/android/camera/settings/CameraSettingsActivity.java
rc/com/android/camera/settings/SettingsCache.java
rc/com/android/camera/settings/SettingsManager.java
rc/com/android/camera/settings/SettingsUtil.java
rc/com/android/camera/ui/SettingsView.java
rc/com/android/camera/util/Callback.java
|
7bf8932c8e741b3542061b0e79ee7f3298b91493 |
11-Feb-2014 |
Doris Liu <tianliu@google.com> |
am 9395bade: Merge "Mode switcher refinements." into gb-ub-photos-denali * commit '9395bade85aab015f4d2914d6b27b8b6c625ba63': Mode switcher refinements.
|
9395bade85aab015f4d2914d6b27b8b6c625ba63 |
11-Feb-2014 |
Doris Liu <tianliu@google.com> |
Merge "Mode switcher refinements." into gb-ub-photos-denali
|
9391f5a1eaf4e119ccb9f281789ba6c21cfffae6 |
11-Feb-2014 |
Angus Kong <shkong@google.com> |
am 7fc3f71e: Merge "Change capture animation to simple flash" into gb-ub-photos-denali * commit '7fc3f71edde748f869ea40aa60932102553abf80': Change capture animation to simple flash
|
7fc3f71edde748f869ea40aa60932102553abf80 |
11-Feb-2014 |
Angus Kong <shkong@google.com> |
Merge "Change capture animation to simple flash" into gb-ub-photos-denali
|
9824f85fab222653f15455d625a585ad2d913b5f |
10-Feb-2014 |
Angus Kong <shkong@google.com> |
Change capture animation to simple flash bug:12959370 Change-Id: I7ea7c9da2642a348d1cb6b802fe64048720ebee8
rc/com/android/camera/ui/CaptureAnimationOverlay.java
|
040e3c053cc0d2097332de24cf5328a26a8e7332 |
10-Feb-2014 |
Doris Liu <tianliu@google.com> |
Mode switcher refinements. - Increase the mode switch icon size. - Change mode cover color to 0x191919 - Change the font of mode text to roboto medium - Change the highlight state of mode icon to fill Bug: 12954273 Bug: 12954790 Bug: 12954370 Bug: 12953261 Change-Id: I23ef62ae4ce5589da20c7ee6bf805e5af70b62f2
ssets/fonts/Roboto-Light.ttf
ssets/fonts/Roboto-Medium.ttf
es/values/colors.xml
es/values/dimens.xml
rc/com/android/camera/app/CameraAppUI.java
rc/com/android/camera/ui/ModeIconView.java
rc/com/android/camera/ui/ModeListView.java
rc/com/android/camera/ui/ModeSelectorItem.java
rc/com/android/camera/util/ApiHelper.java
|
4b9f8c5ee0a2c85ac7917fd370c5193a2e56c560 |
11-Feb-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I65741f8a902ec45c073d1308e390f49893ec73c1 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-km-rKH/strings.xml
es/values-ko/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mn-rMN/strings.xml
es/values-ms-rMY/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
80ef430e10097d842abef2b78e40d075a81ecb44 |
11-Feb-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ibcf6fabcbc2d86eef0c3640df01855eda8fdda20 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-km-rKH/strings.xml
es/values-ko/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mn-rMN/strings.xml
es/values-ms-rMY/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
2d3478635fa18f8d579c43f2b151faa520eb5577 |
10-Feb-2014 |
Spike Sprague <spikuru@google.com> |
am 4108d9ac: Merge "fixing intent ui controls visibility" into gb-ub-photos-denali * commit '4108d9ace2a0f40ad28f8d6530a174f1a0cffe95': fixing intent ui controls visibility
|
4108d9ace2a0f40ad28f8d6530a174f1a0cffe95 |
10-Feb-2014 |
Spike Sprague <spikuru@google.com> |
Merge "fixing intent ui controls visibility" into gb-ub-photos-denali
|
15690d02da08bda74ed63f260b70076801bf91bf |
10-Feb-2014 |
Spike Sprague <spikuru@google.com> |
fixing intent ui controls visibility bug: 12668877 Change-Id: Ibffc0682fb37f88998d2afddcf52bcd6ef86192f
es/layout/bottom_bar_contents.xml
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/VideoModule.java
rc/com/android/camera/app/CameraAppUI.java
rc/com/android/camera/ui/BottomBar.java
|
a5198717953ebde359944eabfab230711a704daa |
10-Feb-2014 |
Erin Dahlgren <edahlgren@google.com> |
am a706c94d: Separate capture icons into a protected res dir. * commit 'a706c94d2c96f47927cc3026fcf9d1c42c01489b': Separate capture icons into a protected res dir.
|
a706c94d2c96f47927cc3026fcf9d1c42c01489b |
10-Feb-2014 |
Erin Dahlgren <edahlgren@google.com> |
Separate capture icons into a protected res dir. Bug: 12954169 Change-Id: I0ecd4c69fb15308e463047cac16213cbfe125973
ndroid.mk
es/drawable-hdpi/ic_camera_normal.png
es/drawable-hdpi/ic_panorama_normal.png
es/drawable-hdpi/ic_refocus_normal.png
es/drawable-hdpi/ic_video_normal.png
es/drawable-mdpi/ic_camera_normal.png
es/drawable-mdpi/ic_panorama_normal.png
es/drawable-mdpi/ic_refocus_normal.png
es/drawable-mdpi/ic_video_normal.png
es/drawable-xhdpi/ic_camera_normal.png
es/drawable-xhdpi/ic_panorama_normal.png
es/drawable-xhdpi/ic_refocus_normal.png
es/drawable-xhdpi/ic_video_normal.png
es/drawable-xxhdpi/ic_camera_normal.png
es/drawable-xxhdpi/ic_panorama_normal.png
es/drawable-xxhdpi/ic_refocus_normal.png
es/drawable-xxhdpi/ic_video_normal.png
es_p/drawable-hdpi/ic_camera_normal.png
es_p/drawable-hdpi/ic_panorama_normal.png
es_p/drawable-hdpi/ic_refocus_normal.png
es_p/drawable-hdpi/ic_video_normal.png
es_p/drawable-mdpi/ic_camera_normal.png
es_p/drawable-mdpi/ic_panorama_normal.png
es_p/drawable-mdpi/ic_refocus_normal.png
es_p/drawable-mdpi/ic_video_normal.png
es_p/drawable-xhdpi/ic_camera_normal.png
es_p/drawable-xhdpi/ic_panorama_normal.png
es_p/drawable-xhdpi/ic_refocus_normal.png
es_p/drawable-xhdpi/ic_video_normal.png
es_p/drawable-xxhdpi/ic_camera_normal.png
es_p/drawable-xxhdpi/ic_panorama_normal.png
es_p/drawable-xxhdpi/ic_refocus_normal.png
es_p/drawable-xxhdpi/ic_video_normal.png
|
96fda58c3cc37afa6d74fd6ad76265af85b8dc88 |
10-Feb-2014 |
Angus Kong <shkong@google.com> |
am 8b25ded2: Merge "De-overlap of undo bar and filmstrip controls." into gb-ub-photos-denali * commit '8b25ded274ecc9377950ea22ff70c351d8914d9b': De-overlap of undo bar and filmstrip controls.
|
8b25ded274ecc9377950ea22ff70c351d8914d9b |
10-Feb-2014 |
Angus Kong <shkong@google.com> |
Merge "De-overlap of undo bar and filmstrip controls." into gb-ub-photos-denali
|
e940b166ea6f1f108dec1c96b15a325a4f0bb47e |
10-Feb-2014 |
Angus Kong <shkong@google.com> |
De-overlap of undo bar and filmstrip controls. bug:12958725 Change-Id: Iaaf31ae02e9f1975b8c3ec20fea2b6da36208278
es/layout/undo_bar.xml
es/values/styles.xml
|
c84cfdf3998f43d6d8504357e2d440535e61ec82 |
10-Feb-2014 |
Spike Sprague <spikuru@google.com> |
am 32ca1e52: Merge "video stop button diameter increased" into gb-ub-photos-denali * commit '32ca1e5290b0f9acde6b106f31e0917c770c19be': video stop button diameter increased
|
32ca1e5290b0f9acde6b106f31e0917c770c19be |
10-Feb-2014 |
Spike Sprague <spikuru@google.com> |
Merge "video stop button diameter increased" into gb-ub-photos-denali
|
53067aeacdd911f35965d14a0f1c7499fd39dd5c |
10-Feb-2014 |
Spike Sprague <spikuru@google.com> |
video stop button diameter increased bug: 12954412 Change-Id: I7b2cd286fbd0871fdaec185090c304edcb582c1e
es/values/dimens.xml
|
d3799683ad6f240b7409c912800227ba99238fcf |
08-Feb-2014 |
Doris Liu <tianliu@google.com> |
am 213a4a08: New mode drawer. * commit '213a4a086b54904cee543adf60b16fc1a61efe38': New mode drawer.
|
213a4a086b54904cee543adf60b16fc1a61efe38 |
05-Feb-2014 |
Doris Liu <tianliu@google.com> |
New mode drawer. -Changed the entire look of the mode drawer by using a live preview as background, and use circle icons rather than block shaped icons -Fade in the blurred preview frame during mode switch -Add highlighted and selected states to mode icons -Center the mode drawer in preview rather than whole screen -Swapped mode order in the drawer TODO: -Add settings access point -Refine swipe in/out behavior of the drawer Change-Id: Ibab0fe960bcfbb9635ca7f45d50178cb1ef2941f
es/drawable/mode_icon_background.xml
es/drawable/mode_icon_highlight.xml
es/layout/mode_list_layout.xml
es/layout/mode_selector.xml
es/values/arrays.xml
es/values/colors.xml
es/values/dimens.xml
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/TextureViewHelper.java
rc/com/android/camera/app/CameraAppUI.java
rc/com/android/camera/ui/ModeIconView.java
rc/com/android/camera/ui/ModeListView.java
rc/com/android/camera/ui/ModeSelectorItem.java
rc/com/android/camera/ui/ModeTransitionView.java
rc/com/android/camera/util/CameraUtil.java
|
100e3bdbcbefa0393bf7c240b3adf3d84654ef5f |
08-Feb-2014 |
Erin Dahlgren <edahlgren@google.com> |
am e69b8889: Merge "Ensure that mode options and indicators are fixed size." into gb-ub-photos-denali * commit 'e69b88893922350461c3a30586aa9194783ff612': Ensure that mode options and indicators are fixed size.
|
936d3983d7544da87935653f186d9d5132d51e91 |
08-Feb-2014 |
Erin Dahlgren <edahlgren@google.com> |
am 62a78dec: Merge "Add grid lines option and indicator." into gb-ub-photos-denali * commit '62a78decdecd84b516854f2ccbf629d76cdf09eb': Add grid lines option and indicator.
|
e69b88893922350461c3a30586aa9194783ff612 |
08-Feb-2014 |
Erin Dahlgren <edahlgren@google.com> |
Merge "Ensure that mode options and indicators are fixed size." into gb-ub-photos-denali
|
62a78decdecd84b516854f2ccbf629d76cdf09eb |
08-Feb-2014 |
Erin Dahlgren <edahlgren@google.com> |
Merge "Add grid lines option and indicator." into gb-ub-photos-denali
|
7721dba3992fa44fc373cc4bd13cbe9b866464b8 |
08-Feb-2014 |
Spike Sprague <spikuru@google.com> |
am 5ea38e3e: Merge "size bottom bar width to match preview area" into gb-ub-photos-denali * commit '5ea38e3e1d1983a5734b8b84c5eff705e47ce821': size bottom bar width to match preview area
|
5ea38e3e1d1983a5734b8b84c5eff705e47ce821 |
08-Feb-2014 |
Spike Sprague <spikuru@google.com> |
Merge "size bottom bar width to match preview area" into gb-ub-photos-denali
|
d5e51466a2848f1c937656c8f8185290034c2429 |
07-Feb-2014 |
Erin Dahlgren <edahlgren@google.com> |
Add grid lines option and indicator. Bug: 12454164 Change-Id: Iae088cee0cc67041bb304f276a5ffe84a813df5e
es/drawable-hdpi/ic_grid_off_disabled.png
es/drawable-hdpi/ic_grid_off_normal.png
es/drawable-hdpi/ic_grid_on_disabled.png
es/drawable-hdpi/ic_grid_on_normal.png
es/drawable-mdpi/ic_grid_off_disabled.png
es/drawable-mdpi/ic_grid_off_normal.png
es/drawable-mdpi/ic_grid_on_disabled.png
es/drawable-mdpi/ic_grid_on_normal.png
es/drawable-xhdpi/ic_grid_off_disabled.png
es/drawable-xhdpi/ic_grid_off_normal.png
es/drawable-xhdpi/ic_grid_on_disabled.png
es/drawable-xhdpi/ic_grid_on_normal.png
es/drawable-xxhdpi/ic_grid_off_disabled.png
es/drawable-xxhdpi/ic_grid_off_normal.png
es/drawable-xxhdpi/ic_grid_on_disabled.png
es/drawable-xxhdpi/ic_grid_on_normal.png
es/drawable/ic_grid_off.xml
es/drawable/ic_grid_on.xml
es/layout/generic_module.xml
es/layout/indicators.xml
es/layout/mode_options_bottombar.xml
es/values/arrays.xml
es/values/strings.xml
rc/com/android/camera/ButtonManager.java
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/VideoModule.java
rc/com/android/camera/app/CameraAppUI.java
rc/com/android/camera/settings/SettingsCache.java
rc/com/android/camera/settings/SettingsManager.java
rc/com/android/camera/ui/GridLines.java
rc/com/android/camera/widget/IndicatorIconController.java
|
83f14669bff9ebcdaae22e4d522ef325a461924f |
08-Feb-2014 |
Erin Dahlgren <edahlgren@google.com> |
am d8de077f: Shared texture view in photosphere. * commit 'd8de077f72b04cee1bdf26e5ca1678ac5297bd71': Shared texture view in photosphere.
|
d8de077f72b04cee1bdf26e5ca1678ac5297bd71 |
03-Feb-2014 |
Erin Dahlgren <edahlgren@google.com> |
Shared texture view in photosphere. Change-Id: I8dd4898e3800b02fa7f0488104dcfa4600b3845f
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/PhotoUI.java
rc/com/android/camera/TextureViewHelper.java
rc/com/android/camera/VideoModule.java
rc/com/android/camera/VideoUI.java
rc/com/android/camera/app/AndroidCameraManagerImpl.java
rc/com/android/camera/app/CameraAppUI.java
rc/com/android/camera/app/CameraManager.java
rc/com/android/camera/ui/BottomBar.java
rc/com/android/camera/ui/PreviewOverlay.java
rc/com/android/camera/ui/PreviewStatusListener.java
|
418b596da9f8e7a7a3ac027cb0d0897c9c03bd69 |
08-Feb-2014 |
Spike Sprague <spikuru@google.com> |
size bottom bar width to match preview area bug: 12563756 Change-Id: If6d26aa050ab130a177a6c2c21e38ee11cb985b5
rc/com/android/camera/ui/BottomBar.java
|
89442e258d2c77df55435b31d9f40e648d8a11e0 |
07-Feb-2014 |
Erin Dahlgren <edahlgren@google.com> |
Ensure that mode options and indicators are fixed size. Change-Id: I487cefaaffe8d2adb2f078692a7a0af16e48dfa3
es/values/dimens.xml
es/values/styles.xml
|
0dd739eecaf86a3d78ea278210ad6a1bcd93adac |
07-Feb-2014 |
Angus Kong <shkong@google.com> |
am fe60979d: Move onPreviewAreaSizeChanged() out of layout pass * commit 'fe60979d7d7ce78de503404da8e91e118242071a': Move onPreviewAreaSizeChanged() out of layout pass
|
fe60979d7d7ce78de503404da8e91e118242071a |
07-Feb-2014 |
Angus Kong <shkong@google.com> |
Move onPreviewAreaSizeChanged() out of layout pass Change-Id: I4eb6f6ffda1438fca7575328ce09945d40549d51
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/TextureViewHelper.java
rc/com/android/camera/VideoModule.java
rc/com/android/camera/module/ModuleController.java
rc/com/android/camera/ui/GridLines.java
rc/com/android/camera/widget/ModeOptionsOverlay.java
|
b5afc76cc854fa3597fe14e91aaeffed50b0c63c |
07-Feb-2014 |
Andy Huibers <andyhuibers@google.com> |
am 771040cd: Scale high aspect ratio Bitmaps to use full texture size. * commit '771040cd327bdf819af789321207a72a359a3a37': Scale high aspect ratio Bitmaps to use full texture size.
|
771040cd327bdf819af789321207a72a359a3a37 |
07-Feb-2014 |
Andy Huibers <andyhuibers@google.com> |
Scale high aspect ratio Bitmaps to use full texture size. Bug:11137777 Change-Id: I1a7ae213d3cdc199d381b89b610c5a195e30fbe9
rc/com/android/camera/data/LocalMediaData.java
|
82cecc9c74cbb7c2d316939ca799f85a29b78a2a |
06-Feb-2014 |
Erin Dahlgren <edahlgren@google.com> |
am 66f41b34: Fix an IllegalStateException introduced by ag/413832. * commit '66f41b3440ed95fdb079dab7993f839fcbb3641b': Fix an IllegalStateException introduced by ag/413832.
|
66f41b3440ed95fdb079dab7993f839fcbb3641b |
05-Feb-2014 |
Erin Dahlgren <edahlgren@google.com> |
Fix an IllegalStateException introduced by ag/413832. Change-Id: Ib160c313af4e60215a9a91b93a2ec2506a06c5d2
rc/com/android/camera/app/CameraAppUI.java
|
689d491b5edea4a8df8bad1636a96795f59933d8 |
05-Feb-2014 |
Erin Dahlgren <edahlgren@google.com> |
am d1df1984: Merge "Treat mode toggle as indicators or default toggle view." into gb-ub-photos-denali * commit 'd1df1984b7742a9f555d366e3acb87c3a43af5b4': Treat mode toggle as indicators or default toggle view.
|
d1df1984b7742a9f555d366e3acb87c3a43af5b4 |
05-Feb-2014 |
Erin Dahlgren <edahlgren@google.com> |
Merge "Treat mode toggle as indicators or default toggle view." into gb-ub-photos-denali
|
5cbb3b0b541dcb452a841ba182ed5fcc212f1163 |
05-Feb-2014 |
Geoff Mendal <mendal@google.com> |
am e450d931: (-s ours) Merge "Revert "Revert "Import translations. DO NOT MERGE""" into gb-ub-photos-denali * commit 'e450d9311b2b5a9157cebdf73850f9a760a3c76d': Revert "Revert "Import translations. DO NOT MERGE""
|
6e07fe22cf84e9eea02d368bf64ab68d92401f20 |
04-Feb-2014 |
Erin Dahlgren <edahlgren@google.com> |
Treat mode toggle as indicators or default toggle view. Change-Id: I25a97cea27893ab76a8930c99de8e65eb2904b36
es/drawable-hdpi/bg_options_indicator.9.png
es/drawable-mdpi/bg_options_indicator.9.png
es/drawable-xhdpi/bg_options_indicator.9.png
es/drawable-xxhdpi/bg_options_indicator.9.png
es/layout/indicators.xml
es/layout/mode_options_bottombar.xml
es/values/styles.xml
rc/com/android/camera/app/CameraAppUI.java
rc/com/android/camera/widget/IndicatorIconController.java
rc/com/android/camera/widget/IndicatorOverlay.java
rc/com/android/camera/widget/ModeOptionsOverlay.java
|
88c93f24734a7a56e3928a13a5249e76fbcaf77d |
05-Feb-2014 |
Geoff Mendal <mendal@google.com> |
Merge "Revert "Revert "Import translations. DO NOT MERGE""" into ub-camera-everglades
|
eb7acdfb367f4992953630c1bdc93e0da6809bcd |
05-Feb-2014 |
Geoff Mendal <mendal@google.com> |
Revert "Revert "Import translations. DO NOT MERGE"" This reverts commit 22389deaded9152040140a4b4dfb9aa635264a9b. Change-Id: I8be68e5fb89a28f5a4237540fad8656d6156e963
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-km-rKH/strings.xml
es/values-ko/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mn-rMN/strings.xml
es/values-ms-rMY/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
e450d9311b2b5a9157cebdf73850f9a760a3c76d |
05-Feb-2014 |
Geoff Mendal <mendal@google.com> |
Merge "Revert "Revert "Import translations. DO NOT MERGE""" into gb-ub-photos-denali
|
6fc3e9612cb23dc0a426cc36784a5913ec209146 |
05-Feb-2014 |
Geoff Mendal <mendal@google.com> |
Revert "Revert "Import translations. DO NOT MERGE"" This reverts commit f8919f0be4f94288edac60f9ab65768f335ab847. Change-Id: Ibbb702ec82939254d88aba30e58ffc12b0411bbc
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-km-rKH/strings.xml
es/values-ko/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mn-rMN/strings.xml
es/values-ms-rMY/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
3697f552318916f640d79a1e6deed0244357df17 |
05-Feb-2014 |
Geoff Mendal <mendal@google.com> |
am 5c1982fe: (-s ours) Merge "Revert "Import translations. DO NOT MERGE"" into gb-ub-photos-denali * commit '5c1982fe07149cb4d9f41b5d0139b86378974c63': Revert "Import translations. DO NOT MERGE"
|
5c1982fe07149cb4d9f41b5d0139b86378974c63 |
05-Feb-2014 |
Geoff Mendal <mendal@google.com> |
Merge "Revert "Import translations. DO NOT MERGE"" into gb-ub-photos-denali
|
f8919f0be4f94288edac60f9ab65768f335ab847 |
05-Feb-2014 |
Geoff Mendal <mendal@google.com> |
Revert "Import translations. DO NOT MERGE" This reverts commit c31dc66e88992d92decf8c2121cb99c481fec3f0. Change-Id: I0f938daddcb866947a5015b91cbd8cb650e0bf18
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-km-rKH/strings.xml
es/values-ko/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mn-rMN/strings.xml
es/values-ms-rMY/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
37a108fa0dae8e7d85ef85263774bea8686fb61c |
05-Feb-2014 |
Geoff Mendal <mendal@google.com> |
Merge "Revert "Import translations. DO NOT MERGE"" into ub-camera-everglades
|
22389deaded9152040140a4b4dfb9aa635264a9b |
05-Feb-2014 |
Geoff Mendal <mendal@google.com> |
Revert "Import translations. DO NOT MERGE" This reverts commit fb547fa8c1b42a7f5078f5b96d975d2d5d589eb0. Change-Id: I5e14fa6d5a1d6dfbcec9da469b0ee42fb3002138
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-km-rKH/strings.xml
es/values-ko/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mn-rMN/strings.xml
es/values-ms-rMY/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
cf1c0b5e7550764fdec5087202ee2a1a479cf526 |
05-Feb-2014 |
Geoff Mendal <mendal@google.com> |
am fd7674d7: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-denali * commit 'fd7674d772b017ced7b9c9d66ec85c77f7e4797c': Import translations. DO NOT MERGE
|
6b464b925afe57ddb6b4d9a3bd322410c19972de |
05-Feb-2014 |
Geoff Mendal <mendal@google.com> |
Merge "Import translations. DO NOT MERGE" into ub-camera-everglades
|
fd7674d772b017ced7b9c9d66ec85c77f7e4797c |
05-Feb-2014 |
Geoff Mendal <mendal@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-denali
|
fb547fa8c1b42a7f5078f5b96d975d2d5d589eb0 |
05-Feb-2014 |
Geoff Mendal <mendal@google.com> |
Import translations. DO NOT MERGE Change-Id: I53251dac59bf0df432140d8c381c452fed7a50b0 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-km-rKH/strings.xml
es/values-ko/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mn-rMN/strings.xml
es/values-ms-rMY/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
c31dc66e88992d92decf8c2121cb99c481fec3f0 |
05-Feb-2014 |
Geoff Mendal <mendal@google.com> |
Import translations. DO NOT MERGE Change-Id: I0720f3157996a287c66f6fc730fb8b3666d32e3c Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-km-rKH/strings.xml
es/values-ko/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mn-rMN/strings.xml
es/values-ms-rMY/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
16fab2256235eec7fd6a8f685dc849a678412bf4 |
05-Feb-2014 |
Sascha Haeberling <haeberling@google.com> |
am fbf3a90e: Merge "Prevent crash if first-time location dialog." into gb-ub-photos-denali * commit 'fbf3a90e72eb954ce90cd32fdbae2353411933a6': Prevent crash if first-time location dialog.
|
fbf3a90e72eb954ce90cd32fdbae2353411933a6 |
05-Feb-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Prevent crash if first-time location dialog." into gb-ub-photos-denali
|
f526f2f0614e6ca408a261dcbebb4374afea9632 |
05-Feb-2014 |
Sascha Haeberling <haeberling@google.com> |
Prevent crash if first-time location dialog. Change-Id: I34f44220202f7b7b39facf7caf9cd46e6e44acc4
rc/com/android/camera/CameraActivity.java
|
dd5f9aab968dd904fe7b99cdb419b160f746fff3 |
05-Feb-2014 |
Sascha Haeberling <haeberling@google.com> |
am 1fc5502e: Merge "Properly guard the weak reference." into gb-ub-photos-denali * commit '1fc5502ed041e3c781225ed5ba8ee0928e9ea632': Properly guard the weak reference.
|
1fc5502ed041e3c781225ed5ba8ee0928e9ea632 |
05-Feb-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Properly guard the weak reference." into gb-ub-photos-denali
|
aa46ec9f5456610d61103f6422ffaeefd46c62ed |
05-Feb-2014 |
Sascha Haeberling <haeberling@google.com> |
Properly guard the weak reference. Bug: 12805279 Change-Id: I268b121807d10edaba5d627eb3fc2d2ffc6579d3
rc/com/android/camera/CameraActivity.java
|
f3ed3aa144de5da7b7b2f1d619dc5b4dfdeec710 |
05-Feb-2014 |
Erin Dahlgren <edahlgren@google.com> |
am 962df780: Update new Camera2 indicator assets. * commit '962df780997eec03eff43354122e436a9bdd888b': Update new Camera2 indicator assets.
|
962df780997eec03eff43354122e436a9bdd888b |
05-Feb-2014 |
Erin Dahlgren <edahlgren@google.com> |
Update new Camera2 indicator assets. Bug: 12893552 Change-Id: I9d8133291626563d0e044f9735592b591671332c
es/drawable-hdpi/ic_flash_auto_indicator.png
es/drawable-hdpi/ic_flash_off_indicator.png
es/drawable-hdpi/ic_flash_on_indicator.png
es/drawable-hdpi/ic_grid_off_indicator.png
es/drawable-hdpi/ic_grid_on_indicator.png
es/drawable-hdpi/ic_hdr_off_indicator.png
es/drawable-hdpi/ic_hdr_on_indicator.png
es/drawable-hdpi/ic_hdr_plus_off_indicator.png
es/drawable-hdpi/ic_hdr_plus_on_indicator.png
es/drawable-hdpi/ic_refocus_off_indicator.png
es/drawable-hdpi/ic_refocus_on_indicator.png
es/drawable-mdpi/ic_flash_auto_indicator.png
es/drawable-mdpi/ic_flash_off_indicator.png
es/drawable-mdpi/ic_flash_on_indicator.png
es/drawable-mdpi/ic_grid_off_indicator.png
es/drawable-mdpi/ic_grid_on_indicator.png
es/drawable-mdpi/ic_hdr_off_indicator.png
es/drawable-mdpi/ic_hdr_on_indicator.png
es/drawable-mdpi/ic_hdr_plus_off_indicator.png
es/drawable-mdpi/ic_hdr_plus_on_indicator.png
es/drawable-mdpi/ic_refocus_off_indicator.png
es/drawable-mdpi/ic_refocus_on_indicator.png
es/drawable-xhdpi/ic_flash_auto_indicator.png
es/drawable-xhdpi/ic_flash_off_indicator.png
es/drawable-xhdpi/ic_flash_on_indicator.png
es/drawable-xhdpi/ic_grid_off_indicator.png
es/drawable-xhdpi/ic_grid_on_indicator.png
es/drawable-xhdpi/ic_hdr_off_indicator.png
es/drawable-xhdpi/ic_hdr_on_indicator.png
es/drawable-xhdpi/ic_hdr_plus_off_indicator.png
es/drawable-xhdpi/ic_hdr_plus_on_indicator.png
es/drawable-xhdpi/ic_refocus_off_indicator.png
es/drawable-xhdpi/ic_refocus_on_indicator.png
es/drawable-xxhdpi/ic_flash_auto_indicator.png
es/drawable-xxhdpi/ic_flash_off_indicator.png
es/drawable-xxhdpi/ic_flash_on_indicator.png
es/drawable-xxhdpi/ic_grid_off_indicator.png
es/drawable-xxhdpi/ic_grid_on_indicator.png
es/drawable-xxhdpi/ic_hdr_off_indicator.png
es/drawable-xxhdpi/ic_hdr_on_indicator.png
es/drawable-xxhdpi/ic_hdr_plus_off_indicator.png
es/drawable-xxhdpi/ic_hdr_plus_on_indicator.png
es/drawable-xxhdpi/ic_refocus_off_indicator.png
es/drawable-xxhdpi/ic_refocus_on_indicator.png
|
97cb4883316feea9a3a8843f4033f4dd51a5343c |
05-Feb-2014 |
Erin Dahlgren <edahlgren@google.com> |
am a6587a1a: Elevate refocus to its own mode, merge craft and camera. * commit 'a6587a1a1e3672013da6a454c0e478846eced15d': Elevate refocus to its own mode, merge craft and camera.
|
a6587a1a1e3672013da6a454c0e478846eced15d |
03-Feb-2014 |
Erin Dahlgren <edahlgren@google.com> |
Elevate refocus to its own mode, merge craft and camera. Change-Id: I9686db26993319fdaf09f09c0610bb65e00a0e05
es/layout/mode_options_bottombar.xml
es/values/arrays.xml
es/values/strings.xml
rc/com/android/camera/ButtonManager.java
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/VideoModule.java
rc/com/android/camera/app/CameraAppUI.java
rc/com/android/camera/app/ModuleManagerImpl.java
rc/com/android/camera/module/ModulesInfo.java
rc/com/android/camera/widget/IndicatorIconController.java
|
25b3580491486028aac1fc983ada7d1032d80d85 |
05-Feb-2014 |
Sascha Haeberling <haeberling@google.com> |
am 846d3abf: Avoid activity leaks. * commit '846d3abfe3da2fa2a5593c7d40a196005408bed1': Avoid activity leaks.
|
846d3abfe3da2fa2a5593c7d40a196005408bed1 |
04-Feb-2014 |
Sascha Haeberling <haeberling@google.com> |
Avoid activity leaks. Bug: 12805279 Change-Id: Ib91ff2d286f6a0e0d67dad673e7af24600e15759
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/VideoModule.java
rc/com/android/camera/app/CameraAppUI.java
rc/com/android/camera/app/CameraController.java
rc/com/android/camera/app/OrientationManagerImpl.java
rc/com/android/camera/module/ModuleController.java
rc/com/android/camera/util/CameraUtil.java
rc_pd/com/android/camera/app/LocationManager.java
|
1533cf79bc03fd4d47f3497de4a57e63ff0554e7 |
05-Feb-2014 |
Erin Dahlgren <edahlgren@google.com> |
am 93157d47: Merge "Add support for grid lines overlay." into gb-ub-photos-denali * commit '93157d47817a833e88d2edbd5e727973cc6ea51a': Add support for grid lines overlay.
|
93157d47817a833e88d2edbd5e727973cc6ea51a |
05-Feb-2014 |
Erin Dahlgren <edahlgren@google.com> |
Merge "Add support for grid lines overlay." into gb-ub-photos-denali
|
b3f59a874f675ceb7542298760a3c813c5e0d9ac |
05-Feb-2014 |
Erin Dahlgren <edahlgren@google.com> |
Add support for grid lines overlay. Bug: 12454164 Change-Id: Iecf175e6dd41d8c2ce42c177f5bc91ec997c420b
es/layout/generic_module.xml
es/values/colors.xml
es/values/dimens.xml
rc/com/android/camera/app/CameraAppUI.java
rc/com/android/camera/ui/GridLines.java
|
100ef681e58452419247c9c9fc7d0ba3e14c08fc |
05-Feb-2014 |
Spike Sprague <spikuru@google.com> |
am 35a42571: add a11y string for "more options" ellipsis * commit '35a4257143ee084f31a735f4e6dae7d03f6ae549': add a11y string for "more options" ellipsis
|
35a4257143ee084f31a735f4e6dae7d03f6ae549 |
04-Feb-2014 |
Spike Sprague <spikuru@google.com> |
add a11y string for "more options" ellipsis bug: 10745077 Change-Id: I50c68fc295d2b07eb8a923bfde3e97b7496d2f4d
es/layout/mode_options_bottombar.xml
es/values/strings.xml
|
a77d375355f08e9a13c7a35ad12b49cf12874ffa |
04-Feb-2014 |
Andy Huibers <andyhuibers@google.com> |
am 7ecf3a13: Merge "Make sure video quality requested is valid." into gb-ub-photos-denali * commit '7ecf3a1334be4852d01574f60766c2b8da965d12': Make sure video quality requested is valid.
|
7ecf3a1334be4852d01574f60766c2b8da965d12 |
04-Feb-2014 |
Andy Huibers <andyhuibers@google.com> |
Merge "Make sure video quality requested is valid." into gb-ub-photos-denali
|
ca7b94f70435334806ac6fcf31de6aad7bfb8992 |
04-Feb-2014 |
Alan Newberger <alann@google.com> |
am a12b337e: Merge "add a11y announcement when multi toggle button changes" into gb-ub-photos-denali * commit 'a12b337e63e7cbcb56e4d49da3d9c52f16f24ad1': add a11y announcement when multi toggle button changes
|
a12b337e63e7cbcb56e4d49da3d9c52f16f24ad1 |
04-Feb-2014 |
Alan Newberger <alann@google.com> |
Merge "add a11y announcement when multi toggle button changes" into gb-ub-photos-denali
|
5c62dc726ef2818283e767cde292148c263bcbf8 |
04-Feb-2014 |
Alan Newberger <alann@google.com> |
add a11y announcement when multi toggle button changes addressing TODO with a manual announcement whenever the content description of a button changes. Does checking of existing content description to reduce chattiness when options are set by the system e.g. on a resolution or orientation change. Still a bit of chattiness on startup if the app is setting a button to a nonstandard value, but I think its acceptable, it's giving user useful information about nonstandard options on startup. Bug: 10745077 Change-Id: I81089b2f4f7f14b90c4436199895a0f67075c3d3
es/values/strings.xml
rc/com/android/camera/MultiToggleImageButton.java
|
4743c1dc9667f5f14b579fe4a82ab17fb328d09c |
04-Feb-2014 |
Erin Dahlgren <edahlgren@google.com> |
am e6dba2a1: Merge "Set bottom bar to a consistent color across app." into gb-ub-photos-denali * commit 'e6dba2a113bdab462f849e2be3f7f36299f6aa7a': Set bottom bar to a consistent color across app.
|
706b233b7de1b84b005adb07b7005ecc56f52a8b |
04-Feb-2014 |
Erin Dahlgren <edahlgren@google.com> |
am 675e92c8: Merge "Center mode options according to spec." into gb-ub-photos-denali * commit '675e92c856f9889d034c0cc05904cc6bd87f717f': Center mode options according to spec.
|
e6dba2a113bdab462f849e2be3f7f36299f6aa7a |
04-Feb-2014 |
Erin Dahlgren <edahlgren@google.com> |
Merge "Set bottom bar to a consistent color across app." into gb-ub-photos-denali
|
675e92c856f9889d034c0cc05904cc6bd87f717f |
04-Feb-2014 |
Erin Dahlgren <edahlgren@google.com> |
Merge "Center mode options according to spec." into gb-ub-photos-denali
|
329e101670311ba5d2b2506580cf4303d8885e4b |
04-Feb-2014 |
Andy Huibers <andyhuibers@google.com> |
Make sure video quality requested is valid. Bug: 12824921 Change-Id: I653ad18359417844846b792d8ffa3b697e03f07e
es/values/strings.xml
rc/com/android/camera/VideoModule.java
|
25ff04d2c7c11fec78c69b9077f9652cdf0e87f7 |
04-Feb-2014 |
Geoff Mendal <mendal@google.com> |
am aaa70e1e: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-denali * commit 'aaa70e1ebea3f9ebb59801692e975be36c60accc': Import translations. DO NOT MERGE
|
aaa70e1ebea3f9ebb59801692e975be36c60accc |
04-Feb-2014 |
Geoff Mendal <mendal@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-denali
|
09bd7dfe8959ce3b7ad4c9489dfbdccde21ca6d7 |
04-Feb-2014 |
Geoff Mendal <mendal@google.com> |
Merge "Import translations. DO NOT MERGE" into ub-camera-everglades
|
2b2e15faa1ff489b1d0f05e42aa335052f08b404 |
04-Feb-2014 |
Alan Newberger <alann@google.com> |
am 1632493f: Merge "add content descriptions for filmstrip controls" into gb-ub-photos-denali * commit '1632493f24d9571cccc02dbfe58b7b69941693c9': add content descriptions for filmstrip controls
|
1632493f24d9571cccc02dbfe58b7b69941693c9 |
04-Feb-2014 |
Alan Newberger <alann@google.com> |
Merge "add content descriptions for filmstrip controls" into gb-ub-photos-denali
|
07cd38746fb6b30072aa36d23c907edc9690eecd |
04-Feb-2014 |
Alan Newberger <alann@google.com> |
add content descriptions for filmstrip controls adding TalkBack descriptions for action buttons shown on the bottom of filmstrip. Bug: 10745077 Change-Id: I3ea278fb065629b43f0ccc9821fe19e6f1d9c4f9
es/layout/filmstrip_bottom_controls.xml
es/values/strings.xml
|
aebb271b5023afcb1e52096a346a6fcb6c7b950c |
04-Feb-2014 |
Geoff Mendal <mendal@google.com> |
Import translations. DO NOT MERGE Change-Id: Ic4408ee0aa311f3d69d0de062ffbf8200a00c101 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-km-rKH/strings.xml
es/values-ko/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mn-rMN/strings.xml
es/values-ms-rMY/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
316fb301d7fbaa0c0d85a346038febde8ecbf706 |
04-Feb-2014 |
Geoff Mendal <mendal@google.com> |
Import translations. DO NOT MERGE Change-Id: If14d9ca0e2b4050c41fdd5c842cb0bed0d560be0 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-km-rKH/strings.xml
es/values-ko/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mn-rMN/strings.xml
es/values-ms-rMY/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
de05e8d5cb41ede6c9095659fc375f3a991d9806 |
04-Feb-2014 |
Alan Newberger <alann@google.com> |
am 80461c2d: Add content URI for current filmstrip item to Gallery intent * commit '80461c2de3ee7f12e17e9951567a843c500b8fe1': Add content URI for current filmstrip item to Gallery intent
|
80461c2de3ee7f12e17e9951567a843c500b8fe1 |
04-Feb-2014 |
Alan Newberger <alann@google.com> |
Add content URI for current filmstrip item to Gallery intent when starting Gallery, if there is a current filmstrip ID, retrieve its content URI and pass to the GalleryHelper to process it. Do nothing within the GalleryHelper at this time. Bug: 12587688 Change-Id: I5becbfa7d12e739383b9f2ef3d3dba7460fa3d25
rc/com/android/camera/CameraActivity.java
rc_pd/com/android/camera/util/GalleryHelper.java
|
7ca4f457f789a19a811e44380387f2f552c41571 |
04-Feb-2014 |
Will Haldean Brown <haldean@google.com> |
Merge "Add hook in CameraApp to register a RemoteShutterListener." into ub-camera-everglades
|
c0ad2fbb43002cf013989489dc0321f459baf84c |
03-Feb-2014 |
Erin Dahlgren <edahlgren@google.com> |
Center mode options according to spec. * spec: https://drive.google.com/a/google.com/#folders/0B0GnUi_SFKJtdHp4YnBnLTZxcjQ * for modes like video with less than the total possible mode options, center the options. Change-Id: I79dce62ced916d2ed20d04e805abe2bfdd60c779
rc/com/android/camera/ButtonManager.java
|
83e07f8c9a24b8373fcb57a5c53cdceefad54fc6 |
03-Feb-2014 |
Will Haldean Brown <haldean@google.com> |
Add hook in CameraApp to register a RemoteShutterListener. Builds can provide an implementation of RemoteShutterBridge whose create method returns a more interesting implementation of a RemoteShutterListener. This also removes the need for the NOOP RemoteShutterListener constant; instead, the default implementation of RemoteShutterBridge returns the NOOP listener. Change-Id: I5ec381abbb3fa5e38249f8a77edc765083bf32aa
rc/com/android/camera/app/CameraApp.java
rc/com/android/camera/remote/RemoteShutterListener.java
rc_pd/com/android/camera/util/RemoteShutterHelper.java
|
9951c504780b91b916c2989589295b02266adebf |
03-Feb-2014 |
Erin Dahlgren <edahlgren@google.com> |
am ea72209d: Fix the build by adding eventproto foreground stubs. * commit 'ea72209da78c8a0a0d6c92cd8715f38f940c7f78': Fix the build by adding eventproto foreground stubs.
|
ea72209da78c8a0a0d6c92cd8715f38f940c7f78 |
03-Feb-2014 |
Erin Dahlgren <edahlgren@google.com> |
Fix the build by adding eventproto foreground stubs. Change-Id: I6319378499e105c5638d8ef4788fbc21ed073936
rc_pd/com/google/common/logging/eventprotos.java
|
14466ba8f9ee23c003067f2c7b5569a6417cc60a |
03-Feb-2014 |
Erin Dahlgren <edahlgren@google.com> |
Set bottom bar to a consistent color across app. Change-Id: Ieda492a9dbc122a828d8b5d8df831fbe99e6295f
es/values/arrays.xml
es/values/colors.xml
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/util/CameraUtil.java
|
e7aff8c58fd36210539debc539165e6d7e9e664a |
03-Feb-2014 |
Erin Dahlgren <edahlgren@google.com> |
am f6edd536: Correctly log the source of a foreground event. * commit 'f6edd53668afe094c8dc09ac35d294d049f6cec1': Correctly log the source of a foreground event.
|
f6edd53668afe094c8dc09ac35d294d049f6cec1 |
31-Jan-2014 |
Erin Dahlgren <edahlgren@google.com> |
Correctly log the source of a foreground event. Bug: 12589465 Change-Id: Ib26d44e1a8fdc4e03561c6a00886682881106ec2
rc/com/android/camera/CameraActivity.java
|
b5d4786bfb11687012a8e2bcbfcb467cd1fa6863 |
03-Feb-2014 |
Erin Dahlgren <edahlgren@google.com> |
am 165bb8d8: Move mode options to transparent overlay. * commit '165bb8d85e6eab4e261c6b21a754ee227f732795': Move mode options to transparent overlay.
|
165bb8d85e6eab4e261c6b21a754ee227f732795 |
30-Jan-2014 |
Erin Dahlgren <edahlgren@google.com> |
Move mode options to transparent overlay. Change-Id: Iec0423668c58a5b849841afc45def923210df6fd
es/layout/bottom_bar_contents.xml
es/layout/generic_module.xml
es/layout/indicator_bottombar.xml
es/layout/mode_options_bottombar.xml
es/values/arrays.xml
es/values/dimens.xml
es/values/styles.xml
rc/com/android/camera/app/CameraAppUI.java
rc/com/android/camera/ui/BottomBar.java
rc/com/android/camera/ui/TopRightMostOverlay.java
rc/com/android/camera/ui/TopRightWeightedLayout.java
rc/com/android/camera/widget/ModeOptionsOverlay.java
|
6948ff8fc0946eeec29e9be6ff2abce8d1f2abed |
31-Jan-2014 |
Spike Sprague <spikuru@google.com> |
am 30099ea6: Merge "adding accessibilty strings to ui items" into gb-ub-photos-denali * commit '30099ea6efee35f4665d500143d5a3e5a2a4d3b5': adding accessibilty strings to ui items
|
30099ea6efee35f4665d500143d5a3e5a2a4d3b5 |
31-Jan-2014 |
Spike Sprague <spikuru@google.com> |
Merge "adding accessibilty strings to ui items" into gb-ub-photos-denali
|
123e1a026a267f4296558cbb303790ee116e22c9 |
31-Jan-2014 |
Doris Liu <tianliu@google.com> |
am 4ba3c72b: Merge "First pass on tracking camera performance" into gb-ub-photos-denali * commit '4ba3c72b6cf7b17345a8ffe643a3e21df460893d': First pass on tracking camera performance
|
4ba3c72b6cf7b17345a8ffe643a3e21df460893d |
31-Jan-2014 |
Doris Liu <tianliu@google.com> |
Merge "First pass on tracking camera performance" into gb-ub-photos-denali
|
7cbeceed6d03d0550797c435f3db6205714cd49f |
30-Jan-2014 |
Doris Liu <tianliu@google.com> |
First pass on tracking camera performance Record time spent on cold/warm start, mode switching for later hooking up with instrument tests. Bug: 12838163 Change-Id: I1004f2b26d9ff9d59b4729e7323c079a6b561fdc
rc/android/util/CameraPerformanceTracker.java
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/app/CameraAppUI.java
|
d9453cca683243d08ca314a88ebf4f323b9caf1f |
31-Jan-2014 |
Erin Dahlgren <edahlgren@google.com> |
am 9fdeb77f: Merge "Log swipes out of filmstrip." into gb-ub-photos-denali * commit '9fdeb77f5d3f9e25ce18f18be64f726305aedcc6': Log swipes out of filmstrip.
|
9fdeb77f5d3f9e25ce18f18be64f726305aedcc6 |
31-Jan-2014 |
Erin Dahlgren <edahlgren@google.com> |
Merge "Log swipes out of filmstrip." into gb-ub-photos-denali
|
b85ab30d88af269cec63ff466b4cc1f2be6a31b7 |
31-Jan-2014 |
Sascha Haeberling <haeberling@google.com> |
am 048cd76a: Merge "Move tiny planet editor into the edit action." into gb-ub-photos-denali * commit '048cd76ab602974b95d7ba9b21c0e8d10ccbbfcf': Move tiny planet editor into the edit action.
|
048cd76ab602974b95d7ba9b21c0e8d10ccbbfcf |
31-Jan-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Move tiny planet editor into the edit action." into gb-ub-photos-denali
|
fa1f4e436d1fee85007ec0c7f1365e9728c000ca |
31-Jan-2014 |
Sascha Haeberling <haeberling@google.com> |
am 0c8a1a4e: Prevent Tiny Planet from crashing often. * commit '0c8a1a4e65e758beb4f5d48b5110aada49667738': Prevent Tiny Planet from crashing often.
|
0c8a1a4e65e758beb4f5d48b5110aada49667738 |
31-Jan-2014 |
Sascha Haeberling <haeberling@google.com> |
Prevent Tiny Planet from crashing often. Bug: 11050122 Make sure the preview rendering is always happening on the handler thread. Change-Id: Id5a2e5d939fa6bd3520dc8bfa5bb1803ef6fb1c5
rc/com/android/camera/tinyplanet/TinyPlanetFragment.java
|
e8959e7a72cd6f057ac4cd8bd47075272700e62e |
31-Jan-2014 |
Sascha Haeberling <haeberling@google.com> |
Move tiny planet editor into the edit action. Bug: 12553864 Change-Id: I3431565928bef637c11246fc6e711ef3d1f925ce
es/layout/filmstrip_bottom_controls.xml
es/menu/filmstrip_context_menu.xml
es/values/strings.xml
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/app/AppController.java
rc/com/android/camera/app/CameraAppUI.java
rc/com/android/camera/app/FilmstripBottomControls.java
|
3488188fa8dff9a90021446e6ed4f9c321c4d4db |
30-Jan-2014 |
Erin Dahlgren <edahlgren@google.com> |
Log swipes out of filmstrip. Bug: 12589465 Change-Id: I13b20b3e56b1ae4285ecc00ca4c2fb5a42fa75ed
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/filmstrip/FilmstripContentPanel.java
rc/com/android/camera/widget/FilmstripLayout.java
rc_pd/com/google/common/logging/eventprotos.java
|
db8e52dfe4aadbc30fb3a42abb27246a0491efec |
31-Jan-2014 |
Erin Dahlgren <edahlgren@google.com> |
am 426901fb: Merge "Add logging for swipe to filmstrip from camera." into gb-ub-photos-denali * commit '426901fb6adf728742ad2841ac595bc1414f3568': Add logging for swipe to filmstrip from camera.
|
426901fb6adf728742ad2841ac595bc1414f3568 |
31-Jan-2014 |
Erin Dahlgren <edahlgren@google.com> |
Merge "Add logging for swipe to filmstrip from camera." into gb-ub-photos-denali
|
c99846976802c6c2c010c3785bdf57bfb24555b1 |
30-Jan-2014 |
Erin Dahlgren <edahlgren@google.com> |
am 1841b11d: Don\'t add duplicate identical OnSettingChangedListeners. * commit '1841b11d64fe17193331d3d091cff4a74a789548': Don't add duplicate identical OnSettingChangedListeners.
|
772951602f9cfccd097283e3b78d188838c82138 |
30-Jan-2014 |
Erin Dahlgren <edahlgren@google.com> |
Add logging for swipe to filmstrip from camera. Bug: 12589465 Change-Id: Ia57c1f341d7c9262b96823121e046fe4c4378b5c
rc/com/android/camera/app/CameraAppUI.java
rc/com/android/camera/ui/MainActivityLayout.java
rc/com/android/camera/widget/FilmstripView.java
|
1841b11d64fe17193331d3d091cff4a74a789548 |
30-Jan-2014 |
Erin Dahlgren <edahlgren@google.com> |
Don't add duplicate identical OnSettingChangedListeners. Bug: 12802314 Change-Id: I8baa668205633a9f5c9da259f0fa28dbca951a77
rc/com/android/camera/settings/SettingsManager.java
|
6a3874c4220211798ebb1786c72f30b9b1a84b28 |
30-Jan-2014 |
Doris Liu <tianliu@google.com> |
am b93451d7: Merge "Fix NPE" into gb-ub-photos-denali * commit 'b93451d7f8b665aa393ad4c38a78f7a6f160c6ff': Fix NPE
|
8d800d0d9e23121388d5994bd149826436a66803 |
30-Jan-2014 |
Sascha Haeberling <haeberling@google.com> |
resolved conflicts for merge of 914a6dba to ub-camera-everglades Change-Id: I1e5700e8d34e19a09c8098ccf0cdfc64bfd4dbf8
|
b93451d7f8b665aa393ad4c38a78f7a6f160c6ff |
30-Jan-2014 |
Doris Liu <tianliu@google.com> |
Merge "Fix NPE" into gb-ub-photos-denali
|
914a6dbafa14065404cf8f72f9bc84877963be10 |
30-Jan-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Changes the picture size settings to L,M,S from concrete resolutions." into gb-ub-photos-denali
|
6365bad43ff3e3e93d4e8c7e6dc22cbc96eb1aaf |
30-Jan-2014 |
Doris Liu <tianliu@google.com> |
Fix NPE This NPE is caused by not having a PreviewStatusListener in photosphere module. Hooking up PreviewStatusListener in photosphere requires a refactor which is non-trivial amount of work. So for now, a null check is added here to prevent NPE and the logic of detecting and handling device flip will be added into photosphere to properly handle device flp. Part II at ag/412607 Bug: 12679997 Change-Id: I5392674e387800e6a2a3114ec3f834b439aed31e
rc/com/android/camera/app/CameraAppUI.java
|
3b0ab89e3fefd25ae87687420df9315ec860d346 |
29-Jan-2014 |
Sascha Haeberling <haeberling@google.com> |
Changes the picture size settings to L,M,S from concrete resolutions. Bug: 12575084 Bug: 12717251 The strategy in detail: - Sort all available sizes - For 'large', select the resolution with the most pixels. - Use the 'large' resolution aspect ratio as the target AR. - Create a list of resolutions with AR close to 'large'. - If only two more are available, use them for medium and small. - If less are available, boarden the search in complete list. - Again, if only two more are available, use them for medium and small. - Otherwise find medium resolution with total pixels closest to 50% of 'large' and ... small as 25% of 'large' pixels. - If they both come out the same, select either one small for 'small' or one larger for 'medium'. Change-Id: Ib94fdf0ce987968bccd85abbf5be7bdaa914325f
es/values/arrays.xml
es/values/strings.xml
rc/com/android/camera/CameraSettings.java
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/SettingsController.java
rc/com/android/camera/settings/SettingsManager.java
rc/com/android/camera/settings/SettingsUtil.java
rc/com/android/camera/ui/SettingsView.java
|
9411a4ba0500263be4b4c85a5a0bc4f755eb9025 |
30-Jan-2014 |
Alan Newberger <alann@google.com> |
am 2ecb9dda: Merge "add additional lifecycle states to PanoramaViewHelper" into gb-ub-photos-denali * commit '2ecb9dda1b10ce12386819402845d3a8407a8e4e': add additional lifecycle states to PanoramaViewHelper
|
2ecb9dda1b10ce12386819402845d3a8407a8e4e |
30-Jan-2014 |
Alan Newberger <alann@google.com> |
Merge "add additional lifecycle states to PanoramaViewHelper" into gb-ub-photos-denali
|
04bd11c53a63f3302a21875f4488feb8118aa5b4 |
29-Jan-2014 |
Alan Newberger <alann@google.com> |
add additional lifecycle states to PanoramaViewHelper Bug: 12192549 Change-Id: I36668db7657c8b285419e7eca824b3d6e495e5ef
rc/com/android/camera/CameraActivity.java
rc_pd/com/android/camera/util/PhotoSphereHelper.java
|
79718f6c6fb60aedd09edeedb2c16d1e2f9fe02d |
29-Jan-2014 |
Spike Sprague <spikuru@google.com> |
adding accessibilty strings to ui items Change-Id: I3f2356c765bd2799dfa1009ff6707fc3af87383e
es/layout/bottom_bar_contents.xml
es/values/arrays.xml
es/values/attrs.xml
es/values/strings.xml
rc/com/android/camera/ButtonManager.java
rc/com/android/camera/MultiToggleImageButton.java
rc/com/android/camera/ui/ModeListView.java
rc/com/android/camera/util/CameraUtil.java
|
9c3252bf998f12c530cc8d940580476a2428ca09 |
29-Jan-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I138119cac5f12e69e7a5045a6d002e34909767bd Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-km-rKH/strings.xml
es/values-ko/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mn-rMN/strings.xml
es/values-ms-rMY/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
f211ae37ec80c603feff214c1cf8ec5de8d2a09b |
29-Jan-2014 |
Doris Liu <tianliu@google.com> |
am bd5341b0: Merge "Use mutable drawable to avoid sharing drawable states" into gb-ub-photos-denali * commit 'bd5341b04a2982885d079b5f6a87a91e84603efd': Use mutable drawable to avoid sharing drawable states
|
bd5341b04a2982885d079b5f6a87a91e84603efd |
29-Jan-2014 |
Doris Liu <tianliu@google.com> |
Merge "Use mutable drawable to avoid sharing drawable states" into gb-ub-photos-denali
|
58ac7e042e0718e860f9aea6dca3697e1c3d9bb8 |
29-Jan-2014 |
Doris Liu <tianliu@google.com> |
Use mutable drawable to avoid sharing drawable states Bug: 12594617 Change-Id: I798b67ed42a5593c346643d42ebf1143d54551e6
rc/com/android/camera/ui/BottomBar.java
rc/com/android/camera/ui/ModeSelectorItem.java
|
c630181f9921c8355c41ca3acea7009c57101fcc |
29-Jan-2014 |
Erin Dahlgren <edahlgren@google.com> |
am 8389ebe6: Merge "Fix secure camera launch crash." into gb-ub-photos-denali * commit '8389ebe65ca6f3640b90e24f35339b5f233dee83': Fix secure camera launch crash.
|
8389ebe65ca6f3640b90e24f35339b5f233dee83 |
29-Jan-2014 |
Erin Dahlgren <edahlgren@google.com> |
Merge "Fix secure camera launch crash." into gb-ub-photos-denali
|
49ab922e8e1e7535286392fc667312ec419403fd |
29-Jan-2014 |
Erin Dahlgren <edahlgren@google.com> |
Fix secure camera launch crash. Bug: 12783858 Change-Id: Iff5cfecff986966f63b40d2db4bc1d31037f12d4
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/VideoModule.java
rc/com/android/camera/app/CameraAppUI.java
|
a26123b9dffb7d186696c72cc2db44d24cbadd58 |
29-Jan-2014 |
Doris Liu <tianliu@google.com> |
am 5e6c3e78: Merge "Fix mode transition jank and stretched video preview" into gb-ub-photos-denali * commit '5e6c3e7840b41685ebd27c40ee243a7ae75e7229': Fix mode transition jank and stretched video preview
|
5e6c3e7840b41685ebd27c40ee243a7ae75e7229 |
29-Jan-2014 |
Doris Liu <tianliu@google.com> |
Merge "Fix mode transition jank and stretched video preview" into gb-ub-photos-denali
|
5a367545ab931a308c8d8555ef5a747dc9565caf |
18-Jan-2014 |
Doris Liu <tianliu@google.com> |
Fix mode transition jank and stretched video preview Bug: 11963674 Change-Id: I9cb292aa3dea6b0073dfc19af8105dce1f0c9865
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/VideoModule.java
rc/com/android/camera/VideoUI.java
rc/com/android/camera/app/AppController.java
rc/com/android/camera/app/CameraAppUI.java
|
d64a351fb730a2f0d15970d1072e72cb751383e3 |
28-Jan-2014 |
Seth Raphael <magicseth@google.com> |
am 8513f7bb: Merge "Clearcut Logs" into gb-ub-photos-denali * commit '8513f7bbf8ebc2563702b1e35d4894bd8ab7b21f': Clearcut Logs
|
8513f7bbf8ebc2563702b1e35d4894bd8ab7b21f |
28-Jan-2014 |
Seth Raphael <magicseth@google.com> |
Merge "Clearcut Logs" into gb-ub-photos-denali
|
5e09d01d80b64c81f21c57f1b99dd9dc1afed18d |
18-Dec-2013 |
Seth Raphael <magicseth@google.com> |
Clearcut Logs Change-Id: I564a2452cb7f02f899760ac086e56eaa76b174eb
ndroid.mk
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/FocusOverlayManager.java
rc/com/android/camera/ListPreference.java
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/VideoModule.java
rc/com/android/camera/util/CameraUtil.java
rc/com/android/camera/widget/FilmstripView.java
rc_pd/com/android/camera/util/UsageStatistics.java
rc_pd/com/google/common/logging/eventprotos.java
|
fcf030c184d2279bd2e6d682a6677b720e03a8a6 |
25-Jan-2014 |
Spike Sprague <spikuru@google.com> |
am 7f749f2c: Merge "reset capture button state on swipes" into gb-ub-photos-denali * commit '7f749f2c7a4061bd4426561b2b4dcbd3b9246640': reset capture button state on swipes
|
7f749f2c7a4061bd4426561b2b4dcbd3b9246640 |
25-Jan-2014 |
Spike Sprague <spikuru@google.com> |
Merge "reset capture button state on swipes" into gb-ub-photos-denali
|
87f7af57932a826d54a74eb2b22b5bfa7a94f583 |
25-Jan-2014 |
Spike Sprague <spikuru@google.com> |
reset capture button state on swipes bug: 12550678 Change-Id: I9678e55cdd19ca319686665b69e76a9984fa7a6a
rc/com/android/camera/ui/BottomBar.java
|
47bfd80640c23b35e3f278c886d85682fa3c83c7 |
25-Jan-2014 |
Spike Sprague <spikuru@google.com> |
am 41f68008: restore video bottom bar on app background during video capture * commit '41f68008374c34ca206691fefbd12494e95e92fe': restore video bottom bar on app background during video capture
|
41f68008374c34ca206691fefbd12494e95e92fe |
25-Jan-2014 |
Spike Sprague <spikuru@google.com> |
restore video bottom bar on app background during video capture bug: 12726013 Change-Id: I3e69daad21835e7ce46427398531d0236703cb5a
rc/com/android/camera/VideoModule.java
|
88d673c08b13e6d13fff4420e2f8ca1e862977ce |
25-Jan-2014 |
Doris Liu <tianliu@google.com> |
am 1143ebd4: Fix NPE by adding a onPause check * commit '1143ebd49f8f90ffa634925d70cb53e4f0184d5d': Fix NPE by adding a onPause check
|
1143ebd49f8f90ffa634925d70cb53e4f0184d5d |
24-Jan-2014 |
Doris Liu <tianliu@google.com> |
Fix NPE by adding a onPause check Bug: 12682478 Change-Id: Ida9c79287751089449569ec26dcf1c1f195afde9
rc/com/android/camera/VideoModule.java
|
f2994f02c46e6351fbaadc8a2b24f8feefa53892 |
24-Jan-2014 |
Sascha Haeberling <haeberling@google.com> |
A first approach for a remote shutter API. Change-Id: Idd00c6eeef487d32f333ff19eae01dc47856cd09
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/app/CameraApp.java
rc/com/android/camera/app/CameraServices.java
rc/com/android/camera/remote/RemoteCameraModule.java
rc/com/android/camera/remote/RemoteShutterListener.java
|
7266b9c7fefe80ece12b44b129b49759c8d1ad90 |
24-Jan-2014 |
Sascha Haeberling <haeberling@google.com> |
am 4af3b04d: Merge "Adds an API for temporary session storage." into gb-ub-photos-denali * commit '4af3b04dbed19579af379213028f76e655e58f2f': Adds an API for temporary session storage.
|
4af3b04dbed19579af379213028f76e655e58f2f |
24-Jan-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Adds an API for temporary session storage." into gb-ub-photos-denali
|
a86b048709342fc53cee92aa047a15a22462c71c |
23-Jan-2014 |
Sascha Haeberling <haeberling@google.com> |
Adds an API for temporary session storage. Bug: 12064183 This is required so that we can have all modules that have sessions use the same logic for creating and deleting them. Change-Id: I20591310d6b4534e564ab60608049eec87f823f9
rc/com/android/camera/app/CameraApp.java
rc/com/android/camera/session/CaptureSessionManager.java
rc/com/android/camera/session/CaptureSessionManagerImpl.java
rc/com/android/camera/session/SessionStorageManager.java
rc/com/android/camera/session/SessionStorageManagerImpl.java
rc/com/android/camera/util/FileUtil.java
|
82387f3da8eadb15d32e79f40e8ef917efebe9c3 |
23-Jan-2014 |
Erin Dahlgren <edahlgren@google.com> |
am 0cccc1b2: Merge "Use ninepatch for indicator background." into gb-ub-photos-denali * commit '0cccc1b22133f1211fc4dacabb8fab9ba392960c': Use ninepatch for indicator background.
|
0cccc1b22133f1211fc4dacabb8fab9ba392960c |
23-Jan-2014 |
Erin Dahlgren <edahlgren@google.com> |
Merge "Use ninepatch for indicator background." into gb-ub-photos-denali
|
ba0bccbf9124f5d6662c1421ceb965800309ffb8 |
23-Jan-2014 |
Baligh Uddin <baligh@google.com> |
am 72b2f85f: (-s ours) Import translations. DO NOT MERGE * commit '72b2f85f42c1e277ffdc963dac15278d282a74ba': Import translations. DO NOT MERGE
|
72b2f85f42c1e277ffdc963dac15278d282a74ba |
23-Jan-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I81642c60b0380b70e6d0556ae47f0421853ddee4 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-km-rKH/strings.xml
es/values-ko/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mn-rMN/strings.xml
es/values-ms-rMY/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
61044000a3baec7b0a7d8bb22314c1dc8fec3c88 |
23-Jan-2014 |
Erin Dahlgren <edahlgren@google.com> |
Use ninepatch for indicator background. Bug: 12602711 Change-Id: Id513f526331b4dbefcfae1f2bff548cbf4bbac94
es/drawable/bg_indicators.xml
es/layout/indicator_bottombar.xml
es/values/styles.xml
rc/com/android/camera/widget/IndicatorOverlay.java
|
2fd7a500a5d96902fc805449183074edb3064e51 |
22-Jan-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Move focus overlay into generic_module." into gb-ub-photos-denali
|
e2914fddcd6d4f78d812ef818d43364d9aa469d4 |
18-Jan-2014 |
Sascha Haeberling <haeberling@google.com> |
Move focus overlay into generic_module. Bug: 12563457 Also cleans up the focus overlay API. Change-Id: I8a63b7abf7cc9390cc709c275807b1d3d2e344a6
es/layout/generic_module.xml
es/layout/photo_module.xml
es/layout/video_module.xml
rc/com/android/camera/FocusOverlayManager.java
rc/com/android/camera/PhotoUI.java
rc/com/android/camera/app/CameraAppUI.java
rc/com/android/camera/ui/FocusOverlay.java
|
481a3b330d8641d8a9f698dfd0fe4d8ab9cca442 |
22-Jan-2014 |
Erin Dahlgren <edahlgren@google.com> |
Switch to gcam module only if gcam is supported. Bug: 12682385 Bug: 12594403 Change-Id: I86b8156ea5027818135ccfce03a1d23f377055f2
rc/com/android/camera/CameraActivity.java
|
406468ebe4c90ecc5e5defa8dafd496965118551 |
22-Jan-2014 |
Erin Dahlgren <edahlgren@google.com> |
Fix the build: limit hdr icons. Change-Id: I64772bc1cae76487e2d13b3a7f5f666b99a66124
es/drawable-hdpi/ic_hdr_off.png
es/drawable-mdpi/ic_hdr_off.png
es/drawable-xhdpi/ic_hdr_off.png
es/values/arrays.xml
|
4235a2aab49d3c6990549de6249d8e210f0651d4 |
22-Jan-2014 |
Erin Dahlgren <edahlgren@google.com> |
Merge "Add hdr option and indicator" into gb-ub-photos-denali
|
5ae34031a009fe20dcbdfee4f6664f2caa94839a |
22-Jan-2014 |
Erin Dahlgren <edahlgren@google.com> |
Merge "Fix the build: use exported panorama values in helper class." into gb-ub-photos-denali
|
d706ea69a87229dca5cb8f16125decfbcbc5303d |
22-Jan-2014 |
Erin Dahlgren <edahlgren@google.com> |
Fix the build: use exported panorama values in helper class. Change-Id: I5b22fe0504fa113f3867d7e626087c9880bbccdd
es/values/arrays.xml
rc/com/android/camera/app/CameraAppUI.java
rc/com/android/camera/widget/IndicatorIconController.java
rc_pd/com/android/camera/util/PhotoSphereHelper.java
|
50f66b17273046767ee131a559fbf402348e8fe9 |
22-Jan-2014 |
Angus Kong <shkong@google.com> |
Merge "Adjust bottom control button positions." into gb-ub-photos-denali
|
b9c4232ca171ac5ae659e0bcac177bedfc8b4e8a |
18-Jan-2014 |
Angus Kong <shkong@google.com> |
Adjust bottom control button positions. bug:12138517 Change-Id: Ife7511e232ba9f02ac83800df129fafaf65c0f46
es/layout/filmstrip_bottom_controls.xml
es/values/dimens.xml
es/values/styles.xml
rc/com/android/camera/app/FilmstripBottomControls.java
|
e7d745c15f1ee0f3a160e7601715e70f9646e6c0 |
21-Jan-2014 |
Erin Dahlgren <edahlgren@google.com> |
Add hdr option and indicator Bug: 12440745 Change-Id: I2e5b8d860a19cd1fd1299dc42d13b26b6b5e88ec
es/drawable-hdpi/ic_hdr_off_disabled.png
es/drawable-hdpi/ic_hdr_off_indicator.png
es/drawable-hdpi/ic_hdr_off_normal.png
es/drawable-hdpi/ic_hdr_on_disabled.png
es/drawable-hdpi/ic_hdr_on_indicator.png
es/drawable-hdpi/ic_hdr_on_normal.png
es/drawable-mdpi/ic_hdr_off_disabled.png
es/drawable-mdpi/ic_hdr_off_indicator.png
es/drawable-mdpi/ic_hdr_off_normal.png
es/drawable-mdpi/ic_hdr_on_disabled.png
es/drawable-mdpi/ic_hdr_on_indicator.png
es/drawable-mdpi/ic_hdr_on_normal.png
es/drawable-xhdpi/ic_hdr_off_disabled.png
es/drawable-xhdpi/ic_hdr_off_indicator.png
es/drawable-xhdpi/ic_hdr_off_normal.png
es/drawable-xhdpi/ic_hdr_on_disabled.png
es/drawable-xhdpi/ic_hdr_on_indicator.png
es/drawable-xhdpi/ic_hdr_on_normal.png
es/drawable-xxhdpi/ic_hdr_off_disabled.png
es/drawable-xxhdpi/ic_hdr_off_indicator.png
es/drawable-xxhdpi/ic_hdr_off_normal.png
es/drawable-xxhdpi/ic_hdr_on_disabled.png
es/drawable-xxhdpi/ic_hdr_on_indicator.png
es/drawable-xxhdpi/ic_hdr_on_normal.png
es/drawable/ic_hdr_off.xml
es/drawable/ic_hdr_on.xml
es/values/arrays.xml
rc/com/android/camera/ButtonManager.java
rc/com/android/camera/widget/IndicatorIconController.java
|
a1fab413bcbe5f62ae1d829bac0539519fef96a6 |
21-Jan-2014 |
Erin Dahlgren <edahlgren@google.com> |
Support for panorama and photosphere bottom bar ui. Bug: 12438294 Change-Id: If8a6f3b8aafd81980290655fb3ad461928f9c520
es/layout/generic_module.xml
es/layout/indicator_bottombar.xml
es/values/arrays.xml
es/values/strings.xml
rc/com/android/camera/ButtonManager.java
rc/com/android/camera/app/CameraAppUI.java
rc/com/android/camera/settings/SettingsCache.java
rc/com/android/camera/settings/SettingsManager.java
rc/com/android/camera/ui/BottomBar.java
rc/com/android/camera/widget/IndicatorIconController.java
|
b1641f5df0cf839b54385ea4d2e43521620fc237 |
15-Jan-2014 |
Erin Dahlgren <edahlgren@google.com> |
Remove global UI elements based on supported camera parameters. Bug: 12192238 Change-Id: I6373adeaa9c95385a2a4ca8d81cf7656550911f2
rc/com/android/camera/ButtonManager.java
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/PhotoUI.java
rc/com/android/camera/VideoModule.java
rc/com/android/camera/VideoUI.java
rc/com/android/camera/app/CameraAppUI.java
rc/com/android/camera/hardware/HardwareSpec.java
rc/com/android/camera/hardware/HardwareSpecImpl.java
rc/com/android/camera/module/ModuleController.java
|
847136dafd90effab61e3a462ecac573a9dec007 |
18-Jan-2014 |
Doris Liu <tianliu@google.com> |
Merge "Improve responsiveness of mode selection highlight" into gb-ub-photos-denali
|
108a8e71d0f8d1c86fa8e6095f69519320e3cd68 |
18-Jan-2014 |
Sascha Haeberling <haeberling@google.com> |
Change order of modules to spec. Bug: 12607061 Change-Id: Iff142b2571f17f71f7a76d629119ac4c8c7f2764
es/values/arrays.xml
rc/com/android/camera/module/ModulesInfo.java
|
82f133fdab566c83701d97e370a705cb3267d1dc |
18-Jan-2014 |
Doris Liu <tianliu@google.com> |
Improve responsiveness of mode selection highlight Bug: 12449459 Change-Id: Ifc5e42119e216827a187f6bb0b6f3c7d2f2bf672
rc/com/android/camera/ui/ModeListView.java
|
f0ff06568be3404d5f0abfc6bf5d953b98b4a7fc |
17-Jan-2014 |
Spike Sprague <spikuru@google.com> |
Merge "black background in image_capture intent review ui." into gb-ub-photos-denali
|
d4c5070dfcd7007654ad71ab292d1909c0091ceb |
17-Jan-2014 |
Spike Sprague <spikuru@google.com> |
black background in image_capture intent review ui. bug: 12606986 Change-Id: I1ee01eba431b7576094445c86c5c577a851c90c3
rc/com/android/camera/ui/BottomBar.java
|
f77f5d207fc7e8b1c6a863ea9a177e48648ab4d2 |
17-Jan-2014 |
Andy Huibers <andyhuibers@google.com> |
Merge "Fix for video parameter setting bug on Nexus 5. Fixes b/12250181 and b/12481202." into gb-ub-photos-denali
|
661ae233922a24dc68100fbc274441f1ab2d372e |
17-Jan-2014 |
Kevin Gabayan <gabayan@google.com> |
Merge "Measure time to first valid preview frame in testImageCapture. Bug: 11999851" into gb-ub-photos-denali
|
a0e8347f9cfb583f90543635c5c86dc9252526e1 |
16-Jan-2014 |
Kevin Gabayan <gabayan@google.com> |
Measure time to first valid preview frame in testImageCapture. Bug: 11999851 Change-Id: Iec695d7de98454435fc9ae239a500fedb9eee894
roguard.flags
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/app/CameraAppUI.java
ests/src/com/android/camera/stress/CameraLatency.java
|
845e1c38b1857dafc0bffbe94556a1426c79862c |
17-Jan-2014 |
Spike Sprague <spikuru@google.com> |
Merge "3 dots press state in bottom bar should be sticky" into gb-ub-photos-denali
|
64abfe999a7f7e64404eb0ec7372f5f85e45087c |
15-Jan-2014 |
Andy Huibers <andyhuibers@google.com> |
Fix for video parameter setting bug on Nexus 5. Fixes b/12250181 and b/12481202. Change-Id: I64da29470a0c9e2a418fd614e41d181c42ece388
rc/com/android/camera/VideoModule.java
|
faff7572a91ea9b6456b3c223bdefc5a155e1ecb |
17-Jan-2014 |
Spike Sprague <spikuru@google.com> |
Change the press state transparency value in the video bottom bar bug: 12600857 Change-Id: I12852fb936443bef67211ba21ed51a4fb9feae28
es/drawable/button_background_pressed_dark.xml
|
dd58749b4e785ea34f23339eabc4bc3040aa1349 |
17-Jan-2014 |
Spike Sprague <spikuru@google.com> |
3 dots press state in bottom bar should be sticky bug: 12600702 Change-Id: Ibd6725e8441775d6d6bced08280430e180bd1c37
es/drawable/ic_options_active.xml
es/values/arrays.xml
|
38c6bc33c306873f6dfdfa3714386be305934392 |
17-Jan-2014 |
Doris Liu <tianliu@google.com> |
Hide focus UI during recording Bug: 12584173 Change-Id: Ibca621b9b961a480b48950f668eb7f6da9055619
rc/com/android/camera/VideoModule.java
rc/com/android/camera/VideoUI.java
|
b4f5d167a15f5cb12fa609195cb4a3e7641ce883 |
16-Jan-2014 |
Carlos Hernandez <chernand@google.com> |
Pass CameraServices to ProcessingTask Change-Id: Ie9c06fe4e03afc6eb051a9bb17ee985251b53d62
|
284a7d5af25d6d89364b4255ead1d0ef659b3625 |
16-Jan-2014 |
Carlos Hernandez <chernand@google.com> |
Merge "Pass CameraServices to ProcessingTask" into gb-ub-photos-denali
|
8066ce460f506506881502d7a9e397fb826a3bad |
16-Jan-2014 |
Spike Sprague <spikuru@google.com> |
Merge "video capture button tweak" into gb-ub-photos-denali
|
4897f4c39628a01ee82206f9cd56e418ddcc10cc |
16-Jan-2014 |
Spike Sprague <spikuru@google.com> |
build break fix Change-Id: I0178453fc19acb76cb612e84e43a0530d2fb7e49
rc/com/android/camera/ui/BottomBar.java
|
4dae414b0e4ad4d6528ee04f0761fbe9eacca5ce |
16-Jan-2014 |
Spike Sprague <spikuru@google.com> |
video capture button tweak bug: 12563852 Change-Id: I39a242ca4cd3832eefd2e205d287d64ceba309b1
es/values/dimens.xml
rc/com/android/camera/ui/BottomBar.java
|
6bc9ecc2999bd3869248eaa55bdef5839c9afd45 |
16-Jan-2014 |
Erin Dahlgren <edahlgren@google.com> |
Merge "Set the shutter button icon across all modes." into gb-ub-photos-denali
|
8d72bc60c9bb45ff49db280dd898ee7f34e690cf |
16-Jan-2014 |
Spike Sprague <spikuru@google.com> |
Merge "button background press states" into gb-ub-photos-denali
|
fecd723c1cfd90332cd2805be79a24f26643ebb9 |
16-Jan-2014 |
Erin Dahlgren <edahlgren@google.com> |
Set the shutter button icon across all modes. Bug: 12552362 Change-Id: I55d4238b0ddbc4bb3ea206dc577381b6de2f68a7
es/values/arrays.xml
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/PhotoUI.java
rc/com/android/camera/VideoModule.java
rc/com/android/camera/VideoUI.java
rc/com/android/camera/app/CameraAppUI.java
rc/com/android/camera/util/CameraUtil.java
|
f3b25654821669002fa2e037530b377209817ede |
16-Jan-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Add 10MP Moto X resolution." into gb-ub-photos-denali
|
206dabd2f882744fc176d980705be6c3b683a5ff |
16-Jan-2014 |
Sascha Haeberling <haeberling@google.com> |
Add 10MP Moto X resolution. Bug: 12586353 Change-Id: Ie29227df3dbaca1eed52ced222c8d1868710aa9d
es/values/arrays.xml
es/values/strings.xml
|
57d2f873a78807bca84d4846e39cb2b73a0c8f82 |
16-Jan-2014 |
Carlos Hernandez <chernand@google.com> |
Pass CameraServices to ProcessingTask Change-Id: Ie9c06fe4e03afc6eb051a9bb17ee985251b53d62
rc/com/android/camera/processing/ProcessingService.java
rc/com/android/camera/processing/ProcessingTask.java
|
55007febc18832eebf3cedd3d8497f9bcb221b9d |
16-Jan-2014 |
Angus Kong <shkong@google.com> |
Merge "Change refocus icon asset." into gb-ub-photos-denali
|
00b3371ca5c3340a81174ea5443443a9176d5130 |
16-Jan-2014 |
Angus Kong <shkong@google.com> |
Change refocus icon asset. bug:12550183 Change-Id: Iad54468a1f88bcc23e68ebda39931c93c5ee407d
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/app/CameraAppUI.java
rc/com/android/camera/app/FilmstripBottomControls.java
|
66a3e6ceb306833355acb740711ccb5c53576e0a |
15-Jan-2014 |
Spike Sprague <spikuru@google.com> |
button background press states bug: 12450227 Change-Id: I9008a4d57545bd081a4c6539c64d23b939d4ab95
es/drawable/button_background_dark.xml
es/drawable/button_background_pressed_dark.xml
es/drawable/button_background_pressed_light.xml
es/drawable/ic_back.xml
es/drawable/ic_cancel.xml
es/drawable/ic_confirm.xml
es/drawable/ic_flash_auto.xml
es/drawable/ic_flash_off.xml
es/drawable/ic_flash_on.xml
es/drawable/ic_hdr_plus_off.xml
es/drawable/ic_hdr_plus_on.xml
es/drawable/ic_options.xml
es/drawable/ic_play.xml
es/drawable/ic_refocus.xml
es/drawable/ic_refocus_off.xml
es/drawable/ic_stop.xml
es/drawable/ic_switch_camera_back.xml
es/drawable/ic_switch_camera_front.xml
es/values/arrays.xml
rc/com/android/camera/MultiToggleImageButton.java
rc/com/android/camera/ui/BottomBar.java
|
6a3fa7357fc80273a2c5ec784683cf89da71b4bb |
16-Jan-2014 |
Doris Liu <tianliu@google.com> |
Merge "Fix focus indicator slightly off center during CAF" into gb-ub-photos-denali
|
c30ca9776999611863cbf7cb623c6d9d47ecbb1c |
16-Jan-2014 |
Doris Liu <tianliu@google.com> |
Merge "Add quick switch support for advanced camera" into gb-ub-photos-denali
|
61c2b0d43a040123ff725a28038bb7cc01370ed5 |
16-Jan-2014 |
Doris Liu <tianliu@google.com> |
Fix focus indicator slightly off center during CAF Change-Id: I5eaf14682e81d95f738a356985eb8d40bdc54524
rc/com/android/camera/FocusOverlayManager.java
|
cf8b653a7697406d6bed2bf8f9b970b17e47e4ef |
16-Jan-2014 |
Doris Liu <tianliu@google.com> |
Add quick switch support for advanced camera Bug: 12429444 Change-Id: I62d5a5b3ce2b8d0ca8d19c8f3a35363114815b20
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/app/ModuleManagerImpl.java
rc/com/android/camera/settings/SettingsCache.java
rc/com/android/camera/settings/SettingsManager.java
|
6fb7342dfcc8a24351032511977fea628d119faf |
16-Jan-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Disables swipe during video recording and during photo sphere sessions." into gb-ub-photos-denali
|
dc9f119b2c4473c418811db28963b579b659b2be |
16-Jan-2014 |
Angus Kong <shkong@google.com> |
Merge "Make up affordance dependent on installed packages" into gb-ub-photos-denali
|
6c0c7f1281425f4296cb1a42563d00ae056cd14a |
15-Jan-2014 |
Angus Kong <shkong@google.com> |
Make up affordance dependent on installed packages bug:12549744 Change-Id: I3b39ccb45518f1044c2149bd5b8c633a6899d96c
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/util/IntentHelper.java
rc_pd/com/android/camera/util/GalleryHelper.java
rc_pd/com/android/camera/util/IntentHelper.java
|
8793eff1b85bda89047316fed36cdc1161a8b811 |
16-Jan-2014 |
Sascha Haeberling <haeberling@google.com> |
Disables swipe during video recording and during photo sphere sessions. Bug: 12554964 Change-Id: I2ab1ae34ae6964371680418eac3583b2e766b26c
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/VideoModule.java
rc/com/android/camera/app/CameraAppUI.java
rc/com/android/camera/ui/MainActivityLayout.java
|
9066d369ba3b39576029b6acc511d839132b1248 |
16-Jan-2014 |
Spike Sprague <spikuru@google.com> |
Merge "adjusted capture button highlight as per comments in b/12560596" into gb-ub-photos-denali
|
e3f095bd84ba5a07d5fba1020a28d40d067d187c |
16-Jan-2014 |
Spike Sprague <spikuru@google.com> |
adjusted capture button highlight as per comments in b/12560596 Change-Id: I9326121e8836898035ecfc6254467567f7b4c431
rc/com/android/camera/ui/BottomBar.java
|
3f787e389fc9912955ac58e42028b14a0776ef9e |
16-Jan-2014 |
Spike Sprague <spikuru@google.com> |
Merge "snappier video bottom bar animation" into gb-ub-photos-denali
|
b63f79b61b4f48c287b0fd95a3146e109ad5e31e |
15-Jan-2014 |
Doris Liu <tianliu@google.com> |
Merge "Open mode draw at a constant speed when there's a fast fling" into gb-ub-photos-denali
|
6c5a5375524efe7e5160f92edcaad121c7fbdb07 |
15-Jan-2014 |
Doris Liu <tianliu@google.com> |
Open mode draw at a constant speed when there's a fast fling Bug:12544207 Change-Id: I104d81c0a74bb46f38ff8cd61dd9f13a2d615ed7
rc/com/android/camera/ui/ModeListView.java
|
53849ec08351e9c008a8043529e7d8fd28dd7e7c |
15-Jan-2014 |
Erin Dahlgren <edahlgren@google.com> |
Remove conflicting refocus pngs. Bug: 12567150 Change-Id: I56f6639cab5933e5e672572d4cd5a84042893f54
es/drawable-hdpi/ic_refocus_off.png
es/drawable-mdpi/ic_refocus_off.png
es/drawable-xhdpi/ic_refocus_off.png
es/drawable-xxhdpi/ic_refocus_off.png
|
217512ce074220090a8ede01adf0406a70f4958f |
15-Jan-2014 |
Spike Sprague <spikuru@google.com> |
snappier video bottom bar animation bug: 12568407 Change-Id: I827b5d6c0e39ad704bd0b8aef1a8feaad7d6614f
rc/com/android/camera/ui/BottomBar.java
|
2d214f7aca00a379000339c22cdf1c5b3caff1bb |
15-Jan-2014 |
Angus Kong <shkong@google.com> |
Merge "Fix size of filmstrip bottom controls sizes." into gb-ub-photos-denali
|
85abf32f41e18e0825dd0d5588d2ee0d1711822a |
15-Jan-2014 |
Erin Dahlgren <edahlgren@google.com> |
Merge "On screen indicators in top right in landscape." into gb-ub-photos-denali
|
cf9010d314a5a263a3f0e9fa9abf16a80f26d281 |
15-Jan-2014 |
Spike Sprague <spikuru@google.com> |
refine capture button hilight area bug: 12560596 Change-Id: Ib0032bc6be21107361605f109caa5e5de7e4b682
rc/com/android/camera/ui/BottomBar.java
|
d205db42440771e324c1a7032eeb0e24fa6d8493 |
15-Jan-2014 |
Angus Kong <shkong@google.com> |
Fix size of filmstrip bottom controls sizes. bug:12550232 Change-Id: Ib73d0ccf16304b706781ea2760d22c668cde2aa8
es/layout/filmstrip_bottom_controls.xml
es/values/styles.xml
|
59401045bf479b2617c981075aec92190ec59aeb |
15-Jan-2014 |
Doris Liu <tianliu@google.com> |
Fix face view in simple camera Part II at ag/407562 Bug: 12460604 Change-Id: I9532d5dae7c156568fef944b81127c6ff194a394
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/PhotoUI.java
rc/com/android/camera/ui/FaceView.java
|
0c46e2c5d626abc206cf4b0d1a9829a4e916f591 |
15-Jan-2014 |
Angus Kong <shkong@google.com> |
Merge "Returns unwrapped refreshed in-progress data." into gb-ub-photos-denali
|
22e74c1014f6710cceb33fd801fde0e34247851d |
15-Jan-2014 |
Angus Kong <shkong@google.com> |
Returns unwrapped refreshed in-progress data. bug:12550918 Change-Id: Ia5794abb96abb980c06e874f4fd5d08ca5884343
rc/com/android/camera/data/InProgressDataWrapper.java
|
de3e438679092ef66222bc691a046864d5436047 |
14-Jan-2014 |
Angus Kong <shkong@google.com> |
Up affordance should act as back key in 1up view. bug:12549094 Change-Id: Id19e2532d9aae929ee15e518a6cd125ff4e550ac
rc/com/android/camera/CameraActivity.java
|
42ad3668e3d41d30bee01e88ba648362529d91b6 |
15-Jan-2014 |
Erin Dahlgren <edahlgren@google.com> |
On screen indicators in top right in landscape. Bug: 12525286 Change-Id: I5c56d0498504b2ec37211523c6212b6925ec7bf5
rc/com/android/camera/widget/IndicatorOverlay.java
|
4567160a43fa5787012bf0b618c216cf18ac0457 |
14-Jan-2014 |
Angus Kong <shkong@google.com> |
Add more filmstrip fullscreen states. And callbacks for new state events also. bug:12468756 Change-Id: I0ebdd99f251394a871c1e050e565fc5cd1706324
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/filmstrip/FilmstripController.java
rc/com/android/camera/widget/FilmstripLayout.java
rc/com/android/camera/widget/FilmstripView.java
|
796a3099e03efe661e4a58ef26c5b554734f1898 |
14-Jan-2014 |
Erin Dahlgren <edahlgren@google.com> |
Merge "Fix stale button references." into gb-ub-photos-denali
|
f1b2e407b20ff16fe793158c598e59799c1990ef |
14-Jan-2014 |
Erin Dahlgren <edahlgren@google.com> |
Fix stale button references. Bug: 12537343 Change-Id: I9c48f9dcfe82afbf89562010daf94b767d53911c
rc/com/android/camera/ButtonManager.java
rc/com/android/camera/app/CameraAppUI.java
|
eaa4d37f8bfb25ffea438f9045867140a63ba0e1 |
14-Jan-2014 |
Spike Sprague <spikuru@google.com> |
fix for bottom bar not taking set color immediately half of b/12537343 Change-Id: Ib9fe344be9c6d24af6b6b246f13070d4c21d00f1
rc/com/android/camera/ui/BottomBar.java
|
a1ec04a9f9526418f5cb17a5afbfc48aca1e02d0 |
14-Jan-2014 |
Doris Liu <tianliu@google.com> |
Add aggressive continuous auto focus to video preview Also added touch to focus for video preview Part II is at ag/407029 Bug: 12368866 Change-Id: I8dd544d5bb6b5128ae99c9b7fe4dffeb1f843ab9
es/layout/video_module.xml
rc/com/android/camera/FocusOverlayManager.java
rc/com/android/camera/PhotoController.java
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/TextureViewHelper.java
rc/com/android/camera/VideoModule.java
rc/com/android/camera/VideoUI.java
rc/com/android/camera/ui/BottomBar.java
rc/com/android/camera/ui/CaptureAnimationOverlay.java
rc/com/android/camera/ui/PreviewOverlay.java
rc/com/android/camera/ui/PreviewStatusListener.java
rc/com/android/camera/widget/IndicatorOverlay.java
|
b92910e04c4da91fc4ea5a9484b83f9ecba1c896 |
14-Jan-2014 |
Spike Sprague <spikuru@google.com> |
capture button pressed colors Change-Id: Ia568be11e6f9b6160f3f8332b504866cbe6ac94f
es/layout-land/bottom_bar.xml
es/values/arrays.xml
es/values/colors.xml
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/app/CameraAppUI.java
rc/com/android/camera/ui/BottomBar.java
rc/com/android/camera/util/CameraUtil.java
|
39f8a7647aa4051a1c260b9496c2db82f93f8667 |
13-Jan-2014 |
Spike Sprague <spikuru@google.com> |
new video bottom bar ui crossfade record <-> stop full bar <-> single button cicle wipe Change-Id: I58e0ddd94221374809acd52a6f0649e419203f54
es/layout-port/bottom_bar.xml
rc/com/android/camera/ButtonManager.java
rc/com/android/camera/PhotoUI.java
rc/com/android/camera/VideoModule.java
rc/com/android/camera/VideoUI.java
rc/com/android/camera/app/CameraAppUI.java
rc/com/android/camera/ui/BottomBar.java
|
fe8bb56cbd17334cb03cb6648a89ebe2e07dce1c |
14-Jan-2014 |
Angus Kong <shkong@google.com> |
Merge "Move external view button to the bottom" into gb-ub-photos-denali
|
07202a478f5c1c4781a3a90b4985c2b618587f93 |
14-Jan-2014 |
Angus Kong <shkong@google.com> |
Move external view button to the bottom Change-Id: Ic7a213335b6a5bddacb2ea5ed450626fc5bdbc69
es/layout/filmstrip_bottom_controls.xml
|
dc07ee44ba52f8918f5c629fe6ffcc5ec41c9083 |
14-Jan-2014 |
Erin Dahlgren <edahlgren@google.com> |
Merge "Sync dependencies between bottom bar options." into gb-ub-photos-denali
|
1560566618696dc8a7aedc8f11da8b36afdf74da |
14-Jan-2014 |
Erin Dahlgren <edahlgren@google.com> |
Merge "Match dimens of TopRightMostOverlay child with the ReferenceView." into gb-ub-photos-denali
|
0a6a8d8e4e1c9796aac606379a42970cdffb8911 |
10-Jan-2014 |
Erin Dahlgren <edahlgren@google.com> |
Sync dependencies between bottom bar options. * Centralizes the bottom bar button customization. * Makes HDR+ and front camera exclusive. Bug: 12469207 Change-Id: I65e3d16d314a26889f04e9bcc26fa4bf095150b7 Conflicts: src/com/android/camera/ButtonManager.java
rc/com/android/camera/ButtonManager.java
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/PhotoUI.java
rc/com/android/camera/VideoModule.java
rc/com/android/camera/VideoUI.java
rc/com/android/camera/app/AppController.java
rc/com/android/camera/app/CameraAppUI.java
rc/com/android/camera/module/ModuleController.java
|
626961145aab5cb2186d33c5cd44071fb9ee7a61 |
13-Jan-2014 |
Angus Kong <shkong@google.com> |
Merge "Clear the camera instance before switching." into gb-ub-photos-denali
|
d391ac0ad8df7dd7d4a9c8ba6fd220040f6a1f98 |
13-Jan-2014 |
Erin Dahlgren <edahlgren@google.com> |
Merge "Sync new ux-assets." into gb-ub-photos-denali
|
e72586b85b155525b0ccf413d577baa282067235 |
13-Jan-2014 |
Erin Dahlgren <edahlgren@google.com> |
Sync new ux-assets. Change-Id: I12bf5f8b058cda17517943c76a826ce9887392ed
es/drawable-hdpi/ic_flash_off_indicator.png
es/drawable-hdpi/ic_flash_on_indicator.png
es/drawable-hdpi/ic_switch_camera_front_disabled.png
es/drawable-mdpi/ic_flash_off_indicator.png
es/drawable-mdpi/ic_flash_on_indicator.png
es/drawable-mdpi/ic_switch_camera_front_disabled.png
es/drawable-xhdpi/ic_flash_off_indicator.png
es/drawable-xhdpi/ic_flash_on_indicator.png
es/drawable-xhdpi/ic_switch_camera_front_disabled.png
es/drawable-xxhdpi/ic_flash_off_indicator.png
es/drawable-xxhdpi/ic_flash_on_indicator.png
es/drawable-xxhdpi/ic_switch_camera_front_disabled.png
|
ede9a42724ae235ea4f1cdfb1398841a1e1a3eb2 |
13-Jan-2014 |
Erin Dahlgren <edahlgren@google.com> |
Match dimens of TopRightMostOverlay child with the ReferenceView. Change-Id: I356059893bcc3bb8ffda1aef9726f8df4466f42c
es/layout/bottom_bar_contents.xml
rc/com/android/camera/ui/TopRightMostOverlay.java
|
cae54999e15d871cb93bf923423f9066f0330ba3 |
13-Jan-2014 |
Erin Dahlgren <edahlgren@google.com> |
Merge "Ensure that SharedPreference listeners respond to known keys." into gb-ub-photos-denali
|
ed413d8a432c88c91af5334e700edefdb927bbe6 |
13-Jan-2014 |
Erin Dahlgren <edahlgren@google.com> |
Merge "Make Front and back camera a mode specific setting." into gb-ub-photos-denali
|
6346ddcab47fc0a4b0b9dd7f96e3ef0002939960 |
13-Jan-2014 |
Erin Dahlgren <edahlgren@google.com> |
Ensure that SharedPreference listeners respond to known keys. Bug: 12439970 Change-Id: Ic4cbfd9823a17294af3b2d3eecd654131bf92cd5
rc/com/android/camera/settings/SettingsManager.java
|
d186f22622752ae9735715f31e8a4318290c987d |
10-Jan-2014 |
Erin Dahlgren <edahlgren@google.com> |
Make Front and back camera a mode specific setting. Bug: 12467987 Change-Id: I69b788565979bb45df511974e1e494f7a5ffe9d8
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/settings/SettingsManager.java
|
2520b5033461422b4aa2f33422656ffd9394b81f |
11-Jan-2014 |
Angus Kong <shkong@google.com> |
Refresh the current item after editing We currently only support calling external editor on the current item of filmstrip. After returning from other apps, we should refresh the current item in case it's modified. Also handles the case of data being removed. bug:12412022 Change-Id: Idf86603ffd75a825f1311f83b3d38181d1eba16f
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/data/CameraDataAdapter.java
rc/com/android/camera/data/InProgressDataWrapper.java
rc/com/android/camera/data/SimpleViewData.java
|
712f9a8c449ae22c9b923242a6019a12a0f1f18f |
10-Jan-2014 |
Spike Sprague <spikuru@google.com> |
Merge "make buttons opaque when bottom bar is translucent" into gb-ub-photos-denali
|
0e037fd58fd7bf97f286184f1c369228434e3bc1 |
10-Jan-2014 |
Erin Dahlgren <edahlgren@google.com> |
Bring on screen indicators up to spec. * 48x48dp background radius * 20dp padding on overlay * background color 30% opaque black Bug: 12368905 Change-Id: Iaff0d915ed64a9a499574bc0728e79159dd121dd
es/layout/generic_module.xml
es/values/colors.xml
es/values/dimens.xml
es/values/styles.xml
|
f63967a175cabd57fcbc20275cc7918bc34b2baf |
02-Jan-2014 |
Erin Dahlgren <edahlgren@google.com> |
Show registered modes as default camera options. Bug: 12178782 Change-Id: I1dc4c3d9a6bf6448e0083b508210577584a35a1c
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/SettingsController.java
rc/com/android/camera/ui/SettingsView.java
|
18bc7e0a3102fa67b719a6f8b5b2e9590a6d4a6c |
10-Jan-2014 |
Erin Dahlgren <edahlgren@google.com> |
Merge "Add a refocus on screen indicator." into gb-ub-photos-denali
|
6346571cd8cda5880fa80214d36b6e7800ca7e9c |
10-Jan-2014 |
Erin Dahlgren <edahlgren@google.com> |
Merge "Close bottom bar options menu on specific triggers." into gb-ub-photos-denali
|
56688f7019fbe4dee110b7600349f48da9fff601 |
09-Jan-2014 |
Erin Dahlgren <edahlgren@google.com> |
Close bottom bar options menu on specific triggers. * on touching anywhere in the preview * after n milliseconds after touching an option Bug: 12447283 Change-Id: If44d83a601b4281711f7006b2ab771edfd588117
es/layout/bottom_bar_contents.xml
rc/com/android/camera/app/CameraAppUI.java
rc/com/android/camera/ui/BottomBar.java
rc/com/android/camera/ui/PreviewOverlay.java
|
a906809bd3e67f3ceaa070baefbdca8c9cb3d766 |
10-Jan-2014 |
Erin Dahlgren <edahlgren@google.com> |
Add a refocus on screen indicator. Bug: 12475491 Change-Id: Icf62df3232c2f129cd8c09f4b27464d4e645d762
es/layout/generic_module.xml
rc/com/android/camera/app/CameraAppUI.java
rc/com/android/camera/widget/IndicatorIconController.java
|
1f9db2dfe59c33228103c54523281501ef52c9ba |
09-Jan-2014 |
Angus Kong <shkong@google.com> |
Continue the animation after the data is updated. When the data is updated, the animation is interrupted because of the original view is replaced by the new one from the new data. We should copy the original animation and continue. Handles the condition when the last photo is deleted. Also some refinement of the codes. bug:12196441 bug:12476802 Change-Id: I2139b09bf5f958af6fa21b91e3d0c14908e1ba79
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/filmstrip/FilmstripContentPanel.java
rc/com/android/camera/widget/FilmstripLayout.java
rc/com/android/camera/widget/FilmstripView.java
|
0cbeaaadce1b50200701a33afc5dff1a4fe4bcd7 |
09-Jan-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Move Refocus' processing service to common code." into gb-ub-photos-denali
|
bd1b8f910d6f2c94daac304f4bd1a098939474c3 |
04-Jan-2014 |
Doris Liu <tianliu@google.com> |
Centralize camera mode resources Moved camera mode related resources such as mode theme color, mode icon, text, mode id, etc to resources xml. And created utility functions to query for them. Part II at ag/404854 Change-Id: I828502c76851cc2ed0b632b1ed4bb7f702fee231
es/values/arrays.xml
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/PhotoUI.java
rc/com/android/camera/app/AppController.java
rc/com/android/camera/app/CameraAppUI.java
rc/com/android/camera/app/ModuleManager.java
rc/com/android/camera/app/ModuleManagerImpl.java
rc/com/android/camera/module/ModulesInfo.java
rc/com/android/camera/ui/ModeListView.java
rc/com/android/camera/util/CameraUtil.java
rc/com/android/camera/widget/IndicatorIconController.java
|
c9fb1e8a9d9ed163ad2c70da178bcccb36626dde |
09-Jan-2014 |
Spike Sprague <spikuru@google.com> |
make buttons opaque when bottom bar is translucent bug: 12450498 Change-Id: I61891ab4118efd9b4ebca1c1a4a9a00eabb213cb
rc/com/android/camera/ui/BottomBar.java
|
6b174190b43bb4c2d7a5493e4f117ef6aac5f684 |
09-Jan-2014 |
Spike Sprague <spikuru@google.com> |
video capture icon bug: 12440820 Change-Id: I276e1260c494519beaf95258129e1f240bdafd59
rc/com/android/camera/ButtonManager.java
rc/com/android/camera/PhotoUI.java
rc/com/android/camera/VideoUI.java
|
dd2d9e610aa9dc71fe0938f38de43bb0e26f3bb2 |
07-Jan-2014 |
Sascha Haeberling <haeberling@google.com> |
Move Refocus' processing service to common code. Bug: 12080035 Bug: 12211113 Also mimic the ServiceManager interface we use for Photo Sphere to make interacting with the service easier. It now starts up automatically and shuts down after the queue is processed. Change-Id: Ie48ec8bc1ab55ff10ce6965a660239eb579b5499
rc/com/android/camera/app/CameraApp.java
rc/com/android/camera/processing/ProcessingService.java
rc/com/android/camera/processing/ProcessingServiceManager.java
rc/com/android/camera/processing/ProcessingTask.java
|
e2a1f54fbf6a8a7beff5b7695654ca21e63643af |
08-Jan-2014 |
Erin Dahlgren <edahlgren@google.com> |
Add dynamically sized transparent background to indicators. Change-Id: Ie9d8214b665ae134fda66c17707d50040cf3f837
es/drawable/bg_indicators.xml
es/layout/generic_module.xml
es/values/arrays.xml
es/values/colors.xml
rc/com/android/camera/app/CameraAppUI.java
rc/com/android/camera/widget/IndicatorIconController.java
rc/com/android/camera/widget/IndicatorOverlay.java
|
7aec5f79ed4492cd89033c8c0a7afc39dba6742e |
09-Jan-2014 |
Erin Dahlgren <edahlgren@google.com> |
Merge "Layout on screen indicators in landscape startup." into gb-ub-photos-denali
|
a2c42decd4d76fda067f53e13e0ad568b637f997 |
09-Jan-2014 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-denali
|
aacd26b956967c4e3f085979ce9fb2edbf50ff51 |
08-Jan-2014 |
Erin Dahlgren <edahlgren@google.com> |
Layout on screen indicators in landscape startup. Change-Id: I20ca5b54a6f7417b0d2c0bda743d08f53a369039
rc/com/android/camera/ui/RotatableLinearLayout.java
|
d4109bc69f48cebedc3feec0effddbf65c93f353 |
09-Jan-2014 |
Angus Kong <shkong@google.com> |
Clear the camera instance before switching. bug:12452510 Change-Id: If8bbd4d8a15ce2ba65659c02063da3a2960142ce
rc/com/android/camera/PhotoModule.java
|
fe47650a9cac114ca0a16697e3b13ab70893f352 |
09-Jan-2014 |
Doris Liu <tianliu@google.com> |
Merge "Stops playing shimmy after 10 sessions where mode drawer is swiped open" into gb-ub-photos-denali
|
2c559c4bd3c65e0cb0bca06f30e3bc979038e6f7 |
09-Jan-2014 |
Doris Liu <tianliu@google.com> |
Stops playing shimmy after 10 sessions where mode drawer is swiped open Bug: 12412506 Change-Id: Ib2e62fa93c5e1bca5eb547a6a74f688f0b0cb633
es/values/strings.xml
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/app/AppController.java
rc/com/android/camera/app/CameraAppUI.java
rc/com/android/camera/settings/SettingsCache.java
rc/com/android/camera/settings/SettingsManager.java
rc/com/android/camera/ui/ModeListView.java
|
f05962f4e05a9e29faef001ddf3a206f2b554d42 |
26-Dec-2013 |
Emil Arfvidsson <ear@google.com> |
Move the Gallery shortcut to the action bar. Change-Id: I0f2c7c72ff9ed3b5a243350b562cd4432bea1911
es/layout/filmstrip_bottom_controls.xml
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/app/CameraAppUI.java
rc/com/android/camera/app/FilmstripBottomControls.java
rc_pd/com/android/camera/util/IntentHelper.java
|
dd4300ec89e82a1ba1bb85678d54a48f6b6ac9d9 |
08-Jan-2014 |
Angus Kong <shkong@google.com> |
Merge "Remove the dependency on CameraHolder." into gb-ub-photos-denali
|
d74e6a1014278e1a05c802e3ed594381288c6381 |
07-Jan-2014 |
Angus Kong <shkong@google.com> |
Remove the dependency on CameraHolder. Change-Id: I39882f1bf2a4cd730d00ceabc7705692bcee6bc0
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/CameraBackupAgent.java
rc/com/android/camera/CameraButtonIntentReceiver.java
rc/com/android/camera/CameraHolder.java
rc/com/android/camera/CameraModule.java
rc/com/android/camera/CameraSettings.java
rc/com/android/camera/CameraTestDevice.java
rc/com/android/camera/ComboPreferences.java
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/util/CameraUtil.java
ests_camera/src/com/android/camera/activity/CameraActivityTest.java
ests_camera/src/com/android/camera/activity/CameraTestCase.java
|
5ca8e7f149a1a20513ea4c9a04e339f1f45486d5 |
08-Jan-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I41e0cb85355e515b08a0ab86d72466a91fc126e4 Auto-generated-cl: translation import
es/values-km-rKH/strings.xml
|
4fd9654839531d1b0ccb73833fc0e2c2bdadf029 |
08-Jan-2014 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Id0064b0fc89d4b42e15174d081e2f2993e1c20f6 Auto-generated-cl: translation import
es/values-km-rKH/strings.xml
|
43f2ddd9e10560a4140cc06cf3fb20f49ffb10b2 |
08-Jan-2014 |
Spike Sprague <spikuru@google.com> |
emergency fix for capture button triggering settings button bug: 12441462 Change-Id: I1c386450331ebceb3bcabf1014ec4202b07f0d75
es/layout/bottom_bar_contents.xml
|
cb99b3d61f6451b84e263949910a1fb7b9893a12 |
08-Jan-2014 |
Erin Dahlgren <edahlgren@google.com> |
Unify setting the bottom bar color. * Camera, Video, Advanced Camera Change-Id: I862543c52372e0028debda7e89a56ebf8e737270
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/PhotoUI.java
rc/com/android/camera/VideoUI.java
|
37b9f92c89d6d130bd54892c157bc6b614110daf |
08-Jan-2014 |
Erin Dahlgren <edahlgren@google.com> |
Merge "Show onscreen indicators for enabled and visible options." into gb-ub-photos-denali
|
1848494bd09c85002d8c59d4feb8a6e0dc32871f |
07-Jan-2014 |
Erin Dahlgren <edahlgren@google.com> |
Show onscreen indicators for enabled and visible options. Bug: 12434780 Change-Id: I85a3efba46303fc47f456d696d89b0ca2997f9f6
rc/com/android/camera/ButtonManager.java
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/PhotoUI.java
rc/com/android/camera/VideoUI.java
rc/com/android/camera/app/AppController.java
rc/com/android/camera/app/CameraAppUI.java
rc/com/android/camera/widget/IndicatorOverlay.java
|
a3ea885b11b13fc86bc750e09355313c644d2178 |
07-Jan-2014 |
Spike Sprague <spikuru@google.com> |
Merge "extending button hitbox to entire bar height; added bottom bar touch listerner to fire capture" into gb-ub-photos-denali
|
ed4bdc0d3f50a6960eae44099a764bf8cdd7a731 |
07-Jan-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Enable lights-out mode at all times." into gb-ub-photos-denali
|
3b92e2f8e6d91af1b83c8bee95bd93e7153b96da |
02-Jan-2014 |
Spike Sprague <spikuru@google.com> |
extending button hitbox to entire bar height; added bottom bar touch listerner to fire capture Change-Id: I4d969060acf2abe2863e15b9c8f2219303e62eca
es/layout/bottom_bar_contents.xml
rc/com/android/camera/ui/BottomBar.java
rc/com/android/camera/ui/TopRightWeightedLayout.java
|
20639e78e441c19752d22ceb54e48115c6084c73 |
07-Jan-2014 |
Sascha Haeberling <haeberling@google.com> |
Enable lights-out mode at all times. Bug: 12429885 Change-Id: I92481003b408cd63334dd8dd4b2df1603b7432e3
rc/com/android/camera/CameraActivity.java
|
972444354413f33c28f043a40dd3c7afd1560808 |
07-Jan-2014 |
Doris Liu <tianliu@google.com> |
Merge "Handle camera orientation change when device is flipped" into gb-ub-photos-denali
|
11ddd7389b89e9a876eba607e246e8b8d0dfecdf |
07-Jan-2014 |
Doris Liu <tianliu@google.com> |
Handle camera orientation change when device is flipped Bug: 12414864 Bug: 12179046 Change-Id: I645709bdfe6ae5678b4a59b7c4a4c893c2827b52
rc/com/android/camera/PhotoUI.java
rc/com/android/camera/VideoUI.java
rc/com/android/camera/app/CameraAppUI.java
rc/com/android/camera/ui/PreviewStatusListener.java
|
49c47c3453242ec035b1d7d40e7cbc51f7994485 |
07-Jan-2014 |
Erin Dahlgren <edahlgren@google.com> |
Merge "Make refocus and hdr+ sticky on mode change." into gb-ub-photos-denali
|
8da34528738117f2dfe024c04b49578f724cb4fd |
07-Jan-2014 |
Erin Dahlgren <edahlgren@google.com> |
Avoid ConcurrentModificationException in SettingsManager. Bug: 12433904 Change-Id: I7d7f3ebf0a17f5e01c4e0ea8b5731a0bac9095d2
rc/com/android/camera/settings/SettingsManager.java
|
a340f0755c4a0037ead0419687204700d1101998 |
07-Jan-2014 |
Erin Dahlgren <edahlgren@google.com> |
Make refocus and hdr+ sticky on mode change. Bug: 12413073 Bug: 12368672 Change-Id: I151581c73bafbf307889b6aa19131c4add400ba9
es/values/arrays.xml
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/settings/SettingsManager.java
|
8b6a5b8a5c527375b01fae8f90590e840c6dcb18 |
07-Jan-2014 |
Erin Dahlgren <edahlgren@google.com> |
Merge "Make flash state sticky on switching to photo mode." into gb-ub-photos-denali
|
6a370a2c1d17e3640b1242da2d551dc39b797a56 |
07-Jan-2014 |
Erin Dahlgren <edahlgren@google.com> |
Merge "Add on screen indicators." into gb-ub-photos-denali
|
1648c36927501ff32bf2918e8a445118d5208731 |
07-Jan-2014 |
Erin Dahlgren <edahlgren@google.com> |
Add on screen indicators. Known caveats: * Does not respect the first orientation change. * PhotoModule resets flash to default on a mode switch. * Hdr plus is not sticky on mode switch. Bug: 12368905 Change-Id: I377f28c6d0f7115371cc9e9dad9378f049bf7d7c
es/layout/generic_module.xml
es/values/arrays.xml
rc/com/android/camera/ButtonManager.java
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/app/CameraAppUI.java
rc/com/android/camera/settings/SettingsManager.java
rc/com/android/camera/ui/BottomBar.java
rc/com/android/camera/ui/RotatableLinearLayout.java
rc/com/android/camera/widget/IndicatorOverlay.java
|
865d4bdd7353ec25584321fd25ea828ac7978a21 |
07-Jan-2014 |
Erin Dahlgren <edahlgren@google.com> |
Make flash state sticky on switching to photo mode. Bug: 12368672 Change-Id: I8ff680efcd4eb55e1773853889580f7f792938a5
rc/com/android/camera/PhotoModule.java
|
361ab77563cc10cd7ed1cd82f33f3480a0193476 |
07-Jan-2014 |
Doris Liu <tianliu@google.com> |
Remove old faceview offset for centering surface texture Bug: 12413526 We used to offset face view to take into account the translation needed to center the scaled surface texture in the view. That's no longer needed because the live preview in this new design aligns top left. Change-Id: Ic38ef697dbbda1ad5b80a5797ba1d01fc3dd6ad8
rc/com/android/camera/ui/FaceView.java
|
eb601c44476c996655f113cb638114812d2e1513 |
06-Jan-2014 |
Spike Sprague <spikuru@google.com> |
Merge "hide bottom bar during video capture" into gb-ub-photos-denali
|
1ca357294fb9b78fd40c9d9ba4e818cc499abca8 |
06-Jan-2014 |
Spike Sprague <spikuru@google.com> |
hide bottom bar during video capture simple visibilty change; jarring but good for a first pass bug: 12368245 Change-Id: Ief01aae1e9f3d9fd229952dc664f766328ac1e0c
rc/com/android/camera/VideoModule.java
|
de3b2d4bab3dc04e6bda1a0c8bdc1d01bd3260dc |
06-Jan-2014 |
Doris Liu <tianliu@google.com> |
Merge "Center preview UI in the live preview rect" into gb-ub-photos-denali
|
1c5e61ffa20701d99bb1051f121aba5b0e21b824 |
06-Jan-2014 |
Angus Kong <shkong@google.com> |
Merge "Check filmstrip visibility to pass down key events" into gb-ub-photos-denali
|
2d60a0b803e5645f93e2cf53bdd272201cadf001 |
06-Jan-2014 |
Sascha Haeberling <haeberling@google.com> |
Merge "Clean-up TAGs and some more auto-clean-ups." into gb-ub-photos-denali
|
5850115399516c9186cc0a8231eb1b554f570441 |
06-Jan-2014 |
Sascha Haeberling <haeberling@google.com> |
Clean-up TAGs and some more auto-clean-ups. Change-Id: Ib5f01a6fed99dd21b87138d8e4f792aefa74880d
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/FocusOverlayManager.java
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/PieController.java
rc/com/android/camera/PreviewGestures.java
rc/com/android/camera/SettingsController.java
rc/com/android/camera/SurfaceTextureRenderer.java
rc/com/android/camera/VideoUI.java
rc/com/android/camera/app/AndroidCameraManagerImpl.java
rc/com/android/camera/app/OrientationManagerImpl.java
rc/com/android/camera/data/CameraDataAdapter.java
rc/com/android/camera/data/LocalData.java
rc/com/android/camera/data/LocalMediaData.java
rc/com/android/camera/data/RotationTask.java
rc/com/android/camera/ui/CountDownView.java
rc/com/android/camera/ui/PreviewOverlay.java
rc/com/android/camera/ui/RenderOverlay.java
rc/com/android/camera/ui/ZoomRenderer.java
|
96f99f43987a4b24bfbe21e12cec1dae752e5178 |
06-Jan-2014 |
Erin Dahlgren <edahlgren@google.com> |
Merge "Update camera parameters when setting has changed." into gb-ub-photos-denali
|
7f0151dff66fed52448056e5f73b15db9485a77e |
03-Jan-2014 |
Erin Dahlgren <edahlgren@google.com> |
Update camera parameters when setting has changed. Bug: 12250474 * Implemented for photo mode only. * To be extended to all other modules. Change-Id: Ie5218f3a76acb757ac526d3f987ef3165736b46d
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/settings/SettingsManager.java
|
1587b049d4a0ae36630b429804cf52991ffbf66f |
03-Jan-2014 |
Angus Kong <shkong@google.com> |
Remove unused code in PhotoModule. Change-Id: I28611ab68343effffab8b8a00649e5884472fc8a
rc/com/android/camera/PhotoModule.java
|
ca4a5668c5bcda027bd896ebf17c8ef374e2ac75 |
03-Jan-2014 |
Doris Liu <tianliu@google.com> |
Center preview UI in the live preview rect Center flash animation Center zoom animation Center focus indicator for auto focus TODO: Gcam focus indicator is not centered in the live preview Bug: 12114128 Change-Id: I5e7f79fdf6a705789d995fc3bf3570262bc8bb49
rc/com/android/camera/FocusOverlayManager.java
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/app/CameraAppUI.java
rc/com/android/camera/ui/CaptureAnimationOverlay.java
rc/com/android/camera/ui/FocusOverlay.java
rc/com/android/camera/ui/PreviewOverlay.java
|
8dcccb160b2f82e5ddc97bad96d4812bc6cfa043 |
03-Jan-2014 |
Angus Kong <shkong@google.com> |
Check filmstrip visibility to pass down key events bug:12196741 Change-Id: I7ef5c65060b4c5481adc41f45f47f9c817f3a8b6
rc/com/android/camera/CameraActivity.java
|
de45652f4232fdfcdee3717b6bd111848fa37003 |
27-Dec-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I8a2e9e5d0a38df978583a88c089afff29823ceb6 Auto-generated-cl: translation import
es/values-fa/strings.xml
es/values-hi/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-lt/strings.xml
es/values-pl/strings.xml
es/values-ru/strings.xml
es/values-th/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
|
b000e760360f09c0014272407f50ca24b9e685a7 |
21-Dec-2013 |
Sascha Häberling <haeberling@google.com> |
Merge "Temp fix the crash going out of photosphere" into gb-ub-photos-denali
|
15b9961c5ca49fc6ac9d036e7a967797987e46ee |
21-Dec-2013 |
Doris Liu <tianliu@google.com> |
Part II of ag/401462 Change-Id: I569179e712d5c4d690a815a16dde31240c396b7f
rc/com/android/camera/FocusOverlayManager.java
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/TextureViewHelper.java
rc/com/android/camera/ui/FocusOverlay.java
|
482de029dc20e0a577388a602985fb31c3200309 |
19-Dec-2013 |
Doris Liu <tianliu@google.com> |
Touch to focus Change-Id: I69860bd05426e3a04bc5fd7d0dd581b5d6ff768d
es/drawable/focus.png
es/layout/photo_module.xml
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/FocusOverlayManager.java
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/PhotoUI.java
rc/com/android/camera/TextureViewHelper.java
rc/com/android/camera/app/AppController.java
rc/com/android/camera/app/CameraAppUI.java
rc/com/android/camera/ui/BottomBar.java
rc/com/android/camera/ui/FocusOverlay.java
rc/com/android/camera/ui/PreviewStatusListener.java
|
c42677f21836df8dac60ba73d6a2bd0b4ef33f44 |
21-Dec-2013 |
Doris Liu <tianliu@google.com> |
Temp fix the crash going out of photosphere Change-Id: I88cc9619a6057e9984d091ea9c92d80209df8cb5
rc/com/android/camera/app/CameraAppUI.java
|
4d49016bde526681e100c9b66c842380dfc007cc |
21-Dec-2013 |
Kevin Gabayan <gabayan@google.com> |
Fallback to Legacy location provider upon connection failure (Camera2) Change-Id: Ibeea4802a93a76c02ea8f6f7558f2d49fbbfe41b
rc/com/android/camera/app/LocationProvider.java
|
efa2e210f0bc1146ad01e7db01efeda66d9ef195 |
21-Dec-2013 |
Spike Sprague <spikuru@google.com> |
Merge "removing unneeded member variable" into gb-ub-photos-denali
|
0982a7405add0c0537c50e158e5f5d9074ed0c39 |
21-Dec-2013 |
Seth Raphael <magicseth@google.com> |
Merge "Allow capture during accordion shimmy" into gb-ub-photos-denali
|
5bac89b81d9dbdf55d434bad3cd2470f673a6543 |
21-Dec-2013 |
Spike Sprague <spikuru@google.com> |
removing unneeded member variable Change-Id: I856b291cd7216c606ee937379d78ce21d54fdd30
rc/com/android/camera/ui/MainActivityLayout.java
|
cc04a4bcf54f693a73e943cc930870b691830dc1 |
21-Dec-2013 |
Sascha Haeberling <haeberling@google.com> |
Merge "Two new getters for the session API." into gb-ub-photos-denali
|
298c06604bbf390da2fe1775f5ed834a592d5bb0 |
21-Dec-2013 |
Sascha Haeberling <haeberling@google.com> |
Two new getters for the session API. Bug: 12236950 Change-Id: I1ac8809688e48ffa4cbde16c212fb90e1a1e5c01
rc/com/android/camera/session/CaptureSession.java
rc/com/android/camera/session/CaptureSessionManagerImpl.java
|
5e2ace6c4b421a31e19463ca84b6bc9c3e165d7b |
21-Dec-2013 |
Spike Sprague <spikuru@google.com> |
Merge "disabling swipe gestures for capture intents" into gb-ub-photos-denali
|
db290c33bd0250b473c475254cbfbbd19dd72430 |
21-Dec-2013 |
Erin Dahlgren <edahlgren@google.com> |
Merge "New Capture UI." into gb-ub-photos-denali
|
312c2dce9b2d870bd5619a75e3139d1c07e9385d |
21-Dec-2013 |
Andy Huibers <andyhuibers@google.com> |
Merge "Increase bitmap resolution when zooming in filmstrip" into gb-ub-photos-denali
|
908bace4c8ceb9ebf4644827350a0792cbd44331 |
21-Dec-2013 |
Seth Raphael <magicseth@google.com> |
Allow capture during accordion shimmy Change-Id: I0027bf1c138efb67b1b2c9bc6599cb2a837c0caf
rc/com/android/camera/ui/ModeListView.java
|
4efa8b54c1df4e06f2d3caed2568015a737f9dda |
18-Dec-2013 |
Erin Dahlgren <edahlgren@google.com> |
New Capture UI. * depends on ag/400799 Change-Id: Ieb0e27447659bcb04dee57348583f68d680408d2
es/layout-land/bottom_bar.xml
es/layout-port/bottom_bar.xml
es/layout/bottom_bar_contents.xml
es/layout/generic_module.xml
es/layout/photo_intent_review_bottombar_buttons.xml
es/layout/photo_module.xml
es/layout/video_intent_review_bottombar_buttons.xml
es/layout/video_module.xml
es/values/arrays.xml
rc/com/android/camera/ButtonManager.java
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/PhotoUI.java
rc/com/android/camera/VideoModule.java
rc/com/android/camera/VideoUI.java
rc/com/android/camera/app/CameraAppUI.java
rc/com/android/camera/module/ModuleController.java
rc/com/android/camera/module/ModulesInfo.java
rc/com/android/camera/settings/SettingsCache.java
rc/com/android/camera/settings/SettingsManager.java
rc/com/android/camera/ui/BottomBar.java
rc/com/android/camera/ui/ModeListView.java
rc/com/android/camera/ui/TopRightMostOverlay.java
rc/com/android/camera/ui/TopRightWeightedLayout.java
|
c050a9475312db95bcd6d3ec8480065ee8104954 |
20-Dec-2013 |
Spike Sprague <spikuru@google.com> |
disabling swipe gestures for capture intents Change-Id: I65ac74ac855fe3ee95339a29aecdab1fe74e4659
rc/com/android/camera/app/CameraAppUI.java
rc/com/android/camera/ui/MainActivityLayout.java
|
caca8c7b2e97bd76e4df1ea98c08acaa48b21557 |
14-Dec-2013 |
Andy Huibers <andyhuibers@google.com> |
Increase bitmap resolution when zooming in filmstrip Bug:11137777 Change-Id: I6f947e2981d012c1693ef0475a2776a7e6275de5
rc/com/android/camera/data/CameraDataAdapter.java
rc/com/android/camera/data/FixedFirstDataAdapter.java
rc/com/android/camera/data/FixedLastDataAdapter.java
rc/com/android/camera/data/InProgressDataWrapper.java
rc/com/android/camera/data/LocalData.java
rc/com/android/camera/data/LocalMediaData.java
rc/com/android/camera/data/SimpleViewData.java
rc/com/android/camera/filmstrip/DataAdapter.java
rc/com/android/camera/widget/FilmstripView.java
|
44c1afb9dac08e02004244e602469c29a27487b6 |
20-Dec-2013 |
Sascha Haeberling <haeberling@google.com> |
Simplify the LocalData API. By removing the Context from most method calls, it makes the API much more concise and focus on what's important. Change-Id: Ib79344365bd4d6a33f8ef59d1d28b5e9780102f5
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/data/AbstractLocalDataAdapterWrapper.java
rc/com/android/camera/data/CameraDataAdapter.java
rc/com/android/camera/data/FixedFirstDataAdapter.java
rc/com/android/camera/data/FixedLastDataAdapter.java
rc/com/android/camera/data/LocalDataAdapter.java
rc/com/android/camera/data/LocalMediaData.java
|
f5ae9d8a234646a59bce465d623b50589f0e267a |
20-Dec-2013 |
Doris Liu <tianliu@google.com> |
Merge "Hook up with camera for accurate timing of new frame" into gb-ub-photos-denali
|
77d24065a133adfb4f94db367aafea176aa56270 |
20-Dec-2013 |
Sascha Haeberling <haeberling@google.com> |
Change naming to reflect that it's 'allowed' memory. ... and not current usage. Change-Id: Ifcbdf95c33112d74cb6a21f66a079ad0d6e7ebd5
rc/com/android/camera/app/MemoryManager.java
rc/com/android/camera/app/MemoryManagerImpl.java
|
4d4a4bc8891bbfc5a7ca842f2981829ac3a716e8 |
20-Dec-2013 |
Doris Liu <tianliu@google.com> |
Hook up with camera for accurate timing of new frame TextureView's onSurfaceTextureChanged callback has been proved inaccurate in terms of timing for new frame, which contradicts the documentation. Nevertheless, we need accurate timing to ensure smooth mode change. Bug: 11963674 Bug: 11767246 Change-Id: I8673174ac5e191c0ab7c4377ff81b3e0889f8831
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/app/AndroidCameraManagerImpl.java
rc/com/android/camera/app/AppController.java
rc/com/android/camera/app/CameraAppUI.java
rc/com/android/camera/app/CameraController.java
rc/com/android/camera/app/CameraManager.java
|
10809bdc41ec2203e5f4f4aa3d1016c0e94b97df |
20-Dec-2013 |
Sascha Haeberling <haeberling@google.com> |
Implement the method to determine our max native memory usage. Bug: 12246801 Change-Id: I5af99bd802be090df9e4c7f909de8e2ca3600f40
rc/com/android/camera/app/MemoryManager.java
rc/com/android/camera/app/MemoryManagerImpl.java
|
e1052c6501f9c1150aeaed99b57744f3afde61ff |
20-Dec-2013 |
Spike Sprague <spikuru@google.com> |
Merge "removing *_disabled.png assets for mode icons" into gb-ub-photos-denali
|
b9b7240d62dd2ad245f2c0e09fd1056a28687978 |
20-Dec-2013 |
Doris Liu <tianliu@google.com> |
Hide mode drawer when back is pressed Bug: 12105158 Change-Id: I0c17fe979e732dad465798ea647d90fb30077c26
rc/com/android/camera/app/CameraAppUI.java
rc/com/android/camera/ui/ModeListView.java
|
ab76f0b4e0f53f065e458e46f5dfdc35b80b6ba7 |
20-Dec-2013 |
Spike Sprague <spikuru@google.com> |
removing *_disabled.png assets for mode icons bug: 12234456 Change-Id: I978e0f43c3ca3bf5dfd5198a9c45048299b43c0e
es/drawable-hdpi/ic_camera_disabled.png
es/drawable-hdpi/ic_panorama_disabled.png
es/drawable-hdpi/ic_photo_sphere_disabled.png
es/drawable-hdpi/ic_settings_disabled.png
es/drawable-hdpi/ic_timelapse_disabled.png
es/drawable-hdpi/ic_video_disabled.png
es/drawable-mdpi/ic_camera_disabled.png
es/drawable-mdpi/ic_panorama_disabled.png
es/drawable-mdpi/ic_photo_sphere_disabled.png
es/drawable-mdpi/ic_settings_disabled.png
es/drawable-mdpi/ic_timelapse_disabled.png
es/drawable-mdpi/ic_video_disabled.png
es/drawable-xhdpi/ic_camera_disabled.png
es/drawable-xhdpi/ic_panorama_disabled.png
es/drawable-xhdpi/ic_photo_sphere_disabled.png
es/drawable-xhdpi/ic_settings_disabled.png
es/drawable-xhdpi/ic_timelapse_disabled.png
es/drawable-xhdpi/ic_video_disabled.png
es/drawable-xxhdpi/ic_camera_disabled.png
es/drawable-xxhdpi/ic_panorama_disabled.png
es/drawable-xxhdpi/ic_photo_sphere_disabled.png
es/drawable-xxhdpi/ic_settings_disabled.png
es/drawable-xxhdpi/ic_timelapse_disabled.png
es/drawable-xxhdpi/ic_video_disabled.png
es/drawable/ic_camera.xml
es/drawable/ic_panorama.xml
es/drawable/ic_photo_sphere.xml
es/drawable/ic_settings.xml
es/drawable/ic_timelapse.xml
es/drawable/ic_video.xml
rc/com/android/camera/ui/ModeListView.java
|
cc43d66f99e5c7a7022eb9c30f5b980e043b41a7 |
20-Dec-2013 |
Angus Kong <shkong@google.com> |
Fix wrong decoding due to parallel execution. Change-Id: I8d38eb57ce3b35d0747be07a23fc80fc06fff600
rc/com/android/camera/data/LocalMediaData.java
|
ba259ce7c19771ba85eca88d2d2503dc8fd88e0a |
19-Dec-2013 |
Kevin Gabayan <gabayan@google.com> |
Merge "Use Fused Location Provider when gms is available. Bug: 8295289" into gb-ub-photos-denali
|
56102c6a83104cea1371114d77a57e1934f2c648 |
19-Dec-2013 |
Angus Kong <shkong@google.com> |
Fix build. Update LocalData implementations with new methods. Change-Id: I9642dd2277d9e3d5745230fbee911cf03eb2905c
rc/com/android/camera/data/FixedFirstDataAdapter.java
rc/com/android/camera/data/InProgressDataWrapper.java
rc/com/android/camera/data/LocalMediaData.java
rc/com/android/camera/data/SimpleViewData.java
|
373b1f0ec3413277ff8d0bfce913901e11cd808e |
19-Dec-2013 |
Angus Kong <shkong@google.com> |
Merge "Load metadata of LocalData on demand." into gb-ub-photos-denali
|
e2f4c03eaea059e15adf34d8782c433b1f7164dc |
19-Dec-2013 |
Angus Kong <shkong@google.com> |
Load metadata of LocalData on demand. 1. Metadata of LocalData is not always needed. It's more efficient to load it on demand. 2. MetadataLoader added to be responsible for loading all the metadata. 3. Metadata loading callback added in LocalDataListener. 4. The loading of the metadata and the bitmap are now all executed by the thread pool executor. bug:12216695 Change-Id: I5c75746630e9952b389f9b50416a0bb950301f33
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/data/AbstractLocalDataAdapterWrapper.java
rc/com/android/camera/data/CameraDataAdapter.java
rc/com/android/camera/data/FixedFirstDataAdapter.java
rc/com/android/camera/data/FixedLastDataAdapter.java
rc/com/android/camera/data/LocalData.java
rc/com/android/camera/data/LocalDataAdapter.java
rc/com/android/camera/data/LocalMediaData.java
rc/com/android/camera/data/MetadataLoader.java
|
ffbc43c3dd3c94a968a41431fb07645a13696c4a |
09-Dec-2013 |
Kevin Gabayan <gabayan@google.com> |
Use Fused Location Provider when gms is available. Bug: 8295289 Change-Id: I3dba25c35fd3754ff70ed3ecea33052505274feb
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/LocationManager.java
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/PhotoUI.java
rc/com/android/camera/SettingsController.java
rc/com/android/camera/VideoModule.java
rc/com/android/camera/app/AppController.java
rc/com/android/camera/app/LegacyLocationProvider.java
rc/com/android/camera/app/LocationProvider.java
rc_pd/com/android/camera/app/LocationManager.java
|
477f70272d1a696ff03f314b2870d0774d3de364 |
19-Dec-2013 |
Alan Newberger <alann@google.com> |
Merge "change gallery link placeholder in Camera2 to drawable from mipmap" into gb-ub-photos-denali
|
1ccff24fa635c82f9d0bc4c99481ff75beeeb135 |
19-Dec-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-denali
|
1793296e5152f07c797e2252a445c22b377c4c35 |
19-Dec-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I03cf32f8a300125e13ba3279628d12e6f7769ad6 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-km-rKH/strings.xml
es/values-ko/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mn-rMN/strings.xml
es/values-ms-rMY/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
58598dc16e1f5a747fe1407ec1641a5529f423e5 |
19-Dec-2013 |
Sascha Haeberling <haeberling@google.com> |
Clean up unused imports. Change-Id: If53a35571522c879304ac9af0ebfca79ed536be0
rc/com/android/camera/ButtonManager.java
|
04424ed572d7c8d3d4ff8399b2574eb654c2dcf4 |
19-Dec-2013 |
Alan Newberger <alann@google.com> |
change gallery link placeholder in Camera2 to drawable from mipmap I believe latest mocks has this going away, using the full color mipmap is not shippable anyway, and its breaking tests, so choosing a drawable placeholder for now. Change-Id: I2d23daf2a15935ea4b48fe99363722c5fdb6471a
es/layout/filmstrip_bottom_controls.xml
rc_pd/com/android/camera/util/IntentHelper.java
|
298811e116518a7fa75e30c0dddd04e8e26e91e4 |
19-Dec-2013 |
Sascha Haeberling <haeberling@google.com> |
Advanced mode icon fix. A recent CL accidentally switched the icon back to the craft icon. Change-Id: I0f7d456daac85a22c565e530a2c3914f905b5b37
rc/com/android/camera/ui/ModeListView.java
|
8a2350a3d557465b53445685db0f9ac838cf90c5 |
17-Dec-2013 |
Angus Kong <shkong@google.com> |
Refactor the photosphere/refocus metadata loading. 1. Metadata added to allow for different attributes to describe LocalData. 2. Move the metadata loading process to image data loading. 3. LocalData.view() removed. The invocation of external viewer is moved back to the activity. bug:12197251 Change-Id: I496b018186f7a4b4818b976201703b966103a636
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/app/CameraAppUI.java
rc/com/android/camera/app/FilmstripBottomControls.java
rc/com/android/camera/data/AbstractLocalDataAdapterWrapper.java
rc/com/android/camera/data/CameraDataAdapter.java
rc/com/android/camera/data/InProgressDataWrapper.java
rc/com/android/camera/data/LocalData.java
rc/com/android/camera/data/LocalDataAdapter.java
rc/com/android/camera/data/LocalMediaData.java
rc/com/android/camera/data/PanoramaMetadataLoader.java
rc/com/android/camera/data/RgbzMetadataLoader.java
rc/com/android/camera/data/SimpleViewData.java
rc/com/android/camera/filmstrip/FilmstripContentPanel.java
rc/com/android/camera/filmstrip/FilmstripController.java
rc/com/android/camera/filmstrip/ImageData.java
rc/com/android/camera/widget/FilmstripView.java
|
7485451166805efa4de46930cc60f2822e62d882 |
18-Dec-2013 |
Spike Sprague <spikuru@google.com> |
unbreaking gcam build Change-Id: I10a7bf25cc17bbf62b4f0ecd615606f7f3a57390
es/xml/camera_preferences.xml
|
aa0e4524488e2f01b44c247fe2e119daaeb9e292 |
18-Dec-2013 |
Spike Sprague <spikuru@google.com> |
Merge "adding new icon resources" into gb-ub-photos-denali
|
cc0161c31a29848a822377845b5e7ffafeacca61 |
18-Dec-2013 |
Spike Sprague <spikuru@google.com> |
adding new icon resources bug: 12128194 Change-Id: I1b34100821113aa7ba996fab3faf14752e766030
es/drawable-hdpi/bg_options_indicator.9.png
es/drawable-hdpi/btn_video_shutter_recording_holo_xlarge.png
es/drawable-hdpi/btn_video_shutter_recording_pressed_holo_xlarge.png
es/drawable-hdpi/ic_auto_focus_disabled.png
es/drawable-hdpi/ic_auto_focus_normal.png
es/drawable-hdpi/ic_back_disabled.png
es/drawable-hdpi/ic_back_normal.png
es/drawable-hdpi/ic_camera_disabled.png
es/drawable-hdpi/ic_cancel_disabled.png
es/drawable-hdpi/ic_cancel_normal.png
es/drawable-hdpi/ic_capture_options.png
es/drawable-hdpi/ic_confirm_disabled.png
es/drawable-hdpi/ic_confirm_normal.png
es/drawable-hdpi/ic_craft_disabled.png
es/drawable-hdpi/ic_flash_auto_disabled.png
es/drawable-hdpi/ic_flash_auto_indicator.png
es/drawable-hdpi/ic_flash_auto_normal.png
es/drawable-hdpi/ic_flash_off_disabled.png
es/drawable-hdpi/ic_flash_off_indicator.png
es/drawable-hdpi/ic_flash_off_normal.png
es/drawable-hdpi/ic_flash_on_disabled.png
es/drawable-hdpi/ic_flash_on_indicator.png
es/drawable-hdpi/ic_flash_on_normal.png
es/drawable-hdpi/ic_hdr_plus_off_disabled.png
es/drawable-hdpi/ic_hdr_plus_off_indicator.png
es/drawable-hdpi/ic_hdr_plus_off_normal.png
es/drawable-hdpi/ic_hdr_plus_on_disabled.png
es/drawable-hdpi/ic_hdr_plus_on_indicator.png
es/drawable-hdpi/ic_hdr_plus_on_normal.png
es/drawable-hdpi/ic_manual_focus_disabled.png
es/drawable-hdpi/ic_manual_focus_normal.png
es/drawable-hdpi/ic_panorama_disabled.png
es/drawable-hdpi/ic_photo_sphere_disabled.png
es/drawable-hdpi/ic_play_disabled.png
es/drawable-hdpi/ic_play_normal.png
es/drawable-hdpi/ic_refocus_disabled.png
es/drawable-hdpi/ic_refocus_normal.png
es/drawable-hdpi/ic_refocus_off.png
es/drawable-hdpi/ic_refocus_off_disabled.png
es/drawable-hdpi/ic_refocus_off_indicator.png
es/drawable-hdpi/ic_refocus_off_normal.png
es/drawable-hdpi/ic_refocus_on_indicator.png
es/drawable-hdpi/ic_settings_disabled.png
es/drawable-hdpi/ic_settings_normal.png
es/drawable-hdpi/ic_stop_disabled.png
es/drawable-hdpi/ic_stop_normal.png
es/drawable-hdpi/ic_switch_camera_back_disabled.png
es/drawable-hdpi/ic_switch_camera_back_normal.png
es/drawable-hdpi/ic_switch_camera_front_disabled.png
es/drawable-hdpi/ic_switch_camera_front_normal.png
es/drawable-hdpi/ic_timelapse_disabled.png
es/drawable-hdpi/ic_video_disabled.png
es/drawable-hdpi/ic_wide_angle_disabled.png
es/drawable-mdpi/bg_options_indicator.9.png
es/drawable-mdpi/ic_auto_focus_disabled.png
es/drawable-mdpi/ic_auto_focus_normal.png
es/drawable-mdpi/ic_back_disabled.png
es/drawable-mdpi/ic_back_normal.png
es/drawable-mdpi/ic_camera_disabled.png
es/drawable-mdpi/ic_cancel_disabled.png
es/drawable-mdpi/ic_cancel_normal.png
es/drawable-mdpi/ic_capture_options.png
es/drawable-mdpi/ic_confirm_disabled.png
es/drawable-mdpi/ic_confirm_normal.png
es/drawable-mdpi/ic_craft_disabled.png
es/drawable-mdpi/ic_flash_auto_disabled.png
es/drawable-mdpi/ic_flash_auto_indicator.png
es/drawable-mdpi/ic_flash_auto_normal.png
es/drawable-mdpi/ic_flash_off_disabled.png
es/drawable-mdpi/ic_flash_off_indicator.png
es/drawable-mdpi/ic_flash_off_normal.png
es/drawable-mdpi/ic_flash_on_disabled.png
es/drawable-mdpi/ic_flash_on_indicator.png
es/drawable-mdpi/ic_flash_on_normal.png
es/drawable-mdpi/ic_hdr_plus_off_disabled.png
es/drawable-mdpi/ic_hdr_plus_off_indicator.png
es/drawable-mdpi/ic_hdr_plus_off_normal.png
es/drawable-mdpi/ic_hdr_plus_on_disabled.png
es/drawable-mdpi/ic_hdr_plus_on_indicator.png
es/drawable-mdpi/ic_hdr_plus_on_normal.png
es/drawable-mdpi/ic_manual_focus_disabled.png
es/drawable-mdpi/ic_manual_focus_normal.png
es/drawable-mdpi/ic_panorama_disabled.png
es/drawable-mdpi/ic_photo_sphere_disabled.png
es/drawable-mdpi/ic_play_disabled.png
es/drawable-mdpi/ic_play_normal.png
es/drawable-mdpi/ic_refocus_disabled.png
es/drawable-mdpi/ic_refocus_normal.png
es/drawable-mdpi/ic_refocus_off.png
es/drawable-mdpi/ic_refocus_off_disabled.png
es/drawable-mdpi/ic_refocus_off_indicator.png
es/drawable-mdpi/ic_refocus_off_normal.png
es/drawable-mdpi/ic_refocus_on_indicator.png
es/drawable-mdpi/ic_settings_disabled.png
es/drawable-mdpi/ic_settings_normal.png
es/drawable-mdpi/ic_stop_disabled.png
es/drawable-mdpi/ic_stop_normal.png
es/drawable-mdpi/ic_switch_camera_back_disabled.png
es/drawable-mdpi/ic_switch_camera_back_normal.png
es/drawable-mdpi/ic_switch_camera_front_disabled.png
es/drawable-mdpi/ic_switch_camera_front_normal.png
es/drawable-mdpi/ic_timelapse_disabled.png
es/drawable-mdpi/ic_video_disabled.png
es/drawable-mdpi/ic_wide_angle_disabled.png
es/drawable-xhdpi/bg_options_indicator.9.png
es/drawable-xhdpi/ic_auto_focus_disabled.png
es/drawable-xhdpi/ic_auto_focus_normal.png
es/drawable-xhdpi/ic_back_disabled.png
es/drawable-xhdpi/ic_back_normal.png
es/drawable-xhdpi/ic_camera_disabled.png
es/drawable-xhdpi/ic_cancel_disabled.png
es/drawable-xhdpi/ic_cancel_normal.png
es/drawable-xhdpi/ic_capture_options.png
es/drawable-xhdpi/ic_confirm_disabled.png
es/drawable-xhdpi/ic_confirm_normal.png
es/drawable-xhdpi/ic_craft_disabled.png
es/drawable-xhdpi/ic_flash_auto_disabled.png
es/drawable-xhdpi/ic_flash_auto_indicator.png
es/drawable-xhdpi/ic_flash_auto_normal.png
es/drawable-xhdpi/ic_flash_off_disabled.png
es/drawable-xhdpi/ic_flash_off_indicator.png
es/drawable-xhdpi/ic_flash_off_normal.png
es/drawable-xhdpi/ic_flash_on_disabled.png
es/drawable-xhdpi/ic_flash_on_indicator.png
es/drawable-xhdpi/ic_flash_on_normal.png
es/drawable-xhdpi/ic_hdr_plus_off_disabled.png
es/drawable-xhdpi/ic_hdr_plus_off_indicator.png
es/drawable-xhdpi/ic_hdr_plus_off_normal.png
es/drawable-xhdpi/ic_hdr_plus_on_disabled.png
es/drawable-xhdpi/ic_hdr_plus_on_indicator.png
es/drawable-xhdpi/ic_hdr_plus_on_normal.png
es/drawable-xhdpi/ic_manual_focus_disabled.png
es/drawable-xhdpi/ic_manual_focus_normal.png
es/drawable-xhdpi/ic_panorama_disabled.png
es/drawable-xhdpi/ic_photo_sphere_disabled.png
es/drawable-xhdpi/ic_play_disabled.png
es/drawable-xhdpi/ic_play_normal.png
es/drawable-xhdpi/ic_refocus_disabled.png
es/drawable-xhdpi/ic_refocus_normal.png
es/drawable-xhdpi/ic_refocus_off.png
es/drawable-xhdpi/ic_refocus_off_disabled.png
es/drawable-xhdpi/ic_refocus_off_indicator.png
es/drawable-xhdpi/ic_refocus_off_normal.png
es/drawable-xhdpi/ic_refocus_on_indicator.png
es/drawable-xhdpi/ic_settings_disabled.png
es/drawable-xhdpi/ic_settings_normal.png
es/drawable-xhdpi/ic_stop_disabled.png
es/drawable-xhdpi/ic_stop_normal.png
es/drawable-xhdpi/ic_switch_camera_back_disabled.png
es/drawable-xhdpi/ic_switch_camera_back_normal.png
es/drawable-xhdpi/ic_switch_camera_front_disabled.png
es/drawable-xhdpi/ic_switch_camera_front_normal.png
es/drawable-xhdpi/ic_timelapse_disabled.png
es/drawable-xhdpi/ic_video_disabled.png
es/drawable-xhdpi/ic_wide_angle_disabled.png
es/drawable-xxhdpi/bg_options_indicator.9.png
es/drawable-xxhdpi/ic_auto_focus_disabled.png
es/drawable-xxhdpi/ic_auto_focus_normal.png
es/drawable-xxhdpi/ic_back_disabled.png
es/drawable-xxhdpi/ic_back_normal.png
es/drawable-xxhdpi/ic_camera_disabled.png
es/drawable-xxhdpi/ic_cancel_disabled.png
es/drawable-xxhdpi/ic_cancel_normal.png
es/drawable-xxhdpi/ic_capture_options.png
es/drawable-xxhdpi/ic_confirm_disabled.png
es/drawable-xxhdpi/ic_confirm_normal.png
es/drawable-xxhdpi/ic_craft_disabled.png
es/drawable-xxhdpi/ic_flash_auto_disabled.png
es/drawable-xxhdpi/ic_flash_auto_indicator.png
es/drawable-xxhdpi/ic_flash_auto_normal.png
es/drawable-xxhdpi/ic_flash_off_disabled.png
es/drawable-xxhdpi/ic_flash_off_indicator.png
es/drawable-xxhdpi/ic_flash_off_normal.png
es/drawable-xxhdpi/ic_flash_on_disabled.png
es/drawable-xxhdpi/ic_flash_on_indicator.png
es/drawable-xxhdpi/ic_flash_on_normal.png
es/drawable-xxhdpi/ic_hdr_plus_off_disabled.png
es/drawable-xxhdpi/ic_hdr_plus_off_indicator.png
es/drawable-xxhdpi/ic_hdr_plus_off_normal.png
es/drawable-xxhdpi/ic_hdr_plus_on_disabled.png
es/drawable-xxhdpi/ic_hdr_plus_on_indicator.png
es/drawable-xxhdpi/ic_hdr_plus_on_normal.png
es/drawable-xxhdpi/ic_manual_focus_disabled.png
es/drawable-xxhdpi/ic_manual_focus_normal.png
es/drawable-xxhdpi/ic_panorama_disabled.png
es/drawable-xxhdpi/ic_photo_sphere_disabled.png
es/drawable-xxhdpi/ic_play_disabled.png
es/drawable-xxhdpi/ic_play_normal.png
es/drawable-xxhdpi/ic_refocus_disabled.png
es/drawable-xxhdpi/ic_refocus_normal.png
es/drawable-xxhdpi/ic_refocus_off.png
es/drawable-xxhdpi/ic_refocus_off_disabled.png
es/drawable-xxhdpi/ic_refocus_off_indicator.png
es/drawable-xxhdpi/ic_refocus_off_normal.png
es/drawable-xxhdpi/ic_refocus_on_indicator.png
es/drawable-xxhdpi/ic_settings_disabled.png
es/drawable-xxhdpi/ic_settings_normal.png
es/drawable-xxhdpi/ic_stop_disabled.png
es/drawable-xxhdpi/ic_stop_normal.png
es/drawable-xxhdpi/ic_switch_camera_back_disabled.png
es/drawable-xxhdpi/ic_switch_camera_back_normal.png
es/drawable-xxhdpi/ic_switch_camera_front_disabled.png
es/drawable-xxhdpi/ic_switch_camera_front_normal.png
es/drawable-xxhdpi/ic_timelapse_disabled.png
es/drawable-xxhdpi/ic_video_disabled.png
es/drawable-xxhdpi/ic_wide_angle_disabled.png
es/drawable/ic_auto_focus.xml
es/drawable/ic_back.xml
es/drawable/ic_camera.xml
es/drawable/ic_cancel.xml
es/drawable/ic_confirm.xml
es/drawable/ic_craft.xml
es/drawable/ic_flash_auto.xml
es/drawable/ic_flash_off.xml
es/drawable/ic_flash_on.xml
es/drawable/ic_hdr_plus_off.xml
es/drawable/ic_hdr_plus_on.xml
es/drawable/ic_manual_focus.xml
es/drawable/ic_panorama.xml
es/drawable/ic_photo_sphere.xml
es/drawable/ic_play.xml
es/drawable/ic_refocus.xml
es/drawable/ic_refocus_off.xml
es/drawable/ic_settings.xml
es/drawable/ic_stop.xml
es/drawable/ic_switch_camera_back.xml
es/drawable/ic_switch_camera_front.xml
es/drawable/ic_timelapse.xml
es/drawable/ic_video.xml
es/drawable/ic_wide_angle.xml
es/layout/photo_intent_bottombar_buttons.xml
es/layout/photo_intent_review_bottombar_buttons.xml
es/layout/video_intent_bottombar_buttons.xml
es/layout/video_intent_review_bottombar_buttons.xml
es/mipmap-hdpi/ic_launcher_camera_dogfood.png
es/mipmap-hdpi/ic_launcher_camera_fishfood.png
es/mipmap-mdpi/ic_launcher_camera_dogfood.png
es/mipmap-mdpi/ic_launcher_camera_fishfood.png
es/mipmap-xhdpi/ic_launcher_camera_dogfood.png
es/mipmap-xhdpi/ic_launcher_camera_fishfood.png
es/mipmap-xxhdpi/ic_launcher_camera_dogfood.png
es/mipmap-xxhdpi/ic_launcher_camera_fishfood.png
es/mipmap-xxxhdpi/ic_launcher_camera_dogfood.png
es/mipmap-xxxhdpi/ic_launcher_camera_fishfood.png
es/values/arrays.xml
es/xml/camera_preferences.xml
es/xml/video_preferences.xml
rc/com/android/camera/ButtonManager.java
rc/com/android/camera/ui/ModeListView.java
|
70da918464276b110c43868caa272c97baadb89e |
18-Dec-2013 |
Doris Liu <tianliu@google.com> |
Centralized TextureView transform logic Automated transform matrix adjustment and bottom bar adjustment for orientation or preview size change. Bug: 12177718 Bug: 12179046 Change-Id: I4cd6fc90bb549774cfd83aaf8ac9654711a5c752
es/layout-land/bottom_bar.xml
es/layout-port/bottom_bar.xml
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/PhotoController.java
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/PhotoUI.java
rc/com/android/camera/TextureViewHelper.java
rc/com/android/camera/VideoController.java
rc/com/android/camera/VideoModule.java
rc/com/android/camera/VideoUI.java
rc/com/android/camera/app/AppController.java
rc/com/android/camera/app/CameraAppUI.java
rc/com/android/camera/ui/BottomBar.java
rc/com/android/camera/ui/PreviewStatusListener.java
|
db44ef57cdb576704b1aafb2b81e30bf9ff261ad |
14-Dec-2013 |
Spike Sprague <spikuru@google.com> |
video intent ui Change-Id: I85e346274c51ec87e0d95e8e30f5c261f08f4d34
es/layout/photo_intent_bottombar_buttons.xml
es/layout/video_intent_bottombar_buttons.xml
es/layout/video_intent_review_bottombar_buttons.xml
es/layout/video_module.xml
rc/com/android/camera/ButtonManager.java
rc/com/android/camera/VideoUI.java
|
f537b86a609b927c49ac74a50e600712cbf21c6c |
17-Dec-2013 |
Sascha Haeberling <haeberling@google.com> |
Fix build by removing unused string. Change-Id: I0f9c9648ca67697dc9af2f4a6f10270ed26c7d5e
es/layout/camera_filmstrip.xml
|
d2f6ac73e46d721704ce8198a8f84a5aec4cee1e |
17-Dec-2013 |
Sascha Haeberling <haeberling@google.com> |
Merge "Change the mode switcher order, color, text." into gb-ub-photos-denali
|
601921e746832bdef40503c606a95b4469f1bedb |
17-Dec-2013 |
Sascha Haeberling <haeberling@google.com> |
Change the mode switcher order, color, text. Bug: 12179634 Bug: 12179736 Bug: 12180159 Also re-enable wide angle mode. Change-Id: I075d7e2311fc560ed3d757585891c0eb2da08ea0
es/values/colors.xml
es/values/strings.xml
rc/com/android/camera/module/ModulesInfo.java
rc/com/android/camera/ui/ModeListView.java
|
fa50cf0773893971d84ab54dacf1710f034d73c4 |
17-Dec-2013 |
Angus Kong <shkong@google.com> |
Merge "Launch activity through the controller." into gb-ub-photos-denali
|
bf6eeb4de9bb32c3d34546797a41da3b95de687e |
17-Dec-2013 |
Baligh Uddin <baligh@google.com> |
am 83694ef1: (-s ours) am 7310717c: (-s ours) am e1db6bbe: (-s ours) am 58f3e903: (-s ours) am dae90cf8: (-s ours) Import translations. DO NOT MERGE * commit '83694ef1241618143ad87c5f0273e07c6564f692': Import translations. DO NOT MERGE
|
83694ef1241618143ad87c5f0273e07c6564f692 |
17-Dec-2013 |
Baligh Uddin <baligh@google.com> |
am 7310717c: (-s ours) am e1db6bbe: (-s ours) am 58f3e903: (-s ours) am dae90cf8: (-s ours) Import translations. DO NOT MERGE * commit '7310717c74ce90b27e92ed9bb0b9d7ee9aeb3da6': Import translations. DO NOT MERGE
|
7310717c74ce90b27e92ed9bb0b9d7ee9aeb3da6 |
17-Dec-2013 |
Baligh Uddin <baligh@google.com> |
am e1db6bbe: (-s ours) am 58f3e903: (-s ours) am dae90cf8: (-s ours) Import translations. DO NOT MERGE * commit 'e1db6bbea5334ce1a6a1073e196d97d91689e0fa': Import translations. DO NOT MERGE
|
e1db6bbea5334ce1a6a1073e196d97d91689e0fa |
17-Dec-2013 |
Baligh Uddin <baligh@google.com> |
am 58f3e903: (-s ours) am dae90cf8: (-s ours) Import translations. DO NOT MERGE * commit '58f3e903c7cfb5286b3e00dde8974cbc680e00c2': Import translations. DO NOT MERGE
|
58f3e903c7cfb5286b3e00dde8974cbc680e00c2 |
17-Dec-2013 |
Baligh Uddin <baligh@google.com> |
am dae90cf8: (-s ours) Import translations. DO NOT MERGE * commit 'dae90cf82db8125b5e741f42aacc78c7e1417aac': Import translations. DO NOT MERGE
|
7055db193e88b33f1046b9ba275cdd0f8a33915b |
17-Dec-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-denali
|
4a010db8a60008b2bf67b93b64f77f63affc29f3 |
17-Dec-2013 |
Doris Liu <tianliu@google.com> |
Fix hdr+ preview wrong rotation TextureView has accumulated OnLayoutChangeListener's over time: Modules add a new listener to it when initialized, but never remove the listeners. As a result, stale listeners are called when there is a layout change, and consequently change the transform matrix incorrectly. Bug: 12168516 Change-Id: I1aa77e682427ed074e8dc2d0574ea013e9e01fc6
rc/com/android/camera/PhotoUI.java
rc/com/android/camera/VideoUI.java
rc/com/android/camera/app/CameraAppUI.java
rc/com/android/camera/ui/PreviewStatusListener.java
|
0eaf01670a1198c95b6472ec0dc076c9f84971de |
17-Dec-2013 |
Angus Kong <shkong@google.com> |
Launch activity through the controller. bug:12173532 Change-Id: Ia99f53b6a5220c962f261ab598270d49366065ff
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/app/AppController.java
rc_pd/com/android/camera/util/PhotoSphereHelper.java
|
b897a1e924394cb2196929975cf0c5cb542dd85c |
17-Dec-2013 |
Doris Liu <tianliu@google.com> |
Fix HDR+ 100% view finder Change-Id: I46fe8821ace8cc58a692bee83c162acd2e027c56
rc/com/android/camera/app/CameraAppUI.java
|
543224f36396be8c3af3be3167fa66eaf8cc2ba7 |
17-Dec-2013 |
Spike Sprague <spikuru@google.com> |
Merge "prevent touch events on bottom control bar from triggering capture" into gb-ub-photos-denali
|
9540c4f43bfa385fffaed191619e8e1092e66ba1 |
17-Dec-2013 |
Angus Kong <shkong@google.com> |
Merge "Reset zoomed view in filmstrip when after deletion" into gb-ub-photos-denali
|
e3b0e946924e45f6788db69aaa8f48a2d81031f0 |
17-Dec-2013 |
Spike Sprague <spikuru@google.com> |
prevent touch events on bottom control bar from triggering capture bug: 12138522 Change-Id: I041cacbcfa353864409d3d63acaa7bea6a69df59
rc/com/android/camera/ui/BottomBar.java
|
fd1dd0b93f5e7a865e717a38cdecfcaee494d5a8 |
17-Dec-2013 |
Angus Kong <shkong@google.com> |
Merge "Remove redundant call of onReload in FilmstripView" into gb-ub-photos-denali
|
bc2f0e76c63663153fb3936c422881b61be20897 |
16-Dec-2013 |
Spike Sprague <spikuru@google.com> |
removing stray code tied to now defunct focus ring toggle Change-Id: I76dcba650e189ed4b1fc6d83ce987fc2b0e9773d
rc/com/android/camera/PhotoUI.java
|
c6953a4de0005456cd50bbbb0acb27162c9b3c8d |
16-Dec-2013 |
Angus Kong <shkong@google.com> |
Reset zoomed view in filmstrip when after deletion bug:11806155 Change-Id: Icd734dc9ad3b0821b90f28452256477bb0af4b40
rc/com/android/camera/widget/FilmstripView.java
|
cb8942b384399ea21052aec66249d5bfa28be3cb |
16-Dec-2013 |
Angus Kong <shkong@google.com> |
Remove redundant call of onReload in FilmstripView bug:11136116 Change-Id: I1db0a4244589b594778454d8388d26a2990dbbbd
rc/com/android/camera/data/CameraDataAdapter.java
|
1d997499522e80a3a078cbc3994bbd6a4ad2ddad |
16-Dec-2013 |
Erin Dahlgren <edahlgren@google.com> |
Merge "Have the CameraAppUI manage refocus UI." into gb-ub-photos-denali
|
808c098e102f1c2fae0dac7b005c443ae516a3bd |
16-Dec-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I0b1f547c31a47cf20ba02a49a0a2d459c9deffd1 Auto-generated-cl: translation import
es/values-es/strings.xml
es/values-mn-rMN/strings.xml
|
dae90cf82db8125b5e741f42aacc78c7e1417aac |
16-Dec-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I8229ddd9cd55f6561be600469f38063e70480c0f Auto-generated-cl: translation import
es/values-es/strings.xml
es/values-mn-rMN/strings.xml
|
ecbeb3feb02ee0ddc0dc395fbe7a49c4094fca7f |
16-Dec-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I03509b212657c9750eae0ab9223e0e32b4e0484d Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-km-rKH/strings.xml
es/values-ko/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mn-rMN/strings.xml
es/values-ms-rMY/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
29cea2bc00fff30992b75ea31f7d0c9ae0f746b9 |
16-Dec-2013 |
Spike Sprague <spikuru@google.com> |
Merge "removing FR and IMM debug toggle buttons" into gb-ub-photos-denali
|
e9a6f801c249e2c705bc2931359fe921f69165b7 |
16-Dec-2013 |
Spike Sprague <spikuru@google.com> |
removing FR and IMM debug toggle buttons bug: 12165442 Change-Id: Id188babfc8878ad06df4d774144851bf39e83cc2
es/layout/photo_module.xml
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/PhotoUI.java
|
67019c70d08c0726b9005dc7777a9485e3c2015a |
14-Dec-2013 |
Sascha Haeberling <haeberling@google.com> |
Fix bottom bar transparency issue in video mode. Change-Id: Iafe1f3a863370cc5867074d3236e700f280213fb
rc/com/android/camera/VideoUI.java
|
ee408db25ab578488b6f761478b743c6c1a6318b |
14-Dec-2013 |
Doris Liu <tianliu@google.com> |
Merge "Improve mode switch jank by reducing redundant transform matrix change" into gb-ub-photos-denali
|
c62f14802ba01ecef5d883d51444edb78906ee6c |
14-Dec-2013 |
Sascha Haeberling <haeberling@google.com> |
Merge "Fix secure camera." into gb-ub-photos-denali
|
10e7ca2f12018703657d8f6136bfaedf5f447eb4 |
14-Dec-2013 |
Sascha Haeberling <haeberling@google.com> |
Merge "Clean up unused camera controls." into gb-ub-photos-denali
|
4417e2a9bc380e0386dccfcd73c4782ab9a9444e |
14-Dec-2013 |
Sascha Haeberling <haeberling@google.com> |
Fix secure camera. Let's not crash in memory manager when removing a listener that was not added. This was to do with pause() being called twice in secure mode. Instead just issue a warning. Change-Id: I72ad41fd72c92e746d4972014f23ad0a86082b2d
rc/com/android/camera/app/MemoryManagerImpl.java
|
ab05a742fb03b2016d2792c7b06f268d3dd82701 |
14-Dec-2013 |
Sascha Haeberling <haeberling@google.com> |
Clean up unused camera controls. These are only used by LightCycle right now and will eventually disappear completely when we introduce the new bottom bar. Change-Id: I2e81db63b8f3602bc0be58edeef7017e91cad04b
es/layout-land/camera_controls.xml
es/layout-port/camera_controls.xml
es/layout/pano_module_capture.xml
es/layout/pano_module_review.xml
es/layout/panorama_module.xml
rc/com/android/camera/app/CameraAppUI.java
rc/com/android/camera/ui/CameraControls.java
|
e038c161389b5d1c0476e315736df31562328894 |
14-Dec-2013 |
Doris Liu <tianliu@google.com> |
Improve mode switch jank by reducing redundant transform matrix change Change-Id: I2ab4167d9645fe9156a0be98d3e93fa179b8936f
rc/com/android/camera/VideoModule.java
rc/com/android/camera/VideoUI.java
rc/com/android/camera/app/CameraAppUI.java
|
e4002f3a703a1835dce30d74ccfc22e00956e13f |
14-Dec-2013 |
Angus Kong <shkong@google.com> |
Avoid double tapping the share button. Might fire the share intent twice. Change-Id: Ib4efb2302a2bee8fa6b9eaab6896fc75512734f3
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/app/CameraAppUI.java
rc/com/android/camera/app/FilmstripBottomControls.java
|
5b78da09b188370a8939f06ce50b8aff7370df58 |
14-Dec-2013 |
Angus Kong <shkong@google.com> |
Merge "Keep tracking the direction of swipe in filmstrip." into gb-ub-photos-denali
|
69f0964a91a035c222d1765768dbb8d175c3b0f7 |
14-Dec-2013 |
Angus Kong <shkong@google.com> |
Keep tracking the direction of swipe in filmstrip. bug:12129544 Change-Id: I2950479d087af681e39a5d6df8b5907ed179886b
rc/com/android/camera/widget/FilmstripView.java
|
c67c07b42eaf918c26cbb785b211a08a6ebc88a1 |
14-Dec-2013 |
Sascha Haeberling <haeberling@google.com> |
Adding two comments missing from ag/399533. Change-Id: I9413c11a33750f46f1f06ee8a175ee1231afc2d6
rc/com/android/camera/data/LocalData.java
rc/com/android/camera/data/LocalMediaData.java
|
9f95ac2fd4d922928cb9b0959f4e251073a807b7 |
14-Dec-2013 |
Sascha Haeberling <haeberling@google.com> |
Merge "Disable wideangle mode for the weekend build." into gb-ub-photos-denali
|
53b60ba3a1332d4ce8ae58a33f3df8cb8d4b3079 |
14-Dec-2013 |
Sascha Haeberling <haeberling@google.com> |
Merge "Add placeholder image support." into gb-ub-photos-denali
|
42db0359a5bb73e175b5b3b8a44315955f2242b1 |
14-Dec-2013 |
Sascha Haeberling <haeberling@google.com> |
Disable wideangle mode for the weekend build. The code is not ready yet for the extended fishfood. Change-Id: I6e7fd7061f4b68a4270efcc4ac946d596bfa698c
rc/com/android/camera/module/ModulesInfo.java
|
0788b14b3b90964455a907dc673e292390990a8e |
14-Dec-2013 |
Doris Liu <tianliu@google.com> |
Fix small flickering when starting mode drawer Change-Id: Ie1775010527911933302b24b4296d7bffee9ff69
rc/com/android/camera/ui/ModeListView.java
|
b6eaa8c70da19fb3233c3c4b1a2625ce90fc35af |
12-Dec-2013 |
Doris Liu <tianliu@google.com> |
Mode selection animation Change-Id: I3741f71add7e506a974602cefa6edfdbeb442fa0
es/layout/mode_list_layout.xml
es/values/colors.xml
rc/com/android/camera/app/CameraAppUI.java
rc/com/android/camera/ui/ModeListView.java
rc/com/android/camera/ui/ModeSelectorItem.java
rc/com/android/camera/widget/AnimationEffects.java
|
14ff6c8df2924ccad083591c0fc873322c6828c0 |
13-Dec-2013 |
Sascha Haeberling <haeberling@google.com> |
Add placeholder image support. Bug: 12132677 Change-Id: I2add5837f82a956901c132cacae71b193007d482
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/Storage.java
rc/com/android/camera/data/AbstractLocalDataAdapterWrapper.java
rc/com/android/camera/data/CameraDataAdapter.java
rc/com/android/camera/data/FixedFirstDataAdapter.java
rc/com/android/camera/data/FixedLastDataAdapter.java
rc/com/android/camera/data/InProgressDataWrapper.java
rc/com/android/camera/data/LocalData.java
rc/com/android/camera/data/LocalDataAdapter.java
rc/com/android/camera/data/LocalMediaData.java
rc/com/android/camera/data/SimpleViewData.java
rc/com/android/camera/session/CaptureSession.java
rc/com/android/camera/session/CaptureSessionManager.java
rc/com/android/camera/session/CaptureSessionManagerImpl.java
rc/com/android/camera/session/PlaceholderManager.java
|
79fcbe48d7bef83469573782d095df5551895a65 |
14-Dec-2013 |
Erin Dahlgren <edahlgren@google.com> |
Have the CameraAppUI manage refocus UI. Change-Id: I47bfd4a3b9e79ed0186cbac1c735d010b504362e
rc/com/android/camera/CameraActivity.java
|
83ebad2e83e9b0917b263d17623f43764665ad7b |
14-Dec-2013 |
Doris Liu <tianliu@google.com> |
Merge "Flash animation parameter tweaking per latest spec" into gb-ub-photos-denali
|
ce1658060e0a85424faed623a970bfb891490759 |
14-Dec-2013 |
Doris Liu <tianliu@google.com> |
Flash animation parameter tweaking per latest spec Change-Id: I455878c4ce55ddd863e32487db1561e2ec759f69
rc/com/android/camera/ui/CaptureAnimationOverlay.java
|
bdebd04c258f163ab5e8e7fcf639de83dfe5a271 |
13-Dec-2013 |
Doris Liu <tianliu@google.com> |
Merge "Update Panorama mode name, color, icon" into gb-ub-photos-denali
|
49a52f211869c44d862ba762a97b937411d37e31 |
13-Dec-2013 |
Doris Liu <tianliu@google.com> |
Update Panorama mode name, color, icon Bug: 12108651 Change-Id: I9edda88577702e41429a6845986e5d87c9abe3c7
es/drawable-hdpi/ic_panorama_normal.png
es/drawable-mdpi/ic_panorama_normal.png
es/drawable-xhdpi/ic_panorama_normal.png
es/drawable-xxhdpi/ic_panorama_normal.png
es/values/colors.xml
es/values/strings.xml
rc/com/android/camera/ui/ModeListView.java
|
eb3134f6ecc42f7d98625ca2c0ddfb06c9f07c43 |
12-Dec-2013 |
Spike Sprague <spikuru@google.com> |
intent ui Change-Id: I34c2b73a07d64b55b8aeb36515cae5d4e4e92813
es/layout/photo_intent_bottombar_buttons.xml
es/layout/photo_intent_review_bottombar_buttons.xml
rc/com/android/camera/ButtonManager.java
rc/com/android/camera/PhotoUI.java
rc/com/android/camera/ui/BottomBar.java
|
fce8a0b023bf88b2320b614dfaf7c67dcf00c9be |
13-Dec-2013 |
Erin Dahlgren <edahlgren@google.com> |
Add a flash callback for video mode toggle. Bug: 12089860 Change-Id: I97941468f79b4fb39aefb6f0662a7540c6121abe
rc/com/android/camera/VideoModule.java
rc/com/android/camera/VideoUI.java
|
42f74103b691203b5e5c30ea86c9615efb98f805 |
13-Dec-2013 |
Sascha Haeberling <haeberling@google.com> |
Merge "Clean up and fix notifications." into gb-ub-photos-denali
|
d3de171d6afa5ebd74d56dde6d4818b14a001286 |
13-Dec-2013 |
Angus Kong <shkong@google.com> |
Enable gallery button. bug:11898278 Change-Id: Id7953f5fa95a6597e5cd223094ab7ccb21f53e2c
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/app/FilmstripBottomControls.java
rc_pd/com/android/camera/util/IntentHelper.java
|
1dbb339102336c7a14ca67a946ac82d7212b29c4 |
13-Dec-2013 |
Sascha Haeberling <haeberling@google.com> |
Clean up and fix notifications. This fixes the issue where mutliple processes didn't properly create their own notifications. This also fixes the wording and messages for the notifications, which are now always shown. Change-Id: I829a80c8457e08fd6a3838393ef1080ef5fed433
es/values/strings.xml
rc/com/android/camera/app/CameraApp.java
rc/com/android/camera/session/CaptureSessionManagerImpl.java
rc/com/android/camera/session/ProcessingNotificationManager.java
|
1dfe7828fd60741b9752553af3ee439c04e758a0 |
12-Dec-2013 |
Doris Liu <tianliu@google.com> |
New flash animation Change-Id: I266b631a5c6feac114467e0a05799ad5e1ffae92
es/layout/generic_module.xml
es/values/dimens.xml
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/PhotoController.java
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/PhotoUI.java
rc/com/android/camera/VideoController.java
rc/com/android/camera/VideoModule.java
rc/com/android/camera/VideoUI.java
rc/com/android/camera/app/CameraAppUI.java
rc/com/android/camera/ui/CaptureAnimationOverlay.java
|
437ddd7a5e538585719ae362391bda186a7304be |
13-Dec-2013 |
Erin Dahlgren <edahlgren@google.com> |
Merge "Make hdr plus a global preference." into gb-ub-photos-denali
|
ba6994d8834db0cb2df60893ccb9af091b23bfce |
13-Dec-2013 |
Erin Dahlgren <edahlgren@google.com> |
Make hdr plus a global preference. Bug: 12112662 Change-Id: I4d5b80aa2412982717bd66e4903deef5331a152b
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/settings/SettingsManager.java
|
dd245b3feb3375fc6e681aecb4113c1aef679238 |
13-Dec-2013 |
Angus Kong <shkong@google.com> |
Merge "Enable share from filmstrip." into gb-ub-photos-denali
|
662fbf4637e5b1a28338613af05f21832cd820cb |
12-Dec-2013 |
Angus Kong <shkong@google.com> |
Enable share from filmstrip. bug:11898278 Change-Id: I3c7986666cfcf05f87fa0c4a15024262afc2dc4f
rc/com/android/camera/CameraActivity.java
|
06ba05f6f87f06ded0c1cdc6decd710625b1bf0e |
12-Dec-2013 |
Andy Huibers <andyhuibers@google.com> |
Merge "Implement new Zoom UI." into gb-ub-photos-denali
|
ebac6398e5ccf3f73d7c3d98ab63be4128e9d123 |
12-Dec-2013 |
Spike Sprague <spikuru@google.com> |
Merge "fix simple camera not capturing bug" into gb-ub-photos-denali
|
9e95b1da932c3a877a1bcf025a28376b0d42681d |
24-Nov-2013 |
Andy Huibers <andyhuibers@google.com> |
Implement new Zoom UI. Change-Id: Ie390230dc85de9a9ba19d6e14e2e9f7f890c52d5
es/values/dimens.xml
rc/com/android/camera/ui/PreviewOverlay.java
rc/com/android/camera/ui/ZoomRenderer.java
|
e0aff89f3e05eb6008651b290ba79d484de55970 |
12-Dec-2013 |
Angus Kong <shkong@google.com> |
Move buttons from action bar to bottom. Known issues: 1. Share has no effect. 2. Gallery icon has no effect. bug:11898278 Change-Id: I545e4dc339b6aa9242f61abb6021de874fcd3090
es/layout/filmstrip_bottom_controls.xml
es/values/dimens.xml
es/values/styles.xml
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/app/CameraAppUI.java
rc/com/android/camera/app/FilmstripBottomControls.java
rc/com/android/camera/data/LocalData.java
rc/com/android/camera/data/LocalMediaData.java
rc/com/android/camera/widget/FilmstripBottomLayout.java
rc/com/android/camera/widget/FilmstripView.java
|
215f6b08c4dc025b8243baff369da144844f22e2 |
12-Dec-2013 |
Spike Sprague <spikuru@google.com> |
fix simple camera not capturing bug Change-Id: I9136b5f4f0738251ddb3cb97ebba150d7e0846f0
rc/com/android/camera/PhotoModule.java
|
6088b0b35be3a6de42de3e29614ee3432e657a8b |
12-Dec-2013 |
Spike Sprague <spikuru@google.com> |
Merge "unify preview and bottom bar resizing code move bottom bar button into own layout files" into gb-ub-photos-denali
|
56f9fc218f258b0655e7c402ba34783a46e3fbde |
12-Dec-2013 |
Angus Kong <shkong@google.com> |
Merge "Dim the background when filmstrip shows." into gb-ub-photos-denali
|
2d55076d723075e9f98fb755c35f970d3ea5e0c0 |
12-Dec-2013 |
Angus Kong <shkong@google.com> |
Dim the background when filmstrip shows. bug:11898278 Change-Id: I4bb4d89c3f22170044e20cd3c38364a9c063830f
rc/com/android/camera/widget/FilmstripLayout.java
|
1ae8409538ac624ef1bb012fc9a25bdced6d112d |
12-Dec-2013 |
Doris Liu <tianliu@google.com> |
Fix mode cover for hdr+ mode Change-Id: Icb3c60946a6b5b280119e3a4d9c989ee6cc50e61
rc/com/android/camera/ui/ModeListView.java
|
5387d921d715c0810293f2626a9f0cd55ea52547 |
12-Dec-2013 |
Angus Kong <shkong@google.com> |
Merge "Fix the jitter by a stupid search-and-replace." into gb-ub-photos-denali
|
0f3c4b4fc9ac87d7d4c3d04c3cb3426c711f57ea |
11-Dec-2013 |
Spike Sprague <spikuru@google.com> |
unify preview and bottom bar resizing code move bottom bar button into own layout files Change-Id: Ib6237fddaa545476563b796cbd752b9562e9d9e4
es/layout-land/bottom_bar.xml
es/layout-port/bottom_bar.xml
es/layout/photo_bottombar_buttons.xml
es/layout/video_bottombar_buttons.xml
es/values/dimens.xml
rc/com/android/camera/ButtonManager.java
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/PhotoUI.java
rc/com/android/camera/VideoUI.java
rc/com/android/camera/app/AppController.java
rc/com/android/camera/app/CameraAppUI.java
rc/com/android/camera/ui/BottomBar.java
|
c602807bcf1fd0225f7c5a8627cd9e167eea4316 |
12-Dec-2013 |
Erin Dahlgren <edahlgren@google.com> |
Merge "Refactor ProgressRenderer out of PieRenderer." into gb-ub-photos-denali
|
6ca4411fd938e935028f713c1f32ed8e274debd4 |
12-Dec-2013 |
Angus Kong <shkong@google.com> |
Fix the jitter by a stupid search-and-replace. Change-Id: Id97b1ffe53cbb3a69d131f6069cb2cf4ca99a02f
rc/com/android/camera/widget/FilmstripLayout.java
|
a21945c7d628aadee74410013782b950a7aa93ff |
12-Dec-2013 |
Angus Kong <shkong@google.com> |
Merge "A small refactor of ImageData and LocalData." into gb-ub-photos-denali
|
5ce035e98ca289b0b0ca884c4d2bb2fd43d8c187 |
11-Dec-2013 |
Erin Dahlgren <edahlgren@google.com> |
Refactor ProgressRenderer out of PieRenderer. * Depends on ag/397902 Change-Id: I7c5f46acae9eb3c57a67f3ddf01554f0faff082d
rc/com/android/camera/ui/PieRenderer.java
rc/com/android/camera/ui/ProgressOverlay.java
rc/com/android/camera/ui/ProgressRenderer.java
|
a63dbb6231f06031204fe20b19a87d0440bd1661 |
22-Nov-2013 |
Sascha Haeberling <haeberling@google.com> |
Add a capture-session API to be used by all modules. Bug: 11747284 This refactors the way we think of sessions. Instead of having multiple session and notification APIs being used by different modules, we create on central capture session API to be used by all modules. This also adds a first implementation of a Memory API which tells modules about the current memory situation. Change-Id: I7f030e32fc2f70f4007825ba7bbbdce9521a2bd9
es/layout/camera_filmstrip.xml
es/values/strings.xml
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/CameraModule.java
rc/com/android/camera/FocusOverlayManager.java
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/Storage.java
rc/com/android/camera/VideoModule.java
rc/com/android/camera/app/AppManagerFactory.java
rc/com/android/camera/app/CameraApp.java
rc/com/android/camera/app/CameraServices.java
rc/com/android/camera/app/ImageTaskManager.java
rc/com/android/camera/app/MemoryManager.java
rc/com/android/camera/app/MemoryManagerImpl.java
rc/com/android/camera/app/PlaceholderManager.java
rc/com/android/camera/crop/ImageLoader.java
rc/com/android/camera/data/CameraDataAdapter.java
rc/com/android/camera/module/ModuleController.java
rc/com/android/camera/session/CaptureSession.java
rc/com/android/camera/session/CaptureSessionManager.java
rc/com/android/camera/session/CaptureSessionManagerImpl.java
rc/com/android/camera/session/PlaceholderManager.java
rc/com/android/camera/session/ProcessingNotificationManager.java
rc/com/android/camera/settings/SettingsManager.java
rc/com/android/camera/ui/RenderOverlay.java
rc_pd/com/android/camera/app/PanoramaStitchingManager.java
|
740cbeef73e8b8fad7605cf0723a647d81f73962 |
12-Dec-2013 |
Angus Kong <shkong@google.com> |
A small refactor of ImageData and LocalData. 1. isPhoto() removed since it's for checking if we can edit it. Use isDataActionSupported() instead since is designed for this purpose. 2. AuxInfoSupportCallback is moved to LocalData since filmstrip doesn't care about this and it's only available on the local data. Change-Id: I4eed477d6cdbe729904577b77a7ba97eed90074f
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/data/CameraDataAdapter.java
rc/com/android/camera/data/InProgressDataWrapper.java
rc/com/android/camera/data/LocalData.java
rc/com/android/camera/data/LocalMediaData.java
rc/com/android/camera/data/SimpleViewData.java
rc/com/android/camera/filmstrip/ImageData.java
|
b2510252fb020f3ccb88787c870930427377b9df |
11-Dec-2013 |
Angus Kong <shkong@google.com> |
Refactor filmstrip BottomControls out of filmstrip 1. The control logic should stay in the controller instead of the view. 2. Fix various issues. 3. Remove some unnecessary hacky checks. bug:12089863 bug:12095905 Change-Id: I6fceb5bf1a3121c45bc509f2fa96d01db2cedb5d
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/app/CameraAppUI.java
rc/com/android/camera/filmstrip/BottomControls.java
rc/com/android/camera/filmstrip/FilmstripContentPanel.java
rc/com/android/camera/filmstrip/FilmstripController.java
rc/com/android/camera/widget/FilmstripBottomLayout.java
rc/com/android/camera/widget/FilmstripLayout.java
rc/com/android/camera/widget/FilmstripView.java
|
2b906b8c9754b564d5113c7a342654c82f97f180 |
11-Dec-2013 |
Doris Liu <tianliu@google.com> |
Show a camera theme cover until preview is ready Also removed the toast for tap to take video snapshot Change-Id: I85025a9d09842097403e5ea7ce7391ea0ed9ec98
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/VideoModule.java
rc/com/android/camera/app/AppController.java
rc/com/android/camera/app/CameraAppUI.java
rc/com/android/camera/ui/ModeTransitionView.java
|
414723eeef540d8a740d4a6d9bfdcaf1298748a8 |
11-Dec-2013 |
Erin Dahlgren <edahlgren@google.com> |
Merge "Gcam uses the PreviewStatusListener controlled by CameraAppUI." into gb-ub-photos-denali
|
5f500bea98883c0d5686d23d4293353cd445c1ff |
10-Dec-2013 |
Erin Dahlgren <edahlgren@google.com> |
Gcam uses the PreviewStatusListener controlled by CameraAppUI. Change-Id: I1c1a6fba0df6b2eef440e87e0f3d8f9313f8ee1a
rc/com/android/camera/CameraActivity.java
|
3d793c4680ac467ec62bc3e9f47415f5f80ec6d3 |
11-Dec-2013 |
Angus Kong <shkong@google.com> |
Merge "Move/refactor filmstrip related files around." into gb-ub-photos-denali
|
01054e922aa547b937a71131ad04c6bd15356240 |
10-Dec-2013 |
Angus Kong <shkong@google.com> |
Move/refactor filmstrip related files around. 1. Rename filmstrip.FilmstripDataAdapter to filmstrip.DataAdapter. 2. Rename filmstrip.FilmstripImageData to filmstrip.ImageData. 3. Move filmstrip.FilmstripListener to filmstrip.FilmstripController.Listener. 4. Add FilmstripContentPanel interface. 5. Move ui.FilmstripView to widget.FilmstripView 6. Move ui.FilmstrpLayout to widget.Filmstripview 7. Move ui.FilmstripBottomControls to widget.FilmstripBottomLayout 8. Extracted interface from widget.FilmstripBottomLayout as filmstrip.BottomControls Change-Id: I83bdd89e2a48a98002a4fed7dab011b28036d1a0
es/layout/camera_filmstrip.xml
es/layout/filmstrip_bottom_controls.xml
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/app/CameraAppUI.java
rc/com/android/camera/data/CameraDataAdapter.java
rc/com/android/camera/data/CameraPreviewData.java
rc/com/android/camera/data/FixedFirstDataAdapter.java
rc/com/android/camera/data/FixedLastDataAdapter.java
rc/com/android/camera/data/LocalData.java
rc/com/android/camera/data/LocalDataAdapter.java
rc/com/android/camera/data/LocalMediaData.java
rc/com/android/camera/data/SimpleViewData.java
rc/com/android/camera/filmstrip/BottomControls.java
rc/com/android/camera/filmstrip/DataAdapter.java
rc/com/android/camera/filmstrip/FilmstripContentPanel.java
rc/com/android/camera/filmstrip/FilmstripController.java
rc/com/android/camera/filmstrip/FilmstripDataAdapter.java
rc/com/android/camera/filmstrip/FilmstripImageData.java
rc/com/android/camera/filmstrip/FilmstripListener.java
rc/com/android/camera/filmstrip/ImageData.java
rc/com/android/camera/ui/FilmstripBottomControls.java
rc/com/android/camera/ui/FilmstripLayout.java
rc/com/android/camera/ui/FilmstripView.java
rc/com/android/camera/ui/MainActivityLayout.java
rc/com/android/camera/widget/FilmstripBottomLayout.java
rc/com/android/camera/widget/FilmstripLayout.java
rc/com/android/camera/widget/FilmstripView.java
|
a8d4afebe65d72b87c411393fe473c63e4b8ddf3 |
10-Dec-2013 |
Sascha Haeberling <haeberling@google.com> |
Merge "Don't show tap-to-focus message." into gb-ub-photos-denali
|
cec03e68f4acd533687e9c432ffe73a5853efb98 |
10-Dec-2013 |
Erin Dahlgren <edahlgren@google.com> |
Support continous zoom ranges in PreviewOverlay. Change-Id: I46ee4f515ef159bbd2018dde43310c0327fa6e48
rc/com/android/camera/ui/PreviewOverlay.java
|
29f6056b703e627bc65efa74294c7c374a0b8957 |
10-Dec-2013 |
Sascha Haeberling <haeberling@google.com> |
Don't show tap-to-focus message. Bug: 12028253 Change-Id: Ifc4385c177dd895f2959429e2575d3ef1d5fcfe3
rc/com/android/camera/PhotoModule.java
|
b95699ed89d02a465950c48ea9b6147d90c80389 |
07-Dec-2013 |
Angus Kong <shkong@google.com> |
Move data-related controls with filmstrip. bug:12015169 Change-Id: I3185acc37adec23fc696f6693236178779a7459e
es/layout/camera_filmstrip.xml
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/ui/FilmstripLayout.java
|
2784c7cd90e5531e4e561e863db06ccc633bd15e |
10-Dec-2013 |
Angus Kong <shkong@google.com> |
Merge "Catch some corner cases for filmstrip." into gb-ub-photos-denali
|
ec2fb473c094f8dfd1cc0cf5205d470e412d3919 |
10-Dec-2013 |
Angus Kong <shkong@google.com> |
Catch some corner cases for filmstrip. 1. When no items on the filmstrip, don't show the filmstrip. 2. NPEs when start with empty filmstrip. 3. More comments. Change-Id: I8b8a592e7f64d870e7ff7ecf0255a57b289de7bf
rc/com/android/camera/ui/FilmstripLayout.java
rc/com/android/camera/ui/FilmstripView.java
|
de3235972d801fea229180444683ad296b40352d |
10-Dec-2013 |
Doris Liu <tianliu@google.com> |
Merge "Setup preview status listener for preview related changes" into gb-ub-photos-denali
|
8b942cc9ad9c5de3871b2bc57c77a6fa63aa7355 |
10-Dec-2013 |
Sascha Haeberling <haeberling@google.com> |
Target only K devices and up, explicitely. Bug: 12060982 Change-Id: Ia15775773f7135e9596b48be2a8e530b4f52452e
ndroidManifest.xml
|
06db742814dd635d100639f977fcfdc904deb778 |
10-Dec-2013 |
Doris Liu <tianliu@google.com> |
Setup preview status listener for preview related changes Change-Id: Ibd8341dfbe5e03ec77c149e671f4dd991833e678
es/layout/generic_module.xml
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/PhotoUI.java
rc/com/android/camera/VideoModule.java
rc/com/android/camera/VideoUI.java
rc/com/android/camera/app/AppController.java
rc/com/android/camera/app/CameraAppUI.java
rc/com/android/camera/ui/PreviewStatusListener.java
|
ee5eeef3b9c988e4aef73135d493a291fc5b489a |
10-Dec-2013 |
Erin Dahlgren <edahlgren@google.com> |
Merge "Make RenderOverlay only respond to tap listener events." into gb-ub-photos-denali
|
3c465d4448c7af495589cc814af22b5cc2c3acb8 |
10-Dec-2013 |
Doris Liu <tianliu@google.com> |
Merge "New keyguard layout" into gb-ub-photos-denali
|
db52a286cc2895a1fc516533b312c000428db53e |
10-Dec-2013 |
Doris Liu <tianliu@google.com> |
New keyguard layout Bug: 12060595 Change-Id: I32b0b6353bf8e569798901ba451daa91f11d8cb1
es/layout-land/keyguard_widget.xml
es/layout-port/keyguard_widget.xml
es/layout/keyguard_widget.xml
|
c5f08b0de26b054b4e49005e57ed789f3bb686dc |
10-Dec-2013 |
Erin Dahlgren <edahlgren@google.com> |
Make RenderOverlay only respond to tap listener events. * Note: this is temporary and makes refactoring the UI of Gcam easier. Soon RenderOverlay will not be a dependency. Change-Id: I7a328f3f7a33a495a1b51bb4bf8b5b558f3ff43e
rc/com/android/camera/ui/RenderOverlay.java
|
a20074f0efeaa62a29b05838110d04a1b7271418 |
10-Dec-2013 |
Doris Liu <tianliu@google.com> |
Only display supported modes in mode drawer Change-Id: I1891de0ca485db7d24982b2e73ac5d415480813e
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/app/ModuleManager.java
rc/com/android/camera/app/ModuleManagerImpl.java
rc/com/android/camera/ui/ModeListView.java
|
5bff8a37f9cd25b863e65576e3ed495f04f8307f |
10-Dec-2013 |
Angus Kong <shkong@google.com> |
Merge "Re-design callbacks from filmstrip." into gb-ub-photos-denali
|
faaee012acc80ad369cb03df9c196e48140f1e7b |
07-Dec-2013 |
Angus Kong <shkong@google.com> |
Re-design callbacks from filmstrip. Enumerated the possible states of filmstrip and have proper callbacks when entering/leaving each of the states. Change-Id: I5a6e931095bb0792e0832fda11d1f1b5ba850263
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/CameraModule.java
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/VideoModule.java
rc/com/android/camera/app/AppController.java
rc/com/android/camera/app/CameraAppUI.java
rc/com/android/camera/filmstrip/FilmstripController.java
rc/com/android/camera/filmstrip/FilmstripListener.java
rc/com/android/camera/module/ModuleController.java
rc/com/android/camera/ui/FilmstripLayout.java
rc/com/android/camera/ui/FilmstripView.java
|
d6e1ed7422e62fcca4c4ccffa6a15a1232449f90 |
10-Dec-2013 |
Baligh Uddin <baligh@google.com> |
Revert "Remove deprecated locales" This reverts commit d127136608daed0c4bea5fc6ce5ad40c0c4a6190. Change-Id: I6a69c16ae5a10ab1625b0e8505957b21114899f0
es/values-et/strings.xml
es/values-ms/strings.xml
|
d127136608daed0c4bea5fc6ce5ad40c0c4a6190 |
09-Dec-2013 |
Baligh Uddin <baligh@google.com> |
Remove deprecated locales Bug:11340849 Change-Id: I99a3613e3f38fcf38b2669ea074ee822555fc242
es/values-et/strings.xml
es/values-ms/strings.xml
|
32d751ea3ff3d77f1a1a44ac0c52a9c60f740f26 |
09-Dec-2013 |
Erin Dahlgren <edahlgren@google.com> |
Merge "Make the ButtonManager api associative." into gb-ub-photos-denali
|
8a2933b2c0156b752425b499f3081e4ffc350061 |
06-Dec-2013 |
Erin Dahlgren <edahlgren@google.com> |
Make the ButtonManager api associative. * Makes handling dependent behavior between buttons less error prone. Change-Id: I13acf3475c46573668e0c8fee633e71efafd9588
es/values/strings.xml
rc/com/android/camera/ButtonManager.java
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/PhotoUI.java
rc/com/android/camera/VideoUI.java
rc/com/android/camera/settings/SettingsManager.java
|
dea899922ed6184f1d5791e29917f93bf0d470c1 |
09-Dec-2013 |
Baligh Uddin <baligh@google.com> |
am c07b4ba8: (-s ours) am dcd2be70: (-s ours) am f437ab0c: (-s ours) am 9f7b40e1: (-s ours) Import translations. DO NOT MERGE * commit 'c07b4ba8ddd29f09cf36136029c1c9ddbf007724': Import translations. DO NOT MERGE
|
c07b4ba8ddd29f09cf36136029c1c9ddbf007724 |
09-Dec-2013 |
Baligh Uddin <baligh@google.com> |
am dcd2be70: (-s ours) am f437ab0c: (-s ours) am 9f7b40e1: (-s ours) Import translations. DO NOT MERGE * commit 'dcd2be70df58221e3367bb3761b6f36106d82f0d': Import translations. DO NOT MERGE
|
dcd2be70df58221e3367bb3761b6f36106d82f0d |
09-Dec-2013 |
Baligh Uddin <baligh@google.com> |
am f437ab0c: (-s ours) am 9f7b40e1: (-s ours) Import translations. DO NOT MERGE * commit 'f437ab0ca38eea48a573060017c01a6053590e02': Import translations. DO NOT MERGE
|
f437ab0ca38eea48a573060017c01a6053590e02 |
09-Dec-2013 |
Baligh Uddin <baligh@google.com> |
am 9f7b40e1: (-s ours) Import translations. DO NOT MERGE * commit '9f7b40e134242e2829a2bffcf71e8149130a159a': Import translations. DO NOT MERGE
|
e76976af3fa4da12c40f96873e90ea61b87eeae9 |
09-Dec-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ia513354c1045415376a47765766bf3513b4a3048 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-fa/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-km-rKH/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mn-rMN/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
9f7b40e134242e2829a2bffcf71e8149130a159a |
09-Dec-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I2b510d8650a4854a3066596e28cee9d4d196dd09 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-fa/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-km-rKH/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mn-rMN/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
1472cfd0ffbda7e51256c72b088fe755f0a226cc |
09-Dec-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: If4326347ceb38842b88e44332a3120e87496c7b9 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-fa/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-km-rKH/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mn-rMN/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
5b6502597edfd4658a937de2b5121dabf3510d52 |
07-Dec-2013 |
Angus Kong <shkong@google.com> |
A quick not-so-good fix for action bar issue. Will remove this fix after the filmstrip callback is re-designed. Change-Id: Ie445581ab8c3a1fc3e474bef96366932d52ddcc9
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/app/AppController.java
rc/com/android/camera/app/CameraAppUI.java
rc/com/android/camera/ui/FilmstripLayout.java
|
b41034b16b0dce997544d2592db5029e7db4e238 |
07-Dec-2013 |
Doris Liu <tianliu@google.com> |
Keep swipe left/right functioning in all modules Change-Id: I230b93c713a038595a06581cf10f48f49f50196b
rc/com/android/camera/app/CameraAppUI.java
rc/com/android/camera/ui/MainActivityLayout.java
|
be6dc1ecf5f17e2792c2cf0985b3410d129a8a29 |
07-Dec-2013 |
Angus Kong <shkong@google.com> |
Merge "Add CameraProvider methods to check camera facing." into gb-ub-photos-denali
|
39b460b805adaa54f310d8637868b3a5c792b2f5 |
07-Dec-2013 |
Angus Kong <shkong@google.com> |
Add CameraProvider methods to check camera facing. Change-Id: Iba0f21a65a44bed1a26fa375a050e4879701bd72
rc/com/android/camera/app/CameraController.java
rc/com/android/camera/app/CameraProvider.java
|
c6c9740d996bf073a157721aa3eb2a1aa60c477d |
07-Dec-2013 |
Doris Liu <tianliu@google.com> |
Cleanup after camera root is moved out of filmstrip Change-Id: I9e6efea3848f2f618aefc888ba7cca364fb64085
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/app/CameraAppUI.java
|
b7d3ce145dd7b1cf0ac51f53d5bc73dbbf35f6e6 |
07-Dec-2013 |
Doris Liu <tianliu@google.com> |
Refining shimmy Bug: 11858581 Change-Id: I7eefc5189caefc6d23d2dbbca243632db716b0c3
es/layout/activity_main.xml
es/layout/camera.xml
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/ui/ModeListView.java
|
b15eb56aefa6dc6a185aa62cba408d853ff4e6bb |
07-Dec-2013 |
Doris Liu <tianliu@google.com> |
Merge "Mode drawer with more fluid dragging" into gb-ub-photos-denali
|
cfaf7b0226e5d556ce12b34793f9bd0901652c62 |
06-Dec-2013 |
Doris Liu <tianliu@google.com> |
Mode drawer with more fluid dragging Change-Id: Ie897988a5efd6180a9b92c61487497b08ca16324
rc/com/android/camera/ui/ModeListView.java
|
30279d866783c0f2b01d2d60d3195b8e27bbec46 |
07-Dec-2013 |
Doris Liu <tianliu@google.com> |
Merge "Redesign preview Overlay for simplicity" into gb-ub-photos-denali
|
f9e4f8fbd1f761443d7a1eecbb5aa221ed3a06a8 |
05-Dec-2013 |
Doris Liu <tianliu@google.com> |
Redesign preview Overlay for simplicity Simplify how preview overlay should be setup from each module Refactored PhotoUI and VideoUI to use the new Overlay Change-Id: Ia8c7c71215007c9aaba69e55353b554e8fdf3c90
es/layout/generic_module.xml
rc/com/android/camera/PhotoController.java
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/PhotoUI.java
rc/com/android/camera/VideoModule.java
rc/com/android/camera/VideoUI.java
rc/com/android/camera/app/CameraAppUI.java
rc/com/android/camera/ui/PreviewOverlay.java
|
248f42b1926294ffa1855fd4319036a02b5f39a1 |
07-Dec-2013 |
Angus Kong <shkong@google.com> |
Change the home logo and the behavior of actionbar Change-Id: I2a930fafd22ea36ae2a84b749c54f64c67a7d06d
ndroidManifest.xml
rc/com/android/camera/CameraActivity.java
|
6245518699bb391356c08d3b9ffa1cc90480ae2f |
06-Dec-2013 |
Erin Dahlgren <edahlgren@google.com> |
Merge "Create a ButtonManager for managing common button behaviors." into gb-ub-photos-denali
|
138af5122a9e875f903ddfdb2b084ae5844d9ea5 |
06-Dec-2013 |
Angus Kong <shkong@google.com> |
Merge "Remove build target and codes for legacy panorama." into gb-ub-photos-denali
|
18e2ef6d2b2d36abcaa7378a0f7df792ecf8ed81 |
05-Dec-2013 |
Erin Dahlgren <edahlgren@google.com> |
Create a ButtonManager for managing common button behaviors. Change-Id: I02d99c393a01e6de9ffb2f4f351a832b4eae9e37
es/layout-land/bottom_bar.xml
es/layout-port/bottom_bar.xml
rc/com/android/camera/ButtonManager.java
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/PhotoMenu.java
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/PhotoUI.java
rc/com/android/camera/VideoMenu.java
rc/com/android/camera/VideoModule.java
rc/com/android/camera/VideoUI.java
|
6943f52611ff2873bed6785c3f15a61f4e0a0b1f |
06-Dec-2013 |
The Android Open Source Project <initial-contribution@android.com> |
am 361da81b: am 3103ef8a: am 148552a0: Merge commit \'da6d9776befd7f03cd863654c03327806025f8b6\' into HEAD * commit '361da81b7ca872e666ac0fd342a080e5a992b084':
|
361da81b7ca872e666ac0fd342a080e5a992b084 |
06-Dec-2013 |
The Android Open Source Project <initial-contribution@android.com> |
am 3103ef8a: am 148552a0: Merge commit \'da6d9776befd7f03cd863654c03327806025f8b6\' into HEAD * commit '3103ef8a2980f3dda2ec2a24eca5bd248a2262e9':
|
3103ef8a2980f3dda2ec2a24eca5bd248a2262e9 |
06-Dec-2013 |
The Android Open Source Project <initial-contribution@android.com> |
am 148552a0: Merge commit \'da6d9776befd7f03cd863654c03327806025f8b6\' into HEAD * commit '148552a0ef3777eccfbcff2297561a4c755c8777':
|
0fa5fcd82ac6fbda0b1ac3d6c1a4759fea13e219 |
06-Dec-2013 |
Angus Kong <shkong@google.com> |
Merge "Add quantum paper background for filmstrip." into gb-ub-photos-denali
|
43596cd34e7020d6a0aafcdc31297237ad98496c |
05-Dec-2013 |
Angus Kong <shkong@google.com> |
Add quantum paper background for filmstrip. Also fix the issue of flickering when swiping out filmstrip. bug:11898278 Change-Id: I0fd0c394cd8c14d70fd7ef1c912ab05d2a5c6668
es/layout/camera_filmstrip.xml
rc/com/android/camera/ui/FilmstripLayout.java
rc/com/android/camera/ui/FilmstripView.java
|
4583f053f5f3205e6016e1cb6c2a5475e0588bdf |
05-Dec-2013 |
Angus Kong <shkong@google.com> |
Remove build target and codes for legacy panorama. bug:11811982 Change-Id: I733e80511d8eecdd1dbc90daf9b7f9fb709a2766
ndroid.mk
ni/Android.mk
ni/feature_mos/doc/Readme.txt
ni/feature_mos/doc/feature_mos_API_doxyfile
ni/feature_mos/src/mosaic/AlignFeatures.cpp
ni/feature_mos/src/mosaic/AlignFeatures.h
ni/feature_mos/src/mosaic/Blend.cpp
ni/feature_mos/src/mosaic/Blend.h
ni/feature_mos/src/mosaic/CSite.h
ni/feature_mos/src/mosaic/Delaunay.cpp
ni/feature_mos/src/mosaic/Delaunay.h
ni/feature_mos/src/mosaic/EdgePointerUtil.h
ni/feature_mos/src/mosaic/Geometry.h
ni/feature_mos/src/mosaic/ImageUtils.cpp
ni/feature_mos/src/mosaic/ImageUtils.h
ni/feature_mos/src/mosaic/Interp.h
ni/feature_mos/src/mosaic/Log.h
ni/feature_mos/src/mosaic/MatrixUtils.h
ni/feature_mos/src/mosaic/Mosaic.cpp
ni/feature_mos/src/mosaic/Mosaic.h
ni/feature_mos/src/mosaic/MosaicTypes.h
ni/feature_mos/src/mosaic/Pyramid.cpp
ni/feature_mos/src/mosaic/Pyramid.h
ni/feature_mos/src/mosaic/trsMatrix.cpp
ni/feature_mos/src/mosaic/trsMatrix.h
ni/feature_mos/src/mosaic_renderer/FrameBuffer.cpp
ni/feature_mos/src/mosaic_renderer/FrameBuffer.h
ni/feature_mos/src/mosaic_renderer/Renderer.cpp
ni/feature_mos/src/mosaic_renderer/Renderer.h
ni/feature_mos/src/mosaic_renderer/SurfaceTextureRenderer.cpp
ni/feature_mos/src/mosaic_renderer/SurfaceTextureRenderer.h
ni/feature_mos/src/mosaic_renderer/WarpRenderer.cpp
ni/feature_mos/src/mosaic_renderer/WarpRenderer.h
ni/feature_mos/src/mosaic_renderer/YVURenderer.cpp
ni/feature_mos/src/mosaic_renderer/YVURenderer.h
ni/feature_mos_jni.cpp
ni/feature_stab/db_vlvm/db_bundle.h
ni/feature_stab/db_vlvm/db_feature_detection.cpp
ni/feature_stab/db_vlvm/db_feature_detection.h
ni/feature_stab/db_vlvm/db_feature_matching.cpp
ni/feature_stab/db_vlvm/db_feature_matching.h
ni/feature_stab/db_vlvm/db_framestitching.cpp
ni/feature_stab/db_vlvm/db_framestitching.h
ni/feature_stab/db_vlvm/db_image_homography.cpp
ni/feature_stab/db_vlvm/db_image_homography.h
ni/feature_stab/db_vlvm/db_metrics.h
ni/feature_stab/db_vlvm/db_rob_image_homography.cpp
ni/feature_stab/db_vlvm/db_rob_image_homography.h
ni/feature_stab/db_vlvm/db_robust.h
ni/feature_stab/db_vlvm/db_utilities.cpp
ni/feature_stab/db_vlvm/db_utilities.h
ni/feature_stab/db_vlvm/db_utilities_algebra.h
ni/feature_stab/db_vlvm/db_utilities_camera.cpp
ni/feature_stab/db_vlvm/db_utilities_camera.h
ni/feature_stab/db_vlvm/db_utilities_constants.h
ni/feature_stab/db_vlvm/db_utilities_geometry.h
ni/feature_stab/db_vlvm/db_utilities_indexing.cpp
ni/feature_stab/db_vlvm/db_utilities_indexing.h
ni/feature_stab/db_vlvm/db_utilities_linalg.cpp
ni/feature_stab/db_vlvm/db_utilities_linalg.h
ni/feature_stab/db_vlvm/db_utilities_poly.cpp
ni/feature_stab/db_vlvm/db_utilities_poly.h
ni/feature_stab/db_vlvm/db_utilities_random.h
ni/feature_stab/db_vlvm/db_utilities_rotation.h
ni/feature_stab/doc/Readme.txt
ni/feature_stab/doc/dbreg_API_doxyfile
ni/feature_stab/src/dbreg/dbreg.cpp
ni/feature_stab/src/dbreg/dbreg.h
ni/feature_stab/src/dbreg/dbstabsmooth.cpp
ni/feature_stab/src/dbreg/dbstabsmooth.h
ni/feature_stab/src/dbreg/targetver.h
ni/feature_stab/src/dbreg/vp_motionmodel.c
ni/feature_stab/src/dbreg/vp_motionmodel.h
ni/feature_stab/src/dbregtest/PgmImage.cpp
ni/feature_stab/src/dbregtest/PgmImage.h
ni/feature_stab/src/dbregtest/dbregtest.cpp
ni/feature_stab/src/dbregtest/stdafx.cpp
ni/feature_stab/src/dbregtest/stdafx.h
ni/feature_stab/src/dbregtest/targetver.h
ni/mosaic_renderer_jni.cpp
ni/mosaic_renderer_jni.h
rc/com/android/camera/Mosaic.java
rc/com/android/camera/MosaicFrameProcessor.java
rc/com/android/camera/MosaicPreviewRenderer.java
rc/com/android/camera/MosaicRenderer.java
rc/com/android/camera/WideAnglePanoramaController.java
rc/com/android/camera/WideAnglePanoramaModule.java
rc/com/android/camera/WideAnglePanoramaUI.java
rc/com/android/camera/module/ModulesInfo.java
|
aeaef40c8285e5c2c0c5e13a8f8229cdb531836c |
05-Dec-2013 |
Angus Kong <shkong@google.com> |
Merge "Replace legacy wide-angle panorama with new one." into gb-ub-photos-denali
|
aff95be4930147d00a754b7544e6418e17667900 |
05-Dec-2013 |
Angus Kong <shkong@google.com> |
Replace legacy wide-angle panorama with new one. Change-Id: I55977b1a3346bfc45782eed3791e34cac423ee96
rc/com/android/camera/module/ModulesInfo.java
rc_pd/com/android/camera/util/PhotoSphereHelper.java
|
7824cd3c905e6cb72ebb22da0e7b5c1173c823a2 |
05-Dec-2013 |
Doris Liu <tianliu@google.com> |
Merge "Change mode drawer text weight to light, change camera mode color" into gb-ub-photos-denali
|
53b3ddbae16c5efbac842e158525720d0b9108cb |
05-Dec-2013 |
Doris Liu <tianliu@google.com> |
Change mode drawer text weight to light, change camera mode color Bug: 11996762 Bug: 11996767 Change-Id: I51ca31795856b91bc78f6d579dd33ec527c1f57b
ssets/fonts/Roboto-Light.ttf
es/values/colors.xml
rc/com/android/camera/ui/ModeSelectorItem.java
rc/com/android/camera/util/ApiHelper.java
|
148552a0ef3777eccfbcff2297561a4c755c8777 |
05-Dec-2013 |
The Android Open Source Project <initial-contribution@android.com> |
Merge commit 'da6d9776befd7f03cd863654c03327806025f8b6' into HEAD
|
e20490c30704e0b14eb25f34cf934b9925b63f6f |
05-Dec-2013 |
Alan Newberger <alann@google.com> |
am 4e8aebd6: am bff2d101: am 689c1c7d: am d8732fc2: am f9b2d0c7: Remove TRIM support * commit '4e8aebd6308a0559f96f5b614dfec54031d6c5e9': Remove TRIM support
|
94c760da17e46368b26d85270cad1c8bd515fa16 |
05-Dec-2013 |
Geoff Mendal <mendal@google.com> |
am 94ba9b8c: (-s ours) am dc0fc0c0: (-s ours) am 3360879d: (-s ours) am 2ecb5944: (-s ours) am be55432c: (-s ours) Import translations. DO NOT MERGE * commit '94ba9b8c36fc49f0522d586b3a92b8b96d6cd537': Import translations. DO NOT MERGE
|
cb1e59f6a5895867ea6e213b7dfb024a80dcfb86 |
05-Dec-2013 |
Geoff Mendal <mendal@google.com> |
am 9ccd5016: (-s ours) am ac917a1d: (-s ours) am 2450dd6d: (-s ours) am ecaad7a2: (-s ours) Import translations. DO NOT MERGE * commit '9ccd5016088578628066bc482178220ab1b9a6c3': Import translations. DO NOT MERGE
|
a07e94c1ed57fa014e7428345927223768532d32 |
05-Dec-2013 |
Erin Dahlgren <edahlgren@google.com> |
Remove dependency on preference groups from video mode. Change-Id: I40f69fa1267d0500125c786bb550052bbd200f9e
rc/com/android/camera/MultiToggleImageButton.java
rc/com/android/camera/VideoMenu.java
rc/com/android/camera/VideoModule.java
rc/com/android/camera/VideoUI.java
|
14d9bbc8b4f259696ad89e39480c7b7ec22c8314 |
05-Dec-2013 |
Angus Kong <shkong@google.com> |
Merge "Implement the new filmstrip UI - first step." into gb-ub-photos-denali
|
166e36fb6e04d40a1bef0459ee6b96c9c736039b |
03-Dec-2013 |
Angus Kong <shkong@google.com> |
Implement the new filmstrip UI - first step. More fancy stuffs will be added in the following CLs. Change-Id: I065c7baf1ff9695121db4917158ffecd0bfc0d01
es/layout/activity_main.xml
es/layout/camera_filmstrip.xml
es/values/colors.xml
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/app/CameraAppUI.java
rc/com/android/camera/ui/FilmStripGestureRecognizer.java
rc/com/android/camera/ui/FilmstripGestureRecognizer.java
rc/com/android/camera/ui/FilmstripLayout.java
rc/com/android/camera/ui/FilmstripView.java
rc/com/android/camera/ui/MainActivityLayout.java
|
48785a35453421e156a240ca8a5a2cc68c9391fd |
05-Dec-2013 |
Erin Dahlgren <edahlgren@google.com> |
Fix broken build. Change-Id: If7483de46934eb81d599367191291d453d715bae
rc_pd/com/android/camera/util/SettingsHelper.java
|
c10e890cf4d2ceea73773e838eaa287c70297bce |
05-Dec-2013 |
Erin Dahlgren <edahlgren@google.com> |
Fix the build. * A duplicate res string compiles locally but fails on the build servers. Change-Id: I5fa1748fa65a1c1595c88af2bb2ca9a9e1a65e58
es/values/strings.xml
|
84ad69f700953821268dbdfb760f474c3f671114 |
05-Dec-2013 |
Erin Dahlgren <edahlgren@google.com> |
Merge "Remove photo mode dependency on preference groups." into gb-ub-photos-denali
|
e419b1919ed54d8d94d19faec2d02e773ae7ecdb |
03-Dec-2013 |
Erin Dahlgren <edahlgren@google.com> |
Remove photo mode dependency on preference groups. Bug: 11967053 Change-Id: I3058a1931d92fa006da9e16bdcc2b5f864b1eacb
es/values/arrays.xml
es/values/strings.xml
rc/com/android/camera/FocusOverlayManager.java
rc/com/android/camera/PhotoMenu.java
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/PhotoUI.java
rc/com/android/camera/SettingsController.java
rc/com/android/camera/settings/SettingsCache.java
rc/com/android/camera/settings/SettingsManager.java
rc_pd/com/android/camera/util/SettingsHelper.java
|
4e8aebd6308a0559f96f5b614dfec54031d6c5e9 |
05-Dec-2013 |
Alan Newberger <alann@google.com> |
am bff2d101: am 689c1c7d: am d8732fc2: am f9b2d0c7: Remove TRIM support * commit 'bff2d1018647647875b92e58d79793d392e29625': Remove TRIM support
|
bff2d1018647647875b92e58d79793d392e29625 |
05-Dec-2013 |
Alan Newberger <alann@google.com> |
am 689c1c7d: am d8732fc2: am f9b2d0c7: Remove TRIM support * commit '689c1c7d13f8d1cc01188696cee3d5c8a70e84da': Remove TRIM support
|
689c1c7d13f8d1cc01188696cee3d5c8a70e84da |
05-Dec-2013 |
Alan Newberger <alann@google.com> |
am d8732fc2: am f9b2d0c7: Remove TRIM support * commit 'd8732fc2277b120a4b7b0e978f6a8c18ebc202ed': Remove TRIM support
|
d8732fc2277b120a4b7b0e978f6a8c18ebc202ed |
05-Dec-2013 |
Alan Newberger <alann@google.com> |
am f9b2d0c7: Remove TRIM support * commit 'f9b2d0c7775b43996a9b9f51c6fc5ab266042c72': Remove TRIM support
|
f9b2d0c7775b43996a9b9f51c6fc5ab266042c72 |
05-Dec-2013 |
Alan Newberger <alann@google.com> |
Remove TRIM support Remove the ability to trim a video with the quick menu action. Bug: 11884080 Change-Id: If00cb31ad6b913012c542a809dba1a8e5d9e5b74
rc/com/android/camera/CameraActivity.java
|
94ba9b8c36fc49f0522d586b3a92b8b96d6cd537 |
04-Dec-2013 |
Geoff Mendal <mendal@google.com> |
am dc0fc0c0: (-s ours) am 3360879d: (-s ours) am 2ecb5944: (-s ours) am be55432c: (-s ours) Import translations. DO NOT MERGE * commit 'dc0fc0c0f0b2a494c86646f5cd1fbd146c9882b7': Import translations. DO NOT MERGE
|
dc0fc0c0f0b2a494c86646f5cd1fbd146c9882b7 |
04-Dec-2013 |
Geoff Mendal <mendal@google.com> |
am 3360879d: (-s ours) am 2ecb5944: (-s ours) am be55432c: (-s ours) Import translations. DO NOT MERGE * commit '3360879db7b16db9f4ac96f6fcfa403e4acf8dd9': Import translations. DO NOT MERGE
|
9ccd5016088578628066bc482178220ab1b9a6c3 |
04-Dec-2013 |
Geoff Mendal <mendal@google.com> |
am ac917a1d: (-s ours) am 2450dd6d: (-s ours) am ecaad7a2: (-s ours) Import translations. DO NOT MERGE * commit 'ac917a1dbea65741d63f22fb4e2a8b6c625797d9': Import translations. DO NOT MERGE
|
3360879db7b16db9f4ac96f6fcfa403e4acf8dd9 |
04-Dec-2013 |
Geoff Mendal <mendal@google.com> |
am 2ecb5944: (-s ours) am be55432c: (-s ours) Import translations. DO NOT MERGE * commit '2ecb594418aedae10d053512f54d8c0a42a494b6': Import translations. DO NOT MERGE
|
ac917a1dbea65741d63f22fb4e2a8b6c625797d9 |
04-Dec-2013 |
Geoff Mendal <mendal@google.com> |
am 2450dd6d: (-s ours) am ecaad7a2: (-s ours) Import translations. DO NOT MERGE * commit '2450dd6d4a9568b1e264ceb5744bfb4890b4c9b7': Import translations. DO NOT MERGE
|
2ecb594418aedae10d053512f54d8c0a42a494b6 |
04-Dec-2013 |
Geoff Mendal <mendal@google.com> |
am be55432c: (-s ours) Import translations. DO NOT MERGE * commit 'be55432c9d98640fbc968a4b8dc77d7994c16fe4': Import translations. DO NOT MERGE
|
2450dd6d4a9568b1e264ceb5744bfb4890b4c9b7 |
04-Dec-2013 |
Geoff Mendal <mendal@google.com> |
am ecaad7a2: (-s ours) Import translations. DO NOT MERGE * commit 'ecaad7a2992d27ae3aeeec359824c4bb1fef5799': Import translations. DO NOT MERGE
|
00a7f56939fa539356f15d6bdb6652e8da5c94fa |
04-Dec-2013 |
Geoff Mendal <mendal@google.com> |
Import translations. DO NOT MERGE Change-Id: I15e1152ff05badaa731519622648e120349b9226 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-km-rKH/strings.xml
es/values-ko/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mn-rMN/strings.xml
es/values-ms-rMY/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
ecaad7a2992d27ae3aeeec359824c4bb1fef5799 |
04-Dec-2013 |
Geoff Mendal <mendal@google.com> |
Import translations. DO NOT MERGE Change-Id: I108868d50a1376c9d638fae24f7a004733eedecb Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-km-rKH/strings.xml
es/values-ko/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mn-rMN/strings.xml
es/values-ms-rMY/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
c17636cbf6169db28109d5ee2cf0081956f02077 |
04-Dec-2013 |
Geoff Mendal <mendal@google.com> |
Import translations. DO NOT MERGE Change-Id: Ia63e893030e0da26bd05e5aef611b40284411a8c Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-km-rKH/strings.xml
es/values-ko/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mn-rMN/strings.xml
es/values-ms-rMY/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
be55432c9d98640fbc968a4b8dc77d7994c16fe4 |
04-Dec-2013 |
Geoff Mendal <mendal@google.com> |
Import translations. DO NOT MERGE Change-Id: I10fe11b8f611ca054e7d0689c8d12135b0722dd4 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-km-rKH/strings.xml
es/values-ko/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mn-rMN/strings.xml
es/values-ms-rMY/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
0a60bfa2a89507ef8f7233fd68e791409708d3b3 |
03-Dec-2013 |
Michael Kolb <kolby@google.com> |
am a1a012a0: am 7fe487c4: am 240b5cab: am d75b9aee: Fix samsung video recording * commit 'a1a012a08ea33a0b84bee2d419ae1caba5a2259a': Fix samsung video recording
|
374a12f4b4391f2299c2b6a4e7f4998f90252e40 |
03-Dec-2013 |
Michael Kolb <kolby@google.com> |
am e4e01f79: am fef79bde: am 795812fd: am 13350e5e: Fix WB indicator override * commit 'e4e01f7966d782d63d5806bd9dd270c414b20dea': Fix WB indicator override
|
a1a012a08ea33a0b84bee2d419ae1caba5a2259a |
03-Dec-2013 |
Michael Kolb <kolby@google.com> |
am 7fe487c4: am 240b5cab: am d75b9aee: Fix samsung video recording * commit '7fe487c4519dd6d3f29242426a77e60e9d1a69d3': Fix samsung video recording
|
e4e01f7966d782d63d5806bd9dd270c414b20dea |
03-Dec-2013 |
Michael Kolb <kolby@google.com> |
am fef79bde: am 795812fd: am 13350e5e: Fix WB indicator override * commit 'fef79bde66d01ec7976d3978978dc4584c2bc445': Fix WB indicator override
|
7fe487c4519dd6d3f29242426a77e60e9d1a69d3 |
03-Dec-2013 |
Michael Kolb <kolby@google.com> |
am 240b5cab: am d75b9aee: Fix samsung video recording * commit '240b5cabe460ca72c43394c595615da914ccb7c1': Fix samsung video recording
|
fef79bde66d01ec7976d3978978dc4584c2bc445 |
03-Dec-2013 |
Michael Kolb <kolby@google.com> |
am 795812fd: am 13350e5e: Fix WB indicator override * commit '795812fdf641e133197fbd29f5f55351f7367092': Fix WB indicator override
|
240b5cabe460ca72c43394c595615da914ccb7c1 |
03-Dec-2013 |
Michael Kolb <kolby@google.com> |
am d75b9aee: Fix samsung video recording * commit 'd75b9aee9a205d6c4d96aa8913131430a0d9a399': Fix samsung video recording
|
795812fdf641e133197fbd29f5f55351f7367092 |
03-Dec-2013 |
Michael Kolb <kolby@google.com> |
am 13350e5e: Fix WB indicator override * commit '13350e5e46db241b4f6d1ad3f371ac7292c12e65': Fix WB indicator override
|
f954236c21f06a6a2d1bb060f1098a622f35923d |
30-May-2013 |
Michael Kolb <kolby@google.com> |
Fix samsung video recording Patching Bryce CL into Denali Bug: 9056573 Change-Id: I81fc31e24fe26bef4179bfc4428def2e8b7d94e9 Conflicts: src/com/android/camera/VideoModule.java
rc/com/android/camera/VideoModule.java
|
d75b9aee9a205d6c4d96aa8913131430a0d9a399 |
30-May-2013 |
Michael Kolb <kolby@google.com> |
Fix samsung video recording Patching Bryce CL into Carlsbad Bug: 9056573 Change-Id: I81fc31e24fe26bef4179bfc4428def2e8b7d94e9 Conflicts: src/com/android/camera/VideoModule.java
rc/com/android/camera/VideoModule.java
|
095fa44f760234376946cd97ccf262e3df0cd7d6 |
03-Dec-2013 |
Angus Kong <shkong@google.com> |
Merge "Make onLayoutOrientationChanged to take a boolean." into gb-ub-photos-denali
|
5996d47f069b10e7891c100fb60df79e8561f64c |
03-Dec-2013 |
Doris Liu <tianliu@google.com> |
Merge "Remove deprecated fitSystemWindows logic" into gb-ub-photos-denali
|
c8b21a5b4137942a65105ca6abf3ef8257bde480 |
03-Dec-2013 |
Michael Kolb <kolby@google.com> |
am c5da5393: am 153a52b3: am 1e5baa47: am 0f7d5488: Revert fixed focus area in CAF mode * commit 'c5da53936350c1f5cc5e8f7f4b0dfe2ff24b0f25': Revert fixed focus area in CAF mode
|
13350e5e46db241b4f6d1ad3f371ac7292c12e65 |
24-Jun-2013 |
Michael Kolb <kolby@google.com> |
Fix WB indicator override Patching into Carlsbad from Bryce. Bug: 9372794 Change-Id: I4f23f05ca1acaef84a24034237e82001aac09f78
rc/com/android/camera/PhotoUI.java
|
c5da53936350c1f5cc5e8f7f4b0dfe2ff24b0f25 |
03-Dec-2013 |
Michael Kolb <kolby@google.com> |
am 153a52b3: am 1e5baa47: am 0f7d5488: Revert fixed focus area in CAF mode * commit '153a52b3517d354a101a0f10d589c88afd6974b6': Revert fixed focus area in CAF mode
|
153a52b3517d354a101a0f10d589c88afd6974b6 |
03-Dec-2013 |
Michael Kolb <kolby@google.com> |
am 1e5baa47: am 0f7d5488: Revert fixed focus area in CAF mode * commit '1e5baa473c233f7b4bd1568d5047c20533e4ce59': Revert fixed focus area in CAF mode
|
b05794393444ebd13bd24c2ecfb3fbd9963f688e |
11-Jul-2013 |
Michael Kolb <kolby@google.com> |
Revert fixed focus area in CAF mode Bug: 9306098 This doesn't set the faces as focus/exp areas yet, but resets the focus area to null in CAF mode to let the HAL decide focus/exp area. Cherrypick of Bryce CL into Denali. Change-Id: I38e31937f64ecdb23d6c79f96040c46652d1d7d0 Conflicts: src/com/android/camera/FocusOverlayManager.java
rc/com/android/camera/FocusOverlayManager.java
|
1e5baa473c233f7b4bd1568d5047c20533e4ce59 |
03-Dec-2013 |
Michael Kolb <kolby@google.com> |
am 0f7d5488: Revert fixed focus area in CAF mode * commit '0f7d5488d33988c1ee3636fe3a7d6472bed84f00': Revert fixed focus area in CAF mode
|
2f0e4a3995684c986afad55db7715c15393a9df0 |
03-Dec-2013 |
Angus Kong <shkong@google.com> |
Make onLayoutOrientationChanged to take a boolean. ModuleController.onLayoutOrientationChanged() call back can just take a boolean to know whether the layout orientation is in landscape or portrait. Change-Id: I1675cbea263b12bb0b568a6038f0fc17dd03799a
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/VideoModule.java
rc/com/android/camera/WideAnglePanoramaModule.java
rc/com/android/camera/WideAnglePanoramaUI.java
rc/com/android/camera/module/ModuleController.java
|
006eb5dbee591e4aa6303bc07cf92eaa397d81db |
03-Dec-2013 |
Alan Newberger <alann@google.com> |
am 0ea86760: am 69818e57: am a3b92891: am 0d5505dd: Merge "Add another HTC picture resolution" into gb-ub-photos-carlsbad * commit '0ea8676082f28f7a975c4316e9bd43ae30b72ed3': Add another HTC picture resolution
|
0f7d5488d33988c1ee3636fe3a7d6472bed84f00 |
11-Jul-2013 |
Michael Kolb <kolby@google.com> |
Revert fixed focus area in CAF mode Bug: 9306098 This doesn't set the faces as focus/exp areas yet, but resets the focus area to null in CAF mode to let the HAL decide focus/exp area. Cherrypick of Bryce CL into Carlsbad. Change-Id: I38e31937f64ecdb23d6c79f96040c46652d1d7d0 Conflicts: src/com/android/camera/FocusOverlayManager.java
rc/com/android/camera/FocusOverlayManager.java
|
0ea8676082f28f7a975c4316e9bd43ae30b72ed3 |
03-Dec-2013 |
Alan Newberger <alann@google.com> |
am 69818e57: am a3b92891: am 0d5505dd: Merge "Add another HTC picture resolution" into gb-ub-photos-carlsbad * commit '69818e57c74f176d31ef48c7c628234c240f1412': Add another HTC picture resolution
|
69818e57c74f176d31ef48c7c628234c240f1412 |
03-Dec-2013 |
Alan Newberger <alann@google.com> |
am a3b92891: am 0d5505dd: Merge "Add another HTC picture resolution" into gb-ub-photos-carlsbad * commit 'a3b928919285fbe31a1201cb0b56336a3909cb4f': Add another HTC picture resolution
|
d3253f20d9fc971f7cb6bdef6cd6f96b21f7dd63 |
12-Jul-2013 |
Michael Kolb <kolby@google.com> |
Always set focus mode first before applying scene mode Patching Bryce CL into Denali. Bug: 9577903 Change-Id: I2c300e443a47c7bc0c20f6aaec6f6e4b6c238880
rc/com/android/camera/PhotoModule.java
|
a3b928919285fbe31a1201cb0b56336a3909cb4f |
03-Dec-2013 |
Alan Newberger <alann@google.com> |
am 0d5505dd: Merge "Add another HTC picture resolution" into gb-ub-photos-carlsbad * commit '0d5505dd1a3bf297677161c4c6608c783d7a2b68': Add another HTC picture resolution
|
8ae8e56d6e369221f047a28678737e4c44e31a87 |
03-Dec-2013 |
Alan Newberger <alann@google.com> |
Merge "Add another HTC picture resolution" into gb-ub-photos-denali
|
0d5505dd1a3bf297677161c4c6608c783d7a2b68 |
03-Dec-2013 |
Alan Newberger <alann@google.com> |
Merge "Add another HTC picture resolution" into gb-ub-photos-carlsbad
|
63233419b09c73e1b45e61acae2c8a2b2d9fd226 |
03-Dec-2013 |
Erin Dahlgren <edahlgren@google.com> |
Merge "Remove ComboPreferences from video mode." into gb-ub-photos-denali
|
ca2b4025adc409a5c8927d4e3d4a68e6a01a3861 |
03-Dec-2013 |
Doris Liu <tianliu@google.com> |
Remove deprecated fitSystemWindows logic Change-Id: I6393db86b017652dfc16f41a0a915fc5e7cff6a0
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/ui/FilmstripView.java
rc/com/android/camera/ui/MainActivityLayout.java
|
f4f94c81f3ab71066a89fffd67af84815cda1b3e |
12-Jun-2013 |
Michael Kolb <kolby@google.com> |
Add another HTC picture resolution Bug: 9370319 Change-Id: I9b2c45b98c7075fda7289707f1e290fcefc084cc Conflicts: res/values/strings.xml
es/values/arrays.xml
es/values/strings.xml
|
398f151a6292a617cd635cc05fa9e0abaece5c19 |
12-Jun-2013 |
Michael Kolb <kolby@google.com> |
Add another HTC picture resolution patching into Carlsbad branch from Bryce Bug: 9370319 Change-Id: I9b2c45b98c7075fda7289707f1e290fcefc084cc Conflicts: res/values/strings.xml
es/values/arrays.xml
es/values/strings.xml
|
ff33b520b30a3faf72623f2889fdae1096a8586b |
03-Dec-2013 |
Doris Liu <tianliu@google.com> |
Merge "No longer lay out under nav bar." into gb-ub-photos-denali
|
773e1c9285bd2d0f03ba87db13e77b4f5197ac4f |
03-Dec-2013 |
Doris Liu <tianliu@google.com> |
No longer lay out under nav bar. Gutted out camera root view that was intended to lay out its child views correctly when it is laid out under the nav bar. Change-Id: Iee33daf63dd6a592577f59010f0fc6b71a126f7c
es/layout/camera.xml
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/PhotoUI.java
rc/com/android/camera/VideoModule.java
rc/com/android/camera/VideoUI.java
rc/com/android/camera/WideAnglePanoramaModule.java
rc/com/android/camera/WideAnglePanoramaUI.java
rc/com/android/camera/ui/CameraRootView.java
rc_pd/com/android/camera/util/SmartCameraHelper.java
|
44f8e82b71a9f988ea91a468f9c1fa7703e3ef99 |
03-Dec-2013 |
Michael Kolb <kolby@google.com> |
am 9e71a438: am a43545d1: am 8850f6d8: am 7993f452: Always set focus mode first before applying scene mode * commit '9e71a438c750d69ac1b20b4f1486745ae338e22f': Always set focus mode first before applying scene mode
|
9e71a438c750d69ac1b20b4f1486745ae338e22f |
03-Dec-2013 |
Michael Kolb <kolby@google.com> |
am a43545d1: am 8850f6d8: am 7993f452: Always set focus mode first before applying scene mode * commit 'a43545d1ec655719e81d04c2d14440a1418e7178': Always set focus mode first before applying scene mode
|
a43545d1ec655719e81d04c2d14440a1418e7178 |
03-Dec-2013 |
Michael Kolb <kolby@google.com> |
am 8850f6d8: am 7993f452: Always set focus mode first before applying scene mode * commit '8850f6d8bf69f6415e7e38448f8ef33824ac67cf': Always set focus mode first before applying scene mode
|
8850f6d8bf69f6415e7e38448f8ef33824ac67cf |
03-Dec-2013 |
Michael Kolb <kolby@google.com> |
am 7993f452: Always set focus mode first before applying scene mode * commit '7993f4521011869a794da69e4d0057fe3b0886c3': Always set focus mode first before applying scene mode
|
32d48735367dae4a7be7d052bc28e69c2cdaeab7 |
03-Dec-2013 |
Seth Raphael <magicseth@google.com> |
am 871fedc1: am ff67e2a6: am 3a46bed6: am 88f9b3e7: Reduce logging of flattened Preferences * commit '871fedc18a1e5db6c32ea3c7fa3ed105ae032e89': Reduce logging of flattened Preferences
|
7993f4521011869a794da69e4d0057fe3b0886c3 |
12-Jul-2013 |
Michael Kolb <kolby@google.com> |
Always set focus mode first before applying scene mode cherrypick from Bryce branch Bug: 9577903 Bug: 11777611 Change-Id: I2c300e443a47c7bc0c20f6aaec6f6e4b6c238880
rc/com/android/camera/PhotoModule.java
|
637c75c9286f04671f2ba0f83b96a3196e17c898 |
03-Dec-2013 |
Angus Kong <shkong@google.com> |
Merge "Change to have finer callbacks." into gb-ub-photos-denali
|
d106adf631bd302377c1d265f5df5216fb2bc687 |
02-Dec-2013 |
Sascha Häberling <haeberling@google.com> |
Merge "Reduce logging of flattened Preferences" into gb-ub-photos-denali
|
53ae041d63ee7a251c73ac47abeeb143a2f0da44 |
02-Dec-2013 |
Angus Kong <shkong@google.com> |
Change to have finer callbacks. onConfigurationChanged() is too general since the configuration contains many things. Should use finer callbacks for each of the changes we care about. Change-Id: I5ffbb7f1f71e6675a4fbb07e564ae09f55fa5127
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/VideoModule.java
rc/com/android/camera/WideAnglePanoramaModule.java
rc/com/android/camera/WideAnglePanoramaUI.java
rc/com/android/camera/module/ModuleController.java
|
85a2ddbcc80cd1fe8444b8225a942076e5228031 |
02-Dec-2013 |
Geoff Mendal <mendal@google.com> |
Import translations. DO NOT MERGE Change-Id: I4078de5d36a71f3c0ff7ff4522b2034c2a890b3d Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-km-rKH/strings.xml
es/values-ko/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mn-rMN/strings.xml
es/values-ms-rMY/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
bd3da269e2b2533e68b670e27ac304837a2eff2b |
02-Dec-2013 |
Erin Dahlgren <edahlgren@google.com> |
Remove ComboPreferences from video mode. Change-Id: Iab54672feee066e23543c7a7dbb19e5118ec214c
rc/com/android/camera/VideoMenu.java
rc/com/android/camera/VideoModule.java
rc/com/android/camera/VideoUI.java
rc/com/android/camera/settings/SettingsManager.java
|
871fedc18a1e5db6c32ea3c7fa3ed105ae032e89 |
28-Nov-2013 |
Seth Raphael <magicseth@google.com> |
am ff67e2a6: am 3a46bed6: am 88f9b3e7: Reduce logging of flattened Preferences * commit 'ff67e2a6207eaf0196b62c8afcee78c47d90a664': Reduce logging of flattened Preferences
|
4497326732ad1ecd836e03fdb386cf9c66cbef1f |
27-Nov-2013 |
Seth Raphael <magicseth@google.com> |
Reduce logging of flattened Preferences Bug: 11901390 Change-Id: I9f2e27e769fd745be01bb2c12a7f07b45aa0b905
rc/com/android/camera/PhotoModule.java
|
ff67e2a6207eaf0196b62c8afcee78c47d90a664 |
28-Nov-2013 |
Seth Raphael <magicseth@google.com> |
am 3a46bed6: am 88f9b3e7: Reduce logging of flattened Preferences * commit '3a46bed61f9b64d2b252909563caecfd811dd691': Reduce logging of flattened Preferences
|
3a46bed61f9b64d2b252909563caecfd811dd691 |
28-Nov-2013 |
Seth Raphael <magicseth@google.com> |
am 88f9b3e7: Reduce logging of flattened Preferences * commit '88f9b3e75c313d181c49ac644930627c40b2138d': Reduce logging of flattened Preferences
|
6fe8c828a186e584c7849ef002eff59e6d14ae4d |
26-Nov-2013 |
Christian Wyglendowski <dowski@google.com> |
Add base support for camera user feedback By default it does nothing. Implementations need to provide their own FeedbackHelper class that handles submitting feedback for the app. Bug: 8155939 Change-Id: I33536267fcc4c3f9aecd957c6064963f5e9d1b6c
es/values/strings.xml
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/SettingsController.java
rc/com/android/camera/ui/SettingsView.java
rc_pd/com/android/camera/util/FeedbackHelper.java
|
88f9b3e75c313d181c49ac644930627c40b2138d |
27-Nov-2013 |
Seth Raphael <magicseth@google.com> |
Reduce logging of flattened Preferences Bug: 11901390 Change-Id: I9f2e27e769fd745be01bb2c12a7f07b45aa0b905
rc/com/android/camera/PhotoModule.java
|
0744e4ab3ec5f0270bdad33e7c477f52ba680bbd |
22-Nov-2013 |
Marco Nelissen <marcone@google.com> |
initial simple camera pruning and refactoring 100% preview and new ui bottom bar bug: 11514604 Change-Id: I010c8aaa41ad6791ce2443ef159ea22cc1e8346f
es/layout-land/bottom_bar.xml
es/layout-land/camera_controls.xml
es/layout-port/bottom_bar.xml
es/layout-port/camera_controls.xml
es/layout/generic_module.xml
es/layout/photo_module.xml
es/layout/video_module.xml
es/values/attrs.xml
es/values/dimens.xml
es/values/strings.xml
rc/com/android/camera/CameraSettings.java
rc/com/android/camera/FocusOverlayManager.java
rc/com/android/camera/MultiToggleImageButton.java
rc/com/android/camera/PhotoMenu.java
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/PhotoUI.java
rc/com/android/camera/ToggleImageButton.java
rc/com/android/camera/VideoModule.java
rc/com/android/camera/VideoUI.java
rc/com/android/camera/app/CameraAppUI.java
rc/com/android/camera/ui/BottomBar.java
rc/com/android/camera/ui/RenderOverlay.java
|
40d95e9455cdc9a58e2cb3ef55e8a94d948bd4ec |
28-Nov-2013 |
Angus Kong <shkong@google.com> |
No need to upgrade preferences. Since we changed the package name in Carlsbad, there is no old versions of preferences anymore for now. We can skip upgrade the preferences file from previous versions in modules. Instead we do this in the activity although it's an no-op for now. Change-Id: Ibb153d4f8f80b6891fb4cb00d13cd8a386ee44a9
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/CameraSettings.java
rc/com/android/camera/VideoModule.java
rc/com/android/camera/WideAnglePanoramaModule.java
|
d95f26dae281bea2acf1f4ee8c34def2c42c5b7b |
27-Nov-2013 |
Geoff Mendal <mendal@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-denali
|
634a60f64d3cf79b857cf6812da8ec437029cfc0 |
27-Nov-2013 |
Geoff Mendal <mendal@google.com> |
Import translations. DO NOT MERGE Change-Id: I926176b385eea4bc77de84a8daf3c1175b88f6c9 Auto-generated-cl: translation import
es/values-zh-rCN/strings.xml
|
e13b4fd550b230f0fef5ae315e2b2be021c03c55 |
27-Nov-2013 |
Erin Dahlgren <edahlgren@google.com> |
Merge "Make the entire listview row clickable." into gb-ub-photos-denali
|
4bb8082489dc6806c7c05635bd24f6d42c876e16 |
27-Nov-2013 |
Erin Dahlgren <edahlgren@google.com> |
Make the entire listview row clickable. Change-Id: I616ff498c7a8bdfdc11d9a6c013ef34f35f310f1
rc/com/android/camera/CameraActivity.java
|
491c628441a58f2dd4b5a5745147552d3f3d9dec |
25-Nov-2013 |
Erin Dahlgren <edahlgren@google.com> |
Refactor settings dialogs. * Adds first time location dialog. * Makes all settings dialogs static. * Moves initialization of first time location dialog. Change-Id: If93f6a9c903f422409bda478b8cb76442eb0ad82
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/PhotoUI.java
rc/com/android/camera/ui/SettingsView.java
|
2c8cc45f91df492d515ba861508fa2012fbb6679 |
06-Nov-2013 |
Sameer Padala <sxp@google.com> |
Update SmartCamera UI Change-Id: Icf04a24656aaaf2a4dfc948e9d4e9a16b2a51f69
rc/com/android/camera/PhotoModule.java
rc_pd/com/android/camera/util/SmartCameraHelper.java
|
635a4b8ba2b8684f95e5cb0aa35c244a06985f4c |
26-Nov-2013 |
Erin Dahlgren <edahlgren@google.com> |
Optimize Settings api. * Caches settings descriptors. * Uses a hashmap for finding setting descriptor from key. Change-Id: I97fb536a2b30226896644b56911d4aec3c61cda5
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/CameraSettings.java
rc/com/android/camera/FocusOverlayManager.java
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/PhotoUI.java
rc/com/android/camera/SettingsController.java
rc/com/android/camera/settings/SettingsCache.java
rc/com/android/camera/settings/SettingsManager.java
|
d03aa898cd72b314b7767aad05acb75e0cab772f |
26-Nov-2013 |
Erin Dahlgren <edahlgren@google.com> |
Merge "Add a divider to the settings popup menu." into gb-ub-photos-denali
|
0ceebcaa256bfba07d63fe8462ef903622d0ca91 |
26-Nov-2013 |
The Android Open Source Project <initial-contribution@android.com> |
am 1ef065f3: am c4cffe22: am 31b29bdf: Merge in Android 4.4 * commit '1ef065f3dfb4798c81b3a9d63c41d478404c4c7d':
|
a0dd77f60c8a3ba544daffe31509ee12e11e2635 |
26-Nov-2013 |
Baligh Uddin <baligh@google.com> |
am 963fc7c2: am 790c7e9a: am 7f18027e: Merge remote-tracking branch \'origin/kitkat-dev\' * commit '963fc7c20643f01206ebac0c8109fc5b1e14272a': Initial empty repository
|
1ef065f3dfb4798c81b3a9d63c41d478404c4c7d |
26-Nov-2013 |
The Android Open Source Project <initial-contribution@android.com> |
am c4cffe22: am 31b29bdf: Merge in Android 4.4 * commit 'c4cffe22f0bab96a672782a9bd2d24018c01d90d':
|
963fc7c20643f01206ebac0c8109fc5b1e14272a |
26-Nov-2013 |
Baligh Uddin <baligh@google.com> |
am 790c7e9a: am 7f18027e: Merge remote-tracking branch \'origin/kitkat-dev\' * commit '790c7e9acb279a5ee559f239dd3a93c27a4ffac8': Initial empty repository
|
ca73a6f27480c9ad85605bf95af16c71a4b5893f |
26-Nov-2013 |
Angus Kong <shkong@google.com> |
Merge "Migrate from old CameraModule to ModuleController." into gb-ub-photos-denali
|
36cda3094b6988d0f670d917f4684e091025245d |
26-Nov-2013 |
Erin Dahlgren <edahlgren@google.com> |
Add a divider to the settings popup menu. Change-Id: I88462733dadb8073ad8a37c721c1b052eb2fb604
es/layout/settings_list_layout.xml
|
c4cffe22f0bab96a672782a9bd2d24018c01d90d |
26-Nov-2013 |
The Android Open Source Project <initial-contribution@android.com> |
am 31b29bdf: Merge in Android 4.4 * commit '31b29bdf560963da62f21a86fca2f6d5b8c4da57':
|
790c7e9acb279a5ee559f239dd3a93c27a4ffac8 |
26-Nov-2013 |
Baligh Uddin <baligh@google.com> |
am 7f18027e: Merge remote-tracking branch \'origin/kitkat-dev\' * commit '7f18027e271253b4eb3ef1b36458be78b7ed5f12': Initial empty repository
|
13e87c4d06e96e03adc229637f07baf3b56b90d6 |
25-Nov-2013 |
Angus Kong <shkong@google.com> |
Migrate from old CameraModule to ModuleController. The following methods are removed. init() of old module interface onUserInteraction() installIntetFilter() onPreviewTextureCopied() onCaptureTextureCopied() onStop() onActivityResult() onShowSwitcherPopup updateStorageHintOnResume() The logic of controlling screen on/off is moved to CameraActivity. Change-Id: I6807ac6bc314bdfcfe47273baf071be94098fd44
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/CameraModule.java
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/VideoModule.java
rc/com/android/camera/WideAnglePanoramaModule.java
rc/com/android/camera/app/AppController.java
rc/com/android/camera/module/ModuleController.java
|
c7f3386b10336a1906ad206e08904a31ea544d0f |
25-Nov-2013 |
Sascha Haeberling <haeberling@google.com> |
Merge "String fixes." into gb-ub-photos-denali
|
c1461e12164b361a7bb21274639dcb538b93ff55 |
25-Nov-2013 |
Sascha Haeberling <haeberling@google.com> |
String fixes. Bug: 10550622 Bug: 10547805 Change-Id: I72b49a944387fd7fca379feb1aaec0d0322ab0a8
es/values/strings.xml
|
5f52dc5f120ec5aa9106da0679d1cd54d1f86131 |
25-Nov-2013 |
Geoff Mendal <mendal@google.com> |
am fbfe22e6: (-s ours) am a08365d6: (-s ours) am 3e44cad5: (-s ours) am adf70222: (-s ours) Import translations. DO NOT MERGE * commit 'fbfe22e611be62d062dca552cb7262e0157d76a1': Import translations. DO NOT MERGE
|
fbfe22e611be62d062dca552cb7262e0157d76a1 |
25-Nov-2013 |
Geoff Mendal <mendal@google.com> |
am a08365d6: (-s ours) am 3e44cad5: (-s ours) am adf70222: (-s ours) Import translations. DO NOT MERGE * commit 'a08365d61aa05e68fb6ea5afc24704d6efc4f0cf': Import translations. DO NOT MERGE
|
a08365d61aa05e68fb6ea5afc24704d6efc4f0cf |
25-Nov-2013 |
Geoff Mendal <mendal@google.com> |
am 3e44cad5: (-s ours) am adf70222: (-s ours) Import translations. DO NOT MERGE * commit '3e44cad56c566a40f2b8e78ae6a22bc9980dcca2': Import translations. DO NOT MERGE
|
ea3c3e74cff88af3365e80991d1ea8cc8bdf24d8 |
25-Nov-2013 |
Geoff Mendal <mendal@google.com> |
am b88897d7: (-s ours) am 7b1d7e46: (-s ours) am 7191c955: (-s ours) Import translations. DO NOT MERGE * commit 'b88897d758596209047bc525ff10ef06386eacbb': Import translations. DO NOT MERGE
|
3e44cad56c566a40f2b8e78ae6a22bc9980dcca2 |
25-Nov-2013 |
Geoff Mendal <mendal@google.com> |
am adf70222: (-s ours) Import translations. DO NOT MERGE * commit 'adf70222d8c493a6880c54b8f939c541a61949bf': Import translations. DO NOT MERGE
|
b88897d758596209047bc525ff10ef06386eacbb |
25-Nov-2013 |
Geoff Mendal <mendal@google.com> |
am 7b1d7e46: (-s ours) am 7191c955: (-s ours) Import translations. DO NOT MERGE * commit '7b1d7e46f9429a7bb82142da461223016361224c': Import translations. DO NOT MERGE
|
7b1d7e46f9429a7bb82142da461223016361224c |
25-Nov-2013 |
Geoff Mendal <mendal@google.com> |
am 7191c955: (-s ours) Import translations. DO NOT MERGE * commit '7191c9558e22e81bdbaf34411bebe92d32eacfbb': Import translations. DO NOT MERGE
|
eae7dbd961a1837f59348ac9cf7e466041cef3d6 |
25-Nov-2013 |
Geoff Mendal <mendal@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-denali
|
a4009aa358f63852e0941ab8915fe8d6e44a36b4 |
25-Nov-2013 |
Geoff Mendal <mendal@google.com> |
Import translations. DO NOT MERGE Change-Id: Ie9c3ede766236f45e7fb704f7ee2ee2f6130cd6f Auto-generated-cl: translation import
es/values-ar/strings.xml
es/values-fa/strings.xml
es/values-it/strings.xml
|
7191c9558e22e81bdbaf34411bebe92d32eacfbb |
25-Nov-2013 |
Geoff Mendal <mendal@google.com> |
Import translations. DO NOT MERGE Change-Id: I258a9c2191463a2d46a6524e6523c7639ee183b4 Auto-generated-cl: translation import
es/values-ar/strings.xml
es/values-fa/strings.xml
es/values-it/strings.xml
|
e9500269d9fb436b8db592e273b9c9f50b2ef705 |
25-Nov-2013 |
Geoff Mendal <mendal@google.com> |
Import translations. DO NOT MERGE Change-Id: If3581e5f932d92ac36b1259268f5ea04468ab954 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-km-rKH/strings.xml
es/values-ko/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mn-rMN/strings.xml
es/values-ms-rMY/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
adf70222d8c493a6880c54b8f939c541a61949bf |
25-Nov-2013 |
Geoff Mendal <mendal@google.com> |
Import translations. DO NOT MERGE Change-Id: I50cb348cf6e31dcb28145087c649c5106bd563d5 Auto-generated-cl: translation import
es/values-ar/strings.xml
es/values-fa/strings.xml
es/values-it/strings.xml
|
357b7673f03d9b45d281d585cc3f4f87dc7d727b |
21-Nov-2013 |
Erin Dahlgren <edahlgren@google.com> |
Build out the SettingsManager model. Change-Id: Ie831dbf624efc5c7e27924785a0ec193b3ce53bd
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/CameraSettings.java
rc/com/android/camera/FocusOverlayManager.java
rc/com/android/camera/ListPreference.java
rc/com/android/camera/PhotoController.java
rc/com/android/camera/PhotoMenu.java
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/PhotoUI.java
rc/com/android/camera/PieController.java
rc/com/android/camera/RecordLocationPreference.java
rc/com/android/camera/SettingsController.java
rc/com/android/camera/SettingsManager.java
rc/com/android/camera/app/AppController.java
rc/com/android/camera/settings/SettingsManager.java
rc/com/android/camera/ui/SettingsView.java
|
31b29bdf560963da62f21a86fca2f6d5b8c4da57 |
25-Nov-2013 |
The Android Open Source Project <initial-contribution@android.com> |
Merge in Android 4.4
|
e767c0f64968a52a162c1c4a50e391ceaec50a16 |
24-Nov-2013 |
Doris Liu <tianliu@google.com> |
Change asset name Change-Id: I60ef126dc992afb4ab9d7ea2f6a3c48298663c3a
rc/com/android/camera/ui/SettingsView.java
|
99a372099badd5ce49bf41ee0c10ced0dc1eb90f |
24-Nov-2013 |
Angus Kong <shkong@google.com> |
Merge "Fix build." into gb-ub-photos-denali
|
2419f24c80ca825927d0c1a6d514e520b6181376 |
24-Nov-2013 |
Angus Kong <shkong@google.com> |
Fix build. Change-Id: I9976a6dcdc940b2c6bf43841e2ceb3dda5c6597e
rc_pd_gcam/com/android/camera/util/GcamHelper.java
|
f55f3c461c5a6ae6b61fa75562ca01683aa93f9a |
20-Nov-2013 |
Doris Liu <tianliu@google.com> |
Pinhole animation, quick switch between photo and video Also, first pass of the view hierarchy refactor. Change-Id: I6c80191f15908bd24c16b76df6ef92df3ef905fc
es/drawable-hdpi/ic_camera_normal.png
es/drawable-hdpi/ic_craft_normal.png
es/drawable-hdpi/ic_photo_sphere_normal.png
es/drawable-hdpi/ic_settings_normal.png
es/drawable-hdpi/ic_timelapse_normal.png
es/drawable-hdpi/ic_video_normal.png
es/drawable-hdpi/ic_wide_angle_normal.png
es/drawable-mdpi/ic_camera_normal.png
es/drawable-mdpi/ic_craft_normal.png
es/drawable-mdpi/ic_photo_sphere_normal.png
es/drawable-mdpi/ic_settings_normal.png
es/drawable-mdpi/ic_timelapse_normal.png
es/drawable-mdpi/ic_video_normal.png
es/drawable-mdpi/ic_wide_angle_normal.png
es/drawable-xhdpi/ic_camera_normal.png
es/drawable-xhdpi/ic_craft_normal.png
es/drawable-xhdpi/ic_photo_sphere_normal.png
es/drawable-xhdpi/ic_settings_normal.png
es/drawable-xhdpi/ic_timelapse_normal.png
es/drawable-xhdpi/ic_video_normal.png
es/drawable-xhdpi/ic_wide_angle_normal.png
es/drawable-xxhdpi/ic_camera_normal.png
es/drawable-xxhdpi/ic_craft_normal.png
es/drawable-xxhdpi/ic_photo_sphere_normal.png
es/drawable-xxhdpi/ic_settings_normal.png
es/drawable-xxhdpi/ic_timelapse_normal.png
es/drawable-xxhdpi/ic_video_normal.png
es/drawable-xxhdpi/ic_wide_angle_normal.png
es/drawable/craft.png
es/drawable/photo.png
es/drawable/photosphere.png
es/drawable/settings.png
es/drawable/timelapse.png
es/drawable/video.png
es/drawable/wideangle.png
es/layout/activity_main.xml
es/layout/generic_module.xml
es/layout/photo_module.xml
es/layout/video_module.xml
es/values/dimens.xml
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/PhotoUI.java
rc/com/android/camera/VideoModule.java
rc/com/android/camera/VideoUI.java
rc/com/android/camera/app/AppController.java
rc/com/android/camera/app/CameraAppUI.java
rc/com/android/camera/ui/MainActivityLayout.java
rc/com/android/camera/ui/ModeListView.java
rc/com/android/camera/ui/ModeSelectorItem.java
rc/com/android/camera/ui/ModeTransitionView.java
rc/com/android/camera/ui/PieRenderer.java
rc/com/android/camera/ui/RenderOverlay.java
|
c4e665625b88a8363fa2bd9848bf88ec9b45637f |
23-Nov-2013 |
Angus Kong <shkong@google.com> |
Consolidate onResume* and onPause* in modules. 1. Combine onResumeAfterSuper() and onResumeBeforeSuper() to resume(). 2. Combine onPauseAfterSuper() and onPauseBeforeSuper() to pause(). 3. Add helper function requestBackCamera() to CameraModule. Change-Id: Ie0ffb0168e2df1e77aba4ead4f8729eca09c894a
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/CameraModule.java
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/VideoModule.java
rc/com/android/camera/WideAnglePanoramaModule.java
rc/com/android/camera/app/AppController.java
rc/com/android/camera/app/ModuleManager.java
rc/com/android/camera/module/ModulesInfo.java
rc_pd/com/android/camera/util/PhotoSphereHelper.java
rc_pd/com/android/camera/util/RefocusHelper.java
|
e77e88fd0b29ac58e0bcf1001bc2517a5ee4db7d |
23-Nov-2013 |
The Android Open Source Project <initial-contribution@android.com> |
am de315ef3: am 621a6721: Merge commit \'957de9a560e24d120dfc76c4b2c1d72581a250fd\' into HEAD * commit 'de315ef32fe0f7bf66d99c7ecf5bf63a122989cb':
|
de315ef32fe0f7bf66d99c7ecf5bf63a122989cb |
23-Nov-2013 |
The Android Open Source Project <initial-contribution@android.com> |
am 621a6721: Merge commit \'957de9a560e24d120dfc76c4b2c1d72581a250fd\' into HEAD * commit '621a67215f9c7ccd4b9c07c75933fea3f76959e2':
|
18500a493634b593dc8ba1e74b46d1f10bb6d031 |
22-Nov-2013 |
Angus Kong <shkong@google.com> |
Refactor PhotoSphere and Refocus: new camera open This is part of the Denali refactor work. Now PhotoSphere and Refocus both uses the new camera start up process so the camera is not released between modules. See http://ag/392043/ Change-Id: I6ae9b111ba1fda33912159e0967f3a12d02937ba
rc/com/android/camera/app/CameraController.java
rc/com/android/camera/app/CameraProvider.java
rc/com/android/camera/module/ModulesInfo.java
|
621a67215f9c7ccd4b9c07c75933fea3f76959e2 |
22-Nov-2013 |
The Android Open Source Project <initial-contribution@android.com> |
Merge commit '957de9a560e24d120dfc76c4b2c1d72581a250fd' into HEAD
|
def975daaa81bda4301cc45de6920ac0a0c12fec |
22-Nov-2013 |
Andy Huibers <andyhuibers@google.com> |
Delay onResume tasks to speed up lockscreen onResume->onPause->onResume launch sequence. Change-Id: I819ba9893c1fbcf0c6e15a91a5733978dcdb9e1f
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/PhotoModule.java
|
5d182fd4436dd8333c6c045842df9667b1d37416 |
22-Nov-2013 |
Baligh Uddin <baligh@google.com> |
am 1dd617a7: (-s ours) am 8cbdfb97: (-s ours) am 98578f40: (-s ours) am 18eb2e4e: (-s ours) Import translations. DO NOT MERGE * commit '1dd617a7ffde72bef08c99df44cb8dadae3129fd': Import translations. DO NOT MERGE
|
d3393ec6aeb54c2826e2e7514990259b83fc17d2 |
22-Nov-2013 |
Marco Nelissen <marcone@google.com> |
Merge "Use audio focus instead of music command broadcast" into gb-ub-photos-denali
|
1dd617a7ffde72bef08c99df44cb8dadae3129fd |
22-Nov-2013 |
Baligh Uddin <baligh@google.com> |
am 8cbdfb97: (-s ours) am 98578f40: (-s ours) am 18eb2e4e: (-s ours) Import translations. DO NOT MERGE * commit '8cbdfb97cc19f19b8b4fab9b5594a11735607a97': Import translations. DO NOT MERGE
|
8cbdfb97cc19f19b8b4fab9b5594a11735607a97 |
22-Nov-2013 |
Baligh Uddin <baligh@google.com> |
am 98578f40: (-s ours) am 18eb2e4e: (-s ours) Import translations. DO NOT MERGE * commit '98578f40ad99bf6ed2c094f7eccb5682e51b71af': Import translations. DO NOT MERGE
|
98578f40ad99bf6ed2c094f7eccb5682e51b71af |
22-Nov-2013 |
Baligh Uddin <baligh@google.com> |
am 18eb2e4e: (-s ours) Import translations. DO NOT MERGE * commit '18eb2e4e7f35a5dfbeea6e3c64b612769bb31293': Import translations. DO NOT MERGE
|
18eb2e4e7f35a5dfbeea6e3c64b612769bb31293 |
22-Nov-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I5bf42de7313c856550b6cc68e0ca5fa30a64c6a1 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-km-rKH/strings.xml
es/values-ko/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mn-rMN/strings.xml
es/values-ms-rMY/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
280fd3edae1dc35ac1015bcc9532477169fad3aa |
21-Nov-2013 |
Sascha Haeberling <haeberling@google.com> |
Introduce common services and integrate Refocus end-to-end. Bug: 11120164 Bug: 10073814 This adds a new common CameraServices interface and a method to every module to get it. Through this we can expose common services and due to the interface, we can easily mock them for tests. Also makes the MediaSaveService not a service anymore. Change-Id: Ifa093efd4ba53c2955ccc2a990b4f18610c29944
ndroidManifest.xml
es/drawable-xhdpi/ic_view_rgbz.png
es/layout/filmstrip_bottom_controls.xml
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/CameraModule.java
rc/com/android/camera/MediaSaveService.java
rc/com/android/camera/MediaSaverImpl.java
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/VideoModule.java
rc/com/android/camera/WideAnglePanoramaModule.java
rc/com/android/camera/app/AppController.java
rc/com/android/camera/app/CameraApp.java
rc/com/android/camera/app/CameraServices.java
rc/com/android/camera/app/ModuleManager.java
rc/com/android/camera/app/ModuleManagerImpl.java
rc/com/android/camera/data/InProgressDataWrapper.java
rc/com/android/camera/data/LocalData.java
rc/com/android/camera/data/LocalMediaData.java
rc/com/android/camera/data/RgbzMetadataLoader.java
rc/com/android/camera/data/SimpleViewData.java
rc/com/android/camera/filmstrip/FilmstripImageData.java
rc/com/android/camera/module/ModulesInfo.java
rc/com/android/camera/tinyplanet/TinyPlanetFragment.java
rc/com/android/camera/ui/FilmstripBottomControls.java
rc/com/android/camera/ui/FilmstripView.java
rc_pd/com/android/camera/util/PhotoSphereHelper.java
rc_pd/com/android/camera/util/RefocusHelper.java
rc_pd_gcam/com/android/camera/util/GcamHelper.java
|
20694b23b61a94e38f98b16f302dda55055eabdb |
29-Oct-2013 |
Marco Nelissen <marcone@google.com> |
Use audio focus instead of music command broadcast Change-Id: I29066248c0145abed747f54c9bf4d93fdb76e45d
rc/com/android/camera/VideoModule.java
|
205b827d4e73692d4ac1f3448705679843db0c9b |
21-Nov-2013 |
Erin Dahlgren <edahlgren@google.com> |
Merge "Custom settings ui with dialogs." into gb-ub-photos-denali
|
c120b0f6e5ea919fcbb87f832a2b6c82509a2114 |
19-Nov-2013 |
Erin Dahlgren <edahlgren@google.com> |
Custom settings ui with dialogs. Change-Id: I117744135e5b08370c1feb63fe4abcccfe325659
es/layout/settings_list_layout.xml
es/layout/settings_selector.xml
es/values/dimens.xml
es/values/strings.xml
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/SettingsController.java
rc/com/android/camera/SettingsManager.java
rc/com/android/camera/app/AppController.java
rc/com/android/camera/ui/ModeListView.java
rc/com/android/camera/ui/SettingsView.java
|
bb674615060af55e3d95b620008595c3d32840a5 |
20-Nov-2013 |
Baligh Uddin <baligh@google.com> |
am 577910d0: (-s ours) am 0c7ea745: (-s ours) am ae13f34c: (-s ours) Import translations. DO NOT MERGE * commit '577910d049c6c66733985c44b0602a0179327471': Import translations. DO NOT MERGE
|
577910d049c6c66733985c44b0602a0179327471 |
20-Nov-2013 |
Baligh Uddin <baligh@google.com> |
am 0c7ea745: (-s ours) am ae13f34c: (-s ours) Import translations. DO NOT MERGE * commit '0c7ea745e591133aedbd1fc1b5df93d85a490054': Import translations. DO NOT MERGE
|
0c7ea745e591133aedbd1fc1b5df93d85a490054 |
20-Nov-2013 |
Baligh Uddin <baligh@google.com> |
am ae13f34c: (-s ours) Import translations. DO NOT MERGE * commit 'ae13f34c5debd5442a616bc97558815a069a84b8': Import translations. DO NOT MERGE
|
5d384595df2e61f2ee17a043719480b77aeb2154 |
20-Nov-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE"
|
9213003227d7e1c6c7834636f147d796d7e12e55 |
20-Nov-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I1174d2d489bb915a9945ded601681da2a2e9777e Auto-generated-cl: translation import
es/values-iw/strings.xml
|
ae13f34c5debd5442a616bc97558815a069a84b8 |
20-Nov-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I2db02a5ec058c2eed8d08a490aeed180095bd58d Auto-generated-cl: translation import
es/values-iw/strings.xml
|
79322e4d40c580db081235198973fda43f0926d6 |
20-Nov-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I7beb85c9a8f060eccccc5ca1302f6d5764d9cb79 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-km-rKH/strings.xml
es/values-ko/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mn-rMN/strings.xml
es/values-ms-rMY/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
e8129fb470002dffdd07789611ec5685721039a0 |
20-Nov-2013 |
ztenghui <ztenghui@google.com> |
am bfe61934: am e04982ad: The initial focus value should be true. * commit 'bfe619349ff66c5b5cc0dc1cdc2e02b99b959ec0': The initial focus value should be true.
|
8e34ae35d634196906d7fe9e4ae1fb6897a15c93 |
20-Nov-2013 |
Sascha Haeberling <haeberling@google.com> |
am 0fa732e0: am 63565c83: Don\'t crash when preview surface could not be set. * commit '0fa732e0359169b43bd448718377c3578c443ae1': Don't crash when preview surface could not be set.
|
ebd01b4cbec2e047c2abaa713a2394d580a41f2d |
20-Nov-2013 |
Doris Liu <tianliu@google.com> |
am 36f5e5e1: am aa67d847: Fix SRI orientation on manta * commit '36f5e5e151614d379d7428aadadd1236e3b09e63': Fix SRI orientation on manta
|
bfe619349ff66c5b5cc0dc1cdc2e02b99b959ec0 |
20-Nov-2013 |
ztenghui <ztenghui@google.com> |
am e04982ad: The initial focus value should be true. * commit 'e04982ad43fa3672cadf821a1bbc9c6454ce20f3': The initial focus value should be true.
|
0fa732e0359169b43bd448718377c3578c443ae1 |
20-Nov-2013 |
Sascha Haeberling <haeberling@google.com> |
am 63565c83: Don\'t crash when preview surface could not be set. * commit '63565c83f70f1bfae8fccfca24605de8e0e42431': Don't crash when preview surface could not be set.
|
36f5e5e151614d379d7428aadadd1236e3b09e63 |
20-Nov-2013 |
Doris Liu <tianliu@google.com> |
am aa67d847: Fix SRI orientation on manta * commit 'aa67d847edf7de3741bac6fb40cd94b8c838d0ae': Fix SRI orientation on manta
|
9bafa0f304fe8275e2cdcc54bde5bb3999ad7fde |
20-Nov-2013 |
Andy Huibers <andyhuibers@google.com> |
am 88d8d997: am 6ea5eab7: am 6cff6768: am 7dc6e97c: Delay onResume tasks to speed up lockscreen onResume->onPause->onResume launch sequence. * commit '88d8d9973e96bc5a1d58f48d642e2f4451ffd071': Delay onResume tasks to speed up lockscreen onResume->onPause->onResume launch sequence.
|
88d8d9973e96bc5a1d58f48d642e2f4451ffd071 |
20-Nov-2013 |
Andy Huibers <andyhuibers@google.com> |
am 6ea5eab7: am 6cff6768: am 7dc6e97c: Delay onResume tasks to speed up lockscreen onResume->onPause->onResume launch sequence. * commit '6ea5eab7033edb735ee2b0793c56b3c4cd48ff11': Delay onResume tasks to speed up lockscreen onResume->onPause->onResume launch sequence.
|
6ea5eab7033edb735ee2b0793c56b3c4cd48ff11 |
20-Nov-2013 |
Andy Huibers <andyhuibers@google.com> |
am 6cff6768: am 7dc6e97c: Delay onResume tasks to speed up lockscreen onResume->onPause->onResume launch sequence. * commit '6cff67680ec985520b1a4e8fd5ddaa5f682f303d': Delay onResume tasks to speed up lockscreen onResume->onPause->onResume launch sequence.
|
6cff67680ec985520b1a4e8fd5ddaa5f682f303d |
20-Nov-2013 |
Andy Huibers <andyhuibers@google.com> |
am 7dc6e97c: Delay onResume tasks to speed up lockscreen onResume->onPause->onResume launch sequence. * commit '7dc6e97c508125b94fffc15c4a8f0b6c989f396c': Delay onResume tasks to speed up lockscreen onResume->onPause->onResume launch sequence.
|
e6700b8f84a0d4047dfc9e60f06f13d842b553b9 |
20-Nov-2013 |
Erin Dahlgren <edahlgren@google.com> |
Merge "Initialize a global LocationManager." into gb-ub-photos-denali
|
21c21a62aaed42cb0d4c2c91a735f08e40f8cd07 |
20-Nov-2013 |
Erin Dahlgren <edahlgren@google.com> |
Initialize a global LocationManager. Change-Id: I69f76e88f5e5b372bdcf6ba9fba8614e34595cc9
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/PhotoUI.java
rc/com/android/camera/VideoModule.java
rc/com/android/camera/WideAnglePanoramaModule.java
|
7dc6e97c508125b94fffc15c4a8f0b6c989f396c |
20-Nov-2013 |
Andy Huibers <andyhuibers@google.com> |
Delay onResume tasks to speed up lockscreen onResume->onPause->onResume launch sequence. Bug: 11773268 Change-Id: Iea7702a0141a390e1e9b50c738f6269c03dabcc3
rc/com/android/camera/PhotoModule.java
|
612321f39ca524de2efced1e826db9ec523bd6dc |
19-Nov-2013 |
Angus Kong <shkong@google.com> |
Centralize the module information. Change-Id: I4d9fdbe480a518c7b6ca0268aa9beee49d22610c
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/app/ModuleManager.java
rc/com/android/camera/app/ModuleManagerImpl.java
rc/com/android/camera/module/ModulesInfo.java
rc/com/android/camera/ui/ModeListView.java
|
bc14ba567b869a96d3009f5cea8866423f7ea71d |
19-Nov-2013 |
Angus Kong <shkong@google.com> |
Merge "Change capture request to pass a message." into gb-ub-photos-denali
|
7492426d2e155ad6741bf3980f81b93321c7951d |
18-Nov-2013 |
Doris Liu <tianliu@google.com> |
Add more context to the mode options strings Bug: 11740562 Bug: 11740561 Bug: 11733900 Bug: 11707516 Change-Id: I4a8451f2f6cce42b92a6dee0466ae146bbe03f9e
es/values/strings.xml
|
188cfc34c0c1e105c27029e2521fb06e10aaab48 |
17-Nov-2013 |
Angus Kong <shkong@google.com> |
Change capture request to pass a message. To be consistent with other camera operations, change the capture request to send a message instead of posting a runnable. Change-Id: I28538a4adbb8b892608d53d4ee59bca3a5064488
rc/com/android/camera/app/AndroidCameraManagerImpl.java
|
0e57fc1baa471ea2acdd6b5bf8b961aa43b1a4a8 |
18-Nov-2013 |
Angus Kong <shkong@google.com> |
Fix a potential CameraManagerFactory memory leak Change-Id: I5fca4cce0baaa9250eca1f74d5e3df950f618cc9
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/app/CameraManagerFactory.java
|
611dc9bf77c8113ce290350c33fa6a7f2bf9cf90 |
18-Nov-2013 |
Baligh Uddin <baligh@google.com> |
am da6d9776: (-s ours) am a46752ca: (-s ours) am 9b75b682: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit 'da6d9776befd7f03cd863654c03327806025f8b6': Import translations. DO NOT MERGE
|
da6d9776befd7f03cd863654c03327806025f8b6 |
18-Nov-2013 |
Baligh Uddin <baligh@google.com> |
am a46752ca: (-s ours) am 9b75b682: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit 'a46752caf72c57855a19b1ddec250d95b302b1f6': Import translations. DO NOT MERGE
|
a46752caf72c57855a19b1ddec250d95b302b1f6 |
18-Nov-2013 |
Baligh Uddin <baligh@google.com> |
am 9b75b682: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '9b75b68274f42f5fe2a30ca774e2ac1bf25faf82': Import translations. DO NOT MERGE
|
e5f75121b872410cc3d24b1a17b79dd4b95410e2 |
18-Nov-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE"
|
9b75b68274f42f5fe2a30ca774e2ac1bf25faf82 |
18-Nov-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into klp-dev
|
9556322bff426f24dcf5249889d0d256060784a5 |
18-Nov-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-denali
|
10f9092b4f7aa4b69d2aec116015242b98d816fc |
18-Nov-2013 |
Angus Kong <shkong@google.com> |
Merge "Major refactor: Make resources access through app." into gb-ub-photos-denali
|
60834195ecceedeb0ff630c82fcea8b9aa5a26e3 |
18-Nov-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am d1e68328: am 47e9cc73: am a390c5b4: am 3bf1cda5: gcam: Clean up placeholders, and add deletion robustness. * commit 'd1e683285f4aee83bd0e363957beaa4787df952e': gcam: Clean up placeholders, and add deletion robustness.
|
d1e683285f4aee83bd0e363957beaa4787df952e |
18-Nov-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 47e9cc73: am a390c5b4: am 3bf1cda5: gcam: Clean up placeholders, and add deletion robustness. * commit '47e9cc73092dc6ce14d8fa2f9ec0a11a1a812fe6': gcam: Clean up placeholders, and add deletion robustness.
|
47e9cc73092dc6ce14d8fa2f9ec0a11a1a812fe6 |
18-Nov-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am a390c5b4: am 3bf1cda5: gcam: Clean up placeholders, and add deletion robustness. * commit 'a390c5b4388d5280a29e24c88470621b1c3b2992': gcam: Clean up placeholders, and add deletion robustness.
|
a390c5b4388d5280a29e24c88470621b1c3b2992 |
18-Nov-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 3bf1cda5: gcam: Clean up placeholders, and add deletion robustness. * commit '3bf1cda53ebd85152fa9eed3ea8c9652a944df9b': gcam: Clean up placeholders, and add deletion robustness.
|
20fad249cbb587b8cf03e8e53bc64ff8e0bec7fd |
12-Nov-2013 |
Angus Kong <shkong@google.com> |
Major refactor: Make resources access through app. 1. Make the camera device avaiability a callback event so the process can be event-driven. 2. Add ModuleManager interface and implementation. 3. Make AndroidCameraManagerImpl implementation package private. This CL is the refactoring work on Gallery2 side. The other part is http://ag/389297/ Known issue: only work for normal photo mode and video mode for now. Change-Id: Ib0a89ca56c00f6a7294192e9737a70dec5143ee3
rc/com/android/camera/AndroidCameraManagerImpl.java
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/CameraHolder.java
rc/com/android/camera/CameraManager.java
rc/com/android/camera/CameraManagerFactory.java
rc/com/android/camera/CameraModule.java
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/PhotoUI.java
rc/com/android/camera/VideoModule.java
rc/com/android/camera/WideAnglePanoramaModule.java
rc/com/android/camera/app/AndroidCameraManagerImpl.java
rc/com/android/camera/app/AppController.java
rc/com/android/camera/app/CameraController.java
rc/com/android/camera/app/CameraManager.java
rc/com/android/camera/app/CameraManagerFactory.java
rc/com/android/camera/app/CameraProvider.java
rc/com/android/camera/app/ModuleManager.java
rc/com/android/camera/app/ModuleManagerImpl.java
rc/com/android/camera/module/ModuleController.java
rc/com/android/camera/util/CameraUtil.java
rc_pd/com/android/camera/util/SmartCameraHelper.java
ests_camera/src/com/android/camera/activity/CameraTestCase.java
|
ca66507c24f0e56cf0d9a5ad8e1779aa06b91f38 |
18-Nov-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I65442650e1136f0ff5375b403f579349c091defb Auto-generated-cl: translation import
es/values-cs/strings.xml
|
ba2e3e0552d57ef416655eb6fc8ba1cd8c3eec1e |
18-Nov-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I41cd8145da8f2907c6c5b20713a28f3e47791bcc Auto-generated-cl: translation import
es/values-cs/strings.xml
|
4448f95350aebfdcd68f0158d50563d1a73ca024 |
18-Nov-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I6e7cd401db97661d4ba5dcb843f8191f496ee7ab Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-km-rKH/strings.xml
es/values-ko/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mn-rMN/strings.xml
es/values-ms-rMY/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
3bf1cda53ebd85152fa9eed3ea8c9652a944df9b |
16-Nov-2013 |
Ruben Brunk <rubenbrunk@google.com> |
gcam: Clean up placeholders, and add deletion robustness. Bug: 11708734 Change-Id: I8a017a382f12165be27afbf78e733bcc1fc0ef6f
rc/com/android/camera/Storage.java
|
9e039852f11dc5c546df174dd91ef6994b87698e |
12-Nov-2013 |
Seth Raphael <magicseth@google.com> |
Add parameters and deduplicate parameter changes Bug: 11646117 Change-Id: If52182a856d7ee8143a351c7f79a76d13840c61e (cherry picked from commit 77775f170a4596421fd566005522f56f82b1c276)
rc/com/android/camera/ComboPreferences.java
rc/com/android/camera/ListPreference.java
rc/com/android/camera/PhotoModule.java
rc_pd/com/android/camera/util/UsageStatistics.java
|
70576b611fddc929abbfb466fa44c396a3a793db |
15-Nov-2013 |
Doris Liu <tianliu@google.com> |
Dim the background of mode switcher as swiping in Also updated comments, and hooked up shimmy. Bug: 11514368 Change-Id: I4055195dc8309ed78be9a04bdfcffd714257cb10
es/values/colors.xml
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/ui/ModeListView.java
rc/com/android/camera/ui/ModeSelectorItem.java
|
d7b8cb57ecbd8776c858b98ca9d1aeed3f22da88 |
15-Nov-2013 |
Erin Dahlgren <edahlgren@google.com> |
Fix a bad rebase. Change-Id: I8447ba6bbe37e7bea7b1ac579560150830688704
rc/com/android/camera/PhotoModule.java
|
dc282e118c398c5138c8f8859b3a1037b3cea672 |
12-Nov-2013 |
Erin Dahlgren <edahlgren@google.com> |
Revert parallel opening camera in photo mode. Reverts: * ag/386409 * ag/386206 * ag/385573 Bug: 11598948 Bug: 11625767 Bug: 11627454 Bug: 11255097 Change-Id: Iad28e32dbcbbce42d9ee261c961cdd5a7712ede5 Conflicts: src/com/android/camera/PhotoModule.java
rc/com/android/camera/PhotoModule.java
|
49ea51ab31f8e39fd48577b704695cb437f644af |
14-Nov-2013 |
Sascha Haeberling <haeberling@google.com> |
Fix issue of focus indicator staying on without being hidden Bug: 11505806 A mix up in the previous 100% CL caused this. This CL here also makes it more robust by making the 100% extra time time-based instead of frame-based. Change-Id: I52c53d4b5816570c2c805e0e8ff193de684f2a64
rc/com/android/camera/ui/PieRenderer.java
rc/com/android/camera/ui/ProgressRenderer.java
|
77ebc092af9d56bfa61666dcafb3a48e2f2f6313 |
14-Nov-2013 |
Sascha Haeberling <haeberling@google.com> |
am 6474693c: am 8415d85c: am 1a1e24f0: am 9db4ac80: Merge "Fix issue of focus indicator staying on without being hidden" into gb-ub-photos-carlsbad * commit '6474693c585b6d9190d90c0954acb0a0fe21e10a': Fix issue of focus indicator staying on without being hidden
|
629dc323f583cd4977ec3860a33797bf9bfb084f |
14-Nov-2013 |
Doris Liu <tianliu@google.com> |
am 9d94bba7: am 48fd528a: am e8bab2cd: am fc7b8341: Ensure view size gets updated after phone decors change. * commit '9d94bba7339dd8284297ab1d129a23ff0212fa86': Ensure view size gets updated after phone decors change.
|
4971b9e2319ab27fc3bb4774015f09e5b9f16e7c |
14-Nov-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-denali
|
6474693c585b6d9190d90c0954acb0a0fe21e10a |
14-Nov-2013 |
Sascha Haeberling <haeberling@google.com> |
am 8415d85c: am 1a1e24f0: am 9db4ac80: Merge "Fix issue of focus indicator staying on without being hidden" into gb-ub-photos-carlsbad * commit '8415d85c2f86011f8fdd07dbdac4fcd9800eb903': Fix issue of focus indicator staying on without being hidden
|
8415d85c2f86011f8fdd07dbdac4fcd9800eb903 |
14-Nov-2013 |
Sascha Haeberling <haeberling@google.com> |
am 1a1e24f0: am 9db4ac80: Merge "Fix issue of focus indicator staying on without being hidden" into gb-ub-photos-carlsbad * commit '1a1e24f095e8f232406d334d6c3e0cbb8f41aae5': Fix issue of focus indicator staying on without being hidden
|
1a1e24f095e8f232406d334d6c3e0cbb8f41aae5 |
14-Nov-2013 |
Sascha Haeberling <haeberling@google.com> |
am 9db4ac80: Merge "Fix issue of focus indicator staying on without being hidden" into gb-ub-photos-carlsbad * commit '9db4ac802c6f635bdc56c69f20be08e054ba2926': Fix issue of focus indicator staying on without being hidden
|
9db4ac802c6f635bdc56c69f20be08e054ba2926 |
14-Nov-2013 |
Sascha Haeberling <haeberling@google.com> |
Merge "Fix issue of focus indicator staying on without being hidden" into gb-ub-photos-carlsbad
|
b7dcf9f20708376dfd14f9db6b41addc2f92e5c6 |
14-Nov-2013 |
Sascha Haeberling <haeberling@google.com> |
Fix issue of focus indicator staying on without being hidden Bug: 11505806 A mix up in the previous 100% CL caused this. This CL here also makes it more robust by making the 100% extra time time-based instead of frame-based. Change-Id: I52c53d4b5816570c2c805e0e8ff193de684f2a64
rc/com/android/camera/ui/PieRenderer.java
rc/com/android/camera/ui/ProgressRenderer.java
|
9b043257ce727860177bfc0e3e35cd5484232fe4 |
14-Nov-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Idf3791955861e93e6abbf0257adbeaf470f037fd Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-km-rKH/strings.xml
es/values-ko/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mn-rMN/strings.xml
es/values-ms-rMY/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
56b2075a1099e925f78413ef0974757f1e9476da |
14-Nov-2013 |
Ed Heyl <edheyl@google.com> |
am 86b76ca8: am 6592443c: am aa08cd8f: merge in release branch changes (no-op). * commit '86b76ca83825bc303449811cdd7d6fa12822569a': Add logging to various actions Ensure mOpenCameraThread has been setup before dereferencing.
|
9d94bba7339dd8284297ab1d129a23ff0212fa86 |
14-Nov-2013 |
Doris Liu <tianliu@google.com> |
am 48fd528a: am e8bab2cd: am fc7b8341: Ensure view size gets updated after phone decors change. * commit '48fd528a68eb8477033c2402918d467e531e8168': Ensure view size gets updated after phone decors change.
|
48fd528a68eb8477033c2402918d467e531e8168 |
14-Nov-2013 |
Doris Liu <tianliu@google.com> |
am e8bab2cd: am fc7b8341: Ensure view size gets updated after phone decors change. * commit 'e8bab2cda4916da1a721ba67154e99a74e27aacc': Ensure view size gets updated after phone decors change.
|
e8bab2cda4916da1a721ba67154e99a74e27aacc |
14-Nov-2013 |
Doris Liu <tianliu@google.com> |
am fc7b8341: Ensure view size gets updated after phone decors change. * commit 'fc7b834155f3a15939b0dcfaf7140a9da21b876c': Ensure view size gets updated after phone decors change.
|
fc7b834155f3a15939b0dcfaf7140a9da21b876c |
14-Nov-2013 |
Doris Liu <tianliu@google.com> |
Ensure view size gets updated after phone decors change. Bug: 11661906 Change-Id: I63234a94b5a0bbd0cc6aa62ccd2642de09208403
rc/com/android/camera/ui/CameraRootView.java
|
86b76ca83825bc303449811cdd7d6fa12822569a |
14-Nov-2013 |
Ed Heyl <edheyl@google.com> |
am 6592443c: am aa08cd8f: merge in release branch changes (no-op). * commit '6592443c49d0bb2f3c0cfa7b684921a7f024d96d': Add logging to various actions Ensure mOpenCameraThread has been setup before dereferencing.
|
6592443c49d0bb2f3c0cfa7b684921a7f024d96d |
14-Nov-2013 |
Ed Heyl <edheyl@google.com> |
am aa08cd8f: merge in release branch changes (no-op). * commit 'aa08cd8f3c6fa652fa7a5fdb904e620dbf60f043': Add logging to various actions Ensure mOpenCameraThread has been setup before dereferencing.
|
aa08cd8f3c6fa652fa7a5fdb904e620dbf60f043 |
14-Nov-2013 |
Ed Heyl <edheyl@google.com> |
merge in release branch changes (no-op).
|
ebf8975ec8e70ff3661c0b17a9d2679ab909ce69 |
13-Nov-2013 |
Sascha Haeberling <haeberling@google.com> |
am 03995ce9: am feb472b0: am e04f9709: am ff3a994a: Merge "Show the 100% state of the progress at least one frame." into gb-ub-photos-carlsbad * commit '03995ce964203036eee90a918fd515062afc4284': Show the 100% state of the progress at least one frame.
|
03995ce964203036eee90a918fd515062afc4284 |
13-Nov-2013 |
Sascha Haeberling <haeberling@google.com> |
am feb472b0: am e04f9709: am ff3a994a: Merge "Show the 100% state of the progress at least one frame." into gb-ub-photos-carlsbad * commit 'feb472b0639bbc7c591b06e4d0380343aa4d06ea': Show the 100% state of the progress at least one frame.
|
feb472b0639bbc7c591b06e4d0380343aa4d06ea |
13-Nov-2013 |
Sascha Haeberling <haeberling@google.com> |
am e04f9709: am ff3a994a: Merge "Show the 100% state of the progress at least one frame." into gb-ub-photos-carlsbad * commit 'e04f97097f78f821d6453d77f74307a8ee95e73f': Show the 100% state of the progress at least one frame.
|
e04f97097f78f821d6453d77f74307a8ee95e73f |
13-Nov-2013 |
Sascha Haeberling <haeberling@google.com> |
am ff3a994a: Merge "Show the 100% state of the progress at least one frame." into gb-ub-photos-carlsbad * commit 'ff3a994a2f33c493024b82023bfa910686c4d1de': Show the 100% state of the progress at least one frame.
|
b7b73ec15e05605db6cc2b7f42bbc61d441da1d2 |
13-Nov-2013 |
Sascha Haeberling <haeberling@google.com> |
Show the 100% state of the progress at least one frame. Bug: 11505806 Change-Id: I5fe8456ff93cd50da53e022ac2cf2dd9ac633b2f
rc/com/android/camera/ui/PieRenderer.java
rc/com/android/camera/ui/ProgressRenderer.java
|
ff3a994a2f33c493024b82023bfa910686c4d1de |
13-Nov-2013 |
Sascha Haeberling <haeberling@google.com> |
Merge "Show the 100% state of the progress at least one frame." into gb-ub-photos-carlsbad
|
1605709f645cbde0d0deb76e5ea4e608ea4707ed |
13-Nov-2013 |
Seth Raphael <magicseth@google.com> |
am 4077c5ac: am ef9d3aea: am 79da4498: am 9c861f7a: Merge "Add parameters and deduplicate parameter changes" into gb-ub-photos-carlsbad * commit '4077c5ac42d53c0a7ec1a5c18a3817fa705e284b': Add parameters and deduplicate parameter changes
|
4077c5ac42d53c0a7ec1a5c18a3817fa705e284b |
13-Nov-2013 |
Seth Raphael <magicseth@google.com> |
am ef9d3aea: am 79da4498: am 9c861f7a: Merge "Add parameters and deduplicate parameter changes" into gb-ub-photos-carlsbad * commit 'ef9d3aea57c6e9438af0aad2d9bc2ed8beec02ec': Add parameters and deduplicate parameter changes
|
ef9d3aea57c6e9438af0aad2d9bc2ed8beec02ec |
13-Nov-2013 |
Seth Raphael <magicseth@google.com> |
am 79da4498: am 9c861f7a: Merge "Add parameters and deduplicate parameter changes" into gb-ub-photos-carlsbad * commit '79da449899dca5588301ce674951ba0552094d02': Add parameters and deduplicate parameter changes
|
79da449899dca5588301ce674951ba0552094d02 |
13-Nov-2013 |
Seth Raphael <magicseth@google.com> |
am 9c861f7a: Merge "Add parameters and deduplicate parameter changes" into gb-ub-photos-carlsbad * commit '9c861f7a5a033275729e69116d980ec0a0aacc35': Add parameters and deduplicate parameter changes
|
9c861f7a5a033275729e69116d980ec0a0aacc35 |
13-Nov-2013 |
Seth Raphael <magicseth@google.com> |
Merge "Add parameters and deduplicate parameter changes" into gb-ub-photos-carlsbad
|
7e33d53a60a0c1f5405d6d1598ac48d5237a1810 |
13-Nov-2013 |
Angus Kong <shkong@google.com> |
Merge "Update CL http://ag/387747" into gb-ub-photos-denali
|
32226b936ceee5dc418385fa214dc4b89aafc3a6 |
13-Nov-2013 |
Angus Kong <shkong@google.com> |
Update CL http://ag/387747 Accidentally submitted the patch set 1 before uploading this one. Change-Id: Iee3c751473b67140ea07c84bdde7811b06060bb4
rc/com/android/camera/data/InProgressDataWrapper.java
rc/com/android/camera/filmstrip/FilmstripDataAdapter.java
rc/com/android/camera/filmstrip/FilmstripImageData.java
rc/com/android/camera/filmstrip/FilmstripListener.java
rc/com/android/camera/ui/FilmstripView.java
|
0e1af6db25a2ff36009a4a0aa168dc18e6645cee |
13-Nov-2013 |
Angus Kong <shkong@google.com> |
Merge "Refine comments and small change of interfaces." into gb-ub-photos-denali
|
1c94b7d0fa0143230d04b9f14c2ff93c6886d6cc |
10-Nov-2013 |
Doris Liu <tianliu@google.com> |
Introduce new mode switcher TODO: Get assets from UX and activate shimmy Bug: 11514368 Change-Id: Iebfd3c3c2dc1b08db25e166d5f90d3418a67ed22
es/drawable/craft.png
es/drawable/photo.png
es/drawable/photosphere.png
es/drawable/settings.png
es/drawable/timelapse.png
es/drawable/video.png
es/drawable/wideangle.png
es/layout-land/camera_controls.xml
es/layout-port/camera_controls.xml
es/layout/activity_main.xml
es/layout/camera_filmstrip.xml
es/layout/mode_list_layout.xml
es/layout/mode_selector.xml
es/values/colors.xml
es/values/dimens.xml
es/values/strings.xml
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/PhotoUI.java
rc/com/android/camera/VideoModule.java
rc/com/android/camera/VideoUI.java
rc/com/android/camera/WideAnglePanoramaUI.java
rc/com/android/camera/ui/CameraControls.java
rc/com/android/camera/ui/CameraRootView.java
rc/com/android/camera/ui/FilmstripView.java
rc/com/android/camera/ui/MainActivityLayout.java
rc/com/android/camera/ui/ModeListView.java
rc/com/android/camera/ui/ModeSelectorItem.java
rc/com/android/camera/ui/ModuleSwitcher.java
rc/com/android/camera/util/Gusterpolator.java
|
54d24c3f82e979b7851e2c0f8b2a4dc69122a7c3 |
13-Nov-2013 |
Sascha Haeberling <haeberling@google.com> |
Show the 100% state of the progress at least one frame. Bug: 11505806 Change-Id: I5fe8456ff93cd50da53e022ac2cf2dd9ac633b2f
rc/com/android/camera/ui/PieRenderer.java
rc/com/android/camera/ui/ProgressRenderer.java
|
050763f31cdfec86805d5b1845a25fb0bf175260 |
13-Nov-2013 |
The Android Automerger <android-build@google.com> |
merge in klp-mr1-release history after reset to klp-dev
|
77775f170a4596421fd566005522f56f82b1c276 |
12-Nov-2013 |
Seth Raphael <magicseth@google.com> |
Add parameters and deduplicate parameter changes Bug: 11646117 Change-Id: If52182a856d7ee8143a351c7f79a76d13840c61e
rc/com/android/camera/ComboPreferences.java
rc/com/android/camera/ListPreference.java
rc/com/android/camera/PhotoModule.java
rc_pd/com/android/camera/util/UsageStatistics.java
|
3fdc0a3b57f548ef18fd6a9d66b0c278e252519f |
12-Nov-2013 |
Erin Dahlgren <edahlgren@google.com> |
am 9483c308: am f3dd012d: am 03cb9721: am cc70702c: Revert parallel opening camera in photo mode. * commit '9483c308e4203ee91aa25ee9a393b2cd8c209180': Revert parallel opening camera in photo mode.
|
9483c308e4203ee91aa25ee9a393b2cd8c209180 |
12-Nov-2013 |
Erin Dahlgren <edahlgren@google.com> |
am f3dd012d: am 03cb9721: am cc70702c: Revert parallel opening camera in photo mode. * commit 'f3dd012d98be5a769efd935365d0f54412a9d939': Revert parallel opening camera in photo mode.
|
c02b13af4c44fe23d4a563d3c2df1ca50e44affc |
12-Nov-2013 |
Angus Kong <shkong@google.com> |
Refine comments and small change of interfaces. 1. Use Context as possible as we can instead of the concrete implementaion Activity. 2. Update/add some comments. Change-Id: If80b2a8ab9ddeb297b8ec821568a74db4f52104f
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/app/AppUi.java
rc/com/android/camera/data/CameraDataAdapter.java
rc/com/android/camera/data/FixedFirstDataAdapter.java
rc/com/android/camera/data/FixedLastDataAdapter.java
rc/com/android/camera/data/InProgressDataWrapper.java
rc/com/android/camera/data/LocalData.java
rc/com/android/camera/data/LocalMediaData.java
rc/com/android/camera/data/SimpleViewData.java
rc/com/android/camera/filmstrip/FilmstripController.java
rc/com/android/camera/filmstrip/FilmstripDataAdapter.java
rc/com/android/camera/filmstrip/FilmstripImageData.java
rc/com/android/camera/filmstrip/FilmstripListener.java
rc/com/android/camera/module/ModuleController.java
rc/com/android/camera/ui/FilmstripView.java
|
f3dd012d98be5a769efd935365d0f54412a9d939 |
12-Nov-2013 |
Erin Dahlgren <edahlgren@google.com> |
am 03cb9721: am cc70702c: Revert parallel opening camera in photo mode. * commit '03cb97219c10790eb0eeb37b8d0867a1798da8f7': Revert parallel opening camera in photo mode.
|
03cb97219c10790eb0eeb37b8d0867a1798da8f7 |
12-Nov-2013 |
Erin Dahlgren <edahlgren@google.com> |
am cc70702c: Revert parallel opening camera in photo mode. * commit 'cc70702cc06d98f011f0d9e80b2afa12e6762c8a': Revert parallel opening camera in photo mode.
|
cc70702cc06d98f011f0d9e80b2afa12e6762c8a |
12-Nov-2013 |
Erin Dahlgren <edahlgren@google.com> |
Revert parallel opening camera in photo mode. Reverts: * ag/386409 * ag/386206 * ag/385573 Bug: 11598948 Bug: 11625767 Bug: 11627454 Bug: 11255097 Change-Id: Iad28e32dbcbbce42d9ee261c961cdd5a7712ede5
rc/com/android/camera/PhotoModule.java
|
66dbfe3d0816b721da22c351931259baecda96db |
12-Nov-2013 |
Andy Huibers <andyhuibers@google.com> |
am 1220c57e: am 9bd8ff21: am 9b9b0db9: am a7c84bac: Merge "Close mode menus if another control is touched" into gb-ub-photos-carlsbad * commit '1220c57e65a7344a24426fe6c9d161548cb52648': Close mode menus if another control is touched
|
1220c57e65a7344a24426fe6c9d161548cb52648 |
12-Nov-2013 |
Andy Huibers <andyhuibers@google.com> |
am 9bd8ff21: am 9b9b0db9: am a7c84bac: Merge "Close mode menus if another control is touched" into gb-ub-photos-carlsbad * commit '9bd8ff21397e4e33032599758252a6e5274ffc9d': Close mode menus if another control is touched
|
9bd8ff21397e4e33032599758252a6e5274ffc9d |
12-Nov-2013 |
Andy Huibers <andyhuibers@google.com> |
am 9b9b0db9: am a7c84bac: Merge "Close mode menus if another control is touched" into gb-ub-photos-carlsbad * commit '9b9b0db9445a0258b77339de49170e2fc5d48048': Close mode menus if another control is touched
|
9b9b0db9445a0258b77339de49170e2fc5d48048 |
12-Nov-2013 |
Andy Huibers <andyhuibers@google.com> |
am a7c84bac: Merge "Close mode menus if another control is touched" into gb-ub-photos-carlsbad * commit 'a7c84bacfd76e5e865655bd5a9b248d64f970af1': Close mode menus if another control is touched
|
15c3c9e8dd4e32fe7439bd14542ca4e7cc96b506 |
12-Nov-2013 |
Andy Huibers <andyhuibers@google.com> |
am a7c84bac: Merge "Close mode menus if another control is touched" into gb-ub-photos-carlsbad * commit 'a7c84bacfd76e5e865655bd5a9b248d64f970af1': Close mode menus if another control is touched
|
a7c84bacfd76e5e865655bd5a9b248d64f970af1 |
12-Nov-2013 |
Andy Huibers <andyhuibers@google.com> |
Merge "Close mode menus if another control is touched" into gb-ub-photos-carlsbad
|
661585132d65f5f3612c169bab0fae0217f6583a |
12-Nov-2013 |
ztenghui <ztenghui@google.com> |
resolved conflicts for merge of aae09fb1 to gb-ub-photos-denali Change-Id: Iac6011795fe5e5ac6cc5181188144cf68d617194
|
986e3e3ea1f57b11a75342b1f229c8c1dbc470d4 |
12-Nov-2013 |
ztenghui <ztenghui@google.com> |
am 66c00be2: am d8606879: am ad98a63f: am aae09fb1: Merge "Differentiate the InProgressData from the normal PhotoData." into gb-ub-photos-carlsbad * commit '66c00be2d759877fa81b850a40df18d3e50145aa': Differentiate the InProgressData from the normal PhotoData.
|
66c00be2d759877fa81b850a40df18d3e50145aa |
12-Nov-2013 |
ztenghui <ztenghui@google.com> |
am d8606879: am ad98a63f: am aae09fb1: Merge "Differentiate the InProgressData from the normal PhotoData." into gb-ub-photos-carlsbad * commit 'd86068799bcac0667cbb1ab59f246857b3b4ac64': Differentiate the InProgressData from the normal PhotoData.
|
d86068799bcac0667cbb1ab59f246857b3b4ac64 |
12-Nov-2013 |
ztenghui <ztenghui@google.com> |
am ad98a63f: am aae09fb1: Merge "Differentiate the InProgressData from the normal PhotoData." into gb-ub-photos-carlsbad * commit 'ad98a63ff063eecc69d552606cb066b7a863e6ac': Differentiate the InProgressData from the normal PhotoData.
|
ad98a63ff063eecc69d552606cb066b7a863e6ac |
12-Nov-2013 |
ztenghui <ztenghui@google.com> |
am aae09fb1: Merge "Differentiate the InProgressData from the normal PhotoData." into gb-ub-photos-carlsbad * commit 'aae09fb1ab292932504233da4be5181ce74db763': Differentiate the InProgressData from the normal PhotoData.
|
8c80ac210c1e1aa6a61a60f8eee0ae941a02c3a1 |
12-Nov-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 57a66517: am 03732aed: am fe9fef97: am baffb73c: Start gcam module directly when handling capture intent. * commit '57a665173bcf8ee9b85506c29843ebfca3e1f406': Start gcam module directly when handling capture intent.
|
aae09fb1ab292932504233da4be5181ce74db763 |
12-Nov-2013 |
ztenghui <ztenghui@google.com> |
Merge "Differentiate the InProgressData from the normal PhotoData." into gb-ub-photos-carlsbad
|
57a665173bcf8ee9b85506c29843ebfca3e1f406 |
12-Nov-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 03732aed: am fe9fef97: am baffb73c: Start gcam module directly when handling capture intent. * commit '03732aedc1624ed86a707b1f06acff69c9f6278c': Start gcam module directly when handling capture intent.
|
03732aedc1624ed86a707b1f06acff69c9f6278c |
12-Nov-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am fe9fef97: am baffb73c: Start gcam module directly when handling capture intent. * commit 'fe9fef97a9c7479611ac2f4b347ec092b555cf07': Start gcam module directly when handling capture intent.
|
78748fbc35e1944e363059a365d8df5134ba6692 |
12-Nov-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am baffb73c: Start gcam module directly when handling capture intent. * commit 'baffb73ca83d9d81c379f9f3b9f46cdac7355a0d': Start gcam module directly when handling capture intent.
|
fe9fef97a9c7479611ac2f4b347ec092b555cf07 |
12-Nov-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am baffb73c: Start gcam module directly when handling capture intent. * commit 'baffb73ca83d9d81c379f9f3b9f46cdac7355a0d': Start gcam module directly when handling capture intent.
|
8e64647afd70d6306ab638e25f47623c85b5fac0 |
12-Nov-2013 |
ztenghui <ztenghui@google.com> |
Differentiate the InProgressData from the normal PhotoData. When we load from MediaStore, we should differentiate the data still in progress, e.g. HDR+, which should show the progress bar and hide the action bar items. bug:11634500 bug:11598186 Change-Id: I8179d39747218c8768977d5b3ce71eadbdfb8b58
rc/com/android/camera/data/CameraDataAdapter.java
|
249653e41763cffbd9bd5ef2298c5120488897fb |
12-Nov-2013 |
Andy Huibers <andyhuibers@google.com> |
Close mode menus if another control is touched Bug: 11598901 Bug: 11635865 Change-Id: I9c6237bacef9a28de1fa238e1e7378a57abfc573
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/PhotoUI.java
rc/com/android/camera/VideoUI.java
|
9315449e86481c5363f97d7b7ec3b84c7c328066 |
12-Nov-2013 |
Baligh Uddin <baligh@google.com> |
am b5159f56: (-s ours) am 1e4591d6: (-s ours) am 292e119c: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit 'b5159f56d45d294efd39cc085e475a1c452c531e': Import translations. DO NOT MERGE
|
657680e6c5513b5fae3f940808fc0db1a38c520b |
12-Nov-2013 |
ztenghui <ztenghui@google.com> |
am 3a1ab872: am 65d1169f: am d12bbb8a: am 6a42c3ae: Add a null check to fix NPE * commit '3a1ab872bd051bedab63aa75acbcce6bd34597f9': Add a null check to fix NPE
|
71639a392621ce7e55478c5c4d80ac18a50bfa2f |
12-Nov-2013 |
Ed Heyl <edheyl@google.com> |
am 33c2b60b: am 1c9a6a14: am 2b5aa3e3: merge in release branch changes (no-op). * commit '33c2b60b9561487af3ecf4f5e52c1d345fd7f265': Add GCam progress indicator. hide preview cover on arrival of new preview data if hidden Fix photo mode is getting stuck in a single CameraState. Show chooser on EDIT intents that have no activity for action. Parallelize opening the camera with view handling in photo mode. Decouple the visibility check for system UI from action bar Don't crash Photo Sphere on back button press in filmstrip. Check for media service being present before capture.
|
fbc420dcf7dd717c7181ec71b6f00b228ed505b7 |
12-Nov-2013 |
Seth Raphael <magicseth@google.com> |
am 203511fd: am 2aa0d2b3: am 05f23b7d: am cbd8267e: Add logging to various actions * commit '203511fd372df4e7f9c1a2e3b2822b60981e653f': Add logging to various actions
|
45893a908cb5965a62795ea8d656bf9dad2a681b |
12-Nov-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am eaaca513: am 6911bfca: am 56960b7e: am 36d84c1d: Merge "Ensure mOpenCameraThread has been setup before dereferencing." into gb-ub-photos-carlsbad * commit 'eaaca5130356a9bb2e38d590b63072ed507f5f9d': Ensure mOpenCameraThread has been setup before dereferencing.
|
6a050d6ecbce92beb816fd9bf4a420ffc00ba510 |
12-Nov-2013 |
Sascha Haeberling <haeberling@google.com> |
am 176b0992: am aa158f2f: am 0351d05d: am 2b78c0c0: Merge "Add GCam progress indicator." into gb-ub-photos-carlsbad * commit '176b099253e3a0eeec3ad2665157c126629b2ae2': Add GCam progress indicator.
|
55f4d90fc04ae5bc8f7c5ec292eef6864694ec83 |
12-Nov-2013 |
Andy Huibers <andyhuibers@google.com> |
am 02cdd0a4: am 8bc966eb: am c504af14: am fccf83bd: hide preview cover on arrival of new preview data if hidden * commit '02cdd0a4fc53f91ba11e191527b90720e10f8929': hide preview cover on arrival of new preview data if hidden
|
0de3af3885ce1885c098a36fb75192b92c3c52dc |
12-Nov-2013 |
Erin Dahlgren <edahlgren@google.com> |
am 40b6b458: am 30ac3520: am cbe9fc1f: am 2f878d54: Merge "Fix photo mode is getting stuck in a single CameraState." into gb-ub-photos-carlsbad * commit '40b6b4585c7ac59667b32e3e0f275423c665c8b8': Fix photo mode is getting stuck in a single CameraState.
|
92a0528d7d263c351de58c1ef89c278512a317c9 |
12-Nov-2013 |
Erin Dahlgren <edahlgren@google.com> |
am 71e8e91d: am 570d8da0: am 5a0475e4: am 05a04924: Show chooser on EDIT intents that have no activity for action. * commit '71e8e91d2b4ff73c7d63241a947b03c74ecd9e8c': Show chooser on EDIT intents that have no activity for action.
|
e52969d1e027902da6c935bf440b2638356c80a0 |
12-Nov-2013 |
Erin Dahlgren <edahlgren@google.com> |
am 1ffe5c18: am d2aeec25: am c8761589: am 7e6e947f: Merge "Parallelize opening the camera with view handling in photo mode." into gb-ub-photos-carlsbad * commit '1ffe5c18a3f219496a0d85f50aeb31f4e8643758': Parallelize opening the camera with view handling in photo mode.
|
510a9d6e20cb452e687bf3a2d0d6fe69e1fa5f1e |
12-Nov-2013 |
ztenghui <ztenghui@google.com> |
am e77b0b74: am 2c14fb02: am d2b57761: am 9070def9: Merge "Decouple the visibility check for system UI from action bar" into gb-ub-photos-carlsbad * commit 'e77b0b74c1fb085ed247697226a5d8642932e83d': Decouple the visibility check for system UI from action bar
|
70481a1db765d91c51fc38df9ae6e28dadbbccd5 |
12-Nov-2013 |
Baligh Uddin <baligh@google.com> |
am c54d55f6: (-s ours) am fef07e22: (-s ours) am f5d6fc67: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit 'c54d55f60cf80e82353a407fe61fb9b13238fb24': Import translations. DO NOT MERGE
|
0daefb11152801e28975a1686b1e5dbb59739f34 |
12-Nov-2013 |
Sascha Haeberling <haeberling@google.com> |
am 35965b92: am ef339df9: am 107e93ee: am eb605b4a: Don\'t crash Photo Sphere on back button press in filmstrip. * commit '35965b92472f0751e3c1a3b9737b4daff05c3efd': Don't crash Photo Sphere on back button press in filmstrip.
|
baffb73ca83d9d81c379f9f3b9f46cdac7355a0d |
11-Nov-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Start gcam module directly when handling capture intent. Bug: 11609971 - Prior behavior for capture intents when in HDR+ mode was to resume into the PhotoModule and switch to the GcamModule. Following this change, we resume directly into the GcamModule. - Fixes the bad lockscreen behavior caused by the sequence: onResume->switch to GcamModule(queue GcamModule onPause and onResume)-> onPause->onResume, where handler queuing order could get in a state where the GcamModule onResume is called twice in a row, resulting in duplicate requests being queued for each capture. Change-Id: Ibd632d74836224288270f5342e45e523e25ca429
rc/com/android/camera/CameraActivity.java
|
b5159f56d45d294efd39cc085e475a1c452c531e |
11-Nov-2013 |
Baligh Uddin <baligh@google.com> |
am 1e4591d6: (-s ours) am 292e119c: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '1e4591d6be9033e82110d90a0cd1aec028084d61': Import translations. DO NOT MERGE
|
1e4591d6be9033e82110d90a0cd1aec028084d61 |
11-Nov-2013 |
Baligh Uddin <baligh@google.com> |
am 292e119c: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '292e119c14c936c35478aad1d386a2ef5b8a0827': Import translations. DO NOT MERGE
|
292e119c14c936c35478aad1d386a2ef5b8a0827 |
11-Nov-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into klp-dev
|
bfdc00a8562a02b4e36fd20d9109d4c4ec9826e4 |
11-Nov-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-denali
|
f5d3fe1c369d2ac61f7b876413cd63f38b09249d |
11-Nov-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I5473adda29e7188a6e12ee57a1576f6ca6abadda Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-km-rKH/strings.xml
es/values-ko/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mn-rMN/strings.xml
es/values-ms-rMY/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
5b451e1de32425bafa0a137f91272ec3b95d1f83 |
11-Nov-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I19829aa0316b38df602b026e39213f11ca02d4d9 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-km-rKH/strings.xml
es/values-ko/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mn-rMN/strings.xml
es/values-ms-rMY/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
e7842b396b140da3e314ff8f903786b53551c7cd |
11-Nov-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Idc1a474f92e3d272a00d312499def4a9962a6461 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-km-rKH/strings.xml
es/values-ko/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mn-rMN/strings.xml
es/values-ms-rMY/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
9f1db5210361802a30a7866825c3b29ef5fe0024 |
10-Nov-2013 |
Angus Kong <shkong@google.com> |
Refactor OrientationManager. We should use a single OrientationManager instead of one for each module. Change-Id: I20adddf50e9e55e4af44bfbe4298bdb1e1e50df3
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/VideoModule.java
rc/com/android/camera/WideAnglePanoramaModule.java
rc/com/android/camera/app/AppController.java
rc/com/android/camera/app/OrientationManager.java
rc/com/android/camera/app/OrientationManagerImpl.java
rc/com/android/camera/module/ModuleController.java
|
0e6c1dc3e16571e036bc947fc531c2049893649a |
11-Nov-2013 |
The Android Automerger <android-build@google.com> |
merge in klp-mr1-release history after reset to klp-dev
|
fb6f63262c892c2b0dd10194e0f040555e980fdf |
11-Nov-2013 |
Angus Kong <shkong@google.com> |
Fix build. Change-Id: I46d88fb17f1d593a4b19cd6657adc28596e6db56
rc/com/android/camera/ui/FilmstripView.java
|
3a1ab872bd051bedab63aa75acbcce6bd34597f9 |
11-Nov-2013 |
ztenghui <ztenghui@google.com> |
am 65d1169f: am d12bbb8a: am 6a42c3ae: Add a null check to fix NPE * commit '65d1169f8f100139cfbd6050094489230377cff1': Add a null check to fix NPE
|
33c2b60b9561487af3ecf4f5e52c1d345fd7f265 |
11-Nov-2013 |
Ed Heyl <edheyl@google.com> |
am 1c9a6a14: am 2b5aa3e3: merge in release branch changes (no-op). * commit '1c9a6a1431c0eec8f7f08cc81429aa5e20322bfc': Add GCam progress indicator. hide preview cover on arrival of new preview data if hidden Fix photo mode is getting stuck in a single CameraState. Show chooser on EDIT intents that have no activity for action. Parallelize opening the camera with view handling in photo mode. Decouple the visibility check for system UI from action bar Don't crash Photo Sphere on back button press in filmstrip. Check for media service being present before capture.
|
203511fd372df4e7f9c1a2e3b2822b60981e653f |
11-Nov-2013 |
Seth Raphael <magicseth@google.com> |
am 2aa0d2b3: am 05f23b7d: am cbd8267e: Add logging to various actions * commit '2aa0d2b3ab80194be3c5b9aaab2face534a363c8': Add logging to various actions
|
eaaca5130356a9bb2e38d590b63072ed507f5f9d |
11-Nov-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 6911bfca: am 56960b7e: am 36d84c1d: Merge "Ensure mOpenCameraThread has been setup before dereferencing." into gb-ub-photos-carlsbad * commit '6911bfca1b8be8b1bd41f30dee77828678de3bd7': Ensure mOpenCameraThread has been setup before dereferencing.
|
176b099253e3a0eeec3ad2665157c126629b2ae2 |
11-Nov-2013 |
Sascha Haeberling <haeberling@google.com> |
am aa158f2f: am 0351d05d: am 2b78c0c0: Merge "Add GCam progress indicator." into gb-ub-photos-carlsbad * commit 'aa158f2fc14b8df1f0f1d36429f094153cf9b376': Add GCam progress indicator.
|
02cdd0a4fc53f91ba11e191527b90720e10f8929 |
11-Nov-2013 |
Andy Huibers <andyhuibers@google.com> |
am 8bc966eb: am c504af14: am fccf83bd: hide preview cover on arrival of new preview data if hidden * commit '8bc966eb1879d8b9d6c8552c160762c5595bbd13': hide preview cover on arrival of new preview data if hidden
|
40b6b4585c7ac59667b32e3e0f275423c665c8b8 |
11-Nov-2013 |
Erin Dahlgren <edahlgren@google.com> |
am 30ac3520: am cbe9fc1f: am 2f878d54: Merge "Fix photo mode is getting stuck in a single CameraState." into gb-ub-photos-carlsbad * commit '30ac35202ada27aef3bbeeae03f73c49249569ee': Fix photo mode is getting stuck in a single CameraState.
|
71e8e91d2b4ff73c7d63241a947b03c74ecd9e8c |
11-Nov-2013 |
Erin Dahlgren <edahlgren@google.com> |
am 570d8da0: am 5a0475e4: am 05a04924: Show chooser on EDIT intents that have no activity for action. * commit '570d8da0ee90cadca3b2281ad0d37078702f614f': Show chooser on EDIT intents that have no activity for action.
|
1ffe5c18a3f219496a0d85f50aeb31f4e8643758 |
11-Nov-2013 |
Erin Dahlgren <edahlgren@google.com> |
am d2aeec25: am c8761589: am 7e6e947f: Merge "Parallelize opening the camera with view handling in photo mode." into gb-ub-photos-carlsbad * commit 'd2aeec255f7db1fbe8e2e2441031c91706630625': Parallelize opening the camera with view handling in photo mode.
|
e77b0b74c1fb085ed247697226a5d8642932e83d |
11-Nov-2013 |
ztenghui <ztenghui@google.com> |
am 2c14fb02: am d2b57761: am 9070def9: Merge "Decouple the visibility check for system UI from action bar" into gb-ub-photos-carlsbad * commit '2c14fb02cc38f39480d39ec0a32f126483d64527': Decouple the visibility check for system UI from action bar
|
c54d55f60cf80e82353a407fe61fb9b13238fb24 |
11-Nov-2013 |
Baligh Uddin <baligh@google.com> |
am fef07e22: (-s ours) am f5d6fc67: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit 'fef07e226b01e4720e0a1f99f41520e29c10c7f7': Import translations. DO NOT MERGE
|
35965b92472f0751e3c1a3b9737b4daff05c3efd |
11-Nov-2013 |
Sascha Haeberling <haeberling@google.com> |
am ef339df9: am 107e93ee: am eb605b4a: Don\'t crash Photo Sphere on back button press in filmstrip. * commit 'ef339df93d7013a8e03c57c586d2206c0855c5f2': Don't crash Photo Sphere on back button press in filmstrip.
|
65d1169f8f100139cfbd6050094489230377cff1 |
11-Nov-2013 |
ztenghui <ztenghui@google.com> |
am d12bbb8a: am 6a42c3ae: Add a null check to fix NPE * commit 'd12bbb8a7ba13fb9e743b62fc9d9779517b8d43e': Add a null check to fix NPE
|
ac6c8597f444957fc13916f62bc37828e6d38765 |
11-Nov-2013 |
ztenghui <ztenghui@google.com> |
am 6a42c3ae: Add a null check to fix NPE * commit '6a42c3ae157c4495db56541ef87f6ee56b5d10b3': Add a null check to fix NPE
|
d12bbb8a7ba13fb9e743b62fc9d9779517b8d43e |
11-Nov-2013 |
ztenghui <ztenghui@google.com> |
am 6a42c3ae: Add a null check to fix NPE * commit '6a42c3ae157c4495db56541ef87f6ee56b5d10b3': Add a null check to fix NPE
|
628481532e1e58a0a26330d238e850aec5657bce |
09-Nov-2013 |
Angus Kong <shkong@google.com> |
Further refactor 1. Create filmstrip package. 2. Move ImageTaskManager to under package app/. 3. Adde app UI abstract layer AppUi. Change-Id: I9d640de65c59196c5d3e5c3a8901bb3220b29f62
es/layout/camera_filmstrip.xml
rc/com/android/camera/AndroidCameraManagerImpl.java
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/CameraHolder.java
rc/com/android/camera/CameraManager.java
rc/com/android/camera/ImageTaskManager.java
rc/com/android/camera/app/AppUi.java
rc/com/android/camera/app/ImageTaskManager.java
rc/com/android/camera/app/PlaceholderManager.java
rc/com/android/camera/data/CameraDataAdapter.java
rc/com/android/camera/data/CameraPreviewData.java
rc/com/android/camera/data/FixedFirstDataAdapter.java
rc/com/android/camera/data/FixedLastDataAdapter.java
rc/com/android/camera/data/LocalData.java
rc/com/android/camera/data/LocalDataAdapter.java
rc/com/android/camera/data/LocalMediaData.java
rc/com/android/camera/data/SimpleViewData.java
rc/com/android/camera/filmstrip/FilmstripController.java
rc/com/android/camera/filmstrip/FilmstripDataAdapter.java
rc/com/android/camera/filmstrip/FilmstripImageData.java
rc/com/android/camera/filmstrip/FilmstripListener.java
rc/com/android/camera/module/ModuleController.java
rc/com/android/camera/ui/FilmStripView.java
rc/com/android/camera/ui/FilmstripView.java
rc/com/android/camera/util/CameraUtil.java
rc_pd/com/android/camera/app/PanoramaStitchingManager.java
|
6a42c3ae157c4495db56541ef87f6ee56b5d10b3 |
09-Nov-2013 |
ztenghui <ztenghui@google.com> |
Add a null check to fix NPE bug: 11594111 Change-Id: Ica2ffe315c4e4eaa818aa609d9600d5e67e54b3b
rc/com/android/camera/ui/FilmStripView.java
|
ed78521eafd4e32897af965c16c9e14504f778f5 |
09-Nov-2013 |
Angus Kong <shkong@google.com> |
Merge "Add more interfaces for app and modules." into gb-ub-photos-denali
|
51ae7a844570f85b68a989034f7391260d88a783 |
08-Nov-2013 |
Angus Kong <shkong@google.com> |
Add more interfaces for app and modules. Change-Id: Ie67f90f227b5bc74bc7ac39fca72dfd1741140ca
rc/com/android/camera/app/AppController.java
rc/com/android/camera/module/ModuleController.java
|
c62cd6fd71df0cd4769e97eab4713fd5e211db58 |
09-Nov-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Close cursor in CameraDataAdapter to prevent resource leaks. Bug: 11352359 Change-Id: I4939d8ff52f8d14ae237ae8464a318daa059e2a2
rc/com/android/camera/data/CameraDataAdapter.java
|
1138d7ad2dc727bc256ee42f7603bebb37468b61 |
08-Nov-2013 |
Angus Kong <shkong@google.com> |
Merge "Refactor MediaSaveService for future test needs." into gb-ub-photos-denali
|
b9cb37d1aaa86f59cde17a9532af3a9f12e790e5 |
05-Nov-2013 |
Seth Raphael <magicseth@google.com> |
Add logging to various actions Bug: 11514148 Change-Id: Ib31a74a6badc4dcdeaa316e032f4aef17edd06b2
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/ComboPreferences.java
rc/com/android/camera/FocusOverlayManager.java
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/WideAnglePanoramaModule.java
rc/com/android/camera/ui/FilmStripView.java
rc/com/android/camera/util/CameraUtil.java
rc_pd/com/android/camera/util/UsageStatistics.java
|
9deefc8c4c27f21e694a819edfa98026f7cc0b24 |
08-Nov-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Ensure mOpenCameraThread has been setup before dereferencing. Bug: 11579062 Change-Id: Iabccdbfd3468eaa47115de1dbcafa7f9e456603b
rc/com/android/camera/PhotoModule.java
|
1c9a6a1431c0eec8f7f08cc81429aa5e20322bfc |
08-Nov-2013 |
Ed Heyl <edheyl@google.com> |
am 2b5aa3e3: merge in release branch changes (no-op). * commit '2b5aa3e38b55f28ea1c5f619b921a7470cc926a0': Add GCam progress indicator. hide preview cover on arrival of new preview data if hidden Fix photo mode is getting stuck in a single CameraState. Show chooser on EDIT intents that have no activity for action. Parallelize opening the camera with view handling in photo mode. Decouple the visibility check for system UI from action bar Don't crash Photo Sphere on back button press in filmstrip. Check for media service being present before capture.
|
2b5aa3e38b55f28ea1c5f619b921a7470cc926a0 |
08-Nov-2013 |
Ed Heyl <edheyl@google.com> |
merge in release branch changes (no-op).
|
57f235bb4d8e017d983ad2d1e062276f049ad7ab |
08-Nov-2013 |
Seth Raphael <magicseth@google.com> |
resolved conflicts for merge of cbd8267e to gb-ub-photos-denali Change-Id: I24dcc27aa7aef1575f03b6ceaf418cf49712a170
|
cc684d5a85c74e00b7a4078030e844aefb6170ec |
08-Nov-2013 |
ztenghui <ztenghui@google.com> |
am 57933be4: am f82f66c1: am 970cd50b: am 189bfea2: Merge "Fix the RTL layout in the app\'s manifest." into gb-ub-photos-carlsbad * commit '57933be4248be055cdc0a273fe1a92fe94fb7bdf': Fix the RTL layout in the app's manifest.
|
79b15ec3251a51eb1e08a315e467c0e04a31c935 |
08-Nov-2013 |
Erin Dahlgren <edahlgren@google.com> |
am 718da285: am dffe3cb6: am f41109d8: am 98254270: Merge "Make image editor intent general." into gb-ub-photos-carlsbad * commit '718da2850e443f6df9ebc1fef19344dcfe7cb412': Make image editor intent general.
|
0b4a7d77744710b8d2ce092821102904d820fac5 |
08-Nov-2013 |
Alan Newberger <alann@google.com> |
am d6384381: am 4fc8f6bd: am 6fddfed2: am 2bcb8d1f: add \'capturing\' string for in process indicators * commit 'd6384381abf59003702e20371fca2ba607eea33f': add 'capturing' string for in process indicators
|
57933be4248be055cdc0a273fe1a92fe94fb7bdf |
08-Nov-2013 |
ztenghui <ztenghui@google.com> |
am f82f66c1: am 970cd50b: am 189bfea2: Merge "Fix the RTL layout in the app\'s manifest." into gb-ub-photos-carlsbad * commit 'f82f66c1fcc8f9f21f00fdf8e83f58c3e1869519': Fix the RTL layout in the app's manifest.
|
718da2850e443f6df9ebc1fef19344dcfe7cb412 |
08-Nov-2013 |
Erin Dahlgren <edahlgren@google.com> |
am dffe3cb6: am f41109d8: am 98254270: Merge "Make image editor intent general." into gb-ub-photos-carlsbad * commit 'dffe3cb681048e2a29c9da331dc0180a730232f8': Make image editor intent general.
|
d6384381abf59003702e20371fca2ba607eea33f |
08-Nov-2013 |
Alan Newberger <alann@google.com> |
am 4fc8f6bd: am 6fddfed2: am 2bcb8d1f: add \'capturing\' string for in process indicators * commit '4fc8f6bd5877189a9e65859a6b742e4b496e3d7a': add 'capturing' string for in process indicators
|
2aa0d2b3ab80194be3c5b9aaab2face534a363c8 |
08-Nov-2013 |
Seth Raphael <magicseth@google.com> |
am 05f23b7d: am cbd8267e: Add logging to various actions * commit '05f23b7d90bbe6161da8759f707a5d271a9d9f70': Add logging to various actions
|
05f23b7d90bbe6161da8759f707a5d271a9d9f70 |
08-Nov-2013 |
Seth Raphael <magicseth@google.com> |
am cbd8267e: Add logging to various actions * commit 'cbd8267ee99e457f72822e8d8187b5e6823104f8': Add logging to various actions
|
cbd8267ee99e457f72822e8d8187b5e6823104f8 |
05-Nov-2013 |
Seth Raphael <magicseth@google.com> |
Add logging to various actions Bug: 11514148 Change-Id: Ib31a74a6badc4dcdeaa316e032f4aef17edd06b2
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/ComboPreferences.java
rc/com/android/camera/FocusOverlayManager.java
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/WideAnglePanoramaModule.java
rc/com/android/camera/ui/FilmStripView.java
rc/com/android/camera/util/CameraUtil.java
rc_pd/com/android/camera/util/UsageStatistics.java
|
6911bfca1b8be8b1bd41f30dee77828678de3bd7 |
08-Nov-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 56960b7e: am 36d84c1d: Merge "Ensure mOpenCameraThread has been setup before dereferencing." into gb-ub-photos-carlsbad * commit '56960b7ebee5c4c9493d35b336adb41afb34a2bd': Ensure mOpenCameraThread has been setup before dereferencing.
|
7974ac9e39bdd13ffa96a788b6322653a5d851ec |
08-Nov-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 36d84c1d: Merge "Ensure mOpenCameraThread has been setup before dereferencing." into gb-ub-photos-carlsbad * commit '36d84c1d273faf24c6907e173cf95f233db71592': Ensure mOpenCameraThread has been setup before dereferencing.
|
56960b7ebee5c4c9493d35b336adb41afb34a2bd |
08-Nov-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 36d84c1d: Merge "Ensure mOpenCameraThread has been setup before dereferencing." into gb-ub-photos-carlsbad * commit '36d84c1d273faf24c6907e173cf95f233db71592': Ensure mOpenCameraThread has been setup before dereferencing.
|
36d84c1d273faf24c6907e173cf95f233db71592 |
08-Nov-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Ensure mOpenCameraThread has been setup before dereferencing." into gb-ub-photos-carlsbad
|
acf9ab7c3ddc976bc9d6239ae54523b9805c876d |
08-Nov-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Ensure mOpenCameraThread has been setup before dereferencing. Bug: 11579062 Change-Id: Iabccdbfd3468eaa47115de1dbcafa7f9e456603b
rc/com/android/camera/PhotoModule.java
|
2820eca8825d6767b283f22c321c8f777ba572ae |
07-Nov-2013 |
Sascha Haeberling <haeberling@google.com> |
Add GCam progress indicator. Bug: 11505806 Change-Id: I823c44b3761bb3c6dce56b1ec1b8d667023da820
es/values/dimens.xml
rc/com/android/camera/ui/PieRenderer.java
rc/com/android/camera/ui/ProgressRenderer.java
|
2c5ab5eaa9d79a0fb1cf3b32fdc7ee283676cced |
06-Nov-2013 |
Andy Huibers <andyhuibers@google.com> |
hide preview cover on arrival of new preview data if hidden Bug: 11433257 Change-Id: I7225ebf1d84bbefd2f952cfa524720a7e76e7181
rc/com/android/camera/PhotoUI.java
rc/com/android/camera/VideoUI.java
rc/com/android/camera/WideAnglePanoramaUI.java
|
2b55bb3092ca5517906ef62bdb5de4c7711666d9 |
07-Nov-2013 |
Erin Dahlgren <edahlgren@google.com> |
Fix photo mode is getting stuck in a single CameraState. Bug: 11574716 Change-Id: Ieb3622103798077071bb9350773851b7acbff756
rc/com/android/camera/PhotoModule.java
|
5eefffdfb0b93f7a1b3d4c167c25d8a2a4a68d08 |
07-Nov-2013 |
Erin Dahlgren <edahlgren@google.com> |
Show chooser on EDIT intents that have no activity for action. Bug: 11571947 Change-Id: I40ef0f9ae6b4567557064d91b9c3942cd524a60b
rc/com/android/camera/CameraActivity.java
|
01341ec00c03577c6d8a1652463e1a6aaef16270 |
06-Nov-2013 |
Erin Dahlgren <edahlgren@google.com> |
Parallelize opening the camera with view handling in photo mode. Bug: 11255097 Change-Id: I8da16a97ee46555267ae8cfee0e7940d3f53f98f
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/PhotoUI.java
|
9666bc6027ab17d28b14b18e0fea8f03108f288b |
06-Nov-2013 |
ztenghui <ztenghui@google.com> |
Decouple the visibility check for system UI from action bar And make sure we toggle system UI when reload. bug:11539377 Change-Id: I4d251557c1d68a173cabb652e0beaa3ee89cb6f0
rc/com/android/camera/CameraActivity.java
|
fd4fc0e52ad69c2d486f5f46c2d465b4c4ba2849 |
08-Nov-2013 |
Angus Kong <shkong@google.com> |
Refactor MediaSaveService for future test needs. Added interface MediaSaver as the abstract layer to make the implementation independent of the clients. Change-Id: I98db3f732e4ed1c87da005b9c18e888682a5e6a5
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/CameraModule.java
rc/com/android/camera/MediaSaveService.java
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/VideoModule.java
rc/com/android/camera/WideAnglePanoramaModule.java
rc/com/android/camera/app/MediaSaver.java
rc/com/android/camera/tinyplanet/TinyPlanetFragment.java
|
aa158f2fc14b8df1f0f1d36429f094153cf9b376 |
08-Nov-2013 |
Sascha Haeberling <haeberling@google.com> |
am 0351d05d: am 2b78c0c0: Merge "Add GCam progress indicator." into gb-ub-photos-carlsbad * commit '0351d05de1e9fe9abd97f082f9de940066b0c818': Add GCam progress indicator.
|
88eabecc304f817e6f945f25a2374412f742caa7 |
08-Nov-2013 |
Sascha Haeberling <haeberling@google.com> |
am 2b78c0c0: Merge "Add GCam progress indicator." into gb-ub-photos-carlsbad * commit '2b78c0c048fe906beaeadeee3e267524c808c340': Add GCam progress indicator.
|
0351d05de1e9fe9abd97f082f9de940066b0c818 |
08-Nov-2013 |
Sascha Haeberling <haeberling@google.com> |
am 2b78c0c0: Merge "Add GCam progress indicator." into gb-ub-photos-carlsbad * commit '2b78c0c048fe906beaeadeee3e267524c808c340': Add GCam progress indicator.
|
2b78c0c048fe906beaeadeee3e267524c808c340 |
08-Nov-2013 |
Sascha Haeberling <haeberling@google.com> |
Merge "Add GCam progress indicator." into gb-ub-photos-carlsbad
|
e0ecc64979a29e5bbdd1084712b231070b1d57bf |
07-Nov-2013 |
Sascha Haeberling <haeberling@google.com> |
Add GCam progress indicator. Bug: 11505806 Change-Id: I823c44b3761bb3c6dce56b1ec1b8d667023da820
es/values/dimens.xml
rc/com/android/camera/ui/PieRenderer.java
rc/com/android/camera/ui/ProgressRenderer.java
|
8bc966eb1879d8b9d6c8552c160762c5595bbd13 |
07-Nov-2013 |
Andy Huibers <andyhuibers@google.com> |
am c504af14: am fccf83bd: hide preview cover on arrival of new preview data if hidden * commit 'c504af14a839ee44e84cc7af84b348a80cde97ff': hide preview cover on arrival of new preview data if hidden
|
88f7dbe2e40a9651053c22d5ebbb060eac43a258 |
07-Nov-2013 |
Andy Huibers <andyhuibers@google.com> |
am fccf83bd: hide preview cover on arrival of new preview data if hidden * commit 'fccf83bd342a3a83dc284525488e69f25e4667c4': hide preview cover on arrival of new preview data if hidden
|
c504af14a839ee44e84cc7af84b348a80cde97ff |
07-Nov-2013 |
Andy Huibers <andyhuibers@google.com> |
am fccf83bd: hide preview cover on arrival of new preview data if hidden * commit 'fccf83bd342a3a83dc284525488e69f25e4667c4': hide preview cover on arrival of new preview data if hidden
|
fccf83bd342a3a83dc284525488e69f25e4667c4 |
06-Nov-2013 |
Andy Huibers <andyhuibers@google.com> |
hide preview cover on arrival of new preview data if hidden Bug: 11433257 Change-Id: I7225ebf1d84bbefd2f952cfa524720a7e76e7181
rc/com/android/camera/PhotoUI.java
rc/com/android/camera/VideoUI.java
rc/com/android/camera/WideAnglePanoramaUI.java
|
30ac35202ada27aef3bbeeae03f73c49249569ee |
07-Nov-2013 |
Erin Dahlgren <edahlgren@google.com> |
am cbe9fc1f: am 2f878d54: Merge "Fix photo mode is getting stuck in a single CameraState." into gb-ub-photos-carlsbad * commit 'cbe9fc1fea10a8c98cff2fd5418d50fc765a6235': Fix photo mode is getting stuck in a single CameraState.
|
cbe9fc1fea10a8c98cff2fd5418d50fc765a6235 |
07-Nov-2013 |
Erin Dahlgren <edahlgren@google.com> |
am 2f878d54: Merge "Fix photo mode is getting stuck in a single CameraState." into gb-ub-photos-carlsbad * commit '2f878d54ecbb62ef09aa2b0152dea983e598724f': Fix photo mode is getting stuck in a single CameraState.
|
90018374f067d35a0fc2e49392532e1ac0c18b68 |
07-Nov-2013 |
Erin Dahlgren <edahlgren@google.com> |
am 2f878d54: Merge "Fix photo mode is getting stuck in a single CameraState." into gb-ub-photos-carlsbad * commit '2f878d54ecbb62ef09aa2b0152dea983e598724f': Fix photo mode is getting stuck in a single CameraState.
|
2f878d54ecbb62ef09aa2b0152dea983e598724f |
07-Nov-2013 |
Erin Dahlgren <edahlgren@google.com> |
Merge "Fix photo mode is getting stuck in a single CameraState." into gb-ub-photos-carlsbad
|
570d8da0ee90cadca3b2281ad0d37078702f614f |
07-Nov-2013 |
Erin Dahlgren <edahlgren@google.com> |
am 5a0475e4: am 05a04924: Show chooser on EDIT intents that have no activity for action. * commit '5a0475e4d7fdc0a1ec3dae3eea3cf8ea2b882fbd': Show chooser on EDIT intents that have no activity for action.
|
5a0475e4d7fdc0a1ec3dae3eea3cf8ea2b882fbd |
07-Nov-2013 |
Erin Dahlgren <edahlgren@google.com> |
am 05a04924: Show chooser on EDIT intents that have no activity for action. * commit '05a04924312fbcda2161da01e0749eb80c2663d1': Show chooser on EDIT intents that have no activity for action.
|
9c19a579c3b39277c7f94ac18340723d64a4f038 |
07-Nov-2013 |
Erin Dahlgren <edahlgren@google.com> |
am 05a04924: Show chooser on EDIT intents that have no activity for action. * commit '05a04924312fbcda2161da01e0749eb80c2663d1': Show chooser on EDIT intents that have no activity for action.
|
c5effbada57112445656bf4929f13f9942afb14c |
07-Nov-2013 |
Erin Dahlgren <edahlgren@google.com> |
Fix photo mode is getting stuck in a single CameraState. Bug: 11574716 Change-Id: Ieb3622103798077071bb9350773851b7acbff756
rc/com/android/camera/PhotoModule.java
|
05a04924312fbcda2161da01e0749eb80c2663d1 |
07-Nov-2013 |
Erin Dahlgren <edahlgren@google.com> |
Show chooser on EDIT intents that have no activity for action. Bug: 11571947 Change-Id: I40ef0f9ae6b4567557064d91b9c3942cd524a60b
rc/com/android/camera/CameraActivity.java
|
d2aeec255f7db1fbe8e2e2441031c91706630625 |
07-Nov-2013 |
Erin Dahlgren <edahlgren@google.com> |
am c8761589: am 7e6e947f: Merge "Parallelize opening the camera with view handling in photo mode." into gb-ub-photos-carlsbad * commit 'c876158977a8555e2bc93395834596e8e10636e1': Parallelize opening the camera with view handling in photo mode.
|
0c61d3c523e242f5030b710801f59f413060ea5b |
07-Nov-2013 |
Erin Dahlgren <edahlgren@google.com> |
am 7e6e947f: Merge "Parallelize opening the camera with view handling in photo mode." into gb-ub-photos-carlsbad * commit '7e6e947f0e530c14b32785bdb3094ea473000a12': Parallelize opening the camera with view handling in photo mode.
|
c876158977a8555e2bc93395834596e8e10636e1 |
07-Nov-2013 |
Erin Dahlgren <edahlgren@google.com> |
am 7e6e947f: Merge "Parallelize opening the camera with view handling in photo mode." into gb-ub-photos-carlsbad * commit '7e6e947f0e530c14b32785bdb3094ea473000a12': Parallelize opening the camera with view handling in photo mode.
|
7e6e947f0e530c14b32785bdb3094ea473000a12 |
07-Nov-2013 |
Erin Dahlgren <edahlgren@google.com> |
Merge "Parallelize opening the camera with view handling in photo mode." into gb-ub-photos-carlsbad
|
b09b53efcd179d55836014dcd054cff6f7d688d8 |
06-Nov-2013 |
Erin Dahlgren <edahlgren@google.com> |
Parallelize opening the camera with view handling in photo mode. Bug: 11255097 Change-Id: I8da16a97ee46555267ae8cfee0e7940d3f53f98f
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/PhotoUI.java
|
2c14fb02cc38f39480d39ec0a32f126483d64527 |
07-Nov-2013 |
ztenghui <ztenghui@google.com> |
am d2b57761: am 9070def9: Merge "Decouple the visibility check for system UI from action bar" into gb-ub-photos-carlsbad * commit 'd2b57761ec5e8b4c5e2d7ec8af48ce4914f1c6bb': Decouple the visibility check for system UI from action bar
|
0b614e05bb44fd1421594454ab6397abb6a26dff |
07-Nov-2013 |
ztenghui <ztenghui@google.com> |
am 9070def9: Merge "Decouple the visibility check for system UI from action bar" into gb-ub-photos-carlsbad * commit '9070def99369ccdffb1cf5e006ed30646297f490': Decouple the visibility check for system UI from action bar
|
d2b57761ec5e8b4c5e2d7ec8af48ce4914f1c6bb |
07-Nov-2013 |
ztenghui <ztenghui@google.com> |
am 9070def9: Merge "Decouple the visibility check for system UI from action bar" into gb-ub-photos-carlsbad * commit '9070def99369ccdffb1cf5e006ed30646297f490': Decouple the visibility check for system UI from action bar
|
9070def99369ccdffb1cf5e006ed30646297f490 |
07-Nov-2013 |
ztenghui <ztenghui@google.com> |
Merge "Decouple the visibility check for system UI from action bar" into gb-ub-photos-carlsbad
|
539ed1536889725aa9f080ba12338700c3d467a2 |
07-Nov-2013 |
The Android Automerger <android-build@google.com> |
merge in klp-mr1-release history after reset to klp-dev
|
fef07e226b01e4720e0a1f99f41520e29c10c7f7 |
07-Nov-2013 |
Baligh Uddin <baligh@google.com> |
am f5d6fc67: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit 'f5d6fc67f32015683840936727726c9f2306cb15': Import translations. DO NOT MERGE
|
f5d6fc67f32015683840936727726c9f2306cb15 |
07-Nov-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into klp-dev
|
3ea14275cdcde7212f019fa620c7376ac8b94ae8 |
07-Nov-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-denali
|
6d3938a9bd68c2a42b3325576d8cb7323d7db5ec |
07-Nov-2013 |
Angus Kong <shkong@google.com> |
Merge "Introducing new architect." into gb-ub-photos-denali
|
fa27423125e78f43d8dbae987c34314a238f205c |
07-Nov-2013 |
Angus Kong <shkong@google.com> |
Introducing new architect. Change-Id: Iedcc7c264d66a933725fae73eb00c70cc544db8c
rc/com/android/camera/app/AppController.java
rc/com/android/camera/module/ModuleController.java
|
23f4d40f6d8800b293360f8c7f840d3f7ab041ed |
06-Nov-2013 |
Sascha Haeberling <haeberling@google.com> |
Don't crash Photo Sphere on back button press in filmstrip. Bug: 11554580 Change-Id: I983713eecbd6f13bd90f94b24a0fa1ecc26e1c56
rc/com/android/camera/SurfaceTextureRenderer.java
|
bc54d2b38f9a8587dbde362b111b1a47ec658c0e |
07-Nov-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I8d30a3739e39a85e03e51cb7d06ea1cd2a6a5504 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-km-rKH/strings.xml
es/values-ko/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mn-rMN/strings.xml
es/values-ms-rMY/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
a92562e92e79667defa85ccea6ea3142a78cb014 |
07-Nov-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I89b964b8ab69359b791eac89bf99b8d518678e27 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-km-rKH/strings.xml
es/values-ko/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mn-rMN/strings.xml
es/values-ms-rMY/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
02cb16c0ae3e371b8e325f415fd439b3ee3ab997 |
07-Nov-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I2d3933ee8b37cd144abd266a73ce90c633c53ef8 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-km-rKH/strings.xml
es/values-ko/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mn-rMN/strings.xml
es/values-ms-rMY/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
17f1e65142df55ebccfa30720cd1265f9ab67e96 |
06-Nov-2013 |
ztenghui <ztenghui@google.com> |
Decouple the visibility check for system UI from action bar And make sure we toggle system UI when reload. bug:11539377 Change-Id: I4d251557c1d68a173cabb652e0beaa3ee89cb6f0
rc/com/android/camera/CameraActivity.java
|
ef339df93d7013a8e03c57c586d2206c0855c5f2 |
06-Nov-2013 |
Sascha Haeberling <haeberling@google.com> |
am 107e93ee: am eb605b4a: Don\'t crash Photo Sphere on back button press in filmstrip. * commit '107e93eee2a3c48e20c17a8a55b4ff5f5c2ebd46': Don't crash Photo Sphere on back button press in filmstrip.
|
107e93eee2a3c48e20c17a8a55b4ff5f5c2ebd46 |
06-Nov-2013 |
Sascha Haeberling <haeberling@google.com> |
am eb605b4a: Don\'t crash Photo Sphere on back button press in filmstrip. * commit 'eb605b4a27be212915db5bc23e9a82b857036a1c': Don't crash Photo Sphere on back button press in filmstrip.
|
278c75c5ed7c059733230685cc81873bdf446ab9 |
06-Nov-2013 |
Sascha Haeberling <haeberling@google.com> |
am eb605b4a: Don\'t crash Photo Sphere on back button press in filmstrip. * commit 'eb605b4a27be212915db5bc23e9a82b857036a1c': Don't crash Photo Sphere on back button press in filmstrip.
|
eb605b4a27be212915db5bc23e9a82b857036a1c |
06-Nov-2013 |
Sascha Haeberling <haeberling@google.com> |
Don't crash Photo Sphere on back button press in filmstrip. Bug: 11554580 Change-Id: I983713eecbd6f13bd90f94b24a0fa1ecc26e1c56
rc/com/android/camera/SurfaceTextureRenderer.java
|
f82f66c1fcc8f9f21f00fdf8e83f58c3e1869519 |
06-Nov-2013 |
ztenghui <ztenghui@google.com> |
am 970cd50b: am 189bfea2: Merge "Fix the RTL layout in the app\'s manifest." into gb-ub-photos-carlsbad * commit '970cd50b34a40121363615f1c33816340d84c1e3': Fix the RTL layout in the app's manifest.
|
970cd50b34a40121363615f1c33816340d84c1e3 |
06-Nov-2013 |
ztenghui <ztenghui@google.com> |
am 189bfea2: Merge "Fix the RTL layout in the app\'s manifest." into gb-ub-photos-carlsbad * commit '189bfea2c8fd3374aac99f4c18cda357fcf2a371': Fix the RTL layout in the app's manifest.
|
09cd7147c5d9e6575d52d46e323362d2665bc523 |
06-Nov-2013 |
ztenghui <ztenghui@google.com> |
am 189bfea2: Merge "Fix the RTL layout in the app\'s manifest." into gb-ub-photos-carlsbad * commit '189bfea2c8fd3374aac99f4c18cda357fcf2a371': Fix the RTL layout in the app's manifest.
|
189bfea2c8fd3374aac99f4c18cda357fcf2a371 |
06-Nov-2013 |
ztenghui <ztenghui@google.com> |
Merge "Fix the RTL layout in the app's manifest." into gb-ub-photos-carlsbad
|
dffe3cb681048e2a29c9da331dc0180a730232f8 |
06-Nov-2013 |
Erin Dahlgren <edahlgren@google.com> |
am f41109d8: am 98254270: Merge "Make image editor intent general." into gb-ub-photos-carlsbad * commit 'f41109d8d15e63399fb3331e577da218a3300d5d': Make image editor intent general.
|
bb1b88be8289f3f60f98b13efaba2518ebb2169a |
06-Nov-2013 |
Erin Dahlgren <edahlgren@google.com> |
am 98254270: Merge "Make image editor intent general." into gb-ub-photos-carlsbad * commit '982542701ef5737456f5ee204684a36620db5475': Make image editor intent general.
|
f41109d8d15e63399fb3331e577da218a3300d5d |
06-Nov-2013 |
Erin Dahlgren <edahlgren@google.com> |
am 98254270: Merge "Make image editor intent general." into gb-ub-photos-carlsbad * commit '982542701ef5737456f5ee204684a36620db5475': Make image editor intent general.
|
982542701ef5737456f5ee204684a36620db5475 |
06-Nov-2013 |
Erin Dahlgren <edahlgren@google.com> |
Merge "Make image editor intent general." into gb-ub-photos-carlsbad
|
e0aace02dfc5f004ed6c44b609b7013e07321a97 |
06-Nov-2013 |
The Android Automerger <android-build@google.com> |
merge in klp-mr1-release history after reset to klp-dev
|
4fc8f6bd5877189a9e65859a6b742e4b496e3d7a |
06-Nov-2013 |
Alan Newberger <alann@google.com> |
am 6fddfed2: am 2bcb8d1f: add \'capturing\' string for in process indicators * commit '6fddfed299cc4b8227f534d3ca2679670e1737bb': add 'capturing' string for in process indicators
|
8a239c8d19fca870919ff5dff7cf157cb9c35037 |
06-Nov-2013 |
Alan Newberger <alann@google.com> |
am 2bcb8d1f: add \'capturing\' string for in process indicators * commit '2bcb8d1ff1c448d4c22e9172f2bb83839d1759cb': add 'capturing' string for in process indicators
|
6fddfed299cc4b8227f534d3ca2679670e1737bb |
06-Nov-2013 |
Alan Newberger <alann@google.com> |
am 2bcb8d1f: add \'capturing\' string for in process indicators * commit '2bcb8d1ff1c448d4c22e9172f2bb83839d1759cb': add 'capturing' string for in process indicators
|
2bcb8d1ff1c448d4c22e9172f2bb83839d1759cb |
06-Nov-2013 |
Alan Newberger <alann@google.com> |
add 'capturing' string for in process indicators This string can be used for in progess screen indicators. Bug: 11505806 Change-Id: I3b0e3809b8389cfea2059b239d09a3e0766a77c6
es/values/strings.xml
|
f486de462d31643a855fa2481109f7aff8b80b3e |
06-Nov-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am d37b3039: am bb8a79f3: am 998f49eb: am 404d7eb0: Merge "camera: Ensure camera release for lockscreen transition." into gb-ub-photos-carlsbad * commit 'd37b303959e43d518405226c389231f7bb3927e6': camera: Ensure camera release for lockscreen transition.
|
d37b303959e43d518405226c389231f7bb3927e6 |
06-Nov-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am bb8a79f3: am 998f49eb: am 404d7eb0: Merge "camera: Ensure camera release for lockscreen transition." into gb-ub-photos-carlsbad * commit 'bb8a79f370b1f9ef7d1b5d66d23f8599b35c0ac8': camera: Ensure camera release for lockscreen transition.
|
bb8a79f370b1f9ef7d1b5d66d23f8599b35c0ac8 |
06-Nov-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 998f49eb: am 404d7eb0: Merge "camera: Ensure camera release for lockscreen transition." into gb-ub-photos-carlsbad * commit '998f49ebaee778df6395ecdcc15bce1dcd0124fc': camera: Ensure camera release for lockscreen transition.
|
998f49ebaee778df6395ecdcc15bce1dcd0124fc |
06-Nov-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 404d7eb0: Merge "camera: Ensure camera release for lockscreen transition." into gb-ub-photos-carlsbad * commit '404d7eb0029e1dcb94d38b0595fdd84345207b0a': camera: Ensure camera release for lockscreen transition.
|
6eec93c996c10fcd9cffb87674fe3dc63e38b455 |
06-Nov-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 404d7eb0: Merge "camera: Ensure camera release for lockscreen transition." into gb-ub-photos-carlsbad * commit '404d7eb0029e1dcb94d38b0595fdd84345207b0a': camera: Ensure camera release for lockscreen transition.
|
404d7eb0029e1dcb94d38b0595fdd84345207b0a |
06-Nov-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "camera: Ensure camera release for lockscreen transition." into gb-ub-photos-carlsbad
|
37c1b3ea4546e6457a335f6550eb7bc4dc566077 |
06-Nov-2013 |
Doris Liu <tianliu@google.com> |
am 4d2c4c02: am f71d895f: am bb9e67ec: am d1b4ab3e: Merge "Make sure preview aspect ratio is updated" into gb-ub-photos-carlsbad * commit '4d2c4c02e6931a14476f048e35eb522cf2dc20f0': Make sure preview aspect ratio is updated
|
4d2c4c02e6931a14476f048e35eb522cf2dc20f0 |
06-Nov-2013 |
Doris Liu <tianliu@google.com> |
am f71d895f: am bb9e67ec: am d1b4ab3e: Merge "Make sure preview aspect ratio is updated" into gb-ub-photos-carlsbad * commit 'f71d895fb1b7ac9096b1c9bf9beab8d1cd07404b': Make sure preview aspect ratio is updated
|
f71d895fb1b7ac9096b1c9bf9beab8d1cd07404b |
06-Nov-2013 |
Doris Liu <tianliu@google.com> |
am bb9e67ec: am d1b4ab3e: Merge "Make sure preview aspect ratio is updated" into gb-ub-photos-carlsbad * commit 'bb9e67ece44a97539440ab41ce6cac05b5dc7107': Make sure preview aspect ratio is updated
|
bb9e67ece44a97539440ab41ce6cac05b5dc7107 |
06-Nov-2013 |
Doris Liu <tianliu@google.com> |
am d1b4ab3e: Merge "Make sure preview aspect ratio is updated" into gb-ub-photos-carlsbad * commit 'd1b4ab3e3899ed4ee1d5c90f124db0a6748cc3a4': Make sure preview aspect ratio is updated
|
a08c5ea78279f2b2a326097ee134f30ab47ec8ee |
06-Nov-2013 |
Doris Liu <tianliu@google.com> |
am d1b4ab3e: Merge "Make sure preview aspect ratio is updated" into gb-ub-photos-carlsbad * commit 'd1b4ab3e3899ed4ee1d5c90f124db0a6748cc3a4': Make sure preview aspect ratio is updated
|
d1b4ab3e3899ed4ee1d5c90f124db0a6748cc3a4 |
06-Nov-2013 |
Doris Liu <tianliu@google.com> |
Merge "Make sure preview aspect ratio is updated" into gb-ub-photos-carlsbad
|
c883a30eff16435909471874d2106acbb63eba03 |
06-Nov-2013 |
Erin Dahlgren <edahlgren@google.com> |
Make image editor intent general. Bug: 11372979 Change-Id: I7649eb995fbd78f9b29c76da777aca83777c49fc
rc/com/android/camera/CameraActivity.java
|
3b808d068f7cc83c6fbaa15dd609d6bdd8259599 |
06-Nov-2013 |
Baligh Uddin <baligh@google.com> |
am 42b4a018: (-s ours) am 19107fdb: (-s ours) am 29b0a905: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '42b4a018584f9f75ad6cd87f242e1417950cd5a0': Import translations. DO NOT MERGE
|
5914783e3f0a1c1c5581361cbf6e0d9ab2cf789d |
06-Nov-2013 |
Ruben Brunk <rubenbrunk@google.com> |
camera: Ensure camera release for lockscreen transition. Bug: 11063890 Change-Id: Iec7fb672571166ee5a560a8245b56affa627e88b
rc/com/android/camera/PhotoModule.java
|
42b4a018584f9f75ad6cd87f242e1417950cd5a0 |
06-Nov-2013 |
Baligh Uddin <baligh@google.com> |
am 19107fdb: (-s ours) am 29b0a905: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '19107fdb1f1c831b6fba7bae08c69c30231db033': Import translations. DO NOT MERGE
|
3ec8d21ae9f687ed213f7b2818e1b8758741689d |
06-Nov-2013 |
ztenghui <ztenghui@google.com> |
Fix the RTL layout in the app's manifest. At the same time, make sure the bottom controls are following RTL rules. bug:11481090 Change-Id: I52262aece7c16c194b6419150c1d4c13abff4f2d
ndroidManifest.xml
es/layout/filmstrip_bottom_controls.xml
|
95405749e5a96ff680b9bcafbfe2bab33c16e1ee |
06-Nov-2013 |
Doris Liu <tianliu@google.com> |
Make sure preview aspect ratio is updated Bug: 11509233 Change-Id: Ide6f5bbe0abe7ed45e56b3f34c19204c1294afc7
rc/com/android/camera/PhotoModule.java
|
19107fdb1f1c831b6fba7bae08c69c30231db033 |
06-Nov-2013 |
Baligh Uddin <baligh@google.com> |
am 29b0a905: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '29b0a9053263d87398e615ba779e3ac9db7f898e': Import translations. DO NOT MERGE
|
6e7d83f531d51585ed0ed37b1ad910285a9e5a86 |
06-Nov-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE"
|
29b0a9053263d87398e615ba779e3ac9db7f898e |
06-Nov-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into klp-dev
|
afd086539aed0ba7c8b6287788f0615062647d85 |
06-Nov-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-denali
|
0c407b83f5b233f48f7e1a9cffec93b283e8efa2 |
05-Nov-2013 |
Alan Newberger <alann@google.com> |
am d7c174fb: am 32056926: am ff41c047: am bf4ce93c: Merge "adjust keyguard camera layout to make buttons match" into gb-ub-photos-carlsbad * commit 'd7c174fbef4048e70766fc671867d674baf101e5': adjust keyguard camera layout to make buttons match
|
de83f412c5741f210ef7782e3b54b13c79e6345f |
05-Nov-2013 |
Doris Liu <tianliu@google.com> |
am 725dc526: am b56d49b1: am 52086855: am 3493ba2a: Merge "Preserve high resolution image on touch during zoom" into gb-ub-photos-carlsbad * commit '725dc526fe501dd4ac57d2ee3910e16b5d1371b9': Preserve high resolution image on touch during zoom
|
1217e8408f6083924de292f534507705ad9307b7 |
05-Nov-2013 |
Alan Newberger <alann@google.com> |
am 4e17ec56: am 07acdd2f: am ade5bb1d: am 7f044e2e: Merge "Adjust HDR options menu details" into gb-ub-photos-carlsbad * commit '4e17ec5654efa550da1efd82d00995889df5ddf1': Adjust HDR options menu details
|
0fe6170b5da275ea79cc6c10e1fb6d22a0e9dfe3 |
05-Nov-2013 |
Sascha Haeberling <haeberling@google.com> |
am c9bb52c8: am 9ac245ed: am fecd573a: am ba1b30b7: Check for media service being present before capture. * commit 'c9bb52c8f26f7f9800649716816aae55131c46c8': Check for media service being present before capture.
|
25d90f4fd453f2ca9783d8429adf147354efb772 |
05-Nov-2013 |
The Android Automerger <android-build@google.com> |
merge in klp-mr1-release history after reset to klp-dev
|
d7c174fbef4048e70766fc671867d674baf101e5 |
05-Nov-2013 |
Alan Newberger <alann@google.com> |
am 32056926: am ff41c047: am bf4ce93c: Merge "adjust keyguard camera layout to make buttons match" into gb-ub-photos-carlsbad * commit '32056926d4973610e0f17bc27228c71b109c01c9': adjust keyguard camera layout to make buttons match
|
725dc526fe501dd4ac57d2ee3910e16b5d1371b9 |
05-Nov-2013 |
Doris Liu <tianliu@google.com> |
am b56d49b1: am 52086855: am 3493ba2a: Merge "Preserve high resolution image on touch during zoom" into gb-ub-photos-carlsbad * commit 'b56d49b196d4881ffe519eb06b401d62a7a9dbcd': Preserve high resolution image on touch during zoom
|
4e17ec5654efa550da1efd82d00995889df5ddf1 |
05-Nov-2013 |
Alan Newberger <alann@google.com> |
am 07acdd2f: am ade5bb1d: am 7f044e2e: Merge "Adjust HDR options menu details" into gb-ub-photos-carlsbad * commit '07acdd2f2f9fa7053803e61918e433e7a8d6cd64': Adjust HDR options menu details
|
c9bb52c8f26f7f9800649716816aae55131c46c8 |
05-Nov-2013 |
Sascha Haeberling <haeberling@google.com> |
am 9ac245ed: am fecd573a: am ba1b30b7: Check for media service being present before capture. * commit '9ac245ed02a791d5eb24d93f175e3468ce7ac2a9': Check for media service being present before capture.
|
deb5a164ef6df2e6b2cd9dbd57d21dbd2ebac116 |
05-Nov-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ica4803baeff68fde60931196ec633d0c15f4313c Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-km-rKH/strings.xml
es/values-ko/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mn-rMN/strings.xml
es/values-ms-rMY/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
45f1ed524ad37a6dc2e4fc7670840e7b03640491 |
05-Nov-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I0f4b4f2b969168513e77763bcd64027fc2a67445 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-km-rKH/strings.xml
es/values-ko/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mn-rMN/strings.xml
es/values-ms-rMY/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
a9a147944c04e0205fe4f9523a9b8471de467752 |
05-Nov-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I946c69304a4b8cbf2c8260dd5491c0e5370bf191 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-km-rKH/strings.xml
es/values-ko/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mn-rMN/strings.xml
es/values-ms-rMY/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
32056926d4973610e0f17bc27228c71b109c01c9 |
05-Nov-2013 |
Alan Newberger <alann@google.com> |
am ff41c047: am bf4ce93c: Merge "adjust keyguard camera layout to make buttons match" into gb-ub-photos-carlsbad * commit 'ff41c047ccbb3f4069f2ce21f22cb452bf2d5aeb': adjust keyguard camera layout to make buttons match
|
f4b1d4a7501e838b5b5e41c4c36aaf12dd4493ca |
04-Nov-2013 |
Alan Newberger <alann@google.com> |
am bf4ce93c: Merge "adjust keyguard camera layout to make buttons match" into gb-ub-photos-carlsbad * commit 'bf4ce93c84400357a28f78a76df62b550e7f85d1': adjust keyguard camera layout to make buttons match
|
ff41c047ccbb3f4069f2ce21f22cb452bf2d5aeb |
04-Nov-2013 |
Alan Newberger <alann@google.com> |
am bf4ce93c: Merge "adjust keyguard camera layout to make buttons match" into gb-ub-photos-carlsbad * commit 'bf4ce93c84400357a28f78a76df62b550e7f85d1': adjust keyguard camera layout to make buttons match
|
bf4ce93c84400357a28f78a76df62b550e7f85d1 |
04-Nov-2013 |
Alan Newberger <alann@google.com> |
Merge "adjust keyguard camera layout to make buttons match" into gb-ub-photos-carlsbad
|
d0d3c4845bef94bb91e0c346c0f0048ba06be309 |
04-Nov-2013 |
Sascha Haeberling <haeberling@google.com> |
Check for media service being present before capture. Bug: 11508325 Change-Id: I0997f9bff63b1cdb3c33272acc8617b30c07424a
rc/com/android/camera/PhotoModule.java
|
b56d49b196d4881ffe519eb06b401d62a7a9dbcd |
04-Nov-2013 |
Doris Liu <tianliu@google.com> |
am 52086855: am 3493ba2a: Merge "Preserve high resolution image on touch during zoom" into gb-ub-photos-carlsbad * commit '5208685539ff1078c125637f76f8bcb708b3d2b2': Preserve high resolution image on touch during zoom
|
07ae1ad139e3f32892b177801b998d5a333436f2 |
04-Nov-2013 |
Doris Liu <tianliu@google.com> |
am 3493ba2a: Merge "Preserve high resolution image on touch during zoom" into gb-ub-photos-carlsbad * commit '3493ba2a0a2e91a093c5fddad60bc1f1e56b91b5': Preserve high resolution image on touch during zoom
|
5208685539ff1078c125637f76f8bcb708b3d2b2 |
04-Nov-2013 |
Doris Liu <tianliu@google.com> |
am 3493ba2a: Merge "Preserve high resolution image on touch during zoom" into gb-ub-photos-carlsbad * commit '3493ba2a0a2e91a093c5fddad60bc1f1e56b91b5': Preserve high resolution image on touch during zoom
|
07acdd2f2f9fa7053803e61918e433e7a8d6cd64 |
04-Nov-2013 |
Alan Newberger <alann@google.com> |
am ade5bb1d: am 7f044e2e: Merge "Adjust HDR options menu details" into gb-ub-photos-carlsbad * commit 'ade5bb1dbd60bb8b452641de664f0b08bc32b976': Adjust HDR options menu details
|
3493ba2a0a2e91a093c5fddad60bc1f1e56b91b5 |
04-Nov-2013 |
Doris Liu <tianliu@google.com> |
Merge "Preserve high resolution image on touch during zoom" into gb-ub-photos-carlsbad
|
23f6209759ff2ccb3750784fa0443d15a773bd90 |
04-Nov-2013 |
Alan Newberger <alann@google.com> |
am 7f044e2e: Merge "Adjust HDR options menu details" into gb-ub-photos-carlsbad * commit '7f044e2eb182f1d1ae023d55f30757439a17ee09': Adjust HDR options menu details
|
ade5bb1dbd60bb8b452641de664f0b08bc32b976 |
04-Nov-2013 |
Alan Newberger <alann@google.com> |
am 7f044e2e: Merge "Adjust HDR options menu details" into gb-ub-photos-carlsbad * commit '7f044e2eb182f1d1ae023d55f30757439a17ee09': Adjust HDR options menu details
|
7f044e2eb182f1d1ae023d55f30757439a17ee09 |
04-Nov-2013 |
Alan Newberger <alann@google.com> |
Merge "Adjust HDR options menu details" into gb-ub-photos-carlsbad
|
5e40933386fa5e4eb56a86f4e43af5724092e667 |
04-Nov-2013 |
Alan Newberger <alann@google.com> |
Adjust HDR options menu details To better align HDR/HDR+ menu options with other menu options, shortening the description and making it all caps. Bug: 11481286 Change-Id: I05ddb3594d1680b11259f128cc1e4aa7954892f8
es/values/strings.xml
|
b0288ec84e06b83923180a04e1b546724fcfd258 |
04-Nov-2013 |
Doris Liu <tianliu@google.com> |
Preserve high resolution image on touch during zoom Bug: 11477449 Change-Id: I08b33cee258de1f90e5fa60e6483834dd5197bd2
rc/com/android/camera/ui/FilmStripView.java
|
9ac245ed02a791d5eb24d93f175e3468ce7ac2a9 |
04-Nov-2013 |
Sascha Haeberling <haeberling@google.com> |
am fecd573a: am ba1b30b7: Check for media service being present before capture. * commit 'fecd573afe7f2c7a098cbd532b866f6fe9ffcfc2': Check for media service being present before capture.
|
fecd573afe7f2c7a098cbd532b866f6fe9ffcfc2 |
04-Nov-2013 |
Sascha Haeberling <haeberling@google.com> |
am ba1b30b7: Check for media service being present before capture. * commit 'ba1b30b7793a8a881493a9fc48f27d503db2405b': Check for media service being present before capture.
|
192958df23013627d81d34e1d7b8f33eda5e232d |
04-Nov-2013 |
Sascha Haeberling <haeberling@google.com> |
am ba1b30b7: Check for media service being present before capture. * commit 'ba1b30b7793a8a881493a9fc48f27d503db2405b': Check for media service being present before capture.
|
ba1b30b7793a8a881493a9fc48f27d503db2405b |
04-Nov-2013 |
Sascha Haeberling <haeberling@google.com> |
Check for media service being present before capture. Bug: 11508325 Change-Id: I0997f9bff63b1cdb3c33272acc8617b30c07424a
rc/com/android/camera/PhotoModule.java
|
03e0145861f790b633118dfc1d53ff89160c193a |
07-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
Add Refocus module. Bug: 10073814 Change-Id: Ibeeeaa6627dce77034f2786040fb3be8e0c19da9
es/drawable-xhdpi/ic_switch_refocus.png
es/mipmap-xxxhdpi/ic_launcher_camera.png
es/values/strings.xml
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/ui/ModuleSwitcher.java
rc_pd/com/android/camera/util/RefocusHelper.java
|
7f18027e271253b4eb3ef1b36458be78b7ed5f12 |
02-Nov-2013 |
Baligh Uddin <baligh@google.com> |
Merge remote-tracking branch 'origin/kitkat-dev'
|
58d56fa817cec5f973eaf26e8197c1d317b6093d |
01-Nov-2013 |
Alan Newberger <alann@google.com> |
am 14fbb56f: am dd5fe0f1: am 1e8e8cec: am ccfafd95: Merge "Add Samsung front camera resolutions" into gb-ub-photos-carlsbad * commit '14fbb56f1b148c2c9e1ca901b58e62bd271542e7': Add Samsung front camera resolutions
|
14fbb56f1b148c2c9e1ca901b58e62bd271542e7 |
01-Nov-2013 |
Alan Newberger <alann@google.com> |
am dd5fe0f1: am 1e8e8cec: am ccfafd95: Merge "Add Samsung front camera resolutions" into gb-ub-photos-carlsbad * commit 'dd5fe0f145e348365e6ca454f67ed969adbaec9e': Add Samsung front camera resolutions
|
dd5fe0f145e348365e6ca454f67ed969adbaec9e |
01-Nov-2013 |
Alan Newberger <alann@google.com> |
am 1e8e8cec: am ccfafd95: Merge "Add Samsung front camera resolutions" into gb-ub-photos-carlsbad * commit '1e8e8cecd02b98c261c7b2fd267f8846dbe90c03': Add Samsung front camera resolutions
|
c807b411a7c7e6854e237497c81b2af8c6d534da |
01-Nov-2013 |
Alan Newberger <alann@google.com> |
am ccfafd95: Merge "Add Samsung front camera resolutions" into gb-ub-photos-carlsbad * commit 'ccfafd95cd4fa046df9d43469d28152f8a04bfed': Add Samsung front camera resolutions
|
1e8e8cecd02b98c261c7b2fd267f8846dbe90c03 |
01-Nov-2013 |
Alan Newberger <alann@google.com> |
am ccfafd95: Merge "Add Samsung front camera resolutions" into gb-ub-photos-carlsbad * commit 'ccfafd95cd4fa046df9d43469d28152f8a04bfed': Add Samsung front camera resolutions
|
ccfafd95cd4fa046df9d43469d28152f8a04bfed |
01-Nov-2013 |
Alan Newberger <alann@google.com> |
Merge "Add Samsung front camera resolutions" into gb-ub-photos-carlsbad
|
8c686011a46f56040f76cf551e69f82eb8c1d3cb |
04-Jun-2013 |
Michael Kolb <kolby@google.com> |
Add Samsung front camera resolutions Bug: 11462711 Bug: 9275928 Change-Id: Ibe6bc8af214eab1fc5f4119823d32ef7876288f5
es/values/arrays.xml
es/values/strings.xml
|
159fe1a07f3ffae8e32262995dbcccebad477f2a |
01-Nov-2013 |
Sascha Haeberling <haeberling@google.com> |
am 693bec84: am 1ff5923f: am d07f6ac0: am 238d6ec7: Add new notification icon. * commit '693bec84a418e693181ee3fe711481e3497f7ae6': Add new notification icon.
|
693bec84a418e693181ee3fe711481e3497f7ae6 |
01-Nov-2013 |
Sascha Haeberling <haeberling@google.com> |
am 1ff5923f: am d07f6ac0: am 238d6ec7: Add new notification icon. * commit '1ff5923fbf4c4806d80c36109c9e7161f548a8a2': Add new notification icon.
|
1ff5923fbf4c4806d80c36109c9e7161f548a8a2 |
01-Nov-2013 |
Sascha Haeberling <haeberling@google.com> |
am d07f6ac0: am 238d6ec7: Add new notification icon. * commit 'd07f6ac064ee13b8da9539884309d47af9a07f91': Add new notification icon.
|
e5f3d6aa778fb4113b2af5327ac17e2bc5e40774 |
01-Nov-2013 |
Sascha Haeberling <haeberling@google.com> |
am 238d6ec7: Add new notification icon. * commit '238d6ec7a9a7a33ceeb5de9cd0dd22cea6a1bff7': Add new notification icon.
|
d07f6ac064ee13b8da9539884309d47af9a07f91 |
01-Nov-2013 |
Sascha Haeberling <haeberling@google.com> |
am 238d6ec7: Add new notification icon. * commit '238d6ec7a9a7a33ceeb5de9cd0dd22cea6a1bff7': Add new notification icon.
|
238d6ec7a9a7a33ceeb5de9cd0dd22cea6a1bff7 |
01-Nov-2013 |
Sascha Haeberling <haeberling@google.com> |
Add new notification icon. Bug: 11417480 Change-Id: I072a1348d515b2cd435748e2db2824e98a604413
es/drawable-hdpi/ic_notification.png
es/drawable-mdpi/ic_notification.png
es/drawable-xhdpi/ic_notification.png
es/drawable-xxhdpi/ic_notification.png
|
d0511c1ceb290a95a4d297b95f030f3c598afb95 |
01-Nov-2013 |
Baligh Uddin <baligh@google.com> |
am bc19c633: (-s ours) am 035174b3: (-s ours) am eb224748: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit 'bc19c6335fd92293686eea79229bfae5ccd9a113': Import translations. DO NOT MERGE
|
bc19c6335fd92293686eea79229bfae5ccd9a113 |
01-Nov-2013 |
Baligh Uddin <baligh@google.com> |
am 035174b3: (-s ours) am eb224748: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '035174b358a16a18eb985c285b2ca4a3fd8a3a77': Import translations. DO NOT MERGE
|
035174b358a16a18eb985c285b2ca4a3fd8a3a77 |
01-Nov-2013 |
Baligh Uddin <baligh@google.com> |
am eb224748: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit 'eb224748d60ce2d0a7c7d8548eae870fa26c711f': Import translations. DO NOT MERGE
|
73bd8255662d8f5dcb46935e61b470c37528a9c7 |
01-Nov-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE"
|
eb224748d60ce2d0a7c7d8548eae870fa26c711f |
01-Nov-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into klp-dev
|
da665abdb5735231744536c635e8c7c1784caad2 |
01-Nov-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-denali
|
abd7a4d8ea11f72e2b6caa45d4ee8bb93af29ae3 |
31-Oct-2013 |
Erin Dahlgren <edahlgren@google.com> |
Merge "Revert smart camera interface to the PhotoModule: ag/356625" into gb-ub-photos-denali
|
cb0f9f0f6fad0c52e0e120715b4df50675589456 |
31-Oct-2013 |
Erin Dahlgren <edahlgren@google.com> |
Revert smart camera interface to the PhotoModule: ag/356625 Bug: 11462288 Change-Id: I6a9dba0d749c7b8c0127ad6bce9ad38aca52715d
rc/com/android/camera/PhotoModule.java
|
e9535bc99f33f4ee5fce5afcc6546b067393e091 |
31-Oct-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am dc06cfbb: am 74c47a95: am f5230ffd: am 6ff701f5: Merge "gcam: Add generic preview fps range selection." into gb-ub-photos-carlsbad * commit 'dc06cfbbe835e9b8e448b64e83d94528893bce25': gcam: Add generic preview fps range selection.
|
dc06cfbbe835e9b8e448b64e83d94528893bce25 |
31-Oct-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 74c47a95: am f5230ffd: am 6ff701f5: Merge "gcam: Add generic preview fps range selection." into gb-ub-photos-carlsbad * commit '74c47a95b929d3713d42aee7c68a2daf2a770b00': gcam: Add generic preview fps range selection.
|
74c47a95b929d3713d42aee7c68a2daf2a770b00 |
31-Oct-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am f5230ffd: am 6ff701f5: Merge "gcam: Add generic preview fps range selection." into gb-ub-photos-carlsbad * commit 'f5230ffdd2e2894b8c5912283de579778f8d3c05': gcam: Add generic preview fps range selection.
|
f5230ffdd2e2894b8c5912283de579778f8d3c05 |
31-Oct-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 6ff701f5: Merge "gcam: Add generic preview fps range selection." into gb-ub-photos-carlsbad * commit '6ff701f5c8744583a73588f301374ff7e683ff15': gcam: Add generic preview fps range selection.
|
f84e775f7add86ab488309cdeb324c5cbdb285f5 |
31-Oct-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 6ff701f5: Merge "gcam: Add generic preview fps range selection." into gb-ub-photos-carlsbad * commit '6ff701f5c8744583a73588f301374ff7e683ff15': gcam: Add generic preview fps range selection.
|
6ff701f5c8744583a73588f301374ff7e683ff15 |
31-Oct-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "gcam: Add generic preview fps range selection." into gb-ub-photos-carlsbad
|
aa7ccfa6137c5aa6b58a3cda9d4df4e060ae11d1 |
31-Oct-2013 |
Baligh Uddin <baligh@google.com> |
Initial empty repository
|
cf3b243fb36d6ef67030fd8d832ea83b6484eead |
30-Oct-2013 |
Alan Newberger <alann@google.com> |
am 3dd5f10c: am 4f78acab: am c0dd6624: am 761306fa: Remove CameraUtil.launchGallery, ensure SecureCamera uses Gallery up icon * commit '3dd5f10cd5e0ed7566fa3c16db3fc70d638047ef': Remove CameraUtil.launchGallery, ensure SecureCamera uses Gallery up icon
|
3dd5f10cd5e0ed7566fa3c16db3fc70d638047ef |
30-Oct-2013 |
Alan Newberger <alann@google.com> |
am 4f78acab: am c0dd6624: am 761306fa: Remove CameraUtil.launchGallery, ensure SecureCamera uses Gallery up icon * commit '4f78acab15d2a1fb3b81fa73beee179955c1e2c4': Remove CameraUtil.launchGallery, ensure SecureCamera uses Gallery up icon
|
4f78acab15d2a1fb3b81fa73beee179955c1e2c4 |
30-Oct-2013 |
Alan Newberger <alann@google.com> |
am c0dd6624: am 761306fa: Remove CameraUtil.launchGallery, ensure SecureCamera uses Gallery up icon * commit 'c0dd6624e7885567e89a8c42343b34376b748fda': Remove CameraUtil.launchGallery, ensure SecureCamera uses Gallery up icon
|
249a7f7cdfc3a0a92b2e91cb06b7d48a90d7ffc0 |
30-Oct-2013 |
Alan Newberger <alann@google.com> |
am 761306fa: Remove CameraUtil.launchGallery, ensure SecureCamera uses Gallery up icon * commit '761306fadfa94b538f43e8cf3463bf6d22814947': Remove CameraUtil.launchGallery, ensure SecureCamera uses Gallery up icon
|
c0dd6624e7885567e89a8c42343b34376b748fda |
30-Oct-2013 |
Alan Newberger <alann@google.com> |
am 761306fa: Remove CameraUtil.launchGallery, ensure SecureCamera uses Gallery up icon * commit '761306fadfa94b538f43e8cf3463bf6d22814947': Remove CameraUtil.launchGallery, ensure SecureCamera uses Gallery up icon
|
761306fadfa94b538f43e8cf3463bf6d22814947 |
30-Oct-2013 |
Alan Newberger <alann@google.com> |
Remove CameraUtil.launchGallery, ensure SecureCamera uses Gallery up icon CameraUtil.launchGallery incorrectly describes a mechanism to call an APP_GALLERY category intent. Since we're using Gallery icon we should go direct to Gallery, which IntentHelper already does. Simply removed the util class and call the helper direct from the activity. Also noticed during testing that the SecureCamera was not correctly showing the Gallery icon, though its behavior would take user to Gallery. Finally, removing restriction that the video player intent should go to Gallery, instead it should route to system preferred intent. Bug: 11065256 Change-Id: I941f9469de169919c4bac6c91dde7e577921f737
ndroidManifest.xml
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/util/CameraUtil.java
rc_pd/com/android/camera/util/IntentHelper.java
|
040f16b1c6ed30dd5d2606a6370603fd0db1a199 |
30-Oct-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I1cf114c70fbacbf925a22c9dc537f99e27e79c18 Auto-generated-cl: translation import
es/values-ar/strings.xml
es/values-fa/strings.xml
es/values-iw/strings.xml
|
e3daf3fb15fcaa6fcbe434780ec9233a99e71946 |
30-Oct-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I87da2fbfde7c44784a1597a7158dd385ce65d21a Auto-generated-cl: translation import
es/values-ar/strings.xml
es/values-fa/strings.xml
es/values-iw/strings.xml
|
b7f9cbcf62643548080832aa1e61a7657401ee87 |
30-Oct-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I36ecef0951ee15fce67df4723c6e1fa97240b8be Auto-generated-cl: translation import
es/values-ar/strings.xml
es/values-fa/strings.xml
es/values-iw/strings.xml
|
2a74dfd414217d9a774e0bf95c5991daa5f53e4c |
30-Oct-2013 |
Ruben Brunk <rubenbrunk@google.com> |
gcam: Add generic preview fps range selection. Bug: 11433097 Change-Id: Ice0f7ad3cd0684183298ce03bab3038a41316cf6
rc/com/android/camera/util/CameraUtil.java
|
4513e0d588d1c1dbd51fa51ce1f98daef783b861 |
30-Oct-2013 |
Andy Huibers <andyhuibers@google.com> |
am 0d3a8663: am 8b639c63: am fabdb282: am cec75e40: Fix rotation bug for animated thumbnail shown after capture. * commit '0d3a8663efa63800bf88160548fc660d2d81afaf': Fix rotation bug for animated thumbnail shown after capture.
|
0d3a8663efa63800bf88160548fc660d2d81afaf |
30-Oct-2013 |
Andy Huibers <andyhuibers@google.com> |
am 8b639c63: am fabdb282: am cec75e40: Fix rotation bug for animated thumbnail shown after capture. * commit '8b639c63e21d240a52b497fe13dcddc672af9ab7': Fix rotation bug for animated thumbnail shown after capture.
|
8b639c63e21d240a52b497fe13dcddc672af9ab7 |
30-Oct-2013 |
Andy Huibers <andyhuibers@google.com> |
am fabdb282: am cec75e40: Fix rotation bug for animated thumbnail shown after capture. * commit 'fabdb282b969118e1c3d094ed023fa57af03c66e': Fix rotation bug for animated thumbnail shown after capture.
|
1591dea20c40f2652f66763a200a054a36765e7d |
30-Oct-2013 |
Andy Huibers <andyhuibers@google.com> |
am cec75e40: Fix rotation bug for animated thumbnail shown after capture. * commit 'cec75e408a2d451b90bac5f06e10906ffcafff33': Fix rotation bug for animated thumbnail shown after capture.
|
fabdb282b969118e1c3d094ed023fa57af03c66e |
30-Oct-2013 |
Andy Huibers <andyhuibers@google.com> |
am cec75e40: Fix rotation bug for animated thumbnail shown after capture. * commit 'cec75e408a2d451b90bac5f06e10906ffcafff33': Fix rotation bug for animated thumbnail shown after capture.
|
cec75e408a2d451b90bac5f06e10906ffcafff33 |
30-Oct-2013 |
Andy Huibers <andyhuibers@google.com> |
Fix rotation bug for animated thumbnail shown after capture. Bug: 11420737 Change-Id: I55b90137b362d0b3b98aba34114537e0f6107b8c
rc/com/android/camera/PhotoUI.java
|
5491834ab438b1a0a5462bebcb5fe0ef5f6fda4c |
29-Oct-2013 |
Doris Liu <tianliu@google.com> |
am 30bdaea6: am 70a6c065: am 2879b7eb: am af714f9e: Merge "Fix the mapping between preview UI and camera sensor" into gb-ub-photos-carlsbad * commit '30bdaea66e7e7df1cf41fc476bb943672a4378ce': Fix the mapping between preview UI and camera sensor
|
30bdaea66e7e7df1cf41fc476bb943672a4378ce |
29-Oct-2013 |
Doris Liu <tianliu@google.com> |
am 70a6c065: am 2879b7eb: am af714f9e: Merge "Fix the mapping between preview UI and camera sensor" into gb-ub-photos-carlsbad * commit '70a6c065ed7f5ec3a4400bae39f1f5e8f955712f': Fix the mapping between preview UI and camera sensor
|
70a6c065ed7f5ec3a4400bae39f1f5e8f955712f |
29-Oct-2013 |
Doris Liu <tianliu@google.com> |
am 2879b7eb: am af714f9e: Merge "Fix the mapping between preview UI and camera sensor" into gb-ub-photos-carlsbad * commit '2879b7ebc3ac510da1c68877c43f6361057c5dc3': Fix the mapping between preview UI and camera sensor
|
d77a6278bc2bd94621f555608e278fecf3ff5949 |
29-Oct-2013 |
Doris Liu <tianliu@google.com> |
am af714f9e: Merge "Fix the mapping between preview UI and camera sensor" into gb-ub-photos-carlsbad * commit 'af714f9ec3264211cb00139ffe0f05d55085ffc2': Fix the mapping between preview UI and camera sensor
|
2879b7ebc3ac510da1c68877c43f6361057c5dc3 |
29-Oct-2013 |
Doris Liu <tianliu@google.com> |
am af714f9e: Merge "Fix the mapping between preview UI and camera sensor" into gb-ub-photos-carlsbad * commit 'af714f9ec3264211cb00139ffe0f05d55085ffc2': Fix the mapping between preview UI and camera sensor
|
af714f9ec3264211cb00139ffe0f05d55085ffc2 |
29-Oct-2013 |
Doris Liu <tianliu@google.com> |
Merge "Fix the mapping between preview UI and camera sensor" into gb-ub-photos-carlsbad
|
aedf32bfe066f914001df2d53071e6d694291bc9 |
29-Oct-2013 |
ztenghui <ztenghui@google.com> |
am c4fd17f9: am cbde8aa1: am a16d166a: am e546d48b: Merge "Fix crash when trying to reopen the camera." into gb-ub-photos-carlsbad * commit 'c4fd17f92aa6148e04de53e256ac6cddfe01e488': Fix crash when trying to reopen the camera.
|
c4fd17f92aa6148e04de53e256ac6cddfe01e488 |
29-Oct-2013 |
ztenghui <ztenghui@google.com> |
am cbde8aa1: am a16d166a: am e546d48b: Merge "Fix crash when trying to reopen the camera." into gb-ub-photos-carlsbad * commit 'cbde8aa1b250c8f0335967e6862435f043abf783': Fix crash when trying to reopen the camera.
|
cbde8aa1b250c8f0335967e6862435f043abf783 |
29-Oct-2013 |
ztenghui <ztenghui@google.com> |
am a16d166a: am e546d48b: Merge "Fix crash when trying to reopen the camera." into gb-ub-photos-carlsbad * commit 'a16d166adaae1e01ea5efc009ffe7eb5c79f3585': Fix crash when trying to reopen the camera.
|
dccff141ee1ffe464a28605036fa41225617f413 |
28-Oct-2013 |
ztenghui <ztenghui@google.com> |
am e546d48b: Merge "Fix crash when trying to reopen the camera." into gb-ub-photos-carlsbad * commit 'e546d48b4acfbf2441b685b2c7d6a4e14241f34b': Fix crash when trying to reopen the camera.
|
a16d166adaae1e01ea5efc009ffe7eb5c79f3585 |
28-Oct-2013 |
ztenghui <ztenghui@google.com> |
am e546d48b: Merge "Fix crash when trying to reopen the camera." into gb-ub-photos-carlsbad * commit 'e546d48b4acfbf2441b685b2c7d6a4e14241f34b': Fix crash when trying to reopen the camera.
|
e546d48b4acfbf2441b685b2c7d6a4e14241f34b |
28-Oct-2013 |
ztenghui <ztenghui@google.com> |
Merge "Fix crash when trying to reopen the camera." into gb-ub-photos-carlsbad
|
cfc148d8373ab69d352c274374ffb34caf4a8d2c |
28-Oct-2013 |
ztenghui <ztenghui@google.com> |
Fix crash when trying to reopen the camera. In this case, another app is using the Camera, such that the camera.open will hit an exception. We should show an dialog here. bug:11258139 Change-Id: I0bd2d05fe4d4d9c5e4b87b39f3ef48910cfb7111
rc/com/android/camera/AndroidCameraManagerImpl.java
rc/com/android/camera/PhotoModule.java
|
36ebcb11b15fb00d3a641499c0f8a16745a2fbb0 |
28-Oct-2013 |
Doris Liu <tianliu@google.com> |
Fix the mapping between preview UI and camera sensor Bug: 11409659 Change-Id: I46ae3d7797590d59befbdc394d5304f14a212a80
rc/com/android/camera/FocusOverlayManager.java
rc/com/android/camera/PhotoController.java
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/PhotoUI.java
rc/com/android/camera/util/CameraUtil.java
|
7eb08e9791de29e879b2b73e580e1dc687c845af |
28-Oct-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am c683acb9: am 82339072: am 72e1e639: am 0a64e00e: Merge "gcam: Add placeholder image." into gb-ub-photos-carlsbad * commit 'c683acb9881131c424c1a53c07a15ca229766ebb': gcam: Add placeholder image.
|
c683acb9881131c424c1a53c07a15ca229766ebb |
28-Oct-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 82339072: am 72e1e639: am 0a64e00e: Merge "gcam: Add placeholder image." into gb-ub-photos-carlsbad * commit '823390721687e451b0caf4b0781c8ccb4269c287': gcam: Add placeholder image.
|
823390721687e451b0caf4b0781c8ccb4269c287 |
28-Oct-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 72e1e639: am 0a64e00e: Merge "gcam: Add placeholder image." into gb-ub-photos-carlsbad * commit '72e1e639206eccac20a9459f0029ec57640d7e0e': gcam: Add placeholder image.
|
42eae8aad760b018224eb73342785d96757e8e3f |
28-Oct-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 0a64e00e: Merge "gcam: Add placeholder image." into gb-ub-photos-carlsbad * commit '0a64e00e88514ae07c3514e19126c166dda0ca82': gcam: Add placeholder image.
|
72e1e639206eccac20a9459f0029ec57640d7e0e |
28-Oct-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 0a64e00e: Merge "gcam: Add placeholder image." into gb-ub-photos-carlsbad * commit '0a64e00e88514ae07c3514e19126c166dda0ca82': gcam: Add placeholder image.
|
0a64e00e88514ae07c3514e19126c166dda0ca82 |
28-Oct-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "gcam: Add placeholder image." into gb-ub-photos-carlsbad
|
e9b10a8252ab6cff59a68bc0a8a56d6c85254d9c |
28-Oct-2013 |
ztenghui <ztenghui@google.com> |
am 1bb489b2: am 7835245c: am 24e0f4d7: am 5250fb28: Merge "Fix memory leak due to inner class for handler." into gb-ub-photos-carlsbad * commit '1bb489b2d0b7dbb5162a7c9a2c4d709d370d0e11': Fix memory leak due to inner class for handler.
|
82e40e3cccb09e7bb3bc44db8b11d80333c4f2a6 |
28-Oct-2013 |
Doris Liu <tianliu@google.com> |
am c1fd1819: am 318b4eab: am f59776db: am d053a5b2: Update aspect ratio when preview aspect ratio changes * commit 'c1fd1819619de7b07a61fb9773ce1fea90f8ecd1': Update aspect ratio when preview aspect ratio changes
|
1bb489b2d0b7dbb5162a7c9a2c4d709d370d0e11 |
28-Oct-2013 |
ztenghui <ztenghui@google.com> |
am 7835245c: am 24e0f4d7: am 5250fb28: Merge "Fix memory leak due to inner class for handler." into gb-ub-photos-carlsbad * commit '7835245c19d1aa3b17f174f95102ee77c93f6d2c': Fix memory leak due to inner class for handler.
|
c1fd1819619de7b07a61fb9773ce1fea90f8ecd1 |
28-Oct-2013 |
Doris Liu <tianliu@google.com> |
am 318b4eab: am f59776db: am d053a5b2: Update aspect ratio when preview aspect ratio changes * commit '318b4eabff3ef0dc8266e98f486d534f59861344': Update aspect ratio when preview aspect ratio changes
|
7835245c19d1aa3b17f174f95102ee77c93f6d2c |
28-Oct-2013 |
ztenghui <ztenghui@google.com> |
am 24e0f4d7: am 5250fb28: Merge "Fix memory leak due to inner class for handler." into gb-ub-photos-carlsbad * commit '24e0f4d7801e114bf95b194839b6f7ffb9f76cd6': Fix memory leak due to inner class for handler.
|
318b4eabff3ef0dc8266e98f486d534f59861344 |
28-Oct-2013 |
Doris Liu <tianliu@google.com> |
am f59776db: am d053a5b2: Update aspect ratio when preview aspect ratio changes * commit 'f59776db86a91e3a2e9e1925f30fbec9f78c8777': Update aspect ratio when preview aspect ratio changes
|
7cfcafdf8f4a439c8fa87b612616fe409979e8a4 |
18-Oct-2013 |
Ruben Brunk <rubenbrunk@google.com> |
gcam: Add placeholder image. Bug: 11050749 Change-Id: I374c5919d6da0609fccd21c09775fa91894d5a24
es/layout/placeholder_progressbar.xml
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/Storage.java
rc/com/android/camera/WideAnglePanoramaModule.java
rc/com/android/camera/app/AppManagerFactory.java
rc/com/android/camera/app/PlaceholderManager.java
rc/com/android/camera/data/InProgressDataWrapper.java
|
9aa1a325710e9305427d1dac5f43634795139679 |
28-Oct-2013 |
ztenghui <ztenghui@google.com> |
am 5250fb28: Merge "Fix memory leak due to inner class for handler." into gb-ub-photos-carlsbad * commit '5250fb28143d45c41673a572b4c5b350e6563eb0': Fix memory leak due to inner class for handler.
|
66cc74bcb739c8a185f215083dcc3229af102f70 |
28-Oct-2013 |
Doris Liu <tianliu@google.com> |
am d053a5b2: Update aspect ratio when preview aspect ratio changes * commit 'd053a5b2aa8cd9cb09bd40962b305ef34e7d404b': Update aspect ratio when preview aspect ratio changes
|
24e0f4d7801e114bf95b194839b6f7ffb9f76cd6 |
28-Oct-2013 |
ztenghui <ztenghui@google.com> |
am 5250fb28: Merge "Fix memory leak due to inner class for handler." into gb-ub-photos-carlsbad * commit '5250fb28143d45c41673a572b4c5b350e6563eb0': Fix memory leak due to inner class for handler.
|
f59776db86a91e3a2e9e1925f30fbec9f78c8777 |
28-Oct-2013 |
Doris Liu <tianliu@google.com> |
am d053a5b2: Update aspect ratio when preview aspect ratio changes * commit 'd053a5b2aa8cd9cb09bd40962b305ef34e7d404b': Update aspect ratio when preview aspect ratio changes
|
5250fb28143d45c41673a572b4c5b350e6563eb0 |
28-Oct-2013 |
ztenghui <ztenghui@google.com> |
Merge "Fix memory leak due to inner class for handler." into gb-ub-photos-carlsbad
|
e1aa59ba7b3a9fb578995ee8ffcd232c11a97842 |
25-Oct-2013 |
ztenghui <ztenghui@google.com> |
Fix memory leak due to inner class for handler. To keep the existing interface, we just overwrite the handler here. bug:11336965 Change-Id: I77b2f577279244439ee9f81344f47bf5773e527b
rc/com/android/camera/AndroidCameraManagerImpl.java
|
d053a5b2aa8cd9cb09bd40962b305ef34e7d404b |
26-Oct-2013 |
Doris Liu <tianliu@google.com> |
Update aspect ratio when preview aspect ratio changes Bug: 11250125 Change-Id: If4047860f056cd81bf7d74045a68f5c0b85ad067
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/PhotoUI.java
|
f4bd9a697f92ea32fe45274b557774f652f22e80 |
26-Oct-2013 |
Doris Liu <tianliu@google.com> |
am 9cf8ca5a: am 4db1e03e: am cf940d9e: am 5737b932: Fix skipped hide review layout calls * commit '9cf8ca5a407e6935496ea670e467fd203dff0747': Fix skipped hide review layout calls
|
9cf8ca5a407e6935496ea670e467fd203dff0747 |
26-Oct-2013 |
Doris Liu <tianliu@google.com> |
am 4db1e03e: am cf940d9e: am 5737b932: Fix skipped hide review layout calls * commit '4db1e03ea25c7be62953138ccd62902b085854ee': Fix skipped hide review layout calls
|
4db1e03ea25c7be62953138ccd62902b085854ee |
26-Oct-2013 |
Doris Liu <tianliu@google.com> |
am cf940d9e: am 5737b932: Fix skipped hide review layout calls * commit 'cf940d9e40cdc9a8876b9484153eedced654fc75': Fix skipped hide review layout calls
|
cf940d9e40cdc9a8876b9484153eedced654fc75 |
26-Oct-2013 |
Doris Liu <tianliu@google.com> |
am 5737b932: Fix skipped hide review layout calls * commit '5737b93254f451859c7924792c46354d385da946': Fix skipped hide review layout calls
|
a17f7241a531c41ebb46d8730f5e27ed67ad08e8 |
26-Oct-2013 |
Doris Liu <tianliu@google.com> |
am 5737b932: Fix skipped hide review layout calls * commit '5737b93254f451859c7924792c46354d385da946': Fix skipped hide review layout calls
|
5737b93254f451859c7924792c46354d385da946 |
25-Oct-2013 |
Doris Liu <tianliu@google.com> |
Fix skipped hide review layout calls Bug: 11338381 Change-Id: I39c9541638f3e8c2a2f96ae4b1be7692a6db0e1c
rc/com/android/camera/WideAnglePanoramaModule.java
|
e04982ad43fa3672cadf821a1bbc9c6454ce20f3 |
21-Oct-2013 |
ztenghui <ztenghui@google.com> |
The initial focus value should be true. Every time when we enter the wide angel (SRI) module, the preview should be in focus. bug:11234723 Change-Id: I218573946609f1e0e4415621a71b96a20775237d
rc/com/android/camera/WideAnglePanoramaModule.java
|
f6cf72375d53d25f947d78be198c8d7bfc61b4e4 |
22-Oct-2013 |
Baligh Uddin <baligh@google.com> |
am 3dcf811e: (-s ours) am 91fb860e: (-s ours) am 865c72a4: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '3dcf811edb748aad766a08c547f0303f74009e76': Import translations. DO NOT MERGE
|
3dcf811edb748aad766a08c547f0303f74009e76 |
22-Oct-2013 |
Baligh Uddin <baligh@google.com> |
am 91fb860e: (-s ours) am 865c72a4: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '91fb860eea66bfe708d6fe4459b538621b3fc5a8': Import translations. DO NOT MERGE
|
91fb860eea66bfe708d6fe4459b538621b3fc5a8 |
22-Oct-2013 |
Baligh Uddin <baligh@google.com> |
am 865c72a4: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '865c72a4a44db92422beaa450b4c7ea652e9d36d': Import translations. DO NOT MERGE
|
af73d350fe749e6d763ef5a96e8318589611fef0 |
22-Oct-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE"
|
865c72a4a44db92422beaa450b4c7ea652e9d36d |
22-Oct-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into klp-dev
|
2629fefb2b2c96845deb76b3570a6472d86aff1c |
22-Oct-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-denali
|
63565c83f70f1bfae8fccfca24605de8e0e42431 |
18-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
Don't crash when preview surface could not be set. Bug: 11021188 Change-Id: Idfc1cf5c50ac1f3f46956079c3231cbdda32e1a4
rc/com/android/camera/AndroidCameraManagerImpl.java
|
915402420f92575894edf19f7f0df467386089a8 |
21-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
am 1f3611ec: am fb99a782: am 080fb578: am 156ea57c: Merge "Bump version number for MR1" into gb-ub-photos-carlsbad * commit '1f3611ecd283e22b4d9e0de16c2bff9185666971': Bump version number for MR1
|
1f3611ecd283e22b4d9e0de16c2bff9185666971 |
21-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
am fb99a782: am 080fb578: am 156ea57c: Merge "Bump version number for MR1" into gb-ub-photos-carlsbad * commit 'fb99a782d2c20459dd2ca74aa5b072b4ff58d19d': Bump version number for MR1
|
fb99a782d2c20459dd2ca74aa5b072b4ff58d19d |
21-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
am 080fb578: am 156ea57c: Merge "Bump version number for MR1" into gb-ub-photos-carlsbad * commit '080fb578bb826dc2e699aed357ece289433e0524': Bump version number for MR1
|
052a13553d30aea37449c74d2c7292afd940bcf9 |
21-Oct-2013 |
Erin Dahlgren <edahlgren@google.com> |
am dcf88e4f: am 17a63bdb: am 4432abe0: am 65e2389b: Merge "Update preview controls on deleting all items." into gb-ub-photos-carlsbad * commit 'dcf88e4f8c7e39e7cb5635d452ffef3e54567a30': Update preview controls on deleting all items.
|
fd3eaeb6acacf82b8dea21b8ba40e643eeb407c4 |
21-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
am 156ea57c: Merge "Bump version number for MR1" into gb-ub-photos-carlsbad * commit '156ea57cd76cc96c507e3ded946cc9ce48647153': Bump version number for MR1
|
dcf88e4f8c7e39e7cb5635d452ffef3e54567a30 |
21-Oct-2013 |
Erin Dahlgren <edahlgren@google.com> |
am 17a63bdb: am 4432abe0: am 65e2389b: Merge "Update preview controls on deleting all items." into gb-ub-photos-carlsbad * commit '17a63bdbfc9a7632232fc9af29caceb2d07fa2a3': Update preview controls on deleting all items.
|
080fb578bb826dc2e699aed357ece289433e0524 |
21-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
am 156ea57c: Merge "Bump version number for MR1" into gb-ub-photos-carlsbad * commit '156ea57cd76cc96c507e3ded946cc9ce48647153': Bump version number for MR1
|
17a63bdbfc9a7632232fc9af29caceb2d07fa2a3 |
21-Oct-2013 |
Erin Dahlgren <edahlgren@google.com> |
am 4432abe0: am 65e2389b: Merge "Update preview controls on deleting all items." into gb-ub-photos-carlsbad * commit '4432abe0aeda12707267dbbb8882406819e125e8': Update preview controls on deleting all items.
|
156ea57cd76cc96c507e3ded946cc9ce48647153 |
21-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
Merge "Bump version number for MR1" into gb-ub-photos-carlsbad
|
0ef3ad27bfe89635dcdab19acdd47cc60ff10f41 |
21-Oct-2013 |
Erin Dahlgren <edahlgren@google.com> |
am 65e2389b: Merge "Update preview controls on deleting all items." into gb-ub-photos-carlsbad * commit '65e2389b3de5992c49732d95902e6e742e44821b': Update preview controls on deleting all items.
|
73da1e35471769cfca9fac9ac1ae315a1709b540 |
21-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
Bump version number for MR1 Bug: 11240056 Change-Id: Ia3ad9f86516eed5ca60e8707d53139d54e3ee562
ersion.mk
|
4432abe0aeda12707267dbbb8882406819e125e8 |
21-Oct-2013 |
Erin Dahlgren <edahlgren@google.com> |
am 65e2389b: Merge "Update preview controls on deleting all items." into gb-ub-photos-carlsbad * commit '65e2389b3de5992c49732d95902e6e742e44821b': Update preview controls on deleting all items.
|
65e2389b3de5992c49732d95902e6e742e44821b |
21-Oct-2013 |
Erin Dahlgren <edahlgren@google.com> |
Merge "Update preview controls on deleting all items." into gb-ub-photos-carlsbad
|
fd7f0a9ffd8e7db21e556b1a60a7602ef5d0fe29 |
21-Oct-2013 |
Erin Dahlgren <edahlgren@google.com> |
Update preview controls on deleting all items. Bug: 11219537 Change-Id: I897b65bd7c594b904aa29462e056a10d0e9c52a2
rc/com/android/camera/CameraActivity.java
|
8397ca384c7d3d723f8cdc504491c61552ee0fca |
21-Oct-2013 |
ztenghui <ztenghui@google.com> |
am b0c2602f: am 3128bfa8: am b67d1401: am 68c1c1e0: The initial focus value should be true. * commit 'b0c2602feca65d86d7924b39bd77a1dc0d7ca4ad': The initial focus value should be true.
|
2779f34fbe40ce3700e48ad0222f6251988fcc86 |
21-Oct-2013 |
ztenghui <ztenghui@google.com> |
am a50c1824: am be1a8c82: am f1d7d405: am 56e44af2: Don\'t call onCurrentDataChanged for CameraPreview when reloading. * commit 'a50c1824053118e8622e3eab28c5c0a34379dcd4': Don't call onCurrentDataChanged for CameraPreview when reloading.
|
b0c2602feca65d86d7924b39bd77a1dc0d7ca4ad |
21-Oct-2013 |
ztenghui <ztenghui@google.com> |
am 3128bfa8: am b67d1401: am 68c1c1e0: The initial focus value should be true. * commit '3128bfa840d00e86589aae71b002208b7cd766dd': The initial focus value should be true.
|
a50c1824053118e8622e3eab28c5c0a34379dcd4 |
21-Oct-2013 |
ztenghui <ztenghui@google.com> |
am be1a8c82: am f1d7d405: am 56e44af2: Don\'t call onCurrentDataChanged for CameraPreview when reloading. * commit 'be1a8c820213369440d0ee752ce2fe2ddefc20f5': Don't call onCurrentDataChanged for CameraPreview when reloading.
|
3128bfa840d00e86589aae71b002208b7cd766dd |
21-Oct-2013 |
ztenghui <ztenghui@google.com> |
am b67d1401: am 68c1c1e0: The initial focus value should be true. * commit 'b67d140189756a48f755130404235cb14b636850': The initial focus value should be true.
|
be1a8c820213369440d0ee752ce2fe2ddefc20f5 |
21-Oct-2013 |
ztenghui <ztenghui@google.com> |
am f1d7d405: am 56e44af2: Don\'t call onCurrentDataChanged for CameraPreview when reloading. * commit 'f1d7d405a95e5901898f906e96f8d1731b745909': Don't call onCurrentDataChanged for CameraPreview when reloading.
|
b67d140189756a48f755130404235cb14b636850 |
21-Oct-2013 |
ztenghui <ztenghui@google.com> |
am 68c1c1e0: The initial focus value should be true. * commit '68c1c1e02143e3d2c2dbc658645a3a981f58cdd5': The initial focus value should be true.
|
f1d7d405a95e5901898f906e96f8d1731b745909 |
21-Oct-2013 |
ztenghui <ztenghui@google.com> |
am 56e44af2: Don\'t call onCurrentDataChanged for CameraPreview when reloading. * commit '56e44af257d65d730f04d1e90c87f5674abd7f26': Don't call onCurrentDataChanged for CameraPreview when reloading.
|
80822ebdae89d0bc93f1d74d3c308e81b610d4e4 |
21-Oct-2013 |
ztenghui <ztenghui@google.com> |
am 68c1c1e0: The initial focus value should be true. * commit '68c1c1e02143e3d2c2dbc658645a3a981f58cdd5': The initial focus value should be true.
|
0467e95d452e7e2e4423fff61fc50194b1b6541d |
21-Oct-2013 |
ztenghui <ztenghui@google.com> |
am 56e44af2: Don\'t call onCurrentDataChanged for CameraPreview when reloading. * commit '56e44af257d65d730f04d1e90c87f5674abd7f26': Don't call onCurrentDataChanged for CameraPreview when reloading.
|
82b6f8510237955018a0b0877317fb23c90d87fc |
21-Oct-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I97de63a80e5287c2b2cfc3a5bdc7cf9bc37a958e Auto-generated-cl: translation import
es/values-zh-rHK/strings.xml
|
eb25532fe90c24cbb170b332b8ec4057219b918c |
21-Oct-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I6731c0dc80337184cc87329ca824164899563b5f Auto-generated-cl: translation import
es/values-zh-rHK/strings.xml
|
f0c2396cfe16abfbf93ec93c3a655b4b6ddf00a1 |
21-Oct-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I214dace1cac07ec5ab5155508cbce4cf0af793d7 Auto-generated-cl: translation import
es/values-zh-rHK/strings.xml
|
68c1c1e02143e3d2c2dbc658645a3a981f58cdd5 |
21-Oct-2013 |
ztenghui <ztenghui@google.com> |
The initial focus value should be true. Every time when we enter the wide angel (SRI) module, the preview should be in focus. bug:11234723 Change-Id: I218573946609f1e0e4415621a71b96a20775237d
rc/com/android/camera/WideAnglePanoramaModule.java
|
56e44af257d65d730f04d1e90c87f5674abd7f26 |
16-Oct-2013 |
ztenghui <ztenghui@google.com> |
Don't call onCurrentDataChanged for CameraPreview when reloading. In this case, camera preview didn't change, so there is no need to call onCurrentDataChanged. bug:11237255 Change-Id: I788a2ee4e7337721d0bbd6aa75e7da6d382bf282
rc/com/android/camera/ui/FilmStripView.java
|
aa67d847edf7de3741bac6fb40cd94b8c838d0ae |
19-Oct-2013 |
Doris Liu <tianliu@google.com> |
Fix SRI orientation on manta Bug: 11292213 Change-Id: I7977de4c5bb906eec5431e706e28118837a682e7
rc/com/android/camera/WideAnglePanoramaController.java
rc/com/android/camera/WideAnglePanoramaModule.java
rc/com/android/camera/WideAnglePanoramaUI.java
|
05e03fc383b170fff4fb08baaaeccc9e47f0dc62 |
19-Oct-2013 |
Doris Liu <tianliu@google.com> |
am 4d7f78f5: am c57947b7: am 8be9183c: am 891a8075: Merge "Fix SRI orientation on manta" into gb-ub-photos-carlsbad * commit '4d7f78f54b3493d7fc47518fffbe47b7d61a52ca': Fix SRI orientation on manta
|
4d7f78f54b3493d7fc47518fffbe47b7d61a52ca |
19-Oct-2013 |
Doris Liu <tianliu@google.com> |
am c57947b7: am 8be9183c: am 891a8075: Merge "Fix SRI orientation on manta" into gb-ub-photos-carlsbad * commit 'c57947b720ac5b6eab7784bf1fab0e1d40101a22': Fix SRI orientation on manta
|
c57947b720ac5b6eab7784bf1fab0e1d40101a22 |
19-Oct-2013 |
Doris Liu <tianliu@google.com> |
am 8be9183c: am 891a8075: Merge "Fix SRI orientation on manta" into gb-ub-photos-carlsbad * commit '8be9183ceb856a8933394238996f4d364e45c3e1': Fix SRI orientation on manta
|
8be9183ceb856a8933394238996f4d364e45c3e1 |
19-Oct-2013 |
Doris Liu <tianliu@google.com> |
am 891a8075: Merge "Fix SRI orientation on manta" into gb-ub-photos-carlsbad * commit '891a80756166a8621f063c727000c9a943cf5465': Fix SRI orientation on manta
|
364433992649dcbba1fcbdbdd4933d90cc19af65 |
19-Oct-2013 |
Doris Liu <tianliu@google.com> |
am 891a8075: Merge "Fix SRI orientation on manta" into gb-ub-photos-carlsbad * commit '891a80756166a8621f063c727000c9a943cf5465': Fix SRI orientation on manta
|
891a80756166a8621f063c727000c9a943cf5465 |
19-Oct-2013 |
Doris Liu <tianliu@google.com> |
Merge "Fix SRI orientation on manta" into gb-ub-photos-carlsbad
|
209a165bd776c938cad388fcf0b1ed27eef4ed83 |
19-Oct-2013 |
Doris Liu <tianliu@google.com> |
Fix SRI orientation on manta Bug: 11292213 Change-Id: I7977de4c5bb906eec5431e706e28118837a682e7
rc/com/android/camera/WideAnglePanoramaController.java
rc/com/android/camera/WideAnglePanoramaModule.java
rc/com/android/camera/WideAnglePanoramaUI.java
|
ec81fe0a249baa47e6824dacf019456e28d7e2ba |
19-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
am 464f2201: Don\'t crash when preview surface could not be set. * commit '464f22013750a416f9fc9a1e32007576d0b655d6': Don't crash when preview surface could not be set.
|
f2568bb70414c73684a26de503809e6552df3e13 |
19-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
am f302a391: Update HDR/HDR+ arc menu hover messages. * commit 'f302a391dfcb435660e18d3111c4e1a618c0cf6e': Update HDR/HDR+ arc menu hover messages.
|
4f156d2da4d29168f7b8cfd275b1e02dab81c0c4 |
19-Oct-2013 |
Doris Liu <tianliu@google.com> |
am 8470cae9: Merge "Show a preview cover until real preview is ready" into gb-ub-photos-carlsbad * commit '8470cae9049959ee6bb28cde1c53185f2ffd10a1': Show a preview cover until real preview is ready
|
69c8b5130570cccd065572ad8cfb1390815a8b7a |
19-Oct-2013 |
ztenghui <ztenghui@google.com> |
am f149ec53: Merge "Don\'t allow swipe into the film strip view when swipe is disabled" into gb-ub-photos-carlsbad * commit 'f149ec53a0fa3330617ce01751964662d3273c88': Don't allow swipe into the film strip view when swipe is disabled
|
1bfd17db069406243f8432711db1a0df08e60cc2 |
19-Oct-2013 |
Baligh Uddin <baligh@google.com> |
am 270b64e9: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-carlsbad * commit '270b64e950ce8bfd137398df83e8fcb2f9b0ce4d': Import translations. DO NOT MERGE
|
239447c5e0d71d035b553a4557b9aa161342bc73 |
19-Oct-2013 |
ztenghui <ztenghui@google.com> |
am 9db92826: Merge "Send an message to decouple the gcam module change." into gb-ub-photos-carlsbad * commit '9db9282667d9e272702cd2ee32d7415204084530': Send an message to decouple the gcam module change.
|
594a34ebf192874a08ff0996aad2c08ac140660a |
19-Oct-2013 |
Ari Sachter-Zeltzer <asz@google.com> |
am 66f39483: Merge "update camera launcher icon" into gb-ub-photos-carlsbad * commit '66f3948315b6bf851dcd5d618d96d6fcda49f159': update camera launcher icon
|
8bf7b071ba720f9586ffc2339a4953eac3221bfc |
19-Oct-2013 |
Doris Liu <tianliu@google.com> |
am 7bd95307: Merge "Fix shutter covering pie menu" into gb-ub-photos-carlsbad * commit '7bd95307ecdca5c7661bc3fb1765313ceb62e92a': Fix shutter covering pie menu
|
a68ef3613d65295559fcc89f7980135b09419358 |
19-Oct-2013 |
Igor Murashkin <iam@google.com> |
am 5e82f81a: Merge "gcam: Fix AF spinner not to reset when changing position" into gb-ub-photos-carlsbad * commit '5e82f81a7c7daaf8ac86dbd688b344027f97ff64': gcam: Fix AF spinner not to reset when changing position
|
027cc0ef35cb0a54dcc9d2b18f9235585dd9ac1b |
19-Oct-2013 |
Doris Liu <tianliu@google.com> |
am 08749a4e: Merge "Dismiss switcher popup when shutter button is clicked" into gb-ub-photos-carlsbad * commit '08749a4ed22c5001aa476a9a30df323b00a6df7d': Dismiss switcher popup when shutter button is clicked
|
cd2094f0d5ed06aec09190d03b87d4745ab8968a |
19-Oct-2013 |
Igor Murashkin <iam@google.com> |
am d3e75bd7: (-s ours) Merge "CameraUtil: add float clamp function" into gb-ub-photos-carlsbad * commit 'd3e75bd748ce2be8fdcb30575bbde9bd07536bd3': (36 commits) CameraUtil: add float clamp function Import translations. DO NOT MERGE Fix build break. Revert "Revert "Import translations. DO NOT MERGE"" Revert "Import translations. DO NOT MERGE" Import translations. DO NOT MERGE Increased time to wait in all tests. For CameraLAtency.java got rid of the key event to get rid of geo tagging dialog on first launch of camera. That will be taken care of by pushing the shared_pref file. Revert "Import translations. DO NOT MERGE" Import translations. DO NOT MERGE Revert "Remove translated filtershow_strings.xml files." Remove translated filtershow_strings.xml files. Build broken. Import translations. DO NOT MERGE Import translations. DO NOT MERGE Import translations. DO NOT MERGE Import translations. DO NOT MERGE Import translations. DO NOT MERGE Adding gcam module to Camera2 app. Refine Filmstrip gesture/position handling. Fix drawable location. ...
|
9738f02a9c77c938fc2aa7abdc79e2fd661e4419 |
19-Oct-2013 |
Igor Murashkin <iam@google.com> |
Merge "resolved conflicts for merge of d3e75bd7 to gb-ub-photos-denali" into gb-ub-photos-denali
|
b16b64668c9f3a98827233183d823c6af4f536ef |
18-Oct-2013 |
Igor Murashkin <iam@google.com> |
resolved conflicts for merge of d3e75bd7 to gb-ub-photos-denali Change-Id: I18356130f8fafa269495cc8abebfb5599400e7fe
rc/com/android/camera/util/CameraUtil.java
|
468835e24951a2a9368fa3fa4f4e8d368c064d92 |
18-Oct-2013 |
Igor Murashkin <iam@google.com> |
Revert "resolved conflicts for merge of d3e75bd7 to gb-ub-photos-denali" This reverts commit bf2c3edea9c0ae650cacc03f6d68941066315d05. Change-Id: I71387cafd8572008ffc0ba23e77febbc08c00adf
rc/com/android/camera/util/CameraUtil.java
|
bf2c3edea9c0ae650cacc03f6d68941066315d05 |
18-Oct-2013 |
Igor Murashkin <iam@google.com> |
resolved conflicts for merge of d3e75bd7 to gb-ub-photos-denali Change-Id: I32ca2adf683b9e479b3925956e5c3030e9692cbd
rc/com/android/camera/util/CameraUtil.java
|
5e28cb9249d7fe71e5a07988dcbc892ac6f24f84 |
18-Oct-2013 |
Erin Dahlgren <edahlgren@google.com> |
am 177c4b05: Merge "Do not show any bottom controls in secure camera to prevent launching out of app behavior." into gb-ub-photos-carlsbad * commit '177c4b05ed8e9f71afc526e5cad339f245563450': Do not show any bottom controls in secure camera to prevent launching out of app behavior.
|
2c4591d9614ed26a3aea984508b648690bdae47e |
18-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
am 0740a277: am 12bbd6e8: am 734d2e67: am 464f2201: Don\'t crash when preview surface could not be set. * commit '0740a277e9c1ba3f38aba7939ebaa8d9206e3170': Don't crash when preview surface could not be set.
|
0740a277e9c1ba3f38aba7939ebaa8d9206e3170 |
18-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
am 12bbd6e8: am 734d2e67: am 464f2201: Don\'t crash when preview surface could not be set. * commit '12bbd6e87999ca1d0bd4f555df489cda5542c45a': Don't crash when preview surface could not be set.
|
12bbd6e87999ca1d0bd4f555df489cda5542c45a |
18-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
am 734d2e67: am 464f2201: Don\'t crash when preview surface could not be set. * commit '734d2e6791891dda7ca2a23d38d828b9765569b9': Don't crash when preview surface could not be set.
|
734d2e6791891dda7ca2a23d38d828b9765569b9 |
18-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
am 464f2201: Don\'t crash when preview surface could not be set. * commit '464f22013750a416f9fc9a1e32007576d0b655d6': Don't crash when preview surface could not be set.
|
464f22013750a416f9fc9a1e32007576d0b655d6 |
18-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
Don't crash when preview surface could not be set. Bug: 11021188 Change-Id: Idfc1cf5c50ac1f3f46956079c3231cbdda32e1a4
rc/com/android/camera/AndroidCameraManagerImpl.java
|
63541f631ebab45fe2d7cdb4d1a9914ac1d83120 |
17-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
am ccd23b8e: am 914192b7: am a6e7579c: am f302a391: Update HDR/HDR+ arc menu hover messages. * commit 'ccd23b8e756add1ca7cff8a0522def01187f17b5': Update HDR/HDR+ arc menu hover messages.
|
ccd23b8e756add1ca7cff8a0522def01187f17b5 |
17-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
am 914192b7: am a6e7579c: am f302a391: Update HDR/HDR+ arc menu hover messages. * commit '914192b7f2494b64fa0a204905f9513e85df313a': Update HDR/HDR+ arc menu hover messages.
|
914192b7f2494b64fa0a204905f9513e85df313a |
17-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
am a6e7579c: am f302a391: Update HDR/HDR+ arc menu hover messages. * commit 'a6e7579cf9b3daeb0b81a395b097b988d07614a1': Update HDR/HDR+ arc menu hover messages.
|
a6e7579cf9b3daeb0b81a395b097b988d07614a1 |
17-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
am f302a391: Update HDR/HDR+ arc menu hover messages. * commit 'f302a391dfcb435660e18d3111c4e1a618c0cf6e': Update HDR/HDR+ arc menu hover messages.
|
f302a391dfcb435660e18d3111c4e1a618c0cf6e |
17-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
Update HDR/HDR+ arc menu hover messages. Bug : 11185194 Change-Id: Ie26e9a225dffa0a8ccd9e99fff3d7264b079ac62
es/values/arrays.xml
|
9cdf79ed53373a4955dd5812dad5af3ef49f3311 |
17-Oct-2013 |
Doris Liu <tianliu@google.com> |
am 17a7ab03: am b8475d8c: am 9ff2635a: am 8470cae9: Merge "Show a preview cover until real preview is ready" into gb-ub-photos-carlsbad * commit '17a7ab0386f879e28c310096bb1d7dc83361cf36': Show a preview cover until real preview is ready
|
17a7ab0386f879e28c310096bb1d7dc83361cf36 |
17-Oct-2013 |
Doris Liu <tianliu@google.com> |
am b8475d8c: am 9ff2635a: am 8470cae9: Merge "Show a preview cover until real preview is ready" into gb-ub-photos-carlsbad * commit 'b8475d8c5278df0be616bbd8aafaea4a47032409': Show a preview cover until real preview is ready
|
940d0171c17f93602c86612a3b0092814fa96814 |
17-Oct-2013 |
ztenghui <ztenghui@google.com> |
am c99f99f2: am 0e0fa5f8: am b1c2d554: am f149ec53: Merge "Don\'t allow swipe into the film strip view when swipe is disabled" into gb-ub-photos-carlsbad * commit 'c99f99f2b4f0ba553f2c907dd68628cf01945cfa': Don't allow swipe into the film strip view when swipe is disabled
|
b8475d8c5278df0be616bbd8aafaea4a47032409 |
17-Oct-2013 |
Doris Liu <tianliu@google.com> |
am 9ff2635a: am 8470cae9: Merge "Show a preview cover until real preview is ready" into gb-ub-photos-carlsbad * commit '9ff2635aaad021813484fd32491c5d41e9e21a20': Show a preview cover until real preview is ready
|
c99f99f2b4f0ba553f2c907dd68628cf01945cfa |
17-Oct-2013 |
ztenghui <ztenghui@google.com> |
am 0e0fa5f8: am b1c2d554: am f149ec53: Merge "Don\'t allow swipe into the film strip view when swipe is disabled" into gb-ub-photos-carlsbad * commit '0e0fa5f8e084ccb75dde42350056728bd6081f23': Don't allow swipe into the film strip view when swipe is disabled
|
9ff2635aaad021813484fd32491c5d41e9e21a20 |
17-Oct-2013 |
Doris Liu <tianliu@google.com> |
am 8470cae9: Merge "Show a preview cover until real preview is ready" into gb-ub-photos-carlsbad * commit '8470cae9049959ee6bb28cde1c53185f2ffd10a1': Show a preview cover until real preview is ready
|
0e0fa5f8e084ccb75dde42350056728bd6081f23 |
17-Oct-2013 |
ztenghui <ztenghui@google.com> |
am b1c2d554: am f149ec53: Merge "Don\'t allow swipe into the film strip view when swipe is disabled" into gb-ub-photos-carlsbad * commit 'b1c2d5544ae5c4ba2f3e3fe7e8baf357581cfbed': Don't allow swipe into the film strip view when swipe is disabled
|
8470cae9049959ee6bb28cde1c53185f2ffd10a1 |
17-Oct-2013 |
Doris Liu <tianliu@google.com> |
Merge "Show a preview cover until real preview is ready" into gb-ub-photos-carlsbad
|
b1c2d5544ae5c4ba2f3e3fe7e8baf357581cfbed |
17-Oct-2013 |
ztenghui <ztenghui@google.com> |
am f149ec53: Merge "Don\'t allow swipe into the film strip view when swipe is disabled" into gb-ub-photos-carlsbad * commit 'f149ec53a0fa3330617ce01751964662d3273c88': Don't allow swipe into the film strip view when swipe is disabled
|
f149ec53a0fa3330617ce01751964662d3273c88 |
17-Oct-2013 |
ztenghui <ztenghui@google.com> |
Merge "Don't allow swipe into the film strip view when swipe is disabled" into gb-ub-photos-carlsbad
|
c2317776107977d6691cc43b07e9c52b3597f22d |
17-Oct-2013 |
Baligh Uddin <baligh@google.com> |
am fa715a80: (-s ours) am c8e13e3f: (-s ours) am a7d9bf6c: (-s ours) am 270b64e9: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-carlsbad * commit 'fa715a8023054b137eed06737e6038202d996c0b': Import translations. DO NOT MERGE
|
fa715a8023054b137eed06737e6038202d996c0b |
17-Oct-2013 |
Baligh Uddin <baligh@google.com> |
am c8e13e3f: (-s ours) am a7d9bf6c: (-s ours) am 270b64e9: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-carlsbad * commit 'c8e13e3f931a184071a2870f2f52a855ca177b42': Import translations. DO NOT MERGE
|
c8e13e3f931a184071a2870f2f52a855ca177b42 |
17-Oct-2013 |
Baligh Uddin <baligh@google.com> |
am a7d9bf6c: (-s ours) am 270b64e9: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-carlsbad * commit 'a7d9bf6cac9f8fa82aee368d2a3db8713b79cdea': Import translations. DO NOT MERGE
|
a7d9bf6cac9f8fa82aee368d2a3db8713b79cdea |
17-Oct-2013 |
Baligh Uddin <baligh@google.com> |
am 270b64e9: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-carlsbad * commit '270b64e950ce8bfd137398df83e8fcb2f9b0ce4d': Import translations. DO NOT MERGE
|
270b64e950ce8bfd137398df83e8fcb2f9b0ce4d |
17-Oct-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-carlsbad
|
a25465bcf823cf02ac8c3ac21e90c9bca11d2255 |
17-Oct-2013 |
Baligh Uddin <baligh@google.com> |
am c959f029: (-s ours) am 88b7b007: (-s ours) am 3cdc6f0a: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit 'c959f0296af028e9666e0c4679adf724449d5934': Import translations. DO NOT MERGE
|
c959f0296af028e9666e0c4679adf724449d5934 |
17-Oct-2013 |
Baligh Uddin <baligh@google.com> |
am 88b7b007: (-s ours) am 3cdc6f0a: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '88b7b0075b96d35c2aa7ad2aa3ea53480246ebe4': Import translations. DO NOT MERGE
|
88b7b0075b96d35c2aa7ad2aa3ea53480246ebe4 |
17-Oct-2013 |
Baligh Uddin <baligh@google.com> |
am 3cdc6f0a: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '3cdc6f0aab59309eba73ada1319cf3fb75124ec9': Import translations. DO NOT MERGE
|
cbce3d1640ab6c810521e4b68b3d88e6b245f206 |
17-Oct-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE"
|
3cdc6f0aab59309eba73ada1319cf3fb75124ec9 |
17-Oct-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into klp-dev
|
fa534397192e9a056331ddd0016477cffc788521 |
17-Oct-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ic5d3048391a09d1d895793254e24db78f75124d6 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-el/strings.xml
es/values-ko/strings.xml
es/values-lv/strings.xml
|
dde7ddc0343c3edb7843479287db07903b715228 |
17-Oct-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I50a68a5ff367a08ae06bd84c83e1035b9fb0bdd5 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-el/strings.xml
es/values-ko/strings.xml
es/values-lv/strings.xml
|
5f8ec2334d895357f4ff22b61a556497f2a8b4d6 |
17-Oct-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ie510117ceb7dacad642d2fb87c81aa3aa0ff3e89 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-km-rKH/strings.xml
es/values-ko/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mn-rMN/strings.xml
es/values-ms-rMY/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
84bbc379cd65b360568c87b97837001641dfc90e |
17-Oct-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I947241bc8f209b1c9aaab0d5571a227aeea1b8c3 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-el/strings.xml
es/values-ko/strings.xml
es/values-lv/strings.xml
|
a1657c9a426c675263921aafea9b34ff2eee0c53 |
17-Oct-2013 |
Ed Heyl <edheyl@google.com> |
am 957de9a5: am cfba2a22: am 071cfe6c: merge in klp-release (no-op) * commit '957de9a560e24d120dfc76c4b2c1d72581a250fd': Only delete the Uri coming from onMediaSaved Avoid unnecessary bringChildToFront() calls. Increased time to wait in all tests. For CameraLAtency.java got rid of the key event to get rid of geo tagging dialog on first launch of camera. That will be taken care of by pushing the shared_pref file. Add missing crop message. Prevent NPE in gesture handling. Restore HQ preference in GCam module. Fix memory leak of context in LocalMediaObserver Add HQ icon indicator support. Remove PopupManager to remove a memory leak Make ROI size 1/8 of longer edge of the image Sort and select the preview fps range for still image.
|
957de9a560e24d120dfc76c4b2c1d72581a250fd |
17-Oct-2013 |
Ed Heyl <edheyl@google.com> |
am cfba2a22: am 071cfe6c: merge in klp-release (no-op) * commit 'cfba2a223502c454871683e4e4304ecb260a788d': Only delete the Uri coming from onMediaSaved Avoid unnecessary bringChildToFront() calls. Increased time to wait in all tests. For CameraLAtency.java got rid of the key event to get rid of geo tagging dialog on first launch of camera. That will be taken care of by pushing the shared_pref file. Add missing crop message. Prevent NPE in gesture handling. Restore HQ preference in GCam module. Fix memory leak of context in LocalMediaObserver Add HQ icon indicator support. Remove PopupManager to remove a memory leak Make ROI size 1/8 of longer edge of the image Sort and select the preview fps range for still image.
|
cfba2a223502c454871683e4e4304ecb260a788d |
17-Oct-2013 |
Ed Heyl <edheyl@google.com> |
am 071cfe6c: merge in klp-release (no-op) * commit '071cfe6c640c014bb9503a049ec5b20e26684860': Only delete the Uri coming from onMediaSaved Avoid unnecessary bringChildToFront() calls. Increased time to wait in all tests. For CameraLAtency.java got rid of the key event to get rid of geo tagging dialog on first launch of camera. That will be taken care of by pushing the shared_pref file. Add missing crop message. Prevent NPE in gesture handling. Restore HQ preference in GCam module. Fix memory leak of context in LocalMediaObserver Add HQ icon indicator support. Remove PopupManager to remove a memory leak Make ROI size 1/8 of longer edge of the image Sort and select the preview fps range for still image.
|
071cfe6c640c014bb9503a049ec5b20e26684860 |
17-Oct-2013 |
Ed Heyl <edheyl@google.com> |
merge in klp-release (no-op)
|
c83a6831413aa9337db4d7bd97790d9a16f0371e |
17-Oct-2013 |
ztenghui <ztenghui@google.com> |
am 0bc5cc2e: am 22673cc0: am 089c19ac: am 9db92826: Merge "Send an message to decouple the gcam module change." into gb-ub-photos-carlsbad * commit '0bc5cc2e240ce0aff7d80d0bbaa1393f7d3aa2e2': Send an message to decouple the gcam module change.
|
0bc5cc2e240ce0aff7d80d0bbaa1393f7d3aa2e2 |
17-Oct-2013 |
ztenghui <ztenghui@google.com> |
am 22673cc0: am 089c19ac: am 9db92826: Merge "Send an message to decouple the gcam module change." into gb-ub-photos-carlsbad * commit '22673cc052b88937df8ae6cbc69f56e1dca034eb': Send an message to decouple the gcam module change.
|
22673cc052b88937df8ae6cbc69f56e1dca034eb |
17-Oct-2013 |
ztenghui <ztenghui@google.com> |
am 089c19ac: am 9db92826: Merge "Send an message to decouple the gcam module change." into gb-ub-photos-carlsbad * commit '089c19ac2c59941224b9263946881d5659145ed0': Send an message to decouple the gcam module change.
|
089c19ac2c59941224b9263946881d5659145ed0 |
17-Oct-2013 |
ztenghui <ztenghui@google.com> |
am 9db92826: Merge "Send an message to decouple the gcam module change." into gb-ub-photos-carlsbad * commit '9db9282667d9e272702cd2ee32d7415204084530': Send an message to decouple the gcam module change.
|
9db9282667d9e272702cd2ee32d7415204084530 |
17-Oct-2013 |
ztenghui <ztenghui@google.com> |
Merge "Send an message to decouple the gcam module change." into gb-ub-photos-carlsbad
|
f1990d5b89078035114caa5d139465f1b20fe1bb |
17-Oct-2013 |
Ari Sachter-Zeltzer <asz@google.com> |
am 5b868a44: am 839cac61: am 7015ae63: am 66f39483: Merge "update camera launcher icon" into gb-ub-photos-carlsbad * commit '5b868a441dcc14dc626c086c4bd7b43d97516ffb': update camera launcher icon
|
5b868a441dcc14dc626c086c4bd7b43d97516ffb |
17-Oct-2013 |
Ari Sachter-Zeltzer <asz@google.com> |
am 839cac61: am 7015ae63: am 66f39483: Merge "update camera launcher icon" into gb-ub-photos-carlsbad * commit '839cac61b1765e7bc53b106c851e7fdeaf57a0dd': update camera launcher icon
|
839cac61b1765e7bc53b106c851e7fdeaf57a0dd |
17-Oct-2013 |
Ari Sachter-Zeltzer <asz@google.com> |
am 7015ae63: am 66f39483: Merge "update camera launcher icon" into gb-ub-photos-carlsbad * commit '7015ae63cfad8305f85c3b55bfa0c12acb18020e': update camera launcher icon
|
367c7c82a22ec007771059beec4aeff3ef96310e |
16-Oct-2013 |
ztenghui <ztenghui@google.com> |
Send an message to decouple the gcam module change. In this particular case, we try to enter GCam module directly which cause the mCameraDevice to become null for photo module. Therefore we post a message to switch into GCam to make sure current mode switch complete first. bug:11252237 Change-Id: Ibd33815e7bee74425faa758247e1dec85a2f17cb
rc/com/android/camera/PhotoModule.java
|
7015ae63cfad8305f85c3b55bfa0c12acb18020e |
17-Oct-2013 |
Ari Sachter-Zeltzer <asz@google.com> |
am 66f39483: Merge "update camera launcher icon" into gb-ub-photos-carlsbad * commit '66f3948315b6bf851dcd5d618d96d6fcda49f159': update camera launcher icon
|
66f3948315b6bf851dcd5d618d96d6fcda49f159 |
17-Oct-2013 |
Ari Sachter-Zeltzer <asz@google.com> |
Merge "update camera launcher icon" into gb-ub-photos-carlsbad
|
f0f6573d60a4e3a9902ba41b1fbd343098882126 |
17-Oct-2013 |
Doris Liu <tianliu@google.com> |
am 99bd2b3c: am 57d192c7: am 1f4e2b9e: am 7bd95307: Merge "Fix shutter covering pie menu" into gb-ub-photos-carlsbad * commit '99bd2b3c282002ce3f3ae5d2607e345ee75fb96c': Fix shutter covering pie menu
|
99bd2b3c282002ce3f3ae5d2607e345ee75fb96c |
17-Oct-2013 |
Doris Liu <tianliu@google.com> |
am 57d192c7: am 1f4e2b9e: am 7bd95307: Merge "Fix shutter covering pie menu" into gb-ub-photos-carlsbad * commit '57d192c7eb8a5ec52e3ff4e329b31b44388702ea': Fix shutter covering pie menu
|
57d192c7eb8a5ec52e3ff4e329b31b44388702ea |
17-Oct-2013 |
Doris Liu <tianliu@google.com> |
am 1f4e2b9e: am 7bd95307: Merge "Fix shutter covering pie menu" into gb-ub-photos-carlsbad * commit '1f4e2b9efbbcd4bcf565f1460907f94b999dacee': Fix shutter covering pie menu
|
1f4e2b9efbbcd4bcf565f1460907f94b999dacee |
16-Oct-2013 |
Doris Liu <tianliu@google.com> |
am 7bd95307: Merge "Fix shutter covering pie menu" into gb-ub-photos-carlsbad * commit '7bd95307ecdca5c7661bc3fb1765313ceb62e92a': Fix shutter covering pie menu
|
7bd95307ecdca5c7661bc3fb1765313ceb62e92a |
16-Oct-2013 |
Doris Liu <tianliu@google.com> |
Merge "Fix shutter covering pie menu" into gb-ub-photos-carlsbad
|
0ba8eaaa5d26f0a806e7bc987676bbc29ad1085c |
16-Oct-2013 |
Doris Liu <tianliu@google.com> |
Fix shutter covering pie menu Bug: 11247988 Change-Id: I2018075a0b8adf7cacb302774ed64df92fc2fa7c
rc/com/android/camera/PhotoUI.java
rc/com/android/camera/ui/RotatableLayout.java
rc/com/android/camera/util/CameraUtil.java
|
e15a2479e7933621a20327975551a115d3c6abf3 |
16-Oct-2013 |
Ari Sachter-Zeltzer <asz@google.com> |
update camera launcher icon fixed b/11252230 Change-Id: I78ef2c748246d7c30849ece2b029150096bc1227
es/mipmap-hdpi/ic_launcher_camera.png
es/mipmap-mdpi/ic_launcher_camera.png
es/mipmap-xhdpi/ic_launcher_camera.png
es/mipmap-xxhdpi/ic_launcher_camera.png
es/mipmap-xxxhdpi/ic_launcher_camera.png
|
3a45c33d74fe0ad0ade9be3d037560a53891c627 |
16-Oct-2013 |
Doris Liu <tianliu@google.com> |
Show a preview cover until real preview is ready Bug: 11211650 Change-Id: Ic4b26ef0f03eac0682e7be0d4bcb1c4632d85f39
es/layout/panorama_module.xml
es/layout/photo_module.xml
es/layout/video_module.xml
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/PhotoUI.java
rc/com/android/camera/VideoModule.java
rc/com/android/camera/VideoUI.java
rc/com/android/camera/WideAnglePanoramaModule.java
rc/com/android/camera/WideAnglePanoramaUI.java
|
b92a5e8cf2c221ac416241fd2c1b5125f14ada8a |
16-Oct-2013 |
Igor Murashkin <iam@google.com> |
am 3102e3dc: am 3a34ec7d: am 4baeda1f: am 5e82f81a: Merge "gcam: Fix AF spinner not to reset when changing position" into gb-ub-photos-carlsbad * commit '3102e3dcf6f19cd89c986d24d0b563f15c4197f1': gcam: Fix AF spinner not to reset when changing position
|
f86ab236e81241db2a906d0a247451bf8bf3c74a |
16-Oct-2013 |
Doris Liu <tianliu@google.com> |
am e897bfd3: am 5813c768: am 6cf14f19: am 08749a4e: Merge "Dismiss switcher popup when shutter button is clicked" into gb-ub-photos-carlsbad * commit 'e897bfd36e5bcdbc2d8cf00f23e531d589e4c09f': Dismiss switcher popup when shutter button is clicked
|
172e58977fcad64f8c33e5cb57a8a34dee0d34d5 |
16-Oct-2013 |
Igor Murashkin <iam@google.com> |
am 1d064e06: am 5e0c9071: am eb1538d7: am d3e75bd7: Merge "CameraUtil: add float clamp function" into gb-ub-photos-carlsbad * commit '1d064e06be80fb71d1b635d72ec1e0979aee4bb3': CameraUtil: add float clamp function
|
bb322187d2e8aab4bcd9b9173ef6c622e73357e0 |
16-Oct-2013 |
Erin Dahlgren <edahlgren@google.com> |
am 4f6611c6: am 02eee819: am f983b7b3: am 177c4b05: Merge "Do not show any bottom controls in secure camera to prevent launching out of app behavior." into gb-ub-photos-carlsbad * commit '4f6611c641c6def93859524e9752681343158400': Do not show any bottom controls in secure camera to prevent launching out of app behavior.
|
3102e3dcf6f19cd89c986d24d0b563f15c4197f1 |
16-Oct-2013 |
Igor Murashkin <iam@google.com> |
am 3a34ec7d: am 4baeda1f: am 5e82f81a: Merge "gcam: Fix AF spinner not to reset when changing position" into gb-ub-photos-carlsbad * commit '3a34ec7d7a5a80198a7e9a4bb4245188245b824a': gcam: Fix AF spinner not to reset when changing position
|
e897bfd36e5bcdbc2d8cf00f23e531d589e4c09f |
16-Oct-2013 |
Doris Liu <tianliu@google.com> |
am 5813c768: am 6cf14f19: am 08749a4e: Merge "Dismiss switcher popup when shutter button is clicked" into gb-ub-photos-carlsbad * commit '5813c768e60edb515f644c75d3927bd80e279b14': Dismiss switcher popup when shutter button is clicked
|
1d064e06be80fb71d1b635d72ec1e0979aee4bb3 |
16-Oct-2013 |
Igor Murashkin <iam@google.com> |
am 5e0c9071: am eb1538d7: am d3e75bd7: Merge "CameraUtil: add float clamp function" into gb-ub-photos-carlsbad * commit '5e0c9071c85b29aba8d40b8b8ea9b45d815d0169': CameraUtil: add float clamp function
|
4f6611c641c6def93859524e9752681343158400 |
16-Oct-2013 |
Erin Dahlgren <edahlgren@google.com> |
am 02eee819: am f983b7b3: am 177c4b05: Merge "Do not show any bottom controls in secure camera to prevent launching out of app behavior." into gb-ub-photos-carlsbad * commit '02eee819bfce48ad79cd7c63cec5757de14209b9': Do not show any bottom controls in secure camera to prevent launching out of app behavior.
|
9ce00c8da2a2222631a7053904861da294f789b5 |
16-Oct-2013 |
The Android Automerger <android-build@google.com> |
merge in klp-release history after reset to klp-dev
|
3a34ec7d7a5a80198a7e9a4bb4245188245b824a |
15-Oct-2013 |
Igor Murashkin <iam@google.com> |
am 4baeda1f: am 5e82f81a: Merge "gcam: Fix AF spinner not to reset when changing position" into gb-ub-photos-carlsbad * commit '4baeda1f643005e11cd2bb4b1103fe487f95ec66': gcam: Fix AF spinner not to reset when changing position
|
4baeda1f643005e11cd2bb4b1103fe487f95ec66 |
15-Oct-2013 |
Igor Murashkin <iam@google.com> |
am 5e82f81a: Merge "gcam: Fix AF spinner not to reset when changing position" into gb-ub-photos-carlsbad * commit '5e82f81a7c7daaf8ac86dbd688b344027f97ff64': gcam: Fix AF spinner not to reset when changing position
|
5e82f81a7c7daaf8ac86dbd688b344027f97ff64 |
15-Oct-2013 |
Igor Murashkin <iam@google.com> |
Merge "gcam: Fix AF spinner not to reset when changing position" into gb-ub-photos-carlsbad
|
c6b9824e0da453cb8b7397078cb5782afabbe2da |
15-Oct-2013 |
Alan Newberger <alann@google.com> |
adjust keyguard camera layout to make buttons match by trial and error adjusted the bottom margins of the controls to make transition to real camera layout seamless on the HH and N4. Bug: 11236276 Change-Id: I707a5b0b94ac466c07b19c84473e444250cecf28
es/layout-port/keyguard_widget.xml
|
7be0e2b8439d525c70cb062c6616d10c4fc004aa |
15-Oct-2013 |
ztenghui <ztenghui@google.com> |
Don't allow swipe into the film strip view when swipe is disabled The swipe is supposed to be intercepted by FilmStripView, however, when the children is not handling the scroll / fling gestures, FilmStripView will still has to handle it. In this case, we need to detect whether or not the swipe has been disabled. bug:11234333 bug:11221594 Change-Id: I1d0fbac65050aef225fb880a41df735e98bf48db
rc/com/android/camera/ui/FilmStripView.java
|
d9b229be6fa942920317fc5e031e803e408adc1d |
15-Oct-2013 |
Igor Murashkin <iam@google.com> |
gcam: Fix AF spinner not to reset when changing position Bug: 10936156 Change-Id: If9b73415e95684e2acbcbc15457e865bd133f366
rc/com/android/camera/ui/PieRenderer.java
|
5813c768e60edb515f644c75d3927bd80e279b14 |
15-Oct-2013 |
Doris Liu <tianliu@google.com> |
am 6cf14f19: am 08749a4e: Merge "Dismiss switcher popup when shutter button is clicked" into gb-ub-photos-carlsbad * commit '6cf14f191d4f590ef564f113856ae6e46704f0ed': Dismiss switcher popup when shutter button is clicked
|
5e0c9071c85b29aba8d40b8b8ea9b45d815d0169 |
15-Oct-2013 |
Igor Murashkin <iam@google.com> |
am eb1538d7: am d3e75bd7: Merge "CameraUtil: add float clamp function" into gb-ub-photos-carlsbad * commit 'eb1538d75e47ed344265aafa1286a192adcb581e': CameraUtil: add float clamp function
|
6cf14f191d4f590ef564f113856ae6e46704f0ed |
15-Oct-2013 |
Doris Liu <tianliu@google.com> |
am 08749a4e: Merge "Dismiss switcher popup when shutter button is clicked" into gb-ub-photos-carlsbad * commit '08749a4ed22c5001aa476a9a30df323b00a6df7d': Dismiss switcher popup when shutter button is clicked
|
08749a4ed22c5001aa476a9a30df323b00a6df7d |
15-Oct-2013 |
Doris Liu <tianliu@google.com> |
Merge "Dismiss switcher popup when shutter button is clicked" into gb-ub-photos-carlsbad
|
eb1538d75e47ed344265aafa1286a192adcb581e |
15-Oct-2013 |
Igor Murashkin <iam@google.com> |
am d3e75bd7: Merge "CameraUtil: add float clamp function" into gb-ub-photos-carlsbad * commit 'd3e75bd748ce2be8fdcb30575bbde9bd07536bd3': CameraUtil: add float clamp function
|
d3e75bd748ce2be8fdcb30575bbde9bd07536bd3 |
15-Oct-2013 |
Igor Murashkin <iam@google.com> |
Merge "CameraUtil: add float clamp function" into gb-ub-photos-carlsbad
|
b7e90f88c7aa1fb5ce35b17ef98a255c06e8d613 |
15-Oct-2013 |
Doris Liu <tianliu@google.com> |
Dismiss switcher popup when shutter button is clicked Bug: 11224722 Change-Id: Id9813c83e22e951f06cb7a885fdb34820f62b545
rc/com/android/camera/PhotoUI.java
|
02eee819bfce48ad79cd7c63cec5757de14209b9 |
15-Oct-2013 |
Erin Dahlgren <edahlgren@google.com> |
am f983b7b3: am 177c4b05: Merge "Do not show any bottom controls in secure camera to prevent launching out of app behavior." into gb-ub-photos-carlsbad * commit 'f983b7b3afdf30de9261f2a6d4c6a4ddb4447c84': Do not show any bottom controls in secure camera to prevent launching out of app behavior.
|
f983b7b3afdf30de9261f2a6d4c6a4ddb4447c84 |
15-Oct-2013 |
Erin Dahlgren <edahlgren@google.com> |
am 177c4b05: Merge "Do not show any bottom controls in secure camera to prevent launching out of app behavior." into gb-ub-photos-carlsbad * commit '177c4b05ed8e9f71afc526e5cad339f245563450': Do not show any bottom controls in secure camera to prevent launching out of app behavior.
|
177c4b05ed8e9f71afc526e5cad339f245563450 |
15-Oct-2013 |
Erin Dahlgren <edahlgren@google.com> |
Merge "Do not show any bottom controls in secure camera to prevent launching out of app behavior." into gb-ub-photos-carlsbad
|
f2f42fe8d311198adb6361eef2cb561a7e9e8750 |
15-Oct-2013 |
Erin Dahlgren <edahlgren@google.com> |
am fee0a72e: am 34e79039: am 5e07d4fc: am 487200db: Merge "Prevent crash after deleting album from Gallery by checking for more null pointers." into gb-ub-photos-carlsbad * commit 'fee0a72e365dd0c42b55c2f3398d9f1d73e447a2': Prevent crash after deleting album from Gallery by checking for more null pointers.
|
3cb2004b2897129c67181316b7c9f62607858618 |
15-Oct-2013 |
Erin Dahlgren <edahlgren@google.com> |
Do not show any bottom controls in secure camera to prevent launching out of app behavior. Bug: 11235651 Change-Id: Iafc0b7930c8c016bd6ab11b13d6572241c5ef074
rc/com/android/camera/ui/FilmStripView.java
|
fee0a72e365dd0c42b55c2f3398d9f1d73e447a2 |
15-Oct-2013 |
Erin Dahlgren <edahlgren@google.com> |
am 34e79039: am 5e07d4fc: am 487200db: Merge "Prevent crash after deleting album from Gallery by checking for more null pointers." into gb-ub-photos-carlsbad * commit '34e79039215fd4c28606132ef1be7eaa1332c5f2': Prevent crash after deleting album from Gallery by checking for more null pointers.
|
34e79039215fd4c28606132ef1be7eaa1332c5f2 |
15-Oct-2013 |
Erin Dahlgren <edahlgren@google.com> |
am 5e07d4fc: am 487200db: Merge "Prevent crash after deleting album from Gallery by checking for more null pointers." into gb-ub-photos-carlsbad * commit '5e07d4fc1a03fcad526d0718ceab11a99f7f8698': Prevent crash after deleting album from Gallery by checking for more null pointers.
|
5e07d4fc1a03fcad526d0718ceab11a99f7f8698 |
15-Oct-2013 |
Erin Dahlgren <edahlgren@google.com> |
am 487200db: Merge "Prevent crash after deleting album from Gallery by checking for more null pointers." into gb-ub-photos-carlsbad * commit '487200db7f4d73e85ae568221d268b46fad19726': Prevent crash after deleting album from Gallery by checking for more null pointers.
|
f26bb76965259f8f2fea1c889643d3868efef686 |
15-Oct-2013 |
Erin Dahlgren <edahlgren@google.com> |
am 487200db: Merge "Prevent crash after deleting album from Gallery by checking for more null pointers." into gb-ub-photos-carlsbad * commit '487200db7f4d73e85ae568221d268b46fad19726': Prevent crash after deleting album from Gallery by checking for more null pointers.
|
487200db7f4d73e85ae568221d268b46fad19726 |
15-Oct-2013 |
Erin Dahlgren <edahlgren@google.com> |
Merge "Prevent crash after deleting album from Gallery by checking for more null pointers." into gb-ub-photos-carlsbad
|
e4da85f660eb3743abd971fa3f5d00da4286f6a0 |
15-Oct-2013 |
ztenghui <ztenghui@google.com> |
am 8ce2d138: am 37ba3571: am df36ec57: am 0e6efbcc: Merge "NPE fix when we failed to open the camera" into gb-ub-photos-carlsbad * commit '8ce2d1388a37d9bd5e3fa05f563598a1481c290b': NPE fix when we failed to open the camera
|
8ce2d1388a37d9bd5e3fa05f563598a1481c290b |
15-Oct-2013 |
ztenghui <ztenghui@google.com> |
am 37ba3571: am df36ec57: am 0e6efbcc: Merge "NPE fix when we failed to open the camera" into gb-ub-photos-carlsbad * commit '37ba3571d7e0c6c6d6d5ae9bbf0cee989436f319': NPE fix when we failed to open the camera
|
37ba3571d7e0c6c6d6d5ae9bbf0cee989436f319 |
15-Oct-2013 |
ztenghui <ztenghui@google.com> |
am df36ec57: am 0e6efbcc: Merge "NPE fix when we failed to open the camera" into gb-ub-photos-carlsbad * commit 'df36ec57043d160dd6191acd9d7d9100314d78b6': NPE fix when we failed to open the camera
|
df36ec57043d160dd6191acd9d7d9100314d78b6 |
15-Oct-2013 |
ztenghui <ztenghui@google.com> |
am 0e6efbcc: Merge "NPE fix when we failed to open the camera" into gb-ub-photos-carlsbad * commit '0e6efbccdb196ef0847e00b23165ed94a77c9f3d': NPE fix when we failed to open the camera
|
bd1ab9e4f0432c132706f4533729cec9d032f544 |
15-Oct-2013 |
ztenghui <ztenghui@google.com> |
am 0e6efbcc: Merge "NPE fix when we failed to open the camera" into gb-ub-photos-carlsbad * commit '0e6efbccdb196ef0847e00b23165ed94a77c9f3d': NPE fix when we failed to open the camera
|
0e6efbccdb196ef0847e00b23165ed94a77c9f3d |
15-Oct-2013 |
ztenghui <ztenghui@google.com> |
Merge "NPE fix when we failed to open the camera" into gb-ub-photos-carlsbad
|
f9ef1ae9d31977c106eefc7ab1a74158bcdcfd39 |
15-Oct-2013 |
Erin Dahlgren <edahlgren@google.com> |
Prevent crash after deleting album from Gallery by checking for more null pointers. Bug: 10950130 Change-Id: I284e2016676e15c7f2ad23de71a965ab50c5d743
rc/com/android/camera/ui/FilmStripView.java
|
1a445017e1365f3da24359e60d48e59bb092d6b2 |
15-Oct-2013 |
The Android Automerger <android-build@google.com> |
merge in klp-release history after reset to klp-dev
|
2f722f2e75d0fa14f00710bf4c5f29940b0afc36 |
15-Oct-2013 |
Mangesh Ghiware <mghiware@google.com> |
am 3c2a2701: am 2abaa8ed: am 5152eb13: am 4f4a1678: Fix Camera2 build. * commit '3c2a2701777c1ccb5b067be6ef5b9e0f1ad2efee': Fix Camera2 build.
|
c5bbddc3d5d9486d246fab41f0cd2864c559c40b |
15-Oct-2013 |
Mangesh Ghiware <mghiware@google.com> |
am 376d5c8e: am 3d6c8291: am 5782f4c1: am 2d939fe7: Use Gallery intents by default. * commit '376d5c8e814e3c403e808eae29e5bf58f26aa8d8': Use Gallery intents by default.
|
31443ab48ca5ab9b65f4a013346e6dc8049042d0 |
15-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
am 4e587d83: am 78d2c5a3: am 85beb3cb: am d8b555b8: Merge "Updating shutter button resources" into gb-ub-photos-carlsbad * commit '4e587d834902918d1d417687d5b691573b21144e': Updating shutter button resources
|
0d26bb989280fbc777c3af497b6fab06aeed562f |
15-Oct-2013 |
Erin Dahlgren <edahlgren@google.com> |
am 1c950cc2: am 2be61f66: am dfca664a: am 831da613: Merge "Set camera controls visibility based on whether the camera preview is centered." into gb-ub-photos-carlsbad * commit '1c950cc26a213c08715ee7a7d9fa7265826277bb': Set camera controls visibility based on whether the camera preview is centered.
|
9bf7cdd4138a21099e7e747b66aba61861ed4a43 |
15-Oct-2013 |
Baligh Uddin <baligh@google.com> |
am c906bf82: (-s ours) am 8b3398ed: (-s ours) am 62cfac54: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit 'c906bf82d1a49c743914793bf12013581b1f19a6': Import translations. DO NOT MERGE
|
f93fa4647ba8d90d5163f41cb5f5861d2af16065 |
15-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
am d6b84c0a: am f294584d: am 147887f4: am 2670f3e4: Updating button assets, follow-up to http://ag/373177 * commit 'd6b84c0aa8f427b9fc8ab64f0256698dffcc388e': Updating button assets, follow-up to http://ag/373177
|
6cb540f33cf1313c5a15dfa0d679faf234cb3b62 |
15-Oct-2013 |
Doris Liu <tianliu@google.com> |
am 38e32e0f: am c74eee91: am 713cb961: am ce75de57: Merge "Fix SRI upside down preview in reverse landscape and reverse portrait" into gb-ub-photos-carlsbad * commit '38e32e0fdd2cab77d1805502cc186ee529cf6348': Fix SRI upside down preview in reverse landscape and reverse portrait
|
f950ab32c6091d49935f708da420ca43c305a8c2 |
15-Oct-2013 |
ztenghui <ztenghui@google.com> |
am 8d516822: am ac6fffd7: am 46132e66: am b27668f0: Merge "Only delete the Uri coming from onMediaSaved" into gb-ub-photos-carlsbad * commit '8d516822fd559404020585b2ae157345bd13b422': Only delete the Uri coming from onMediaSaved
|
3c2a2701777c1ccb5b067be6ef5b9e0f1ad2efee |
15-Oct-2013 |
Mangesh Ghiware <mghiware@google.com> |
am 2abaa8ed: am 5152eb13: am 4f4a1678: Fix Camera2 build. * commit '2abaa8ed5e6ff56ca19d47b3d878f3b5597ca0b4': Fix Camera2 build.
|
2abaa8ed5e6ff56ca19d47b3d878f3b5597ca0b4 |
15-Oct-2013 |
Mangesh Ghiware <mghiware@google.com> |
am 5152eb13: am 4f4a1678: Fix Camera2 build. * commit '5152eb131ed75629746b1bbc0302cb0f5c56c214': Fix Camera2 build.
|
5152eb131ed75629746b1bbc0302cb0f5c56c214 |
15-Oct-2013 |
Mangesh Ghiware <mghiware@google.com> |
am 4f4a1678: Fix Camera2 build. * commit '4f4a16782537f6eb08c5cc3ed76831312770e170': Fix Camera2 build.
|
379b6122aefc3cf8117e6f303117e47fb698d496 |
15-Oct-2013 |
Mangesh Ghiware <mghiware@google.com> |
am 4f4a1678: Fix Camera2 build. * commit '4f4a16782537f6eb08c5cc3ed76831312770e170': Fix Camera2 build.
|
4f4a16782537f6eb08c5cc3ed76831312770e170 |
15-Oct-2013 |
Mangesh Ghiware <mghiware@google.com> |
Fix Camera2 build. Bug: 11226016 Change-Id: Ib667e52a150ffad44575ea97174f9d13de1d7b5e
rc_pd/com/android/camera/util/IntentHelper.java
|
376d5c8e814e3c403e808eae29e5bf58f26aa8d8 |
15-Oct-2013 |
Mangesh Ghiware <mghiware@google.com> |
am 3d6c8291: am 5782f4c1: am 2d939fe7: Use Gallery intents by default. * commit '3d6c8291372daa11ba72e2fd0f760698a4b39f78': Use Gallery intents by default.
|
3d6c8291372daa11ba72e2fd0f760698a4b39f78 |
15-Oct-2013 |
Mangesh Ghiware <mghiware@google.com> |
am 5782f4c1: am 2d939fe7: Use Gallery intents by default. * commit '5782f4c1fedf9e608a2aa6e42c7d933a665ca842': Use Gallery intents by default.
|
5782f4c1fedf9e608a2aa6e42c7d933a665ca842 |
15-Oct-2013 |
Mangesh Ghiware <mghiware@google.com> |
am 2d939fe7: Use Gallery intents by default. * commit '2d939fe70e52ba4805c6783b01530c8c1c67fb33': Use Gallery intents by default.
|
366a04d7ce3d8d6d54b257784755d77071cb4061 |
15-Oct-2013 |
Mangesh Ghiware <mghiware@google.com> |
am 2d939fe7: Use Gallery intents by default. * commit '2d939fe70e52ba4805c6783b01530c8c1c67fb33': Use Gallery intents by default.
|
2d939fe70e52ba4805c6783b01530c8c1c67fb33 |
15-Oct-2013 |
Mangesh Ghiware <mghiware@google.com> |
Use Gallery intents by default. Bug: 11226016 Change-Id: I4f6a5856dd8141930fb0fef19b9ded0b37ea1ce5
rc/com/android/camera/util/CameraUtil.java
rc_pd/com/android/camera/util/IntentHelper.java
|
4e587d834902918d1d417687d5b691573b21144e |
15-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
am 78d2c5a3: am 85beb3cb: am d8b555b8: Merge "Updating shutter button resources" into gb-ub-photos-carlsbad * commit '78d2c5a3b9da6df9f4d36f0b12641450a69fe439': Updating shutter button resources
|
78d2c5a3b9da6df9f4d36f0b12641450a69fe439 |
15-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
am 85beb3cb: am d8b555b8: Merge "Updating shutter button resources" into gb-ub-photos-carlsbad * commit '85beb3cb658799492ccb08828ea85bf1eab09d57': Updating shutter button resources
|
85beb3cb658799492ccb08828ea85bf1eab09d57 |
15-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
am d8b555b8: Merge "Updating shutter button resources" into gb-ub-photos-carlsbad * commit 'd8b555b801c5e57bfbeca27ef38bea7688286c3c': Updating shutter button resources
|
d5ad4b9bc1d58a17a99d5ca47a194fdaa8c25139 |
15-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
am d8b555b8: Merge "Updating shutter button resources" into gb-ub-photos-carlsbad * commit 'd8b555b801c5e57bfbeca27ef38bea7688286c3c': Updating shutter button resources
|
d8b555b801c5e57bfbeca27ef38bea7688286c3c |
15-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
Merge "Updating shutter button resources" into gb-ub-photos-carlsbad
|
1c950cc26a213c08715ee7a7d9fa7265826277bb |
15-Oct-2013 |
Erin Dahlgren <edahlgren@google.com> |
am 2be61f66: am dfca664a: am 831da613: Merge "Set camera controls visibility based on whether the camera preview is centered." into gb-ub-photos-carlsbad * commit '2be61f6624fcb060ff110a1ae3b4e6e981cba03c': Set camera controls visibility based on whether the camera preview is centered.
|
c906bf82d1a49c743914793bf12013581b1f19a6 |
15-Oct-2013 |
Baligh Uddin <baligh@google.com> |
am 8b3398ed: (-s ours) am 62cfac54: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '8b3398edf816afa57989f5e4f00bee7fcae7cae1': Import translations. DO NOT MERGE
|
d6b84c0aa8f427b9fc8ab64f0256698dffcc388e |
15-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
am f294584d: am 147887f4: am 2670f3e4: Updating button assets, follow-up to http://ag/373177 * commit 'f294584d91f07c4b4eaa15071acb3ca85862dec0': Updating button assets, follow-up to http://ag/373177
|
38e32e0fdd2cab77d1805502cc186ee529cf6348 |
15-Oct-2013 |
Doris Liu <tianliu@google.com> |
am c74eee91: am 713cb961: am ce75de57: Merge "Fix SRI upside down preview in reverse landscape and reverse portrait" into gb-ub-photos-carlsbad * commit 'c74eee91dcfe5c8772402a33715deeaece2dfad9': Fix SRI upside down preview in reverse landscape and reverse portrait
|
8d516822fd559404020585b2ae157345bd13b422 |
15-Oct-2013 |
ztenghui <ztenghui@google.com> |
am ac6fffd7: am 46132e66: am b27668f0: Merge "Only delete the Uri coming from onMediaSaved" into gb-ub-photos-carlsbad * commit 'ac6fffd72855b2a6f3048a03981dcfe4e0f3fd82': Only delete the Uri coming from onMediaSaved
|
2be61f6624fcb060ff110a1ae3b4e6e981cba03c |
15-Oct-2013 |
Erin Dahlgren <edahlgren@google.com> |
am dfca664a: am 831da613: Merge "Set camera controls visibility based on whether the camera preview is centered." into gb-ub-photos-carlsbad * commit 'dfca664afdd86ef55c00cca88fca64c980cf6c4f': Set camera controls visibility based on whether the camera preview is centered.
|
8b3398edf816afa57989f5e4f00bee7fcae7cae1 |
15-Oct-2013 |
Baligh Uddin <baligh@google.com> |
am 62cfac54: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '62cfac546902d151682e873d83c34e42fa17fee1': Import translations. DO NOT MERGE
|
f294584d91f07c4b4eaa15071acb3ca85862dec0 |
15-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
am 147887f4: am 2670f3e4: Updating button assets, follow-up to http://ag/373177 * commit '147887f44ab581a6260e8b1f56cf17642befaa72': Updating button assets, follow-up to http://ag/373177
|
c74eee91dcfe5c8772402a33715deeaece2dfad9 |
15-Oct-2013 |
Doris Liu <tianliu@google.com> |
am 713cb961: am ce75de57: Merge "Fix SRI upside down preview in reverse landscape and reverse portrait" into gb-ub-photos-carlsbad * commit '713cb9613607b64276edb2bf0c27afd399bc0cdf': Fix SRI upside down preview in reverse landscape and reverse portrait
|
ac6fffd72855b2a6f3048a03981dcfe4e0f3fd82 |
15-Oct-2013 |
ztenghui <ztenghui@google.com> |
am 46132e66: am b27668f0: Merge "Only delete the Uri coming from onMediaSaved" into gb-ub-photos-carlsbad * commit '46132e66c8bb467843a13cc0b8d45a13dbe382b8': Only delete the Uri coming from onMediaSaved
|
dfca664afdd86ef55c00cca88fca64c980cf6c4f |
15-Oct-2013 |
Erin Dahlgren <edahlgren@google.com> |
am 831da613: Merge "Set camera controls visibility based on whether the camera preview is centered." into gb-ub-photos-carlsbad * commit '831da6132122d9d9a35183ef832994be659c3740': Set camera controls visibility based on whether the camera preview is centered.
|
65f365b1df3122f4c36ac755e419b9439fec608c |
15-Oct-2013 |
Erin Dahlgren <edahlgren@google.com> |
am 831da613: Merge "Set camera controls visibility based on whether the camera preview is centered." into gb-ub-photos-carlsbad * commit '831da6132122d9d9a35183ef832994be659c3740': Set camera controls visibility based on whether the camera preview is centered.
|
526177c0613be147761087ae3d3cc884d408a560 |
15-Oct-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE"
|
62cfac546902d151682e873d83c34e42fa17fee1 |
15-Oct-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into klp-dev
|
6bcb59753ad5763c8450737e56ce5c9ba4b57bb7 |
15-Oct-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-denali
|
831da6132122d9d9a35183ef832994be659c3740 |
15-Oct-2013 |
Erin Dahlgren <edahlgren@google.com> |
Merge "Set camera controls visibility based on whether the camera preview is centered." into gb-ub-photos-carlsbad
|
ef01a315078587883d3c800d31df6af302b702a9 |
15-Oct-2013 |
ztenghui <ztenghui@google.com> |
NPE fix when we failed to open the camera At the same time, some error check code never get turned on. Remove those stale codes and make sure we check the CameraDevice for null correctly. We didn't intensively log the error here since they should be logged by the CameraOpenErrorCallback already. bug:11215576 Change-Id: Ib1e1b9011a169607b719c833d6d5eddbd9be8a9d
rc/com/android/camera/VideoModule.java
|
80df72b187ec90e7976c3256cc9dadcf44bc8fe5 |
15-Oct-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I255007f4c6cc024816b1566e1edfa17da40bbfc3 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-km-rKH/strings.xml
es/values-ko/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mn-rMN/strings.xml
es/values-ms-rMY/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
591d51a52fcf66c8faa5188a9730f35649b355b4 |
15-Oct-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I80c7902d8de92127a13f6d2f66452c876090a7ac Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-km-rKH/strings.xml
es/values-ko/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mn-rMN/strings.xml
es/values-ms-rMY/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
f27a557dcee42548b685419d5ac3f58b119dc163 |
15-Oct-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ibc5c567dda829b1bbfd58bb94025c6695cb88450 Auto-generated-cl: translation import
es/values-am/strings.xml
es/values-ca/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-it/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-uk/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
3543879bf2d59feae5ded9e5709d40fe33925746 |
14-Oct-2013 |
ztenghui <ztenghui@google.com> |
Only delete the Uri coming from onMediaSaved The incoming Uri can be null, or a file Uri, which we don't want to delete. The Uri from onMediaSaved has been inserted to the MediaStore and pass null check. bug:11218007 Change-Id: Ie4b08cae94e22a8014ea2436f0a82eba2541a667
rc/com/android/camera/VideoModule.java
|
33d782eef5034385b0dbd75a7e7ae70a29b4cc39 |
15-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
Updating shutter button resources Bug: 11155984 Change-Id: I178938250d2f99e32c9c339f3ffdf4495c053361
es/drawable-sw600dp-hdpi-v19/btn_shutter_default.png
es/drawable-sw600dp-hdpi-v19/btn_shutter_default_disabled.png
es/drawable-sw600dp-hdpi-v19/btn_shutter_pressed.png
es/drawable-sw600dp-hdpi-v19/btn_shutter_pressed_disabled.png
es/drawable-sw600dp-hdpi-v19/btn_shutter_recording.png
es/drawable-sw600dp-hdpi-v19/btn_shutter_video_default.png
es/drawable-sw600dp-hdpi-v19/btn_shutter_video_pressed.png
es/drawable-sw600dp-hdpi-v19/btn_shutter_video_recording.png
es/drawable-sw600dp-hdpi/btn_shutter_default.png
es/drawable-sw600dp-hdpi/btn_shutter_default_disabled.png
es/drawable-sw600dp-hdpi/btn_shutter_pressed.png
es/drawable-sw600dp-hdpi/btn_shutter_pressed_disabled.png
es/drawable-sw600dp-hdpi/btn_shutter_recording.png
es/drawable-sw600dp-hdpi/btn_shutter_video_default.png
es/drawable-sw600dp-hdpi/btn_shutter_video_pressed.png
es/drawable-sw600dp-hdpi/btn_shutter_video_recording.png
es/drawable-sw600dp-mdpi-v19/btn_shutter_default.png
es/drawable-sw600dp-mdpi-v19/btn_shutter_default_disabled.png
es/drawable-sw600dp-mdpi-v19/btn_shutter_pressed.png
es/drawable-sw600dp-mdpi-v19/btn_shutter_pressed_disabled.png
es/drawable-sw600dp-mdpi-v19/btn_shutter_recording.png
es/drawable-sw600dp-mdpi-v19/btn_shutter_video_default.png
es/drawable-sw600dp-mdpi-v19/btn_shutter_video_pressed.png
es/drawable-sw600dp-mdpi-v19/btn_shutter_video_recording.png
es/drawable-sw600dp-mdpi/btn_shutter_default.png
es/drawable-sw600dp-mdpi/btn_shutter_default_disabled.png
es/drawable-sw600dp-mdpi/btn_shutter_pressed.png
es/drawable-sw600dp-mdpi/btn_shutter_pressed_disabled.png
es/drawable-sw600dp-mdpi/btn_shutter_recording.png
es/drawable-sw600dp-mdpi/btn_shutter_video_default.png
es/drawable-sw600dp-mdpi/btn_shutter_video_pressed.png
es/drawable-sw600dp-mdpi/btn_shutter_video_recording.png
es/drawable-sw600dp-xhdpi-v19/btn_shutter_default.png
es/drawable-sw600dp-xhdpi-v19/btn_shutter_default_disabled.png
es/drawable-sw600dp-xhdpi-v19/btn_shutter_pressed.png
es/drawable-sw600dp-xhdpi-v19/btn_shutter_pressed_disabled.png
es/drawable-sw600dp-xhdpi-v19/btn_shutter_recording.png
es/drawable-sw600dp-xhdpi-v19/btn_shutter_video_default.png
es/drawable-sw600dp-xhdpi-v19/btn_shutter_video_pressed.png
es/drawable-sw600dp-xhdpi-v19/btn_shutter_video_recording.png
es/drawable-sw600dp-xhdpi/btn_shutter_default.png
es/drawable-sw600dp-xhdpi/btn_shutter_default_disabled.png
es/drawable-sw600dp-xhdpi/btn_shutter_pressed.png
es/drawable-sw600dp-xhdpi/btn_shutter_pressed_disabled.png
es/drawable-sw600dp-xhdpi/btn_shutter_recording.png
es/drawable-sw600dp-xhdpi/btn_shutter_video_default.png
es/drawable-sw600dp-xhdpi/btn_shutter_video_pressed.png
es/drawable-sw600dp-xhdpi/btn_shutter_video_recording.png
es/drawable-sw600dp-xxhdpi-v19/btn_shutter_default.png
es/drawable-sw600dp-xxhdpi-v19/btn_shutter_default_disabled.png
es/drawable-sw600dp-xxhdpi-v19/btn_shutter_pressed.png
es/drawable-sw600dp-xxhdpi-v19/btn_shutter_pressed_disabled.png
es/drawable-sw600dp-xxhdpi-v19/btn_shutter_recording.png
es/drawable-sw600dp-xxhdpi-v19/btn_shutter_video_default.png
es/drawable-sw600dp-xxhdpi-v19/btn_shutter_video_pressed.png
es/drawable-sw600dp-xxhdpi-v19/btn_shutter_video_recording.png
es/drawable-sw600dp-xxhdpi/btn_shutter_default.png
es/drawable-sw600dp-xxhdpi/btn_shutter_default_disabled.png
es/drawable-sw600dp-xxhdpi/btn_shutter_pressed.png
es/drawable-sw600dp-xxhdpi/btn_shutter_pressed_disabled.png
es/drawable-sw600dp-xxhdpi/btn_shutter_recording.png
es/drawable-sw600dp-xxhdpi/btn_shutter_video_default.png
es/drawable-sw600dp-xxhdpi/btn_shutter_video_pressed.png
es/drawable-sw600dp-xxhdpi/btn_shutter_video_recording.png
|
160b036386b1b60ff3fce9742ce66bfcd54d6430 |
14-Oct-2013 |
Igor Murashkin <iam@google.com> |
CameraUtil: add float clamp function Bug: 10936156 Change-Id: I5fbaf399ed8ca0206d23aa7d0af11c9b8a1debe5
rc/com/android/camera/util/CameraUtil.java
|
7a72b91b5c86b85cedbd51566b038fe310590a27 |
14-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
am 2670f3e4: Updating button assets, follow-up to http://ag/373177 * commit '2670f3e45f5818f7c1074b10ef336df30af74583': Updating button assets, follow-up to http://ag/373177
|
147887f44ab581a6260e8b1f56cf17642befaa72 |
14-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
am 2670f3e4: Updating button assets, follow-up to http://ag/373177 * commit '2670f3e45f5818f7c1074b10ef336df30af74583': Updating button assets, follow-up to http://ag/373177
|
2670f3e45f5818f7c1074b10ef336df30af74583 |
13-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
Updating button assets, follow-up to http://ag/373177 Bug: 11155984 Change-Id: Ib1cbf5cf53f30e45751804f6d9d25afa127df99a
es/drawable-sw600dp-hdpi-v19/btn_shutter_default.png
es/drawable-sw600dp-hdpi-v19/btn_shutter_pressed.png
es/drawable-sw600dp-hdpi-v19/btn_shutter_recording.png
es/drawable-sw600dp-hdpi-v19/btn_shutter_video_default.png
es/drawable-sw600dp-hdpi-v19/btn_shutter_video_pressed.png
es/drawable-sw600dp-hdpi-v19/btn_shutter_video_recording.png
es/drawable-sw600dp-hdpi-v19/switcher_bg.9.png
es/drawable-sw600dp-mdpi-v19/btn_shutter_video_pressed.png
es/drawable-sw600dp-xhdpi-v19/btn_shutter_video_pressed.png
es/drawable-sw600dp-xxhdpi-v19/btn_shutter_video_pressed.png
|
713cb9613607b64276edb2bf0c27afd399bc0cdf |
14-Oct-2013 |
Doris Liu <tianliu@google.com> |
am ce75de57: Merge "Fix SRI upside down preview in reverse landscape and reverse portrait" into gb-ub-photos-carlsbad * commit 'ce75de57dca5398b7786ad7262cb016e5f6b24ee': Fix SRI upside down preview in reverse landscape and reverse portrait
|
f0637d7c10d6f9502f4508eec732adb1aa6ee30c |
14-Oct-2013 |
Doris Liu <tianliu@google.com> |
am ce75de57: Merge "Fix SRI upside down preview in reverse landscape and reverse portrait" into gb-ub-photos-carlsbad * commit 'ce75de57dca5398b7786ad7262cb016e5f6b24ee': Fix SRI upside down preview in reverse landscape and reverse portrait
|
ce75de57dca5398b7786ad7262cb016e5f6b24ee |
14-Oct-2013 |
Doris Liu <tianliu@google.com> |
Merge "Fix SRI upside down preview in reverse landscape and reverse portrait" into gb-ub-photos-carlsbad
|
3044d8c577432d6e9721fc8b26ac2afbbaf21266 |
11-Oct-2013 |
Erin Dahlgren <edahlgren@google.com> |
Set camera controls visibility based on whether the camera preview is centered. Bug: 10861015 Change-Id: Ib0c4945e35cee16b73a4bba913e11d0f79a26176
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/CameraModule.java
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/PhotoUI.java
rc/com/android/camera/VideoModule.java
rc/com/android/camera/VideoUI.java
rc/com/android/camera/WideAnglePanoramaModule.java
rc/com/android/camera/WideAnglePanoramaUI.java
rc/com/android/camera/ui/FilmStripView.java
|
46132e66c8bb467843a13cc0b8d45a13dbe382b8 |
14-Oct-2013 |
ztenghui <ztenghui@google.com> |
am b27668f0: Merge "Only delete the Uri coming from onMediaSaved" into gb-ub-photos-carlsbad * commit 'b27668f0d0a1d5049759a8448e1701e199e05c71': Only delete the Uri coming from onMediaSaved
|
8ec57b6453fc38eafd2f5e7f986087facb92bdd7 |
14-Oct-2013 |
ztenghui <ztenghui@google.com> |
am b27668f0: Merge "Only delete the Uri coming from onMediaSaved" into gb-ub-photos-carlsbad * commit 'b27668f0d0a1d5049759a8448e1701e199e05c71': Only delete the Uri coming from onMediaSaved
|
b27668f0d0a1d5049759a8448e1701e199e05c71 |
14-Oct-2013 |
ztenghui <ztenghui@google.com> |
Merge "Only delete the Uri coming from onMediaSaved" into gb-ub-photos-carlsbad
|
70bd024ea2019da185de5c999fd50beb0e30215e |
14-Oct-2013 |
ztenghui <ztenghui@google.com> |
Only delete the Uri coming from onMediaSaved The incoming Uri can be null, or a file Uri, which we don't want to delete. The Uri from onMediaSaved has been inserted to the MediaStore and pass null check. bug:11218007 Change-Id: Ie4b08cae94e22a8014ea2436f0a82eba2541a667
rc/com/android/camera/VideoModule.java
|
352b014552d77948193d84ec177c7673552eb1ee |
14-Oct-2013 |
Doris Liu <tianliu@google.com> |
Fix SRI upside down preview in reverse landscape and reverse portrait Also make sure preview is not upside down after device flip, and fix camera controls jiggering during rotation Bug: 11216647 Bug: 11174540 Change-Id: I764e5b86549fa87c2224d8e85ff06f57f0a315d1
es/layout/panorama_module.xml
rc/com/android/camera/WideAnglePanoramaModule.java
rc/com/android/camera/WideAnglePanoramaUI.java
|
e70b02274a5dfb791ab54a4be9cfb5ed42ad51a3 |
14-Oct-2013 |
Angus Kong <shkong@google.com> |
am 21018360: am e75d5db8: am 4a0a1ff8: am ae169730: Merge "Ignore clicks on disabled pie menu items." into gb-ub-photos-carlsbad * commit '21018360c934db4661a4f3c7f84ee7cde4871401': Ignore clicks on disabled pie menu items.
|
7657e5cd14bfd2fb610884b0864c7cbd683c9808 |
14-Oct-2013 |
Angus Kong <shkong@google.com> |
am 01084cdb: am 38ddd91e: am 7da0c4cd: am 24d94d61: Merge "Workaround to prevent the data focus callback." into gb-ub-photos-carlsbad * commit '01084cdb183aad8506c88feb8f745eb1e63f99f7': Workaround to prevent the data focus callback.
|
08fc713a769f26f33250bbdec15f78d68676d819 |
14-Oct-2013 |
Alan Newberger <alann@google.com> |
am 049d6337: am fa44b8ec: am ae9a7783: am 28019abc: Change keyguard camera layout to show no menu options in indicator * commit '049d6337952bce6100e174ffdbbfbf9bf9b284e8': Change keyguard camera layout to show no menu options in indicator
|
1c92e2c2245303f7aad9ffc41843adf92c27965c |
14-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
am a435a073: am d762e17f: am 23a2aa99: am 704530ed: Merge "Add \'disabled\' state for when Gcam is unable to take another shot." into gb-ub-photos-carlsbad * commit 'a435a073f422d169e581feeb44a4f8e131d74b64': Add 'disabled' state for when Gcam is unable to take another shot.
|
e555ca19459b222fe2196647d9813d2576dacc8b |
14-Oct-2013 |
Doris Liu <tianliu@google.com> |
am c3bb004e: am d3316978: am 33120140: am c937ab7f: Merge "Fix for mis-placed camera controls" into gb-ub-photos-carlsbad * commit 'c3bb004e141911ca30b0fb717737eba978d4bcd5': Fix for mis-placed camera controls
|
b727b149035f9107ecf321e8f6513343d5b09bad |
14-Oct-2013 |
Angus Kong <shkong@google.com> |
am c6805c7f: am 252c76a8: am 22b0d455: am 2d5c7478: Don\'t load data when it\'s secure camera. * commit 'c6805c7f7a3817980b297b5c8b5ece315a12874a': Don't load data when it's secure camera.
|
8b87e7bdfb8c750ba51a6d0c7f8abfeb78cc94ca |
14-Oct-2013 |
Angus Kong <shkong@google.com> |
am 33fd2fd8: am 6b0fd1f5: am 8fa9c2b5: am f1582c9c: Adjust the position after layout change. * commit '33fd2fd8f4f5772cd30a6eff44d39c920f9e59ae': Adjust the position after layout change.
|
0311ef9b11afc1cbfeac9200147a1c377e00d7c1 |
14-Oct-2013 |
Baligh Uddin <baligh@google.com> |
am c22619b2: (-s ours) am e4a63aa1: (-s ours) am 8052407d: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit 'c22619b2af71276e2d714129ab07948c6e08436a': Import translations. DO NOT MERGE
|
73065a06a48de79beee68bd826c8eeb526476b9c |
14-Oct-2013 |
Doris Liu <tianliu@google.com> |
am 2222f0ac: am 3f8ba6d4: am 193da1b0: am a5002410: Merge "Correct initial orientation of camera controls" into gb-ub-photos-carlsbad * commit '2222f0ac4688958b9fb4e1b3ccb3210e1d000e6f': Correct initial orientation of camera controls
|
5060a1d7ce10ae5988908eef698e7ba2afd17f81 |
14-Oct-2013 |
ztenghui <ztenghui@google.com> |
am 1f23079a: am 2337cc64: am 25d6a81e: am 27562534: Merge "Finish the secure camera activity when user try to play a video." into gb-ub-photos-carlsbad * commit '1f23079a272f6605d8c8a9b22ec2f268ebd4dccd': Finish the secure camera activity when user try to play a video.
|
f1102c6d5152f09b1a50df916cfe970c4e048581 |
14-Oct-2013 |
Doris Liu <tianliu@google.com> |
am d4ddb980: am 9ab431e5: am 3a6c47dd: am 87d093d6: Merge "Bring full screen window flag back to camera" into gb-ub-photos-carlsbad * commit 'd4ddb980eb3b92a550e89664f847d63752908fb9': Bring full screen window flag back to camera
|
5606728dc4052367a4404f25f4de7805fe7fa4e8 |
14-Oct-2013 |
Seth Raphael <magicseth@google.com> |
am 9a5a2c5b: am f6ed47dc: am c065ae53: am 3772d2f4: restore Usage Statistics * commit '9a5a2c5b2236a36ffebc74e2f6454349b897c268': restore Usage Statistics
|
180f009b254c887c225bb1754b40b7d0bde75076 |
14-Oct-2013 |
The Android Automerger <android-build@google.com> |
merge in klp-release history after reset to klp-dev
|
21018360c934db4661a4f3c7f84ee7cde4871401 |
14-Oct-2013 |
Angus Kong <shkong@google.com> |
am e75d5db8: am 4a0a1ff8: am ae169730: Merge "Ignore clicks on disabled pie menu items." into gb-ub-photos-carlsbad * commit 'e75d5db82883bcf58f0432a31f36157c6d20c543': Ignore clicks on disabled pie menu items.
|
e75d5db82883bcf58f0432a31f36157c6d20c543 |
14-Oct-2013 |
Angus Kong <shkong@google.com> |
am 4a0a1ff8: am ae169730: Merge "Ignore clicks on disabled pie menu items." into gb-ub-photos-carlsbad * commit '4a0a1ff8311b61f4bfeb79b27857b300e41a4859': Ignore clicks on disabled pie menu items.
|
4a0a1ff8311b61f4bfeb79b27857b300e41a4859 |
14-Oct-2013 |
Angus Kong <shkong@google.com> |
am ae169730: Merge "Ignore clicks on disabled pie menu items." into gb-ub-photos-carlsbad * commit 'ae1697302b4ef59bbfebdf1127bc73531ce550b7': Ignore clicks on disabled pie menu items.
|
b0b60370c3b36f3e8b3bd1aa515837a64cf0a7f6 |
14-Oct-2013 |
Angus Kong <shkong@google.com> |
am ae169730: Merge "Ignore clicks on disabled pie menu items." into gb-ub-photos-carlsbad * commit 'ae1697302b4ef59bbfebdf1127bc73531ce550b7': Ignore clicks on disabled pie menu items.
|
01084cdb183aad8506c88feb8f745eb1e63f99f7 |
14-Oct-2013 |
Angus Kong <shkong@google.com> |
am 38ddd91e: am 7da0c4cd: am 24d94d61: Merge "Workaround to prevent the data focus callback." into gb-ub-photos-carlsbad * commit '38ddd91eda82d61274a9849f67d03251146ab2c6': Workaround to prevent the data focus callback.
|
38ddd91eda82d61274a9849f67d03251146ab2c6 |
14-Oct-2013 |
Angus Kong <shkong@google.com> |
am 7da0c4cd: am 24d94d61: Merge "Workaround to prevent the data focus callback." into gb-ub-photos-carlsbad * commit '7da0c4cda65e2d8b22e0324ebbe34696a0750993': Workaround to prevent the data focus callback.
|
ae1697302b4ef59bbfebdf1127bc73531ce550b7 |
14-Oct-2013 |
Angus Kong <shkong@google.com> |
Merge "Ignore clicks on disabled pie menu items." into gb-ub-photos-carlsbad
|
7da0c4cda65e2d8b22e0324ebbe34696a0750993 |
14-Oct-2013 |
Angus Kong <shkong@google.com> |
am 24d94d61: Merge "Workaround to prevent the data focus callback." into gb-ub-photos-carlsbad * commit '24d94d6140ee5ecdf66b28218e8dd9dfe5edfb19': Workaround to prevent the data focus callback.
|
c0f42717d9c54f9a7ee6fb88f58aeff61615b695 |
14-Oct-2013 |
Angus Kong <shkong@google.com> |
am 24d94d61: Merge "Workaround to prevent the data focus callback." into gb-ub-photos-carlsbad * commit '24d94d6140ee5ecdf66b28218e8dd9dfe5edfb19': Workaround to prevent the data focus callback.
|
24d94d6140ee5ecdf66b28218e8dd9dfe5edfb19 |
14-Oct-2013 |
Angus Kong <shkong@google.com> |
Merge "Workaround to prevent the data focus callback." into gb-ub-photos-carlsbad
|
ab1c93722391e4cba4446658bdfeeb71aa4d05b1 |
14-Oct-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Iae1b919338b9f9b4d8c84807fa10501c47267ea2 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-cs/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-iw/strings.xml
es/values-km-rKH/strings.xml
es/values-lo-rLA/strings.xml
es/values-mn-rMN/strings.xml
es/values-ms-rMY/strings.xml
es/values-pt/strings.xml
es/values-sl/strings.xml
es/values-tr/strings.xml
es/values-vi/strings.xml
es/values-zh-rHK/strings.xml
|
d90d0ffc3e69316b105b6f9d03dc98cd5b40ecbf |
14-Oct-2013 |
Angus Kong <shkong@google.com> |
Ignore clicks on disabled pie menu items. bug:11205671 Change-Id: I8b7c8c6b95f2cedadc064747470acd742280eb7f
rc/com/android/camera/PieController.java
|
02cafdfb92a2d53b76c2bb180ee5289a80f4f4ac |
14-Oct-2013 |
Angus Kong <shkong@google.com> |
Workaround to prevent the data focus callback. bug:11205669 Change-Id: I5b2d33422ec5f6fe21c81e39d24f36ec8b61ce4e
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/ui/FilmStripView.java
rc/com/android/camera/ui/PieMenuButton.java
|
9f26644ac1f4aa11b300f5a36bacf808e44a6d0d |
14-Oct-2013 |
The Android Automerger <android-build@google.com> |
merge in klp-release history after reset to klp-dev
|
049d6337952bce6100e174ffdbbfbf9bf9b284e8 |
14-Oct-2013 |
Alan Newberger <alann@google.com> |
am fa44b8ec: am ae9a7783: am 28019abc: Change keyguard camera layout to show no menu options in indicator * commit 'fa44b8eca7ffd3b7ba626273f32aaa497862d5e7': Change keyguard camera layout to show no menu options in indicator
|
fa44b8eca7ffd3b7ba626273f32aaa497862d5e7 |
14-Oct-2013 |
Alan Newberger <alann@google.com> |
am ae9a7783: am 28019abc: Change keyguard camera layout to show no menu options in indicator * commit 'ae9a77837d3b6b161d0d2915b957b023cbf43a62': Change keyguard camera layout to show no menu options in indicator
|
ae9a77837d3b6b161d0d2915b957b023cbf43a62 |
14-Oct-2013 |
Alan Newberger <alann@google.com> |
am 28019abc: Change keyguard camera layout to show no menu options in indicator * commit '28019abc86de3d96a32595e69f6c549353b2c4ec': Change keyguard camera layout to show no menu options in indicator
|
6056f10cf74f6e5773b21f9cf9dcd52475cd8ae8 |
14-Oct-2013 |
Alan Newberger <alann@google.com> |
am 28019abc: Change keyguard camera layout to show no menu options in indicator * commit '28019abc86de3d96a32595e69f6c549353b2c4ec': Change keyguard camera layout to show no menu options in indicator
|
28019abc86de3d96a32595e69f6c549353b2c4ec |
14-Oct-2013 |
Alan Newberger <alann@google.com> |
Change keyguard camera layout to show no menu options in indicator There are situations where the user selected options e.g. hdr+ are the initial indicators to the camera, so showing autoflash on the fake layout seems janky. additionally I sometimes see camera showing its own default clean circle indicator layout prior to switching to whatever indicators are active. For both these reasons it seems better to start secure camera from lockscreen with an empty circle indicator. I tried this CL out on my device and can confirm it feels less janky. Bug: 11206325 Change-Id: Ia694a21e5c86f9e12a339679aa30f4b21f1fa23b
es/layout/menu_indicators_keyguard.xml
|
a435a073f422d169e581feeb44a4f8e131d74b64 |
14-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
am d762e17f: am 23a2aa99: am 704530ed: Merge "Add \'disabled\' state for when Gcam is unable to take another shot." into gb-ub-photos-carlsbad * commit 'd762e17fe4f51088612b110e75c7d47043d8565e': Add 'disabled' state for when Gcam is unable to take another shot.
|
d762e17fe4f51088612b110e75c7d47043d8565e |
14-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
am 23a2aa99: am 704530ed: Merge "Add \'disabled\' state for when Gcam is unable to take another shot." into gb-ub-photos-carlsbad * commit '23a2aa993c7997913f32cd5eb69e12d4f6e0e354': Add 'disabled' state for when Gcam is unable to take another shot.
|
23a2aa993c7997913f32cd5eb69e12d4f6e0e354 |
14-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
am 704530ed: Merge "Add \'disabled\' state for when Gcam is unable to take another shot." into gb-ub-photos-carlsbad * commit '704530edd94ba9b5990a247d4156ec18bf6ea0eb': Add 'disabled' state for when Gcam is unable to take another shot.
|
878b51dffe5d4f59277adb66a3cc2fc4f02c763c |
14-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
am 704530ed: Merge "Add \'disabled\' state for when Gcam is unable to take another shot." into gb-ub-photos-carlsbad * commit '704530edd94ba9b5990a247d4156ec18bf6ea0eb': Add 'disabled' state for when Gcam is unable to take another shot.
|
704530edd94ba9b5990a247d4156ec18bf6ea0eb |
14-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
Merge "Add 'disabled' state for when Gcam is unable to take another shot." into gb-ub-photos-carlsbad
|
c3bb004e141911ca30b0fb717737eba978d4bcd5 |
14-Oct-2013 |
Doris Liu <tianliu@google.com> |
am d3316978: am 33120140: am c937ab7f: Merge "Fix for mis-placed camera controls" into gb-ub-photos-carlsbad * commit 'd3316978cda82f58314c9ddad03e2886f97a27cf': Fix for mis-placed camera controls
|
d3316978cda82f58314c9ddad03e2886f97a27cf |
14-Oct-2013 |
Doris Liu <tianliu@google.com> |
am 33120140: am c937ab7f: Merge "Fix for mis-placed camera controls" into gb-ub-photos-carlsbad * commit '331201407e613e5a243b8cf6e8f3d5bdb647e6c5': Fix for mis-placed camera controls
|
331201407e613e5a243b8cf6e8f3d5bdb647e6c5 |
14-Oct-2013 |
Doris Liu <tianliu@google.com> |
am c937ab7f: Merge "Fix for mis-placed camera controls" into gb-ub-photos-carlsbad * commit 'c937ab7f9bac633aa425da62348f9eb07c248450': Fix for mis-placed camera controls
|
b3f45ec3ed96e4f037a1a6c835a68a98b2823a25 |
14-Oct-2013 |
Doris Liu <tianliu@google.com> |
am c937ab7f: Merge "Fix for mis-placed camera controls" into gb-ub-photos-carlsbad * commit 'c937ab7f9bac633aa425da62348f9eb07c248450': Fix for mis-placed camera controls
|
c937ab7f9bac633aa425da62348f9eb07c248450 |
14-Oct-2013 |
Doris Liu <tianliu@google.com> |
Merge "Fix for mis-placed camera controls" into gb-ub-photos-carlsbad
|
7f4dd18503452d02b207747aae4b3ff2bca21c1c |
13-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
Add 'disabled' state for when Gcam is unable to take another shot. Bug: 11113201 Change-Id: I887104dc79f4a7a83bb79b2d30c0289fc90c9022
es/drawable-hdpi/btn_shutter_default_disabled.png
es/drawable-hdpi/btn_shutter_pressed_disabled.png
es/drawable-mdpi/btn_shutter_default_disabled.png
es/drawable-mdpi/btn_shutter_pressed_disabled.png
es/drawable-sw600dp-hdpi-v19/btn_shutter_default_disabled.png
es/drawable-sw600dp-hdpi-v19/btn_shutter_pressed_disabled.png
es/drawable-sw600dp-hdpi/btn_shutter_default_disabled.png
es/drawable-sw600dp-hdpi/btn_shutter_pressed_disabled.png
es/drawable-sw600dp-mdpi-v19/btn_shutter_default_disabled.png
es/drawable-sw600dp-mdpi-v19/btn_shutter_pressed_disabled.png
es/drawable-sw600dp-mdpi/btn_shutter_default_disabled.png
es/drawable-sw600dp-mdpi/btn_shutter_pressed_disabled.png
es/drawable-sw600dp-xhdpi-v19/btn_shutter_default_disabled.png
es/drawable-sw600dp-xhdpi-v19/btn_shutter_pressed_disabled.png
es/drawable-sw600dp-xhdpi/btn_shutter_default_disabled.png
es/drawable-sw600dp-xhdpi/btn_shutter_pressed_disabled.png
es/drawable-sw600dp-xxhdpi-v19/btn_shutter_default_disabled.png
es/drawable-sw600dp-xxhdpi-v19/btn_shutter_pressed_disabled.png
es/drawable-sw600dp-xxhdpi/btn_shutter_default_disabled.png
es/drawable-sw600dp-xxhdpi/btn_shutter_pressed_disabled.png
es/drawable-xhdpi/btn_shutter_default_disabled.png
es/drawable-xhdpi/btn_shutter_pressed_disabled.png
es/drawable-xxhdpi/btn_shutter_default_disabled.png
es/drawable-xxhdpi/btn_shutter_pressed_disabled.png
es/drawable/btn_shutter_disabled.xml
|
3068c52499b43b679d2af8018d7f1ab0b1a7e863 |
13-Oct-2013 |
Doris Liu <tianliu@google.com> |
Fix for mis-placed camera controls Bug: 11205682 Change-Id: Ie74e906a059158db825977af898445b2b2ba5a48
es/values-sw600dp/booleans.xml
es/values/bool.xml
rc/com/android/camera/ui/RotatableLayout.java
|
c6805c7f7a3817980b297b5c8b5ece315a12874a |
13-Oct-2013 |
Angus Kong <shkong@google.com> |
am 252c76a8: am 22b0d455: am 2d5c7478: Don\'t load data when it\'s secure camera. * commit '252c76a8ab6efb056242feb7422323e2021fb00e': Don't load data when it's secure camera.
|
252c76a8ab6efb056242feb7422323e2021fb00e |
13-Oct-2013 |
Angus Kong <shkong@google.com> |
am 22b0d455: am 2d5c7478: Don\'t load data when it\'s secure camera. * commit '22b0d455358f7f816b2f328a062e72df8b6d3c63': Don't load data when it's secure camera.
|
22b0d455358f7f816b2f328a062e72df8b6d3c63 |
13-Oct-2013 |
Angus Kong <shkong@google.com> |
am 2d5c7478: Don\'t load data when it\'s secure camera. * commit '2d5c74785d19f1944cab92948a6fa8233086ebc1': Don't load data when it's secure camera.
|
469e2e77ac417f2184d99c966f0e691a34e2ed55 |
13-Oct-2013 |
Angus Kong <shkong@google.com> |
am 2d5c7478: Don\'t load data when it\'s secure camera. * commit '2d5c74785d19f1944cab92948a6fa8233086ebc1': Don't load data when it's secure camera.
|
edaa225acbbd0d63194bc163919d9885afd272d0 |
13-Oct-2013 |
The Android Automerger <android-build@google.com> |
merge in klp-release history after reset to klp-dev
|
2d5c74785d19f1944cab92948a6fa8233086ebc1 |
13-Oct-2013 |
Angus Kong <shkong@google.com> |
Don't load data when it's secure camera. bug:11063164 Change-Id: I7e44a13f4d841d16807bd36133b588a0a8c40e49
rc/com/android/camera/CameraActivity.java
|
33fd2fd8f4f5772cd30a6eff44d39c920f9e59ae |
13-Oct-2013 |
Angus Kong <shkong@google.com> |
am 6b0fd1f5: am 8fa9c2b5: am f1582c9c: Adjust the position after layout change. * commit '6b0fd1f5d8e3eecb3c6089ac9b2c81b1f8bcf889': Adjust the position after layout change.
|
6b0fd1f5d8e3eecb3c6089ac9b2c81b1f8bcf889 |
13-Oct-2013 |
Angus Kong <shkong@google.com> |
am 8fa9c2b5: am f1582c9c: Adjust the position after layout change. * commit '8fa9c2b531dc894f1d05dfd5db63d0e35d4977b9': Adjust the position after layout change.
|
7525160b9cfcdfbe09c1ae9ea8b769bd60a3fb7d |
13-Oct-2013 |
Angus Kong <shkong@google.com> |
am f1582c9c: Adjust the position after layout change. * commit 'f1582c9c075e9cd5790b4bbe1101c94a45ac15d2': Adjust the position after layout change.
|
8fa9c2b531dc894f1d05dfd5db63d0e35d4977b9 |
13-Oct-2013 |
Angus Kong <shkong@google.com> |
am f1582c9c: Adjust the position after layout change. * commit 'f1582c9c075e9cd5790b4bbe1101c94a45ac15d2': Adjust the position after layout change.
|
f1582c9c075e9cd5790b4bbe1101c94a45ac15d2 |
13-Oct-2013 |
Angus Kong <shkong@google.com> |
Adjust the position after layout change. bug:10993660 Change-Id: Ia07b8238a09e761a02fe11577b738776ab965b30
rc/com/android/camera/ui/FilmStripView.java
|
c22619b2af71276e2d714129ab07948c6e08436a |
12-Oct-2013 |
Baligh Uddin <baligh@google.com> |
am e4a63aa1: (-s ours) am 8052407d: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit 'e4a63aa1b2096b74ab03db8126d1ad1a0706ea79': Import translations. DO NOT MERGE
|
e4a63aa1b2096b74ab03db8126d1ad1a0706ea79 |
12-Oct-2013 |
Baligh Uddin <baligh@google.com> |
am 8052407d: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '8052407d9569db7f72087be8f45dcfad7623199c': Import translations. DO NOT MERGE
|
8052407d9569db7f72087be8f45dcfad7623199c |
12-Oct-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into klp-dev
|
ceebbb7fce8b82a244d9642c87f328977ae4df42 |
12-Oct-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-denali
|
df4866eead40a9cd52d3699e1245037f2667b2a1 |
12-Oct-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I34b02536da8110ccf33846100abd88027b3f0a74 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-km-rKH/strings.xml
es/values-ko/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mn-rMN/strings.xml
es/values-ms-rMY/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
90fb4fc7f53a22db98d8c55bb31deaa61eff96dd |
12-Oct-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I4ff93327a41e4a0c3263e3fb32b510b19f60ab8c Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-km-rKH/strings.xml
es/values-ko/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mn-rMN/strings.xml
es/values-ms-rMY/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
8e275d6d460af56e7cf7d477152155551373d017 |
12-Oct-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I00c0c86fdc1b6030b1971c8207c65055da95e73c Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-km-rKH/strings.xml
es/values-ko/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mn-rMN/strings.xml
es/values-ms-rMY/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
2222f0ac4688958b9fb4e1b3ccb3210e1d000e6f |
12-Oct-2013 |
Doris Liu <tianliu@google.com> |
am 3f8ba6d4: am 193da1b0: am a5002410: Merge "Correct initial orientation of camera controls" into gb-ub-photos-carlsbad * commit '3f8ba6d4c5850451c329f4fae5057b5219a037aa': Correct initial orientation of camera controls
|
3f8ba6d4c5850451c329f4fae5057b5219a037aa |
12-Oct-2013 |
Doris Liu <tianliu@google.com> |
am 193da1b0: am a5002410: Merge "Correct initial orientation of camera controls" into gb-ub-photos-carlsbad * commit '193da1b0cd3079dcfe9dbc6f4162190377272e84': Correct initial orientation of camera controls
|
d6b6031c379cd41580013b28d40761e5e5aa3823 |
12-Oct-2013 |
Doris Liu <tianliu@google.com> |
am a5002410: Merge "Correct initial orientation of camera controls" into gb-ub-photos-carlsbad * commit 'a500241084f9e267e5f154b55e7a76a09623e6d8': Correct initial orientation of camera controls
|
193da1b0cd3079dcfe9dbc6f4162190377272e84 |
12-Oct-2013 |
Doris Liu <tianliu@google.com> |
am a5002410: Merge "Correct initial orientation of camera controls" into gb-ub-photos-carlsbad * commit 'a500241084f9e267e5f154b55e7a76a09623e6d8': Correct initial orientation of camera controls
|
a500241084f9e267e5f154b55e7a76a09623e6d8 |
12-Oct-2013 |
Doris Liu <tianliu@google.com> |
Merge "Correct initial orientation of camera controls" into gb-ub-photos-carlsbad
|
86ad8435b60a91fc97abf9d188b1e1af457e4885 |
12-Oct-2013 |
Doris Liu <tianliu@google.com> |
Correct initial orientation of camera controls Bug: 8878379 Change-Id: I3ecf190b19e91ae963e67ae2930b7388c4f92c70
es/values-sw600dp/booleans.xml
es/values/bool.xml
rc/com/android/camera/ui/RotatableLayout.java
|
1f23079a272f6605d8c8a9b22ec2f268ebd4dccd |
12-Oct-2013 |
ztenghui <ztenghui@google.com> |
am 2337cc64: am 25d6a81e: am 27562534: Merge "Finish the secure camera activity when user try to play a video." into gb-ub-photos-carlsbad * commit '2337cc64a57168d5bcfb8a16f6fc3d468e798fc9': Finish the secure camera activity when user try to play a video.
|
2337cc64a57168d5bcfb8a16f6fc3d468e798fc9 |
12-Oct-2013 |
ztenghui <ztenghui@google.com> |
am 25d6a81e: am 27562534: Merge "Finish the secure camera activity when user try to play a video." into gb-ub-photos-carlsbad * commit '25d6a81eaa4260e792381f4eb035ea1d4674b81c': Finish the secure camera activity when user try to play a video.
|
25d6a81eaa4260e792381f4eb035ea1d4674b81c |
12-Oct-2013 |
ztenghui <ztenghui@google.com> |
am 27562534: Merge "Finish the secure camera activity when user try to play a video." into gb-ub-photos-carlsbad * commit '275625342769eba3e2b461e249aec83165e4e7f1': Finish the secure camera activity when user try to play a video.
|
854a6be70f34ca314e839580cc09ff1efa353a3b |
12-Oct-2013 |
ztenghui <ztenghui@google.com> |
am 27562534: Merge "Finish the secure camera activity when user try to play a video." into gb-ub-photos-carlsbad * commit '275625342769eba3e2b461e249aec83165e4e7f1': Finish the secure camera activity when user try to play a video.
|
275625342769eba3e2b461e249aec83165e4e7f1 |
12-Oct-2013 |
ztenghui <ztenghui@google.com> |
Merge "Finish the secure camera activity when user try to play a video." into gb-ub-photos-carlsbad
|
98b2a282a212b74d756c169a445e8d3f6089fb66 |
12-Oct-2013 |
ztenghui <ztenghui@google.com> |
Finish the secure camera activity when user try to play a video. bug:11190995 Change-Id: I8aa1a538496c291d34ca25d489a7eb03f0c90b53
rc/com/android/camera/util/CameraUtil.java
|
d4ddb980eb3b92a550e89664f847d63752908fb9 |
12-Oct-2013 |
Doris Liu <tianliu@google.com> |
am 9ab431e5: am 3a6c47dd: am 87d093d6: Merge "Bring full screen window flag back to camera" into gb-ub-photos-carlsbad * commit '9ab431e5e01ef2d35d62e7c0e2958a10be954e89': Bring full screen window flag back to camera
|
9ab431e5e01ef2d35d62e7c0e2958a10be954e89 |
12-Oct-2013 |
Doris Liu <tianliu@google.com> |
am 3a6c47dd: am 87d093d6: Merge "Bring full screen window flag back to camera" into gb-ub-photos-carlsbad * commit '3a6c47dddab9f76493cedfadcf2393f006112525': Bring full screen window flag back to camera
|
3a6c47dddab9f76493cedfadcf2393f006112525 |
12-Oct-2013 |
Doris Liu <tianliu@google.com> |
am 87d093d6: Merge "Bring full screen window flag back to camera" into gb-ub-photos-carlsbad * commit '87d093d6145524b1c8f5c052dfe40c18b52e5235': Bring full screen window flag back to camera
|
6d01890aebe277cba6e9bf095c153ea27092cf60 |
12-Oct-2013 |
Doris Liu <tianliu@google.com> |
am 87d093d6: Merge "Bring full screen window flag back to camera" into gb-ub-photos-carlsbad * commit '87d093d6145524b1c8f5c052dfe40c18b52e5235': Bring full screen window flag back to camera
|
87d093d6145524b1c8f5c052dfe40c18b52e5235 |
12-Oct-2013 |
Doris Liu <tianliu@google.com> |
Merge "Bring full screen window flag back to camera" into gb-ub-photos-carlsbad
|
97cb1ea3dbcf03b4e1fc6b149bf475ef3f3920fc |
12-Oct-2013 |
Doris Liu <tianliu@google.com> |
Bring full screen window flag back to camera Bug: 11027091 Change-Id: Iee41d7dd040a9b7816a4b5e99d89201dc068f362
es/values/styles.xml
rc/com/android/camera/CameraActivity.java
|
9a5a2c5b2236a36ffebc74e2f6454349b897c268 |
12-Oct-2013 |
Seth Raphael <magicseth@google.com> |
am f6ed47dc: am c065ae53: am 3772d2f4: restore Usage Statistics * commit 'f6ed47dc6f9e4d853ee14997b55ad7ba41054310': restore Usage Statistics
|
f6ed47dc6f9e4d853ee14997b55ad7ba41054310 |
12-Oct-2013 |
Seth Raphael <magicseth@google.com> |
am c065ae53: am 3772d2f4: restore Usage Statistics * commit 'c065ae53b07d9402b1171f12cfba89fd2d2bfb38': restore Usage Statistics
|
b1e3a5c1cf75766cd5cfbd1be5cac9cf74aff947 |
12-Oct-2013 |
Seth Raphael <magicseth@google.com> |
am 3772d2f4: restore Usage Statistics * commit '3772d2f48ee5af8516f203f0f0519a2075042d6b': restore Usage Statistics
|
c065ae53b07d9402b1171f12cfba89fd2d2bfb38 |
12-Oct-2013 |
Seth Raphael <magicseth@google.com> |
am 3772d2f4: restore Usage Statistics * commit '3772d2f48ee5af8516f203f0f0519a2075042d6b': restore Usage Statistics
|
3772d2f48ee5af8516f203f0f0519a2075042d6b |
11-Oct-2013 |
Seth Raphael <magicseth@google.com> |
restore Usage Statistics initialize was not being called anywhere. Bug: 11188914 Change-Id: I9b3ae094b2d22605c368c1ac38de80090a336894
rc/com/android/camera/app/CameraApp.java
|
7240715e7343cc1e73e067fc157474f832630a63 |
11-Oct-2013 |
Alan Newberger <alann@google.com> |
am 86ab6dc5: am 07fdfac4: am 46455ec8: am c13cc22b: Add strings to better describe HDR mode menus * commit '86ab6dc52335cefa2ffd96e79b2ad39b64da367b': Add strings to better describe HDR mode menus
|
86ab6dc52335cefa2ffd96e79b2ad39b64da367b |
11-Oct-2013 |
Alan Newberger <alann@google.com> |
am 07fdfac4: am 46455ec8: am c13cc22b: Add strings to better describe HDR mode menus * commit '07fdfac4051191903e6565fdc6b6d3379e7b0719': Add strings to better describe HDR mode menus
|
07fdfac4051191903e6565fdc6b6d3379e7b0719 |
11-Oct-2013 |
Alan Newberger <alann@google.com> |
am 46455ec8: am c13cc22b: Add strings to better describe HDR mode menus * commit '46455ec88e4c5aa6b0bb432802aeec4af1939a5d': Add strings to better describe HDR mode menus
|
46455ec88e4c5aa6b0bb432802aeec4af1939a5d |
11-Oct-2013 |
Alan Newberger <alann@google.com> |
am c13cc22b: Add strings to better describe HDR mode menus * commit 'c13cc22ba17591111be3fae732ae0396e889820a': Add strings to better describe HDR mode menus
|
5925da84b3ca8aa87b89a09b594a4f96e4738ec4 |
11-Oct-2013 |
Alan Newberger <alann@google.com> |
am c13cc22b: Add strings to better describe HDR mode menus * commit 'c13cc22ba17591111be3fae732ae0396e889820a': Add strings to better describe HDR mode menus
|
c13cc22ba17591111be3fae732ae0396e889820a |
11-Oct-2013 |
Alan Newberger <alann@google.com> |
Add strings to better describe HDR mode menus Instead of one word, these strings will describe the button action i.e. 'Turn HDR on'. Leaving existing strings to pipeline translations before implementing the migration to these strings. Bug: 11185194 Change-Id: Ie9aca0b328b19c610af740127e1683a8d87f93d8
es/values/strings.xml
|
63270df12da1ca2f1aefa380f16f6a8278c3b10c |
11-Oct-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 5c64fd7a: am b0d295b2: am 2e30f90a: am f0622191: Merge "gcam: Allow debugging postcapture image to be added to mediastore." into gb-ub-photos-carlsbad * commit '5c64fd7a4e09c6fe49a5c466532613c7381eab0f': gcam: Allow debugging postcapture image to be added to mediastore.
|
5c64fd7a4e09c6fe49a5c466532613c7381eab0f |
11-Oct-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am b0d295b2: am 2e30f90a: am f0622191: Merge "gcam: Allow debugging postcapture image to be added to mediastore." into gb-ub-photos-carlsbad * commit 'b0d295b2af537c91cba36e76ff782257411d79af': gcam: Allow debugging postcapture image to be added to mediastore.
|
b0d295b2af537c91cba36e76ff782257411d79af |
11-Oct-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 2e30f90a: am f0622191: Merge "gcam: Allow debugging postcapture image to be added to mediastore." into gb-ub-photos-carlsbad * commit '2e30f90a571dd7774e3c0bf32d370a63b2461a93': gcam: Allow debugging postcapture image to be added to mediastore.
|
2e30f90a571dd7774e3c0bf32d370a63b2461a93 |
11-Oct-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am f0622191: Merge "gcam: Allow debugging postcapture image to be added to mediastore." into gb-ub-photos-carlsbad * commit 'f06221914bf40b6345cacd1a5904d773c6eddcb0': gcam: Allow debugging postcapture image to be added to mediastore.
|
b15ce577b47d4c09391a1e788d143e9d4940c39a |
11-Oct-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am f0622191: Merge "gcam: Allow debugging postcapture image to be added to mediastore." into gb-ub-photos-carlsbad * commit 'f06221914bf40b6345cacd1a5904d773c6eddcb0': gcam: Allow debugging postcapture image to be added to mediastore.
|
f06221914bf40b6345cacd1a5904d773c6eddcb0 |
11-Oct-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "gcam: Allow debugging postcapture image to be added to mediastore." into gb-ub-photos-carlsbad
|
dc5d2b422afe7f24a1c9d03674b645f00a46b472 |
11-Oct-2013 |
Angus Kong <shkong@google.com> |
Avoid unnecessary bringChildToFront() calls. bug:10750719 Change-Id: I831d9ecead91d64c7a0b6a665e9c842ef17d8a8a
rc/com/android/camera/ui/FilmStripView.java
|
d43ecd7122769a8b97a84beb9f8d1bf8c20b8e83 |
11-Oct-2013 |
Sameer Padala <sxp@google.com> |
am 6cc86d7a: am 005a9ee5: am 1f8c4241: Fix build break. * commit '6cc86d7ae0e6b6bb3b0fae12335183da075b518c': Fix build break.
|
6cc86d7ae0e6b6bb3b0fae12335183da075b518c |
11-Oct-2013 |
Sameer Padala <sxp@google.com> |
am 005a9ee5: am 1f8c4241: Fix build break. * commit '005a9ee5db8af3ffd75bdae99180daa8d17824c1': Fix build break.
|
005a9ee5db8af3ffd75bdae99180daa8d17824c1 |
11-Oct-2013 |
Sameer Padala <sxp@google.com> |
am 1f8c4241: Fix build break. * commit '1f8c42419304742b20ff88a18f938a88f01b895c': Fix build break.
|
1f8c42419304742b20ff88a18f938a88f01b895c |
07-Oct-2013 |
Sameer Padala <sxp@google.com> |
Fix build break. ag/369626/ added a cannot_load_image string which was translated in ag/370960/ However, this translation resulted in a duplicate string since this string already existed in translated versions of filtershow_strings.xml which was deleted in ag/339346 but the translated versions weren't deleted. Deleting all the translated versions of that file caused a problem because ag/362583/ added source code that depended on a setting_wallpaper string which only existed in the translated string files. This change deletes the translated filtershow_strings.xml and adds the untranslated setting_wallpaper string. Change-Id: I1b8ac8c854c6f06abde9a71db2105c4d2dd44934 (cherry picked from commit 73a18da0f6181d882d04d648ddcbcc82047f5d71)
es/values-af/filtershow_strings.xml
es/values-am/filtershow_strings.xml
es/values-ar/filtershow_strings.xml
es/values-be/filtershow_strings.xml
es/values-bg/filtershow_strings.xml
es/values-ca/filtershow_strings.xml
es/values-cs/filtershow_strings.xml
es/values-da/filtershow_strings.xml
es/values-de/filtershow_strings.xml
es/values-el/filtershow_strings.xml
es/values-en-rGB/filtershow_strings.xml
es/values-es-rUS/filtershow_strings.xml
es/values-es/filtershow_strings.xml
es/values-et/filtershow_strings.xml
es/values-fa/filtershow_strings.xml
es/values-fi/filtershow_strings.xml
es/values-fr/filtershow_strings.xml
es/values-hi/filtershow_strings.xml
es/values-hr/filtershow_strings.xml
es/values-hu/filtershow_strings.xml
es/values-in/filtershow_strings.xml
es/values-it/filtershow_strings.xml
es/values-iw/filtershow_strings.xml
es/values-ja/filtershow_strings.xml
es/values-ko/filtershow_strings.xml
es/values-lt/filtershow_strings.xml
es/values-lv/filtershow_strings.xml
es/values-ms/filtershow_strings.xml
es/values-nb/filtershow_strings.xml
es/values-nl/filtershow_strings.xml
es/values-pl/filtershow_strings.xml
es/values-pt-rPT/filtershow_strings.xml
es/values-pt/filtershow_strings.xml
es/values-ro/filtershow_strings.xml
es/values-ru/filtershow_strings.xml
es/values-sk/filtershow_strings.xml
es/values-sl/filtershow_strings.xml
es/values-sr/filtershow_strings.xml
es/values-sv/filtershow_strings.xml
es/values-sw/filtershow_strings.xml
es/values-th/filtershow_strings.xml
es/values-tl/filtershow_strings.xml
es/values-tr/filtershow_strings.xml
es/values-uk/filtershow_strings.xml
es/values-vi/filtershow_strings.xml
es/values-zh-rCN/filtershow_strings.xml
es/values-zh-rTW/filtershow_strings.xml
es/values-zu/filtershow_strings.xml
es/values/strings.xml
|
7b02f8fe6294d951c99a86c76e62d7c499d77831 |
11-Oct-2013 |
Baligh Uddin <baligh@google.com> |
am 2751b289: (-s ours) am 58fdde61: (-s ours) am 6d9353a7: (-s ours) Merge "Revert "Revert "Import translations. DO NOT MERGE""" into klp-dev * commit '2751b289f327acd05e7be319271091c59d011a05': Revert "Revert "Import translations. DO NOT MERGE""
|
2751b289f327acd05e7be319271091c59d011a05 |
11-Oct-2013 |
Baligh Uddin <baligh@google.com> |
am 58fdde61: (-s ours) am 6d9353a7: (-s ours) Merge "Revert "Revert "Import translations. DO NOT MERGE""" into klp-dev * commit '58fdde61e6560edfbc3cb5b8b75e0343397685f5': Revert "Revert "Import translations. DO NOT MERGE""
|
58fdde61e6560edfbc3cb5b8b75e0343397685f5 |
11-Oct-2013 |
Baligh Uddin <baligh@google.com> |
am 6d9353a7: (-s ours) Merge "Revert "Revert "Import translations. DO NOT MERGE""" into klp-dev * commit '6d9353a72310f9971599b5ac7ff607ca34ff0814': Revert "Revert "Import translations. DO NOT MERGE""
|
6d9353a72310f9971599b5ac7ff607ca34ff0814 |
11-Oct-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Revert "Revert "Import translations. DO NOT MERGE""" into klp-dev
|
6f70baacef0bc1fa0e44bb1dbb89a02175078431 |
11-Oct-2013 |
Angus Kong <shkong@google.com> |
am fcee8b10: am 8ffb3c16: am 28875b52: am 81ef40bc: Merge "Avoid unnecessary bringChildToFront() calls." into gb-ub-photos-carlsbad * commit 'fcee8b10aba17cf2fefa4a9cbbf95d99060ad8c7': Avoid unnecessary bringChildToFront() calls.
|
fcee8b10aba17cf2fefa4a9cbbf95d99060ad8c7 |
11-Oct-2013 |
Angus Kong <shkong@google.com> |
am 8ffb3c16: am 28875b52: am 81ef40bc: Merge "Avoid unnecessary bringChildToFront() calls." into gb-ub-photos-carlsbad * commit '8ffb3c16803026235de3d7d655ea4009f89434c3': Avoid unnecessary bringChildToFront() calls.
|
8ffb3c16803026235de3d7d655ea4009f89434c3 |
11-Oct-2013 |
Angus Kong <shkong@google.com> |
am 28875b52: am 81ef40bc: Merge "Avoid unnecessary bringChildToFront() calls." into gb-ub-photos-carlsbad * commit '28875b52bd4f4ab3dac09fb04c463f13e3165afb': Avoid unnecessary bringChildToFront() calls.
|
1adbeaebb8ac70cd806c804c1cff937dcf073b13 |
11-Oct-2013 |
Angus Kong <shkong@google.com> |
am 81ef40bc: Merge "Avoid unnecessary bringChildToFront() calls." into gb-ub-photos-carlsbad * commit '81ef40bc4923e7014f52f03d8c7ddcf7a4344f70': Avoid unnecessary bringChildToFront() calls.
|
28875b52bd4f4ab3dac09fb04c463f13e3165afb |
11-Oct-2013 |
Angus Kong <shkong@google.com> |
am 81ef40bc: Merge "Avoid unnecessary bringChildToFront() calls." into gb-ub-photos-carlsbad * commit '81ef40bc4923e7014f52f03d8c7ddcf7a4344f70': Avoid unnecessary bringChildToFront() calls.
|
81ef40bc4923e7014f52f03d8c7ddcf7a4344f70 |
11-Oct-2013 |
Angus Kong <shkong@google.com> |
Merge "Avoid unnecessary bringChildToFront() calls." into gb-ub-photos-carlsbad
|
f6ad5f55d92cb3b26bf62737db1b006b8c823d6a |
11-Oct-2013 |
Baligh Uddin <baligh@google.com> |
am 379c809f: (-s ours) am 4b04b755: (-s ours) Merge "Revert "Import translations. DO NOT MERGE"" into klp-ub-dev * commit '379c809f6ebb2ab0dfe73ac2182466dda80ab5e3': Revert "Import translations. DO NOT MERGE"
|
379c809f6ebb2ab0dfe73ac2182466dda80ab5e3 |
11-Oct-2013 |
Baligh Uddin <baligh@google.com> |
am 4b04b755: (-s ours) Merge "Revert "Import translations. DO NOT MERGE"" into klp-ub-dev * commit '4b04b755d2bd0b366233228f1041701962077b1a': Revert "Import translations. DO NOT MERGE"
|
4b04b755d2bd0b366233228f1041701962077b1a |
11-Oct-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Revert "Import translations. DO NOT MERGE"" into klp-ub-dev
|
282d5d086709c1a04b5a13a845f1c6efdbc51af0 |
11-Oct-2013 |
Baligh Uddin <baligh@google.com> |
Revert "Import translations. DO NOT MERGE" This reverts commit a1dd79180a1da373b9e6f349c3f9b72e973d0e28. Change-Id: I305fb5703b900693ca508384b1dcfba3da5f1b7c
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms-rMY/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
812aa95e10fb0cf2ab8c2759270b66690772faaf |
11-Oct-2013 |
Baligh Uddin <baligh@google.com> |
am c7caa91b: (-s ours) am 01a0d87d: (-s ours) am cdbd8a64: (-s ours) Merge "Revert "Import translations. DO NOT MERGE"" into klp-dev * commit 'c7caa91b9b6311279703b012f4cfb0eaa82e137e': Revert "Import translations. DO NOT MERGE"
|
bc7f7c4c87f725191fdd199617d07d004d52a728 |
11-Oct-2013 |
Baligh Uddin <baligh@google.com> |
am 7e063111: (-s ours) am ddabe772: (-s ours) am 32445d3b: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '7e0631118605195586b74abf1ba56c4c8b70e313': Import translations. DO NOT MERGE
|
c7caa91b9b6311279703b012f4cfb0eaa82e137e |
11-Oct-2013 |
Baligh Uddin <baligh@google.com> |
am 01a0d87d: (-s ours) am cdbd8a64: (-s ours) Merge "Revert "Import translations. DO NOT MERGE"" into klp-dev * commit '01a0d87de426f66c22c45359faf20d033ad65623': Revert "Import translations. DO NOT MERGE"
|
7e0631118605195586b74abf1ba56c4c8b70e313 |
11-Oct-2013 |
Baligh Uddin <baligh@google.com> |
am ddabe772: (-s ours) am 32445d3b: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit 'ddabe772b6f8c38215107a37ffd50c73c4338cec': Import translations. DO NOT MERGE
|
2136b65ad4ee3c443931756f20524f12f63a177d |
11-Oct-2013 |
Baligh Uddin <baligh@google.com> |
am 83b99712: (-s ours) am 11b56e6d: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev * commit '83b99712f151f5c124febed2b09fe8ce484b3841': Import translations. DO NOT MERGE
|
01a0d87de426f66c22c45359faf20d033ad65623 |
11-Oct-2013 |
Baligh Uddin <baligh@google.com> |
am cdbd8a64: (-s ours) Merge "Revert "Import translations. DO NOT MERGE"" into klp-dev * commit 'cdbd8a64c368c9f363acc3b52067ae50e1fe2557': Revert "Import translations. DO NOT MERGE"
|
ddabe772b6f8c38215107a37ffd50c73c4338cec |
11-Oct-2013 |
Baligh Uddin <baligh@google.com> |
am 32445d3b: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '32445d3b3e237505cf7604a532e52ec2d7d6fb19': Import translations. DO NOT MERGE
|
83b99712f151f5c124febed2b09fe8ce484b3841 |
11-Oct-2013 |
Baligh Uddin <baligh@google.com> |
am 11b56e6d: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev * commit '11b56e6d3a6ee7246df09f7f77e57873b5b8affc': Import translations. DO NOT MERGE
|
283b800dbc7120e9464a133c53267268f663be41 |
11-Oct-2013 |
Baligh Uddin <baligh@google.com> |
Revert "Revert "Import translations. DO NOT MERGE"" This reverts commit faa0615fd6d67fdfdbf28df099cb40a02c34c2f0. Change-Id: I8043d94a45a975412c6f73e64628e1af3cc4d8fe
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-km-rKH/strings.xml
es/values-ko/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mn-rMN/strings.xml
es/values-ms-rMY/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
cdbd8a64c368c9f363acc3b52067ae50e1fe2557 |
11-Oct-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Revert "Import translations. DO NOT MERGE"" into klp-dev
|
faa0615fd6d67fdfdbf28df099cb40a02c34c2f0 |
11-Oct-2013 |
Baligh Uddin <baligh@google.com> |
Revert "Import translations. DO NOT MERGE" This reverts commit 69e938dd6c3e49bfda29fc665b44340bf35b3e09. Change-Id: I8a37595707a87b950c36a25003726d052ba2ab9d
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-km-rKH/strings.xml
es/values-ko/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mn-rMN/strings.xml
es/values-ms-rMY/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
11b56e6d3a6ee7246df09f7f77e57873b5b8affc |
11-Oct-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into klp-ub-dev
|
32445d3b3e237505cf7604a532e52ec2d7d6fb19 |
11-Oct-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into klp-dev
|
2929abadf399a8a8673a9866f16983fa75766d40 |
11-Oct-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-denali
|
a1dd79180a1da373b9e6f349c3f9b72e973d0e28 |
11-Oct-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I232154f8f6cd3f6eeeb0749b36d4a5d3f25c4702 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms-rMY/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
69e938dd6c3e49bfda29fc665b44340bf35b3e09 |
11-Oct-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ib699ef5577f778618a8657f9f58d317def9268ab Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-km-rKH/strings.xml
es/values-ko/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mn-rMN/strings.xml
es/values-ms-rMY/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
02b7c00cf6bf260ca5042cee044fa108479c69ed |
11-Oct-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: If1d0120b4e4c15ea1f892e9974bdf683ae2fbcb4 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms-rMY/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
53aedc0ee671c2d11341a66c444bbb6cdc97b150 |
11-Oct-2013 |
Angus Kong <shkong@google.com> |
Avoid unnecessary bringChildToFront() calls. bug:10750719 Change-Id: I831d9ecead91d64c7a0b6a665e9c842ef17d8a8a
rc/com/android/camera/ui/FilmStripView.java
|
d748827206f4fd065b7f083f521c7bb9a78f85a3 |
11-Oct-2013 |
Ruben Brunk <rubenbrunk@google.com> |
gcam: Allow debugging postcapture image to be added to mediastore. Bug: 11010544 Change-Id: Iaa5a2d8bcc3ece583376517e006018b0c8b75587
rc/com/android/camera/PhotoModule.java
|
793129be18190e38844b26675318c748a3995f9d |
11-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
am 9b0799aa: am b4a40684: am 3b9f618b: am 64cea6aa: Don\'t show a details dialog if there are no details. * commit '9b0799aae6b8b4d0418cf871cc76f0cde85d66be': Don't show a details dialog if there are no details.
|
9b0799aae6b8b4d0418cf871cc76f0cde85d66be |
11-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
am b4a40684: am 3b9f618b: am 64cea6aa: Don\'t show a details dialog if there are no details. * commit 'b4a40684406cc72a68c0a245b810651ef1c0fba7': Don't show a details dialog if there are no details.
|
b4a40684406cc72a68c0a245b810651ef1c0fba7 |
11-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
am 3b9f618b: am 64cea6aa: Don\'t show a details dialog if there are no details. * commit '3b9f618ba95f6fb095e2be584fb52443c587dda6': Don't show a details dialog if there are no details.
|
4a1cc7bddbddc1f9e0e996d0e614f36789f4ea36 |
11-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
am 64cea6aa: Don\'t show a details dialog if there are no details. * commit '64cea6aadb912067e31f1a158044c5efeb3e64af': Don't show a details dialog if there are no details.
|
3b9f618ba95f6fb095e2be584fb52443c587dda6 |
11-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
am 64cea6aa: Don\'t show a details dialog if there are no details. * commit '64cea6aadb912067e31f1a158044c5efeb3e64af': Don't show a details dialog if there are no details.
|
64cea6aadb912067e31f1a158044c5efeb3e64af |
11-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
Don't show a details dialog if there are no details. Bug: 11021907 Change-Id: Ie4919889f60f2035fbd6f8b99bff4415e2962ae6
rc/com/android/camera/CameraActivity.java
|
a4e8d618a56cfdf1ea4840ad21bf4436ebcd1ef8 |
11-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
am e9c899a3: am 6dbd0a25: am 886c3a5f: am 2a959b83: Merge "Don\'t initialize photo module if it\'s paused." into gb-ub-photos-carlsbad * commit 'e9c899a3437f40958a77f4d7b765a018e9e83fa3': Don't initialize photo module if it's paused.
|
e9c899a3437f40958a77f4d7b765a018e9e83fa3 |
11-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
am 6dbd0a25: am 886c3a5f: am 2a959b83: Merge "Don\'t initialize photo module if it\'s paused." into gb-ub-photos-carlsbad * commit '6dbd0a25493409010607aa2e28a8db977a568f63': Don't initialize photo module if it's paused.
|
6dbd0a25493409010607aa2e28a8db977a568f63 |
11-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
am 886c3a5f: am 2a959b83: Merge "Don\'t initialize photo module if it\'s paused." into gb-ub-photos-carlsbad * commit '886c3a5fabf59d8529910f34f155fb4565d5a4d2': Don't initialize photo module if it's paused.
|
886c3a5fabf59d8529910f34f155fb4565d5a4d2 |
11-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
am 2a959b83: Merge "Don\'t initialize photo module if it\'s paused." into gb-ub-photos-carlsbad * commit '2a959b838d9a20830d15f916a8a698f18582da5c': Don't initialize photo module if it's paused.
|
0cb322c5781564721fa37d53c52ecf94ec66d11a |
11-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
am 2a959b83: Merge "Don\'t initialize photo module if it\'s paused." into gb-ub-photos-carlsbad * commit '2a959b838d9a20830d15f916a8a698f18582da5c': Don't initialize photo module if it's paused.
|
2a959b838d9a20830d15f916a8a698f18582da5c |
11-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
Merge "Don't initialize photo module if it's paused." into gb-ub-photos-carlsbad
|
e769c76d4319f4aa324d36b99534242855d34ef0 |
11-Oct-2013 |
Erin Dahlgren <edahlgren@google.com> |
am 0d3abc89: am 8ca32464: am 6cad9e09: am 36c21ca1: Merge "Check both the requestId of current item and total items in filmstrip for bottom controls." into gb-ub-photos-carlsbad * commit '0d3abc895a7b2606edee71f8321cdc47fd601666': Check both the requestId of current item and total items in filmstrip for bottom controls.
|
689874806103af70e1d3150944043acb249d2dfd |
11-Oct-2013 |
Doris Liu <tianliu@google.com> |
am 42694ac4: am 2ae69122: am bc7ecede: am d70f0fb6: Add fling support in zoom view * commit '42694ac4d55d28cf09e98a12f14eb66047681121': Add fling support in zoom view
|
f95560b8fc88788a7b9e58f587e55d6aac3be20d |
11-Oct-2013 |
Doris Liu <tianliu@google.com> |
am b9245c0b: am bfe7e483: am 8a310a39: am 8c807823: Merge "Remove display change listener for mode switch" into gb-ub-photos-carlsbad * commit 'b9245c0b9fbf485f66153df4b7daa41c2b421868': Remove display change listener for mode switch
|
0d3abc895a7b2606edee71f8321cdc47fd601666 |
11-Oct-2013 |
Erin Dahlgren <edahlgren@google.com> |
am 8ca32464: am 6cad9e09: am 36c21ca1: Merge "Check both the requestId of current item and total items in filmstrip for bottom controls." into gb-ub-photos-carlsbad * commit '8ca324641a7f50da2972e889e50f96d73f3e4997': Check both the requestId of current item and total items in filmstrip for bottom controls.
|
42694ac4d55d28cf09e98a12f14eb66047681121 |
11-Oct-2013 |
Doris Liu <tianliu@google.com> |
am 2ae69122: am bc7ecede: am d70f0fb6: Add fling support in zoom view * commit '2ae69122d58600afff1a380c1bfb530734b614e4': Add fling support in zoom view
|
b9245c0b9fbf485f66153df4b7daa41c2b421868 |
11-Oct-2013 |
Doris Liu <tianliu@google.com> |
am bfe7e483: am 8a310a39: am 8c807823: Merge "Remove display change listener for mode switch" into gb-ub-photos-carlsbad * commit 'bfe7e4830c8ef0412716d1989523769d7d58789b': Remove display change listener for mode switch
|
330dafba33f0d75929591095028779f068459431 |
11-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
Don't initialize photo module if it's paused. Bug: 11028614 The main visible issue with this is that we register additional location listeners, thus draining battery as we don't unregister them ever. Change-Id: Ibd39171681867a12bc00abe9705f4281b9945ec1
rc/com/android/camera/PhotoModule.java
|
8ca324641a7f50da2972e889e50f96d73f3e4997 |
11-Oct-2013 |
Erin Dahlgren <edahlgren@google.com> |
am 6cad9e09: am 36c21ca1: Merge "Check both the requestId of current item and total items in filmstrip for bottom controls." into gb-ub-photos-carlsbad * commit '6cad9e09bef494a3ae9f19049ad8fa501d134613': Check both the requestId of current item and total items in filmstrip for bottom controls.
|
bd0d34b049e6f068a9fea069ac4051ec67aadc00 |
11-Oct-2013 |
Erin Dahlgren <edahlgren@google.com> |
am 36c21ca1: Merge "Check both the requestId of current item and total items in filmstrip for bottom controls." into gb-ub-photos-carlsbad * commit '36c21ca1365c0c3832742bc0cf75d3409723254b': Check both the requestId of current item and total items in filmstrip for bottom controls.
|
6cad9e09bef494a3ae9f19049ad8fa501d134613 |
11-Oct-2013 |
Erin Dahlgren <edahlgren@google.com> |
am 36c21ca1: Merge "Check both the requestId of current item and total items in filmstrip for bottom controls." into gb-ub-photos-carlsbad * commit '36c21ca1365c0c3832742bc0cf75d3409723254b': Check both the requestId of current item and total items in filmstrip for bottom controls.
|
36c21ca1365c0c3832742bc0cf75d3409723254b |
11-Oct-2013 |
Erin Dahlgren <edahlgren@google.com> |
Merge "Check both the requestId of current item and total items in filmstrip for bottom controls." into gb-ub-photos-carlsbad
|
2ae69122d58600afff1a380c1bfb530734b614e4 |
11-Oct-2013 |
Doris Liu <tianliu@google.com> |
am bc7ecede: am d70f0fb6: Add fling support in zoom view * commit 'bc7ecede08af6cbd696f501301f3183bd0e4eab1': Add fling support in zoom view
|
bc7ecede08af6cbd696f501301f3183bd0e4eab1 |
11-Oct-2013 |
Doris Liu <tianliu@google.com> |
am d70f0fb6: Add fling support in zoom view * commit 'd70f0fb68064e170fb2cf041a707ed04d68040f9': Add fling support in zoom view
|
01382295e900da9c765227bab5df6ffe75daa927 |
11-Oct-2013 |
Doris Liu <tianliu@google.com> |
am d70f0fb6: Add fling support in zoom view * commit 'd70f0fb68064e170fb2cf041a707ed04d68040f9': Add fling support in zoom view
|
d70f0fb68064e170fb2cf041a707ed04d68040f9 |
04-Oct-2013 |
Doris Liu <tianliu@google.com> |
Add fling support in zoom view Bug: 10679704 Change-Id: I7ab72fdf4e836495b2471c65fd57f952e863f1dd
rc/com/android/camera/ui/FilmStripView.java
|
bfe7e4830c8ef0412716d1989523769d7d58789b |
11-Oct-2013 |
Doris Liu <tianliu@google.com> |
am 8a310a39: am 8c807823: Merge "Remove display change listener for mode switch" into gb-ub-photos-carlsbad * commit '8a310a3975c3546be43c7ce3e2f11cf648fc59f5': Remove display change listener for mode switch
|
5b7316c1dec6d858eef0bcb7a45b719e7719d231 |
11-Oct-2013 |
Doris Liu <tianliu@google.com> |
am 8c807823: Merge "Remove display change listener for mode switch" into gb-ub-photos-carlsbad * commit '8c80782326d1cdc764b9a9a791b2c5525e8ef234': Remove display change listener for mode switch
|
8a310a3975c3546be43c7ce3e2f11cf648fc59f5 |
11-Oct-2013 |
Doris Liu <tianliu@google.com> |
am 8c807823: Merge "Remove display change listener for mode switch" into gb-ub-photos-carlsbad * commit '8c80782326d1cdc764b9a9a791b2c5525e8ef234': Remove display change listener for mode switch
|
8c80782326d1cdc764b9a9a791b2c5525e8ef234 |
11-Oct-2013 |
Doris Liu <tianliu@google.com> |
Merge "Remove display change listener for mode switch" into gb-ub-photos-carlsbad
|
59390061e26d3d481c6e0c9b22fb3ee8ec8387b0 |
11-Oct-2013 |
Doris Liu <tianliu@google.com> |
Remove display change listener for mode switch Bug: 10928549 Change-Id: I333e1a47e7f5c5cadca9b0b6cfd368f455fc3670
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/PhotoUI.java
rc/com/android/camera/VideoModule.java
rc/com/android/camera/VideoUI.java
rc/com/android/camera/ui/CameraRootView.java
|
92a2a23bef27728fa5b0457b79fb08fde68403aa |
09-Oct-2013 |
priya <priyar@google.com> |
Increased time to wait in all tests. For CameraLAtency.java got rid of the key event to get rid of geo tagging dialog on first launch of camera. That will be taken care of by pushing the shared_pref file. Change-Id: I76a824b5690d6913630560d58739e2df5cc1c259
ests/src/com/android/camera/stress/CameraLatency.java
ests/src/com/android/camera/stress/CameraStartUp.java
ests/src/com/android/camera/stress/ImageCapture.java
ests/src/com/android/camera/stress/VideoCapture.java
|
10ce8aafd001900076baa4556e6e5f7f57a0f3f3 |
11-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
am 0c81fca3: am f69c7569: am 86ecc992: am ada31cbe: Merge "Hide the status bar and switch into lights-out mode when popup is dimissed." into gb-ub-photos-carlsbad * commit '0c81fca3ea3e6f1a72c60ba885c09cca1d43fd7f': Hide the status bar and switch into lights-out mode when popup is dimissed.
|
0c81fca3ea3e6f1a72c60ba885c09cca1d43fd7f |
11-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
am f69c7569: am 86ecc992: am ada31cbe: Merge "Hide the status bar and switch into lights-out mode when popup is dimissed." into gb-ub-photos-carlsbad * commit 'f69c75696284e2919ce97e30334bcf8cd7b68e62': Hide the status bar and switch into lights-out mode when popup is dimissed.
|
f69c75696284e2919ce97e30334bcf8cd7b68e62 |
11-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
am 86ecc992: am ada31cbe: Merge "Hide the status bar and switch into lights-out mode when popup is dimissed." into gb-ub-photos-carlsbad * commit '86ecc992272d4bc7d4d97057bf797bc1c5568363': Hide the status bar and switch into lights-out mode when popup is dimissed.
|
86ecc992272d4bc7d4d97057bf797bc1c5568363 |
11-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
am ada31cbe: Merge "Hide the status bar and switch into lights-out mode when popup is dimissed." into gb-ub-photos-carlsbad * commit 'ada31cbe4010e192825b7eb9b7093d4d75cf3558': Hide the status bar and switch into lights-out mode when popup is dimissed.
|
90cbaa9ba3d1f3be217d885cc29902754dd51d8f |
11-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
am ada31cbe: Merge "Hide the status bar and switch into lights-out mode when popup is dimissed." into gb-ub-photos-carlsbad * commit 'ada31cbe4010e192825b7eb9b7093d4d75cf3558': Hide the status bar and switch into lights-out mode when popup is dimissed.
|
ada31cbe4010e192825b7eb9b7093d4d75cf3558 |
11-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
Merge "Hide the status bar and switch into lights-out mode when popup is dimissed." into gb-ub-photos-carlsbad
|
62c72ca1b5d0a608d549615928d66e9d1911062f |
10-Oct-2013 |
Erin Dahlgren <edahlgren@google.com> |
Check both the requestId of current item and total items in filmstrip for bottom controls. Bug: 11169201 Change-Id: I9d42b168efe62712f76165db5221757a1f20013f
rc/com/android/camera/ui/FilmStripView.java
|
f1db80c98c139b085ca49348a3bf31484560c16c |
10-Oct-2013 |
priya <priyar@google.com> |
am bc99ab0f: am 1d266660: am f51bebd5: Merge "Increased time to wait in all tests. For CameraLAtency.java got rid of the key event to get rid of geo tagging dialog on first launch of camera. That will be taken care of by pushing the shared_pref file." into klp-dev * commit 'bc99ab0fcabce48468185c1b0bce8c498ab18a62': Increased time to wait in all tests. For CameraLAtency.java got rid of the key event to get rid of geo tagging dialog on first launch of camera. That will be taken care of by pushing the shared_pref file.
|
bc99ab0fcabce48468185c1b0bce8c498ab18a62 |
10-Oct-2013 |
priya <priyar@google.com> |
am 1d266660: am f51bebd5: Merge "Increased time to wait in all tests. For CameraLAtency.java got rid of the key event to get rid of geo tagging dialog on first launch of camera. That will be taken care of by pushing the shared_pref file." into klp-dev * commit '1d26666088febf7168b2d32633a58138854f318f': Increased time to wait in all tests. For CameraLAtency.java got rid of the key event to get rid of geo tagging dialog on first launch of camera. That will be taken care of by pushing the shared_pref file.
|
1d26666088febf7168b2d32633a58138854f318f |
10-Oct-2013 |
priya <priyar@google.com> |
am f51bebd5: Merge "Increased time to wait in all tests. For CameraLAtency.java got rid of the key event to get rid of geo tagging dialog on first launch of camera. That will be taken care of by pushing the shared_pref file." into klp-dev * commit 'f51bebd5be7c1438aee808a4bbb565720224654f': Increased time to wait in all tests. For CameraLAtency.java got rid of the key event to get rid of geo tagging dialog on first launch of camera. That will be taken care of by pushing the shared_pref file.
|
f51bebd5be7c1438aee808a4bbb565720224654f |
10-Oct-2013 |
priya <priyar@google.com> |
Merge "Increased time to wait in all tests. For CameraLAtency.java got rid of the key event to get rid of geo tagging dialog on first launch of camera. That will be taken care of by pushing the shared_pref file." into klp-dev
|
4ec139dc81482ebfef1e62a3987c53bd5880c759 |
10-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
Hide the status bar and switch into lights-out mode when popup is dimissed. Bug: 11119286 Change-Id: I912103f36d27b07cd6fcebc2dae7c2964e883cc8
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/PhotoUI.java
rc/com/android/camera/VideoUI.java
|
b138995e65ebebf4776e1047c969819342983d95 |
10-Oct-2013 |
Doris Liu <tianliu@google.com> |
am da67719b: am f7b3f37d: am 364c8830: am 23df6752: Merge "Workaround for re-applying transform on new surface texuture" into gb-ub-photos-carlsbad * commit 'da67719ba3989288ddfa7530530d40720d8a4174': Workaround for re-applying transform on new surface texuture
|
da67719ba3989288ddfa7530530d40720d8a4174 |
10-Oct-2013 |
Doris Liu <tianliu@google.com> |
am f7b3f37d: am 364c8830: am 23df6752: Merge "Workaround for re-applying transform on new surface texuture" into gb-ub-photos-carlsbad * commit 'f7b3f37d1f4dde9698c10a5270f99cd414aac167': Workaround for re-applying transform on new surface texuture
|
fedddf62f19e12a24965d560e7413f7d5dd70cb3 |
10-Oct-2013 |
Mindy Pereira <mindyp@google.com> |
am a723b07d: am d6a639f3: am fca08fd3: am 47e437de: Merge "Update shutter recording assets." into gb-ub-photos-carlsbad * commit 'a723b07d3104a68b23a92a0801d0ba2c31db540b': Update shutter recording assets.
|
f7b3f37d1f4dde9698c10a5270f99cd414aac167 |
10-Oct-2013 |
Doris Liu <tianliu@google.com> |
am 364c8830: am 23df6752: Merge "Workaround for re-applying transform on new surface texuture" into gb-ub-photos-carlsbad * commit '364c88307b21d8f81d0c159ea0c852662dfdb0f0': Workaround for re-applying transform on new surface texuture
|
a723b07d3104a68b23a92a0801d0ba2c31db540b |
10-Oct-2013 |
Mindy Pereira <mindyp@google.com> |
am d6a639f3: am fca08fd3: am 47e437de: Merge "Update shutter recording assets." into gb-ub-photos-carlsbad * commit 'd6a639f353bfefd7882727b689a229d4ac969d5f': Update shutter recording assets.
|
364c88307b21d8f81d0c159ea0c852662dfdb0f0 |
10-Oct-2013 |
Doris Liu <tianliu@google.com> |
am 23df6752: Merge "Workaround for re-applying transform on new surface texuture" into gb-ub-photos-carlsbad * commit '23df6752f1bf0cc7d13b3aa68e87a8dde36af2d4': Workaround for re-applying transform on new surface texuture
|
79953260e073967da981a0ace2674ff550e8bb57 |
10-Oct-2013 |
Doris Liu <tianliu@google.com> |
am 23df6752: Merge "Workaround for re-applying transform on new surface texuture" into gb-ub-photos-carlsbad * commit '23df6752f1bf0cc7d13b3aa68e87a8dde36af2d4': Workaround for re-applying transform on new surface texuture
|
23df6752f1bf0cc7d13b3aa68e87a8dde36af2d4 |
10-Oct-2013 |
Doris Liu <tianliu@google.com> |
Merge "Workaround for re-applying transform on new surface texuture" into gb-ub-photos-carlsbad
|
d6a639f353bfefd7882727b689a229d4ac969d5f |
10-Oct-2013 |
Mindy Pereira <mindyp@google.com> |
am fca08fd3: am 47e437de: Merge "Update shutter recording assets." into gb-ub-photos-carlsbad * commit 'fca08fd3f63cc49e8ea191de7c61c92cce24f6a4': Update shutter recording assets.
|
21f32860e4919e6168ca9d65f386e43e299134f8 |
10-Oct-2013 |
Mindy Pereira <mindyp@google.com> |
am 47e437de: Merge "Update shutter recording assets." into gb-ub-photos-carlsbad * commit '47e437dea0d53310eba230a54724b30004de144f': Update shutter recording assets.
|
fca08fd3f63cc49e8ea191de7c61c92cce24f6a4 |
10-Oct-2013 |
Mindy Pereira <mindyp@google.com> |
am 47e437de: Merge "Update shutter recording assets." into gb-ub-photos-carlsbad * commit '47e437dea0d53310eba230a54724b30004de144f': Update shutter recording assets.
|
18f20b9f460a8e329dd5af1e035d23931e7e1910 |
10-Oct-2013 |
Doris Liu <tianliu@google.com> |
Workaround for re-applying transform on new surface texuture Bug: 10981460 Change-Id: Ic7fca757f3c1171317c76cd90fad43ff5c5ae5d2
rc/com/android/camera/PhotoUI.java
|
47e437dea0d53310eba230a54724b30004de144f |
10-Oct-2013 |
Mindy Pereira <mindyp@google.com> |
Merge "Update shutter recording assets." into gb-ub-photos-carlsbad
|
f6160d82d691707437cb1cabd0e75285648bd638 |
10-Oct-2013 |
ztenghui <ztenghui@google.com> |
am aebc3468: am d6f2c5c0: am 8d2bc8ef: am d46d6f8e: Merge "Fix flash issue" into gb-ub-photos-carlsbad * commit 'aebc34684139e4cb0bb819ef1eb3d97ed644a89e': Fix flash issue
|
aebc34684139e4cb0bb819ef1eb3d97ed644a89e |
10-Oct-2013 |
ztenghui <ztenghui@google.com> |
am d6f2c5c0: am 8d2bc8ef: am d46d6f8e: Merge "Fix flash issue" into gb-ub-photos-carlsbad * commit 'd6f2c5c0cacbe54d8daef9b6d75b30a95985996c': Fix flash issue
|
d6f2c5c0cacbe54d8daef9b6d75b30a95985996c |
10-Oct-2013 |
ztenghui <ztenghui@google.com> |
am 8d2bc8ef: am d46d6f8e: Merge "Fix flash issue" into gb-ub-photos-carlsbad * commit '8d2bc8ef3470efc960d5ebbb8ac2f6a25a5b38f5': Fix flash issue
|
6a351e5b7324069d2c15459323876ac446b92f4c |
10-Oct-2013 |
ztenghui <ztenghui@google.com> |
am d46d6f8e: Merge "Fix flash issue" into gb-ub-photos-carlsbad * commit 'd46d6f8e729b0e40878b53763387604a9193385a': Fix flash issue
|
05f84f31e26acdb9acd89c016d795669b2f994b2 |
09-Oct-2013 |
priya <priyar@google.com> |
Increased time to wait in all tests. For CameraLAtency.java got rid of the key event to get rid of geo tagging dialog on first launch of camera. That will be taken care of by pushing the shared_pref file. Change-Id: I76a824b5690d6913630560d58739e2df5cc1c259
ests/src/com/android/camera/stress/CameraLatency.java
ests/src/com/android/camera/stress/CameraStartUp.java
ests/src/com/android/camera/stress/ImageCapture.java
ests/src/com/android/camera/stress/VideoCapture.java
|
8d2bc8ef3470efc960d5ebbb8ac2f6a25a5b38f5 |
10-Oct-2013 |
ztenghui <ztenghui@google.com> |
am d46d6f8e: Merge "Fix flash issue" into gb-ub-photos-carlsbad * commit 'd46d6f8e729b0e40878b53763387604a9193385a': Fix flash issue
|
d46d6f8e729b0e40878b53763387604a9193385a |
10-Oct-2013 |
ztenghui <ztenghui@google.com> |
Merge "Fix flash issue" into gb-ub-photos-carlsbad
|
820a54a44e090171eecb8ad43cc44af5f7dfcf1a |
10-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
am 7013d125: am 552150ab: am 030b6a41: am 048bf4d0: Initialize GCam with GServices values. * commit '7013d125866cda5ecb4e4e0c27a5c91f2661b8ee': Initialize GCam with GServices values.
|
694464f1429d021c07fdf30427c99cc93178ca90 |
10-Oct-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 5f034d19: am 69782f4e: am cb17c7f8: am c14bfe6a: Merge "gcam: Add postcapture for gcam debugging." into gb-ub-photos-carlsbad * commit '5f034d1903b85560093798e74b75ae203473fee4': gcam: Add postcapture for gcam debugging.
|
f16e59c161056b002e8c54e5bca4bd015140a76c |
10-Oct-2013 |
The Android Automerger <android-build@google.com> |
merge in klp-release history after reset to klp-dev
|
7013d125866cda5ecb4e4e0c27a5c91f2661b8ee |
10-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
am 552150ab: am 030b6a41: am 048bf4d0: Initialize GCam with GServices values. * commit '552150ab458513bd51e4f3d50d9841528bc8c563': Initialize GCam with GServices values.
|
552150ab458513bd51e4f3d50d9841528bc8c563 |
10-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
am 030b6a41: am 048bf4d0: Initialize GCam with GServices values. * commit '030b6a41b77d7e830d8499589aec7527005d4e9d': Initialize GCam with GServices values.
|
030b6a41b77d7e830d8499589aec7527005d4e9d |
10-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
am 048bf4d0: Initialize GCam with GServices values. * commit '048bf4d0b46c4c34d8caa801c8ddc8c1ff4e79cf': Initialize GCam with GServices values.
|
167f49287ef67ecacd94942cf1b596a384fd1d80 |
10-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
am 048bf4d0: Initialize GCam with GServices values. * commit '048bf4d0b46c4c34d8caa801c8ddc8c1ff4e79cf': Initialize GCam with GServices values.
|
5f034d1903b85560093798e74b75ae203473fee4 |
10-Oct-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 69782f4e: am cb17c7f8: am c14bfe6a: Merge "gcam: Add postcapture for gcam debugging." into gb-ub-photos-carlsbad * commit '69782f4ec4d1e2af3e6b321cf919f6cf44a949c5': gcam: Add postcapture for gcam debugging.
|
69782f4ec4d1e2af3e6b321cf919f6cf44a949c5 |
10-Oct-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am cb17c7f8: am c14bfe6a: Merge "gcam: Add postcapture for gcam debugging." into gb-ub-photos-carlsbad * commit 'cb17c7f81ed4a00f17b6d63b186f4829ccdd3029': gcam: Add postcapture for gcam debugging.
|
048bf4d0b46c4c34d8caa801c8ddc8c1ff4e79cf |
07-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
Initialize GCam with GServices values. Bug: 11103065 Change-Id: Ic8d3c9825abdc5d79c5e4c7b0e96770ab0941036
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/CameraSettings.java
rc/com/android/camera/ui/ModuleSwitcher.java
rc_pd_gcam/com/android/camera/util/GcamHelper.java
|
cb17c7f81ed4a00f17b6d63b186f4829ccdd3029 |
10-Oct-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am c14bfe6a: Merge "gcam: Add postcapture for gcam debugging." into gb-ub-photos-carlsbad * commit 'c14bfe6a287d31c8ee5c7a698a60acfdc7e7e393': gcam: Add postcapture for gcam debugging.
|
bea4c5bed954391eb54463b8167391292f5f5baa |
10-Oct-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 34a4a375: am 8b226af5: am c89b9122: am b5eb1ffa: Merge "gcam: Fix preview FOV." into gb-ub-photos-carlsbad * commit '34a4a375b48d4cba96ecb333e8f9e6e7042c3384': gcam: Fix preview FOV.
|
e914700b35ca7edfbb447710b1db6ea1e33d14e2 |
10-Oct-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am c14bfe6a: Merge "gcam: Add postcapture for gcam debugging." into gb-ub-photos-carlsbad * commit 'c14bfe6a287d31c8ee5c7a698a60acfdc7e7e393': gcam: Add postcapture for gcam debugging.
|
c14bfe6a287d31c8ee5c7a698a60acfdc7e7e393 |
10-Oct-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "gcam: Add postcapture for gcam debugging." into gb-ub-photos-carlsbad
|
34a4a375b48d4cba96ecb333e8f9e6e7042c3384 |
10-Oct-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 8b226af5: am c89b9122: am b5eb1ffa: Merge "gcam: Fix preview FOV." into gb-ub-photos-carlsbad * commit '8b226af5ba340eb53fe375f15e7cfc5629deb294': gcam: Fix preview FOV.
|
8b226af5ba340eb53fe375f15e7cfc5629deb294 |
10-Oct-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am c89b9122: am b5eb1ffa: Merge "gcam: Fix preview FOV." into gb-ub-photos-carlsbad * commit 'c89b91221152d84f6792c530cf75aebb066e58ed': gcam: Fix preview FOV.
|
5bdf8cf20629a89de8cedd0c7e7b970067520f2c |
10-Oct-2013 |
Mindy Pereira <mindyp@google.com> |
Update shutter recording assets. fixes b/11155984 SRI pano shutter button inconsistent Change-Id: I6b4c8419d4cd3814287edf932dcdfcc8b91e49e6
es/drawable-hdpi-v19/btn_shutter_default.png
es/drawable-hdpi-v19/btn_shutter_pressed.png
es/drawable-hdpi-v19/btn_shutter_recording.png
es/drawable-hdpi-v19/btn_shutter_video_default.png
es/drawable-hdpi-v19/btn_shutter_video_pressed.png
es/drawable-hdpi-v19/btn_shutter_video_recording.png
es/drawable-mdpi-v19/btn_shutter_default.png
es/drawable-mdpi-v19/btn_shutter_pressed.png
es/drawable-mdpi-v19/btn_shutter_recording.png
es/drawable-mdpi-v19/btn_shutter_video_default.png
es/drawable-mdpi-v19/btn_shutter_video_pressed.png
es/drawable-mdpi-v19/btn_shutter_video_recording.png
es/drawable-xhdpi-v19/btn_shutter_default.png
es/drawable-xhdpi-v19/btn_shutter_pressed.png
es/drawable-xhdpi-v19/btn_shutter_recording.png
es/drawable-xhdpi-v19/btn_shutter_video_default.png
es/drawable-xhdpi-v19/btn_shutter_video_pressed.png
es/drawable-xhdpi-v19/btn_shutter_video_recording.png
es/drawable-xxhdpi-v19/btn_shutter_recording.png
es/drawable-xxhdpi-v19/btn_shutter_video_recording.png
|
54e21cc19f5faf2098218db778f3a8d70960e037 |
10-Oct-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am b5eb1ffa: Merge "gcam: Fix preview FOV." into gb-ub-photos-carlsbad * commit 'b5eb1ffab6db3f311def4f9b28a189a991396537': gcam: Fix preview FOV.
|
c89b91221152d84f6792c530cf75aebb066e58ed |
10-Oct-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am b5eb1ffa: Merge "gcam: Fix preview FOV." into gb-ub-photos-carlsbad * commit 'b5eb1ffab6db3f311def4f9b28a189a991396537': gcam: Fix preview FOV.
|
b5eb1ffab6db3f311def4f9b28a189a991396537 |
10-Oct-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "gcam: Fix preview FOV." into gb-ub-photos-carlsbad
|
285a5be7ce327eb4c169e60ecc4a9cd8d583e65d |
10-Oct-2013 |
ztenghui <ztenghui@google.com> |
Fix flash issue The flash light should show up at the same time as the control show up. Also, when we change the flash mode, we should update the flash on screen indicator. bug:11064667 Change-Id: I888d3ce76ac618a4c7b40a288ecce13555c89ab0
rc/com/android/camera/VideoModule.java
rc/com/android/camera/VideoUI.java
|
714d4d0f6cf3b04b70efd7f9bfc0a29ae03b7964 |
10-Oct-2013 |
Ruben Brunk <rubenbrunk@google.com> |
gcam: Fix preview FOV. Bug: 11150965 Change-Id: Iacdcc7ad37193f5343d2c5d5de3fabecee1f05df
rc/com/android/camera/util/CameraUtil.java
|
8d9525df3871e71528b6c0ea37ece827678e5df7 |
10-Oct-2013 |
Erin Dahlgren <edahlgren@google.com> |
am a96aa546: am 6ee3c8e0: am 3f552685: am 71686048: Merge "Update bottom edit control for photos inside secure and insecure mode." into gb-ub-photos-carlsbad * commit 'a96aa5466807bc8b6decd5ae1ec3f1c01db9eef5': Update bottom edit control for photos inside secure and insecure mode.
|
a96aa5466807bc8b6decd5ae1ec3f1c01db9eef5 |
10-Oct-2013 |
Erin Dahlgren <edahlgren@google.com> |
am 6ee3c8e0: am 3f552685: am 71686048: Merge "Update bottom edit control for photos inside secure and insecure mode." into gb-ub-photos-carlsbad * commit '6ee3c8e0dc1aad4331e43df952a91fe2774e80ac': Update bottom edit control for photos inside secure and insecure mode.
|
6ee3c8e0dc1aad4331e43df952a91fe2774e80ac |
10-Oct-2013 |
Erin Dahlgren <edahlgren@google.com> |
am 3f552685: am 71686048: Merge "Update bottom edit control for photos inside secure and insecure mode." into gb-ub-photos-carlsbad * commit '3f552685349fc1b447dc09c54d66de397270da9a': Update bottom edit control for photos inside secure and insecure mode.
|
3f552685349fc1b447dc09c54d66de397270da9a |
10-Oct-2013 |
Erin Dahlgren <edahlgren@google.com> |
am 71686048: Merge "Update bottom edit control for photos inside secure and insecure mode." into gb-ub-photos-carlsbad * commit '716860487554b5e214d355f88effc9b8c316d54e': Update bottom edit control for photos inside secure and insecure mode.
|
9234c57d8f0157f49c59d901e1ccd32af00477bd |
10-Oct-2013 |
Erin Dahlgren <edahlgren@google.com> |
am 71686048: Merge "Update bottom edit control for photos inside secure and insecure mode." into gb-ub-photos-carlsbad * commit '716860487554b5e214d355f88effc9b8c316d54e': Update bottom edit control for photos inside secure and insecure mode.
|
716860487554b5e214d355f88effc9b8c316d54e |
10-Oct-2013 |
Erin Dahlgren <edahlgren@google.com> |
Merge "Update bottom edit control for photos inside secure and insecure mode." into gb-ub-photos-carlsbad
|
39ca527f2647d7af6ae9f326bec1fa627c675989 |
09-Oct-2013 |
Erin Dahlgren <edahlgren@google.com> |
Update bottom edit control for photos inside secure and insecure mode. Bug: 11067201 Change-Id: I21a775d46c26206e340c830fceafaf52e7a06ac5
rc/com/android/camera/ui/FilmStripView.java
|
d11c9a1e7fb126a5da6c9107a4b05770b46b1571 |
09-Oct-2013 |
ztenghui <ztenghui@google.com> |
am 8f375272: am 90da6872: am 3cac767e: am 70d24b5b: Merge "Fix another potential issue related to video capture intent." into gb-ub-photos-carlsbad * commit '8f3752727d89161569dc728b19a0fd46961e4a24': Fix another potential issue related to video capture intent.
|
8f3752727d89161569dc728b19a0fd46961e4a24 |
09-Oct-2013 |
ztenghui <ztenghui@google.com> |
am 90da6872: am 3cac767e: am 70d24b5b: Merge "Fix another potential issue related to video capture intent." into gb-ub-photos-carlsbad * commit '90da6872aa443c7d54d46f9ac0680f014f9ae53c': Fix another potential issue related to video capture intent.
|
a60c369506b37e372889c76886b317255bc097e8 |
09-Oct-2013 |
Doris Liu <tianliu@google.com> |
am 4702a593: am 3152c957: am 7c2e7cce: am ef4dccf6: Merge "Workaround to disable swiping for SRI during capture" into gb-ub-photos-carlsbad * commit '4702a593eaad74a524834822e210bc615238835f': Workaround to disable swiping for SRI during capture
|
90da6872aa443c7d54d46f9ac0680f014f9ae53c |
09-Oct-2013 |
ztenghui <ztenghui@google.com> |
am 3cac767e: am 70d24b5b: Merge "Fix another potential issue related to video capture intent." into gb-ub-photos-carlsbad * commit '3cac767e2fafccd565761b7677f554d680c72de3': Fix another potential issue related to video capture intent.
|
4702a593eaad74a524834822e210bc615238835f |
09-Oct-2013 |
Doris Liu <tianliu@google.com> |
am 3152c957: am 7c2e7cce: am ef4dccf6: Merge "Workaround to disable swiping for SRI during capture" into gb-ub-photos-carlsbad * commit '3152c957ff7cf8ddaabe256363b2fbafe7b4a078': Workaround to disable swiping for SRI during capture
|
3cac767e2fafccd565761b7677f554d680c72de3 |
09-Oct-2013 |
ztenghui <ztenghui@google.com> |
am 70d24b5b: Merge "Fix another potential issue related to video capture intent." into gb-ub-photos-carlsbad * commit '70d24b5b602ae56784d7f7bd6d79af7d37095553': Fix another potential issue related to video capture intent.
|
f64e2d801b6a464affe4647772a8f8abff975e12 |
09-Oct-2013 |
ztenghui <ztenghui@google.com> |
am 70d24b5b: Merge "Fix another potential issue related to video capture intent." into gb-ub-photos-carlsbad * commit '70d24b5b602ae56784d7f7bd6d79af7d37095553': Fix another potential issue related to video capture intent.
|
3152c957ff7cf8ddaabe256363b2fbafe7b4a078 |
09-Oct-2013 |
Doris Liu <tianliu@google.com> |
am 7c2e7cce: am ef4dccf6: Merge "Workaround to disable swiping for SRI during capture" into gb-ub-photos-carlsbad * commit '7c2e7ccef29aa272f183b90a4890e3ce5e6526f2': Workaround to disable swiping for SRI during capture
|
70d24b5b602ae56784d7f7bd6d79af7d37095553 |
09-Oct-2013 |
ztenghui <ztenghui@google.com> |
Merge "Fix another potential issue related to video capture intent." into gb-ub-photos-carlsbad
|
7c2e7ccef29aa272f183b90a4890e3ce5e6526f2 |
09-Oct-2013 |
Doris Liu <tianliu@google.com> |
am ef4dccf6: Merge "Workaround to disable swiping for SRI during capture" into gb-ub-photos-carlsbad * commit 'ef4dccf65c1077b8c7f28c26c9c2038c975fd94c': Workaround to disable swiping for SRI during capture
|
6c402f3b2b3d4c1e3ae25d241e871fd6799ce8a0 |
09-Oct-2013 |
Doris Liu <tianliu@google.com> |
am ef4dccf6: Merge "Workaround to disable swiping for SRI during capture" into gb-ub-photos-carlsbad * commit 'ef4dccf65c1077b8c7f28c26c9c2038c975fd94c': Workaround to disable swiping for SRI during capture
|
ef4dccf65c1077b8c7f28c26c9c2038c975fd94c |
09-Oct-2013 |
Doris Liu <tianliu@google.com> |
Merge "Workaround to disable swiping for SRI during capture" into gb-ub-photos-carlsbad
|
a6637593a6811be9ba8642e1dced90e0c63093e0 |
09-Oct-2013 |
Erin Dahlgren <edahlgren@google.com> |
am 19b7517f: am c3075c38: am 82223508: am 26862c30: Update bottom controls and action bar with a tighter bounds on data change. * commit '19b7517f812dbadc6b58f88daf8e2152ad1bde58': Update bottom controls and action bar with a tighter bounds on data change.
|
19b7517f812dbadc6b58f88daf8e2152ad1bde58 |
09-Oct-2013 |
Erin Dahlgren <edahlgren@google.com> |
am c3075c38: am 82223508: am 26862c30: Update bottom controls and action bar with a tighter bounds on data change. * commit 'c3075c38cb8d7175ad5852348bc0ab2503c17086': Update bottom controls and action bar with a tighter bounds on data change.
|
c3075c38cb8d7175ad5852348bc0ab2503c17086 |
09-Oct-2013 |
Erin Dahlgren <edahlgren@google.com> |
am 82223508: am 26862c30: Update bottom controls and action bar with a tighter bounds on data change. * commit '82223508f8a30bf30577cad5760db8ceff35586a': Update bottom controls and action bar with a tighter bounds on data change.
|
7a205c62c51257812839ac1eb510d3f408432fbe |
09-Oct-2013 |
Erin Dahlgren <edahlgren@google.com> |
am 26862c30: Update bottom controls and action bar with a tighter bounds on data change. * commit '26862c304a8163016b1f8196c715769750ba1720': Update bottom controls and action bar with a tighter bounds on data change.
|
82223508f8a30bf30577cad5760db8ceff35586a |
09-Oct-2013 |
Erin Dahlgren <edahlgren@google.com> |
am 26862c30: Update bottom controls and action bar with a tighter bounds on data change. * commit '26862c304a8163016b1f8196c715769750ba1720': Update bottom controls and action bar with a tighter bounds on data change.
|
26862c304a8163016b1f8196c715769750ba1720 |
09-Oct-2013 |
Erin Dahlgren <edahlgren@google.com> |
Update bottom controls and action bar with a tighter bounds on data change. Bug: 11087361 Change-Id: Ie319d1767eb671ca7ed4a129aa9b75c77d63b20d
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/ui/FilmStripView.java
|
e9549df5f1d49bd3331505c75acc827a729e3a9f |
09-Oct-2013 |
Doris Liu <tianliu@google.com> |
Workaround to disable swiping for SRI during capture Bug: 11139101 Change-Id: I2cfc9fb94259755e3db6f5d0b80287388cb846de
es/layout/panorama_module.xml
|
d217ed0fa931d2a080a159c24e4012697baf5ae3 |
09-Oct-2013 |
Ruben Brunk <rubenbrunk@google.com> |
gcam: Add postcapture for gcam debugging. Bug: 11010544 Change-Id: I782bf3bd52f7b37cf47291501560ba771951760a
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/PhotoModule.java
|
638bf9ae74f28ce7b6c0b3e6cbe3d6e09b677138 |
09-Oct-2013 |
ztenghui <ztenghui@google.com> |
Fix another potential issue related to video capture intent. We don't want to delete the Uri sent from the intent. When we are in review mode, the mCurrentVideoUri should be from the capture result. bug:11136978 Change-Id: I148135326e3516936f7d6463941c6b50dbc389db
rc/com/android/camera/VideoModule.java
|
9bf4da841b4f97d57459595f3f4a7cf5a89beb29 |
09-Oct-2013 |
Sameer Padala <sxp@google.com> |
Merge "Initial commit of SmartCamera." into gb-ub-photos-denali
|
3fa1b9ff0d052e38b02c55c2bb01ff359c1c9efd |
09-Oct-2013 |
ztenghui <ztenghui@google.com> |
am bbd228fc: am e158f707: am 676b89ca: am 52beb04d: Merge "Fix NPE in video intent." into gb-ub-photos-carlsbad * commit 'bbd228fcdfe92deb9ecfdcf94f5e8a20177bf760': Fix NPE in video intent.
|
bbd228fcdfe92deb9ecfdcf94f5e8a20177bf760 |
09-Oct-2013 |
ztenghui <ztenghui@google.com> |
am e158f707: am 676b89ca: am 52beb04d: Merge "Fix NPE in video intent." into gb-ub-photos-carlsbad * commit 'e158f707136e028a3afb8aff28de566db5468e81': Fix NPE in video intent.
|
e158f707136e028a3afb8aff28de566db5468e81 |
09-Oct-2013 |
ztenghui <ztenghui@google.com> |
am 676b89ca: am 52beb04d: Merge "Fix NPE in video intent." into gb-ub-photos-carlsbad * commit '676b89cab6e9db1b784617fc16e97eadac7c4e2d': Fix NPE in video intent.
|
676b89cab6e9db1b784617fc16e97eadac7c4e2d |
09-Oct-2013 |
ztenghui <ztenghui@google.com> |
am 52beb04d: Merge "Fix NPE in video intent." into gb-ub-photos-carlsbad * commit '52beb04d45ff906dfaffb1799a6d93859f1d83bd': Fix NPE in video intent.
|
73acdad4c9910b9c3b824bf66ebcd22b101c490a |
09-Oct-2013 |
ztenghui <ztenghui@google.com> |
am 52beb04d: Merge "Fix NPE in video intent." into gb-ub-photos-carlsbad * commit '52beb04d45ff906dfaffb1799a6d93859f1d83bd': Fix NPE in video intent.
|
52beb04d45ff906dfaffb1799a6d93859f1d83bd |
09-Oct-2013 |
ztenghui <ztenghui@google.com> |
Merge "Fix NPE in video intent." into gb-ub-photos-carlsbad
|
9d797d2001067476d1d46062d3f289e35da4e0da |
09-Oct-2013 |
Angus Kong <shkong@google.com> |
am 4ba3f4e0: am 2393fa30: am 59f24eeb: am 6939d143: Merge "Make the transition animation identical." into gb-ub-photos-carlsbad * commit '4ba3f4e0524a2063defb2bbb5c04b145c727dadc': Make the transition animation identical.
|
5636b8ebdf5c8733ed1adc4e82178841b21d1fdc |
09-Oct-2013 |
Angus Kong <shkong@google.com> |
am d33edf4f: am 2df4a3c5: am a584528f: am 6ddd31b9: Enter fullscreen if all items are removed. * commit 'd33edf4fcb1f5b4c479d18b7496acad96e3c5bbe': Enter fullscreen if all items are removed.
|
878a73bb47bc13fd45eeb28c260a869a9373666b |
09-Oct-2013 |
Angus Kong <shkong@google.com> |
am cf076416: am 7693a4f0: am 762d8cb0: am b04dcdb5: Merge "Don\'t go into Gcam when it\'s capture intent." into gb-ub-photos-carlsbad * commit 'cf076416c755d05e133705b882b9cab1437e711d': Don't go into Gcam when it's capture intent.
|
8d64700f79bacac688efa1c1595826f245456742 |
09-Oct-2013 |
Doris Liu <tianliu@google.com> |
am 08339ae8: am eba2ebbd: am 52fab3a0: am 3179f6a4: Allow scaling beyond 1:1 in zoom view * commit '08339ae81ea680fc08244c873127a8aaa9ecfe8a': Allow scaling beyond 1:1 in zoom view
|
9945b425d160a905cf3222c057b88b5571b3f908 |
09-Oct-2013 |
Doris Liu <tianliu@google.com> |
am ad0e2958: am e5543c5c: am 89a8a1c3: am 607634ca: Merge "Do not allow navigation to filmstrip during video recording" into gb-ub-photos-carlsbad * commit 'ad0e295839ce7357e25fdb3f2423bc36e7196ea5': Do not allow navigation to filmstrip during video recording
|
7cb732464025a962c4462a3a316d811de94cc66b |
09-Oct-2013 |
Mindy DelliCarpini <mindyp@google.com> |
am 2f0e2e07: am fdcc07eb: am 51d86937: am 2ca6c0f7: Merge "Update camera assets for de-blue effort" into gb-ub-photos-carlsbad * commit '2f0e2e0796990a57cfce189bed1edf8b600939d0': Update camera assets for de-blue effort
|
0c81e586459abf79f8bdbbf9b8b73b1a32f55b98 |
09-Oct-2013 |
Ed Heyl <edheyl@google.com> |
am 55cce949: am 57067df0: am 3e69e4ee: merge in KFS78N (no-op) * commit '55cce949bd819241828e3f52099eb036319f28fa':
|
2b5ed6dcec56dd7d864887c3cbc9acf3300c4607 |
09-Oct-2013 |
Ed Heyl <edheyl@google.com> |
am 2ceaed66: am a6f80df8: am 2c042f21: merge in KQS81M * commit '2ceaed66837c94a7be837e3e101e93988450afbd': Adding gcam module to Camera2 app. Refine Filmstrip gesture/position handling. Fix drawable location. Improve swipe gesture in filmstrip. Fix black screen in mode switching Stop the MediaSaveService after unbinding. Enable switching cameras in video mode. Handle unexpected exceptions when loading videos.
|
4ba3f4e0524a2063defb2bbb5c04b145c727dadc |
09-Oct-2013 |
Angus Kong <shkong@google.com> |
am 2393fa30: am 59f24eeb: am 6939d143: Merge "Make the transition animation identical." into gb-ub-photos-carlsbad * commit '2393fa305aa8fd0cf2d7c72381899b307fcd278d': Make the transition animation identical.
|
2393fa305aa8fd0cf2d7c72381899b307fcd278d |
09-Oct-2013 |
Angus Kong <shkong@google.com> |
am 59f24eeb: am 6939d143: Merge "Make the transition animation identical." into gb-ub-photos-carlsbad * commit '59f24eeb714d75658f98123928f872fe65cab0a1': Make the transition animation identical.
|
59f24eeb714d75658f98123928f872fe65cab0a1 |
09-Oct-2013 |
Angus Kong <shkong@google.com> |
am 6939d143: Merge "Make the transition animation identical." into gb-ub-photos-carlsbad * commit '6939d143cb52a012b1b9cd9a141156357367b212': Make the transition animation identical.
|
4933533b906d4268cdda0d45cc309afd6f63f10f |
09-Oct-2013 |
Angus Kong <shkong@google.com> |
am 6939d143: Merge "Make the transition animation identical." into gb-ub-photos-carlsbad * commit '6939d143cb52a012b1b9cd9a141156357367b212': Make the transition animation identical.
|
6939d143cb52a012b1b9cd9a141156357367b212 |
09-Oct-2013 |
Angus Kong <shkong@google.com> |
Merge "Make the transition animation identical." into gb-ub-photos-carlsbad
|
d33edf4fcb1f5b4c479d18b7496acad96e3c5bbe |
09-Oct-2013 |
Angus Kong <shkong@google.com> |
am 2df4a3c5: am a584528f: am 6ddd31b9: Enter fullscreen if all items are removed. * commit '2df4a3c5748ce523f0433034b4575eb710d4c6c2': Enter fullscreen if all items are removed.
|
2df4a3c5748ce523f0433034b4575eb710d4c6c2 |
09-Oct-2013 |
Angus Kong <shkong@google.com> |
am a584528f: am 6ddd31b9: Enter fullscreen if all items are removed. * commit 'a584528f0c77d383284ba6c8cc249bcad49e2be7': Enter fullscreen if all items are removed.
|
a584528f0c77d383284ba6c8cc249bcad49e2be7 |
09-Oct-2013 |
Angus Kong <shkong@google.com> |
am 6ddd31b9: Enter fullscreen if all items are removed. * commit '6ddd31b9284bbbfcf891766f9d6238bfd5cde721': Enter fullscreen if all items are removed.
|
9ac359212126644c789278bd55ec4a4c1ec440c4 |
09-Oct-2013 |
Angus Kong <shkong@google.com> |
am 6ddd31b9: Enter fullscreen if all items are removed. * commit '6ddd31b9284bbbfcf891766f9d6238bfd5cde721': Enter fullscreen if all items are removed.
|
da568b23002859e9672271bb135808303c2e07cb |
09-Oct-2013 |
Angus Kong <shkong@google.com> |
Make the transition animation identical. The animation of transition between camera preview and filmstrip should be a special case to prevent jank. bug:11011577 Change-Id: If611599203e845d098cd6e4acb56d5631d085ffe
rc/com/android/camera/ui/FilmStripView.java
|
6ddd31b9284bbbfcf891766f9d6238bfd5cde721 |
09-Oct-2013 |
Angus Kong <shkong@google.com> |
Enter fullscreen if all items are removed. bug:11066937 Change-Id: Ibf9b03adc0d00838ba23c65361aa7c783c835d90
rc/com/android/camera/ui/FilmStripView.java
|
336041e5c62c084f6fd0d3a33bc8de0bc036f81d |
09-Oct-2013 |
The Android Automerger <android-build@google.com> |
merge in klp-release history after reset to klp-dev
|
cf076416c755d05e133705b882b9cab1437e711d |
09-Oct-2013 |
Angus Kong <shkong@google.com> |
am 7693a4f0: am 762d8cb0: am b04dcdb5: Merge "Don\'t go into Gcam when it\'s capture intent." into gb-ub-photos-carlsbad * commit '7693a4f020261d20b2f48f11b842f9c095abeba5': Don't go into Gcam when it's capture intent.
|
7693a4f020261d20b2f48f11b842f9c095abeba5 |
09-Oct-2013 |
Angus Kong <shkong@google.com> |
am 762d8cb0: am b04dcdb5: Merge "Don\'t go into Gcam when it\'s capture intent." into gb-ub-photos-carlsbad * commit '762d8cb0c6e05af36893fd3eec9753e4f68b6c83': Don't go into Gcam when it's capture intent.
|
63569491d9f87f178521067fcfe99907c3398bf4 |
09-Oct-2013 |
Angus Kong <shkong@google.com> |
am b04dcdb5: Merge "Don\'t go into Gcam when it\'s capture intent." into gb-ub-photos-carlsbad * commit 'b04dcdb5cea6ac42f8ba0d699dc45e965d104a5e': Don't go into Gcam when it's capture intent.
|
762d8cb0c6e05af36893fd3eec9753e4f68b6c83 |
09-Oct-2013 |
Angus Kong <shkong@google.com> |
am b04dcdb5: Merge "Don\'t go into Gcam when it\'s capture intent." into gb-ub-photos-carlsbad * commit 'b04dcdb5cea6ac42f8ba0d699dc45e965d104a5e': Don't go into Gcam when it's capture intent.
|
b04dcdb5cea6ac42f8ba0d699dc45e965d104a5e |
09-Oct-2013 |
Angus Kong <shkong@google.com> |
Merge "Don't go into Gcam when it's capture intent." into gb-ub-photos-carlsbad
|
5b4ccd2e6334e2eb0a7ac2e6db6a386fd26f0479 |
10-Sep-2013 |
Sameer Padala <sxp@google.com> |
Initial commit of SmartCamera. These are the stubs that are going into AOSP * Added s/c/a/camera/util/SmartCameraHelper.java stub * Added barcode hook to s/c/a/c/PhotoModule.java Change-Id: Ic76304d129552be27c0a43e279d190c24313dcf9
rc/com/android/camera/PhotoModule.java
rc_pd/com/android/camera/util/SmartCameraHelper.java
|
08339ae81ea680fc08244c873127a8aaa9ecfe8a |
09-Oct-2013 |
Doris Liu <tianliu@google.com> |
am eba2ebbd: am 52fab3a0: am 3179f6a4: Allow scaling beyond 1:1 in zoom view * commit 'eba2ebbd1293f6fc9d09b3a4f3dc580df6839147': Allow scaling beyond 1:1 in zoom view
|
eba2ebbd1293f6fc9d09b3a4f3dc580df6839147 |
09-Oct-2013 |
Doris Liu <tianliu@google.com> |
am 52fab3a0: am 3179f6a4: Allow scaling beyond 1:1 in zoom view * commit '52fab3a022a45e1a87852c1eda650d60a8633d1a': Allow scaling beyond 1:1 in zoom view
|
0b24690c59ccc625958c2bf046f390e7686981fb |
09-Oct-2013 |
Doris Liu <tianliu@google.com> |
am 3179f6a4: Allow scaling beyond 1:1 in zoom view * commit '3179f6a49516833761be5155c4e1244ac0aa17fe': Allow scaling beyond 1:1 in zoom view
|
52fab3a022a45e1a87852c1eda650d60a8633d1a |
09-Oct-2013 |
Doris Liu <tianliu@google.com> |
am 3179f6a4: Allow scaling beyond 1:1 in zoom view * commit '3179f6a49516833761be5155c4e1244ac0aa17fe': Allow scaling beyond 1:1 in zoom view
|
dfe5b152788b970944078afc7e57f9d8684571c7 |
09-Oct-2013 |
ztenghui <ztenghui@google.com> |
Fix NPE in video intent. bug:11136978 Change-Id: I6076581131e3dcdc456d8ac8865a5cc6f84e9da4
rc/com/android/camera/VideoModule.java
|
1584fbc62790232673cbab3e71ce6d04a69406e2 |
09-Oct-2013 |
Angus Kong <shkong@google.com> |
am 768d99eb: am 2f0b7b19: am 3c27dd36: am f5aa51e6: Add shutter click sound in SoundClips. * commit '768d99eb74ffff1ef082262e3af2b4468bb91d92': Add shutter click sound in SoundClips.
|
3179f6a49516833761be5155c4e1244ac0aa17fe |
09-Oct-2013 |
Doris Liu <tianliu@google.com> |
Allow scaling beyond 1:1 in zoom view Bug: 10950226 Change-Id: I38828edaf4010170f6c6db18b8c5fdeef91b4f11
rc/com/android/camera/ui/FilmStripView.java
rc/com/android/camera/ui/ZoomView.java
|
ad0e295839ce7357e25fdb3f2423bc36e7196ea5 |
09-Oct-2013 |
Doris Liu <tianliu@google.com> |
am e5543c5c: am 89a8a1c3: am 607634ca: Merge "Do not allow navigation to filmstrip during video recording" into gb-ub-photos-carlsbad * commit 'e5543c5c3c15ed3212fcc583ae3bf8dfdcbcea4b': Do not allow navigation to filmstrip during video recording
|
e5543c5c3c15ed3212fcc583ae3bf8dfdcbcea4b |
09-Oct-2013 |
Doris Liu <tianliu@google.com> |
am 89a8a1c3: am 607634ca: Merge "Do not allow navigation to filmstrip during video recording" into gb-ub-photos-carlsbad * commit '89a8a1c3a85bad6b99c240364e8fad33fc7a89e2': Do not allow navigation to filmstrip during video recording
|
8509010ef6045d8938eb18d8216d97ce3d78e1f4 |
09-Oct-2013 |
Doris Liu <tianliu@google.com> |
am 607634ca: Merge "Do not allow navigation to filmstrip during video recording" into gb-ub-photos-carlsbad * commit '607634cafd9a0b626de8390d855bdabe23a4738b': Do not allow navigation to filmstrip during video recording
|
89a8a1c3a85bad6b99c240364e8fad33fc7a89e2 |
09-Oct-2013 |
Doris Liu <tianliu@google.com> |
am 607634ca: Merge "Do not allow navigation to filmstrip during video recording" into gb-ub-photos-carlsbad * commit '607634cafd9a0b626de8390d855bdabe23a4738b': Do not allow navigation to filmstrip during video recording
|
607634cafd9a0b626de8390d855bdabe23a4738b |
09-Oct-2013 |
Doris Liu <tianliu@google.com> |
Merge "Do not allow navigation to filmstrip during video recording" into gb-ub-photos-carlsbad
|
2f0e2e0796990a57cfce189bed1edf8b600939d0 |
09-Oct-2013 |
Mindy DelliCarpini <mindyp@google.com> |
am fdcc07eb: am 51d86937: am 2ca6c0f7: Merge "Update camera assets for de-blue effort" into gb-ub-photos-carlsbad * commit 'fdcc07eb2705ab49a63b588505107404041da750': Update camera assets for de-blue effort
|
fdcc07eb2705ab49a63b588505107404041da750 |
09-Oct-2013 |
Mindy DelliCarpini <mindyp@google.com> |
am 51d86937: am 2ca6c0f7: Merge "Update camera assets for de-blue effort" into gb-ub-photos-carlsbad * commit '51d86937e76b5e07f000c790818244e748403e75': Update camera assets for de-blue effort
|
bf64d476076b45f3fe6a8c96d446c658983c3249 |
09-Oct-2013 |
Mindy DelliCarpini <mindyp@google.com> |
am 2ca6c0f7: Merge "Update camera assets for de-blue effort" into gb-ub-photos-carlsbad * commit '2ca6c0f77ab8c70558e2ad4937d2fdd1e505b0f5': Update camera assets for de-blue effort
|
51d86937e76b5e07f000c790818244e748403e75 |
09-Oct-2013 |
Mindy DelliCarpini <mindyp@google.com> |
am 2ca6c0f7: Merge "Update camera assets for de-blue effort" into gb-ub-photos-carlsbad * commit '2ca6c0f77ab8c70558e2ad4937d2fdd1e505b0f5': Update camera assets for de-blue effort
|
2ca6c0f77ab8c70558e2ad4937d2fdd1e505b0f5 |
09-Oct-2013 |
Mindy DelliCarpini <mindyp@google.com> |
Merge "Update camera assets for de-blue effort" into gb-ub-photos-carlsbad
|
55cce949bd819241828e3f52099eb036319f28fa |
09-Oct-2013 |
Ed Heyl <edheyl@google.com> |
am 57067df0: am 3e69e4ee: merge in KFS78N (no-op) * commit '57067df0117b6007241bf0e647ee9f54d925998a':
|
57067df0117b6007241bf0e647ee9f54d925998a |
09-Oct-2013 |
Ed Heyl <edheyl@google.com> |
am 3e69e4ee: merge in KFS78N (no-op) * commit '3e69e4ee9e2b532af96a331d99ef74c6044d0cf4':
|
3e69e4ee9e2b532af96a331d99ef74c6044d0cf4 |
09-Oct-2013 |
Ed Heyl <edheyl@google.com> |
merge in KFS78N (no-op)
|
2ceaed66837c94a7be837e3e101e93988450afbd |
09-Oct-2013 |
Ed Heyl <edheyl@google.com> |
am a6f80df8: am 2c042f21: merge in KQS81M * commit 'a6f80df8b0cc75ee4459550f99a8a5c60c19a857': Adding gcam module to Camera2 app. Refine Filmstrip gesture/position handling. Fix drawable location. Improve swipe gesture in filmstrip. Fix black screen in mode switching Stop the MediaSaveService after unbinding. Enable switching cameras in video mode. Handle unexpected exceptions when loading videos.
|
a6f80df8b0cc75ee4459550f99a8a5c60c19a857 |
09-Oct-2013 |
Ed Heyl <edheyl@google.com> |
am 2c042f21: merge in KQS81M * commit '2c042f218280aa6ee8c8d0d83fe4830e104c6365': Adding gcam module to Camera2 app. Refine Filmstrip gesture/position handling. Fix drawable location. Improve swipe gesture in filmstrip. Fix black screen in mode switching Stop the MediaSaveService after unbinding. Enable switching cameras in video mode. Handle unexpected exceptions when loading videos. Add back DisableCameraReceiver
|
2c042f218280aa6ee8c8d0d83fe4830e104c6365 |
09-Oct-2013 |
Ed Heyl <edheyl@google.com> |
merge in KQS81M
|
768d99eb74ffff1ef082262e3af2b4468bb91d92 |
09-Oct-2013 |
Angus Kong <shkong@google.com> |
am 2f0b7b19: am 3c27dd36: am f5aa51e6: Add shutter click sound in SoundClips. * commit '2f0b7b190bf69ce496cf460895ec176fb7ac2418': Add shutter click sound in SoundClips.
|
2f0b7b190bf69ce496cf460895ec176fb7ac2418 |
09-Oct-2013 |
Angus Kong <shkong@google.com> |
am 3c27dd36: am f5aa51e6: Add shutter click sound in SoundClips. * commit '3c27dd3690ee42aafdb7d19eee4f9bf50f95a47d': Add shutter click sound in SoundClips.
|
85ca0e7e79af80337b5f611f4501fa376632d151 |
09-Oct-2013 |
Angus Kong <shkong@google.com> |
am f5aa51e6: Add shutter click sound in SoundClips. * commit 'f5aa51e6e8da349c8f1a604b431af243cc0802c0': Add shutter click sound in SoundClips.
|
3c27dd3690ee42aafdb7d19eee4f9bf50f95a47d |
09-Oct-2013 |
Angus Kong <shkong@google.com> |
am f5aa51e6: Add shutter click sound in SoundClips. * commit 'f5aa51e6e8da349c8f1a604b431af243cc0802c0': Add shutter click sound in SoundClips.
|
f5aa51e6e8da349c8f1a604b431af243cc0802c0 |
08-Oct-2013 |
Angus Kong <shkong@google.com> |
Add shutter click sound in SoundClips. bug:11135055 Change-Id: Ib4396ada73021beff9845c49fee7c5eb8f4cc96d
rc/com/android/camera/SoundClips.java
|
0fb819b4619cd4ac20f9d381739e444da011d4ed |
08-Oct-2013 |
Angus Kong <shkong@google.com> |
Don't go into Gcam when it's capture intent. bug:11115082 Change-Id: I2532e9597f526eb7daea9753b019d5ed95f5fe6b
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/CameraSettings.java
rc/com/android/camera/PhotoModule.java
|
fe6596c3474f0ffbf03a2b7a7d89ea9cc9d9d61d |
08-Oct-2013 |
Doris Liu <tianliu@google.com> |
Do not allow navigation to filmstrip during video recording Bug: 11064867 Change-Id: I168136a193008578b3ad2642cba764650bcc2487
rc/com/android/camera/VideoModule.java
rc/com/android/camera/VideoUI.java
|
302dd429da329b406353b513d3f8372d0e5eef88 |
08-Oct-2013 |
The Android Automerger <android-build@google.com> |
merge in klp-release history after reset to klp-dev
|
b5dfe2420856214bfb7df79ce4c9d96645c971b7 |
08-Oct-2013 |
Baligh Uddin <baligh@google.com> |
am b9358143: (-s ours) am 6f1346f8: (-s ours) am d0fff8a7: (-s ours) Merge "Revert "Import translations. DO NOT MERGE"" into klp-dev * commit 'b9358143036925d4a0fd88e3ee26b00d6f0eaf59': Revert "Import translations. DO NOT MERGE"
|
b9358143036925d4a0fd88e3ee26b00d6f0eaf59 |
08-Oct-2013 |
Baligh Uddin <baligh@google.com> |
am 6f1346f8: (-s ours) am d0fff8a7: (-s ours) Merge "Revert "Import translations. DO NOT MERGE"" into klp-dev * commit '6f1346f8a29f6d5878b65273b5f783909137e853': Revert "Import translations. DO NOT MERGE"
|
30f796530619636c7d3ae527226ccfd93538025e |
08-Oct-2013 |
Baligh Uddin <baligh@google.com> |
am 2f97233f: (-s ours) am a8771ede: (-s ours) Merge "Revert "Import translations. DO NOT MERGE"" into klp-ub-dev * commit '2f97233f8ae7678c19d4a6fb729be1eb9238d2a3': Revert "Import translations. DO NOT MERGE"
|
6f1346f8a29f6d5878b65273b5f783909137e853 |
08-Oct-2013 |
Baligh Uddin <baligh@google.com> |
am d0fff8a7: (-s ours) Merge "Revert "Import translations. DO NOT MERGE"" into klp-dev * commit 'd0fff8a7802505fb882bff18d3033f77bb273228': Revert "Import translations. DO NOT MERGE"
|
2f97233f8ae7678c19d4a6fb729be1eb9238d2a3 |
08-Oct-2013 |
Baligh Uddin <baligh@google.com> |
am a8771ede: (-s ours) Merge "Revert "Import translations. DO NOT MERGE"" into klp-ub-dev * commit 'a8771ede1ca54f2105860c57a7fc5858a80f6483': Revert "Import translations. DO NOT MERGE"
|
a8771ede1ca54f2105860c57a7fc5858a80f6483 |
08-Oct-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Revert "Import translations. DO NOT MERGE"" into klp-ub-dev
|
9757a2f3279e1f0bcc5413eee906bf88e3ac8f3b |
08-Oct-2013 |
Baligh Uddin <baligh@google.com> |
Revert "Import translations. DO NOT MERGE" This reverts commit fac183bec4a6a2da290e57d0c1875423a3801557. Change-Id: I1a4c06fe958c341f1a6d6d2ee41098236ec4d30c
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms-rMY/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
183a1d06d67f3733c8f8075f873976dc669b1394 |
08-Oct-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Revert "Import translations. DO NOT MERGE""
|
77e9945ec0b256716aec32bc6e9e2b6ea74621bc |
08-Oct-2013 |
Baligh Uddin <baligh@google.com> |
Revert "Import translations. DO NOT MERGE" This reverts commit 0c425f6953f9a0bfdc0b13f695d8c81a0fca44fe. Change-Id: I6d14ed8fb7c49c62e9641206b12d57c2af30ebc7
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-km-rKH/strings.xml
es/values-ko/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mn-rMN/strings.xml
es/values-ms-rMY/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
d0fff8a7802505fb882bff18d3033f77bb273228 |
08-Oct-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Revert "Import translations. DO NOT MERGE"" into klp-dev
|
ad1f318bb59e52c300710bbe108b0e832c84f940 |
08-Oct-2013 |
Baligh Uddin <baligh@google.com> |
Revert "Import translations. DO NOT MERGE" This reverts commit 5d00bc10562d86312bc88c34d00da20f41cc3ad9. Change-Id: I82e49f95a3e0705a506cbb409130b19a63e582c1
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-km-rKH/strings.xml
es/values-ko/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mn-rMN/strings.xml
es/values-ms-rMY/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
061356f489296670e6c3fa07ce1be1048f7eb3c4 |
08-Oct-2013 |
Baligh Uddin <baligh@google.com> |
am 51d0d9c8: (-s ours) am db2ec4a6: (-s ours) am 9d8a48ca: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '51d0d9c8bc7ade9606619d30137bf39e9d1e592d': Import translations. DO NOT MERGE
|
51d0d9c8bc7ade9606619d30137bf39e9d1e592d |
08-Oct-2013 |
Baligh Uddin <baligh@google.com> |
am db2ec4a6: (-s ours) am 9d8a48ca: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit 'db2ec4a6dbb9483863b8bc3c3515fa7cedb53e0b': Import translations. DO NOT MERGE
|
6d6ebfaab935274ee2d98fce0912a6ed1dd6ebf9 |
08-Oct-2013 |
Baligh Uddin <baligh@google.com> |
am 8c77d184: (-s ours) am 5d0f4b37: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev * commit '8c77d184a1dcdbb875263b01c19aa45e79bb2cd0': Import translations. DO NOT MERGE
|
db2ec4a6dbb9483863b8bc3c3515fa7cedb53e0b |
08-Oct-2013 |
Baligh Uddin <baligh@google.com> |
am 9d8a48ca: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '9d8a48caf6d1ca1d8ab02800d28872211baaa334': Import translations. DO NOT MERGE
|
8c77d184a1dcdbb875263b01c19aa45e79bb2cd0 |
08-Oct-2013 |
Baligh Uddin <baligh@google.com> |
am 5d0f4b37: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev * commit '5d0f4b37ccd900819570875f4e1316e775a7fcc9': Import translations. DO NOT MERGE
|
bbd2779f68484ceadffe7efa9e6c3f42a512e045 |
08-Oct-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE"
|
5d0f4b37ccd900819570875f4e1316e775a7fcc9 |
08-Oct-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into klp-ub-dev
|
9d8a48caf6d1ca1d8ab02800d28872211baaa334 |
08-Oct-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into klp-dev
|
a51440ff970ec4b45bcfe0cb22ffcf4720aa9587 |
08-Oct-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-denali
|
cc3ebd2658af705afab09a8c063edf0a1b645c69 |
08-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
am fe180475: am 230d79b6: am a406decd: am 94f5f216: Merge "Increase character limit." into gb-ub-photos-carlsbad * commit 'fe18047502691b1443d45b2556ee1e339577e70f': Increase character limit.
|
fe18047502691b1443d45b2556ee1e339577e70f |
08-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
am 230d79b6: am a406decd: am 94f5f216: Merge "Increase character limit." into gb-ub-photos-carlsbad * commit '230d79b66b1e54860c3078b54a59a0d8ce0d9272': Increase character limit.
|
53a4563751016b50c3da5b526085d0b0625b8a84 |
08-Oct-2013 |
Doris Liu <tianliu@google.com> |
am 9fb17011: am 867c6364: am 4e90efbc: am c502bc9d: Correct sample factor for rotated images in zoom view * commit '9fb17011a40e71543775b3a951a4d983da9a125c': Correct sample factor for rotated images in zoom view
|
230d79b66b1e54860c3078b54a59a0d8ce0d9272 |
08-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
am a406decd: am 94f5f216: Merge "Increase character limit." into gb-ub-photos-carlsbad * commit 'a406decd9d3242e4c2381eb8a6d43182089bf249': Increase character limit.
|
9fb17011a40e71543775b3a951a4d983da9a125c |
08-Oct-2013 |
Doris Liu <tianliu@google.com> |
am 867c6364: am 4e90efbc: am c502bc9d: Correct sample factor for rotated images in zoom view * commit '867c6364a014b08332b99864135bfce5b04bac75': Correct sample factor for rotated images in zoom view
|
aa270874c98cbfcb6fa3743f2c078da3935184c2 |
08-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
am 94f5f216: Merge "Increase character limit." into gb-ub-photos-carlsbad * commit '94f5f216821c1090bd8a0660483935456dc13df1': Increase character limit.
|
a406decd9d3242e4c2381eb8a6d43182089bf249 |
08-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
am 94f5f216: Merge "Increase character limit." into gb-ub-photos-carlsbad * commit '94f5f216821c1090bd8a0660483935456dc13df1': Increase character limit.
|
867c6364a014b08332b99864135bfce5b04bac75 |
08-Oct-2013 |
Doris Liu <tianliu@google.com> |
am 4e90efbc: am c502bc9d: Correct sample factor for rotated images in zoom view * commit '4e90efbc3187a51358ee2da1e76e55912c55ea48': Correct sample factor for rotated images in zoom view
|
94f5f216821c1090bd8a0660483935456dc13df1 |
08-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
Merge "Increase character limit." into gb-ub-photos-carlsbad
|
65ba3ae52b0908562711e9bf7ec3fe5b4081e17e |
08-Oct-2013 |
Doris Liu <tianliu@google.com> |
am c502bc9d: Correct sample factor for rotated images in zoom view * commit 'c502bc9d50ded1f2eec28f4809c7193ec4ec5298': Correct sample factor for rotated images in zoom view
|
4e90efbc3187a51358ee2da1e76e55912c55ea48 |
08-Oct-2013 |
Doris Liu <tianliu@google.com> |
am c502bc9d: Correct sample factor for rotated images in zoom view * commit 'c502bc9d50ded1f2eec28f4809c7193ec4ec5298': Correct sample factor for rotated images in zoom view
|
4d96e37b7b131190a6ed2914546409aa82a143d2 |
08-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
Increase character limit. Bug: 10999205 Bug: 10558260 Bug: 10554875 Change-Id: Ib2add1a1b32a4a1a677d30a4bd11b0de5f6f126b
es/values/strings.xml
|
0c425f6953f9a0bfdc0b13f695d8c81a0fca44fe |
08-Oct-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I05be1dd03eecd62777581eb78fef13120a20c177 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-km-rKH/strings.xml
es/values-ko/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mn-rMN/strings.xml
es/values-ms-rMY/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
fac183bec4a6a2da290e57d0c1875423a3801557 |
08-Oct-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: If5cac08dbe6fb0699277d2939dc3da1c0c9b9e85 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms-rMY/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
5d00bc10562d86312bc88c34d00da20f41cc3ad9 |
08-Oct-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I6a24d5d07950f17fe0886365c359ea1514df7c07 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-km-rKH/strings.xml
es/values-ko/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mn-rMN/strings.xml
es/values-ms-rMY/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
eb6977395f0fedd282d6254d5bf5e755cf71ef06 |
08-Oct-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ie1b85ef1984555e5500cb0094829c465fbae9c61 Auto-generated-cl: translation import
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-in/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-ms-rMY/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
|
c502bc9d50ded1f2eec28f4809c7193ec4ec5298 |
08-Oct-2013 |
Doris Liu <tianliu@google.com> |
Correct sample factor for rotated images in zoom view Bug: 11067085 Change-Id: I52093052393fb1b2db08f105b8a16b68c3d3c95a
rc/com/android/camera/ui/ZoomView.java
|
92a4421f3009dee752bec4187a9476c5c4af07bc |
08-Oct-2013 |
ztenghui <ztenghui@google.com> |
am 2225732d: am aaad00a7: am 6cd0dfeb: am 73809edd: Merge "Keep the ImageData size info consistent with MediaStore and Exif" into gb-ub-photos-carlsbad * commit '2225732d02a73df625f4641c19a14ddc09f37c61': Keep the ImageData size info consistent with MediaStore and Exif
|
2225732d02a73df625f4641c19a14ddc09f37c61 |
08-Oct-2013 |
ztenghui <ztenghui@google.com> |
am aaad00a7: am 6cd0dfeb: am 73809edd: Merge "Keep the ImageData size info consistent with MediaStore and Exif" into gb-ub-photos-carlsbad * commit 'aaad00a7fd6a913569df9cf8f66475aa31b07ade': Keep the ImageData size info consistent with MediaStore and Exif
|
aaad00a7fd6a913569df9cf8f66475aa31b07ade |
08-Oct-2013 |
ztenghui <ztenghui@google.com> |
am 6cd0dfeb: am 73809edd: Merge "Keep the ImageData size info consistent with MediaStore and Exif" into gb-ub-photos-carlsbad * commit '6cd0dfebcac8e262aec68d66e4cc2447da31c5d3': Keep the ImageData size info consistent with MediaStore and Exif
|
9b2fc44ad85f94122695eab30d020e1d1d4eb110 |
08-Oct-2013 |
ztenghui <ztenghui@google.com> |
am 73809edd: Merge "Keep the ImageData size info consistent with MediaStore and Exif" into gb-ub-photos-carlsbad * commit '73809edd589fe54b44452cfa7c3935477d68dd5e': Keep the ImageData size info consistent with MediaStore and Exif
|
6cd0dfebcac8e262aec68d66e4cc2447da31c5d3 |
08-Oct-2013 |
ztenghui <ztenghui@google.com> |
am 73809edd: Merge "Keep the ImageData size info consistent with MediaStore and Exif" into gb-ub-photos-carlsbad * commit '73809edd589fe54b44452cfa7c3935477d68dd5e': Keep the ImageData size info consistent with MediaStore and Exif
|
73809edd589fe54b44452cfa7c3935477d68dd5e |
08-Oct-2013 |
ztenghui <ztenghui@google.com> |
Merge "Keep the ImageData size info consistent with MediaStore and Exif" into gb-ub-photos-carlsbad
|
06578b59bf15c1ac35dbbffd979f40479b1cbda9 |
07-Oct-2013 |
ztenghui <ztenghui@google.com> |
Keep the ImageData size info consistent with MediaStore and Exif Basically, the width and hight in the ImageData will be pre-rotation. bug:11067085 Change-Id: I377caf2f1d49d26b4d6823d4e72168a055d80858
rc/com/android/camera/data/LocalMediaData.java
rc/com/android/camera/data/RotationTask.java
rc/com/android/camera/ui/FilmStripView.java
|
c9851fff307fc406eab2c3350aca1f26c5ec0c4d |
08-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
am a16cc411: (-s ours) am 5dce0fee: am d820c0c6: am 2a2f33fe: (-s ours) Fix missing filtershow string. DO NOT MERGE * commit 'a16cc41137119819847b7095c0446d96201e2d8c': Fix missing filtershow string. DO NOT MERGE
|
a16cc41137119819847b7095c0446d96201e2d8c |
08-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
am 5dce0fee: am d820c0c6: am 2a2f33fe: (-s ours) Fix missing filtershow string. DO NOT MERGE * commit '5dce0feec3d6345062c4ce8de5426bc23f04b572': Fix missing filtershow string. DO NOT MERGE
|
5dce0feec3d6345062c4ce8de5426bc23f04b572 |
08-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
am d820c0c6: am 2a2f33fe: (-s ours) Fix missing filtershow string. DO NOT MERGE * commit 'd820c0c6c28656e99db3adfd2f79a91ba7674553': Fix missing filtershow string. DO NOT MERGE
|
d820c0c6c28656e99db3adfd2f79a91ba7674553 |
07-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
am 2a2f33fe: (-s ours) Fix missing filtershow string. DO NOT MERGE * commit '2a2f33feffe61e2e7b5717aa05de718856f5bec0': Fix missing filtershow string. DO NOT MERGE
|
7043d931573ae24d5d5561e948ec3dd979bebd3e |
07-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
am 2a2f33fe: (-s ours) Fix missing filtershow string. DO NOT MERGE * commit '2a2f33feffe61e2e7b5717aa05de718856f5bec0': Fix missing filtershow string. DO NOT MERGE
|
2a2f33feffe61e2e7b5717aa05de718856f5bec0 |
07-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
Fix missing filtershow string. DO NOT MERGE Bug: 11116778 Change-Id: I459e0b1db241a38866a3b06be5b316dc3b300c56
es/values-af/filtershow_strings.xml
es/values-am/filtershow_strings.xml
es/values-ar/filtershow_strings.xml
es/values-be/filtershow_strings.xml
es/values-bg/filtershow_strings.xml
es/values-ca/filtershow_strings.xml
es/values-cs/filtershow_strings.xml
es/values-da/filtershow_strings.xml
es/values-de/filtershow_strings.xml
es/values-el/filtershow_strings.xml
es/values-en-rGB/filtershow_strings.xml
es/values-es-rUS/filtershow_strings.xml
es/values-es/filtershow_strings.xml
es/values-et/filtershow_strings.xml
es/values-fa/filtershow_strings.xml
es/values-fi/filtershow_strings.xml
es/values-fr/filtershow_strings.xml
es/values-hi/filtershow_strings.xml
es/values-hr/filtershow_strings.xml
es/values-hu/filtershow_strings.xml
es/values-in/filtershow_strings.xml
es/values-it/filtershow_strings.xml
es/values-iw/filtershow_strings.xml
es/values-ja/filtershow_strings.xml
es/values-ko/filtershow_strings.xml
es/values-lt/filtershow_strings.xml
es/values-lv/filtershow_strings.xml
es/values-ms/filtershow_strings.xml
es/values-nb/filtershow_strings.xml
es/values-nl/filtershow_strings.xml
es/values-pl/filtershow_strings.xml
es/values-pt-rPT/filtershow_strings.xml
es/values-pt/filtershow_strings.xml
es/values-ro/filtershow_strings.xml
es/values-ru/filtershow_strings.xml
es/values-sk/filtershow_strings.xml
es/values-sl/filtershow_strings.xml
es/values-sr/filtershow_strings.xml
es/values-sv/filtershow_strings.xml
es/values-sw/filtershow_strings.xml
es/values-th/filtershow_strings.xml
es/values-tl/filtershow_strings.xml
es/values-tr/filtershow_strings.xml
es/values-uk/filtershow_strings.xml
es/values-vi/filtershow_strings.xml
es/values-zh-rCN/filtershow_strings.xml
es/values-zh-rTW/filtershow_strings.xml
es/values-zu/filtershow_strings.xml
es/values/strings.xml
|
73a18da0f6181d882d04d648ddcbcc82047f5d71 |
07-Oct-2013 |
Sameer Padala <sxp@google.com> |
Fix build break. ag/369626/ added a cannot_load_image string which was translated in ag/370960/ However, this translation resulted in a duplicate string since this string already existed in translated versions of filtershow_strings.xml which was deleted in ag/339346 but the translated versions weren't deleted. Deleting all the translated versions of that file caused a problem because ag/362583/ added source code that depended on a setting_wallpaper string which only existed in the translated string files. This change deletes the translated filtershow_strings.xml and adds the untranslated setting_wallpaper string. Change-Id: I1b8ac8c854c6f06abde9a71db2105c4d2dd44934
es/values-af/filtershow_strings.xml
es/values-am/filtershow_strings.xml
es/values-ar/filtershow_strings.xml
es/values-be/filtershow_strings.xml
es/values-bg/filtershow_strings.xml
es/values-ca/filtershow_strings.xml
es/values-cs/filtershow_strings.xml
es/values-da/filtershow_strings.xml
es/values-de/filtershow_strings.xml
es/values-el/filtershow_strings.xml
es/values-en-rGB/filtershow_strings.xml
es/values-es-rUS/filtershow_strings.xml
es/values-es/filtershow_strings.xml
es/values-et/filtershow_strings.xml
es/values-fa/filtershow_strings.xml
es/values-fi/filtershow_strings.xml
es/values-fr/filtershow_strings.xml
es/values-hi/filtershow_strings.xml
es/values-hr/filtershow_strings.xml
es/values-hu/filtershow_strings.xml
es/values-in/filtershow_strings.xml
es/values-it/filtershow_strings.xml
es/values-iw/filtershow_strings.xml
es/values-ja/filtershow_strings.xml
es/values-ko/filtershow_strings.xml
es/values-lt/filtershow_strings.xml
es/values-lv/filtershow_strings.xml
es/values-ms/filtershow_strings.xml
es/values-nb/filtershow_strings.xml
es/values-nl/filtershow_strings.xml
es/values-pl/filtershow_strings.xml
es/values-pt-rPT/filtershow_strings.xml
es/values-pt/filtershow_strings.xml
es/values-ro/filtershow_strings.xml
es/values-ru/filtershow_strings.xml
es/values-sk/filtershow_strings.xml
es/values-sl/filtershow_strings.xml
es/values-sr/filtershow_strings.xml
es/values-sv/filtershow_strings.xml
es/values-sw/filtershow_strings.xml
es/values-th/filtershow_strings.xml
es/values-tl/filtershow_strings.xml
es/values-tr/filtershow_strings.xml
es/values-uk/filtershow_strings.xml
es/values-vi/filtershow_strings.xml
es/values-zh-rCN/filtershow_strings.xml
es/values-zh-rTW/filtershow_strings.xml
es/values-zu/filtershow_strings.xml
es/values/strings.xml
|
c2d8844b49d15c5793df22ade85b32e41575506e |
07-Oct-2013 |
Baligh Uddin <baligh@google.com> |
am 494c02aa: am 8f850b1b: am eb418dba: Merge "Revert "Remove translated filtershow_strings.xml files."" into klp-dev * commit '494c02aabeafeab31d7e4f325f68ffd6a2765574': Revert "Remove translated filtershow_strings.xml files."
|
494c02aabeafeab31d7e4f325f68ffd6a2765574 |
07-Oct-2013 |
Baligh Uddin <baligh@google.com> |
am 8f850b1b: am eb418dba: Merge "Revert "Remove translated filtershow_strings.xml files."" into klp-dev * commit '8f850b1b6e805fc339cdba0e6440c3ef96d67937': Revert "Remove translated filtershow_strings.xml files."
|
8f850b1b6e805fc339cdba0e6440c3ef96d67937 |
07-Oct-2013 |
Baligh Uddin <baligh@google.com> |
am eb418dba: Merge "Revert "Remove translated filtershow_strings.xml files."" into klp-dev * commit 'eb418dba6be5cbbeebd29f514be365a19b8f6c50': Revert "Remove translated filtershow_strings.xml files."
|
eb418dba6be5cbbeebd29f514be365a19b8f6c50 |
07-Oct-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Revert "Remove translated filtershow_strings.xml files."" into klp-dev
|
cf7ce679edc2ea6f54b2ef93146b9254bde8ba81 |
07-Oct-2013 |
Baligh Uddin <baligh@google.com> |
Revert "Remove translated filtershow_strings.xml files." This reverts commit b17ba7b90fc7ad2d4a12ba5bf86a0b0bd04c6900. Change-Id: Ib5bc636f29af4dee5c4bca520fb3d183187a1b7a
es/values-af/filtershow_strings.xml
es/values-am/filtershow_strings.xml
es/values-ar/filtershow_strings.xml
es/values-be/filtershow_strings.xml
es/values-bg/filtershow_strings.xml
es/values-ca/filtershow_strings.xml
es/values-cs/filtershow_strings.xml
es/values-da/filtershow_strings.xml
es/values-de/filtershow_strings.xml
es/values-el/filtershow_strings.xml
es/values-en-rGB/filtershow_strings.xml
es/values-es-rUS/filtershow_strings.xml
es/values-es/filtershow_strings.xml
es/values-et/filtershow_strings.xml
es/values-fa/filtershow_strings.xml
es/values-fi/filtershow_strings.xml
es/values-fr/filtershow_strings.xml
es/values-hi/filtershow_strings.xml
es/values-hr/filtershow_strings.xml
es/values-hu/filtershow_strings.xml
es/values-in/filtershow_strings.xml
es/values-it/filtershow_strings.xml
es/values-iw/filtershow_strings.xml
es/values-ja/filtershow_strings.xml
es/values-ko/filtershow_strings.xml
es/values-large/filtershow_values.xml
es/values-lt/filtershow_strings.xml
es/values-lv/filtershow_strings.xml
es/values-ms/filtershow_strings.xml
es/values-nb/filtershow_strings.xml
es/values-nl/filtershow_strings.xml
es/values-pl/filtershow_strings.xml
es/values-pt-rPT/filtershow_strings.xml
es/values-pt/filtershow_strings.xml
es/values-ro/filtershow_strings.xml
es/values-ru/filtershow_strings.xml
es/values-sk/filtershow_strings.xml
es/values-sl/filtershow_strings.xml
es/values-sr/filtershow_strings.xml
es/values-sv/filtershow_strings.xml
es/values-sw/filtershow_strings.xml
es/values-th/filtershow_strings.xml
es/values-tl/filtershow_strings.xml
es/values-tr/filtershow_strings.xml
es/values-uk/filtershow_strings.xml
es/values-vi/filtershow_strings.xml
es/values-xlarge/filtershow_values.xml
es/values-zh-rCN/filtershow_strings.xml
es/values-zh-rTW/filtershow_strings.xml
es/values-zu/filtershow_strings.xml
|
c84826e38d664405086d46cbd71d6c465fc71bde |
07-Oct-2013 |
Baligh Uddin <baligh@google.com> |
am 3e322d6e: am 1bb8a000: am 591fbff2: Merge "Remove translated filtershow_strings.xml files." into klp-dev * commit '3e322d6ec7b6fc8286441bb3bcfc0455ed609daa': Remove translated filtershow_strings.xml files.
|
3e322d6ec7b6fc8286441bb3bcfc0455ed609daa |
07-Oct-2013 |
Baligh Uddin <baligh@google.com> |
am 1bb8a000: am 591fbff2: Merge "Remove translated filtershow_strings.xml files." into klp-dev * commit '1bb8a000fa9c11c32a8054c2821edeedbaeb8de7': Remove translated filtershow_strings.xml files.
|
1bb8a000fa9c11c32a8054c2821edeedbaeb8de7 |
07-Oct-2013 |
Baligh Uddin <baligh@google.com> |
am 591fbff2: Merge "Remove translated filtershow_strings.xml files." into klp-dev * commit '591fbff2c04639e1223176d05eaabdae6f4ba1fe': Remove translated filtershow_strings.xml files.
|
591fbff2c04639e1223176d05eaabdae6f4ba1fe |
07-Oct-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Remove translated filtershow_strings.xml files." into klp-dev
|
3ec3ab0e13da73947ef77def593cf348b068b3e5 |
07-Oct-2013 |
The Android Automerger <android-build@google.com> |
merge in klp-release history after reset to klp-dev
|
53f933fcfb62d19c75b9978586b639ed4783a66f |
07-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
am e6e00e74: am 5eaa6237: am b439aa31: am 4de78806: Revert CL that added broadcast receivers for shutter control. * commit 'e6e00e74536115db5707c9c0488f1f8c891f3d34': Revert CL that added broadcast receivers for shutter control.
|
9adc368b4226d16501647ce3d25c1ef9256c7e47 |
07-Oct-2013 |
Baligh Uddin <baligh@google.com> |
am f5b77cb7: am afcf9bbd: am e5b45eaf: (-s ours) Merge "Build broken." into klp-dev * commit 'f5b77cb72f028b663ea3117c9e3185a76658f049': Build broken.
|
e6e00e74536115db5707c9c0488f1f8c891f3d34 |
07-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
am 5eaa6237: am b439aa31: am 4de78806: Revert CL that added broadcast receivers for shutter control. * commit '5eaa6237049dc895356e1f55c2317f1a67b013eb': Revert CL that added broadcast receivers for shutter control.
|
f5b77cb72f028b663ea3117c9e3185a76658f049 |
07-Oct-2013 |
Baligh Uddin <baligh@google.com> |
am afcf9bbd: am e5b45eaf: (-s ours) Merge "Build broken." into klp-dev * commit 'afcf9bbdef0cec0a5bbdc399b6fb4f9c09aaa648': Build broken.
|
5eaa6237049dc895356e1f55c2317f1a67b013eb |
07-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
am b439aa31: am 4de78806: Revert CL that added broadcast receivers for shutter control. * commit 'b439aa3109b58f3e823db41e369f462e5b0d7e70': Revert CL that added broadcast receivers for shutter control.
|
afcf9bbdef0cec0a5bbdc399b6fb4f9c09aaa648 |
07-Oct-2013 |
Baligh Uddin <baligh@google.com> |
am e5b45eaf: (-s ours) Merge "Build broken." into klp-dev * commit 'e5b45eafa6c19865045c5c867399ea4bbb692638': Build broken.
|
38bf196e3831a0d2bb48c2baa39d578d6d2a5942 |
07-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
am 4de78806: Revert CL that added broadcast receivers for shutter control. * commit '4de788063b51cc2d3f65122bdcc7f862170ba761': Revert CL that added broadcast receivers for shutter control.
|
b439aa3109b58f3e823db41e369f462e5b0d7e70 |
07-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
am 4de78806: Revert CL that added broadcast receivers for shutter control. * commit '4de788063b51cc2d3f65122bdcc7f862170ba761': Revert CL that added broadcast receivers for shutter control.
|
4de788063b51cc2d3f65122bdcc7f862170ba761 |
07-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
Revert CL that added broadcast receivers for shutter control. Bug: 11006189 This was added for Gem support but causes us trouble. As it's not essential, we'll remove it now. Original CL was http://ag/342589 Change-Id: I9e137411cf5beb0fbdad611ee85803960feef14a
rc/com/android/camera/PhotoModule.java
|
5a4ecf52bc5b4cd561fdad4bd792421b60d18a5a |
06-Oct-2013 |
The Android Automerger <android-build@google.com> |
merge in klp-release history after reset to klp-dev
|
bc683fc5ca2684acc97addfeaa9f330349518966 |
05-Oct-2013 |
Baligh Uddin <baligh@google.com> |
am 6137316b: (-s ours) am bf33451e: (-s ours) Merge "Build broken Revert "Import translations. DO NOT MERGE"" into klp-ub-dev * commit '6137316bb6e5b727a63ff4505828d3334aa8d4b7': Build broken Revert "Import translations. DO NOT MERGE"
|
d67bda55928c4a3772e5f9ba0302dbfc830bb9e7 |
05-Oct-2013 |
Baligh Uddin <baligh@google.com> |
am 2c5ad7cc: (-s ours) am 4bb6f6e2: (-s ours) am 57913c82: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '2c5ad7cc54e89cbb29f43ea503e371c7d66195d8': Import translations. DO NOT MERGE
|
d2d15e4d8417f9de7d275e63d6596c0566e9b618 |
05-Oct-2013 |
Baligh Uddin <baligh@google.com> |
am 7ef6f5be: (-s ours) am 47becad6: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev * commit '7ef6f5be7aa363b5200b9e4ec9405a8752e31ee7': Import translations. DO NOT MERGE
|
6137316bb6e5b727a63ff4505828d3334aa8d4b7 |
05-Oct-2013 |
Baligh Uddin <baligh@google.com> |
am bf33451e: (-s ours) Merge "Build broken Revert "Import translations. DO NOT MERGE"" into klp-ub-dev * commit 'bf33451ece2d872aa5dfc770a694a4f57432698b': Build broken Revert "Import translations. DO NOT MERGE"
|
2c5ad7cc54e89cbb29f43ea503e371c7d66195d8 |
05-Oct-2013 |
Baligh Uddin <baligh@google.com> |
am 4bb6f6e2: (-s ours) am 57913c82: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '4bb6f6e2d56fb6b42bfb63a8e75fa77018cfde1a': Import translations. DO NOT MERGE
|
b17ba7b90fc7ad2d4a12ba5bf86a0b0bd04c6900 |
05-Oct-2013 |
Baligh Uddin <baligh@google.com> |
Remove translated filtershow_strings.xml files.
es/values-af/filtershow_strings.xml
es/values-am/filtershow_strings.xml
es/values-ar/filtershow_strings.xml
es/values-be/filtershow_strings.xml
es/values-bg/filtershow_strings.xml
es/values-ca/filtershow_strings.xml
es/values-cs/filtershow_strings.xml
es/values-da/filtershow_strings.xml
es/values-de/filtershow_strings.xml
es/values-el/filtershow_strings.xml
es/values-en-rGB/filtershow_strings.xml
es/values-es-rUS/filtershow_strings.xml
es/values-es/filtershow_strings.xml
es/values-et/filtershow_strings.xml
es/values-fa/filtershow_strings.xml
es/values-fi/filtershow_strings.xml
es/values-fr/filtershow_strings.xml
es/values-hi/filtershow_strings.xml
es/values-hr/filtershow_strings.xml
es/values-hu/filtershow_strings.xml
es/values-in/filtershow_strings.xml
es/values-it/filtershow_strings.xml
es/values-iw/filtershow_strings.xml
es/values-ja/filtershow_strings.xml
es/values-ko/filtershow_strings.xml
es/values-large/filtershow_values.xml
es/values-lt/filtershow_strings.xml
es/values-lv/filtershow_strings.xml
es/values-ms/filtershow_strings.xml
es/values-nb/filtershow_strings.xml
es/values-nl/filtershow_strings.xml
es/values-pl/filtershow_strings.xml
es/values-pt-rPT/filtershow_strings.xml
es/values-pt/filtershow_strings.xml
es/values-ro/filtershow_strings.xml
es/values-ru/filtershow_strings.xml
es/values-sk/filtershow_strings.xml
es/values-sl/filtershow_strings.xml
es/values-sr/filtershow_strings.xml
es/values-sv/filtershow_strings.xml
es/values-sw/filtershow_strings.xml
es/values-th/filtershow_strings.xml
es/values-tl/filtershow_strings.xml
es/values-tr/filtershow_strings.xml
es/values-uk/filtershow_strings.xml
es/values-vi/filtershow_strings.xml
es/values-xlarge/filtershow_values.xml
es/values-zh-rCN/filtershow_strings.xml
es/values-zh-rTW/filtershow_strings.xml
es/values-zu/filtershow_strings.xml
|
bf33451ece2d872aa5dfc770a694a4f57432698b |
05-Oct-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Build broken Revert "Import translations. DO NOT MERGE"" into klp-ub-dev
|
4a31aefd8b8d75218b6f31d45233d402f31fbac1 |
05-Oct-2013 |
Baligh Uddin <baligh@google.com> |
Build broken Revert "Import translations. DO NOT MERGE" This reverts commit fa80b8d06fc1d4cc449805f090e77e852209da06. Change-Id: I9d5a49f235e9150dc78239892cfb32460c115121
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-km-rKH/strings.xml
es/values-ko/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mn-rMN/strings.xml
es/values-ms-rMY/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
e5b45eafa6c19865045c5c867399ea4bbb692638 |
05-Oct-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Build broken." into klp-dev
|
6e3df153f852cc06703f344d2d29011ca192a443 |
05-Oct-2013 |
Baligh Uddin <baligh@google.com> |
Build broken. Revert "Import translations. DO NOT MERGE" This reverts commit 0028336423130a5a0227cd932d3295581f83dd22. Change-Id: Id3638d0d093d03c037d30a3b1f49e242ff67af85
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-km-rKH/strings.xml
es/values-ko/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mn-rMN/strings.xml
es/values-ms-rMY/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
4bb6f6e2d56fb6b42bfb63a8e75fa77018cfde1a |
05-Oct-2013 |
Baligh Uddin <baligh@google.com> |
am 57913c82: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '57913c823cdba83a1171efea3ef3546fa2bbf670': Import translations. DO NOT MERGE
|
7ef6f5be7aa363b5200b9e4ec9405a8752e31ee7 |
05-Oct-2013 |
Baligh Uddin <baligh@google.com> |
am 47becad6: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev * commit '47becad6bf644c2f12522fc6968b627192cc3368': Import translations. DO NOT MERGE
|
ecbbda0cea5c148b51fbf29ffd686c84fa3a452a |
05-Oct-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE"
|
47becad6bf644c2f12522fc6968b627192cc3368 |
05-Oct-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into klp-ub-dev
|
57913c823cdba83a1171efea3ef3546fa2bbf670 |
05-Oct-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into klp-dev
|
44bf34f33070ec6cabbcaae63ac260254fe983f7 |
05-Oct-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-denali
|
02cf0d1e574ec9f050c68d5e139ef3aa8ff854d5 |
05-Oct-2013 |
Mindy DelliCarpini <mindyp@google.com> |
Update camera assets for de-blue effort Fixes b/11007065 Shutter button disappears / becomes white when pressed Change-Id: I4001df821e545317eb4436da21f8f8d255d330f3
es/drawable-hdpi-v19/btn_shutter_default.png
es/drawable-hdpi-v19/btn_shutter_pressed.png
es/drawable-hdpi-v19/btn_shutter_recording.png
es/drawable-hdpi-v19/btn_shutter_video_default.png
es/drawable-hdpi-v19/btn_shutter_video_pressed.png
es/drawable-hdpi-v19/btn_shutter_video_recording.png
es/drawable-hdpi-v19/menu_bg_pressed.png
es/drawable-mdpi-v19/btn_shutter_default.png
es/drawable-mdpi-v19/btn_shutter_pressed.png
es/drawable-mdpi-v19/btn_shutter_recording.png
es/drawable-mdpi-v19/btn_shutter_video_default.png
es/drawable-mdpi-v19/btn_shutter_video_pressed.png
es/drawable-mdpi-v19/btn_shutter_video_recording.png
es/drawable-mdpi-v19/menu_bg_pressed.png
es/drawable-sw600dp-hdpi-v19/btn_shutter_default.png
es/drawable-sw600dp-hdpi-v19/btn_shutter_pressed.png
es/drawable-sw600dp-hdpi-v19/btn_shutter_recording.png
es/drawable-sw600dp-hdpi-v19/btn_shutter_video_default.png
es/drawable-sw600dp-hdpi-v19/btn_shutter_video_pressed.png
es/drawable-sw600dp-hdpi-v19/btn_shutter_video_recording.png
es/drawable-sw600dp-mdpi-v19/btn_shutter_default.png
es/drawable-sw600dp-mdpi-v19/btn_shutter_pressed.png
es/drawable-sw600dp-mdpi-v19/btn_shutter_recording.png
es/drawable-sw600dp-mdpi-v19/btn_shutter_video_default.png
es/drawable-sw600dp-mdpi-v19/btn_shutter_video_pressed.png
es/drawable-sw600dp-mdpi-v19/btn_shutter_video_recording.png
es/drawable-sw600dp-xhdpi-v19/btn_shutter_default.png
es/drawable-sw600dp-xhdpi-v19/btn_shutter_pressed.png
es/drawable-sw600dp-xhdpi-v19/btn_shutter_recording.png
es/drawable-sw600dp-xhdpi-v19/btn_shutter_video_default.png
es/drawable-sw600dp-xhdpi-v19/btn_shutter_video_pressed.png
es/drawable-sw600dp-xhdpi-v19/btn_shutter_video_recording.png
es/drawable-sw600dp-xxhdpi-v19/btn_shutter_default.png
es/drawable-sw600dp-xxhdpi-v19/btn_shutter_pressed.png
es/drawable-sw600dp-xxhdpi-v19/btn_shutter_recording.png
es/drawable-sw600dp-xxhdpi-v19/btn_shutter_video_default.png
es/drawable-sw600dp-xxhdpi-v19/btn_shutter_video_pressed.png
es/drawable-sw600dp-xxhdpi-v19/btn_shutter_video_recording.png
es/drawable-xhdpi-v19/btn_shutter_default.png
es/drawable-xhdpi-v19/btn_shutter_pressed.png
es/drawable-xhdpi-v19/btn_shutter_recording.png
es/drawable-xhdpi-v19/btn_shutter_video_default.png
es/drawable-xhdpi-v19/btn_shutter_video_pressed.png
es/drawable-xhdpi-v19/btn_shutter_video_recording.png
es/drawable-xhdpi-v19/menu_bg_pressed.png
es/drawable-xxhdpi-v19/btn_shutter_default.png
es/drawable-xxhdpi-v19/btn_shutter_pressed.png
es/drawable-xxhdpi-v19/btn_shutter_recording.png
es/drawable-xxhdpi-v19/btn_shutter_video_default.png
es/drawable-xxhdpi-v19/btn_shutter_video_pressed.png
es/drawable-xxhdpi-v19/btn_shutter_video_recording.png
es/drawable-xxhdpi-v19/menu_bg_pressed.png
|
0a92eebf35d285e721e320ec670a3a210f04fb8d |
05-Oct-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ifc0196b84bb0a6ce508f809baafb048c1d5248e0 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-km-rKH/strings.xml
es/values-ko/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mn-rMN/strings.xml
es/values-ms-rMY/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
fa80b8d06fc1d4cc449805f090e77e852209da06 |
05-Oct-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I8d413eb91154f37f4c1d36a416d0df07729dd473 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-km-rKH/strings.xml
es/values-ko/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mn-rMN/strings.xml
es/values-ms-rMY/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
0028336423130a5a0227cd932d3295581f83dd22 |
05-Oct-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ie6c099841e72853be3243fffc8d6c266c8c802da Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-km-rKH/strings.xml
es/values-ko/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mn-rMN/strings.xml
es/values-ms-rMY/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
686d4af4a5ab8840327b6f24382fd173b5079f62 |
05-Oct-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I2e193757d733be2f03ca5932509b1359ce2b9f50 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-km-rKH/strings.xml
es/values-ko/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mn-rMN/strings.xml
es/values-ms-rMY/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
dd9b8aac38e9e338b27328c16d9300cc19038005 |
05-Oct-2013 |
ztenghui <ztenghui@google.com> |
am 82d2091c: am d094939d: am e0c413ca: am 4ab4879e: Don\'t show the option for Gcam when using front camera. * commit '82d2091c5d6796cd461eb8d0748f338872760040': Don't show the option for Gcam when using front camera.
|
82d2091c5d6796cd461eb8d0748f338872760040 |
04-Oct-2013 |
ztenghui <ztenghui@google.com> |
am d094939d: am e0c413ca: am 4ab4879e: Don\'t show the option for Gcam when using front camera. * commit 'd094939d9b99b403514fe0c30cbaed670a947685': Don't show the option for Gcam when using front camera.
|
d094939d9b99b403514fe0c30cbaed670a947685 |
04-Oct-2013 |
ztenghui <ztenghui@google.com> |
am e0c413ca: am 4ab4879e: Don\'t show the option for Gcam when using front camera. * commit 'e0c413cad04e3551bc1e10a878439f9336b295bf': Don't show the option for Gcam when using front camera.
|
e0c413cad04e3551bc1e10a878439f9336b295bf |
04-Oct-2013 |
ztenghui <ztenghui@google.com> |
am 4ab4879e: Don\'t show the option for Gcam when using front camera. * commit '4ab4879eec785faf40ccb346b96963f04af9b0e6': Don't show the option for Gcam when using front camera.
|
a9a7ab88bc3ad6e7e66edd9a23595ec18aed44fd |
04-Oct-2013 |
ztenghui <ztenghui@google.com> |
am 4ab4879e: Don\'t show the option for Gcam when using front camera. * commit '4ab4879eec785faf40ccb346b96963f04af9b0e6': Don't show the option for Gcam when using front camera.
|
4ab4879eec785faf40ccb346b96963f04af9b0e6 |
04-Oct-2013 |
ztenghui <ztenghui@google.com> |
Don't show the option for Gcam when using front camera. bug:11051221 Change-Id: I802eb0bc73adb3c573a2bf62b312bc681152223d
rc/com/android/camera/CameraSettings.java
|
7d9943c7f8d276c16a32a43c929e4d43247fc487 |
04-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
am d652388c: am 8db842dc: am 872257af: am 18709218: Update the HDR+ assets. * commit 'd652388c438875b6ef109d39621272f81335d564': Update the HDR+ assets.
|
d652388c438875b6ef109d39621272f81335d564 |
04-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
am 8db842dc: am 872257af: am 18709218: Update the HDR+ assets. * commit '8db842dc2447b0c705e97916a3d4d655b5d83f9b': Update the HDR+ assets.
|
8db842dc2447b0c705e97916a3d4d655b5d83f9b |
04-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
am 872257af: am 18709218: Update the HDR+ assets. * commit '872257af9a5d5300963d9335c54b292d34093d8a': Update the HDR+ assets.
|
e60cb51a3b1813a856683b9bb84cbcbcb2ac29af |
04-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
am 18709218: Update the HDR+ assets. * commit '187092180b3af64b5d7c2197d1054a860f7cbf45': Update the HDR+ assets.
|
872257af9a5d5300963d9335c54b292d34093d8a |
04-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
am 18709218: Update the HDR+ assets. * commit '187092180b3af64b5d7c2197d1054a860f7cbf45': Update the HDR+ assets.
|
187092180b3af64b5d7c2197d1054a860f7cbf45 |
04-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
Update the HDR+ assets. Bug: 11047147 Change-Id: I680d9a822876655d3c30715a9315a17b8db87763
es/drawable-hdpi/ic_hdr_plus_disabled.png
es/drawable-hdpi/ic_hdr_plus_disabled_pressed.png
es/drawable-hdpi/ic_hdr_plus_normal.png
es/drawable-hdpi/ic_hdr_plus_normal_pressed.png
es/drawable-hdpi/ic_indicator_hdr_plus_on.png
es/drawable-mdpi/ic_hdr_plus_disabled.png
es/drawable-mdpi/ic_hdr_plus_disabled_pressed.png
es/drawable-mdpi/ic_hdr_plus_normal.png
es/drawable-mdpi/ic_hdr_plus_normal_pressed.png
es/drawable-mdpi/ic_indicator_hdr_plus_on.png
es/drawable-xhdpi/ic_hdr_plus_disabled.png
es/drawable-xhdpi/ic_hdr_plus_disabled_pressed.png
es/drawable-xhdpi/ic_hdr_plus_normal.png
es/drawable-xhdpi/ic_hdr_plus_normal_pressed.png
es/drawable-xhdpi/ic_indicator_hdr_plus_on.png
es/drawable-xxhdpi/ic_hdr_plus_disabled.png
es/drawable-xxhdpi/ic_hdr_plus_disabled_pressed.png
es/drawable-xxhdpi/ic_hdr_plus_normal.png
es/drawable-xxhdpi/ic_hdr_plus_normal_pressed.png
es/drawable-xxhdpi/ic_indicator_hdr_plus_on.png
|
e5920338f78027ac9f159150471f82de28b46353 |
04-Oct-2013 |
Doris Liu <tianliu@google.com> |
am 2294bfcc: am 5e233f82: am 309cd179: am b0fbd543: Merge "Prevent picture taking via volumn key in filmstrip mode" into gb-ub-photos-carlsbad * commit '2294bfccdf07dc5c641a13b3c6d653d4dcc0412b': Prevent picture taking via volumn key in filmstrip mode
|
f71afab9d5629204c6d804edaac03f671fbb0aab |
04-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
am e65a190d: am 2e2467c3: am 7c1ae08c: am 7ba4a88e: Merge "Sync Camera2 permissions to GoogleCamera permissions." into gb-ub-photos-carlsbad * commit 'e65a190d2635c8a5c7ce8fd1b4b14f33bbbe5cc1': Sync Camera2 permissions to GoogleCamera permissions.
|
07bafeb43ac4a40c28f4db37b74897e0547b6d06 |
04-Oct-2013 |
Erin Dahlgren <edahlgren@google.com> |
am 6f10aec6: am f56cc71e: am 88b31b09: am 77dd1493: Merge "Make space for photosphere rendering text" into gb-ub-photos-carlsbad * commit '6f10aec6765021e7c022880786e3a24339b116f9': Make space for photosphere rendering text
|
c4482227304751f656d0c24a6ed0dc12ecc15b00 |
04-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
am 205c049c: am 67747e3d: am 6b879500: am 238799e9: Merge "Change icons and code from HQ to HDR+ mode." into gb-ub-photos-carlsbad * commit '205c049ced1184fe4b28b52cf9c39c3a9bd2f59a': Change icons and code from HQ to HDR+ mode.
|
d51a6365579acc4493ea8b3f9ff94076b0e83c07 |
04-Oct-2013 |
Angus Kong <shkong@google.com> |
am e3903c3b: am 2e63f2e6: am 5f16c140: am 5bca6f4c: Merge "Don\'t allow actions on items in progress." into gb-ub-photos-carlsbad * commit 'e3903c3b848309747b433f14b67894364f4ec591': Don't allow actions on items in progress.
|
380a27a57be6071edef9382dc30ac3c34a1394da |
04-Oct-2013 |
Doris Liu <tianliu@google.com> |
am e288dff3: am 37c96ec8: am 67510532: am 930b9b41: Merge "Leave ROI not set except in tap-to-focus scenario" into gb-ub-photos-carlsbad * commit 'e288dff3f14ba19dc3c259b25e82e0385201b73c': Leave ROI not set except in tap-to-focus scenario
|
fb22c7da4a3266a7cb6e0e6fb7b7e99925b48e48 |
04-Oct-2013 |
Kevin Gabayan <gabayan@google.com> |
am 24e76b0a: am c421586c: am 5ed30cb7: am 68fc363b: Merge "Camera2 icon update for all resolutions." into gb-ub-photos-carlsbad * commit '24e76b0a5070fb993f13ee91e9cbddc6a8dcbb6a': Camera2 icon update for all resolutions.
|
2e53c959a59a8ad474b45884493bbe2d2d8c5d6f |
04-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
am 83f9b837: am 3c3c63ea: am 644c534f: am 623b74b6: Add HDR+ mode strings (to replace HQ mode) * commit '83f9b8371d7b863ca05e5db91fa611ceee2e3d71': Add HDR+ mode strings (to replace HQ mode)
|
2da3798386f490e6d12f16ae34f49c8e6ab0ee9f |
04-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
am 23b0a3f2: am 98461dca: am 8a605fad: am 3393a627: Merge "Add missing crop message." into gb-ub-photos-carlsbad * commit '23b0a3f21f748494717c991da6412900d3c56135': Add missing crop message.
|
712933fdfa66f88a0bbb650851aa0caf891424dd |
04-Oct-2013 |
ztenghui <ztenghui@google.com> |
am 44c32d17: am 27408847: am 9a09d511: am 4c0aede4: Merge "Only show delete action when in secure camera mode." into gb-ub-photos-carlsbad * commit '44c32d1710482fd45aacfd077d206ad2de1df588': Only show delete action when in secure camera mode.
|
aeb30218a84150724f897ff1dc55a5ff7c2f61aa |
04-Oct-2013 |
ztenghui <ztenghui@google.com> |
am 092b7e31: am d915fa04: am cd324a25: am 9ac97492: Merge "Show the delete button if there is room in action bar." into gb-ub-photos-carlsbad * commit '092b7e316290d7ffbc4cc7d59ba426d85b502717': Show the delete button if there is room in action bar.
|
9c7b241db9ba118cb861a2ef9910e00c9cef67f8 |
04-Oct-2013 |
Mangesh Ghiware <mghiware@google.com> |
am baa0e6a4: am ac63f9c4: am 893981de: am 4f563f1d: Merge "Exit Camera on Up button if no APP_GALLERY handler found." into gb-ub-photos-carlsbad * commit 'baa0e6a41872a36b9bf967fd445f65d8ddbc8f82': Exit Camera on Up button if no APP_GALLERY handler found.
|
bcdebc6bf5f7c97ff99f42e7a2cde89505485e90 |
04-Oct-2013 |
Baligh Uddin <baligh@google.com> |
am 6e5ae500: (-s ours) am b5cdb04a: (-s ours) am 8bab49cd: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '6e5ae5008b647d996be7688db9a974ea00dd0be9': Import translations. DO NOT MERGE
|
2294bfccdf07dc5c641a13b3c6d653d4dcc0412b |
04-Oct-2013 |
Doris Liu <tianliu@google.com> |
am 5e233f82: am 309cd179: am b0fbd543: Merge "Prevent picture taking via volumn key in filmstrip mode" into gb-ub-photos-carlsbad * commit '5e233f829888b2a4bedbf30b57cce400539fe1eb': Prevent picture taking via volumn key in filmstrip mode
|
5e233f829888b2a4bedbf30b57cce400539fe1eb |
04-Oct-2013 |
Doris Liu <tianliu@google.com> |
am 309cd179: am b0fbd543: Merge "Prevent picture taking via volumn key in filmstrip mode" into gb-ub-photos-carlsbad * commit '309cd179b821f63b25e5ebae556b38daabab1708': Prevent picture taking via volumn key in filmstrip mode
|
309cd179b821f63b25e5ebae556b38daabab1708 |
04-Oct-2013 |
Doris Liu <tianliu@google.com> |
am b0fbd543: Merge "Prevent picture taking via volumn key in filmstrip mode" into gb-ub-photos-carlsbad * commit 'b0fbd5437cc67ce10e8f4b2a7318d4cc97110976': Prevent picture taking via volumn key in filmstrip mode
|
c467534b3c15a4e7d746acc261b210cdd5cdbbfb |
04-Oct-2013 |
Doris Liu <tianliu@google.com> |
am b0fbd543: Merge "Prevent picture taking via volumn key in filmstrip mode" into gb-ub-photos-carlsbad * commit 'b0fbd5437cc67ce10e8f4b2a7318d4cc97110976': Prevent picture taking via volumn key in filmstrip mode
|
b0fbd5437cc67ce10e8f4b2a7318d4cc97110976 |
04-Oct-2013 |
Doris Liu <tianliu@google.com> |
Merge "Prevent picture taking via volumn key in filmstrip mode" into gb-ub-photos-carlsbad
|
dba16ae7d0aee0c3984df68b5787a0d0a7cd6f50 |
04-Oct-2013 |
Doris Liu <tianliu@google.com> |
Prevent picture taking via volumn key in filmstrip mode Bug: 11045068 Change-Id: Ic823e04520fef3c2cef5341dceb9887fd62a5212
rc/com/android/camera/CameraActivity.java
|
e65a190d2635c8a5c7ce8fd1b4b14f33bbbe5cc1 |
04-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
am 2e2467c3: am 7c1ae08c: am 7ba4a88e: Merge "Sync Camera2 permissions to GoogleCamera permissions." into gb-ub-photos-carlsbad * commit '2e2467c3f87f01aa673ef987fa11492293d18c17': Sync Camera2 permissions to GoogleCamera permissions.
|
6f10aec6765021e7c022880786e3a24339b116f9 |
04-Oct-2013 |
Erin Dahlgren <edahlgren@google.com> |
am f56cc71e: am 88b31b09: am 77dd1493: Merge "Make space for photosphere rendering text" into gb-ub-photos-carlsbad * commit 'f56cc71eb5b0373b67729f5eb5f59dc1927b951d': Make space for photosphere rendering text
|
205c049ced1184fe4b28b52cf9c39c3a9bd2f59a |
04-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
am 67747e3d: am 6b879500: am 238799e9: Merge "Change icons and code from HQ to HDR+ mode." into gb-ub-photos-carlsbad * commit '67747e3d000e9379b698d394c3d6d87ff4bd028d': Change icons and code from HQ to HDR+ mode.
|
e3903c3b848309747b433f14b67894364f4ec591 |
04-Oct-2013 |
Angus Kong <shkong@google.com> |
am 2e63f2e6: am 5f16c140: am 5bca6f4c: Merge "Don\'t allow actions on items in progress." into gb-ub-photos-carlsbad * commit '2e63f2e6779efd681dddcb36ff7d108cd92004fd': Don't allow actions on items in progress.
|
e288dff3f14ba19dc3c259b25e82e0385201b73c |
04-Oct-2013 |
Doris Liu <tianliu@google.com> |
am 37c96ec8: am 67510532: am 930b9b41: Merge "Leave ROI not set except in tap-to-focus scenario" into gb-ub-photos-carlsbad * commit '37c96ec8af4487fa0545a6d367f8117a4f701242': Leave ROI not set except in tap-to-focus scenario
|
24e76b0a5070fb993f13ee91e9cbddc6a8dcbb6a |
04-Oct-2013 |
Kevin Gabayan <gabayan@google.com> |
am c421586c: am 5ed30cb7: am 68fc363b: Merge "Camera2 icon update for all resolutions." into gb-ub-photos-carlsbad * commit 'c421586c285feada482c858ba1b14e9340ff83f8': Camera2 icon update for all resolutions.
|
83f9b8371d7b863ca05e5db91fa611ceee2e3d71 |
04-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
am 3c3c63ea: am 644c534f: am 623b74b6: Add HDR+ mode strings (to replace HQ mode) * commit '3c3c63eae242d313b9dd0a59e34f28adecfedfe5': Add HDR+ mode strings (to replace HQ mode)
|
23b0a3f21f748494717c991da6412900d3c56135 |
04-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
am 98461dca: am 8a605fad: am 3393a627: Merge "Add missing crop message." into gb-ub-photos-carlsbad * commit '98461dcaff1ec0880714a4fa22a5e4de9445e1e8': Add missing crop message.
|
44c32d1710482fd45aacfd077d206ad2de1df588 |
04-Oct-2013 |
ztenghui <ztenghui@google.com> |
am 27408847: am 9a09d511: am 4c0aede4: Merge "Only show delete action when in secure camera mode." into gb-ub-photos-carlsbad * commit '27408847ed867399fed01515848d3cd93a4d343f': Only show delete action when in secure camera mode.
|
092b7e316290d7ffbc4cc7d59ba426d85b502717 |
04-Oct-2013 |
ztenghui <ztenghui@google.com> |
am d915fa04: am cd324a25: am 9ac97492: Merge "Show the delete button if there is room in action bar." into gb-ub-photos-carlsbad * commit 'd915fa042edd436dd819ac889f523da452bf37ae': Show the delete button if there is room in action bar.
|
baa0e6a41872a36b9bf967fd445f65d8ddbc8f82 |
04-Oct-2013 |
Mangesh Ghiware <mghiware@google.com> |
am ac63f9c4: am 893981de: am 4f563f1d: Merge "Exit Camera on Up button if no APP_GALLERY handler found." into gb-ub-photos-carlsbad * commit 'ac63f9c493d6b755a5bfc106d603ce850b2443de': Exit Camera on Up button if no APP_GALLERY handler found.
|
6e5ae5008b647d996be7688db9a974ea00dd0be9 |
04-Oct-2013 |
Baligh Uddin <baligh@google.com> |
am b5cdb04a: (-s ours) am 8bab49cd: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit 'b5cdb04a80b0b6d3d46b969f95678b0002130220': Import translations. DO NOT MERGE
|
2e2467c3f87f01aa673ef987fa11492293d18c17 |
04-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
am 7c1ae08c: am 7ba4a88e: Merge "Sync Camera2 permissions to GoogleCamera permissions." into gb-ub-photos-carlsbad * commit '7c1ae08c1dfcfbae45f3d4692adee6140386eebd': Sync Camera2 permissions to GoogleCamera permissions.
|
863bd8ca10bb89ca66c35ca3386eb60bce49b8c5 |
04-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
am 7ba4a88e: Merge "Sync Camera2 permissions to GoogleCamera permissions." into gb-ub-photos-carlsbad * commit '7ba4a88eb78fc41717275de25748f5cf17915f5b': Sync Camera2 permissions to GoogleCamera permissions.
|
7c1ae08c1dfcfbae45f3d4692adee6140386eebd |
04-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
am 7ba4a88e: Merge "Sync Camera2 permissions to GoogleCamera permissions." into gb-ub-photos-carlsbad * commit '7ba4a88eb78fc41717275de25748f5cf17915f5b': Sync Camera2 permissions to GoogleCamera permissions.
|
7ba4a88eb78fc41717275de25748f5cf17915f5b |
04-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
Merge "Sync Camera2 permissions to GoogleCamera permissions." into gb-ub-photos-carlsbad
|
f56cc71eb5b0373b67729f5eb5f59dc1927b951d |
03-Oct-2013 |
Erin Dahlgren <edahlgren@google.com> |
am 88b31b09: am 77dd1493: Merge "Make space for photosphere rendering text" into gb-ub-photos-carlsbad * commit '88b31b0940459f79204086d567a8aaad0a842f89': Make space for photosphere rendering text
|
88b31b0940459f79204086d567a8aaad0a842f89 |
03-Oct-2013 |
Erin Dahlgren <edahlgren@google.com> |
am 77dd1493: Merge "Make space for photosphere rendering text" into gb-ub-photos-carlsbad * commit '77dd14930b24816369560a73cfb0610c1f745d05': Make space for photosphere rendering text
|
29553621376934fa2480b15545617cb7a36c4b09 |
03-Oct-2013 |
Erin Dahlgren <edahlgren@google.com> |
am 77dd1493: Merge "Make space for photosphere rendering text" into gb-ub-photos-carlsbad * commit '77dd14930b24816369560a73cfb0610c1f745d05': Make space for photosphere rendering text
|
77dd14930b24816369560a73cfb0610c1f745d05 |
03-Oct-2013 |
Erin Dahlgren <edahlgren@google.com> |
Merge "Make space for photosphere rendering text" into gb-ub-photos-carlsbad
|
67747e3d000e9379b698d394c3d6d87ff4bd028d |
03-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
am 6b879500: am 238799e9: Merge "Change icons and code from HQ to HDR+ mode." into gb-ub-photos-carlsbad * commit '6b879500209fb3f187141ece2bed39537a697aa1': Change icons and code from HQ to HDR+ mode.
|
6b879500209fb3f187141ece2bed39537a697aa1 |
03-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
am 238799e9: Merge "Change icons and code from HQ to HDR+ mode." into gb-ub-photos-carlsbad * commit '238799e97077ee72a53a5a04d9d3068aebb82bf7': Change icons and code from HQ to HDR+ mode.
|
4646329a595d5e350cf17d7462d482a220f83518 |
03-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
am 238799e9: Merge "Change icons and code from HQ to HDR+ mode." into gb-ub-photos-carlsbad * commit '238799e97077ee72a53a5a04d9d3068aebb82bf7': Change icons and code from HQ to HDR+ mode.
|
238799e97077ee72a53a5a04d9d3068aebb82bf7 |
03-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
Merge "Change icons and code from HQ to HDR+ mode." into gb-ub-photos-carlsbad
|
2e63f2e6779efd681dddcb36ff7d108cd92004fd |
03-Oct-2013 |
Angus Kong <shkong@google.com> |
am 5f16c140: am 5bca6f4c: Merge "Don\'t allow actions on items in progress." into gb-ub-photos-carlsbad * commit '5f16c14039b2c97492b03f27c45e5ea01aa0b557': Don't allow actions on items in progress.
|
5f16c14039b2c97492b03f27c45e5ea01aa0b557 |
03-Oct-2013 |
Angus Kong <shkong@google.com> |
am 5bca6f4c: Merge "Don\'t allow actions on items in progress." into gb-ub-photos-carlsbad * commit '5bca6f4cf43732edf459010f418d3719e07f3c8a': Don't allow actions on items in progress.
|
218fb25720bf0bfd3ed619ab7d40dea13080dcbd |
03-Oct-2013 |
Angus Kong <shkong@google.com> |
am 5bca6f4c: Merge "Don\'t allow actions on items in progress." into gb-ub-photos-carlsbad * commit '5bca6f4cf43732edf459010f418d3719e07f3c8a': Don't allow actions on items in progress.
|
5bca6f4cf43732edf459010f418d3719e07f3c8a |
03-Oct-2013 |
Angus Kong <shkong@google.com> |
Merge "Don't allow actions on items in progress." into gb-ub-photos-carlsbad
|
447b4657ade1802ebeb588904cd62f0787ab66c3 |
03-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
Add missing crop message. Bug: 11021907 Change-Id: I9f1b6793e62c098a21f06e2957118cb8bf3475c4
es/values/strings.xml
|
37c96ec8af4487fa0545a6d367f8117a4f701242 |
03-Oct-2013 |
Doris Liu <tianliu@google.com> |
am 67510532: am 930b9b41: Merge "Leave ROI not set except in tap-to-focus scenario" into gb-ub-photos-carlsbad * commit '67510532c164801a1bc995942f44e21453b3e1d4': Leave ROI not set except in tap-to-focus scenario
|
67510532c164801a1bc995942f44e21453b3e1d4 |
03-Oct-2013 |
Doris Liu <tianliu@google.com> |
am 930b9b41: Merge "Leave ROI not set except in tap-to-focus scenario" into gb-ub-photos-carlsbad * commit '930b9b41185a2f59c05fe527300248776d3993a0': Leave ROI not set except in tap-to-focus scenario
|
67f250913cb10228f09112f59711892388a6c63d |
03-Oct-2013 |
Doris Liu <tianliu@google.com> |
am 930b9b41: Merge "Leave ROI not set except in tap-to-focus scenario" into gb-ub-photos-carlsbad * commit '930b9b41185a2f59c05fe527300248776d3993a0': Leave ROI not set except in tap-to-focus scenario
|
3250987bd014d1c5463b8a39bbe988165ab1cc3f |
03-Oct-2013 |
Angus Kong <shkong@google.com> |
Don't allow actions on items in progress. bug:11049529 Change-Id: Id6bd0f912f153b8b8e6b1a525a383ad8cadbe3dd
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/data/InProgressDataWrapper.java
rc/com/android/camera/data/LocalData.java
rc/com/android/camera/data/LocalMediaData.java
rc/com/android/camera/data/RotationTask.java
rc/com/android/camera/data/SimpleViewData.java
|
930b9b41185a2f59c05fe527300248776d3993a0 |
03-Oct-2013 |
Doris Liu <tianliu@google.com> |
Merge "Leave ROI not set except in tap-to-focus scenario" into gb-ub-photos-carlsbad
|
9bf0fd606a624138b8c1123d168f06a24c4d20a3 |
03-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
Change icons and code from HQ to HDR+ mode. Bug: 11047147 Change-Id: Ib0ab1675788f6584d2b06b63a113468d2e775f23
es/drawable-hdpi/ic_hdr_plus_disabled.png
es/drawable-hdpi/ic_hdr_plus_disabled_pressed.png
es/drawable-hdpi/ic_hdr_plus_normal.png
es/drawable-hdpi/ic_hdr_plus_normal_pressed.png
es/drawable-hdpi/ic_indicator_hdr_plus_on.png
es/drawable-mdpi/ic_hdr_plus_disabled.png
es/drawable-mdpi/ic_hdr_plus_disabled_pressed.png
es/drawable-mdpi/ic_hdr_plus_normal.png
es/drawable-mdpi/ic_hdr_plus_normal_pressed.png
es/drawable-mdpi/ic_indicator_hdr_plus_on.png
es/drawable-xhdpi/ic_hdr_plus_disabled.png
es/drawable-xhdpi/ic_hdr_plus_disabled_pressed.png
es/drawable-xhdpi/ic_hdr_plus_normal.png
es/drawable-xhdpi/ic_hdr_plus_normal_pressed.png
es/drawable-xhdpi/ic_indicator_hdr_plus_on.png
es/drawable-xxhdpi/ic_hdr_plus_disabled.png
es/drawable-xxhdpi/ic_hdr_plus_disabled_pressed.png
es/drawable-xxhdpi/ic_hdr_plus_normal.png
es/drawable-xxhdpi/ic_hdr_plus_normal_pressed.png
es/drawable-xxhdpi/ic_hq_disabled.png
es/drawable-xxhdpi/ic_hq_disabled_pressed.png
es/drawable-xxhdpi/ic_hq_normal.png
es/drawable-xxhdpi/ic_hq_normal_pressed.png
es/drawable-xxhdpi/ic_indicator_hdr_plus_on.png
es/drawable-xxhdpi/ic_indicator_hq_on.png
es/values/arrays.xml
es/values/strings.xml
es/xml/camera_preferences.xml
rc/com/android/camera/CameraSettings.java
rc/com/android/camera/OnScreenIndicators.java
rc/com/android/camera/PhotoMenu.java
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/util/ApiHelper.java
|
c421586c285feada482c858ba1b14e9340ff83f8 |
03-Oct-2013 |
Kevin Gabayan <gabayan@google.com> |
am 5ed30cb7: am 68fc363b: Merge "Camera2 icon update for all resolutions." into gb-ub-photos-carlsbad * commit '5ed30cb77f6e73995f3acf8bb00a2a28fd8e6ed1': Camera2 icon update for all resolutions.
|
3c3c63eae242d313b9dd0a59e34f28adecfedfe5 |
03-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
am 644c534f: am 623b74b6: Add HDR+ mode strings (to replace HQ mode) * commit '644c534f6b1d37a8fdd4c1d8f0e243ad13690204': Add HDR+ mode strings (to replace HQ mode)
|
98461dcaff1ec0880714a4fa22a5e4de9445e1e8 |
03-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
am 8a605fad: am 3393a627: Merge "Add missing crop message." into gb-ub-photos-carlsbad * commit '8a605fad65487973449f629bcf6e396f2d79ad3c': Add missing crop message.
|
27408847ed867399fed01515848d3cd93a4d343f |
03-Oct-2013 |
ztenghui <ztenghui@google.com> |
am 9a09d511: am 4c0aede4: Merge "Only show delete action when in secure camera mode." into gb-ub-photos-carlsbad * commit '9a09d511ce26df0bb81a3fc3b61d68356c790860': Only show delete action when in secure camera mode.
|
d915fa042edd436dd819ac889f523da452bf37ae |
03-Oct-2013 |
ztenghui <ztenghui@google.com> |
am cd324a25: am 9ac97492: Merge "Show the delete button if there is room in action bar." into gb-ub-photos-carlsbad * commit 'cd324a25d3c97a7fc4bc22c2ab12408d3d5e2ac2': Show the delete button if there is room in action bar.
|
ac63f9c493d6b755a5bfc106d603ce850b2443de |
03-Oct-2013 |
Mangesh Ghiware <mghiware@google.com> |
am 893981de: am 4f563f1d: Merge "Exit Camera on Up button if no APP_GALLERY handler found." into gb-ub-photos-carlsbad * commit '893981de1e8359f15ade64ce81f5d8efc35581eb': Exit Camera on Up button if no APP_GALLERY handler found.
|
b5cdb04a80b0b6d3d46b969f95678b0002130220 |
03-Oct-2013 |
Baligh Uddin <baligh@google.com> |
am 8bab49cd: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '8bab49cd8647480316598d5e510bf073166795d0': Import translations. DO NOT MERGE
|
88641ad117189fe1a3440dc82e57312507879bab |
03-Oct-2013 |
Erin Dahlgren <edahlgren@google.com> |
Make space for photosphere rendering text Bug: 11005014 Change-Id: I1f92322ff5a53b8bf6752841efd3a59e366d78fb
es/layout/camera_filmstrip.xml
rc/com/android/camera/ui/FilmStripView.java
|
cbdd373181fdd389f02e71a8079e9aab5f11fbad |
03-Oct-2013 |
Doris Liu <tianliu@google.com> |
Leave ROI not set except in tap-to-focus scenario Bug: 11005574 Change-Id: If1837ef6c29d6d48388e3cf8d9bb85bd70a133c9
rc/com/android/camera/FocusOverlayManager.java
rc/com/android/camera/PhotoModule.java
|
5ed30cb77f6e73995f3acf8bb00a2a28fd8e6ed1 |
03-Oct-2013 |
Kevin Gabayan <gabayan@google.com> |
am 68fc363b: Merge "Camera2 icon update for all resolutions." into gb-ub-photos-carlsbad * commit '68fc363bd33a9e506ccfd1ffa330c4525a2734ce': Camera2 icon update for all resolutions.
|
41b3a7dafd990c2e9ed5b2eadd72797439804451 |
03-Oct-2013 |
Kevin Gabayan <gabayan@google.com> |
am 68fc363b: Merge "Camera2 icon update for all resolutions." into gb-ub-photos-carlsbad * commit '68fc363bd33a9e506ccfd1ffa330c4525a2734ce': Camera2 icon update for all resolutions.
|
68fc363bd33a9e506ccfd1ffa330c4525a2734ce |
03-Oct-2013 |
Kevin Gabayan <gabayan@google.com> |
Merge "Camera2 icon update for all resolutions." into gb-ub-photos-carlsbad
|
644c534f6b1d37a8fdd4c1d8f0e243ad13690204 |
03-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
am 623b74b6: Add HDR+ mode strings (to replace HQ mode) * commit '623b74b608fae83034bab58331fc705b8cfecaa6': Add HDR+ mode strings (to replace HQ mode)
|
509134a56d248b493cc550a45114a94bf87b649a |
03-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
am 623b74b6: Add HDR+ mode strings (to replace HQ mode) * commit '623b74b608fae83034bab58331fc705b8cfecaa6': Add HDR+ mode strings (to replace HQ mode)
|
623b74b608fae83034bab58331fc705b8cfecaa6 |
03-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
Add HDR+ mode strings (to replace HQ mode) Bug: 11047147 Change-Id: Iadf72105d526467a1d8f63db839237a4cfba24e1
es/values/arrays.xml
es/values/strings.xml
es/xml/camera_preferences.xml
|
b5a53eb88c8ef73ba312855d038dbda8d7b1f6cf |
03-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
am 3393a627: Merge "Add missing crop message." into gb-ub-photos-carlsbad * commit '3393a62797fa397823eba720b3f52d39ae065739': Add missing crop message.
|
8a605fad65487973449f629bcf6e396f2d79ad3c |
03-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
am 3393a627: Merge "Add missing crop message." into gb-ub-photos-carlsbad * commit '3393a62797fa397823eba720b3f52d39ae065739': Add missing crop message.
|
3393a62797fa397823eba720b3f52d39ae065739 |
03-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
Merge "Add missing crop message." into gb-ub-photos-carlsbad
|
9a09d511ce26df0bb81a3fc3b61d68356c790860 |
03-Oct-2013 |
ztenghui <ztenghui@google.com> |
am 4c0aede4: Merge "Only show delete action when in secure camera mode." into gb-ub-photos-carlsbad * commit '4c0aede4ea37f8fad98a40ec4d28028f338591bd': Only show delete action when in secure camera mode.
|
cd324a25d3c97a7fc4bc22c2ab12408d3d5e2ac2 |
03-Oct-2013 |
ztenghui <ztenghui@google.com> |
am 9ac97492: Merge "Show the delete button if there is room in action bar." into gb-ub-photos-carlsbad * commit '9ac97492cafafc02357de21074d95b29d55d2e9f': Show the delete button if there is room in action bar.
|
b120f19e341086225b6be959e1797dd8645af9c4 |
03-Oct-2013 |
ztenghui <ztenghui@google.com> |
am 4c0aede4: Merge "Only show delete action when in secure camera mode." into gb-ub-photos-carlsbad * commit '4c0aede4ea37f8fad98a40ec4d28028f338591bd': Only show delete action when in secure camera mode.
|
dd89ca2063fb6c94a4193d13e619c62959315bd1 |
03-Oct-2013 |
ztenghui <ztenghui@google.com> |
am 9ac97492: Merge "Show the delete button if there is room in action bar." into gb-ub-photos-carlsbad * commit '9ac97492cafafc02357de21074d95b29d55d2e9f': Show the delete button if there is room in action bar.
|
4c0aede4ea37f8fad98a40ec4d28028f338591bd |
03-Oct-2013 |
ztenghui <ztenghui@google.com> |
Merge "Only show delete action when in secure camera mode." into gb-ub-photos-carlsbad
|
9ac97492cafafc02357de21074d95b29d55d2e9f |
03-Oct-2013 |
ztenghui <ztenghui@google.com> |
Merge "Show the delete button if there is room in action bar." into gb-ub-photos-carlsbad
|
2a5475ca21f899b1d7b4eb28cc382935dbc784d9 |
03-Oct-2013 |
The Android Automerger <android-build@google.com> |
merge in klp-release history after reset to klp-dev
|
46aec0dd9f88ab78a2263b00b6f1f4e58c70d150 |
03-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
Add missing crop message. Bug: 11021907 Change-Id: I9f1b6793e62c098a21f06e2957118cb8bf3475c4
es/values/strings.xml
|
566a5f1137d75698669edbbb664c7be8cfaea613 |
03-Oct-2013 |
Mangesh Ghiware <mghiware@google.com> |
am 4f563f1d: Merge "Exit Camera on Up button if no APP_GALLERY handler found." into gb-ub-photos-carlsbad * commit '4f563f1d91b381ff840e84c52d548194517f6b4c': Exit Camera on Up button if no APP_GALLERY handler found.
|
893981de1e8359f15ade64ce81f5d8efc35581eb |
03-Oct-2013 |
Mangesh Ghiware <mghiware@google.com> |
am 4f563f1d: Merge "Exit Camera on Up button if no APP_GALLERY handler found." into gb-ub-photos-carlsbad * commit '4f563f1d91b381ff840e84c52d548194517f6b4c': Exit Camera on Up button if no APP_GALLERY handler found.
|
4f563f1d91b381ff840e84c52d548194517f6b4c |
03-Oct-2013 |
Mangesh Ghiware <mghiware@google.com> |
Merge "Exit Camera on Up button if no APP_GALLERY handler found." into gb-ub-photos-carlsbad
|
3db3924ffcd04c51652c4db8f73d804979d10e3f |
03-Oct-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE"
|
8bab49cd8647480316598d5e510bf073166795d0 |
03-Oct-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into klp-dev
|
22d3a53d6cd92db212325ea588c9828eff1a96d9 |
03-Oct-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-denali
|
d9b1f7d22fc7a313103d548868d730c102b62936 |
03-Oct-2013 |
Kevin Gabayan <gabayan@google.com> |
Camera2 icon update for all resolutions. Bug: 11048341 Change-Id: I71bf09eed24aa23e30eaf8c9bf4add8c0d1835b1
es/mipmap-hdpi/ic_launcher_camera.png
es/mipmap-mdpi/ic_launcher_camera.png
es/mipmap-xhdpi/ic_launcher_camera.png
es/mipmap-xxhdpi/ic_launcher_camera.png
es/mipmap-xxxhdpi/ic_launcher_camera.png
|
e941cbeeacac11fbae5ae8b06cc1b311e3f6f36d |
03-Oct-2013 |
ztenghui <ztenghui@google.com> |
Only show delete action when in secure camera mode. bug:11048260 Change-Id: Idcf452e91983acdfad17ce1cc503b25d17c2e53c
rc/com/android/camera/CameraActivity.java
|
8c055752e66b17af71ae7ad900ad3bf1adbad39b |
03-Oct-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I5590241df09e5f4a6551a233c5222a87a1e53cae Auto-generated-cl: translation import
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-de/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-ko/strings.xml
es/values-ms-rMY/strings.xml
es/values-pt-rPT/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sr/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
|
7799ab1d55c1ff80b2c823074fe86e35d42c4f3d |
03-Oct-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ib171940890f7da47381b6f33a9dddc893cfe60d5 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-km-rKH/strings.xml
es/values-ko/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mn-rMN/strings.xml
es/values-ms-rMY/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
1d0e3c50d8f0585caf13d5a3b6af3b1105dbe5c4 |
03-Oct-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ib2fdda0ffb7bb870de4f970d33c4022627082d36 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms-rMY/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
b1e5e38e21183edf4b694c28b918c069638ec31e |
03-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
Sync Camera2 permissions to GoogleCamera permissions. Bug: 10951073 Excluding the Gallery3d and gservices permissions. Change-Id: If6508114a47e1a793a2b4caab81437242907f8d2
ndroidManifest.xml
|
8c72b25e2c5bca35e08e8429a98676d5746e147a |
02-Oct-2013 |
ztenghui <ztenghui@google.com> |
Show the delete button if there is room in action bar. bug:10731828 Change-Id: I251593bcbfc8547d1bc445a56f3cd7fd3dd4acf3
es/menu/operations.xml
|
54942e1f1b373191bdee4c67833875b901b94841 |
03-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
am d7b30dd2: am 81fa3622: am f8b53c38: am c60e2b09: Merge "Increase char limit for camera timer sound message." into gb-ub-photos-carlsbad * commit 'd7b30dd25a10169440241bb6c8053dfdc3023d1f': Increase char limit for camera timer sound message.
|
d7b30dd25a10169440241bb6c8053dfdc3023d1f |
03-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
am 81fa3622: am f8b53c38: am c60e2b09: Merge "Increase char limit for camera timer sound message." into gb-ub-photos-carlsbad * commit '81fa362246bed290463f94fdba71a989d796ef94': Increase char limit for camera timer sound message.
|
81fa362246bed290463f94fdba71a989d796ef94 |
03-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
am f8b53c38: am c60e2b09: Merge "Increase char limit for camera timer sound message." into gb-ub-photos-carlsbad * commit 'f8b53c38e933bf9290f727fbf6532839e917fee4': Increase char limit for camera timer sound message.
|
f8b53c38e933bf9290f727fbf6532839e917fee4 |
03-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
am c60e2b09: Merge "Increase char limit for camera timer sound message." into gb-ub-photos-carlsbad * commit 'c60e2b096886e36580c6ecfedd037dcf21130ed3': Increase char limit for camera timer sound message.
|
16e2e32af2b243075443f5cc9db9a29a6b18fe68 |
03-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
am c60e2b09: Merge "Increase char limit for camera timer sound message." into gb-ub-photos-carlsbad * commit 'c60e2b096886e36580c6ecfedd037dcf21130ed3': Increase char limit for camera timer sound message.
|
c60e2b096886e36580c6ecfedd037dcf21130ed3 |
03-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
Merge "Increase char limit for camera timer sound message." into gb-ub-photos-carlsbad
|
0643b884757a56b55dd40dd2b793543bf8d36ec7 |
02-Oct-2013 |
Erin Dahlgren <edahlgren@google.com> |
am f0b608be: am 826b0631: am 03b10508: am cf7babd5: Merge "Reads PhotoSphere metadata once fully loaded so that PhotoSphere viewer icon is visible." into gb-ub-photos-carlsbad * commit 'f0b608be5bfd03200f32bb11cf0db999a3282417': Reads PhotoSphere metadata once fully loaded so that PhotoSphere viewer icon is visible.
|
fef36150da24c5f095960966868bf6c078f6144e |
02-Oct-2013 |
Angus Kong <shkong@google.com> |
am 8c0263e2: am 81f859df: am 632afc19: am 45f5976f: Merge "Make scroll animation smoother." into gb-ub-photos-carlsbad * commit '8c0263e2b28973ba6a09ebc6dd8d8f2055202fda': Make scroll animation smoother.
|
30968d0f9a5094d62de1fb023b8bf7dc3202ebaf |
02-Oct-2013 |
Mangesh Ghiware <mghiware@google.com> |
Exit Camera on Up button if no APP_GALLERY handler found. Bug: 11047289 Change-Id: I532e4ab4fc057bb260d74466af6c1926b0e9900c
rc/com/android/camera/CameraActivity.java
|
f0b608be5bfd03200f32bb11cf0db999a3282417 |
02-Oct-2013 |
Erin Dahlgren <edahlgren@google.com> |
am 826b0631: am 03b10508: am cf7babd5: Merge "Reads PhotoSphere metadata once fully loaded so that PhotoSphere viewer icon is visible." into gb-ub-photos-carlsbad * commit '826b06319f634332c56873db602d80aa14c7bab9': Reads PhotoSphere metadata once fully loaded so that PhotoSphere viewer icon is visible.
|
8c0263e2b28973ba6a09ebc6dd8d8f2055202fda |
02-Oct-2013 |
Angus Kong <shkong@google.com> |
am 81f859df: am 632afc19: am 45f5976f: Merge "Make scroll animation smoother." into gb-ub-photos-carlsbad * commit '81f859dfe54b5884b9641726f463ddc5dac5424e': Make scroll animation smoother.
|
826b06319f634332c56873db602d80aa14c7bab9 |
02-Oct-2013 |
Erin Dahlgren <edahlgren@google.com> |
am 03b10508: am cf7babd5: Merge "Reads PhotoSphere metadata once fully loaded so that PhotoSphere viewer icon is visible." into gb-ub-photos-carlsbad * commit '03b10508d51f03695d91268826a4044f24929340': Reads PhotoSphere metadata once fully loaded so that PhotoSphere viewer icon is visible.
|
81f859dfe54b5884b9641726f463ddc5dac5424e |
02-Oct-2013 |
Angus Kong <shkong@google.com> |
am 632afc19: am 45f5976f: Merge "Make scroll animation smoother." into gb-ub-photos-carlsbad * commit '632afc196121cb15a53b4cffd3b93df4fcd39f46': Make scroll animation smoother.
|
fc3188eef51932f890f24757f4743bf4e7cc430d |
02-Oct-2013 |
Erin Dahlgren <edahlgren@google.com> |
am cf7babd5: Merge "Reads PhotoSphere metadata once fully loaded so that PhotoSphere viewer icon is visible." into gb-ub-photos-carlsbad * commit 'cf7babd5cbe69cf99d96e46c306d6733837f48eb': Reads PhotoSphere metadata once fully loaded so that PhotoSphere viewer icon is visible.
|
93140e497495ac0f0a1c46719d0c8913c9b9b7a6 |
02-Oct-2013 |
Angus Kong <shkong@google.com> |
am 45f5976f: Merge "Make scroll animation smoother." into gb-ub-photos-carlsbad * commit '45f5976f2c1d4eda46be4ea591c6196c683f2ded': Make scroll animation smoother.
|
03b10508d51f03695d91268826a4044f24929340 |
02-Oct-2013 |
Erin Dahlgren <edahlgren@google.com> |
am cf7babd5: Merge "Reads PhotoSphere metadata once fully loaded so that PhotoSphere viewer icon is visible." into gb-ub-photos-carlsbad * commit 'cf7babd5cbe69cf99d96e46c306d6733837f48eb': Reads PhotoSphere metadata once fully loaded so that PhotoSphere viewer icon is visible.
|
632afc196121cb15a53b4cffd3b93df4fcd39f46 |
02-Oct-2013 |
Angus Kong <shkong@google.com> |
am 45f5976f: Merge "Make scroll animation smoother." into gb-ub-photos-carlsbad * commit '45f5976f2c1d4eda46be4ea591c6196c683f2ded': Make scroll animation smoother.
|
cf7babd5cbe69cf99d96e46c306d6733837f48eb |
02-Oct-2013 |
Erin Dahlgren <edahlgren@google.com> |
Merge "Reads PhotoSphere metadata once fully loaded so that PhotoSphere viewer icon is visible." into gb-ub-photos-carlsbad
|
45f5976f2c1d4eda46be4ea591c6196c683f2ded |
02-Oct-2013 |
Angus Kong <shkong@google.com> |
Merge "Make scroll animation smoother." into gb-ub-photos-carlsbad
|
d5b6ec2cb324156bdfe268470363678e576584b4 |
02-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
am 4f4e12c6: am 3c45c0c0: am b8968f2c: am 706c985f: Merge "Deactivate the backup agent in Camera2" into gb-ub-photos-carlsbad * commit '4f4e12c6cabe33152c6f974f8168e9f76d842c65': Deactivate the backup agent in Camera2
|
ed8923cccc23995c4de95835b4f5ec320770e5dd |
02-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
am cf087b41: am 5a55e6b8: am 607bb9a2: am 72a83bc2: Merge "Add content description to post-capture thumbnail." into gb-ub-photos-carlsbad * commit 'cf087b416532547626ec193b920757d5095ce0ac': Add content description to post-capture thumbnail.
|
03af34f8022253fa1a24586587e486613742a3d3 |
02-Oct-2013 |
Erin Dahlgren <edahlgren@google.com> |
am 5974e522: am b7633573: am 852853c8: am 6416ba8a: Merge "Fix FilmStrip crash by checking if photos are present before updating action bar" into gb-ub-photos-carlsbad * commit '5974e5221e3bf63358e6b42a9085ccc0b0f36b85': Fix FilmStrip crash by checking if photos are present before updating action bar
|
45a2fa1c2840d20f462b63f16526bc2c0f756c8c |
02-Oct-2013 |
Doris Liu <tianliu@google.com> |
am 45385a9f: am c4810a33: am 148b65b0: am 1f69e36b: A workaround for crash in zoom view * commit '45385a9f3225e8e1504aa0fa4cefd84a5bc77104': A workaround for crash in zoom view
|
c7086b21694172423643ef17887c4b6dfada64ee |
02-Oct-2013 |
Angus Kong <shkong@google.com> |
am ee5aa8f1: am ee7f3963: am 9baebd5d: am 7fc104e4: Prevent NPE in gesture handling. * commit 'ee5aa8f11fdf08b28dcd935e8288a881f6703586': Prevent NPE in gesture handling.
|
179e3b6d5662c958e196684046d5eba7aa996628 |
02-Oct-2013 |
Doris Liu <tianliu@google.com> |
am 58af6bfd: am 6f2be56c: am 5eb88117: am e2d59dcc: Merge "Double tap to full screen from filmstrip" into gb-ub-photos-carlsbad * commit '58af6bfdf86cbe797630b0cb9f1055369b01a103': Double tap to full screen from filmstrip
|
0587ebdd30b68d13f86526d17882f098bdde505e |
02-Oct-2013 |
Erin Dahlgren <edahlgren@google.com> |
am 791efd67: am ee8d0e11: am ed3a34fb: am ad3003bb: Merge "Updates newly centered photos in FilmStrip after a delete." into gb-ub-photos-carlsbad * commit '791efd67fcf00f4d1ab15153403908fe6813d99f': Updates newly centered photos in FilmStrip after a delete.
|
a1f57c51f7a231a6bcad4053108057d5bde9ae05 |
02-Oct-2013 |
Baligh Uddin <baligh@google.com> |
am e096cec4: (-s ours) am bcdea4ae: (-s ours) am 16376616: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit 'e096cec4964acb5e82cd63df90d7c56c29008ac4': Import translations. DO NOT MERGE
|
971af279be870013577f986965bb894d85bea904 |
02-Oct-2013 |
Angus Kong <shkong@google.com> |
am 37123ea0: am 85be0ac8: am a1cb57be: Merge "Don\'t adjust the position while scrolling." into gb-ub-photos-carlsbad * commit '37123ea0a142e378e9c9033e99c0bf4e7e9cdf4a': Don't adjust the position while scrolling.
|
38fe1b6402b493de870b2a74a7be4b00ed373918 |
02-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
am 4b5dd651: am 7334597f: am 4d21fc2e: Merge "Show status bar in filmstrip mode" into gb-ub-photos-carlsbad * commit '4b5dd6514f5ef3026a325cfdb9d43b575c781df7': Show status bar in filmstrip mode
|
4f4e12c6cabe33152c6f974f8168e9f76d842c65 |
02-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
am 3c45c0c0: am b8968f2c: am 706c985f: Merge "Deactivate the backup agent in Camera2" into gb-ub-photos-carlsbad * commit '3c45c0c0b250eecd2a589a3616a14dea195564a8': Deactivate the backup agent in Camera2
|
cf087b416532547626ec193b920757d5095ce0ac |
02-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
am 5a55e6b8: am 607bb9a2: am 72a83bc2: Merge "Add content description to post-capture thumbnail." into gb-ub-photos-carlsbad * commit '5a55e6b8a63e6f5a287ccc7c3099423e5e5fa30b': Add content description to post-capture thumbnail.
|
5974e5221e3bf63358e6b42a9085ccc0b0f36b85 |
02-Oct-2013 |
Erin Dahlgren <edahlgren@google.com> |
am b7633573: am 852853c8: am 6416ba8a: Merge "Fix FilmStrip crash by checking if photos are present before updating action bar" into gb-ub-photos-carlsbad * commit 'b763357340619b188d0d536e31c5e7ddbcfec595': Fix FilmStrip crash by checking if photos are present before updating action bar
|
45385a9f3225e8e1504aa0fa4cefd84a5bc77104 |
02-Oct-2013 |
Doris Liu <tianliu@google.com> |
am c4810a33: am 148b65b0: am 1f69e36b: A workaround for crash in zoom view * commit 'c4810a331b4420a18e8925afd61b0a0006943704': A workaround for crash in zoom view
|
ee5aa8f11fdf08b28dcd935e8288a881f6703586 |
02-Oct-2013 |
Angus Kong <shkong@google.com> |
am ee7f3963: am 9baebd5d: am 7fc104e4: Prevent NPE in gesture handling. * commit 'ee7f3963c8fcb44ff8d1d1864ac480664f3f645c': Prevent NPE in gesture handling.
|
58af6bfdf86cbe797630b0cb9f1055369b01a103 |
02-Oct-2013 |
Doris Liu <tianliu@google.com> |
am 6f2be56c: am 5eb88117: am e2d59dcc: Merge "Double tap to full screen from filmstrip" into gb-ub-photos-carlsbad * commit '6f2be56cad8a8963f351eb8d21996a9c222a6f60': Double tap to full screen from filmstrip
|
791efd67fcf00f4d1ab15153403908fe6813d99f |
02-Oct-2013 |
Erin Dahlgren <edahlgren@google.com> |
am ee8d0e11: am ed3a34fb: am ad3003bb: Merge "Updates newly centered photos in FilmStrip after a delete." into gb-ub-photos-carlsbad * commit 'ee8d0e11a987bb5b12f0b760a918913c7a1661d0': Updates newly centered photos in FilmStrip after a delete.
|
e096cec4964acb5e82cd63df90d7c56c29008ac4 |
02-Oct-2013 |
Baligh Uddin <baligh@google.com> |
am bcdea4ae: (-s ours) am 16376616: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit 'bcdea4aeaac503f2d7610258e73909db4e4e6292': Import translations. DO NOT MERGE
|
37123ea0a142e378e9c9033e99c0bf4e7e9cdf4a |
02-Oct-2013 |
Angus Kong <shkong@google.com> |
am 85be0ac8: am a1cb57be: Merge "Don\'t adjust the position while scrolling." into gb-ub-photos-carlsbad * commit '85be0ac807789a8d02ab900de179adbef5c865cb': Don't adjust the position while scrolling.
|
4b5dd6514f5ef3026a325cfdb9d43b575c781df7 |
02-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
am 7334597f: am 4d21fc2e: Merge "Show status bar in filmstrip mode" into gb-ub-photos-carlsbad * commit '7334597fcc93679d49d15e3922887496b17cb3cd': Show status bar in filmstrip mode
|
c57b101e21246c16a41989cb0351737bbfbc94d1 |
02-Oct-2013 |
The Android Automerger <android-build@google.com> |
merge in klp-release history after reset to klp-dev
|
8034442d7ea57fda82931bc0a9fc2cd8488776a8 |
02-Oct-2013 |
ztenghui <ztenghui@google.com> |
am 954be135: am 293cf7e4: am 4feabff8: Fix MediaStore correction code. * commit '954be1350bfadaa45035880a817f2723e8a3585a': Fix MediaStore correction code.
|
eeff8760c81cf0c9d782254d5459d9c0da3c8050 |
02-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
am 2ef69c96: am 9c9244fc: am c4aa7c0e: Change crop label to avoid aapt dump badging from failing. * commit '2ef69c967b91fd3c12ab56f6e06ae392ae231a89': Change crop label to avoid aapt dump badging from failing.
|
1f36cf1c97faf2b7824bbecd62942456847f0e13 |
02-Oct-2013 |
Angus Kong <shkong@google.com> |
Make scroll animation smoother. bug:10802703 Change-Id: I2e759a5b45eb8f68eb63163ad7e42cc670971bf4
rc/com/android/camera/ui/FilmStripView.java
|
954be1350bfadaa45035880a817f2723e8a3585a |
02-Oct-2013 |
ztenghui <ztenghui@google.com> |
am 293cf7e4: am 4feabff8: Fix MediaStore correction code. * commit '293cf7e4030fc029911386b4da9f1805aafa8ba5': Fix MediaStore correction code.
|
2ef69c967b91fd3c12ab56f6e06ae392ae231a89 |
02-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
am 9c9244fc: am c4aa7c0e: Change crop label to avoid aapt dump badging from failing. * commit '9c9244fceb36344594946360c8b00cf62539f19f': Change crop label to avoid aapt dump badging from failing.
|
574a23f4b2e4266930d59d2d19a6ef2417b14a86 |
02-Oct-2013 |
Alan Newberger <alann@google.com> |
am d0a03f32: am f390ec0c: am fb344efd: Temporary removal of resize code to evaluate GCam image bug * commit 'd0a03f3293fe83c0bc3aa8d91ea17961baab0729':
|
0e2d50cd058c76279bb701fe6ca252b27037cd33 |
02-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
am 604c0289: am 70d6ff76: am ac5cb243: Merge "Add basic EXIF to the tiny planet so that rotate succeeds." into gb-ub-photos-carlsbad * commit '604c02890925d5ad1086fe211c47f595c2647c81':
|
59cde58e0beb2dae81b32cd201d2c0b684f00a5a |
02-Oct-2013 |
ztenghui <ztenghui@google.com> |
am a6491129: am d200ce9a: am b7be228d: Fix incorrect width and height from MediaStore. * commit 'a64911292be4e18c0c435b6914c777136b496045':
|
d28ae5f87d41c7dec1247d6ebacf69fad3d859b7 |
02-Oct-2013 |
Angus Kong <shkong@google.com> |
am bbe03add: am 5475e801: am 9ba47bf4: Merge "Restore HQ preference in GCam module." into gb-ub-photos-carlsbad * commit 'bbe03addaa5f2f8f2388b14ffadc0124bcd59c24':
|
e9a422b897c51b691305ead92afc1a62a663f35e |
02-Oct-2013 |
ztenghui <ztenghui@google.com> |
am 603b1711: am 2b0ce26b: am af41aaa4: Don\'t update the width and height in MediaStore after rotation * commit '603b1711e6876e07a8be49d68c98c29db7ce2574':
|
bf52fff89036855e47a7f980721955ac7de12df6 |
02-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
am 20afca67: am 2062cfd4: am 3cde3ece: Merge "Add orientation information to the details dialog." into gb-ub-photos-carlsbad * commit '20afca67e42ecc153c977e1d333c02b6f673be96':
|
31448792d4324785bd19d537ce85116f72f9a7af |
02-Oct-2013 |
Doris Liu <tianliu@google.com> |
am 3c0a09f1: am 2b72f33b: am 2b86d873: Fix memory leak of context in LocalMediaObserver * commit '3c0a09f1c6ff14b3879808dc5cbe10440324d7b3':
|
4ad2c07cb2ef5b9610a0399433026f69637fe057 |
02-Oct-2013 |
Alan Newberger <alann@google.com> |
am f390ec0c: am fb344efd: Temporary removal of resize code to evaluate GCam image bug * commit 'f390ec0c09bbd043466a5b22c9bef70426c3c07b': Temporary removal of resize code to evaluate GCam image bug
|
3c45c0c0b250eecd2a589a3616a14dea195564a8 |
02-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
am b8968f2c: am 706c985f: Merge "Deactivate the backup agent in Camera2" into gb-ub-photos-carlsbad * commit 'b8968f2ce791c437322c25ef6e6fdc9d0fa10d65': Deactivate the backup agent in Camera2
|
df78813ff84a86f7dc5377860abaf39a4fb2ac2b |
02-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
am 706c985f: Merge "Deactivate the backup agent in Camera2" into gb-ub-photos-carlsbad * commit '706c985f0a8c8d996b979543a541ed2cb41269e1': Deactivate the backup agent in Camera2
|
b8968f2ce791c437322c25ef6e6fdc9d0fa10d65 |
02-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
am 706c985f: Merge "Deactivate the backup agent in Camera2" into gb-ub-photos-carlsbad * commit '706c985f0a8c8d996b979543a541ed2cb41269e1': Deactivate the backup agent in Camera2
|
5a55e6b8a63e6f5a287ccc7c3099423e5e5fa30b |
02-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
am 607bb9a2: am 72a83bc2: Merge "Add content description to post-capture thumbnail." into gb-ub-photos-carlsbad * commit '607bb9a208578dc7e0aa79c4dd222e3edd26566b': Add content description to post-capture thumbnail.
|
23d9ce529e54b42776369a24c6f9721bdf143fa5 |
02-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
am 72a83bc2: Merge "Add content description to post-capture thumbnail." into gb-ub-photos-carlsbad * commit '72a83bc295dfa5c0d07102065f50930bf18e28e2': Add content description to post-capture thumbnail.
|
706c985f0a8c8d996b979543a541ed2cb41269e1 |
02-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
Merge "Deactivate the backup agent in Camera2" into gb-ub-photos-carlsbad
|
607bb9a208578dc7e0aa79c4dd222e3edd26566b |
02-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
am 72a83bc2: Merge "Add content description to post-capture thumbnail." into gb-ub-photos-carlsbad * commit '72a83bc295dfa5c0d07102065f50930bf18e28e2': Add content description to post-capture thumbnail.
|
72a83bc295dfa5c0d07102065f50930bf18e28e2 |
02-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
Merge "Add content description to post-capture thumbnail." into gb-ub-photos-carlsbad
|
e129ec0885fe366aa0cc6774e316b3c5e113a4fa |
02-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
Deactivate the backup agent in Camera2 Bug: 11033304 Change-Id: I9fc4d3b02b1dd041988fb9d0f313693b5ae1b865
ndroidManifest.xml
|
0423308f36acce0bed2bcde8c74043082c9e83d7 |
02-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
Increase char limit for camera timer sound message. Bug: 10962439 Change-Id: Ib08734a059082dd6a20a7ded67bc3495500c598e
es/values/strings.xml
|
f6da258372d5a500351fd4ee621e454ec410aaf2 |
02-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
Add content description to post-capture thumbnail. Bug: 10916138 Change-Id: I6fc5316cf622da8ba7bfcff5c6b43104d50c6652
es/layout-land/camera_controls.xml
es/layout-port/camera_controls.xml
es/values/strings.xml
|
b763357340619b188d0d536e31c5e7ddbcfec595 |
02-Oct-2013 |
Erin Dahlgren <edahlgren@google.com> |
am 852853c8: am 6416ba8a: Merge "Fix FilmStrip crash by checking if photos are present before updating action bar" into gb-ub-photos-carlsbad * commit '852853c8ac10aeea3f8df0ec53d8f2ae203e0a5e': Fix FilmStrip crash by checking if photos are present before updating action bar
|
5d73bcd33cb59b7ea575c8d11c679675e169d75c |
02-Oct-2013 |
Erin Dahlgren <edahlgren@google.com> |
am 6416ba8a: Merge "Fix FilmStrip crash by checking if photos are present before updating action bar" into gb-ub-photos-carlsbad * commit '6416ba8a428025c669782a2d3226f06ad5a86921': Fix FilmStrip crash by checking if photos are present before updating action bar
|
852853c8ac10aeea3f8df0ec53d8f2ae203e0a5e |
02-Oct-2013 |
Erin Dahlgren <edahlgren@google.com> |
am 6416ba8a: Merge "Fix FilmStrip crash by checking if photos are present before updating action bar" into gb-ub-photos-carlsbad * commit '6416ba8a428025c669782a2d3226f06ad5a86921': Fix FilmStrip crash by checking if photos are present before updating action bar
|
6416ba8a428025c669782a2d3226f06ad5a86921 |
02-Oct-2013 |
Erin Dahlgren <edahlgren@google.com> |
Merge "Fix FilmStrip crash by checking if photos are present before updating action bar" into gb-ub-photos-carlsbad
|
c4810a331b4420a18e8925afd61b0a0006943704 |
02-Oct-2013 |
Doris Liu <tianliu@google.com> |
am 148b65b0: am 1f69e36b: A workaround for crash in zoom view * commit '148b65b0c1ac7f202af2e682a21cac298c7d05ef': A workaround for crash in zoom view
|
a070dd004981d63ce4f6bc53e8afb830077b7b79 |
02-Oct-2013 |
Doris Liu <tianliu@google.com> |
am 1f69e36b: A workaround for crash in zoom view * commit '1f69e36bc45ccf0090cb1d8392d603cfe2a4e8bf': A workaround for crash in zoom view
|
148b65b0c1ac7f202af2e682a21cac298c7d05ef |
02-Oct-2013 |
Doris Liu <tianliu@google.com> |
am 1f69e36b: A workaround for crash in zoom view * commit '1f69e36bc45ccf0090cb1d8392d603cfe2a4e8bf': A workaround for crash in zoom view
|
b7a52a4caafd270dbb6aaa41f890a516359e44b8 |
01-Oct-2013 |
Erin Dahlgren <edahlgren@google.com> |
Reads PhotoSphere metadata once fully loaded so that PhotoSphere viewer icon is visible. Bug: 10715651 Change-Id: Ib71a3e4469d1ecee87b9423b03b8898294a7ffa6
rc/com/android/camera/ui/FilmStripView.java
|
1f69e36bc45ccf0090cb1d8392d603cfe2a4e8bf |
02-Oct-2013 |
Doris Liu <tianliu@google.com> |
A workaround for crash in zoom view Bug: 10636636 Change-Id: Iffa126781fd71796b8816d637263450911cb7e8e
rc/com/android/camera/ui/ZoomView.java
|
c712df271263d946fe8ff6355099d00c84947410 |
01-Oct-2013 |
Angus Kong <shkong@google.com> |
Prevent NPE in gesture handling. bug:11023769 Change-Id: Iee9e5c2d295378f327c3b01349eda5d80a579ed7
rc/com/android/camera/PreviewGestures.java
|
d4f69ed6fa6e302955ce8d0b2a21f47794ce7d64 |
01-Oct-2013 |
Erin Dahlgren <edahlgren@google.com> |
Fix FilmStrip crash by checking if photos are present before updating action bar Bug: 11027838 Change-Id: I770f8d0187b4f92f5395b27496620acb099eeb6a
rc/com/android/camera/CameraActivity.java
|
ee7f3963c8fcb44ff8d1d1864ac480664f3f645c |
01-Oct-2013 |
Angus Kong <shkong@google.com> |
am 9baebd5d: am 7fc104e4: Prevent NPE in gesture handling. * commit '9baebd5de51909a5c06c5c8c35201c6e251eec95': Prevent NPE in gesture handling.
|
d498beef746d3ff95fc10a975e71e97d1c3fe3b3 |
01-Oct-2013 |
Angus Kong <shkong@google.com> |
am 7fc104e4: Prevent NPE in gesture handling. * commit '7fc104e4e75ac881269fd4a093513da01565e5d6': Prevent NPE in gesture handling.
|
9baebd5de51909a5c06c5c8c35201c6e251eec95 |
01-Oct-2013 |
Angus Kong <shkong@google.com> |
am 7fc104e4: Prevent NPE in gesture handling. * commit '7fc104e4e75ac881269fd4a093513da01565e5d6': Prevent NPE in gesture handling.
|
7fc104e4e75ac881269fd4a093513da01565e5d6 |
01-Oct-2013 |
Angus Kong <shkong@google.com> |
Prevent NPE in gesture handling. bug:11023769 Change-Id: Iee9e5c2d295378f327c3b01349eda5d80a579ed7
rc/com/android/camera/PreviewGestures.java
|
6f2be56cad8a8963f351eb8d21996a9c222a6f60 |
01-Oct-2013 |
Doris Liu <tianliu@google.com> |
am 5eb88117: am e2d59dcc: Merge "Double tap to full screen from filmstrip" into gb-ub-photos-carlsbad * commit '5eb88117627c555398f04065e79bb601337b12f7': Double tap to full screen from filmstrip
|
5eb88117627c555398f04065e79bb601337b12f7 |
01-Oct-2013 |
Doris Liu <tianliu@google.com> |
am e2d59dcc: Merge "Double tap to full screen from filmstrip" into gb-ub-photos-carlsbad * commit 'e2d59dcccf177fdd158949a6b2f741a75d504416': Double tap to full screen from filmstrip
|
0b867639b073af8ac4a240af3d09688b3e3f6cc8 |
01-Oct-2013 |
Doris Liu <tianliu@google.com> |
am e2d59dcc: Merge "Double tap to full screen from filmstrip" into gb-ub-photos-carlsbad * commit 'e2d59dcccf177fdd158949a6b2f741a75d504416': Double tap to full screen from filmstrip
|
e2d59dcccf177fdd158949a6b2f741a75d504416 |
01-Oct-2013 |
Doris Liu <tianliu@google.com> |
Merge "Double tap to full screen from filmstrip" into gb-ub-photos-carlsbad
|
ee8d0e11a987bb5b12f0b760a918913c7a1661d0 |
01-Oct-2013 |
Erin Dahlgren <edahlgren@google.com> |
am ed3a34fb: am ad3003bb: Merge "Updates newly centered photos in FilmStrip after a delete." into gb-ub-photos-carlsbad * commit 'ed3a34fb4bdb77ee3bca61398d57a32c01b0523f': Updates newly centered photos in FilmStrip after a delete.
|
ed9ba2ec664938e13fafdf8293017f31eec53bd2 |
01-Oct-2013 |
Erin Dahlgren <edahlgren@google.com> |
am ad3003bb: Merge "Updates newly centered photos in FilmStrip after a delete." into gb-ub-photos-carlsbad * commit 'ad3003bbb275b91d7564568e413400fc187dbcd4': Updates newly centered photos in FilmStrip after a delete.
|
ed3a34fb4bdb77ee3bca61398d57a32c01b0523f |
01-Oct-2013 |
Erin Dahlgren <edahlgren@google.com> |
am ad3003bb: Merge "Updates newly centered photos in FilmStrip after a delete." into gb-ub-photos-carlsbad * commit 'ad3003bbb275b91d7564568e413400fc187dbcd4': Updates newly centered photos in FilmStrip after a delete.
|
ad3003bbb275b91d7564568e413400fc187dbcd4 |
01-Oct-2013 |
Erin Dahlgren <edahlgren@google.com> |
Merge "Updates newly centered photos in FilmStrip after a delete." into gb-ub-photos-carlsbad
|
d66cb98dea44b43e6db58ce5c20f41a22b969af2 |
01-Oct-2013 |
The Android Automerger <android-build@google.com> |
merge in klp-release history after reset to klp-dev
|
d0a03f3293fe83c0bc3aa8d91ea17961baab0729 |
01-Oct-2013 |
Alan Newberger <alann@google.com> |
am f390ec0c: am fb344efd: Temporary removal of resize code to evaluate GCam image bug * commit 'f390ec0c09bbd043466a5b22c9bef70426c3c07b': Temporary removal of resize code to evaluate GCam image bug
|
bcdea4aeaac503f2d7610258e73909db4e4e6292 |
01-Oct-2013 |
Baligh Uddin <baligh@google.com> |
am 16376616: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '1637661648894b78f997a44cce6d0e49155bf340': Import translations. DO NOT MERGE
|
596e2dbc565fa1615a90130e2d0c2521394b1083 |
01-Oct-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE"
|
1637661648894b78f997a44cce6d0e49155bf340 |
01-Oct-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into klp-dev
|
419e61e67adb56ea25ca6104e2fd32132f546f2d |
01-Oct-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-denali
|
f43998f3fa5d2aad737c500276a6331c9588ed5a |
01-Oct-2013 |
Angus Kong <shkong@google.com> |
am a1cb57be: Merge "Don\'t adjust the position while scrolling." into gb-ub-photos-carlsbad * commit 'a1cb57beb56e17f8d64b82cb1465dcb63cce74b1': Don't adjust the position while scrolling.
|
85be0ac807789a8d02ab900de179adbef5c865cb |
01-Oct-2013 |
Angus Kong <shkong@google.com> |
am a1cb57be: Merge "Don\'t adjust the position while scrolling." into gb-ub-photos-carlsbad * commit 'a1cb57beb56e17f8d64b82cb1465dcb63cce74b1': Don't adjust the position while scrolling.
|
a1cb57beb56e17f8d64b82cb1465dcb63cce74b1 |
01-Oct-2013 |
Angus Kong <shkong@google.com> |
Merge "Don't adjust the position while scrolling." into gb-ub-photos-carlsbad
|
7334597fcc93679d49d15e3922887496b17cb3cd |
01-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
am 4d21fc2e: Merge "Show status bar in filmstrip mode" into gb-ub-photos-carlsbad * commit '4d21fc2e3f7e7e64e5910b9ee4f6b7662a441427': Show status bar in filmstrip mode
|
fa9f1f43db82f9ecf104ed0a700cf7a1dd9afe12 |
01-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
am 4d21fc2e: Merge "Show status bar in filmstrip mode" into gb-ub-photos-carlsbad * commit '4d21fc2e3f7e7e64e5910b9ee4f6b7662a441427': Show status bar in filmstrip mode
|
4d21fc2e3f7e7e64e5910b9ee4f6b7662a441427 |
01-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
Merge "Show status bar in filmstrip mode" into gb-ub-photos-carlsbad
|
d42de0adf9ab8d84029856859cb8fbb07eaa96b5 |
30-Sep-2013 |
Erin Dahlgren <edahlgren@google.com> |
Updates newly centered photos in FilmStrip after a delete. Bug: 10715651 Change-Id: Idf4029270c5d0de2885322b2e25ad75e98def84a
rc/com/android/camera/CameraActivity.java
|
8eaf3b1b3ad894db8d23a659a4c662d9f6d09df1 |
01-Oct-2013 |
ztenghui <ztenghui@google.com> |
am 4feabff8: Fix MediaStore correction code. * commit '4feabff8b87e1b71e8040dbcd6289a313bf9f593': Fix MediaStore correction code.
|
ef024b9d5284454197e8578606caf953ed39a8dc |
01-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
am c4aa7c0e: Change crop label to avoid aapt dump badging from failing. * commit 'c4aa7c0e3c9b6a15eca03ba7bdaaccf3ceb8c15d': Change crop label to avoid aapt dump badging from failing.
|
293cf7e4030fc029911386b4da9f1805aafa8ba5 |
01-Oct-2013 |
ztenghui <ztenghui@google.com> |
am 4feabff8: Fix MediaStore correction code. * commit '4feabff8b87e1b71e8040dbcd6289a313bf9f593': Fix MediaStore correction code.
|
9c9244fceb36344594946360c8b00cf62539f19f |
01-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
am c4aa7c0e: Change crop label to avoid aapt dump badging from failing. * commit 'c4aa7c0e3c9b6a15eca03ba7bdaaccf3ceb8c15d': Change crop label to avoid aapt dump badging from failing.
|
604c02890925d5ad1086fe211c47f595c2647c81 |
01-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
am 70d6ff76: am ac5cb243: Merge "Add basic EXIF to the tiny planet so that rotate succeeds." into gb-ub-photos-carlsbad * commit '70d6ff76b6e967fccbaf66256331e076366d6ae0': Add basic EXIF to the tiny planet so that rotate succeeds.
|
a64911292be4e18c0c435b6914c777136b496045 |
01-Oct-2013 |
ztenghui <ztenghui@google.com> |
am d200ce9a: am b7be228d: Fix incorrect width and height from MediaStore. * commit 'd200ce9a514895d021129e5f534cac0cf5bdfcf8': Fix incorrect width and height from MediaStore.
|
bbe03addaa5f2f8f2388b14ffadc0124bcd59c24 |
01-Oct-2013 |
Angus Kong <shkong@google.com> |
am 5475e801: am 9ba47bf4: Merge "Restore HQ preference in GCam module." into gb-ub-photos-carlsbad * commit '5475e8016e33164756b80152ae3a0c8f48397c67': Restore HQ preference in GCam module.
|
603b1711e6876e07a8be49d68c98c29db7ce2574 |
01-Oct-2013 |
ztenghui <ztenghui@google.com> |
am 2b0ce26b: am af41aaa4: Don\'t update the width and height in MediaStore after rotation * commit '2b0ce26b317abd5dfad18bc5a916cb81cf01a195': Don't update the width and height in MediaStore after rotation
|
20afca67e42ecc153c977e1d333c02b6f673be96 |
01-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
am 2062cfd4: am 3cde3ece: Merge "Add orientation information to the details dialog." into gb-ub-photos-carlsbad * commit '2062cfd46e029e95ff4b7c22282ffa34fac1706c': Add orientation information to the details dialog.
|
3c0a09f1c6ff14b3879808dc5cbe10440324d7b3 |
01-Oct-2013 |
Doris Liu <tianliu@google.com> |
am 2b72f33b: am 2b86d873: Fix memory leak of context in LocalMediaObserver * commit '2b72f33bebf07b628a3c0bc65c147b4c447c427a': Fix memory leak of context in LocalMediaObserver
|
0156d9179bb9ba8718b25ee05985a7c71e5578c7 |
01-Oct-2013 |
Sascha Haeberling <haeberling@google.com> |
Show status bar in filmstrip mode Bug: 11005642 Also makes sure we only call setSystemUiVisibility in only one place. Change-Id: I6e4709c63c25a4e69219ec7518dc284cef303aaa
es/values/styles.xml
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/ui/CameraRootView.java
rc/com/android/camera/ui/FilmStripView.java
|
4feabff8b87e1b71e8040dbcd6289a313bf9f593 |
30-Sep-2013 |
ztenghui <ztenghui@google.com> |
Fix MediaStore correction code. This reverts commit fb344efde20ffab903fae7c6e5a2e1c90b4ef085. And this CL make sure we handle rotated image correctly and update the MediaStore according to the bitmap size. bug:10988273 Change-Id: I9acb60e0dd485292748bcc586801f76bc7a543dc
rc/com/android/camera/data/LocalMediaData.java
|
a5d6b243d3d742cf9dd2ffdac88d386abacd123a |
01-Oct-2013 |
Angus Kong <shkong@google.com> |
Don't adjust the position while scrolling. bug:10802703 Change-Id: I493c36b87c99de97275add1243f5ac363a28787e
rc/com/android/camera/ui/FilmStripView.java
|
decfee8e656fbde8d8028ac6fca48f91c847ca0f |
30-Sep-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I6449f166d9f764a8915e7a39f02fd035a5867581 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-km-rKH/strings.xml
es/values-ko/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mn-rMN/strings.xml
es/values-ms-rMY/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
e17f24a9c55adab4c7f6f224551458fce1497099 |
30-Sep-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I250289ddbb5e5e2a3062ee895b4ebfaf6004db8f Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-km-rKH/strings.xml
es/values-ko/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mn-rMN/strings.xml
es/values-ms-rMY/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
eb1c0fa8966851f643d527ca840bfc4edba1752b |
30-Sep-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I557ab8b62bb6452f1e9e0d86e21d9750c6aab652 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms-rMY/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
e9730a848ab1b83d841a22799f0f7f1441a25dff |
30-Sep-2013 |
Sascha Haeberling <haeberling@google.com> |
am 70d6ff76: am ac5cb243: Merge "Add basic EXIF to the tiny planet so that rotate succeeds." into gb-ub-photos-carlsbad * commit '70d6ff76b6e967fccbaf66256331e076366d6ae0': Add basic EXIF to the tiny planet so that rotate succeeds.
|
af8cff176bc7dcac0284f21e202f3c1065a85972 |
30-Sep-2013 |
ztenghui <ztenghui@google.com> |
am d200ce9a: am b7be228d: Fix incorrect width and height from MediaStore. * commit 'd200ce9a514895d021129e5f534cac0cf5bdfcf8': Fix incorrect width and height from MediaStore.
|
2851a27f70336f269baf92224411e296228349aa |
30-Sep-2013 |
Angus Kong <shkong@google.com> |
am 5475e801: am 9ba47bf4: Merge "Restore HQ preference in GCam module." into gb-ub-photos-carlsbad * commit '5475e8016e33164756b80152ae3a0c8f48397c67': Restore HQ preference in GCam module.
|
1b9d72656eb5a92a8d7756d77feff048557ce18d |
30-Sep-2013 |
ztenghui <ztenghui@google.com> |
am 2b0ce26b: am af41aaa4: Don\'t update the width and height in MediaStore after rotation * commit '2b0ce26b317abd5dfad18bc5a916cb81cf01a195': Don't update the width and height in MediaStore after rotation
|
89049a56acec3dda8c8bece5ac5d467b962fb749 |
30-Sep-2013 |
Sascha Haeberling <haeberling@google.com> |
am 2062cfd4: am 3cde3ece: Merge "Add orientation information to the details dialog." into gb-ub-photos-carlsbad * commit '2062cfd46e029e95ff4b7c22282ffa34fac1706c': Add orientation information to the details dialog.
|
6378a8fed87e65b552a8b088586e1817d3d39478 |
30-Sep-2013 |
Doris Liu <tianliu@google.com> |
am 2b72f33b: am 2b86d873: Fix memory leak of context in LocalMediaObserver * commit '2b72f33bebf07b628a3c0bc65c147b4c447c427a': Fix memory leak of context in LocalMediaObserver
|
c4aa7c0e3c9b6a15eca03ba7bdaaccf3ceb8c15d |
30-Sep-2013 |
Sascha Haeberling <haeberling@google.com> |
Change crop label to avoid aapt dump badging from failing. Bug: 11006006 Change-Id: Ie6bb4cecc58f25947998f1faa4da6b3b84dc5df3
ndroidManifest.xml
|
b7537e168d5dc7be6e91a29a9fa5449fd6316ca8 |
30-Sep-2013 |
The Android Automerger <android-build@google.com> |
merge in klp-release history after reset to klp-dev
|
e5e319d52e3eb1ef02e50bdb27913551a10438e3 |
30-Sep-2013 |
Alan Newberger <alann@google.com> |
am fb344efd: Temporary removal of resize code to evaluate GCam image bug * commit 'fb344efde20ffab903fae7c6e5a2e1c90b4ef085': Temporary removal of resize code to evaluate GCam image bug
|
f390ec0c09bbd043466a5b22c9bef70426c3c07b |
30-Sep-2013 |
Alan Newberger <alann@google.com> |
am fb344efd: Temporary removal of resize code to evaluate GCam image bug * commit 'fb344efde20ffab903fae7c6e5a2e1c90b4ef085': Temporary removal of resize code to evaluate GCam image bug
|
fb344efde20ffab903fae7c6e5a2e1c90b4ef085 |
30-Sep-2013 |
Alan Newberger <alann@google.com> |
Temporary removal of resize code to evaluate GCam image bug removes LocalMediaData resize code to evaluate black screenshots. this results in correct display of GCam photos newly taking in KRS91; prior GCam photos will look distorted due to incorrect EXIF. Bug: 10988273 Change-Id: I7fedffeeb1823da857f4c92433c6213d6697bda0
rc/com/android/camera/data/LocalMediaData.java
|
f14f6f4b51de13b705555f125ecc34369870cddc |
29-Sep-2013 |
The Android Automerger <android-build@google.com> |
merge in klp-release history after reset to klp-dev
|
cf141ef24c09a5e4c0eba9dbe8cc813c5063090f |
28-Sep-2013 |
Sascha Haeberling <haeberling@google.com> |
am ac5cb243: Merge "Add basic EXIF to the tiny planet so that rotate succeeds." into gb-ub-photos-carlsbad * commit 'ac5cb2430408f9a1854a4e22e8297733279bf75b': Add basic EXIF to the tiny planet so that rotate succeeds.
|
82243c70ddd3c7698285318fdbe2c37ee22370af |
28-Sep-2013 |
ztenghui <ztenghui@google.com> |
am b7be228d: Fix incorrect width and height from MediaStore. * commit 'b7be228d192cb8f91079caaa2f77a884a40b1160': Fix incorrect width and height from MediaStore.
|
70d6ff76b6e967fccbaf66256331e076366d6ae0 |
28-Sep-2013 |
Sascha Haeberling <haeberling@google.com> |
am ac5cb243: Merge "Add basic EXIF to the tiny planet so that rotate succeeds." into gb-ub-photos-carlsbad * commit 'ac5cb2430408f9a1854a4e22e8297733279bf75b': Add basic EXIF to the tiny planet so that rotate succeeds.
|
d200ce9a514895d021129e5f534cac0cf5bdfcf8 |
28-Sep-2013 |
ztenghui <ztenghui@google.com> |
am b7be228d: Fix incorrect width and height from MediaStore. * commit 'b7be228d192cb8f91079caaa2f77a884a40b1160': Fix incorrect width and height from MediaStore.
|
ac5cb2430408f9a1854a4e22e8297733279bf75b |
28-Sep-2013 |
Sascha Haeberling <haeberling@google.com> |
Merge "Add basic EXIF to the tiny planet so that rotate succeeds." into gb-ub-photos-carlsbad
|
b7be228d192cb8f91079caaa2f77a884a40b1160 |
21-Sep-2013 |
ztenghui <ztenghui@google.com> |
Fix incorrect width and height from MediaStore. bug:10768232 Change-Id: I53673b8ef341f7388a9a4aaa7b03f804485928cf
rc/com/android/camera/data/CameraDataAdapter.java
rc/com/android/camera/data/FixedFirstDataAdapter.java
rc/com/android/camera/data/FixedLastDataAdapter.java
rc/com/android/camera/data/LocalData.java
rc/com/android/camera/data/LocalMediaData.java
rc/com/android/camera/data/SimpleViewData.java
|
1744f4965a5db0e33f3c966f0762d2b591d7eb06 |
27-Sep-2013 |
Angus Kong <shkong@google.com> |
Restore HQ preference in GCam module. bug:10860305 Change-Id: Ibb563c53b63efb2d0656b59c09148423af2ee41b
rc/com/android/camera/PhotoModule.java
|
21a2e9cb07caba660120b7f5eba6e053a6cb3ac3 |
27-Sep-2013 |
Sascha Haeberling <haeberling@google.com> |
Add basic EXIF to the tiny planet so that rotate succeeds. Bug: 10861115 Change-Id: I1eec2bf4d6879c227a07c5364bc821749ace312b
rc/com/android/camera/data/RotationTask.java
rc/com/android/camera/tinyplanet/TinyPlanetFragment.java
|
5326f0265206ccd8a2f3424bb983da674b20a31e |
27-Sep-2013 |
Doris Liu <tianliu@google.com> |
Double tap to full screen from filmstrip Also fix the first photo going from full screen to filmstrip on single tap Bug: 10948166 Change-Id: I15df0325f495722f43b17e0713d6196e8585aa75
rc/com/android/camera/ui/FilmStripView.java
|
5475e8016e33164756b80152ae3a0c8f48397c67 |
27-Sep-2013 |
Angus Kong <shkong@google.com> |
am 9ba47bf4: Merge "Restore HQ preference in GCam module." into gb-ub-photos-carlsbad * commit '9ba47bf4b755337786bb2bbc810ab69a5772e38f': Restore HQ preference in GCam module.
|
e151125e2d6699713da94f19218195f78eccbf67 |
27-Sep-2013 |
Angus Kong <shkong@google.com> |
am 9ba47bf4: Merge "Restore HQ preference in GCam module." into gb-ub-photos-carlsbad * commit '9ba47bf4b755337786bb2bbc810ab69a5772e38f': Restore HQ preference in GCam module.
|
9ba47bf4b755337786bb2bbc810ab69a5772e38f |
27-Sep-2013 |
Angus Kong <shkong@google.com> |
Merge "Restore HQ preference in GCam module." into gb-ub-photos-carlsbad
|
2829253f417e31ea76fd8605e32ee63034de3e55 |
27-Sep-2013 |
Doris Liu <tianliu@google.com> |
Fix memory leak of context in LocalMediaObserver Bug: 10728773 Change-Id: Ie5a50590e71fd4b853cb7590db4fa14f5b6dc73b
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/data/LocalMediaObserver.java
|
2b0ce26b317abd5dfad18bc5a916cb81cf01a195 |
27-Sep-2013 |
ztenghui <ztenghui@google.com> |
am af41aaa4: Don\'t update the width and height in MediaStore after rotation * commit 'af41aaa4005d7abcc45ea3c7fb87af098ef49ce8': Don't update the width and height in MediaStore after rotation
|
ed1ecfcb0cca7538b94baa8e9ae27788f5643ee5 |
27-Sep-2013 |
ztenghui <ztenghui@google.com> |
am af41aaa4: Don\'t update the width and height in MediaStore after rotation * commit 'af41aaa4005d7abcc45ea3c7fb87af098ef49ce8': Don't update the width and height in MediaStore after rotation
|
af41aaa4005d7abcc45ea3c7fb87af098ef49ce8 |
27-Sep-2013 |
ztenghui <ztenghui@google.com> |
Don't update the width and height in MediaStore after rotation bug:10917681 Change-Id: I897d883636991f5b95290acf57c2a84eadd7c5d2
rc/com/android/camera/data/RotationTask.java
|
2396e609321f38be61151dd6530d8fd0b0dc2f63 |
27-Sep-2013 |
Angus Kong <shkong@google.com> |
Restore HQ preference in GCam module. bug:10860305 Change-Id: Ibb563c53b63efb2d0656b59c09148423af2ee41b
rc/com/android/camera/PhotoModule.java
|
2062cfd46e029e95ff4b7c22282ffa34fac1706c |
27-Sep-2013 |
Sascha Haeberling <haeberling@google.com> |
am 3cde3ece: Merge "Add orientation information to the details dialog." into gb-ub-photos-carlsbad * commit '3cde3ece3e6e384f831a02f21c677e292a824df8': Add orientation information to the details dialog.
|
d42191926c1456a6d060416700663ae0cda0cec9 |
27-Sep-2013 |
Sascha Haeberling <haeberling@google.com> |
am 3cde3ece: Merge "Add orientation information to the details dialog." into gb-ub-photos-carlsbad * commit '3cde3ece3e6e384f831a02f21c677e292a824df8': Add orientation information to the details dialog.
|
3cde3ece3e6e384f831a02f21c677e292a824df8 |
27-Sep-2013 |
Sascha Haeberling <haeberling@google.com> |
Merge "Add orientation information to the details dialog." into gb-ub-photos-carlsbad
|
bfd919aff7007f5dc26c74dfb97705c8e23e09b8 |
27-Sep-2013 |
Sascha Haeberling <haeberling@google.com> |
Add orientation information to the details dialog. Bug: 10649902 Change-Id: Icaf17abdbd48a86d55e1555115fdb7817faf6359
rc/com/android/camera/data/LocalMediaData.java
rc/com/android/camera/ui/DetailsDialog.java
|
bb47cdba0223a2692f961d0e211f89306b8cabc0 |
26-Sep-2013 |
Sascha Haeberling <haeberling@google.com> |
Add HQ icon indicator support. Bug: 10785988 Change-Id: If844caaedc3468dce8153cb434bd89328a4a92ca
es/drawable-xxhdpi/ic_indicator_hq_on.png
rc/com/android/camera/OnScreenIndicators.java
|
5e44f366d0454e15dff2d58ef4c36cf08d2e7052 |
27-Sep-2013 |
Doris Liu <tianliu@google.com> |
am 2b86d873: Fix memory leak of context in LocalMediaObserver * commit '2b86d873ca4fb3a921139633ed7be9959ab452df': Fix memory leak of context in LocalMediaObserver
|
2b72f33bebf07b628a3c0bc65c147b4c447c427a |
27-Sep-2013 |
Doris Liu <tianliu@google.com> |
am 2b86d873: Fix memory leak of context in LocalMediaObserver * commit '2b86d873ca4fb3a921139633ed7be9959ab452df': Fix memory leak of context in LocalMediaObserver
|
2b86d873ca4fb3a921139633ed7be9959ab452df |
27-Sep-2013 |
Doris Liu <tianliu@google.com> |
Fix memory leak of context in LocalMediaObserver Bug: 10728773 Change-Id: Ie5a50590e71fd4b853cb7590db4fa14f5b6dc73b
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/data/LocalMediaObserver.java
|
43f24c25c854bfa02f0ac2f4b447f5eda58aaa7a |
26-Sep-2013 |
Seth Raphael <magicseth@google.com> |
Remove PopupManager to remove a memory leak PopupManager had been previously refactored out but vestiges remained. They were causing a memory leak of Activities in its hash map. Bug: 10728773 Change-Id: Ia6d98db1f0d30b4e879984033b471e8c802bc1c1
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/VideoModule.java
rc/com/android/camera/WideAnglePanoramaModule.java
rc/com/android/camera/ui/PopupManager.java
|
033b0486f734f69286f18cf796818d08a0d84fd1 |
26-Sep-2013 |
Doris Liu <tianliu@google.com> |
Make ROI size 1/8 of longer edge of the image Bug: 10863323 Change-Id: Iabe0685e48ecbf5f456d377af6a73d10dcdf0eda
rc/com/android/camera/FocusOverlayManager.java
|
5036e5f921b3b016ce92a815581c695177f0315a |
26-Sep-2013 |
Seth Raphael <magicseth@google.com> |
am dce17630: am f86bdf5a: am 66788094: Remove PopupManager to remove a memory leak * commit 'dce17630b7c839854cb4a2a590ffe882fcbf69a6': Remove PopupManager to remove a memory leak
|
dce17630b7c839854cb4a2a590ffe882fcbf69a6 |
26-Sep-2013 |
Seth Raphael <magicseth@google.com> |
am f86bdf5a: am 66788094: Remove PopupManager to remove a memory leak * commit 'f86bdf5a15f563c0bc64e4c805e94aedd11bf47d': Remove PopupManager to remove a memory leak
|
f86bdf5a15f563c0bc64e4c805e94aedd11bf47d |
26-Sep-2013 |
Seth Raphael <magicseth@google.com> |
am 66788094: Remove PopupManager to remove a memory leak * commit '667880948de7a051f62359878cb61c1e0a867e24': Remove PopupManager to remove a memory leak
|
0ec9f248b8562bb6c74b1d7e871df1217b396f0a |
26-Sep-2013 |
Seth Raphael <magicseth@google.com> |
am 66788094: Remove PopupManager to remove a memory leak * commit '667880948de7a051f62359878cb61c1e0a867e24': Remove PopupManager to remove a memory leak
|
667880948de7a051f62359878cb61c1e0a867e24 |
26-Sep-2013 |
Seth Raphael <magicseth@google.com> |
Remove PopupManager to remove a memory leak PopupManager had been previously refactored out but vestiges remained. They were causing a memory leak of Activities in its hash map. Bug: 10728773 Change-Id: Ia6d98db1f0d30b4e879984033b471e8c802bc1c1
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/VideoModule.java
rc/com/android/camera/WideAnglePanoramaModule.java
rc/com/android/camera/ui/PopupManager.java
|
70432217124400e3d28701a87cfd293099f3c410 |
26-Sep-2013 |
Sascha Haeberling <haeberling@google.com> |
am a0403285: am baa3fc46: am 67685a78: Add HQ icon indicator support. * commit 'a04032858eddcba24566e95d97c525c7ec677c53': Add HQ icon indicator support.
|
a04032858eddcba24566e95d97c525c7ec677c53 |
26-Sep-2013 |
Sascha Haeberling <haeberling@google.com> |
am baa3fc46: am 67685a78: Add HQ icon indicator support. * commit 'baa3fc4629c2f047a97f8dd211868dbdcacd5a98': Add HQ icon indicator support.
|
7c99ba87011b428633b8562675610cf341065856 |
26-Sep-2013 |
Sascha Haeberling <haeberling@google.com> |
am 67685a78: Add HQ icon indicator support. * commit '67685a78a29a0311043f38f8766a1fbbf881a599': Add HQ icon indicator support.
|
baa3fc4629c2f047a97f8dd211868dbdcacd5a98 |
26-Sep-2013 |
Sascha Haeberling <haeberling@google.com> |
am 67685a78: Add HQ icon indicator support. * commit '67685a78a29a0311043f38f8766a1fbbf881a599': Add HQ icon indicator support.
|
67685a78a29a0311043f38f8766a1fbbf881a599 |
26-Sep-2013 |
Sascha Haeberling <haeberling@google.com> |
Add HQ icon indicator support. Bug: 10785988 Change-Id: If844caaedc3468dce8153cb434bd89328a4a92ca
es/drawable-xxhdpi/ic_indicator_hq_on.png
rc/com/android/camera/OnScreenIndicators.java
|
39b6e0a0d3421639cd5ec9dd16225f73fa6b8364 |
26-Sep-2013 |
Doris Liu <tianliu@google.com> |
am ef5b92a1: am 91e8fe94: am f5fc8d67: Merge "Finalize deletion when app exits and for last photo" into gb-ub-photos-carlsbad * commit 'ef5b92a1c79ae383664468f179e6dbd1ed72c7bf': Finalize deletion when app exits and for last photo
|
ef5b92a1c79ae383664468f179e6dbd1ed72c7bf |
26-Sep-2013 |
Doris Liu <tianliu@google.com> |
am 91e8fe94: am f5fc8d67: Merge "Finalize deletion when app exits and for last photo" into gb-ub-photos-carlsbad * commit '91e8fe945b769d1ca5dafd37e75dcca5d54495c8': Finalize deletion when app exits and for last photo
|
91e8fe945b769d1ca5dafd37e75dcca5d54495c8 |
26-Sep-2013 |
Doris Liu <tianliu@google.com> |
am f5fc8d67: Merge "Finalize deletion when app exits and for last photo" into gb-ub-photos-carlsbad * commit 'f5fc8d67dcbb5df2cb6ac802c5caa50a850d72d2': Finalize deletion when app exits and for last photo
|
853801ab890fbbf0bd8ee4bf8400ba161a5c709a |
26-Sep-2013 |
Doris Liu <tianliu@google.com> |
am f5fc8d67: Merge "Finalize deletion when app exits and for last photo" into gb-ub-photos-carlsbad * commit 'f5fc8d67dcbb5df2cb6ac802c5caa50a850d72d2': Finalize deletion when app exits and for last photo
|
d7f25e65d3a11b971dc0734757c72153d2f6fce2 |
26-Sep-2013 |
Doris Liu <tianliu@google.com> |
am 07e242de: am c2441f77: am 2ba03263: Make ROI size 1/8 of longer edge of the image * commit '07e242deb71cdd7e536671cd1ae0b634e1fbf1e7': Make ROI size 1/8 of longer edge of the image
|
f5fc8d67dcbb5df2cb6ac802c5caa50a850d72d2 |
26-Sep-2013 |
Doris Liu <tianliu@google.com> |
Merge "Finalize deletion when app exits and for last photo" into gb-ub-photos-carlsbad
|
07e242deb71cdd7e536671cd1ae0b634e1fbf1e7 |
26-Sep-2013 |
Doris Liu <tianliu@google.com> |
am c2441f77: am 2ba03263: Make ROI size 1/8 of longer edge of the image * commit 'c2441f773eed37ab138c595926694eb70875a057': Make ROI size 1/8 of longer edge of the image
|
73854d0346b41aa9a2dbdda03db900135038961d |
26-Sep-2013 |
Doris Liu <tianliu@google.com> |
am 2ba03263: Make ROI size 1/8 of longer edge of the image * commit '2ba03263340639635120be467f8cabec2889aa08': Make ROI size 1/8 of longer edge of the image
|
c2441f773eed37ab138c595926694eb70875a057 |
26-Sep-2013 |
Doris Liu <tianliu@google.com> |
am 2ba03263: Make ROI size 1/8 of longer edge of the image * commit '2ba03263340639635120be467f8cabec2889aa08': Make ROI size 1/8 of longer edge of the image
|
2ba03263340639635120be467f8cabec2889aa08 |
26-Sep-2013 |
Doris Liu <tianliu@google.com> |
Make ROI size 1/8 of longer edge of the image Bug: 10863323 Change-Id: Iabe0685e48ecbf5f456d377af6a73d10dcdf0eda
rc/com/android/camera/FocusOverlayManager.java
|
f2c14330a49abb55f75bfae6b3bae67a0dad115b |
26-Sep-2013 |
Doris Liu <tianliu@google.com> |
Finalize deletion when app exits and for last photo Bug: 10892925 Change-Id: I94a29ec26f657b5c6c2f784f05b63d45e5e3e010
rc/com/android/camera/CameraActivity.java
|
907e395f32337b4ac43d28141d5189b9cc88b59b |
26-Sep-2013 |
Mangesh Ghiware <mghiware@google.com> |
am 67cf6167: am 61ea6472: am 22236064: Merge "Use Camcorder label and icon for video camera activity." into gb-ub-photos-carlsbad * commit '67cf6167e63df664260f12a91321a04e6abc9d5f': Use Camcorder label and icon for video camera activity.
|
67cf6167e63df664260f12a91321a04e6abc9d5f |
26-Sep-2013 |
Mangesh Ghiware <mghiware@google.com> |
am 61ea6472: am 22236064: Merge "Use Camcorder label and icon for video camera activity." into gb-ub-photos-carlsbad * commit '61ea6472afe534df003673d1b76e3a078c340218': Use Camcorder label and icon for video camera activity.
|
279b8aac0c718e13ea66c904c0b7345114041009 |
26-Sep-2013 |
Mangesh Ghiware <mghiware@google.com> |
am 22236064: Merge "Use Camcorder label and icon for video camera activity." into gb-ub-photos-carlsbad * commit '22236064c8ec28196c07e847d4acb06e214deda8': Use Camcorder label and icon for video camera activity.
|
61ea6472afe534df003673d1b76e3a078c340218 |
26-Sep-2013 |
Mangesh Ghiware <mghiware@google.com> |
am 22236064: Merge "Use Camcorder label and icon for video camera activity." into gb-ub-photos-carlsbad * commit '22236064c8ec28196c07e847d4acb06e214deda8': Use Camcorder label and icon for video camera activity.
|
22236064c8ec28196c07e847d4acb06e214deda8 |
26-Sep-2013 |
Mangesh Ghiware <mghiware@google.com> |
Merge "Use Camcorder label and icon for video camera activity." into gb-ub-photos-carlsbad
|
b8aeb6200325f0183e7f38e5995691da006f8172 |
26-Sep-2013 |
Baligh Uddin <baligh@google.com> |
am 9b5e3ede: (-s ours) am d859daee: (-s ours) am 192686cf: (-s ours) Import translations. DO NOT MERGE * commit '9b5e3edebf62c7cd86e681ae874cc77949079517': Import translations. DO NOT MERGE
|
cd0d13703b8a2de0c767b51f66bbc9fbcc0d2293 |
26-Sep-2013 |
The Android Automerger <android-build@google.com> |
merge in klp-release history after reset to klp-dev
|
9b5e3edebf62c7cd86e681ae874cc77949079517 |
26-Sep-2013 |
Baligh Uddin <baligh@google.com> |
am d859daee: (-s ours) am 192686cf: (-s ours) Import translations. DO NOT MERGE * commit 'd859daee43f514a07032b64af7edf1e9f23ce3ad': Import translations. DO NOT MERGE
|
d995c44c44c71b3cb20b80807daa0283444e0afd |
26-Sep-2013 |
Baligh Uddin <baligh@google.com> |
am 192686cf: (-s ours) Import translations. DO NOT MERGE * commit '192686cfde67ae1cc9933b865e8c196b363b54f7': Import translations. DO NOT MERGE
|
d859daee43f514a07032b64af7edf1e9f23ce3ad |
26-Sep-2013 |
Baligh Uddin <baligh@google.com> |
am 192686cf: (-s ours) Import translations. DO NOT MERGE * commit '192686cfde67ae1cc9933b865e8c196b363b54f7': Import translations. DO NOT MERGE
|
192686cfde67ae1cc9933b865e8c196b363b54f7 |
26-Sep-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I9fbfdbc9853215d57f6de75e33da059cd9cc4f43 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms-rMY/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
bbde212b5b40a45d7ffbe784535c5eb843a12900 |
26-Sep-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I8872acec73bdb03f24099abe457ca8b04a59815d Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-km-rKH/strings.xml
es/values-ko/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mn-rMN/strings.xml
es/values-ms-rMY/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
0e2522762fcbd561ead9e8774babf461aaa79bbf |
26-Sep-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I320c82295ff7d8fe806bd694493b61c149886f5d Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms-rMY/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
f32062eeef05ad531b02b8fa37c4ae0492b6402c |
25-Sep-2013 |
Mangesh Ghiware <mghiware@google.com> |
Use Camcorder label and icon for video camera activity. Bug: 10932790 Change-Id: If8847e06049e63116381904382db7dfcebb55010
ndroidManifest.xml
es/mipmap-hdpi/ic_launcher_video_camera.png
es/mipmap-mdpi/ic_launcher_video_camera.png
es/values/strings.xml
|
38b71e1be987ff55b07407212fa3539f392306a5 |
25-Sep-2013 |
Sascha Haeberling <haeberling@google.com> |
am 6e7d944d: am b80c1e77: am 15ccccf6: Merge "Fix the checks for when to remove the HDR/HQ icons from the pie menu." into gb-ub-photos-carlsbad * commit '6e7d944d87c995091e193108a3fab0950a6825fc': Fix the checks for when to remove the HDR/HQ icons from the pie menu.
|
6e7d944d87c995091e193108a3fab0950a6825fc |
25-Sep-2013 |
Sascha Haeberling <haeberling@google.com> |
am b80c1e77: am 15ccccf6: Merge "Fix the checks for when to remove the HDR/HQ icons from the pie menu." into gb-ub-photos-carlsbad * commit 'b80c1e77fb59d56d8175f674e4c33931a19fc1b9': Fix the checks for when to remove the HDR/HQ icons from the pie menu.
|
32d8d220cda580e935b78f01e4ae807d74e9af8e |
25-Sep-2013 |
Sascha Haeberling <haeberling@google.com> |
am 15ccccf6: Merge "Fix the checks for when to remove the HDR/HQ icons from the pie menu." into gb-ub-photos-carlsbad * commit '15ccccf6df50b465514eef85f64393d6f2022e0d': Fix the checks for when to remove the HDR/HQ icons from the pie menu.
|
b80c1e77fb59d56d8175f674e4c33931a19fc1b9 |
25-Sep-2013 |
Sascha Haeberling <haeberling@google.com> |
am 15ccccf6: Merge "Fix the checks for when to remove the HDR/HQ icons from the pie menu." into gb-ub-photos-carlsbad * commit '15ccccf6df50b465514eef85f64393d6f2022e0d': Fix the checks for when to remove the HDR/HQ icons from the pie menu.
|
15ccccf6df50b465514eef85f64393d6f2022e0d |
25-Sep-2013 |
Sascha Haeberling <haeberling@google.com> |
Merge "Fix the checks for when to remove the HDR/HQ icons from the pie menu." into gb-ub-photos-carlsbad
|
dfe80098600f092735e9fcb23d8a17b8de23cdef |
25-Sep-2013 |
Sascha Haeberling <haeberling@google.com> |
Fix the checks for when to remove the HDR/HQ icons from the pie menu. Bug: 10932511 Change-Id: I4d80d028335c2f45c5c59d56898846a76755ec44
rc/com/android/camera/CameraSettings.java
|
d0d1841a073e3e0fa3a1317640e9193cce6eaefd |
25-Sep-2013 |
Angus Kong <shkong@google.com> |
am b714e5f9: am e8e2011d: am c9c15044: Merge "Checks for low storage in wide-angle pano mode." into gb-ub-photos-carlsbad * commit 'b714e5f93fe89ea7a82b2c0d78f8a35e6081ded6': Checks for low storage in wide-angle pano mode.
|
b714e5f93fe89ea7a82b2c0d78f8a35e6081ded6 |
25-Sep-2013 |
Angus Kong <shkong@google.com> |
am e8e2011d: am c9c15044: Merge "Checks for low storage in wide-angle pano mode." into gb-ub-photos-carlsbad * commit 'e8e2011d45b402b7c95d1bf3ee473d93aebe762f': Checks for low storage in wide-angle pano mode.
|
2b5644efecd0c861e64ab11ac82596b64d97ce03 |
25-Sep-2013 |
Doris Liu <tianliu@google.com> |
am 39ce8333: am e8cb214b: am 0537d4f7: Merge "Increase ROI size to 1/8 of the image width" into gb-ub-photos-carlsbad * commit '39ce8333a33269e0ae59f01c3249cd6132fe1387': Increase ROI size to 1/8 of the image width
|
3730ef6f2271d6225be68bc5373170a22cc428ce |
25-Sep-2013 |
Angus Kong <shkong@google.com> |
am c9c15044: Merge "Checks for low storage in wide-angle pano mode." into gb-ub-photos-carlsbad * commit 'c9c1504408819bda3fb6b2b264f9dbf6012f9b7f': Checks for low storage in wide-angle pano mode.
|
a571ca4e745ca5d333086ce7bd7dd788c91301b6 |
25-Sep-2013 |
Doris Liu <tianliu@google.com> |
am 0537d4f7: Merge "Increase ROI size to 1/8 of the image width" into gb-ub-photos-carlsbad * commit '0537d4f7abe9e137f626e5cff3fcf252bb04c626': Increase ROI size to 1/8 of the image width
|
0136090242f23fcd6a974c53880afe5b8a9d2d87 |
25-Sep-2013 |
Angus Kong <shkong@google.com> |
am b998a491: Enlarge the native buffer of wide-angle-pano. * commit 'b998a491a5b24e710bc1711dbb00cbfa05273bf2': Enlarge the native buffer of wide-angle-pano.
|
7cc78545422fb475a4c37e70ff49c3e7e66fd144 |
25-Sep-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am be7dc627: Fix HQ mode change to allow return to regular photo mode. * commit 'be7dc6279dfe17cb93fab8cf88d1115966acb2e0': Fix HQ mode change to allow return to regular photo mode.
|
6df6f214936e9d838a483bbdc035a2da894e9811 |
25-Sep-2013 |
Sascha Haeberling <haeberling@google.com> |
am 98f38bb0: Add HQ option and use it to switch to GCam. * commit '98f38bb04daa3db49a072718cd8b5005b8b73af1': Add HQ option and use it to switch to GCam.
|
49eb8050eb2066e921a86af59bc896b118e15d60 |
25-Sep-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 4601f5d9: Enable gcam as HDR pie menu option. * commit '4601f5d987ad2f57db6b1b65a716f00308e5ae99': Enable gcam as HDR pie menu option.
|
f4ad59f36831d1074e148fc671408f4534cea8fb |
25-Sep-2013 |
Kevin Gabayan <gabayan@google.com> |
am e0bf566d: Merge "Removed unused assets from Camera2 Bug: 10493013 Change-Id: Id07878cbe1a89e0aaeb70942e0f4ca39cd4a3399" into gb-ub-photos-carlsbad * commit 'e0bf566d4ab2c45e05635397bdfd6c9f9a92a356': Removed unused assets from Camera2 Bug: 10493013 Change-Id: Id07878cbe1a89e0aaeb70942e0f4ca39cd4a3399
|
e8e2011d45b402b7c95d1bf3ee473d93aebe762f |
25-Sep-2013 |
Angus Kong <shkong@google.com> |
am c9c15044: Merge "Checks for low storage in wide-angle pano mode." into gb-ub-photos-carlsbad * commit 'c9c1504408819bda3fb6b2b264f9dbf6012f9b7f': Checks for low storage in wide-angle pano mode.
|
c9c1504408819bda3fb6b2b264f9dbf6012f9b7f |
25-Sep-2013 |
Angus Kong <shkong@google.com> |
Merge "Checks for low storage in wide-angle pano mode." into gb-ub-photos-carlsbad
|
39ce8333a33269e0ae59f01c3249cd6132fe1387 |
25-Sep-2013 |
Doris Liu <tianliu@google.com> |
am e8cb214b: am 0537d4f7: Merge "Increase ROI size to 1/8 of the image width" into gb-ub-photos-carlsbad * commit 'e8cb214bbde9f53f12985d22a71c2f9305175bb3': Increase ROI size to 1/8 of the image width
|
2dcc0a9dfcc23f090bbe36308f92d72f68c4f0a2 |
25-Sep-2013 |
Angus Kong <shkong@google.com> |
Checks for low storage in wide-angle pano mode. 1. Storage.LOW_STORAGE_THRESHOLD -> Storage.LOW_STORAGE_THRESHOLD_BYTE. 2. Checks for low storage before start preview in wide-angle pano mode. 3. Add low storage warning message for debugging when in wide-angle pano mode. bug:10691367 Change-Id: Iffd96d322b33591c8f235fcf5680e86cf0f06571
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/Storage.java
rc/com/android/camera/VideoModule.java
rc/com/android/camera/WideAnglePanoramaModule.java
|
e8cb214bbde9f53f12985d22a71c2f9305175bb3 |
25-Sep-2013 |
Doris Liu <tianliu@google.com> |
am 0537d4f7: Merge "Increase ROI size to 1/8 of the image width" into gb-ub-photos-carlsbad * commit '0537d4f7abe9e137f626e5cff3fcf252bb04c626': Increase ROI size to 1/8 of the image width
|
0537d4f7abe9e137f626e5cff3fcf252bb04c626 |
25-Sep-2013 |
Doris Liu <tianliu@google.com> |
Merge "Increase ROI size to 1/8 of the image width" into gb-ub-photos-carlsbad
|
0f65d1eac6dc2e8f64b2bb80c24d83cf9064b289 |
25-Sep-2013 |
Baligh Uddin <baligh@google.com> |
am 83ec031a: (-s ours) am 71c85612: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '83ec031aa42c499255ccaf4ba683ed353ef9fa7a': Import translations. DO NOT MERGE
|
83ec031aa42c499255ccaf4ba683ed353ef9fa7a |
25-Sep-2013 |
Baligh Uddin <baligh@google.com> |
am 71c85612: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '71c856128eeca5741eb45423e85e6ad3f81bed37': Import translations. DO NOT MERGE
|
71c856128eeca5741eb45423e85e6ad3f81bed37 |
25-Sep-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into klp-dev
|
7a9ca6d6ae9bed1935e421de3d9c92d2e5398d74 |
25-Sep-2013 |
Angus Kong <shkong@google.com> |
am ceff97a0: am 2ba69209: am b998a491: Enlarge the native buffer of wide-angle-pano. * commit 'ceff97a001250fe4a7ea7bd084dc2aefcc4c8497': Enlarge the native buffer of wide-angle-pano.
|
b3749f2071f866c43ea5f70de219f23157097077 |
25-Sep-2013 |
Doris Liu <tianliu@google.com> |
Increase ROI size to 1/8 of the image width Bug: 10863323 Change-Id: I962afbb0b49a6902fac0bbd5209b52591604ed20
rc/com/android/camera/FocusOverlayManager.java
rc/com/android/camera/PhotoController.java
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/PhotoUI.java
|
ceff97a001250fe4a7ea7bd084dc2aefcc4c8497 |
25-Sep-2013 |
Angus Kong <shkong@google.com> |
am 2ba69209: am b998a491: Enlarge the native buffer of wide-angle-pano. * commit '2ba69209781c6b60a7f9a48153a2b0db85beb180': Enlarge the native buffer of wide-angle-pano.
|
2ba69209781c6b60a7f9a48153a2b0db85beb180 |
25-Sep-2013 |
Angus Kong <shkong@google.com> |
am b998a491: Enlarge the native buffer of wide-angle-pano. * commit 'b998a491a5b24e710bc1711dbb00cbfa05273bf2': Enlarge the native buffer of wide-angle-pano.
|
b998a491a5b24e710bc1711dbb00cbfa05273bf2 |
25-Sep-2013 |
Angus Kong <shkong@google.com> |
Enlarge the native buffer of wide-angle-pano. bug:10654457 Change-Id: I6f5edda309b94f91986dd468bb4e3131fdcc6678
ni/mosaic_renderer_jni.h
|
bdfdc3778468b42e92838059e41ec34600e67cae |
25-Sep-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I760c80468210f750e4d614d7e4099680e032963a Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-km-rKH/strings.xml
es/values-ko/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mn-rMN/strings.xml
es/values-ms-rMY/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
c4db84c8c11636d2274a802984a57ced2b7db896 |
25-Sep-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 6df4dbae: am acc3396d: am be7dc627: Fix HQ mode change to allow return to regular photo mode. * commit '6df4dbaee8cea8feec8781eeefc855641d435f0b': Fix HQ mode change to allow return to regular photo mode.
|
98873d308993ce7d2e4ebacb162607d38daea3c2 |
25-Sep-2013 |
Sascha Haeberling <haeberling@google.com> |
am d7e3a64e: am 531e36df: am 98f38bb0: Add HQ option and use it to switch to GCam. * commit 'd7e3a64e12cc9aaa9cde2f8416d2510e62924ce5': Add HQ option and use it to switch to GCam.
|
6df4dbaee8cea8feec8781eeefc855641d435f0b |
25-Sep-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am acc3396d: am be7dc627: Fix HQ mode change to allow return to regular photo mode. * commit 'acc3396dfbf637189131c97ed5a6cafedb046d8b': Fix HQ mode change to allow return to regular photo mode.
|
d7e3a64e12cc9aaa9cde2f8416d2510e62924ce5 |
25-Sep-2013 |
Sascha Haeberling <haeberling@google.com> |
am 531e36df: am 98f38bb0: Add HQ option and use it to switch to GCam. * commit '531e36df195d77cfb697b1602e4bbe147dec25d7': Add HQ option and use it to switch to GCam.
|
acc3396dfbf637189131c97ed5a6cafedb046d8b |
25-Sep-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am be7dc627: Fix HQ mode change to allow return to regular photo mode. * commit 'be7dc6279dfe17cb93fab8cf88d1115966acb2e0': Fix HQ mode change to allow return to regular photo mode.
|
531e36df195d77cfb697b1602e4bbe147dec25d7 |
25-Sep-2013 |
Sascha Haeberling <haeberling@google.com> |
am 98f38bb0: Add HQ option and use it to switch to GCam. * commit '98f38bb04daa3db49a072718cd8b5005b8b73af1': Add HQ option and use it to switch to GCam.
|
4c0206a3763221f80cec2c3215f3b72fcf4c93e7 |
25-Sep-2013 |
The Android Automerger <android-build@google.com> |
merge in klp-release history after reset to klp-dev
|
be7dc6279dfe17cb93fab8cf88d1115966acb2e0 |
25-Sep-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Fix HQ mode change to allow return to regular photo mode. Bug: 10848559 Change-Id: I6645bc17d29af664b9689e4bd05164100b155aa3
rc/com/android/camera/PhotoModule.java
|
98f38bb04daa3db49a072718cd8b5005b8b73af1 |
25-Sep-2013 |
Sascha Haeberling <haeberling@google.com> |
Add HQ option and use it to switch to GCam. Bug: 10430748 Bug: 10785988 Change-Id: If824d1d1876d8434958b2a5bc97d2852da118a8b
es/drawable-xxhdpi/ic_hq_disabled.png
es/drawable-xxhdpi/ic_hq_disabled_pressed.png
es/drawable-xxhdpi/ic_hq_normal.png
es/drawable-xxhdpi/ic_hq_normal_pressed.png
es/values/arrays.xml
es/values/strings.xml
es/xml/camera_preferences.xml
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/CameraSettings.java
rc/com/android/camera/PhotoMenu.java
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/ui/ModuleSwitcher.java
rc/com/android/camera/util/ApiHelper.java
rc_pd_gcam/com/android/camera/util/GcamHelper.java
|
f771c7478af9f4785bf7f1c6b4f56ca294a44c95 |
25-Sep-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 80842c45: am 7086b298: am 4601f5d9: Enable gcam as HDR pie menu option. * commit '80842c4529cccfd07a75e6a48f013a7795c5c392': Enable gcam as HDR pie menu option.
|
80842c4529cccfd07a75e6a48f013a7795c5c392 |
25-Sep-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 7086b298: am 4601f5d9: Enable gcam as HDR pie menu option. * commit '7086b298e059b46b8c3e61299ce73f5315415a23': Enable gcam as HDR pie menu option.
|
7086b298e059b46b8c3e61299ce73f5315415a23 |
25-Sep-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 4601f5d9: Enable gcam as HDR pie menu option. * commit '4601f5d987ad2f57db6b1b65a716f00308e5ae99': Enable gcam as HDR pie menu option.
|
4601f5d987ad2f57db6b1b65a716f00308e5ae99 |
25-Sep-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Enable gcam as HDR pie menu option. Bug: 10430748 Change-Id: I0f589126bac895b31ef7475afd093680766de39e
rc/com/android/camera/CameraSettings.java
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/ui/ModuleSwitcher.java
rc_pd_gcam/com/android/camera/util/GcamHelper.java
|
008b343213ffd85081c221a4e75103a5fbe166e5 |
25-Sep-2013 |
Kevin Gabayan <gabayan@google.com> |
am 3ad20d14: am 37f7a3ef: am e0bf566d: Merge "Removed unused assets from Camera2 Bug: 10493013 Change-Id: Id07878cbe1a89e0aaeb70942e0f4ca39cd4a3399" into gb-ub-photos-carlsbad * commit '3ad20d142f2901ab1b7a07050eb1c8ab6283d02f': Removed unused assets from Camera2 Bug: 10493013 Change-Id: Id07878cbe1a89e0aaeb70942e0f4ca39cd4a3399
|
3ad20d142f2901ab1b7a07050eb1c8ab6283d02f |
25-Sep-2013 |
Kevin Gabayan <gabayan@google.com> |
am 37f7a3ef: am e0bf566d: Merge "Removed unused assets from Camera2 Bug: 10493013 Change-Id: Id07878cbe1a89e0aaeb70942e0f4ca39cd4a3399" into gb-ub-photos-carlsbad * commit '37f7a3ef1544c32fd177c52323f82de9b872f2d8': Removed unused assets from Camera2 Bug: 10493013 Change-Id: Id07878cbe1a89e0aaeb70942e0f4ca39cd4a3399
|
37f7a3ef1544c32fd177c52323f82de9b872f2d8 |
25-Sep-2013 |
Kevin Gabayan <gabayan@google.com> |
am e0bf566d: Merge "Removed unused assets from Camera2 Bug: 10493013 Change-Id: Id07878cbe1a89e0aaeb70942e0f4ca39cd4a3399" into gb-ub-photos-carlsbad * commit 'e0bf566d4ab2c45e05635397bdfd6c9f9a92a356': Removed unused assets from Camera2 Bug: 10493013 Change-Id: Id07878cbe1a89e0aaeb70942e0f4ca39cd4a3399
|
e0bf566d4ab2c45e05635397bdfd6c9f9a92a356 |
25-Sep-2013 |
Kevin Gabayan <gabayan@google.com> |
Merge "Removed unused assets from Camera2 Bug: 10493013 Change-Id: Id07878cbe1a89e0aaeb70942e0f4ca39cd4a3399" into gb-ub-photos-carlsbad
|
ac7379a88dac48530bb610ab1164ed415c290cf4 |
25-Sep-2013 |
Sascha Haeberling <haeberling@google.com> |
am fcdd3a0a: am 38bddcc4: am 601d8041: Don\'t expose the Camera crop intent. * commit 'fcdd3a0a7e36d18e5ff47c46766187a6bf67b7fd': Don't expose the Camera crop intent.
|
fcdd3a0a7e36d18e5ff47c46766187a6bf67b7fd |
25-Sep-2013 |
Sascha Haeberling <haeberling@google.com> |
am 38bddcc4: am 601d8041: Don\'t expose the Camera crop intent. * commit '38bddcc4b7d1993865f5ee4d52228826f7d791b4': Don't expose the Camera crop intent.
|
ab56d97c4480cbdd45542ffc1da26adc0a7a5551 |
25-Sep-2013 |
Sascha Haeberling <haeberling@google.com> |
am 601d8041: Don\'t expose the Camera crop intent. * commit '601d804177a8d4abf02b2c0cb2805178f980c96b': Don't expose the Camera crop intent.
|
38bddcc4b7d1993865f5ee4d52228826f7d791b4 |
25-Sep-2013 |
Sascha Haeberling <haeberling@google.com> |
am 601d8041: Don\'t expose the Camera crop intent. * commit '601d804177a8d4abf02b2c0cb2805178f980c96b': Don't expose the Camera crop intent.
|
601d804177a8d4abf02b2c0cb2805178f980c96b |
25-Sep-2013 |
Sascha Haeberling <haeberling@google.com> |
Don't expose the Camera crop intent. Bug: 10912467 Change-Id: I2f03b7e7c84d76add7a43c30f097f902f1e25e56
ndroidManifest.xml
|
bbc0dc0b882fb5719b9cf1a1aa87cc19b59fa61c |
25-Sep-2013 |
Baligh Uddin <baligh@google.com> |
am 18cc8cfa: (-s ours) am f1b81feb: (-s ours) am e5d39a52: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-carlsbad * commit '18cc8cfa592708c34d7f037cbb54949e9dc6f75a': Import translations. DO NOT MERGE
|
9775be03239765f04c61e3a188707b1be593598f |
25-Sep-2013 |
Baligh Uddin <baligh@google.com> |
am d4fb8e12: (-s ours) am e78ca833: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit 'd4fb8e12f84305fe8dc17017a697431593c77143': Import translations. DO NOT MERGE
|
18cc8cfa592708c34d7f037cbb54949e9dc6f75a |
25-Sep-2013 |
Baligh Uddin <baligh@google.com> |
am f1b81feb: (-s ours) am e5d39a52: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-carlsbad * commit 'f1b81feb4352fe0eed297f9b2cfa3adec18d8718': Import translations. DO NOT MERGE
|
447006cd493dfb6de5819d1ddebf6c5c92b10957 |
25-Sep-2013 |
Baligh Uddin <baligh@google.com> |
am e5d39a52: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-carlsbad * commit 'e5d39a522ff2f44fea8d56fddfbd785ddec8314a': Import translations. DO NOT MERGE
|
f1b81feb4352fe0eed297f9b2cfa3adec18d8718 |
25-Sep-2013 |
Baligh Uddin <baligh@google.com> |
am e5d39a52: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-carlsbad * commit 'e5d39a522ff2f44fea8d56fddfbd785ddec8314a': Import translations. DO NOT MERGE
|
d4fb8e12f84305fe8dc17017a697431593c77143 |
25-Sep-2013 |
Baligh Uddin <baligh@google.com> |
am e78ca833: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit 'e78ca833b65e6745d255bc19441ac9a4a5aff52c': Import translations. DO NOT MERGE
|
e5d39a522ff2f44fea8d56fddfbd785ddec8314a |
25-Sep-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-carlsbad
|
19a7a98ab6c22afbe2ad1f5941d48d3b8c43797d |
24-Sep-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE"
|
e78ca833b65e6745d255bc19441ac9a4a5aff52c |
24-Sep-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into klp-dev
|
1016ed1b4e5e3ee468df3d6d910dbac2d20885aa |
24-Sep-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-denali
|
f90a61a430089ffc34cd52070bace45a3f3c3aed |
24-Sep-2013 |
Mindy Pereira <mindyp@google.com> |
am cc14008a: am 106dc71a: am 29e7a34e: De-blue camera * commit 'cc14008a3889c821389c80f0b109379e8fb0bb7a': De-blue camera
|
cc14008a3889c821389c80f0b109379e8fb0bb7a |
24-Sep-2013 |
Mindy Pereira <mindyp@google.com> |
am 106dc71a: am 29e7a34e: De-blue camera * commit '106dc71aad0b6a38eb33b08b7661e4686d72ce1a': De-blue camera
|
106dc71aad0b6a38eb33b08b7661e4686d72ce1a |
24-Sep-2013 |
Mindy Pereira <mindyp@google.com> |
am 29e7a34e: De-blue camera * commit '29e7a34e01e791641030f7687402f12bc091a70d': De-blue camera
|
17bce0fa497851183e4362e35b0408591fa3d20d |
24-Sep-2013 |
Mindy Pereira <mindyp@google.com> |
am 29e7a34e: De-blue camera * commit '29e7a34e01e791641030f7687402f12bc091a70d': De-blue camera
|
29e7a34e01e791641030f7687402f12bc091a70d |
24-Sep-2013 |
Mindy Pereira <mindyp@google.com> |
De-blue camera fixes b/10914366 de-blue camera Change-Id: I36616639e701d7d76fb354e0911e5e64c973060d
es/drawable-hdpi-v19/btn_shutter_pressed.png
es/drawable-hdpi-v19/list_pressed_holo_light.9.png
es/drawable-hdpi-v19/menu_bg_pressed.png
es/drawable-mdpi-v19/btn_shutter_pressed.png
es/drawable-mdpi-v19/list_pressed_holo_light.9.png
es/drawable-mdpi-v19/menu_bg_pressed.png
es/drawable-v19/circle_bg_pressed_exit_fading.xml
es/drawable-v19/photopage_bottom_button_background.xml
es/drawable-v19/transparent_button_background.xml
es/drawable-xhdpi-v19/btn_shutter_pressed.png
es/drawable-xhdpi-v19/list_pressed_holo_light.9.png
es/drawable-xhdpi-v19/menu_bg_pressed.png
es/drawable-xxhdpi-v19/btn_shutter_pressed.png
es/drawable-xxhdpi-v19/list_pressed_holo_light.9.png
es/drawable-xxhdpi-v19/menu_bg_pressed.png
es/layout-land-v19/switcher_popup.xml
es/layout-port-v19/switcher_popup.xml
es/values-v19/styles.xml
|
9144089aab4cd83b43c8e4f84bee3b324dfcaa67 |
24-Sep-2013 |
Sascha Haeberling <haeberling@google.com> |
am 79da0775: am 8c17960b: am 4863db01: Remove hideybars from Camera. * commit '79da0775133b804eeb595177d36436443af737eb': Remove hideybars from Camera.
|
79da0775133b804eeb595177d36436443af737eb |
24-Sep-2013 |
Sascha Haeberling <haeberling@google.com> |
am 8c17960b: am 4863db01: Remove hideybars from Camera. * commit '8c17960b9714d0694530d914a103233bf793ff09': Remove hideybars from Camera.
|
90916e2a880d9270ce9e57694f36634eb7fe19a2 |
24-Sep-2013 |
Sascha Haeberling <haeberling@google.com> |
am 4863db01: Remove hideybars from Camera. * commit '4863db01e3629a0a29c718b94445332ef74441e9': Remove hideybars from Camera.
|
8c17960b9714d0694530d914a103233bf793ff09 |
24-Sep-2013 |
Sascha Haeberling <haeberling@google.com> |
am 4863db01: Remove hideybars from Camera. * commit '4863db01e3629a0a29c718b94445332ef74441e9': Remove hideybars from Camera.
|
4863db01e3629a0a29c718b94445332ef74441e9 |
24-Sep-2013 |
Sascha Haeberling <haeberling@google.com> |
Remove hideybars from Camera. Bug: 10859173 Change-Id: I6e6677ace3d1c35c974e003bebd25c9a43d43719
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/ui/CameraRootView.java
|
3d0ea819abcd7bbb152bfcfaf199bc1363137073 |
24-Sep-2013 |
Doris Liu <tianliu@google.com> |
am 7a550178: am 5c1c3b38: am 3180ac90: Merge "Fix SRI UX issues and improve UI efficiency" into gb-ub-photos-carlsbad * commit '7a5501780604953a7d7d509f689d4698d100179c': Fix SRI UX issues and improve UI efficiency
|
7a5501780604953a7d7d509f689d4698d100179c |
24-Sep-2013 |
Doris Liu <tianliu@google.com> |
am 5c1c3b38: am 3180ac90: Merge "Fix SRI UX issues and improve UI efficiency" into gb-ub-photos-carlsbad * commit '5c1c3b3814331302b02a0435e9ae9104f65e8ce4': Fix SRI UX issues and improve UI efficiency
|
f3eda2e11070be521d90c25a62eab0b7a6207b03 |
24-Sep-2013 |
Doris Liu <tianliu@google.com> |
am 3180ac90: Merge "Fix SRI UX issues and improve UI efficiency" into gb-ub-photos-carlsbad * commit '3180ac90af3e63ed7d9b487de5a35ba216d9463f': Fix SRI UX issues and improve UI efficiency
|
5c1c3b3814331302b02a0435e9ae9104f65e8ce4 |
24-Sep-2013 |
Doris Liu <tianliu@google.com> |
am 3180ac90: Merge "Fix SRI UX issues and improve UI efficiency" into gb-ub-photos-carlsbad * commit '3180ac90af3e63ed7d9b487de5a35ba216d9463f': Fix SRI UX issues and improve UI efficiency
|
3180ac90af3e63ed7d9b487de5a35ba216d9463f |
24-Sep-2013 |
Doris Liu <tianliu@google.com> |
Merge "Fix SRI UX issues and improve UI efficiency" into gb-ub-photos-carlsbad
|
105aaf4dd5a381d4c5098fc1d7ace29a3c240c9e |
24-Sep-2013 |
Doris Liu <tianliu@google.com> |
Fix SRI UX issues and improve UI efficiency Bug: 10674078 Change-Id: I0bb820b5866e3acb8534592a4eec246df24fd441
es/layout-land/pano_module_capture.xml
es/layout-land/pano_module_review.xml
es/layout-land/pano_review_control.xml
es/layout-port/pano_module_capture.xml
es/layout-port/pano_module_review.xml
es/layout-port/pano_review_control.xml
es/layout/pano_module_capture.xml
es/layout/pano_module_review.xml
es/values-land/dimensions.xml
es/values-port/dimensions.xml
es/values/styles.xml
rc/com/android/camera/WideAnglePanoramaUI.java
|
9e16ee25f3619d249cd4eb63c56b08a2f29cb8ae |
24-Sep-2013 |
Angus Kong <shkong@google.com> |
am e1fc04ba: am ee011517: am c74825b1: Merge "Allow user to tap on lock icon from secure camera." into gb-ub-photos-carlsbad * commit 'e1fc04babedcb425e8e9c329d18b833846225a37': Allow user to tap on lock icon from secure camera.
|
836a4b1ef2d4b31d2a85f95985e9cf146522752f |
24-Sep-2013 |
Kevin Gabayan <gabayan@google.com> |
am e8f235d6: am a014398a: am d897d5c9: Merge "192x192 icon added to mipmap-xxxhdpi." into gb-ub-photos-carlsbad * commit 'e8f235d6947f82d4a13cfa9db3804c832938eab5': 192x192 icon added to mipmap-xxxhdpi.
|
9419714897b7786890213a50636c08f4133c84e5 |
24-Sep-2013 |
Sascha Haeberling <haeberling@google.com> |
am abe1edec: am 2377df9a: am 8fed926c: Merge "Localize the numbers in the time laps popup." into gb-ub-photos-carlsbad * commit 'abe1edecfaf06120b2c503f4566922762a580982': Localize the numbers in the time laps popup.
|
4afef49e9fa72d86a69b655569382fc5127a40be |
24-Sep-2013 |
ztenghui <ztenghui@google.com> |
am da361548: am f58ec27a: am 4c478ffe: Merge "Sort and select the preview fps range for still image." into gb-ub-photos-carlsbad * commit 'da361548de0084d362a8a0ad4b3269632eff049e': Sort and select the preview fps range for still image.
|
a3c0f64f2ac2f13db2a4d9e56fa70112f3a9317e |
24-Sep-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am aeeb5145: am a69f785c: am 283beaf6: Fix build: Don\'t build GCam for non-arm targets * commit 'aeeb5145d01d4d17f01854f4ccc4340f0c96a7e1': Fix build: Don't build GCam for non-arm targets
|
e1fc04babedcb425e8e9c329d18b833846225a37 |
24-Sep-2013 |
Angus Kong <shkong@google.com> |
am ee011517: am c74825b1: Merge "Allow user to tap on lock icon from secure camera." into gb-ub-photos-carlsbad * commit 'ee0115170c47fde80ed410d753609b7ced377f5b': Allow user to tap on lock icon from secure camera.
|
ee0115170c47fde80ed410d753609b7ced377f5b |
24-Sep-2013 |
Angus Kong <shkong@google.com> |
am c74825b1: Merge "Allow user to tap on lock icon from secure camera." into gb-ub-photos-carlsbad * commit 'c74825b1666857cbfd0ad3750f0d509de8e86953': Allow user to tap on lock icon from secure camera.
|
fba6d270767a64987c04603bda7d9d846de657d1 |
24-Sep-2013 |
Angus Kong <shkong@google.com> |
am c74825b1: Merge "Allow user to tap on lock icon from secure camera." into gb-ub-photos-carlsbad * commit 'c74825b1666857cbfd0ad3750f0d509de8e86953': Allow user to tap on lock icon from secure camera.
|
c74825b1666857cbfd0ad3750f0d509de8e86953 |
24-Sep-2013 |
Angus Kong <shkong@google.com> |
Merge "Allow user to tap on lock icon from secure camera." into gb-ub-photos-carlsbad
|
8354f0c7756330227dacc14e44f70840e998bb9e |
24-Sep-2013 |
The Android Automerger <android-build@google.com> |
merge in klp-release history after reset to klp-dev
|
690dc4722d068a1838b16dc0eabe9c7d518d524c |
21-Sep-2013 |
Angus Kong <shkong@google.com> |
Allow user to tap on lock icon from secure camera. bug:10857973 Change-Id: Id3c03f4d83c676986748ed083e85e85cea8eb507
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/util/CameraUtil.java
|
e8f235d6947f82d4a13cfa9db3804c832938eab5 |
24-Sep-2013 |
Kevin Gabayan <gabayan@google.com> |
am a014398a: am d897d5c9: Merge "192x192 icon added to mipmap-xxxhdpi." into gb-ub-photos-carlsbad * commit 'a014398ae230523cc10696f4c4cdc0f9532cda11': 192x192 icon added to mipmap-xxxhdpi.
|
abe1edecfaf06120b2c503f4566922762a580982 |
24-Sep-2013 |
Sascha Haeberling <haeberling@google.com> |
am 2377df9a: am 8fed926c: Merge "Localize the numbers in the time laps popup." into gb-ub-photos-carlsbad * commit '2377df9a4e3fe0e6f036e9d885b72456c951fb80': Localize the numbers in the time laps popup.
|
da361548de0084d362a8a0ad4b3269632eff049e |
24-Sep-2013 |
ztenghui <ztenghui@google.com> |
am f58ec27a: am 4c478ffe: Merge "Sort and select the preview fps range for still image." into gb-ub-photos-carlsbad * commit 'f58ec27a63538590fc6eaf87a38c69ca2ae05d2c': Sort and select the preview fps range for still image.
|
aeeb5145d01d4d17f01854f4ccc4340f0c96a7e1 |
24-Sep-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am a69f785c: am 283beaf6: Fix build: Don\'t build GCam for non-arm targets * commit 'a69f785c11bd1efce8a94489e6c9ffe06146607d': Fix build: Don't build GCam for non-arm targets
|
f331803f7b69c6c5223669a29c2cae7fa924d1f3 |
24-Sep-2013 |
Kevin Gabayan <gabayan@google.com> |
am d897d5c9: Merge "192x192 icon added to mipmap-xxxhdpi." into gb-ub-photos-carlsbad * commit 'd897d5c9048ba96d79b9893d0ebc7eb7e6b84260': 192x192 icon added to mipmap-xxxhdpi.
|
a014398ae230523cc10696f4c4cdc0f9532cda11 |
24-Sep-2013 |
Kevin Gabayan <gabayan@google.com> |
am d897d5c9: Merge "192x192 icon added to mipmap-xxxhdpi." into gb-ub-photos-carlsbad * commit 'd897d5c9048ba96d79b9893d0ebc7eb7e6b84260': 192x192 icon added to mipmap-xxxhdpi.
|
d897d5c9048ba96d79b9893d0ebc7eb7e6b84260 |
24-Sep-2013 |
Kevin Gabayan <gabayan@google.com> |
Merge "192x192 icon added to mipmap-xxxhdpi." into gb-ub-photos-carlsbad
|
ca35ef912105bb3e8e2a33b8f3e489ff173846fe |
24-Sep-2013 |
Kevin Gabayan <gabayan@google.com> |
Removed unused assets from Camera2 Bug: 10493013 Change-Id: Id07878cbe1a89e0aaeb70942e0f4ca39cd4a3399
es/drawable-hdpi/appwidget_photo_border.9.png
es/drawable-hdpi/bg_vidcontrol.png
es/drawable-hdpi/border_photo_frame_widget_focused_holo.9.png
es/drawable-hdpi/border_photo_frame_widget_holo.9.png
es/drawable-hdpi/border_photo_frame_widget_pressed_holo.9.png
es/drawable-hdpi/btn_make_offline_disabled_on_holo_dark.png
es/drawable-hdpi/btn_make_offline_normal_off_holo_dark.png
es/drawable-hdpi/btn_make_offline_normal_on_holo_dark.png
es/drawable-hdpi/cab_divider_vertical_dark.png
es/drawable-hdpi/capture_thumbnail_shadow.9.png
es/drawable-hdpi/dialog_full_holo_dark.9.png
es/drawable-hdpi/dropdown_ic_arrow_normal_holo_dark.png
es/drawable-hdpi/filtershow_button_colors_curve.png
es/drawable-hdpi/filtershow_button_colors_sharpen.png
es/drawable-hdpi/filtershow_button_grad.png
es/drawable-hdpi/filtershow_button_redo.png
es/drawable-hdpi/filtershow_button_undo.png
es/drawable-hdpi/filtershow_scrubber_control_disabled.png
es/drawable-hdpi/filtershow_scrubber_control_focused.png
es/drawable-hdpi/filtershow_scrubber_control_normal.png
es/drawable-hdpi/filtershow_scrubber_control_pressed.png
es/drawable-hdpi/filtershow_scrubber_primary.9.png
es/drawable-hdpi/filtershow_scrubber_secondary.9.png
es/drawable-hdpi/filtershow_scrubber_track.9.png
es/drawable-hdpi/frame_overlay_gallery_camera.png
es/drawable-hdpi/frame_overlay_gallery_folder.png
es/drawable-hdpi/frame_overlay_gallery_picasa.png
es/drawable-hdpi/grid_pressed.9.png
es/drawable-hdpi/grid_selected.9.png
es/drawable-hdpi/ic_360pano_holo_light.png
es/drawable-hdpi/ic_cameraalbum_overlay.png
es/drawable-hdpi/ic_grad_add.png
es/drawable-hdpi/ic_grad_del.png
es/drawable-hdpi/ic_menu_camera_holo_light.png
es/drawable-hdpi/ic_menu_make_offline.png
es/drawable-hdpi/ic_menu_ptp_holo_light.png
es/drawable-hdpi/ic_menu_slideshow_holo_light.png
es/drawable-hdpi/ic_photoeditor_border.png
es/drawable-hdpi/ic_photoeditor_color.png
es/drawable-hdpi/ic_photoeditor_effects.png
es/drawable-hdpi/ic_photoeditor_fix.png
es/drawable-hdpi/ic_vidcontrol_pause.png
es/drawable-hdpi/ic_vidcontrol_play.png
es/drawable-hdpi/ic_vidcontrol_reload.png
es/drawable-hdpi/ic_video_thumb.png
es/drawable-hdpi/icn_media_pause_focused_holo_dark.png
es/drawable-hdpi/icn_media_pause_normal_holo_dark.png
es/drawable-hdpi/icn_media_pause_pressed_holo_dark.png
es/drawable-hdpi/icn_media_play_focused_holo_dark.png
es/drawable-hdpi/icn_media_play_normal_holo_dark.png
es/drawable-hdpi/icn_media_play_pressed_holo_dark.png
es/drawable-hdpi/list_divider_holo_dark.9.png
es/drawable-hdpi/list_selector_background_selected.9.png
es/drawable-hdpi/menu_dropdown_panel_holo_dark.9.png
es/drawable-hdpi/overscroll_edge.png
es/drawable-hdpi/overscroll_glow.png
es/drawable-hdpi/placeholder_camera.png
es/drawable-hdpi/placeholder_empty.png
es/drawable-hdpi/scrubber_knob.png
es/drawable-hdpi/spinner_76_inner_holo.png
es/drawable-hdpi/spinner_76_outer_holo.png
es/drawable-hdpi/text_select_handle_left.png
es/drawable-hdpi/text_select_handle_right.png
es/drawable-hdpi/wallpaper_picker_preview.png
es/drawable-mdpi/appwidget_photo_border.9.png
es/drawable-mdpi/bg_vidcontrol.png
es/drawable-mdpi/border_photo_frame_widget_focused_holo.9.png
es/drawable-mdpi/border_photo_frame_widget_holo.9.png
es/drawable-mdpi/border_photo_frame_widget_pressed_holo.9.png
es/drawable-mdpi/btn_make_offline_disabled_on_holo_dark.png
es/drawable-mdpi/btn_make_offline_normal_off_holo_dark.png
es/drawable-mdpi/btn_make_offline_normal_on_holo_dark.png
es/drawable-mdpi/cab_divider_vertical_dark.png
es/drawable-mdpi/capture_thumbnail_shadow.9.png
es/drawable-mdpi/dialog_full_holo_dark.9.png
es/drawable-mdpi/dropdown_ic_arrow_normal_holo_dark.png
es/drawable-mdpi/filtershow_button_colors_curve.png
es/drawable-mdpi/filtershow_button_colors_sharpen.png
es/drawable-mdpi/filtershow_button_grad.png
es/drawable-mdpi/filtershow_button_redo.png
es/drawable-mdpi/filtershow_button_undo.png
es/drawable-mdpi/filtershow_scrubber_control_disabled.png
es/drawable-mdpi/filtershow_scrubber_control_focused.png
es/drawable-mdpi/filtershow_scrubber_control_normal.png
es/drawable-mdpi/filtershow_scrubber_control_pressed.png
es/drawable-mdpi/filtershow_scrubber_primary.9.png
es/drawable-mdpi/filtershow_scrubber_secondary.9.png
es/drawable-mdpi/filtershow_scrubber_track.9.png
es/drawable-mdpi/frame_overlay_gallery_camera.png
es/drawable-mdpi/frame_overlay_gallery_folder.png
es/drawable-mdpi/frame_overlay_gallery_picasa.png
es/drawable-mdpi/grid_pressed.9.png
es/drawable-mdpi/grid_selected.9.png
es/drawable-mdpi/ic_360pano_holo_light.png
es/drawable-mdpi/ic_cameraalbum_overlay.png
es/drawable-mdpi/ic_grad_add.png
es/drawable-mdpi/ic_grad_del.png
es/drawable-mdpi/ic_menu_camera_holo_light.png
es/drawable-mdpi/ic_menu_make_offline.png
es/drawable-mdpi/ic_menu_ptp_holo_light.png
es/drawable-mdpi/ic_menu_slideshow_holo_light.png
es/drawable-mdpi/ic_photoeditor_border.png
es/drawable-mdpi/ic_photoeditor_color.png
es/drawable-mdpi/ic_photoeditor_effects.png
es/drawable-mdpi/ic_photoeditor_fix.png
es/drawable-mdpi/ic_vidcontrol_pause.png
es/drawable-mdpi/ic_vidcontrol_play.png
es/drawable-mdpi/ic_vidcontrol_reload.png
es/drawable-mdpi/ic_video_thumb.png
es/drawable-mdpi/icn_media_pause_focused_holo_dark.png
es/drawable-mdpi/icn_media_pause_normal_holo_dark.png
es/drawable-mdpi/icn_media_pause_pressed_holo_dark.png
es/drawable-mdpi/icn_media_play_focused_holo_dark.png
es/drawable-mdpi/icn_media_play_normal_holo_dark.png
es/drawable-mdpi/icn_media_play_pressed_holo_dark.png
es/drawable-mdpi/list_divider_holo_dark.9.png
es/drawable-mdpi/list_selector_background_selected.9.png
es/drawable-mdpi/menu_dropdown_panel_holo_dark.9.png
es/drawable-mdpi/overscroll_edge.png
es/drawable-mdpi/overscroll_glow.png
es/drawable-mdpi/placeholder_camera.png
es/drawable-mdpi/placeholder_empty.png
es/drawable-mdpi/scrubber_knob.png
es/drawable-mdpi/spinner_76_inner_holo.png
es/drawable-mdpi/spinner_76_outer_holo.png
es/drawable-mdpi/text_select_handle_left.png
es/drawable-mdpi/text_select_handle_right.png
es/drawable-mdpi/wallpaper_picker_preview.png
es/drawable-nodpi/filtershow_icon_vignette.png
es/drawable-xhdpi/bg_vidcontrol.png
es/drawable-xhdpi/capture_thumbnail_shadow.9.png
es/drawable-xhdpi/dialog_full_holo_dark.9.png
es/drawable-xhdpi/dropdown_ic_arrow_normal_holo_dark.png
es/drawable-xhdpi/filtershow_button_colors_curve.png
es/drawable-xhdpi/filtershow_button_colors_sharpen.png
es/drawable-xhdpi/filtershow_button_grad.png
es/drawable-xhdpi/filtershow_button_redo.png
es/drawable-xhdpi/filtershow_button_undo.png
es/drawable-xhdpi/filtershow_scrubber_control_disabled.png
es/drawable-xhdpi/filtershow_scrubber_control_focused.png
es/drawable-xhdpi/filtershow_scrubber_control_normal.png
es/drawable-xhdpi/filtershow_scrubber_control_pressed.png
es/drawable-xhdpi/filtershow_scrubber_primary.9.png
es/drawable-xhdpi/filtershow_scrubber_secondary.9.png
es/drawable-xhdpi/filtershow_scrubber_track.9.png
es/drawable-xhdpi/frame_overlay_gallery_camera.png
es/drawable-xhdpi/frame_overlay_gallery_folder.png
es/drawable-xhdpi/frame_overlay_gallery_picasa.png
es/drawable-xhdpi/grid_pressed.9.png
es/drawable-xhdpi/grid_selected.9.png
es/drawable-xhdpi/ic_360pano_holo_light.png
es/drawable-xhdpi/ic_cameraalbum_overlay.png
es/drawable-xhdpi/ic_grad_add.png
es/drawable-xhdpi/ic_grad_del.png
es/drawable-xhdpi/ic_menu_make_offline.png
es/drawable-xhdpi/ic_photoeditor_border.png
es/drawable-xhdpi/ic_photoeditor_color.png
es/drawable-xhdpi/ic_photoeditor_effects.png
es/drawable-xhdpi/ic_photoeditor_fix.png
es/drawable-xhdpi/ic_vidcontrol_pause.png
es/drawable-xhdpi/ic_vidcontrol_play.png
es/drawable-xhdpi/ic_vidcontrol_reload.png
es/drawable-xhdpi/ic_video_thumb.png
es/drawable-xhdpi/list_divider_holo_dark.9.png
es/drawable-xhdpi/list_selector_background_selected.9.png
es/drawable-xhdpi/menu_dropdown_panel_holo_dark.9.png
es/drawable-xhdpi/overscroll_edge.png
es/drawable-xhdpi/overscroll_glow.png
es/drawable-xhdpi/placeholder_camera.png
es/drawable-xhdpi/placeholder_empty.png
es/drawable-xhdpi/scrubber_knob.png
es/drawable-xhdpi/spinner_76_inner_holo.png
es/drawable-xhdpi/spinner_76_outer_holo.png
es/drawable-xhdpi/text_select_handle_left.png
es/drawable-xhdpi/text_select_handle_right.png
|
7e5768b8c1c28e554d7a866e13cda010e0d982c3 |
24-Sep-2013 |
Sascha Haeberling <haeberling@google.com> |
am 8fed926c: Merge "Localize the numbers in the time laps popup." into gb-ub-photos-carlsbad * commit '8fed926c9f1a3b205165a2f9aad05379c85ececd': Localize the numbers in the time laps popup.
|
2377df9a4e3fe0e6f036e9d885b72456c951fb80 |
24-Sep-2013 |
Sascha Haeberling <haeberling@google.com> |
am 8fed926c: Merge "Localize the numbers in the time laps popup." into gb-ub-photos-carlsbad * commit '8fed926c9f1a3b205165a2f9aad05379c85ececd': Localize the numbers in the time laps popup.
|
8fed926c9f1a3b205165a2f9aad05379c85ececd |
24-Sep-2013 |
Sascha Haeberling <haeberling@google.com> |
Merge "Localize the numbers in the time laps popup." into gb-ub-photos-carlsbad
|
a1d38e795cf93a21f3c30eaddd6ea76b92c705fd |
23-Sep-2013 |
ztenghui <ztenghui@google.com> |
Sort and select the preview fps range for still image. bug:10842868 Change-Id: Ic7d64aead7fd877e2c404d22ce42fd2d3566e57b
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/util/CameraUtil.java
|
3e058558dc0aaea971d084bf9c72e1cfa0c5ebd9 |
24-Sep-2013 |
Sascha Haeberling <haeberling@google.com> |
Localize the numbers in the time laps popup. Bug: 10889796 Change-Id: I44c476519b785a83af1c72aed07378c5e02d9073
rc/com/android/camera/ui/TimeIntervalPopup.java
|
9acff12fc6ee97b60fa840339b83745b3c6807c6 |
23-Sep-2013 |
ztenghui <ztenghui@google.com> |
am 4c478ffe: Merge "Sort and select the preview fps range for still image." into gb-ub-photos-carlsbad * commit '4c478ffe556bff91f9c7574384ab6d482c947627': Sort and select the preview fps range for still image.
|
f58ec27a63538590fc6eaf87a38c69ca2ae05d2c |
23-Sep-2013 |
ztenghui <ztenghui@google.com> |
am 4c478ffe: Merge "Sort and select the preview fps range for still image." into gb-ub-photos-carlsbad * commit '4c478ffe556bff91f9c7574384ab6d482c947627': Sort and select the preview fps range for still image.
|
b6dbfa08ef74210cd07d1422ad1d2bf21d3be909 |
23-Sep-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I6579c8050e160f317ced1f098af607a622c8a87c Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms-rMY/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
4c478ffe556bff91f9c7574384ab6d482c947627 |
23-Sep-2013 |
ztenghui <ztenghui@google.com> |
Merge "Sort and select the preview fps range for still image." into gb-ub-photos-carlsbad
|
7a6bdf2aac7e74402342dc97b1ec32bbf8673539 |
23-Sep-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ic13c030c8ad5f5d3ca80f01b2543076a776c62d5 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-km-rKH/strings.xml
es/values-ko/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mn-rMN/strings.xml
es/values-ms-rMY/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
1973569ed395400e527abf33c1b0ed1d083fdb98 |
23-Sep-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I69db8d31a7314f67babd49ec59d5c0fb5fb66516 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-km-rKH/strings.xml
es/values-ko/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mn-rMN/strings.xml
es/values-ms-rMY/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
6647136058e3b2175327c86bcea288b016125613 |
23-Sep-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I18c99ec6ea068cb113aa2e949f649d2ae11a686c Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms-rMY/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
16a35206473b5a49821edccea93bbde54c52be49 |
23-Sep-2013 |
ztenghui <ztenghui@google.com> |
Sort and select the preview fps range for still image. bug:10842868 Change-Id: Ic7d64aead7fd877e2c404d22ce42fd2d3566e57b
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/util/CameraUtil.java
|
a69f785c11bd1efce8a94489e6c9ffe06146607d |
23-Sep-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 283beaf6: Fix build: Don\'t build GCam for non-arm targets * commit '283beaf677d0c3235fbb22bfd5cd8338459bed1b': Fix build: Don't build GCam for non-arm targets
|
2389b22a3f97504cd7bfddf818ddf223adb6dd20 |
23-Sep-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 283beaf6: Fix build: Don\'t build GCam for non-arm targets * commit '283beaf677d0c3235fbb22bfd5cd8338459bed1b': Fix build: Don't build GCam for non-arm targets
|
283beaf677d0c3235fbb22bfd5cd8338459bed1b |
23-Sep-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Fix build: Don't build GCam for non-arm targets Bug: 10430748 Change-Id: I26e1208b38f40808ff59e3976f5c4a76efa15b4c
ndroid.mk
rc_pd/com/android/camera/util/GcamHelper.java
rc_pd_gcam/com/android/camera/util/GcamHelper.java
|
83be75a2c39e081606c1c01a145f1ccdcd41bca5 |
22-Sep-2013 |
The Android Automerger <android-build@google.com> |
merge in klp-release history after reset to klp-dev
|
72df808d188bcd180291da51626ddf9d0bf8ef60 |
21-Sep-2013 |
Angus Kong <shkong@google.com> |
am 8831725c: am 4d017ab2: am b21215a1: Improve the animation to filmstrip. * commit '8831725ce91d172b3331d339d1aa71189ce7fe2e': Improve the animation to filmstrip.
|
8831725ce91d172b3331d339d1aa71189ce7fe2e |
21-Sep-2013 |
Angus Kong <shkong@google.com> |
am 4d017ab2: am b21215a1: Improve the animation to filmstrip. * commit '4d017ab2085d5ade791358a23fca33b974afb4e3': Improve the animation to filmstrip.
|
4d017ab2085d5ade791358a23fca33b974afb4e3 |
21-Sep-2013 |
Angus Kong <shkong@google.com> |
am b21215a1: Improve the animation to filmstrip. * commit 'b21215a1a59812592380f31891becedbdec7468b': Improve the animation to filmstrip.
|
2479542ae98936b12fb6baac4c797b0fb00e53c3 |
21-Sep-2013 |
Angus Kong <shkong@google.com> |
am b21215a1: Improve the animation to filmstrip. * commit 'b21215a1a59812592380f31891becedbdec7468b': Improve the animation to filmstrip.
|
b21215a1a59812592380f31891becedbdec7468b |
21-Sep-2013 |
Angus Kong <shkong@google.com> |
Improve the animation to filmstrip. 1. Remove the snap-in-center check at the end of scale animation. 2. Don't go back to full-screen when animating from camera preview to filmstrip. bug:10806298 bug:10864100 Change-Id: I751040a22e2758709c22e7230a5418a871ef85f9
rc/com/android/camera/data/CameraPreviewData.java
rc/com/android/camera/data/LocalMediaData.java
rc/com/android/camera/data/SimpleViewData.java
rc/com/android/camera/ui/FilmStripView.java
rc/com/android/camera/util/CameraUtil.java
|
c93da7f151c699679654f7ad52fe5d80656ae3f8 |
21-Sep-2013 |
Kevin Gabayan <gabayan@google.com> |
192x192 icon added to mipmap-xxxhdpi. Change-Id: I2531fc226c97f5a3948f9616dc40e269e792b29c
es/mipmap-xxxhdpi/ic_launcher_camera.png
|
910396b42a57e8afa6b603be42846b6fbe9db505 |
20-Sep-2013 |
Doris Liu <tianliu@google.com> |
am 3c60ff75: am 00258a68: am aa874428: Hide action bar after a timeout * commit '3c60ff751c1d2ada3848fea911f01fecef1daad7': Hide action bar after a timeout
|
3c60ff751c1d2ada3848fea911f01fecef1daad7 |
20-Sep-2013 |
Doris Liu <tianliu@google.com> |
am 00258a68: am aa874428: Hide action bar after a timeout * commit '00258a685922bccf36be7c4938e837ca5d72bcb7': Hide action bar after a timeout
|
00258a685922bccf36be7c4938e837ca5d72bcb7 |
20-Sep-2013 |
Doris Liu <tianliu@google.com> |
am aa874428: Hide action bar after a timeout * commit 'aa8744284864cda5570e8dfa4eccc2747cee52dc': Hide action bar after a timeout
|
abef15eda3aa420fc115096609f368c62bc59d3e |
20-Sep-2013 |
Doris Liu <tianliu@google.com> |
am aa874428: Hide action bar after a timeout * commit 'aa8744284864cda5570e8dfa4eccc2747cee52dc': Hide action bar after a timeout
|
2d941751c7146e5841dfda18020c40a803cfad32 |
20-Sep-2013 |
Angus Kong <shkong@google.com> |
am 98795bed: am cb736218: am cdbba4c8: Merge "Refine Filmstrip gesture/position handling." into gb-ub-photos-carlsbad * commit '98795bed91ab0340cbdabd917a4e619384e31d2b': Refine Filmstrip gesture/position handling.
|
aa8744284864cda5570e8dfa4eccc2747cee52dc |
19-Sep-2013 |
Doris Liu <tianliu@google.com> |
Hide action bar after a timeout Also make sure: 1) Action bar does not go away when the menu is showing 2) Extend the timeout if user swipe to a new image when action bar is visible 3) Hide action bar immediately when double-tap-to-zoom starts 4) Action bar persists in filmstrip mode (i.e. non-fullscreen mode) Bug: 10750342 Change-Id: I820dc2b57ced61f91246fffe3fecc4e60ea187ca
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/ui/FilmStripView.java
rc/com/android/camera/ui/FilmstripBottomControls.java
|
025c8b2032cd2cd5b2147ccd9adc038e1e5ac040 |
20-Sep-2013 |
Baligh Uddin <baligh@google.com> |
am a09cda9b: (-s ours) am 1106268f: (-s ours) am 4821c541: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-carlsbad * commit 'a09cda9b0b52ed01f616f9a3d33782edd29d6341': Import translations. DO NOT MERGE
|
9d40d3961a52dd1bf9d066561408b177993c4411 |
20-Sep-2013 |
Baligh Uddin <baligh@google.com> |
am 11db9bd4: (-s ours) am 3aac79f2: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '11db9bd48b5390e8b741ca1d77d19d0fe0f496cf': Import translations. DO NOT MERGE
|
278b95022084857b99fb206133e2090e5264f542 |
20-Sep-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 9403e4dc: am 75ad0584: am 30a21ea3: Merge "Fix drawable location." into gb-ub-photos-carlsbad * commit '9403e4dcb724fe9ee07625cba9339e769f71a7e2': Fix drawable location.
|
24f67e2624e2e0e1b7060bfa01a6f982fd94f51c |
20-Sep-2013 |
nicolasroard <nicolasroard@google.com> |
am e3155f4d: am 27d4468f: am 19ab725a: Add crop activity * commit 'e3155f4dd95120b8d7f8d8ea1d14b15b4da65a04': Add crop activity
|
f7bc0035afe7a11d8e8ecc808a1b555ea5453dfe |
20-Sep-2013 |
ztenghui <ztenghui@google.com> |
am 79c8a1f0: am 9e7cb170: am 064d6000: Use contentObserver to refresh the data when dirty. * commit '79c8a1f0e1b97ac111d7b23daf476482e14f0d7d': Use contentObserver to refresh the data when dirty.
|
a1dd53b898a63fb77b1d6e5256b52d0de6ce0255 |
20-Sep-2013 |
Mangesh Ghiware <mghiware@google.com> |
am a6b977b3: am 7806200a: am a5682ab0: Bring back NFC beam support to filmstrip * commit 'a6b977b3600570f3e92a3677c628659bfa6db508': Bring back NFC beam support to filmstrip
|
f1cbd66fd7d0ee372f7f599d6a5b44ac3467f728 |
06-Sep-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Adding gcam module to Camera2 app. Bug: 10430748 Change-Id: I0c53085553cd8505ba376b1518507d36065894f5
es/drawable-mdpi/ic_switch_gcam.png
|
5a9ead1618a1706703af9a70899353fe590bf36d |
19-Sep-2013 |
Angus Kong <shkong@google.com> |
Refine Filmstrip gesture/position handling. bug:10749052 bug:10802996 bug:10711578 Change-Id: I9080a930209118a5c1bdc11b1ef7b316c55a741e
rc/com/android/camera/ui/FilmStripView.java
rc/com/android/camera/ui/FilmstripBottomControls.java
rc/com/android/camera/util/CameraUtil.java
|
1f05bbf28ee78c2dc783fd8d9392701e0342bfa0 |
19-Sep-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Fix drawable location. Bug: 10430748 - Drawable wasn't included when building from klp-dev. Change-Id: I85e57eebbab3a25e18e3fd6738ffa43bdd61f974
es/drawable-mdpi/ic_switch_gcam.png
es/drawable/ic_switch_gcam.png
|
98795bed91ab0340cbdabd917a4e619384e31d2b |
20-Sep-2013 |
Angus Kong <shkong@google.com> |
am cb736218: am cdbba4c8: Merge "Refine Filmstrip gesture/position handling." into gb-ub-photos-carlsbad * commit 'cb7362183f68428db80a778ec65685526624f4c9': Refine Filmstrip gesture/position handling.
|
cb7362183f68428db80a778ec65685526624f4c9 |
20-Sep-2013 |
Angus Kong <shkong@google.com> |
am cdbba4c8: Merge "Refine Filmstrip gesture/position handling." into gb-ub-photos-carlsbad * commit 'cdbba4c8395cd765b3464e2d980a8a0ea1ff54c7': Refine Filmstrip gesture/position handling.
|
48c019425b5347b8b8439acb85a8b543ca005e68 |
20-Sep-2013 |
Angus Kong <shkong@google.com> |
am cdbba4c8: Merge "Refine Filmstrip gesture/position handling." into gb-ub-photos-carlsbad * commit 'cdbba4c8395cd765b3464e2d980a8a0ea1ff54c7': Refine Filmstrip gesture/position handling.
|
cdbba4c8395cd765b3464e2d980a8a0ea1ff54c7 |
20-Sep-2013 |
Angus Kong <shkong@google.com> |
Merge "Refine Filmstrip gesture/position handling." into gb-ub-photos-carlsbad
|
7d2388d96522975307cf5c40f7ac911ad963c44d |
19-Sep-2013 |
Angus Kong <shkong@google.com> |
Refine Filmstrip gesture/position handling. bug:10749052 bug:10802996 bug:10711578 Change-Id: I9080a930209118a5c1bdc11b1ef7b316c55a741e
rc/com/android/camera/ui/FilmStripView.java
rc/com/android/camera/ui/FilmstripBottomControls.java
rc/com/android/camera/util/CameraUtil.java
|
a09cda9b0b52ed01f616f9a3d33782edd29d6341 |
19-Sep-2013 |
Baligh Uddin <baligh@google.com> |
am 1106268f: (-s ours) am 4821c541: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-carlsbad * commit '1106268ffb0050b2d52a345b6827954a91f54bae': Import translations. DO NOT MERGE
|
f0a5358473dcef4845f0d0f42951b9d05b859ed7 |
19-Sep-2013 |
Baligh Uddin <baligh@google.com> |
am 4821c541: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-carlsbad * commit '4821c5418d44d936ca222bfe1fdc1ac367e129f8': Import translations. DO NOT MERGE
|
11db9bd48b5390e8b741ca1d77d19d0fe0f496cf |
19-Sep-2013 |
Baligh Uddin <baligh@google.com> |
am 3aac79f2: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '3aac79f2a9b67458ff4754c0a37fb4f09e78bfbd': Import translations. DO NOT MERGE
|
1106268ffb0050b2d52a345b6827954a91f54bae |
19-Sep-2013 |
Baligh Uddin <baligh@google.com> |
am 4821c541: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-carlsbad * commit '4821c5418d44d936ca222bfe1fdc1ac367e129f8': Import translations. DO NOT MERGE
|
4821c5418d44d936ca222bfe1fdc1ac367e129f8 |
19-Sep-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-carlsbad
|
d2fe47ca67d21a23145ccb581b24498542793985 |
19-Sep-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE"
|
3aac79f2a9b67458ff4754c0a37fb4f09e78bfbd |
19-Sep-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into klp-dev
|
89a43f8f1660eb504699f6403b60b247798adcd4 |
19-Sep-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-denali
|
9403e4dcb724fe9ee07625cba9339e769f71a7e2 |
19-Sep-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 75ad0584: am 30a21ea3: Merge "Fix drawable location." into gb-ub-photos-carlsbad * commit '75ad0584a13438fa113e5a9e201c6fe1af4880af': Fix drawable location.
|
298310f4a95a56b96cdc3689f9e04523a2a2a251 |
19-Sep-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 30a21ea3: Merge "Fix drawable location." into gb-ub-photos-carlsbad * commit '30a21ea3356e87bdff0e072b840fa73215597326': Fix drawable location.
|
75ad0584a13438fa113e5a9e201c6fe1af4880af |
19-Sep-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 30a21ea3: Merge "Fix drawable location." into gb-ub-photos-carlsbad * commit '30a21ea3356e87bdff0e072b840fa73215597326': Fix drawable location.
|
30a21ea3356e87bdff0e072b840fa73215597326 |
19-Sep-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Fix drawable location." into gb-ub-photos-carlsbad
|
e3155f4dd95120b8d7f8d8ea1d14b15b4da65a04 |
19-Sep-2013 |
nicolasroard <nicolasroard@google.com> |
am 27d4468f: am 19ab725a: Add crop activity * commit '27d4468f90dd478839d864376edd0d40201bd80e': Add crop activity
|
0b30d0e51c4339a3e7f6945828d9bd501fdc344d |
19-Sep-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Fix drawable location. Bug: 10430748 - Drawable wasn't included when building from klp-dev. Change-Id: I85e57eebbab3a25e18e3fd6738ffa43bdd61f974
es/drawable-mdpi/ic_switch_gcam.png
es/drawable/ic_switch_gcam.png
|
27d4468f90dd478839d864376edd0d40201bd80e |
19-Sep-2013 |
nicolasroard <nicolasroard@google.com> |
am 19ab725a: Add crop activity * commit '19ab725a5e640a1a20b1a6def083e37d1d1c1e20': Add crop activity
|
252bdb8ff20181186e9923e8f91f467a2eb11694 |
19-Sep-2013 |
nicolasroard <nicolasroard@google.com> |
am 19ab725a: Add crop activity * commit '19ab725a5e640a1a20b1a6def083e37d1d1c1e20': Add crop activity
|
19ab725a5e640a1a20b1a6def083e37d1d1c1e20 |
19-Sep-2013 |
nicolasroard <nicolasroard@google.com> |
Add crop activity bug:10367125 Change-Id: I8dce6d799e7469ff048d419598d87b0c04bef2a0
ndroidManifest.xml
es/drawable/crop_background.png
es/drawable/crop_tiled_background.xml
es/drawable/menu_save_photo.xml
es/layout/crop_actionbar.xml
es/layout/crop_activity.xml
es/values/strings.xml
es/values/styles.xml
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/crop/BoundedRect.java
rc/com/android/camera/crop/CropActivity.java
rc/com/android/camera/crop/CropDrawingUtils.java
rc/com/android/camera/crop/CropExtras.java
rc/com/android/camera/crop/CropMath.java
rc/com/android/camera/crop/CropObject.java
rc/com/android/camera/crop/CropView.java
rc/com/android/camera/crop/GeometryMathUtils.java
rc/com/android/camera/crop/ImageLoader.java
rc/com/android/camera/crop/SaveImage.java
rc/com/android/camera/crop/Utils.java
|
79c8a1f0e1b97ac111d7b23daf476482e14f0d7d |
19-Sep-2013 |
ztenghui <ztenghui@google.com> |
am 9e7cb170: am 064d6000: Use contentObserver to refresh the data when dirty. * commit '9e7cb170dfbb9884e2f47e30a8a0e60bded318ad': Use contentObserver to refresh the data when dirty.
|
fdbdfaa86401becaa8648e2a9d198dc3afb90492 |
19-Sep-2013 |
ztenghui <ztenghui@google.com> |
am 064d6000: Use contentObserver to refresh the data when dirty. * commit '064d6000933354f7bf344a41e0caa7052401c903': Use contentObserver to refresh the data when dirty.
|
9e7cb170dfbb9884e2f47e30a8a0e60bded318ad |
19-Sep-2013 |
ztenghui <ztenghui@google.com> |
am 064d6000: Use contentObserver to refresh the data when dirty. * commit '064d6000933354f7bf344a41e0caa7052401c903': Use contentObserver to refresh the data when dirty.
|
064d6000933354f7bf344a41e0caa7052401c903 |
06-Sep-2013 |
ztenghui <ztenghui@google.com> |
Use contentObserver to refresh the data when dirty. Handle another setDataSource exception. Remove the old work around for refreshing after editing. bug:10390298 Change-Id: I8777364b96c86eeaf5581a96163aab823cd4b438
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/data/LocalMediaData.java
rc/com/android/camera/data/LocalMediaObserver.java
|
a6b977b3600570f3e92a3677c628659bfa6db508 |
19-Sep-2013 |
Mangesh Ghiware <mghiware@google.com> |
am 7806200a: am a5682ab0: Bring back NFC beam support to filmstrip * commit '7806200aa5235dc8514411107d1603acea12e6b7': Bring back NFC beam support to filmstrip
|
08910be8db5a4ea24c5cea167077328343acef9a |
19-Sep-2013 |
Mangesh Ghiware <mghiware@google.com> |
am a5682ab0: Bring back NFC beam support to filmstrip * commit 'a5682ab08e1d42fe272ec877929478b4adb769f5': Bring back NFC beam support to filmstrip
|
7806200aa5235dc8514411107d1603acea12e6b7 |
19-Sep-2013 |
Mangesh Ghiware <mghiware@google.com> |
am a5682ab0: Bring back NFC beam support to filmstrip * commit 'a5682ab08e1d42fe272ec877929478b4adb769f5': Bring back NFC beam support to filmstrip
|
a5682ab08e1d42fe272ec877929478b4adb769f5 |
19-Sep-2013 |
Mangesh Ghiware <mghiware@google.com> |
Bring back NFC beam support to filmstrip Bug: 10805211 Change-Id: I457d47625c69fcdaba663e53f46d461d29c7cb92
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/util/ApiHelper.java
|
d7dea7a04c696849ff36e1ab9ed28d1699e16172 |
19-Sep-2013 |
The Android Automerger <android-build@google.com> |
merge in klp-release history after reset to klp-dev
|
0d9e6418e702db989f79e8050851ae424f13b08e |
19-Sep-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I14087e2afde009daca03e6005fab8043d36c7e0c Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms-rMY/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
784b610c3d7383fcfcc7f0e73a534f39cac2bf72 |
19-Sep-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I6926f23c1f0882c429b08e96379484e94e9d39e1 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-km-rKH/strings.xml
es/values-ko/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mn-rMN/strings.xml
es/values-ms-rMY/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
7349723e84a87b20181602ea4305160e6b5dbb46 |
19-Sep-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Id078acbb97019f81cab8f877aa2939192b099e2f Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-km-rKH/strings.xml
es/values-ko/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mn-rMN/strings.xml
es/values-ms-rMY/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
e6fcae826df424992899d85be32abd1b8f3445ae |
19-Sep-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ic533c8e0dffbde2d57fe27f9121ebce7c55d6939 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms-rMY/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
b6c932234efb33d34c2cf0f9dd2c4598c93a85eb |
19-Sep-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am cf3b5668: am e784eb4b: am 0374e092: Merge "Adding gcam module to Camera2 app." into gb-ub-photos-carlsbad * commit 'cf3b56681622e19a9876803dd6133e146f78bb25': Adding gcam module to Camera2 app.
|
cf3b56681622e19a9876803dd6133e146f78bb25 |
19-Sep-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am e784eb4b: am 0374e092: Merge "Adding gcam module to Camera2 app." into gb-ub-photos-carlsbad * commit 'e784eb4b4e14a38c29f6c7af127ac38b73575413': Adding gcam module to Camera2 app.
|
e784eb4b4e14a38c29f6c7af127ac38b73575413 |
19-Sep-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 0374e092: Merge "Adding gcam module to Camera2 app." into gb-ub-photos-carlsbad * commit '0374e092eb6fdb33cb6edcb7724601928283dd47': Adding gcam module to Camera2 app.
|
cbfca9bbb4251386a10752ed966e18c4ebee1897 |
19-Sep-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 0374e092: Merge "Adding gcam module to Camera2 app." into gb-ub-photos-carlsbad * commit '0374e092eb6fdb33cb6edcb7724601928283dd47': Adding gcam module to Camera2 app.
|
0374e092eb6fdb33cb6edcb7724601928283dd47 |
19-Sep-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Adding gcam module to Camera2 app." into gb-ub-photos-carlsbad
|
a9d66bdab247626b31dc182c4d62520b3abffdbd |
06-Sep-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Adding gcam module to Camera2 app. Bug: 10430748 Change-Id: I0c53085553cd8505ba376b1518507d36065894f5
es/drawable-mdpi/ic_switch_gcam.png
es/values/strings.xml
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/CameraHolder.java
rc/com/android/camera/MediaSaveService.java
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/ui/ModuleSwitcher.java
rc_pd/com/android/camera/util/GcamHelper.java
|
0288792d77ed40d2834ec8b54e1af63015d38b59 |
19-Sep-2013 |
Mangesh Ghiware <mghiware@google.com> |
am e3568c49: am 247fa7b9: am 9426a38c: Merge "Make Up button in filmstrip go to Gallery." into gb-ub-photos-carlsbad * commit 'e3568c49558fb8cda93fd9f9995dcfaba07acf23': Make Up button in filmstrip go to Gallery.
|
e3568c49558fb8cda93fd9f9995dcfaba07acf23 |
19-Sep-2013 |
Mangesh Ghiware <mghiware@google.com> |
am 247fa7b9: am 9426a38c: Merge "Make Up button in filmstrip go to Gallery." into gb-ub-photos-carlsbad * commit '247fa7b988935e73f41805bb640344ebf2614b25': Make Up button in filmstrip go to Gallery.
|
47e0df96078249070cd874944937bed60706e27e |
19-Sep-2013 |
Mangesh Ghiware <mghiware@google.com> |
am 9426a38c: Merge "Make Up button in filmstrip go to Gallery." into gb-ub-photos-carlsbad * commit '9426a38c2a3ea7f54f35a202dc8aa83fa0cffa63': Make Up button in filmstrip go to Gallery.
|
247fa7b988935e73f41805bb640344ebf2614b25 |
19-Sep-2013 |
Mangesh Ghiware <mghiware@google.com> |
am 9426a38c: Merge "Make Up button in filmstrip go to Gallery." into gb-ub-photos-carlsbad * commit '9426a38c2a3ea7f54f35a202dc8aa83fa0cffa63': Make Up button in filmstrip go to Gallery.
|
9426a38c2a3ea7f54f35a202dc8aa83fa0cffa63 |
19-Sep-2013 |
Mangesh Ghiware <mghiware@google.com> |
Merge "Make Up button in filmstrip go to Gallery." into gb-ub-photos-carlsbad
|
9a814dc6b3f3e9eb6b8c3065617a301336cf0306 |
19-Sep-2013 |
Sascha Haeberling <haeberling@google.com> |
am 53192fde: am 485f95e4: am b2d70d5b: Fix various message issues * commit '53192fdeb65c84bd69996f53130409fea0b98779': Fix various message issues
|
53192fdeb65c84bd69996f53130409fea0b98779 |
19-Sep-2013 |
Sascha Haeberling <haeberling@google.com> |
am 485f95e4: am b2d70d5b: Fix various message issues * commit '485f95e4f48ef76587e2b9d5ecf99063a104c6f7': Fix various message issues
|
485f95e4f48ef76587e2b9d5ecf99063a104c6f7 |
19-Sep-2013 |
Sascha Haeberling <haeberling@google.com> |
am b2d70d5b: Fix various message issues * commit 'b2d70d5bfcebbd2deb3e8e81371204eb0fc0421b': Fix various message issues
|
a387172c3fc86f90d5f7fd5b6a4a9c1d392069dc |
19-Sep-2013 |
Sascha Haeberling <haeberling@google.com> |
am b2d70d5b: Fix various message issues * commit 'b2d70d5bfcebbd2deb3e8e81371204eb0fc0421b': Fix various message issues
|
5df64b0a818d4f85cb14602db725f05b0055c1d9 |
19-Sep-2013 |
Mangesh Ghiware <mghiware@google.com> |
Make Up button in filmstrip go to Gallery. Bug: 10748904 Change-Id: If80f3354071893dc4f8bd60e4ca605d3626ecdf9
ndroidManifest.xml
es/mipmap-hdpi/ic_launcher_gallery.png
es/mipmap-mdpi/ic_launcher_gallery.png
es/mipmap-xhdpi/ic_launcher_gallery.png
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/util/ApiHelper.java
|
b2d70d5bfcebbd2deb3e8e81371204eb0fc0421b |
19-Sep-2013 |
Sascha Haeberling <haeberling@google.com> |
Fix various message issues Bug: 10568697 Bug: 10589224 Bug: 10561095 Bug: 10589353 Bug: 10570925 Change-Id: I1affdf37d74bef37e099c70775f669ee0ff33acf
es/values/strings.xml
|
6d38aea3857a258d91af2e6d395d1149a54dc945 |
19-Sep-2013 |
Sascha Haeberling <haeberling@google.com> |
am 4911e6eb: am f0ec22b7: am 638e6f06: Clean up ApiHelper and remove unused code paths. * commit '4911e6eb754ace87120d7e4a739e2e79350779b8': Clean up ApiHelper and remove unused code paths.
|
4911e6eb754ace87120d7e4a739e2e79350779b8 |
19-Sep-2013 |
Sascha Haeberling <haeberling@google.com> |
am f0ec22b7: am 638e6f06: Clean up ApiHelper and remove unused code paths. * commit 'f0ec22b78a94e34f1136e87f1cff0d348aea9882': Clean up ApiHelper and remove unused code paths.
|
f0ec22b78a94e34f1136e87f1cff0d348aea9882 |
19-Sep-2013 |
Sascha Haeberling <haeberling@google.com> |
am 638e6f06: Clean up ApiHelper and remove unused code paths. * commit '638e6f06c877d90b907f66ea9c22b3c6b73c7384': Clean up ApiHelper and remove unused code paths.
|
5e4523c012a7ae11aceb53e4fc8fc6cb790435a4 |
19-Sep-2013 |
Sascha Haeberling <haeberling@google.com> |
am 638e6f06: Clean up ApiHelper and remove unused code paths. * commit '638e6f06c877d90b907f66ea9c22b3c6b73c7384': Clean up ApiHelper and remove unused code paths.
|
638e6f06c877d90b907f66ea9c22b3c6b73c7384 |
18-Sep-2013 |
Sascha Haeberling <haeberling@google.com> |
Clean up ApiHelper and remove unused code paths. Bug: 10821545 As we're targeting ICS there are a lot of checks and code paths that are no longer in use. This CL cleans them up. Change-Id: Ic3dd26628a94e134e25e2c496ccec1f1f957216d
rc/com/android/camera/AndroidCameraManagerImpl.java
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/CameraManager.java
rc/com/android/camera/CameraSettings.java
rc/com/android/camera/EffectsRecorder.java
rc/com/android/camera/FocusOverlayManager.java
rc/com/android/camera/MosaicPreviewRenderer.java
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/PhotoUI.java
rc/com/android/camera/SoundClips.java
rc/com/android/camera/VideoModule.java
rc/com/android/camera/VideoUI.java
rc/com/android/camera/ui/CameraRootView.java
rc/com/android/camera/ui/EffectSettingPopup.java
rc/com/android/camera/ui/FaceView.java
rc/com/android/camera/ui/ModuleSwitcher.java
rc/com/android/camera/ui/RotateLayout.java
rc/com/android/camera/ui/Switch.java
rc/com/android/camera/util/ApiHelper.java
rc/com/android/camera/util/CameraUtil.java
rc/com/android/camera/util/MotionEventHelper.java
|
923873b0213fa8c6d5119d74b284474d0b71f260 |
18-Sep-2013 |
Sascha Haeberling <haeberling@google.com> |
am 1847b431: am 18dcbd5d: am 4ed20592: Adding Hideybar support for K and up. * commit '1847b431dc8fb24e1c8ae65997b82387f08f7057': Adding Hideybar support for K and up.
|
1847b431dc8fb24e1c8ae65997b82387f08f7057 |
18-Sep-2013 |
Sascha Haeberling <haeberling@google.com> |
am 18dcbd5d: am 4ed20592: Adding Hideybar support for K and up. * commit '18dcbd5d7fbe683b3891a05b5ba90babf359a45f': Adding Hideybar support for K and up.
|
18dcbd5d7fbe683b3891a05b5ba90babf359a45f |
18-Sep-2013 |
Sascha Haeberling <haeberling@google.com> |
am 4ed20592: Adding Hideybar support for K and up. * commit '4ed20592482d2ab2f3f48ee72d5b1c06bf009034': Adding Hideybar support for K and up.
|
18374912c744174c4c9137c34856d43836435fa4 |
18-Sep-2013 |
Sascha Haeberling <haeberling@google.com> |
am 4ed20592: Adding Hideybar support for K and up. * commit '4ed20592482d2ab2f3f48ee72d5b1c06bf009034': Adding Hideybar support for K and up.
|
4ed20592482d2ab2f3f48ee72d5b1c06bf009034 |
13-Sep-2013 |
Sascha Haeberling <haeberling@google.com> |
Adding Hideybar support for K and up. Bug: 10723047 Change-Id: Ie1d0bdadfbe6dee6a4e0998facac61ff1fb6e02a
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/ui/CameraRootView.java
|
723d4a338ecd6c0938b04dde524e3c484cca56ea |
18-Sep-2013 |
The Android Automerger <android-build@google.com> |
merge in klp-release history after reset to klp-dev
|
288464bb6f579ac7b5db64bc6364ef811034a6a7 |
18-Sep-2013 |
The Android Automerger <android-build@google.com> |
merge in klp-release history after reset to klp-dev
|
ebe3c3371cb7ba516ef0087586f59f78e5847c5d |
18-Sep-2013 |
ztenghui <ztenghui@google.com> |
am 2c5114b8: am eb0c0d3c: am e1f0f4f1: Merge "Delete the captured video if cancel in review." into gb-ub-photos-carlsbad * commit '2c5114b81ea373227f9dce4bb4747ba13824d900': Delete the captured video if cancel in review.
|
2c5114b81ea373227f9dce4bb4747ba13824d900 |
18-Sep-2013 |
ztenghui <ztenghui@google.com> |
am eb0c0d3c: am e1f0f4f1: Merge "Delete the captured video if cancel in review." into gb-ub-photos-carlsbad * commit 'eb0c0d3cc706a7f63177a55a50ea057e7ecf0232': Delete the captured video if cancel in review.
|
eb0c0d3cc706a7f63177a55a50ea057e7ecf0232 |
18-Sep-2013 |
ztenghui <ztenghui@google.com> |
am e1f0f4f1: Merge "Delete the captured video if cancel in review." into gb-ub-photos-carlsbad * commit 'e1f0f4f1bce2a8d0dca3856aa0211dcfffb74abc': Delete the captured video if cancel in review.
|
83ab3ff6a97009d98c59dc3f49fc27d7bda21626 |
18-Sep-2013 |
ztenghui <ztenghui@google.com> |
am e1f0f4f1: Merge "Delete the captured video if cancel in review." into gb-ub-photos-carlsbad * commit 'e1f0f4f1bce2a8d0dca3856aa0211dcfffb74abc': Delete the captured video if cancel in review.
|
e1f0f4f1bce2a8d0dca3856aa0211dcfffb74abc |
18-Sep-2013 |
ztenghui <ztenghui@google.com> |
Merge "Delete the captured video if cancel in review." into gb-ub-photos-carlsbad
|
af3a19761034225333685b90206dcdb8e784a1c4 |
18-Sep-2013 |
ztenghui <ztenghui@google.com> |
Delete the captured video if cancel in review. In capture intent case, video get inserted all the time before review. So if cancelled in review mode, the captured video should be deleted. bug:8897671 Change-Id: I01dd4b0707dd1b70480cda94b2a9b9c6ce9194c7
rc/com/android/camera/VideoModule.java
|
e59fd687b879ae4f834991a17e78451f71fb136d |
18-Sep-2013 |
Sascha Haeberling <haeberling@google.com> |
am 1ec6a26f: am c008cf33: am 15125661: Fall back to Photo module if stores index is illegal. * commit '1ec6a26f79e19b3672182a7a16d9cc3ffa5d648d': Fall back to Photo module if stores index is illegal.
|
1ec6a26f79e19b3672182a7a16d9cc3ffa5d648d |
18-Sep-2013 |
Sascha Haeberling <haeberling@google.com> |
am c008cf33: am 15125661: Fall back to Photo module if stores index is illegal. * commit 'c008cf3380e2b30cede4ee24e0463fb4f9b12d44': Fall back to Photo module if stores index is illegal.
|
c008cf3380e2b30cede4ee24e0463fb4f9b12d44 |
18-Sep-2013 |
Sascha Haeberling <haeberling@google.com> |
am 15125661: Fall back to Photo module if stores index is illegal. * commit '15125661ad968cf4d40989a9bc88d11189beb0b3': Fall back to Photo module if stores index is illegal.
|
c9ab515836e5dc51c06966979462d589d18605ce |
18-Sep-2013 |
Sascha Haeberling <haeberling@google.com> |
am 15125661: Fall back to Photo module if stores index is illegal. * commit '15125661ad968cf4d40989a9bc88d11189beb0b3': Fall back to Photo module if stores index is illegal.
|
ab5e8b75b169e784514ca4261232f53dbc674e76 |
18-Sep-2013 |
Sascha Haeberling <haeberling@google.com> |
am a3ffd99c: am bfb14b9c: am 483d25a2: Merge "Don\'t crash the app if camera is not available." into gb-ub-photos-carlsbad * commit 'a3ffd99c264b60dc5389217b23f5895a9bbf639c': Don't crash the app if camera is not available.
|
a3ffd99c264b60dc5389217b23f5895a9bbf639c |
18-Sep-2013 |
Sascha Haeberling <haeberling@google.com> |
am bfb14b9c: am 483d25a2: Merge "Don\'t crash the app if camera is not available." into gb-ub-photos-carlsbad * commit 'bfb14b9cbf42967721df8ef96e3d43fb5aa70d9f': Don't crash the app if camera is not available.
|
15125661ad968cf4d40989a9bc88d11189beb0b3 |
18-Sep-2013 |
Sascha Haeberling <haeberling@google.com> |
Fall back to Photo module if stores index is illegal. Bug: 10805249 Change-Id: Iace590af34cf646abf7af74b498520d686c04511
rc/com/android/camera/CameraActivity.java
|
bfb14b9cbf42967721df8ef96e3d43fb5aa70d9f |
18-Sep-2013 |
Sascha Haeberling <haeberling@google.com> |
am 483d25a2: Merge "Don\'t crash the app if camera is not available." into gb-ub-photos-carlsbad * commit '483d25a21058094303b94e44cc67cbd8fecd4bf8': Don't crash the app if camera is not available.
|
5c14dd40c962253143a5d27f7106567b43305a61 |
18-Sep-2013 |
Sascha Haeberling <haeberling@google.com> |
am 483d25a2: Merge "Don\'t crash the app if camera is not available." into gb-ub-photos-carlsbad * commit '483d25a21058094303b94e44cc67cbd8fecd4bf8': Don't crash the app if camera is not available.
|
483d25a21058094303b94e44cc67cbd8fecd4bf8 |
18-Sep-2013 |
Sascha Haeberling <haeberling@google.com> |
Merge "Don't crash the app if camera is not available." into gb-ub-photos-carlsbad
|
864388f4bb0469bfc3a7215c2ff2be857e12c146 |
18-Sep-2013 |
Sascha Haeberling <haeberling@google.com> |
am 86bdf145: am e7c77157: am 4ee4d99c: Merge "Adding a simple done handler interface." into gb-ub-photos-carlsbad * commit '86bdf1459770a56f642e0e4b08bdbd574d342770': Adding a simple done handler interface.
|
86bdf1459770a56f642e0e4b08bdbd574d342770 |
18-Sep-2013 |
Sascha Haeberling <haeberling@google.com> |
am e7c77157: am 4ee4d99c: Merge "Adding a simple done handler interface." into gb-ub-photos-carlsbad * commit 'e7c77157c61fb0e09b5a5eec0b977a3b75f7a6eb': Adding a simple done handler interface.
|
a912820eb7fb33eb9cc5b65cff4976b8c56edb4b |
18-Sep-2013 |
Sascha Haeberling <haeberling@google.com> |
am 4ee4d99c: Merge "Adding a simple done handler interface." into gb-ub-photos-carlsbad * commit '4ee4d99cfc519847bd8f84aca9ece5d2b6519536': Adding a simple done handler interface.
|
e7c77157c61fb0e09b5a5eec0b977a3b75f7a6eb |
18-Sep-2013 |
Sascha Haeberling <haeberling@google.com> |
am 4ee4d99c: Merge "Adding a simple done handler interface." into gb-ub-photos-carlsbad * commit '4ee4d99cfc519847bd8f84aca9ece5d2b6519536': Adding a simple done handler interface.
|
4ee4d99cfc519847bd8f84aca9ece5d2b6519536 |
18-Sep-2013 |
Sascha Haeberling <haeberling@google.com> |
Merge "Adding a simple done handler interface." into gb-ub-photos-carlsbad
|
02db77fc8bdcd6aeb1b36217d939bc11355822e6 |
18-Sep-2013 |
Sascha Haeberling <haeberling@google.com> |
Don't crash the app if camera is not available. Bug: 10747001 Change-Id: I8a4e302a9b458c73901776a95a0118da0e4e8b6c
rc/com/android/camera/AndroidCameraManagerImpl.java
|
b47d1abbd94a7650cbfcf7d6ba267afdf90af251 |
18-Sep-2013 |
Doris Liu <tianliu@google.com> |
am 63349606: am 1b3ffde9: am 9c0492a6: Merge "Fix camera controls rotation for secure camera" into gb-ub-photos-carlsbad * commit '63349606f71e617dae25958ba92455d62d64c028': Fix camera controls rotation for secure camera
|
63349606f71e617dae25958ba92455d62d64c028 |
18-Sep-2013 |
Doris Liu <tianliu@google.com> |
am 1b3ffde9: am 9c0492a6: Merge "Fix camera controls rotation for secure camera" into gb-ub-photos-carlsbad * commit '1b3ffde934ceb9247e319d432d61a81dc6a28ecd': Fix camera controls rotation for secure camera
|
9fe8e8f94d55310b1a5790f58c911017e55150c2 |
18-Sep-2013 |
Doris Liu <tianliu@google.com> |
am 9c0492a6: Merge "Fix camera controls rotation for secure camera" into gb-ub-photos-carlsbad * commit '9c0492a606ca48dbc3e56b03051ea9242d952e3e': Fix camera controls rotation for secure camera
|
1b3ffde934ceb9247e319d432d61a81dc6a28ecd |
18-Sep-2013 |
Doris Liu <tianliu@google.com> |
am 9c0492a6: Merge "Fix camera controls rotation for secure camera" into gb-ub-photos-carlsbad * commit '9c0492a606ca48dbc3e56b03051ea9242d952e3e': Fix camera controls rotation for secure camera
|
9c0492a606ca48dbc3e56b03051ea9242d952e3e |
18-Sep-2013 |
Doris Liu <tianliu@google.com> |
Merge "Fix camera controls rotation for secure camera" into gb-ub-photos-carlsbad
|
8cecf837f8f25418890344a53f7cb3ae44ef0b03 |
18-Sep-2013 |
Doris Liu <tianliu@google.com> |
Fix camera controls rotation for secure camera Bug: 8878379 Change-Id: I80b06d98010dbed14a46994f365d1fbb9aa8ba49
rc/com/android/camera/ui/RotatableLayout.java
|
df454e4adf27de57ef57ff724f6024f8f92c2a8a |
18-Sep-2013 |
Angus Kong <shkong@google.com> |
am 1e1dd300: am 7315a189: am c2497d0a: Merge "Show dialog when camera device is not connected." into gb-ub-photos-carlsbad * commit '1e1dd300c5e31bfcef1f4d281f3fa88bed97f96d': Show dialog when camera device is not connected.
|
1e1dd300c5e31bfcef1f4d281f3fa88bed97f96d |
17-Sep-2013 |
Angus Kong <shkong@google.com> |
am 7315a189: am c2497d0a: Merge "Show dialog when camera device is not connected." into gb-ub-photos-carlsbad * commit '7315a189fc166735ae46261e99e9da81baaa7936': Show dialog when camera device is not connected.
|
17de38548d764503012e85e4fd449442e771c152 |
17-Sep-2013 |
Angus Kong <shkong@google.com> |
am c2497d0a: Merge "Show dialog when camera device is not connected." into gb-ub-photos-carlsbad * commit 'c2497d0a7213a3c105ec312f12b0f8b00347d5e5': Show dialog when camera device is not connected.
|
7315a189fc166735ae46261e99e9da81baaa7936 |
17-Sep-2013 |
Angus Kong <shkong@google.com> |
am c2497d0a: Merge "Show dialog when camera device is not connected." into gb-ub-photos-carlsbad * commit 'c2497d0a7213a3c105ec312f12b0f8b00347d5e5': Show dialog when camera device is not connected.
|
c2497d0a7213a3c105ec312f12b0f8b00347d5e5 |
17-Sep-2013 |
Angus Kong <shkong@google.com> |
Merge "Show dialog when camera device is not connected." into gb-ub-photos-carlsbad
|
4f795b878843e59810ec1dca05b7cdb37b5614c5 |
16-Sep-2013 |
Angus Kong <shkong@google.com> |
Show dialog when camera device is not connected. bug:10726516 Change-Id: I3d3433d0b2eced54027b19910473fd55135d0e1c
rc/com/android/camera/AndroidCameraManagerImpl.java
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/CameraButtonIntentReceiver.java
rc/com/android/camera/CameraHolder.java
rc/com/android/camera/CameraManager.java
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/VideoModule.java
rc/com/android/camera/WideAnglePanoramaModule.java
rc/com/android/camera/util/CameraUtil.java
|
faffec99cf5c99df6b0cc945637ed23c9b0c1557 |
17-Sep-2013 |
ztenghui <ztenghui@google.com> |
am bd3e1882: am a4c33574: am 828c9190: Merge "Use a new Intent to work around issues in framework" into gb-ub-photos-carlsbad * commit 'bd3e1882df98ff32e1263a382b0d8164a7b97a73': Use a new Intent to work around issues in framework
|
bd3e1882df98ff32e1263a382b0d8164a7b97a73 |
17-Sep-2013 |
ztenghui <ztenghui@google.com> |
am a4c33574: am 828c9190: Merge "Use a new Intent to work around issues in framework" into gb-ub-photos-carlsbad * commit 'a4c33574b2bd70a1a04b0aac58ee97c3d022fc5e': Use a new Intent to work around issues in framework
|
a4c33574b2bd70a1a04b0aac58ee97c3d022fc5e |
17-Sep-2013 |
ztenghui <ztenghui@google.com> |
am 828c9190: Merge "Use a new Intent to work around issues in framework" into gb-ub-photos-carlsbad * commit '828c9190aafc9b57126f5a4868e5cee922cf9f2c': Use a new Intent to work around issues in framework
|
2f3b645c3ee77a0117cd865a9b239c419bcf9f62 |
17-Sep-2013 |
ztenghui <ztenghui@google.com> |
am 828c9190: Merge "Use a new Intent to work around issues in framework" into gb-ub-photos-carlsbad * commit '828c9190aafc9b57126f5a4868e5cee922cf9f2c': Use a new Intent to work around issues in framework
|
828c9190aafc9b57126f5a4868e5cee922cf9f2c |
17-Sep-2013 |
ztenghui <ztenghui@google.com> |
Merge "Use a new Intent to work around issues in framework" into gb-ub-photos-carlsbad
|
05804751ba07c8abcf422f57467d0ed3de95576c |
17-Sep-2013 |
ztenghui <ztenghui@google.com> |
Use a new Intent to work around issues in framework Framework didn't update the action provider if reusing the intent object. The work around is creating new intents here. bug:10713267 Change-Id: Iee64e84e191c8c2c2377fb5b9b95a91dae3c445c
rc/com/android/camera/CameraActivity.java
|
e67139ae13950fbfd961b6088163b9ec782e4a0f |
17-Sep-2013 |
The Android Automerger <android-build@google.com> |
merge in klp-release history after reset to klp-dev
|
5030968f53b09b6d3d538b2b667d338bd314d800 |
17-Sep-2013 |
Baligh Uddin <baligh@google.com> |
am 468592c2: (-s ours) am d313b92c: (-s ours) am 53304d69: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-carlsbad * commit '468592c24df7f395b4a38589cb70a0f750afb6d6': Import translations. DO NOT MERGE
|
cd3e45fdba1a3697a5346cf256bbafa11a7d6116 |
17-Sep-2013 |
Baligh Uddin <baligh@google.com> |
am 5c00ae40: (-s ours) am f72f347c: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '5c00ae404603943a5756e855e49f5e4d3d9271d8': Import translations. DO NOT MERGE
|
468592c24df7f395b4a38589cb70a0f750afb6d6 |
17-Sep-2013 |
Baligh Uddin <baligh@google.com> |
am d313b92c: (-s ours) am 53304d69: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-carlsbad * commit 'd313b92c73257a7427945acdf66a861afb188b0d': Import translations. DO NOT MERGE
|
5c00ae404603943a5756e855e49f5e4d3d9271d8 |
17-Sep-2013 |
Baligh Uddin <baligh@google.com> |
am f72f347c: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit 'f72f347cae1ab00203d7e8bd374a7079d3ee5d05': Import translations. DO NOT MERGE
|
d313b92c73257a7427945acdf66a861afb188b0d |
17-Sep-2013 |
Baligh Uddin <baligh@google.com> |
am 53304d69: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-carlsbad * commit '53304d6953ff8f09a51c1128b7a0f3921e45b651': Import translations. DO NOT MERGE
|
14c3fd6b83a6d38ceb083bafb6d8240d4909ec8a |
17-Sep-2013 |
Baligh Uddin <baligh@google.com> |
am 53304d69: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-carlsbad * commit '53304d6953ff8f09a51c1128b7a0f3921e45b651': Import translations. DO NOT MERGE
|
53304d6953ff8f09a51c1128b7a0f3921e45b651 |
17-Sep-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-carlsbad
|
9504b21a76a866f1ae89b4f57eb19e5c102d6d86 |
17-Sep-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE"
|
f72f347cae1ab00203d7e8bd374a7079d3ee5d05 |
17-Sep-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into klp-dev
|
14ed7a1e3359bc1d707201a86a3ff33bc331e332 |
17-Sep-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-denali
|
8b352394aa0c6035ca2496314f19846732136ce9 |
17-Sep-2013 |
Doris Liu <tianliu@google.com> |
am 3bb7bf70: am 987a17d0: am 2065e606: Merge "Fix zoom for images with orientation tag" into gb-ub-photos-carlsbad * commit '3bb7bf702ee3c68b0ddd7ba6cd92ed4e95c9a76c': Fix zoom for images with orientation tag
|
3bb7bf702ee3c68b0ddd7ba6cd92ed4e95c9a76c |
17-Sep-2013 |
Doris Liu <tianliu@google.com> |
am 987a17d0: am 2065e606: Merge "Fix zoom for images with orientation tag" into gb-ub-photos-carlsbad * commit '987a17d0c926fd665ff57e20df744b6424b442c0': Fix zoom for images with orientation tag
|
987a17d0c926fd665ff57e20df744b6424b442c0 |
17-Sep-2013 |
Doris Liu <tianliu@google.com> |
am 2065e606: Merge "Fix zoom for images with orientation tag" into gb-ub-photos-carlsbad * commit '2065e606b68f7e8532317f076c7f688a2093186d': Fix zoom for images with orientation tag
|
f8f11a7e52dd0d48eae863ca6ade7e2aa11b85b5 |
17-Sep-2013 |
Doris Liu <tianliu@google.com> |
am 2065e606: Merge "Fix zoom for images with orientation tag" into gb-ub-photos-carlsbad * commit '2065e606b68f7e8532317f076c7f688a2093186d': Fix zoom for images with orientation tag
|
2065e606b68f7e8532317f076c7f688a2093186d |
17-Sep-2013 |
Doris Liu <tianliu@google.com> |
Merge "Fix zoom for images with orientation tag" into gb-ub-photos-carlsbad
|
534667fb623d3a3e253bdcef6d3477f04d765317 |
17-Sep-2013 |
Angus Kong <shkong@google.com> |
am 64e8a35d: am 1dffcefa: am 5bee41c6: Merge "Set correct alpha for views in filmstrip." into gb-ub-photos-carlsbad * commit '64e8a35d11e650e45420fed7bbe3c63a48aaa6f1': Set correct alpha for views in filmstrip.
|
64e8a35d11e650e45420fed7bbe3c63a48aaa6f1 |
17-Sep-2013 |
Angus Kong <shkong@google.com> |
am 1dffcefa: am 5bee41c6: Merge "Set correct alpha for views in filmstrip." into gb-ub-photos-carlsbad * commit '1dffcefae388b4ea643150b4a077c668e8e765a2': Set correct alpha for views in filmstrip.
|
87fc5e1568f737e03327770cb3dee03c4b939c59 |
16-Sep-2013 |
Doris Liu <tianliu@google.com> |
Fix zoom for images with orientation tag Bug: 10780042 Change-Id: I518bf8a6e2b53647398180e60b55533960ebe318
rc/com/android/camera/data/LocalMediaData.java
rc/com/android/camera/data/SimpleViewData.java
rc/com/android/camera/ui/FilmStripView.java
rc/com/android/camera/ui/ZoomView.java
|
258265fc5760dab1ddcb8b7dcd1f444ae75d9fd3 |
17-Sep-2013 |
Angus Kong <shkong@google.com> |
am 5bee41c6: Merge "Set correct alpha for views in filmstrip." into gb-ub-photos-carlsbad * commit '5bee41c6d727c730c7b10fba886862284a489257': Set correct alpha for views in filmstrip.
|
1dffcefae388b4ea643150b4a077c668e8e765a2 |
17-Sep-2013 |
Angus Kong <shkong@google.com> |
am 5bee41c6: Merge "Set correct alpha for views in filmstrip." into gb-ub-photos-carlsbad * commit '5bee41c6d727c730c7b10fba886862284a489257': Set correct alpha for views in filmstrip.
|
5bee41c6d727c730c7b10fba886862284a489257 |
17-Sep-2013 |
Angus Kong <shkong@google.com> |
Merge "Set correct alpha for views in filmstrip." into gb-ub-photos-carlsbad
|
1bfc41a1536f8625b7584fb1a29e552b090043dd |
17-Sep-2013 |
Sascha Haeberling <haeberling@google.com> |
am a0283515: am 38cea6cf: am 3d91d906: Add HQ and HD strings. * commit 'a02835151e0a285f18dafec151b58a43c1b5da3a': Add HQ and HD strings.
|
a02835151e0a285f18dafec151b58a43c1b5da3a |
17-Sep-2013 |
Sascha Haeberling <haeberling@google.com> |
am 38cea6cf: am 3d91d906: Add HQ and HD strings. * commit '38cea6cfee607493adfea682e13d0814fe26714c': Add HQ and HD strings.
|
38cea6cfee607493adfea682e13d0814fe26714c |
17-Sep-2013 |
Sascha Haeberling <haeberling@google.com> |
am 3d91d906: Add HQ and HD strings. * commit '3d91d906fa288923b0d307f8333af89699303528': Add HQ and HD strings.
|
93a388fbdd6a6a8f972a5dbdd22e5ad5274bb9da |
17-Sep-2013 |
Sascha Haeberling <haeberling@google.com> |
am 3d91d906: Add HQ and HD strings. * commit '3d91d906fa288923b0d307f8333af89699303528': Add HQ and HD strings.
|
3d91d906fa288923b0d307f8333af89699303528 |
17-Sep-2013 |
Sascha Haeberling <haeberling@google.com> |
Add HQ and HD strings. Bug: 10785988 Change-Id: Idc76e1888cb91d3ec6b56657f38f7422a2df7e43
es/values/strings.xml
|
d028dd4908e68c7d4d0e7438efa74fa2c67e5f2a |
14-Sep-2013 |
Angus Kong <shkong@google.com> |
Set correct alpha for views in filmstrip. bug:10713813 Change-Id: I2715b7c3ecb2e0c995e8f66e710c91561e9cf231
rc/com/android/camera/ui/FilmStripView.java
|
2f92d309de115b2a41692b93d77fcbffd1260781 |
16-Sep-2013 |
Sascha Haeberling <haeberling@google.com> |
Adding a simple done handler interface. Bug: 10747001 Needed by http://ag/360619 Change-Id: I942cb601391a8cdd2c30ea152415f56d38fd0918
rc/com/android/camera/util/DoneHandler.java
|
a991d06b69c17ac61bbabc24f736012fcfa96258 |
16-Sep-2013 |
Doris Liu <tianliu@google.com> |
am 970235ac: am 9ca0842a: am d688c0c3: Merge "Fix flicker when zooming images smaller than screen" into gb-ub-photos-carlsbad * commit '970235aca30ec9a2d3fcb356bf6fe3e0e76b291d': Fix flicker when zooming images smaller than screen
|
fb61a3f0454d4e5ee2ed7fb607b9261bae6508b1 |
16-Sep-2013 |
Sascha Haeberling <haeberling@google.com> |
am 9602d9e1: am f546cdbd: am c2915695: Avoid expensive O(n) main-thread operation when adding Photo Sphere. * commit '9602d9e1c62773107ec0d68bc2f4b540bdde38c7': Avoid expensive O(n) main-thread operation when adding Photo Sphere.
|
970235aca30ec9a2d3fcb356bf6fe3e0e76b291d |
16-Sep-2013 |
Doris Liu <tianliu@google.com> |
am 9ca0842a: am d688c0c3: Merge "Fix flicker when zooming images smaller than screen" into gb-ub-photos-carlsbad * commit '9ca0842a2ba0ac2f848942fe4e5d1d80e7510588': Fix flicker when zooming images smaller than screen
|
9602d9e1c62773107ec0d68bc2f4b540bdde38c7 |
16-Sep-2013 |
Sascha Haeberling <haeberling@google.com> |
am f546cdbd: am c2915695: Avoid expensive O(n) main-thread operation when adding Photo Sphere. * commit 'f546cdbd24b9576c416204b83914c87a111641d7': Avoid expensive O(n) main-thread operation when adding Photo Sphere.
|
9ca0842a2ba0ac2f848942fe4e5d1d80e7510588 |
16-Sep-2013 |
Doris Liu <tianliu@google.com> |
am d688c0c3: Merge "Fix flicker when zooming images smaller than screen" into gb-ub-photos-carlsbad * commit 'd688c0c31d4287c03b664f6fca5c6498a1e4bd7d': Fix flicker when zooming images smaller than screen
|
f546cdbd24b9576c416204b83914c87a111641d7 |
16-Sep-2013 |
Sascha Haeberling <haeberling@google.com> |
am c2915695: Avoid expensive O(n) main-thread operation when adding Photo Sphere. * commit 'c29156954bcbf0218a78c308c3ba8f25e00aeecc': Avoid expensive O(n) main-thread operation when adding Photo Sphere.
|
10ed7e898b6b376aa128a1ae2c50844f919d9ad8 |
16-Sep-2013 |
Doris Liu <tianliu@google.com> |
am d688c0c3: Merge "Fix flicker when zooming images smaller than screen" into gb-ub-photos-carlsbad * commit 'd688c0c31d4287c03b664f6fca5c6498a1e4bd7d': Fix flicker when zooming images smaller than screen
|
d3a708cc4ef9a5cb3b4d1847c32cbafa232453c3 |
16-Sep-2013 |
Sascha Haeberling <haeberling@google.com> |
am c2915695: Avoid expensive O(n) main-thread operation when adding Photo Sphere. * commit 'c29156954bcbf0218a78c308c3ba8f25e00aeecc': Avoid expensive O(n) main-thread operation when adding Photo Sphere.
|
d688c0c31d4287c03b664f6fca5c6498a1e4bd7d |
16-Sep-2013 |
Doris Liu <tianliu@google.com> |
Merge "Fix flicker when zooming images smaller than screen" into gb-ub-photos-carlsbad
|
c29156954bcbf0218a78c308c3ba8f25e00aeecc |
16-Sep-2013 |
Sascha Haeberling <haeberling@google.com> |
Avoid expensive O(n) main-thread operation when adding Photo Sphere. Bug: 10747001 Change-Id: I8dcc3c5e7dd12879a927aa82e71bea0c6370ccda
rc/com/android/camera/data/CameraDataAdapter.java
rc/com/android/camera/data/LocalDataList.java
|
8046084a4059f2bc3a77ce556be180a526794f9f |
16-Sep-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Iab05e7410b6829ad7934d71024fee3e1e2d77f8f Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-de/strings.xml
es/values-et-rEE/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-in/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms-rMY/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
36440ab7b249479afd5fe903d14c99c8edacb493 |
16-Sep-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I31bb88d783b3a2faa758e00d87716b6fd33b87ee Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-de/strings.xml
es/values-et-rEE/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-km-rKH/strings.xml
es/values-ko/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mn-rMN/strings.xml
es/values-ms-rMY/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
6a81ca33a17e347f89ff35f973daf1df0ff01013 |
16-Sep-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ib51b9e17820f90dcc176c4f8196d60bca3b0d0a5 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-de/strings.xml
es/values-et-rEE/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-km-rKH/strings.xml
es/values-ko/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mn-rMN/strings.xml
es/values-ms-rMY/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
e296bca3ac6f3f2491cc7564b846e1c3c8b7fd2f |
16-Sep-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I5fe216b9632775a6f1261a23288d48ff9e7f066b Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-de/strings.xml
es/values-et-rEE/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-in/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms-rMY/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
79dcb12bbbcb9b3650ace5290897e26451218fe1 |
16-Sep-2013 |
Doris Liu <tianliu@google.com> |
Fix flicker when zooming images smaller than screen Bug: 10733300 Change-Id: Ifa753722132b1fd81265b5fc105a0b96602b6fd2
rc/com/android/camera/ui/FilmStripView.java
|
5f3e02989b4f6cf3fe4354df040e22a7a7b528ea |
16-Sep-2013 |
The Android Automerger <android-build@google.com> |
merge in klp-factoryrom-release history after reset to klp-release
|
2155ecef9cbb7473b1c85f2fd244ad6b5e2942e1 |
16-Sep-2013 |
The Android Automerger <android-build@google.com> |
merge in klp-release history after reset to klp-dev
|
9500f9e19caf60ac005f84746a3c3bc9aaac40b5 |
14-Sep-2013 |
Baligh Uddin <baligh@google.com> |
am 9bb3e1e5: (-s ours) am 0f9a86d8: (-s ours) am d095b79d: (-s ours) Import translations. DO NOT MERGE * commit '9bb3e1e52676f524c17ce0aae0ad6ebd6f0ab5ed': Import translations. DO NOT MERGE
|
9bb3e1e52676f524c17ce0aae0ad6ebd6f0ab5ed |
14-Sep-2013 |
Baligh Uddin <baligh@google.com> |
am 0f9a86d8: (-s ours) am d095b79d: (-s ours) Import translations. DO NOT MERGE * commit '0f9a86d86436d05529c9f1a73ed48771362adb5f': Import translations. DO NOT MERGE
|
0f9a86d86436d05529c9f1a73ed48771362adb5f |
14-Sep-2013 |
Baligh Uddin <baligh@google.com> |
am d095b79d: (-s ours) Import translations. DO NOT MERGE * commit 'd095b79d083440e20d683ddb05ff8477159ee38f': Import translations. DO NOT MERGE
|
5faae037d31ef038a032473f5b6d3ba4d834322e |
14-Sep-2013 |
Baligh Uddin <baligh@google.com> |
am d095b79d: (-s ours) Import translations. DO NOT MERGE * commit 'd095b79d083440e20d683ddb05ff8477159ee38f': Import translations. DO NOT MERGE
|
bfac86155c92fd81cd5c69e3810c5e9a45f71b68 |
14-Sep-2013 |
Baligh Uddin <baligh@google.com> |
am 317a468d: (-s ours) am d5fc134e: (-s ours) Import translations. DO NOT MERGE * commit '317a468d799fdc1d69eb3e50441d18d6944f93b9': Import translations. DO NOT MERGE
|
317a468d799fdc1d69eb3e50441d18d6944f93b9 |
14-Sep-2013 |
Baligh Uddin <baligh@google.com> |
am d5fc134e: (-s ours) Import translations. DO NOT MERGE * commit 'd5fc134e66a3ea232ea450d91c8da6fae54430d2': Import translations. DO NOT MERGE
|
d095b79d083440e20d683ddb05ff8477159ee38f |
14-Sep-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I66cd67cee8d92b6c594ad9f19d217a1a4cceae44 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms-rMY/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
6facc9036cb7d216a4b30d9e9fde6fdaa36bf7d4 |
14-Sep-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Idbea620ed6227602c4ca9a37eb50795313208a27 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-km-rKH/strings.xml
es/values-ko/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mn-rMN/strings.xml
es/values-ms-rMY/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
d5fc134e66a3ea232ea450d91c8da6fae54430d2 |
14-Sep-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Icb32a9036f201b08701bfeea02cbf38552b1f24e Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-km-rKH/strings.xml
es/values-ko/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mn-rMN/strings.xml
es/values-ms-rMY/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
0dbf00cda7a979a4fc3c2e7db0719b457c8c7bc0 |
14-Sep-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ie6e9442a822e3be9a766d5ce2601b7d812928f27 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms-rMY/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
b8724ab5a57055cccd92dcfaeadd0b090c75df5b |
14-Sep-2013 |
Angus Kong <shkong@google.com> |
am 064bcdae: am 14bbdd6a: am 44974d4b: Don\'t show menu/indicators in wide-angle mode. * commit '064bcdae140ebfca3ddb8f205a6200ee404468e7': Don't show menu/indicators in wide-angle mode.
|
44a0fc39c1277eec93ee0f25b09e86688efcbf8f |
14-Sep-2013 |
Sascha Haeberling <haeberling@google.com> |
am e30684d9: am 51da31a9: am 7e1e10f3: Merge "Fix potential deadlock while rendering the preview." into gb-ub-photos-carlsbad * commit 'e30684d94fa6717675d78427ef31ea503c653ec2': Fix potential deadlock while rendering the preview.
|
799082e4df722f50bc625c872bcc925d34eab493 |
14-Sep-2013 |
Angus Kong <shkong@google.com> |
am d831b816: am b3804596: am a29e0bfc: Merge "Always leave full-screen when swip from camera." into gb-ub-photos-carlsbad * commit 'd831b816e557a217ec3f2bebb284b7a670c19f1d': Always leave full-screen when swip from camera.
|
064bcdae140ebfca3ddb8f205a6200ee404468e7 |
14-Sep-2013 |
Angus Kong <shkong@google.com> |
am 14bbdd6a: am 44974d4b: Don\'t show menu/indicators in wide-angle mode. * commit '14bbdd6a5b304abdcbef0ad3a2a2ab0459cd3a37': Don't show menu/indicators in wide-angle mode.
|
e30684d94fa6717675d78427ef31ea503c653ec2 |
14-Sep-2013 |
Sascha Haeberling <haeberling@google.com> |
am 51da31a9: am 7e1e10f3: Merge "Fix potential deadlock while rendering the preview." into gb-ub-photos-carlsbad * commit '51da31a916633a6bf9b7a4f52f7341da86ea2595': Fix potential deadlock while rendering the preview.
|
d831b816e557a217ec3f2bebb284b7a670c19f1d |
14-Sep-2013 |
Angus Kong <shkong@google.com> |
am b3804596: am a29e0bfc: Merge "Always leave full-screen when swip from camera." into gb-ub-photos-carlsbad * commit 'b3804596c874387c83ab37d4ba489daed98af1c1': Always leave full-screen when swip from camera.
|
4516e61dd865bc6d13d5f1d746d413211e709fe8 |
14-Sep-2013 |
Angus Kong <shkong@google.com> |
am 44974d4b: Don\'t show menu/indicators in wide-angle mode. * commit '44974d4b8014ec1f3c8ef1b9d77aae990bbba821': Don't show menu/indicators in wide-angle mode.
|
14bbdd6a5b304abdcbef0ad3a2a2ab0459cd3a37 |
14-Sep-2013 |
Angus Kong <shkong@google.com> |
am 44974d4b: Don\'t show menu/indicators in wide-angle mode. * commit '44974d4b8014ec1f3c8ef1b9d77aae990bbba821': Don't show menu/indicators in wide-angle mode.
|
44974d4b8014ec1f3c8ef1b9d77aae990bbba821 |
13-Sep-2013 |
Angus Kong <shkong@google.com> |
Don't show menu/indicators in wide-angle mode. bug:10674078 Change-Id: I08edd11ead1c71cd6b81274938c92f788c039a8f
rc/com/android/camera/WideAnglePanoramaUI.java
|
51da31a916633a6bf9b7a4f52f7341da86ea2595 |
13-Sep-2013 |
Sascha Haeberling <haeberling@google.com> |
am 7e1e10f3: Merge "Fix potential deadlock while rendering the preview." into gb-ub-photos-carlsbad * commit '7e1e10f34dcb77566d0551b7fb8b0b4e7e18ca25': Fix potential deadlock while rendering the preview.
|
df79a363d69090f217e78fb6b5e60069dff0fc0b |
13-Sep-2013 |
Sascha Haeberling <haeberling@google.com> |
am 7e1e10f3: Merge "Fix potential deadlock while rendering the preview." into gb-ub-photos-carlsbad * commit '7e1e10f34dcb77566d0551b7fb8b0b4e7e18ca25': Fix potential deadlock while rendering the preview.
|
7e1e10f34dcb77566d0551b7fb8b0b4e7e18ca25 |
13-Sep-2013 |
Sascha Haeberling <haeberling@google.com> |
Merge "Fix potential deadlock while rendering the preview." into gb-ub-photos-carlsbad
|
b3804596c874387c83ab37d4ba489daed98af1c1 |
13-Sep-2013 |
Angus Kong <shkong@google.com> |
am a29e0bfc: Merge "Always leave full-screen when swip from camera." into gb-ub-photos-carlsbad * commit 'a29e0bfcafa292adba7fff2daf0f754627e47137': Always leave full-screen when swip from camera.
|
9fdccaa974f1d20cf10e1ff4d15ca49894b69d46 |
13-Sep-2013 |
Angus Kong <shkong@google.com> |
am a29e0bfc: Merge "Always leave full-screen when swip from camera." into gb-ub-photos-carlsbad * commit 'a29e0bfcafa292adba7fff2daf0f754627e47137': Always leave full-screen when swip from camera.
|
a29e0bfcafa292adba7fff2daf0f754627e47137 |
13-Sep-2013 |
Angus Kong <shkong@google.com> |
Merge "Always leave full-screen when swip from camera." into gb-ub-photos-carlsbad
|
6100053eea36f0258091ee12be5f72c501209ad0 |
13-Sep-2013 |
Sascha Haeberling <haeberling@google.com> |
Fix potential deadlock while rendering the preview. Bug: 10748013 Change-Id: Id03053f47ee3c066347dd136b6abe9fb1a5d6502
rc/com/android/camera/tinyplanet/TinyPlanetPreview.java
|
998bfd014edc27e5972b2fe38d32c0a02d893001 |
13-Sep-2013 |
Angus Kong <shkong@google.com> |
am 395505df: am caaffcc7: am 539b9eec: Merge "Avoid flickering after swipe to delete." into gb-ub-photos-carlsbad * commit '395505df7aedde20d9f733201329181adbba8377': Avoid flickering after swipe to delete.
|
e4bc73ca6eea09ffad51b50f733339c1d2121c4e |
13-Sep-2013 |
ztenghui <ztenghui@google.com> |
am 2907cb9d: am 755b36ac: am a7035394: Merge "Fix crash due to a hole in setDataSource." into gb-ub-photos-carlsbad * commit '2907cb9d667734cf8579518530e3693de3d326b9': Fix crash due to a hole in setDataSource.
|
395505df7aedde20d9f733201329181adbba8377 |
13-Sep-2013 |
Angus Kong <shkong@google.com> |
am caaffcc7: am 539b9eec: Merge "Avoid flickering after swipe to delete." into gb-ub-photos-carlsbad * commit 'caaffcc7037118b1892e3257b5f530e0d3018f79': Avoid flickering after swipe to delete.
|
2907cb9d667734cf8579518530e3693de3d326b9 |
13-Sep-2013 |
ztenghui <ztenghui@google.com> |
am 755b36ac: am a7035394: Merge "Fix crash due to a hole in setDataSource." into gb-ub-photos-carlsbad * commit '755b36acb9c434c81a55250c8dbcfc06472f5df5': Fix crash due to a hole in setDataSource.
|
caaffcc7037118b1892e3257b5f530e0d3018f79 |
13-Sep-2013 |
Angus Kong <shkong@google.com> |
am 539b9eec: Merge "Avoid flickering after swipe to delete." into gb-ub-photos-carlsbad * commit '539b9eec067c012d17f482975cf8053e04a11759': Avoid flickering after swipe to delete.
|
bb08f427b06cf360ca9e2dbd193ae8f23e8b8112 |
13-Sep-2013 |
Angus Kong <shkong@google.com> |
am 539b9eec: Merge "Avoid flickering after swipe to delete." into gb-ub-photos-carlsbad * commit '539b9eec067c012d17f482975cf8053e04a11759': Avoid flickering after swipe to delete.
|
539b9eec067c012d17f482975cf8053e04a11759 |
13-Sep-2013 |
Angus Kong <shkong@google.com> |
Merge "Avoid flickering after swipe to delete." into gb-ub-photos-carlsbad
|
a2cdd80a31ce162a6223f5fa1640570bc0567fb8 |
13-Sep-2013 |
ztenghui <ztenghui@google.com> |
am a7035394: Merge "Fix crash due to a hole in setDataSource." into gb-ub-photos-carlsbad * commit 'a7035394b246b238c19230c92672dbda2ab1f88c': Fix crash due to a hole in setDataSource.
|
755b36acb9c434c81a55250c8dbcfc06472f5df5 |
13-Sep-2013 |
ztenghui <ztenghui@google.com> |
am a7035394: Merge "Fix crash due to a hole in setDataSource." into gb-ub-photos-carlsbad * commit 'a7035394b246b238c19230c92672dbda2ab1f88c': Fix crash due to a hole in setDataSource.
|
a7035394b246b238c19230c92672dbda2ab1f88c |
13-Sep-2013 |
ztenghui <ztenghui@google.com> |
Merge "Fix crash due to a hole in setDataSource." into gb-ub-photos-carlsbad
|
abcd58760903d557e0fdffff900c0053ce6a74f6 |
13-Sep-2013 |
Sascha Haeberling <haeberling@google.com> |
am fe0ad8e0: am c54135c8: am 1e689c25: Fix DeadLock in TinyPlanet. * commit 'fe0ad8e0ca8a97124de56c0d61b5b2b0d2a8e910': Fix DeadLock in TinyPlanet.
|
310a37b000edb2f5af294c89b20d132cc03c153c |
13-Sep-2013 |
Sascha Haeberling <haeberling@google.com> |
am b922e919: am 144ef251: am a5a08d76: Bring back tiny planet to the Camera filmstrip * commit 'b922e919fb53b5db1942990701857fecb97ae28c': Bring back tiny planet to the Camera filmstrip
|
3fd3595664dddb651b72872acae90d8a714e6a5b |
13-Sep-2013 |
Doris Liu <tianliu@google.com> |
am b5c99151: am da414423: am 742cd5b1: Keep undo bar around until there is user interaciton * commit 'b5c991511c043bee7c2f85062133bec14d55e08d': Keep undo bar around until there is user interaciton
|
fe0ad8e0ca8a97124de56c0d61b5b2b0d2a8e910 |
13-Sep-2013 |
Sascha Haeberling <haeberling@google.com> |
am c54135c8: am 1e689c25: Fix DeadLock in TinyPlanet. * commit 'c54135c829e7d83cbb60f7ba69d10d4a0db69d57': Fix DeadLock in TinyPlanet.
|
b922e919fb53b5db1942990701857fecb97ae28c |
13-Sep-2013 |
Sascha Haeberling <haeberling@google.com> |
am 144ef251: am a5a08d76: Bring back tiny planet to the Camera filmstrip * commit '144ef2518648e0198ba3e199fd390ea1b6f89224': Bring back tiny planet to the Camera filmstrip
|
b5c991511c043bee7c2f85062133bec14d55e08d |
13-Sep-2013 |
Doris Liu <tianliu@google.com> |
am da414423: am 742cd5b1: Keep undo bar around until there is user interaciton * commit 'da4144231a630a44cbfe7c426e8696fe8d72a24c': Keep undo bar around until there is user interaciton
|
2a36173bd114b6e55d1195ab6ad6c577623fb694 |
13-Sep-2013 |
Sascha Haeberling <haeberling@google.com> |
am 1e689c25: Fix DeadLock in TinyPlanet. * commit '1e689c254960f0ced0d19d91067cc5ef703dec64': Fix DeadLock in TinyPlanet.
|
c54135c829e7d83cbb60f7ba69d10d4a0db69d57 |
13-Sep-2013 |
Sascha Haeberling <haeberling@google.com> |
am 1e689c25: Fix DeadLock in TinyPlanet. * commit '1e689c254960f0ced0d19d91067cc5ef703dec64': Fix DeadLock in TinyPlanet.
|
1e689c254960f0ced0d19d91067cc5ef703dec64 |
13-Sep-2013 |
Sascha Haeberling <haeberling@google.com> |
Fix DeadLock in TinyPlanet. Bug: 10393598 Now that we acquire the lock inside doInBackground, we need to make sure to run the AsyncTasks in parallel. Change-Id: If253f375d56c352c30076f00cf923dfa521f2db4
rc/com/android/camera/tinyplanet/TinyPlanetFragment.java
|
edbba628dc2e31057b304c6a431f44dbca125891 |
12-Sep-2013 |
Angus Kong <shkong@google.com> |
Avoid flickering after swipe to delete. bug:10624385 Change-Id: Id4d65a391b2d13a5d6cc08ae9c1b787610c94c46
rc/com/android/camera/ui/FilmStripView.java
|
cfb30e2e1dad6f70ef0fcf7affb77cb97cb66c7d |
13-Sep-2013 |
Sascha Haeberling <haeberling@google.com> |
am a5a08d76: Bring back tiny planet to the Camera filmstrip * commit 'a5a08d7642a1fdf961b057cc90e76c4c93103c15': Bring back tiny planet to the Camera filmstrip
|
144ef2518648e0198ba3e199fd390ea1b6f89224 |
13-Sep-2013 |
Sascha Haeberling <haeberling@google.com> |
am a5a08d76: Bring back tiny planet to the Camera filmstrip * commit 'a5a08d7642a1fdf961b057cc90e76c4c93103c15': Bring back tiny planet to the Camera filmstrip
|
a5a08d7642a1fdf961b057cc90e76c4c93103c15 |
12-Sep-2013 |
Sascha Haeberling <haeberling@google.com> |
Bring back tiny planet to the Camera filmstrip Bug: 10393598 The native code and XmpUtil are mostly 1:1 copies from Gallery2. The UI is new and should work on all form factors. Change-Id: Ia302a4a7a24cf0b3aa583836683c459e9e7e1f85
ndroid.mk
ni/Android.mk
ni/tinyplanet.cc
es/layout/tinyplanet_editor.xml
es/values/strings.xml
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/MediaSaveService.java
rc/com/android/camera/tinyplanet/TinyPlanetFragment.java
rc/com/android/camera/tinyplanet/TinyPlanetNative.java
rc/com/android/camera/tinyplanet/TinyPlanetPreview.java
rc/com/android/camera/ui/FilmStripView.java
rc/com/android/camera/util/XmpUtil.java
|
da4144231a630a44cbfe7c426e8696fe8d72a24c |
13-Sep-2013 |
Doris Liu <tianliu@google.com> |
am 742cd5b1: Keep undo bar around until there is user interaciton * commit '742cd5b18e1899bee1d430b61891238c0f3502b6': Keep undo bar around until there is user interaciton
|
7354e3ec2caf7b083d9099b178a9f8b05ab3874b |
13-Sep-2013 |
Doris Liu <tianliu@google.com> |
am 742cd5b1: Keep undo bar around until there is user interaciton * commit '742cd5b18e1899bee1d430b61891238c0f3502b6': Keep undo bar around until there is user interaciton
|
1d866ee9cdbc8556e593d260cfae916d484fb614 |
13-Sep-2013 |
ztenghui <ztenghui@google.com> |
am 9c52461d: am 99ba10e0: am a29a0ad0: Merge "When current data is preview, don\'t show the action bar." into gb-ub-photos-carlsbad * commit '9c52461daaa17250d3de2e0eade9a65a6941e63a': When current data is preview, don't show the action bar.
|
368bc8441a76e2193859bfd73121787936a0977d |
13-Sep-2013 |
ztenghui <ztenghui@google.com> |
Fix crash due to a hole in setDataSource. setDataSource() somehow throws a RuntimeException instead of IllegalArgumentException when seeing unsupported video file. bug:10732664 Change-Id: I79ab1f1afd8750bb37df0c8fc9448dbb2e00230a
rc/com/android/camera/data/LocalMediaData.java
|
742cd5b18e1899bee1d430b61891238c0f3502b6 |
13-Sep-2013 |
Doris Liu <tianliu@google.com> |
Keep undo bar around until there is user interaciton Bug: 10678578 Bug: 10674009 Also removed the use of withEndAction() call because it was introduced in API 16, whereas we need to be compatible with API 14+ Change-Id: I785770ae9a083f88056e94fc5378daf8ebc6dc6e
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/ui/FilmStripView.java
|
45f9b06b31666c2b880c24cf32f1ca8b21435422 |
12-Sep-2013 |
Angus Kong <shkong@google.com> |
Always leave full-screen when swip from camera. bug:10714779 Change-Id: Ifa10f151974ac0598a0c27751e23c77d525d332e
rc/com/android/camera/ui/FilmStripView.java
|
9c52461daaa17250d3de2e0eade9a65a6941e63a |
13-Sep-2013 |
ztenghui <ztenghui@google.com> |
am 99ba10e0: am a29a0ad0: Merge "When current data is preview, don\'t show the action bar." into gb-ub-photos-carlsbad * commit '99ba10e0e7708f10d1fec4214e3b74f566b9ab69': When current data is preview, don't show the action bar.
|
99ba10e0e7708f10d1fec4214e3b74f566b9ab69 |
13-Sep-2013 |
ztenghui <ztenghui@google.com> |
am a29a0ad0: Merge "When current data is preview, don\'t show the action bar." into gb-ub-photos-carlsbad * commit 'a29a0ad0fa7667177025a26d3043cb601ae17a6c': When current data is preview, don't show the action bar.
|
3eb8e280c33fa76a1336a33736cd46ae300a7d2f |
13-Sep-2013 |
ztenghui <ztenghui@google.com> |
am a29a0ad0: Merge "When current data is preview, don\'t show the action bar." into gb-ub-photos-carlsbad * commit 'a29a0ad0fa7667177025a26d3043cb601ae17a6c': When current data is preview, don't show the action bar.
|
a29a0ad0fa7667177025a26d3043cb601ae17a6c |
13-Sep-2013 |
ztenghui <ztenghui@google.com> |
Merge "When current data is preview, don't show the action bar." into gb-ub-photos-carlsbad
|
8566dd777cd219254c945240a31ac97de28792a2 |
12-Sep-2013 |
ztenghui <ztenghui@google.com> |
When current data is preview, don't show the action bar. bug:10678458 Change-Id: Ia48ca694ddca47438338e7223e9fa19c2c65dd5d
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/ui/FilmStripView.java
|
a82a331e312d6138bb4ea7d775077a12d960e677 |
12-Sep-2013 |
Baligh Uddin <baligh@google.com> |
am 9768be7a: (-s ours) am 4988cf65: (-s ours) am d1b0801a: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-carlsbad * commit '9768be7af47e89bebc28f97ee6bc1a9401f83b8d': Import translations. DO NOT MERGE
|
78b072fee70b4b799a9a7c2bd7abafc75a9808ca |
12-Sep-2013 |
Baligh Uddin <baligh@google.com> |
am 98c35e8c: (-s ours) am 11311445: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '98c35e8c2966170856463fe2931aba31d6b715f6': Import translations. DO NOT MERGE
|
9768be7af47e89bebc28f97ee6bc1a9401f83b8d |
12-Sep-2013 |
Baligh Uddin <baligh@google.com> |
am 4988cf65: (-s ours) am d1b0801a: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-carlsbad * commit '4988cf6544dca986d4350b7076411c43d47891cc': Import translations. DO NOT MERGE
|
98c35e8c2966170856463fe2931aba31d6b715f6 |
12-Sep-2013 |
Baligh Uddin <baligh@google.com> |
am 11311445: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '1131144520022dbe5bf0281e42e5ff06c921c37b': Import translations. DO NOT MERGE
|
d74e420c12e85b1ca066b9b5563a14b84e8a95a0 |
12-Sep-2013 |
Baligh Uddin <baligh@google.com> |
am d1b0801a: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-carlsbad * commit 'd1b0801a2e7f80c5ac047dded1edd0d3806f1e86': Import translations. DO NOT MERGE
|
4988cf6544dca986d4350b7076411c43d47891cc |
12-Sep-2013 |
Baligh Uddin <baligh@google.com> |
am d1b0801a: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-carlsbad * commit 'd1b0801a2e7f80c5ac047dded1edd0d3806f1e86': Import translations. DO NOT MERGE
|
a5c188a998a5f0f843381cc1505ec1e8838e6056 |
12-Sep-2013 |
The Android Automerger <android-build@google.com> |
merge in klp-release history after reset to klp-dev
|
f1b5a4d77d964109841cb506c346b345f4d355f9 |
12-Sep-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE"
|
1131144520022dbe5bf0281e42e5ff06c921c37b |
12-Sep-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into klp-dev
|
75432618f4c5ae581dfbf9b4a0f42a7f6963776b |
12-Sep-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-denali
|
d1b0801a2e7f80c5ac047dded1edd0d3806f1e86 |
12-Sep-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-carlsbad
|
c66beee16548a1e6eee88c5bd2eedf1feb128311 |
12-Sep-2013 |
Doris Liu <tianliu@google.com> |
am 2031c48d: am c9293ebd: am 36e56fba: Show captured image rather than frozen preview for capture intent * commit '2031c48d687e74fa9a1adde74ee5016449243bd5': Show captured image rather than frozen preview for capture intent
|
2031c48d687e74fa9a1adde74ee5016449243bd5 |
12-Sep-2013 |
Doris Liu <tianliu@google.com> |
am c9293ebd: am 36e56fba: Show captured image rather than frozen preview for capture intent * commit 'c9293ebd1e300de148a0a98965d74f556c4c7a9a': Show captured image rather than frozen preview for capture intent
|
c9293ebd1e300de148a0a98965d74f556c4c7a9a |
12-Sep-2013 |
Doris Liu <tianliu@google.com> |
am 36e56fba: Show captured image rather than frozen preview for capture intent * commit '36e56fba281292255a01ee00b4bee067fa09ab59': Show captured image rather than frozen preview for capture intent
|
e0e5478f88f3a436182c2caf61a951847dc07423 |
12-Sep-2013 |
Doris Liu <tianliu@google.com> |
am 36e56fba: Show captured image rather than frozen preview for capture intent * commit '36e56fba281292255a01ee00b4bee067fa09ab59': Show captured image rather than frozen preview for capture intent
|
36e56fba281292255a01ee00b4bee067fa09ab59 |
12-Sep-2013 |
Doris Liu <tianliu@google.com> |
Show captured image rather than frozen preview for capture intent Bug: 10570887 Change-Id: Ie986c865bdf452973b833efcdcb397c27bef2420
es/layout/photo_module.xml
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/PhotoUI.java
|
5566671e96ce699bee3ed455a1d82574b9b4c743 |
12-Sep-2013 |
ztenghui <ztenghui@google.com> |
am fedfb465: am c6cc7335: am 7b265a6b: Fix the flash mode transition in video mode * commit 'fedfb465bb28fd41c2ba1f25b5dc2f002e03d723': Fix the flash mode transition in video mode
|
fedfb465bb28fd41c2ba1f25b5dc2f002e03d723 |
12-Sep-2013 |
ztenghui <ztenghui@google.com> |
am c6cc7335: am 7b265a6b: Fix the flash mode transition in video mode * commit 'c6cc7335986bbeacf7767f1280937ab4b5b2bdc1': Fix the flash mode transition in video mode
|
f23d62f9142a056729728d69106fa3df6d00345a |
12-Sep-2013 |
ztenghui <ztenghui@google.com> |
am 7b265a6b: Fix the flash mode transition in video mode * commit '7b265a6b2f55c6ae7afc30e63ba324c4084a5d8e': Fix the flash mode transition in video mode
|
c6cc7335986bbeacf7767f1280937ab4b5b2bdc1 |
12-Sep-2013 |
ztenghui <ztenghui@google.com> |
am 7b265a6b: Fix the flash mode transition in video mode * commit '7b265a6b2f55c6ae7afc30e63ba324c4084a5d8e': Fix the flash mode transition in video mode
|
7b265a6b2f55c6ae7afc30e63ba324c4084a5d8e |
09-Sep-2013 |
ztenghui <ztenghui@google.com> |
Fix the flash mode transition in video mode onSwitchMode is wrongly overloaded, now is fixed. Basically, onCurrentDataChanged will handle the switching in and out of Camera. onDataFullScreenChange will handle full screen change on non-preview data. bug:10610967 Change-Id: I199a20d40d66b78302e90e0f96826d03076b0e39
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/CameraModule.java
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/PhotoUI.java
rc/com/android/camera/VideoModule.java
rc/com/android/camera/VideoUI.java
rc/com/android/camera/WideAnglePanoramaModule.java
rc/com/android/camera/ui/FilmStripView.java
|
b5f4b3261e1410a329d8f7de41f8b8705a96e426 |
12-Sep-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I7308bed0e13e157fb27eceb2153becbaa8b250bb Auto-generated-cl: translation import
es/values-am/strings.xml
es/values-hi/strings.xml
|
b9bfc1a867ee9089e71d44b2a0532c12ed5888af |
12-Sep-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I69256509cf492a69765c6b9896aa2751aa114619 Auto-generated-cl: translation import
es/values-am/strings.xml
es/values-hi/strings.xml
|
116384bb192a74ba7c95fd0de1d749c99136b084 |
12-Sep-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I386f050c07469dfb3a1a1d696dacd59c8bd04325 Auto-generated-cl: translation import
es/values-am/strings.xml
es/values-hi/strings.xml
|
4f7c5bc6974fe705f91a4903b83d654294ae30eb |
12-Sep-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Id3a2de300eaa51a628613b653410bc6582545c83 Auto-generated-cl: translation import
es/values-am/strings.xml
es/values-hi/strings.xml
|
1a27aad679ef902176e79c5ac2533415be9e6a88 |
11-Sep-2013 |
The Android Automerger <android-build@google.com> |
merge in klp-release history after reset to klp-dev
|
79aeca999fc80aec531081097cec2e5c69c9de6e |
11-Sep-2013 |
Angus Kong <shkong@google.com> |
am 6fd118b2: am 2e36dff3: am 20703f72: Merge "Flinging back should stop at the first photo first." into gb-ub-photos-carlsbad * commit '6fd118b2d6134337bd1801cf8cf08ac8e209cd74': Flinging back should stop at the first photo first.
|
6fd118b2d6134337bd1801cf8cf08ac8e209cd74 |
11-Sep-2013 |
Angus Kong <shkong@google.com> |
am 2e36dff3: am 20703f72: Merge "Flinging back should stop at the first photo first." into gb-ub-photos-carlsbad * commit '2e36dff3a0295e0b29a9a0f5acdc2f94514f5a1a': Flinging back should stop at the first photo first.
|
c6184961120e7a8fb0f16229c82c9a2c6e0e9c17 |
11-Sep-2013 |
Angus Kong <shkong@google.com> |
am 20703f72: Merge "Flinging back should stop at the first photo first." into gb-ub-photos-carlsbad * commit '20703f72e087a01e6a589c2875819cf817581a51': Flinging back should stop at the first photo first.
|
2e36dff3a0295e0b29a9a0f5acdc2f94514f5a1a |
11-Sep-2013 |
Angus Kong <shkong@google.com> |
am 20703f72: Merge "Flinging back should stop at the first photo first." into gb-ub-photos-carlsbad * commit '20703f72e087a01e6a589c2875819cf817581a51': Flinging back should stop at the first photo first.
|
e73fec14fd477fa1842bd58c6cecab135bcc4ae6 |
11-Sep-2013 |
Doris Liu <tianliu@google.com> |
am a2a5570a: am 005fbbbc: am e1d5ba4f: Hide zoom view when going to full screen * commit 'a2a5570a8012287ae0528ec505ceea9a327f6b82': Hide zoom view when going to full screen
|
20703f72e087a01e6a589c2875819cf817581a51 |
11-Sep-2013 |
Angus Kong <shkong@google.com> |
Merge "Flinging back should stop at the first photo first." into gb-ub-photos-carlsbad
|
a2a5570a8012287ae0528ec505ceea9a327f6b82 |
11-Sep-2013 |
Doris Liu <tianliu@google.com> |
am 005fbbbc: am e1d5ba4f: Hide zoom view when going to full screen * commit '005fbbbcf6afe3f2dcb268115f4fe04ecd19cfd2': Hide zoom view when going to full screen
|
4c672b2e7516fc80a65aa115864690f8bac122e9 |
11-Sep-2013 |
Doris Liu <tianliu@google.com> |
am e1d5ba4f: Hide zoom view when going to full screen * commit 'e1d5ba4fc5470043e8645984e3018b712f5dfcff': Hide zoom view when going to full screen
|
005fbbbcf6afe3f2dcb268115f4fe04ecd19cfd2 |
11-Sep-2013 |
Doris Liu <tianliu@google.com> |
am e1d5ba4f: Hide zoom view when going to full screen * commit 'e1d5ba4fc5470043e8645984e3018b712f5dfcff': Hide zoom view when going to full screen
|
5fbe134c3cf1f7c2c82ccef223cab7eb43cd92f1 |
11-Sep-2013 |
Angus Kong <shkong@google.com> |
Flinging back should stop at the first photo first. bug:10634016 Change-Id: I44e715268b913902a444c977c136d1e0381b3833
rc/com/android/camera/ui/FilmStripView.java
|
e1d5ba4fc5470043e8645984e3018b712f5dfcff |
10-Sep-2013 |
Doris Liu <tianliu@google.com> |
Hide zoom view when going to full screen Bug: 10654903 Change-Id: Ibeed1e02e203dffc4aba69a52b748206a734294f
rc/com/android/camera/ui/FilmStripView.java
|
992c7b794c5a0231bd8ac637448dd6aba0f637fc |
10-Sep-2013 |
The Android Automerger <android-build@google.com> |
merge in klp-release history after reset to klp-dev
|
27c172c071844ed72ac91c348140cefc0588f017 |
10-Sep-2013 |
Baligh Uddin <baligh@google.com> |
am 1b6b0f8d: (-s ours) am eff820b2: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '1b6b0f8d24c354427e3f68dfa8fe46aaefab35c5': Import translations. DO NOT MERGE
|
1b6b0f8d24c354427e3f68dfa8fe46aaefab35c5 |
10-Sep-2013 |
Baligh Uddin <baligh@google.com> |
am eff820b2: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit 'eff820b2de7824ba82d310e1706800e4d34e41cc': Import translations. DO NOT MERGE
|
c3586a5e9b2b86f9b1eb5e76919424a8bd347dee |
10-Sep-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE"
|
eff820b2de7824ba82d310e1706800e4d34e41cc |
10-Sep-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into klp-dev
|
ec016a3ab1935da9bcfc094b56bafe2c591a478d |
10-Sep-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-denali
|
bf9ead6bf9dcf1f1b4767f2c2d8be650ab413066 |
10-Sep-2013 |
Baligh Uddin <baligh@google.com> |
am b9cbdd9c: (-s ours) am 359f2552: (-s ours) am 44c02874: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-carlsbad * commit 'b9cbdd9c55c75160d03a18d05a21dcb87d4e58ff': Import translations. DO NOT MERGE
|
b9cbdd9c55c75160d03a18d05a21dcb87d4e58ff |
10-Sep-2013 |
Baligh Uddin <baligh@google.com> |
am 359f2552: (-s ours) am 44c02874: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-carlsbad * commit '359f2552d54da59f9cd04862d9159a627fb7852b': Import translations. DO NOT MERGE
|
359f2552d54da59f9cd04862d9159a627fb7852b |
10-Sep-2013 |
Baligh Uddin <baligh@google.com> |
am 44c02874: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-carlsbad * commit '44c028746ab84c9f12e4f4db14aeda87c51d9835': Import translations. DO NOT MERGE
|
0589f910de33f7f44eaf77250d8dee8d0b1e9f32 |
10-Sep-2013 |
Baligh Uddin <baligh@google.com> |
am 44c02874: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-carlsbad * commit '44c028746ab84c9f12e4f4db14aeda87c51d9835': Import translations. DO NOT MERGE
|
44c028746ab84c9f12e4f4db14aeda87c51d9835 |
10-Sep-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-carlsbad
|
537669fdae272a1f82bf4b102395ad8f7ef0fd6c |
10-Sep-2013 |
Angus Kong <shkong@google.com> |
am 21fb09d3: am 7f9cd2a5: am 6aae9177: Merge "Fix images being off-center in filmstrip." into gb-ub-photos-carlsbad * commit '21fb09d385d6fb5cbc4d3d3194f2cb3fbee4913b': Fix images being off-center in filmstrip.
|
21fb09d385d6fb5cbc4d3d3194f2cb3fbee4913b |
10-Sep-2013 |
Angus Kong <shkong@google.com> |
am 7f9cd2a5: am 6aae9177: Merge "Fix images being off-center in filmstrip." into gb-ub-photos-carlsbad * commit '7f9cd2a5a238971694ea4646f864b3884874a83d': Fix images being off-center in filmstrip.
|
ce4ee85be5d9da27cecd9d44dd6045387448501d |
10-Sep-2013 |
Angus Kong <shkong@google.com> |
am 6aae9177: Merge "Fix images being off-center in filmstrip." into gb-ub-photos-carlsbad * commit '6aae9177ac432df82971facab214b365e92b4a04': Fix images being off-center in filmstrip.
|
7f9cd2a5a238971694ea4646f864b3884874a83d |
10-Sep-2013 |
Angus Kong <shkong@google.com> |
am 6aae9177: Merge "Fix images being off-center in filmstrip." into gb-ub-photos-carlsbad * commit '6aae9177ac432df82971facab214b365e92b4a04': Fix images being off-center in filmstrip.
|
6aae9177ac432df82971facab214b365e92b4a04 |
10-Sep-2013 |
Angus Kong <shkong@google.com> |
Merge "Fix images being off-center in filmstrip." into gb-ub-photos-carlsbad
|
563a289f1aed4dd7bf760959851ff6ad72c7627f |
10-Sep-2013 |
Angus Kong <shkong@google.com> |
Fix images being off-center in filmstrip. bug:10609827 bug:10650966 Change-Id: Ie06beaeb7c6a616d5d7ca751cfaa65a64844332c
rc/com/android/camera/ui/FilmStripView.java
|
328fe8ace71d83331c1c8b9b5054744666bcebb0 |
10-Sep-2013 |
Doris Liu <tianliu@google.com> |
am 870067e8: am 66cfdf11: am e074fcbd: Merge "Hide zoom view when back is pressed" into gb-ub-photos-carlsbad * commit '870067e87e6d2d9a827196bdd0eb645b7c4ba1cb': Hide zoom view when back is pressed
|
870067e87e6d2d9a827196bdd0eb645b7c4ba1cb |
10-Sep-2013 |
Doris Liu <tianliu@google.com> |
am 66cfdf11: am e074fcbd: Merge "Hide zoom view when back is pressed" into gb-ub-photos-carlsbad * commit '66cfdf11508addf60891c00f4f0752fb90cfe5fb': Hide zoom view when back is pressed
|
6b78f28b720be431ebe9662d7cd0eccdf11a3df2 |
10-Sep-2013 |
Doris Liu <tianliu@google.com> |
am e074fcbd: Merge "Hide zoom view when back is pressed" into gb-ub-photos-carlsbad * commit 'e074fcbdb7d7bb20dde8173b969cbbafb53b92a9': Hide zoom view when back is pressed
|
66cfdf11508addf60891c00f4f0752fb90cfe5fb |
10-Sep-2013 |
Doris Liu <tianliu@google.com> |
am e074fcbd: Merge "Hide zoom view when back is pressed" into gb-ub-photos-carlsbad * commit 'e074fcbdb7d7bb20dde8173b969cbbafb53b92a9': Hide zoom view when back is pressed
|
e074fcbdb7d7bb20dde8173b969cbbafb53b92a9 |
10-Sep-2013 |
Doris Liu <tianliu@google.com> |
Merge "Hide zoom view when back is pressed" into gb-ub-photos-carlsbad
|
16d8ffe5963fe1199796ab9559b7b26c77112e53 |
10-Sep-2013 |
Sascha Haeberling <haeberling@google.com> |
am e1a9e908: am db0ea490: am f8b877c2: Update indicators at the right time to show the correct state. * commit 'e1a9e9083cc1edfb810550c739de640f9bb90b0e': Update indicators at the right time to show the correct state.
|
e1a9e9083cc1edfb810550c739de640f9bb90b0e |
10-Sep-2013 |
Sascha Haeberling <haeberling@google.com> |
am db0ea490: am f8b877c2: Update indicators at the right time to show the correct state. * commit 'db0ea49051523552af59f1b336a4163b843908d8': Update indicators at the right time to show the correct state.
|
a7982d126d1b4afcd49692d6a5a287929a62e755 |
10-Sep-2013 |
Sascha Haeberling <haeberling@google.com> |
am f8b877c2: Update indicators at the right time to show the correct state. * commit 'f8b877c2dd4fed2c962c51d619e2548923888525': Update indicators at the right time to show the correct state.
|
db0ea49051523552af59f1b336a4163b843908d8 |
10-Sep-2013 |
Sascha Haeberling <haeberling@google.com> |
am f8b877c2: Update indicators at the right time to show the correct state. * commit 'f8b877c2dd4fed2c962c51d619e2548923888525': Update indicators at the right time to show the correct state.
|
03b75411538c60021799ccc7acc8ed4798253b6d |
10-Sep-2013 |
Doris Liu <tianliu@google.com> |
Hide zoom view when back is pressed Bug: 10677244 Change-Id: I2e42d35382dded28bdd47dbdca173a1fd2bf6ac7
rc/com/android/camera/ui/FilmStripView.java
|
f8b877c2dd4fed2c962c51d619e2548923888525 |
10-Sep-2013 |
Sascha Haeberling <haeberling@google.com> |
Update indicators at the right time to show the correct state. Bug: 10620907 Change-Id: I19de5820aff4b99709326a625765f416d8a5a5f5
rc/com/android/camera/VideoModule.java
|
4f2610b2a9df0bd25e91e0d0fbe9b4e921efa489 |
10-Sep-2013 |
Sascha Haeberling <haeberling@google.com> |
am 15304725: am 790bc99b: am b7639c64: Make sure we switch to preview view when resuming. * commit '15304725e9ccb6ecd5a9c6e020bcc39cc8356ea2': Make sure we switch to preview view when resuming.
|
15304725e9ccb6ecd5a9c6e020bcc39cc8356ea2 |
10-Sep-2013 |
Sascha Haeberling <haeberling@google.com> |
am 790bc99b: am b7639c64: Make sure we switch to preview view when resuming. * commit '790bc99b1b31983a46b3c78b77ed5fdc357b7800': Make sure we switch to preview view when resuming.
|
790bc99b1b31983a46b3c78b77ed5fdc357b7800 |
10-Sep-2013 |
Sascha Haeberling <haeberling@google.com> |
am b7639c64: Make sure we switch to preview view when resuming. * commit 'b7639c641f2ed5d0c60546349c3aa9e90c026878': Make sure we switch to preview view when resuming.
|
bd80e6fa5eacf0719c38b35d0c3606e8e2fabdb2 |
10-Sep-2013 |
Sascha Haeberling <haeberling@google.com> |
am b7639c64: Make sure we switch to preview view when resuming. * commit 'b7639c641f2ed5d0c60546349c3aa9e90c026878': Make sure we switch to preview view when resuming.
|
b7639c641f2ed5d0c60546349c3aa9e90c026878 |
09-Sep-2013 |
Sascha Haeberling <haeberling@google.com> |
Make sure we switch to preview view when resuming. Bug: 10640328 But we need to make sure to not always switch in onResume, as some activities stared from us (like playing a video or editing) require the UI flow to stay in filmstrip. Change-Id: Id2911be4949de9fd9fc4cb3451dd34e3fae8becf
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/VideoModule.java
rc/com/android/camera/data/CameraDataAdapter.java
rc/com/android/camera/data/FixedFirstDataAdapter.java
rc/com/android/camera/data/FixedLastDataAdapter.java
rc/com/android/camera/data/LocalData.java
rc/com/android/camera/data/LocalMediaData.java
rc/com/android/camera/data/SimpleViewData.java
rc/com/android/camera/ui/FilmStripView.java
rc/com/android/camera/util/CameraUtil.java
|
aabf64970da4249d7657a7f0b65efa596141e7eb |
09-Sep-2013 |
ztenghui <ztenghui@google.com> |
am 4997b532: am 8455977f: am 08d82bae: Merge "Update the data after edit." into gb-ub-photos-carlsbad * commit '4997b532b6c470d16ccc2681b592674119246100': Update the data after edit.
|
4997b532b6c470d16ccc2681b592674119246100 |
09-Sep-2013 |
ztenghui <ztenghui@google.com> |
am 8455977f: am 08d82bae: Merge "Update the data after edit." into gb-ub-photos-carlsbad * commit '8455977fc891149fb9a6e49cdb87652c867857a8': Update the data after edit.
|
8455977fc891149fb9a6e49cdb87652c867857a8 |
09-Sep-2013 |
ztenghui <ztenghui@google.com> |
am 08d82bae: Merge "Update the data after edit." into gb-ub-photos-carlsbad * commit '08d82bae967db1cc090ab763f072e0410eb4b05e': Update the data after edit.
|
a1f4d7369fda1973b65e619a1d1a8c01949f6870 |
09-Sep-2013 |
ztenghui <ztenghui@google.com> |
am 08d82bae: Merge "Update the data after edit." into gb-ub-photos-carlsbad * commit '08d82bae967db1cc090ab763f072e0410eb4b05e': Update the data after edit.
|
ab52b42775cd5ffe3404ffe52073dc823afc4363 |
09-Sep-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I8a7ee1a4b9023c4257dc7e6860e42219e637e119 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-az-rAZ/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-km-rKH/strings.xml
es/values-ko/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mn-rMN/strings.xml
es/values-ms-rMY/strings.xml
es/values-nb/strings.xml
es/values-ne-rNP/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-si-rLK/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
d6503eb59b20c84cc2d7398f51cdb8cda98b80f6 |
09-Sep-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Id933394699ad53eace19d97d160e4b86f2181d90 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-az-rAZ/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-km-rKH/strings.xml
es/values-ko/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mn-rMN/strings.xml
es/values-ms-rMY/strings.xml
es/values-nb/strings.xml
es/values-ne-rNP/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-si-rLK/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
d53fd8c6751b1c30343a8c97d2b0512859a09ff2 |
09-Sep-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: If99b0e48a475adf2741d0836e463ecc7e9af96c1 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms-rMY/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
072e482a3d109af49bba74317ba5f0477e8bd943 |
09-Sep-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I38c56cd29e446a64f00837851aa21507f4761dbd Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms-rMY/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
08d82bae967db1cc090ab763f072e0410eb4b05e |
09-Sep-2013 |
ztenghui <ztenghui@google.com> |
Merge "Update the data after edit." into gb-ub-photos-carlsbad
|
91ff406680b2f3731beb7f82b70b138ccbdffe9c |
06-Sep-2013 |
ztenghui <ztenghui@google.com> |
Update the data after edit. bug:10411943 Change-Id: I94804d581470a87f7449a2a249b0b2a27ab640a2
rc/com/android/camera/CameraActivity.java
|
fdf6fdc9267ef91ceba9813298f8b7673035dfa3 |
09-Sep-2013 |
The Android Automerger <android-build@google.com> |
merge in klp-release history after reset to klp-dev
|
df34386dff6ba5d9bd03a82c528d819ab865051d |
07-Sep-2013 |
Angus Kong <shkong@google.com> |
am 72bc2821: am 31ee75ce: am a7194601: Disable swipe in capture intent mode. * commit '72bc2821eb873f42f68b28daf7519eccc194cb6f': Disable swipe in capture intent mode.
|
72bc2821eb873f42f68b28daf7519eccc194cb6f |
07-Sep-2013 |
Angus Kong <shkong@google.com> |
am 31ee75ce: am a7194601: Disable swipe in capture intent mode. * commit '31ee75ce69df47e13e8125923caee634678f9ec7': Disable swipe in capture intent mode.
|
c7e62f9dce65bf1050a5c79eb6a8a45461a357a6 |
07-Sep-2013 |
Angus Kong <shkong@google.com> |
am a7194601: Disable swipe in capture intent mode. * commit 'a71946012df0eee8fe4859a22da3c56feba0344e': Disable swipe in capture intent mode.
|
31ee75ce69df47e13e8125923caee634678f9ec7 |
07-Sep-2013 |
Angus Kong <shkong@google.com> |
am a7194601: Disable swipe in capture intent mode. * commit 'a71946012df0eee8fe4859a22da3c56feba0344e': Disable swipe in capture intent mode.
|
a71946012df0eee8fe4859a22da3c56feba0344e |
07-Sep-2013 |
Angus Kong <shkong@google.com> |
Disable swipe in capture intent mode. bug:10606988 Change-Id: Iaf80cdef5b463795b9847f2ab9ab5c70f3f0083c
rc/com/android/camera/CameraActivity.java
|
88ce1c87e9b6e4e8d2bc21d715dc26d6bfa1023c |
06-Sep-2013 |
Angus Kong <shkong@google.com> |
Improve swipe gesture in filmstrip. bug:10552605 bug:10645736 Change-Id: I7f524c191b0d8bd051ce9e1399a1265d0cac2f25
rc/com/android/camera/ui/FilmStripView.java
|
d0fe47f8aee9d52a529968c2860dd147290579e8 |
06-Sep-2013 |
Angus Kong <shkong@google.com> |
am b32a26f7: am e9dba8ac: am 56ad83f7: Merge "Respect system auto-rotate setting." into gb-ub-photos-carlsbad * commit 'b32a26f769df19fa27ecebc1469309fa9ca18c30': Respect system auto-rotate setting.
|
b32a26f769df19fa27ecebc1469309fa9ca18c30 |
06-Sep-2013 |
Angus Kong <shkong@google.com> |
am e9dba8ac: am 56ad83f7: Merge "Respect system auto-rotate setting." into gb-ub-photos-carlsbad * commit 'e9dba8accf223071007175c1b81ce04ee0760c01': Respect system auto-rotate setting.
|
54feee2f38692d2f95bd1f3143e2f826163de606 |
06-Sep-2013 |
Angus Kong <shkong@google.com> |
am 56ad83f7: Merge "Respect system auto-rotate setting." into gb-ub-photos-carlsbad * commit '56ad83f797ab09af240d1f67d63e55dd602160c1': Respect system auto-rotate setting.
|
e9dba8accf223071007175c1b81ce04ee0760c01 |
06-Sep-2013 |
Angus Kong <shkong@google.com> |
am 56ad83f7: Merge "Respect system auto-rotate setting." into gb-ub-photos-carlsbad * commit '56ad83f797ab09af240d1f67d63e55dd602160c1': Respect system auto-rotate setting.
|
56ad83f797ab09af240d1f67d63e55dd602160c1 |
06-Sep-2013 |
Angus Kong <shkong@google.com> |
Merge "Respect system auto-rotate setting." into gb-ub-photos-carlsbad
|
c3db3fd3bb68500a53ce1f5134abfcbe317c3d31 |
06-Sep-2013 |
Angus Kong <shkong@google.com> |
am f322ed79: am 793729a5: am 080f8683: Merge "Improve swipe gesture in filmstrip." into gb-ub-photos-carlsbad * commit 'f322ed79ebc210abc501c9d39e8eff31339a09c9': Improve swipe gesture in filmstrip.
|
91e22961b5a667d9908f03f9c3c0f1369cf9c65b |
06-Sep-2013 |
Sascha Haeberling <haeberling@google.com> |
am 6792d81b: am 22610d24: am 5199c207: Set the system UI to low profile when we hide the action bar. * commit '6792d81b32998375a91bf4508bf0d62be15171c8': Set the system UI to low profile when we hide the action bar.
|
f322ed79ebc210abc501c9d39e8eff31339a09c9 |
06-Sep-2013 |
Angus Kong <shkong@google.com> |
am 793729a5: am 080f8683: Merge "Improve swipe gesture in filmstrip." into gb-ub-photos-carlsbad * commit '793729a5b69212c898c17300d41448f724b5b003': Improve swipe gesture in filmstrip.
|
6792d81b32998375a91bf4508bf0d62be15171c8 |
06-Sep-2013 |
Sascha Haeberling <haeberling@google.com> |
am 22610d24: am 5199c207: Set the system UI to low profile when we hide the action bar. * commit '22610d24c29adac498ffb7308141250f06ffdcfc': Set the system UI to low profile when we hide the action bar.
|
205122704acc5371b07d1c8d0bb7d77e791789ca |
06-Sep-2013 |
Angus Kong <shkong@google.com> |
am 080f8683: Merge "Improve swipe gesture in filmstrip." into gb-ub-photos-carlsbad * commit '080f868350a0f8c7666f5f5935db1e2b0a75f7f1': Improve swipe gesture in filmstrip.
|
793729a5b69212c898c17300d41448f724b5b003 |
06-Sep-2013 |
Angus Kong <shkong@google.com> |
am 080f8683: Merge "Improve swipe gesture in filmstrip." into gb-ub-photos-carlsbad * commit '080f868350a0f8c7666f5f5935db1e2b0a75f7f1': Improve swipe gesture in filmstrip.
|
9c92bb323788a984201fd7c101a3ae192107462b |
06-Sep-2013 |
Sascha Haeberling <haeberling@google.com> |
am dadcb042: am 5eca5f52: am cd7b8c13: Re-add a strings that should not have cleaned up. * commit 'dadcb0422a4bb181b4ea54a8ce395636a2b8b2e8': Re-add a strings that should not have cleaned up.
|
080f868350a0f8c7666f5f5935db1e2b0a75f7f1 |
06-Sep-2013 |
Angus Kong <shkong@google.com> |
Merge "Improve swipe gesture in filmstrip." into gb-ub-photos-carlsbad
|
17e669d695ef2a38d28d5ba2512937836293e9ca |
06-Sep-2013 |
Angus Kong <shkong@google.com> |
Improve swipe gesture in filmstrip. bug:10552605 bug:10645736 Change-Id: I7f524c191b0d8bd051ce9e1399a1265d0cac2f25
rc/com/android/camera/ui/FilmStripView.java
|
dadcb0422a4bb181b4ea54a8ce395636a2b8b2e8 |
06-Sep-2013 |
Sascha Haeberling <haeberling@google.com> |
am 5eca5f52: am cd7b8c13: Re-add a strings that should not have cleaned up. * commit '5eca5f526f470be011c9e56603fe45df347d623e': Re-add a strings that should not have cleaned up.
|
4ddee6ea91449077154fd94308f9cea3e35e4948 |
06-Sep-2013 |
Sascha Haeberling <haeberling@google.com> |
am 5199c207: Set the system UI to low profile when we hide the action bar. * commit '5199c2078f3aea06732015ce8ad354c066a2f4ec': Set the system UI to low profile when we hide the action bar.
|
22610d24c29adac498ffb7308141250f06ffdcfc |
06-Sep-2013 |
Sascha Haeberling <haeberling@google.com> |
am 5199c207: Set the system UI to low profile when we hide the action bar. * commit '5199c2078f3aea06732015ce8ad354c066a2f4ec': Set the system UI to low profile when we hide the action bar.
|
5199c2078f3aea06732015ce8ad354c066a2f4ec |
06-Sep-2013 |
Sascha Haeberling <haeberling@google.com> |
Set the system UI to low profile when we hide the action bar. Bug: 10633686 Change-Id: I3fca7b608807fd0a510641c7b32724173587c458
rc/com/android/camera/CameraActivity.java
|
793fbbd7fa2bb696dfa1fe6ec1e2d27d04c3f089 |
06-Sep-2013 |
Sascha Haeberling <haeberling@google.com> |
am cd7b8c13: Re-add a strings that should not have cleaned up. * commit 'cd7b8c13c3372f6124d284d45a5082dc7135ce7a': Re-add a strings that should not have cleaned up.
|
5eca5f526f470be011c9e56603fe45df347d623e |
06-Sep-2013 |
Sascha Haeberling <haeberling@google.com> |
am cd7b8c13: Re-add a strings that should not have cleaned up. * commit 'cd7b8c13c3372f6124d284d45a5082dc7135ce7a': Re-add a strings that should not have cleaned up.
|
cd7b8c13c3372f6124d284d45a5082dc7135ce7a |
06-Sep-2013 |
Sascha Haeberling <haeberling@google.com> |
Re-add a strings that should not have cleaned up. Bug: 10647548 Change-Id: I7b99a82a0748ed8ec8d5b288e8f1ed62d77d10ac
es/values/strings.xml
|
6d89585189b6b8a090999e3c9fc67dc713beb064 |
06-Sep-2013 |
Sascha Haeberling <haeberling@google.com> |
am d23a67e6: am 082fb573: am 46c09ba0: Remove unused strings. * commit 'd23a67e62aae529296709b1b3cee8e40738875f6': Remove unused strings.
|
a7cf5be1c085e87ae0c0d3d1a1f6fc74fb519754 |
06-Sep-2013 |
Baligh Uddin <baligh@google.com> |
am 5ea52719: (-s ours) am 7ca24118: (-s ours) am 01f12724: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-carlsbad * commit '5ea5271924aab88f789f3708b7a224bee31b4c17': Import translations. DO NOT MERGE
|
985680f8a94e160def041379e8c87db9f775f56a |
06-Sep-2013 |
Baligh Uddin <baligh@google.com> |
am 7c86cd26: (-s ours) am 8ebeb744: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '7c86cd2607aa06c9b47bfd3e876997977a48d4fd': Import translations. DO NOT MERGE
|
d23a67e62aae529296709b1b3cee8e40738875f6 |
06-Sep-2013 |
Sascha Haeberling <haeberling@google.com> |
am 082fb573: am 46c09ba0: Remove unused strings. * commit '082fb57328edab12df7f6d1ee9ac62648f765c74': Remove unused strings.
|
082fb57328edab12df7f6d1ee9ac62648f765c74 |
06-Sep-2013 |
Sascha Haeberling <haeberling@google.com> |
am 46c09ba0: Remove unused strings. * commit '46c09ba0ef7fac45ab7109d8608290c50cf40bce': Remove unused strings.
|
85ba26f97a1d4b198c5b883db298e2f863659412 |
06-Sep-2013 |
Sascha Haeberling <haeberling@google.com> |
am 46c09ba0: Remove unused strings. * commit '46c09ba0ef7fac45ab7109d8608290c50cf40bce': Remove unused strings.
|
46c09ba0ef7fac45ab7109d8608290c50cf40bce |
05-Sep-2013 |
Sascha Haeberling <haeberling@google.com> |
Remove unused strings. Bug: 10627919 Change-Id: I5434baf8785912a577fec9f363598e4d927fddc3
es/values/strings.xml
|
ce2b94917098f211cacaaebaa0f6b40021d3e3fa |
06-Sep-2013 |
Angus Kong <shkong@google.com> |
Respect system auto-rotate setting. bug:10623244 Change-Id: I66757e50daf487680ac4f49d854c0f49d672b6ff
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/VideoModule.java
rc/com/android/camera/WideAnglePanoramaModule.java
rc/com/android/camera/app/OrientationManager.java
|
5ea5271924aab88f789f3708b7a224bee31b4c17 |
06-Sep-2013 |
Baligh Uddin <baligh@google.com> |
am 7ca24118: (-s ours) am 01f12724: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-carlsbad * commit '7ca241183f8b4b883d5f6c98672e724770bd2c95': Import translations. DO NOT MERGE
|
7c86cd2607aa06c9b47bfd3e876997977a48d4fd |
06-Sep-2013 |
Baligh Uddin <baligh@google.com> |
am 8ebeb744: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '8ebeb744d8c5e7ea71c7a0482f18a7755301fe5a': Import translations. DO NOT MERGE
|
dc978b3b6a9a7c9d6a3f1777526e3860f4799f1e |
06-Sep-2013 |
Baligh Uddin <baligh@google.com> |
am 01f12724: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-carlsbad * commit '01f12724c0a0950e3d1d1c64cc7f1fb59ec3e316': Import translations. DO NOT MERGE
|
7ca241183f8b4b883d5f6c98672e724770bd2c95 |
06-Sep-2013 |
Baligh Uddin <baligh@google.com> |
am 01f12724: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-carlsbad * commit '01f12724c0a0950e3d1d1c64cc7f1fb59ec3e316': Import translations. DO NOT MERGE
|
9b5990cd99e5647c730ed4ef524c19e002419530 |
06-Sep-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE"
|
8ebeb744d8c5e7ea71c7a0482f18a7755301fe5a |
06-Sep-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into klp-dev
|
149d8c2c7c1d747a3dc90dbe8a9089e39fcb1d29 |
06-Sep-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-denali
|
01f12724c0a0950e3d1d1c64cc7f1fb59ec3e316 |
06-Sep-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-carlsbad
|
696e501d98983400b6f07f4d9f77b2caba603f8e |
05-Sep-2013 |
Doris Liu <tianliu@google.com> |
Fix black screen in mode switching Bug: 10632592 Change-Id: I3c8bc1f6a17709d39ec88b51a22edfbbab828bde
rc/com/android/camera/ui/FilmStripView.java
|
9783180ae241e5dab5f59356fb5fed7f5267c913 |
05-Sep-2013 |
Doris Liu <tianliu@google.com> |
am 8f5708b3: am 364295ed: am fffc6a5a: Merge "Fix black screen in mode switching" into gb-ub-photos-carlsbad * commit '8f5708b3471bdad57936b32204981835f1fceec7': Fix black screen in mode switching
|
8f5708b3471bdad57936b32204981835f1fceec7 |
05-Sep-2013 |
Doris Liu <tianliu@google.com> |
am 364295ed: am fffc6a5a: Merge "Fix black screen in mode switching" into gb-ub-photos-carlsbad * commit '364295ed6c6c6a872cd7cc0c72597814f47d6b2d': Fix black screen in mode switching
|
364295ed6c6c6a872cd7cc0c72597814f47d6b2d |
05-Sep-2013 |
Doris Liu <tianliu@google.com> |
am fffc6a5a: Merge "Fix black screen in mode switching" into gb-ub-photos-carlsbad * commit 'fffc6a5a3458cd0a29a49f10ff5ea1834c1c98fc': Fix black screen in mode switching
|
2a229bf02f7cf4d30b1ec269cc4b03b071163108 |
05-Sep-2013 |
Doris Liu <tianliu@google.com> |
am fffc6a5a: Merge "Fix black screen in mode switching" into gb-ub-photos-carlsbad * commit 'fffc6a5a3458cd0a29a49f10ff5ea1834c1c98fc': Fix black screen in mode switching
|
fffc6a5a3458cd0a29a49f10ff5ea1834c1c98fc |
05-Sep-2013 |
Doris Liu <tianliu@google.com> |
Merge "Fix black screen in mode switching" into gb-ub-photos-carlsbad
|
564343e34ab0e43e131566bf74a9448d1e982ad7 |
05-Sep-2013 |
Doris Liu <tianliu@google.com> |
Fix black screen in mode switching Bug: 10632592 Change-Id: I3c8bc1f6a17709d39ec88b51a22edfbbab828bde
rc/com/android/camera/ui/FilmStripView.java
|
f070812dc05a1d385e04d4c85bdd537c5aae6dc1 |
05-Sep-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I162f1cf0f0c54825582bd4d1a559234f4dc2590e Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-az-rAZ/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-fa/strings.xml
es/values-fr-rCA/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ms-rMY/strings.xml
es/values-ro/strings.xml
es/values-th/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
|
0764f1c0fe7fbf184665000cbb495df87e2159a6 |
05-Sep-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I7290132a6577d8e8b5658dfcaaeb250c3d096f07 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-az-rAZ/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-fa/strings.xml
es/values-fr-rCA/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ms-rMY/strings.xml
es/values-ro/strings.xml
es/values-th/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
|
0a8f64c1fb984b80809023ffea59dfa21c70e535 |
05-Sep-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I72bad30278a45d62ab00ffc55bcf023b3f21984a Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-fa/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ms-rMY/strings.xml
es/values-ro/strings.xml
es/values-th/strings.xml
es/values-zh-rTW/strings.xml
|
d7d20b1519116bbb97374fa0c5cc310ca2383bf1 |
05-Sep-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I4d61c5deed477ebc178cc4ad99424ac1d5fad336 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-fa/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ms-rMY/strings.xml
es/values-ro/strings.xml
es/values-th/strings.xml
es/values-zh-rTW/strings.xml
|
e2988467c55996574090bda006361ff96be8b62f |
05-Sep-2013 |
The Android Automerger <android-build@google.com> |
merge in klp-release history after reset to klp-dev
|
b7dfb20645f926a2eec848bc11c6ea0e61bbeb92 |
05-Sep-2013 |
Angus Kong <shkong@google.com> |
am 4df74700: am 4aac7d25: am 33bb2d47: Merge "Bring back wide angle panorama." into gb-ub-photos-carlsbad * commit '4df7470055b9e431987a561e57904848d35dc37a': Bring back wide angle panorama.
|
4df7470055b9e431987a561e57904848d35dc37a |
05-Sep-2013 |
Angus Kong <shkong@google.com> |
am 4aac7d25: am 33bb2d47: Merge "Bring back wide angle panorama." into gb-ub-photos-carlsbad * commit '4aac7d254d464e1659320c9b32d6fc080ec27dd8': Bring back wide angle panorama.
|
2f5ca57cd1f9e0e6b085bf2131c2b457ab81e053 |
05-Sep-2013 |
Angus Kong <shkong@google.com> |
am 33bb2d47: Merge "Bring back wide angle panorama." into gb-ub-photos-carlsbad * commit '33bb2d47fa5850c14f7fe42e07ab6f21585efade': Bring back wide angle panorama.
|
4aac7d254d464e1659320c9b32d6fc080ec27dd8 |
05-Sep-2013 |
Angus Kong <shkong@google.com> |
am 33bb2d47: Merge "Bring back wide angle panorama." into gb-ub-photos-carlsbad * commit '33bb2d47fa5850c14f7fe42e07ab6f21585efade': Bring back wide angle panorama.
|
33bb2d47fa5850c14f7fe42e07ab6f21585efade |
05-Sep-2013 |
Angus Kong <shkong@google.com> |
Merge "Bring back wide angle panorama." into gb-ub-photos-carlsbad
|
3aa9e0f0f193adb496d722310e66320940359384 |
05-Sep-2013 |
Alan Newberger <alann@google.com> |
am a10ab337: am 364f1200: am 1ef76d4c: reintroduce action bar hiding for onDataChanged * commit 'a10ab337afcbacf31e6d426fe2d1145791a1ce56': reintroduce action bar hiding for onDataChanged
|
a10ab337afcbacf31e6d426fe2d1145791a1ce56 |
05-Sep-2013 |
Alan Newberger <alann@google.com> |
am 364f1200: am 1ef76d4c: reintroduce action bar hiding for onDataChanged * commit '364f12004622ff16ae16ef0f10d8c101c16597ec': reintroduce action bar hiding for onDataChanged
|
7d365c510d7044b050e14a6272065b794b1f2113 |
05-Sep-2013 |
Alan Newberger <alann@google.com> |
am 1ef76d4c: reintroduce action bar hiding for onDataChanged * commit '1ef76d4cbd73c02cb8d02cf4cde3f4cee81548d6': reintroduce action bar hiding for onDataChanged
|
364f12004622ff16ae16ef0f10d8c101c16597ec |
05-Sep-2013 |
Alan Newberger <alann@google.com> |
am 1ef76d4c: reintroduce action bar hiding for onDataChanged * commit '1ef76d4cbd73c02cb8d02cf4cde3f4cee81548d6': reintroduce action bar hiding for onDataChanged
|
1ef76d4cbd73c02cb8d02cf4cde3f4cee81548d6 |
05-Sep-2013 |
Alan Newberger <alann@google.com> |
reintroduce action bar hiding for onDataChanged this code was present but got inadvertently removed by a subsequent change Icb07e9e890a72bec6ed3b4c5a7e33400be3446f8. Change-Id: If6c0f31497406fc3056dbb48d67b195342f6d10f
rc/com/android/camera/CameraActivity.java
|
c227d9c18e6a325968b4b313c1505c8dab82dad3 |
05-Sep-2013 |
Sascha Haeberling <haeberling@google.com> |
am efcd9eb0: am 540f719a: am 5633994e: Increase char limit. * commit 'efcd9eb0bde8ed1f334fa5f08c0c5120eaa7d221': Increase char limit.
|
efcd9eb0bde8ed1f334fa5f08c0c5120eaa7d221 |
05-Sep-2013 |
Sascha Haeberling <haeberling@google.com> |
am 540f719a: am 5633994e: Increase char limit. * commit '540f719ab58d0a4776b0eb419a3b5f24738fb7f8': Increase char limit.
|
540f719ab58d0a4776b0eb419a3b5f24738fb7f8 |
05-Sep-2013 |
Sascha Haeberling <haeberling@google.com> |
am 5633994e: Increase char limit. * commit '5633994ecddb26bdd7a577a5b015b95bcb33e309': Increase char limit.
|
f3665d9aa3136189be20f2e37a72ed60f4308bda |
05-Sep-2013 |
Sascha Haeberling <haeberling@google.com> |
am 5633994e: Increase char limit. * commit '5633994ecddb26bdd7a577a5b015b95bcb33e309': Increase char limit.
|
5633994ecddb26bdd7a577a5b015b95bcb33e309 |
05-Sep-2013 |
Sascha Haeberling <haeberling@google.com> |
Increase char limit. Bug: 10590844 Change-Id: Ib30d348c1806e5c1b174bdd5198b880a2dca14e5
es/values/strings.xml
|
a16866207064e59a5bb0fb70946370d9bd2a7f49 |
05-Sep-2013 |
Mangesh Ghiware <mghiware@google.com> |
am 56b63cdc: am 631c94a8: am 33035c19: Bring back \'share 360 photosphere\' to filmstrip * commit '56b63cdc4a85c919bdf939c218cb5c48fb79bafc': Bring back 'share 360 photosphere' to filmstrip
|
56b63cdc4a85c919bdf939c218cb5c48fb79bafc |
05-Sep-2013 |
Mangesh Ghiware <mghiware@google.com> |
am 631c94a8: am 33035c19: Bring back \'share 360 photosphere\' to filmstrip * commit '631c94a8928b864bc5429bf14b275dc36292fedc': Bring back 'share 360 photosphere' to filmstrip
|
631c94a8928b864bc5429bf14b275dc36292fedc |
05-Sep-2013 |
Mangesh Ghiware <mghiware@google.com> |
am 33035c19: Bring back \'share 360 photosphere\' to filmstrip * commit '33035c19cc47adfb738c20cef66652ae451c8e10': Bring back 'share 360 photosphere' to filmstrip
|
809f7c308fa765a7327245fb30f6c47ddd555e46 |
05-Sep-2013 |
Mangesh Ghiware <mghiware@google.com> |
am 33035c19: Bring back \'share 360 photosphere\' to filmstrip * commit '33035c19cc47adfb738c20cef66652ae451c8e10': Bring back 'share 360 photosphere' to filmstrip
|
33035c19cc47adfb738c20cef66652ae451c8e10 |
23-Aug-2013 |
Mangesh Ghiware <mghiware@google.com> |
Bring back 'share 360 photosphere' to filmstrip Bug: 10367406 Change-Id: Icb07e9e890a72bec6ed3b4c5a7e33400be3446f8
es/menu/operations.xml
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/ui/FilmStripView.java
|
4f01d6895a47126211cd18ae16a7113d24e33cdb |
05-Sep-2013 |
Doris Liu <tianliu@google.com> |
am 06618394: am 194d84f1: am 121022cb: Double tap to zoom all the way in and out * commit '0661839460fe24bbead112bc22acd68e2a32cc90': Double tap to zoom all the way in and out
|
0661839460fe24bbead112bc22acd68e2a32cc90 |
05-Sep-2013 |
Doris Liu <tianliu@google.com> |
am 194d84f1: am 121022cb: Double tap to zoom all the way in and out * commit '194d84f16271cb86069145deae2fbd16841b15ce': Double tap to zoom all the way in and out
|
194d84f16271cb86069145deae2fbd16841b15ce |
05-Sep-2013 |
Doris Liu <tianliu@google.com> |
am 121022cb: Double tap to zoom all the way in and out * commit '121022cb590955e37f1264f77190ce4711159976': Double tap to zoom all the way in and out
|
3d799e5fd741bb5b28aa4719565e5cf28673a984 |
05-Sep-2013 |
Doris Liu <tianliu@google.com> |
am 121022cb: Double tap to zoom all the way in and out * commit '121022cb590955e37f1264f77190ce4711159976': Double tap to zoom all the way in and out
|
121022cb590955e37f1264f77190ce4711159976 |
04-Sep-2013 |
Doris Liu <tianliu@google.com> |
Double tap to zoom all the way in and out Bug: 10308195 Change-Id: Id6c1bd6c95a812c3aae0c292ca53e3de6eea2d55
rc/com/android/camera/ui/FilmStripGestureRecognizer.java
rc/com/android/camera/ui/FilmStripView.java
rc/com/android/camera/ui/ZoomView.java
|
ed15d1a140986473bbe7fffd72ec9618c41c5979 |
20-Aug-2013 |
Angus Kong <shkong@google.com> |
Bring back wide angle panorama. bug:10293937 Change-Id: I23a977e87b7416f07ecac20025b6c142ae61be05
ndroid.mk
es/drawable-hdpi/ic_switch_pan.png
es/drawable-mdpi/ic_switch_pan.png
es/drawable-xhdpi/ic_switch_pan.png
es/drawable/pano_direction_left_indicator.xml
es/drawable/pano_direction_right_indicator.xml
es/layout-land/camera_controls.xml
es/layout-land/pano_module_capture.xml
es/layout-land/pano_module_review.xml
es/layout-port/camera_controls.xml
es/layout-port/pano_module_capture.xml
es/layout-port/pano_module_review.xml
es/layout/panorama_module.xml
es/values-land/styles.xml
es/values-port/styles.xml
es/values/styles.xml
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/Mosaic.java
rc/com/android/camera/MosaicFrameProcessor.java
rc/com/android/camera/MosaicPreviewRenderer.java
rc/com/android/camera/MosaicRenderer.java
rc/com/android/camera/PanoProgressBar.java
rc/com/android/camera/PanoUtil.java
rc/com/android/camera/PhotoUI.java
rc/com/android/camera/PreviewFrameLayout.java
rc/com/android/camera/VideoUI.java
rc/com/android/camera/WideAnglePanoramaController.java
rc/com/android/camera/WideAnglePanoramaModule.java
rc/com/android/camera/WideAnglePanoramaUI.java
rc/com/android/camera/app/AppManagerFactory.java
rc/com/android/camera/app/CameraApp.java
rc/com/android/camera/app/OrientationManager.java
rc/com/android/camera/app/OrientationSource.java
rc/com/android/camera/ui/CameraRootView.java
rc/com/android/camera/ui/CameraSwitcher.java
rc/com/android/camera/ui/LayoutChangeHelper.java
rc/com/android/camera/ui/LayoutChangeNotifier.java
rc/com/android/camera/ui/LayoutNotifyView.java
rc/com/android/camera/ui/ModuleSwitcher.java
rc_pd/com/android/camera/PanoramaStitchingManager.java
rc_pd/com/android/camera/app/PanoramaStitchingManager.java
|
933c93a090d04c551ff9e656293929fb81498a37 |
04-Sep-2013 |
The Android Automerger <android-build@google.com> |
merge in klp-release history after reset to klp-dev
|
16447be43eae88021f9ec2f0e021b647cdc42976 |
04-Sep-2013 |
Baligh Uddin <baligh@google.com> |
am 98680095: (-s ours) am 0ab8fabb: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '98680095aa996ffd2633ae1ab1a4bb7b237ce4ce': Import translations. DO NOT MERGE
|
958c83d46f69db4e23173dd5eaf4a55fcf93a186 |
04-Sep-2013 |
Baligh Uddin <baligh@google.com> |
am 659ea14a: (-s ours) am fb56e3fe: (-s ours) am 7ff7b04d: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-carlsbad * commit '659ea14a2d84b369f717d802e206027ed76d8a70': Import translations. DO NOT MERGE
|
98680095aa996ffd2633ae1ab1a4bb7b237ce4ce |
04-Sep-2013 |
Baligh Uddin <baligh@google.com> |
am 0ab8fabb: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '0ab8fabbb3ee7bc575fc7127a209b4fc6c396933': Import translations. DO NOT MERGE
|
659ea14a2d84b369f717d802e206027ed76d8a70 |
04-Sep-2013 |
Baligh Uddin <baligh@google.com> |
am fb56e3fe: (-s ours) am 7ff7b04d: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-carlsbad * commit 'fb56e3fe13d4aa24c9ff09dd28d9e0d8e05e2ae3': Import translations. DO NOT MERGE
|
0ab8fabbb3ee7bc575fc7127a209b4fc6c396933 |
04-Sep-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into klp-dev
|
ff1ca750fdd826247f07e5d97242ae4358a29fb9 |
04-Sep-2013 |
Baligh Uddin <baligh@google.com> |
am 7ff7b04d: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-carlsbad * commit '7ff7b04dd187b2662c9faeb58f660a248b3764a7': Import translations. DO NOT MERGE
|
fb56e3fe13d4aa24c9ff09dd28d9e0d8e05e2ae3 |
04-Sep-2013 |
Baligh Uddin <baligh@google.com> |
am 7ff7b04d: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-carlsbad * commit '7ff7b04dd187b2662c9faeb58f660a248b3764a7': Import translations. DO NOT MERGE
|
37f3e3fc222152edfd13776e32a9ea483460e0c0 |
04-Sep-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE"
|
ea9a37f96484df75e4438e5a5e85f08b0d5269a9 |
04-Sep-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-denali
|
7ff7b04dd187b2662c9faeb58f660a248b3764a7 |
04-Sep-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-carlsbad
|
47a6d7373a7df27ba5c596b57cc8abcc9f6753e4 |
04-Sep-2013 |
Sascha Haeberling <haeberling@google.com> |
am d6e28ae1: am 52a0a4f0: am 26145e56: Use app_name label now that we have the correct translations. * commit 'd6e28ae1ee307ddaf0e52deb24db101e3592948e': Use app_name label now that we have the correct translations.
|
d6e28ae1ee307ddaf0e52deb24db101e3592948e |
04-Sep-2013 |
Sascha Haeberling <haeberling@google.com> |
am 52a0a4f0: am 26145e56: Use app_name label now that we have the correct translations. * commit '52a0a4f0be9226fac107346d1010d139f93cc050': Use app_name label now that we have the correct translations.
|
52a0a4f0be9226fac107346d1010d139f93cc050 |
04-Sep-2013 |
Sascha Haeberling <haeberling@google.com> |
am 26145e56: Use app_name label now that we have the correct translations. * commit '26145e56f6e98733569b7093573fc26f44d3cfa5': Use app_name label now that we have the correct translations.
|
67d967c244c34ac48a399a6638f0465ba89de6a4 |
04-Sep-2013 |
Sascha Haeberling <haeberling@google.com> |
am 26145e56: Use app_name label now that we have the correct translations. * commit '26145e56f6e98733569b7093573fc26f44d3cfa5': Use app_name label now that we have the correct translations.
|
26145e56f6e98733569b7093573fc26f44d3cfa5 |
04-Sep-2013 |
Sascha Haeberling <haeberling@google.com> |
Use app_name label now that we have the correct translations. Bug: 10509882 Change-Id: I58e7d26afb5636fa156ec22b7c1cfa21262dd9f7
ndroidManifest.xml
|
9404249c18ea0bab1131bca165b58df0a81e696a |
03-Sep-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ide25e1fa4f82cd1149c6dbd734bbf3627755c7f9 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-az-rAZ/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-km-rKH/strings.xml
es/values-ko/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mn-rMN/strings.xml
es/values-ms-rMY/strings.xml
es/values-nb/strings.xml
es/values-ne-rNP/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-si-rLK/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
ba598b9d9db95f0f570caaab935ec32059d43bd2 |
03-Sep-2013 |
ztenghui <ztenghui@google.com> |
am c346b81b: am 6d7237f2: am 269c824d: Merge "Don\'t show the action bar in the capture intent." into gb-ub-photos-carlsbad * commit 'c346b81bc0263206a41020f699a1a6e213b9d665': Don't show the action bar in the capture intent.
|
57c0a9651f1430c669b0820ce798a784e2628cda |
03-Sep-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Iad77e8a0d648ed7b2bb3205e1d6ab1e73dafde76 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-az-rAZ/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-km-rKH/strings.xml
es/values-ko/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mn-rMN/strings.xml
es/values-ms-rMY/strings.xml
es/values-nb/strings.xml
es/values-ne-rNP/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-si-rLK/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
4bbb524b74eed9e7a8008687519f6fdcbd4f7cbd |
03-Sep-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I9caa5f6f0b46237b1f9eed72ce17905332d9e9c2 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms-rMY/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
f1b6498c116e136c7eb2c1b83a012789ac7ba470 |
03-Sep-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ib04bd2f74b2812001a26d50dfca2a27351e6cbe3 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms-rMY/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
c346b81bc0263206a41020f699a1a6e213b9d665 |
03-Sep-2013 |
ztenghui <ztenghui@google.com> |
am 6d7237f2: am 269c824d: Merge "Don\'t show the action bar in the capture intent." into gb-ub-photos-carlsbad * commit '6d7237f2d34f0d4f9bf24c14dddee123d6caa488': Don't show the action bar in the capture intent.
|
b47f2856750de4cdf0cd2b5395ac61b8479385c5 |
03-Sep-2013 |
ztenghui <ztenghui@google.com> |
am 269c824d: Merge "Don\'t show the action bar in the capture intent." into gb-ub-photos-carlsbad * commit '269c824d720b2e902c4ad6c3bb23422644da1f41': Don't show the action bar in the capture intent.
|
6d7237f2d34f0d4f9bf24c14dddee123d6caa488 |
03-Sep-2013 |
ztenghui <ztenghui@google.com> |
am 269c824d: Merge "Don\'t show the action bar in the capture intent." into gb-ub-photos-carlsbad * commit '269c824d720b2e902c4ad6c3bb23422644da1f41': Don't show the action bar in the capture intent.
|
269c824d720b2e902c4ad6c3bb23422644da1f41 |
03-Sep-2013 |
ztenghui <ztenghui@google.com> |
Merge "Don't show the action bar in the capture intent." into gb-ub-photos-carlsbad
|
f06e01d7ea653b0c1138e4cf83fbdc10794030d6 |
03-Sep-2013 |
ztenghui <ztenghui@google.com> |
am 549ac4b8: am 1247a8bc: am 2c3d9a58: Don\'t show action bar when in camera preview. * commit '549ac4b834781db9623a3debe01596a34adb6de6': Don't show action bar when in camera preview.
|
549ac4b834781db9623a3debe01596a34adb6de6 |
03-Sep-2013 |
ztenghui <ztenghui@google.com> |
am 1247a8bc: am 2c3d9a58: Don\'t show action bar when in camera preview. * commit '1247a8bc53cd391d0b21c06adbf63e4b621c5bc8': Don't show action bar when in camera preview.
|
1247a8bc53cd391d0b21c06adbf63e4b621c5bc8 |
03-Sep-2013 |
ztenghui <ztenghui@google.com> |
am 2c3d9a58: Don\'t show action bar when in camera preview. * commit '2c3d9a58d8942f73bc16c71e57584e4d89410185': Don't show action bar when in camera preview.
|
00ea32fcc496a271c7858c88d2460f7d0ecc5101 |
03-Sep-2013 |
ztenghui <ztenghui@google.com> |
am 2c3d9a58: Don\'t show action bar when in camera preview. * commit '2c3d9a58d8942f73bc16c71e57584e4d89410185': Don't show action bar when in camera preview.
|
2c3d9a58d8942f73bc16c71e57584e4d89410185 |
03-Sep-2013 |
ztenghui <ztenghui@google.com> |
Don't show action bar when in camera preview. There are 3 cases we need to toggle the action bar. 1. Touch in full screen mode. onToggleActionBarVisibility() 2. Swipe back and forth to film stripe from preview. onSwitchMode() 3. In full screen mode, current data becomes the preview. onCurrentDataChanged() bug:10563392 Change-Id: I576c49b767cd863da725cf991238c27440d85b9b
rc/com/android/camera/CameraActivity.java
|
fd43e3be3d69f48a97bdd9084e9549f41e963cc2 |
03-Sep-2013 |
ztenghui <ztenghui@google.com> |
Don't show the action bar in the capture intent. bug:10571262 Change-Id: I85ed9c632f76084db95ce24277fb303c67c3949f
rc/com/android/camera/CameraActivity.java
|
161098d5f1548d5a7f2581e1d4f5c84ec64666ae |
02-Sep-2013 |
The Android Automerger <android-build@google.com> |
merge in klp-release history after reset to klp-dev
|
a92676ca0aa517b270bdf6e19215a8f8358d6cf6 |
31-Aug-2013 |
Baligh Uddin <baligh@google.com> |
am 52790c96: (-s ours) am 95dd838a: (-s ours) am 5457782d: (-s ours) Import translations. DO NOT MERGE * commit '52790c9686ee475bbd8a1b3c0d11f5c2de60bb7b': Import translations. DO NOT MERGE
|
52790c9686ee475bbd8a1b3c0d11f5c2de60bb7b |
31-Aug-2013 |
Baligh Uddin <baligh@google.com> |
am 95dd838a: (-s ours) am 5457782d: (-s ours) Import translations. DO NOT MERGE * commit '95dd838ab3d0768de66b67763a7aa46706e1305f': Import translations. DO NOT MERGE
|
95dd838ab3d0768de66b67763a7aa46706e1305f |
31-Aug-2013 |
Baligh Uddin <baligh@google.com> |
am 5457782d: (-s ours) Import translations. DO NOT MERGE * commit '5457782daf2d03bdc1ac8f6b7143c92c62c3cfd0': Import translations. DO NOT MERGE
|
a5aff944bccf404cfb287cb90b30313316585b12 |
31-Aug-2013 |
Baligh Uddin <baligh@google.com> |
am 5457782d: (-s ours) Import translations. DO NOT MERGE * commit '5457782daf2d03bdc1ac8f6b7143c92c62c3cfd0': Import translations. DO NOT MERGE
|
5457782daf2d03bdc1ac8f6b7143c92c62c3cfd0 |
31-Aug-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ia4ef8cf1acece5a8413feffbbecc2e3713e28332 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms-rMY/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
0e5ec1ee4464a8ea94db1c48e1df56cd5ddcfcbd |
31-Aug-2013 |
Sascha Haeberling <haeberling@google.com> |
am d9746979: am cb46d560: am 1d9a8d7a: Rename renering message from panorama to photo sphere. * commit 'd974697911011ae8ff9fff59cbebc9a112698698': Rename renering message from panorama to photo sphere.
|
d974697911011ae8ff9fff59cbebc9a112698698 |
31-Aug-2013 |
Sascha Haeberling <haeberling@google.com> |
am cb46d560: am 1d9a8d7a: Rename renering message from panorama to photo sphere. * commit 'cb46d560990d7b39d0d341a89028a1b886acfb4c': Rename renering message from panorama to photo sphere.
|
cb46d560990d7b39d0d341a89028a1b886acfb4c |
31-Aug-2013 |
Sascha Haeberling <haeberling@google.com> |
am 1d9a8d7a: Rename renering message from panorama to photo sphere. * commit '1d9a8d7a0fa22e66aa2efdcf35aca57f7ffa432a': Rename renering message from panorama to photo sphere.
|
34fbebddef8023a9ec14a3be11eb2e18b2d81944 |
31-Aug-2013 |
Sascha Haeberling <haeberling@google.com> |
am 1d9a8d7a: Rename renering message from panorama to photo sphere. * commit '1d9a8d7a0fa22e66aa2efdcf35aca57f7ffa432a': Rename renering message from panorama to photo sphere.
|
1d9a8d7a0fa22e66aa2efdcf35aca57f7ffa432a |
31-Aug-2013 |
Sascha Haeberling <haeberling@google.com> |
Rename renering message from panorama to photo sphere. Bug: 7695145 Change-Id: Ibfd083d4a879eda5dbf866e3a22df651166ea315
es/layout/camera_filmstrip.xml
es/values/strings.xml
|
658d6900e28bfe4472e1b6ce89bc5bcb5a548396 |
31-Aug-2013 |
Doris Liu <tianliu@google.com> |
am 5f296514: am 14f85082: am 0dff7ce1: Merge "Reset zoom view when user exits app or rotate device" into gb-ub-photos-carlsbad * commit '5f29651483526014b1c1a441ec17e1c0d7bd7cce': Reset zoom view when user exits app or rotate device
|
74127fd3ba3f3ad0c137844ee28112be9f986df8 |
31-Aug-2013 |
Angus Kong <shkong@google.com> |
am 0a21bf1a: am 6e9cfebc: am b2f0968c: Merge "Make the preview thumbnail clicable after scaling." into gb-ub-photos-carlsbad * commit '0a21bf1a54f1f27df4849cd17174ec655ed988d7': Make the preview thumbnail clicable after scaling.
|
5f29651483526014b1c1a441ec17e1c0d7bd7cce |
31-Aug-2013 |
Doris Liu <tianliu@google.com> |
am 14f85082: am 0dff7ce1: Merge "Reset zoom view when user exits app or rotate device" into gb-ub-photos-carlsbad * commit '14f85082d9aba3819fd8f0f64bf5aaf28a2fbe9b': Reset zoom view when user exits app or rotate device
|
0a21bf1a54f1f27df4849cd17174ec655ed988d7 |
31-Aug-2013 |
Angus Kong <shkong@google.com> |
am 6e9cfebc: am b2f0968c: Merge "Make the preview thumbnail clicable after scaling." into gb-ub-photos-carlsbad * commit '6e9cfebc56b703ba2057061ba9a9f192e645d437': Make the preview thumbnail clicable after scaling.
|
14f85082d9aba3819fd8f0f64bf5aaf28a2fbe9b |
31-Aug-2013 |
Doris Liu <tianliu@google.com> |
am 0dff7ce1: Merge "Reset zoom view when user exits app or rotate device" into gb-ub-photos-carlsbad * commit '0dff7ce1f701816b4a634b612bcaaaae6de0da34': Reset zoom view when user exits app or rotate device
|
6e9cfebc56b703ba2057061ba9a9f192e645d437 |
31-Aug-2013 |
Angus Kong <shkong@google.com> |
am b2f0968c: Merge "Make the preview thumbnail clicable after scaling." into gb-ub-photos-carlsbad * commit 'b2f0968c90a352cca43f508d216c3f28c3d2cc16': Make the preview thumbnail clicable after scaling.
|
8b13b56580c3df11140572d7489888997de45918 |
31-Aug-2013 |
Doris Liu <tianliu@google.com> |
am 0dff7ce1: Merge "Reset zoom view when user exits app or rotate device" into gb-ub-photos-carlsbad * commit '0dff7ce1f701816b4a634b612bcaaaae6de0da34': Reset zoom view when user exits app or rotate device
|
49acd53f136ddf3394d22762bc3e2b961479eda3 |
31-Aug-2013 |
Angus Kong <shkong@google.com> |
am b2f0968c: Merge "Make the preview thumbnail clicable after scaling." into gb-ub-photos-carlsbad * commit 'b2f0968c90a352cca43f508d216c3f28c3d2cc16': Make the preview thumbnail clicable after scaling.
|
0dff7ce1f701816b4a634b612bcaaaae6de0da34 |
31-Aug-2013 |
Doris Liu <tianliu@google.com> |
Merge "Reset zoom view when user exits app or rotate device" into gb-ub-photos-carlsbad
|
b2f0968c90a352cca43f508d216c3f28c3d2cc16 |
31-Aug-2013 |
Angus Kong <shkong@google.com> |
Merge "Make the preview thumbnail clicable after scaling." into gb-ub-photos-carlsbad
|
93a38d80b202a95cc0336e5cc04dbad92e43253d |
31-Aug-2013 |
Angus Kong <shkong@google.com> |
Make the preview thumbnail clicable after scaling. bug:10552110 Change-Id: I81abd96ad971543412597dbe8f7f57eeb6d3c1fa
rc/com/android/camera/AnimationManager.java
|
f9ddb6034e560684e4d3ddd460ef9dff345e4e91 |
31-Aug-2013 |
Doris Liu <tianliu@google.com> |
Reset zoom view when user exits app or rotate device Bug:10308195 Change-Id: Icf1acc4b17611b28a9c65ec809083ac58da5bd8f
rc/com/android/camera/ui/FilmStripView.java
|
1fc9d10bc720539b99d53b95211590c36f9ac1d7 |
31-Aug-2013 |
Sascha Haeberling <haeberling@google.com> |
am 466054a3: am 0ee2d8c1: am 72a57ddf: Merge "Automatic versioning for Camera." into gb-ub-photos-carlsbad * commit '466054a39b32b9049a65823a28d48e5876e824f6': Automatic versioning for Camera.
|
3fd539ae0437532aa211f3f4cccee2a6783f350f |
31-Aug-2013 |
Doris Liu <tianliu@google.com> |
am ee357766: am f55555e0: am 750e73c4: Merge "Measure all children to ensure correct layout position" into gb-ub-photos-carlsbad * commit 'ee3577666dd1918d3200087ae10b185221677d9b': Measure all children to ensure correct layout position
|
e42eebcd9e77e1f63277eb98379e9329a1609423 |
31-Aug-2013 |
Angus Kong <shkong@google.com> |
am 9f3f0fa0: am a5624237: am 8d2c6b83: Merge "Skip bitmaps with 0 dimension." into gb-ub-photos-carlsbad * commit '9f3f0fa035288787d7f64e110704080dc89688a9': Skip bitmaps with 0 dimension.
|
466054a39b32b9049a65823a28d48e5876e824f6 |
31-Aug-2013 |
Sascha Haeberling <haeberling@google.com> |
am 0ee2d8c1: am 72a57ddf: Merge "Automatic versioning for Camera." into gb-ub-photos-carlsbad * commit '0ee2d8c14d2a75f8616b98a026a5c9429dd3e397': Automatic versioning for Camera.
|
ee3577666dd1918d3200087ae10b185221677d9b |
31-Aug-2013 |
Doris Liu <tianliu@google.com> |
am f55555e0: am 750e73c4: Merge "Measure all children to ensure correct layout position" into gb-ub-photos-carlsbad * commit 'f55555e0ad5aad15813ce2c2fb57552fdb6c01b2': Measure all children to ensure correct layout position
|
9f3f0fa035288787d7f64e110704080dc89688a9 |
31-Aug-2013 |
Angus Kong <shkong@google.com> |
am a5624237: am 8d2c6b83: Merge "Skip bitmaps with 0 dimension." into gb-ub-photos-carlsbad * commit 'a562423733af58910e301c00c90f26b5f5a2052f': Skip bitmaps with 0 dimension.
|
ef35ec1661900ba401da6f6aad7bea9be478dfc1 |
31-Aug-2013 |
Sascha Haeberling <haeberling@google.com> |
am 72a57ddf: Merge "Automatic versioning for Camera." into gb-ub-photos-carlsbad * commit '72a57ddf178b410ffb3c4532fc4e56b8b1d99706': Automatic versioning for Camera.
|
0ee2d8c14d2a75f8616b98a026a5c9429dd3e397 |
31-Aug-2013 |
Sascha Haeberling <haeberling@google.com> |
am 72a57ddf: Merge "Automatic versioning for Camera." into gb-ub-photos-carlsbad * commit '72a57ddf178b410ffb3c4532fc4e56b8b1d99706': Automatic versioning for Camera.
|
72a57ddf178b410ffb3c4532fc4e56b8b1d99706 |
31-Aug-2013 |
Sascha Haeberling <haeberling@google.com> |
Merge "Automatic versioning for Camera." into gb-ub-photos-carlsbad
|
f55555e0ad5aad15813ce2c2fb57552fdb6c01b2 |
31-Aug-2013 |
Doris Liu <tianliu@google.com> |
am 750e73c4: Merge "Measure all children to ensure correct layout position" into gb-ub-photos-carlsbad * commit '750e73c4a4b04a5695540d3c982774662307b58e': Measure all children to ensure correct layout position
|
05f7b8097d95fa3bc520becc44c81fbd126e7f82 |
31-Aug-2013 |
Doris Liu <tianliu@google.com> |
am 750e73c4: Merge "Measure all children to ensure correct layout position" into gb-ub-photos-carlsbad * commit '750e73c4a4b04a5695540d3c982774662307b58e': Measure all children to ensure correct layout position
|
750e73c4a4b04a5695540d3c982774662307b58e |
31-Aug-2013 |
Doris Liu <tianliu@google.com> |
Merge "Measure all children to ensure correct layout position" into gb-ub-photos-carlsbad
|
a562423733af58910e301c00c90f26b5f5a2052f |
31-Aug-2013 |
Angus Kong <shkong@google.com> |
am 8d2c6b83: Merge "Skip bitmaps with 0 dimension." into gb-ub-photos-carlsbad * commit '8d2c6b830131a3d2e6ec7f2f8158b37506403dbd': Skip bitmaps with 0 dimension.
|
6326ce9b86b2fd208b8b2f7669483a0b109ba606 |
31-Aug-2013 |
Angus Kong <shkong@google.com> |
am 8d2c6b83: Merge "Skip bitmaps with 0 dimension." into gb-ub-photos-carlsbad * commit '8d2c6b830131a3d2e6ec7f2f8158b37506403dbd': Skip bitmaps with 0 dimension.
|
8d2c6b830131a3d2e6ec7f2f8158b37506403dbd |
31-Aug-2013 |
Angus Kong <shkong@google.com> |
Merge "Skip bitmaps with 0 dimension." into gb-ub-photos-carlsbad
|
de84c22cf14f8005002af473f19ff0244d520f6c |
31-Aug-2013 |
Doris Liu <tianliu@google.com> |
Measure all children to ensure correct layout position Bug: 10412775 Change-Id: Ia64d6d4d0d023b208edb70066b4d4670e4ad2bbb
rc/com/android/camera/ui/CameraControls.java
|
be98b75e8e51fd6197362d6432f68d4a5ed49a66 |
31-Aug-2013 |
Alan Newberger <alann@google.com> |
am 8f32473b: am 5fff50b6: am 5f6b50de: Add back button handlng to CameraActivity. * commit '8f32473baf3655681d40ea649a1172e0104bb1a4': Add back button handlng to CameraActivity.
|
8f32473baf3655681d40ea649a1172e0104bb1a4 |
31-Aug-2013 |
Alan Newberger <alann@google.com> |
am 5fff50b6: am 5f6b50de: Add back button handlng to CameraActivity. * commit '5fff50b6b4e467ad59363637bf525c9c0f662145': Add back button handlng to CameraActivity.
|
5fff50b6b4e467ad59363637bf525c9c0f662145 |
31-Aug-2013 |
Alan Newberger <alann@google.com> |
am 5f6b50de: Add back button handlng to CameraActivity. * commit '5f6b50deaf46fb546ebf6d0d6244ebf7fb79c7ca': Add back button handlng to CameraActivity.
|
ccd1e8da429bffb3f07858f4746f985546abb161 |
31-Aug-2013 |
Alan Newberger <alann@google.com> |
am 5f6b50de: Add back button handlng to CameraActivity. * commit '5f6b50deaf46fb546ebf6d0d6244ebf7fb79c7ca': Add back button handlng to CameraActivity.
|
62a622b22717b454d3de26bb3311536a27492b6e |
31-Aug-2013 |
Angus Kong <shkong@google.com> |
Skip bitmaps with 0 dimension. bug:10514553 Change-Id: I0d26a324ede55b281e60cedc174869f5b863ca31
rc/com/android/camera/data/LocalMediaData.java
|
6dd7607a19dfb88e583109ac882c4260b4a2d13a |
31-Aug-2013 |
Alan Newberger <alann@google.com> |
am fc207c7a: am 0b51d31c: am 2581af9b: Merge "add up button support for filmstrip" into gb-ub-photos-carlsbad * commit 'fc207c7ae2becc4cd02a8a51088396205efa8743': add up button support for filmstrip
|
c6acd119a539818705ff859c2724b6161b00ae23 |
31-Aug-2013 |
Sascha Haeberling <haeberling@google.com> |
am 951b41ac: am c36e3561: am 1b44336b: Merge "Let the Camera app remember which mode it was started in last." into gb-ub-photos-carlsbad * commit '951b41ac7087997c088dc43f69d088601ee592c6': Let the Camera app remember which mode it was started in last.
|
4257119754c07410667bb77887f3617e735e4a60 |
31-Aug-2013 |
Baligh Uddin <baligh@google.com> |
am 9726d282: (-s ours) am 5c285d9c: (-s ours) am 6447ef1e: (-s ours) Import translations. DO NOT MERGE * commit '9726d2824862ee28a4db72953fd5d181ab81017f': Import translations. DO NOT MERGE
|
3e02cdbaf3193e9a60d09b56dbc04b2e7e6d4ba2 |
31-Aug-2013 |
Doris Liu <tianliu@google.com> |
am 43b75343: am d24a8d30: am b3d4d8e5: Merge "Fix gap between camera controls and nav bar" into gb-ub-photos-carlsbad * commit '43b75343803de33c55706d136c250532ba39814c': Fix gap between camera controls and nav bar
|
78d9b28ec311aa2c4014bef3cd9f98dfb34b77e1 |
31-Aug-2013 |
Sascha Haeberling <haeberling@google.com> |
am 7c7cf256: am 4feab753: am c09c5f03: Merge "Fix of memory issues with bitmaps in filmstrip." into gb-ub-photos-carlsbad * commit '7c7cf256269343e3b3e10575b601b59fa760e457': Fix of memory issues with bitmaps in filmstrip.
|
fc207c7ae2becc4cd02a8a51088396205efa8743 |
31-Aug-2013 |
Alan Newberger <alann@google.com> |
am 0b51d31c: am 2581af9b: Merge "add up button support for filmstrip" into gb-ub-photos-carlsbad * commit '0b51d31cbf028f1065dcf2cfa724080ac0f89c18': add up button support for filmstrip
|
951b41ac7087997c088dc43f69d088601ee592c6 |
31-Aug-2013 |
Sascha Haeberling <haeberling@google.com> |
am c36e3561: am 1b44336b: Merge "Let the Camera app remember which mode it was started in last." into gb-ub-photos-carlsbad * commit 'c36e3561ea1a8145b9d3482afe4682f56f82386f': Let the Camera app remember which mode it was started in last.
|
9726d2824862ee28a4db72953fd5d181ab81017f |
31-Aug-2013 |
Baligh Uddin <baligh@google.com> |
am 5c285d9c: (-s ours) am 6447ef1e: (-s ours) Import translations. DO NOT MERGE * commit '5c285d9c8dcef8855463875966fb9a644aed5c59': Import translations. DO NOT MERGE
|
43b75343803de33c55706d136c250532ba39814c |
31-Aug-2013 |
Doris Liu <tianliu@google.com> |
am d24a8d30: am b3d4d8e5: Merge "Fix gap between camera controls and nav bar" into gb-ub-photos-carlsbad * commit 'd24a8d307e34451fb027519c4b7a9d71119a5eab': Fix gap between camera controls and nav bar
|
7c7cf256269343e3b3e10575b601b59fa760e457 |
31-Aug-2013 |
Sascha Haeberling <haeberling@google.com> |
am 4feab753: am c09c5f03: Merge "Fix of memory issues with bitmaps in filmstrip." into gb-ub-photos-carlsbad * commit '4feab7531dfdfe26e023670c3c4493a2bee45788': Fix of memory issues with bitmaps in filmstrip.
|
0b51d31cbf028f1065dcf2cfa724080ac0f89c18 |
31-Aug-2013 |
Alan Newberger <alann@google.com> |
am 2581af9b: Merge "add up button support for filmstrip" into gb-ub-photos-carlsbad * commit '2581af9b08ac913465303795745c3ce24eb0f20c': add up button support for filmstrip
|
c36e3561ea1a8145b9d3482afe4682f56f82386f |
31-Aug-2013 |
Sascha Haeberling <haeberling@google.com> |
am 1b44336b: Merge "Let the Camera app remember which mode it was started in last." into gb-ub-photos-carlsbad * commit '1b44336b29d2145eaaf0786be47c08e2b5304bcf': Let the Camera app remember which mode it was started in last.
|
5c285d9c8dcef8855463875966fb9a644aed5c59 |
31-Aug-2013 |
Baligh Uddin <baligh@google.com> |
am 6447ef1e: (-s ours) Import translations. DO NOT MERGE * commit '6447ef1e7cef4dad424f9e91c8fb730a6c8d0376': Import translations. DO NOT MERGE
|
d24a8d307e34451fb027519c4b7a9d71119a5eab |
31-Aug-2013 |
Doris Liu <tianliu@google.com> |
am b3d4d8e5: Merge "Fix gap between camera controls and nav bar" into gb-ub-photos-carlsbad * commit 'b3d4d8e58831f6fffc078c8a6ee750dfe0f2a123': Fix gap between camera controls and nav bar
|
4feab7531dfdfe26e023670c3c4493a2bee45788 |
31-Aug-2013 |
Sascha Haeberling <haeberling@google.com> |
am c09c5f03: Merge "Fix of memory issues with bitmaps in filmstrip." into gb-ub-photos-carlsbad * commit 'c09c5f0328a28ccfe9a0a9b37d028e91a94ded94': Fix of memory issues with bitmaps in filmstrip.
|
5f6b50deaf46fb546ebf6d0d6244ebf7fb79c7ca |
31-Aug-2013 |
Alan Newberger <alann@google.com> |
Add back button handlng to CameraActivity. This CL first detects whether user is in filmstrip mode i.e. not in Camera, if so brings user back to the first item which is the Camera. If in Camera, we route back handling to the current Camera module which enables already- written module handling for back button e.g. backing out of pie menus. Bug: 8781981 Change-Id: I18377ea5fbdcd8bd8c6fc3af9cb5322d5f5a889a
rc/com/android/camera/CameraActivity.java
|
d782487dfba3ce335c0731e932c0978f316642bd |
30-Aug-2013 |
Alan Newberger <alann@google.com> |
am 2581af9b: Merge "add up button support for filmstrip" into gb-ub-photos-carlsbad * commit '2581af9b08ac913465303795745c3ce24eb0f20c': add up button support for filmstrip
|
2581af9b08ac913465303795745c3ce24eb0f20c |
30-Aug-2013 |
Alan Newberger <alann@google.com> |
Merge "add up button support for filmstrip" into gb-ub-photos-carlsbad
|
3f969c1735e2636bf22dfe44104d0e99924cca97 |
23-Aug-2013 |
Alan Newberger <alann@google.com> |
add up button support for filmstrip This CL adds up affordance handling to CameraActivity. There was no working call to reset the filmstrip back to the camera, so this CL adds a controller which then calls reload, which is itself fixed to work as desired. Note that during testing I identified issue 10563392, I've decided to file that separately since it is orthogonal to up button function, but it does affect the overall experience and should be fixed. Bug: 10414498 Change-Id: I1ee914dc1d264adb1fb5a363c2d6174070cd7b71
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/ui/FilmStripView.java
|
d115d37659f5544d4fd98d8a09b146de576e6f16 |
30-Aug-2013 |
Sascha Haeberling <haeberling@google.com> |
am 1b44336b: Merge "Let the Camera app remember which mode it was started in last." into gb-ub-photos-carlsbad * commit '1b44336b29d2145eaaf0786be47c08e2b5304bcf': Let the Camera app remember which mode it was started in last.
|
1b44336b29d2145eaaf0786be47c08e2b5304bcf |
30-Aug-2013 |
Sascha Haeberling <haeberling@google.com> |
Merge "Let the Camera app remember which mode it was started in last." into gb-ub-photos-carlsbad
|
fb10e462d4c6d0bc03250b9073669490324ed785 |
30-Aug-2013 |
Baligh Uddin <baligh@google.com> |
am 6447ef1e: (-s ours) Import translations. DO NOT MERGE * commit '6447ef1e7cef4dad424f9e91c8fb730a6c8d0376': Import translations. DO NOT MERGE
|
6447ef1e7cef4dad424f9e91c8fb730a6c8d0376 |
30-Aug-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I27af5d736c885d9dbadfb635c5c6ea3a8f570543 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms-rMY/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
95d7aa317654e008cf4109a2b2609bff51aeb04e |
30-Aug-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-denali
|
e1d41148bca36a8577a38a146ce426a4f13f2046 |
30-Aug-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I3e9ed2c2bd1720edf316ee294de43abb0d201d24 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms-rMY/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
b3d4d8e58831f6fffc078c8a6ee750dfe0f2a123 |
30-Aug-2013 |
Doris Liu <tianliu@google.com> |
Merge "Fix gap between camera controls and nav bar" into gb-ub-photos-carlsbad
|
bdd198ee9047fc180b8e97e1c3a76132256fd36c |
30-Aug-2013 |
Doris Liu <tianliu@google.com> |
Fix gap between camera controls and nav bar Bug: 10097187 Change-Id: I9918a09a1e0b2d3c5a89330b800a9b7f2c2a6408
es/layout/photo_module.xml
es/layout/video_module.xml
rc/com/android/camera/VideoUI.java
|
c09c5f0328a28ccfe9a0a9b37d028e91a94ded94 |
30-Aug-2013 |
Sascha Haeberling <haeberling@google.com> |
Merge "Fix of memory issues with bitmaps in filmstrip." into gb-ub-photos-carlsbad
|
7f47e6ced2f9305296eadd6ad8647ff92890890f |
30-Aug-2013 |
Sascha Haeberling <haeberling@google.com> |
Fix of memory issues with bitmaps in filmstrip. Bug: 10495593 We should use the bigger scale factor of the two, and not the smaller. Change-Id: I5a1ff6fe7d6b50c0128ff17709daa94cef9cb65b
rc/com/android/camera/data/LocalMediaData.java
|
dfe93e891d4e5cb204ccb1c836789169bcc30d75 |
30-Aug-2013 |
Sascha Haeberling <haeberling@google.com> |
am 863fd808: am 3a5c8362: am f3d3a5c6: Merge "Disable shutter button while picture is being taken." into gb-ub-photos-carlsbad * commit '863fd8089276f355014550546821903fec4c73d7': Disable shutter button while picture is being taken.
|
863fd8089276f355014550546821903fec4c73d7 |
30-Aug-2013 |
Sascha Haeberling <haeberling@google.com> |
am 3a5c8362: am f3d3a5c6: Merge "Disable shutter button while picture is being taken." into gb-ub-photos-carlsbad * commit '3a5c836282033c1fb0eea8cc2d1883540ab50efa': Disable shutter button while picture is being taken.
|
3a5c836282033c1fb0eea8cc2d1883540ab50efa |
30-Aug-2013 |
Sascha Haeberling <haeberling@google.com> |
am f3d3a5c6: Merge "Disable shutter button while picture is being taken." into gb-ub-photos-carlsbad * commit 'f3d3a5c63bd0d88882f0180ac79186c03c644c70': Disable shutter button while picture is being taken.
|
f3d3a5c63bd0d88882f0180ac79186c03c644c70 |
30-Aug-2013 |
Sascha Haeberling <haeberling@google.com> |
Merge "Disable shutter button while picture is being taken." into gb-ub-photos-carlsbad
|
4388944254c40a4593a3758fb402eec1629bb33d |
29-Aug-2013 |
Doris Liu <tianliu@google.com> |
am 8e1e749d: am b7a8e45e: am 8de13111: 1:1 zoom integration * commit '8e1e749d751efc62ec69a37c78500d3a9872f7d8': 1:1 zoom integration
|
8e1e749d751efc62ec69a37c78500d3a9872f7d8 |
29-Aug-2013 |
Doris Liu <tianliu@google.com> |
am b7a8e45e: am 8de13111: 1:1 zoom integration * commit 'b7a8e45e727ef2a3e57ae6a9aea96eb23b3e7039': 1:1 zoom integration
|
b7a8e45e727ef2a3e57ae6a9aea96eb23b3e7039 |
29-Aug-2013 |
Doris Liu <tianliu@google.com> |
am 8de13111: 1:1 zoom integration * commit '8de13111cc4e62da3462ea321d18c7951282e0d0': 1:1 zoom integration
|
8de13111cc4e62da3462ea321d18c7951282e0d0 |
23-Aug-2013 |
Doris Liu <tianliu@google.com> |
1:1 zoom integration Bug: 10308195 Change-Id: I940891f6aa3e24575174ff888c384fddaaa5b3c8
rc/com/android/camera/data/LocalData.java
rc/com/android/camera/data/LocalMediaData.java
rc/com/android/camera/ui/FilmStripView.java
rc/com/android/camera/ui/ZoomView.java
|
ba0f88cc6d64ccfab2d5f82b4caf66d8f0b0c990 |
29-Aug-2013 |
The Android Automerger <android-build@google.com> |
merge in klp-release history after reset to klp-dev
|
8890194726507573fd230fba7d4042ed00b363e4 |
29-Aug-2013 |
Sascha Haeberling <haeberling@google.com> |
Disable shutter button while picture is being taken. Bug: 7328018 Change-Id: I98160d52c542186aa9f2d85f66a4e0120a917e38
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/PhotoUI.java
|
b1ca06bfd24728499f9032f3769b25dede298ca6 |
29-Aug-2013 |
Doris Liu <tianliu@google.com> |
am e914c060: am 734c25b9: am 0df03318: Merge "Flip capture thumb when using front facing camera" into gb-ub-photos-carlsbad * commit 'e914c060fa847b24c9a5a2b4fd7a14093984b926': Flip capture thumb when using front facing camera
|
e914c060fa847b24c9a5a2b4fd7a14093984b926 |
29-Aug-2013 |
Doris Liu <tianliu@google.com> |
am 734c25b9: am 0df03318: Merge "Flip capture thumb when using front facing camera" into gb-ub-photos-carlsbad * commit '734c25b9c17e5f824863c24843c7265d37bda1d5': Flip capture thumb when using front facing camera
|
734c25b9c17e5f824863c24843c7265d37bda1d5 |
29-Aug-2013 |
Doris Liu <tianliu@google.com> |
am 0df03318: Merge "Flip capture thumb when using front facing camera" into gb-ub-photos-carlsbad * commit '0df03318d36f77aaec11238854921bd45f50c035': Flip capture thumb when using front facing camera
|
0df03318d36f77aaec11238854921bd45f50c035 |
29-Aug-2013 |
Doris Liu <tianliu@google.com> |
Merge "Flip capture thumb when using front facing camera" into gb-ub-photos-carlsbad
|
29da2db13029f8896018836693139a05d1139362 |
28-Aug-2013 |
Doris Liu <tianliu@google.com> |
Flip capture thumb when using front facing camera Bug: 10495008 Change-Id: I9f444625e64be35afe44b0d7f50d81fbd1936ae8
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/PhotoUI.java
|
2654dd9bb6a7d917dab1a48e2182c4f49fe71f11 |
29-Aug-2013 |
Sascha Haeberling <haeberling@google.com> |
Let the Camera app remember which mode it was started in last. Bug: 7320368 Change-Id: Ia2ae47693f453c9bcff315af87fe1e5a44b6e5c7
rc/com/android/camera/CameraActivity.java
|
30239937e7722ca376864d888cc2edaca21a496d |
28-Aug-2013 |
Sascha Haeberling <haeberling@google.com> |
Automatic versioning for Camera. Bug: 10461009 This is the scheme copied from GMS Core and modified by Babel, which allows us to generate version number more easily and also incorporate build numbers into it. Change-Id: I6ed4bf03e545a22423cb9936a5fcb67a50133490
ndroid.mk
ndroidManifest.xml
ersion.mk
|
b81c6c430b4cacea6145d3a5b9811bdf332e5a13 |
28-Aug-2013 |
ztenghui <ztenghui@google.com> |
am 268e1ad7: am 72b0220a: am 2d1c49c2: Merge "Add rotate support in Film Strip" into gb-ub-photos-carlsbad * commit '268e1ad75e3c46d30b51087cc57851c37d6f2580': Add rotate support in Film Strip
|
c8a0b8d32bbffb73ac5fc3ab5647ee1b951fe99c |
28-Aug-2013 |
Tenghui Zhu <ztenghui@google.com> |
am 4b422b02: am 659df48f: am 09d5983d: Merge "Revert "Add rotate support in Film Strip"" into gb-ub-photos-carlsbad * commit '4b422b02b0cd3eb639cd8da9d80cc6119b805f4e': Revert "Add rotate support in Film Strip"
|
ca0c85fa15e98434639f0035699c3a0fbfb6dd9b |
28-Aug-2013 |
ztenghui <ztenghui@google.com> |
am d5f7d83c: am 7cd724ae: am 80e2e1ec: Merge "Add rotate support in Film Strip" into gb-ub-photos-carlsbad * commit 'd5f7d83c1bb4e8585c93b81c36d7e324fcbb4112': Add rotate support in Film Strip
|
268e1ad75e3c46d30b51087cc57851c37d6f2580 |
28-Aug-2013 |
ztenghui <ztenghui@google.com> |
am 72b0220a: am 2d1c49c2: Merge "Add rotate support in Film Strip" into gb-ub-photos-carlsbad * commit '72b0220acf98afae4c1b9a3ba8f32f62e20b7159': Add rotate support in Film Strip
|
72b0220acf98afae4c1b9a3ba8f32f62e20b7159 |
28-Aug-2013 |
ztenghui <ztenghui@google.com> |
am 2d1c49c2: Merge "Add rotate support in Film Strip" into gb-ub-photos-carlsbad * commit '2d1c49c2959d8b5adecd8bb5668fd50c1bf0190c': Add rotate support in Film Strip
|
2d1c49c2959d8b5adecd8bb5668fd50c1bf0190c |
28-Aug-2013 |
ztenghui <ztenghui@google.com> |
Merge "Add rotate support in Film Strip" into gb-ub-photos-carlsbad
|
a16e7b50f3148f581439509279f242092e254309 |
23-Aug-2013 |
ztenghui <ztenghui@google.com> |
Add rotate support in Film Strip Move the exif related code under src.com.android.camera.exif. Refactor the member variables under LocalMediaData.java. Refactor the LocalData to make sure they are immutables for thread safety. bug:10367037 Change-Id: I0e84bcc0097925b2be749fe016984177a68e0a4d
ndroid.mk
allerycommon/Android.mk
allerycommon/src/com/android/gallery3d/exif/ByteBufferInputStream.java
allerycommon/src/com/android/gallery3d/exif/CountedDataInputStream.java
allerycommon/src/com/android/gallery3d/exif/ExifData.java
allerycommon/src/com/android/gallery3d/exif/ExifInterface.java
allerycommon/src/com/android/gallery3d/exif/ExifInvalidFormatException.java
allerycommon/src/com/android/gallery3d/exif/ExifModifier.java
allerycommon/src/com/android/gallery3d/exif/ExifOutputStream.java
allerycommon/src/com/android/gallery3d/exif/ExifParser.java
allerycommon/src/com/android/gallery3d/exif/ExifReader.java
allerycommon/src/com/android/gallery3d/exif/ExifTag.java
allerycommon/src/com/android/gallery3d/exif/IfdData.java
allerycommon/src/com/android/gallery3d/exif/IfdId.java
allerycommon/src/com/android/gallery3d/exif/JpegHeader.java
allerycommon/src/com/android/gallery3d/exif/OrderedDataOutputStream.java
allerycommon/src/com/android/gallery3d/exif/Rational.java
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/Exif.java
rc/com/android/camera/MediaSaveService.java
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/Storage.java
rc/com/android/camera/VideoModule.java
rc/com/android/camera/data/CameraDataAdapter.java
rc/com/android/camera/data/LocalData.java
rc/com/android/camera/data/LocalMediaData.java
rc/com/android/camera/data/MediaDetails.java
rc/com/android/camera/data/RotationTask.java
rc/com/android/camera/data/SimpleViewData.java
rc/com/android/camera/exif/ByteBufferInputStream.java
rc/com/android/camera/exif/CountedDataInputStream.java
rc/com/android/camera/exif/ExifData.java
rc/com/android/camera/exif/ExifInterface.java
rc/com/android/camera/exif/ExifInvalidFormatException.java
rc/com/android/camera/exif/ExifModifier.java
rc/com/android/camera/exif/ExifOutputStream.java
rc/com/android/camera/exif/ExifParser.java
rc/com/android/camera/exif/ExifReader.java
rc/com/android/camera/exif/ExifTag.java
rc/com/android/camera/exif/IfdData.java
rc/com/android/camera/exif/IfdId.java
rc/com/android/camera/exif/JpegHeader.java
rc/com/android/camera/exif/OrderedDataOutputStream.java
rc/com/android/camera/exif/Rational.java
rc/com/android/camera/ui/FilmStripView.java
|
4b422b02b0cd3eb639cd8da9d80cc6119b805f4e |
28-Aug-2013 |
Tenghui Zhu <ztenghui@google.com> |
am 659df48f: am 09d5983d: Merge "Revert "Add rotate support in Film Strip"" into gb-ub-photos-carlsbad * commit '659df48f1a84eb4498cd615ad79f39a7f45d7306': Revert "Add rotate support in Film Strip"
|
659df48f1a84eb4498cd615ad79f39a7f45d7306 |
28-Aug-2013 |
Tenghui Zhu <ztenghui@google.com> |
am 09d5983d: Merge "Revert "Add rotate support in Film Strip"" into gb-ub-photos-carlsbad * commit '09d5983dfbd252fca56ee8368906156e69a9fed0': Revert "Add rotate support in Film Strip"
|
09d5983dfbd252fca56ee8368906156e69a9fed0 |
28-Aug-2013 |
Tenghui Zhu <ztenghui@google.com> |
Merge "Revert "Add rotate support in Film Strip"" into gb-ub-photos-carlsbad
|
0acda98704a01e20de5af8026875789af1cd56f9 |
28-Aug-2013 |
Tenghui Zhu <ztenghui@google.com> |
Revert "Add rotate support in Film Strip" This reverts commit 568ad02f9fd3993abf4b973bdd49a34737267c77. Change-Id: I300376126b55191e4112b8aabf3f9f61cc27fef6
allerycommon/src/com/android/gallery3d/exif/ByteBufferInputStream.java
allerycommon/src/com/android/gallery3d/exif/CountedDataInputStream.java
allerycommon/src/com/android/gallery3d/exif/ExifData.java
allerycommon/src/com/android/gallery3d/exif/ExifInterface.java
allerycommon/src/com/android/gallery3d/exif/ExifInvalidFormatException.java
allerycommon/src/com/android/gallery3d/exif/ExifModifier.java
allerycommon/src/com/android/gallery3d/exif/ExifOutputStream.java
allerycommon/src/com/android/gallery3d/exif/ExifParser.java
allerycommon/src/com/android/gallery3d/exif/ExifReader.java
allerycommon/src/com/android/gallery3d/exif/ExifTag.java
allerycommon/src/com/android/gallery3d/exif/IfdData.java
allerycommon/src/com/android/gallery3d/exif/IfdId.java
allerycommon/src/com/android/gallery3d/exif/JpegHeader.java
allerycommon/src/com/android/gallery3d/exif/OrderedDataOutputStream.java
allerycommon/src/com/android/gallery3d/exif/Rational.java
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/Exif.java
rc/com/android/camera/MediaSaveService.java
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/Storage.java
rc/com/android/camera/VideoModule.java
rc/com/android/camera/data/CameraDataAdapter.java
rc/com/android/camera/data/LocalData.java
rc/com/android/camera/data/LocalMediaData.java
rc/com/android/camera/data/MediaDetails.java
rc/com/android/camera/data/RotationTask.java
rc/com/android/camera/data/SimpleViewData.java
rc/com/android/camera/exif/ByteBufferInputStream.java
rc/com/android/camera/exif/CountedDataInputStream.java
rc/com/android/camera/exif/ExifData.java
rc/com/android/camera/exif/ExifInterface.java
rc/com/android/camera/exif/ExifInvalidFormatException.java
rc/com/android/camera/exif/ExifModifier.java
rc/com/android/camera/exif/ExifOutputStream.java
rc/com/android/camera/exif/ExifParser.java
rc/com/android/camera/exif/ExifReader.java
rc/com/android/camera/exif/ExifTag.java
rc/com/android/camera/exif/IfdData.java
rc/com/android/camera/exif/IfdId.java
rc/com/android/camera/exif/JpegHeader.java
rc/com/android/camera/exif/OrderedDataOutputStream.java
rc/com/android/camera/exif/Rational.java
rc/com/android/camera/ui/FilmStripView.java
|
d5f7d83c1bb4e8585c93b81c36d7e324fcbb4112 |
28-Aug-2013 |
ztenghui <ztenghui@google.com> |
am 7cd724ae: am 80e2e1ec: Merge "Add rotate support in Film Strip" into gb-ub-photos-carlsbad * commit '7cd724ae6acf09a641110e0bb46d28f9a932c1e8': Add rotate support in Film Strip
|
7cd724ae6acf09a641110e0bb46d28f9a932c1e8 |
28-Aug-2013 |
ztenghui <ztenghui@google.com> |
am 80e2e1ec: Merge "Add rotate support in Film Strip" into gb-ub-photos-carlsbad * commit '80e2e1eca93d1df72420eb6d1b7db88460620b6e': Add rotate support in Film Strip
|
80e2e1eca93d1df72420eb6d1b7db88460620b6e |
28-Aug-2013 |
ztenghui <ztenghui@google.com> |
Merge "Add rotate support in Film Strip" into gb-ub-photos-carlsbad
|
e95382dacbde8308c2177040a91bbd5023e55af7 |
28-Aug-2013 |
The Android Automerger <android-build@google.com> |
merge in klp-release history after reset to klp-dev
|
568ad02f9fd3993abf4b973bdd49a34737267c77 |
23-Aug-2013 |
ztenghui <ztenghui@google.com> |
Add rotate support in Film Strip Move the exif related code under src.com.android.camera.exif. Refactor the member variables under LocalMediaData.java. Refactor the LocalData to make sure they are immutables for thread safety. bug:10367037 Change-Id: I0b8128a806fa9e777a87967b294555daadced1c5
allerycommon/src/com/android/gallery3d/exif/ByteBufferInputStream.java
allerycommon/src/com/android/gallery3d/exif/CountedDataInputStream.java
allerycommon/src/com/android/gallery3d/exif/ExifData.java
allerycommon/src/com/android/gallery3d/exif/ExifInterface.java
allerycommon/src/com/android/gallery3d/exif/ExifInvalidFormatException.java
allerycommon/src/com/android/gallery3d/exif/ExifModifier.java
allerycommon/src/com/android/gallery3d/exif/ExifOutputStream.java
allerycommon/src/com/android/gallery3d/exif/ExifParser.java
allerycommon/src/com/android/gallery3d/exif/ExifReader.java
allerycommon/src/com/android/gallery3d/exif/ExifTag.java
allerycommon/src/com/android/gallery3d/exif/IfdData.java
allerycommon/src/com/android/gallery3d/exif/IfdId.java
allerycommon/src/com/android/gallery3d/exif/JpegHeader.java
allerycommon/src/com/android/gallery3d/exif/OrderedDataOutputStream.java
allerycommon/src/com/android/gallery3d/exif/Rational.java
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/Exif.java
rc/com/android/camera/MediaSaveService.java
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/Storage.java
rc/com/android/camera/VideoModule.java
rc/com/android/camera/data/CameraDataAdapter.java
rc/com/android/camera/data/LocalData.java
rc/com/android/camera/data/LocalMediaData.java
rc/com/android/camera/data/MediaDetails.java
rc/com/android/camera/data/RotationTask.java
rc/com/android/camera/data/SimpleViewData.java
rc/com/android/camera/exif/ByteBufferInputStream.java
rc/com/android/camera/exif/CountedDataInputStream.java
rc/com/android/camera/exif/ExifData.java
rc/com/android/camera/exif/ExifInterface.java
rc/com/android/camera/exif/ExifInvalidFormatException.java
rc/com/android/camera/exif/ExifModifier.java
rc/com/android/camera/exif/ExifOutputStream.java
rc/com/android/camera/exif/ExifParser.java
rc/com/android/camera/exif/ExifReader.java
rc/com/android/camera/exif/ExifTag.java
rc/com/android/camera/exif/IfdData.java
rc/com/android/camera/exif/IfdId.java
rc/com/android/camera/exif/JpegHeader.java
rc/com/android/camera/exif/OrderedDataOutputStream.java
rc/com/android/camera/exif/Rational.java
rc/com/android/camera/ui/FilmStripView.java
|
7a9caf3f9926624131454ebff3c44dd18430e47e |
27-Aug-2013 |
Sascha Haeberling <haeberling@google.com> |
am 558c58da: am f4d1ee6e: am 7446e9fd: Use the well-translated camera_label instead of app_name. * commit '558c58dae93a13d24ceedea26f8e0ee1c52fe6b7': Use the well-translated camera_label instead of app_name.
|
558c58dae93a13d24ceedea26f8e0ee1c52fe6b7 |
27-Aug-2013 |
Sascha Haeberling <haeberling@google.com> |
am f4d1ee6e: am 7446e9fd: Use the well-translated camera_label instead of app_name. * commit 'f4d1ee6ea91d630178595d955b6b96cdb2a1fe4e': Use the well-translated camera_label instead of app_name.
|
f4d1ee6ea91d630178595d955b6b96cdb2a1fe4e |
27-Aug-2013 |
Sascha Haeberling <haeberling@google.com> |
am 7446e9fd: Use the well-translated camera_label instead of app_name. * commit '7446e9fde7cd8dd7904beff592e8819513797ab9': Use the well-translated camera_label instead of app_name.
|
7446e9fde7cd8dd7904beff592e8819513797ab9 |
27-Aug-2013 |
Sascha Haeberling <haeberling@google.com> |
Use the well-translated camera_label instead of app_name. Bug: 10509953 Change-Id: Ia5522fce1892e521c12fcc2f152afe7009026ac5
ndroidManifest.xml
es/values/strings.xml
|
bd2ad2fd969600192f65b2f5269f24aa10eda733 |
27-Aug-2013 |
Mangesh Ghiware <mghiware@google.com> |
am f66afcb9: am accdf4ca: am 18d1d26a: Merge "Bring back Share to filmstrip" into gb-ub-photos-carlsbad * commit 'f66afcb9b503805f143065e2068ebc8563c7c2fa': Bring back Share to filmstrip
|
c378a182338ca7ec24bbe1cecef3509cc4fc8039 |
27-Aug-2013 |
Sascha Haeberling <haeberling@google.com> |
am 92581f9c: am 8ada875a: am 00279bbc: Merge "Remove RefocusHelper." into gb-ub-photos-carlsbad * commit '92581f9cd82646c919cba83b3cf3338a8bed94de': Remove RefocusHelper.
|
f368001fa3bccd0bf2580d98a26fec4d65c2c5e3 |
27-Aug-2013 |
Sascha Haeberling <haeberling@google.com> |
am 174ebdd4: am 5d26fdfd: am 143eb46b: Merge "Remove Refocus string and icon" into gb-ub-photos-carlsbad * commit '174ebdd46e809eff1697b88bf29c99f95fd5b4b6': Remove Refocus string and icon
|
f66afcb9b503805f143065e2068ebc8563c7c2fa |
27-Aug-2013 |
Mangesh Ghiware <mghiware@google.com> |
am accdf4ca: am 18d1d26a: Merge "Bring back Share to filmstrip" into gb-ub-photos-carlsbad * commit 'accdf4ca62021676ded6cf30c69faa849df5d660': Bring back Share to filmstrip
|
accdf4ca62021676ded6cf30c69faa849df5d660 |
27-Aug-2013 |
Mangesh Ghiware <mghiware@google.com> |
am 18d1d26a: Merge "Bring back Share to filmstrip" into gb-ub-photos-carlsbad * commit '18d1d26a6da997bc0d9aa4d5688203f36c15377a': Bring back Share to filmstrip
|
18d1d26a6da997bc0d9aa4d5688203f36c15377a |
27-Aug-2013 |
Mangesh Ghiware <mghiware@google.com> |
Merge "Bring back Share to filmstrip" into gb-ub-photos-carlsbad
|
5222cd471345921d793b71857a53896cc8e4dc63 |
27-Aug-2013 |
The Android Automerger <android-build@google.com> |
merge in klp-release history after reset to klp-dev
|
92581f9cd82646c919cba83b3cf3338a8bed94de |
27-Aug-2013 |
Sascha Haeberling <haeberling@google.com> |
am 8ada875a: am 00279bbc: Merge "Remove RefocusHelper." into gb-ub-photos-carlsbad * commit '8ada875abf96d99246d212d9e88ce2e70d28faf7': Remove RefocusHelper.
|
8ada875abf96d99246d212d9e88ce2e70d28faf7 |
27-Aug-2013 |
Sascha Haeberling <haeberling@google.com> |
am 00279bbc: Merge "Remove RefocusHelper." into gb-ub-photos-carlsbad * commit '00279bbcf7926189a7ae944988f6eceb91aae422': Remove RefocusHelper.
|
00279bbcf7926189a7ae944988f6eceb91aae422 |
27-Aug-2013 |
Sascha Haeberling <haeberling@google.com> |
Merge "Remove RefocusHelper." into gb-ub-photos-carlsbad
|
174ebdd46e809eff1697b88bf29c99f95fd5b4b6 |
27-Aug-2013 |
Sascha Haeberling <haeberling@google.com> |
am 5d26fdfd: am 143eb46b: Merge "Remove Refocus string and icon" into gb-ub-photos-carlsbad * commit '5d26fdfdc2746c8c6f70b947b43722bc576dc1c3': Remove Refocus string and icon
|
5d26fdfdc2746c8c6f70b947b43722bc576dc1c3 |
27-Aug-2013 |
Sascha Haeberling <haeberling@google.com> |
am 143eb46b: Merge "Remove Refocus string and icon" into gb-ub-photos-carlsbad * commit '143eb46b81202601e5454d460ea80a4796ecf43d': Remove Refocus string and icon
|
69fd1a0f5c373a472d727af2ffde003efe4f86b2 |
27-Aug-2013 |
Sascha Haeberling <haeberling@google.com> |
Remove RefocusHelper. Bug: 10494566 Change-Id: I0e5c665867fe324883ff199327df1ef3736cc7c7
rc_pd/com/android/camera/util/RefocusHelper.java
|
143eb46b81202601e5454d460ea80a4796ecf43d |
27-Aug-2013 |
Sascha Haeberling <haeberling@google.com> |
Merge "Remove Refocus string and icon" into gb-ub-photos-carlsbad
|
d2219d3023a93ce15725af5009627eb37e982726 |
27-Aug-2013 |
Sascha Haeberling <haeberling@google.com> |
Remove Refocus string and icon Bug: 10494566 Change-Id: I49c61a5e1ae31e0458250e6cc624d63547ac0372
es/drawable-xhdpi/ic_switch_refocus.png
es/values/strings.xml
rc/com/android/camera/ui/CameraSwitcher.java
|
cd2eeb0efc4370f20e9836e20eb11cb974e3b00d |
23-Aug-2013 |
Mangesh Ghiware <mghiware@google.com> |
Bring back Share to filmstrip Bug: 10367406 Change-Id: I37834442e3af209fb00b98e6da524263ac8c70f0
es/menu/operations.xml
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/data/LocalData.java
rc/com/android/camera/data/LocalMediaData.java
|
d17ca75b08d5b1da6314b37c50887d142abdcaae |
27-Aug-2013 |
Yu Shan Emily Lau <yslau@google.com> |
am 48f94999: am 1cc08fea: Merge "Adding back the camera tests to KLP-DEV after sorting them out in UB." into klp-dev * commit '48f9499953cc0b24a04c815a46d67b0ed8099d54': Adding back the camera tests to KLP-DEV after sorting them out in UB.
|
48f9499953cc0b24a04c815a46d67b0ed8099d54 |
27-Aug-2013 |
Yu Shan Emily Lau <yslau@google.com> |
am 1cc08fea: Merge "Adding back the camera tests to KLP-DEV after sorting them out in UB." into klp-dev * commit '1cc08feaf523d478dcf50bafdec0cf5b0a93c01b': Adding back the camera tests to KLP-DEV after sorting them out in UB.
|
1cc08feaf523d478dcf50bafdec0cf5b0a93c01b |
27-Aug-2013 |
Yu Shan Emily Lau <yslau@google.com> |
Merge "Adding back the camera tests to KLP-DEV after sorting them out in UB." into klp-dev
|
bcbbd4e3199d44f6ea31c49beebb0c3fd75aeeec |
27-Aug-2013 |
Sascha Haeberling <haeberling@google.com> |
am 96fceea0: am d9114beb: am 3be7f94c: Make parsing integers for details dialog more robust. * commit '96fceea07eef796bc6de38da2f5fe033cba236e4': Make parsing integers for details dialog more robust.
|
46119e147079d67adde1b578ebb2896d10efbb57 |
27-Aug-2013 |
Angus Kong <shkong@google.com> |
am 5da48574: am 919284cf: am 80af7dd8: Fix full-screen swipe layout. * commit '5da48574eae9856835247d82436230b544ec8975': Fix full-screen swipe layout.
|
84fbbbde6534930637daca0c964ca4e3dcaafa4a |
27-Aug-2013 |
Angus Kong <shkong@google.com> |
am d1e70234: am dfb722fd: am a2818f58: Merge "Bring back undo delete confirmation." into gb-ub-photos-carlsbad * commit 'd1e70234619067b47367f124f24ddf8241aae33f': Bring back undo delete confirmation.
|
96fceea07eef796bc6de38da2f5fe033cba236e4 |
27-Aug-2013 |
Sascha Haeberling <haeberling@google.com> |
am d9114beb: am 3be7f94c: Make parsing integers for details dialog more robust. * commit 'd9114beb2829c17f43c006bf368438834e71ce7a': Make parsing integers for details dialog more robust.
|
5da48574eae9856835247d82436230b544ec8975 |
27-Aug-2013 |
Angus Kong <shkong@google.com> |
am 919284cf: am 80af7dd8: Fix full-screen swipe layout. * commit '919284cf30980d0f2a01c2ca37046039e0b7d713': Fix full-screen swipe layout.
|
d1e70234619067b47367f124f24ddf8241aae33f |
27-Aug-2013 |
Angus Kong <shkong@google.com> |
am dfb722fd: am a2818f58: Merge "Bring back undo delete confirmation." into gb-ub-photos-carlsbad * commit 'dfb722fd542d23b5908446fcc70c22caa7e08c8f': Bring back undo delete confirmation.
|
d9114beb2829c17f43c006bf368438834e71ce7a |
26-Aug-2013 |
Sascha Haeberling <haeberling@google.com> |
am 3be7f94c: Make parsing integers for details dialog more robust. * commit '3be7f94c1029728a8e236cfcde9c8bce68244095': Make parsing integers for details dialog more robust.
|
3be7f94c1029728a8e236cfcde9c8bce68244095 |
26-Aug-2013 |
Sascha Haeberling <haeberling@google.com> |
Make parsing integers for details dialog more robust. Bug: 7141309 Change-Id: I031e2f062ea786acb94d41385c5913c47d719ccd
rc/com/android/camera/ui/DetailsDialog.java
|
9081ee55fff06785e945087c6bb2c720a33d93f6 |
23-Aug-2013 |
Jason Noguchi <jnoguchi@google.com> |
Adding back the camera tests to KLP-DEV after sorting them out in UB. Change-Id: I963aa71a31580fd42edc17a5f226b6d2c02b6f79
ests/Android.mk
ests/AndroidManifest.xml
ests/exiftool_parser/parser.py
ests/res/raw/android_lawn.mp4
ests/res/raw/galaxy_nexus.jpg
ests/res/raw/jpeg_control.jpg
ests/res/xml/galaxy_nexus.xml
ests/src/com/android/camera/CameraTestRunner.java
ests/src/com/android/camera/StressTests.java
ests/src/com/android/camera/functional/CameraTest.java
ests/src/com/android/camera/functional/ImageCaptureIntentTest.java
ests/src/com/android/camera/functional/VideoCaptureIntentTest.java
ests/src/com/android/camera/stress/CameraLatency.java
ests/src/com/android/camera/stress/CameraStartUp.java
ests/src/com/android/camera/stress/CameraStressTestRunner.java
ests/src/com/android/camera/stress/ImageCapture.java
ests/src/com/android/camera/stress/ShotToShotLatency.java
ests/src/com/android/camera/stress/SwitchPreview.java
ests/src/com/android/camera/stress/TestUtil.java
ests/src/com/android/camera/stress/VideoCapture.java
ests/src/com/android/camera/unittest/CameraUnitTest.java
|
7a2df5eb153990b17957f930201723f46ac2e466 |
26-Aug-2013 |
The Android Automerger <android-build@google.com> |
merge in klp-release history after reset to klp-dev
|
919284cf30980d0f2a01c2ca37046039e0b7d713 |
23-Aug-2013 |
Angus Kong <shkong@google.com> |
am 80af7dd8: Fix full-screen swipe layout. * commit '80af7dd871547d03ee9ff5023cbec00b1d8677ee': Fix full-screen swipe layout.
|
80af7dd871547d03ee9ff5023cbec00b1d8677ee |
23-Aug-2013 |
Angus Kong <shkong@google.com> |
Fix full-screen swipe layout. bug:10428905 Change-Id: Ie4907735cc86f2d10bd936ce2d9af54cccab7ece
rc/com/android/camera/ui/FilmStripView.java
|
dfb722fd542d23b5908446fcc70c22caa7e08c8f |
23-Aug-2013 |
Angus Kong <shkong@google.com> |
am a2818f58: Merge "Bring back undo delete confirmation." into gb-ub-photos-carlsbad * commit 'a2818f58b829f07021d69a36a831dcf339e9258a': Bring back undo delete confirmation.
|
a2818f58b829f07021d69a36a831dcf339e9258a |
23-Aug-2013 |
Angus Kong <shkong@google.com> |
Merge "Bring back undo delete confirmation." into gb-ub-photos-carlsbad
|
653c43be6e58be54cf2ac3c8efb2d65ac20bd03b |
22-Aug-2013 |
Angus Kong <shkong@google.com> |
Bring back undo delete confirmation. Also corrects the default decoding size. bug:10413110 bug:10330214 Change-Id: I45465fdea2320501fd17ac4e35e0f0f54c08cbba
es/layout/camera_filmstrip.xml
es/layout/filmstrip_bottom_controls.xml
es/layout/undo_bar.xml
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/data/CameraDataAdapter.java
rc/com/android/camera/ui/FilmStripView.java
|
9b32812bec8ca944b04882b2d6755756101b19e7 |
23-Aug-2013 |
Sascha Haeberling <haeberling@google.com> |
am 651c18fe: am f2b312dd: am e2fb9943: Proper I18N of the Details dialog, especially for RTL. * commit '651c18fee420b1b5eae1655d43c4b13d6289d1d7': Proper I18N of the Details dialog, especially for RTL.
|
651c18fee420b1b5eae1655d43c4b13d6289d1d7 |
23-Aug-2013 |
Sascha Haeberling <haeberling@google.com> |
am f2b312dd: am e2fb9943: Proper I18N of the Details dialog, especially for RTL. * commit 'f2b312ddb528d9faed743ed8d23d93789a572d34': Proper I18N of the Details dialog, especially for RTL.
|
f2b312ddb528d9faed743ed8d23d93789a572d34 |
23-Aug-2013 |
Sascha Haeberling <haeberling@google.com> |
am e2fb9943: Proper I18N of the Details dialog, especially for RTL. * commit 'e2fb9943fb2d5a51a651f138d88473bf7f62e0b9': Proper I18N of the Details dialog, especially for RTL.
|
e2fb9943fb2d5a51a651f138d88473bf7f62e0b9 |
22-Aug-2013 |
Sascha Haeberling <haeberling@google.com> |
Proper I18N of the Details dialog, especially for RTL. Bug: 7141309 Change-Id: I27a2efd83b355cf2c7fa6cc6c9b386c1c0496c6b
es/layout/details.xml
rc/com/android/camera/data/LocalMediaData.java
rc/com/android/camera/data/MediaDetails.java
rc/com/android/camera/ui/DetailsDialog.java
|
64fe605b9a969e316518e1c1b89d7f64a09b2691 |
23-Aug-2013 |
Sascha Haeberling <haeberling@google.com> |
am 6196fadc: am 779160b3: am 00373f8a: Merge "Speed up filmstrip by not decoding with default 3000px." into gb-ub-photos-carlsbad * commit '6196fadc87d07d1269ed121b2423662c6b3eebbf': Speed up filmstrip by not decoding with default 3000px.
|
d528a110dfc107bb14991da6de6d535fa5ccf7e2 |
23-Aug-2013 |
Doris Liu <tianliu@google.com> |
am 26a5082d: am d567d7d5: am ce2acbcb: Fix preview thumb orientation * commit '26a5082dbcf2b324550a0a44c7eb907fff086f67': Fix preview thumb orientation
|
b05a0791b94d3ac00d41db7d015489fdba589405 |
23-Aug-2013 |
Angus Kong <shkong@google.com> |
am 7b1e22c7: am 0174828e: am f737ac48: Merge "Add support to "go-to-next" in film strip." into gb-ub-photos-carlsbad * commit '7b1e22c7d0083cc6da935f65bbf234b51258db52': Add support to "go-to-next" in film strip.
|
145ef5f6f91a97f532fefa79f71afef62f72ebcc |
23-Aug-2013 |
Doris Liu <tianliu@google.com> |
am 9191a598: am 64335cf3: am 56f16746: Merge "Fix video capture animation and video snapshot animation" into gb-ub-photos-carlsbad * commit '9191a598d8204d2756cc05564bdd6faeda1cb585': Fix video capture animation and video snapshot animation
|
f81f253cb2564202093d7752e9ab31ac39b8c92d |
23-Aug-2013 |
Angus Kong <shkong@google.com> |
am d7f7649a: am 10096771: am 15396ca6: Merge "Fix delete animation in fullscreen mode." into gb-ub-photos-carlsbad * commit 'd7f7649add68ee85376e3cda81ffa5cf00c2bd7a': Fix delete animation in fullscreen mode.
|
b2d68118bebf5059180f451ef1a274b3d5d63d22 |
23-Aug-2013 |
Angus Kong <shkong@google.com> |
am 963718bf: am 0d9217b4: am 7e374eb0: Stop the MediaSaveService after unbinding. * commit '963718bf313e849209f8acb050a58ac8016430d9': Stop the MediaSaveService after unbinding.
|
24e5ab1e10639632f99decb7da1bfe1213e56cfd |
23-Aug-2013 |
Angus Kong <shkong@google.com> |
am d43c559e: am ef851bf2: am 025136bb: Support filmstrip swipe in full-screen. * commit 'd43c559eb98bc0c431f5e1db196d2efc51a4dcc7': Support filmstrip swipe in full-screen.
|
2303b76915f23fc2633f84280c654dff16a70c24 |
23-Aug-2013 |
Angus Kong <shkong@google.com> |
am fffbdc3f: am 78ad4a5a: am 87025351: Merge "Update the final PhotoSphere result correctly." into gb-ub-photos-carlsbad * commit 'fffbdc3f9b964d7d0414ae0ab811a3aa5bf6ff03': Update the final PhotoSphere result correctly.
|
5f5e1850d46abb0b23710393c298bc51c6c3259d |
23-Aug-2013 |
Doris Liu <tianliu@google.com> |
am 11dbe8af: am de07dbb6: am 304a6360: Merge "Fix nav bar overlapping camera bottom UI controls" into gb-ub-photos-carlsbad * commit '11dbe8af9d5656ae618ebb0c64e4d24321b5e3de': Fix nav bar overlapping camera bottom UI controls
|
a54b39ee372f18145aa5d5d101f7830e801ca6b8 |
23-Aug-2013 |
Sascha Haeberling <haeberling@google.com> |
am 97ff12f9: am fd791ba4: am b5ca24e7: Merge "Remove the "button" part of the shutter button description." into gb-ub-photos-carlsbad * commit '97ff12f9ec3bef714d0434af5fb1691c65f38f45': Remove the "button" part of the shutter button description.
|
a3cf3c2ca7c30f4d77be943ce837d0ce0f0c0a69 |
23-Aug-2013 |
Doris Liu <tianliu@google.com> |
am 00a2e30d: am 2acc6ac5: am d7e01e25: Merge "Fix video snapshot aspect ratio" into gb-ub-photos-carlsbad * commit '00a2e30d5053a76e1b8474e5bbeecfa6ea699f75': Fix video snapshot aspect ratio
|
d17699036abf7032b8e3e90c18580d852da4d1bb |
23-Aug-2013 |
Doris Liu <tianliu@google.com> |
am a0b114fa: am b8ff43a2: am 2b18ecec: Merge "Make camera preview full screen" into gb-ub-photos-carlsbad * commit 'a0b114fa27c91fcf742e68308db179c39c10f914': Make camera preview full screen
|
6196fadc87d07d1269ed121b2423662c6b3eebbf |
23-Aug-2013 |
Sascha Haeberling <haeberling@google.com> |
am 779160b3: am 00373f8a: Merge "Speed up filmstrip by not decoding with default 3000px." into gb-ub-photos-carlsbad * commit '779160b3411588dfd018974f83414996dfb97665': Speed up filmstrip by not decoding with default 3000px.
|
26a5082dbcf2b324550a0a44c7eb907fff086f67 |
23-Aug-2013 |
Doris Liu <tianliu@google.com> |
am d567d7d5: am ce2acbcb: Fix preview thumb orientation * commit 'd567d7d51fc84b9abb9bb5b3c6bf46855234a480': Fix preview thumb orientation
|
7b1e22c7d0083cc6da935f65bbf234b51258db52 |
23-Aug-2013 |
Angus Kong <shkong@google.com> |
am 0174828e: am f737ac48: Merge "Add support to "go-to-next" in film strip." into gb-ub-photos-carlsbad * commit '0174828e574bc7c94c90be0dce7b3831983b0ff8': Add support to "go-to-next" in film strip.
|
9191a598d8204d2756cc05564bdd6faeda1cb585 |
23-Aug-2013 |
Doris Liu <tianliu@google.com> |
am 64335cf3: am 56f16746: Merge "Fix video capture animation and video snapshot animation" into gb-ub-photos-carlsbad * commit '64335cf39cf7c94a6457160ef6d272b01f360167': Fix video capture animation and video snapshot animation
|
d7f7649add68ee85376e3cda81ffa5cf00c2bd7a |
23-Aug-2013 |
Angus Kong <shkong@google.com> |
am 10096771: am 15396ca6: Merge "Fix delete animation in fullscreen mode." into gb-ub-photos-carlsbad * commit '10096771260244daedac89e70183c54bb577bd0c': Fix delete animation in fullscreen mode.
|
963718bf313e849209f8acb050a58ac8016430d9 |
23-Aug-2013 |
Angus Kong <shkong@google.com> |
am 0d9217b4: am 7e374eb0: Stop the MediaSaveService after unbinding. * commit '0d9217b4da9dab3b7e70c8df0a600f5601e9fee4': Stop the MediaSaveService after unbinding.
|
d43c559eb98bc0c431f5e1db196d2efc51a4dcc7 |
23-Aug-2013 |
Angus Kong <shkong@google.com> |
am ef851bf2: am 025136bb: Support filmstrip swipe in full-screen. * commit 'ef851bf2984c3eba1db92e85f4e908ee56e192f9': Support filmstrip swipe in full-screen.
|
fffbdc3f9b964d7d0414ae0ab811a3aa5bf6ff03 |
23-Aug-2013 |
Angus Kong <shkong@google.com> |
am 78ad4a5a: am 87025351: Merge "Update the final PhotoSphere result correctly." into gb-ub-photos-carlsbad * commit '78ad4a5af6f283bf358f75aaeef1231e74eaab12': Update the final PhotoSphere result correctly.
|
11dbe8af9d5656ae618ebb0c64e4d24321b5e3de |
23-Aug-2013 |
Doris Liu <tianliu@google.com> |
am de07dbb6: am 304a6360: Merge "Fix nav bar overlapping camera bottom UI controls" into gb-ub-photos-carlsbad * commit 'de07dbb65fb35fd36c6e27c417b8fc0c8e4f690f': Fix nav bar overlapping camera bottom UI controls
|
97ff12f9ec3bef714d0434af5fb1691c65f38f45 |
23-Aug-2013 |
Sascha Haeberling <haeberling@google.com> |
am fd791ba4: am b5ca24e7: Merge "Remove the "button" part of the shutter button description." into gb-ub-photos-carlsbad * commit 'fd791ba47fdca3f2c625293088c5869b221bfb1c': Remove the "button" part of the shutter button description.
|
00a2e30d5053a76e1b8474e5bbeecfa6ea699f75 |
23-Aug-2013 |
Doris Liu <tianliu@google.com> |
am 2acc6ac5: am d7e01e25: Merge "Fix video snapshot aspect ratio" into gb-ub-photos-carlsbad * commit '2acc6ac5e0720e484c2f860b1135b2165b1b5d19': Fix video snapshot aspect ratio
|
a0b114fa27c91fcf742e68308db179c39c10f914 |
23-Aug-2013 |
Doris Liu <tianliu@google.com> |
am b8ff43a2: am 2b18ecec: Merge "Make camera preview full screen" into gb-ub-photos-carlsbad * commit 'b8ff43a2eef0aca35c685c5c6cbffa807944714c': Make camera preview full screen
|
779160b3411588dfd018974f83414996dfb97665 |
23-Aug-2013 |
Sascha Haeberling <haeberling@google.com> |
am 00373f8a: Merge "Speed up filmstrip by not decoding with default 3000px." into gb-ub-photos-carlsbad * commit '00373f8a411042964f019a6355864a4c25fc2238': Speed up filmstrip by not decoding with default 3000px.
|
d567d7d51fc84b9abb9bb5b3c6bf46855234a480 |
23-Aug-2013 |
Doris Liu <tianliu@google.com> |
am ce2acbcb: Fix preview thumb orientation * commit 'ce2acbcb77225b6d429a23e00f69aadde8c2378b': Fix preview thumb orientation
|
0174828e574bc7c94c90be0dce7b3831983b0ff8 |
23-Aug-2013 |
Angus Kong <shkong@google.com> |
am f737ac48: Merge "Add support to "go-to-next" in film strip." into gb-ub-photos-carlsbad * commit 'f737ac489200f12b6a48c4d0f7b63c0731eb8713': Add support to "go-to-next" in film strip.
|
64335cf39cf7c94a6457160ef6d272b01f360167 |
23-Aug-2013 |
Doris Liu <tianliu@google.com> |
am 56f16746: Merge "Fix video capture animation and video snapshot animation" into gb-ub-photos-carlsbad * commit '56f16746c8b3208e12134fb51843dde988cc79bc': Fix video capture animation and video snapshot animation
|
10096771260244daedac89e70183c54bb577bd0c |
23-Aug-2013 |
Angus Kong <shkong@google.com> |
am 15396ca6: Merge "Fix delete animation in fullscreen mode." into gb-ub-photos-carlsbad * commit '15396ca68c47a4ef14e6b23c6cd009d8915f8ea2': Fix delete animation in fullscreen mode.
|
0d9217b4da9dab3b7e70c8df0a600f5601e9fee4 |
23-Aug-2013 |
Angus Kong <shkong@google.com> |
am 7e374eb0: Stop the MediaSaveService after unbinding. * commit '7e374eb0a450ed2689b556ab42a0a88c8f74df2e': Stop the MediaSaveService after unbinding.
|
ef851bf2984c3eba1db92e85f4e908ee56e192f9 |
23-Aug-2013 |
Angus Kong <shkong@google.com> |
am 025136bb: Support filmstrip swipe in full-screen. * commit '025136bb4639d84b2a5a7b95367fabcc92b86415': Support filmstrip swipe in full-screen.
|
78ad4a5af6f283bf358f75aaeef1231e74eaab12 |
23-Aug-2013 |
Angus Kong <shkong@google.com> |
am 87025351: Merge "Update the final PhotoSphere result correctly." into gb-ub-photos-carlsbad * commit '870253516ce315888ac64e1921285e47154a75e7': Update the final PhotoSphere result correctly.
|
de07dbb65fb35fd36c6e27c417b8fc0c8e4f690f |
23-Aug-2013 |
Doris Liu <tianliu@google.com> |
am 304a6360: Merge "Fix nav bar overlapping camera bottom UI controls" into gb-ub-photos-carlsbad * commit '304a6360c3b710a4a5781788b887ca479646c86f': Fix nav bar overlapping camera bottom UI controls
|
fd791ba47fdca3f2c625293088c5869b221bfb1c |
23-Aug-2013 |
Sascha Haeberling <haeberling@google.com> |
am b5ca24e7: Merge "Remove the "button" part of the shutter button description." into gb-ub-photos-carlsbad * commit 'b5ca24e7ce3aa1e3511f0bdf871fd7e41c247027': Remove the "button" part of the shutter button description.
|
2acc6ac5e0720e484c2f860b1135b2165b1b5d19 |
23-Aug-2013 |
Doris Liu <tianliu@google.com> |
am d7e01e25: Merge "Fix video snapshot aspect ratio" into gb-ub-photos-carlsbad * commit 'd7e01e25dab83af2fe093d73f8f5f705f1a27305': Fix video snapshot aspect ratio
|
b8ff43a2eef0aca35c685c5c6cbffa807944714c |
23-Aug-2013 |
Doris Liu <tianliu@google.com> |
am 2b18ecec: Merge "Make camera preview full screen" into gb-ub-photos-carlsbad * commit '2b18ecece9ad0affe9054b2818722bf727fcde97': Make camera preview full screen
|
2d9c1e10dcddf1fcffdc33de9a32806d33d5f54c |
23-Aug-2013 |
Jason Noguchi <jnoguchi@google.com> |
am fc30eda1: am 17525fee: am 5ad4114f: (-s ours) Merge "Updating the Camera tests makefile and source to reflect recent split between camera and gallery apps." into gb-ub-photos-carlsbad * commit 'fc30eda12b5d1a1e0ad073c9137bfeed26540a50': Updating the Camera tests makefile and source to reflect recent split between camera and gallery apps.
|
fc30eda12b5d1a1e0ad073c9137bfeed26540a50 |
23-Aug-2013 |
Jason Noguchi <jnoguchi@google.com> |
am 17525fee: am 5ad4114f: (-s ours) Merge "Updating the Camera tests makefile and source to reflect recent split between camera and gallery apps." into gb-ub-photos-carlsbad * commit '17525fee654db267564485339b366356a8c42e91': Updating the Camera tests makefile and source to reflect recent split between camera and gallery apps.
|
17525fee654db267564485339b366356a8c42e91 |
23-Aug-2013 |
Jason Noguchi <jnoguchi@google.com> |
am 5ad4114f: (-s ours) Merge "Updating the Camera tests makefile and source to reflect recent split between camera and gallery apps." into gb-ub-photos-carlsbad * commit '5ad4114f1ad766fa0ec9a9e6469313dd000f426d': Updating the Camera tests makefile and source to reflect recent split between camera and gallery apps.
|
00373f8a411042964f019a6355864a4c25fc2238 |
22-Aug-2013 |
Sascha Haeberling <haeberling@google.com> |
Merge "Speed up filmstrip by not decoding with default 3000px." into gb-ub-photos-carlsbad
|
da3fc17d2cf6b4f7925e47f921165a60ec477794 |
22-Aug-2013 |
The Android Automerger <android-build@google.com> |
merge in klp-release history after reset to klp-dev
|
1259bc49d956887477ad6d789668fb61f572b046 |
22-Aug-2013 |
Sascha Haeberling <haeberling@google.com> |
Speed up filmstrip by not decoding with default 3000px. Bug: 10330214 Bug: 10430152 We need to tell the wrapped data adapters about the size we need. Also, use a more efficient way to determine the sample size. Change-Id: Ie2c6fb438f06d97d6e5420afdceccccf41040020
rc/com/android/camera/data/AbstractLocalDataAdapterWrapper.java
rc/com/android/camera/data/LocalMediaData.java
|
ce2acbcb77225b6d429a23e00f69aadde8c2378b |
22-Aug-2013 |
Doris Liu <tianliu@google.com> |
Fix preview thumb orientation Bug: 10428123 Change-Id: I7c6f37db66d9e10a07f555902b214009156736c1
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/PhotoUI.java
|
f737ac489200f12b6a48c4d0f7b63c0731eb8713 |
22-Aug-2013 |
Angus Kong <shkong@google.com> |
Merge "Add support to "go-to-next" in film strip." into gb-ub-photos-carlsbad
|
734598c39e6a9d809982dae2907dc7d10e0b0e9f |
22-Aug-2013 |
Angus Kong <shkong@google.com> |
Add support to "go-to-next" in film strip. bug:10328123 Change-Id: I018876df89cc7ed125a32af850e6b26114fb1004
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/PhotoUI.java
rc/com/android/camera/VideoUI.java
rc/com/android/camera/ui/FilmStripView.java
|
56f16746c8b3208e12134fb51843dde988cc79bc |
22-Aug-2013 |
Doris Liu <tianliu@google.com> |
Merge "Fix video capture animation and video snapshot animation" into gb-ub-photos-carlsbad
|
3973deba115d398a25f0b74c2aea2ff4079355a5 |
21-Aug-2013 |
Doris Liu <tianliu@google.com> |
Fix video capture animation and video snapshot animation Also removed unused effects recording code Bug: 10326106 Bug: 10414112 Change-Id: I904a26a0b10c75fcce650dc0ec63d7c11746dc2e
rc/com/android/camera/MediaSaveService.java
rc/com/android/camera/VideoModule.java
rc/com/android/camera/VideoUI.java
|
15396ca68c47a4ef14e6b23c6cd009d8915f8ea2 |
22-Aug-2013 |
Angus Kong <shkong@google.com> |
Merge "Fix delete animation in fullscreen mode." into gb-ub-photos-carlsbad
|
6f76afc19c6d6e030ae97e5a5860ea664a391e27 |
21-Aug-2013 |
Angus Kong <shkong@google.com> |
Stop the MediaSaveService after unbinding. bug:10361258 Change-Id: Ie1dc3caac03f7a691aae0c84c468bfb21ce6ae90
rc/com/android/camera/CameraActivity.java
|
aa2a243bdc91b809dbfe01a9933b02e6b95d983f |
21-Aug-2013 |
Angus Kong <shkong@google.com> |
Fix delete animation in fullscreen mode. bug:10414539 Change-Id: I798492a824306d0eb479aae4e822cd9c7fbe3530
rc/com/android/camera/ui/FilmStripView.java
|
7e374eb0a450ed2689b556ab42a0a88c8f74df2e |
21-Aug-2013 |
Angus Kong <shkong@google.com> |
Stop the MediaSaveService after unbinding. bug:10361258 Change-Id: Ie1dc3caac03f7a691aae0c84c468bfb21ce6ae90
rc/com/android/camera/CameraActivity.java
|
025136bb4639d84b2a5a7b95367fabcc92b86415 |
21-Aug-2013 |
Angus Kong <shkong@google.com> |
Support filmstrip swipe in full-screen. bug:10341731 Change-Id: Ib4a3278f72d3e1070603d2a094f4021a947bdc56
rc/com/android/camera/ui/FilmStripView.java
|
e2f6f9c26a085741add26de27684d370a38a0dcc |
21-Aug-2013 |
The Android Automerger <android-build@google.com> |
merge in klp-release history after reset to klp-dev
|
870253516ce315888ac64e1921285e47154a75e7 |
21-Aug-2013 |
Angus Kong <shkong@google.com> |
Merge "Update the final PhotoSphere result correctly." into gb-ub-photos-carlsbad
|
304a6360c3b710a4a5781788b887ca479646c86f |
21-Aug-2013 |
Doris Liu <tianliu@google.com> |
Merge "Fix nav bar overlapping camera bottom UI controls" into gb-ub-photos-carlsbad
|
b5ca24e7ce3aa1e3511f0bdf871fd7e41c247027 |
21-Aug-2013 |
Sascha Haeberling <haeberling@google.com> |
Merge "Remove the "button" part of the shutter button description." into gb-ub-photos-carlsbad
|
513f1c1e8b7b4249c599a734307e348355439b67 |
21-Aug-2013 |
Doris Liu <tianliu@google.com> |
Fix nav bar overlapping camera bottom UI controls Bug: 10394750 Change-Id: Ia46d4903a2c148102bd62ca71516bd81e10fe497
rc/com/android/camera/ui/FilmStripView.java
|
d7e01e25dab83af2fe093d73f8f5f705f1a27305 |
21-Aug-2013 |
Doris Liu <tianliu@google.com> |
Merge "Fix video snapshot aspect ratio" into gb-ub-photos-carlsbad
|
f9a082c0f75867520c2bb5313fc098aa145c5924 |
21-Aug-2013 |
Sascha Haeberling <haeberling@google.com> |
Remove the "button" part of the shutter button description. Bug: 10081355 Talkback automatically appends "button" to a clickable ImageView. Change-Id: I7d20b96965a5542277cb27b0fd8d255251b2cb3c
es/values/strings.xml
|
2b18ecece9ad0affe9054b2818722bf727fcde97 |
21-Aug-2013 |
Doris Liu <tianliu@google.com> |
Merge "Make camera preview full screen" into gb-ub-photos-carlsbad
|
6df2d96e6a3d1f20ef04d2a29c9bb15f3002ad15 |
21-Aug-2013 |
Doris Liu <tianliu@google.com> |
Fix video snapshot aspect ratio Bug: 10312002 Change-Id: Ibe2037195b3936baa63628797ea2b742825ed701
rc/com/android/camera/MediaSaveService.java
rc/com/android/camera/VideoModule.java
|
5ad4114f1ad766fa0ec9a9e6469313dd000f426d |
21-Aug-2013 |
Jason Noguchi <jnoguchi@google.com> |
Merge "Updating the Camera tests makefile and source to reflect recent split between camera and gallery apps." into gb-ub-photos-carlsbad
|
3189c037886fda47be73da9885e6760df50efd71 |
20-Aug-2013 |
Jason Noguchi <jnoguchi@google.com> |
Updating the Camera tests makefile and source to reflect recent split between camera and gallery apps. Change-Id: Ie5b3eb918c67b1f9e77f9a1f53d3cb562d78a001
ests/AndroidManifest.xml
ests/src/com/android/camera/CameraTestRunner.java
ests/src/com/android/camera/StressTests.java
ests/src/com/android/camera/functional/CameraTest.java
ests/src/com/android/camera/functional/ImageCaptureIntentTest.java
ests/src/com/android/camera/functional/VideoCaptureIntentTest.java
ests/src/com/android/camera/stress/CameraLatency.java
ests/src/com/android/camera/stress/CameraStartUp.java
ests/src/com/android/camera/stress/CameraStressTestRunner.java
ests/src/com/android/camera/stress/ImageCapture.java
ests/src/com/android/camera/stress/ShotToShotLatency.java
ests/src/com/android/camera/stress/SwitchPreview.java
ests/src/com/android/camera/stress/TestUtil.java
ests/src/com/android/camera/stress/VideoCapture.java
ests/src/com/android/camera/unittest/CameraUnitTest.java
ests/src/com/android/gallery3d/CameraTestRunner.java
ests/src/com/android/gallery3d/StressTests.java
ests/src/com/android/gallery3d/functional/CameraTest.java
ests/src/com/android/gallery3d/functional/ImageCaptureIntentTest.java
ests/src/com/android/gallery3d/functional/VideoCaptureIntentTest.java
ests/src/com/android/gallery3d/stress/CameraLatency.java
ests/src/com/android/gallery3d/stress/CameraStartUp.java
ests/src/com/android/gallery3d/stress/CameraStressTestRunner.java
ests/src/com/android/gallery3d/stress/ImageCapture.java
ests/src/com/android/gallery3d/stress/ShotToShotLatency.java
ests/src/com/android/gallery3d/stress/SwitchPreview.java
ests/src/com/android/gallery3d/stress/TestUtil.java
ests/src/com/android/gallery3d/stress/VideoCapture.java
ests/src/com/android/gallery3d/unittest/CameraUnitTest.java
|
23ac39ce4c6b7b5934d9f6604c8348dfb94bc243 |
20-Aug-2013 |
Doris Liu <tianliu@google.com> |
Make camera preview full screen Bug: 10328123 Change-Id: I4a72b7d7d35dba7cceecd61db9879265617c511e
es/values/styles.xml
|
352ce55bf04462090e671ded0b205b877421e466 |
20-Aug-2013 |
Doris Liu <tianliu@google.com> |
am 6fa6de7a: am d049c85e: am 13ca71eb: Fix squished preview * commit '6fa6de7a4a12b6e09153fd35e057930e07e1cb8c': Fix squished preview
|
6fa6de7a4a12b6e09153fd35e057930e07e1cb8c |
20-Aug-2013 |
Doris Liu <tianliu@google.com> |
am d049c85e: am 13ca71eb: Fix squished preview * commit 'd049c85e69dc388089deca097df3c5e58ce95371': Fix squished preview
|
d049c85e69dc388089deca097df3c5e58ce95371 |
20-Aug-2013 |
Doris Liu <tianliu@google.com> |
am 13ca71eb: Fix squished preview * commit '13ca71ebdbb2eb9c492da16262311b1290474f7d': Fix squished preview
|
8969a67c926608737f3e49f2d2240298372e8416 |
20-Aug-2013 |
Angus Kong <shkong@google.com> |
Update the final PhotoSphere result correctly. bug:10400557 Change-Id: I8e8b22b569c3b3a7f4d25e7eb46053332e2dc062
rc/com/android/camera/ui/FilmStripView.java
|
13ca71ebdbb2eb9c492da16262311b1290474f7d |
20-Aug-2013 |
Doris Liu <tianliu@google.com> |
Fix squished preview Bug: 10330209 Change-Id: I0b208ccd556d8c65474ad6bce0d2ddc3c2bdb7f6
rc/com/android/camera/PhotoUI.java
|
69d9e93867c780b56e05066a9bcce025091342ec |
20-Aug-2013 |
nicolasroard <nicolasroard@google.com> |
am 4921b308: am 9fd5ee8a: am 0819304b: Add "set as" capability in Film Strip * commit '4921b308d9b40a6f2ba7b3c5a7c1d91bd089cf66': Add "set as" capability in Film Strip
|
4921b308d9b40a6f2ba7b3c5a7c1d91bd089cf66 |
20-Aug-2013 |
nicolasroard <nicolasroard@google.com> |
am 9fd5ee8a: am 0819304b: Add "set as" capability in Film Strip * commit '9fd5ee8aae5f7aca69c65245007a10fe672422d7': Add "set as" capability in Film Strip
|
9fd5ee8aae5f7aca69c65245007a10fe672422d7 |
20-Aug-2013 |
nicolasroard <nicolasroard@google.com> |
am 0819304b: Add "set as" capability in Film Strip * commit '0819304bc06ffd3498d9fd0d8a148c50f0903c46': Add "set as" capability in Film Strip
|
0819304bc06ffd3498d9fd0d8a148c50f0903c46 |
20-Aug-2013 |
nicolasroard <nicolasroard@google.com> |
Add "set as" capability in Film Strip bug:10367174 Change-Id: I9161e08f26c02edd1d168ac6986de61066d69552
rc/com/android/camera/CameraActivity.java
|
a4c5e53cb988eec7080275807b4a5701fd615797 |
20-Aug-2013 |
Sascha Haeberling <haeberling@google.com> |
am 054e5237: am cf43f817: am 722c8607: Rename accessibility text for Photo Sphere mode from \'new panorama\'. * commit '054e5237e9f901f1603c8f59c593b897e8ac7f15': Rename accessibility text for Photo Sphere mode from 'new panorama'.
|
054e5237e9f901f1603c8f59c593b897e8ac7f15 |
20-Aug-2013 |
Sascha Haeberling <haeberling@google.com> |
am cf43f817: am 722c8607: Rename accessibility text for Photo Sphere mode from \'new panorama\'. * commit 'cf43f817a0aff70ee126eb3c669584ef79824786': Rename accessibility text for Photo Sphere mode from 'new panorama'.
|
cf43f817a0aff70ee126eb3c669584ef79824786 |
20-Aug-2013 |
Sascha Haeberling <haeberling@google.com> |
am 722c8607: Rename accessibility text for Photo Sphere mode from \'new panorama\'. * commit '722c86077d15354ccf0d6e1acf5b6384df5da85f': Rename accessibility text for Photo Sphere mode from 'new panorama'.
|
f9714ce2436c75f4d1e56db6f87cf14b4bb42abc |
20-Aug-2013 |
The Android Automerger <android-build@google.com> |
merge in klp-release history after reset to klp-dev
|
722c86077d15354ccf0d6e1acf5b6384df5da85f |
20-Aug-2013 |
Sascha Haeberling <haeberling@google.com> |
Rename accessibility text for Photo Sphere mode from 'new panorama'. Bug: 10075811 Change-Id: I7a0e7f890d0243fe13e8f3746d49378daf1bb962
es/values/strings.xml
rc/com/android/camera/ui/CameraSwitcher.java
|
c18989c04de4c2dd1be600ef0e537eee4c8f254c |
19-Aug-2013 |
Sascha Haeberling <haeberling@google.com> |
Enable switching cameras in video mode. Bug: 10313018 Change-Id: I8e75341d7d37135ba7747d56a1a0e6d19ffb8eaa
rc/com/android/camera/VideoModule.java
|
899ecf093bb83ae6436890dabf62893a017e19d5 |
19-Aug-2013 |
Angus Kong <shkong@google.com> |
am 31ffcf37: am 49ab978a: am b269061d: Merge "Implement deletion in the menu." into gb-ub-photos-carlsbad * commit '31ffcf377e348aeaea273f50c691037c140b59ef': Implement deletion in the menu.
|
31ffcf377e348aeaea273f50c691037c140b59ef |
19-Aug-2013 |
Angus Kong <shkong@google.com> |
am 49ab978a: am b269061d: Merge "Implement deletion in the menu." into gb-ub-photos-carlsbad * commit '49ab978ac5ee1d7188fefa18a5ebce1a016d2386': Implement deletion in the menu.
|
49ab978ac5ee1d7188fefa18a5ebce1a016d2386 |
19-Aug-2013 |
Angus Kong <shkong@google.com> |
am b269061d: Merge "Implement deletion in the menu." into gb-ub-photos-carlsbad * commit 'b269061daf65d090e6836980b57c408f62039841': Implement deletion in the menu.
|
b269061daf65d090e6836980b57c408f62039841 |
19-Aug-2013 |
Angus Kong <shkong@google.com> |
Merge "Implement deletion in the menu." into gb-ub-photos-carlsbad
|
e857cc90a98e280e2008beb03e2446bd642d2ec4 |
19-Aug-2013 |
Angus Kong <shkong@google.com> |
Implement deletion in the menu. bug:10367402 Change-Id: Ia48544ccb4186808f8cf89c7b4ea6d291aa8cf24
rc/com/android/camera/CameraActivity.java
|
8106e976f972975a02ace2013fb4c0695b2815a7 |
19-Aug-2013 |
Sascha Haeberling <haeberling@google.com> |
am 08ae9e64: am 32ba33c6: am b0a5929b: Add video details to the details menu * commit '08ae9e647fbc9a35181ed0db5d982cce5791b3f5': Add video details to the details menu
|
08ae9e647fbc9a35181ed0db5d982cce5791b3f5 |
19-Aug-2013 |
Sascha Haeberling <haeberling@google.com> |
am 32ba33c6: am b0a5929b: Add video details to the details menu * commit '32ba33c6b1f4735df00e57013a2fe0971defdc66': Add video details to the details menu
|
32ba33c6b1f4735df00e57013a2fe0971defdc66 |
19-Aug-2013 |
Sascha Haeberling <haeberling@google.com> |
am b0a5929b: Add video details to the details menu * commit 'b0a5929b1dd0ddc2729e23ba95afdb43a1aecfd5': Add video details to the details menu
|
b0a5929b1dd0ddc2729e23ba95afdb43a1aecfd5 |
19-Aug-2013 |
Sascha Haeberling <haeberling@google.com> |
Add video details to the details menu Bug: 10330505 Also fix a potential NPE issue and some minor reformatting. Change-Id: I89a32645a497d1f19d935b96bd1997e6fdf902b2
rc/com/android/camera/data/LocalMediaData.java
rc/com/android/camera/data/MediaDetails.java
|
914497a2bbbff9e2e83d0861f1d23b4e0581f2b5 |
19-Aug-2013 |
ztenghui <ztenghui@google.com> |
am ac8455c9: am 397586f0: am 99a5ef6f: Merge "Update the action bar style to match Bryce" into gb-ub-photos-carlsbad * commit 'ac8455c9760ef793303d3f61f86a3cd09f774798': Update the action bar style to match Bryce
|
ac8455c9760ef793303d3f61f86a3cd09f774798 |
19-Aug-2013 |
ztenghui <ztenghui@google.com> |
am 397586f0: am 99a5ef6f: Merge "Update the action bar style to match Bryce" into gb-ub-photos-carlsbad * commit '397586f086023ff3906cfcd5d3defd1b630af379': Update the action bar style to match Bryce
|
397586f086023ff3906cfcd5d3defd1b630af379 |
19-Aug-2013 |
ztenghui <ztenghui@google.com> |
am 99a5ef6f: Merge "Update the action bar style to match Bryce" into gb-ub-photos-carlsbad * commit '99a5ef6f6158d0056c90135329da4af0dc8ca7f4': Update the action bar style to match Bryce
|
99a5ef6f6158d0056c90135329da4af0dc8ca7f4 |
19-Aug-2013 |
ztenghui <ztenghui@google.com> |
Merge "Update the action bar style to match Bryce" into gb-ub-photos-carlsbad
|
8bfcc04e130d4b1e9fb5483aabd8a2cbf005d5cf |
19-Aug-2013 |
Sascha Haeberling <haeberling@google.com> |
am fe0655c5: am 119bd7ec: am e98a59af: Merge "Don\'t refresh item on resume as it leads to a filmstrip bug." into gb-ub-photos-carlsbad * commit 'fe0655c5b50b5a3d3036b5f84cdd49445f1db9f7': Don't refresh item on resume as it leads to a filmstrip bug.
|
2dff253c573f5edd4715e775bc51924ba400c1ae |
19-Aug-2013 |
ztenghui <ztenghui@google.com> |
Update the action bar style to match Bryce bug:10347330 Change-Id: I9a3e6f5cac0003cce4b19cba28904d539faa94a9
es/values/styles.xml
|
fe0655c5b50b5a3d3036b5f84cdd49445f1db9f7 |
19-Aug-2013 |
Sascha Haeberling <haeberling@google.com> |
am 119bd7ec: am e98a59af: Merge "Don\'t refresh item on resume as it leads to a filmstrip bug." into gb-ub-photos-carlsbad * commit '119bd7ecb7724fae56989f92bb4b8f143bbfc5e0': Don't refresh item on resume as it leads to a filmstrip bug.
|
f2e4e4a617b934d9bf5a418e56b7991e95829d29 |
19-Aug-2013 |
Sascha Haeberling <haeberling@google.com> |
am f39b9612: am b030d20d: am 58dfa0fb: Merge "Enable switching cameras in video mode." into gb-ub-photos-carlsbad * commit 'f39b9612dbfdea114c01ad6b3247f9d4378418ff': Enable switching cameras in video mode.
|
f39b9612dbfdea114c01ad6b3247f9d4378418ff |
19-Aug-2013 |
Sascha Haeberling <haeberling@google.com> |
am b030d20d: am 58dfa0fb: Merge "Enable switching cameras in video mode." into gb-ub-photos-carlsbad * commit 'b030d20df5f95ab5078fefc77bb59138d45b0605': Enable switching cameras in video mode.
|
119bd7ecb7724fae56989f92bb4b8f143bbfc5e0 |
19-Aug-2013 |
Sascha Haeberling <haeberling@google.com> |
am e98a59af: Merge "Don\'t refresh item on resume as it leads to a filmstrip bug." into gb-ub-photos-carlsbad * commit 'e98a59afc89fc97bc619ef8c3aa66781061592f8': Don't refresh item on resume as it leads to a filmstrip bug.
|
6b9e34ce361bd02a21cd4fd63435e2aa48d5c4b8 |
19-Aug-2013 |
Sascha Haeberling <haeberling@google.com> |
am 1b27950b: am 2c9dc8eb: am 88ef7664: Bring back the bottom controls in Filmstrip. * commit '1b27950b1f52a70b78372f661e28ee83c9ea91cf': Bring back the bottom controls in Filmstrip.
|
e98a59afc89fc97bc619ef8c3aa66781061592f8 |
19-Aug-2013 |
Sascha Haeberling <haeberling@google.com> |
Merge "Don't refresh item on resume as it leads to a filmstrip bug." into gb-ub-photos-carlsbad
|
1b27950b1f52a70b78372f661e28ee83c9ea91cf |
19-Aug-2013 |
Sascha Haeberling <haeberling@google.com> |
am 2c9dc8eb: am 88ef7664: Bring back the bottom controls in Filmstrip. * commit '2c9dc8eb28dcb508855002b0643526824fd51eb4': Bring back the bottom controls in Filmstrip.
|
b030d20df5f95ab5078fefc77bb59138d45b0605 |
19-Aug-2013 |
Sascha Haeberling <haeberling@google.com> |
am 58dfa0fb: Merge "Enable switching cameras in video mode." into gb-ub-photos-carlsbad * commit '58dfa0fb61e0499fdb108143da90014c463f05a2': Enable switching cameras in video mode.
|
e5b3ce3da8537b7a6bb971f293a5940f117a7a3f |
19-Aug-2013 |
Sascha Haeberling <haeberling@google.com> |
Don't refresh item on resume as it leads to a filmstrip bug. Instead we should listen to the proper events when something is changed with the media. Change-Id: Ia5337a4a83de73962070148e0a10f0a12f769345
rc/com/android/camera/CameraActivity.java
|
2c9dc8eb28dcb508855002b0643526824fd51eb4 |
19-Aug-2013 |
Sascha Haeberling <haeberling@google.com> |
am 88ef7664: Bring back the bottom controls in Filmstrip. * commit '88ef7664ba6a888fa5da8693091674e152b56192': Bring back the bottom controls in Filmstrip.
|
58dfa0fb61e0499fdb108143da90014c463f05a2 |
19-Aug-2013 |
Sascha Haeberling <haeberling@google.com> |
Merge "Enable switching cameras in video mode." into gb-ub-photos-carlsbad
|
88ef7664ba6a888fa5da8693091674e152b56192 |
16-Aug-2013 |
Sascha Haeberling <haeberling@google.com> |
Bring back the bottom controls in Filmstrip. Bug: 10367172 Bug: 10074320 Also hooks up the Edit button and the edit menu item. Change-Id: I0ce3344e09fdfd7794c417ddbe44b3d247a7ed7c
es/drawable/photopage_bottom_button_background.xml
es/layout/camera_filmstrip.xml
es/layout/filmstrip_bottom_controls.xml
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/data/LocalData.java
rc/com/android/camera/data/LocalMediaData.java
rc/com/android/camera/data/SimpleViewData.java
rc/com/android/camera/ui/FilmStripView.java
rc/com/android/camera/ui/FilmstripBottomControls.java
|
0d63b89ef8e5bfbfe2ef1a8d40505d7208052ff8 |
19-Aug-2013 |
Sascha Haeberling <haeberling@google.com> |
Enable switching cameras in video mode. Bug: 10313018 Change-Id: I8e75341d7d37135ba7747d56a1a0e6d19ffb8eaa
rc/com/android/camera/VideoModule.java
|
0ccb3ded758cb3b5ffcfc7c72c146a97f687a1ab |
19-Aug-2013 |
ztenghui <ztenghui@google.com> |
am 45bd3fe4: am 1a7fed5f: am 1571239c: Merge "Add the trim functionality back to FilmStripView" into gb-ub-photos-carlsbad * commit '45bd3fe4581677f4da04d4c558930244e60ada25': Add the trim functionality back to FilmStripView
|
45bd3fe4581677f4da04d4c558930244e60ada25 |
19-Aug-2013 |
ztenghui <ztenghui@google.com> |
am 1a7fed5f: am 1571239c: Merge "Add the trim functionality back to FilmStripView" into gb-ub-photos-carlsbad * commit '1a7fed5fdf84a3c796f50739b2f2842111b099fd': Add the trim functionality back to FilmStripView
|
1a7fed5fdf84a3c796f50739b2f2842111b099fd |
19-Aug-2013 |
ztenghui <ztenghui@google.com> |
am 1571239c: Merge "Add the trim functionality back to FilmStripView" into gb-ub-photos-carlsbad * commit '1571239c21fc4be7fd3c8db6ff1b8dc22f4d7e6f': Add the trim functionality back to FilmStripView
|
1571239c21fc4be7fd3c8db6ff1b8dc22f4d7e6f |
19-Aug-2013 |
ztenghui <ztenghui@google.com> |
Merge "Add the trim functionality back to FilmStripView" into gb-ub-photos-carlsbad
|
aae59add350a62955300c157cbbb37a448589014 |
19-Aug-2013 |
The Android Automerger <android-build@google.com> |
merge in klp-release history after reset to klp-dev
|
185a342cd6070fcd40801378e8216b73086b5a86 |
17-Aug-2013 |
Doris Liu <tianliu@google.com> |
am 957da61b: am c5541a55: am e9d3428f: Merge "Add image 1:1 support" into gb-ub-photos-carlsbad * commit '957da61b9229361723f5df310e758033131519f5': Add image 1:1 support
|
957da61b9229361723f5df310e758033131519f5 |
17-Aug-2013 |
Doris Liu <tianliu@google.com> |
am c5541a55: am e9d3428f: Merge "Add image 1:1 support" into gb-ub-photos-carlsbad * commit 'c5541a555c185a3ea665003eb085f7778028412e': Add image 1:1 support
|
c5541a555c185a3ea665003eb085f7778028412e |
17-Aug-2013 |
Doris Liu <tianliu@google.com> |
am e9d3428f: Merge "Add image 1:1 support" into gb-ub-photos-carlsbad * commit 'e9d3428f605ef90efbf94c18abf5bba3ac64d870': Add image 1:1 support
|
e9d3428f605ef90efbf94c18abf5bba3ac64d870 |
17-Aug-2013 |
Doris Liu <tianliu@google.com> |
Merge "Add image 1:1 support" into gb-ub-photos-carlsbad
|
c68570335a64be66829727e121afe1622902a74b |
16-Aug-2013 |
Doris Liu <tianliu@google.com> |
Add image 1:1 support Bug: 10308195 Change-Id: I7b7fcf3b46475a2d39bac27095d01d438582e516
rc/com/android/camera/ui/ZoomView.java
|
6b9203214d828d72758943aca55adceab684a862 |
17-Aug-2013 |
ztenghui <ztenghui@google.com> |
Add the trim functionality back to FilmStripView At the same time, disable the mute for now. bug:10313015 Change-Id: Ic2139f509ddb4ed57f3a4d67782eadb150e88ea5
es/menu/operations.xml
rc/com/android/camera/CameraActivity.java
|
b8a4f774bb2a8cd688a81bbedddfb12b529c841f |
17-Aug-2013 |
Mangesh Ghiware <mghiware@google.com> |
am 03ce0b53: am 34a3b7fb: am 856d7ec4: Merge "Add back intent-filter for default category and main action." into gb-ub-photos-carlsbad * commit '03ce0b5310ed9edf78bd323ab00f1ed760701421': Add back intent-filter for default category and main action.
|
03ce0b5310ed9edf78bd323ab00f1ed760701421 |
17-Aug-2013 |
Mangesh Ghiware <mghiware@google.com> |
am 34a3b7fb: am 856d7ec4: Merge "Add back intent-filter for default category and main action." into gb-ub-photos-carlsbad * commit '34a3b7fb968c07ff6e8a4420a285de86b43cd7b8': Add back intent-filter for default category and main action.
|
34a3b7fb968c07ff6e8a4420a285de86b43cd7b8 |
17-Aug-2013 |
Mangesh Ghiware <mghiware@google.com> |
am 856d7ec4: Merge "Add back intent-filter for default category and main action." into gb-ub-photos-carlsbad * commit '856d7ec4eac95a9411970228795945f0dae66af5': Add back intent-filter for default category and main action.
|
856d7ec4eac95a9411970228795945f0dae66af5 |
17-Aug-2013 |
Mangesh Ghiware <mghiware@google.com> |
Merge "Add back intent-filter for default category and main action." into gb-ub-photos-carlsbad
|
3964082cb6eb010fc57b57a8a8a42d087848a310 |
17-Aug-2013 |
Mangesh Ghiware <mghiware@google.com> |
Add back intent-filter for default category and main action. Bug: 10349073 Change-Id: I06c24cebc50fe555ec150813117955da09814fb4
ndroidManifest.xml
|
ae06c39d20d3883095a594ca32440167c9c8afea |
16-Aug-2013 |
Angus Kong <shkong@google.com> |
am db109f7c: am 9e06215e: am 4ff5a1ab: Set views in filmstrip invisible when alpha = 0. * commit 'db109f7c9c058690c556430b2e3a9819b2599e15': Set views in filmstrip invisible when alpha = 0.
|
db109f7c9c058690c556430b2e3a9819b2599e15 |
16-Aug-2013 |
Angus Kong <shkong@google.com> |
am 9e06215e: am 4ff5a1ab: Set views in filmstrip invisible when alpha = 0. * commit '9e06215e7c90d2867c406ff0a45d39ff9c5e1d81': Set views in filmstrip invisible when alpha = 0.
|
69e60486ed4263f1503b002c14b97f072e9a5939 |
16-Aug-2013 |
Sascha Haeberling <haeberling@google.com> |
am df651ff6: am 81d517a4: am 394023fb: Single-tap in fullscreen view toggles ActionBar. * commit 'df651ff65909e92fdc6b1189d857fe847688dd71': Single-tap in fullscreen view toggles ActionBar.
|
9e06215e7c90d2867c406ff0a45d39ff9c5e1d81 |
16-Aug-2013 |
Angus Kong <shkong@google.com> |
am 4ff5a1ab: Set views in filmstrip invisible when alpha = 0. * commit '4ff5a1ab360577c6a7ec953f9197778c84c9d334': Set views in filmstrip invisible when alpha = 0.
|
df651ff65909e92fdc6b1189d857fe847688dd71 |
16-Aug-2013 |
Sascha Haeberling <haeberling@google.com> |
am 81d517a4: am 394023fb: Single-tap in fullscreen view toggles ActionBar. * commit '81d517a45937eaae4ea574bc7995860fd6f7cafc': Single-tap in fullscreen view toggles ActionBar.
|
4ff5a1ab360577c6a7ec953f9197778c84c9d334 |
15-Aug-2013 |
Angus Kong <shkong@google.com> |
Set views in filmstrip invisible when alpha = 0. bug:10096747 Change-Id: Idcb62448acbf38d581af3a08a9bcbc0cad0ab6be
rc/com/android/camera/data/CameraDataAdapter.java
rc/com/android/camera/data/FixedFirstDataAdapter.java
rc/com/android/camera/data/FixedLastDataAdapter.java
rc/com/android/camera/data/LocalData.java
rc/com/android/camera/ui/FilmStripView.java
|
81d517a45937eaae4ea574bc7995860fd6f7cafc |
16-Aug-2013 |
Sascha Haeberling <haeberling@google.com> |
am 394023fb: Single-tap in fullscreen view toggles ActionBar. * commit '394023fb7e3c8d07d4aeafc30bf4b66ed481ebb7': Single-tap in fullscreen view toggles ActionBar.
|
394023fb7e3c8d07d4aeafc30bf4b66ed481ebb7 |
16-Aug-2013 |
Sascha Haeberling <haeberling@google.com> |
Single-tap in fullscreen view toggles ActionBar. Bug: 10347286 Change-Id: I55e400c957d4ec1ef1307e45007e2127ea5ab7ea
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/ui/FilmStripView.java
|
65b5837fb83472a883f6de1b9f032af7c85d7894 |
16-Aug-2013 |
Sascha Haeberling <haeberling@google.com> |
am 2cd5b165: am e14044ee: am fae11a16: Implent show-on-map functionality. Also make sure the show-on-map item is only shown for items with coordinates. and add the coordinate to the details view. * commit '2cd5b16540fae98487c639f6d2e84be52561003a': Implent show-on-map functionality. Also make sure the show-on-map item is only shown for items with coordinates. and add the coordinate to the details view.
|
2cd5b16540fae98487c639f6d2e84be52561003a |
16-Aug-2013 |
Sascha Haeberling <haeberling@google.com> |
am e14044ee: am fae11a16: Implent show-on-map functionality. Also make sure the show-on-map item is only shown for items with coordinates. and add the coordinate to the details view. * commit 'e14044ee6b5123bc842d8f315c2d3a30c4cfe4ac': Implent show-on-map functionality. Also make sure the show-on-map item is only shown for items with coordinates. and add the coordinate to the details view.
|
e14044ee6b5123bc842d8f315c2d3a30c4cfe4ac |
16-Aug-2013 |
Sascha Haeberling <haeberling@google.com> |
am fae11a16: Implent show-on-map functionality. Also make sure the show-on-map item is only shown for items with coordinates. and add the coordinate to the details view. * commit 'fae11a165e344a38811770c7d348eda214683edc': Implent show-on-map functionality. Also make sure the show-on-map item is only shown for items with coordinates. and add the coordinate to the details view.
|
fae11a165e344a38811770c7d348eda214683edc |
15-Aug-2013 |
Sascha Haeberling <haeberling@google.com> |
Implent show-on-map functionality. Also make sure the show-on-map item is only shown for items with coordinates. and add the coordinate to the details view. Bug: 10346208 Bug: 10330505 Change-Id: Idaeec207bcc0e7311fa3b651868515ccea81d083
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/data/CameraPreviewData.java
rc/com/android/camera/data/LocalData.java
rc/com/android/camera/data/LocalMediaData.java
rc/com/android/camera/data/SimpleViewData.java
rc/com/android/camera/ui/FilmStripView.java
rc/com/android/camera/util/CameraUtil.java
|
e5899625f47b381e2d3395acc95118e587fbd5b3 |
15-Aug-2013 |
Sascha Haeberling <haeberling@google.com> |
am d0fcc1bd: am ac87189c: am 29a27c76: Merge "Brings back the details menu with most EXIF data in it. Some are still missing and will come back later." into gb-ub-photos-carlsbad * commit 'd0fcc1bdc9e019179a3b2c69a632cc177e947be9': Brings back the details menu with most EXIF data in it. Some are still missing and will come back later.
|
d0fcc1bdc9e019179a3b2c69a632cc177e947be9 |
15-Aug-2013 |
Sascha Haeberling <haeberling@google.com> |
am ac87189c: am 29a27c76: Merge "Brings back the details menu with most EXIF data in it. Some are still missing and will come back later." into gb-ub-photos-carlsbad * commit 'ac87189cf64a3abf222a837dad055fac21eb1c56': Brings back the details menu with most EXIF data in it. Some are still missing and will come back later.
|
ac87189cf64a3abf222a837dad055fac21eb1c56 |
15-Aug-2013 |
Sascha Haeberling <haeberling@google.com> |
am 29a27c76: Merge "Brings back the details menu with most EXIF data in it. Some are still missing and will come back later." into gb-ub-photos-carlsbad * commit '29a27c76f2f581cdf5ab5c7e196312f635669420': Brings back the details menu with most EXIF data in it. Some are still missing and will come back later.
|
29a27c76f2f581cdf5ab5c7e196312f635669420 |
15-Aug-2013 |
Sascha Haeberling <haeberling@google.com> |
Merge "Brings back the details menu with most EXIF data in it. Some are still missing and will come back later." into gb-ub-photos-carlsbad
|
6f64b50db6565bc6454304fd20c0c4020b297bb7 |
15-Aug-2013 |
Sascha Haeberling <haeberling@google.com> |
Brings back the details menu with most EXIF data in it. Some are still missing and will come back later. Bug: 10330505 Change-Id: I7bc44b19fac5b47557d5feae3ed969040ac3ae9b
es/layout/details.xml
es/layout/details_list.xml
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/data/DataUtils.java
rc/com/android/camera/data/LocalData.java
rc/com/android/camera/data/LocalMediaData.java
rc/com/android/camera/data/MediaDetails.java
rc/com/android/camera/data/SimpleViewData.java
rc/com/android/camera/ui/DetailsDialog.java
|
39e6b542e6b2c01f635e71cc463d0655c9094125 |
15-Aug-2013 |
Dan Aminzade <monzy@google.com> |
am 2b3cee71: am 18aafe57: am fca1c5ec: Defining broadcast intent strings as constants in CameraUtil.java. For now I\'m leaving the definition within the Camera application. If we decide we want to publicize and document these intents as part of the Android API, we cou * commit '2b3cee71446e2468b534ac51103732c3d1e137ac': Defining broadcast intent strings as constants in CameraUtil.java. For now I'm leaving the definition within the Camera application. If we decide we want to publicize and document these intents as part of the Android API, we could move the definitions to Camera.java.
|
2b3cee71446e2468b534ac51103732c3d1e137ac |
15-Aug-2013 |
Dan Aminzade <monzy@google.com> |
am 18aafe57: am fca1c5ec: Defining broadcast intent strings as constants in CameraUtil.java. For now I\'m leaving the definition within the Camera application. If we decide we want to publicize and document these intents as part of the Android API, we could move the d * commit '18aafe5738dcfd051a8e5514ed987de4ed66da7a': Defining broadcast intent strings as constants in CameraUtil.java. For now I'm leaving the definition within the Camera application. If we decide we want to publicize and document these intents as part of the Android API, we could move the definitions to Camera.java.
|
18aafe5738dcfd051a8e5514ed987de4ed66da7a |
15-Aug-2013 |
Dan Aminzade <monzy@google.com> |
am fca1c5ec: Defining broadcast intent strings as constants in CameraUtil.java. For now I\'m leaving the definition within the Camera application. If we decide we want to publicize and document these intents as part of the Android API, we could move the definitions to * commit 'fca1c5ece5450914ed49115443e1d45737f2ee40': Defining broadcast intent strings as constants in CameraUtil.java. For now I'm leaving the definition within the Camera application. If we decide we want to publicize and document these intents as part of the Android API, we could move the definitions to Camera.java.
|
fca1c5ece5450914ed49115443e1d45737f2ee40 |
15-Aug-2013 |
Dan Aminzade <monzy@google.com> |
Defining broadcast intent strings as constants in CameraUtil.java. For now I'm leaving the definition within the Camera application. If we decide we want to publicize and document these intents as part of the Android API, we could move the definitions to Camera.java. Change-Id: Ia198b843245b70d7378e1ea81ecb8b7983486446
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/util/CameraUtil.java
|
2dba2368033c6a4eeea231bffc8a8697f0844464 |
15-Aug-2013 |
The Android Automerger <android-build@google.com> |
merge in klp-release history after reset to klp-dev
|
7fa594c22f1c27a8521ea8da64e072677f6c0e9d |
15-Aug-2013 |
Angus Kong <shkong@google.com> |
am 8fc1610d: am a6e1f342: am 7e1c5fe2: Single tap to full screen mode. * commit '8fc1610d1eb6c91cf456bd522407e8cc0a41bf76': Single tap to full screen mode.
|
8fc1610d1eb6c91cf456bd522407e8cc0a41bf76 |
15-Aug-2013 |
Angus Kong <shkong@google.com> |
am a6e1f342: am 7e1c5fe2: Single tap to full screen mode. * commit 'a6e1f342792995c1e231cae286d7fca5ecd12b69': Single tap to full screen mode.
|
a6e1f342792995c1e231cae286d7fca5ecd12b69 |
15-Aug-2013 |
Angus Kong <shkong@google.com> |
am 7e1c5fe2: Single tap to full screen mode. * commit '7e1c5fe26bc861d979b85014a511ba35bc1f4110': Single tap to full screen mode.
|
7e1c5fe26bc861d979b85014a511ba35bc1f4110 |
15-Aug-2013 |
Angus Kong <shkong@google.com> |
Single tap to full screen mode. bug:10308911 Change-Id: Ia3213782091eafe6a5683a931dea1ae212e79ba3
rc/com/android/camera/ui/FilmStripView.java
|
b4fe56c5e1147b17f72ee9b324bf08e3549c7c57 |
15-Aug-2013 |
Angus Kong <shkong@google.com> |
am c7283d99: am 690eba37: am 0689254e: Merge "Make current view center in filmstrip." into gb-ub-photos-carlsbad * commit 'c7283d9947482586e2a20b98028e86a4f2035f35': Make current view center in filmstrip.
|
c7283d9947482586e2a20b98028e86a4f2035f35 |
15-Aug-2013 |
Angus Kong <shkong@google.com> |
am 690eba37: am 0689254e: Merge "Make current view center in filmstrip." into gb-ub-photos-carlsbad * commit '690eba378d7526a54a7cbab253fdaebb036ebc39': Make current view center in filmstrip.
|
690eba378d7526a54a7cbab253fdaebb036ebc39 |
15-Aug-2013 |
Angus Kong <shkong@google.com> |
am 0689254e: Merge "Make current view center in filmstrip." into gb-ub-photos-carlsbad * commit '0689254ef810c502c65852a7c54bf902e975b38a': Make current view center in filmstrip.
|
0689254ef810c502c65852a7c54bf902e975b38a |
15-Aug-2013 |
Angus Kong <shkong@google.com> |
Merge "Make current view center in filmstrip." into gb-ub-photos-carlsbad
|
47721fa8f2dc13cb565ae5629a417dc4ed298e81 |
15-Aug-2013 |
Angus Kong <shkong@google.com> |
Make current view center in filmstrip. bug:10096746 Change-Id: I458a3f1b1a2c78239e1cfaa91d6d5e1cec19507e
rc/com/android/camera/ui/FilmStripView.java
|
c914ba401301144e81a2d087243d957517b46f60 |
15-Aug-2013 |
Dan Aminzade <monzy@google.com> |
am 139f3abf: am d0a780dc: am 92ae10ec: Add support for remote shutter control via broadcast intents. Send CAMERA_STOPPED and CAMERA_STARTED intents on pause/resume, to notify Gem to hide and show the camera card, and receive the SHUTTER broadcast intent to trigger the * commit '139f3abfa778e1280c5efc2f2b3b47237507b362': Add support for remote shutter control via broadcast intents. Send CAMERA_STOPPED and CAMERA_STARTED intents on pause/resume, to notify Gem to hide and show the camera card, and receive the SHUTTER broadcast intent to trigger the shutter. This change resolves b/10185077.
|
139f3abfa778e1280c5efc2f2b3b47237507b362 |
15-Aug-2013 |
Dan Aminzade <monzy@google.com> |
am d0a780dc: am 92ae10ec: Add support for remote shutter control via broadcast intents. Send CAMERA_STOPPED and CAMERA_STARTED intents on pause/resume, to notify Gem to hide and show the camera card, and receive the SHUTTER broadcast intent to trigger the shutter. Thi * commit 'd0a780dc82847b9007d0c8e3e6fdef010aba6598': Add support for remote shutter control via broadcast intents. Send CAMERA_STOPPED and CAMERA_STARTED intents on pause/resume, to notify Gem to hide and show the camera card, and receive the SHUTTER broadcast intent to trigger the shutter. This change resolves b/10185077.
|
8803e548e74d815e08b0727fb63b46dee56d2a56 |
14-Aug-2013 |
Angus Kong <shkong@google.com> |
Handle unexpected exceptions when loading videos. bug:10313671 bug:9757517 Change-Id: I8cb922599c4185a585f90007c3975841d14e179a
rc/com/android/camera/PhotoUI.java
rc/com/android/camera/data/LocalMediaData.java
|
d0a780dc82847b9007d0c8e3e6fdef010aba6598 |
15-Aug-2013 |
Dan Aminzade <monzy@google.com> |
am 92ae10ec: Add support for remote shutter control via broadcast intents. Send CAMERA_STOPPED and CAMERA_STARTED intents on pause/resume, to notify Gem to hide and show the camera card, and receive the SHUTTER broadcast intent to trigger the shutter. This change reso * commit '92ae10ec320405d07c85a9e80be40293c65d85e0': Add support for remote shutter control via broadcast intents. Send CAMERA_STOPPED and CAMERA_STARTED intents on pause/resume, to notify Gem to hide and show the camera card, and receive the SHUTTER broadcast intent to trigger the shutter. This change resolves b/10185077.
|
92ae10ec320405d07c85a9e80be40293c65d85e0 |
13-Aug-2013 |
Dan Aminzade <monzy@google.com> |
Add support for remote shutter control via broadcast intents. Send CAMERA_STOPPED and CAMERA_STARTED intents on pause/resume, to notify Gem to hide and show the camera card, and receive the SHUTTER broadcast intent to trigger the shutter. This change resolves b/10185077. Change-Id: I1e38039874b74460f5c815e9d2672789691e9e2f
rc/com/android/camera/PhotoModule.java
|
b65852d35f31407af42f5c5b96b3a2d9a646c153 |
15-Aug-2013 |
The Android Open Source Project <initial-contribution@android.com> |
am 845dadec: (-s ours) Reconcile with klp-release - do not merge * commit '845dadec2a2cc619d316c44e706b15eba4d75293': Add back DisableCameraReceiver
|
845dadec2a2cc619d316c44e706b15eba4d75293 |
15-Aug-2013 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with klp-release - do not merge Change-Id: I7342697cd26413fe5da3528afca689e91a070c59
|
8711cc85125c1f5384d14cfee36deb5771a009a9 |
14-Aug-2013 |
Angus Kong <shkong@google.com> |
am c9178f70: am 18a29449: Merge "Handle unexpected exceptions when loading videos." into gb-ub-photos-carlsbad * commit 'c9178f709d67185ef87e886b3e7ab9a0cc10d023': Handle unexpected exceptions when loading videos.
|
c9178f709d67185ef87e886b3e7ab9a0cc10d023 |
14-Aug-2013 |
Angus Kong <shkong@google.com> |
am 18a29449: Merge "Handle unexpected exceptions when loading videos." into gb-ub-photos-carlsbad * commit '18a29449cf72bb693eb63e30ba2b7e70853c454b': Handle unexpected exceptions when loading videos.
|
18a29449cf72bb693eb63e30ba2b7e70853c454b |
14-Aug-2013 |
Angus Kong <shkong@google.com> |
Merge "Handle unexpected exceptions when loading videos." into gb-ub-photos-carlsbad
|
0989e394420705b66867a8c1cf273b5904c8e4eb |
14-Aug-2013 |
Angus Kong <shkong@google.com> |
Handle unexpected exceptions when loading videos. bug:10313671 bug:9757517 Change-Id: I8cb922599c4185a585f90007c3975841d14e179a
rc/com/android/camera/PhotoUI.java
rc/com/android/camera/data/LocalMediaData.java
|
f6dd662b2a4f66a9712a7e05cdb44acf4e61aa69 |
14-Aug-2013 |
Mangesh Ghiware <mghiware@google.com> |
Add back DisableCameraReceiver Bug: 10314435 Change-Id: Ic8ba05e6bfecfff365b2fd759d7669c1015a3845
ndroidManifest.xml
|
4219bcb573b8a13d223df887f522d421982175d0 |
14-Aug-2013 |
Sascha Haeberling <haeberling@google.com> |
am 391768a8: am a1a52fc2: Merge "Copy over libjni_mosaic from Camera. We need to support the SRI pano mode for Carlsbad." into gb-ub-photos-carlsbad * commit '391768a83ea0e391cfd4a09a29d981b76f18bdf0': Copy over libjni_mosaic from Camera. We need to support the SRI pano mode for Carlsbad.
|
44735b1e92096db1293af4344617093ddc147760 |
14-Aug-2013 |
Mangesh Ghiware <mghiware@google.com> |
am 73b88136: am 0270ab73: Add back DisableCameraReceiver * commit '73b88136d9f5386f0c5820c1a4e40405080960c3': Add back DisableCameraReceiver
|
391768a83ea0e391cfd4a09a29d981b76f18bdf0 |
14-Aug-2013 |
Sascha Haeberling <haeberling@google.com> |
am a1a52fc2: Merge "Copy over libjni_mosaic from Camera. We need to support the SRI pano mode for Carlsbad." into gb-ub-photos-carlsbad * commit 'a1a52fc26adbfa7f464b996cc5ea420d3f29a324': Copy over libjni_mosaic from Camera. We need to support the SRI pano mode for Carlsbad.
|
a1a52fc26adbfa7f464b996cc5ea420d3f29a324 |
14-Aug-2013 |
Sascha Haeberling <haeberling@google.com> |
Merge "Copy over libjni_mosaic from Camera. We need to support the SRI pano mode for Carlsbad." into gb-ub-photos-carlsbad
|
8bddf8ce4f3dcbb56edb12cee7e93f3a9daa3f96 |
14-Aug-2013 |
Sascha Haeberling <haeberling@google.com> |
Copy over libjni_mosaic from Camera. We need to support the SRI pano mode for Carlsbad. Change-Id: Id14e64d8248236e8170c12cfca2cbf2ca952e993
ni/Android.mk
ni/NOTICE
ni/feature_mos/doc/Readme.txt
ni/feature_mos/doc/feature_mos_API_doxyfile
ni/feature_mos/src/mosaic/AlignFeatures.cpp
ni/feature_mos/src/mosaic/AlignFeatures.h
ni/feature_mos/src/mosaic/Blend.cpp
ni/feature_mos/src/mosaic/Blend.h
ni/feature_mos/src/mosaic/CSite.h
ni/feature_mos/src/mosaic/Delaunay.cpp
ni/feature_mos/src/mosaic/Delaunay.h
ni/feature_mos/src/mosaic/EdgePointerUtil.h
ni/feature_mos/src/mosaic/Geometry.h
ni/feature_mos/src/mosaic/ImageUtils.cpp
ni/feature_mos/src/mosaic/ImageUtils.h
ni/feature_mos/src/mosaic/Interp.h
ni/feature_mos/src/mosaic/Log.h
ni/feature_mos/src/mosaic/MatrixUtils.h
ni/feature_mos/src/mosaic/Mosaic.cpp
ni/feature_mos/src/mosaic/Mosaic.h
ni/feature_mos/src/mosaic/MosaicTypes.h
ni/feature_mos/src/mosaic/Pyramid.cpp
ni/feature_mos/src/mosaic/Pyramid.h
ni/feature_mos/src/mosaic/trsMatrix.cpp
ni/feature_mos/src/mosaic/trsMatrix.h
ni/feature_mos/src/mosaic_renderer/FrameBuffer.cpp
ni/feature_mos/src/mosaic_renderer/FrameBuffer.h
ni/feature_mos/src/mosaic_renderer/Renderer.cpp
ni/feature_mos/src/mosaic_renderer/Renderer.h
ni/feature_mos/src/mosaic_renderer/SurfaceTextureRenderer.cpp
ni/feature_mos/src/mosaic_renderer/SurfaceTextureRenderer.h
ni/feature_mos/src/mosaic_renderer/WarpRenderer.cpp
ni/feature_mos/src/mosaic_renderer/WarpRenderer.h
ni/feature_mos/src/mosaic_renderer/YVURenderer.cpp
ni/feature_mos/src/mosaic_renderer/YVURenderer.h
ni/feature_mos_jni.cpp
ni/feature_stab/db_vlvm/db_bundle.h
ni/feature_stab/db_vlvm/db_feature_detection.cpp
ni/feature_stab/db_vlvm/db_feature_detection.h
ni/feature_stab/db_vlvm/db_feature_matching.cpp
ni/feature_stab/db_vlvm/db_feature_matching.h
ni/feature_stab/db_vlvm/db_framestitching.cpp
ni/feature_stab/db_vlvm/db_framestitching.h
ni/feature_stab/db_vlvm/db_image_homography.cpp
ni/feature_stab/db_vlvm/db_image_homography.h
ni/feature_stab/db_vlvm/db_metrics.h
ni/feature_stab/db_vlvm/db_rob_image_homography.cpp
ni/feature_stab/db_vlvm/db_rob_image_homography.h
ni/feature_stab/db_vlvm/db_robust.h
ni/feature_stab/db_vlvm/db_utilities.cpp
ni/feature_stab/db_vlvm/db_utilities.h
ni/feature_stab/db_vlvm/db_utilities_algebra.h
ni/feature_stab/db_vlvm/db_utilities_camera.cpp
ni/feature_stab/db_vlvm/db_utilities_camera.h
ni/feature_stab/db_vlvm/db_utilities_constants.h
ni/feature_stab/db_vlvm/db_utilities_geometry.h
ni/feature_stab/db_vlvm/db_utilities_indexing.cpp
ni/feature_stab/db_vlvm/db_utilities_indexing.h
ni/feature_stab/db_vlvm/db_utilities_linalg.cpp
ni/feature_stab/db_vlvm/db_utilities_linalg.h
ni/feature_stab/db_vlvm/db_utilities_poly.cpp
ni/feature_stab/db_vlvm/db_utilities_poly.h
ni/feature_stab/db_vlvm/db_utilities_random.h
ni/feature_stab/db_vlvm/db_utilities_rotation.h
ni/feature_stab/doc/Readme.txt
ni/feature_stab/doc/dbreg_API_doxyfile
ni/feature_stab/src/dbreg/dbreg.cpp
ni/feature_stab/src/dbreg/dbreg.h
ni/feature_stab/src/dbreg/dbstabsmooth.cpp
ni/feature_stab/src/dbreg/dbstabsmooth.h
ni/feature_stab/src/dbreg/targetver.h
ni/feature_stab/src/dbreg/vp_motionmodel.c
ni/feature_stab/src/dbreg/vp_motionmodel.h
ni/feature_stab/src/dbregtest/PgmImage.cpp
ni/feature_stab/src/dbregtest/PgmImage.h
ni/feature_stab/src/dbregtest/dbregtest.cpp
ni/feature_stab/src/dbregtest/stdafx.cpp
ni/feature_stab/src/dbregtest/stdafx.h
ni/feature_stab/src/dbregtest/targetver.h
ni/mosaic_renderer_jni.cpp
ni/mosaic_renderer_jni.h
|
73b88136d9f5386f0c5820c1a4e40405080960c3 |
14-Aug-2013 |
Mangesh Ghiware <mghiware@google.com> |
am 0270ab73: Add back DisableCameraReceiver * commit '0270ab7337570c3dbd42a1a97a046a4459844fee': Add back DisableCameraReceiver
|
0270ab7337570c3dbd42a1a97a046a4459844fee |
14-Aug-2013 |
Mangesh Ghiware <mghiware@google.com> |
Add back DisableCameraReceiver Bug: 10314435 Change-Id: Ic8ba05e6bfecfff365b2fd759d7669c1015a3845
ndroidManifest.xml
|
9691303560e1956b8e450f6819250281cdc559b2 |
14-Aug-2013 |
Mangesh Ghiware <mghiware@google.com> |
am 96620c37: am a34e8c7d: Merge "Add activity-alias for Camera." into gb-ub-photos-carlsbad * commit '96620c37849419a4fbf1774a6016e5055a8d2cbf': Add activity-alias for Camera.
|
946633e953a47aeb320eada4f6b0c2fe10e73611 |
14-Aug-2013 |
Angus Kong <shkong@google.com> |
am 14d52c47: am dcccc510: Fix camera preview stopped after onResume(). * commit '14d52c47229def21c86afdf42d9ebec4ce8fe5e6': Fix camera preview stopped after onResume().
|
96620c37849419a4fbf1774a6016e5055a8d2cbf |
14-Aug-2013 |
Mangesh Ghiware <mghiware@google.com> |
am a34e8c7d: Merge "Add activity-alias for Camera." into gb-ub-photos-carlsbad * commit 'a34e8c7d439d17355df51e5e536bdbbd1744cc74': Add activity-alias for Camera.
|
a34e8c7d439d17355df51e5e536bdbbd1744cc74 |
14-Aug-2013 |
Mangesh Ghiware <mghiware@google.com> |
Merge "Add activity-alias for Camera." into gb-ub-photos-carlsbad
|
14d52c47229def21c86afdf42d9ebec4ce8fe5e6 |
14-Aug-2013 |
Angus Kong <shkong@google.com> |
am dcccc510: Fix camera preview stopped after onResume(). * commit 'dcccc510652b835fdbd39310a07849af8203052a': Fix camera preview stopped after onResume().
|
dcccc510652b835fdbd39310a07849af8203052a |
09-Aug-2013 |
Angus Kong <shkong@google.com> |
Fix camera preview stopped after onResume(). This fix is for the blank camera preview blank after onPause() -> onResume(). 1. Refined camera start up procedure by removing redundant camera startup thread. 2. Cleanup unused calls after aparted from gallery. bug:10189998 Change-Id: I13ffa24aff5069f0032cd4bc801548fccc63d0e7
es/layout/photo_module.xml
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/PhotoController.java
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/PhotoUI.java
rc/com/android/camera/VideoModule.java
rc/com/android/camera/data/CameraDataAdapter.java
rc/com/android/camera/data/FixedFirstDataAdapter.java
rc/com/android/camera/ui/FilmStripView.java
|
ae1f5e12825adeb6a59910c7effde126e474e5c8 |
14-Aug-2013 |
ztenghui <ztenghui@google.com> |
am 0bc38179: am 5894ec25: Fix view jumps when action bar is hiding * commit '0bc381791a08a255e6f9a59026a36ff28125de82': Fix view jumps when action bar is hiding
|
0bc381791a08a255e6f9a59026a36ff28125de82 |
14-Aug-2013 |
ztenghui <ztenghui@google.com> |
am 5894ec25: Fix view jumps when action bar is hiding * commit '5894ec256d231e5167239176cc90b96a49cb9148': Fix view jumps when action bar is hiding
|
acd4e11ac09816721ebbbed0811c0fdf93ada9cf |
14-Aug-2013 |
Mangesh Ghiware <mghiware@google.com> |
Add activity-alias for Camera. Similar to the one in Gallery2 manifest. Bug: 10312966 Change-Id: I5325f8cfeba2a3825cd5604d4fee7c209067aba1
ndroidManifest.xml
|
5894ec256d231e5167239176cc90b96a49cb9148 |
14-Aug-2013 |
ztenghui <ztenghui@google.com> |
Fix view jumps when action bar is hiding bug:10245009 Change-Id: Ie596132dfc7790ff371d032701475aa742bd31fa
es/values/styles.xml
|
bef04096281f8c366c9b40366d7782de4adff191 |
14-Aug-2013 |
Sascha Haeberling <haeberling@google.com> |
am 2a4339db: am 1e335342: Merge "Don\'t take a snapshot if video recording is not in progress." into gb-ub-photos-carlsbad * commit '2a4339db4bbdc260cf5568a3a58b5f65cf3ac277': Don't take a snapshot if video recording is not in progress.
|
30984e0c5561570c756a647fbee3ae5a88bc529c |
14-Aug-2013 |
Sascha Haeberling <haeberling@google.com> |
am 7f266b79: am e96a4ad8: Merge "Clean up unused code." into gb-ub-photos-carlsbad * commit '7f266b79b2d62068e9de72998b3d591f47acfee5': Clean up unused code.
|
10580bbea069a275a96bf9ecf45fd054dcae6673 |
14-Aug-2013 |
ztenghui <ztenghui@google.com> |
am c0555fc5: am 0abbdb37: Merge "Hide the actionbar and title at the beginning" into gb-ub-photos-carlsbad * commit 'c0555fc5d878b01ce752a601e313178ba5016747': Hide the actionbar and title at the beginning
|
2a4339db4bbdc260cf5568a3a58b5f65cf3ac277 |
14-Aug-2013 |
Sascha Haeberling <haeberling@google.com> |
am 1e335342: Merge "Don\'t take a snapshot if video recording is not in progress." into gb-ub-photos-carlsbad * commit '1e3353427a04b945bfc6e167e38b63e814329a9f': Don't take a snapshot if video recording is not in progress.
|
7f266b79b2d62068e9de72998b3d591f47acfee5 |
14-Aug-2013 |
Sascha Haeberling <haeberling@google.com> |
am e96a4ad8: Merge "Clean up unused code." into gb-ub-photos-carlsbad * commit 'e96a4ad86489b86d0ce2f7ce156723f4d9d94dba': Clean up unused code.
|
1e3353427a04b945bfc6e167e38b63e814329a9f |
14-Aug-2013 |
Sascha Haeberling <haeberling@google.com> |
Merge "Don't take a snapshot if video recording is not in progress." into gb-ub-photos-carlsbad
|
e96a4ad86489b86d0ce2f7ce156723f4d9d94dba |
14-Aug-2013 |
Sascha Haeberling <haeberling@google.com> |
Merge "Clean up unused code." into gb-ub-photos-carlsbad
|
c0555fc5d878b01ce752a601e313178ba5016747 |
14-Aug-2013 |
ztenghui <ztenghui@google.com> |
am 0abbdb37: Merge "Hide the actionbar and title at the beginning" into gb-ub-photos-carlsbad * commit '0abbdb370b4cd722a739cf65c7b5845ceef535b8': Hide the actionbar and title at the beginning
|
0abbdb370b4cd722a739cf65c7b5845ceef535b8 |
14-Aug-2013 |
ztenghui <ztenghui@google.com> |
Merge "Hide the actionbar and title at the beginning" into gb-ub-photos-carlsbad
|
50df47071c776703a36dbc4cb90ec8d1df3c0f6e |
14-Aug-2013 |
ztenghui <ztenghui@google.com> |
Hide the actionbar and title at the beginning bug:10245009 Change-Id: I39640e9f7add0c8ae20257dd5c71cefd4a927a0e
es/values/styles.xml
rc/com/android/camera/CameraActivity.java
|
a514b14dd769f67478c3296451bd9cd05676fa5f |
14-Aug-2013 |
Sascha Haeberling <haeberling@google.com> |
Don't take a snapshot if video recording is not in progress. Bug:10312841 Change-Id: Ie6931d054089d0825e7a57206a8de129a79b741f
rc/com/android/camera/VideoModule.java
|
3a7cc88bb516f5c6e44b350cd2d0bca7e1ceec72 |
14-Aug-2013 |
ztenghui <ztenghui@google.com> |
am 12773789: am 02ed1b27: Merge "Add the menu items back" into gb-ub-photos-carlsbad * commit '12773789ecdc5a30ae2735b50f73b59622c01c2f': Add the menu items back
|
ddef7798808fb8871650a5a803aec1f169a08bcb |
13-Aug-2013 |
Sascha Haeberling <haeberling@google.com> |
Clean up unused code. Change-Id: Ib7d05cd1bd908708ad96a8b215c79162950e0221
rc/com/android/camera/PhotoController.java
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/VideoModule.java
|
12773789ecdc5a30ae2735b50f73b59622c01c2f |
14-Aug-2013 |
ztenghui <ztenghui@google.com> |
am 02ed1b27: Merge "Add the menu items back" into gb-ub-photos-carlsbad * commit '02ed1b27b8cd2d0493ed18aea1ce304b6837ef64': Add the menu items back
|
02ed1b27b8cd2d0493ed18aea1ce304b6837ef64 |
14-Aug-2013 |
ztenghui <ztenghui@google.com> |
Merge "Add the menu items back" into gb-ub-photos-carlsbad
|
0353ca2e048543bd6e233b4c2110a1df1070cd3f |
13-Aug-2013 |
ztenghui <ztenghui@google.com> |
Add the menu items back bug:10245009 Change-Id: I4e11e0cd64800bd9c07158d1a46ea5765ba51d15
es/menu/operations.xml
rc/com/android/camera/CameraActivity.java
|
026a9e7c337aff48bae11ebb0d0830e34fbff201 |
14-Aug-2013 |
Doris Liu <tianliu@google.com> |
am 7d4e819c: am f9296614: Merge "Check for device support before taking video snapshots" into gb-ub-photos-carlsbad * commit '7d4e819c9616b9fe7f52b1999514f357b1c8aaad': Check for device support before taking video snapshots
|
7d4e819c9616b9fe7f52b1999514f357b1c8aaad |
14-Aug-2013 |
Doris Liu <tianliu@google.com> |
am f9296614: Merge "Check for device support before taking video snapshots" into gb-ub-photos-carlsbad * commit 'f9296614d552ccf9af1331748c42e8f59f0cda9e': Check for device support before taking video snapshots
|
f9296614d552ccf9af1331748c42e8f59f0cda9e |
14-Aug-2013 |
Doris Liu <tianliu@google.com> |
Merge "Check for device support before taking video snapshots" into gb-ub-photos-carlsbad
|
386057407167d69636d441a287e8ebef9708c533 |
14-Aug-2013 |
Doris Liu <tianliu@google.com> |
Check for device support before taking video snapshots Bug: 9496097 Change-Id: I6f5d0489848b583fac3b1fd3b605351002be08ba
rc/com/android/camera/VideoModule.java
|
c121e63e536437b1cffbe811134aaa5c6ef0083b |
13-Aug-2013 |
Doris Liu <tianliu@google.com> |
am 060f5669: am 6d8bb279: Merge "Remove old video camera icon and label from Camera2" into gb-ub-photos-carlsbad * commit '060f56691b4cc382d276a6134d363c889ca7bf2f': Remove old video camera icon and label from Camera2
|
060f56691b4cc382d276a6134d363c889ca7bf2f |
13-Aug-2013 |
Doris Liu <tianliu@google.com> |
am 6d8bb279: Merge "Remove old video camera icon and label from Camera2" into gb-ub-photos-carlsbad * commit '6d8bb2792391182cf75783acaff5acb1c38d9be4': Remove old video camera icon and label from Camera2
|
6d8bb2792391182cf75783acaff5acb1c38d9be4 |
13-Aug-2013 |
Doris Liu <tianliu@google.com> |
Merge "Remove old video camera icon and label from Camera2" into gb-ub-photos-carlsbad
|
b33bf1c192e9a666f10a7d2f246a2655251a7cfd |
13-Aug-2013 |
Sascha Haeberling <haeberling@google.com> |
am 28d20a43: am 57549631: Remove Refocus from Camera UI. * commit '28d20a4337869da254b18bea3b819d1c363173b9': Remove Refocus from Camera UI.
|
28d20a4337869da254b18bea3b819d1c363173b9 |
13-Aug-2013 |
Sascha Haeberling <haeberling@google.com> |
am 57549631: Remove Refocus from Camera UI. * commit '57549631449fab8cd4d8dffe730bee4d5c4d8890': Remove Refocus from Camera UI.
|
cf44e5869bb034b1d4c23566e0b3efd3933f67c4 |
13-Aug-2013 |
Doris Liu <tianliu@google.com> |
Remove old video camera icon and label from Camera2 Bug: 10296343 Change-Id: I6c6f130f86b4206d6b9ef322c76e6bdbe81aa57e
es/mipmap-hdpi/ic_launcher_video_camera.png
es/mipmap-mdpi/ic_launcher_video_camera.png
es/values/strings.xml
|
57549631449fab8cd4d8dffe730bee4d5c4d8890 |
13-Aug-2013 |
Sascha Haeberling <haeberling@google.com> |
Remove Refocus from Camera UI. Bug:10073814 Change-Id: I023c7f61463690b02492705cedec8c74159c515d
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/ui/CameraSwitcher.java
|
7c4e2aca10951c175630a5d7074a40c22977bdbf |
13-Aug-2013 |
Doris Liu <tianliu@google.com> |
am d1a37b3b: am 0a08b3a2: Merge "Fix video capture intent handling" into gb-ub-photos-carlsbad * commit 'd1a37b3b191d9df6595129021575e0bb1f7875ef': Fix video capture intent handling
|
d1a37b3b191d9df6595129021575e0bb1f7875ef |
13-Aug-2013 |
Doris Liu <tianliu@google.com> |
am 0a08b3a2: Merge "Fix video capture intent handling" into gb-ub-photos-carlsbad * commit '0a08b3a280bf7934d362c94a49e43646c9b3bc4f': Fix video capture intent handling
|
0a08b3a280bf7934d362c94a49e43646c9b3bc4f |
13-Aug-2013 |
Doris Liu <tianliu@google.com> |
Merge "Fix video capture intent handling" into gb-ub-photos-carlsbad
|
2a7f44cac888de5683d05bef5708f846ee950f43 |
13-Aug-2013 |
Doris Liu <tianliu@google.com> |
Fix video capture intent handling Bug: 10296343 Change-Id: I55fb6c71b59a1559ebb58c65e71d510379367435
ndroidManifest.xml
es/layout/video_module.xml
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/VideoModule.java
rc/com/android/camera/VideoUI.java
|
b8b4120fc59f983f914fca90ac47579812bd9a30 |
13-Aug-2013 |
Sascha Haeberling <haeberling@google.com> |
am de42a04a: Remove all tests from Camera2 until we have them sorted out. * commit 'de42a04ad09b70d550f85bc4339876ea50a53e75': Remove all tests from Camera2 until we have them sorted out.
|
de42a04ad09b70d550f85bc4339876ea50a53e75 |
13-Aug-2013 |
Sascha Haeberling <haeberling@google.com> |
Remove all tests from Camera2 until we have them sorted out. Change-Id: I15107eac9acc37b09094585902fc24fe96ef8953
ests/Android.mk
ests/AndroidManifest.xml
ests/exiftool_parser/parser.py
ests/res/raw/android_lawn.mp4
ests/res/raw/galaxy_nexus.jpg
ests/res/raw/jpeg_control.jpg
ests/res/xml/galaxy_nexus.xml
ests/src/com/android/gallery3d/StressTests.java
ests/src/com/android/gallery3d/functional/CameraTest.java
ests/src/com/android/gallery3d/functional/ImageCaptureIntentTest.java
ests/src/com/android/gallery3d/functional/VideoCaptureIntentTest.java
ests/src/com/android/gallery3d/stress/CameraLatency.java
ests/src/com/android/gallery3d/stress/CameraStartUp.java
ests/src/com/android/gallery3d/stress/CameraStressTestRunner.java
ests/src/com/android/gallery3d/stress/ImageCapture.java
ests/src/com/android/gallery3d/stress/ShotToShotLatency.java
ests/src/com/android/gallery3d/stress/SwitchPreview.java
ests/src/com/android/gallery3d/stress/TestUtil.java
ests/src/com/android/gallery3d/stress/VideoCapture.java
ests_camera/AndroidManifest.xml
ests_camera/src/com/android/camera/CameraLaunchPerformance.java
ests_camera/src/com/android/camera/CameraTestRunner.java
ests_camera/src/com/android/camera/StressTests.java
ests_camera/src/com/android/camera/UnitTests.java
ests_camera/src/com/android/camera/activity/CameraActivityTest.java
ests_camera/src/com/android/camera/activity/CameraTestCase.java
ests_camera/src/com/android/camera/functional/CameraTest.java
ests_camera/src/com/android/camera/functional/ImageCaptureIntentTest.java
ests_camera/src/com/android/camera/functional/VideoCaptureIntentTest.java
ests_camera/src/com/android/camera/power/ImageAndVideoCapture.java
ests_camera/src/com/android/camera/stress/CameraLatency.java
ests_camera/src/com/android/camera/stress/CameraStartUp.java
ests_camera/src/com/android/camera/stress/CameraStressTestRunner.java
ests_camera/src/com/android/camera/stress/ImageCapture.java
ests_camera/src/com/android/camera/stress/ShotToShotLatency.java
ests_camera/src/com/android/camera/stress/SwitchPreview.java
ests_camera/src/com/android/camera/stress/TestUtil.java
ests_camera/src/com/android/camera/stress/VideoCapture.java
ests_camera/src/com/android/camera/unittest/CameraUnitTest.java
|
06fb671e5de124f2774b65efb6a6068f65a20952 |
13-Aug-2013 |
Sascha Haeberling <haeberling@google.com> |
am 10fe3634: Remove Camera tests from Gallery (breaks userdebugs builds) * commit '10fe36347b1059151d1a4e0c5faf98fd903fce3c': Remove Camera tests from Gallery (breaks userdebugs builds)
|
814b21d1c3c746fea1d7d6dcbb219f371e28f99a |
13-Aug-2013 |
Angus Kong <shkong@google.com> |
am c27d21bc: Add local data types. * commit 'c27d21bc3b9322936004827ab005fb7d1facfacf': Add local data types.
|
d8ab2d95ca529c28c80fa43c2a0186fa9b0cd7f7 |
13-Aug-2013 |
Angus Kong <shkong@google.com> |
am d806e652: Don\'t return null if there\'s no images to load. * commit 'd806e6528092fd309bb2128ad5a539c72f52fd42': Don't return null if there's no images to load.
|
10fe36347b1059151d1a4e0c5faf98fd903fce3c |
13-Aug-2013 |
Sascha Haeberling <haeberling@google.com> |
Remove Camera tests from Gallery (breaks userdebugs builds) Change-Id: I64d1fafb4ba7be73f16a53908507bc902168d1e7
ests/src/com/android/gallery3d/CameraTestRunner.java
ests/src/com/android/gallery3d/unittest/CameraUnitTest.java
|
c27d21bc3b9322936004827ab005fb7d1facfacf |
13-Aug-2013 |
Angus Kong <shkong@google.com> |
Add local data types. We need local data types to generate different menus. bug:10245009 Change-Id: I95f947c11ad3f39172c43f75f4108bf720148278
rc/com/android/camera/data/CameraPreviewData.java
rc/com/android/camera/data/LocalData.java
rc/com/android/camera/data/LocalMediaData.java
rc/com/android/camera/data/SimpleViewData.java
rc/com/android/camera/ui/FilmStripView.java
|
d806e6528092fd309bb2128ad5a539c72f52fd42 |
13-Aug-2013 |
Angus Kong <shkong@google.com> |
Don't return null if there's no images to load. bug:10294250 Change-Id: Id6744f5bf36715527badc098de77bf11d67ae549
rc/com/android/camera/data/CameraDataAdapter.java
|
a93c67c3c669d109758bacdab2f275c076cda696 |
13-Aug-2013 |
Qiwen Zhao <zhao@google.com> |
Merge remote-tracking branch 'goog/master'
|
72ea6e574ca3b1c0d43c75bbedc4ce927a4cce93 |
13-Aug-2013 |
Qiwen Zhao <zhao@google.com> |
am 68de58e3: Merge jni_jpegstream/ from platform/packages/apps/Gallery2 to jni_jpegstream/ * commit '68de58e353cf9764196efa007f3c5a77510ab099': Added jpeg streaming classes.
|
fb23741ed2c1a99d2555e244584942ff152d1f92 |
13-Aug-2013 |
Qiwen Zhao <zhao@google.com> |
resolved conflicts for merge of 972f65f2 to master Change-Id: I497733321c68abc58dbc95309e46497c0514303a
|
39685480a9705a949275c4b9cb0cca46c6c3cbc4 |
12-Aug-2013 |
Sascha Haeberling <haeberling@google.com> |
Don't set mImages to null, as we call .size() later. Bug: 10293573 Change-Id: I5fab2bc4fe355c4c26dcab9b6b71ff14e7216502
rc/com/android/camera/data/CameraDataAdapter.java
|
ca4ddcc4b523ecc9d56bc265b2f90621bb4c8781 |
12-Aug-2013 |
Sascha Haeberling <haeberling@google.com> |
Update app name to "Camera" before merging to KLP. Change-Id: Icbd776f5e2b07464de94b41081358996920eafcf
ndroidManifest.xml
es/values/strings.xml
|
a0bd080a978fd7e9a67436b412f929c5b3cf8854 |
12-Aug-2013 |
ztenghui <ztenghui@google.com> |
Merge "Add the basic action bar back." into gb-ub-photos-carlsbad
|
ce0879836ae753cdda3cf45f2b0eb050f27f8258 |
10-Aug-2013 |
Angus Kong <shkong@google.com> |
Merge "Clean up Gallery codes." into gb-ub-photos-carlsbad
|
fa9e2cc9ccbcd746f5765cb7a0afebcdb60e2973 |
10-Aug-2013 |
ztenghui <ztenghui@google.com> |
Add the basic action bar back. Remove outdated styles. bug:10245009 Change-Id: I1ab6e6ea7c3e5c4157951203209b573dd2edda88
es/values-v11/styles.xml
es/values-v13/styles.xml
es/values/styles.xml
rc/com/android/camera/CameraActivity.java
|
b50b5cbfbc0a67db6fc43373363b10381c9c61a3 |
09-Aug-2013 |
Angus Kong <shkong@google.com> |
Clean up Gallery codes. bug:10263696 Change-Id: I3a16dba3aabe52b8103a2c591cfa39907265a263
ndroidManifest.xml
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
allerycommon/src/com/android/gallery3d/common/AsyncTaskUtil.java
allerycommon/src/com/android/gallery3d/common/BitmapUtils.java
allerycommon/src/com/android/gallery3d/common/BlobCache.java
allerycommon/src/com/android/gallery3d/common/Entry.java
allerycommon/src/com/android/gallery3d/common/EntrySchema.java
allerycommon/src/com/android/gallery3d/common/FileCache.java
allerycommon/src/com/android/gallery3d/common/Fingerprint.java
allerycommon/src/com/android/gallery3d/common/HttpClientFactory.java
allerycommon/src/com/android/gallery3d/common/LruCache.java
allerycommon/src/com/android/gallery3d/common/OverScroller.java
allerycommon/src/com/android/gallery3d/common/Scroller.java
allerycommon/src/com/android/gallery3d/common/Utils.java
allerycommon/src/com/android/gallery3d/jpegstream/JPEGInputStream.java
allerycommon/src/com/android/gallery3d/jpegstream/JPEGOutputStream.java
allerycommon/src/com/android/gallery3d/jpegstream/JpegConfig.java
allerycommon/src/com/android/gallery3d/jpegstream/StreamUtils.java
allerycommon/src/com/android/gallery3d/util/Future.java
allerycommon/src/com/android/gallery3d/util/FutureListener.java
allerycommon/src/com/android/gallery3d/util/PriorityThreadFactory.java
allerycommon/src/com/android/gallery3d/util/ThreadPool.java
roguard.flags
rc/com/android/camera/AndroidCameraManagerImpl.java
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/CameraHolder.java
rc/com/android/camera/CameraManager.java
rc/com/android/camera/CameraScreenNail.java
rc/com/android/camera/CameraSettings.java
rc/com/android/camera/CaptureAnimManager.java
rc/com/android/camera/EffectsRecorder.java
rc/com/android/camera/FocusOverlayManager.java
rc/com/android/camera/ListPreference.java
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/PhotoUI.java
rc/com/android/camera/PreviewFrameLayout.java
rc/com/android/camera/RotateDialogController.java
rc/com/android/camera/SoundClips.java
rc/com/android/camera/StaticBitmapScreenNail.java
rc/com/android/camera/Storage.java
rc/com/android/camera/SwitchAnimManager.java
rc/com/android/camera/Util.java
rc/com/android/camera/VideoModule.java
rc/com/android/camera/VideoUI.java
rc/com/android/camera/app/CameraApp.java
rc/com/android/camera/app/OrientationManager.java
rc/com/android/camera/app/OrientationSource.java
rc/com/android/camera/data/LocalMediaData.java
rc/com/android/camera/support/app/OrientationManager.java
rc/com/android/camera/support/app/StitchingChangeListener.java
rc/com/android/camera/support/common/ApiHelper.java
rc/com/android/camera/support/common/Utils.java
rc/com/android/camera/support/filtershow/crop/CropExtras.java
rc/com/android/camera/support/glrenderer/BasicTexture.java
rc/com/android/camera/support/glrenderer/BitmapTexture.java
rc/com/android/camera/support/glrenderer/ExtTexture.java
rc/com/android/camera/support/glrenderer/GLCanvas.java
rc/com/android/camera/support/glrenderer/GLId.java
rc/com/android/camera/support/glrenderer/GLPaint.java
rc/com/android/camera/support/glrenderer/NinePatchChunk.java
rc/com/android/camera/support/glrenderer/NinePatchTexture.java
rc/com/android/camera/support/glrenderer/RawTexture.java
rc/com/android/camera/support/glrenderer/ResourceTexture.java
rc/com/android/camera/support/glrenderer/Texture.java
rc/com/android/camera/support/glrenderer/UploadedTexture.java
rc/com/android/camera/support/ui/BitmapScreenNail.java
rc/com/android/camera/support/ui/OrientationSource.java
rc/com/android/camera/support/ui/ScreenNail.java
rc/com/android/camera/support/ui/SurfaceTextureScreenNail.java
rc/com/android/camera/support/util/AccessibilityUtils.java
rc/com/android/camera/support/util/MotionEventHelper.java
rc/com/android/camera/ui/CameraRootView.java
rc/com/android/camera/ui/CameraSwitcher.java
rc/com/android/camera/ui/EffectSettingPopup.java
rc/com/android/camera/ui/FaceView.java
rc/com/android/camera/ui/PreviewSurfaceView.java
rc/com/android/camera/ui/RotatableLayout.java
rc/com/android/camera/ui/RotateLayout.java
rc/com/android/camera/ui/RotateTextToast.java
rc/com/android/camera/ui/Switch.java
rc/com/android/camera/util/AccessibilityUtils.java
rc/com/android/camera/util/ApiHelper.java
rc/com/android/camera/util/CameraUtil.java
rc/com/android/camera/util/MotionEventHelper.java
rc_pd/com/android/camera/app/StitchingProgressManager.java
rc_pd/com/android/camera/util/PhotoSphereHelper.java
ests_camera/src/com/android/camera/activity/CameraTestCase.java
ests_camera/src/com/android/camera/unittest/CameraUnitTest.java
|
81c5992f805517b6dd8937d4ff6b11724b23c228 |
10-Aug-2013 |
Angus Kong <shkong@google.com> |
Fix NPE after capture when camera roll is empty. Use empty array instead of null. bug:10264304 Change-Id: I486a26810dc4e0d4b562809dc243f52448dbd258
rc/com/android/camera/data/CameraDataAdapter.java
|
4b2cb93c3f652734c41b4eb7449215178c586e8a |
10-Aug-2013 |
Sascha Haeberling <haeberling@google.com> |
Merge "Add camera-related tests back." into gb-ub-photos-carlsbad
|
1ac5817f362f6f8262bf00191e1e419996475380 |
09-Aug-2013 |
Sascha Haeberling <haeberling@google.com> |
Add camera-related tests back. Change-Id: I2213618fe3b2d4ba776c5f1f94aca330a785df1a
ests/Android.mk
ests/AndroidManifest.xml
ests/exiftool_parser/parser.py
ests/res/raw/android_lawn.mp4
ests/res/raw/galaxy_nexus.jpg
ests/res/raw/jpeg_control.jpg
ests/res/xml/galaxy_nexus.xml
ests/src/com/android/gallery3d/CameraTestRunner.java
ests/src/com/android/gallery3d/StressTests.java
ests/src/com/android/gallery3d/functional/CameraTest.java
ests/src/com/android/gallery3d/functional/ImageCaptureIntentTest.java
ests/src/com/android/gallery3d/functional/VideoCaptureIntentTest.java
ests/src/com/android/gallery3d/stress/CameraLatency.java
ests/src/com/android/gallery3d/stress/CameraStartUp.java
ests/src/com/android/gallery3d/stress/CameraStressTestRunner.java
ests/src/com/android/gallery3d/stress/ImageCapture.java
ests/src/com/android/gallery3d/stress/ShotToShotLatency.java
ests/src/com/android/gallery3d/stress/SwitchPreview.java
ests/src/com/android/gallery3d/stress/TestUtil.java
ests/src/com/android/gallery3d/stress/VideoCapture.java
ests/src/com/android/gallery3d/unittest/CameraUnitTest.java
|
c3679c0961521165499380c77344acc69072b2ac |
09-Aug-2013 |
Doris Liu <tianliu@google.com> |
Use PopupWindow for settings popup Bug:10261902 Change-Id: Ia77cff276615db8c3fbb9e859bf099249b4021cf
gitignore
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/PhotoUI.java
rc/com/android/camera/VideoModule.java
rc/com/android/camera/VideoUI.java
|
3d0b691b8f7a844093e8de9267ffa2ce16d0c5a9 |
09-Aug-2013 |
Angus Kong <shkong@google.com> |
Fix DataAdapter wrapper classes callback mechanism. Also to fix FilmStripView to avoid NPE before data is loaded. Change-Id: I6c8a3d215d9f1dc72b4207e52023c1e27e9df123
rc/com/android/camera/data/FixedFirstDataAdapter.java
rc/com/android/camera/ui/FilmStripView.java
|
70466a0f15b91efdfdfd97a718e3d4089666a51c |
08-Aug-2013 |
Angus Kong <shkong@google.com> |
Merge "Refactor data/LocalData." into gb-ub-photos-carlsbad
|
eee0d4e9b1c65f86ecbb303b759868ccbf9de597 |
08-Aug-2013 |
Sascha Haeberling <haeberling@google.com> |
Changes required for building GoogleCamera. Change-Id: I2ea7f4714e3003ff05eadb6cb8b93af721b39ac6
es/values/styles.xml
rc/com/android/camera/app/CameraApp.java
|
bd26069d391830856c57c2141cd2efbc8423d871 |
07-Aug-2013 |
Angus Kong <shkong@google.com> |
Refactor data/LocalData. Make the design more easily understood. Change-Id: I4f7dbe7d3f0a0534c13996b773f1767997848746
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/data/CameraDataAdapter.java
rc/com/android/camera/data/CameraPreviewData.java
rc/com/android/camera/data/LocalData.java
rc/com/android/camera/data/LocalMediaData.java
rc/com/android/camera/data/SimpleViewData.java
|
764b07e6d5143b09c6f1bdd5504a89b81f7a7e74 |
07-Aug-2013 |
Sascha Haeberling <haeberling@google.com> |
Remove refocus icon if it's not enabled or present. Change-Id: I0c885a7a56abfe2365d832fa5ca8c1d74ce2edc8
rc/com/android/camera/ui/CameraSwitcher.java
rc_pd/com/android/camera/util/PhotoSphereHelper.java
rc_pd/com/android/camera/util/RefocusHelper.java
|
43ec6facaec9fdfa7b29ea3cce114e94af95c34c |
07-Aug-2013 |
Sascha Haeberling <haeberling@google.com> |
Add .mk files for Camera2. Change-Id: I0678c1b12f40f6dfd76d7589f61d18e99997394f
ndroid.mk
leanSpec.mk
allerycommon/Android.mk
roguard.flags
|
37f3611bbdc787c996a99894dcef7d8fb77e3f7c |
06-Aug-2013 |
Sascha Haeberling <haeberling@google.com> |
This adds the following four CLs to Camera2: http://ag/339319 http://ag/338974 http://ag/338401 http://ag/324149 Adapted to work in Camera2 and adding a .gitignore so that temporary Eclipse files and folders are not submitted. Change-Id: I40295c7f0139f76270c44f0ca395c0574a288569
gitignore
es/layout-land/camera_controls.xml
es/layout-port/camera_controls.xml
es/layout/camera_filmstrip.xml
es/layout/video_module.xml
rc/com/android/camera/AnimationManager.java
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/ImageTaskManager.java
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/PhotoUI.java
rc/com/android/camera/Util.java
rc/com/android/camera/VideoModule.java
rc/com/android/camera/VideoUI.java
rc/com/android/camera/data/AbstractLocalDataAdapterWrapper.java
rc/com/android/camera/data/CameraDataAdapter.java
rc/com/android/camera/data/FixedFirstDataAdapter.java
rc/com/android/camera/data/FixedLastDataAdapter.java
rc/com/android/camera/data/LocalData.java
rc/com/android/camera/data/LocalDataAdapter.java
rc/com/android/camera/ui/FilmStripView.java
|
8fe71f31bc8ab1b634566a3060e041e22e9b2e41 |
06-Aug-2013 |
Sascha Haeberling <haeberling@google.com> |
Remove two more .mk files. We will add CleanSpec.mk back later. Change-Id: Ic58a86df7ba5002d4f9ea8c0fdacb02435a92da4
leanSpec.mk
ni/Application.mk
|
8e963a5a6016d246184ed65906f9d103e92b17e2 |
06-Aug-2013 |
Sascha Haeberling <haeberling@google.com> |
This removes all non-Camera stuff from Camera2. Note: Camera2 is a clone of Gallery2 right now. Note 2: I will bring .mk files back later. Change-Id: Ida958654296f5ebaacb6bb0ff59d52a7c37ce6fc
ndroidManifest.xml
ni/filters/bwfilter.c
ni/filters/contrast.c
ni/filters/edge.c
ni/filters/exposure.c
ni/filters/filters.h
ni/filters/fx.c
ni/filters/geometry.c
ni/filters/gradient.c
ni/filters/highlight.c
ni/filters/hsv.c
ni/filters/hue.c
ni/filters/kmeans.cc
ni/filters/kmeans.h
ni/filters/negative.c
ni/filters/redEyeMath.c
ni/filters/redeye.c
ni/filters/saturated.c
ni/filters/shadows.c
ni/filters/tinyplanet.cc
ni/filters/vibrance.c
ni/filters/vignette.c
ni/filters/wbalance.c
ni/jni_egl_fence.cpp
ni/jni_egl_fence.h
ni_jpegstream/src/error_codes.h
ni_jpegstream/src/inputstream_wrapper.cpp
ni_jpegstream/src/inputstream_wrapper.h
ni_jpegstream/src/jerr_hook.cpp
ni_jpegstream/src/jerr_hook.h
ni_jpegstream/src/jni_defines.h
ni_jpegstream/src/jpeg_config.h
ni_jpegstream/src/jpeg_hook.cpp
ni_jpegstream/src/jpeg_hook.h
ni_jpegstream/src/jpeg_reader.cpp
ni_jpegstream/src/jpeg_reader.h
ni_jpegstream/src/jpeg_writer.cpp
ni_jpegstream/src/jpeg_writer.h
ni_jpegstream/src/jpegstream.cpp
ni_jpegstream/src/outputstream_wrapper.cpp
ni_jpegstream/src/outputstream_wrapper.h
ni_jpegstream/src/stream_wrapper.cpp
ni_jpegstream/src/stream_wrapper.h
roguard-project.txt
roguard.flags
roject.properties
es/drawable/action_bar_two_line_background.xml
es/drawable/border_photo_frame_widget.xml
es/drawable/btn_shutter_video_recording.xml
es/drawable/filtershow_addpoint.png
es/drawable/filtershow_background.png
es/drawable/filtershow_border_4x5.9.png
es/drawable/filtershow_border_black.9.png
es/drawable/filtershow_border_brush.9.png
es/drawable/filtershow_border_film.png
es/drawable/filtershow_border_grunge.9.png
es/drawable/filtershow_border_rounded_black.9.png
es/drawable/filtershow_border_rounded_white.9.png
es/drawable/filtershow_border_sumi_e.9.png
es/drawable/filtershow_border_tape.9.png
es/drawable/filtershow_border_white.9.png
es/drawable/filtershow_button_background.xml
es/drawable/filtershow_button_border.png
es/drawable/filtershow_button_colors.png
es/drawable/filtershow_button_colors_contrast.png
es/drawable/filtershow_button_colors_vignette.png
es/drawable/filtershow_button_current.png
es/drawable/filtershow_button_fx.png
es/drawable/filtershow_button_geometry.png
es/drawable/filtershow_button_geometry_crop.png
es/drawable/filtershow_button_geometry_flip.png
es/drawable/filtershow_button_geometry_rotate.png
es/drawable/filtershow_button_geometry_straighten.png
es/drawable/filtershow_button_operations.png
es/drawable/filtershow_button_origin.png
es/drawable/filtershow_button_redo.png
es/drawable/filtershow_button_selected_background.9.png
es/drawable/filtershow_button_settings.png
es/drawable/filtershow_button_show_original.png
es/drawable/filtershow_button_undo.png
es/drawable/filtershow_color_picker_circle.xml
es/drawable/filtershow_color_picker_roundrect.xml
es/drawable/filtershow_delpoint.png
es/drawable/filtershow_drawing.png
es/drawable/filtershow_fx_0000_vintage.png
es/drawable/filtershow_fx_0001_instant.png
es/drawable/filtershow_fx_0002_bleach.png
es/drawable/filtershow_fx_0003_blue_crush.png
es/drawable/filtershow_fx_0004_bw_contrast.png
es/drawable/filtershow_fx_0005_punch.png
es/drawable/filtershow_fx_0006_x_process.png
es/drawable/filtershow_fx_0007_washout.png
es/drawable/filtershow_fx_0008_washout_color.png
es/drawable/filtershow_grad_button.xml
es/drawable/filtershow_menu_marker.png
es/drawable/filtershow_scrubber.xml
es/drawable/filtershow_slider.xml
es/drawable/filtershow_state_button_background
es/drawable/filtershow_tiled_background.xml
es/drawable/filtershow_vertical_bar.png
es/drawable/filtershow_vertical_line.xml
es/drawable/icn_media_pause.xml
es/drawable/icn_media_play.xml
es/drawable/ingest_item_list_selector.xml
es/drawable/menu_save_photo.xml
es/drawable/photoeditor_effect_redeye.png
es/drawable/photopage_bottom_button_background.xml
es/drawable/white_text_bg_gradient.xml
es/interpolator/decelerate_cubic.xml
es/interpolator/decelerate_quint.xml
es/layout-land/filtershow_activity.xml
es/layout-land/filtershow_category_panel_new.xml
es/layout-land/filtershow_editor_panel.xml
es/layout-land/filtershow_main_panel.xml
es/layout-land/filtershow_state_panel_new.xml
es/layout/action_bar_text.xml
es/layout/action_bar_two_line_text.xml
es/layout/action_mode.xml
es/layout/album_content.xml
es/layout/album_header.xml
es/layout/album_set_item.xml
es/layout/appwidget_loading_item.xml
es/layout/appwidget_main.xml
es/layout/appwidget_photo_item.xml
es/layout/bg_replacement_training_message.xml
es/layout/choose_widget_type.xml
es/layout/crop_activity.xml
es/layout/cropimage.xml
es/layout/details.xml
es/layout/details_list.xml
es/layout/dialog_picker.xml
es/layout/editor_grad_button.xml
es/layout/filtershow_actionbar.xml
es/layout/filtershow_activity.xml
es/layout/filtershow_category_panel.xml
es/layout/filtershow_category_panel_new.xml
es/layout/filtershow_color_gird.xml
es/layout/filtershow_color_picker.xml
es/layout/filtershow_control_action_slider.xml
es/layout/filtershow_control_style_chooser.xml
es/layout/filtershow_control_title_slider.xml
es/layout/filtershow_cp_custom_title.xml
es/layout/filtershow_crop_button.xml
es/layout/filtershow_curves_button.xml
es/layout/filtershow_default_editor.xml
es/layout/filtershow_draw_button.xml
es/layout/filtershow_draw_size.xml
es/layout/filtershow_editor_panel.xml
es/layout/filtershow_export_dialog.xml
es/layout/filtershow_grad_editor.xml
es/layout/filtershow_history_operation_row.xml
es/layout/filtershow_history_panel.xml
es/layout/filtershow_main_panel.xml
es/layout/filtershow_presets_management_dialog.xml
es/layout/filtershow_presets_management_row.xml
es/layout/filtershow_seekbar.xml
es/layout/filtershow_state_panel.xml
es/layout/filtershow_state_panel_new.xml
es/layout/filtershow_tiny_planet_editor.xml
es/layout/filtershow_vignette_editor.xml
es/layout/filtershow_zoom_editor.xml
es/layout/gl_root_group.xml
es/layout/ingest_activity_item_list.xml
es/layout/ingest_date_tile.xml
es/layout/ingest_fullsize.xml
es/layout/ingest_thumbnail.xml
es/layout/main.xml
es/layout/manage_offline_bar.xml
es/layout/movie_view.xml
es/layout/multigrid_content.xml
es/layout/photo_frame.xml
es/layout/photo_set_item.xml
es/layout/photopage_bottom_controls.xml
es/layout/photopage_progress_bar.xml
es/layout/popup_list_item.xml
es/layout/trim_menu.xml
es/layout/trim_view.xml
es/layout/undo_bar.xml
es/menu/album.xml
es/menu/albumset.xml
es/menu/crop.xml
es/menu/filterby.xml
es/menu/filtershow_activity_menu.xml
es/menu/filtershow_menu_chan_sat.xml
es/menu/filtershow_menu_crop.xml
es/menu/filtershow_menu_curves.xml
es/menu/filtershow_menu_draw.xml
es/menu/filtershow_menu_grad.xml
es/menu/gallery.xml
es/menu/gallery_multiselect.xml
es/menu/groupby.xml
es/menu/ingest_menu_item_list_selection.xml
es/menu/movie.xml
es/menu/operation.xml
es/menu/photo.xml
es/menu/pickup.xml
es/menu/settings.xml
es/mipmap-hdpi/ic_launcher_gallery.png
es/mipmap-mdpi/ic_launcher_gallery.png
es/mipmap-xhdpi/ic_launcher_gallery.png
es/values/filtershow_color.xml
es/values/filtershow_ids.xml
es/values/filtershow_strings.xml
es/values/filtershow_styles.xml
es/values/filtershow_values.xml
es/values/filtershow_values_attrs.xml
es/values/iconbutton_styles.xml
es/values/strings.xml
es/values/styles.xml
es/xml/camera_preferences.xml
es/xml/device_filter.xml
es/xml/video_preferences.xml
es/xml/wallpaper_picker_preview.xml
es/xml/widget_info.xml
rc/com/android/camera/AndroidCameraManagerImpl.java
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/CameraManager.java
rc/com/android/camera/CameraPreference.java
rc/com/android/camera/CameraScreenNail.java
rc/com/android/camera/CameraSettings.java
rc/com/android/camera/CaptureAnimManager.java
rc/com/android/camera/ComboPreferences.java
rc/com/android/camera/CountDownTimerPreference.java
rc/com/android/camera/EffectsRecorder.java
rc/com/android/camera/FocusOverlayManager.java
rc/com/android/camera/IconListPreference.java
rc/com/android/camera/ListPreference.java
rc/com/android/camera/OnScreenHint.java
rc/com/android/camera/OnScreenIndicators.java
rc/com/android/camera/PhotoMenu.java
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/PhotoUI.java
rc/com/android/camera/PreviewFrameLayout.java
rc/com/android/camera/RotateDialogController.java
rc/com/android/camera/SoundClips.java
rc/com/android/camera/StaticBitmapScreenNail.java
rc/com/android/camera/Storage.java
rc/com/android/camera/SwitchAnimManager.java
rc/com/android/camera/Util.java
rc/com/android/camera/VideoMenu.java
rc/com/android/camera/VideoModule.java
rc/com/android/camera/VideoUI.java
rc/com/android/camera/app/CameraApp.java
rc/com/android/camera/data/CameraDataAdapter.java
rc/com/android/camera/data/LocalData.java
rc/com/android/camera/data/PanoramaMetadataLoader.java
rc/com/android/camera/support/app/OrientationManager.java
rc/com/android/camera/support/app/StitchingChangeListener.java
rc/com/android/camera/support/common/ApiHelper.java
rc/com/android/camera/support/common/Utils.java
rc/com/android/camera/support/filtershow/crop/CropExtras.java
rc/com/android/camera/support/glrenderer/BasicTexture.java
rc/com/android/camera/support/glrenderer/BitmapTexture.java
rc/com/android/camera/support/glrenderer/ExtTexture.java
rc/com/android/camera/support/glrenderer/GLCanvas.java
rc/com/android/camera/support/glrenderer/GLId.java
rc/com/android/camera/support/glrenderer/GLPaint.java
rc/com/android/camera/support/glrenderer/NinePatchChunk.java
rc/com/android/camera/support/glrenderer/NinePatchTexture.java
rc/com/android/camera/support/glrenderer/RawTexture.java
rc/com/android/camera/support/glrenderer/ResourceTexture.java
rc/com/android/camera/support/glrenderer/Texture.java
rc/com/android/camera/support/glrenderer/UploadedTexture.java
rc/com/android/camera/support/ui/BitmapScreenNail.java
rc/com/android/camera/support/ui/OrientationSource.java
rc/com/android/camera/support/ui/ScreenNail.java
rc/com/android/camera/support/ui/SurfaceTextureScreenNail.java
rc/com/android/camera/support/util/AccessibilityUtils.java
rc/com/android/camera/support/util/MotionEventHelper.java
rc/com/android/camera/ui/AbstractSettingPopup.java
rc/com/android/camera/ui/CameraControls.java
rc/com/android/camera/ui/CameraRootView.java
rc/com/android/camera/ui/CameraSwitcher.java
rc/com/android/camera/ui/CountDownView.java
rc/com/android/camera/ui/CountdownTimerPopup.java
rc/com/android/camera/ui/EffectSettingPopup.java
rc/com/android/camera/ui/FaceView.java
rc/com/android/camera/ui/FilmStripView.java
rc/com/android/camera/ui/InLineSettingCheckBox.java
rc/com/android/camera/ui/InLineSettingItem.java
rc/com/android/camera/ui/InLineSettingMenu.java
rc/com/android/camera/ui/ListPrefSettingPopup.java
rc/com/android/camera/ui/MoreSettingPopup.java
rc/com/android/camera/ui/PieRenderer.java
rc/com/android/camera/ui/RotateLayout.java
rc/com/android/camera/ui/RotateTextToast.java
rc/com/android/camera/ui/Switch.java
rc/com/android/camera/ui/TimeIntervalPopup.java
rc/com/android/camera/ui/ZoomRenderer.java
rc/com/android/gallery3d/anim/AlphaAnimation.java
rc/com/android/gallery3d/anim/Animation.java
rc/com/android/gallery3d/anim/CanvasAnimation.java
rc/com/android/gallery3d/anim/FloatAnimation.java
rc/com/android/gallery3d/anim/StateTransitionAnimation.java
rc/com/android/gallery3d/app/AbstractGalleryActivity.java
rc/com/android/gallery3d/app/ActivityState.java
rc/com/android/gallery3d/app/AlbumDataLoader.java
rc/com/android/gallery3d/app/AlbumPage.java
rc/com/android/gallery3d/app/AlbumPicker.java
rc/com/android/gallery3d/app/AlbumSetDataLoader.java
rc/com/android/gallery3d/app/AlbumSetPage.java
rc/com/android/gallery3d/app/AppBridge.java
rc/com/android/gallery3d/app/BatchService.java
rc/com/android/gallery3d/app/CommonControllerOverlay.java
rc/com/android/gallery3d/app/Config.java
rc/com/android/gallery3d/app/ControllerOverlay.java
rc/com/android/gallery3d/app/DialogPicker.java
rc/com/android/gallery3d/app/EyePosition.java
rc/com/android/gallery3d/app/FilmstripPage.java
rc/com/android/gallery3d/app/FilterUtils.java
rc/com/android/gallery3d/app/Gallery.java
rc/com/android/gallery3d/app/GalleryActionBar.java
rc/com/android/gallery3d/app/GalleryApp.java
rc/com/android/gallery3d/app/GalleryAppImpl.java
rc/com/android/gallery3d/app/GalleryContext.java
rc/com/android/gallery3d/app/LoadingListener.java
rc/com/android/gallery3d/app/Log.java
rc/com/android/gallery3d/app/ManageCachePage.java
rc/com/android/gallery3d/app/MovieActivity.java
rc/com/android/gallery3d/app/MovieControllerOverlay.java
rc/com/android/gallery3d/app/MoviePlayer.java
rc/com/android/gallery3d/app/MuteVideo.java
rc/com/android/gallery3d/app/NotificationIds.java
rc/com/android/gallery3d/app/OrientationManager.java
rc/com/android/gallery3d/app/PackagesMonitor.java
rc/com/android/gallery3d/app/PanoramaMetadataSupport.java
rc/com/android/gallery3d/app/PhotoDataAdapter.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/app/PhotoPageBottomControls.java
rc/com/android/gallery3d/app/PhotoPageProgressBar.java
rc/com/android/gallery3d/app/PickerActivity.java
rc/com/android/gallery3d/app/SinglePhotoDataAdapter.java
rc/com/android/gallery3d/app/SinglePhotoPage.java
rc/com/android/gallery3d/app/SlideshowDataAdapter.java
rc/com/android/gallery3d/app/SlideshowPage.java
rc/com/android/gallery3d/app/StateManager.java
rc/com/android/gallery3d/app/StitchingChangeListener.java
rc/com/android/gallery3d/app/TimeBar.java
rc/com/android/gallery3d/app/TransitionStore.java
rc/com/android/gallery3d/app/TrimControllerOverlay.java
rc/com/android/gallery3d/app/TrimTimeBar.java
rc/com/android/gallery3d/app/TrimVideo.java
rc/com/android/gallery3d/app/VideoUtils.java
rc/com/android/gallery3d/app/Wallpaper.java
rc/com/android/gallery3d/data/ActionImage.java
rc/com/android/gallery3d/data/BucketHelper.java
rc/com/android/gallery3d/data/BytesBufferPool.java
rc/com/android/gallery3d/data/CameraShortcutImage.java
rc/com/android/gallery3d/data/ChangeNotifier.java
rc/com/android/gallery3d/data/ClusterAlbum.java
rc/com/android/gallery3d/data/ClusterAlbumSet.java
rc/com/android/gallery3d/data/ClusterSource.java
rc/com/android/gallery3d/data/Clustering.java
rc/com/android/gallery3d/data/ComboAlbum.java
rc/com/android/gallery3d/data/ComboAlbumSet.java
rc/com/android/gallery3d/data/ComboSource.java
rc/com/android/gallery3d/data/ContentListener.java
rc/com/android/gallery3d/data/DataManager.java
rc/com/android/gallery3d/data/DataSourceType.java
rc/com/android/gallery3d/data/DecodeUtils.java
rc/com/android/gallery3d/data/DownloadCache.java
rc/com/android/gallery3d/data/DownloadEntry.java
rc/com/android/gallery3d/data/DownloadUtils.java
rc/com/android/gallery3d/data/EmptyAlbumImage.java
rc/com/android/gallery3d/data/Exif.java
rc/com/android/gallery3d/data/Face.java
rc/com/android/gallery3d/data/FaceClustering.java
rc/com/android/gallery3d/data/FilterDeleteSet.java
rc/com/android/gallery3d/data/FilterEmptyPromptSet.java
rc/com/android/gallery3d/data/FilterSource.java
rc/com/android/gallery3d/data/FilterTypeSet.java
rc/com/android/gallery3d/data/ImageCacheRequest.java
rc/com/android/gallery3d/data/ImageCacheService.java
rc/com/android/gallery3d/data/LocalAlbum.java
rc/com/android/gallery3d/data/LocalAlbumSet.java
rc/com/android/gallery3d/data/LocalImage.java
rc/com/android/gallery3d/data/LocalMediaItem.java
rc/com/android/gallery3d/data/LocalMergeAlbum.java
rc/com/android/gallery3d/data/LocalSource.java
rc/com/android/gallery3d/data/LocalVideo.java
rc/com/android/gallery3d/data/LocationClustering.java
rc/com/android/gallery3d/data/Log.java
rc/com/android/gallery3d/data/MediaDetails.java
rc/com/android/gallery3d/data/MediaItem.java
rc/com/android/gallery3d/data/MediaObject.java
rc/com/android/gallery3d/data/MediaSet.java
rc/com/android/gallery3d/data/MediaSource.java
rc/com/android/gallery3d/data/MtpClient.java
rc/com/android/gallery3d/data/PanoramaMetadataJob.java
rc/com/android/gallery3d/data/Path.java
rc/com/android/gallery3d/data/PathMatcher.java
rc/com/android/gallery3d/data/SecureAlbum.java
rc/com/android/gallery3d/data/SecureSource.java
rc/com/android/gallery3d/data/SingleItemAlbum.java
rc/com/android/gallery3d/data/SizeClustering.java
rc/com/android/gallery3d/data/SnailAlbum.java
rc/com/android/gallery3d/data/SnailItem.java
rc/com/android/gallery3d/data/SnailSource.java
rc/com/android/gallery3d/data/TagClustering.java
rc/com/android/gallery3d/data/TimeClustering.java
rc/com/android/gallery3d/data/UnlockImage.java
rc/com/android/gallery3d/data/UriImage.java
rc/com/android/gallery3d/data/UriSource.java
rc/com/android/gallery3d/filtershow/CenteredLinearLayout.java
rc/com/android/gallery3d/filtershow/EditorPlaceHolder.java
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/cache/ImageLoader.java
rc/com/android/gallery3d/filtershow/category/Action.java
rc/com/android/gallery3d/filtershow/category/CategoryAdapter.java
rc/com/android/gallery3d/filtershow/category/CategoryPanel.java
rc/com/android/gallery3d/filtershow/category/CategoryTrack.java
rc/com/android/gallery3d/filtershow/category/CategoryView.java
rc/com/android/gallery3d/filtershow/category/MainPanel.java
rc/com/android/gallery3d/filtershow/colorpicker/ColorGridDialog.java
rc/com/android/gallery3d/filtershow/colorpicker/ColorListener.java
rc/com/android/gallery3d/filtershow/colorpicker/ColorOpacityView.java
rc/com/android/gallery3d/filtershow/colorpicker/ColorPickerDialog.java
rc/com/android/gallery3d/filtershow/colorpicker/ColorRectView.java
rc/com/android/gallery3d/filtershow/colorpicker/ColorValueView.java
rc/com/android/gallery3d/filtershow/colorpicker/RGBListener.java
rc/com/android/gallery3d/filtershow/controller/ActionSlider.java
rc/com/android/gallery3d/filtershow/controller/BasicParameterInt.java
rc/com/android/gallery3d/filtershow/controller/BasicParameterStyle.java
rc/com/android/gallery3d/filtershow/controller/BasicSlider.java
rc/com/android/gallery3d/filtershow/controller/Control.java
rc/com/android/gallery3d/filtershow/controller/FilterView.java
rc/com/android/gallery3d/filtershow/controller/Parameter.java
rc/com/android/gallery3d/filtershow/controller/ParameterActionAndInt.java
rc/com/android/gallery3d/filtershow/controller/ParameterInteger.java
rc/com/android/gallery3d/filtershow/controller/ParameterSet.java
rc/com/android/gallery3d/filtershow/controller/ParameterStyles.java
rc/com/android/gallery3d/filtershow/controller/StyleChooser.java
rc/com/android/gallery3d/filtershow/controller/TitledSlider.java
rc/com/android/gallery3d/filtershow/crop/BoundedRect.java
rc/com/android/gallery3d/filtershow/crop/CropActivity.java
rc/com/android/gallery3d/filtershow/crop/CropDrawingUtils.java
rc/com/android/gallery3d/filtershow/crop/CropExtras.java
rc/com/android/gallery3d/filtershow/crop/CropMath.java
rc/com/android/gallery3d/filtershow/crop/CropObject.java
rc/com/android/gallery3d/filtershow/crop/CropView.java
rc/com/android/gallery3d/filtershow/data/FilterStackDBHelper.java
rc/com/android/gallery3d/filtershow/data/FilterStackSource.java
rc/com/android/gallery3d/filtershow/data/UserPresetsManager.java
rc/com/android/gallery3d/filtershow/editors/BasicEditor.java
rc/com/android/gallery3d/filtershow/editors/Editor.java
rc/com/android/gallery3d/filtershow/editors/EditorChanSat.java
rc/com/android/gallery3d/filtershow/editors/EditorCrop.java
rc/com/android/gallery3d/filtershow/editors/EditorCurves.java
rc/com/android/gallery3d/filtershow/editors/EditorDraw.java
rc/com/android/gallery3d/filtershow/editors/EditorGrad.java
rc/com/android/gallery3d/filtershow/editors/EditorInfo.java
rc/com/android/gallery3d/filtershow/editors/EditorMirror.java
rc/com/android/gallery3d/filtershow/editors/EditorPanel.java
rc/com/android/gallery3d/filtershow/editors/EditorRedEye.java
rc/com/android/gallery3d/filtershow/editors/EditorRotate.java
rc/com/android/gallery3d/filtershow/editors/EditorStraighten.java
rc/com/android/gallery3d/filtershow/editors/EditorTinyPlanet.java
rc/com/android/gallery3d/filtershow/editors/EditorVignette.java
rc/com/android/gallery3d/filtershow/editors/EditorZoom.java
rc/com/android/gallery3d/filtershow/editors/ImageOnlyEditor.java
rc/com/android/gallery3d/filtershow/editors/ParametricEditor.java
rc/com/android/gallery3d/filtershow/editors/SwapButton.java
rc/com/android/gallery3d/filtershow/filters/BaseFiltersManager.java
rc/com/android/gallery3d/filtershow/filters/ColorSpaceMatrix.java
rc/com/android/gallery3d/filtershow/filters/FilterBasicRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterChanSatRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterColorBorderRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterCropRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterCurvesRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterDirectRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterDrawRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterFxRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterGradRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterImageBorderRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterMirrorRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterPoint.java
rc/com/android/gallery3d/filtershow/filters/FilterPointRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterRedEyeRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterRotateRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterStraightenRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterTinyPlanetRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterUserPresetRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterVignetteRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FiltersManagerInterface.java
rc/com/android/gallery3d/filtershow/filters/IconUtilities.java
rc/com/android/gallery3d/filtershow/filters/ImageFilter.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterBorder.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterBwFilter.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterChanSat.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterContrast.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterCurves.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterDownsample.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterDraw.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterEdge.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterExposure.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterFx.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterGrad.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterHighlights.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterHue.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterKMeans.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterNegative.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterParametricBorder.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterRS.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterRedEye.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterSaturated.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterShadows.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterSharpen.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterTinyPlanet.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterVibrance.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterVignette.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterWBalance.java
rc/com/android/gallery3d/filtershow/filters/RedEyeCandidate.java
rc/com/android/gallery3d/filtershow/filters/SimpleImageFilter.java
rc/com/android/gallery3d/filtershow/filters/SplineMath.java
rc/com/android/gallery3d/filtershow/filters/convolve3x3.rs
rc/com/android/gallery3d/filtershow/filters/grad.rs
rc/com/android/gallery3d/filtershow/filters/grey.rs
rc/com/android/gallery3d/filtershow/filters/saturation.rs
rc/com/android/gallery3d/filtershow/history/HistoryItem.java
rc/com/android/gallery3d/filtershow/history/HistoryManager.java
rc/com/android/gallery3d/filtershow/imageshow/ControlPoint.java
rc/com/android/gallery3d/filtershow/imageshow/EclipseControl.java
rc/com/android/gallery3d/filtershow/imageshow/GeometryMathUtils.java
rc/com/android/gallery3d/filtershow/imageshow/GradControl.java
rc/com/android/gallery3d/filtershow/imageshow/ImageCrop.java
rc/com/android/gallery3d/filtershow/imageshow/ImageCurves.java
rc/com/android/gallery3d/filtershow/imageshow/ImageDraw.java
rc/com/android/gallery3d/filtershow/imageshow/ImageGrad.java
rc/com/android/gallery3d/filtershow/imageshow/ImageMirror.java
rc/com/android/gallery3d/filtershow/imageshow/ImagePoint.java
rc/com/android/gallery3d/filtershow/imageshow/ImageRedEye.java
rc/com/android/gallery3d/filtershow/imageshow/ImageRotate.java
rc/com/android/gallery3d/filtershow/imageshow/ImageShow.java
rc/com/android/gallery3d/filtershow/imageshow/ImageStraighten.java
rc/com/android/gallery3d/filtershow/imageshow/ImageTinyPlanet.java
rc/com/android/gallery3d/filtershow/imageshow/ImageVignette.java
rc/com/android/gallery3d/filtershow/imageshow/Line.java
rc/com/android/gallery3d/filtershow/imageshow/MasterImage.java
rc/com/android/gallery3d/filtershow/imageshow/Oval.java
rc/com/android/gallery3d/filtershow/imageshow/Spline.java
rc/com/android/gallery3d/filtershow/pipeline/Buffer.java
rc/com/android/gallery3d/filtershow/pipeline/CacheProcessing.java
rc/com/android/gallery3d/filtershow/pipeline/CachingPipeline.java
rc/com/android/gallery3d/filtershow/pipeline/FilterEnvironment.java
rc/com/android/gallery3d/filtershow/pipeline/HighresRenderingRequestTask.java
rc/com/android/gallery3d/filtershow/pipeline/ImagePreset.java
rc/com/android/gallery3d/filtershow/pipeline/ImageSavingTask.java
rc/com/android/gallery3d/filtershow/pipeline/PipelineInterface.java
rc/com/android/gallery3d/filtershow/pipeline/ProcessingService.java
rc/com/android/gallery3d/filtershow/pipeline/ProcessingTask.java
rc/com/android/gallery3d/filtershow/pipeline/ProcessingTaskController.java
rc/com/android/gallery3d/filtershow/pipeline/RenderingRequest.java
rc/com/android/gallery3d/filtershow/pipeline/RenderingRequestCaller.java
rc/com/android/gallery3d/filtershow/pipeline/RenderingRequestTask.java
rc/com/android/gallery3d/filtershow/pipeline/SharedBuffer.java
rc/com/android/gallery3d/filtershow/pipeline/SharedPreset.java
rc/com/android/gallery3d/filtershow/pipeline/UpdatePreviewTask.java
rc/com/android/gallery3d/filtershow/presets/PresetManagementDialog.java
rc/com/android/gallery3d/filtershow/presets/UserPresetsAdapter.java
rc/com/android/gallery3d/filtershow/provider/SharedImageProvider.java
rc/com/android/gallery3d/filtershow/state/DragListener.java
rc/com/android/gallery3d/filtershow/state/PanelTrack.java
rc/com/android/gallery3d/filtershow/state/State.java
rc/com/android/gallery3d/filtershow/state/StateAdapter.java
rc/com/android/gallery3d/filtershow/state/StatePanel.java
rc/com/android/gallery3d/filtershow/state/StatePanelTrack.java
rc/com/android/gallery3d/filtershow/state/StateView.java
rc/com/android/gallery3d/filtershow/tools/IconFactory.java
rc/com/android/gallery3d/filtershow/tools/MatrixFit.java
rc/com/android/gallery3d/filtershow/tools/SaveImage.java
rc/com/android/gallery3d/filtershow/tools/XmpPresets.java
rc/com/android/gallery3d/filtershow/ui/ExportDialog.java
rc/com/android/gallery3d/filtershow/ui/FramedTextButton.java
rc/com/android/gallery3d/filtershow/ui/SelectionRenderer.java
rc/com/android/gallery3d/gadget/LocalPhotoSource.java
rc/com/android/gallery3d/gadget/MediaSetSource.java
rc/com/android/gallery3d/gadget/PhotoAppWidgetProvider.java
rc/com/android/gallery3d/gadget/WidgetClickHandler.java
rc/com/android/gallery3d/gadget/WidgetConfigure.java
rc/com/android/gallery3d/gadget/WidgetDatabaseHelper.java
rc/com/android/gallery3d/gadget/WidgetService.java
rc/com/android/gallery3d/gadget/WidgetSource.java
rc/com/android/gallery3d/gadget/WidgetTypeChooser.java
rc/com/android/gallery3d/gadget/WidgetUtils.java
rc/com/android/gallery3d/glrenderer/BasicTexture.java
rc/com/android/gallery3d/glrenderer/BitmapTexture.java
rc/com/android/gallery3d/glrenderer/CanvasTexture.java
rc/com/android/gallery3d/glrenderer/ColorTexture.java
rc/com/android/gallery3d/glrenderer/ExtTexture.java
rc/com/android/gallery3d/glrenderer/FadeInTexture.java
rc/com/android/gallery3d/glrenderer/FadeOutTexture.java
rc/com/android/gallery3d/glrenderer/FadeTexture.java
rc/com/android/gallery3d/glrenderer/GLCanvas.java
rc/com/android/gallery3d/glrenderer/GLES11Canvas.java
rc/com/android/gallery3d/glrenderer/GLES11IdImpl.java
rc/com/android/gallery3d/glrenderer/GLES20Canvas.java
rc/com/android/gallery3d/glrenderer/GLES20IdImpl.java
rc/com/android/gallery3d/glrenderer/GLId.java
rc/com/android/gallery3d/glrenderer/GLPaint.java
rc/com/android/gallery3d/glrenderer/MultiLineTexture.java
rc/com/android/gallery3d/glrenderer/NinePatchChunk.java
rc/com/android/gallery3d/glrenderer/NinePatchTexture.java
rc/com/android/gallery3d/glrenderer/RawTexture.java
rc/com/android/gallery3d/glrenderer/ResourceTexture.java
rc/com/android/gallery3d/glrenderer/StringTexture.java
rc/com/android/gallery3d/glrenderer/Texture.java
rc/com/android/gallery3d/glrenderer/TextureUploader.java
rc/com/android/gallery3d/glrenderer/TiledTexture.java
rc/com/android/gallery3d/glrenderer/UploadedTexture.java
rc/com/android/gallery3d/ingest/ImportTask.java
rc/com/android/gallery3d/ingest/IngestActivity.java
rc/com/android/gallery3d/ingest/IngestService.java
rc/com/android/gallery3d/ingest/MtpDeviceIndex.java
rc/com/android/gallery3d/ingest/SimpleDate.java
rc/com/android/gallery3d/ingest/adapter/CheckBroker.java
rc/com/android/gallery3d/ingest/adapter/MtpAdapter.java
rc/com/android/gallery3d/ingest/adapter/MtpPagerAdapter.java
rc/com/android/gallery3d/ingest/data/BitmapWithMetadata.java
rc/com/android/gallery3d/ingest/data/MtpBitmapFetch.java
rc/com/android/gallery3d/ingest/ui/DateTileView.java
rc/com/android/gallery3d/ingest/ui/IngestGridView.java
rc/com/android/gallery3d/ingest/ui/MtpFullscreenView.java
rc/com/android/gallery3d/ingest/ui/MtpImageView.java
rc/com/android/gallery3d/ingest/ui/MtpThumbnailTileView.java
rc/com/android/gallery3d/onetimeinitializer/GalleryWidgetMigrator.java
rc/com/android/gallery3d/provider/GalleryProvider.java
rc/com/android/gallery3d/ui/AbstractSlotRenderer.java
rc/com/android/gallery3d/ui/ActionModeHandler.java
rc/com/android/gallery3d/ui/AlbumLabelMaker.java
rc/com/android/gallery3d/ui/AlbumSetSlidingWindow.java
rc/com/android/gallery3d/ui/AlbumSetSlotRenderer.java
rc/com/android/gallery3d/ui/AlbumSlidingWindow.java
rc/com/android/gallery3d/ui/AlbumSlotRenderer.java
rc/com/android/gallery3d/ui/AnimationTime.java
rc/com/android/gallery3d/ui/BitmapLoader.java
rc/com/android/gallery3d/ui/BitmapScreenNail.java
rc/com/android/gallery3d/ui/BitmapTileProvider.java
rc/com/android/gallery3d/ui/CacheStorageUsageInfo.java
rc/com/android/gallery3d/ui/CaptureAnimation.java
rc/com/android/gallery3d/ui/DetailsAddressResolver.java
rc/com/android/gallery3d/ui/DetailsHelper.java
rc/com/android/gallery3d/ui/DialogDetailsView.java
rc/com/android/gallery3d/ui/DownUpDetector.java
rc/com/android/gallery3d/ui/EdgeEffect.java
rc/com/android/gallery3d/ui/EdgeView.java
rc/com/android/gallery3d/ui/FlingScroller.java
rc/com/android/gallery3d/ui/GLRoot.java
rc/com/android/gallery3d/ui/GLRootView.java
rc/com/android/gallery3d/ui/GLView.java
rc/com/android/gallery3d/ui/GestureRecognizer.java
rc/com/android/gallery3d/ui/Log.java
rc/com/android/gallery3d/ui/ManageCacheDrawer.java
rc/com/android/gallery3d/ui/MeasureHelper.java
rc/com/android/gallery3d/ui/MenuExecutor.java
rc/com/android/gallery3d/ui/OrientationSource.java
rc/com/android/gallery3d/ui/Paper.java
rc/com/android/gallery3d/ui/PhotoFallbackEffect.java
rc/com/android/gallery3d/ui/PhotoView.java
rc/com/android/gallery3d/ui/PopupList.java
rc/com/android/gallery3d/ui/PositionController.java
rc/com/android/gallery3d/ui/PreparePageFadeoutTexture.java
rc/com/android/gallery3d/ui/ProgressSpinner.java
rc/com/android/gallery3d/ui/RelativePosition.java
rc/com/android/gallery3d/ui/ScreenNail.java
rc/com/android/gallery3d/ui/ScrollBarView.java
rc/com/android/gallery3d/ui/ScrollerHelper.java
rc/com/android/gallery3d/ui/SelectionManager.java
rc/com/android/gallery3d/ui/SelectionMenu.java
rc/com/android/gallery3d/ui/SlideshowView.java
rc/com/android/gallery3d/ui/SlotView.java
rc/com/android/gallery3d/ui/SurfaceTextureScreenNail.java
rc/com/android/gallery3d/ui/SynchronizedHandler.java
rc/com/android/gallery3d/ui/TileImageView.java
rc/com/android/gallery3d/ui/TileImageViewAdapter.java
rc/com/android/gallery3d/ui/TiledScreenNail.java
rc/com/android/gallery3d/ui/UndoBarView.java
rc/com/android/gallery3d/ui/UserInteractionListener.java
rc/com/android/gallery3d/ui/WakeLockHoldingProgressListener.java
rc/com/android/gallery3d/util/AccessibilityUtils.java
rc/com/android/gallery3d/util/BucketNames.java
rc/com/android/gallery3d/util/CacheManager.java
rc/com/android/gallery3d/util/GalleryUtils.java
rc/com/android/gallery3d/util/Holder.java
rc/com/android/gallery3d/util/IdentityCache.java
rc/com/android/gallery3d/util/IntArray.java
rc/com/android/gallery3d/util/InterruptableOutputStream.java
rc/com/android/gallery3d/util/JobLimiter.java
rc/com/android/gallery3d/util/LinkedNode.java
rc/com/android/gallery3d/util/Log.java
rc/com/android/gallery3d/util/MediaSetUtils.java
rc/com/android/gallery3d/util/MotionEventHelper.java
rc/com/android/gallery3d/util/Profile.java
rc/com/android/gallery3d/util/ProfileData.java
rc/com/android/gallery3d/util/RangeArray.java
rc/com/android/gallery3d/util/RangeBoolArray.java
rc/com/android/gallery3d/util/RangeIntArray.java
rc/com/android/gallery3d/util/ReverseGeocoder.java
rc/com/android/gallery3d/util/SaveVideoFileInfo.java
rc/com/android/gallery3d/util/SaveVideoFileUtils.java
rc/com/android/gallery3d/util/UpdateHelper.java
rc/com/android/photos/AlbumActivity.java
rc/com/android/photos/AlbumFragment.java
rc/com/android/photos/AlbumSetFragment.java
rc/com/android/photos/BitmapRegionTileSource.java
rc/com/android/photos/FullscreenViewer.java
rc/com/android/photos/GalleryActivity.java
rc/com/android/photos/MultiChoiceManager.java
rc/com/android/photos/MultiSelectGridFragment.java
rc/com/android/photos/PhotoFragment.java
rc/com/android/photos/PhotoSetFragment.java
rc/com/android/photos/SelectionManager.java
rc/com/android/photos/adapters/AlbumSetCursorAdapter.java
rc/com/android/photos/adapters/PhotoThumbnailAdapter.java
rc/com/android/photos/data/AlbumSetLoader.java
rc/com/android/photos/data/BitmapDecoder.java
rc/com/android/photos/data/FileRetriever.java
rc/com/android/photos/data/GalleryBitmapPool.java
rc/com/android/photos/data/MediaCache.java
rc/com/android/photos/data/MediaCacheDatabase.java
rc/com/android/photos/data/MediaCacheUtils.java
rc/com/android/photos/data/MediaRetriever.java
rc/com/android/photos/data/NotificationWatcher.java
rc/com/android/photos/data/PhotoDatabase.java
rc/com/android/photos/data/PhotoProvider.java
rc/com/android/photos/data/PhotoSetLoader.java
rc/com/android/photos/data/SQLiteContentProvider.java
rc/com/android/photos/data/SparseArrayBitmapPool.java
rc/com/android/photos/drawables/AutoThumbnailDrawable.java
rc/com/android/photos/drawables/DataUriThumbnailDrawable.java
rc/com/android/photos/shims/BitmapJobDrawable.java
rc/com/android/photos/shims/LoaderCompatShim.java
rc/com/android/photos/shims/MediaItemsLoader.java
rc/com/android/photos/shims/MediaSetLoader.java
rc/com/android/photos/views/BlockingGLTextureView.java
rc/com/android/photos/views/GalleryThumbnailView.java
rc/com/android/photos/views/HeaderGridView.java
rc/com/android/photos/views/SquareImageView.java
rc/com/android/photos/views/TiledImageRenderer.java
rc/com/android/photos/views/TiledImageView.java
rc_pd/com/android/camera/PanoramaStitchingManager.java
rc_pd/com/android/camera/app/StitchingProgressManager.java
rc_pd/com/android/camera/util/HelpUtils.java
rc_pd/com/android/camera/util/PhotoSphereHelper.java
rc_pd/com/android/camera/util/RefocusHelper.java
rc_pd/com/android/camera/util/UsageStatistics.java
rc_pd/com/android/gallery3d/app/StitchingProgressManager.java
rc_pd/com/android/gallery3d/filtershow/editors/EditorManager.java
rc_pd/com/android/gallery3d/filtershow/filters/FiltersManager.java
rc_pd/com/android/gallery3d/picasasource/PicasaSource.java
rc_pd/com/android/gallery3d/settings/GallerySettings.java
rc_pd/com/android/gallery3d/util/HelpUtils.java
rc_pd/com/android/gallery3d/util/LightCycleHelper.java
rc_pd/com/android/gallery3d/util/RefocusHelper.java
rc_pd/com/android/gallery3d/util/UsageStatistics.java
rc_pd/com/android/gallery3d/util/XmpUtilHelper.java
rc_pd/com/android/photos/data/PhotoProviderAuthority.java
ests/AndroidManifest.xml
ests/exiftool_parser/parser.py
ests/res/raw/android_lawn.mp4
ests/res/raw/galaxy_nexus.jpg
ests/res/raw/jpeg_control.jpg
ests/res/xml/galaxy_nexus.xml
ests/src/com/android/gallery3d/CameraTestRunner.java
ests/src/com/android/gallery3d/StressTests.java
ests/src/com/android/gallery3d/anim/AnimationTest.java
ests/src/com/android/gallery3d/common/BlobCacheTest.java
ests/src/com/android/gallery3d/common/UtilsTest.java
ests/src/com/android/gallery3d/data/GalleryAppMock.java
ests/src/com/android/gallery3d/data/GalleryAppStub.java
ests/src/com/android/gallery3d/data/LocalDataTest.java
ests/src/com/android/gallery3d/data/MediaSetTest.java
ests/src/com/android/gallery3d/data/MockItem.java
ests/src/com/android/gallery3d/data/MockSet.java
ests/src/com/android/gallery3d/data/MockSource.java
ests/src/com/android/gallery3d/data/PathTest.java
ests/src/com/android/gallery3d/data/RealDataTest.java
ests/src/com/android/gallery3d/exif/ExifDataTest.java
ests/src/com/android/gallery3d/exif/ExifInterfaceTest.java
ests/src/com/android/gallery3d/exif/ExifModifierTest.java
ests/src/com/android/gallery3d/exif/ExifOutputStreamTest.java
ests/src/com/android/gallery3d/exif/ExifParserTest.java
ests/src/com/android/gallery3d/exif/ExifReaderTest.java
ests/src/com/android/gallery3d/exif/ExifTagTest.java
ests/src/com/android/gallery3d/exif/ExifTestRunner.java
ests/src/com/android/gallery3d/exif/ExifXmlDataTestCase.java
ests/src/com/android/gallery3d/exif/ExifXmlReader.java
ests/src/com/android/gallery3d/exif/Util.java
ests/src/com/android/gallery3d/functional/CameraTest.java
ests/src/com/android/gallery3d/functional/ImageCaptureIntentTest.java
ests/src/com/android/gallery3d/functional/VideoCaptureIntentTest.java
ests/src/com/android/gallery3d/glrenderer/GLCanvasMock.java
ests/src/com/android/gallery3d/glrenderer/GLCanvasTest.java
ests/src/com/android/gallery3d/glrenderer/GLMock.java
ests/src/com/android/gallery3d/glrenderer/GLStub.java
ests/src/com/android/gallery3d/glrenderer/TextureTest.java
ests/src/com/android/gallery3d/jpegstream/JpegStreamReaderTest.java
ests/src/com/android/gallery3d/jpegstream/JpegStreamTestCase.java
ests/src/com/android/gallery3d/jpegstream/JpegStreamTestRunner.java
ests/src/com/android/gallery3d/jpegstream/JpegStreamWriterTest.java
ests/src/com/android/gallery3d/stress/CameraLatency.java
ests/src/com/android/gallery3d/stress/CameraStartUp.java
ests/src/com/android/gallery3d/stress/CameraStressTestRunner.java
ests/src/com/android/gallery3d/stress/ImageCapture.java
ests/src/com/android/gallery3d/stress/ShotToShotLatency.java
ests/src/com/android/gallery3d/stress/SwitchPreview.java
ests/src/com/android/gallery3d/stress/TestUtil.java
ests/src/com/android/gallery3d/stress/VideoCapture.java
ests/src/com/android/gallery3d/ui/GLCanvasStub.java
ests/src/com/android/gallery3d/ui/GLRootMock.java
ests/src/com/android/gallery3d/ui/GLRootStub.java
ests/src/com/android/gallery3d/ui/GLViewMock.java
ests/src/com/android/gallery3d/ui/GLViewTest.java
ests/src/com/android/gallery3d/ui/PointerInfo.java
ests/src/com/android/gallery3d/unittest/CameraUnitTest.java
ests/src/com/android/gallery3d/util/IntArrayTest.java
ests/src/com/android/gallery3d/util/ProfileTest.java
ests/src/com/android/photos/data/DataTestRunner.java
ests/src/com/android/photos/data/MediaCacheTest.java
ests/src/com/android/photos/data/PhotoDatabaseTest.java
ests/src/com/android/photos/data/PhotoDatabaseUtils.java
ests/src/com/android/photos/data/PhotoProviderTest.java
ests/src/com/android/photos/data/TestHelper.java
|
4fc90b07dcf316c7ce6c5313af8202e84bc85603 |
06-Aug-2013 |
Sascha Haeberling <haeberling@google.com> |
Remove all .mk files from the cloned Camera2 until the project is properly set up. Change-Id: I3eb79a7a756793ac5253b8c40c3fbc6c6fe2e8e3
ndroid.mk
allerycommon/Android.mk
ni/Android.mk
ni_jpegstream/Android.mk
ests/Android.mk
ests_camera/Android.mk
|
8672b225baab4e458e752e55ffb6bbc76c8e9c61 |
06-Aug-2013 |
Qiwen Zhao <zhao@google.com> |
Merge tests/exiftool_parser/ from platform/packages/apps/Gallery2 to tests/exiftool_parser/
|
394baebc5579fa9c3f7e09bfbcac7ef666f6c002 |
06-Aug-2013 |
Qiwen Zhao <zhao@google.com> |
Merge CleanSpec.mk/ from platform/packages/apps/Gallery2 to CleanSpec.mk/
|
326a79d9d43253a675142b8b416121d4744df299 |
06-Aug-2013 |
Qiwen Zhao <zhao@google.com> |
Merge proguard.flags/ from platform/packages/apps/Gallery2 to proguard.flags/
|
7ee16875b7f8c01b278f4dd009e8360e5c0b3bfb |
06-Aug-2013 |
Qiwen Zhao <zhao@google.com> |
Merge Android.mk/ from platform/packages/apps/Gallery2 to Android.mk/
|
48634be18119e370989fefa3284ad600aef92a1b |
06-Aug-2013 |
Qiwen Zhao <zhao@google.com> |
Merge AndroidManifest.xml/ from platform/packages/apps/Gallery2 to AndroidManifest.xml/
|
51b3321864eabfe04e484287481d7df7792b2f2b |
06-Aug-2013 |
Qiwen Zhao <zhao@google.com> |
Merge res/ from platform/packages/apps/Gallery2 to res/
|
e426d40137e32e579c70fbcd28fd94e74799f2a9 |
06-Aug-2013 |
Qiwen Zhao <zhao@google.com> |
Merge jni/ from platform/packages/apps/Gallery2 to jni/
|
ae49a9f990643202d28e7a5b6f999163914d8246 |
06-Aug-2013 |
Qiwen Zhao <zhao@google.com> |
Merge src/ from platform/packages/apps/Gallery2 to src/
|
68de58e353cf9764196efa007f3c5a77510ab099 |
06-Aug-2013 |
Qiwen Zhao <zhao@google.com> |
Merge jni_jpegstream/ from platform/packages/apps/Gallery2 to jni_jpegstream/
|
972f65f24a63ff280e110ad4ed62730fb4250a73 |
06-Aug-2013 |
Qiwen Zhao <zhao@google.com> |
Merge gallerycommon/ from platform/packages/apps/Gallery2 to gallerycommon/
|
d475c670423404931e1b7281ac2dcb430490c27b |
06-Aug-2013 |
Angus Kong <shkong@google.com> |
Load the FilmStrip data in onCreate() The loading should be done in onCreate() so it won't waste time loading the data which has been loaded everytime the app is brought to the foreground. bug:10189998 Change-Id: I5b9158b206f96b065f6f18a5ab7da3ca14b9e52a
rc/com/android/camera/CameraActivity.java
|
56752d5d6313890758325f75d0e73a68467da58f |
05-Aug-2013 |
Qiwen Zhao <zhao@google.com> |
Merge AndroidManifest.xml/ from platform/packages/apps/Gallery2 to AndroidManifest.xml/
|
8b6c588e775056d4fd7dbe8fcbcea2746cc63c79 |
03-Aug-2013 |
Jason Noguchi <jnoguchi@google.com> |
Merge "Clean up the test tags used by the continuous test service to determine which tests to run on every dev build. Add SmallTest or MediumTest tags for unit tests that are currently being skipped and remove LargeTest tags from long running stress tests which are not necessary in this context." into gb-ub-photos-carlsbad
|
26d2fb1a5cffea83b9ef6c264cdd1d0e56aeff87 |
03-Aug-2013 |
Jason Noguchi <jnoguchi@google.com> |
Merge "Clean up the test tags used by the continuous test service to determine which tests to run on every dev build. Add SmallTest or MediumTest tags for unit tests that are currently being skipped and remove LargeTest tags from long running stress tests which are not necessary in this context." into gb-ub-photos-carlsbad
|
4c3d807c2b6ec190dd7b4f0a1626cec7f88deae3 |
31-Jul-2013 |
Jason Noguchi <jnoguchi@google.com> |
Clean up the test tags used by the continuous test service to determine which tests to run on every dev build. Add SmallTest or MediumTest tags for unit tests that are currently being skipped and remove LargeTest tags from long running stress tests which are not necessary in this context. Change-Id: I2d3db31b0800dcbed42c881c5eaa589517fd9f87
ests/src/com/android/gallery3d/stress/CameraLatency.java
ests/src/com/android/gallery3d/stress/CameraStartUp.java
ests/src/com/android/gallery3d/stress/ImageCapture.java
ests/src/com/android/gallery3d/stress/ShotToShotLatency.java
ests/src/com/android/gallery3d/stress/SwitchPreview.java
ests/src/com/android/gallery3d/stress/VideoCapture.java
|
f40d4fbbbeb8e972114c41078e038fbbe0e5b083 |
31-Jul-2013 |
Jason Noguchi <jnoguchi@google.com> |
Clean up the test tags used by the continuous test service to determine which tests to run on every dev build. Add SmallTest or MediumTest tags for unit tests that are currently being skipped and remove LargeTest tags from long running stress tests which are not necessary in this context. Change-Id: I2d3db31b0800dcbed42c881c5eaa589517fd9f87
ests/src/com/android/gallery3d/exif/ExifDataTest.java
ests/src/com/android/gallery3d/exif/ExifInterfaceTest.java
ests/src/com/android/gallery3d/exif/ExifModifierTest.java
ests/src/com/android/gallery3d/exif/ExifOutputStreamTest.java
ests/src/com/android/gallery3d/exif/ExifParserTest.java
ests/src/com/android/gallery3d/exif/ExifReaderTest.java
ests/src/com/android/gallery3d/exif/ExifTagTest.java
ests/src/com/android/gallery3d/glrenderer/GLCanvasTest.java
ests/src/com/android/gallery3d/glrenderer/TextureTest.java
ests/src/com/android/gallery3d/jpegstream/JpegStreamReaderTest.java
ests/src/com/android/gallery3d/stress/CameraLatency.java
ests/src/com/android/gallery3d/stress/CameraStartUp.java
ests/src/com/android/gallery3d/stress/ImageCapture.java
ests/src/com/android/gallery3d/stress/ShotToShotLatency.java
ests/src/com/android/gallery3d/stress/SwitchPreview.java
ests/src/com/android/gallery3d/stress/VideoCapture.java
|
9db5aa8efbf41376e193f7695529a8377fa79c79 |
02-Aug-2013 |
Qiwen Zhao <zhao@google.com> |
Initial empty repository
|
b19d6038926ff736f08b479ae43a59a339cf39c8 |
02-Aug-2013 |
nicolasroard <nicolasroard@google.com> |
Fix display bug with highres Change-Id: I8961beca6bf80efdf3cf1c3b6cae691dd0f473ed
rc/com/android/gallery3d/filtershow/pipeline/HighresRenderingRequestTask.java
|
08a7c5ee848874759f28be0b5998269e5a32293c |
02-Aug-2013 |
nicolasroard <nicolasroard@google.com> |
Fix display bug with highres Change-Id: I8961beca6bf80efdf3cf1c3b6cae691dd0f473ed
rc/com/android/gallery3d/filtershow/pipeline/CachingPipeline.java
rc/com/android/gallery3d/filtershow/pipeline/HighresRenderingRequestTask.java
|
5ba2436722006a3c66cb9aa6654a355af0250ef6 |
02-Aug-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Add quality selector to export. - Adds the option to change the quality of the jpeg compression when flattening an exported bitmap. Change-Id: I252913fc15ff32a0fcff683edb5b33e17b5daac4
es/layout/filtershow_export_dialog.xml
es/values/filtershow_strings.xml
|
8f0065ba9aefe1c6b53c941b6d2438b7b9cb2c66 |
02-Aug-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Add quality selector to export. - Adds the option to change the quality of the jpeg compression when flattening an exported bitmap. Change-Id: I252913fc15ff32a0fcff683edb5b33e17b5daac4
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/pipeline/ImageSavingTask.java
rc/com/android/gallery3d/filtershow/pipeline/ProcessingService.java
rc/com/android/gallery3d/filtershow/tools/SaveImage.java
rc/com/android/gallery3d/filtershow/ui/ExportDialog.java
|
56f769814f4bbcdd8b08b98cbd75711fe64d50db |
02-Aug-2013 |
Sascha Haeberling <haeberling@google.com> |
Hide "View Photo Sphere" button by default. Change-Id: Idb31a96d0dcb19e6d57c1c5d388ef8d180382345
es/layout/camera_filmstrip.xml
|
a1168a948830022c599a6164d92ce537794a1247 |
02-Aug-2013 |
John Hoford <hoford@google.com> |
Merge "add Per Channel Saturation" into gb-ub-photos-carlsbad
|
dd9432a31e18c2cb1479ec51f41defced345173a |
02-Aug-2013 |
John Hoford <hoford@google.com> |
Merge "add Per Channel Saturation" into gb-ub-photos-carlsbad
|
8e5e4eedb25a4589342660b928935acca4375fc7 |
30-Jul-2013 |
Angus Kong <shkong@google.com> |
Add LocalDataAdapter and wrappers. 1. FixedFirstDataAdapter wraps another adapter and add a data at the first position. 2. FixedLastDataAdapter wraps another adapter and add a data at the last position. 3. Make the LocalData interface more complete. - onFullScreen() - canSwipeInFullScreen() - getPath() 3. Add methods to the FilmStripView.DataAdapter to receive UI events. - onDataCentered() - onDataFullScreen() Change-Id: I26d3a3b7facd0c451af43ce5fbbcab2baaaec427
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/PhotoUI.java
rc/com/android/camera/data/AbstractLocalDataAdapterWrapper.java
rc/com/android/camera/data/CameraDataAdapter.java
rc/com/android/camera/data/CameraPreviewData.java
rc/com/android/camera/data/FixedFirstDataAdapter.java
rc/com/android/camera/data/FixedLastDataAdapter.java
rc/com/android/camera/data/LocalData.java
rc/com/android/camera/data/LocalDataAdapter.java
rc/com/android/camera/ui/FilmStripView.java
|
2f1ff6df511486b307ea8facbea8656015c93c20 |
30-Jul-2013 |
John Hoford <hoford@google.com> |
add Per Channel Saturation Change-Id: Icfd24c817674b81ac9caecc2d73348dc7734f037
es/menu/filtershow_menu_chan_sat.xml
es/values/filtershow_ids.xml
es/values/filtershow_strings.xml
rc/com/android/gallery3d/filtershow/filters/FilterChanSatRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterGradRepresentation.java
rc/com/android/gallery3d/filtershow/pipeline/ImagePreset.java
|
014bbe68d6e407269a0d843083be56f8df58adba |
30-Jul-2013 |
John Hoford <hoford@google.com> |
add Per Channel Saturation Change-Id: Icfd24c817674b81ac9caecc2d73348dc7734f037
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/controller/BasicParameterInt.java
rc/com/android/gallery3d/filtershow/editors/EditorChanSat.java
rc/com/android/gallery3d/filtershow/filters/BaseFiltersManager.java
rc/com/android/gallery3d/filtershow/filters/FilterChanSatRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterGradRepresentation.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterChanSat.java
rc/com/android/gallery3d/filtershow/filters/saturation.rs
rc/com/android/gallery3d/filtershow/pipeline/ImagePreset.java
rc_pd/com/android/gallery3d/filtershow/editors/EditorManager.java
|
8bd17465ed2058eee581fdf8e6c401796692161c |
02-Aug-2013 |
Sascha Haeberling <haeberling@google.com> |
Merge "Adds back the PhotoSphere View icon in filmstrip." into gb-ub-photos-carlsbad
|
bfed27177046f4b1325bf1bc145ce3bb6b82b1ec |
02-Aug-2013 |
Sascha Haeberling <haeberling@google.com> |
Merge "Adds back the PhotoSphere View icon in filmstrip." into gb-ub-photos-carlsbad
|
1a7821c03e800cf616f567326b8e2e197f0dcd27 |
31-Jul-2013 |
Sascha Haeberling <haeberling@google.com> |
Adds back the PhotoSphere View icon in filmstrip. This also exercises the "leave a place cleaner than you found it" rule by cleaning up stuff: - Formatting according to the Android format rules - Removing unused code - Putting braces where they belong. Change-Id: Ie1dbfe9195bf3e20d9624d7ae85eeba16df8f931
es/layout/camera_filmstrip.xml
|
f1f5186f7d3fd8bf35009d9e65a43914c664d82b |
31-Jul-2013 |
Sascha Haeberling <haeberling@google.com> |
Adds back the PhotoSphere View icon in filmstrip. This also exercises the "leave a place cleaner than you found it" rule by cleaning up stuff: - Formatting according to the Android format rules - Removing unused code - Putting braces where they belong. Change-Id: Ie1dbfe9195bf3e20d9624d7ae85eeba16df8f931
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/data/CameraDataAdapter.java
rc/com/android/camera/data/LocalData.java
rc/com/android/camera/data/PanoramaMetadataLoader.java
rc/com/android/camera/ui/FilmStripView.java
|
dff09e12b897d6546caa38fc867e4c449b520262 |
01-Aug-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ia632d125addcaa105f70381f36b9ce0b32e50923 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
22c824de0d52f9f19398529fee14a3aeb41f04b0 |
19-Jul-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Refactoring Geometry handling. Bug: 9170644 Bug: 9366654 Bug: 9366263 - Consolidates all the geometry transforms in GeometryMathUtils and significantly reduces complexity. - Removes GeometryMetadata object and dependent code. - Removes ImageGeometry and geometry update callbacks. Change-Id: I59add51907459593244c9ebaadef585efc7486d5
rc/com/android/gallery3d/filtershow/filters/FilterCropRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterMirrorRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterRotateRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterStraightenRepresentation.java
rc/com/android/gallery3d/filtershow/pipeline/ImagePreset.java
|
203eb404a7cd6a80397535e63d22b3772939f03d |
19-Jul-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Refactoring Geometry handling. Bug: 9170644 Bug: 9366654 Bug: 9366263 - Consolidates all the geometry transforms in GeometryMathUtils and significantly reduces complexity. - Removes GeometryMetadata object and dependent code. - Removes ImageGeometry and geometry update callbacks. Change-Id: I59add51907459593244c9ebaadef585efc7486d5
rc/com/android/gallery3d/filtershow/EditorPlaceHolder.java
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/crop/BoundedRect.java
rc/com/android/gallery3d/filtershow/crop/CropMath.java
rc/com/android/gallery3d/filtershow/crop/CropObject.java
rc/com/android/gallery3d/filtershow/crop/CropView.java
rc/com/android/gallery3d/filtershow/editors/Editor.java
rc/com/android/gallery3d/filtershow/editors/EditorCrop.java
rc/com/android/gallery3d/filtershow/editors/EditorFlip.java
rc/com/android/gallery3d/filtershow/editors/EditorMirror.java
rc/com/android/gallery3d/filtershow/editors/EditorPanel.java
rc/com/android/gallery3d/filtershow/editors/EditorRotate.java
rc/com/android/gallery3d/filtershow/editors/EditorStraighten.java
rc/com/android/gallery3d/filtershow/filters/BaseFiltersManager.java
rc/com/android/gallery3d/filtershow/filters/FilterCropRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterMirrorRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterRotateRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterStraightenRepresentation.java
rc/com/android/gallery3d/filtershow/filters/ImageFilter.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterGeometry.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterStraighten.java
rc/com/android/gallery3d/filtershow/imageshow/GeometryListener.java
rc/com/android/gallery3d/filtershow/imageshow/GeometryMath.java
rc/com/android/gallery3d/filtershow/imageshow/GeometryMathUtils.java
rc/com/android/gallery3d/filtershow/imageshow/GeometryMetadata.java
rc/com/android/gallery3d/filtershow/imageshow/ImageCrop.java
rc/com/android/gallery3d/filtershow/imageshow/ImageDraw.java
rc/com/android/gallery3d/filtershow/imageshow/ImageFlip.java
rc/com/android/gallery3d/filtershow/imageshow/ImageGeometry.java
rc/com/android/gallery3d/filtershow/imageshow/ImageMirror.java
rc/com/android/gallery3d/filtershow/imageshow/ImagePoint.java
rc/com/android/gallery3d/filtershow/imageshow/ImageRotate.java
rc/com/android/gallery3d/filtershow/imageshow/ImageShow.java
rc/com/android/gallery3d/filtershow/imageshow/ImageStraighten.java
rc/com/android/gallery3d/filtershow/imageshow/MasterImage.java
rc/com/android/gallery3d/filtershow/pipeline/CacheProcessing.java
rc/com/android/gallery3d/filtershow/pipeline/CachingPipeline.java
rc/com/android/gallery3d/filtershow/pipeline/FilterEnvironment.java
rc/com/android/gallery3d/filtershow/pipeline/ImagePreset.java
rc_pd/com/android/gallery3d/filtershow/editors/EditorManager.java
|
d7abdc4a553524456a48736383f9b2f4defef94c |
01-Aug-2013 |
nicolasroard <nicolasroard@google.com> |
Fix problem with N-1 caching when no filters / one filter - also fix equals() for geometry Change-Id: I6f6f21d1e274b3b95ac4b5189b2fa7f419912864
rc/com/android/gallery3d/filtershow/filters/FilterCropRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterMirrorRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterRotateRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterStraightenRepresentation.java
|
3a5bc6b23096365e1a814f8999937028bc12b401 |
01-Aug-2013 |
nicolasroard <nicolasroard@google.com> |
Fix problem with N-1 caching when no filters / one filter - also fix equals() for geometry Change-Id: I6f6f21d1e274b3b95ac4b5189b2fa7f419912864
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/filters/FilterCropRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterMirrorRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterRotateRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterStraightenRepresentation.java
rc/com/android/gallery3d/filtershow/imageshow/GeometryMetadata.java
rc/com/android/gallery3d/filtershow/pipeline/CacheProcessing.java
|
bb2848ab2a8d532956f4730c8cf7434eb3a8600f |
01-Aug-2013 |
Angus Kong <shkong@google.com> |
Merge "Add wrapper for face detection listener." into gb-ub-photos-carlsbad
|
b1dd3933a20df2b45c2ca27a632afd7207a67d87 |
01-Aug-2013 |
nicolasroard <nicolasroard@google.com> |
Merge "Implements N-1 Caching" into gb-ub-photos-carlsbad
|
5c9925a5ad7298c3e3a49bfa8fa09f7691b18c4a |
01-Aug-2013 |
nicolasroard <nicolasroard@google.com> |
Merge "Implements N-1 Caching" into gb-ub-photos-carlsbad
|
37c88fc60e1301582ac91b02f2c826d86ae10600 |
31-Jul-2013 |
nicolasroard <nicolasroard@google.com> |
Implements N-1 Caching Change-Id: Ief1a04dbe4f6ced15f937177a556733cfcdb5879
rc/com/android/gallery3d/filtershow/filters/FilterVignetteRepresentation.java
rc/com/android/gallery3d/filtershow/pipeline/ImagePreset.java
|
7f2b1e548ad3b5cdf8775b0a12f8f9b389477f21 |
31-Jul-2013 |
nicolasroard <nicolasroard@google.com> |
Implements N-1 Caching Change-Id: Ief1a04dbe4f6ced15f937177a556733cfcdb5879
rc/com/android/gallery3d/filtershow/filters/FilterVignetteRepresentation.java
rc/com/android/gallery3d/filtershow/pipeline/CacheProcessing.java
rc/com/android/gallery3d/filtershow/pipeline/CachingPipeline.java
rc/com/android/gallery3d/filtershow/pipeline/ImagePreset.java
|
9e76552adff6ecf8b8e4070ecd61699cb6d18269 |
31-Jul-2013 |
Angus Kong <shkong@google.com> |
Add wrapper for face detection listener. bug:10113532 Change-Id: I01dc051d7b25cb97153b5e3e4cf06744dccb9fd4
rc/com/android/camera/AndroidCameraManagerImpl.java
rc/com/android/camera/CameraManager.java
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/PhotoUI.java
|
d152efe9aa419becc06136f7895e4f937cc61619 |
31-Jul-2013 |
Doris Liu <tianliu@google.com> |
Set default video quality to the highest Bug: 9886141 Change-Id: I4741d5c898ac666923cfc12abc78d5d3517cb05f
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
|
c2556da9f89da81e5a1987bd898f6d0fb4c4bfaf |
31-Jul-2013 |
Doris Liu <tianliu@google.com> |
Set default video quality to the highest Bug: 9886141 Change-Id: I4741d5c898ac666923cfc12abc78d5d3517cb05f
es/xml/video_preferences.xml
|
3f7e00441f65ebd463a68d4c687589a65980ac5b |
31-Jul-2013 |
Doris Liu <tianliu@google.com> |
Set default video quality to the highest Bug: 9886141 Change-Id: I4741d5c898ac666923cfc12abc78d5d3517cb05f
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
rc/com/android/camera/CameraSettings.java
rc/com/android/camera/VideoModule.java
|
6d29a648f497f827d623d7af0b679e98ea58bf90 |
31-Jul-2013 |
Angus Kong <shkong@google.com> |
Fix switching camera failure. bug:10110830 Change-Id: I1adcefc229ce4a245880bc037a086c949c73da55
rc/com/android/camera/AndroidCameraManagerImpl.java
|
996669f26a5c526561f5779a5d04702a551f4230 |
31-Jul-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Do antialiasing on wallpaper preview." into gb-ub-photos-carlsbad
|
d031ce88398f90961a6f1a2cd8f989510d256140 |
31-Jul-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Do antialiasing on wallpaper preview. Bug: 9052851 Change-Id: I890fae2d4bb9907c7204cc6fa34c42c7fe7c7309
rc/com/android/gallery3d/filtershow/crop/CropView.java
|
a0a51343063d9d689771112b9af668f01d8cf87c |
31-Jul-2013 |
John Hoford <hoford@google.com> |
Merge "clean up some bugs and update the icons" into gb-ub-photos-carlsbad
|
28d86a33744fc5ae60949a43ff27930579b9bda8 |
31-Jul-2013 |
John Hoford <hoford@google.com> |
Merge "clean up some bugs and update the icons" into gb-ub-photos-carlsbad
|
7dd44d877efb2682c538fdf6d1cb06237ec00308 |
31-Jul-2013 |
John Hoford <hoford@google.com> |
clean up some bugs and update the icons Change-Id: I6952bae8cfea2ec64064f3126eece93687c02eae
es/drawable-hdpi/filtershow_button_grad.png
es/drawable-mdpi/filtershow_button_grad.png
es/drawable-xhdpi/filtershow_button_grad.png
es/values/filtershow_values.xml
rc/com/android/gallery3d/filtershow/filters/FilterGradRepresentation.java
|
e887fa594f5eb3a88601e68c4c7b073bd719e565 |
31-Jul-2013 |
John Hoford <hoford@google.com> |
clean up some bugs and update the icons Change-Id: I6952bae8cfea2ec64064f3126eece93687c02eae
rc/com/android/gallery3d/filtershow/filters/FilterGradRepresentation.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterGrad.java
rc/com/android/gallery3d/filtershow/filters/grad.rs
rc/com/android/gallery3d/filtershow/imageshow/ImageGrad.java
|
13ae2608e04998f0d13bc3f58cda5237bdde0b7d |
15-Jul-2013 |
nicolasroard <nicolasroard@google.com> |
Add user presets saving/loading Change-Id: I85c5dd0df1e9264a01c8d7a6d44602e87799890c
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/category/Action.java
rc/com/android/gallery3d/filtershow/category/CategoryAdapter.java
rc/com/android/gallery3d/filtershow/category/CategoryTrack.java
rc/com/android/gallery3d/filtershow/data/FilterStackSource.java
rc/com/android/gallery3d/filtershow/data/UserPresetsManager.java
rc/com/android/gallery3d/filtershow/filters/BaseFiltersManager.java
rc/com/android/gallery3d/filtershow/filters/FilterUserPresetRepresentation.java
rc/com/android/gallery3d/filtershow/pipeline/FilterEnvironment.java
rc/com/android/gallery3d/filtershow/pipeline/ImagePreset.java
rc/com/android/gallery3d/filtershow/presets/PresetManagementDialog.java
rc/com/android/gallery3d/filtershow/presets/UserPresetsAdapter.java
|
430d25bfc7d78f03f3f7007edfddc8d15fb8c5c9 |
15-Jul-2013 |
nicolasroard <nicolasroard@google.com> |
Add user presets saving/loading Change-Id: I85c5dd0df1e9264a01c8d7a6d44602e87799890c
es/layout/filtershow_presets_management_dialog.xml
es/layout/filtershow_presets_management_row.xml
es/menu/filtershow_activity_menu.xml
es/values/filtershow_strings.xml
rc/com/android/gallery3d/filtershow/data/UserPresetsManager.java
rc/com/android/gallery3d/filtershow/filters/FilterUserPresetRepresentation.java
rc/com/android/gallery3d/filtershow/pipeline/ImagePreset.java
rc/com/android/gallery3d/filtershow/presets/PresetManagementDialog.java
rc/com/android/gallery3d/filtershow/presets/UserPresetsAdapter.java
|
2e5fe3fc3b6381456ab8e009f4270b1f4c42e53d |
30-Jul-2013 |
John Hoford <hoford@google.com> |
Merge "add Grad filter" into gb-ub-photos-carlsbad
|
7d1433ac9191fa7b7c79a0187d4d0f30c16f84d9 |
30-Jul-2013 |
John Hoford <hoford@google.com> |
Merge "add Grad filter" into gb-ub-photos-carlsbad
|
6ae2ecaf2f767ba908cb8d7ef8be2340603380a7 |
20-Jul-2013 |
John Hoford <hoford@google.com> |
add Grad filter Change-Id: I30fc0810c54f3daa31726188a4c3762df33953a7
es/drawable-hdpi/filtershow_button_grad.png
es/drawable-hdpi/ic_grad_add.png
es/drawable-hdpi/ic_grad_del.png
es/drawable-mdpi/filtershow_button_grad.png
es/drawable-mdpi/ic_grad_add.png
es/drawable-mdpi/ic_grad_del.png
es/drawable-xhdpi/filtershow_button_grad.png
es/drawable-xhdpi/ic_grad_add.png
es/drawable-xhdpi/ic_grad_del.png
es/drawable/filtershow_grad_button.xml
es/layout/editor_grad_button.xml
es/layout/filtershow_grad_editor.xml
es/menu/filtershow_menu_grad.xml
es/values/filtershow_color.xml
es/values/filtershow_ids.xml
es/values/filtershow_strings.xml
es/values/filtershow_values.xml
rc/com/android/gallery3d/filtershow/filters/FilterGradRepresentation.java
|
52e9277b6774bc938a9e55694640c20e4ba90365 |
20-Jul-2013 |
John Hoford <hoford@google.com> |
add Grad filter Change-Id: I30fc0810c54f3daa31726188a4c3762df33953a7
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/editors/EditorGrad.java
rc/com/android/gallery3d/filtershow/filters/BaseFiltersManager.java
rc/com/android/gallery3d/filtershow/filters/FilterGradRepresentation.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterGrad.java
rc/com/android/gallery3d/filtershow/filters/grad.rs
rc/com/android/gallery3d/filtershow/imageshow/GradControl.java
rc/com/android/gallery3d/filtershow/imageshow/ImageGrad.java
rc/com/android/gallery3d/filtershow/imageshow/Line.java
rc_pd/com/android/gallery3d/filtershow/editors/EditorManager.java
|
9ef9925131835743f5316393758c14532c06277d |
19-Jul-2013 |
Angus Kong <shkong@google.com> |
Refactor CameraManager. 1. CameraManager should be the only class accessing android.hardware.Camera. 2. For potential future upgrade in Camera HAL and android.hardward.Camera API upgrade, CameraManager should be just an interface instead of concrete implementation. 3. waitDone() in CameraProxy is removed. 4. ShutterCallback, PreviewCallback, PictureCallback and AF Callbacks are wrapped by our own interfaces. Change-Id: I595da17a1a9c6d476ee805b71c7f45ebb609e465
rc/com/android/camera/AndroidCameraManagerImpl.java
rc/com/android/camera/CameraHolder.java
rc/com/android/camera/CameraManager.java
rc/com/android/camera/CameraManagerFactory.java
rc/com/android/camera/EffectsRecorder.java
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/Util.java
rc/com/android/camera/VideoModule.java
|
d7d3f84a113c74c0e0d7993e6442fc8f27341740 |
27-Jul-2013 |
Sascha Haeberling <haeberling@google.com> |
Merge "Refocus integration phase 1." into gb-ub-photos-carlsbad
|
9d1cd3ec768cac1142de259a676893a08141a6d3 |
27-Jul-2013 |
Sascha Haeberling <haeberling@google.com> |
Merge "Refocus integration phase 1." into gb-ub-photos-carlsbad
|
3dbed24b638141342323373d97954532c44320ac |
26-Jul-2013 |
nicolasroard <nicolasroard@google.com> |
Fix disappearing fragment Change-Id: Ic478ad75a458bb36001c91f8627aab7643fa0a47
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
|
e51d434400c66a6449db893ebf9df37186f11297 |
26-Jul-2013 |
nicolasroard <nicolasroard@google.com> |
Fix geometry serialization Change-Id: I3040cfdb08f6cc6dbd4fd1eb5444b3395a68c7da
rc/com/android/gallery3d/filtershow/pipeline/ImagePreset.java
|
a5c138bdac37dddf53acd37807a364aac753acb6 |
26-Jul-2013 |
nicolasroard <nicolasroard@google.com> |
Fix geometry serialization Change-Id: I3040cfdb08f6cc6dbd4fd1eb5444b3395a68c7da
rc/com/android/gallery3d/filtershow/pipeline/ImagePreset.java
|
32e91ad17313c1298f49459704d1de2a2da94537 |
25-Jul-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Added support to export to a flattened photo. Bug: 10008212 - Adds a menu item to allow a photo with edits to be flattened into a separate photo. - Fixes bug where crop intents fail to save cropped images. Change-Id: I1dcf1bb9ba22e72378f24e7971a74f81b8db7564
es/menu/filtershow_activity_menu.xml
es/values/filtershow_strings.xml
|
16967913de669502464cdd1aa2a389c24d123f70 |
25-Jul-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Added support to export to a flattened photo. Bug: 10008212 - Adds a menu item to allow a photo with edits to be flattened into a separate photo. - Fixes bug where crop intents fail to save cropped images. Change-Id: I1dcf1bb9ba22e72378f24e7971a74f81b8db7564
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/pipeline/ImageSavingTask.java
rc/com/android/gallery3d/filtershow/pipeline/ProcessingService.java
rc/com/android/gallery3d/filtershow/tools/SaveImage.java
|
470416e809943136004819d77244d47eda7a5c91 |
24-Jul-2013 |
Sascha Haeberling <haeberling@google.com> |
Refocus integration phase 1. Bug: 9966846 Change-Id: I591ce1ee878a9f4d6bd63eddef6e79608ffd69ec
es/drawable-xhdpi/ic_switch_refocus.png
es/values/strings.xml
|
77fb852da18c6ee8ba1f1037f385319eb47bdce6 |
24-Jul-2013 |
Sascha Haeberling <haeberling@google.com> |
Refocus integration phase 1. Bug: 9966846 Change-Id: I591ce1ee878a9f4d6bd63eddef6e79608ffd69ec
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/ui/CameraSwitcher.java
rc_pd/com/android/gallery3d/util/RefocusHelper.java
|
c8d3c0ab3769085b2b9a0235585798f06050bdb2 |
19-Jul-2013 |
Angus Kong <shkong@google.com> |
Remove legacy code ActivityBase.java. Change-Id: I7b372e5d69c3d01b4012ab61bbf725a7fec8a445
roguard.flags
|
6a8e8a1a0f3e8e62cd350733e275047475380d6b |
19-Jul-2013 |
Angus Kong <shkong@google.com> |
Remove legacy code ActivityBase.java. Change-Id: I7b372e5d69c3d01b4012ab61bbf725a7fec8a445
rc/com/android/camera/ActivityBase.java
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/PhotoModule.java
|
2641302a93350698b2eeee2bc90b6a9836e23007 |
24-Jul-2013 |
nicolasroard <nicolasroard@google.com> |
Fix geometry transform Change-Id: I0c3af6f4122d045f5a8656bc709127aa7ae2ecab
rc/com/android/gallery3d/filtershow/imageshow/ImageShow.java
|
da3a7517c1263d8b94562fbb6212376e21118b56 |
23-Jul-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE"
|
d2fe86415ac281d0f223ac5bf4e32d73abb9df10 |
23-Jul-2013 |
nicolasroard <nicolasroard@google.com> |
Merge "Move ImageCurves to the ImageShow package" into gb-ub-photos-carlsbad
|
26709d9d85ddfdc67d6ff291fe5dd8dcd3b69137 |
23-Jul-2013 |
Angus Kong <shkong@google.com> |
Don't enable shutter button before preview started. bug:9926593 Change-Id: I26fb1f7490ee1e508fe0abca4faeccd61b500fae (cherry picked from commit 1bccc910bf18eea6adbbd2a4267731014ee34c7e)
rc/com/android/camera/VideoModule.java
|
458da19fb064427a320aed8fe25b0c0cdb78109f |
22-Jul-2013 |
nicolasroard <nicolasroard@google.com> |
Move ImageCurves to the ImageShow package Change-Id: I458d20df930b9228dcbc60c3ec27f74b152d38cf
rc/com/android/gallery3d/filtershow/filters/FilterCurvesRepresentation.java
|
6f441a571084b039553c1b8bea29b44381776cf3 |
22-Jul-2013 |
nicolasroard <nicolasroard@google.com> |
Move ImageCurves to the ImageShow package Change-Id: I458d20df930b9228dcbc60c3ec27f74b152d38cf
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/editors/EditorCurves.java
rc/com/android/gallery3d/filtershow/filters/FilterCurvesRepresentation.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterCurves.java
rc/com/android/gallery3d/filtershow/imageshow/ControlPoint.java
rc/com/android/gallery3d/filtershow/imageshow/ImageCurves.java
rc/com/android/gallery3d/filtershow/imageshow/Spline.java
rc/com/android/gallery3d/filtershow/ui/ControlPoint.java
rc/com/android/gallery3d/filtershow/ui/ImageCurves.java
rc/com/android/gallery3d/filtershow/ui/Spline.java
|
fa07148c9336b520de25acec7aa077e3c7b22427 |
22-Jul-2013 |
ztenghui <ztenghui@google.com> |
Fix saving issues with online image. bug:9468909 Change-Id: I10762dba307999d87fac08b3a2ce7e104264a813
rc/com/android/gallery3d/filtershow/tools/SaveImage.java
|
19b2cd105be71c2fbb7cd662ef068a171e9db799 |
22-Jul-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I1a171eb7d785dd0ca138ba8de5b3a09d2558ebd0 Auto-generated-cl: translation import
es/values-zh-rCN/strings.xml
|
716d5e6bb624451fba8c8e827eb586e036a8444c |
20-Jul-2013 |
nicolasroard <nicolasroard@google.com> |
Merge "Remove FilteringPipeline" into gb-ub-photos-carlsbad
|
76d39416cba8f8fe9f09f3387c324895d72b7afc |
20-Jul-2013 |
nicolasroard <nicolasroard@google.com> |
Merge "Remove FilteringPipeline" into gb-ub-photos-carlsbad
|
9354680b5e2a777244b355dc425faa747e393d2a |
19-Jul-2013 |
nicolasroard <nicolasroard@google.com> |
Remove FilteringPipeline Reorganize things around the filtering service. - add HighresRenderingTask - add RenderingRequestTask - add UpdatePreviewTask Change-Id: I3da34fee8c624fb55311c3e1639857fc1bcdadad
rc/com/android/gallery3d/filtershow/pipeline/HighresRenderingRequestTask.java
|
58019558c7465a8dce8dfb49d68292a296c6b408 |
19-Jul-2013 |
nicolasroard <nicolasroard@google.com> |
Remove FilteringPipeline Reorganize things around the filtering service. - add HighresRenderingTask - add RenderingRequestTask - add UpdatePreviewTask Change-Id: I3da34fee8c624fb55311c3e1639857fc1bcdadad
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/category/Action.java
rc/com/android/gallery3d/filtershow/imageshow/MasterImage.java
rc/com/android/gallery3d/filtershow/pipeline/FilteringPipeline.java
rc/com/android/gallery3d/filtershow/pipeline/HighresRenderingRequestTask.java
rc/com/android/gallery3d/filtershow/pipeline/ProcessingService.java
rc/com/android/gallery3d/filtershow/pipeline/ProcessingTask.java
rc/com/android/gallery3d/filtershow/pipeline/ProcessingTaskController.java
rc/com/android/gallery3d/filtershow/pipeline/RenderingRequest.java
rc/com/android/gallery3d/filtershow/pipeline/RenderingRequestTask.java
rc/com/android/gallery3d/filtershow/pipeline/UpdatePreviewTask.java
|
c19f078c8a65c0b90b1d1b88e6f60f521a54ed1d |
20-Jul-2013 |
ztenghui <ztenghui@google.com> |
Merge "Update Uri instead of removing" into gb-ub-photos-carlsbad
|
d32b92d96ad07f15f6130a8608a67ab96c962a96 |
18-Jul-2013 |
ztenghui <ztenghui@google.com> |
Update Uri instead of removing In this way, the processing service can have a better presentation. The cache key now include the file Uri and local abs path if exists. bug:9468909 Change-Id: I0919c09ad26bea2e798c99ad376996547f8f2bf8
rc/com/android/gallery3d/data/ImageCacheRequest.java
rc/com/android/gallery3d/data/ImageCacheService.java
rc/com/android/gallery3d/data/LocalImage.java
rc/com/android/gallery3d/data/LocalVideo.java
rc/com/android/gallery3d/filtershow/tools/SaveImage.java
rc_pd/com/android/gallery3d/util/LightCycleHelper.java
|
3d037cf0bbc35ad1d8906ca2ccf3fca6ba420c8e |
19-Jul-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I9bf4ad76580a5320b45a991f3cbfa0206fae067a Auto-generated-cl: translation import
es/values-nl/strings.xml
|
6798c34ddb5248f038f351674c6a6c7a20992c8c |
17-Jul-2013 |
Angus Kong <shkong@google.com> |
Add stitching manager in Camera. Change-Id: I2f27c2c0e77ed3d618df890e709ca09076591f70
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/ImageTaskManager.java
rc_pd/com/android/camera/PanoramaStitchingManager.java
|
c40c411683da5db1e393e2172a451c3f9c511811 |
18-Jul-2013 |
Angus Kong <shkong@google.com> |
Refine MediaSaveService to use memory limit. Change-Id: Ieeb06eddbd742896ecb7c50f0f51facaa77b2d21
rc/com/android/camera/MediaSaveService.java
|
6e440f6cd97c63c264e5326b6b4796ff24e74d76 |
16-Jul-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Refactoring GeometryMetadata. Bug: 9170644 - First part of multi-step refactor, splits GeometryMetadata functionality into 4 FilterRepresentation subclasses as requested. Change-Id: I212193db8c154f64c550adb9735c0502bcaa7468
rc/com/android/gallery3d/filtershow/filters/FilterCropRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterMirrorRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterRotateRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterStraightenRepresentation.java
rc/com/android/gallery3d/filtershow/pipeline/ImagePreset.java
|
c0d712e074fc38463464516befb7ea145654d21b |
16-Jul-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Refactoring GeometryMetadata. Bug: 9170644 - First part of multi-step refactor, splits GeometryMetadata functionality into 4 FilterRepresentation subclasses as requested. Change-Id: I212193db8c154f64c550adb9735c0502bcaa7468
rc/com/android/gallery3d/filtershow/filters/FilterCropRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterMirrorRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterRotateRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterStraightenRepresentation.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterGeometry.java
rc/com/android/gallery3d/filtershow/imageshow/GeometryMetadata.java
rc/com/android/gallery3d/filtershow/imageshow/ImageCrop.java
rc/com/android/gallery3d/filtershow/imageshow/ImageFlip.java
rc/com/android/gallery3d/filtershow/imageshow/ImageGeometry.java
rc/com/android/gallery3d/filtershow/imageshow/ImageRotate.java
rc/com/android/gallery3d/filtershow/pipeline/ImagePreset.java
|
4264520a6a231d42f65168b07e7e793cda7b1a8d |
16-Jul-2013 |
John Hoford <hoford@google.com> |
remove clone Change-Id: Ia9f4c1778e06416018eeb07be657bcdd0af1496b
rc/com/android/gallery3d/filtershow/filters/BaseFiltersManager.java
rc/com/android/gallery3d/filtershow/filters/FilterBasicRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterColorBorderRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterCurvesRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterDirectRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterDrawRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterFxRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterImageBorderRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterPointRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterRedEyeRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterTinyPlanetRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterVignetteRepresentation.java
rc/com/android/gallery3d/filtershow/history/HistoryItem.java
rc/com/android/gallery3d/filtershow/imageshow/GeometryMetadata.java
rc/com/android/gallery3d/filtershow/pipeline/ImagePreset.java
|
b1d3cca173277658c1906477af6582e573d5d98c |
16-Jul-2013 |
John Hoford <hoford@google.com> |
remove clone Change-Id: Ia9f4c1778e06416018eeb07be657bcdd0af1496b
rc/com/android/gallery3d/filtershow/filters/FilterBasicRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterColorBorderRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterCurvesRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterDirectRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterDrawRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterFxRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterImageBorderRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterPointRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterRedEyeRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterTinyPlanetRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterVignetteRepresentation.java
rc/com/android/gallery3d/filtershow/pipeline/ImagePreset.java
|
9b799fa7ccb6c5c926d13c7265af621b9eca3b33 |
13-Jul-2013 |
John Hoford <hoford@google.com> |
fix restoring frames Change-Id: I77a75f3feb8a1affdb579e3c7b196928af1b2bf0
rc_pd/com/android/gallery3d/filtershow/filters/FiltersManager.java
|
2b03b4a2f07d022cf82f8b229cc066a33abb0ea5 |
17-Jul-2013 |
John Reck <jreck@google.com> |
Fix help for GalleryGoogle builds Bug: 9886976 Change-Id: I23fc78b924f3757f8ab12f84d3a0c97c1adc2333 (cherry picked from commit 7a43c8c3b85d6f9162651d8ed8b3a11a87490824)
es/values/strings.xml
rc/com/android/gallery3d/app/AlbumSetPage.java
rc/com/android/gallery3d/util/HelpUtils.java
rc_pd/com/android/gallery3d/util/HelpUtils.java
|
6380a393458e362f35b6e6e25a0734c719face92 |
17-Jul-2013 |
John Reck <jreck@google.com> |
Fix help for GalleryGoogle builds Bug: 9886976 Change-Id: I23fc78b924f3757f8ab12f84d3a0c97c1adc2333 (cherry picked from commit 7a43c8c3b85d6f9162651d8ed8b3a11a87490824)
es/values/strings.xml
|
720ff62d92f678a86c650ed580c6b27523bb82a9 |
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/gallery3d/app/AlbumSetPage.java
rc/com/android/gallery3d/util/HelpUtils.java
rc_pd/com/android/gallery3d/util/HelpUtils.java
|
6c6317bb7472386c4088bcae729a0d0007404dec |
13-Jul-2013 |
nicolasroard <nicolasroard@google.com> |
Add background processing service bug:7298624 Change-Id: Ie79f88fd84fdf8f4dab6a8071f06a819e247b357
ndroidManifest.xml
|
6cc4a04a9c8548bd8fc3bd978aa629dc6767674b |
13-Jul-2013 |
nicolasroard <nicolasroard@google.com> |
Add background processing service bug:7298624 Change-Id: Ie79f88fd84fdf8f4dab6a8071f06a819e247b357
es/values/filtershow_strings.xml
rc/com/android/gallery3d/filtershow/pipeline/ImagePreset.java
|
cf76723e40171afef891d494d4c537200597acbb |
13-Jul-2013 |
nicolasroard <nicolasroard@google.com> |
Add background processing service bug:7298624 Change-Id: Ie79f88fd84fdf8f4dab6a8071f06a819e247b357
rc/com/android/gallery3d/data/LocalImage.java
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/cache/ImageLoader.java
rc/com/android/gallery3d/filtershow/crop/CropActivity.java
rc/com/android/gallery3d/filtershow/filters/BaseFiltersManager.java
rc/com/android/gallery3d/filtershow/imageshow/ImageShow.java
rc/com/android/gallery3d/filtershow/imageshow/MasterImage.java
rc/com/android/gallery3d/filtershow/pipeline/CachingPipeline.java
rc/com/android/gallery3d/filtershow/pipeline/FilteringPipeline.java
rc/com/android/gallery3d/filtershow/pipeline/ImagePreset.java
rc/com/android/gallery3d/filtershow/pipeline/ImageSavingTask.java
rc/com/android/gallery3d/filtershow/pipeline/ProcessingService.java
rc/com/android/gallery3d/filtershow/pipeline/ProcessingTask.java
rc/com/android/gallery3d/filtershow/pipeline/ProcessingTaskController.java
rc/com/android/gallery3d/filtershow/tools/SaveCopyTask.java
rc/com/android/gallery3d/filtershow/tools/SaveImage.java
rc/com/android/gallery3d/util/SaveVideoFileUtils.java
rc_pd/com/android/gallery3d/filtershow/filters/FiltersManager.java
|
6d13e422b2ca68dce029c96e3b8789bae990a88c |
16-Jul-2013 |
ztenghui <ztenghui@google.com> |
Merge "Add equality check into FilterCurveRep" into gb-ub-photos-carlsbad
|
03d68bcae788b843b264594a5ad0b3f4a99d2dcf |
16-Jul-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE"
|
4e7deb5f4f56ca570858c10c5614ca8083f4b6ed |
16-Jul-2013 |
Angus Kong <shkong@google.com> |
Merge "Remove unnecessary startPreview thread in video." into gb-ub-photos-carlsbad
|
395ee2d6d3c8fa9e16363517dc9e8afc8cbd609e |
15-Jul-2013 |
Angus Kong <shkong@google.com> |
Remove unnecessary startPreview thread in video. Change-Id: I42dc46748fad3b321178280069555ecdd5c4a962
rc/com/android/camera/VideoController.java
rc/com/android/camera/VideoModule.java
rc/com/android/camera/VideoUI.java
|
36cf7a9bbd856063eaf5779e05ae75645a458226 |
16-Jul-2013 |
ztenghui <ztenghui@google.com> |
Add equality check into FilterCurveRep Consequently add equality check support in Spline and ControlPoint. bug:9468909 Change-Id: I8078b994beac4056ca92e76da0e15d618389e56e
rc/com/android/gallery3d/filtershow/filters/FilterCurvesRepresentation.java
|
9448b353e8cb1936fb62262b8c4962cfd3765bab |
16-Jul-2013 |
ztenghui <ztenghui@google.com> |
Add equality check into FilterCurveRep Consequently add equality check support in Spline and ControlPoint. bug:9468909 Change-Id: I8078b994beac4056ca92e76da0e15d618389e56e
rc/com/android/gallery3d/filtershow/filters/FilterCurvesRepresentation.java
rc/com/android/gallery3d/filtershow/imageshow/MasterImage.java
rc/com/android/gallery3d/filtershow/ui/ControlPoint.java
rc/com/android/gallery3d/filtershow/ui/Spline.java
|
d4d6505a75371dbfac01beaa2059e0b2075e990f |
15-Jul-2013 |
ztenghui <ztenghui@google.com> |
FilterDirectRepresentation always should be considered as has modification. Therefore isNil should be false. bug:9468909 Change-Id: I9946d060e7a1c73b6dc27c73d8f3b7986343de98
rc/com/android/gallery3d/filtershow/filters/FilterDirectRepresentation.java
|
b7f5b39dee010424b1d57257b728255c0bf334f2 |
15-Jul-2013 |
ztenghui <ztenghui@google.com> |
FilterDirectRepresentation always should be considered as has modification. Therefore isNil should be false. bug:9468909 Change-Id: I9946d060e7a1c73b6dc27c73d8f3b7986343de98
rc/com/android/gallery3d/filtershow/filters/FilterDirectRepresentation.java
|
fdac33b9e82dc3806d8ea352e33648f5780d7023 |
15-Jul-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I887b7382a447d3ebba208bb5764669b455d61950 Auto-generated-cl: translation import
es/values-de/filtershow_strings.xml
|
bb7306bc0f8dfdd125408ab2ccc56ff4204c6b6f |
15-Jul-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Idcdf1cc493433b6beb16edb2e0c10be56737ad80 Auto-generated-cl: translation import
es/values-in/strings.xml
|
0dca1b590f4cae2fe42afc9245f1a8ea81f9e6d3 |
13-Jul-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Combine ImageLoader and CropLoader utility classes. Bug: 9356969 Bug: 9170644 - Refactor to eliminate code duplication in image loading classes. - Fix bugs caused by the inability to determine MIME types for images that aren't in Gallery's content provider (causes b/9356969). Change-Id: I30c2ba5c0cd37aac624681a2cec9abddaa78f9c2
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/cache/ImageLoader.java
rc/com/android/gallery3d/filtershow/crop/CropActivity.java
rc/com/android/gallery3d/filtershow/crop/CropLoader.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterDraw.java
rc/com/android/gallery3d/filtershow/imageshow/ImageShow.java
rc/com/android/gallery3d/filtershow/imageshow/MasterImage.java
rc/com/android/gallery3d/filtershow/tools/SaveCopyTask.java
|
2212065e2de9ec6a2a105218a693a48145e9bfb6 |
12-Jul-2013 |
Doris Liu <tianliu@google.com> |
Merge "Use ValueAnimator to ensure callbacks get called" into gb-ub-photos-carlsbad
|
1b9362e03c56e98a27879a15b9d133f1e50fc4d4 |
12-Jul-2013 |
Doris Liu <tianliu@google.com> |
Use ValueAnimator to ensure callbacks get called Bug: 9597743 Change-Id: I6b119bb7a6f8bbba76ccc09c28293eb7b5a0457e
rc/com/android/camera/ui/PieRenderer.java
|
667ca48ff51a57443b00ef8b9b52a75b98353a00 |
12-Jul-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE"
|
4b1935cdecda5fd02955b4529daf828a4353e664 |
29-Jun-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Added jpeg streaming classes. - Provides streaming operations for decompressing/compressing JPEG files. - Allows pixel operations to be performed on large JPEG images without holding the entire bitmap in memory. Change-Id: I597ddf282b59d2ba6d6bca4722208121e3728f94
ndroid.mk
ni_jpegstream/Android.mk
|
3d5d54874f1c1e0a0f60899a4d7c45c517e087a3 |
29-Jun-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Added jpeg streaming classes. - Provides streaming operations for decompressing/compressing JPEG files. - Allows pixel operations to be performed on large JPEG images without holding the entire bitmap in memory. Change-Id: I597ddf282b59d2ba6d6bca4722208121e3728f94
ni_jpegstream/Android.mk
ni_jpegstream/src/error_codes.h
ni_jpegstream/src/inputstream_wrapper.cpp
ni_jpegstream/src/inputstream_wrapper.h
ni_jpegstream/src/jerr_hook.cpp
ni_jpegstream/src/jerr_hook.h
ni_jpegstream/src/jni_defines.h
ni_jpegstream/src/jpeg_config.h
ni_jpegstream/src/jpeg_hook.cpp
ni_jpegstream/src/jpeg_hook.h
ni_jpegstream/src/jpeg_reader.cpp
ni_jpegstream/src/jpeg_reader.h
ni_jpegstream/src/jpeg_writer.cpp
ni_jpegstream/src/jpeg_writer.h
ni_jpegstream/src/jpegstream.cpp
ni_jpegstream/src/outputstream_wrapper.cpp
ni_jpegstream/src/outputstream_wrapper.h
ni_jpegstream/src/stream_wrapper.cpp
ni_jpegstream/src/stream_wrapper.h
|
0a7720cce4068a08a5b9a06cefa537de846fa099 |
29-Jun-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Added jpeg streaming classes. - Provides streaming operations for decompressing/compressing JPEG files. - Allows pixel operations to be performed on large JPEG images without holding the entire bitmap in memory. Change-Id: I597ddf282b59d2ba6d6bca4722208121e3728f94
ni_jpegstream/Android.mk
ni_jpegstream/src/error_codes.h
ni_jpegstream/src/inputstream_wrapper.cpp
ni_jpegstream/src/inputstream_wrapper.h
ni_jpegstream/src/jerr_hook.cpp
ni_jpegstream/src/jerr_hook.h
ni_jpegstream/src/jni_defines.h
ni_jpegstream/src/jpeg_config.h
ni_jpegstream/src/jpeg_hook.cpp
ni_jpegstream/src/jpeg_hook.h
ni_jpegstream/src/jpeg_reader.cpp
ni_jpegstream/src/jpeg_reader.h
ni_jpegstream/src/jpeg_writer.cpp
ni_jpegstream/src/jpeg_writer.h
ni_jpegstream/src/jpegstream.cpp
ni_jpegstream/src/outputstream_wrapper.cpp
ni_jpegstream/src/outputstream_wrapper.h
ni_jpegstream/src/stream_wrapper.cpp
ni_jpegstream/src/stream_wrapper.h
|
3d2e8d6d7ba018355c79b5a8b0ee40e633931b32 |
29-Jun-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Added jpeg streaming classes. - Provides streaming operations for decompressing/compressing JPEG files. - Allows pixel operations to be performed on large JPEG images without holding the entire bitmap in memory. Change-Id: I597ddf282b59d2ba6d6bca4722208121e3728f94
allerycommon/src/com/android/gallery3d/jpegstream/JPEGInputStream.java
allerycommon/src/com/android/gallery3d/jpegstream/JPEGOutputStream.java
allerycommon/src/com/android/gallery3d/jpegstream/JpegConfig.java
allerycommon/src/com/android/gallery3d/jpegstream/StreamUtils.java
|
a89aa4bc9d5f7d1eeb31edb619d7f738723d7107 |
29-Jun-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Added jpeg streaming classes. - Provides streaming operations for decompressing/compressing JPEG files. - Allows pixel operations to be performed on large JPEG images without holding the entire bitmap in memory. Change-Id: I597ddf282b59d2ba6d6bca4722208121e3728f94
roguard.flags
|
bffb4a0c64c857e3b2cc595a604cfadf8837c5f8 |
29-Jun-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Added jpeg streaming classes. - Provides streaming operations for decompressing/compressing JPEG files. - Allows pixel operations to be performed on large JPEG images without holding the entire bitmap in memory. Change-Id: I597ddf282b59d2ba6d6bca4722208121e3728f94
ests/AndroidManifest.xml
|
ade3402307dcbd39a6475f6c98860ce359fc4fbf |
29-Jun-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Added jpeg streaming classes. - Provides streaming operations for decompressing/compressing JPEG files. - Allows pixel operations to be performed on large JPEG images without holding the entire bitmap in memory. Change-Id: I597ddf282b59d2ba6d6bca4722208121e3728f94
ests/res/raw/jpeg_control.jpg
|
8d8d5cf2943da78ca5f84d1729b081312c031e6a |
29-Jun-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Added jpeg streaming classes. - Provides streaming operations for decompressing/compressing JPEG files. - Allows pixel operations to be performed on large JPEG images without holding the entire bitmap in memory. Change-Id: I597ddf282b59d2ba6d6bca4722208121e3728f94
allerycommon/src/com/android/gallery3d/jpegstream/JPEGInputStream.java
allerycommon/src/com/android/gallery3d/jpegstream/JPEGOutputStream.java
allerycommon/src/com/android/gallery3d/jpegstream/JpegConfig.java
allerycommon/src/com/android/gallery3d/jpegstream/StreamUtils.java
ni_jpegstream/src/error_codes.h
ni_jpegstream/src/inputstream_wrapper.cpp
ni_jpegstream/src/inputstream_wrapper.h
ni_jpegstream/src/jerr_hook.cpp
ni_jpegstream/src/jerr_hook.h
ni_jpegstream/src/jni_defines.h
ni_jpegstream/src/jpeg_config.h
ni_jpegstream/src/jpeg_hook.cpp
ni_jpegstream/src/jpeg_hook.h
ni_jpegstream/src/jpeg_reader.cpp
ni_jpegstream/src/jpeg_reader.h
ni_jpegstream/src/jpeg_writer.cpp
ni_jpegstream/src/jpeg_writer.h
ni_jpegstream/src/jpegstream.cpp
ni_jpegstream/src/outputstream_wrapper.cpp
ni_jpegstream/src/outputstream_wrapper.h
ni_jpegstream/src/stream_wrapper.cpp
ni_jpegstream/src/stream_wrapper.h
ests/src/com/android/gallery3d/jpegstream/JpegStreamReaderTest.java
ests/src/com/android/gallery3d/jpegstream/JpegStreamTestCase.java
ests/src/com/android/gallery3d/jpegstream/JpegStreamTestRunner.java
ests/src/com/android/gallery3d/jpegstream/JpegStreamWriterTest.java
|
ec8f9757b1df34c32719c3dc38749f27ca95ef22 |
11-Jul-2013 |
The Android Open Source Project <initial-contribution@android.com> |
am f6167c87: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge * commit 'f6167c87682c118f64f220d7f09da6c4bd766fda':
|
96b4c48233dc809e111f39a1e101a65f57a190ac |
11-Jul-2013 |
Doris Liu <tianliu@google.com> |
am 85695457: am ee14cce0: am e8e2610f: Fix preview thumb and touch target out of sync * commit '85695457ba745d0b22e565c80816a39c4cc0d528': Fix preview thumb and touch target out of sync
|
915248a10422454f8c2a21e7d32aae841e4e4dc4 |
11-Jul-2013 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with jb-mr2-zeroday-release - do not merge Change-Id: Iac55adc80b6a38a8e0aadbb9b7de27c7fd7dac2c
|
1b0a964a00cb64573e6732695ffdf899ad08f3ce |
11-Jul-2013 |
The Android Automerger <android-build@google.com> |
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
|
1e7c1d88fb3e04cdb43001fa407daa77e65d3bec |
11-Jul-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I2c70d13dce29e66d8ab095bf5cfc68288d8404c4 Auto-generated-cl: translation import
es/values-am/strings.xml
|
3ea8558300780ca5269d75230f78eadf4100876c |
09-Jul-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Refactoring ImageLoader. - Moves state (history, loadlisteners, bitmaps, etc.) from ImageLoader to MasterImage. - Makes ImageLoader into a utility class. Change-Id: I7a8a988c61848694a86a4b2919bf8f30bfd2be8c
rc/com/android/gallery3d/filtershow/EditorPlaceHolder.java
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/cache/ImageLoader.java
rc/com/android/gallery3d/filtershow/editors/Editor.java
rc/com/android/gallery3d/filtershow/editors/EditorCrop.java
rc/com/android/gallery3d/filtershow/editors/EditorFlip.java
rc/com/android/gallery3d/filtershow/editors/EditorRotate.java
rc/com/android/gallery3d/filtershow/editors/EditorStraighten.java
rc/com/android/gallery3d/filtershow/filters/ImageFilter.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterDownsample.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterDraw.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterTinyPlanet.java
rc/com/android/gallery3d/filtershow/imageshow/GeometryMetadata.java
rc/com/android/gallery3d/filtershow/imageshow/ImageShow.java
rc/com/android/gallery3d/filtershow/imageshow/ImageVignette.java
rc/com/android/gallery3d/filtershow/imageshow/MasterImage.java
rc/com/android/gallery3d/filtershow/pipeline/CachingPipeline.java
rc/com/android/gallery3d/filtershow/pipeline/FilteringPipeline.java
rc/com/android/gallery3d/filtershow/pipeline/ImagePreset.java
rc/com/android/gallery3d/filtershow/pipeline/RenderingRequest.java
|
160d5e9c8440b73e6bc54a0f113b3e8db7a671c3 |
09-Jul-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Refactoring ImageLoader. - Moves state (history, loadlisteners, bitmaps, etc.) from ImageLoader to MasterImage. - Makes ImageLoader into a utility class. Change-Id: I7a8a988c61848694a86a4b2919bf8f30bfd2be8c
rc/com/android/gallery3d/filtershow/pipeline/ImagePreset.java
|
9bba45787308782a8e4c2edae4b754f9537605d0 |
11-Jul-2013 |
nicolasroard <nicolasroard@google.com> |
Fix selection in categories Change-Id: Ica9ff5ba4a6d195f8b1ea1a686e9bbc6772d655f
rc/com/android/gallery3d/filtershow/category/CategoryAdapter.java
rc/com/android/gallery3d/filtershow/category/CategoryPanel.java
|
3fa5bfbdbb0c38c342fcf1a31d1285f4345710ce |
11-Jul-2013 |
nicolasroard <nicolasroard@google.com> |
Fix state panel Labels were not reflecting looks changes bug:9746512 Change-Id: Ia2dd2a760f38dbd48c8a4d43e3d46ee2b875771f
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/imageshow/MasterImage.java
rc/com/android/gallery3d/filtershow/state/State.java
|
779ff7e582a41cdbd8a678feabcc7f866606ce14 |
10-Jul-2013 |
Doris Liu <tianliu@google.com> |
am ee14cce0: am e8e2610f: Fix preview thumb and touch target out of sync * commit 'ee14cce054c74c3eb785de3ea4936c75bb753b6b': Fix preview thumb and touch target out of sync
|
7bea384b32371b444f46ebb8835873a116f2febf |
10-Jul-2013 |
Doris Liu <tianliu@google.com> |
am e8e2610f: Fix preview thumb and touch target out of sync * commit 'e8e2610f112103e77ffc4b583a752302921131d6': Fix preview thumb and touch target out of sync
|
b09a9f6f62cbc757bae5b01a4c1410f614b26f01 |
09-Jul-2013 |
Doris Liu <tianliu@google.com> |
Fix preview thumb and touch target out of sync Also ensure video module respects system orientation lock Bug: 9626888 Change-Id: I4d7406c37878446e65d0ad1de3bc6b300acb1b23 (cherry picked from commit dfc939b80f45d969a44caca4bd397ab0828c562d)
rc/com/android/camera/Util.java
rc/com/android/camera/VideoModule.java
|
b477b42906a3f8b299ddaeede3940e6344fb6825 |
09-Jul-2013 |
Angus Kong <shkong@google.com> |
Measure children after the dimension is determined. Also, the setMeasuredDimension() in onMeasure() is not necessary as we already called super. bug:9680271 Change-Id: I639454e515edb3027c9e79347d2124a1fcaa529b
rc/com/android/camera/ui/FilmStripView.java
|
2df730a94ed98f7e3a264fd765ae1b36bfa6e462 |
03-Jul-2013 |
nicolasroard <nicolasroard@google.com> |
Remove FilterIconButton Change-Id: Ie1d7c4e8d3f397323f702eba2809f2589b8071f0
es/layout/filtericonbutton.xml
|
7fef4963161ddc60472b6414be0b3d57744deb6b |
03-Jul-2013 |
nicolasroard <nicolasroard@google.com> |
Remove FilterIconButton Change-Id: Ie1d7c4e8d3f397323f702eba2809f2589b8071f0
rc/com/android/gallery3d/filtershow/category/CategoryAdapter.java
rc/com/android/gallery3d/filtershow/ui/FilterIconButton.java
rc/com/android/gallery3d/filtershow/ui/IconButton.java
|
d77e55a4bf326b4bfc1f3880f24d068cb79af1ce |
03-Jul-2013 |
nicolasroard <nicolasroard@google.com> |
Merge "Improves portrait categories buttons" into gb-ub-photos-carlsbad
|
e38c1a93d3987375bb49f057cba396fd667b59be |
03-Jul-2013 |
nicolasroard <nicolasroard@google.com> |
Improves portrait categories buttons - use only CategoryView, no FilterIconButton - add xml values for the font size/margins - for now reuse the same Action bitmap - add accessibility contentDescription Change-Id: Ic1ae8015abba27bea0b3c4a2bccbd1a7c9ff4731
es/values-large/filtershow_values.xml
es/values-xlarge/filtershow_values.xml
es/values/filtershow_values.xml
|
bacd1788f3e966bf78c5fb34e481b25797e2ad42 |
03-Jul-2013 |
nicolasroard <nicolasroard@google.com> |
Improves portrait categories buttons - use only CategoryView, no FilterIconButton - add xml values for the font size/margins - for now reuse the same Action bitmap - add accessibility contentDescription Change-Id: Ic1ae8015abba27bea0b3c4a2bccbd1a7c9ff4731
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/category/Action.java
rc/com/android/gallery3d/filtershow/category/CategoryAdapter.java
rc/com/android/gallery3d/filtershow/category/CategoryPanel.java
rc/com/android/gallery3d/filtershow/category/CategoryView.java
|
67bf67eafefeda59bb0d2db8e048a5b989076850 |
28-Jun-2013 |
ztenghui <ztenghui@google.com> |
Try to restore the original file instead of copying when appropiate. bug:9468909 Change-Id: I09ac244459389b0fdf6f64a79987c176ba8756d8
rc/com/android/gallery3d/filtershow/tools/SaveCopyTask.java
|
7edd7ad47a0476994f3c0e92a6b4f12e6ec5e650 |
03-Jul-2013 |
nicolasroard <nicolasroard@google.com> |
Move classes to pipeline package Change-Id: I9d664537d845d9daeb352c8006d0296a3f546dca
rc/com/android/gallery3d/filtershow/pipeline/ImagePreset.java
rc/com/android/gallery3d/filtershow/pipeline/SharedPreset.java
rc/com/android/gallery3d/filtershow/presets/FilterEnvironment.java
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
rc/com/android/gallery3d/filtershow/presets/PipelineInterface.java
rc/com/android/gallery3d/filtershow/tools/XmpPresets.java
|
f51cdda5060a742863d0d74d57040d48d9ab394d |
03-Jul-2013 |
nicolasroard <nicolasroard@google.com> |
Move classes to pipeline package Change-Id: I9d664537d845d9daeb352c8006d0296a3f546dca
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/cache/CachingPipeline.java
rc/com/android/gallery3d/filtershow/cache/FilteringPipeline.java
rc/com/android/gallery3d/filtershow/cache/ImageLoader.java
rc/com/android/gallery3d/filtershow/cache/RenderingRequest.java
rc/com/android/gallery3d/filtershow/cache/RenderingRequestCaller.java
rc/com/android/gallery3d/filtershow/category/Action.java
rc/com/android/gallery3d/filtershow/category/CategoryAdapter.java
rc/com/android/gallery3d/filtershow/controller/BasicParameterStyle.java
rc/com/android/gallery3d/filtershow/controller/FilterView.java
rc/com/android/gallery3d/filtershow/controller/ParameterStyles.java
rc/com/android/gallery3d/filtershow/controller/StyleChooser.java
rc/com/android/gallery3d/filtershow/editors/Editor.java
rc/com/android/gallery3d/filtershow/filters/BaseFiltersManager.java
rc/com/android/gallery3d/filtershow/filters/ImageFilter.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterDraw.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterRS.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterTinyPlanet.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterVignette.java
rc/com/android/gallery3d/filtershow/history/HistoryItem.java
rc/com/android/gallery3d/filtershow/imageshow/ImageGeometry.java
rc/com/android/gallery3d/filtershow/imageshow/ImageShow.java
rc/com/android/gallery3d/filtershow/imageshow/MasterImage.java
rc/com/android/gallery3d/filtershow/pipeline/Buffer.java
rc/com/android/gallery3d/filtershow/pipeline/CachingPipeline.java
rc/com/android/gallery3d/filtershow/pipeline/FilterEnvironment.java
rc/com/android/gallery3d/filtershow/pipeline/FilteringPipeline.java
rc/com/android/gallery3d/filtershow/pipeline/ImagePreset.java
rc/com/android/gallery3d/filtershow/pipeline/PipelineInterface.java
rc/com/android/gallery3d/filtershow/pipeline/RenderingRequest.java
rc/com/android/gallery3d/filtershow/pipeline/RenderingRequestCaller.java
rc/com/android/gallery3d/filtershow/pipeline/SharedPreset.java
rc/com/android/gallery3d/filtershow/presets/FilterEnvironment.java
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
rc/com/android/gallery3d/filtershow/presets/PipelineInterface.java
rc/com/android/gallery3d/filtershow/tools/SaveCopyTask.java
rc/com/android/gallery3d/filtershow/tools/XmpPresets.java
rc/com/android/gallery3d/filtershow/ui/FilterIconButton.java
rc/com/android/gallery3d/filtershow/ui/ImageCurves.java
|
68ff24597aa829f4ef4d9bd1ab21c3ff9e42f217 |
03-Jul-2013 |
nicolasroard <nicolasroard@google.com> |
Fix crash in geometry Change-Id: I4c9292b539643f2e2738d788dcb58f0a129254f9
rc/com/android/gallery3d/filtershow/editors/Editor.java
|
68ce09f03fdf73c48295d3d2b6615b21d72b1399 |
03-Jul-2013 |
nicolasroard <nicolasroard@google.com> |
Speed up load times Compute the small res image on the fly Load the high res preview image after first load Change-Id: Icc556c2204cb4fd25766d90064a5756c877b11cc
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/cache/CachingPipeline.java
rc/com/android/gallery3d/filtershow/cache/FilteringPipeline.java
rc/com/android/gallery3d/filtershow/cache/ImageLoader.java
|
a337253c886df37f37341c4cd7b708bfcdee4a9d |
02-Jul-2013 |
nicolasroard <nicolasroard@google.com> |
Add stop check in ImageFilterFX speed up switching / interrupting of rendering. Change-Id: I3ef4b1d16047b00a062c86d72cdfff2bfe9817a2
ni/filters/fx.c
|
dbc7b1ebe939d68cbc7f01878e038ca3e9c35f89 |
02-Jul-2013 |
nicolasroard <nicolasroard@google.com> |
Add stop check in ImageFilterFX speed up switching / interrupting of rendering. Change-Id: I3ef4b1d16047b00a062c86d72cdfff2bfe9817a2
rc/com/android/gallery3d/filtershow/filters/IconUtilities.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterFx.java
|
e6af6d79fdaebcf566f9281ed6a29778d284dc42 |
02-Jul-2013 |
nicolasroard <nicolasroard@google.com> |
Merge "Pipeline refactoring" into gb-ub-photos-carlsbad
|
e383e8e55a8caac5dca7292aeb336f4fa607758f |
02-Jul-2013 |
nicolasroard <nicolasroard@google.com> |
Pipeline refactoring Remove the temp representations and instead use a triple buffer for ImagePresets. Change-Id: I4cdcfbe4941af72b38fe42385085ff4a20eb78cc
rc/com/android/gallery3d/filtershow/filters/FilterRepresentation.java
rc/com/android/gallery3d/filtershow/pipeline/SharedPreset.java
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
|
f1f0d01da7742d46a546176081b441bdd23378f6 |
02-Jul-2013 |
nicolasroard <nicolasroard@google.com> |
Pipeline refactoring Remove the temp representations and instead use a triple buffer for ImagePresets. Change-Id: I4cdcfbe4941af72b38fe42385085ff4a20eb78cc
rc/com/android/gallery3d/filtershow/cache/CachingPipeline.java
rc/com/android/gallery3d/filtershow/cache/FilteringPipeline.java
rc/com/android/gallery3d/filtershow/filters/FilterRepresentation.java
rc/com/android/gallery3d/filtershow/imageshow/MasterImage.java
rc/com/android/gallery3d/filtershow/pipeline/Buffer.java
rc/com/android/gallery3d/filtershow/pipeline/SharedBuffer.java
rc/com/android/gallery3d/filtershow/pipeline/SharedPreset.java
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
|
6a83d528b09c55ade6ad44b82c81d4476ac57441 |
02-Jul-2013 |
Doris Liu <tianliu@google.com> |
Add in carlsbad: Avoid duplicated location popups Bug: 9505556 Change-Id: I00859d8d851ea3c75d3bda4fcf5df373f06c2ee0
rc/com/android/camera/PhotoController.java
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/PhotoUI.java
|
deaef0458003c802b57dab5ebce36c38083c6708 |
02-Jul-2013 |
nicolasroard <nicolasroard@google.com> |
Pipeline refactoring Add SharedBuffer and Buffer class Change-Id: I823a9520541e3be5321a3deb5e58a358588b6cf3
rc/com/android/gallery3d/filtershow/presets/FilterEnvironment.java
|
a9be5b3d573b1b5511300272fca5b320bdc0aae0 |
02-Jul-2013 |
nicolasroard <nicolasroard@google.com> |
Pipeline refactoring Add SharedBuffer and Buffer class Change-Id: I823a9520541e3be5321a3deb5e58a358588b6cf3
rc/com/android/gallery3d/filtershow/cache/CachingPipeline.java
rc/com/android/gallery3d/filtershow/cache/FilteringPipeline.java
rc/com/android/gallery3d/filtershow/cache/TripleBufferBitmap.java
rc/com/android/gallery3d/filtershow/imageshow/MasterImage.java
rc/com/android/gallery3d/filtershow/pipeline/Buffer.java
rc/com/android/gallery3d/filtershow/pipeline/SharedBuffer.java
rc/com/android/gallery3d/filtershow/presets/FilterEnvironment.java
|
59552e6424a93bf8ba55fa770b7d7a230ea10db9 |
02-Jul-2013 |
ztenghui <ztenghui@google.com> |
Merge "Fix the save button issue." into gb-ub-photos-carlsbad
|
a18a161d3b46152b9114a5005efe8a043286c19d |
02-Jul-2013 |
ztenghui <ztenghui@google.com> |
Merge "Fix the save button issue." into gb-ub-photos-carlsbad
|
1ffd4a20e4b93ff7b54e4c8c8e6d977062ca40bd |
28-Jun-2013 |
ztenghui <ztenghui@google.com> |
Fix the save button issue. When dealing with non Fx filters, the hasModification() really need to go deep to figure out whether things has changed. bug:9468909 Change-Id: I89495f147f7af7c35490def84805aae98e3f917f
rc/com/android/gallery3d/filtershow/filters/FilterRepresentation.java
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
|
2185e9b81380f7e43608419743c983c5afee43c4 |
28-Jun-2013 |
ztenghui <ztenghui@google.com> |
Fix the save button issue. When dealing with non Fx filters, the hasModification() really need to go deep to figure out whether things has changed. bug:9468909 Change-Id: I89495f147f7af7c35490def84805aae98e3f917f
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/filters/FilterRepresentation.java
rc/com/android/gallery3d/filtershow/imageshow/ImageShow.java
rc/com/android/gallery3d/filtershow/imageshow/MasterImage.java
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
|
03f97f549f8b27b770dee5c5199a819fa8603c53 |
01-Jul-2013 |
George Mount <mount@google.com> |
Ensure no account duplicates. Bug 9502314 Add a uniqueness constraint to account name. Change-Id: I1f0607e5ce9b90054b3b98bed1557b223d7e89a7
rc/com/android/photos/data/PhotoDatabase.java
|
cbb45ff9079b4f1ec19f26a1a43fb72e2c179502 |
28-Jun-2013 |
ztenghui <ztenghui@google.com> |
Merge "Add a switch to turn on/off the aux directory saving" into gb-ub-photos-carlsbad
|
59e60d36233f4acd67c4542bf849a0bcfce54adc |
28-Jun-2013 |
ztenghui <ztenghui@google.com> |
Add a switch to turn on/off the aux directory saving bug:9468909 Change-Id: Iaecda20a74a02556d883f0e97250e9ec4d856677
rc/com/android/gallery3d/filtershow/tools/SaveCopyTask.java
|
54d97996e53871b01a49b177960c6c2132da94e2 |
28-Jun-2013 |
John Hoford <hoford@google.com> |
small bug in reading presets Change-Id: I791a8407d72b92f5e46a33c254d44747308b2ba5
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
|
bfb76a89af606e65eb34099d08c27b471f8d1b29 |
28-Jun-2013 |
John Hoford <hoford@google.com> |
small bug in reading presets Change-Id: I791a8407d72b92f5e46a33c254d44747308b2ba5
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
|
39f4ad6d7e663778d74a47c8b25768c4f221fbdc |
27-Jun-2013 |
nicolasroard <nicolasroard@google.com> |
Refactor HistoryAdapter - Remove the adapter part - Rename into HistoryManager Change-Id: I58de5661770f8796882ff4a633aec700bd8bc1a5
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/cache/ImageLoader.java
rc/com/android/gallery3d/filtershow/editors/EditorPanel.java
rc/com/android/gallery3d/filtershow/history/HistoryAdapter.java
rc/com/android/gallery3d/filtershow/history/HistoryManager.java
rc/com/android/gallery3d/filtershow/imageshow/MasterImage.java
|
d9347c858cfb20256dababe51806a38e71651103 |
24-Jun-2013 |
ztenghui <ztenghui@google.com> |
Save button now behaves correctly for filter changes. Basically, save the original filter from the file's XMP. Compare the current filter against original one to decide whether or not the file has been modified and needed to be saved. At the same time, make sure we don't save "None" filter in the ImagePreset. bug:9468909 Change-Id: I5b86ab95556b6b010367c9577b02c0bb42ffb824
rc/com/android/gallery3d/filtershow/filters/FilterRepresentation.java
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
|
dfaf4c5b5b901dbbd4904fd86995b71f4acfd47c |
24-Jun-2013 |
ztenghui <ztenghui@google.com> |
Save button now behaves correctly for filter changes. Basically, save the original filter from the file's XMP. Compare the current filter against original one to decide whether or not the file has been modified and needed to be saved. At the same time, make sure we don't save "None" filter in the ImagePreset. bug:9468909 Change-Id: I5b86ab95556b6b010367c9577b02c0bb42ffb824
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/filters/FilterRepresentation.java
rc/com/android/gallery3d/filtershow/imageshow/ImageShow.java
rc/com/android/gallery3d/filtershow/imageshow/MasterImage.java
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
|
83b16cf2b02773370e00d3659e201efff20d788d |
27-Jun-2013 |
nicolasroard <nicolasroard@google.com> |
Move history classes to their own package Change-Id: Ib4f50c56b445788cad3b973673008d8a89244867
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/HistoryAdapter.java
rc/com/android/gallery3d/filtershow/HistoryItem.java
rc/com/android/gallery3d/filtershow/cache/ImageLoader.java
rc/com/android/gallery3d/filtershow/editors/EditorPanel.java
rc/com/android/gallery3d/filtershow/history/HistoryAdapter.java
rc/com/android/gallery3d/filtershow/history/HistoryItem.java
rc/com/android/gallery3d/filtershow/imageshow/ImageGeometry.java
rc/com/android/gallery3d/filtershow/imageshow/MasterImage.java
|
c75824ac1422e011cb001abc25560aba97d56254 |
26-Jun-2013 |
nicolasroard <nicolasroard@google.com> |
Fix selected frame in looks and borders Change-Id: Id1839a028f3044929043d7c910df30a1fcabdda1
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
|
56a4e82931ea5eccfd4212c7a5cec0fa1d154aae |
26-Jun-2013 |
nicolasroard <nicolasroard@google.com> |
Fix selected frame in looks and borders Change-Id: Id1839a028f3044929043d7c910df30a1fcabdda1
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/category/CategoryAdapter.java
rc/com/android/gallery3d/filtershow/category/CategoryPanel.java
rc/com/android/gallery3d/filtershow/category/CategoryTrack.java
rc/com/android/gallery3d/filtershow/category/CategoryView.java
rc/com/android/gallery3d/filtershow/imageshow/MasterImage.java
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
|
39514477043be950bea702f8b7a6ff2618970988 |
27-Jun-2013 |
Bart Sears <bsears@google.com> |
Bump up the version number to 1.1.40030 Change-Id: I391e9515e50ec9d61855f4e939b4033dad648ac5
ndroidManifest.xml
|
b270df4d01b459d445bd861c8cea52cdf90ed441 |
27-Jun-2013 |
nicolasroard <nicolasroard@google.com> |
ImagePreset cleanup Get rid of remaining ivars related to history Change-Id: Ic106ef6a96f4727c6dd46d7be3d059bdc42e5a2a
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
|
06ed7651d1022d7649de94265f1a382feb791084 |
27-Jun-2013 |
nicolasroard <nicolasroard@google.com> |
ImagePreset cleanup Get rid of remaining ivars related to history Change-Id: Ic106ef6a96f4727c6dd46d7be3d059bdc42e5a2a
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/HistoryAdapter.java
rc/com/android/gallery3d/filtershow/HistoryItem.java
rc/com/android/gallery3d/filtershow/cache/CachingPipeline.java
rc/com/android/gallery3d/filtershow/category/CategoryAdapter.java
rc/com/android/gallery3d/filtershow/imageshow/ImageCrop.java
rc/com/android/gallery3d/filtershow/imageshow/ImageFlip.java
rc/com/android/gallery3d/filtershow/imageshow/ImageGeometry.java
rc/com/android/gallery3d/filtershow/imageshow/ImageRotate.java
rc/com/android/gallery3d/filtershow/imageshow/ImageStraighten.java
rc/com/android/gallery3d/filtershow/imageshow/MasterImage.java
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
|
38afc164c9df332dd3789a924db577b67758e673 |
27-Jun-2013 |
John Hoford <hoford@google.com> |
fix icon repaint on simple load Change-Id: I841475949e67b63fd3d24a2267fda9f2e450898d
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
|
d9b2355e1e11c6f7248c902a419a36c99e6bb58c |
27-Jun-2013 |
John Hoford <hoford@google.com> |
Merge "support non destructive edits of Curves" into gb-ub-photos-carlsbad
|
47b0417a6cd824e8bf153ad905d679cec24c447a |
27-Jun-2013 |
John Hoford <hoford@google.com> |
Merge "support non destructive edits of Curves" into gb-ub-photos-carlsbad
|
9bbe5ad57e60c0c33d64cd0a415b9506940c3c25 |
27-Jun-2013 |
nicolasroard <nicolasroard@google.com> |
Fix tot Change-Id: I75b28ac56f9c3b295280690078f5c854fda7eb66
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
|
58571d95c24053bb816fe4c8fbc4dd634612dd20 |
27-Jun-2013 |
nicolasroard <nicolasroard@google.com> |
Fix tot Change-Id: I75b28ac56f9c3b295280690078f5c854fda7eb66
rc/com/android/gallery3d/filtershow/imageshow/ImageGeometry.java
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
|
e89458e7d8b78cb3eb8d5299c50e6075131b09ef |
25-Jun-2013 |
John Hoford <hoford@google.com> |
support non destructive edits of Curves Change-Id: I597be6570a17072a4116bf6227a6a35796266bc3
rc/com/android/gallery3d/filtershow/filters/FilterCurvesRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterRepresentation.java
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
|
ca0ecc627396c69bf21f6fae5b1e6b1ac3ea36d9 |
25-Jun-2013 |
John Hoford <hoford@google.com> |
support non destructive edits of Curves Change-Id: I597be6570a17072a4116bf6227a6a35796266bc3
rc/com/android/gallery3d/filtershow/filters/FilterCurvesRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterRepresentation.java
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
|
a36b22bc0948e9d558789cfd16026601ea836f65 |
27-Jun-2013 |
nicolasroard <nicolasroard@google.com> |
Merge "Cleanup in ImagePreset" into gb-ub-photos-carlsbad
|
c06530222740afc65813a798dfdc5941b81d623c |
27-Jun-2013 |
nicolasroard <nicolasroard@google.com> |
Merge "Cleanup in ImagePreset" into gb-ub-photos-carlsbad
|
750c6d5f73b408db68e00181cd4d9564e180f14a |
26-Jun-2013 |
nicolasroard <nicolasroard@google.com> |
Cleanup in ImagePreset Move GeometryMetadata to the list of filters Change-Id: I0bef13ca0d9cb41e68eddd108000ff7bd426b313
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
|
977489b60c2375cd084a481e03c9878c03e6b077 |
26-Jun-2013 |
nicolasroard <nicolasroard@google.com> |
Cleanup in ImagePreset Move GeometryMetadata to the list of filters Change-Id: I0bef13ca0d9cb41e68eddd108000ff7bd426b313
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/filters/ImageFilter.java
rc/com/android/gallery3d/filtershow/imageshow/GeometryMetadata.java
rc/com/android/gallery3d/filtershow/imageshow/ImageShow.java
rc/com/android/gallery3d/filtershow/imageshow/MasterImage.java
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
rc/com/android/gallery3d/filtershow/ui/FilterIconButton.java
|
12087a11e9ea0114ab97d93f0225a5905abbe036 |
26-Jun-2013 |
Michael Kolb <kolby@google.com> |
Merge "Clean up PreviewGestures" into gb-ub-photos-carlsbad
|
3b524fa21f72f5f26e3b417b66364d2fbc68850c |
26-Jun-2013 |
Michael Kolb <kolby@google.com> |
Merge "Clean up PreviewGestures" into gb-ub-photos-carlsbad
|
fb8e45221fc2cb06f080cf94f20be1edd71598e3 |
26-Jun-2013 |
Michael Kolb <kolby@google.com> |
Clean up PreviewGestures - remove dead code and state - fix zoom only mode during video recording Change-Id: I2238f99b9823ba091d300046d07448c67bc2ad78
rc/com/android/camera/PreviewGestures.java
|
a77d6e06ce32eaaa123922a448173f3d12e6ac9d |
26-Jun-2013 |
Michael Kolb <kolby@google.com> |
Clean up PreviewGestures - remove dead code and state - fix zoom only mode during video recording Change-Id: I2238f99b9823ba091d300046d07448c67bc2ad78
rc/com/android/camera/PreviewGestures.java
rc/com/android/camera/VideoUI.java
|
d50917a24eb71375d491bb7f410e285648ff4c63 |
26-Jun-2013 |
ztenghui <ztenghui@google.com> |
Merge "Fix ambiguous naming and typo" into gb-ub-photos-carlsbad
|
3be6f26ab847dfd336fb4de58a00d8dac081ebd1 |
26-Jun-2013 |
ztenghui <ztenghui@google.com> |
Merge "Fix ambiguous naming and typo" into gb-ub-photos-carlsbad
|
30e5b372e3f573d9ea339cc9c01657deae36a834 |
26-Jun-2013 |
Angus Kong <shkong@google.com> |
Merge "Add fullscreen mode." into gb-ub-photos-carlsbad
|
69db30368a3d270c8cb8e0d648651fb7286263aa |
26-Jun-2013 |
ztenghui <ztenghui@google.com> |
Fix ambiguous naming and typo bug:9468909 Change-Id: Ic52f3b6f6b5d0c874e8291ce7b3a76cb6c22f60f
rc/com/android/gallery3d/filtershow/filters/FilterColorBorderRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterFxRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterImageBorderRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterRepresentation.java
|
d5b9386177313e7b0ffe9a137515a1d001fe87c6 |
26-Jun-2013 |
ztenghui <ztenghui@google.com> |
Fix ambiguous naming and typo bug:9468909 Change-Id: Ic52f3b6f6b5d0c874e8291ce7b3a76cb6c22f60f
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/filters/FilterColorBorderRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterFxRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterImageBorderRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterRepresentation.java
|
a6a6a730074e9fedd56c41cd8fa8f1212cfac108 |
19-Jun-2013 |
Angus Kong <shkong@google.com> |
Add fullscreen mode. 1. Single tap to center a picture. 2. Double tap to fullscreen 3. In fullscreen, the next picture is on the left but the previous one is under the current one. Change-Id: I728da2487ea649162be4f1858a8524331c625157
rc/com/android/camera/data/LocalData.java
rc/com/android/camera/ui/FilmStripView.java
|
1abc84c3ec015667ed8f15752b82459492db681d |
26-Jun-2013 |
Angus Kong <shkong@google.com> |
Merge "Fix check of failing decoding boundaries calls" into gb-ub-photos-carlsbad
|
c285458f6809d43333e3ada8790bddac17912e5a |
26-Jun-2013 |
Angus Kong <shkong@google.com> |
Fix check of failing decoding boundaries calls Change-Id: I7b7780de9988312f9ce79c2a27132b7f6acb1c4e
rc/com/android/camera/data/CameraDataAdapter.java
rc/com/android/camera/data/LocalData.java
|
59eb0f822c8ec33b8c5b97a95a170275df816d44 |
26-Jun-2013 |
nicolasroard <nicolasroard@google.com> |
Merge "Cleanup ImagePreset to remove special-casing for borders" into gb-ub-photos-carlsbad
|
41752b2536bede41d81eddb8b813db42579be937 |
26-Jun-2013 |
nicolasroard <nicolasroard@google.com> |
Merge "Cleanup ImagePreset to remove special-casing for borders" into gb-ub-photos-carlsbad
|
a3c1fb69e51861a11b79c397e63cbf3acd52ba5f |
26-Jun-2013 |
nicolasroard <nicolasroard@google.com> |
Cleanup ImagePreset to remove special-casing for borders Change-Id: I6410a7a44d72c3dfa51c1d18f5a6fcba854ba9c2
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
|
0bb8918bad881fef82ca220298b69fa3e6bbafca |
26-Jun-2013 |
nicolasroard <nicolasroard@google.com> |
Cleanup ImagePreset to remove special-casing for borders Change-Id: I6410a7a44d72c3dfa51c1d18f5a6fcba854ba9c2
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
|
30ff4db0bbd66723a45feed13ead31e2ea401e11 |
26-Jun-2013 |
The Android Open Source Project <initial-contribution@android.com> |
am 57d45b60: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge * commit '57d45b6039cd58964f8eec9b35ace0ae5475e12e':
|
01b89601ce426921df471ca675c642dd87038d61 |
26-Jun-2013 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with jb-mr2-zeroday-release - do not merge Change-Id: I0dea6d4a409899be3ba89212b1c269f61db4b453
|
a6d9b6f18770fd279fa8dca994e5f92719350697 |
25-Jun-2013 |
Angus Kong <shkong@google.com> |
Don't use post-ICS API View.setBackground(). View.setBackground() is API level 16. Change-Id: I7e56939efbcaa6e152c19c37a4a54a133bed3b47
rc/com/android/camera/data/LocalData.java
|
4f5dee37d71532693f756ebf724a7880b0a2ef78 |
25-Jun-2013 |
Angus Kong <shkong@google.com> |
Synchronize camera access in start preview thread. Change-Id: Iba953fea3bd17ecb085d75fb3b2e350c0bf5d3b1
rc/com/android/camera/VideoModule.java
|
b8e2ab31ce0584505502d6c438d1a781a3a26a3b |
25-Jun-2013 |
Doris Liu <tianliu@google.com> |
Merge "Clean up camera switcher" into gb-ub-photos-carlsbad
|
b43c678f8b6c2d9e202cd1fc0c110d15b15be50f |
25-Jun-2013 |
Doris Liu <tianliu@google.com> |
Merge "Clean up camera switcher" into gb-ub-photos-carlsbad
|
c309cd0b01c5f254c29f7195c8f7f62ea19381d6 |
25-Jun-2013 |
ztenghui <ztenghui@google.com> |
Merge "Fix the missing filter name after deserialization." into gb-ub-photos-carlsbad
|
22b8228415284ad40cad8d5413e030a8ef396b7a |
25-Jun-2013 |
ztenghui <ztenghui@google.com> |
Merge "Fix the missing filter name after deserialization." into gb-ub-photos-carlsbad
|
b449c9cbe6e38bc1d169fd0cad20600b333b5bc8 |
25-Jun-2013 |
ztenghui <ztenghui@google.com> |
Fix the missing filter name after deserialization. bug:9468909 Change-Id: I63aaf0bad02c2afdddf9b162f695fc0a9165befa
rc/com/android/gallery3d/filtershow/filters/FilterRepresentation.java
|
1c4707a192c2f58b909a40b2cb24e38571c0e2d7 |
25-Jun-2013 |
ztenghui <ztenghui@google.com> |
Fix the missing filter name after deserialization. bug:9468909 Change-Id: I63aaf0bad02c2afdddf9b162f695fc0a9165befa
rc/com/android/gallery3d/filtershow/filters/FilterRepresentation.java
|
52516590aa097a247aa5e4c4733750a4f6f40011 |
25-Jun-2013 |
Doris Liu <tianliu@google.com> |
Clean up camera switcher Change-Id: I9f0495524028528ca02c7ddf94f4698d4e87af14
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
|
7bee00df2043c9d47b6f22b34f68bd0a0c78fa2e |
25-Jun-2013 |
Doris Liu <tianliu@google.com> |
Clean up camera switcher Change-Id: I9f0495524028528ca02c7ddf94f4698d4e87af14
es/drawable-hdpi/ic_switch_pan.png
es/drawable-mdpi/ic_switch_pan.png
es/drawable-xhdpi/ic_switch_pan.png
|
147e26ab7075f0acd3978f0cd0541cd1da4b50e1 |
25-Jun-2013 |
Doris Liu <tianliu@google.com> |
Clean up camera switcher Change-Id: I9f0495524028528ca02c7ddf94f4698d4e87af14
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/PhotoUI.java
rc/com/android/camera/VideoUI.java
rc/com/android/camera/ui/CameraSwitcher.java
|
fbd90a0e77ce21c6028dba2823392d9804e4e213 |
24-Jun-2013 |
The Android Automerger <android-build@google.com> |
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
|
7acd81b69aa59175c349dcf592c97b1f661c84f2 |
24-Jun-2013 |
The Android Automerger <android-build@android.com> |
Merge remote-tracking branch 'origin/jb-mr2-zeroday-release' into HEAD
|
957584d0f4bb5e16b4ca9cfef525194f0110d28b |
24-Jun-2013 |
nicolasroard <nicolasroard@google.com> |
Merge "Add a MatrixFit class" into gb-ub-photos-carlsbad
|
e2a1e317ac23e6e5f3f2530f62a243c1de652067 |
21-Jun-2013 |
Bobby Georgescu <georgescu@google.com> |
Merge "MTP Importer: show overlay icon on video items" into gb-ub-photos-carlsbad
|
4956b8e60bfb860f76f22d449ee0d0c0d0cbaf4a |
21-Jun-2013 |
Doris Liu <tianliu@google.com> |
Merge "Remove SRI panorama" into gb-ub-photos-carlsbad
|
d073915c54e5852e4533c47be287111194e61b2d |
21-Jun-2013 |
Doris Liu <tianliu@google.com> |
Merge "Remove SRI panorama" into gb-ub-photos-carlsbad
|
270bae7b507a361c7ab0bad45127e5e54a95a704 |
21-Jun-2013 |
Bobby Georgescu <georgescu@google.com> |
MTP Importer: show overlay icon on video items Bug: 4099088 Change-Id: Ia785f889aff91329e9d7c7026238b2588336963d
rc/com/android/gallery3d/ingest/ui/MtpImageView.java
|
c21e539b604cf07108a59741deeb5a5f34310617 |
21-Jun-2013 |
The Android Open Source Project <initial-contribution@android.com> |
am 090c669e: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge * commit '090c669e69279c0dcbe5da2c262578b36a98ace9':
|
34e952e83d254a88bc7cf58b999910d4fe190d29 |
21-Jun-2013 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with jb-mr2-zeroday-release - do not merge Change-Id: Ifabc6325c7c832b018cfca775680e3e90fc99832
|
7cd14ae2f227958fc628c0faf240c782bf5943cf |
21-Jun-2013 |
The Android Automerger <android-build@google.com> |
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
|
0372c360195f856b09c5f3679179cfdbb185e649 |
21-Jun-2013 |
Doris Liu <tianliu@google.com> |
Remove SRI panorama Change-Id: Icbe154aede474fb678ae4e0b2088626a4a8b31d8
ndroid.mk
ni_mosaic/Android.mk
erftests/panorama/Android.mk
|
3cd424299cf350f071df0cb5dbdc7107a745695c |
21-Jun-2013 |
Doris Liu <tianliu@google.com> |
Remove SRI panorama Change-Id: Icbe154aede474fb678ae4e0b2088626a4a8b31d8
ni_mosaic/Android.mk
ni_mosaic/NOTICE
ni_mosaic/feature_mos/doc/Readme.txt
ni_mosaic/feature_mos/doc/feature_mos_API_doxyfile
ni_mosaic/feature_mos/src/mosaic/AlignFeatures.cpp
ni_mosaic/feature_mos/src/mosaic/AlignFeatures.h
ni_mosaic/feature_mos/src/mosaic/Blend.cpp
ni_mosaic/feature_mos/src/mosaic/Blend.h
ni_mosaic/feature_mos/src/mosaic/CSite.h
ni_mosaic/feature_mos/src/mosaic/Delaunay.cpp
ni_mosaic/feature_mos/src/mosaic/Delaunay.h
ni_mosaic/feature_mos/src/mosaic/EdgePointerUtil.h
ni_mosaic/feature_mos/src/mosaic/Geometry.h
ni_mosaic/feature_mos/src/mosaic/ImageUtils.cpp
ni_mosaic/feature_mos/src/mosaic/ImageUtils.h
ni_mosaic/feature_mos/src/mosaic/Interp.h
ni_mosaic/feature_mos/src/mosaic/Log.h
ni_mosaic/feature_mos/src/mosaic/MatrixUtils.h
ni_mosaic/feature_mos/src/mosaic/Mosaic.cpp
ni_mosaic/feature_mos/src/mosaic/Mosaic.h
ni_mosaic/feature_mos/src/mosaic/MosaicTypes.h
ni_mosaic/feature_mos/src/mosaic/Pyramid.cpp
ni_mosaic/feature_mos/src/mosaic/Pyramid.h
ni_mosaic/feature_mos/src/mosaic/trsMatrix.cpp
ni_mosaic/feature_mos/src/mosaic/trsMatrix.h
ni_mosaic/feature_mos/src/mosaic_renderer/FrameBuffer.cpp
ni_mosaic/feature_mos/src/mosaic_renderer/FrameBuffer.h
ni_mosaic/feature_mos/src/mosaic_renderer/Renderer.cpp
ni_mosaic/feature_mos/src/mosaic_renderer/Renderer.h
ni_mosaic/feature_mos/src/mosaic_renderer/SurfaceTextureRenderer.cpp
ni_mosaic/feature_mos/src/mosaic_renderer/SurfaceTextureRenderer.h
ni_mosaic/feature_mos/src/mosaic_renderer/WarpRenderer.cpp
ni_mosaic/feature_mos/src/mosaic_renderer/WarpRenderer.h
ni_mosaic/feature_mos/src/mosaic_renderer/YVURenderer.cpp
ni_mosaic/feature_mos/src/mosaic_renderer/YVURenderer.h
ni_mosaic/feature_mos_jni.cpp
ni_mosaic/feature_stab/db_vlvm/db_bundle.h
ni_mosaic/feature_stab/db_vlvm/db_feature_detection.cpp
ni_mosaic/feature_stab/db_vlvm/db_feature_detection.h
ni_mosaic/feature_stab/db_vlvm/db_feature_matching.cpp
ni_mosaic/feature_stab/db_vlvm/db_feature_matching.h
ni_mosaic/feature_stab/db_vlvm/db_framestitching.cpp
ni_mosaic/feature_stab/db_vlvm/db_framestitching.h
ni_mosaic/feature_stab/db_vlvm/db_image_homography.cpp
ni_mosaic/feature_stab/db_vlvm/db_image_homography.h
ni_mosaic/feature_stab/db_vlvm/db_metrics.h
ni_mosaic/feature_stab/db_vlvm/db_rob_image_homography.cpp
ni_mosaic/feature_stab/db_vlvm/db_rob_image_homography.h
ni_mosaic/feature_stab/db_vlvm/db_robust.h
ni_mosaic/feature_stab/db_vlvm/db_utilities.cpp
ni_mosaic/feature_stab/db_vlvm/db_utilities.h
ni_mosaic/feature_stab/db_vlvm/db_utilities_algebra.h
ni_mosaic/feature_stab/db_vlvm/db_utilities_camera.cpp
ni_mosaic/feature_stab/db_vlvm/db_utilities_camera.h
ni_mosaic/feature_stab/db_vlvm/db_utilities_constants.h
ni_mosaic/feature_stab/db_vlvm/db_utilities_geometry.h
ni_mosaic/feature_stab/db_vlvm/db_utilities_indexing.cpp
ni_mosaic/feature_stab/db_vlvm/db_utilities_indexing.h
ni_mosaic/feature_stab/db_vlvm/db_utilities_linalg.cpp
ni_mosaic/feature_stab/db_vlvm/db_utilities_linalg.h
ni_mosaic/feature_stab/db_vlvm/db_utilities_poly.cpp
ni_mosaic/feature_stab/db_vlvm/db_utilities_poly.h
ni_mosaic/feature_stab/db_vlvm/db_utilities_random.h
ni_mosaic/feature_stab/db_vlvm/db_utilities_rotation.h
ni_mosaic/feature_stab/doc/Readme.txt
ni_mosaic/feature_stab/doc/dbreg_API_doxyfile
ni_mosaic/feature_stab/src/dbreg/dbreg.cpp
ni_mosaic/feature_stab/src/dbreg/dbreg.h
ni_mosaic/feature_stab/src/dbreg/dbstabsmooth.cpp
ni_mosaic/feature_stab/src/dbreg/dbstabsmooth.h
ni_mosaic/feature_stab/src/dbreg/targetver.h
ni_mosaic/feature_stab/src/dbreg/vp_motionmodel.c
ni_mosaic/feature_stab/src/dbreg/vp_motionmodel.h
ni_mosaic/feature_stab/src/dbregtest/PgmImage.cpp
ni_mosaic/feature_stab/src/dbregtest/PgmImage.h
ni_mosaic/feature_stab/src/dbregtest/dbregtest.cpp
ni_mosaic/feature_stab/src/dbregtest/stdafx.cpp
ni_mosaic/feature_stab/src/dbregtest/stdafx.h
ni_mosaic/feature_stab/src/dbregtest/targetver.h
ni_mosaic/mosaic_renderer_jni.cpp
ni_mosaic/mosaic_renderer_jni.h
|
ff529508bb5ebd6bede02c29a251dee3ed5eb7b7 |
21-Jun-2013 |
Doris Liu <tianliu@google.com> |
Remove SRI panorama Change-Id: Icbe154aede474fb678ae4e0b2088626a4a8b31d8
ni_mosaic/feature_mos/src/mosaic/AlignFeatures.cpp
ni_mosaic/feature_mos/src/mosaic/AlignFeatures.h
es/drawable/pano_direction_left_indicator.xml
es/drawable/pano_direction_right_indicator.xml
es/layout-land/pano_module_capture.xml
es/layout-land/pano_review.xml
es/layout-land/preview_frame_pano.xml
es/layout-port/pano_module_capture.xml
es/layout-port/pano_review.xml
es/layout-port/preview_frame_pano.xml
es/layout/panorama_module.xml
rc/com/android/camera/PanoProgressBar.java
|
e4ff95562b8692e4a08199a69bbb69ddccf6e904 |
21-Jun-2013 |
Doris Liu <tianliu@google.com> |
Remove SRI panorama Change-Id: Icbe154aede474fb678ae4e0b2088626a4a8b31d8
ni_mosaic/feature_mos/src/mosaic/AlignFeatures.cpp
ni_mosaic/feature_mos/src/mosaic/AlignFeatures.h
ni_mosaic/feature_mos/src/mosaic/Blend.cpp
ni_mosaic/feature_mos/src/mosaic/Blend.h
ni_mosaic/feature_mos/src/mosaic/CSite.h
ni_mosaic/feature_mos/src/mosaic/Delaunay.cpp
ni_mosaic/feature_mos/src/mosaic/Delaunay.h
ni_mosaic/feature_mos/src/mosaic/EdgePointerUtil.h
ni_mosaic/feature_mos/src/mosaic/Geometry.h
ni_mosaic/feature_mos/src/mosaic/ImageUtils.cpp
ni_mosaic/feature_mos/src/mosaic/ImageUtils.h
ni_mosaic/feature_mos/src/mosaic/Interp.h
ni_mosaic/feature_mos/src/mosaic/Log.h
ni_mosaic/feature_mos/src/mosaic/MatrixUtils.h
ni_mosaic/feature_mos/src/mosaic/Mosaic.cpp
ni_mosaic/feature_mos/src/mosaic/Mosaic.h
ni_mosaic/feature_mos/src/mosaic/MosaicTypes.h
ni_mosaic/feature_mos/src/mosaic/Pyramid.cpp
ni_mosaic/feature_mos/src/mosaic/Pyramid.h
ni_mosaic/feature_mos/src/mosaic/trsMatrix.cpp
ni_mosaic/feature_mos/src/mosaic/trsMatrix.h
ni_mosaic/feature_mos/src/mosaic_renderer/FrameBuffer.cpp
ni_mosaic/feature_mos/src/mosaic_renderer/FrameBuffer.h
ni_mosaic/feature_mos/src/mosaic_renderer/Renderer.cpp
ni_mosaic/feature_mos/src/mosaic_renderer/Renderer.h
ni_mosaic/feature_mos/src/mosaic_renderer/SurfaceTextureRenderer.cpp
ni_mosaic/feature_mos/src/mosaic_renderer/SurfaceTextureRenderer.h
ni_mosaic/feature_mos/src/mosaic_renderer/WarpRenderer.cpp
ni_mosaic/feature_mos/src/mosaic_renderer/WarpRenderer.h
ni_mosaic/feature_mos/src/mosaic_renderer/YVURenderer.cpp
ni_mosaic/feature_mos/src/mosaic_renderer/YVURenderer.h
ni_mosaic/feature_stab/src/dbreg/dbreg.cpp
ni_mosaic/feature_stab/src/dbreg/dbreg.h
ni_mosaic/feature_stab/src/dbreg/dbstabsmooth.cpp
ni_mosaic/feature_stab/src/dbreg/dbstabsmooth.h
ni_mosaic/feature_stab/src/dbreg/targetver.h
ni_mosaic/feature_stab/src/dbreg/vp_motionmodel.c
ni_mosaic/feature_stab/src/dbreg/vp_motionmodel.h
ni_mosaic/feature_stab/src/dbregtest/PgmImage.cpp
ni_mosaic/feature_stab/src/dbregtest/PgmImage.h
ni_mosaic/feature_stab/src/dbregtest/dbregtest.cpp
ni_mosaic/feature_stab/src/dbregtest/stdafx.cpp
ni_mosaic/feature_stab/src/dbregtest/stdafx.h
ni_mosaic/feature_stab/src/dbregtest/targetver.h
rc/com/android/camera/Mosaic.java
rc/com/android/camera/MosaicFrameProcessor.java
rc/com/android/camera/MosaicPreviewRenderer.java
rc/com/android/camera/MosaicRenderer.java
rc/com/android/camera/PanoProgressBar.java
rc/com/android/camera/PanoUtil.java
|
14f35c35dff8209a496eed3bd7d2051d5b06dfae |
20-Jun-2013 |
Bobby Georgescu <georgescu@google.com> |
MTP Importer: improve experience when importing large files Bug: 4099088 Change-Id: Ie5d9da1be0b8891b9123eceaadfe9c2ec2d3e408
rc/com/android/gallery3d/ingest/IngestActivity.java
|
659f0694f1a63d3c3aadf13425ca1fe027b1152a |
20-Jun-2013 |
Bobby Georgescu <georgescu@google.com> |
Merge "Add support for importing videos in MTP importer" into gb-ub-photos-carlsbad
|
9e908d9cd407778633af5337b2e98f7313bbbb86 |
17-Jun-2013 |
Bobby Georgescu <georgescu@google.com> |
Add support for importing videos in MTP importer Bug: 4099088 Change-Id: Ic3ac00cb730381dd2d7f4802aa8001a60e439748
rc/com/android/gallery3d/ingest/ImportTask.java
rc/com/android/gallery3d/ingest/MtpDeviceIndex.java
rc/com/android/gallery3d/ingest/ui/MtpImageView.java
|
d759db61f0c5a7b2a0777acc51dcb512a6e4c46a |
20-Jun-2013 |
ztenghui <ztenghui@google.com> |
Merge "Fix LUT3D information lost after re-edit" into gb-ub-photos-carlsbad
|
923770ce24214ce3dc2fe96fe7c66b8567d4380f |
20-Jun-2013 |
ztenghui <ztenghui@google.com> |
Merge "Fix LUT3D information lost after re-edit" into gb-ub-photos-carlsbad
|
ee4eee27d478e12071859a6064c6d6f79fba2752 |
20-Jun-2013 |
ztenghui <ztenghui@google.com> |
Merge "Setup the saving framework to support hiding original photo for editor." into gb-ub-photos-carlsbad
|
2f8439e4a2b038746ff6792d2ea797cbdfdf7108 |
19-Jun-2013 |
Doris Liu <tianliu@google.com> |
Add flash animation to photo module Change-Id: I9faa46e71e27064c4fbcb629c5c31cc4d7b22652
es/layout/photo_module.xml
|
c2e9abdcb39a9b8070889ff7a7d829b3eda0c51b |
19-Jun-2013 |
Doris Liu <tianliu@google.com> |
Add flash animation to photo module Change-Id: I9faa46e71e27064c4fbcb629c5c31cc4d7b22652
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/PhotoUI.java
|
6ad0b031f330c8fbc426966f7d3b47117b1f2294 |
19-Jun-2013 |
ztenghui <ztenghui@google.com> |
Fix LUT3D information lost after re-edit bug:9427243 Change-Id: I8535c8776c866fd6c84d391a8de82df9cb214694
rc/com/android/gallery3d/filtershow/filters/FilterFxRepresentation.java
|
277c428c606bd1de0ac84a35ece703afa89227f0 |
19-Jun-2013 |
ztenghui <ztenghui@google.com> |
Fix LUT3D information lost after re-edit bug:9427243 Change-Id: I8535c8776c866fd6c84d391a8de82df9cb214694
rc/com/android/gallery3d/filtershow/filters/FilterFxRepresentation.java
|
d4702d8906274c64f7e7b08c7ecccf891e8a1a6e |
19-Jun-2013 |
nicolasroard <nicolasroard@google.com> |
Add a MatrixFit class Change-Id: I67d2eb92fe5bbdff56ff50330c7eed48e7593f75
rc/com/android/gallery3d/filtershow/tools/MatrixFit.java
|
41fd8171292a8a3248fe48eea362834ed5d25b90 |
11-Jun-2013 |
ztenghui <ztenghui@google.com> |
Setup the saving framework to support hiding original photo for editor. This new approach will try to hide the original image into an auxiliary directory. User will only see one edited image, while being able to go back to the original image in the editor. Refactor SaveCopyTask for more private funcs and more comments. bug:9468909 Change-Id: I866321d23e6db0b3dbd08fec2a6a7e3142b17b65
rc/com/android/gallery3d/data/LocalImage.java
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/cache/ImageLoader.java
rc/com/android/gallery3d/filtershow/tools/SaveCopyTask.java
rc/com/android/gallery3d/util/SaveVideoFileUtils.java
|
b84b9738c855a525dc1944165983cc3c342ce446 |
19-Jun-2013 |
Doris Liu <tianliu@google.com> |
Set window flags to show secure camera Change-Id: I9acb47ae5d6c5b9248aeea5cd267e17243f93c74
rc/com/android/camera/CameraActivity.java
|
4984a6afefe1e9b9514d32c0c4fa874ada57af79 |
18-Jun-2013 |
Doris Liu <tianliu@google.com> |
Merge "Switch over to use new camera activity" into gb-ub-photos-carlsbad
|
784000450a39f4b07817c5cefe0c407b6a5f86da |
18-Jun-2013 |
George Mount <mount@google.com> |
Merge "Add decoding to a smaller image by sampling and scaling." into gb-ub-photos-carlsbad
|
9194ad576d53852039f7de823ce3e54232e680d6 |
14-Jun-2013 |
Doris Liu <tianliu@google.com> |
Switch over to use new camera activity Change-Id: Ib907b5ab5d0e818261e95edd182f2e20c3bbebe0
es/layout/camera.xml
es/layout/camera_main.xml
es/layout/new_photo_module.xml
es/layout/new_video_module.xml
es/layout/photo_module.xml
es/layout/video_module.xml
rc/com/android/camera/NewPreviewGestures.java
rc/com/android/camera/PreviewGestures.java
|
6432cd65159731a28d9239426b0f0f4d7c44fa98 |
14-Jun-2013 |
Doris Liu <tianliu@google.com> |
Switch over to use new camera activity Change-Id: Ib907b5ab5d0e818261e95edd182f2e20c3bbebe0
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/CameraModule.java
rc/com/android/camera/NewCameraActivity.java
rc/com/android/camera/NewCameraModule.java
rc/com/android/camera/NewPhotoMenu.java
rc/com/android/camera/NewPhotoModule.java
rc/com/android/camera/NewPhotoUI.java
rc/com/android/camera/NewPreviewGestures.java
rc/com/android/camera/NewVideoMenu.java
rc/com/android/camera/NewVideoModule.java
rc/com/android/camera/NewVideoUI.java
rc/com/android/camera/PanoramaModule.java
rc/com/android/camera/PhotoMenu.java
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/PhotoUI.java
rc/com/android/camera/PreviewGestures.java
rc/com/android/camera/VideoMenu.java
rc/com/android/camera/VideoModule.java
rc/com/android/camera/VideoUI.java
rc/com/android/camera/ui/CameraRootView.java
rc/com/android/camera/ui/FaceView.java
rc/com/android/camera/ui/NewCameraRootView.java
rc/com/android/camera/ui/RenderOverlay.java
rc/com/android/gallery3d/app/StateManager.java
rc_pd/com/android/gallery3d/util/LightCycleHelper.java
|
d90e44e196d4c4e3e4c6f21cec3c8ad8c4d16e9a |
28-May-2013 |
George Mount <mount@google.com> |
Add decoding to a smaller image by sampling and scaling. This allows opportunistic reuse of bitmaps, but does not require it when downsampling. Change-Id: I06f12bb5416f88a242f67bff3d2ca45894101bcd
rc/com/android/photos/data/BitmapDecoder.java
|
608e27fb708aa24afe5790b0f0825c977a7df784 |
18-Jun-2013 |
Bobby Georgescu <georgescu@google.com> |
Add more metrics to Editor Bug: 9467671 Instrument - Editor opened - Number of filters used in save - Undo/redo/reset/state panel - Save completed Change-Id: I4722f36496ccd089829bd616f89d760078922573
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
rc/com/android/gallery3d/filtershow/tools/SaveCopyTask.java
rc_pd/com/android/gallery3d/util/UsageStatistics.java
|
cf55a94b8bba764df380e4e49fe7baaa03d72575 |
18-Jun-2013 |
Bobby Georgescu <georgescu@google.com> |
Add more metrics to Editor Bug: 9467671 Instrument - Editor opened - Number of filters used in save - Undo/redo/reset/state panel - Save completed Change-Id: I4722f36496ccd089829bd616f89d760078922573
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
|
3126f4f5c0c241f7fb895cc8222954a7f7cbfdfe |
17-Jun-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Added serialization IDs for frames, adds frames to analytics. Bug: 9467671 Change-Id: I6f21e7bc9ca7255a290ba7cd1a94e9b07e7b06cb
rc/com/android/gallery3d/filtershow/imageshow/MasterImage.java
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
rc_pd/com/android/gallery3d/filtershow/filters/FiltersManager.java
|
9c03e4ebfe55e699d6f28db2688ea0cfd63bb064 |
17-Jun-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Added serialization IDs for frames, adds frames to analytics. Bug: 9467671 Change-Id: I6f21e7bc9ca7255a290ba7cd1a94e9b07e7b06cb
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
|
d67ffd653bada5d4dcdca1f7a3c3a7aab1b51360 |
17-Jun-2013 |
Angus Kong <shkong@google.com> |
Merge "Remove files actually." into gb-ub-photos-carlsbad
|
2bd10a103c6fc7130a8cf0d199dc77b37076bd1e |
17-Jun-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Fix IDs for analytics, unlocalize serialization IDs. Bug: 9467671 Bug: 9336168 Change-Id: Icb0037ab853598b8ad6b931808074f824ea706ed
rc/com/android/gallery3d/filtershow/filters/FilterFxRepresentation.java
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
|
bbcaf793b27d9ee2976836a1d13b85e24e0aa652 |
17-Jun-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Fix IDs for analytics, unlocalize serialization IDs. Bug: 9467671 Bug: 9336168 Change-Id: Icb0037ab853598b8ad6b931808074f824ea706ed
rc/com/android/gallery3d/filtershow/filters/BaseFiltersManager.java
rc/com/android/gallery3d/filtershow/filters/FilterFxRepresentation.java
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
|
13fe37e7f0c98fbd5629e8ab51a1554e53b8fa96 |
17-Jun-2013 |
Baligh Uddin <baligh@google.com> |
am 8543578f: (-s ours) am f36574be: am baa22861: (-s ours) Import translations. DO NOT MERGE * commit '8543578f108d703b7db8fbea3ab5e7f2e7c67483': Import translations. DO NOT MERGE
|
a4fd1979dab507860e004c296552ba94d539b03a |
17-Jun-2013 |
Baligh Uddin <baligh@google.com> |
am f36574be: am baa22861: (-s ours) Import translations. DO NOT MERGE * commit 'f36574be8845a69b091684e6c2a904af909c713f': Import translations. DO NOT MERGE
|
3ee7f09cfc6f9929ee533eeeb223788687748cbd |
17-Jun-2013 |
Baligh Uddin <baligh@google.com> |
am 0722071c: (-s ours) am edf2adc8: Import translations. DO NOT MERGE * commit '0722071c5d180e42f304aaefdc8e1a4cc505bf42': Import translations. DO NOT MERGE
|
3f41e2bb5bb5404976468b9c4ab901acfddb3cbc |
17-Jun-2013 |
Baligh Uddin <baligh@google.com> |
am edf2adc8: Import translations. DO NOT MERGE * commit 'edf2adc8b2d45d8c067df4e178473ecb27f77c72': Import translations. DO NOT MERGE
|
8ed8f8ea7917839ccfde67ca9bb1ef164eb21bcb |
17-Jun-2013 |
Baligh Uddin <baligh@google.com> |
am baa22861: (-s ours) Import translations. DO NOT MERGE * commit 'baa228619eaa813f15c07988511aba924b96b7a1': Import translations. DO NOT MERGE
|
a8c80b7d18f2daf970266b9394a4f18d73d8fe28 |
17-Jun-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I8b4d102aceb40167cc5bcf895ce8a7017b246b28 Auto-generated-cl: translation import
es/values-hu/strings.xml
|
d321a8dac57055e3c394f4501cfbc038fc3330e5 |
17-Jun-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I0443c96fc10662ae66201fa2d690f530bc3d0009 Auto-generated-cl: translation import
es/values-hu/strings.xml
|
8ff1c1aee81a41da1baacfb12a3c72948bb19e8c |
17-Jun-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ia25288fc8663f78cd456231c21b0f8f55ff203d3 Auto-generated-cl: translation import
es/values-hu/strings.xml
|
5eae52de2c8f99450c29a846a9eb8f3a334b3ea0 |
16-Jun-2013 |
The Android Open Source Project <initial-contribution@android.com> |
am 28b13ba1: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge * commit '28b13ba10d8e1ce2b29ee548979ab347ec0b8e9e':
|
d87af89362c9b7963809f8b4dfc195f5d939944c |
16-Jun-2013 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with jb-mr2-zeroday-release - do not merge Change-Id: Ib2c2ee9efe4216329231a2bf4abc608ea662bc85
|
d2b3d5ef1572ec47d2a28ee54884ded3c3355182 |
16-Jun-2013 |
The Android Automerger <android-build@google.com> |
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
|
516d2594d567228434c78785e6695c01a28426fe |
16-Jun-2013 |
Baligh Uddin <baligh@google.com> |
am fec773cc: (-s ours) am d1c376a1: am 43c20616: (-s ours) Import translations. DO NOT MERGE * commit 'fec773ccc9b92353a986bcab69e07d36ed31e16e': Import translations. DO NOT MERGE
|
4f953e8f5bac9a01853257a9493134c498aed293 |
16-Jun-2013 |
Baligh Uddin <baligh@google.com> |
am d1c376a1: am 43c20616: (-s ours) Import translations. DO NOT MERGE * commit 'd1c376a1cc31de1202c3041be8aa637cfa7d9a7a': Import translations. DO NOT MERGE
|
c4002afeb8e872771d6471a412007e3744483690 |
16-Jun-2013 |
Baligh Uddin <baligh@google.com> |
am 727964ae: (-s ours) am 0baaf2c7: Import translations. DO NOT MERGE * commit '727964aecc8c9764e6fb5871b6c36ab860469526': Import translations. DO NOT MERGE
|
a0ec5e22f8cbcbd1524a45a19ce8de0311e4992f |
16-Jun-2013 |
Baligh Uddin <baligh@google.com> |
am 43c20616: (-s ours) Import translations. DO NOT MERGE * commit '43c206167c813b525047a2fc366177579cef7910': Import translations. DO NOT MERGE
|
0a20563eae271f55d7b7a0ecfca0909d72742d8d |
16-Jun-2013 |
Baligh Uddin <baligh@google.com> |
am 0baaf2c7: Import translations. DO NOT MERGE * commit '0baaf2c7bce7d3aad933bf35a0a9147331a12a85': Import translations. DO NOT MERGE
|
99e2da13d775613252bd0e622d043e4d03fece30 |
15-Jun-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I7f77a0903c9dfb798f44f2755ac5cd431bfec881 Auto-generated-cl: translation import
es/values-it/strings.xml
|
4c332073c28104c6bcfadfbb108a2d01d9c46169 |
15-Jun-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I14843535bff905edc2636e256f19bc9c67b6aaa2 Auto-generated-cl: translation import
es/values-it/strings.xml
|
74346a5b8f3ec93499ccfcdcc6f4a6c6fff8e4b4 |
15-Jun-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I71c6a4b743cd3c587e0c410d84f0e28dfcb605e4 Auto-generated-cl: translation import
es/values-it/strings.xml
|
082210302a595e665ef0e34e9be216e554b13698 |
14-Jun-2013 |
Angus Kong <shkong@google.com> |
Remove files actually. Change-Id: Ideba2dfff0678f1049bf2bdc93cee98bbb0e589e
rc/com/android/camera/NewCameraActivity.java
rc/com/android/camera/data/CameraDataAdapter.java
rc/com/android/camera/data/LocalData.java
rc/com/android/camera/ui/FilmStripView.java
|
682c7e316d4cae77c934fc3e6859a2f0f279edb7 |
14-Jun-2013 |
Doris Liu <tianliu@google.com> |
Merge "Add callbacks for switching to camera/filmstrip" into gb-ub-photos-carlsbad
|
a52f04c1ff32b2f529c21b49861a62ad34359e28 |
06-Jun-2013 |
Doris Liu <tianliu@google.com> |
Add callbacks for switching to camera/filmstrip Change-Id: I936d59efe3e09232ab0b298603c823d4f7952199
rc/com/android/camera/NewCameraActivity.java
rc/com/android/camera/NewCameraModule.java
rc/com/android/camera/NewPhotoModule.java
rc/com/android/camera/NewPhotoUI.java
rc/com/android/camera/NewVideoModule.java
rc/com/android/camera/NewVideoUI.java
rc/com/android/camera/ui/FilmStripView.java
rc/com/android/camera/ui/NewCameraRootView.java
rc/com/android/camera/ui/RenderOverlay.java
|
c1b125df4715f9c6c0862b1ee3b09092cc3a2615 |
13-Jun-2013 |
Angus Kong <shkong@google.com> |
Merge "Refactor to separate out EGL part." into gb-ub-photos-carlsbad
|
a0ab65b489d7c0ba5cbe258be09dfbe36cce2851 |
13-Jun-2013 |
Doris Liu <tianliu@google.com> |
Merge "Update camera orientation when device is flipped" into gb-ub-photos-carlsbad
|
4f993f0eab972bca47f9e28e665e44227abf187b |
13-Jun-2013 |
John Hoford <hoford@google.com> |
Merge "fix start up crash" into gb-ub-photos-carlsbad
|
0a735860321394741cf42a75fcb265b47bc473ba |
11-Jun-2013 |
John Hoford <hoford@google.com> |
fix start up crash bug:8734160 Change-Id: Iaf7f6bdbd70ab04011b9af7816a6991724363e49
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
|
4c122cbf4edd0e0132aa72c18cdbd39b3a03d86e |
13-Jun-2013 |
Bobby Georgescu <georgescu@google.com> |
Remove unused and buggy MtpThumbnailDrawable code Bug: 8793065 Change-Id: Ib8b08ae8b9e08319f8628581d8e3c5a4688ee4a5
rc/com/android/photos/drawables/MtpThumbnailDrawable.java
|
44ab147ed213bf6a1aa6c62e08c20d7fca03503d |
08-Jun-2013 |
Doris Liu <tianliu@google.com> |
Update camera orientation when device is flipped Bug: 8963053 Change-Id: I909793a7da3903a080a19cd7e271b3720df4ec0a
rc/com/android/camera/NewPhotoModule.java
rc/com/android/camera/NewPhotoUI.java
rc/com/android/camera/NewVideoModule.java
rc/com/android/camera/NewVideoUI.java
rc/com/android/camera/PhotoController.java
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/VideoController.java
rc/com/android/camera/VideoModule.java
rc/com/android/camera/ui/CameraControls.java
rc/com/android/camera/ui/NewCameraRootView.java
rc/com/android/camera/ui/RotatableLayout.java
|
77f1615264a5641b58e037156f25ad1b30527ef5 |
06-Jun-2013 |
Angus Kong <shkong@google.com> |
Refactor to separate out EGL part. Change-Id: I90c37b9e221a80f0d35e6e12ab8850078dc03622
rc/com/android/camera/MosaicPreviewRenderer.java
rc/com/android/camera/NewCameraActivity.java
rc/com/android/camera/SurfaceTextureRenderer.java
rc_pd/com/android/gallery3d/util/LightCycleHelper.java
|
b22e24cc4a4b65ebd88ff865ec23d592fbd645ea |
12-Jun-2013 |
Doris Liu <tianliu@google.com> |
Merge "In carlesbad, fix image capture on S4" into gb-ub-photos-carlsbad
|
b81204ad0ccd2f16805b0fd5277be73fc6e8d31f |
12-Jun-2013 |
Doris Liu <tianliu@google.com> |
In carlesbad, fix image capture on S4 Bug: 9390020 Change-Id: I9d7e0609c55f47a267aff8499dcd244dfb2fdb3a
rc/com/android/camera/NewPhotoModule.java
|
08a9f0d5d7541a91d5db2a6849c29d80a8d6c617 |
12-Jun-2013 |
The Android Open Source Project <initial-contribution@android.com> |
am c5b6bd8e: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge * commit 'c5b6bd8e53e38db1afd543262490fccc1962f3e9': Fix text size in the state panel
|
7b83e48fc153b886c222cf0ab5432f3f7f6e7c7a |
12-Jun-2013 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge Change-Id: I914272e7b65b9b792f8d71f0654ab156fdbef452
|
18b5e3ecb5416c7683bcb7e5238d2298ef06dc67 |
12-Jun-2013 |
The Android Automerger <android-build@google.com> |
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
|
8b0498d0cfed3e4cd5aa874760c222826bff64c6 |
12-Jun-2013 |
nicolasroard <nicolasroard@google.com> |
Fix icon sizes and jaggies bug:9105608 bug:8791729 Change-Id: I828e9d4daf4025f53d505a3412c27dd8c54a607e
rc/com/android/gallery3d/filtershow/category/Action.java
rc/com/android/gallery3d/filtershow/tools/IconFactory.java
|
7c050f5d486e5a2ddd205a64d3abb1f64bc58637 |
12-Jun-2013 |
nicolasroard <nicolasroard@google.com> |
Fix icon sizes and jaggies bug:9105608 bug:8791729 Change-Id: I828e9d4daf4025f53d505a3412c27dd8c54a607e
es/layout/filtershow_category_panel_new.xml
es/values-large/filtershow_values.xml
es/values-xlarge/filtershow_values.xml
es/values/filtershow_values.xml
|
3888de2f0f056e382fefcee5c577f4eb8494b14e |
11-Jun-2013 |
nicolasroard <nicolasroard@google.com> |
Fix text size in the state panel bug:9377153 Change-Id: I6a3a383e4180d757f0272492dcadcbfdb580b154 (cherry picked from commit 68cb2b7efda1b35c79279c670b0d3a0bd6df72ae)
es/values/filtershow_values.xml
rc/com/android/gallery3d/filtershow/state/StateView.java
|
a4165b172691b5e9eaff8ee853045f4720e65456 |
12-Jun-2013 |
Doris Liu <tianliu@google.com> |
Merge "Disable zoom when camera does not support zoom" into gb-ub-photos-carlsbad
|
5791e2fbe36756806339182fcde4ce058ec1d203 |
12-Jun-2013 |
Doris Liu <tianliu@google.com> |
Merge "Disable zoom when camera does not support zoom" into gb-ub-photos-carlsbad
|
a09c627245c2b8f1d0cc690e4e290313a1d8bfa4 |
11-Jun-2013 |
nicolasroard <nicolasroard@google.com> |
am 3de1ebeb: am a4d93ac0: Fix text size in the state panel * commit '3de1ebebe75042cd7dc342c4e3fa094bbb5cbc8d': Fix text size in the state panel
|
093463fadde8f8c2c569c70669bf847bedcf8aa5 |
11-Jun-2013 |
Baligh Uddin <baligh@google.com> |
am 3570306f: (-s ours) am aea40fd2: Import translations. DO NOT MERGE * commit '3570306fbaab44149ebf4dc4ae97bfc2f783071b': Import translations. DO NOT MERGE
|
53075549eab2288220ccb6ef8daaaff0450373b8 |
11-Jun-2013 |
nicolasroard <nicolasroard@google.com> |
am a4d93ac0: Fix text size in the state panel * commit 'a4d93ac033712096c820840b31e7017f850f8e74': Fix text size in the state panel
|
c1f8de990cd08fc28f6790f8852a7f31ab443bb1 |
11-Jun-2013 |
Baligh Uddin <baligh@google.com> |
am aea40fd2: Import translations. DO NOT MERGE * commit 'aea40fd2a111904fa37699d8d90456813afff895': Import translations. DO NOT MERGE
|
cfd86991cbe82976b7ad540ac871988bc69ea2b9 |
11-Jun-2013 |
Doris Liu <tianliu@google.com> |
Disable zoom when camera does not support zoom Change-Id: I5b4c38636614df37db1ef3166368f1650c9e5fa0
rc/com/android/camera/NewPreviewGestures.java
|
e991ac8d67ffa09ee285e72ad275d32475de2ded |
11-Jun-2013 |
Doris Liu <tianliu@google.com> |
Disable zoom when camera does not support zoom Change-Id: I5b4c38636614df37db1ef3166368f1650c9e5fa0
rc/com/android/camera/NewPhotoModule.java
rc/com/android/camera/NewPhotoUI.java
rc/com/android/camera/NewPreviewGestures.java
rc/com/android/camera/NewVideoModule.java
rc/com/android/camera/NewVideoUI.java
|
1e2b3f8be10ca20f6807ed71f160d6f6a8ab1c81 |
11-Jun-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Mirror CL 319301 in Bryce. Change-Id: If84a08aa1969415a0d5d9ad3b9153743b1951108
rc/com/android/gallery3d/filtershow/crop/CropLoader.java
|
c76547793270371785f9b928e173e1dbc238ef37 |
11-Jun-2013 |
Angus Kong <shkong@google.com> |
Fix build. Change-Id: I05f73596157fb5a2ee0ebf8581cfffa973a2d1d7
rc/com/android/camera/NewPhotoModule.java
|
d82eae2bc5628ee3d0db039076298c93179e7aad |
11-Jun-2013 |
Angus Kong <shkong@google.com> |
Use setPreviewFpsRange instead. Change-Id: I58f6af667fd906221b67b8a4827d7a67c567e20a
rc/com/android/camera/NewPhotoModule.java
rc/com/android/camera/NewVideoModule.java
rc/com/android/camera/Util.java
|
42740f769f3c208d713d33cbcddc2cfba2639dc3 |
11-Jun-2013 |
nicolasroard <nicolasroard@google.com> |
Fix text size in the state panel bug:9377153 Change-Id: I6a3a383e4180d757f0272492dcadcbfdb580b154 (cherry picked from commit 68cb2b7efda1b35c79279c670b0d3a0bd6df72ae)
es/values/filtershow_values.xml
rc/com/android/gallery3d/filtershow/state/StateView.java
|
e5c35e5e1f2fe037de7d527fa6a152749959c10b |
11-Jun-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE"
|
b8ecfd5b8726b94341bfb0110f0472ff6a42599f |
11-Jun-2013 |
nicolasroard <nicolasroard@google.com> |
Fix panel anim in ICS Change-Id: Ie2e5a6a36c5bec309b5848e50a90f089f9aeffa9
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
|
e009f521225fac20eb3d73ff3a9a6bb49bf7a64e |
11-Jun-2013 |
nicolasroard <nicolasroard@google.com> |
Fix state panel text size bug:9377153 Change-Id: Id5243539e2f8d3ee737e24eeb204145fbaa9138d
rc/com/android/gallery3d/filtershow/state/StateView.java
|
a5d2367c644ac34f12a191fa1ec1274ccebf9435 |
11-Jun-2013 |
nicolasroard <nicolasroard@google.com> |
Fix text size in the state panel Change-Id: I0290b2039d987605e3cc82e3c4d486b7855059b2
es/values/filtershow_values.xml
|
2549a552d0b76eed10d2abe34e8d954d8dcab985 |
10-Jun-2013 |
nicolasroard <nicolasroard@google.com> |
Fix warnings Change-Id: I736364e538c2cb03f58c05b9b38252e7771f23e8
rc/com/android/gallery3d/filtershow/filters/FilterRepresentation.java
|
5e29f1cbd247e85a3c5c27260cea6bb2b3fefac5 |
10-Jun-2013 |
nicolasroard <nicolasroard@google.com> |
Fix warnings Change-Id: I736364e538c2cb03f58c05b9b38252e7771f23e8
rc/com/android/gallery3d/filtershow/filters/FilterRepresentation.java
|
baab1bed1733770de33d08f51608ba049e6a8c11 |
10-Jun-2013 |
The Android Open Source Project <initial-contribution@android.com> |
am 55a3c0dd: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge * commit '55a3c0dd0d34a17ca966ed1652e7d7ba9deb3240':
|
3aa946dd696e807fd7494306908b37b6615d7fb7 |
10-Jun-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I5aefa1d9ad0feb6282b3a012d568ee8879062eb1 Auto-generated-cl: translation import
es/values-es-rUS/strings.xml
es/values-fa/strings.xml
es/values-hr/strings.xml
|
30c23b53404661ab519d18c4242d561bf008563b |
10-Jun-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I0522f769ec1fc9992a884462a1a4a6639ba1ee7f Auto-generated-cl: translation import
es/values-es-rUS/strings.xml
es/values-fa/strings.xml
es/values-hr/strings.xml
|
5bf8c80f3ef08c9543460a56aa98264fc4dc9b61 |
10-Jun-2013 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with jb-mr2-zeroday-release - do not merge Change-Id: I5a0af2cc544c873654fb328b96b0bf1eed32d4ef
|
8f5c8b9be7b45acce6fbee800bd919ff4731139b |
09-Jun-2013 |
The Android Automerger <android-build@google.com> |
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
|
5644a35e0fa484565cfe27e2c5d4cbcca1ddedd9 |
08-Jun-2013 |
Doris Liu <tianliu@google.com> |
Merge "Add enable/disable swiping to filmstrip" into gb-ub-photos-carlsbad
|
d483ca1f81704f7a1c6a310bd2ba289aef2ffb65 |
07-Jun-2013 |
Bobby Georgescu <georgescu@google.com> |
Fix NPE in PreparePageFadeoutTexture Bug: 8837688 Change-Id: Ie8fbd9a42497195b8a01cc5638cb0c44d4532d09
rc/com/android/gallery3d/ui/PreparePageFadeoutTexture.java
|
f85fbb9555d496a8f508ea2fd7985421413d44cd |
07-Jun-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE"
|
9a94140d23b1de2cd5fd57b1ce42b18b701a8a7e |
07-Jun-2013 |
Baligh Uddin <baligh@google.com> |
am 57e90a2a: (-s ours) am 5412abc0: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev * commit '57e90a2a67144aa37fc2b6905c9c011589d4c99c': Import translations. DO NOT MERGE
|
8759c0f697de146d332a01cbc745cb70143c00e4 |
07-Jun-2013 |
Baligh Uddin <baligh@google.com> |
am 5412abc0: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev * commit '5412abc08d27c19d28aa32e743e911f3a680a25d': Import translations. DO NOT MERGE
|
d961cec72ddc99dde9b548c32870ceebe423946e |
07-Jun-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
|
f7758b6cc5ab00ad3955bf9c98af76559644a477 |
07-Jun-2013 |
Doris Liu <tianliu@google.com> |
Add enable/disable swiping to filmstrip Change-Id: I3e019764a72f947545cd230b9bfe45f67d83dc29
rc/com/android/camera/NewCameraActivity.java
rc/com/android/camera/NewPhotoModule.java
rc/com/android/camera/NewPhotoUI.java
rc/com/android/camera/NewVideoModule.java
rc/com/android/camera/NewVideoUI.java
rc/com/android/camera/data/CameraDataAdapter.java
rc/com/android/camera/ui/FilmStripView.java
|
44146732eb0523a4c9bca026a88b80a1c2612a82 |
06-Jun-2013 |
John Reck <jreck@android.com> |
am 2f1b8478: am 1ed8e6ff: am 5a193f9d: Merge "fix typo for AndroidManifest.xml" * commit '2f1b8478057e1ca562fd2a586e13e1fe990e3716': fix typo for AndroidManifest.xml
|
e4f411bc99a2c52ea6693785125a9a9b4403b576 |
06-Jun-2013 |
John Reck <jreck@android.com> |
am 1ed8e6ff: am 5a193f9d: Merge "fix typo for AndroidManifest.xml" * commit '1ed8e6ffcff4efaeb861ccbc0c2483cd17f79a64': fix typo for AndroidManifest.xml
|
1d6823c248f827f1a06dc4777883992659143f30 |
06-Jun-2013 |
John Reck <jreck@android.com> |
am 5a193f9d: Merge "fix typo for AndroidManifest.xml" * commit '5a193f9da6e87c7b15e627aedfb1e8f5d1df66e3': fix typo for AndroidManifest.xml
|
5a193f9da6e87c7b15e627aedfb1e8f5d1df66e3 |
06-Jun-2013 |
John Reck <jreck@android.com> |
Merge "fix typo for AndroidManifest.xml"
|
d97f77b928561c449ed4aa8b614dc659039fda7b |
06-Jun-2013 |
The Android Open Source Project <initial-contribution@android.com> |
am 143563e9: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge * commit '143563e9d0b236322114cfb210eb899a747826dc': Update preview size for focus manager after rotation
|
2a9a63e9969080c9ce5d5f1631ddbc37842f69b2 |
06-Jun-2013 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge Change-Id: I935b9694f3885d28f3d3af62459a91fb354ad6f2
|
7a14c10b8c84c3e0aa3d9621aad0350dddf94273 |
06-Jun-2013 |
The Android Automerger <android-build@google.com> |
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
|
342d3bc940bc8de578b10d5f6944bc5f4c3a6428 |
06-Jun-2013 |
Sungmin Choi <sungmin.choi@lge.com> |
fix typo for AndroidManifest.xml Change-Id: I686047b4807ebcc9bc706a813a63e30d9f826b9f
ndroidManifest.xml
|
ae56dacc8a278cd3dc74995f630b8044af444923 |
05-Jun-2013 |
Doris Liu <tianliu@google.com> |
Add a layout for undo bar Change-Id: Id795f00c8ca5f147f6aae8c1f9cba4e1da1e5b20
es/layout/undo_bar.xml
es/values/colors.xml
es/values/styles.xml
|
53587260ba0873f45a220a2c37fd29ef4e21667e |
05-Jun-2013 |
Doris Liu <tianliu@google.com> |
Update preview size for focus manager after rotation Bug: 9282724 Change-Id: I5c0f0ecb2bf47e9600198450a9fce3590b2c5d10 (cherry picked from commit c71bd4f897a2322baa6765aa8abcf2c3fe35c05a)
rc/com/android/camera/PhotoUI.java
|
b7d13430b030f7d46ed3335d84ff20f11b44efff |
05-Jun-2013 |
Angus Kong <shkong@google.com> |
Merge "Play video from flim strip." into gb-ub-photos-carlsbad
|
af7f620c5170821ab3c3dbfa73e011b03664f9a9 |
05-Jun-2013 |
Angus Kong <shkong@google.com> |
Merge "Add interface for swipe checking." into gb-ub-photos-carlsbad
|
a3bdd2935035548f121815b7c1f66e8f4f59fa85 |
05-Jun-2013 |
John Reck <jreck@google.com> |
Merge "Fix graphical corruption due to tear down race" into gb-ub-photos-carlsbad
|
9285dedd138709376b99d3948d563f896857723c |
05-Jun-2013 |
John Reck <jreck@google.com> |
Fix graphical corruption due to tear down race Bug: 9278945 Change-Id: I7594680322768f60eaed8a1037d139cbadf9706b
rc/com/android/gallery3d/ui/GLRootView.java
|
e9d3f4ca4bb0ea9aa3e474bd1429d931dd6732df |
05-Jun-2013 |
Doris Liu <tianliu@google.com> |
am 164a0b6a: am 6c604d61: Update preview size for focus manager after rotation * commit '164a0b6a74f2f61577cbd473a0e6a4d11a222f1f': Update preview size for focus manager after rotation
|
f2471e413e79f2ae049228dd45f1b1290ccb28c8 |
05-Jun-2013 |
Doris Liu <tianliu@google.com> |
am 6c604d61: Update preview size for focus manager after rotation * commit '6c604d616ff796f1ec41d4ad7212729cf469e8f5': Update preview size for focus manager after rotation
|
a568b3bf5429250d83286dda4986593d94101172 |
05-Jun-2013 |
Doris Liu <tianliu@google.com> |
Update preview size for focus manager after rotation Bug: 9282724 Change-Id: I5c0f0ecb2bf47e9600198450a9fce3590b2c5d10 (cherry picked from commit c71bd4f897a2322baa6765aa8abcf2c3fe35c05a)
rc/com/android/camera/PhotoUI.java
|
49448f8631783fa635a0770345afa850bc0f212a |
05-Jun-2013 |
Angus Kong <shkong@google.com> |
Add interface for swipe checking. And fullscreen notification. Change-Id: Ib264904cca47f1fc90ae5e392f0672c253e4d833
rc/com/android/camera/NewCameraActivity.java
rc/com/android/camera/data/CameraDataAdapter.java
rc/com/android/camera/ui/FilmStripView.java
|
dbc5d9573c1a050ea42009f06c6415871dfb94b1 |
05-Jun-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I1adebd103b1d17cc9047f919934e3e55d55350ef Auto-generated-cl: translation import
es/values-bg/strings.xml
es/values-es-rUS/strings.xml
es/values-fi/strings.xml
es/values-ko/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-tr/strings.xml
es/values-zh-rCN/strings.xml
|
e7081d8ef8b574dff407b7ddf75d6a321ef62178 |
05-Jun-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I347b083e229cf1f1b2a268ed5119f13684cc78d7 Auto-generated-cl: translation import
es/values-bg/strings.xml
es/values-es-rUS/strings.xml
es/values-fi/strings.xml
es/values-ko/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-tr/strings.xml
es/values-zh-rCN/strings.xml
|
5311bd7a2f0d2697a0f9a38029a74f0f94c47d19 |
05-Jun-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Removing unused UI fields in FilterRepresentation." into gb-ub-photos-carlsbad
|
41c100e0dfb2a371c34eb9e9685aa6987d6bf9a6 |
05-Jun-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Removing unused UI fields in FilterRepresentation." into gb-ub-photos-carlsbad
|
ff2386c62da597aa9b49cb765519407ce57c2bcc |
04-Jun-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Removing unused UI fields in FilterRepresentation. Bug: 9170644 Change-Id: Ic197123286e06d9eb64d30eb345f8cc5797659a2
rc/com/android/gallery3d/filtershow/filters/FilterColorBorderRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterCurvesRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterDrawRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterFxRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterImageBorderRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterPointRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterTinyPlanetRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterVignetteRepresentation.java
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
|
17fbd7949abfd2dee5b15e443611c56dac2d6ef3 |
04-Jun-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Removing unused UI fields in FilterRepresentation. Bug: 9170644 Change-Id: Ic197123286e06d9eb64d30eb345f8cc5797659a2
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/category/Action.java
rc/com/android/gallery3d/filtershow/category/CategoryAdapter.java
rc/com/android/gallery3d/filtershow/filters/FilterColorBorderRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterCurvesRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterDrawRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterFxRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterImageBorderRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterPointRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterTinyPlanetRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterVignetteRepresentation.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterBwFilter.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterContrast.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterDownsample.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterEdge.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterExposure.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterHighlights.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterHue.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterKMeans.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterNegative.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterSaturated.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterShadows.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterSharpen.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterVibrance.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterWBalance.java
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
|
0a5240a61c9f885dd78080c1c3a4c7a7fd9a7322 |
05-Jun-2013 |
The Android Automerger <android-build@google.com> |
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
|
a47edf8fdde5e6b7ffc11ae71e61da8e82fd2f47 |
05-Jun-2013 |
Doris Liu <tianliu@google.com> |
Remove the frameLayout wrapping CameraRootView Change-Id: I5a238766b54d3f36c929c53225367cddf90473f9
es/layout/camera.xml
|
b40738a104ac056b9a220c1aec71d2df7446108a |
03-Jun-2013 |
Angus Kong <shkong@google.com> |
Play video from flim strip. Change-Id: Iaedf42d7dabee53f75a20c57f9e6916864ea271f
rc/com/android/camera/NewCameraActivity.java
rc/com/android/camera/Util.java
rc/com/android/camera/data/CameraDataAdapter.java
rc/com/android/camera/data/LocalData.java
rc/com/android/camera/ui/FilmStripView.java
|
7f555884b919d006e4da2ba06a57d9807be711bb |
04-Jun-2013 |
Doris Liu <tianliu@google.com> |
Merge "Get new camera activity up to date" into gb-ub-photos-carlsbad
|
97d5093f721317a3914eb9ba91de961f38c660fd |
04-Jun-2013 |
Doris Liu <tianliu@google.com> |
Fix pie menu button disappearing Change-Id: Ia664ac3115849227848c465067a78ef3aaf445cb
rc/com/android/camera/NewPhotoUI.java
|
366c1307e4cb8e0bcc7d7791d483e2b1e4a570b9 |
04-Jun-2013 |
Angus Kong <shkong@google.com> |
Merge "Add secure camera support." into gb-ub-photos-carlsbad
|
44c5d5ce423bde77019b7dc2c567588b32a51d11 |
04-Jun-2013 |
Angus Kong <shkong@google.com> |
Merge "Add secure camera support." into gb-ub-photos-carlsbad
|
28cc71307aec54676866de256fcd6bec984de011 |
04-Jun-2013 |
The Android Open Source Project <initial-contribution@android.com> |
am c7d13ed3: (-s ours) Reconcile with jb-mr2-release - do not merge * commit 'c7d13ed362760cde68c339cdc733a1f964fc4065': am 8bb4e1a0: Fixes reading exif tags in editor.
|
29a8d5b95b4b872d7596f0c6fcf27a9537202354 |
04-Jun-2013 |
Doris Liu <tianliu@google.com> |
Get new camera activity up to date Change-Id: I24241bc6082052a1da90b9c41c3362af72e47b37
rc/com/android/camera/NewCameraActivity.java
rc/com/android/camera/NewPhotoModule.java
rc/com/android/camera/NewPhotoUI.java
rc/com/android/camera/NewVideoMenu.java
rc/com/android/camera/NewVideoModule.java
rc/com/android/camera/NewVideoUI.java
|
35cd9cf1692d80b860176ba2a2aaab2194fc28d8 |
04-Jun-2013 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with jb-mr2-release - do not merge Change-Id: Id191ec4ec57aba482a2e504c2ad8cd5a1af91c53
|
8ce743f577b2056519fd8e74da272c461ff74e33 |
04-Jun-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Fixes save filename for panos after edit." into gb-ub-photos-carlsbad
|
2d06a167933509422076d4f8e90e4de212866905 |
03-Jun-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Fixes save filename for panos after edit. Bug: 9258209 Change-Id: Ib7404242e5886a38b9e6f9fd6f28a52f1a703590
rc/com/android/gallery3d/filtershow/tools/SaveCopyTask.java
|
38a8c8a1da858f212dbfbcbfd165d8a235545937 |
03-Jun-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 8bb4e1a0: Fixes reading exif tags in editor. * commit '8bb4e1a036e67a3bf4f9cdb8f55d6f558189e5b9': Fixes reading exif tags in editor.
rc/com/android/gallery3d/filtershow/tools/SaveCopyTask.java
|
a57db33122bae9e2a56f250d01a74d42f97a37c5 |
03-Jun-2013 |
Baligh Uddin <baligh@google.com> |
am 2c9a2912: (-s ours) am 2ca1f2a7: am e40d9a1e: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce * commit '2c9a291277f3eb6c13943cdca3fd99c74b2ee3b3': Import translations. DO NOT MERGE
|
d8c404125a42b5790e3d1f7caab64eafe34f797e |
03-Jun-2013 |
Baligh Uddin <baligh@google.com> |
am a2a4244b: (-s ours) am 42989297: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev * commit 'a2a4244b68d49ac565b94830817d9f850e2d6fcf': Import translations. DO NOT MERGE
|
8b33eb94ab80847205890ab634ab6cb6119a25ec |
03-Jun-2013 |
Baligh Uddin <baligh@google.com> |
am 2ca1f2a7: am e40d9a1e: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce * commit '2ca1f2a7a4cec46988bfc95df5ac056316584f98': Import translations. DO NOT MERGE
|
e22e180f0012d6bf2bbae3656099e09af6198a9f |
03-Jun-2013 |
Baligh Uddin <baligh@google.com> |
am 42989297: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev * commit '42989297a71cbb59544646fb83551aeac20cc3c5': Import translations. DO NOT MERGE
|
e15298dccbc5a12276b814f4bed88514088d36aa |
03-Jun-2013 |
Baligh Uddin <baligh@google.com> |
am e40d9a1e: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce * commit 'e40d9a1e39596220d1949b869ed4c167ca8e63a5': Import translations. DO NOT MERGE
|
9772b610bd30cfa4d98882a2fe345c7650823991 |
03-Jun-2013 |
Baligh Uddin <baligh@google.com> |
am e40d9a1e: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce * commit 'e40d9a1e39596220d1949b869ed4c167ca8e63a5': Import translations. DO NOT MERGE
|
55c781f767ed09b35e135e0f31d5b2e69d4b4f30 |
03-Jun-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE"
|
a9489568b3a85bc2eecbc4fdd420644ca3c0c8de |
03-Jun-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
|
e40d9a1e39596220d1949b869ed4c167ca8e63a5 |
03-Jun-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
|
61544549e543aebb69742ceda6e6235bea979630 |
03-Jun-2013 |
Angus Kong <shkong@google.com> |
Add play icon for videos. Change-Id: Idf73da3c2a8a3beaf45da9f8219ed71c720a5bfd
rc/com/android/camera/data/LocalData.java
|
21de3320953d34b8e833c251dfcf973603c1d758 |
03-Jun-2013 |
The Android Open Source Project <initial-contribution@android.com> |
am e96b631b: (-s ours) Reconcile with jb-mr2-release - do not merge * commit 'e96b631b07bc8c08d32c86ec5fedc62cfcbee7d4':
|
f8e45028eb7f69f74292f4b739c01b58b90f2abd |
03-Jun-2013 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with jb-mr2-release - do not merge Change-Id: If28ee81947b5975843ee6843824e5f7069333251
|
186e6b94150461d384d6bb62bc372a934733588c |
03-Jun-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I5e31d242897106475b71dcc9f670eabd8a5963e7 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
31b60d949b76fbc39c97e73e606dd81f43b80c28 |
03-Jun-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ie4057f8b26e13a412015e6e45a50aa5bbf5f077f Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
ff0f0fc58acdb1644200edba048c0c152bd6ba35 |
03-Jun-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I8b878349f27250babd1dc79b0a152ae19293242e Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
60f3d8efb15fb73f341e6fa84ca3df6d0a5e8a35 |
03-Jun-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I8b878349f27250babd1dc79b0a152ae19293242e Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
e3c3c87822ff806ee048be15d9b6710f9eac9eb0 |
03-Jun-2013 |
Angus Kong <shkong@google.com> |
Add secure camera support. Change-Id: I672d76cb4de37c46394a5e8ee2899cf571158a2c
es/layout/secure_album_placeholder.xml
|
a06b4e2f2664bdd0b966ed3fb24e560cd9be7124 |
03-Jun-2013 |
Angus Kong <shkong@google.com> |
Add secure camera support. Change-Id: I672d76cb4de37c46394a5e8ee2899cf571158a2c
rc/com/android/camera/NewCameraActivity.java
rc/com/android/camera/data/CameraDataAdapter.java
rc/com/android/camera/data/LocalData.java
|
34205180659c12e65a2f9f7cecba107534722522 |
03-Jun-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 8481c661: am 536c651c: am 8bb4e1a0: Fixes reading exif tags in editor. * commit '8481c661729888b86f2958de3ac3f4008bcac078': Fixes reading exif tags in editor.
|
c44da2a89e2461881baafb73549f37cbc6c68b0c |
03-Jun-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 536c651c: am 8bb4e1a0: Fixes reading exif tags in editor. * commit '536c651c7fa0c8e70990ba8ff302cdc98e8c3105': Fixes reading exif tags in editor.
|
4c400b2f79ff7b4b4f11f5b45326316ac7af075c |
03-Jun-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 8bb4e1a0: Fixes reading exif tags in editor. * commit '8bb4e1a036e67a3bf4f9cdb8f55d6f558189e5b9': Fixes reading exif tags in editor.
|
a838472f25d2d42461308c0f05662efd6a7df70d |
03-Jun-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 8bb4e1a0: Fixes reading exif tags in editor. * commit '8bb4e1a036e67a3bf4f9cdb8f55d6f558189e5b9': Fixes reading exif tags in editor.
|
8bb4e1a036e67a3bf4f9cdb8f55d6f558189e5b9 |
03-Jun-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Fixes reading exif tags in editor. Bug: 9140401 Change-Id: Ic84efca90c5297ab2c6a65b13d512c4799e623f6
rc/com/android/gallery3d/filtershow/tools/SaveCopyTask.java
|
1f48263ef924d9c92deb1e11b3b0cf94673ac1c5 |
03-Jun-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Fixes reading exif tags in editor. Bug: 9140401 Change-Id: Ic84efca90c5297ab2c6a65b13d512c4799e623f6
rc/com/android/gallery3d/filtershow/tools/SaveCopyTask.java
|
3939633cad71e4e9da482752dd3b1cde850ef963 |
03-Jun-2013 |
ztenghui <ztenghui@google.com> |
Merge "Add LUT3D filter state saving" into gb-ub-photos-carlsbad
|
d93c11de769ce07c9821381ca91efe3ae50de043 |
03-Jun-2013 |
ztenghui <ztenghui@google.com> |
Merge "Add LUT3D filter state saving" into gb-ub-photos-carlsbad
|
31f71961edadf2f9d6c137b3bd4cb4d3a3db1f27 |
03-Jun-2013 |
Doris Liu <tianliu@google.com> |
Merge "Add recent changes to new photo module" into gb-ub-photos-carlsbad
|
4c32ba1965fd295bc15f831d44e10aea2daa39f4 |
02-Jun-2013 |
The Android Automerger <android-build@google.com> |
merge in jb-mr2-release history after reset to jb-mr2-dev
|
e24e93d2ed9a050ce4bbc69dd333e52213509217 |
01-Jun-2013 |
Baligh Uddin <baligh@google.com> |
am 9e7158e6: (-s ours) am ae6d04d8: am 6d1345aa: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce * commit '9e7158e664250b545efc36ab4694ac8e72f59df2': Import translations. DO NOT MERGE
|
a4116f31612750e73a6140841d94d9b15a9ccdba |
01-Jun-2013 |
Baligh Uddin <baligh@google.com> |
am b85c039a: (-s ours) am f43b2a96: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev * commit 'b85c039a5134b778c2b2142ed2ba20f3c87cf20e': Import translations. DO NOT MERGE
|
c487b5f067ca55b04dc88afeb170fc460b1cb947 |
01-Jun-2013 |
Baligh Uddin <baligh@google.com> |
am ae6d04d8: am 6d1345aa: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce * commit 'ae6d04d8ce3717a09a54b8b120f4680ca91036ba': Import translations. DO NOT MERGE
|
1f49a240feefaf5bf12aef1ed6c4d2a15e2c755a |
01-Jun-2013 |
Baligh Uddin <baligh@google.com> |
am f43b2a96: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev * commit 'f43b2a96b6606cc6b908cf507688d375c468a74a': Import translations. DO NOT MERGE
|
4f14938f803b017111cceb1df40332ad9bc2d261 |
01-Jun-2013 |
Baligh Uddin <baligh@google.com> |
am 6d1345aa: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce * commit '6d1345aa496d9f5caedae6b3b0c5b6132fb01893': Import translations. DO NOT MERGE
|
625cb9c8c33ad4f4d54468e8cc5afd469a3ae7b6 |
01-Jun-2013 |
Baligh Uddin <baligh@google.com> |
am 6d1345aa: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce * commit '6d1345aa496d9f5caedae6b3b0c5b6132fb01893': Import translations. DO NOT MERGE
|
4da5967b9ebdd0156e3bf47de2ab9c32a18d1b77 |
01-Jun-2013 |
Doris Liu <tianliu@google.com> |
Add recent changes to new photo module Change-Id: Icd29a41e1564094e4feafd6c4d4c809f6253753d
rc/com/android/camera/NewCameraModule.java
rc/com/android/camera/NewPhotoMenu.java
rc/com/android/camera/NewPhotoModule.java
rc/com/android/camera/NewPhotoUI.java
rc/com/android/camera/NewVideoModule.java
rc/com/android/camera/NewVideoUI.java
rc/com/android/camera/ui/NewCameraRootView.java
|
885367cc5add241f6cb9ac243381400b497d630e |
01-Jun-2013 |
Angus Kong <shkong@google.com> |
Add newly taken photos/videos to film strip. Change-Id: I82d9e83d0a45f14036a194cf1ad5793b436357cd
rc/com/android/camera/NewCameraActivity.java
rc/com/android/camera/NewPhotoModule.java
rc/com/android/camera/NewVideoModule.java
rc/com/android/camera/data/CameraDataAdapter.java
|
71e436c3c839b5dccb409e93abb6509b21144b14 |
01-Jun-2013 |
ztenghui <ztenghui@google.com> |
Add LUT3D filter state saving Change-Id: I195fad1dcad5639c30a2eb94ce28cfd0a2464018
rc/com/android/gallery3d/filtershow/filters/BaseFiltersManager.java
rc/com/android/gallery3d/filtershow/filters/FilterFxRepresentation.java
|
c2efb326a63e869b2e1e5fcf693795d68eb66bfe |
01-Jun-2013 |
ztenghui <ztenghui@google.com> |
Add LUT3D filter state saving Change-Id: I195fad1dcad5639c30a2eb94ce28cfd0a2464018
rc/com/android/gallery3d/filtershow/filters/FilterFxRepresentation.java
|
232ed0f1cdd09563ba0aa5f7648d45465d95d8d8 |
01-Jun-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE"
|
fc8d6658ef35c5b58e8669e8cd08208abbcc17e1 |
01-Jun-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
|
20af1d4037a14be77d59137b2fdd3caab5a40733 |
01-Jun-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
|
6d1345aa496d9f5caedae6b3b0c5b6132fb01893 |
01-Jun-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
|
5334fa3036425acf843072f32af72565b5547cf3 |
31-May-2013 |
Angus Kong <shkong@google.com> |
Merge "Adjust data id even if it's not currently used." into gb-ub-photos-carlsbad
|
7f6f7737b5d71ab6720c093702a99f77ddc0db02 |
14-May-2013 |
Doris Liu <tianliu@google.com> |
Improve gesture handling Change-Id: Ib1e18274480b6bb681bd06f3130f9b9ea198ea98
es/layout-land/camera_controls.xml
es/layout-port/camera_controls.xml
rc/com/android/camera/NewPreviewGestures.java
|
fb57df15a87f95ce8b2f861e54d960602912e03c |
14-May-2013 |
Doris Liu <tianliu@google.com> |
Improve gesture handling Change-Id: Ib1e18274480b6bb681bd06f3130f9b9ea198ea98
rc/com/android/camera/NewPhotoModule.java
rc/com/android/camera/NewPhotoUI.java
rc/com/android/camera/NewPreviewGestures.java
rc/com/android/camera/NewVideoUI.java
rc/com/android/camera/ui/FilmStripView.java
rc/com/android/camera/ui/NewCameraRootView.java
rc/com/android/camera/ui/PieMenuButton.java
rc/com/android/camera/ui/PieRenderer.java
rc/com/android/camera/ui/RenderOverlay.java
|
f464958e6bc926e0c4a776d11a9f2aa8514a866f |
31-May-2013 |
Angus Kong <shkong@google.com> |
Merge "Translate the first/last view too." into gb-ub-photos-carlsbad
|
d3992d8958aa8067c4803f113bcbab9e7f5a61b0 |
31-May-2013 |
Angus Kong <shkong@google.com> |
Merge "Don't use the same drawable for every view." into gb-ub-photos-carlsbad
|
067a56d3e43642e6ddfdad357ba6bdf4b3d2015f |
31-May-2013 |
Angus Kong <shkong@google.com> |
Merge "Fix mistakenly reversed order in FilmStripView." into gb-ub-photos-carlsbad
|
649feec605b225342139c7460bf0af10a815e890 |
31-May-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Mirroring google3 for CL 47368174. Change-Id: Ic29d8d6784870660e0bd83f870ec2cf0c244746d
rc/com/android/gallery3d/filtershow/filters/FilterRepresentation.java
|
111bc7aeea0653f1a823af24174cd073420a9515 |
31-May-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Mirroring google3 for CL 47368174. Change-Id: Ic29d8d6784870660e0bd83f870ec2cf0c244746d
rc/com/android/gallery3d/filtershow/filters/FilterRepresentation.java
|
accc6e55bbf0186be316e81fb4e82da4731f72e0 |
31-May-2013 |
Angus Kong <shkong@google.com> |
Don't use the same drawable for every view. The placeholder drawable should be cloned for each view using it. Change-Id: Ic9f7614cc91c95a16105b3b8a9e07c81a8f1a2d7
rc/com/android/camera/data/CameraDataAdapter.java
|
cf442dc2b191e5a472e29e9be7f671b12080e271 |
31-May-2013 |
Stephen Hines <srhines@google.com> |
am d49e5609: am f39b88ca: am fb428906: Use hyphenated path for android-support-v8-renderscript. * commit 'd49e56097a63a3d4047c2765ff3b13bc76690667': Use hyphenated path for android-support-v8-renderscript.
|
ba5bd974bad2ffda23e3f204a81c9b22c1b93072 |
31-May-2013 |
Stephen Hines <srhines@google.com> |
am e367d29b: am f322c3af: Merge "Use hyphenated path for android-support-v8-renderscript." into jb-mr2-dev * commit 'e367d29b0838761f9cd1d7a2983c9cbfb10136b8': Use hyphenated path for android-support-v8-renderscript.
|
d22b506d1014b7d5ea97459d124d5589fc0df5fb |
31-May-2013 |
Michael Kolb <kolby@google.com> |
am 26b52f3c: am 3fac8415: am af65d7ba: Merge "Add HTC One picture resolutions" into gb-ub-photos-bryce * commit '26b52f3c12169a5776f948a89bb0bcc900a0c356': Add HTC One picture resolutions
|
c31569ce211414f6db2447cc84ca71115f916b6f |
31-May-2013 |
Angus Kong <shkong@google.com> |
Adjust data id even if it's not currently used. FilmStripView should adjust the internal info of data id after removal regardless of the existence of the removed data in the buffer. Change-Id: I78202997525a96a88f7bba8e0d55b7f6aad2c9cf
rc/com/android/camera/ui/FilmStripView.java
|
e4fa973c236d1293abf341e97e0debb9f287efbe |
31-May-2013 |
Angus Kong <shkong@google.com> |
am 4dbf12d1: am 66c23659: am a1db2653: Dismiss settings when showing popup in Video mode. * commit '4dbf12d1a01e400ccb4d6dc1a5bbc5ca1dfa178a': Dismiss settings when showing popup in Video mode.
|
d226055a9d7c2c38506f208149471ad4ab632641 |
31-May-2013 |
Stephen Hines <srhines@google.com> |
am f39b88ca: am fb428906: Use hyphenated path for android-support-v8-renderscript. * commit 'f39b88cafa70280ff577b018aa6a59e89ee85ee7': Use hyphenated path for android-support-v8-renderscript.
|
05675f743408635454cf30813422b0226e786b08 |
31-May-2013 |
Stephen Hines <srhines@google.com> |
am fb428906: Use hyphenated path for android-support-v8-renderscript. * commit 'fb428906549212790a031615c48ba7f8df3f8aa3': Use hyphenated path for android-support-v8-renderscript.
|
0fdb6069f0a5cdd12247ba7a6bafe387661735c6 |
31-May-2013 |
Stephen Hines <srhines@google.com> |
am fb428906: Use hyphenated path for android-support-v8-renderscript. * commit 'fb428906549212790a031615c48ba7f8df3f8aa3': Use hyphenated path for android-support-v8-renderscript.
|
0980fe89b2c0d2d8f75cb43a5fe06c00b8c8901e |
29-May-2013 |
Angus Kong <shkong@google.com> |
Translate the first/last view too. Change-Id: Iea6dfa8acc632596fdf05001b6b11d11d014a8a0
rc/com/android/camera/ui/FilmStripView.java
|
7283c609ccca310cfc39a3d25bb1c58f4198a341 |
30-May-2013 |
Angus Kong <shkong@google.com> |
Fix mistakenly reversed order in FilmStripView. Change-Id: Ia9b285adbf448383e8f19081a16b8351b3c201e4
rc/com/android/camera/data/LocalData.java
|
fb428906549212790a031615c48ba7f8df3f8aa3 |
29-May-2013 |
Stephen Hines <srhines@google.com> |
Use hyphenated path for android-support-v8-renderscript. Bug: 9188088 Change-Id: Id30e0a67d89419aeb323f43bf5e65321bf862e79 (cherry picked from commit 79f4335753c1cffba15d6c7ea5ec6b7bb3db3f8e)
ndroid.mk
|
51e2332e79dc9be46210c3bf3ae3c7087b5175e3 |
29-May-2013 |
Stephen Hines <srhines@google.com> |
Use hyphenated path for android-support-v8-renderscript. Bug: 9188088 Change-Id: Id30e0a67d89419aeb323f43bf5e65321bf862e79 (cherry picked from commit 79f4335753c1cffba15d6c7ea5ec6b7bb3db3f8e)
ndroid.mk
|
ea6b4a043196ac7e4b2742b1d5ff3f56482a7ab1 |
30-May-2013 |
The Android Open Source Project <initial-contribution@android.com> |
am 53c01796: (-s ours) Reconcile with jb-mr2-release - do not merge * commit '53c017961c78d7ed9e95ec081cf821db2ba91745':
|
d0bed142b84999dc825c36e48b38bcbc953344a3 |
30-May-2013 |
Stephen Hines <srhines@google.com> |
am f322c3af: Merge "Use hyphenated path for android-support-v8-renderscript." into jb-mr2-dev * commit 'f322c3afa867b423dc803dc2bc2f065f2da1d0bd': Use hyphenated path for android-support-v8-renderscript.
|
0f3e0c98f7df2af32b65f085e3652215d91a70df |
30-May-2013 |
Stephen Hines <srhines@google.com> |
Merge "Use hyphenated path for android-support-v8-renderscript." into jb-mr2-dev
|
facfdfee0545321a8ecbaaf27b393e880efbcc4d |
30-May-2013 |
Michael Kolb <kolby@google.com> |
am 3fac8415: am af65d7ba: Merge "Add HTC One picture resolutions" into gb-ub-photos-bryce * commit '3fac84150826c68fbb1607f7151328ee4ad17f3c': Add HTC One picture resolutions
|
b854b303ee8df164541e334c417878b4e48e5c91 |
30-May-2013 |
Michael Kolb <kolby@google.com> |
am af65d7ba: Merge "Add HTC One picture resolutions" into gb-ub-photos-bryce * commit 'af65d7ba216eba60651d11d248d20346309375ed': Add HTC One picture resolutions
|
9d6561494d28e8e8c6f1add50ab7724df722525b |
30-May-2013 |
Michael Kolb <kolby@google.com> |
am af65d7ba: Merge "Add HTC One picture resolutions" into gb-ub-photos-bryce * commit 'af65d7ba216eba60651d11d248d20346309375ed': Add HTC One picture resolutions
|
d554ed3a6d3a941d53c26b4af7cc291a4fa5eeb2 |
30-May-2013 |
Michael Kolb <kolby@google.com> |
am af65d7ba: Merge "Add HTC One picture resolutions" into gb-ub-photos-bryce * commit 'af65d7ba216eba60651d11d248d20346309375ed': Add HTC One picture resolutions
|
d42c203a7fbbef58af268e7dcec295b7cdca6e4a |
30-May-2013 |
Michael Kolb <kolby@google.com> |
Merge "Add HTC One picture resolutions" into gb-ub-photos-bryce
|
d6c1993f6c24ff64c18a40ab596d5131b02d6f51 |
30-May-2013 |
Michael Kolb <kolby@google.com> |
Merge "Add HTC One picture resolutions" into gb-ub-photos-bryce
|
af65d7ba216eba60651d11d248d20346309375ed |
30-May-2013 |
Michael Kolb <kolby@google.com> |
Merge "Add HTC One picture resolutions" into gb-ub-photos-bryce
|
4a4d4ef24b7edbbdf1614373880681e5406df246 |
30-May-2013 |
Michael Kolb <kolby@google.com> |
Add HTC One picture resolutions Bug: 9175168 Fixes bug where preview is not stopped before size changes Change-Id: I2df136482df68a952c9d3ca5c058ba56ff3a6db8
rc/com/android/camera/PhotoModule.java
|
6610eead313278bd03f5b30e35992ad1eea40b22 |
30-May-2013 |
Michael Kolb <kolby@google.com> |
Add HTC One picture resolutions Bug: 9175168 Fixes bug where preview is not stopped before size changes Change-Id: I2df136482df68a952c9d3ca5c058ba56ff3a6db8
es/values/arrays.xml
es/values/strings.xml
|
dadbad39d82cef83afa7114359a9faf8d195e9fa |
30-May-2013 |
Michael Kolb <kolby@google.com> |
Add HTC One picture resolutions Bug: 9175168 Fixes bug where preview is not stopped before size changes Change-Id: I2df136482df68a952c9d3ca5c058ba56ff3a6db8
es/values/arrays.xml
es/values/strings.xml
rc/com/android/camera/PhotoModule.java
|
e975f77483fcbe57a44c51af7a83d635c210678f |
30-May-2013 |
Angus Kong <shkong@google.com> |
am 66c23659: am a1db2653: Dismiss settings when showing popup in Video mode. * commit '66c236598a273c308384423a1d9babce05c79588': Dismiss settings when showing popup in Video mode.
|
32d50e89e7877a2b38573d20a8251850c87e7851 |
30-May-2013 |
Angus Kong <shkong@google.com> |
am a1db2653: Dismiss settings when showing popup in Video mode. * commit 'a1db26536913f1259ad74c5e6e952521c05bf2f0': Dismiss settings when showing popup in Video mode.
|
2a9e86bc9780a47be03fe520d0c1ebc01f74b59c |
30-May-2013 |
Angus Kong <shkong@google.com> |
am a1db2653: Dismiss settings when showing popup in Video mode. * commit 'a1db26536913f1259ad74c5e6e952521c05bf2f0': Dismiss settings when showing popup in Video mode.
|
9cbfe8d5ea68308ece1e57b4b8e38bf5f0344951 |
30-May-2013 |
John Reck <jreck@google.com> |
Copy Tiling changes from G+ Change-Id: Id229728182a002c29699884289f1354b6cb6e714
rc/com/android/photos/BitmapRegionTileSource.java
rc/com/android/photos/FullscreenViewer.java
rc/com/android/photos/views/BlockingGLTextureView.java
rc/com/android/photos/views/TiledImageRenderer.java
rc/com/android/photos/views/TiledImageView.java
|
7062f9199797d2fdd3fcc0f1c83bef4bd6cce779 |
30-May-2013 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with jb-mr2-release - do not merge Change-Id: Iafe6038c4a1cfd9f5fa19c0aa5697923ac7d3db8
|
1aa2e0494117affee46082c085079521a2fbb902 |
30-May-2013 |
The Android Automerger <android-build@google.com> |
merge in jb-mr2-release history after reset to jb-mr2-dev
|
3adeb85975bc5c160544b265999b89f891e22c2f |
30-May-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ib3f5ccf1b233ef453d7f1d62d9a30d6ad0466e9e Auto-generated-cl: translation import
es/values-bg/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hr/strings.xml
es/values-in/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-ms/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
|
8ea2d776b5f6c9bc874a1defce92e99dfd167b68 |
30-May-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ia77532a1e48fb42897f9574cbf02c5deafb0914d Auto-generated-cl: translation import
es/values-bg/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hr/strings.xml
es/values-in/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-ms/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
|
f7fe7116ee67ddd39f1809a396e79b9f014067c6 |
30-May-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I1d9ab8dc2f246b9456ba677ee3a657306fbefcb7 Auto-generated-cl: translation import
es/values-bg/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hr/strings.xml
es/values-in/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-ms/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
|
d6fa8c53588dc37b05052f3eeedc46abfe22331e |
30-May-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I1d9ab8dc2f246b9456ba677ee3a657306fbefcb7 Auto-generated-cl: translation import
es/values-bg/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hr/strings.xml
es/values-in/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-ms/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
|
91fffb39cf1eb7919cab48c56eb1b44727f4e5c2 |
30-May-2013 |
Angus Kong <shkong@google.com> |
Dismiss settings when showing popup in Video mode. bug:8771618 Change-Id: I889b794c6732b674e26436f950e81f67529012e7
rc/com/android/camera/VideoUI.java
|
a1db26536913f1259ad74c5e6e952521c05bf2f0 |
30-May-2013 |
Angus Kong <shkong@google.com> |
Dismiss settings when showing popup in Video mode. bug:8771618 Change-Id: I889b794c6732b674e26436f950e81f67529012e7
rc/com/android/camera/VideoUI.java
|
c20713ce1fb9c66b1e9d35723452097929944964 |
30-May-2013 |
Baligh Uddin <baligh@google.com> |
am 9695037c: (-s ours) am cd9e75af: am b3753390: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce * commit '9695037c72a8d291cf731e220acd3807c87e4fb1': Import translations. DO NOT MERGE
|
3efd44d6bf02770cd30a5c27618de242d61df226 |
30-May-2013 |
Baligh Uddin <baligh@google.com> |
am cd9e75af: am b3753390: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce * commit 'cd9e75af015aa06d6e37a126d1ee92bfd63496dc': Import translations. DO NOT MERGE
|
0efed3376f258dda68976f6debb083cbee174333 |
30-May-2013 |
Baligh Uddin <baligh@google.com> |
am ed6bb750: (-s ours) am a7707160: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev * commit 'ed6bb750c1662cff918d157b0ea3d2ce0c7e4108': Import translations. DO NOT MERGE
|
fa6222c553a3e34d975438fa354205a2a6f2aca5 |
30-May-2013 |
Baligh Uddin <baligh@google.com> |
am a7707160: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev * commit 'a7707160ba8d9693ffdb813e0eb2cd3f15084a7f': Import translations. DO NOT MERGE
|
1a0a4ad51235d2af106f85aca5963587ec50278c |
30-May-2013 |
Baligh Uddin <baligh@google.com> |
am b3753390: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce * commit 'b375339072a32c57ebb06523abeaebd2db29dc08': Import translations. DO NOT MERGE
|
af98c95d8e526b4b1d464aecd1c8a273707d1fec |
30-May-2013 |
Baligh Uddin <baligh@google.com> |
am b3753390: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce * commit 'b375339072a32c57ebb06523abeaebd2db29dc08': Import translations. DO NOT MERGE
|
2f7d041680fd6e65c3b4f14922a27a5da7a90820 |
29-May-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE"
|
86bc22a5f2948ae098cb7b97e21d55676cd15738 |
29-May-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
|
b375339072a32c57ebb06523abeaebd2db29dc08 |
29-May-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
|
c58d6414da1cc38f07f0512f4debf92e8c738ca0 |
29-May-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Cleaning up ImageShow. Bug: 9170644 Change-Id: Iab44ec425462e9afe8c104c52e4a28c4145d4690
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/editors/Editor.java
rc/com/android/gallery3d/filtershow/editors/EditorPanel.java
rc/com/android/gallery3d/filtershow/imageshow/ImageDraw.java
rc/com/android/gallery3d/filtershow/imageshow/ImageGeometry.java
rc/com/android/gallery3d/filtershow/imageshow/ImageShow.java
rc/com/android/gallery3d/filtershow/ui/ImageCurves.java
|
ae3d53c4e53b3a3fb4f785ddc17ca5c5251e311c |
29-May-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Cleaning up ImageShow. Bug: 9170644 Change-Id: Iab44ec425462e9afe8c104c52e4a28c4145d4690
es/values/dimens.xml
es/values/dimensions.xml
|
14c458d819037f5782c8c64f73c5109004ea8acf |
29-May-2013 |
Stephen Hines <srhines@google.com> |
Use hyphenated path for android-support-v8-renderscript. Bug: 9188088 Change-Id: Id435b35712fd944369b8515f7f84ea30f1eecbe3
ndroid.mk
|
a9aef942d9fd9e352fce50429ea36760a26f0467 |
29-May-2013 |
Stephen Hines <srhines@google.com> |
Use hyphenated path for android-support-v8-renderscript. Bug: 9188088 Change-Id: Id30e0a67d89419aeb323f43bf5e65321bf862e79
ndroid.mk
|
849c8173361ce83bf27aa4a77625ad6a04fb7540 |
29-May-2013 |
The Android Open Source Project <initial-contribution@android.com> |
am a4a4e0b3: (-s ours) Reconcile with jb-mr2-release - do not merge * commit 'a4a4e0b3cb74f6cea857ed2c8a4315e1ffc30bac':
|
82ebc35ff9cd21ee77f1d2fc5a1044629242820c |
29-May-2013 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with jb-mr2-release - do not merge Change-Id: I2a6743d468c9daa2f59f5d249964bbe3abb274ca
|
5713c7f1ac26c208ab43d07f83c36e1e3ff74cbe |
29-May-2013 |
The Android Automerger <android-build@google.com> |
merge in jb-mr2-release history after reset to jb-mr2-dev
|
45849dc5f3bd76ab28452898d68e524792252dc8 |
29-May-2013 |
John Hoford <hoford@google.com> |
Merge "zoom to center of double tap" into gb-ub-photos-carlsbad
|
96ba2fbe1ad0e29673eaf5ceaa1ca256239dedac |
29-May-2013 |
Angus Kong <shkong@google.com> |
Merge "Add UI for insertion in FilmStripView." into gb-ub-photos-carlsbad
|
723cd37ea7da0cf6f7264007b271683613ce2f47 |
29-May-2013 |
John Hoford <hoford@google.com> |
zoom to center of double tap Change-Id: Idfc257f92dd1a97d9109b9f5325299b8e1432c37
rc/com/android/gallery3d/filtershow/imageshow/ImageShow.java
rc/com/android/gallery3d/filtershow/imageshow/MasterImage.java
|
f91b03fd66f37fcabe3581011a58b37977ff2922 |
29-May-2013 |
George Mount <mount@google.com> |
Merge "Recover from bitmap decode failure." into gb-ub-photos-carlsbad
|
98df4dc894b8d8b8a6cac932ce193fddb7858e99 |
29-May-2013 |
George Mount <mount@google.com> |
Recover from bitmap decode failure. Skia errors out when decoding a bitmap into another bitmap sometimes. When this situation is detected, the decode is is retried without reusing a bitmap. Change-Id: I935dec988ed7e115ceda9233a65d3b6083a17468
rc/com/android/photos/data/BitmapDecoder.java
|
cce2fe4b1c5e113345e0e8dd5c7681d474fffd61 |
28-May-2013 |
Angus Kong <shkong@google.com> |
Add UI for insertion in FilmStripView. Change-Id: Iff389525e3811c5018365b6e6c3b9f8b95b9da9a
es/values/dimens.xml
|
e78541f2edf2f02660c34660114e76d53b32ab8b |
28-May-2013 |
Angus Kong <shkong@google.com> |
Add UI for insertion in FilmStripView. Change-Id: Iff389525e3811c5018365b6e6c3b9f8b95b9da9a
rc/com/android/camera/NewCameraActivity.java
rc/com/android/camera/ui/FilmStripView.java
|
888764650c93b30f720bfcdaf72827a0cdb964d5 |
28-May-2013 |
Jeff Sharkey <jsharkey@android.com> |
Fix XML comment. Change-Id: If54672cc7cb9ad6a240bb2dff07cbe9c39a521a3 (cherry picked from commit 53a0d0aa62b5f33ca3ff2c9ec63a4bcf606c5292)
ndroidManifest.xml
|
4c3166e7b89c179ab028d705f537f0768ebfdeda |
28-May-2013 |
Doris Liu <tianliu@google.com> |
am 9e11dddd: am 00d9601b: am 9fb962fe: Merge "Change the order of exposure compensation" into gb-ub-photos-bryce * commit '9e11dddd508dff7b8d24c56989d70c6ff67ca619': Change the order of exposure compensation
|
f33ba01a9dcab55e669aeec80b94d71f8a0516ec |
28-May-2013 |
Bobby Georgescu <georgescu@google.com> |
am c4ef64c8: am c1aaf4b5: am e3336dc3: Merge "Prevent lock screen appearing during active slideshow" into gb-ub-photos-bryce * commit 'c4ef64c8cc8ba7edc543f64efcb25c401cc94466': Prevent lock screen appearing during active slideshow
|
5c2a64cfa8f6a7a31d49a0bc119d6ffdd13611f4 |
28-May-2013 |
The Android Open Source Project <initial-contribution@android.com> |
am f6f4abec: (-s ours) Reconcile with jb-mr2-release - do not merge * commit 'f6f4abec09afda4d802ac0b7b2006d86a6161892':
|
260b999e473f5a4ef616ed0da5edf332a2fce2dd |
28-May-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Removed unused ZoomCache class. Bug: 9170644 Note: this class doesn't appear to have been used by the zoom on doubletap. Change-Id: Ie3319511ade7732976488f2bb7d76c5e1c130db9
rc/com/android/gallery3d/filtershow/cache/ImageLoader.java
rc/com/android/gallery3d/filtershow/cache/ZoomCache.java
|
88741b480f3dece25ac06a87d3752e995bdd53c5 |
28-May-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Removed unused handling for intent extras in editor. Bug: 9170644 Change-Id: I569b16d278d1813f5a96f9e0231ed71ff9e33687
rc/com/android/camera/NewPhotoModule.java
rc/com/android/camera/PhotoModule.java
rc/com/android/gallery3d/app/AlbumPage.java
rc/com/android/gallery3d/app/Wallpaper.java
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/cache/ImageLoader.java
rc/com/android/gallery3d/filtershow/imageshow/ImageShow.java
rc/com/android/gallery3d/filtershow/tools/BitmapTask.java
rc/com/android/gallery3d/gadget/WidgetConfigure.java
rc/com/android/photos/MultiChoiceManager.java
|
e9f9783712f3fd8a474d8b025fffdf0b2a3e00f5 |
28-May-2013 |
Doris Liu <tianliu@google.com> |
am 00d9601b: am 9fb962fe: Merge "Change the order of exposure compensation" into gb-ub-photos-bryce * commit '00d9601b666106c3a1b60beb88639c70b8548ddc': Change the order of exposure compensation
|
dc8c999fa304207f2acbc25d0f1c26a25c85944f |
28-May-2013 |
Doris Liu <tianliu@google.com> |
am 9fb962fe: Merge "Change the order of exposure compensation" into gb-ub-photos-bryce * commit '9fb962feb94909af05ab6cf872eee7e8928eb9b1': Change the order of exposure compensation
|
94472c3dc397cfa9a8fad5ba7628253ec6642ed6 |
28-May-2013 |
Doris Liu <tianliu@google.com> |
am 9fb962fe: Merge "Change the order of exposure compensation" into gb-ub-photos-bryce * commit '9fb962feb94909af05ab6cf872eee7e8928eb9b1': Change the order of exposure compensation
|
3bbe0f9f61e3702b46a43e0537060a7a609104b2 |
28-May-2013 |
Doris Liu <tianliu@google.com> |
Merge "Change the order of exposure compensation" into gb-ub-photos-bryce
|
9fb962feb94909af05ab6cf872eee7e8928eb9b1 |
28-May-2013 |
Doris Liu <tianliu@google.com> |
Merge "Change the order of exposure compensation" into gb-ub-photos-bryce
|
e79013abc5d54d648d09153291e7ee7c16f97d2c |
28-May-2013 |
Bobby Georgescu <georgescu@google.com> |
am c1aaf4b5: am e3336dc3: Merge "Prevent lock screen appearing during active slideshow" into gb-ub-photos-bryce * commit 'c1aaf4b526507245428ef56a03727a5d0fb68659': Prevent lock screen appearing during active slideshow
|
f8c7bff9f5b88fb83696e192c3ff343fa810c5b9 |
28-May-2013 |
Bobby Georgescu <georgescu@google.com> |
am e3336dc3: Merge "Prevent lock screen appearing during active slideshow" into gb-ub-photos-bryce * commit 'e3336dc35f514e3b5dd7a15f9a86eaf6d1572b5e': Prevent lock screen appearing during active slideshow
|
562414813ab2dd8ca0df4149d12c588e12101d00 |
28-May-2013 |
Bobby Georgescu <georgescu@google.com> |
am e3336dc3: Merge "Prevent lock screen appearing during active slideshow" into gb-ub-photos-bryce * commit 'e3336dc35f514e3b5dd7a15f9a86eaf6d1572b5e': Prevent lock screen appearing during active slideshow
|
2cca828ec5186105723ae85e618bfca0bb59cdb8 |
28-May-2013 |
Bobby Georgescu <georgescu@google.com> |
Merge "Prevent lock screen appearing during active slideshow" into gb-ub-photos-bryce
|
e3336dc35f514e3b5dd7a15f9a86eaf6d1572b5e |
28-May-2013 |
Bobby Georgescu <georgescu@google.com> |
Merge "Prevent lock screen appearing during active slideshow" into gb-ub-photos-bryce
|
caaddf4a80cbb81cefdda3dbdafb74f319c2872e |
28-May-2013 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with jb-mr2-release - do not merge Change-Id: Ia6906f2a43e04fae3489cc3d253fa6bc5dc175f4
|
d29ddea26c2697d397b50000900ac25bcb646faf |
27-May-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Iec953ffc39f8ad12f2f18a3fdee49046f4753839 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
e121eafe2164f46f4c30338aa503a785f2f952d1 |
27-May-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I122eede49de1a919508911c5439529fdda40b203 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
8ab72f5f5c23df14fbd5b87ea96db37ff11866b3 |
27-May-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I6d43e9331dd993de57921360e33c36a58c355056 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
a6aab4097d7577705087b8c94050d2e5d7ab43b2 |
27-May-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I6d43e9331dd993de57921360e33c36a58c355056 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
d3a3f93f30714117254bf8f4fdf4f797ddde7bcd |
27-May-2013 |
Christian Wichner <cwichner@google.com> |
Merge "functionality added to transport filter parameter values to following filters. e.g. FixedFrames use the style from Retrolux or Film to tinting the frame." into gb-ub-photos-carlsbad
|
cc4ebbd29a749aaff363be709f5c89b31411d994 |
26-May-2013 |
The Android Automerger <android-build@google.com> |
merge in jb-mr2-release history after reset to jb-mr2-dev
|
37eb0e35b34f492e212b373bdd2e0b071e307df0 |
25-May-2013 |
Bobby Georgescu <georgescu@google.com> |
Prevent lock screen appearing during active slideshow Bug: 9094678 Change-Id: I8efb988911c75275430da934474df1e65265b234
rc/com/android/gallery3d/app/SlideshowPage.java
|
ef132358deba6acbbeaf0a63014c77c98bca1d9a |
25-May-2013 |
Bobby Georgescu <georgescu@google.com> |
Prevent lock screen appearing during active slideshow Bug: 9094678 Change-Id: I8efb988911c75275430da934474df1e65265b234
rc/com/android/gallery3d/app/SlideshowPage.java
|
31ce18458f63a2876e2d53c0b8692ef3dd6fca4f |
25-May-2013 |
Doris Liu <tianliu@google.com> |
Change the order of exposure compensation Bug: 9119379 Change-Id: I2e70ab1e83cf322ee0043850b2d27db962039bf3
rc/com/android/camera/CameraSettings.java
|
0bf8435fa008182f42bb7c506cf735175b98c843 |
25-May-2013 |
Doris Liu <tianliu@google.com> |
Change the order of exposure compensation Bug: 9119379 Change-Id: I2e70ab1e83cf322ee0043850b2d27db962039bf3
rc/com/android/camera/CameraSettings.java
|
8da7614acda858cff18205ab98e40816e1757b30 |
24-May-2013 |
Michael Kolb <kolby@google.com> |
am 4f950b02: am c4edd18d: am 461e101f: Add 13MP resolution * commit '4f950b02b321f6414dd9ad48b34560ee7f4e6b77': Add 13MP resolution
|
d3523bb712beb8a4bf6a0a47cc7a594ea2c874f7 |
24-May-2013 |
Michael Kolb <kolby@google.com> |
am c4edd18d: am 461e101f: Add 13MP resolution * commit 'c4edd18dcd6fa025a059b45e2f4c827569a24ac5': Add 13MP resolution
|
1d8ccae8b8a8c7d365db578246a0792560d90e89 |
24-May-2013 |
Michael Kolb <kolby@google.com> |
am 461e101f: Add 13MP resolution * commit '461e101fb99df1a704544efb29e56ece25788985': Add 13MP resolution
|
5e6613eed7cff25d4685ddd48be735682d27a7b5 |
24-May-2013 |
Michael Kolb <kolby@google.com> |
am 461e101f: Add 13MP resolution * commit '461e101fb99df1a704544efb29e56ece25788985': Add 13MP resolution
|
ba0c64720ea43807d8995cc6ec3cd142c427741a |
24-May-2013 |
Michael Kolb <kolby@google.com> |
Add 13MP resolution Bug: 9059351 Change-Id: I40c2c94ccc54399f6928d9e8a66abca0df15fea3
es/values/arrays.xml
es/values/strings.xml
|
461e101fb99df1a704544efb29e56ece25788985 |
24-May-2013 |
Michael Kolb <kolby@google.com> |
Add 13MP resolution Bug: 9059351 Change-Id: I40c2c94ccc54399f6928d9e8a66abca0df15fea3
es/values/arrays.xml
es/values/strings.xml
|
f22d8c2e1f011a31e56db45cab07c98a2a03ad9a |
24-May-2013 |
Christian Wichner <cwichner@google.com> |
functionality added to transport filter parameter values to following filters. e.g. FixedFrames use the style from Retrolux or Film to tinting the frame. Change-Id: I87f2497bdaccf8de5d153cbebf9641b979ea15a3
rc/com/android/gallery3d/filtershow/filters/ImageFilter.java
rc/com/android/gallery3d/filtershow/presets/FilterEnvironment.java
|
bd769d3ea522f0d6f62f6746c007f624eb7840ce |
24-May-2013 |
Christian Wichner <cwichner@google.com> |
functionality added to transport filter parameter values to following filters. e.g. FixedFrames use the style from Retrolux or Film to tinting the frame. Change-Id: I87f2497bdaccf8de5d153cbebf9641b979ea15a3
rc/com/android/gallery3d/filtershow/presets/FilterEnvironment.java
|
4f675e3c7509efea7e0d140bda1631042a21f8ca |
23-May-2013 |
Angus Kong <shkong@google.com> |
Merge "Fix/simplify comparator of LocalData." into gb-ub-photos-carlsbad
|
dff672d644f3db07d13f6d58bfceb2b1cc10d345 |
23-May-2013 |
Angus Kong <shkong@google.com> |
Fix/simplify comparator of LocalData. Change-Id: I433516d630de3d0f98d7ab8c35becf0cc6495bef
rc/com/android/camera/data/LocalData.java
|
af956d7c25877dc3614a022a608948b6ed9b2e8f |
23-May-2013 |
Angus Kong <shkong@google.com> |
Merge "Refactor to add FilmStripView.Controller." into gb-ub-photos-carlsbad
|
19dbed30193d257a245afc93750d09c40974cb0a |
23-May-2013 |
John Hoford <hoford@google.com> |
am 0d2e0608: am 7b3d8d85: am a7a6a3a5: Fix issues with Local * commit '0d2e0608cce21d4d80d6b0270af71f86b150294f': Fix issues with Local
|
c1a49e8d384dbb73ea4ca1c0cb17da66e8b36b1c |
23-May-2013 |
John Hoford <hoford@google.com> |
am 7b3d8d85: am a7a6a3a5: Fix issues with Local * commit '7b3d8d85e8602c0f6b43a13b3b0b1deccb8600cd': Fix issues with Local
|
8d3445517db4c3456f76e42f4070dd4b512faad3 |
23-May-2013 |
John Hoford <hoford@google.com> |
am a7a6a3a5: Fix issues with Local * commit 'a7a6a3a5efaf62cdd5d562a9141678671952d27d': Fix issues with Local
|
3c6befe9d482dc1cb1e45342cde5f884e2c06113 |
23-May-2013 |
John Hoford <hoford@google.com> |
am a7a6a3a5: Fix issues with Local * commit 'a7a6a3a5efaf62cdd5d562a9141678671952d27d': Fix issues with Local
|
5b140a67ac134446911f53b2ac1edd742677d37f |
23-May-2013 |
The Android Open Source Project <initial-contribution@android.com> |
am edf16ad6: (-s ours) Reconcile with jb-mr2-release - do not merge * commit 'edf16ad654cbebd53ef7be0c585e0f1937340f06':
|
3d1ffd6ff5a0a03b63a14a0f73736ef8c2070dc1 |
23-May-2013 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with jb-mr2-release - do not merge Change-Id: I92222f8b210362d6a0bd2577216a5df5f822608a
|
29cc0e219aad52da1fa723ff1a807865297f26ff |
23-May-2013 |
The Android Automerger <android-build@google.com> |
merge in jb-mr2-release history after reset to jb-mr2-dev
|
b37d996fa90b1b98ea4aee75a696d9722c535619 |
23-May-2013 |
John Hoford <hoford@google.com> |
am 4d25d129: Merge "fix ellipse logic for portrait" into gb-ub-photos-bryce * commit '4d25d129d1c9f92033382e12260d3f40521cf3fd': fix ellipse logic for portrait
|
970c0bdd33978839857d05adc98d014dfdd8ef07 |
23-May-2013 |
Bobby Georgescu <georgescu@google.com> |
am cdc87e62: Merge "Fix potential synchronization issue in bitmap pool" into gb-ub-photos-bryce * commit 'cdc87e62ee28b5022b2e4d0bc756c264cc26d8e9': Fix potential synchronization issue in bitmap pool
|
cbb5de929f1fb2d40d5e2f0d616a2ff3ce3f0f83 |
23-May-2013 |
Michael Kolb <kolby@google.com> |
am be4f113f: Fix editor on ICS * commit 'be4f113fa1fea32e8d8865a52491b9f25760eaba': Fix editor on ICS
|
653642bbfd6aef9b468c3632a112829d32d0ec99 |
23-May-2013 |
Michael Kolb <kolby@google.com> |
am 37be6658: Merge "Fix selection highlight for tablets" into gb-ub-photos-bryce * commit '37be6658075cac2bad0e30d93705dddeaaf1e421': Fix selection highlight for tablets
|
3d83a13d9c0e60e7a3f7227a8263226dc0c3c00a |
23-May-2013 |
John Reck <jreck@google.com> |
am 01ae91aa: Merge "Fix height" into gb-ub-photos-bryce * commit '01ae91aa0e347c5a8b335afc8cb0f02459ee5adc': Fix height
|
4e6549b0a894c8c95a105b95f0bd421817ae9c25 |
23-May-2013 |
Sascha Haeberling <haeberling@google.com> |
am 80a3d636: Make capture thumbnail tappable in video mode. * commit '80a3d636fa38bb78dbc9f224b4944a21a6e3271d': Make capture thumbnail tappable in video mode.
|
6d23f4c77fde7ddf70e0edd48f46cc22b7f7320e |
23-May-2013 |
Angus Kong <shkong@google.com> |
Refactor to add FilmStripView.Controller. Use controller to control the FilmStripView. Change-Id: If203d4bf28ce2dc398ada8b56b38be51a1d5dab9
rc/com/android/camera/ui/FilmStripView.java
|
d6145d21419680b22a6daa6da95ee566bef72df6 |
23-May-2013 |
John Hoford <hoford@google.com> |
Fix issues with Local bug:9085638 Change-Id: I8d10373b4cd65b3f1338d88f1816ccb0b3a0166d
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
|
a7a6a3a5efaf62cdd5d562a9141678671952d27d |
23-May-2013 |
John Hoford <hoford@google.com> |
Fix issues with Local bug:9085638 Change-Id: I8d10373b4cd65b3f1338d88f1816ccb0b3a0166d
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
|
cecf0bd88309a0c9b114b53ee9f4b2c6cbf433ef |
22-May-2013 |
John Hoford <hoford@google.com> |
am 4eb1825c: am 3d4fbf40: am 4d25d129: Merge "fix ellipse logic for portrait" into gb-ub-photos-bryce * commit '4eb1825cb6c305f1c4479f55fac9047a4001b8e4': fix ellipse logic for portrait
|
cb1653348eb1cf4b47608826cf239fe666391fa3 |
22-May-2013 |
John Hoford <hoford@google.com> |
am 3d4fbf40: am 4d25d129: Merge "fix ellipse logic for portrait" into gb-ub-photos-bryce * commit '3d4fbf40115389ed33487db2059048163c9afd1a': fix ellipse logic for portrait
|
7615f607322cddc2283ef6907b3cbd622c269dc5 |
22-May-2013 |
John Hoford <hoford@google.com> |
am 4d25d129: Merge "fix ellipse logic for portrait" into gb-ub-photos-bryce * commit '4d25d129d1c9f92033382e12260d3f40521cf3fd': fix ellipse logic for portrait
|
c4870f4c07d085ed6b9f220c2f04ef8ea5a1cd6e |
22-May-2013 |
John Hoford <hoford@google.com> |
Merge "fix ellipse logic for portrait" into gb-ub-photos-bryce
|
4d25d129d1c9f92033382e12260d3f40521cf3fd |
22-May-2013 |
John Hoford <hoford@google.com> |
Merge "fix ellipse logic for portrait" into gb-ub-photos-bryce
|
590160fdd7bbaaa603328df0b18b95e46dca3d48 |
22-May-2013 |
Bobby Georgescu <georgescu@google.com> |
am e3ea0548: am 410635e7: am cdc87e62: Merge "Fix potential synchronization issue in bitmap pool" into gb-ub-photos-bryce * commit 'e3ea05489d870d9fb0c6c45401e01a07c7b90b4c': Fix potential synchronization issue in bitmap pool
|
c3451392ee67c94fe2f1b53809fcdf15c4539752 |
22-May-2013 |
Bobby Georgescu <georgescu@google.com> |
am 410635e7: am cdc87e62: Merge "Fix potential synchronization issue in bitmap pool" into gb-ub-photos-bryce * commit '410635e7f8df429fcecc328bf6191b053b989004': Fix potential synchronization issue in bitmap pool
|
5276aaf1d4e4c7f70460b6ebed8d1b515fb1a6a4 |
22-May-2013 |
Bobby Georgescu <georgescu@google.com> |
am cdc87e62: Merge "Fix potential synchronization issue in bitmap pool" into gb-ub-photos-bryce * commit 'cdc87e62ee28b5022b2e4d0bc756c264cc26d8e9': Fix potential synchronization issue in bitmap pool
|
a5d7a79da64631dccee8858cb646b4cb373039df |
22-May-2013 |
Bobby Georgescu <georgescu@google.com> |
Merge "Fix potential synchronization issue in bitmap pool" into gb-ub-photos-bryce
|
cdc87e62ee28b5022b2e4d0bc756c264cc26d8e9 |
22-May-2013 |
Bobby Georgescu <georgescu@google.com> |
Merge "Fix potential synchronization issue in bitmap pool" into gb-ub-photos-bryce
|
5348643158e3578f0bf3f797e89bc4002edbeb8b |
22-May-2013 |
Michael Kolb <kolby@google.com> |
am dc5c77d6: am 02593125: am be4f113f: Fix editor on ICS * commit 'dc5c77d6e56171b7f879e9558e491f93b0def3a6': Fix editor on ICS
|
d14883e7d38fd9997aec225f8026d418355bc381 |
22-May-2013 |
Michael Kolb <kolby@google.com> |
am 02593125: am be4f113f: Fix editor on ICS * commit '0259312504eddbae2f29a1d8a09892fb0e95d8c8': Fix editor on ICS
|
68988bb066376c9c4477c43d0a37793341896f70 |
22-May-2013 |
Michael Kolb <kolby@google.com> |
am be4f113f: Fix editor on ICS * commit 'be4f113fa1fea32e8d8865a52491b9f25760eaba': Fix editor on ICS
|
667035cb00787b57a59e737f2af928ceebf918e4 |
22-May-2013 |
Michael Kolb <kolby@google.com> |
Fix editor on ICS Bug: 9079902 Change-Id: I1159708b0a9db4a0369044cdf9f3620bca433e14
rc/com/android/gallery3d/filtershow/category/CategoryAdapter.java
|
be4f113fa1fea32e8d8865a52491b9f25760eaba |
22-May-2013 |
Michael Kolb <kolby@google.com> |
Fix editor on ICS Bug: 9079902 Change-Id: I1159708b0a9db4a0369044cdf9f3620bca433e14
rc/com/android/gallery3d/filtershow/category/CategoryAdapter.java
|
73c23d34364c41817c6fc1329b4485506a86b406 |
22-May-2013 |
The Android Open Source Project <initial-contribution@android.com> |
am cac59514: (-s ours) Reconcile with jb-mr2-release - do not merge * commit 'cac5951436f3cff8b0e634b52633b193e139c135':
|
8c9a2fe055ed956eb24cd57bdbbe386ead95a043 |
22-May-2013 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with jb-mr2-release - do not merge Change-Id: I7100dae7ada8486be79bec2166bf9b8f81cf9e34
|
c81f644802eb2c2ef51bf6aef060f3a85fd5fff2 |
22-May-2013 |
The Android Automerger <android-build@google.com> |
merge in jb-mr2-release history after reset to jb-mr2-dev
|
af323d6fe49ab551cb990869d62a9d831c6e8488 |
22-May-2013 |
John Hoford <hoford@google.com> |
fix ellipse logic for portrait bug:9054114 Change-Id: I4bdc7301a60e74bf663fda031c0f2c76ee34b7ec
rc/com/android/gallery3d/filtershow/imageshow/EclipseControl.java
|
52fab9f1595cfcabe85d81325bdb9b486bc8c306 |
22-May-2013 |
John Hoford <hoford@google.com> |
fix ellipse logic for portrait bug:9054114 Change-Id: I4bdc7301a60e74bf663fda031c0f2c76ee34b7ec
rc/com/android/gallery3d/filtershow/imageshow/EclipseControl.java
|
fd382ee5142bb87707be00dec9bc7235f01733d1 |
22-May-2013 |
Angus Kong <shkong@google.com> |
Keep camera preview in view hierarchy. Camera preview is a special case that needs to be kept to avoid unnecessary start and stop preview. Change-Id: I6c922d4b35ff86981fa6a3ec3b76417d07a68a0e
rc/com/android/camera/ui/FilmStripView.java
|
2927b07c036431541a8c64ab479637b05bc0c35d |
22-May-2013 |
Angus Kong <shkong@google.com> |
Merge "Fix off-position issue after changing orientation" into gb-ub-photos-carlsbad
|
5cdb0806cfc71166c67af778ed6bde8ec3e30d4c |
22-May-2013 |
Michael Kolb <kolby@google.com> |
am 28d3467e: am 7da344a4: am 37be6658: Merge "Fix selection highlight for tablets" into gb-ub-photos-bryce * commit '28d3467e5dbad9e21e7a7695a15faedea5e9c8ef': Fix selection highlight for tablets
|
d69e1fe2139748eac70285ed8f8392b76cb10547 |
22-May-2013 |
Michael Kolb <kolby@google.com> |
am 7da344a4: am 37be6658: Merge "Fix selection highlight for tablets" into gb-ub-photos-bryce * commit '7da344a46f348a5bc9ac958ccf7186b4f7d1c899': Fix selection highlight for tablets
|
165baca41f14e2f91304e6d10e6f4d2f49b7cd35 |
22-May-2013 |
Michael Kolb <kolby@google.com> |
am 37be6658: Merge "Fix selection highlight for tablets" into gb-ub-photos-bryce * commit '37be6658075cac2bad0e30d93705dddeaaf1e421': Fix selection highlight for tablets
|
d63f8090161e9924911840ef6c7c8e2ef16d2866 |
22-May-2013 |
Michael Kolb <kolby@google.com> |
Merge "Fix selection highlight for tablets" into gb-ub-photos-bryce
|
37be6658075cac2bad0e30d93705dddeaaf1e421 |
22-May-2013 |
Michael Kolb <kolby@google.com> |
Merge "Fix selection highlight for tablets" into gb-ub-photos-bryce
|
d07a7b9e822b3a25d1a427f85fb4b4491ddd4aa7 |
22-May-2013 |
John Reck <jreck@google.com> |
am a4a09f9c: am 550eefae: am 01ae91aa: Merge "Fix height" into gb-ub-photos-bryce * commit 'a4a09f9c0d73876a92c4fddbbd5086fa21899af2': Fix height
|
8238575d7e8e9f116254ac7f8be95b66c4f7519a |
22-May-2013 |
John Reck <jreck@google.com> |
am 550eefae: am 01ae91aa: Merge "Fix height" into gb-ub-photos-bryce * commit '550eefae642049dea0023168643b54d1c7a73b8e': Fix height
|
af24d28f8938a05d2e3c40155e39cbc7ff4d64b7 |
21-May-2013 |
Angus Kong <shkong@google.com> |
Fix off-position issue after changing orientation Change-Id: I1c40b9ede5fa85ab46d9bcb9ab586e66c4c132c8
rc/com/android/camera/ui/FilmStripView.java
|
bb43dfd8f97dd345feaba9b161331d51c19e9909 |
22-May-2013 |
John Reck <jreck@google.com> |
am 01ae91aa: Merge "Fix height" into gb-ub-photos-bryce * commit '01ae91aa0e347c5a8b335afc8cb0f02459ee5adc': Fix height
|
15074e2673f2165188e71dc3d2470f0093fa71e7 |
22-May-2013 |
John Reck <jreck@google.com> |
Merge "Fix height" into gb-ub-photos-bryce
|
01ae91aa0e347c5a8b335afc8cb0f02459ee5adc |
22-May-2013 |
John Reck <jreck@google.com> |
Merge "Fix height" into gb-ub-photos-bryce
|
3e01d643976864060c153aa3dfb714434e4f7533 |
22-May-2013 |
Sascha Haeberling <haeberling@google.com> |
am 103b2429: am 0cf42d07: am 80a3d636: Make capture thumbnail tappable in video mode. * commit '103b2429c1840ed85dddef636bc7c6ffd03deea2': Make capture thumbnail tappable in video mode.
|
f751e20d896a403dbfc76135836f18d97ccc975a |
22-May-2013 |
Sascha Haeberling <haeberling@google.com> |
am 0cf42d07: am 80a3d636: Make capture thumbnail tappable in video mode. * commit '0cf42d07132b27aa1f50707fbf5aa30fde925cbf': Make capture thumbnail tappable in video mode.
|
b3373f98c6a82e47c4e45a73e361149ff0f29e7b |
22-May-2013 |
Sascha Haeberling <haeberling@google.com> |
am 80a3d636: Make capture thumbnail tappable in video mode. * commit '80a3d636fa38bb78dbc9f224b4944a21a6e3271d': Make capture thumbnail tappable in video mode.
|
afed6ec95d9cbc83a211c032209fde04c08c611d |
20-May-2013 |
John Reck <jreck@google.com> |
Fix height Change-Id: I133063acdad4a1afe8e0a9105591dd90354913f0
rc/com/android/gallery3d/filtershow/category/CategoryAdapter.java
|
5df43365995e2929d831302a76f08f2cd50d698d |
20-May-2013 |
John Reck <jreck@google.com> |
Fix height Change-Id: I133063acdad4a1afe8e0a9105591dd90354913f0
rc/com/android/gallery3d/filtershow/category/CategoryAdapter.java
|
d2d5410fbcb39c12d362644d1cdc91c6ca18711f |
22-May-2013 |
Michael Kolb <kolby@google.com> |
Fix selection highlight for tablets Bug: 9044356 Fixes selection highlight for the new asset sizes. Change-Id: Ibf21a1f90d6cd1faf62a221d71d55928dc7a3b4a
rc/com/android/gallery3d/filtershow/category/CategoryView.java
rc/com/android/gallery3d/filtershow/ui/SelectionRenderer.java
|
2fa659f93347df6a78392679092bf9af42a64635 |
22-May-2013 |
Michael Kolb <kolby@google.com> |
Fix selection highlight for tablets Bug: 9044356 Fixes selection highlight for the new asset sizes. Change-Id: Ibf21a1f90d6cd1faf62a221d71d55928dc7a3b4a
rc/com/android/gallery3d/filtershow/category/CategoryView.java
rc/com/android/gallery3d/filtershow/ui/SelectionRenderer.java
|
e46c3a0cac1ec6ab707bf74b85e91c488488de8a |
22-May-2013 |
George Mount <mount@google.com> |
Merge "Make preview size smaller so that low-res images come in faster." into gb-ub-photos-carlsbad
|
bc2c0d6cda0955490db62ab3a4f60678ca34b88c |
22-May-2013 |
George Mount <mount@google.com> |
Merge "Combine code for bitmap decoding and add byte array decoding." into gb-ub-photos-carlsbad
|
1a833d67f22eefcbc5a76a104d0857a5b1064433 |
21-May-2013 |
George Mount <mount@google.com> |
Combine code for bitmap decoding and add byte array decoding. Change-Id: Id780f94a5d939e5423b87f2e1d4ddf18b3dfa126
rc/com/android/photos/data/BitmapDecoder.java
|
407fe728f95645ca43d7c2d3254856c6314ad534 |
22-May-2013 |
Bobby Georgescu <georgescu@google.com> |
Merge "Add comments to bitmap pools" into gb-ub-photos-carlsbad
|
6b9ece8710604adec2805b903d977264f90087c6 |
21-May-2013 |
Bobby Georgescu <georgescu@google.com> |
Add comments to bitmap pools Change-Id: Ie841316629ef0737dcdd5002b3278cf0bca3a768
rc/com/android/photos/data/GalleryBitmapPool.java
rc/com/android/photos/data/SparseArrayBitmapPool.java
|
4f91ab5d099632afd84dd7bd80a804cbbe1f3588 |
21-May-2013 |
Sascha Haeberling <haeberling@google.com> |
Make capture thumbnail tappable in video mode. Bug: 9054122 Also make gotoGallery public for LightCycle to use. Change-Id: I3cd5af26531a756e78c1478de29155dfda709afc
rc/com/android/camera/ActivityBase.java
rc/com/android/camera/VideoModule.java
rc/com/android/camera/VideoUI.java
|
80a3d636fa38bb78dbc9f224b4944a21a6e3271d |
21-May-2013 |
Sascha Haeberling <haeberling@google.com> |
Make capture thumbnail tappable in video mode. Bug: 9054122 Also make gotoGallery public for LightCycle to use. Change-Id: I3cd5af26531a756e78c1478de29155dfda709afc
rc/com/android/camera/ActivityBase.java
rc/com/android/camera/VideoModule.java
rc/com/android/camera/VideoUI.java
|
430237d7a6f8dd74e03e6c1bae8a03f54ab7cffc |
21-May-2013 |
Bobby Georgescu <georgescu@google.com> |
Fix potential synchronization issue in bitmap pool Bug: 9072712 Change-Id: I7fcecd6ec63e461e06a6565519be6d86e3246155
rc/com/android/photos/data/GalleryBitmapPool.java
|
3e43b59805993151c76fcc3f0069cc99985811d3 |
21-May-2013 |
Bobby Georgescu <georgescu@google.com> |
Fix potential synchronization issue in bitmap pool Bug: 9072712 Change-Id: I7fcecd6ec63e461e06a6565519be6d86e3246155
rc/com/android/photos/data/GalleryBitmapPool.java
|
485ebe6686f5903d4c40ce80d6e4f40aef8d208f |
21-May-2013 |
George Mount <mount@google.com> |
Make preview size smaller so that low-res images come in faster. Change-Id: I82fea176a2aa8b0a3abfd829c0ec2d16f267ef5b
es/values/dimens.xml
|
34321961c62ad063fcf7c89bc22b3aebfe4891e4 |
21-May-2013 |
Doris Liu <tianliu@google.com> |
am ef2d4a1d: am bfce0515: am aa77f39a: Merge "Fix camera controls blink on startup" into gb-ub-photos-bryce * commit 'ef2d4a1d0fd6b2676c5b650dfbdba07b99528328': Fix camera controls blink on startup
|
7e849b373a128977f067549dc0718d719f8c195e |
21-May-2013 |
Doris Liu <tianliu@google.com> |
am bfce0515: am aa77f39a: Merge "Fix camera controls blink on startup" into gb-ub-photos-bryce * commit 'bfce0515165aa381b730b4dd772132c41dea4e28': Fix camera controls blink on startup
|
68b0e4d9e95bad5bf0ac4f1301497e1429dde1a5 |
21-May-2013 |
Doris Liu <tianliu@google.com> |
am aa77f39a: Merge "Fix camera controls blink on startup" into gb-ub-photos-bryce * commit 'aa77f39a3a18ee7945177189c358ef6208e6da2b': Fix camera controls blink on startup
|
19331c408aeed3cf66ba20fca08cbc842b55ddd6 |
21-May-2013 |
Doris Liu <tianliu@google.com> |
am aa77f39a: Merge "Fix camera controls blink on startup" into gb-ub-photos-bryce * commit 'aa77f39a3a18ee7945177189c358ef6208e6da2b': Fix camera controls blink on startup
|
4a0676ce905ace0eb8dcac4bfd9bce8da0884298 |
21-May-2013 |
Doris Liu <tianliu@google.com> |
Merge "Fix camera controls blink on startup" into gb-ub-photos-bryce
|
aa77f39a3a18ee7945177189c358ef6208e6da2b |
21-May-2013 |
Doris Liu <tianliu@google.com> |
Merge "Fix camera controls blink on startup" into gb-ub-photos-bryce
|
cbb00a31be9b2db291adb0fd703bb21240ad8c32 |
21-May-2013 |
John Hoford <hoford@google.com> |
am a8d103b4: am c6038e29: am a285bc13: Merge "fix TinyPlanets Filter landscape crash" into gb-ub-photos-bryce * commit 'a8d103b48174c9313aed9e4db026c1c19d7dd56c': fix TinyPlanets Filter landscape crash
|
03692004060ed7a1d97fc6b46693b4817079b2f1 |
21-May-2013 |
John Hoford <hoford@google.com> |
am c6038e29: am a285bc13: Merge "fix TinyPlanets Filter landscape crash" into gb-ub-photos-bryce * commit 'c6038e29aea5012a8c342d1a4c72aa26a9895519': fix TinyPlanets Filter landscape crash
|
fda9d791f43d7ae31cbdf5180faef24fc60dc13c |
21-May-2013 |
John Hoford <hoford@google.com> |
am a285bc13: Merge "fix TinyPlanets Filter landscape crash" into gb-ub-photos-bryce * commit 'a285bc130ff1175c60085410f317e90f6443c39b': fix TinyPlanets Filter landscape crash
|
90529c8c1634c35f39033397c6196922d797ea67 |
21-May-2013 |
John Hoford <hoford@google.com> |
am a285bc13: Merge "fix TinyPlanets Filter landscape crash" into gb-ub-photos-bryce * commit 'a285bc130ff1175c60085410f317e90f6443c39b': fix TinyPlanets Filter landscape crash
|
a285bc130ff1175c60085410f317e90f6443c39b |
21-May-2013 |
John Hoford <hoford@google.com> |
Merge "fix TinyPlanets Filter landscape crash" into gb-ub-photos-bryce
|
d059fe0f47195e48a24fd51ec4a19be23ff6e727 |
21-May-2013 |
The Android Open Source Project <initial-contribution@android.com> |
am 7b2f0b93: (-s ours) Reconcile with jb-mr2-release - do not merge * commit '7b2f0b93fc5f6299511125e509560ac49f90e79a':
|
9304d65dece10a9cc8aae4880a6aa98c382fd52f |
21-May-2013 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with jb-mr2-release - do not merge Change-Id: I51461342bc651cb4e82db8a6a117d00a1017f4d9
|
9b949db717b52d1b85c5d83c34f30ee7e5051921 |
21-May-2013 |
Bart Sears <bsears@google.com> |
am 7ddebfad: am 1998968a: am a83166df: Bump up the version number to 1.1.40012 * commit '7ddebfad20c3ad136f42f80a2dc44c92b9b4b71a': Bump up the version number to 1.1.40012
|
7d2d8bfaa25a4578f9d8faedda39d84952162273 |
21-May-2013 |
Bart Sears <bsears@google.com> |
am 1998968a: am a83166df: Bump up the version number to 1.1.40012 * commit '1998968a17c490276ffc46c7466401011109063b': Bump up the version number to 1.1.40012
|
12dc8249df94193db2d1f4c58e13032390fbef05 |
21-May-2013 |
Bart Sears <bsears@google.com> |
am a83166df: Bump up the version number to 1.1.40012 * commit 'a83166dfc97c6d45b03728a2ae32b085e91b8d0c': Bump up the version number to 1.1.40012
|
9e186f199df518c529bda9705f27891c16e87ce7 |
21-May-2013 |
Bart Sears <bsears@google.com> |
am a83166df: Bump up the version number to 1.1.40012 * commit 'a83166dfc97c6d45b03728a2ae32b085e91b8d0c': Bump up the version number to 1.1.40012
|
b4378ff001b133da4ad8dd1db4b2a7f338aa360b |
21-May-2013 |
The Android Automerger <android-build@google.com> |
merge in jb-mr2-release history after reset to jb-mr2-dev
|
9eb37145df8adfb0bd68e9023342f5c7a4d12d31 |
21-May-2013 |
John Hoford <hoford@google.com> |
fix TinyPlanets Filter landscape crash bug:9038163 Change-Id: Ice1e01dfa0e9ac72e5019fac900e76bd38955e05
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
|
f57e5885f74f586760daa9eeb0808c53ac4b2c9d |
21-May-2013 |
John Hoford <hoford@google.com> |
fix TinyPlanets Filter landscape crash bug:9038163 Change-Id: Ice1e01dfa0e9ac72e5019fac900e76bd38955e05
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
|
d6f247be465060c28be6018c9dee4b098d589eba |
21-May-2013 |
Angus Kong <shkong@google.com> |
Merge "Fix jitter in FilmStripView." into gb-ub-photos-carlsbad
|
9f02c87cfb5039a72f516ea5edc0378c45ac5779 |
20-May-2013 |
Angus Kong <shkong@google.com> |
Fix jitter in FilmStripView. The jigger happens when deleting the one before the last. The length of the film strip might be changed due to the deletion. Change-Id: I269a5d88eb77ed5fa6e44ae9c86c2941ecd718b1
rc/com/android/camera/ui/FilmStripView.java
|
a83166dfc97c6d45b03728a2ae32b085e91b8d0c |
21-May-2013 |
Bart Sears <bsears@google.com> |
Bump up the version number to 1.1.40012 Bug: 8607157 Change-Id: I5fdf05fd4d10a54f72129177572285d438740b97
ndroidManifest.xml
|
5798f0b70cdf1fe8e9d9b4d01ce6c4c5bfe26874 |
21-May-2013 |
Bart Sears <bsears@google.com> |
Bump up the version number to 1.1.40012 Bug: 8607157 Change-Id: I5fdf05fd4d10a54f72129177572285d438740b97
ndroidManifest.xml
|
f22ed280bae246a4b9ce31e5fada68a30f211aed |
21-May-2013 |
Doris Liu <tianliu@google.com> |
Fix camera controls blink on startup Bug: 9052837 Change-Id: Ie15b812c6e6e7879d29d96a345173a2130b2fe91
rc/com/android/gallery3d/ui/PhotoView.java
|
58ed4d197795147f9f4a202da00b411a6ed53bd2 |
21-May-2013 |
Doris Liu <tianliu@google.com> |
Fix camera controls blink on startup Bug: 9052837 Change-Id: Ie15b812c6e6e7879d29d96a345173a2130b2fe91
rc/com/android/gallery3d/ui/PhotoView.java
|
6ca5835a8718410825776a1862bb374fa5fa8228 |
20-May-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am e28b45f0: am 96c48dee: am 286afab1: Merge "Avoid using region decoder for bad image types when setting wallpaper." into gb-ub-photos-bryce * commit 'e28b45f0372195330237d8f30607b19b9b817c05': Avoid using region decoder for bad image types when setting wallpaper.
|
239f09ab5d534615a6a901b4da25056f7c0ac274 |
20-May-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 96c48dee: am 286afab1: Merge "Avoid using region decoder for bad image types when setting wallpaper." into gb-ub-photos-bryce * commit '96c48dee541fae960c23234a71d0f287e0e13489': Avoid using region decoder for bad image types when setting wallpaper.
|
e3d3789183ba8fa718ac80857a5bc0f872616e05 |
20-May-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 286afab1: Merge "Avoid using region decoder for bad image types when setting wallpaper." into gb-ub-photos-bryce * commit '286afab10fb4c528ea503981c4f1bdbcfbdbde77': Avoid using region decoder for bad image types when setting wallpaper.
|
9895f144631ef60056da2bcc3cb911faf9c6b3b1 |
20-May-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 286afab1: Merge "Avoid using region decoder for bad image types when setting wallpaper." into gb-ub-photos-bryce * commit '286afab10fb4c528ea503981c4f1bdbcfbdbde77': Avoid using region decoder for bad image types when setting wallpaper.
|
d165d93679ba8d10d4c7572eb425845243a6e715 |
20-May-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Avoid using region decoder for bad image types when setting wallpaper." into gb-ub-photos-bryce
|
286afab10fb4c528ea503981c4f1bdbcfbdbde77 |
20-May-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Avoid using region decoder for bad image types when setting wallpaper." into gb-ub-photos-bryce
|
0545d6a60508b1abe793735f6a82ebef8974a5dc |
20-May-2013 |
Sascha Haeberling <haeberling@google.com> |
am 4925d799: am f2697daa: am 7af7156a: Merge "Make sure canceling a filter does not undo previous filter." into gb-ub-photos-bryce * commit '4925d79902524b506c04aa769c6aa3788a7be2d0': Make sure canceling a filter does not undo previous filter.
|
dadee124d0dde8d0eb6988c1a39341255e3877fd |
20-May-2013 |
Sascha Haeberling <haeberling@google.com> |
am f2697daa: am 7af7156a: Merge "Make sure canceling a filter does not undo previous filter." into gb-ub-photos-bryce * commit 'f2697daa3a5f114216488022ca513cb7811075b9': Make sure canceling a filter does not undo previous filter.
|
769a51cbde67124b4809948aad556bfa60349a09 |
20-May-2013 |
Sascha Haeberling <haeberling@google.com> |
am 7af7156a: Merge "Make sure canceling a filter does not undo previous filter." into gb-ub-photos-bryce * commit '7af7156a809934951877b1f9b9ad1ceeb9c9a5ce': Make sure canceling a filter does not undo previous filter.
|
3c4b7c568d5de16b738207e581e9cd48e4eb6529 |
20-May-2013 |
Sascha Haeberling <haeberling@google.com> |
am 7af7156a: Merge "Make sure canceling a filter does not undo previous filter." into gb-ub-photos-bryce * commit '7af7156a809934951877b1f9b9ad1ceeb9c9a5ce': Make sure canceling a filter does not undo previous filter.
|
d54f6082ca219c82a525553e2a405cbca92e9dfb |
20-May-2013 |
Sascha Haeberling <haeberling@google.com> |
Merge "Make sure canceling a filter does not undo previous filter." into gb-ub-photos-bryce
|
7af7156a809934951877b1f9b9ad1ceeb9c9a5ce |
20-May-2013 |
Sascha Haeberling <haeberling@google.com> |
Merge "Make sure canceling a filter does not undo previous filter." into gb-ub-photos-bryce
|
119db4a01c903a4bce4a68cb7f3caa8b41ecd9a4 |
20-May-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Avoid using region decoder for bad image types when setting wallpaper. Bug: 8893617 Change-Id: I9830ea0d76acff8a524186cf505963c48d9f1fbe
rc/com/android/gallery3d/filtershow/crop/CropActivity.java
|
f6be3f0d8968383cfa7e76ef2d480fdfadcc9b7f |
20-May-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Avoid using region decoder for bad image types when setting wallpaper. Bug: 8893617 Change-Id: I9830ea0d76acff8a524186cf505963c48d9f1fbe
rc/com/android/gallery3d/filtershow/crop/CropActivity.java
|
cb44d9b87098cd9b6f572b2c50562fc183f75d11 |
20-May-2013 |
The Android Open Source Project <initial-contribution@android.com> |
am 706ed7eb: (-s ours) Reconcile with jb-mr2-release - do not merge * commit '706ed7ebf21b5936b2d5b908a239be3e05160518':
|
2e0f41bc7ccf39a399d4573c62f75d26b0dea279 |
20-May-2013 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with jb-mr2-release - do not merge Change-Id: I326060063e4586e6bfa9edafc93b26a89a47a7b7
|
ae6564d551df2cc97f6e5d739bd908b2b91444e5 |
20-May-2013 |
John Hoford <hoford@google.com> |
am 112c7fee: am 22fcfeb2: am 26e3c48b: Merge "Disable zoom" into gb-ub-photos-bryce * commit '112c7fee94a3f31f85fa44ada54274652f1f2596': Disable zoom
|
b5d2ad2266283b4e9eac217831b00a4083ed8d21 |
20-May-2013 |
John Hoford <hoford@google.com> |
am 22fcfeb2: am 26e3c48b: Merge "Disable zoom" into gb-ub-photos-bryce * commit '22fcfeb20d601ca73dcfa374a46d3b370bef1929': Disable zoom
|
875da35b7b769a66edb8f25db4780a8c63aa3a4e |
20-May-2013 |
John Hoford <hoford@google.com> |
am 26e3c48b: Merge "Disable zoom" into gb-ub-photos-bryce * commit '26e3c48b831e39ced1db18673f12fb3c7a2d56d8': Disable zoom
|
16c62076d65cffb8709c81b1931074ca9997fc57 |
20-May-2013 |
John Hoford <hoford@google.com> |
am 26e3c48b: Merge "Disable zoom" into gb-ub-photos-bryce * commit '26e3c48b831e39ced1db18673f12fb3c7a2d56d8': Disable zoom
|
31c1feb195c778c431b4ec69abd80ee01cc9a5e9 |
20-May-2013 |
John Hoford <hoford@google.com> |
Merge "Disable zoom" into gb-ub-photos-bryce
|
26e3c48b831e39ced1db18673f12fb3c7a2d56d8 |
20-May-2013 |
John Hoford <hoford@google.com> |
Merge "Disable zoom" into gb-ub-photos-bryce
|
85ee207061fb799e765560540911437d0d01a81a |
19-May-2013 |
The Android Automerger <android-build@google.com> |
merge in jb-mr2-release history after reset to jb-mr2-dev
|
3f39318ccd887c83aeaab5d2a882671e1280ecf0 |
17-May-2013 |
John Hoford <hoford@google.com> |
Disable zoom Bug: 8791729 Change-Id: I2ee9d9e644842ce0a7014a1665e6bd1d001e4f06
rc/com/android/gallery3d/filtershow/imageshow/MasterImage.java
|
111e70bc1b962151a3cb5aef83914aad07185022 |
17-May-2013 |
John Hoford <hoford@google.com> |
Disable zoom Bug: 8791729 Change-Id: I2ee9d9e644842ce0a7014a1665e6bd1d001e4f06
rc/com/android/gallery3d/filtershow/imageshow/MasterImage.java
|
0072798c4049d3d7317254d6369f745758f96b47 |
18-May-2013 |
Baligh Uddin <baligh@google.com> |
am e6359c7e: (-s ours) am 5ba97880: am 082541a7: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce * commit 'e6359c7e2de8ca3fdee7ef36c0830212bd58a805': Import translations. DO NOT MERGE
|
58fa730982951d7d55fedc314b044c71985ccef7 |
18-May-2013 |
Baligh Uddin <baligh@google.com> |
am e801a8f2: (-s ours) am 2e4c852c: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev * commit 'e801a8f264580268282a923fa3213999a84e87af': Import translations. DO NOT MERGE
|
e6108d0f2fb9af55612fb01347fea44e6b7ad524 |
18-May-2013 |
Baligh Uddin <baligh@google.com> |
am 5ba97880: am 082541a7: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce * commit '5ba9788055cce978a82a96367625b671471a86f4': Import translations. DO NOT MERGE
|
587bd23651f6a3bd04ef8eebc645295ed65aaede |
18-May-2013 |
Baligh Uddin <baligh@google.com> |
am 2e4c852c: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev * commit '2e4c852c525ceceb7176f61e1d94a4fed9b29d15': Import translations. DO NOT MERGE
|
a3b9db69b5733db12affd25ed16f30065a0aafd5 |
18-May-2013 |
Baligh Uddin <baligh@google.com> |
am 082541a7: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce * commit '082541a730e56092b948580a8e8040be78979e23': Import translations. DO NOT MERGE
|
9bf81f335c0f885c062843f70889a8fc0299cc20 |
18-May-2013 |
Baligh Uddin <baligh@google.com> |
am 082541a7: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce * commit '082541a730e56092b948580a8e8040be78979e23': Import translations. DO NOT MERGE
|
b2a4bcc62c2a61169553c45d566966563a9db226 |
18-May-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE"
|
722a8ef9add00c6b90244f36dc7a21faf4caa64c |
18-May-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
|
4226f58ccdbc0d02582e25fadeb6a0d009b8f270 |
18-May-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
|
082541a730e56092b948580a8e8040be78979e23 |
18-May-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
|
7019785aa49d9212030048be2839b7b0640210f1 |
18-May-2013 |
Michael Kolb <kolby@google.com> |
am 34243e8f: am cf4b66a9: am 1a266f16: Highlight selected option in FX and Borders * commit '34243e8ff2784c9d2ee9b72cf6c4ec54b7f65a42': Highlight selected option in FX and Borders
|
347f772f18d9d50f2ad474884b5048931dee06ac |
18-May-2013 |
Michael Kolb <kolby@google.com> |
am cf4b66a9: am 1a266f16: Highlight selected option in FX and Borders * commit 'cf4b66a9a4d794d93c75798fab81fad006897167': Highlight selected option in FX and Borders
|
8dcd1ab3b1d2c0f56b2af8ffd25ca3a6a5cfb657 |
18-May-2013 |
Michael Kolb <kolby@google.com> |
am 1a266f16: Highlight selected option in FX and Borders * commit '1a266f16edbef7cb0a770d37fcad958fc55a5862': Highlight selected option in FX and Borders
|
e8a2d1f32ea31fba1378cf4ce3af25152eb9d344 |
18-May-2013 |
Michael Kolb <kolby@google.com> |
am 1a266f16: Highlight selected option in FX and Borders * commit '1a266f16edbef7cb0a770d37fcad958fc55a5862': Highlight selected option in FX and Borders
|
16407d78e2159d7ab1497ff9d318abee497ee189 |
18-May-2013 |
Michael Kolb <kolby@google.com> |
am 1a266f16: Highlight selected option in FX and Borders * commit '1a266f16edbef7cb0a770d37fcad958fc55a5862': Highlight selected option in FX and Borders
|
01fa94509b880bf80d3c852544c26cda6e882539 |
17-May-2013 |
Michael Kolb <kolby@google.com> |
Highlight selected option in FX and Borders Bug: 8791729 Change-Id: I8ac2c3deabe7b293df48db9f44f52956443a92a4
rc/com/android/gallery3d/filtershow/category/CategoryAdapter.java
rc/com/android/gallery3d/filtershow/category/CategoryPanel.java
rc/com/android/gallery3d/filtershow/category/CategoryView.java
rc/com/android/gallery3d/filtershow/category/MainPanel.java
rc/com/android/gallery3d/filtershow/ui/FilterIconButton.java
rc/com/android/gallery3d/filtershow/ui/SelectionRenderer.java
|
68e740832f8fc03b214fd8b3dbe03a083c8b7293 |
17-May-2013 |
Michael Kolb <kolby@google.com> |
Highlight selected option in FX and Borders Bug: 8791729 Change-Id: I8ac2c3deabe7b293df48db9f44f52956443a92a4
es/values/filtershow_color.xml
|
1a266f16edbef7cb0a770d37fcad958fc55a5862 |
17-May-2013 |
Michael Kolb <kolby@google.com> |
Highlight selected option in FX and Borders Bug: 8791729 Change-Id: I8ac2c3deabe7b293df48db9f44f52956443a92a4
es/values/filtershow_color.xml
rc/com/android/gallery3d/filtershow/category/CategoryAdapter.java
rc/com/android/gallery3d/filtershow/category/CategoryPanel.java
rc/com/android/gallery3d/filtershow/category/CategoryView.java
rc/com/android/gallery3d/filtershow/category/MainPanel.java
rc/com/android/gallery3d/filtershow/ui/FilterIconButton.java
rc/com/android/gallery3d/filtershow/ui/SelectionRenderer.java
|
125f966bb426056f1e99e7cd2cde3ad3f832d067 |
17-May-2013 |
The Android Open Source Project <initial-contribution@android.com> |
am aecc1998: (-s ours) Reconcile with jb-mr2-release - do not merge * commit 'aecc1998647fc33822a8e5c55673c8f45ec466e7':
|
e6bbeb0af501a3367dde0c9b5a967cdf161f2b41 |
17-May-2013 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with jb-mr2-release - do not merge Change-Id: I6c8f974fdf7022bfe1cc0ca00a3cf1466d641428
|
8bb348c68868aa8a32566cecd4c2c15fddf1a243 |
17-May-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I963773d748c0ee9d23257f3fb688f8921a97f01b Auto-generated-cl: translation import
es/values-hi/strings.xml
|
22245b3cc1e6c5e2dadc209fbce2cb9fbd05b431 |
17-May-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I0c282e8a46050eb587fc120334eb2ef21bc2b15e Auto-generated-cl: translation import
es/values-hi/strings.xml
|
ef9af6ffe0634d0ca2c73f3a954f7c41f1b1bcd8 |
17-May-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I5a5fee30a1f76b360c7ffca2ffec7592a66d7e52 Auto-generated-cl: translation import
es/values-hi/strings.xml
|
1bba281ead05868aa8701c7623270e2fbd32ca3d |
17-May-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I5a5fee30a1f76b360c7ffca2ffec7592a66d7e52 Auto-generated-cl: translation import
es/values-hi/strings.xml
|
87f9a62f473a3c57505e2877b0a46ab3cb5e62ac |
17-May-2013 |
Angus Kong <shkong@google.com> |
Add remove UI in FilmStripView 1. Add UI support for swipe to delete. 2. Don't set children padding. Change-Id: I26be97f14d569db3df6a127cd00efe3c0c60f22c
rc/com/android/camera/NewCameraActivity.java
rc/com/android/camera/data/CameraDataAdapter.java
rc/com/android/camera/data/LocalData.java
rc/com/android/camera/ui/FilmStripGestureRecognizer.java
rc/com/android/camera/ui/FilmStripView.java
|
76f7dddd28e1837b3d59d22b98a81c73a6bce75e |
17-May-2013 |
Doris Liu <tianliu@google.com> |
Merge "Add new camera activity back and fix build errors" into gb-ub-photos-carlsbad
|
1bd01a1efc3f1e3fbe89481f08689633a3f15f34 |
17-May-2013 |
Doris Liu <tianliu@google.com> |
Merge "Add new camera activity back and fix build errors" into gb-ub-photos-carlsbad
|
f1aca80946cbb6e922bdc29a6dfd38af0764cad8 |
17-May-2013 |
John Reck <jreck@google.com> |
am 72b6bd03: am 8d07b582: am 3b7347da: Merge "Switch back to old crop" into gb-ub-photos-bryce * commit '72b6bd030c21553f32073790ac8276111ac4e684': Switch back to old crop
|
5b85826058b60d6d36ac64b698deef97297c94f6 |
17-May-2013 |
John Reck <jreck@google.com> |
am 8d07b582: am 3b7347da: Merge "Switch back to old crop" into gb-ub-photos-bryce * commit '8d07b582341df0262eda91da7fbed5938bdd2337': Switch back to old crop
|
4bd3099ffe6aa8773e9bc69b0ca633c1f166a748 |
17-May-2013 |
John Reck <jreck@google.com> |
am 3b7347da: Merge "Switch back to old crop" into gb-ub-photos-bryce * commit '3b7347daf572c20996607afe4cc32f9a96f8fe5d': Switch back to old crop
|
2c4dbba15035120aec9b4c66a578d36ad47bbf3e |
17-May-2013 |
John Reck <jreck@google.com> |
am 3b7347da: Merge "Switch back to old crop" into gb-ub-photos-bryce * commit '3b7347daf572c20996607afe4cc32f9a96f8fe5d': Switch back to old crop
|
3b7347daf572c20996607afe4cc32f9a96f8fe5d |
17-May-2013 |
John Reck <jreck@google.com> |
Merge "Switch back to old crop" into gb-ub-photos-bryce
|
ce54df0c34bd0d8472e2c1fea4da1e0a9d8fd657 |
17-May-2013 |
John Reck <jreck@google.com> |
Switch back to old crop Bug: 8950255 Change-Id: I3f78901e65a17a1d5867d3f76a6031cff5f65fed
rc/com/android/gallery3d/ui/MenuExecutor.java
|
1bfe7cb96a5a042f238d048eda771169d6ad93ac |
17-May-2013 |
John Reck <jreck@google.com> |
Switch back to old crop Bug: 8950255 Change-Id: I3f78901e65a17a1d5867d3f76a6031cff5f65fed
rc/com/android/gallery3d/ui/MenuExecutor.java
|
e4a8f61f3997227904d7984a1aa502d3e46bcfd5 |
16-May-2013 |
Michael Kolb <kolby@google.com> |
am 6d86f3d3: am 1420dea3: am 5f30afbe: Merge "Add new overlay icons for sharpen and curves" into gb-ub-photos-bryce * commit '6d86f3d361d28679cfe5da08dcb7f4356f13558a': Add new overlay icons for sharpen and curves
|
a6c68014337b9d722ab97de7226d0c65839df54e |
16-May-2013 |
Michael Kolb <kolby@google.com> |
am 1420dea3: am 5f30afbe: Merge "Add new overlay icons for sharpen and curves" into gb-ub-photos-bryce * commit '1420dea329586ad491ea93a90a59d0d78b28d953': Add new overlay icons for sharpen and curves
|
76046e5ca00c71aed9838dc1c33afc3c4e66997f |
14-May-2013 |
Doris Liu <tianliu@google.com> |
Add new camera activity back and fix build errors Change-Id: I30b657c7eee2b8cb0317c922966821002ea956f0
es/layout/camera.xml
es/layout/camera_filmstrip.xml
es/layout/new_photo_module.xml
es/layout/new_video_module.xml
rc/com/android/camera/NewPreviewGestures.java
|
7234f4d6ff4fdcd47eb428405d2b31a5711d20ce |
14-May-2013 |
Doris Liu <tianliu@google.com> |
Add new camera activity back and fix build errors Change-Id: I30b657c7eee2b8cb0317c922966821002ea956f0
rc/com/android/camera/NewCameraActivity.java
rc/com/android/camera/NewCameraModule.java
rc/com/android/camera/NewPhotoMenu.java
rc/com/android/camera/NewPhotoModule.java
rc/com/android/camera/NewPhotoUI.java
rc/com/android/camera/NewPreviewGestures.java
rc/com/android/camera/NewVideoMenu.java
rc/com/android/camera/NewVideoModule.java
rc/com/android/camera/NewVideoUI.java
rc/com/android/camera/ui/FaceView.java
rc/com/android/camera/ui/FilmStripGestureRecognizer.java
rc/com/android/camera/ui/NewCameraRootView.java
|
cf2a4a0d300e4d064e5742d32fe07e9374c27065 |
16-May-2013 |
Michael Kolb <kolby@google.com> |
am 5f30afbe: Merge "Add new overlay icons for sharpen and curves" into gb-ub-photos-bryce * commit '5f30afbeea7d6f6f05df9e8a50b64c5cd0cc9cca': Add new overlay icons for sharpen and curves
|
ae0096ca2ad33d6ec74c2824e732d88dab49fe25 |
16-May-2013 |
Michael Kolb <kolby@google.com> |
am 5f30afbe: Merge "Add new overlay icons for sharpen and curves" into gb-ub-photos-bryce * commit '5f30afbeea7d6f6f05df9e8a50b64c5cd0cc9cca': Add new overlay icons for sharpen and curves
|
50decd6a27e68b644786d4c4689513c68c2478f0 |
16-May-2013 |
Michael Kolb <kolby@google.com> |
Merge "Add new overlay icons for sharpen and curves" into gb-ub-photos-bryce
|
5f30afbeea7d6f6f05df9e8a50b64c5cd0cc9cca |
16-May-2013 |
Michael Kolb <kolby@google.com> |
Merge "Add new overlay icons for sharpen and curves" into gb-ub-photos-bryce
|
26a8f25547dec86aeb7937f5a51ac5c745396860 |
16-May-2013 |
Michael Kolb <kolby@google.com> |
Add new overlay icons for sharpen and curves Bug: 8791729 Change-Id: Ife86e0a22fb270df2f2f0a699f103ece5e9e9f1b
es/drawable-hdpi/filtershow_button_colors_curve.png
es/drawable-hdpi/filtershow_button_colors_sharpen.png
es/drawable-mdpi/filtershow_button_colors_curve.png
es/drawable-mdpi/filtershow_button_colors_sharpen.png
es/drawable-xhdpi/filtershow_button_colors_curve.png
es/drawable-xhdpi/filtershow_button_colors_sharpen.png
es/drawable/filtershow_button_colors_curve.png
es/drawable/filtershow_button_colors_sharpen.png
|
b5e0fb8e6f9f5035f7ee2a6ec816f6de6c636065 |
16-May-2013 |
Michael Kolb <kolby@google.com> |
Add new overlay icons for sharpen and curves Bug: 8791729 Change-Id: Ife86e0a22fb270df2f2f0a699f103ece5e9e9f1b
es/drawable-hdpi/filtershow_button_colors_curve.png
es/drawable-hdpi/filtershow_button_colors_sharpen.png
es/drawable-mdpi/filtershow_button_colors_curve.png
es/drawable-mdpi/filtershow_button_colors_sharpen.png
es/drawable-xhdpi/filtershow_button_colors_curve.png
es/drawable-xhdpi/filtershow_button_colors_sharpen.png
es/drawable/filtershow_button_colors_curve.png
es/drawable/filtershow_button_colors_sharpen.png
|
823d9235be4276d4c9dc5d41945b8836400eee23 |
16-May-2013 |
John Reck <jreck@google.com> |
am 42423914: am 5c95e49f: am 75084da1: Merge "toUpper() some strings" into gb-ub-photos-bryce * commit '4242391413fe3b5e12502794cefc7caf689e3044': toUpper() some strings
|
e864d7ae7e5da474db2a9ca9a3a1450fc76ab10f |
16-May-2013 |
John Reck <jreck@google.com> |
am 5c95e49f: am 75084da1: Merge "toUpper() some strings" into gb-ub-photos-bryce * commit '5c95e49faad25acca47639ed97ada8b50567793e': toUpper() some strings
|
c41d255e7f397b861e8ea87e732c4018dddafc22 |
16-May-2013 |
John Reck <jreck@google.com> |
am 2c596d7f: am 80835b0a: am 5a9716fe: Merge "Fix reset" into gb-ub-photos-bryce * commit '2c596d7f5988c942774fb9f8044162b4149f9ab2': Fix reset
|
196091f41b0dd3e852f8c44e70b5cf61764768fb |
16-May-2013 |
John Reck <jreck@google.com> |
am 80835b0a: am 5a9716fe: Merge "Fix reset" into gb-ub-photos-bryce * commit '80835b0aa14ad477adf3f23b69b2bf7c83fe0c20': Fix reset
|
f66e0dbcbcc8d99711312242e4238ab41d8c12c0 |
16-May-2013 |
John Reck <jreck@google.com> |
am 75084da1: Merge "toUpper() some strings" into gb-ub-photos-bryce * commit '75084da1b34e0ff9f269b5409d206c213532edbc': toUpper() some strings
|
2a88de414efddfe2813dea1fbe121f915e3bd07a |
16-May-2013 |
John Reck <jreck@google.com> |
am 75084da1: Merge "toUpper() some strings" into gb-ub-photos-bryce * commit '75084da1b34e0ff9f269b5409d206c213532edbc': toUpper() some strings
|
aa4f40fe94266ed53f900d6199f30084b578b0b8 |
16-May-2013 |
John Reck <jreck@google.com> |
am 75084da1: Merge "toUpper() some strings" into gb-ub-photos-bryce * commit '75084da1b34e0ff9f269b5409d206c213532edbc': toUpper() some strings
|
b9974cb7e9f117c639399c3b13823e13be47f18e |
16-May-2013 |
John Reck <jreck@google.com> |
Merge "toUpper() some strings" into gb-ub-photos-bryce
|
75084da1b34e0ff9f269b5409d206c213532edbc |
16-May-2013 |
John Reck <jreck@google.com> |
Merge "toUpper() some strings" into gb-ub-photos-bryce
|
0dd0a2b9f138c44f50977d0ebcbf308f1af83651 |
16-May-2013 |
John Reck <jreck@google.com> |
Merge "toUpper() some strings" into gb-ub-photos-bryce
|
535c38022add5f7fd87fa12e2c34d2e60291bfd1 |
16-May-2013 |
John Reck <jreck@google.com> |
am 5a9716fe: Merge "Fix reset" into gb-ub-photos-bryce * commit '5a9716fe6de7af4585a24dd1d749b38a4ab48195': Fix reset
|
03a49d85713be63a791ba7e4591aa72f3e2a13b1 |
16-May-2013 |
John Reck <jreck@google.com> |
am 5a9716fe: Merge "Fix reset" into gb-ub-photos-bryce * commit '5a9716fe6de7af4585a24dd1d749b38a4ab48195': Fix reset
|
5a9716fe6de7af4585a24dd1d749b38a4ab48195 |
16-May-2013 |
John Reck <jreck@google.com> |
Merge "Fix reset" into gb-ub-photos-bryce
|
5e737ffa3eb106518e03d1a9b4d00a58c73640ee |
16-May-2013 |
John Reck <jreck@google.com> |
toUpper() some strings Bug: 8791729 Change-Id: Icd05eb2d33b83fb589470ef9d98585f919f14deb
rc/com/android/gallery3d/filtershow/editors/Editor.java
rc/com/android/gallery3d/filtershow/editors/SwapButton.java
rc/com/android/gallery3d/filtershow/ui/ImageCurves.java
|
7638772c0ceb5528b12c9943bad5391658d6c78d |
16-May-2013 |
John Reck <jreck@google.com> |
toUpper() some strings Bug: 8791729 Change-Id: Icd05eb2d33b83fb589470ef9d98585f919f14deb
es/layout-land/filtershow_editor_panel.xml
es/layout/filtershow_editor_panel.xml
rc/com/android/gallery3d/filtershow/editors/Editor.java
rc/com/android/gallery3d/filtershow/editors/SwapButton.java
rc/com/android/gallery3d/filtershow/ui/ImageCurves.java
|
472bdac539e6cd2fb6637bf59631ad6db8c0269a |
16-May-2013 |
John Reck <jreck@google.com> |
toUpper() some strings Bug: 8791729 Change-Id: Icd05eb2d33b83fb589470ef9d98585f919f14deb
es/layout-land/filtershow_editor_panel.xml
es/layout/filtershow_editor_panel.xml
|
3532ed2d117e00b017eb44f7ba172bb9ca7708a7 |
16-May-2013 |
John Hoford <hoford@google.com> |
am 78f2d565: am c792b72a: am fef58a0f: change edit icon * commit '78f2d565bf309c9a2fe2006d66d488e2b62603b7': change edit icon
|
1c3a4ba09d6a88480acec870fba6e24ce9504e09 |
16-May-2013 |
John Hoford <hoford@google.com> |
am c792b72a: am fef58a0f: change edit icon * commit 'c792b72a0b2394cdd8648ad867a0a36f0ad937f4': change edit icon
|
96072149acad1ee0999cf2c8f46b5fb969d1ff73 |
16-May-2013 |
John Hoford <hoford@google.com> |
am fef58a0f: change edit icon * commit 'fef58a0fc969cc09b02cb9945da8d553698681e3': change edit icon
|
f677ba87180a01fe507a6206bc85c45522f8089e |
16-May-2013 |
John Hoford <hoford@google.com> |
am fef58a0f: change edit icon * commit 'fef58a0fc969cc09b02cb9945da8d553698681e3': change edit icon
|
ae4b048b401e728240feba782bf41b82be047ea0 |
16-May-2013 |
John Hoford <hoford@google.com> |
change edit icon bug:8988179 Change-Id: I57516d154e56cd694f8e76bc38774bdf7f9e5df0
es/drawable-hdpi/ic_menu_edit_holo_dark.png
es/drawable-mdpi/ic_menu_edit_holo_dark.png
es/drawable-xhdpi/ic_menu_edit_holo_dark.png
es/layout/photopage_bottom_controls.xml
|
fef58a0fc969cc09b02cb9945da8d553698681e3 |
16-May-2013 |
John Hoford <hoford@google.com> |
change edit icon bug:8988179 Change-Id: I57516d154e56cd694f8e76bc38774bdf7f9e5df0
es/drawable-hdpi/ic_menu_edit_holo_dark.png
es/drawable-mdpi/ic_menu_edit_holo_dark.png
es/drawable-xhdpi/ic_menu_edit_holo_dark.png
es/layout/photopage_bottom_controls.xml
|
5340e6262ed42a4dfac29e0af57743da93bc519a |
16-May-2013 |
The Android Automerger <android-build@google.com> |
merge in jb-mr2-release history after reset to jb-mr2-dev
|
ca8e9af9bc053e4acbd16681ecec22ae583c1d9a |
16-May-2013 |
The Android Open Source Project <initial-contribution@android.com> |
am cd168d34: (-s ours) Reconcile with jb-mr2-release - do not merge * commit 'cd168d344fe9c36ea31505939af5fcb925e5acd7': am a7e098c8: Merge "Drop in new assets of correct size" into gb-ub-photos-bryce am c3178ca4: Gallery crop uses new activity. Fixed image quality.
|
a7d8b2e176323c51e1984ffe313b24a2264c4617 |
16-May-2013 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with jb-mr2-release - do not merge Change-Id: I232af0988b3526fbc5d309397c361556fb7b09e7
|
436a2bcaf47c32a2a1b1cee2871d936c062ce699 |
15-May-2013 |
John Reck <jreck@google.com> |
Fix reset Bug: 8791729 Change-Id: Id39ef76f013a38bae3d92f45b02de7cd184edfec
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
|
be9c8105b431de765f5811bfd170c899d1c8d3b3 |
15-May-2013 |
John Reck <jreck@google.com> |
Fix reset Bug: 8791729 Change-Id: Id39ef76f013a38bae3d92f45b02de7cd184edfec
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
|
b01e4f89f700bb3c29d36ad7048a4d582a771159 |
15-May-2013 |
Michael Kolb <kolby@google.com> |
am 04d95221: am f8d78d2f: am c2f813a3: Merge "Grey out undo/redo/reset according to state" into gb-ub-photos-bryce * commit '04d952217a2dd51b86ddecbe4dc56f98329d78a2': Grey out undo/redo/reset according to state
|
891a2ca77a2d7e36d8284c3d3a995c96371a4e61 |
15-May-2013 |
Michael Kolb <kolby@google.com> |
am 7c83eba2: am da046959: am 655e208d: Merge "Correct label position after rotation" into gb-ub-photos-bryce * commit '7c83eba291774d906abac828f0465643e932f819': Correct label position after rotation
|
5f8b35b82f5c9c518d31e463c574c8f2eee6faa1 |
15-May-2013 |
ztenghui <ztenghui@google.com> |
am 76582a06: am 0e0644ad: am 4aa8d5fc: Merge "Fix another annoying warning log spam" into gb-ub-photos-bryce * commit '76582a062e3c9333f55c5d43c5900637feeb0492': Fix another annoying warning log spam
|
9163cbcec00c12828f409fe522aa6db9e5171c40 |
15-May-2013 |
Michael Kolb <kolby@google.com> |
am f8d78d2f: am c2f813a3: Merge "Grey out undo/redo/reset according to state" into gb-ub-photos-bryce * commit 'f8d78d2fda5b706e5932f8d428f6316f4e68a32a': Grey out undo/redo/reset according to state
|
e1efc79fd134b18d45d6d417d81b5219567a4e9a |
15-May-2013 |
Michael Kolb <kolby@google.com> |
am da046959: am 655e208d: Merge "Correct label position after rotation" into gb-ub-photos-bryce * commit 'da046959e0b990e532e774779c50b2b5c1d7a785': Correct label position after rotation
|
d1f9472cc75f16cc479fe399573c6b62d2b10e8b |
15-May-2013 |
ztenghui <ztenghui@google.com> |
am 0e0644ad: am 4aa8d5fc: Merge "Fix another annoying warning log spam" into gb-ub-photos-bryce * commit '0e0644ad8538253bfb0e07bdafaa2dacba6c6a56': Fix another annoying warning log spam
|
fc5d005a3c3309fac653d12af4fd158c4b79c834 |
15-May-2013 |
Michael Kolb <kolby@google.com> |
am c2f813a3: Merge "Grey out undo/redo/reset according to state" into gb-ub-photos-bryce * commit 'c2f813a36711742af3b23743ef1849cec13a9a95': Grey out undo/redo/reset according to state
|
454b55986b9736fabfc9aa8b458d70866018b22d |
15-May-2013 |
Michael Kolb <kolby@google.com> |
am 655e208d: Merge "Correct label position after rotation" into gb-ub-photos-bryce * commit '655e208d5dc1305d9e4eb5301dec0673136151c9': Correct label position after rotation
|
b6ad64dce341b96a68eecca6cc6ceda633c1a521 |
15-May-2013 |
Michael Kolb <kolby@google.com> |
am c2f813a3: Merge "Grey out undo/redo/reset according to state" into gb-ub-photos-bryce * commit 'c2f813a36711742af3b23743ef1849cec13a9a95': Grey out undo/redo/reset according to state
|
e64e28cd164d52e1339f084ff57cf602f1bfd55c |
15-May-2013 |
Michael Kolb <kolby@google.com> |
am 655e208d: Merge "Correct label position after rotation" into gb-ub-photos-bryce * commit '655e208d5dc1305d9e4eb5301dec0673136151c9': Correct label position after rotation
|
c2f813a36711742af3b23743ef1849cec13a9a95 |
15-May-2013 |
Michael Kolb <kolby@google.com> |
Merge "Grey out undo/redo/reset according to state" into gb-ub-photos-bryce
|
2c81bea7d026c29ad2b0b95031b2a399b88886f5 |
15-May-2013 |
Michael Kolb <kolby@google.com> |
Merge "Grey out undo/redo/reset according to state" into gb-ub-photos-bryce
|
655e208d5dc1305d9e4eb5301dec0673136151c9 |
15-May-2013 |
Michael Kolb <kolby@google.com> |
Merge "Correct label position after rotation" into gb-ub-photos-bryce
|
3071b12d4586b6dbb908c0fc89ebc04bbd656995 |
15-May-2013 |
Michael Kolb <kolby@google.com> |
Merge "Correct label position after rotation" into gb-ub-photos-bryce
|
cfe2423206a26785a4e78b08a8985670566609d7 |
15-May-2013 |
ztenghui <ztenghui@google.com> |
am 4aa8d5fc: Merge "Fix another annoying warning log spam" into gb-ub-photos-bryce * commit '4aa8d5fc9d3478d511786cb99d5ba704d3e1f426': Fix another annoying warning log spam
|
56f69010c951298634fc85529cb75842442c2528 |
15-May-2013 |
ztenghui <ztenghui@google.com> |
am 4aa8d5fc: Merge "Fix another annoying warning log spam" into gb-ub-photos-bryce * commit '4aa8d5fc9d3478d511786cb99d5ba704d3e1f426': Fix another annoying warning log spam
|
4aa8d5fc9d3478d511786cb99d5ba704d3e1f426 |
15-May-2013 |
ztenghui <ztenghui@google.com> |
Merge "Fix another annoying warning log spam" into gb-ub-photos-bryce
|
cbe3447fab97f3c4ffb0a792ae4d9cb9d3b558c6 |
15-May-2013 |
ztenghui <ztenghui@google.com> |
Merge "Fix another annoying warning log spam" into gb-ub-photos-bryce
|
81f2fe728c44e8a125ed746489527929d57b305e |
15-May-2013 |
Marco Nelissen <marcone@google.com> |
am d41597fd: am 6e59979d: Merge "Enable virtualization" into jb-mr2-dev * commit 'd41597fda5f25c4915cde35566f357903c56c37e': Enable virtualization
|
d74dc023145f8289c54567775cdb154711810a34 |
15-May-2013 |
Marco Nelissen <marcone@google.com> |
am 6e59979d: Merge "Enable virtualization" into jb-mr2-dev * commit '6e59979de90664d5e93d25a4bf2e165de2e20ac2': Enable virtualization
|
97e8bd504a7ca85b135d90b0201035778cea1e7a |
15-May-2013 |
Marco Nelissen <marcone@google.com> |
Merge "Enable virtualization" into jb-mr2-dev
|
e342207d88261d1fe2169ad047372a383dd8a5d9 |
15-May-2013 |
The Android Automerger <android-build@android.com> |
merge in jb-mr2-release history after reset to jb-mr2-dev
|
2b06ff267ca205b72b79ac9b6f8089a623719afe |
15-May-2013 |
Angus Kong <shkong@google.com> |
Merge "Improve bitmap load efficiency." into gb-ub-photos-carlsbad
|
dff7d0ec9cb635ef7381e518d32de5b7457dd655 |
15-May-2013 |
Michael Kolb <kolby@google.com> |
Grey out undo/redo/reset according to state Bug: 8791729 Change-Id: I1252a9634870e56c8989688eeb28b1b4c2781827
rc/com/android/gallery3d/filtershow/HistoryAdapter.java
|
ea7b3557be2beb76d553a0cfe216c382eb293ee4 |
15-May-2013 |
Michael Kolb <kolby@google.com> |
Grey out undo/redo/reset according to state Bug: 8791729 Change-Id: I1252a9634870e56c8989688eeb28b1b4c2781827
rc/com/android/gallery3d/filtershow/HistoryAdapter.java
|
36eea8990c70534a8ecb2b1775dd5488dcaffeea |
14-May-2013 |
Doris Liu <tianliu@google.com> |
am a4f1cdc2: am 18f19a72: am 26dbb20c: Merge "Pause face detection when review captured images" into gb-ub-photos-bryce * commit 'a4f1cdc2b0a9601d878e7ea09a79ec28e0e543ca': Pause face detection when review captured images
|
a0b60f835e51d17a1316fff651a54d11ac2b7d5d |
14-May-2013 |
Michael Kolb <kolby@google.com> |
Correct label position after rotation Bug: 8963421 Change-Id: If361e0ca6f20612ec3baae74cde444bd26164ab3
rc/com/android/camera/ui/PieRenderer.java
|
60e938e0caed26441e0ab784344fd161954dc8ab |
14-May-2013 |
Michael Kolb <kolby@google.com> |
Correct label position after rotation Bug: 8963421 Change-Id: If361e0ca6f20612ec3baae74cde444bd26164ab3
rc/com/android/camera/ui/PieRenderer.java
|
98a32ae80f8160dbd8b418c521544b6e15c8ca3f |
14-May-2013 |
Doris Liu <tianliu@google.com> |
am 18f19a72: am 26dbb20c: Merge "Pause face detection when review captured images" into gb-ub-photos-bryce * commit '18f19a722c327edcf8f84fc5494f13cbbe816a4d': Pause face detection when review captured images
|
7e072be494fa0c46b1f0aeda4cdbf35e8d55fbf5 |
14-May-2013 |
Doris Liu <tianliu@google.com> |
am 26dbb20c: Merge "Pause face detection when review captured images" into gb-ub-photos-bryce * commit '26dbb20c15e27d22a14efd0a25ec4e50cf5084cc': Pause face detection when review captured images
|
48dda2ed8b296db3231a7f1cbddf7b656bef55d7 |
14-May-2013 |
Doris Liu <tianliu@google.com> |
am 26dbb20c: Merge "Pause face detection when review captured images" into gb-ub-photos-bryce * commit '26dbb20c15e27d22a14efd0a25ec4e50cf5084cc': Pause face detection when review captured images
|
26dbb20c15e27d22a14efd0a25ec4e50cf5084cc |
14-May-2013 |
Doris Liu <tianliu@google.com> |
Merge "Pause face detection when review captured images" into gb-ub-photos-bryce
|
750e8ec8af168afd318d47082b326b95f1cca517 |
06-May-2013 |
Angus Kong <shkong@google.com> |
Improve bitmap load efficiency. Call prepare before/recycle after using image data. Change-Id: I3387c8ca68f57c3949fed2aaa3e26490e66c791a
rc/com/android/camera/data/CameraDataAdapter.java
rc/com/android/camera/data/LocalData.java
rc/com/android/camera/ui/FilmStripView.java
|
ecc4e9cc7a5a45961d641dc9bbc69cd27a99f0cf |
14-May-2013 |
Tim Murray <timmurray@google.com> |
am 2c28721b: am a24c4906: am 33f2a880: Only link librsjni in unbundled branches. * commit '2c28721bcfe6135f7477fa84e214d7616a6a6fc7': Only link librsjni in unbundled branches.
|
b27ae3b43673fb1e79e66746c1535d101f3b8b18 |
14-May-2013 |
Tim Murray <timmurray@google.com> |
am a24c4906: am 33f2a880: Only link librsjni in unbundled branches. * commit 'a24c4906455e02f1a8cc8db98dd2280a1d19eca4': Only link librsjni in unbundled branches.
|
62dc5a00b0597f15f0b8576bbc4aac62c2378335 |
14-May-2013 |
Tim Murray <timmurray@google.com> |
am 33f2a880: Only link librsjni in unbundled branches. * commit '33f2a8800ff5228bf81a0fdc75c1289bae9a4d1c': Only link librsjni in unbundled branches.
|
d31cdfeb1035df8ba939e877031769f0df247aa6 |
14-May-2013 |
Doris Liu <tianliu@google.com> |
Pause face detection when review captured images Bug: 8799508 Change-Id: I994299a3ad406bcee5e6699265cb0ab29612e62c
rc/com/android/camera/PhotoUI.java
|
6f14590d1ac6d6984fa0db4af668bc897628a6f3 |
14-May-2013 |
Doris Liu <tianliu@google.com> |
Pause face detection when review captured images Bug: 8799508 Change-Id: I994299a3ad406bcee5e6699265cb0ab29612e62c
rc/com/android/camera/PhotoUI.java
|
a0f586992d7e8594a46b83a227d53180621b6ce5 |
14-May-2013 |
The Android Automerger <android-build@android.com> |
merge in jb-mr2-release history after reset to jb-mr2-dev
|
7f9e16ed4a4feb1d7ae15fb9e73d84d95ee53c2d |
14-May-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Fix FP rounding error for crop bounds. Bug: 8874599 Change-Id: I94198e4dcdbb0afa1dd788130645855b33e8f30b
rc/com/android/gallery3d/filtershow/crop/CropMath.java
|
59c25ee436215b989492b65dd0f26268e5b99b01 |
14-May-2013 |
Tim Murray <timmurray@google.com> |
Only link librsjni in unbundled branches. bug 8939828 Change-Id: I87d28185c6fb2b23852eb66487bf99d6111c3a7a
ndroid.mk
|
33f2a8800ff5228bf81a0fdc75c1289bae9a4d1c |
14-May-2013 |
Tim Murray <timmurray@google.com> |
Only link librsjni in unbundled branches. bug 8939828 Change-Id: I87d28185c6fb2b23852eb66487bf99d6111c3a7a
ndroid.mk
|
49b9ba2ba89760f297ecc7d6d94d68fb4b836be1 |
13-May-2013 |
Angus Kong <shkong@google.com> |
Dropping back FilmStripView codes. Ongoing work that doesn't affect builds. Change-Id: I83d81fa91e87d10787c3ce1d767bc41131341067
rc/com/android/camera/data/CameraDataAdapter.java
rc/com/android/camera/ui/FilmStripGestureRecognizer.java
rc/com/android/camera/ui/FilmStripView.java
|
21df8c16f26a50e175a8de61f02509f77a834861 |
13-May-2013 |
Marco Nelissen <marcone@google.com> |
Enable virtualization When the Intent says to virtualize, and the right virtualizer is present on the device, enable virtualization. b/8767565 Change-Id: I8a98404b21c434966b7ae2dc341eb38f2a47eef2
rc/com/android/gallery3d/app/MoviePlayer.java
|
7f19247734fe6962aa0934f075c90c836ede53ce |
13-May-2013 |
Doris Liu <tianliu@google.com> |
am ed9b3ac3: am c5fb797d: am 25d69c11: Merge "New count down beeps." into gb-ub-photos-bryce * commit 'ed9b3ac3b0064e9b4acf41d4c083d325abeefe8b': New count down beeps.
|
d819087d75782b742bacfcca85194fae3a7eb978 |
13-May-2013 |
Doris Liu <tianliu@google.com> |
am c5fb797d: am 25d69c11: Merge "New count down beeps." into gb-ub-photos-bryce * commit 'c5fb797d41515e15fba40042bc947543b5e9896c': New count down beeps.
|
ec8d2c6022683e2643be1b56b48d3dfd98e25e12 |
13-May-2013 |
Doris Liu <tianliu@google.com> |
am 25d69c11: Merge "New count down beeps." into gb-ub-photos-bryce * commit '25d69c11831fabf8f4e474aaf17b05dd001979ce': New count down beeps.
|
ea0040b2a7a1bb538c82d140bcf476c48bed9bca |
13-May-2013 |
Doris Liu <tianliu@google.com> |
am 25d69c11: Merge "New count down beeps." into gb-ub-photos-bryce * commit '25d69c11831fabf8f4e474aaf17b05dd001979ce': New count down beeps.
|
94c6f5e5c7a36c3d77fe811505e4d6da75955f92 |
13-May-2013 |
Doris Liu <tianliu@google.com> |
Merge "New count down beeps." into gb-ub-photos-bryce
|
25d69c11831fabf8f4e474aaf17b05dd001979ce |
13-May-2013 |
Doris Liu <tianliu@google.com> |
Merge "New count down beeps." into gb-ub-photos-bryce
|
5e21003398e687fb66880878858c1a6df1e9eef6 |
11-May-2013 |
ztenghui <ztenghui@google.com> |
Fix another annoying warning log spam bug:8771541 When we set up the icon rendering, we need to set the geometry, too. Change-Id: I331bdb752c5183d5e2611d8387505055c4219b92
rc/com/android/gallery3d/filtershow/ui/FilterIconButton.java
|
f4862f0a3df697db6000972dbfd5387727506072 |
11-May-2013 |
ztenghui <ztenghui@google.com> |
Fix another annoying warning log spam bug:8771541 When we set up the icon rendering, we need to set the geometry, too. Change-Id: I331bdb752c5183d5e2611d8387505055c4219b92
rc/com/android/gallery3d/filtershow/ui/FilterIconButton.java
|
11cf4db1b07e57067081d491e7590a61db34f281 |
13-May-2013 |
Doris Liu <tianliu@google.com> |
New count down beeps. Bug: 8872947 Change-Id: Ifc84daabba0a4e85e32fd3547303716ca5ed649a
es/raw/beep_once.ogg
es/raw/beep_twice.ogg
|
0b775d14c7d225e19491a2405f653f3f7713437c |
13-May-2013 |
Doris Liu <tianliu@google.com> |
New count down beeps. Bug: 8872947 Change-Id: Ifc84daabba0a4e85e32fd3547303716ca5ed649a
es/raw/beep_once.ogg
es/raw/beep_twice.ogg
|
f38af8a526ca191ced230f986ad1550879710629 |
13-May-2013 |
The Android Automerger <android-build@android.com> |
merge in jb-mr2-release history after reset to jb-mr2-dev
|
362b361849ffc77b646132959d20755959b8336d |
10-May-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Revert "Reinitialize all the filters after Crop is applied." This reverts commit 1cfbaca7bef29b7d510c5e1de424e68cd8804022.
rc/com/android/gallery3d/filtershow/filters/BaseFiltersManager.java
rc/com/android/gallery3d/filtershow/filters/FiltersManagerInterface.java
rc/com/android/gallery3d/filtershow/filters/ImageFilter.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterRS.java
|
d8224654ddc7265e715eefd8b1a86f34f8dbbab1 |
10-May-2013 |
Victor Doba <dobavictor@google.com> |
Reinitialize all the filters after Crop is applied. Change-Id: I192918a3f28eac400e2e35f3b410dc8adc1a8ad4
rc/com/android/gallery3d/filtershow/filters/BaseFiltersManager.java
rc/com/android/gallery3d/filtershow/filters/FiltersManagerInterface.java
rc/com/android/gallery3d/filtershow/filters/ImageFilter.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterRS.java
|
b9c4151f37ae4fd6f6634df9f62730d9455768ed |
10-May-2013 |
George Mount <mount@google.com> |
am 8cbdeb31: am 09e1a5ac: am ac94740c: Remove GL dependency on unused stencil buffers. * commit '8cbdeb310a769b02c61f2ec0a231821bc6ee5fa2': Remove GL dependency on unused stencil buffers.
|
215f16fe114217105f99699c746ccb8848c6d92d |
10-May-2013 |
George Mount <mount@google.com> |
am 09e1a5ac: am ac94740c: Remove GL dependency on unused stencil buffers. * commit '09e1a5ac2cdd9bccd543df91859152a0aa3c3879': Remove GL dependency on unused stencil buffers.
|
423293f8bf95d625a08c3732ef234d52075682d7 |
10-May-2013 |
George Mount <mount@google.com> |
am ac94740c: Remove GL dependency on unused stencil buffers. * commit 'ac94740cd673a016542d803c8600633c99b7427e': Remove GL dependency on unused stencil buffers.
|
e87f2a79cda41bf75069206c6f453ce97912dddb |
10-May-2013 |
George Mount <mount@google.com> |
am ac94740c: Remove GL dependency on unused stencil buffers. * commit 'ac94740cd673a016542d803c8600633c99b7427e': Remove GL dependency on unused stencil buffers.
|
caa77af0d12fa40418a342385bc47b8db6267e6c |
09-May-2013 |
George Mount <mount@google.com> |
Remove GL dependency on unused stencil buffers. Bug 8884435 Change-Id: I8e7f0563a4a901953e3e2b14e35457b4fefe2e34
rc/com/android/gallery3d/glrenderer/GLCanvas.java
rc/com/android/gallery3d/glrenderer/GLES11Canvas.java
rc/com/android/gallery3d/glrenderer/GLES20Canvas.java
rc/com/android/gallery3d/ui/GLRootView.java
rc/com/android/gallery3d/ui/GalleryEGLConfigChooser.java
ests/src/com/android/gallery3d/ui/GLCanvasStub.java
|
ac94740cd673a016542d803c8600633c99b7427e |
09-May-2013 |
George Mount <mount@google.com> |
Remove GL dependency on unused stencil buffers. Bug 8884435 Change-Id: I8e7f0563a4a901953e3e2b14e35457b4fefe2e34
rc/com/android/gallery3d/glrenderer/GLCanvas.java
rc/com/android/gallery3d/glrenderer/GLES11Canvas.java
rc/com/android/gallery3d/glrenderer/GLES20Canvas.java
rc/com/android/gallery3d/ui/GLRootView.java
rc/com/android/gallery3d/ui/GalleryEGLConfigChooser.java
ests/src/com/android/gallery3d/ui/GLCanvasStub.java
|
355148659ec47dcbc0e670da3d38b7590e33d366 |
09-May-2013 |
ztenghui <ztenghui@google.com> |
resolved conflicts for merge of 9a4fb2dc to gb-ub-photos-carlsbad Change-Id: I90ffd8732cf34bb3dea7a849fc37fb1f3d82df39
|
e579e4f752af8005680a4b80780ba65a7fdfa9e8 |
09-May-2013 |
ztenghui <ztenghui@google.com> |
resolved conflicts for merge of 9a4fb2dc to gb-ub-photos-carlsbad Change-Id: I90ffd8732cf34bb3dea7a849fc37fb1f3d82df39
|
0586812c1475f9221965cfe89390e5b8d2c38972 |
09-May-2013 |
ztenghui <ztenghui@google.com> |
am d49fd01c: am f4733e6f: am 9a4fb2dc: Merge "Fix the verbose log" into gb-ub-photos-bryce * commit 'd49fd01c2547c4630c1d3665e70523698ea7f48b': Fix the verbose log
|
580a70ca4af56da78a4e96a4bb77e31b16155b1e |
09-May-2013 |
ztenghui <ztenghui@google.com> |
am f4733e6f: am 9a4fb2dc: Merge "Fix the verbose log" into gb-ub-photos-bryce * commit 'f4733e6f0f8c7012a448f375627478bfb9e53c96': Fix the verbose log
|
0470634dace2e72202f8deddacb1505e7c9fe021 |
09-May-2013 |
ztenghui <ztenghui@google.com> |
am 9a4fb2dc: Merge "Fix the verbose log" into gb-ub-photos-bryce * commit '9a4fb2dc95722c45e2acb4f4fe380d27830f8d8b': Fix the verbose log
|
4b04581a65df77b3e3d29fe740411216ec2d079f |
09-May-2013 |
ztenghui <ztenghui@google.com> |
Merge "Fix the verbose log" into gb-ub-photos-bryce
|
b5530eae0732be37a7685e646c5dd9726dc73caf |
09-May-2013 |
ztenghui <ztenghui@google.com> |
Merge "Fix the verbose log" into gb-ub-photos-bryce
|
9a4fb2dc95722c45e2acb4f4fe380d27830f8d8b |
09-May-2013 |
ztenghui <ztenghui@google.com> |
Merge "Fix the verbose log" into gb-ub-photos-bryce
|
bf1dc5019c3040e2380a1695f4a5ac8ac6aafd26 |
09-May-2013 |
George Mount <mount@google.com> |
Merge "Fix bitmap buffer size." into gb-ub-photos-carlsbad
|
9cc33d0ba8899e8a35217171f641e373a455f677 |
09-May-2013 |
The Android Automerger <android-build@android.com> |
merge in jb-mr2-release history after reset to jb-mr2-dev
|
c83e2fe479aa222d0f74ced1c0a17b903c478bcd |
09-May-2013 |
Bart Sears <bsears@google.com> |
am 2ee5df0c: am de8d7096: am b298ab63: Merge "Close menu in onPause" into gb-ub-photos-bryce * commit '2ee5df0cd4fec393b22c719620fd158e6b1eccb7': Close menu in onPause
|
044f4c0f87f0249065771a3a0ec71fc19762ed45 |
09-May-2013 |
Bart Sears <bsears@google.com> |
am de8d7096: am b298ab63: Merge "Close menu in onPause" into gb-ub-photos-bryce * commit 'de8d70965ebea26929aae9f40245e5147d638f65': Close menu in onPause
|
6a9a4979e60d54f010c2a43da7af62a5c3f9746c |
09-May-2013 |
Bart Sears <bsears@google.com> |
am b298ab63: Merge "Close menu in onPause" into gb-ub-photos-bryce * commit 'b298ab636fec3894b9e702eaa0a6028ba03f49b1': Close menu in onPause
|
da7bb5ee038ccc5ec43822eba5a34d607208c4e5 |
09-May-2013 |
Bart Sears <bsears@google.com> |
am b298ab63: Merge "Close menu in onPause" into gb-ub-photos-bryce * commit 'b298ab636fec3894b9e702eaa0a6028ba03f49b1': Close menu in onPause
|
3d585e9429acc637fa4f6e9ad9fdc82a428c7152 |
09-May-2013 |
Bart Sears <bsears@google.com> |
Merge "Close menu in onPause" into gb-ub-photos-bryce
|
b298ab636fec3894b9e702eaa0a6028ba03f49b1 |
09-May-2013 |
Bart Sears <bsears@google.com> |
Merge "Close menu in onPause" into gb-ub-photos-bryce
|
6120af1f6b886191f92a6780957ced8b500e467d |
09-May-2013 |
Sascha Haeberling <haeberling@google.com> |
Make sure canceling a filter does not undo previous filter. Bug: 8770921 Change-Id: I2b8e5fac980f562eaf97b231ad15612004608164
rc/com/android/gallery3d/filtershow/HistoryAdapter.java
|
a60a303c3c5de42cc6d0d2765008c4728bb9aab7 |
09-May-2013 |
Sascha Haeberling <haeberling@google.com> |
Make sure canceling a filter does not undo previous filter. Bug: 8770921 Change-Id: I2b8e5fac980f562eaf97b231ad15612004608164
rc/com/android/gallery3d/filtershow/HistoryAdapter.java
|
382238298838189fb4c6f4c0344395dcea7e022a |
09-May-2013 |
Michael Kolb <kolby@google.com> |
am 71d392b5: am c3ec037f: am e324a388: Merge "Add drop shadow to preview thumb" into gb-ub-photos-bryce * commit '71d392b57e947a6876cf4e877acd95d06421244f': Add drop shadow to preview thumb
|
7ef6fe36164dc6a94318e09639f6f97e7c369ff5 |
09-May-2013 |
Michael Kolb <kolby@google.com> |
am c3ec037f: am e324a388: Merge "Add drop shadow to preview thumb" into gb-ub-photos-bryce * commit 'c3ec037ffa27fb45e1bbf8ba9d08da22a6979920': Add drop shadow to preview thumb
|
1e9c9667ca0cc86f2752a42947eb2b02dc099ee8 |
09-May-2013 |
Michael Kolb <kolby@google.com> |
am e324a388: Merge "Add drop shadow to preview thumb" into gb-ub-photos-bryce * commit 'e324a388ead1f291fe27eb6b4ce5f25b55a29a49': Add drop shadow to preview thumb
|
667ef1217b802787d0d4557d5df1482d5f5b0c49 |
09-May-2013 |
Michael Kolb <kolby@google.com> |
am e324a388: Merge "Add drop shadow to preview thumb" into gb-ub-photos-bryce * commit 'e324a388ead1f291fe27eb6b4ce5f25b55a29a49': Add drop shadow to preview thumb
|
a4870271d5b7a07a9128f410fdf9c97df64feba4 |
09-May-2013 |
Michael Kolb <kolby@google.com> |
am e324a388: Merge "Add drop shadow to preview thumb" into gb-ub-photos-bryce * commit 'e324a388ead1f291fe27eb6b4ce5f25b55a29a49': Add drop shadow to preview thumb
|
c3b2c78480dc6bacf0b5d279cb7b07ee82a61dc8 |
09-May-2013 |
Michael Kolb <kolby@google.com> |
Merge "Add drop shadow to preview thumb" into gb-ub-photos-bryce
|
e324a388ead1f291fe27eb6b4ce5f25b55a29a49 |
09-May-2013 |
Michael Kolb <kolby@google.com> |
Merge "Add drop shadow to preview thumb" into gb-ub-photos-bryce
|
8754acdd2389bcaf53b37bf205d8d9920951c011 |
08-May-2013 |
ztenghui <ztenghui@google.com> |
Fix the verbose log Now use adb shell log.tag.BasicRepresentation VERBOSE to turn on the logging. bug:8771541 Change-Id: Ib9e1e44dbbd4e46798226d8ab5dc7365e8a90e27
rc/com/android/gallery3d/filtershow/filters/FilterBasicRepresentation.java
|
d06573076a50d10038aea574529e02a190e93150 |
08-May-2013 |
ztenghui <ztenghui@google.com> |
Fix the verbose log Now use adb shell log.tag.BasicRepresentation VERBOSE to turn on the logging. bug:8771541 Change-Id: Ib9e1e44dbbd4e46798226d8ab5dc7365e8a90e27
rc/com/android/gallery3d/filtershow/filters/FilterBasicRepresentation.java
|
502244165ab673f3d0b1d0c0288de4b010c5c5c9 |
08-May-2013 |
ztenghui <ztenghui@google.com> |
Fix the verbose log Now use adb shell log.tag.BasicRepresentation VERBOSE to turn on the logging. bug:8771541 Change-Id: Ib9e1e44dbbd4e46798226d8ab5dc7365e8a90e27
rc/com/android/gallery3d/filtershow/filters/FilterBasicRepresentation.java
|
d64ae9d77d30f01d38972771b4dd154be8c46ee1 |
08-May-2013 |
Michael Kolb <kolby@google.com> |
Add drop shadow to preview thumb Bug: 8826241 Also, remove animateSlide blocker, it caused frozen review Change-Id: Ic8eb129ec236726550a26bc387967fe0c00473e9
es/drawable-hdpi/capture_thumbnail_shadow.9.png
es/drawable-mdpi/capture_thumbnail_shadow.9.png
es/drawable-xhdpi/capture_thumbnail_shadow.9.png
es/values/dimens.xml
|
4615c5c727b4e447b702f1e11213898da28d2f97 |
08-May-2013 |
Michael Kolb <kolby@google.com> |
Add drop shadow to preview thumb Bug: 8826241 Also, remove animateSlide blocker, it caused frozen review Change-Id: Ic8eb129ec236726550a26bc387967fe0c00473e9
rc/com/android/camera/ActivityBase.java
rc/com/android/camera/CameraScreenNail.java
rc/com/android/camera/CaptureAnimManager.java
|
03a3fe53625ec513c0b76fc333f66a16211b2d7b |
08-May-2013 |
Michael Kolb <kolby@google.com> |
Add drop shadow to preview thumb Bug: 8826241 Also, remove animateSlide blocker, it caused frozen review Change-Id: Ic8eb129ec236726550a26bc387967fe0c00473e9
es/drawable-hdpi/capture_thumbnail_shadow.9.png
es/drawable-mdpi/capture_thumbnail_shadow.9.png
es/drawable-xhdpi/capture_thumbnail_shadow.9.png
es/values/dimens.xml
rc/com/android/camera/ActivityBase.java
rc/com/android/camera/CameraScreenNail.java
rc/com/android/camera/CaptureAnimManager.java
|
b16bae90dbb99892c6b3209c13c53c44cb69deb4 |
09-May-2013 |
Michael Kolb <kolby@google.com> |
Close menu in onPause Bug: 8722672 Change-Id: Ia3fac3ccc5db6cc1bb2a1dd32960ec6295735cfc
rc/com/android/camera/PhotoUI.java
|
75add6bc6abd314c9244fd667fbd586bf50bf3dc |
09-May-2013 |
Michael Kolb <kolby@google.com> |
Close menu in onPause Bug: 8722672 Change-Id: Ia3fac3ccc5db6cc1bb2a1dd32960ec6295735cfc
rc/com/android/camera/PhotoUI.java
|
edc63acbef5d639e5c0afa25f23b589559e3dc0f |
09-May-2013 |
George Mount <mount@google.com> |
Fix bitmap buffer size. The buffer size wasn't sufficient for some images. Change-Id: Iba008c5bd4801183450f6076d73d19db531d5f3b
rc/com/android/photos/data/BitmapDecoder.java
|
0834d5e006a209b6ed22458abc8117f92f9e2fdb |
09-May-2013 |
Doris Liu <tianliu@google.com> |
Merge "Remove new camera activity to avoid build breakage" into gb-ub-photos-carlsbad
|
67ba348a511c12f4e06a46cd96ec391d01e61b9e |
09-May-2013 |
Sascha Haeberling <haeberling@google.com> |
am d829a6c5: am b51819ba: am 58f32428: Merge "Reduce max size of bitmap returned by crop dialog." into gb-ub-photos-bryce * commit 'd829a6c52cdcf87001e8d4189a1eb80905083abc': Reduce max size of bitmap returned by crop dialog.
|
d49efcc25a5e0595cff5c211facccb2aa1842a63 |
09-May-2013 |
Doris Liu <tianliu@google.com> |
Remove new camera activity to avoid build breakage Change-Id: I56f0586ae196f57a0f55b8d835e6bc8fd27bdcfe
ndroidManifest.xml
|
a7a892ee49adf760a8c2bd65aabfd49d0a157e92 |
09-May-2013 |
Doris Liu <tianliu@google.com> |
Remove new camera activity to avoid build breakage Change-Id: I56f0586ae196f57a0f55b8d835e6bc8fd27bdcfe
es/layout/build_fix_indicators.xml
es/layout/camera.xml
es/layout/camera_filmstrip.xml
es/layout/new_photo_module.xml
es/layout/new_video_module.xml
rc/com/android/camera/NewPreviewGestures.java
|
f43dee9f40bb4f21df23ae3876213a5b2f9afcfc |
09-May-2013 |
Doris Liu <tianliu@google.com> |
Remove new camera activity to avoid build breakage Change-Id: I56f0586ae196f57a0f55b8d835e6bc8fd27bdcfe
rc/com/android/camera/NewCameraActivity.java
rc/com/android/camera/NewCameraModule.java
rc/com/android/camera/NewPhotoMenu.java
rc/com/android/camera/NewPhotoModule.java
rc/com/android/camera/NewPhotoUI.java
rc/com/android/camera/NewPreviewGestures.java
rc/com/android/camera/NewVideoMenu.java
rc/com/android/camera/NewVideoModule.java
rc/com/android/camera/NewVideoUI.java
rc/com/android/camera/data/CameraDataAdapter.java
rc/com/android/camera/ui/FaceView.java
rc/com/android/camera/ui/FilmStripGestureRecognizer.java
rc/com/android/camera/ui/FilmStripView.java
rc/com/android/camera/ui/NewCameraRootView.java
|
5a5f6243f5a34a8a5b4b8e06cd451cb3f78e4433 |
09-May-2013 |
Sascha Haeberling <haeberling@google.com> |
am b51819ba: am 58f32428: Merge "Reduce max size of bitmap returned by crop dialog." into gb-ub-photos-bryce * commit 'b51819ba4e1690aa43ba112be707220414e44f3b': Reduce max size of bitmap returned by crop dialog.
|
955549f3e24e458dc6f3b84e8a510385a88f973c |
09-May-2013 |
Sascha Haeberling <haeberling@google.com> |
am 58f32428: Merge "Reduce max size of bitmap returned by crop dialog." into gb-ub-photos-bryce * commit '58f32428768ff67520e0363de7a8c1929a4eac1f': Reduce max size of bitmap returned by crop dialog.
|
2bf76b3fd19b0ec67c7d4510f4350f875762f9d3 |
09-May-2013 |
Sascha Haeberling <haeberling@google.com> |
am 58f32428: Merge "Reduce max size of bitmap returned by crop dialog." into gb-ub-photos-bryce * commit '58f32428768ff67520e0363de7a8c1929a4eac1f': Reduce max size of bitmap returned by crop dialog.
|
58f32428768ff67520e0363de7a8c1929a4eac1f |
09-May-2013 |
Sascha Haeberling <haeberling@google.com> |
Merge "Reduce max size of bitmap returned by crop dialog." into gb-ub-photos-bryce
|
ca1717423fadab46d9c9d2f967a1a1d7eb2473ab |
09-May-2013 |
Sascha Haeberling <haeberling@google.com> |
Merge "Reduce max size of bitmap returned by crop dialog." into gb-ub-photos-bryce
|
a85fe0a353f4c63b16154d8264480b460f215a05 |
09-May-2013 |
Michael Kolb <kolby@google.com> |
am e51dd93e: am 17b4b977: am c3fde4b4: Merge "Fix second level menu" into gb-ub-photos-bryce * commit 'e51dd93ed757c7b89467cd69932efd66b702f7f3': Fix second level menu
|
e51d5b8cc2c1a316c39bf4f1d04bcb2cb70d4ff4 |
09-May-2013 |
Angus Kong <shkong@google.com> |
am aec98df1: am 50e22843: Merge "Further assets clean up." into jb-mr2-dev * commit 'aec98df1f61d5a67e226ef7bea62ba411653c877': Further assets clean up.
|
c6426ff1df7e76b991601c4af01847a33d80e837 |
09-May-2013 |
Angus Kong <shkong@google.com> |
am d03380c0: (-s ours) am fafd8bbc: am 188ad6ed: (-s ours) Merge "DO NOT MERGE Further assets clean up." into gb-ub-photos-bryce * commit 'd03380c0d08219e213d0ec7162b7e124ba9616c8': DO NOT MERGE Further assets clean up.
|
503852ffbbe7ac18b43963eb11b54bcc09423833 |
09-May-2013 |
Bobby Georgescu <georgescu@google.com> |
am bbbedf36: am b45e0eab: am 9fcabfb5: Merge "Fix memory leak in SparseArrayBitmapPool" into gb-ub-photos-bryce * commit 'bbbedf366aed5cdb230e30b93c77a272a6d70db7': Fix memory leak in SparseArrayBitmapPool
|
c61a073bd3001a52cce2a5b06411ed652a79f874 |
09-May-2013 |
Doris Liu <tianliu@google.com> |
am 01fd3f2e: am ca83651a: am b281a646: Merge "Fix video capture intent overlapping buttons" into gb-ub-photos-bryce * commit '01fd3f2eb5a6b2239fee7b53bbbaa508dddcb3da': Fix video capture intent overlapping buttons
|
bd9b233659241edd30230c153c645e6fd0e6858d |
09-May-2013 |
Michael Kolb <kolby@google.com> |
am b046fa1e: am dcd90240: am 0a830ce4: Merge "Add animation to slice selection" into gb-ub-photos-bryce * commit 'b046fa1e21e056da33d26a7f7e1fd8dcf3038db3': Add animation to slice selection
|
509c1f2c25a4662d4ceb5984a2bc99b9ab40e373 |
09-May-2013 |
Michael Kolb <kolby@google.com> |
am e52429d3: am 7174d685: am 9a26f823: Merge "Remove unused assets" into gb-ub-photos-bryce * commit 'e52429d3d1937c5dd53a88fe3201223ef636af11': Remove unused assets
|
2dd6c6d1b5cd3cb29f9f61fcce9dca6e193677af |
09-May-2013 |
Sascha Haeberling <haeberling@google.com> |
am bc2cab3d: am a8e0de46: am 6febbfc6: Merge "Avoid rounding errors from cropping uncropped images." into gb-ub-photos-bryce * commit 'bc2cab3df0341e112c9a9363b7e327cff56a1622': Avoid rounding errors from cropping uncropped images.
|
5f35a24aac019fce555e2a94587642ac01263450 |
09-May-2013 |
Michael Kolb <kolby@google.com> |
am db65cad4: am d7ec31f0: am 48ce39b8: Fix review button placement * commit 'db65cad47986206877a5be663f314417504544f5': Fix review button placement
|
59e10a95fb6eef850442ea58039119578dcc8015 |
08-May-2013 |
Michael Kolb <kolby@google.com> |
am 17b4b977: am c3fde4b4: Merge "Fix second level menu" into gb-ub-photos-bryce * commit '17b4b977fad36b1b943cafef043e02c707844c97': Fix second level menu
|
687e800bdf76e921d2254030d7d33c701ae98b77 |
08-May-2013 |
Michael Kolb <kolby@google.com> |
am c3fde4b4: Merge "Fix second level menu" into gb-ub-photos-bryce * commit 'c3fde4b4032591fc34ce118860e53fe92c0b3706': Fix second level menu
|
00220410d4363e597e15c904006c8581e711cde3 |
08-May-2013 |
Michael Kolb <kolby@google.com> |
am c3fde4b4: Merge "Fix second level menu" into gb-ub-photos-bryce * commit 'c3fde4b4032591fc34ce118860e53fe92c0b3706': Fix second level menu
|
751aad308cb146dc03e018e19a756b3f99e8e06a |
08-May-2013 |
Michael Kolb <kolby@google.com> |
am c3fde4b4: Merge "Fix second level menu" into gb-ub-photos-bryce * commit 'c3fde4b4032591fc34ce118860e53fe92c0b3706': Fix second level menu
|
946e92e6d0082686908a75a12694bb1f5bab248c |
08-May-2013 |
Michael Kolb <kolby@google.com> |
Merge "Fix second level menu" into gb-ub-photos-bryce
|
83bd9d3e7bb5402c335bad1370cef7f2351352ab |
08-May-2013 |
Michael Kolb <kolby@google.com> |
Merge "Fix second level menu" into gb-ub-photos-bryce
|
c3fde4b4032591fc34ce118860e53fe92c0b3706 |
08-May-2013 |
Michael Kolb <kolby@google.com> |
Merge "Fix second level menu" into gb-ub-photos-bryce
|
dec6820659d163d4a70ac90a023eaf4f1188a78e |
08-May-2013 |
Michael Kolb <kolby@google.com> |
Fix second level menu Bug: 8857098 Added Countdown timer and picture size items Change-Id: I73f3a5b22ab708e216729ed77fbd60041d40147d
es/drawable-hdpi/ic_exposure_holo_light_large.png
es/drawable-hdpi/ic_exposure_holo_light_xlarge.png
es/drawable-hdpi/ic_flash_auto_holo_light_large.png
es/drawable-hdpi/ic_flash_auto_holo_light_xlarge.png
es/drawable-hdpi/ic_flash_off_holo_light_large.png
es/drawable-hdpi/ic_flash_off_holo_light_xlarge.png
es/drawable-hdpi/ic_flash_on_holo_light_large.png
es/drawable-hdpi/ic_flash_on_holo_light_xlarge.png
es/drawable-hdpi/ic_imagesize.png
es/drawable-hdpi/ic_indicator_sce_hdr.png
es/drawable-hdpi/ic_indicator_sce_off.png
es/drawable-hdpi/ic_indicator_sce_on.png
es/drawable-hdpi/ic_settings_holo_light_large.png
es/drawable-hdpi/ic_settings_holo_light_xlarge.png
es/drawable-hdpi/ic_timer.png
es/drawable-mdpi/ic_exposure_holo_light_xlarge.png
es/drawable-mdpi/ic_flash_auto_holo_light_xlarge.png
es/drawable-mdpi/ic_flash_off_holo_light_xlarge.png
es/drawable-mdpi/ic_flash_on_holo_light_xlarge.png
es/drawable-mdpi/ic_imagesize.png
es/drawable-mdpi/ic_indicator_sce_hdr.png
es/drawable-mdpi/ic_indicator_sce_off.png
es/drawable-mdpi/ic_indicator_sce_on.png
es/drawable-mdpi/ic_settings_holo_light_xlarge.png
es/drawable-mdpi/ic_timer.png
es/drawable-xhdpi/ic_exposure_holo_light_xlarge.png
es/drawable-xhdpi/ic_flash_auto_holo_light_xlarge.png
es/drawable-xhdpi/ic_flash_off_holo_light_xlarge.png
es/drawable-xhdpi/ic_flash_on_holo_light_xlarge.png
es/drawable-xhdpi/ic_imagesize.png
es/drawable-xhdpi/ic_indicator_sce_hdr.png
es/drawable-xhdpi/ic_indicator_sce_off.png
es/drawable-xhdpi/ic_indicator_sce_on.png
es/drawable-xhdpi/ic_settings_holo_light_xlarge.png
es/drawable-xhdpi/ic_timer.png
es/layout/countdown_setting_popup.xml
es/layout/timer_setting_popup.xml
es/values-large-hdpi/drawable.xml
es/values-sw600dp-hdpi/drawable.xml
es/values-sw640dp/drawable.xml
es/values-xlarge/drawable.xml
|
7048972374474dfca142856583833d8168d3b1b6 |
08-May-2013 |
Michael Kolb <kolby@google.com> |
Fix second level menu Bug: 8857098 Added Countdown timer and picture size items Change-Id: I73f3a5b22ab708e216729ed77fbd60041d40147d
rc/com/android/camera/CountDownTimerPreference.java
rc/com/android/camera/PhotoMenu.java
rc/com/android/camera/PhotoUI.java
rc/com/android/camera/ui/CountdownTimerPopup.java
rc/com/android/camera/ui/TimerSettingPopup.java
|
fc1baa24c86914c0e808c5aac9724230e44afc87 |
08-May-2013 |
Michael Kolb <kolby@google.com> |
Fix second level menu Bug: 8857098 Added Countdown timer and picture size items Change-Id: I73f3a5b22ab708e216729ed77fbd60041d40147d
es/drawable-hdpi/ic_exposure_holo_light_large.png
es/drawable-hdpi/ic_exposure_holo_light_xlarge.png
es/drawable-hdpi/ic_flash_auto_holo_light_large.png
es/drawable-hdpi/ic_flash_auto_holo_light_xlarge.png
es/drawable-hdpi/ic_flash_off_holo_light_large.png
es/drawable-hdpi/ic_flash_off_holo_light_xlarge.png
es/drawable-hdpi/ic_flash_on_holo_light_large.png
es/drawable-hdpi/ic_flash_on_holo_light_xlarge.png
es/drawable-hdpi/ic_imagesize.png
es/drawable-hdpi/ic_indicator_sce_hdr.png
es/drawable-hdpi/ic_indicator_sce_off.png
es/drawable-hdpi/ic_indicator_sce_on.png
es/drawable-hdpi/ic_settings_holo_light_large.png
es/drawable-hdpi/ic_settings_holo_light_xlarge.png
es/drawable-hdpi/ic_timer.png
es/drawable-mdpi/ic_exposure_holo_light_xlarge.png
es/drawable-mdpi/ic_flash_auto_holo_light_xlarge.png
es/drawable-mdpi/ic_flash_off_holo_light_xlarge.png
es/drawable-mdpi/ic_flash_on_holo_light_xlarge.png
es/drawable-mdpi/ic_imagesize.png
es/drawable-mdpi/ic_indicator_sce_hdr.png
es/drawable-mdpi/ic_indicator_sce_off.png
es/drawable-mdpi/ic_indicator_sce_on.png
es/drawable-mdpi/ic_settings_holo_light_xlarge.png
es/drawable-mdpi/ic_timer.png
es/drawable-xhdpi/ic_exposure_holo_light_xlarge.png
es/drawable-xhdpi/ic_flash_auto_holo_light_xlarge.png
es/drawable-xhdpi/ic_flash_off_holo_light_xlarge.png
es/drawable-xhdpi/ic_flash_on_holo_light_xlarge.png
es/drawable-xhdpi/ic_imagesize.png
es/drawable-xhdpi/ic_indicator_sce_hdr.png
es/drawable-xhdpi/ic_indicator_sce_off.png
es/drawable-xhdpi/ic_indicator_sce_on.png
es/drawable-xhdpi/ic_settings_holo_light_xlarge.png
es/drawable-xhdpi/ic_timer.png
es/layout/countdown_setting_popup.xml
es/layout/timer_setting_popup.xml
es/values-large-hdpi/drawable.xml
es/values-sw600dp-hdpi/drawable.xml
es/values-sw640dp/drawable.xml
es/values-xlarge/drawable.xml
rc/com/android/camera/CountDownTimerPreference.java
rc/com/android/camera/PhotoMenu.java
rc/com/android/camera/PhotoUI.java
rc/com/android/camera/ui/CountdownTimerPopup.java
rc/com/android/camera/ui/TimerSettingPopup.java
|
e39fa23e113587219f5647656b8abe041fb7de31 |
08-May-2013 |
Sascha Haeberling <haeberling@google.com> |
Reduce max size of bitmap returned by crop dialog. Bug: 8851336 Change-Id: Id69c46c44b22ce753900c52e34944428a38d02c6
rc/com/android/gallery3d/filtershow/crop/CropActivity.java
|
ffaf11cbaeedc02812300fd1221ad154e37f857d |
08-May-2013 |
Sascha Haeberling <haeberling@google.com> |
Reduce max size of bitmap returned by crop dialog. Bug: 8851336 Change-Id: Id69c46c44b22ce753900c52e34944428a38d02c6
rc/com/android/gallery3d/filtershow/crop/CropActivity.java
|
706c1abed165cef4be5a076aa9c1fdf4a40a262c |
08-May-2013 |
Angus Kong <shkong@google.com> |
am 50e22843: Merge "Further assets clean up." into jb-mr2-dev * commit '50e2284308089c4ad0e7a9fbef1ac0cdb1caddf2': Further assets clean up.
|
3fbf38fe492f456e3325f9f52828b86b726548d0 |
08-May-2013 |
Angus Kong <shkong@google.com> |
Merge "Further assets clean up." into jb-mr2-dev
|
45e7922f0ce6c911a99e8e16280bbd9d3ebbf17e |
06-May-2013 |
Angus Kong <shkong@google.com> |
Further assets clean up. Remove unused assets and layouts. bug:8656481 Change-Id: I320bc5fb8e5c4203520dafce517225244f52e8f5
es/drawable-hdpi/background_portrait.jpg
es/drawable-mdpi/background_portrait.jpg
es/drawable/filtershow_border_film.png
es/drawable/filtershow_button_border.png
es/drawable/filtershow_button_colors_contrast.png
es/drawable/filtershow_button_colors_vignette.png
es/drawable/filtershow_button_current.png
es/drawable/filtershow_button_fx.png
es/drawable/filtershow_button_operations.png
es/drawable/filtershow_button_origin.png
es/drawable/filtershow_button_settings.png
es/drawable/filtershow_button_show_original.png
es/drawable/filtershow_delpoint.png
es/layout/cropimage.xml
es/layout/filtershow_category_panel.xml
es/layout/filtershow_cp_custom_title.xml
es/layout/filtershow_crop_button.xml
es/layout/filtershow_curves_button.xml
es/layout/filtershow_draw_button.xml
es/layout/filtershow_history_panel.xml
es/layout/filtershow_state_panel.xml
|
ef8e09c61554e651b4fc5d57db6a08786495eecb |
08-May-2013 |
Angus Kong <shkong@google.com> |
am fafd8bbc: am 188ad6ed: (-s ours) Merge "DO NOT MERGE Further assets clean up." into gb-ub-photos-bryce * commit 'fafd8bbcc3b33539ccd7ee4e6d69f31aede3b1e7': DO NOT MERGE Further assets clean up.
|
ce55583e05a7669880a4b3ccd02df8eb746e9d62 |
08-May-2013 |
Bobby Georgescu <georgescu@google.com> |
am b45e0eab: am 9fcabfb5: Merge "Fix memory leak in SparseArrayBitmapPool" into gb-ub-photos-bryce * commit 'b45e0eab05a503c53ff8ad9f2213abe64acf5d3e': Fix memory leak in SparseArrayBitmapPool
|
244f5db014a3d958d2ee16cc0565a3a5a58ab01d |
08-May-2013 |
Angus Kong <shkong@google.com> |
am 188ad6ed: (-s ours) Merge "DO NOT MERGE Further assets clean up." into gb-ub-photos-bryce * commit '188ad6eda97b4e05853d582198722e70f9e03705': DO NOT MERGE Further assets clean up.
|
7f6e8a662dc8f1441ad55b6ba7a2a06839b06636 |
08-May-2013 |
Angus Kong <shkong@google.com> |
am 188ad6ed: (-s ours) Merge "DO NOT MERGE Further assets clean up." into gb-ub-photos-bryce * commit '188ad6eda97b4e05853d582198722e70f9e03705': DO NOT MERGE Further assets clean up.
|
188ad6eda97b4e05853d582198722e70f9e03705 |
08-May-2013 |
Angus Kong <shkong@google.com> |
Merge "DO NOT MERGE Further assets clean up." into gb-ub-photos-bryce
|
563643da89eba5d22239a0c87f81fb274c52ed17 |
08-May-2013 |
Bobby Georgescu <georgescu@google.com> |
am 9fcabfb5: Merge "Fix memory leak in SparseArrayBitmapPool" into gb-ub-photos-bryce * commit '9fcabfb535f9e094f77cbdba5305d04209adc0b3': Fix memory leak in SparseArrayBitmapPool
|
c6c15bd4c13c05bb30486cc7abc7e4b11bf8ba8e |
08-May-2013 |
Bobby Georgescu <georgescu@google.com> |
am 9fcabfb5: Merge "Fix memory leak in SparseArrayBitmapPool" into gb-ub-photos-bryce * commit '9fcabfb535f9e094f77cbdba5305d04209adc0b3': Fix memory leak in SparseArrayBitmapPool
|
d1389522283c36a6955458d733bc69627bb86ea4 |
06-May-2013 |
Angus Kong <shkong@google.com> |
DO NOT MERGE Further assets clean up. Remove unused assets and layouts. bug:8656481 Change-Id: I320bc5fb8e5c4203520dafce517225244f52e8f5
es/drawable-hdpi/background_portrait.jpg
es/drawable-mdpi/background_portrait.jpg
es/drawable/filtershow_border_film.png
es/drawable/filtershow_button_border.png
es/drawable/filtershow_button_colors_contrast.png
es/drawable/filtershow_button_colors_vignette.png
es/drawable/filtershow_button_current.png
es/drawable/filtershow_button_fx.png
es/drawable/filtershow_button_operations.png
es/drawable/filtershow_button_origin.png
es/drawable/filtershow_button_settings.png
es/drawable/filtershow_button_show_original.png
es/drawable/filtershow_delpoint.png
es/layout/cropimage.xml
es/layout/filtershow_category_panel.xml
es/layout/filtershow_cp_custom_title.xml
es/layout/filtershow_crop_button.xml
es/layout/filtershow_curves_button.xml
es/layout/filtershow_draw_button.xml
es/layout/filtershow_history_panel.xml
es/layout/filtershow_state_panel.xml
|
271f8018f340a47f726ac082af0a98677aaa5405 |
06-May-2013 |
Angus Kong <shkong@google.com> |
DO NOT MERGE Further assets clean up. Remove unused assets and layouts. bug:8656481 Change-Id: I320bc5fb8e5c4203520dafce517225244f52e8f5
es/drawable-hdpi/background_portrait.jpg
es/drawable-mdpi/background_portrait.jpg
es/drawable/filtershow_border_film.png
es/drawable/filtershow_button_border.png
es/drawable/filtershow_button_colors_contrast.png
es/drawable/filtershow_button_colors_vignette.png
es/drawable/filtershow_button_current.png
es/drawable/filtershow_button_fx.png
es/drawable/filtershow_button_operations.png
es/drawable/filtershow_button_origin.png
es/drawable/filtershow_button_settings.png
es/drawable/filtershow_button_show_original.png
es/drawable/filtershow_delpoint.png
es/layout/cropimage.xml
es/layout/filtershow_category_panel.xml
es/layout/filtershow_cp_custom_title.xml
es/layout/filtershow_crop_button.xml
es/layout/filtershow_curves_button.xml
es/layout/filtershow_draw_button.xml
es/layout/filtershow_history_panel.xml
es/layout/filtershow_state_panel.xml
|
bb70a7a3392a798e3af39479cf05f5bd1748ba89 |
08-May-2013 |
Bobby Georgescu <georgescu@google.com> |
Merge "Fix memory leak in SparseArrayBitmapPool" into gb-ub-photos-bryce
|
9fcabfb535f9e094f77cbdba5305d04209adc0b3 |
08-May-2013 |
Bobby Georgescu <georgescu@google.com> |
Merge "Fix memory leak in SparseArrayBitmapPool" into gb-ub-photos-bryce
|
fb49a579d258efce95c88da55c33e6670a49e412 |
08-May-2013 |
The Android Automerger <android-build@android.com> |
merge in jb-mr2-release history after reset to jb-mr2-dev
|
d731825ea5faa5d928f85d45d130efd74ad0645e |
08-May-2013 |
Michael Kolb <kolby@google.com> |
Fix build Add required method to NewVideoModule Change-Id: Ia04b07b8064f6fc1af73b1550bee88b14fe79b6b
rc/com/android/camera/NewVideoModule.java
|
48237fc2609f587b8cf2c262972ce7c437afb9d3 |
08-May-2013 |
Bobby Georgescu <georgescu@google.com> |
Fix memory leak in SparseArrayBitmapPool Bug: 8857493 Change-Id: Ie5fae457aea91973caa07f8955b1364df573821b
rc/com/android/photos/data/SparseArrayBitmapPool.java
|
033d43c3334c4633221fb18c5e826964b495f3c1 |
08-May-2013 |
Bobby Georgescu <georgescu@google.com> |
Fix memory leak in SparseArrayBitmapPool Bug: 8857493 Change-Id: Ie5fae457aea91973caa07f8955b1364df573821b
rc/com/android/photos/data/SparseArrayBitmapPool.java
|
e43208a013106e01e96ff09eab1a8b0ec7c78dde |
08-May-2013 |
Michael Kolb <kolby@google.com> |
Merge "Fix build" into gb-ub-photos-carlsbad
|
fea396b4a227f9a7113e53e39a337cd198deff88 |
08-May-2013 |
Doris Liu <tianliu@google.com> |
am ca83651a: am b281a646: Merge "Fix video capture intent overlapping buttons" into gb-ub-photos-bryce * commit 'ca83651a7fd9244682d340e4af2c6f52f5ba80ed': Fix video capture intent overlapping buttons
|
e3a1e77d5256dcfd64b0340afcba0a15ff2a41a4 |
08-May-2013 |
Michael Kolb <kolby@google.com> |
am dcd90240: am 0a830ce4: Merge "Add animation to slice selection" into gb-ub-photos-bryce * commit 'dcd90240d4723c2c2305c0a9c0fca2790fccfeeb': Add animation to slice selection
|
196ac2e72b8590741d4d951be8adf2d76dba8422 |
08-May-2013 |
Michael Kolb <kolby@google.com> |
am 7174d685: am 9a26f823: Merge "Remove unused assets" into gb-ub-photos-bryce * commit '7174d6857e992f3abafdda968a1053725f65a28c': Remove unused assets
|
b522f68987755ebdc515ff55466ff6ac094283fd |
08-May-2013 |
Michael Kolb <kolby@google.com> |
Fix build Temporarily remove the old indicator code until we update to the new UI Change-Id: I4c706c5f147dffe085bd2ab1da30cc9a469ef2ce
rc/com/android/camera/NewPhotoUI.java
|
c5def80161aa8dc2831d0509436452f966f18144 |
08-May-2013 |
Doris Liu <tianliu@google.com> |
am b281a646: Merge "Fix video capture intent overlapping buttons" into gb-ub-photos-bryce * commit 'b281a6463f22c75c5b4a7a7079bdb55e484c2d07': Fix video capture intent overlapping buttons
|
110f62f66428830161802823b44ce976f7f67585 |
08-May-2013 |
Doris Liu <tianliu@google.com> |
am b281a646: Merge "Fix video capture intent overlapping buttons" into gb-ub-photos-bryce * commit 'b281a6463f22c75c5b4a7a7079bdb55e484c2d07': Fix video capture intent overlapping buttons
|
0815098550dd4158386d059b04de7f13fb415620 |
08-May-2013 |
Doris Liu <tianliu@google.com> |
Merge "Fix video capture intent overlapping buttons" into gb-ub-photos-bryce
|
b281a6463f22c75c5b4a7a7079bdb55e484c2d07 |
08-May-2013 |
Doris Liu <tianliu@google.com> |
Merge "Fix video capture intent overlapping buttons" into gb-ub-photos-bryce
|
8357b00f98979a3f0a844e1be1411addab9adee2 |
08-May-2013 |
Michael Kolb <kolby@google.com> |
am 0a830ce4: Merge "Add animation to slice selection" into gb-ub-photos-bryce * commit '0a830ce4b5424ff9919b9156eb0635e671a67a81': Add animation to slice selection
|
26cde5188893b71699b51ef5e426e08e9b8bfe6a |
08-May-2013 |
Michael Kolb <kolby@google.com> |
am 0a830ce4: Merge "Add animation to slice selection" into gb-ub-photos-bryce * commit '0a830ce4b5424ff9919b9156eb0635e671a67a81': Add animation to slice selection
|
e94d00bb84955b4928616af297b61b97f36f3345 |
08-May-2013 |
Michael Kolb <kolby@google.com> |
Merge "Add animation to slice selection" into gb-ub-photos-bryce
|
0a830ce4b5424ff9919b9156eb0635e671a67a81 |
08-May-2013 |
Michael Kolb <kolby@google.com> |
Merge "Add animation to slice selection" into gb-ub-photos-bryce
|
309cbecff166a40430e363fe249987288ba19129 |
08-May-2013 |
Michael Kolb <kolby@google.com> |
am 9a26f823: Merge "Remove unused assets" into gb-ub-photos-bryce * commit '9a26f823b2894d3decf47b28ee10d08932b09adf': Remove unused assets
|
55ba1e8b5007adf5481f8ef911d822b6ee4f9504 |
08-May-2013 |
Michael Kolb <kolby@google.com> |
am 9a26f823: Merge "Remove unused assets" into gb-ub-photos-bryce * commit '9a26f823b2894d3decf47b28ee10d08932b09adf': Remove unused assets
|
7d651067391ffff56d4a8726cd9f297f2738de1d |
08-May-2013 |
Michael Kolb <kolby@google.com> |
Merge "Remove unused assets" into gb-ub-photos-bryce
|
9a26f823b2894d3decf47b28ee10d08932b09adf |
08-May-2013 |
Michael Kolb <kolby@google.com> |
Merge "Remove unused assets" into gb-ub-photos-bryce
|
c1920cb8e47596f5d11f31ab48db8e51b13b3731 |
08-May-2013 |
Michael Kolb <kolby@google.com> |
Remove unused assets Bug: 8656481 Change-Id: I8c598a209fe910c1bf658ffffdc1d197dedb0018
es/drawable-hdpi/btn_camera_shutter_holo.png
es/drawable-hdpi/btn_camera_shutter_holo_large.png
es/drawable-hdpi/btn_camera_shutter_pressed_holo.png
es/drawable-hdpi/btn_camera_shutter_pressed_holo_large.png
es/drawable-hdpi/btn_default_normal_holo_dark.9.png
es/drawable-hdpi/btn_default_pressed_holo_dark.9.png
es/drawable-hdpi/btn_pan_shutter_pressed_holo.png
es/drawable-hdpi/btn_pan_shutter_pressed_holo_large.png
es/drawable-hdpi/btn_pan_shutter_recording_holo.png
es/drawable-hdpi/btn_pan_shutter_recording_holo_large.png
es/drawable-hdpi/btn_pan_shutter_recording_pressed_holo.png
es/drawable-hdpi/btn_pan_shutter_recording_pressed_holo_large.png
es/drawable-hdpi/btn_shutter_pano_pressed.png
es/drawable-hdpi/btn_video_shutter_holo.png
es/drawable-hdpi/btn_video_shutter_holo_large.png
es/drawable-hdpi/btn_video_shutter_pressed_holo.png
es/drawable-hdpi/btn_video_shutter_pressed_holo_large.png
es/drawable-hdpi/camera_crop_holo.png
es/drawable-hdpi/focus_box.9.png
es/drawable-hdpi/frame_overlay_gallery_ptp.png
es/drawable-hdpi/ic_flash_torch.png
es/drawable-hdpi/ic_indicator_hdr_off.png
es/drawable-hdpi/ic_indicator_hdr_on.png
es/drawable-hdpi/ic_localadjust_add.png
es/drawable-hdpi/ic_localadjust_delete.png
es/drawable-hdpi/ic_lockscreen_chevron_up.png
es/drawable-hdpi/ic_manage_pin.png
es/drawable-hdpi/ic_menu_camera_video_view.png
es/drawable-hdpi/ic_menu_save_holo_light.png
es/drawable-hdpi/ic_menuselect_camera_facing_back.png
es/drawable-hdpi/ic_menuselect_camera_facing_front.png
es/drawable-hdpi/ic_menuselect_gps_off.png
es/drawable-hdpi/ic_menuselect_gps_on.png
es/drawable-hdpi/ic_pan_recording_indicator.png
es/drawable-hdpi/ic_pan_thumb.9.png
es/drawable-hdpi/ic_switch_pano_active.png
es/drawable-hdpi/ic_switch_video_active.png
es/drawable-hdpi/ic_timer_10s.png
es/drawable-hdpi/ic_timer_15s.png
es/drawable-hdpi/ic_timer_1s.png
es/drawable-hdpi/ic_timer_3s.png
es/drawable-hdpi/ic_timer_off.png
es/drawable-hdpi/ic_viewfinder_camera_facing_back.png
es/drawable-hdpi/ic_viewfinder_camera_facing_front.png
es/drawable-hdpi/ic_viewfinder_gps_no_signal.png
es/drawable-hdpi/ic_viewfinder_gps_off.png
es/drawable-hdpi/ic_viewfinder_gps_on.png
es/drawable-hdpi/localadjust_defocused.png
es/drawable-hdpi/localadjust_focused.png
es/drawable-hdpi/popup_full_dark.9.png
es/drawable-hdpi/progress_bg_holo_dark.9.png
es/drawable-hdpi/progress_primary_holo_dark.9.png
es/drawable-hdpi/progress_secondary_holo_dark.9.png
es/drawable-land-hdpi/btn_camera_shutter_holo_xlarge.png
es/drawable-land-hdpi/btn_camera_shutter_pressed_holo_xlarge.png
es/drawable-land-hdpi/btn_pan_shutter_pressed_holo_xlarge.png
es/drawable-land-hdpi/btn_pan_shutter_recording_holo_xlarge.png
es/drawable-land-hdpi/btn_pan_shutter_recording_pressed_holo_xlarge.png
es/drawable-land-hdpi/btn_video_shutter_holo_xlarge.png
es/drawable-land-hdpi/btn_video_shutter_pressed_holo_xlarge.png
es/drawable-land-hdpi/ic_zoom_big.9.png
es/drawable-land-hdpi/ic_zoom_big_dark.9.png
es/drawable-land-hdpi/ic_zoom_big_dark_large.9.png
es/drawable-land-hdpi/ic_zoom_big_large.9.png
es/drawable-land-mdpi/btn_camera_shutter_holo_xlarge.png
es/drawable-land-mdpi/btn_camera_shutter_pressed_holo_xlarge.png
es/drawable-land-mdpi/btn_pan_shutter_pressed_holo_xlarge.png
es/drawable-land-mdpi/btn_pan_shutter_recording_holo_xlarge.png
es/drawable-land-mdpi/btn_pan_shutter_recording_pressed_holo_xlarge.png
es/drawable-land-mdpi/btn_video_shutter_holo_xlarge.png
es/drawable-land-mdpi/btn_video_shutter_pressed_holo_xlarge.png
es/drawable-land-mdpi/ic_zoom_big.9.png
es/drawable-land-mdpi/ic_zoom_big_dark.9.png
es/drawable-land-xhdpi/btn_camera_shutter_holo_xlarge.png
es/drawable-land-xhdpi/btn_camera_shutter_pressed_holo_xlarge.png
es/drawable-land-xhdpi/btn_pan_shutter_pressed_holo_xlarge.png
es/drawable-land-xhdpi/btn_pan_shutter_recording_holo_xlarge.png
es/drawable-land-xhdpi/btn_pan_shutter_recording_pressed_holo_xlarge.png
es/drawable-land-xhdpi/btn_video_shutter_holo_xlarge.png
es/drawable-land-xhdpi/btn_video_shutter_pressed_holo_xlarge.png
es/drawable-land-xhdpi/ic_zoom_big.9.png
es/drawable-land-xhdpi/ic_zoom_big_dark.9.png
es/drawable-mdpi/btn_camera_shutter_holo.png
es/drawable-mdpi/btn_camera_shutter_pressed_holo.png
es/drawable-mdpi/btn_default_normal_holo_dark.9.png
es/drawable-mdpi/btn_default_pressed_holo_dark.9.png
es/drawable-mdpi/btn_pan_shutter_pressed_holo.png
es/drawable-mdpi/btn_pan_shutter_recording_holo.png
es/drawable-mdpi/btn_pan_shutter_recording_pressed_holo.png
es/drawable-mdpi/btn_shutter_pano_pressed.png
es/drawable-mdpi/btn_video_shutter_holo.png
es/drawable-mdpi/btn_video_shutter_pressed_holo.png
es/drawable-mdpi/camera_crop_holo.png
es/drawable-mdpi/focus_box.9.png
es/drawable-mdpi/frame_overlay_gallery_ptp.png
es/drawable-mdpi/ic_flash_torch.png
es/drawable-mdpi/ic_indicator_hdr_off.png
es/drawable-mdpi/ic_indicator_hdr_on.png
es/drawable-mdpi/ic_localadjust_add.png
es/drawable-mdpi/ic_localadjust_delete.png
es/drawable-mdpi/ic_lockscreen_chevron_up.png
es/drawable-mdpi/ic_manage_pin.png
es/drawable-mdpi/ic_menu_camera_video_view.png
es/drawable-mdpi/ic_menu_save_holo_light.png
es/drawable-mdpi/ic_menuselect_camera_facing_back.png
es/drawable-mdpi/ic_menuselect_camera_facing_front.png
es/drawable-mdpi/ic_menuselect_gps_off.png
es/drawable-mdpi/ic_menuselect_gps_on.png
es/drawable-mdpi/ic_pan_recording_indicator.png
es/drawable-mdpi/ic_pan_thumb.9.png
es/drawable-mdpi/ic_switch_pano_active.png
es/drawable-mdpi/ic_switch_video_active.png
es/drawable-mdpi/ic_timer_10s.png
es/drawable-mdpi/ic_timer_15s.png
es/drawable-mdpi/ic_timer_1s.png
es/drawable-mdpi/ic_timer_3s.png
es/drawable-mdpi/ic_timer_off.png
es/drawable-mdpi/ic_viewfinder_camera_facing_back.png
es/drawable-mdpi/ic_viewfinder_camera_facing_front.png
es/drawable-mdpi/ic_viewfinder_gps_no_signal.png
es/drawable-mdpi/ic_viewfinder_gps_off.png
es/drawable-mdpi/ic_viewfinder_gps_on.png
es/drawable-mdpi/localadjust_defocused.png
es/drawable-mdpi/localadjust_focused.png
es/drawable-mdpi/popup_full_dark.9.png
es/drawable-mdpi/progress_bg_holo_dark.9.png
es/drawable-mdpi/progress_primary_holo_dark.9.png
es/drawable-mdpi/progress_secondary_holo_dark.9.png
es/drawable-port-hdpi/btn_camera_shutter_holo_xlarge.png
es/drawable-port-hdpi/btn_camera_shutter_pressed_holo_xlarge.png
es/drawable-port-hdpi/btn_pan_shutter_pressed_holo_xlarge.png
es/drawable-port-hdpi/btn_pan_shutter_recording_holo_xlarge.png
es/drawable-port-hdpi/btn_pan_shutter_recording_pressed_holo_xlarge.png
es/drawable-port-hdpi/btn_video_shutter_holo_xlarge.png
es/drawable-port-hdpi/btn_video_shutter_pressed_holo_xlarge.png
es/drawable-port-hdpi/ic_zoom_big.9.png
es/drawable-port-hdpi/ic_zoom_big_dark.9.png
es/drawable-port-hdpi/ic_zoom_big_dark_large.9.png
es/drawable-port-hdpi/ic_zoom_big_large.9.png
es/drawable-port-mdpi/btn_camera_shutter_holo_xlarge.png
es/drawable-port-mdpi/btn_camera_shutter_pressed_holo_xlarge.png
es/drawable-port-mdpi/btn_pan_shutter_pressed_holo_xlarge.png
es/drawable-port-mdpi/btn_pan_shutter_recording_holo_xlarge.png
es/drawable-port-mdpi/btn_pan_shutter_recording_pressed_holo_xlarge.png
es/drawable-port-mdpi/btn_video_shutter_holo_xlarge.png
es/drawable-port-mdpi/btn_video_shutter_pressed_holo_xlarge.png
es/drawable-port-mdpi/ic_zoom_big.9.png
es/drawable-port-mdpi/ic_zoom_big_dark.9.png
es/drawable-port-xhdpi/btn_camera_shutter_holo_xlarge.png
es/drawable-port-xhdpi/btn_camera_shutter_pressed_holo_xlarge.png
es/drawable-port-xhdpi/btn_pan_shutter_pressed_holo_xlarge.png
es/drawable-port-xhdpi/btn_pan_shutter_recording_holo_xlarge.png
es/drawable-port-xhdpi/btn_pan_shutter_recording_pressed_holo_xlarge.png
es/drawable-port-xhdpi/btn_video_shutter_holo_xlarge.png
es/drawable-port-xhdpi/btn_video_shutter_pressed_holo_xlarge.png
es/drawable-port-xhdpi/ic_zoom_big.9.png
es/drawable-port-xhdpi/ic_zoom_big_dark.9.png
es/drawable-xhdpi/btn_camera_shutter_holo.png
es/drawable-xhdpi/btn_camera_shutter_pressed_holo.png
es/drawable-xhdpi/btn_pan_shutter_pressed_holo.png
es/drawable-xhdpi/btn_pan_shutter_recording_holo.png
es/drawable-xhdpi/btn_pan_shutter_recording_pressed_holo.png
es/drawable-xhdpi/btn_shutter_pano_pressed.png
es/drawable-xhdpi/btn_video_shutter_holo.png
es/drawable-xhdpi/btn_video_shutter_pressed_holo.png
es/drawable-xhdpi/camera_crop_holo.png
es/drawable-xhdpi/frame_overlay_gallery_ptp.png
es/drawable-xhdpi/ic_flash_torch.png
es/drawable-xhdpi/ic_indicator_hdr_off.png
es/drawable-xhdpi/ic_indicator_hdr_on.png
es/drawable-xhdpi/ic_localadjust_add.png
es/drawable-xhdpi/ic_localadjust_delete.png
es/drawable-xhdpi/ic_pan_recording_indicator.png
es/drawable-xhdpi/ic_pan_thumb.9.png
es/drawable-xhdpi/ic_switch_pano_active.png
es/drawable-xhdpi/ic_switch_video_active.png
es/drawable-xhdpi/ic_timer_10s.png
es/drawable-xhdpi/ic_timer_15s.png
es/drawable-xhdpi/ic_timer_1s.png
es/drawable-xhdpi/ic_timer_3s.png
es/drawable-xhdpi/ic_timer_off.png
es/drawable-xhdpi/localadjust_defocused.png
es/drawable-xhdpi/localadjust_focused.png
|
fb4fa63b8d85a305b990fd91b3a4eb9557892a5f |
08-May-2013 |
Michael Kolb <kolby@google.com> |
Remove unused assets Bug: 8656481 Change-Id: I8c598a209fe910c1bf658ffffdc1d197dedb0018
es/drawable-hdpi/btn_camera_shutter_holo.png
es/drawable-hdpi/btn_camera_shutter_holo_large.png
es/drawable-hdpi/btn_camera_shutter_pressed_holo.png
es/drawable-hdpi/btn_camera_shutter_pressed_holo_large.png
es/drawable-hdpi/btn_default_normal_holo_dark.9.png
es/drawable-hdpi/btn_default_pressed_holo_dark.9.png
es/drawable-hdpi/btn_pan_shutter_pressed_holo.png
es/drawable-hdpi/btn_pan_shutter_pressed_holo_large.png
es/drawable-hdpi/btn_pan_shutter_recording_holo.png
es/drawable-hdpi/btn_pan_shutter_recording_holo_large.png
es/drawable-hdpi/btn_pan_shutter_recording_pressed_holo.png
es/drawable-hdpi/btn_pan_shutter_recording_pressed_holo_large.png
es/drawable-hdpi/btn_shutter_pano_pressed.png
es/drawable-hdpi/btn_video_shutter_holo.png
es/drawable-hdpi/btn_video_shutter_holo_large.png
es/drawable-hdpi/btn_video_shutter_pressed_holo.png
es/drawable-hdpi/btn_video_shutter_pressed_holo_large.png
es/drawable-hdpi/camera_crop_holo.png
es/drawable-hdpi/focus_box.9.png
es/drawable-hdpi/frame_overlay_gallery_ptp.png
es/drawable-hdpi/ic_flash_torch.png
es/drawable-hdpi/ic_indicator_hdr_off.png
es/drawable-hdpi/ic_indicator_hdr_on.png
es/drawable-hdpi/ic_localadjust_add.png
es/drawable-hdpi/ic_localadjust_delete.png
es/drawable-hdpi/ic_lockscreen_chevron_up.png
es/drawable-hdpi/ic_manage_pin.png
es/drawable-hdpi/ic_menu_camera_video_view.png
es/drawable-hdpi/ic_menu_save_holo_light.png
es/drawable-hdpi/ic_menuselect_camera_facing_back.png
es/drawable-hdpi/ic_menuselect_camera_facing_front.png
es/drawable-hdpi/ic_menuselect_gps_off.png
es/drawable-hdpi/ic_menuselect_gps_on.png
es/drawable-hdpi/ic_pan_recording_indicator.png
es/drawable-hdpi/ic_pan_thumb.9.png
es/drawable-hdpi/ic_switch_pano_active.png
es/drawable-hdpi/ic_switch_video_active.png
es/drawable-hdpi/ic_timer_10s.png
es/drawable-hdpi/ic_timer_15s.png
es/drawable-hdpi/ic_timer_1s.png
es/drawable-hdpi/ic_timer_3s.png
es/drawable-hdpi/ic_timer_off.png
es/drawable-hdpi/ic_viewfinder_camera_facing_back.png
es/drawable-hdpi/ic_viewfinder_camera_facing_front.png
es/drawable-hdpi/ic_viewfinder_gps_no_signal.png
es/drawable-hdpi/ic_viewfinder_gps_off.png
es/drawable-hdpi/ic_viewfinder_gps_on.png
es/drawable-hdpi/localadjust_defocused.png
es/drawable-hdpi/localadjust_focused.png
es/drawable-hdpi/popup_full_dark.9.png
es/drawable-hdpi/progress_bg_holo_dark.9.png
es/drawable-hdpi/progress_primary_holo_dark.9.png
es/drawable-hdpi/progress_secondary_holo_dark.9.png
es/drawable-land-hdpi/btn_camera_shutter_holo_xlarge.png
es/drawable-land-hdpi/btn_camera_shutter_pressed_holo_xlarge.png
es/drawable-land-hdpi/btn_pan_shutter_pressed_holo_xlarge.png
es/drawable-land-hdpi/btn_pan_shutter_recording_holo_xlarge.png
es/drawable-land-hdpi/btn_pan_shutter_recording_pressed_holo_xlarge.png
es/drawable-land-hdpi/btn_video_shutter_holo_xlarge.png
es/drawable-land-hdpi/btn_video_shutter_pressed_holo_xlarge.png
es/drawable-land-hdpi/ic_zoom_big.9.png
es/drawable-land-hdpi/ic_zoom_big_dark.9.png
es/drawable-land-hdpi/ic_zoom_big_dark_large.9.png
es/drawable-land-hdpi/ic_zoom_big_large.9.png
es/drawable-land-mdpi/btn_camera_shutter_holo_xlarge.png
es/drawable-land-mdpi/btn_camera_shutter_pressed_holo_xlarge.png
es/drawable-land-mdpi/btn_pan_shutter_pressed_holo_xlarge.png
es/drawable-land-mdpi/btn_pan_shutter_recording_holo_xlarge.png
es/drawable-land-mdpi/btn_pan_shutter_recording_pressed_holo_xlarge.png
es/drawable-land-mdpi/btn_video_shutter_holo_xlarge.png
es/drawable-land-mdpi/btn_video_shutter_pressed_holo_xlarge.png
es/drawable-land-mdpi/ic_zoom_big.9.png
es/drawable-land-mdpi/ic_zoom_big_dark.9.png
es/drawable-land-xhdpi/btn_camera_shutter_holo_xlarge.png
es/drawable-land-xhdpi/btn_camera_shutter_pressed_holo_xlarge.png
es/drawable-land-xhdpi/btn_pan_shutter_pressed_holo_xlarge.png
es/drawable-land-xhdpi/btn_pan_shutter_recording_holo_xlarge.png
es/drawable-land-xhdpi/btn_pan_shutter_recording_pressed_holo_xlarge.png
es/drawable-land-xhdpi/btn_video_shutter_holo_xlarge.png
es/drawable-land-xhdpi/btn_video_shutter_pressed_holo_xlarge.png
es/drawable-land-xhdpi/ic_zoom_big.9.png
es/drawable-land-xhdpi/ic_zoom_big_dark.9.png
es/drawable-mdpi/btn_camera_shutter_holo.png
es/drawable-mdpi/btn_camera_shutter_pressed_holo.png
es/drawable-mdpi/btn_default_normal_holo_dark.9.png
es/drawable-mdpi/btn_default_pressed_holo_dark.9.png
es/drawable-mdpi/btn_pan_shutter_pressed_holo.png
es/drawable-mdpi/btn_pan_shutter_recording_holo.png
es/drawable-mdpi/btn_pan_shutter_recording_pressed_holo.png
es/drawable-mdpi/btn_shutter_pano_pressed.png
es/drawable-mdpi/btn_video_shutter_holo.png
es/drawable-mdpi/btn_video_shutter_pressed_holo.png
es/drawable-mdpi/camera_crop_holo.png
es/drawable-mdpi/focus_box.9.png
es/drawable-mdpi/frame_overlay_gallery_ptp.png
es/drawable-mdpi/ic_flash_torch.png
es/drawable-mdpi/ic_indicator_hdr_off.png
es/drawable-mdpi/ic_indicator_hdr_on.png
es/drawable-mdpi/ic_localadjust_add.png
es/drawable-mdpi/ic_localadjust_delete.png
es/drawable-mdpi/ic_lockscreen_chevron_up.png
es/drawable-mdpi/ic_manage_pin.png
es/drawable-mdpi/ic_menu_camera_video_view.png
es/drawable-mdpi/ic_menu_save_holo_light.png
es/drawable-mdpi/ic_menuselect_camera_facing_back.png
es/drawable-mdpi/ic_menuselect_camera_facing_front.png
es/drawable-mdpi/ic_menuselect_gps_off.png
es/drawable-mdpi/ic_menuselect_gps_on.png
es/drawable-mdpi/ic_pan_recording_indicator.png
es/drawable-mdpi/ic_pan_thumb.9.png
es/drawable-mdpi/ic_switch_pano_active.png
es/drawable-mdpi/ic_switch_video_active.png
es/drawable-mdpi/ic_timer_10s.png
es/drawable-mdpi/ic_timer_15s.png
es/drawable-mdpi/ic_timer_1s.png
es/drawable-mdpi/ic_timer_3s.png
es/drawable-mdpi/ic_timer_off.png
es/drawable-mdpi/ic_viewfinder_camera_facing_back.png
es/drawable-mdpi/ic_viewfinder_camera_facing_front.png
es/drawable-mdpi/ic_viewfinder_gps_no_signal.png
es/drawable-mdpi/ic_viewfinder_gps_off.png
es/drawable-mdpi/ic_viewfinder_gps_on.png
es/drawable-mdpi/localadjust_defocused.png
es/drawable-mdpi/localadjust_focused.png
es/drawable-mdpi/popup_full_dark.9.png
es/drawable-mdpi/progress_bg_holo_dark.9.png
es/drawable-mdpi/progress_primary_holo_dark.9.png
es/drawable-mdpi/progress_secondary_holo_dark.9.png
es/drawable-port-hdpi/btn_camera_shutter_holo_xlarge.png
es/drawable-port-hdpi/btn_camera_shutter_pressed_holo_xlarge.png
es/drawable-port-hdpi/btn_pan_shutter_pressed_holo_xlarge.png
es/drawable-port-hdpi/btn_pan_shutter_recording_holo_xlarge.png
es/drawable-port-hdpi/btn_pan_shutter_recording_pressed_holo_xlarge.png
es/drawable-port-hdpi/btn_video_shutter_holo_xlarge.png
es/drawable-port-hdpi/btn_video_shutter_pressed_holo_xlarge.png
es/drawable-port-hdpi/ic_zoom_big.9.png
es/drawable-port-hdpi/ic_zoom_big_dark.9.png
es/drawable-port-hdpi/ic_zoom_big_dark_large.9.png
es/drawable-port-hdpi/ic_zoom_big_large.9.png
es/drawable-port-mdpi/btn_camera_shutter_holo_xlarge.png
es/drawable-port-mdpi/btn_camera_shutter_pressed_holo_xlarge.png
es/drawable-port-mdpi/btn_pan_shutter_pressed_holo_xlarge.png
es/drawable-port-mdpi/btn_pan_shutter_recording_holo_xlarge.png
es/drawable-port-mdpi/btn_pan_shutter_recording_pressed_holo_xlarge.png
es/drawable-port-mdpi/btn_video_shutter_holo_xlarge.png
es/drawable-port-mdpi/btn_video_shutter_pressed_holo_xlarge.png
es/drawable-port-mdpi/ic_zoom_big.9.png
es/drawable-port-mdpi/ic_zoom_big_dark.9.png
es/drawable-port-xhdpi/btn_camera_shutter_holo_xlarge.png
es/drawable-port-xhdpi/btn_camera_shutter_pressed_holo_xlarge.png
es/drawable-port-xhdpi/btn_pan_shutter_pressed_holo_xlarge.png
es/drawable-port-xhdpi/btn_pan_shutter_recording_holo_xlarge.png
es/drawable-port-xhdpi/btn_pan_shutter_recording_pressed_holo_xlarge.png
es/drawable-port-xhdpi/btn_video_shutter_holo_xlarge.png
es/drawable-port-xhdpi/btn_video_shutter_pressed_holo_xlarge.png
es/drawable-port-xhdpi/ic_zoom_big.9.png
es/drawable-port-xhdpi/ic_zoom_big_dark.9.png
es/drawable-xhdpi/btn_camera_shutter_holo.png
es/drawable-xhdpi/btn_camera_shutter_pressed_holo.png
es/drawable-xhdpi/btn_pan_shutter_pressed_holo.png
es/drawable-xhdpi/btn_pan_shutter_recording_holo.png
es/drawable-xhdpi/btn_pan_shutter_recording_pressed_holo.png
es/drawable-xhdpi/btn_shutter_pano_pressed.png
es/drawable-xhdpi/btn_video_shutter_holo.png
es/drawable-xhdpi/btn_video_shutter_pressed_holo.png
es/drawable-xhdpi/camera_crop_holo.png
es/drawable-xhdpi/frame_overlay_gallery_ptp.png
es/drawable-xhdpi/ic_flash_torch.png
es/drawable-xhdpi/ic_indicator_hdr_off.png
es/drawable-xhdpi/ic_indicator_hdr_on.png
es/drawable-xhdpi/ic_localadjust_add.png
es/drawable-xhdpi/ic_localadjust_delete.png
es/drawable-xhdpi/ic_pan_recording_indicator.png
es/drawable-xhdpi/ic_pan_thumb.9.png
es/drawable-xhdpi/ic_switch_pano_active.png
es/drawable-xhdpi/ic_switch_video_active.png
es/drawable-xhdpi/ic_timer_10s.png
es/drawable-xhdpi/ic_timer_15s.png
es/drawable-xhdpi/ic_timer_1s.png
es/drawable-xhdpi/ic_timer_3s.png
es/drawable-xhdpi/ic_timer_off.png
es/drawable-xhdpi/localadjust_defocused.png
es/drawable-xhdpi/localadjust_focused.png
|
3a07066970c25241d7363a27b17e534ad46ee079 |
08-May-2013 |
Sascha Haeberling <haeberling@google.com> |
am a8e0de46: am 6febbfc6: Merge "Avoid rounding errors from cropping uncropped images." into gb-ub-photos-bryce * commit 'a8e0de46eea85c30f4817f2c2517d061d12ba994': Avoid rounding errors from cropping uncropped images.
|
69ef5ea6ed838cf6fba834811f01122d349a61cf |
07-May-2013 |
Doris Liu <tianliu@google.com> |
Fix video capture intent overlapping buttons Bug: 8839010 Change-Id: I8ee9bd8117a4a5e4dafe71775bb5563cef2ccdf0
rc/com/android/camera/VideoController.java
rc/com/android/camera/VideoModule.java
rc/com/android/camera/VideoUI.java
rc/com/android/camera/ui/CameraControls.java
|
563e1555cdda8665e25c3afb0c68405df54d1afa |
07-May-2013 |
Doris Liu <tianliu@google.com> |
Fix video capture intent overlapping buttons Bug: 8839010 Change-Id: I8ee9bd8117a4a5e4dafe71775bb5563cef2ccdf0
rc/com/android/camera/VideoController.java
rc/com/android/camera/VideoModule.java
rc/com/android/camera/VideoUI.java
rc/com/android/camera/ui/CameraControls.java
|
fc6a06d7d091b233d12f725bec37df92d1a88b31 |
08-May-2013 |
Sascha Haeberling <haeberling@google.com> |
am 6febbfc6: Merge "Avoid rounding errors from cropping uncropped images." into gb-ub-photos-bryce * commit '6febbfc6c9c2d645f22fb200574fe14fa1201046': Avoid rounding errors from cropping uncropped images.
|
77a66b210f6a272ccb3c4c494516de08df6afb76 |
08-May-2013 |
Sascha Haeberling <haeberling@google.com> |
am 6febbfc6: Merge "Avoid rounding errors from cropping uncropped images." into gb-ub-photos-bryce * commit '6febbfc6c9c2d645f22fb200574fe14fa1201046': Avoid rounding errors from cropping uncropped images.
|
f2911e2fdeda288cdccdba5d8523da8e49ca0d43 |
08-May-2013 |
Sascha Haeberling <haeberling@google.com> |
am 6febbfc6: Merge "Avoid rounding errors from cropping uncropped images." into gb-ub-photos-bryce * commit '6febbfc6c9c2d645f22fb200574fe14fa1201046': Avoid rounding errors from cropping uncropped images.
|
59733de14afde5e9c1b34dd72f40837e486e43b4 |
08-May-2013 |
Sascha Haeberling <haeberling@google.com> |
Merge "Avoid rounding errors from cropping uncropped images." into gb-ub-photos-bryce
|
6febbfc6c9c2d645f22fb200574fe14fa1201046 |
08-May-2013 |
Sascha Haeberling <haeberling@google.com> |
Merge "Avoid rounding errors from cropping uncropped images." into gb-ub-photos-bryce
|
ad2a745d44fdf5acdd98d3bd8212ca51f45c29e7 |
07-May-2013 |
Michael Kolb <kolby@google.com> |
Add animation to slice selection Bug: 8826233 Change-Id: Ibe41c38e048546b66ea9aa56a664ba80de2fbd4c
rc/com/android/camera/ui/PieRenderer.java
|
67339f9ab0b3d583ee0f519d65617f3ab39c4bd5 |
07-May-2013 |
Michael Kolb <kolby@google.com> |
Add animation to slice selection Bug: 8826233 Change-Id: Ibe41c38e048546b66ea9aa56a664ba80de2fbd4c
rc/com/android/camera/ui/PieRenderer.java
|
90f2009a9ca46aee2e8cdb8057fbf1e5ed85ec78 |
07-May-2013 |
Michael Kolb <kolby@google.com> |
am d7ec31f0: am 48ce39b8: Fix review button placement * commit 'd7ec31f066c8de6ad28cebfe7e6bd7d41bda8532': Fix review button placement
|
6e054bc450306adeba9fb512171a32dc61583c86 |
07-May-2013 |
Michael Kolb <kolby@google.com> |
am 48ce39b8: Fix review button placement * commit '48ce39b881f60fde8c9a1536199980c31d38188c': Fix review button placement
|
a133a41f9773d2197a675312b8e6d13fedeabdeb |
07-May-2013 |
Michael Kolb <kolby@google.com> |
am 48ce39b8: Fix review button placement * commit '48ce39b881f60fde8c9a1536199980c31d38188c': Fix review button placement
|
48ce39b881f60fde8c9a1536199980c31d38188c |
07-May-2013 |
Michael Kolb <kolby@google.com> |
Fix review button placement Bug: 8833788 Change-Id: I7fc8912ea4ffcd36a08e4cbb2705eec79c014da1
rc/com/android/camera/ui/CameraControls.java
|
c9a1195c43d7d9953b3060503188c1f28cd948b8 |
07-May-2013 |
Michael Kolb <kolby@google.com> |
Fix review button placement Bug: 8833788 Change-Id: I7fc8912ea4ffcd36a08e4cbb2705eec79c014da1
rc/com/android/camera/ui/CameraControls.java
|
e9e777d2ea2d1b1bf7a1b8a563d9bd1b314ac744 |
07-May-2013 |
Sascha Haeberling <haeberling@google.com> |
Avoid rounding errors from cropping uncropped images. Bug: 8736111 Also don't treat "none" as a non-modifying filter. Change-Id: I6478c557dbb68d7eecabb29f062285b83de05cda
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
|
559970b1af0333ead040b68cbcc632072f2e7a76 |
07-May-2013 |
Sascha Haeberling <haeberling@google.com> |
Avoid rounding errors from cropping uncropped images. Bug: 8736111 Also don't treat "none" as a non-modifying filter. Change-Id: I6478c557dbb68d7eecabb29f062285b83de05cda
rc/com/android/gallery3d/filtershow/imageshow/GeometryMetadata.java
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
|
a01423869bd4dbef3054e232592494aab43edc18 |
07-May-2013 |
Sascha Haeberling <haeberling@google.com> |
Avoid rounding errors from cropping uncropped images. Bug: 8736111 Also don't treat "none" as a non-modifying filter. Change-Id: I6478c557dbb68d7eecabb29f062285b83de05cda
rc/com/android/gallery3d/filtershow/imageshow/GeometryMetadata.java
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
|
ef064ab1ff0650e7161d159233da6ec0658baed9 |
07-May-2013 |
Doris Liu <tianliu@google.com> |
am 327826a5: am dec72c89: am ed1224f1: Resize children to avoid laying out outside parent * commit '327826a562d273086e8200bf585b07bcfbec8660': Resize children to avoid laying out outside parent
|
21c2f339aa742bc7c956d32769b5f7844b25643e |
07-May-2013 |
Doris Liu <tianliu@google.com> |
am dec72c89: am ed1224f1: Resize children to avoid laying out outside parent * commit 'dec72c898e34f01ea2ffda1a6614b0bdcb719933': Resize children to avoid laying out outside parent
|
dabf1823a99ac2dc855f87acde6a0c62dff7cf18 |
07-May-2013 |
Doris Liu <tianliu@google.com> |
am ed1224f1: Resize children to avoid laying out outside parent * commit 'ed1224f1b98a1a534f5a3b18739465ed6114529a': Resize children to avoid laying out outside parent
|
8e1aa6c5ae137ac8eb179f4b53ac3c411e9a602c |
07-May-2013 |
Doris Liu <tianliu@google.com> |
am ed1224f1: Resize children to avoid laying out outside parent * commit 'ed1224f1b98a1a534f5a3b18739465ed6114529a': Resize children to avoid laying out outside parent
|
b0bc49a4faeb9604e2f45892c8c774156122caea |
07-May-2013 |
Elliott Hughes <enh@google.com> |
am 614d3650: resolved conflicts for merge of f959df75 to jb-mr2-dev-plus-aosp * commit '614d365088a1959ad44831fa9b1065ecbd4eefb8': Someone's IDE chose the wrong Date.
|
1d51f8b626e2802d8062b9f09d13ba42122b3f90 |
07-May-2013 |
The Android Automerger <android-build@android.com> |
merge in jb-mr2-release history after reset to jb-mr2-dev
|
6e9528b2e263c67d53edf3b5262411c4790be424 |
07-May-2013 |
George Mount <mount@google.com> |
am 4a26d5e3: am 6c14823c: am 08d2c513: Merge "Fix black background on save progress indicator." into gb-ub-photos-bryce * commit '4a26d5e3cce401e2683190597e1e50b90f9900d8': Fix black background on save progress indicator.
|
c5676b2a1b930e5b445b4fec20fb23be82a901f8 |
07-May-2013 |
Michael Kolb <kolby@google.com> |
am b3ae962e: am 90ca6d6b: am ea75136a: Merge "Fix lockscreen camera widget layout" into gb-ub-photos-bryce * commit 'b3ae962e4c66ba6ff27e4b5e01290b2a4428e01c': Fix lockscreen camera widget layout
|
ed1224f1b98a1a534f5a3b18739465ed6114529a |
07-May-2013 |
Doris Liu <tianliu@google.com> |
Resize children to avoid laying out outside parent Bug: 8838983 Change-Id: Idc8ec7b96dd13e9c99dbc8b4710aa9d768ef198e
rc/com/android/camera/ui/CameraRootView.java
|
bcd73db9b9a5580167f1f54e78b798cbf9165940 |
07-May-2013 |
Doris Liu <tianliu@google.com> |
Resize children to avoid laying out outside parent Bug: 8838983 Change-Id: Idc8ec7b96dd13e9c99dbc8b4710aa9d768ef198e
rc/com/android/camera/ui/CameraRootView.java
|
9a08a17ab4f6def051119ea217961db14d202d1f |
07-May-2013 |
Michael Kolb <kolby@google.com> |
Quick and Dirty build fix Change-Id: I4266fa63145a95d878a9fc0effab937ec0859bab
es/layout/build_fix_indicators.xml
|
e27415946905ebd48a3a3bd19b00de571b4fd39a |
06-May-2013 |
Elliott Hughes <enh@google.com> |
resolved conflicts for merge of f959df75 to jb-mr2-dev-plus-aosp Change-Id: Ic56346cb59b2817482c3c33a2bcd1d552dd432da
|
355f90ccd730f152db65b88bc04670340e47ba10 |
06-May-2013 |
Doris Liu <tianliu@google.com> |
am 4cf9fb5b: am 59ad838a: am 3a50eb36: Merge "Restrict checking for device flip" into gb-ub-photos-bryce * commit '4cf9fb5b8cb19e5a210578383b54cc77e809882c': Restrict checking for device flip
|
dea362267d938c6c9060e59245671c5d28f05ce7 |
06-May-2013 |
Michael Kolb <kolby@google.com> |
am d1f80981: am e7fa2f0d: am 1e3bc7d4: Set correct label text in tap mode * commit 'd1f809818da681dafa33373088f8e89038e2b0e4': Set correct label text in tap mode
|
1b05bcfaf148440b36b3b6cb8f0fd260f80652d7 |
06-May-2013 |
Baligh Uddin <baligh@google.com> |
am 0452e77f: (-s ours) am d5edf6b9: am 49a24225: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce * commit '0452e77f0c9887bf4aa726ffa9d72c1a2df9a77c': Import translations. DO NOT MERGE
|
a7f62656dbf476ceb3052a7988b2ed1a8ac44d6d |
06-May-2013 |
Baligh Uddin <baligh@google.com> |
am b4e5d593: (-s ours) am 228e200c: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev * commit 'b4e5d593979e57ef5314a4424de292c19b81e958': Import translations. DO NOT MERGE
|
dafe154bba4576bec85711460c2f6cfacf9169c6 |
06-May-2013 |
George Mount <mount@google.com> |
am 6c14823c: am 08d2c513: Merge "Fix black background on save progress indicator." into gb-ub-photos-bryce * commit '6c14823c50bbfdb1765a9b5987bee8d83882eece': Fix black background on save progress indicator.
|
466c9246035e882b926831c9467e710a256d7f5a |
06-May-2013 |
George Mount <mount@google.com> |
am 08d2c513: Merge "Fix black background on save progress indicator." into gb-ub-photos-bryce * commit '08d2c51392978383699aedcf63d24e5122b3b7a5': Fix black background on save progress indicator.
|
0332c5c624fe574a74511727f1c58e647a55a259 |
06-May-2013 |
George Mount <mount@google.com> |
am 08d2c513: Merge "Fix black background on save progress indicator." into gb-ub-photos-bryce * commit '08d2c51392978383699aedcf63d24e5122b3b7a5': Fix black background on save progress indicator.
|
7baf60dfa9b3baf52d4648fe02cf339d7fc28da4 |
06-May-2013 |
George Mount <mount@google.com> |
Merge "Fix black background on save progress indicator." into gb-ub-photos-bryce
|
08d2c51392978383699aedcf63d24e5122b3b7a5 |
06-May-2013 |
George Mount <mount@google.com> |
Merge "Fix black background on save progress indicator." into gb-ub-photos-bryce
|
f959df75e30697a1276d3bc47ffa59104733f7ce |
06-May-2013 |
Elliott Hughes <enh@google.com> |
Merge "Someone's IDE chose the wrong Date."
|
121c6c1253792591a8fec6b017bfcb018556f907 |
06-May-2013 |
Michael Kolb <kolby@google.com> |
am 90ca6d6b: am ea75136a: Merge "Fix lockscreen camera widget layout" into gb-ub-photos-bryce * commit '90ca6d6b065dbda8fd234c34d49649305e965f85': Fix lockscreen camera widget layout
|
0fe6f88bc7f6e0c12109bd63a97e8e136140e74b |
06-May-2013 |
Michael Kolb <kolby@google.com> |
am ea75136a: Merge "Fix lockscreen camera widget layout" into gb-ub-photos-bryce * commit 'ea75136ae4abf55070644e5a048cf44323517c43': Fix lockscreen camera widget layout
|
73284c46ac81e4f98dc537d783b6d00e7fe7fde5 |
06-May-2013 |
Michael Kolb <kolby@google.com> |
am ea75136a: Merge "Fix lockscreen camera widget layout" into gb-ub-photos-bryce * commit 'ea75136ae4abf55070644e5a048cf44323517c43': Fix lockscreen camera widget layout
|
ea75136ae4abf55070644e5a048cf44323517c43 |
06-May-2013 |
Michael Kolb <kolby@google.com> |
Merge "Fix lockscreen camera widget layout" into gb-ub-photos-bryce
|
055305005cf90a25437cc0f88e4087633e7d529f |
06-May-2013 |
Michael Kolb <kolby@google.com> |
Fix lockscreen camera widget layout Bug: 8832891 Change-Id: I4658de74e7cc9d4ba80a561b3e71ae6339d4f236
es/layout-land/keyguard_widget.xml
es/layout-port/keyguard_widget.xml
es/layout/menu_indicators.xml
es/layout/menu_indicators_keyguard.xml
|
d6536c09d1c311b0160b2cb911c62c21b7254eba |
06-May-2013 |
Michael Kolb <kolby@google.com> |
Fix lockscreen camera widget layout Bug: 8832891 Change-Id: I4658de74e7cc9d4ba80a561b3e71ae6339d4f236
es/layout-land/keyguard_widget.xml
es/layout-port/keyguard_widget.xml
es/layout/menu_indicators.xml
es/layout/menu_indicators_keyguard.xml
|
0a7b4a27822e8e4e3d1b3d48196a5c7e37a9e700 |
06-May-2013 |
Doris Liu <tianliu@google.com> |
am 178b6b41: am cdbac140: am cd0fb7af: Fix NPE caused by insets never being set * commit '178b6b41823dac0658a07f6e7bd89b7f9b5db814': Fix NPE caused by insets never being set
|
816b3361beacca39a22c2d59a57e982cc66d8229 |
06-May-2013 |
Elliott Hughes <enh@google.com> |
Someone's IDE chose the wrong Date. Part 2 of the mystery of the java.sql.Date in preloaded-classes solved. Change-Id: If819d89d1cb7ac015adee7a39a6fda963c6a1022
rc/com/android/gallery3d/app/TrimVideo.java
rc/com/android/gallery3d/filtershow/tools/SaveCopyTask.java
|
d75462c5a122702a1bd08c047609fe41608a7b32 |
06-May-2013 |
Doris Liu <tianliu@google.com> |
am 59ad838a: am 3a50eb36: Merge "Restrict checking for device flip" into gb-ub-photos-bryce * commit '59ad838a9431bc2dea1bddcb18ea68b506148f81': Restrict checking for device flip
|
650573a82415f68f0ee136a5514023b2d48a07c6 |
06-May-2013 |
Michael Kolb <kolby@google.com> |
am e7fa2f0d: am 1e3bc7d4: Set correct label text in tap mode * commit 'e7fa2f0df420e43a524b7ed726eee82216e03ba4': Set correct label text in tap mode
|
b8261a41a4ceab00ff5b65d99d4b424adc42337a |
06-May-2013 |
Baligh Uddin <baligh@google.com> |
am d5edf6b9: am 49a24225: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce * commit 'd5edf6b996a21a88321e5db06581426f1234cc6a': Import translations. DO NOT MERGE
|
cfb50ac1ec5e306990acfeb8099d4c7161018ee5 |
06-May-2013 |
Baligh Uddin <baligh@google.com> |
am 228e200c: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev * commit '228e200c8c63060696b331c5c4a8d2032932e3f6': Import translations. DO NOT MERGE
|
76c624b3c5534a333351990725e5c945c6fb81ed |
06-May-2013 |
Doris Liu <tianliu@google.com> |
am 3a50eb36: Merge "Restrict checking for device flip" into gb-ub-photos-bryce * commit '3a50eb36cf760ddb2a11c72b247f96611f3bf112': Restrict checking for device flip
|
4546a3a1c97d959ab4f50a0727fbdbaef7347f7e |
06-May-2013 |
Doris Liu <tianliu@google.com> |
am 3a50eb36: Merge "Restrict checking for device flip" into gb-ub-photos-bryce * commit '3a50eb36cf760ddb2a11c72b247f96611f3bf112': Restrict checking for device flip
|
93240535cafe2b1a7630f8350963a3d84cbb9937 |
06-May-2013 |
Doris Liu <tianliu@google.com> |
Merge "Restrict checking for device flip" into gb-ub-photos-bryce
|
3a50eb36cf760ddb2a11c72b247f96611f3bf112 |
06-May-2013 |
Doris Liu <tianliu@google.com> |
Merge "Restrict checking for device flip" into gb-ub-photos-bryce
|
1382ccd32a2b9fe0705e890771462b2475e7666c |
06-May-2013 |
George Mount <mount@google.com> |
Fix black background on save progress indicator. Bug 8802092 Change-Id: I40075ba6af69895a88973d906436c6e235c733fa
es/layout/crop_activity.xml
|
e0750d49f00f94a79ca81ba993b6051c57a3484b |
06-May-2013 |
George Mount <mount@google.com> |
Fix black background on save progress indicator. Bug 8802092 Change-Id: I40075ba6af69895a88973d906436c6e235c733fa
es/layout/crop_activity.xml
|
6b3db045de063c8de7fdadbeec4a582882a5392b |
06-May-2013 |
Michael Kolb <kolby@google.com> |
am 1e3bc7d4: Set correct label text in tap mode * commit '1e3bc7d4873dbc0778d5e12333c73c00bcd6512f': Set correct label text in tap mode
|
983be6e26337b3788a01eeebc2bdd45a58df12ba |
06-May-2013 |
Michael Kolb <kolby@google.com> |
am 1e3bc7d4: Set correct label text in tap mode * commit '1e3bc7d4873dbc0778d5e12333c73c00bcd6512f': Set correct label text in tap mode
|
1e3bc7d4873dbc0778d5e12333c73c00bcd6512f |
06-May-2013 |
Michael Kolb <kolby@google.com> |
Set correct label text in tap mode Bug: 8826229 Change-Id: I10b06ac04314beaf52fc8b29c9b10693eb11311b
rc/com/android/camera/ui/PieRenderer.java
|
712cc2f5add2fb78fbb723ecbca5f576a91fb54f |
06-May-2013 |
Michael Kolb <kolby@google.com> |
Set correct label text in tap mode Bug: 8826229 Change-Id: I10b06ac04314beaf52fc8b29c9b10693eb11311b
rc/com/android/camera/ui/PieRenderer.java
|
b9224cc168d8d3617d7878120ad79bdbe8922b5e |
06-May-2013 |
Doris Liu <tianliu@google.com> |
am cdbac140: am cd0fb7af: Fix NPE caused by insets never being set * commit 'cdbac140d0530b7b8928302ab75a2d0febb8121c': Fix NPE caused by insets never being set
|
842ffa902bf51ebf07edea8094da57faee617ec2 |
06-May-2013 |
The Android Automerger <android-build@android.com> |
merge in jb-mr2-release history after reset to jb-mr2-dev
|
63129f5c8888bd8202a90abcf5531a7526762d97 |
05-May-2013 |
Baligh Uddin <baligh@google.com> |
am 49a24225: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce * commit '49a242256761f990001c3f81c54e4897f58ebc36': Import translations. DO NOT MERGE
|
7f2c48843e2395ca90ad5882c8fb518f60982e3f |
05-May-2013 |
Baligh Uddin <baligh@google.com> |
am 49a24225: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce * commit '49a242256761f990001c3f81c54e4897f58ebc36': Import translations. DO NOT MERGE
|
8e63ebacdb1e73650c4fe22ee7d43a2fb55a8315 |
05-May-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE"
|
20a398897ab0e2dbe329640ea0e0193a359aba96 |
05-May-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
|
49a242256761f990001c3f81c54e4897f58ebc36 |
05-May-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
|
fa1c3a528de2ec357b8f43aa133feae444899668 |
03-May-2013 |
Doris Liu <tianliu@google.com> |
Restrict checking for device flip Bug: 8714114 Change-Id: Ic12627fe5b7512c8d5739ed801130d52f33407cc
rc/com/android/camera/ui/CameraControls.java
rc/com/android/camera/ui/RotatableLayout.java
|
9ee99847b28e9a282cf0732fa659f62a9d24f3eb |
03-May-2013 |
Doris Liu <tianliu@google.com> |
Restrict checking for device flip Bug: 8714114 Change-Id: Ic12627fe5b7512c8d5739ed801130d52f33407cc
rc/com/android/camera/ui/CameraControls.java
rc/com/android/camera/ui/RotatableLayout.java
|
33fe383a0a11923d551d6d278a3feb3d18ff4b31 |
03-May-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I379861ad236db90fba6d8d89915f209df26e09d1 Auto-generated-cl: translation import
es/values-ja/strings.xml
|
5074fa0eb003ad9c36112b8b459950b534393454 |
03-May-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I0f2979b6c91ecc068535ee41324c637237421fa6 Auto-generated-cl: translation import
es/values-ja/strings.xml
|
5650f420ff94d0d91c30d7f2d528028a412fe1dd |
03-May-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Id960caeb9b28300e0f6ee817f0bf1ea783e0f3fb Auto-generated-cl: translation import
es/values-ja/strings.xml
|
e5f4214d539d8a248945f230b18e7ccb45008961 |
03-May-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Id960caeb9b28300e0f6ee817f0bf1ea783e0f3fb Auto-generated-cl: translation import
es/values-ja/strings.xml
|
9f1027822eddb983c2fa812396598233fa31509f |
03-May-2013 |
Doris Liu <tianliu@google.com> |
am cd0fb7af: Fix NPE caused by insets never being set * commit 'cd0fb7af20f855e1190122467c5650e46bfe820c': Fix NPE caused by insets never being set
|
fe25f09af1058d1e6eba12568d8f7cb426863b3b |
03-May-2013 |
Doris Liu <tianliu@google.com> |
am cd0fb7af: Fix NPE caused by insets never being set * commit 'cd0fb7af20f855e1190122467c5650e46bfe820c': Fix NPE caused by insets never being set
|
d45258375a9356475377f6bdc7a504cd9acb937a |
03-May-2013 |
Doris Liu <tianliu@google.com> |
Fix NPE caused by insets never being set Bug: 8804054 Change-Id: Ie0f2dec9681977621ba95650aa714b0733a30858
rc/com/android/camera/ui/CameraRootView.java
|
cd0fb7af20f855e1190122467c5650e46bfe820c |
03-May-2013 |
Doris Liu <tianliu@google.com> |
Fix NPE caused by insets never being set Bug: 8804054 Change-Id: Ie0f2dec9681977621ba95650aa714b0733a30858
rc/com/android/camera/ui/CameraRootView.java
|
ff6cb4ea8d0e00219a5dd8fc62b8eaddd55a5a89 |
03-May-2013 |
Doris Liu <tianliu@google.com> |
am e8c2ef9f: am 919d2153: am 4b9dea3a: Merge "Anchor camera controls when flipping device" into gb-ub-photos-bryce * commit 'e8c2ef9fb79e13679681b00ead2c863445c9374d': Anchor camera controls when flipping device
|
db5bbc553d0b65f2da4b9bb463216ef56809ebd4 |
03-May-2013 |
Angus Kong <shkong@google.com> |
am 2e4281da: am 432e24c0: am b0a1e9fe: Don\'t show settings when popup is shown. * commit '2e4281dae07542a023385bc0f9e12d2884d38397': Don't show settings when popup is shown.
|
a692ea578abe98fcba7365f3b83a9c93d80f9a2f |
03-May-2013 |
Doris Liu <tianliu@google.com> |
am 919d2153: am 4b9dea3a: Merge "Anchor camera controls when flipping device" into gb-ub-photos-bryce * commit '919d2153a938ff5a59ac55ea890127dcba4b947a': Anchor camera controls when flipping device
|
083b83c104d2a61c57d6290ffb8fcf3343cf7b64 |
03-May-2013 |
Angus Kong <shkong@google.com> |
am 432e24c0: am b0a1e9fe: Don\'t show settings when popup is shown. * commit '432e24c090c8208dd379188d3226c34638cc3057': Don't show settings when popup is shown.
|
ab27d0f7c2682645b8180935a736f118fa23f023 |
03-May-2013 |
Doris Liu <tianliu@google.com> |
am 4b9dea3a: Merge "Anchor camera controls when flipping device" into gb-ub-photos-bryce * commit '4b9dea3a1496271b73a7b5a4f62ad3bb3b5cdadc': Anchor camera controls when flipping device
|
e7146dfbaf09be18d9b1f20170cc0d606e85a48e |
03-May-2013 |
Doris Liu <tianliu@google.com> |
am 4b9dea3a: Merge "Anchor camera controls when flipping device" into gb-ub-photos-bryce * commit '4b9dea3a1496271b73a7b5a4f62ad3bb3b5cdadc': Anchor camera controls when flipping device
|
cbefed61cf0a7f28afb1221e95ee80c14d190243 |
03-May-2013 |
Doris Liu <tianliu@google.com> |
Merge "Anchor camera controls when flipping device" into gb-ub-photos-bryce
|
4b9dea3a1496271b73a7b5a4f62ad3bb3b5cdadc |
03-May-2013 |
Doris Liu <tianliu@google.com> |
Merge "Anchor camera controls when flipping device" into gb-ub-photos-bryce
|
a3d107564fe9e1001a1acd06b463404952bdc287 |
03-May-2013 |
Angus Kong <shkong@google.com> |
am b0a1e9fe: Don\'t show settings when popup is shown. * commit 'b0a1e9fe925be1745bfb224867ee53562e027145': Don't show settings when popup is shown.
|
79465fc4369d307d0a6ee9b608e155a7a515a3b1 |
03-May-2013 |
Angus Kong <shkong@google.com> |
am b0a1e9fe: Don\'t show settings when popup is shown. * commit 'b0a1e9fe925be1745bfb224867ee53562e027145': Don't show settings when popup is shown.
|
f479c0db587cb21ea0699e2421f1d0d8e5ada289 |
03-May-2013 |
Doris Liu <tianliu@google.com> |
Anchor camera controls when flipping device Also adjusted margins for camera root view to avoid covering undo bar Bug: 8758513 Bug: 8714114 Change-Id: If27f55a40f95402923d59d162db0c7cc29eabba4
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
|
acfe99e268f157bfd524c825f388e6d37261e135 |
03-May-2013 |
Doris Liu <tianliu@google.com> |
Anchor camera controls when flipping device Also adjusted margins for camera root view to avoid covering undo bar Bug: 8758513 Bug: 8714114 Change-Id: If27f55a40f95402923d59d162db0c7cc29eabba4
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
rc/com/android/camera/ui/CameraControls.java
rc/com/android/camera/ui/CameraRootView.java
|
5a6cbd17a335361ae9c71a1356ea8c956f1353fb |
03-May-2013 |
Doris Liu <tianliu@google.com> |
Anchor camera controls when flipping device Also adjusted margins for camera root view to avoid covering undo bar Bug: 8758513 Bug: 8714114 Change-Id: If27f55a40f95402923d59d162db0c7cc29eabba4
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
rc/com/android/camera/ui/CameraControls.java
rc/com/android/camera/ui/CameraRootView.java
|
d675bceed1a817e5f5a330ea27ac1b30b7be3330 |
03-May-2013 |
Angus Kong <shkong@google.com> |
Don't show settings when popup is shown. bug:8771618 Change-Id: Idec1cbacec1ae958c7295facadc6653b840dbe50
rc/com/android/camera/PhotoUI.java
|
b0a1e9fe925be1745bfb224867ee53562e027145 |
03-May-2013 |
Angus Kong <shkong@google.com> |
Don't show settings when popup is shown. bug:8771618 Change-Id: Idec1cbacec1ae958c7295facadc6653b840dbe50
rc/com/android/camera/PhotoUI.java
|
a1842952530b4fe738076ad261df0943e906c6b5 |
02-May-2013 |
George Mount <mount@google.com> |
am b6238e9a: am 49101abc: am 6d7a2d3e: Merge changes Ia9b2ced0,I7cccfffc into gb-ub-photos-bryce * commit 'b6238e9ac95c8887cbffb522fc21be7e6dad9796': Class to simplify use of GalleryBitmapPool for decoding Bitmaps. Allow prefetch for cache, reducing priority for prefetched images.
|
8bb0894b9881ba1d8b2ece1fd3a399ce662cd520 |
02-May-2013 |
George Mount <mount@google.com> |
am 49101abc: am 6d7a2d3e: Merge changes Ia9b2ced0,I7cccfffc into gb-ub-photos-bryce * commit '49101abc1be1a5a19bc02e01683242230560e19c': Class to simplify use of GalleryBitmapPool for decoding Bitmaps. Allow prefetch for cache, reducing priority for prefetched images.
|
b384243e414d22243e84c298f8cf3cef5f6c7bb4 |
02-May-2013 |
George Mount <mount@google.com> |
am 6d7a2d3e: Merge changes Ia9b2ced0,I7cccfffc into gb-ub-photos-bryce * commit '6d7a2d3e32a27de28336176f856a7439b36252bd': Class to simplify use of GalleryBitmapPool for decoding Bitmaps. Allow prefetch for cache, reducing priority for prefetched images.
|
9e2a03dac128f6b4c71a90eb068311fb15460523 |
02-May-2013 |
George Mount <mount@google.com> |
am 6d7a2d3e: Merge changes Ia9b2ced0,I7cccfffc into gb-ub-photos-bryce * commit '6d7a2d3e32a27de28336176f856a7439b36252bd': Class to simplify use of GalleryBitmapPool for decoding Bitmaps. Allow prefetch for cache, reducing priority for prefetched images.
|
6d7a2d3e32a27de28336176f856a7439b36252bd |
02-May-2013 |
George Mount <mount@google.com> |
Merge changes Ia9b2ced0,I7cccfffc into gb-ub-photos-bryce * changes: Class to simplify use of GalleryBitmapPool for decoding Bitmaps. Allow prefetch for cache, reducing priority for prefetched images.
|
7b96023121ebeac1d7b48e573a24acfd8964e2d1 |
02-May-2013 |
George Mount <mount@google.com> |
Merge changes Ia9b2ced0,I7cccfffc into gb-ub-photos-bryce * changes: Class to simplify use of GalleryBitmapPool for decoding Bitmaps. Allow prefetch for cache, reducing priority for prefetched images.
|
33065f02d7d88dab68ff3f9a0a27b7bd5bba8da7 |
30-Apr-2013 |
George Mount <mount@google.com> |
Class to simplify use of GalleryBitmapPool for decoding Bitmaps. Bug 8446191 Required for I86cfa59f448daa4e7b9fd7ea9ada2d69357e1f63 Change-Id: Ia9b2ced0bfd9c9c1b969c77bc89eaa0fa87687bb
rc/com/android/photos/data/BitmapDecoder.java
|
7b4502110166210cf7bbb0740544a0daf1c4d258 |
30-Apr-2013 |
George Mount <mount@google.com> |
Class to simplify use of GalleryBitmapPool for decoding Bitmaps. Bug 8446191 Required for I86cfa59f448daa4e7b9fd7ea9ada2d69357e1f63 Change-Id: Ia9b2ced0bfd9c9c1b969c77bc89eaa0fa87687bb
rc/com/android/photos/data/BitmapDecoder.java
|
057146cfc753d434994385e8a71f196fbd009b44 |
02-May-2013 |
George Mount <mount@google.com> |
Allow prefetch for cache, reducing priority for prefetched images. Bug 8446191 Required for I86cfa59f448daa4e7b9fd7ea9ada2d69357e1f63 Change-Id: I7cccfffc539988d26fc751e16726b05fb2ba21bd
rc/com/android/photos/data/MediaCache.java
|
e4600fca519144d8d9b82a82fdfaabcc77182f40 |
02-May-2013 |
George Mount <mount@google.com> |
Allow prefetch for cache, reducing priority for prefetched images. Bug 8446191 Required for I86cfa59f448daa4e7b9fd7ea9ada2d69357e1f63 Change-Id: I7cccfffc539988d26fc751e16726b05fb2ba21bd
rc/com/android/photos/data/MediaCache.java
|
0e7cbf3229148de0b914f5384f35fcf2c626d67f |
02-May-2013 |
The Android Automerger <android-build@android.com> |
merge in jb-mr2-release history after reset to jb-mr2-dev
|
ffc3bd65bd8a7b49356569ec81860d81c30f7fd6 |
02-May-2013 |
nicolasroard <nicolasroard@google.com> |
am c8a90b2b: am 6ef06ee3: am f469a168: Fix flashing (remove clipping) * commit 'c8a90b2ba70aad02e6d07b1698e6f4f03590ca47': Fix flashing (remove clipping)
|
cd2b7ef027e85a079577c80c31cf1686dd98e198 |
02-May-2013 |
nicolasroard <nicolasroard@google.com> |
am 6ef06ee3: am f469a168: Fix flashing (remove clipping) * commit '6ef06ee314910347baed13fad487ad2a24f50c54': Fix flashing (remove clipping)
|
d2ebe2776692a1bc94e028fce7631dfc03038b3f |
02-May-2013 |
nicolasroard <nicolasroard@google.com> |
am f469a168: Fix flashing (remove clipping) * commit 'f469a1689a9563f3c5bb68f46a5d9cd152d67053': Fix flashing (remove clipping)
|
51d8cd77fd65f260c44cdb735a16322285aab342 |
02-May-2013 |
nicolasroard <nicolasroard@google.com> |
am f469a168: Fix flashing (remove clipping) * commit 'f469a1689a9563f3c5bb68f46a5d9cd152d67053': Fix flashing (remove clipping)
|
f469a1689a9563f3c5bb68f46a5d9cd152d67053 |
02-May-2013 |
nicolasroard <nicolasroard@google.com> |
Fix flashing (remove clipping) bug:8747333 Change-Id: Ie1e7f1a58bf195b1f427b75ee9a1390e29b3ba2a
rc/com/android/gallery3d/filtershow/imageshow/ImageShow.java
|
f6c71858b1a6d39eab259bc593e3b4dd096daeef |
02-May-2013 |
nicolasroard <nicolasroard@google.com> |
Fix flashing (remove clipping) bug:8747333 Change-Id: Ie1e7f1a58bf195b1f427b75ee9a1390e29b3ba2a
rc/com/android/gallery3d/filtershow/imageshow/ImageShow.java
|
2dedab318958a927fa1e52bcf06b46ad38b054f9 |
02-May-2013 |
nicolasroard <nicolasroard@google.com> |
am 5840c68e: am 8275c99e: am 00259461: Fix UI * commit '5840c68e43b49865c2d0ca857e655374971cf9ca': Fix UI
|
cceca1341cc81a155a27c08c7276b6d7569a3813 |
02-May-2013 |
nicolasroard <nicolasroard@google.com> |
am 8275c99e: am 00259461: Fix UI * commit '8275c99e304645c72ef5856ed4142468bca5cd03': Fix UI
|
4f347d06a1825b4891c97c778a03643587ed5f51 |
02-May-2013 |
nicolasroard <nicolasroard@google.com> |
am 00259461: Fix UI * commit '00259461be82e601b58d3e970afbf0c012c5f3e7': Fix UI
|
4c0d9138fda2ef04b2abd52ec93ed8715f00bb52 |
02-May-2013 |
nicolasroard <nicolasroard@google.com> |
am 00259461: Fix UI * commit '00259461be82e601b58d3e970afbf0c012c5f3e7': Fix UI
|
7bef776eb3a3806bf91c940fc8c77cebad78c082 |
02-May-2013 |
nicolasroard <nicolasroard@google.com> |
am 00259461: Fix UI * commit '00259461be82e601b58d3e970afbf0c012c5f3e7': Fix UI
|
7c5349cd12130c41e56f061f369a0babbaa9107c |
01-May-2013 |
nicolasroard <nicolasroard@google.com> |
Fix UI bug:8664728 Change-Id: I90b903e8935b2b6c0dbd6590cff36865644c49b4
es/layout/filtershow_editor_panel.xml
es/layout/filtershow_main_panel.xml
es/layout/filtershow_state_panel_new.xml
es/layout/filtershow_tiny_planet_editor.xml
es/layout/filtershow_vignette_editor.xml
rc/com/android/gallery3d/filtershow/filters/FilterRepresentation.java
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
|
00259461be82e601b58d3e970afbf0c012c5f3e7 |
01-May-2013 |
nicolasroard <nicolasroard@google.com> |
Fix UI bug:8664728 Change-Id: I90b903e8935b2b6c0dbd6590cff36865644c49b4
es/layout/filtershow_editor_panel.xml
es/layout/filtershow_main_panel.xml
es/layout/filtershow_state_panel_new.xml
es/layout/filtershow_tiny_planet_editor.xml
es/layout/filtershow_vignette_editor.xml
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/category/Action.java
rc/com/android/gallery3d/filtershow/category/CategoryView.java
rc/com/android/gallery3d/filtershow/editors/ParametricEditor.java
rc/com/android/gallery3d/filtershow/filters/FilterRepresentation.java
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
rc/com/android/gallery3d/filtershow/state/State.java
rc/com/android/gallery3d/filtershow/state/StateAdapter.java
rc/com/android/gallery3d/filtershow/state/StatePanelTrack.java
rc/com/android/gallery3d/filtershow/state/StateView.java
|
2ee98c8dc8bfba5e9820c14f348ee077c4a4236d |
01-May-2013 |
nicolasroard <nicolasroard@google.com> |
Fix UI bug:8664728 Change-Id: I90b903e8935b2b6c0dbd6590cff36865644c49b4
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/category/Action.java
rc/com/android/gallery3d/filtershow/category/CategoryView.java
rc/com/android/gallery3d/filtershow/editors/ParametricEditor.java
rc/com/android/gallery3d/filtershow/filters/FilterRepresentation.java
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
rc/com/android/gallery3d/filtershow/state/State.java
rc/com/android/gallery3d/filtershow/state/StateAdapter.java
rc/com/android/gallery3d/filtershow/state/StatePanelTrack.java
rc/com/android/gallery3d/filtershow/state/StateView.java
|
c1f579d33b8085502f4b9bfe0b5adef26a17fa0c |
02-May-2013 |
Bobby Georgescu <georgescu@google.com> |
am b4bf4692: am 9774a161: am 5a352be0: Increase selection limit * commit 'b4bf4692325eb6dc7346d07f57da318c881ce294': Increase selection limit
|
3b565e3f04bb2143b326733ecfc04ab373ebd34b |
02-May-2013 |
Bobby Georgescu <georgescu@google.com> |
am 9774a161: am 5a352be0: Increase selection limit * commit '9774a161aa1547ee92acff609189adca683cbce0': Increase selection limit
|
8392649975f3613b2c592d200eb434eb90f49c51 |
02-May-2013 |
Bobby Georgescu <georgescu@google.com> |
am 5a352be0: Increase selection limit * commit '5a352be0df79b03c942eb67a799ddb3aaa1a26a2': Increase selection limit
|
6cfe7ce6fe6d3486d996288d6c7c700a5c645808 |
02-May-2013 |
Bobby Georgescu <georgescu@google.com> |
am 5a352be0: Increase selection limit * commit '5a352be0df79b03c942eb67a799ddb3aaa1a26a2': Increase selection limit
|
5a352be0df79b03c942eb67a799ddb3aaa1a26a2 |
02-May-2013 |
Bobby Georgescu <georgescu@google.com> |
Increase selection limit Bug: 8606565 Bug: 8721237 Bug: 8752803 Change-Id: I578536389146fb4d8735c8171ec346ebe49de729
rc/com/android/gallery3d/ui/ActionModeHandler.java
|
e6a85fb5dc3148d8ef4d6cda30183a9ee33f7314 |
02-May-2013 |
Bobby Georgescu <georgescu@google.com> |
Increase selection limit Bug: 8606565 Bug: 8721237 Bug: 8752803 Change-Id: I578536389146fb4d8735c8171ec346ebe49de729
rc/com/android/gallery3d/ui/ActionModeHandler.java
|
cfd33dc25bf7589dc846c90e85f69a41794d5ca9 |
02-May-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "G+ activity xform stack and pipeline cleanup." into gb-ub-photos-carlsbad
|
513e369b84ec93175d63b922d4ed5e54a3393534 |
02-May-2013 |
John Hoford <hoford@google.com> |
fix crash due to no ImageFilterDraw Change-Id: I0c8bfaa7d162f5c1a49f05d853f4700322fe5901
rc/com/android/gallery3d/filtershow/filters/BaseFiltersManager.java
|
96a9f483b2156fe6e27a17dcc2e9c660c12794ce |
01-May-2013 |
Michael Kolb <kolby@google.com> |
am aec918b9: am ec7fc927: am fb936141: Merge "Fix layout and preview for tablets" into gb-ub-photos-bryce * commit 'aec918b9aadc550535d0e17c674278fe7ee2d49f': Fix layout and preview for tablets
|
2d64d4053a8641a98828e5b95016c224e9b35911 |
01-May-2013 |
Michael Kolb <kolby@google.com> |
am ec7fc927: am fb936141: Merge "Fix layout and preview for tablets" into gb-ub-photos-bryce * commit 'ec7fc9277418d823c32c078c2c5589edbea3ad4b': Fix layout and preview for tablets
|
92351fbc7c9829c3c1317334ed6c5d41ce8f749c |
01-May-2013 |
Michael Kolb <kolby@google.com> |
am fb936141: Merge "Fix layout and preview for tablets" into gb-ub-photos-bryce * commit 'fb9361419abfac7f893674bb6f4d1b1f8ab1f677': Fix layout and preview for tablets
|
c616d43e0de46677a602acaca92b301bdb947b7b |
01-May-2013 |
Michael Kolb <kolby@google.com> |
am fb936141: Merge "Fix layout and preview for tablets" into gb-ub-photos-bryce * commit 'fb9361419abfac7f893674bb6f4d1b1f8ab1f677': Fix layout and preview for tablets
|
e65a7a3af35c3c79e8b7da1ed7edaf3a778c489c |
01-May-2013 |
Michael Kolb <kolby@google.com> |
am fb936141: Merge "Fix layout and preview for tablets" into gb-ub-photos-bryce * commit 'fb9361419abfac7f893674bb6f4d1b1f8ab1f677': Fix layout and preview for tablets
|
8468e0e50dc2cf00cdf288fca0b56049d12ef598 |
01-May-2013 |
Michael Kolb <kolby@google.com> |
Merge "Fix layout and preview for tablets" into gb-ub-photos-bryce
|
fb9361419abfac7f893674bb6f4d1b1f8ab1f677 |
01-May-2013 |
Michael Kolb <kolby@google.com> |
Merge "Fix layout and preview for tablets" into gb-ub-photos-bryce
|
b0da79fe069d740566663120818f9ed13a706890 |
01-May-2013 |
Michael Kolb <kolby@google.com> |
Fix layout and preview for tablets Bug: 8253060 Make controls full screen, and layout according to required size Change-Id: I725547041264457d85d73d470d25caa5cb2cf783
rc/com/android/camera/ui/CameraControls.java
|
a18f665404f0cefe51db0c8aba1c4eec18224582 |
01-May-2013 |
Michael Kolb <kolby@google.com> |
Fix layout and preview for tablets Bug: 8253060 Make controls full screen, and layout according to required size Change-Id: I725547041264457d85d73d470d25caa5cb2cf783
es/layout-land/camera_controls.xml
es/layout-port/camera_controls.xml
es/layout/camera_main.xml
es/values-sw600dp-land/styles.xml
es/values-sw600dp-port/styles.xml
es/values-sw600dp/dimens.xml
es/values/dimens.xml
|
f2c86c128401cf92a2e5b351b32dc6f906eed412 |
01-May-2013 |
Michael Kolb <kolby@google.com> |
Fix layout and preview for tablets Bug: 8253060 Make controls full screen, and layout according to required size Change-Id: I725547041264457d85d73d470d25caa5cb2cf783
es/layout-land/camera_controls.xml
es/layout-port/camera_controls.xml
es/layout/camera_main.xml
es/values-sw600dp-land/styles.xml
es/values-sw600dp-port/styles.xml
es/values-sw600dp/dimens.xml
es/values/dimens.xml
rc/com/android/camera/ui/CameraControls.java
|
c35d94591c9ead2f79990c30dbe77ec302f9e2e6 |
01-May-2013 |
Michael Kolb <kolby@google.com> |
Fix new activity menus Change-Id: If8ace52a46284b41169532b69bdf77305b9610d9
rc/com/android/camera/NewPhotoMenu.java
rc/com/android/camera/NewVideoMenu.java
|
c544c53c7f27c4d1ba12c26a0d9ca24dc18a2316 |
01-May-2013 |
Baligh Uddin <baligh@google.com> |
am f1ba6eb9: (-s ours) am 36648e50: am 32aa7da8: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce * commit 'f1ba6eb9a062967ae5110b2abd61967bce211b80': Import translations. DO NOT MERGE
|
062bc83043ce61d53af78e5536084895cf59a498 |
01-May-2013 |
Baligh Uddin <baligh@google.com> |
am 36648e50: am 32aa7da8: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce * commit '36648e508e8241757a1798e79d18d5a9abeccc45': Import translations. DO NOT MERGE
|
6c015e2fd67ac0190870c599ffbee0f9a2229bde |
01-May-2013 |
Baligh Uddin <baligh@google.com> |
am 2a02906f: (-s ours) am 287a40d1: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev * commit '2a02906fee40fcdcd5b0fe5bebfa13195780da58': Import translations. DO NOT MERGE
|
27307c07d224270e7c8759c8361706b96be8a362 |
01-May-2013 |
Baligh Uddin <baligh@google.com> |
am 287a40d1: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev * commit '287a40d1aba640d8bd6f82631d577524e544d071': Import translations. DO NOT MERGE
|
956828d2855e69fbdc329304d935821adf8e4587 |
01-May-2013 |
Baligh Uddin <baligh@google.com> |
am 32aa7da8: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce * commit '32aa7da8dc533a5add4ca7c94a69201ff5ed9a90': Import translations. DO NOT MERGE
|
36d857c783c1b402cee57990d794dc3a2c0c1348 |
01-May-2013 |
Baligh Uddin <baligh@google.com> |
am 32aa7da8: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce * commit '32aa7da8dc533a5add4ca7c94a69201ff5ed9a90': Import translations. DO NOT MERGE
|
3c398185946200e2b7afc62fff023ddcf950b425 |
01-May-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE"
|
354dbd73a42cb94b5210421bdac74009634193e6 |
01-May-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
|
9708e20994b55d20efdc608f55b664522a2d2556 |
01-May-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
|
32aa7da8dc533a5add4ca7c94a69201ff5ed9a90 |
01-May-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
|
e70e39d53b3ff6bae964625fb29991667f276027 |
01-May-2013 |
Michael Kolb <kolby@google.com> |
am c43e5b6b: Update capture animation * commit 'c43e5b6bd84f5a7635766f70677097f6958f4058': Update capture animation
|
acf9821bdbe01a6ba4c9e28adb06d56a70cb9662 |
01-May-2013 |
Michael Kolb <kolby@google.com> |
am c43e5b6b: Update capture animation * commit 'c43e5b6bd84f5a7635766f70677097f6958f4058': Update capture animation
|
650db5470d569966d4ecf13844f14333a3c721e7 |
01-May-2013 |
Michael Kolb <kolby@google.com> |
am 03e752e0: Update scene mode off icon in menu * commit '03e752e0c9f9978663fb5bca06edd5e56476132e': Update scene mode off icon in menu
|
3466f1d66f5a70f17016114d034550840ae0b347 |
01-May-2013 |
Michael Kolb <kolby@google.com> |
am 9ea4147f: Update location indicator correctly * commit '9ea4147f6220e3a9fb6f9ae3fef46036919641b4': Update location indicator correctly
|
6aee5e63a9774812566cb4062348a9e8f9863487 |
01-May-2013 |
Michael Kolb <kolby@google.com> |
am 64c9c183: Adjust switcher animation * commit '64c9c183384b9df6dafe0142f10c4f7b802d54bf': Adjust switcher animation
|
7ffae50747da84448a06323dad2176605f8881d3 |
01-May-2013 |
Michael Kolb <kolby@google.com> |
am b048226f: Merge "Align review controls" into gb-ub-photos-bryce * commit 'b048226feed739f122ffb39fca51fedaec791e67': Align review controls
|
7523e30fb1bbe737296cf2d53bef2b640657ce97 |
01-May-2013 |
Mangesh Ghiware <mghiware@google.com> |
am fe804d11: Handle onDowngrade in PhotoDatabase * commit 'fe804d11f398b3c03b4a6ccffcfdac56e1728de4': Handle onDowngrade in PhotoDatabase
|
b4ac724674dcbcd92f94b4fed203323233d20fa8 |
01-May-2013 |
Michael Kolb <kolby@google.com> |
am ce8f6d1b: Remove empty slots from menu * commit 'ce8f6d1bb9dc52da7d168a94cb4c6f24d631d304': Remove empty slots from menu
|
8fbd359ef215885306571f6cca1220ab8558b4c8 |
01-May-2013 |
Baligh Uddin <baligh@google.com> |
am aa3541c5: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce * commit 'aa3541c5f8e64f6f6cf7d5c80f1aeaacde51a4f0': Import translations. DO NOT MERGE
|
916a428dd0553322bed763f8cc7c3d5b243b0ca3 |
01-May-2013 |
Baligh Uddin <baligh@google.com> |
am 9ce3bef0: (-s ours) Import translations. DO NOT MERGE * commit '9ce3bef0a877c5573256ea8a76642e45dac92cc4': Import translations. DO NOT MERGE
|
b0690afcf1a57c9634b8293d0c562bbb6452c762 |
01-May-2013 |
Michael Kolb <kolby@google.com> |
am 9bd6b55d: am 746a8792: am c43e5b6b: Update capture animation * commit '9bd6b55d1fd682c247b15408dd28db0042332826': Update capture animation
|
c3a273c6a135ed3cbdc1d8f33bffba0e482f9e61 |
01-May-2013 |
Michael Kolb <kolby@google.com> |
am 125909fd: am 8cc69e74: am 03e752e0: Update scene mode off icon in menu * commit '125909fdb1e78c1632d1079fd161ceddd745d7dd': Update scene mode off icon in menu
|
76b8e9dd521fceba5f5ad61a0303391ed4a6e244 |
01-May-2013 |
Michael Kolb <kolby@google.com> |
am 746a8792: am c43e5b6b: Update capture animation * commit '746a87929bd3b14c2d467b279659990bf3188c7e': Update capture animation
|
6c2f36d7c23b3b84f43130f84b1820de79a7c849 |
01-May-2013 |
Michael Kolb <kolby@google.com> |
am 8cc69e74: am 03e752e0: Update scene mode off icon in menu * commit '8cc69e74a008dfad4fb9d34dd5692575954a7080': Update scene mode off icon in menu
|
d0f51690ec478b98ba3d3988b630dca00380b9fb |
01-May-2013 |
Michael Kolb <kolby@google.com> |
am c43e5b6b: Update capture animation * commit 'c43e5b6bd84f5a7635766f70677097f6958f4058': Update capture animation
|
4aa6bde26cacce1af172dd4af7230a071571239d |
01-May-2013 |
Michael Kolb <kolby@google.com> |
am 03e752e0: Update scene mode off icon in menu * commit '03e752e0c9f9978663fb5bca06edd5e56476132e': Update scene mode off icon in menu
|
f63b8fc49ecc6f980187a351a4e00213324dde5f |
01-May-2013 |
Michael Kolb <kolby@google.com> |
am 9c525edf: Merge "Remove timer indicator" into gb-ub-photos-bryce * commit '9c525edf6440b6daf10885f4f7a0da479b7f2707': Remove timer indicator
|
1a4e2ec8f92716630c653f5cbb0c2ea9a154e030 |
01-May-2013 |
John Hoford <hoford@google.com> |
resolved conflicts for merge of d6edcee3 to gb-ub-photos-carlsbad Change-Id: I24057e85ca5b0409e9bcb92c85577fb9a763fbe4
|
d16de2ee0d4abc6dc46b949f693b1a865344dfa3 |
01-May-2013 |
John Hoford <hoford@google.com> |
resolved conflicts for merge of d6edcee3 to gb-ub-photos-carlsbad Change-Id: I24057e85ca5b0409e9bcb92c85577fb9a763fbe4
|
78a5b224eca3c702f4ecf8abd072779e32e26641 |
01-May-2013 |
Michael Kolb <kolby@google.com> |
Update capture animation Bug: 8253060 Update preview thumb margins and size Add touch target for thumbnail Change-Id: I2b298de330834c42a55b4cb082148d971727f530
rc/com/android/camera/CaptureAnimManager.java
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/PhotoUI.java
rc/com/android/camera/ui/CameraControls.java
|
8c0570c14eb9cc72a86c191b90b1ff626a8aa039 |
01-May-2013 |
Michael Kolb <kolby@google.com> |
Update capture animation Bug: 8253060 Update preview thumb margins and size Add touch target for thumbnail Change-Id: I2b298de330834c42a55b4cb082148d971727f530
es/layout-land/camera_controls.xml
es/layout-port/camera_controls.xml
es/values-land/dimensions.xml
es/values-sw360dp-land/dimensions.xml
es/values-sw360dp/dimensions.xml
es/values-sw600dp/dimens.xml
|
c43e5b6bd84f5a7635766f70677097f6958f4058 |
01-May-2013 |
Michael Kolb <kolby@google.com> |
Update capture animation Bug: 8253060 Update preview thumb margins and size Add touch target for thumbnail Change-Id: I2b298de330834c42a55b4cb082148d971727f530
es/layout-land/camera_controls.xml
es/layout-port/camera_controls.xml
es/values-land/dimensions.xml
es/values-sw360dp-land/dimensions.xml
es/values-sw360dp/dimensions.xml
es/values-sw600dp/dimens.xml
rc/com/android/camera/CaptureAnimManager.java
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/PhotoUI.java
rc/com/android/camera/ui/CameraControls.java
|
3cb3cff8718a21cd35451636c3511c3de5843e59 |
01-May-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I647e09340158b86056cfa7251cf3db419bb096f7 Auto-generated-cl: translation import
es/values-es/strings.xml
es/values-sw/strings.xml
|
9c93869229bb793ebeeef0007cc39e06b7bbdd8a |
01-May-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Iccdd5306b72ee9dd0e37247ff7273362a7324a49 Auto-generated-cl: translation import
es/values-es/strings.xml
es/values-sw/strings.xml
|
dcf16ebac88ad2f7f1790a11d9cd5e919b000dc2 |
01-May-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I7a4b256e2ef8d9eea311c8945be7caa93ff5609c Auto-generated-cl: translation import
es/values-es/strings.xml
es/values-sw/strings.xml
|
699952e186d1e4f5135ba3cb7d213b0f50f44705 |
01-May-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I7a4b256e2ef8d9eea311c8945be7caa93ff5609c Auto-generated-cl: translation import
es/values-es/strings.xml
es/values-sw/strings.xml
|
d48e78ccfb7cd66032bea9df39951b7945df933c |
01-May-2013 |
Michael Kolb <kolby@google.com> |
Update scene mode off icon in menu Bug: 8656593 Change-Id: Ic310bd896a02ae842c5a5af180dfcec289c679fc
es/values/arrays.xml
|
03e752e0c9f9978663fb5bca06edd5e56476132e |
01-May-2013 |
Michael Kolb <kolby@google.com> |
Update scene mode off icon in menu Bug: 8656593 Change-Id: Ic310bd896a02ae842c5a5af180dfcec289c679fc
es/values/arrays.xml
|
a0ee50639423deaeb5333142fe7fea5979aa567c |
01-May-2013 |
The Android Automerger <android-build@android.com> |
merge in jb-mr2-release history after reset to jb-mr2-dev
|
4f32062f39c6afc53bdce722cd3299b0840436ad |
01-May-2013 |
Ruben Brunk <rubenbrunk@google.com> |
G+ activity xform stack and pipeline cleanup. Change-Id: I3277dd4e709146ca2c06b56a1db200d3130dd5e3
rc/com/android/gallery3d/filtershow/filters/ImageFilterRS.java
|
e244165dbfb8d6aaf5294988c8b2ae73244916fd |
01-May-2013 |
Michael Kolb <kolby@google.com> |
am 3b7a6553: am eedc9eeb: am 9ea4147f: Update location indicator correctly * commit '3b7a6553acaba85b1282789578de547d69a39c49': Update location indicator correctly
|
cfd5e38d5e0e0dd5d280de0015f2ad26744610da |
01-May-2013 |
Michael Kolb <kolby@google.com> |
am 552ffa38: am 51b8ce8e: am 64c9c183: Adjust switcher animation * commit '552ffa38866e1bd6c35e461791c895f629d6d2f4': Adjust switcher animation
|
24b4728d50d1ef5a973ea1b98ad91be1176a42c6 |
01-May-2013 |
Michael Kolb <kolby@google.com> |
am eedc9eeb: am 9ea4147f: Update location indicator correctly * commit 'eedc9eeb82f41f3d266019c38b4cabc4368c486f': Update location indicator correctly
|
c3d8e45a9b0b71af9d1c28d50f3d527fe050b25d |
01-May-2013 |
Michael Kolb <kolby@google.com> |
am 51b8ce8e: am 64c9c183: Adjust switcher animation * commit '51b8ce8ed24ebe9d05fd192e0fce9d495b8eb5a6': Adjust switcher animation
|
12a9e15859456423b5a10e0ee800e7c0c442fdcf |
01-May-2013 |
Michael Kolb <kolby@google.com> |
am 2b3b02c1: am c8a2d34c: am b048226f: Merge "Align review controls" into gb-ub-photos-bryce * commit '2b3b02c14114ed70e66800a0575d4d11a5ad0107': Align review controls
|
7bcd57a8c8d0c493d1e6cd36e03a97689e014cea |
01-May-2013 |
Mangesh Ghiware <mghiware@google.com> |
am e74fa383: am a9c070ad: am fe804d11: Handle onDowngrade in PhotoDatabase * commit 'e74fa38341cbb69d8a089f5a27da0d15b67a16bb': Handle onDowngrade in PhotoDatabase
|
653dd146d8021063f078afd44ea32fa8fdf7d567 |
01-May-2013 |
Michael Kolb <kolby@google.com> |
am e54e43e2: am 75a1975a: am ce8f6d1b: Remove empty slots from menu * commit 'e54e43e24218a02e4d820e85b2e6462cb01cbee7': Remove empty slots from menu
|
b8e030d633dd27821f1f6e6bc1a8793a12ef0e2b |
01-May-2013 |
Baligh Uddin <baligh@google.com> |
am a09ae5d4: (-s ours) am d651db7a: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev * commit 'a09ae5d47482dcea8039046cb4c389cd307d3b07': Import translations. DO NOT MERGE
|
7c7ebab6b7604987dbe51ce2dd68077c0cb15f9b |
01-May-2013 |
Baligh Uddin <baligh@google.com> |
am 58c076d9: (-s ours) am 4d8a127e: am aa3541c5: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce * commit '58c076d97b4189968b1e4b599bd06fa93ab4fd39': Import translations. DO NOT MERGE
|
373880b6efeacea8f9aa09a1c58160a48cd48f4d |
01-May-2013 |
Baligh Uddin <baligh@google.com> |
am ef42883d: (-s ours) am ebfadc7f: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev * commit 'ef42883d409fa06279436945deaff40f2b7fe8b9': Import translations. DO NOT MERGE
|
52b077146e8b82115bf0c3920cc6bf855657980c |
01-May-2013 |
Baligh Uddin <baligh@google.com> |
am ac7de390: (-s ours) am 055893a4: am 9ce3bef0: (-s ours) Import translations. DO NOT MERGE * commit 'ac7de390d1cf19310a53227c881dff48df7586b5': Import translations. DO NOT MERGE
|
fdc375f39925a0f06fe7a37b2009a3231a097a72 |
01-May-2013 |
Michael Kolb <kolby@google.com> |
am b61555d0: am 096b9781: am 9c525edf: Merge "Remove timer indicator" into gb-ub-photos-bryce * commit 'b61555d0d9cf2b7f1f252582a466a6c0b36d3419': Remove timer indicator
|
bb6179982a0b2cb5530474ec4c9ebb9613844d29 |
01-May-2013 |
John Hoford <hoford@google.com> |
am e8cce4df: am c5e43f82: am d6edcee3: Merge "small ui changes based on UX/PM feedback" into gb-ub-photos-bryce * commit 'e8cce4df337c8a389bfd08ddcaa8e13c650c5fd0': small ui changes based on UX/PM feedback
|
b74ce94db4d61b4b7bd83e16deeb8fa036a2edf9 |
01-May-2013 |
Michael Kolb <kolby@google.com> |
am c8a2d34c: am b048226f: Merge "Align review controls" into gb-ub-photos-bryce * commit 'c8a2d34c2efec8e9c97c9c88658cc67b90d9db3a': Align review controls
|
00517eea76f8bcd9c51ced73380c6b1274de63f9 |
01-May-2013 |
Mangesh Ghiware <mghiware@google.com> |
am a9c070ad: am fe804d11: Handle onDowngrade in PhotoDatabase * commit 'a9c070adf31d9e4da5bf5f6fdde30701c1d525cd': Handle onDowngrade in PhotoDatabase
|
f866d17520f81220ced60bb613289ad380c1862f |
01-May-2013 |
Michael Kolb <kolby@google.com> |
am 75a1975a: am ce8f6d1b: Remove empty slots from menu * commit '75a1975abec4bfed44906605fd045b3c06a10bfa': Remove empty slots from menu
|
a049931138a29f612723fa8703562445b4dcc9a3 |
01-May-2013 |
Baligh Uddin <baligh@google.com> |
am d651db7a: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev * commit 'd651db7aab4588214ed978222847a03aed1b2bff': Import translations. DO NOT MERGE
|
85d90d8aee24bbbb0034538201258a56b897539d |
01-May-2013 |
Baligh Uddin <baligh@google.com> |
am 4d8a127e: am aa3541c5: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce * commit '4d8a127e3e45639dd7ef3f4e717da43ddac847af': Import translations. DO NOT MERGE
|
ad2b67762e71764401b71cbda87a987997f5ddb1 |
01-May-2013 |
Baligh Uddin <baligh@google.com> |
am ebfadc7f: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev * commit 'ebfadc7fdc2d63cae483acf368af07a5dce5f73a': Import translations. DO NOT MERGE
|
7e67b76dbe114157412558b38bc81cd5693121c9 |
01-May-2013 |
Baligh Uddin <baligh@google.com> |
am 055893a4: am 9ce3bef0: (-s ours) Import translations. DO NOT MERGE * commit '055893a45bc66c626585360389ef99af7e3bb8d4': Import translations. DO NOT MERGE
|
643d6a4b4399934e1d884f7e25b829697a5d3760 |
01-May-2013 |
Michael Kolb <kolby@google.com> |
am 096b9781: am 9c525edf: Merge "Remove timer indicator" into gb-ub-photos-bryce * commit '096b9781f00a6f6a33e82682274c614cee4fed57': Remove timer indicator
|
b9b1eb7e1db4312a39a08bdea2037912286fc46b |
01-May-2013 |
John Hoford <hoford@google.com> |
am c5e43f82: am d6edcee3: Merge "small ui changes based on UX/PM feedback" into gb-ub-photos-bryce * commit 'c5e43f8290050500f7617ed02ced825c5f9869df': small ui changes based on UX/PM feedback
|
e7e1552b6313cf41f4306a6023948a94ea6a0eef |
01-May-2013 |
Michael Kolb <kolby@google.com> |
am 9ea4147f: Update location indicator correctly * commit '9ea4147f6220e3a9fb6f9ae3fef46036919641b4': Update location indicator correctly
|
8788079a51a90255dce330e56afcb6674deccbf7 |
01-May-2013 |
Michael Kolb <kolby@google.com> |
Update location indicator correctly Bug: 8768592 Change-Id: I8f94b4fb62174c4c27e6dbdc68ba272b0d3ae371
rc/com/android/camera/PhotoUI.java
rc/com/android/camera/VideoModule.java
rc/com/android/camera/VideoUI.java
|
9ea4147f6220e3a9fb6f9ae3fef46036919641b4 |
01-May-2013 |
Michael Kolb <kolby@google.com> |
Update location indicator correctly Bug: 8768592 Change-Id: I8f94b4fb62174c4c27e6dbdc68ba272b0d3ae371
rc/com/android/camera/PhotoUI.java
rc/com/android/camera/VideoModule.java
rc/com/android/camera/VideoUI.java
|
a33242701de1ccd9a9cae885b743b3438301125a |
30-Apr-2013 |
Michael Kolb <kolby@google.com> |
am 64c9c183: Adjust switcher animation * commit '64c9c183384b9df6dafe0142f10c4f7b802d54bf': Adjust switcher animation
|
997dfc3211ac036448d18d0c0076fef9623885c0 |
30-Apr-2013 |
Michael Kolb <kolby@google.com> |
Adjust switcher animation Bug: 8754841 Change-Id: I7a25527297eddd11f9c9a025986ff857f97c07be
rc/com/android/camera/ui/CameraSwitcher.java
|
64c9c183384b9df6dafe0142f10c4f7b802d54bf |
30-Apr-2013 |
Michael Kolb <kolby@google.com> |
Adjust switcher animation Bug: 8754841 Change-Id: I7a25527297eddd11f9c9a025986ff857f97c07be
rc/com/android/camera/ui/CameraSwitcher.java
|
9189c4e650f5a3898decea0d7e47276bb2902d8c |
30-Apr-2013 |
Michael Kolb <kolby@google.com> |
am b048226f: Merge "Align review controls" into gb-ub-photos-bryce * commit 'b048226feed739f122ffb39fca51fedaec791e67': Align review controls
|
553f31aca13fbcb661af0122b132314576d84c27 |
30-Apr-2013 |
Michael Kolb <kolby@google.com> |
Merge "Align review controls" into gb-ub-photos-bryce
|
b048226feed739f122ffb39fca51fedaec791e67 |
30-Apr-2013 |
Michael Kolb <kolby@google.com> |
Merge "Align review controls" into gb-ub-photos-bryce
|
d548f9af4524773a3dc7903f33eb05fcf9a1bfb8 |
30-Apr-2013 |
Michael Kolb <kolby@google.com> |
Align review controls Bug: 8753607 Change-Id: Iea2cef5bf56c82c2ddbd7191be6345a58fa126c9
rc/com/android/camera/ui/CameraControls.java
|
574e68d662cd9aade7502301ea3957ffaf06f1c4 |
30-Apr-2013 |
Michael Kolb <kolby@google.com> |
Align review controls Bug: 8753607 Change-Id: Iea2cef5bf56c82c2ddbd7191be6345a58fa126c9
rc/com/android/camera/ui/CameraControls.java
|
7a25ed09002ba86231b47f1c5676c585c4da7707 |
30-Apr-2013 |
Mangesh Ghiware <mghiware@google.com> |
am fe804d11: Handle onDowngrade in PhotoDatabase * commit 'fe804d11f398b3c03b4a6ccffcfdac56e1728de4': Handle onDowngrade in PhotoDatabase
|
7d54a706167031ff4043536c7cfa529ac46e6411 |
30-Apr-2013 |
Mangesh Ghiware <mghiware@google.com> |
Handle onDowngrade in PhotoDatabase Bug: 8683352 Change-Id: Iefaa425a753c8242dc345efd96354bbb7b5bb999
rc/com/android/photos/data/PhotoDatabase.java
|
fe804d11f398b3c03b4a6ccffcfdac56e1728de4 |
30-Apr-2013 |
Mangesh Ghiware <mghiware@google.com> |
Handle onDowngrade in PhotoDatabase Bug: 8683352 Change-Id: Iefaa425a753c8242dc345efd96354bbb7b5bb999
rc/com/android/photos/data/PhotoDatabase.java
|
674287f653736d586521e33d2b3d5924e0f12cc0 |
30-Apr-2013 |
Michael Kolb <kolby@google.com> |
am ce8f6d1b: Remove empty slots from menu * commit 'ce8f6d1bb9dc52da7d168a94cb4c6f24d631d304': Remove empty slots from menu
|
b7c49994231f31f5cf4de4a66eec7a85a3bd9551 |
30-Apr-2013 |
Michael Kolb <kolby@google.com> |
Remove empty slots from menu Bug: 8640131 When a specific camera doesn't support one of the menu options, the option is removed from the menu, no empty spot anymore. Change-Id: I002d6347c35cb0bfd5f71d880294f04f45ffb38f
rc/com/android/camera/PhotoMenu.java
rc/com/android/camera/PieController.java
rc/com/android/camera/VideoMenu.java
rc/com/android/camera/ui/PieItem.java
rc/com/android/camera/ui/PieRenderer.java
|
ce8f6d1bb9dc52da7d168a94cb4c6f24d631d304 |
30-Apr-2013 |
Michael Kolb <kolby@google.com> |
Remove empty slots from menu Bug: 8640131 When a specific camera doesn't support one of the menu options, the option is removed from the menu, no empty spot anymore. Change-Id: I002d6347c35cb0bfd5f71d880294f04f45ffb38f
rc/com/android/camera/PhotoMenu.java
rc/com/android/camera/PieController.java
rc/com/android/camera/VideoMenu.java
rc/com/android/camera/ui/PieItem.java
rc/com/android/camera/ui/PieRenderer.java
|
f0b26ae5ebd6ddc2c8e4c79b3fe71933083f5dd7 |
30-Apr-2013 |
Michael Kolb <kolby@google.com> |
am cf615402: am 5371a9c2: am ef878669: Fix indicator layout * commit 'cf6154020655b42d8785fda4046b8995a77431c0': Fix indicator layout
|
9caab0fd50cdc12db125da78668750c31e238b82 |
30-Apr-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE"
|
6fd7a83d1f524c9c1506719c098324436da7a696 |
30-Apr-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
|
d3b85c73c05f22b51eef199a9a92319e8d3f999a |
30-Apr-2013 |
Baligh Uddin <baligh@google.com> |
am aa3541c5: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce * commit 'aa3541c5f8e64f6f6cf7d5c80f1aeaacde51a4f0': Import translations. DO NOT MERGE
|
aa3541c5f8e64f6f6cf7d5c80f1aeaacde51a4f0 |
30-Apr-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
|
bd96d01f07b84fac54e980da7ec52aa2fcd27067 |
30-Apr-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
|
1f01686ec7fb99344da5efa7e0a3bd325b2e87ff |
30-Apr-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE"
|
54d7e0816807b41d2740a9f3b34c47a9f9d399c8 |
30-Apr-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
|
64ad4c33a6dff537241dfae37bd3365ea0603694 |
30-Apr-2013 |
Baligh Uddin <baligh@google.com> |
am 9ce3bef0: (-s ours) Import translations. DO NOT MERGE * commit '9ce3bef0a877c5573256ea8a76642e45dac92cc4': Import translations. DO NOT MERGE
|
3af6ff7536ebd404f950c4fe2d014a8950117274 |
30-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 83057500: am 61e5715d: am 9e5b0799: Merge "Cleanup crop activity UI." into gb-ub-photos-bryce * commit '83057500efa6d1fad19cefa73565dfa774fb94e4': Cleanup crop activity UI.
|
0865a4c55759cc77b54f38f5821fa218e4ee4e4c |
30-Apr-2013 |
Bobby Georgescu <georgescu@google.com> |
am 2d806a27: am 657384bb: am 384971f7: Instrument importer for usage statistics * commit '2d806a27036347530a1632ac3232fa246cbd26bc': Instrument importer for usage statistics
|
3b68cf1a40812250cdd04774365ed38fd3a377e7 |
30-Apr-2013 |
The Android Automerger <android-build@android.com> |
merge in jb-mr2-release history after reset to jb-mr2-dev
|
4f2006f4e532e9cb7b4586dc7fac4a95a924563c |
30-Apr-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I2dec04ee645e481deeee22edcfb5237edfdeb57b Auto-generated-cl: translation import
es/values-af/filtershow_strings.xml
es/values-da/filtershow_strings.xml
es/values-fa/filtershow_strings.xml
|
b3db495929b712c8d912e282a78e96262fca2d8c |
30-Apr-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I1509ed3f361a2433d2960b9d69ceebc2300e1769 Auto-generated-cl: translation import
es/values-af/filtershow_strings.xml
es/values-da/filtershow_strings.xml
es/values-fa/filtershow_strings.xml
|
cf1cbf8287f2bd708da01912b0f3bc2a7429ca01 |
30-Apr-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ie7162610e7c9c69d5d5e70d552f9c8bece66cefa Auto-generated-cl: translation import
es/values-af/filtershow_strings.xml
es/values-da/filtershow_strings.xml
es/values-fa/filtershow_strings.xml
|
cb1a62f7d4bd6f4c93fa59513f39378c46eff019 |
30-Apr-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ie7162610e7c9c69d5d5e70d552f9c8bece66cefa Auto-generated-cl: translation import
es/values-af/filtershow_strings.xml
es/values-da/filtershow_strings.xml
es/values-fa/filtershow_strings.xml
|
ddd829f25417b6749040b7836b7c1bd797420c9b |
30-Apr-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I3f4606e047d454e3c19a2b87c82475bf08d5bbdb Auto-generated-cl: translation import
es/values-fa/strings.xml
es/values-in/strings.xml
|
f93aeb360c906402d7e8b362a408ebb5982c8736 |
30-Apr-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I2358ab187569ecbdfa9e8b26b875a9df549dcdb4 Auto-generated-cl: translation import
es/values-fa/strings.xml
es/values-in/strings.xml
|
73c5aadf84198ec86a0c8333d68f112e6e7413fa |
30-Apr-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I03986a2e5f9465f377739c18d672574c34464960 Auto-generated-cl: translation import
es/values-fa/strings.xml
es/values-in/strings.xml
|
9ce3bef0a877c5573256ea8a76642e45dac92cc4 |
30-Apr-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I03986a2e5f9465f377739c18d672574c34464960 Auto-generated-cl: translation import
es/values-fa/strings.xml
es/values-in/strings.xml
|
10060c47f0dbba03d415a7dd64f26f82636fd6c2 |
30-Apr-2013 |
Michael Kolb <kolby@google.com> |
am 9c525edf: Merge "Remove timer indicator" into gb-ub-photos-bryce * commit '9c525edf6440b6daf10885f4f7a0da479b7f2707': Remove timer indicator
|
4d42e8680f841fa4b318f90798f1792bdc3589d0 |
30-Apr-2013 |
John Hoford <hoford@google.com> |
am d6edcee3: Merge "small ui changes based on UX/PM feedback" into gb-ub-photos-bryce * commit 'd6edcee398efa0c208f036c68a06dd840586f734': small ui changes based on UX/PM feedback
|
6cf36371a5888be8e137af1ede183bd592bb07b2 |
30-Apr-2013 |
Michael Kolb <kolby@google.com> |
Merge "Remove timer indicator" into gb-ub-photos-bryce
|
9c525edf6440b6daf10885f4f7a0da479b7f2707 |
30-Apr-2013 |
Michael Kolb <kolby@google.com> |
Merge "Remove timer indicator" into gb-ub-photos-bryce
|
b15919a1bccfcecd24c35001837626c73b0a4bdb |
30-Apr-2013 |
John Hoford <hoford@google.com> |
Merge "small ui changes based on UX/PM feedback" into gb-ub-photos-bryce
|
d6edcee398efa0c208f036c68a06dd840586f734 |
30-Apr-2013 |
John Hoford <hoford@google.com> |
Merge "small ui changes based on UX/PM feedback" into gb-ub-photos-bryce
|
4f7fe16804568f9bcb189ab7916e403f8b1e2f90 |
30-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
Merge "Modifications for simple edit" into gb-ub-photos-carlsbad
|
2ddb3e6dc31c9ebdae1962edf1ba3fa4d498bbc3 |
26-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
Modifications for simple edit Change-Id: Ic200a4f1e843deb119d68f627d5b8adb201f0f7f
rc/com/android/gallery3d/filtershow/filters/FilterRepresentation.java
rc/com/android/gallery3d/filtershow/presets/FilterEnvironment.java
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
rc/com/android/gallery3d/filtershow/presets/PipelineInterface.java
|
ae1dbae668753a2765fccdd28a9b7359dc7ecb3f |
26-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
Modifications for simple edit Change-Id: Ic200a4f1e843deb119d68f627d5b8adb201f0f7f
rc/com/android/gallery3d/filtershow/cache/CachingPipeline.java
rc/com/android/gallery3d/filtershow/filters/BaseFiltersManager.java
rc/com/android/gallery3d/filtershow/filters/FilterRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FiltersManagerInterface.java
rc/com/android/gallery3d/filtershow/filters/ImageFilter.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterDraw.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterRS.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterSharpen.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterTinyPlanet.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterVignette.java
rc/com/android/gallery3d/filtershow/presets/FilterEnvironment.java
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
rc/com/android/gallery3d/filtershow/presets/PipelineInterface.java
|
db56a16f02e06207e527d9b135fcedddb2643515 |
30-Apr-2013 |
Michael Kolb <kolby@google.com> |
Remove timer indicator Bug: 8754833 Change-Id: I1750ac4ad7300605c3e65015ac9a94d012d26db2
rc/com/android/camera/PhotoUI.java
|
197262c79d6cadad1e1e3461970a7cb9b3d87880 |
30-Apr-2013 |
Michael Kolb <kolby@google.com> |
Remove timer indicator Bug: 8754833 Change-Id: I1750ac4ad7300605c3e65015ac9a94d012d26db2
rc/com/android/camera/PhotoUI.java
|
e334813b759efd5cd25826709a3e1ffc1b64f24e |
30-Apr-2013 |
Michael Kolb <kolby@google.com> |
am 5371a9c2: am ef878669: Fix indicator layout * commit '5371a9c23af5effa1bce940882d022c0b3db3f7f': Fix indicator layout
|
8d69650b70e1b5034eefd67ce1965ca204ebb62b |
30-Apr-2013 |
Michael Kolb <kolby@google.com> |
am ef878669: Fix indicator layout * commit 'ef87866904722e6d381445a98b61a948e004970e': Fix indicator layout
|
bee436f8095e352549f4c1cbe275eb6009cea791 |
30-Apr-2013 |
Michael Kolb <kolby@google.com> |
am ef878669: Fix indicator layout * commit 'ef87866904722e6d381445a98b61a948e004970e': Fix indicator layout
|
b644e34fa8e6a94eec12e12046a4098b8734c70d |
29-Apr-2013 |
Michael Kolb <kolby@google.com> |
Fix indicator layout Bug: 8754592 Use the correct anchor for layout Change-Id: Idc408da48dd3066a8dabdd8f4f2c553b54d0dffd
rc/com/android/camera/ui/CameraControls.java
|
ef87866904722e6d381445a98b61a948e004970e |
29-Apr-2013 |
Michael Kolb <kolby@google.com> |
Fix indicator layout Bug: 8754592 Use the correct anchor for layout Change-Id: Idc408da48dd3066a8dabdd8f4f2c553b54d0dffd
rc/com/android/camera/ui/CameraControls.java
|
2ef853833a2d7fed29b3a46e526fb8479422064e |
29-Apr-2013 |
John Hoford <hoford@google.com> |
small ui changes based on UX/PM feedback bug:8664728 Change-Id: I4e0651c011b9a6c4742d86c898a0821187f43043
es/drawable-hdpi/filtershow_button_redo.png
es/drawable-hdpi/filtershow_button_undo.png
es/drawable-mdpi/filtershow_button_redo.png
es/drawable-mdpi/filtershow_button_undo.png
es/drawable-xhdpi/filtershow_button_redo.png
es/drawable-xhdpi/filtershow_button_undo.png
es/layout/filtershow_control_title_slider.xml
rc/com/android/gallery3d/filtershow/filters/FilterBasicRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterImageBorderRepresentation.java
|
027c2681e8075dda5c83088532ac1f55d20130fd |
29-Apr-2013 |
John Hoford <hoford@google.com> |
small ui changes based on UX/PM feedback bug:8664728 Change-Id: I4e0651c011b9a6c4742d86c898a0821187f43043
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/controller/TitledSlider.java
rc/com/android/gallery3d/filtershow/editors/BasicEditor.java
rc/com/android/gallery3d/filtershow/editors/Editor.java
rc/com/android/gallery3d/filtershow/editors/EditorStraighten.java
rc/com/android/gallery3d/filtershow/editors/ParametricEditor.java
rc/com/android/gallery3d/filtershow/filters/BaseFiltersManager.java
rc/com/android/gallery3d/filtershow/filters/FilterBasicRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterImageBorderRepresentation.java
rc/com/android/gallery3d/filtershow/imageshow/EclipseControl.java
|
33de212ec780eaf2bc8d86908f07da33ea8dd7f2 |
29-Apr-2013 |
John Hoford <hoford@google.com> |
small ui changes based on UX/PM feedback bug:8664728 Change-Id: I4e0651c011b9a6c4742d86c898a0821187f43043
es/drawable-hdpi/filtershow_button_redo.png
es/drawable-hdpi/filtershow_button_undo.png
es/drawable-mdpi/filtershow_button_redo.png
es/drawable-mdpi/filtershow_button_undo.png
es/drawable-xhdpi/filtershow_button_redo.png
es/drawable-xhdpi/filtershow_button_undo.png
es/layout/filtershow_control_title_slider.xml
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/controller/TitledSlider.java
rc/com/android/gallery3d/filtershow/editors/BasicEditor.java
rc/com/android/gallery3d/filtershow/editors/Editor.java
rc/com/android/gallery3d/filtershow/editors/EditorStraighten.java
rc/com/android/gallery3d/filtershow/editors/ParametricEditor.java
rc/com/android/gallery3d/filtershow/filters/BaseFiltersManager.java
rc/com/android/gallery3d/filtershow/filters/FilterBasicRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterImageBorderRepresentation.java
rc/com/android/gallery3d/filtershow/imageshow/EclipseControl.java
|
5e9e82f4d9a70b015e57b729dd00eb6c04047726 |
29-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 61e5715d: am 9e5b0799: Merge "Cleanup crop activity UI." into gb-ub-photos-bryce * commit '61e5715d3645b5af300b475db081798ec481042b': Cleanup crop activity UI.
|
336f2136aa2d6119b55d092af16de894e67f0349 |
29-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 9e5b0799: Merge "Cleanup crop activity UI." into gb-ub-photos-bryce * commit '9e5b079934538f2c90d0ac995330fb006b738cc7': Cleanup crop activity UI.
|
2bf193c70d160aa5b1586ba8430200dcffd3776f |
29-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 9e5b0799: Merge "Cleanup crop activity UI." into gb-ub-photos-bryce * commit '9e5b079934538f2c90d0ac995330fb006b738cc7': Cleanup crop activity UI.
|
1307043784aca5f1014f93898d58e1a7d14608bf |
29-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 9e5b0799: Merge "Cleanup crop activity UI." into gb-ub-photos-bryce * commit '9e5b079934538f2c90d0ac995330fb006b738cc7': Cleanup crop activity UI.
|
31eef2d6d3e4c72bf168b931c5123ed739401b99 |
29-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Cleanup crop activity UI." into gb-ub-photos-bryce
|
9e5b079934538f2c90d0ac995330fb006b738cc7 |
29-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Cleanup crop activity UI." into gb-ub-photos-bryce
|
7b7b5dd19859ff88519b51936bdb5d001f1853e2 |
29-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Cleanup crop activity UI." into gb-ub-photos-bryce
|
b596658cf36bb5c2fd76764c26c27a5cdfd02ed0 |
29-Apr-2013 |
Angus Kong <shkong@google.com> |
am 98c193c8: am dacb9142: am a042bfaa: Merge "Delegate the texture copy to DrawClient." into gb-ub-photos-bryce * commit '98c193c8df1fee66bf7f91a12a5bd40f99f0d893': Delegate the texture copy to DrawClient.
|
bb29aa496618f11f041458cc68cc1ecfbfa69597 |
29-Apr-2013 |
Bobby Georgescu <georgescu@google.com> |
am d2b8538b: am 7df6a438: am 45377ce9: Merge "Log name of borders and filters of saved images" into gb-ub-photos-bryce * commit 'd2b8538ba45564049a32b9571f76f702c83d1651': Log name of borders and filters of saved images
|
0e1e0502daaa88053b014c242fe02e0396bc1254 |
29-Apr-2013 |
Michael Kolb <kolby@google.com> |
am b6a4a52c: am 68e04f4c: am 8021e39d: Merge "Add new indicators" into gb-ub-photos-bryce * commit 'b6a4a52ca139a82d2231319c1423725cc0fc9369': Add new indicators
|
1796aeff8b9d4575ecc250498529ccf95f733c6b |
29-Apr-2013 |
Bobby Georgescu <georgescu@google.com> |
am 4f852565: am 42a5183f: am 568a8cf9: Dismiss MTP notification on device disconnect * commit '4f8525654b6595569a533724c7427a4cf0566ffb': Dismiss MTP notification on device disconnect
|
f4cfc81f8a27470d0b14b4f756ed5ace4ff7ce64 |
29-Apr-2013 |
Baligh Uddin <baligh@google.com> |
am 7c908a01: am 6d742d71: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev * commit '7c908a01e9f19e47491bb7a8f1983492263b4212': Import translations. DO NOT MERGE
|
397f9ea8839c61cccf3a2795baa90320d4951406 |
29-Apr-2013 |
Baligh Uddin <baligh@google.com> |
am 66a557f3: am 272e9e02: am 4060811a: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce * commit '66a557f302bacad61bbec716e2445546841f18b4': Import translations. DO NOT MERGE
|
5830869c1447a5d38ac079fef89c267b940c21af |
29-Apr-2013 |
Baligh Uddin <baligh@google.com> |
am 7ff805ac: am 577c826a: am 9a21fba3: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce * commit '7ff805ac933c074e148fb107c7aa548cce1e39d5': Import translations. DO NOT MERGE
|
34748df990e9e037637801b2e8412490f158a6dd |
29-Apr-2013 |
Baligh Uddin <baligh@google.com> |
am acc26e20: am 5e0b6b4e: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev * commit 'acc26e20af304668f5bd8b2213ab048a2951ac02': Import translations. DO NOT MERGE
|
bda75a4613affe2c1777d6d06b0a1f035e50dd63 |
29-Apr-2013 |
Bobby Georgescu <georgescu@google.com> |
am 657384bb: am 384971f7: Instrument importer for usage statistics * commit '657384bb34fb2fc7af5480134c1619bb3358f119': Instrument importer for usage statistics
|
938a03fb484e718196556711afb33f960f65412f |
29-Apr-2013 |
Bobby Georgescu <georgescu@google.com> |
am 384971f7: Instrument importer for usage statistics * commit '384971f7ce93c98249825d0498ad4bcbd4104895': Instrument importer for usage statistics
|
5f73062b8e589547c9acba80678a9ebf9cfb0197 |
29-Apr-2013 |
Bobby Georgescu <georgescu@google.com> |
am 384971f7: Instrument importer for usage statistics * commit '384971f7ce93c98249825d0498ad4bcbd4104895': Instrument importer for usage statistics
|
e3729e3ff933c5be606bb78b3abd23657cb581c6 |
29-Apr-2013 |
The Android Automerger <android-build@android.com> |
merge in jb-mr2-release history after reset to jb-mr2-dev
|
00c80bbed8cf59e374c6698c82a5d7fa830e2917 |
28-Apr-2013 |
Bobby Georgescu <georgescu@google.com> |
Instrument importer for usage statistics Bug: 8744068 Change-Id: I416463ba15713d363ac0ce68109532b770fb02b3
rc/com/android/gallery3d/ingest/ImportTask.java
rc/com/android/gallery3d/ingest/IngestActivity.java
rc/com/android/gallery3d/ingest/IngestService.java
rc_pd/com/android/gallery3d/util/UsageStatistics.java
|
384971f7ce93c98249825d0498ad4bcbd4104895 |
28-Apr-2013 |
Bobby Georgescu <georgescu@google.com> |
Instrument importer for usage statistics Bug: 8744068 Change-Id: I416463ba15713d363ac0ce68109532b770fb02b3
rc/com/android/gallery3d/ingest/ImportTask.java
rc/com/android/gallery3d/ingest/IngestActivity.java
rc/com/android/gallery3d/ingest/IngestService.java
rc_pd/com/android/gallery3d/util/UsageStatistics.java
|
3c8df12bdb110e83505afdcf251ee4d54c476e37 |
27-Apr-2013 |
Angus Kong <shkong@google.com> |
am dacb9142: am a042bfaa: Merge "Delegate the texture copy to DrawClient." into gb-ub-photos-bryce * commit 'dacb9142e19c5f38103091d0a486c24eda640451': Delegate the texture copy to DrawClient.
|
8ee62644f72cc6a494517c398ef4847f64af8594 |
27-Apr-2013 |
Angus Kong <shkong@google.com> |
am a042bfaa: Merge "Delegate the texture copy to DrawClient." into gb-ub-photos-bryce * commit 'a042bfaa31e514ea0979936d39cde8696fc0ece0': Delegate the texture copy to DrawClient.
|
37e814e73cc3b6ba9dd061b3fec261475f13ef42 |
27-Apr-2013 |
Angus Kong <shkong@google.com> |
am a042bfaa: Merge "Delegate the texture copy to DrawClient." into gb-ub-photos-bryce * commit 'a042bfaa31e514ea0979936d39cde8696fc0ece0': Delegate the texture copy to DrawClient.
|
beefbf5ad2ef69683f4c2f6c3d354b20c457a11c |
27-Apr-2013 |
Angus Kong <shkong@google.com> |
Merge "Delegate the texture copy to DrawClient." into gb-ub-photos-bryce
|
a042bfaa31e514ea0979936d39cde8696fc0ece0 |
27-Apr-2013 |
Angus Kong <shkong@google.com> |
Merge "Delegate the texture copy to DrawClient." into gb-ub-photos-bryce
|
2c0dc3a134cac1355267c819fcc80ddc0627b265 |
27-Apr-2013 |
Bobby Georgescu <georgescu@google.com> |
am 7df6a438: am 45377ce9: Merge "Log name of borders and filters of saved images" into gb-ub-photos-bryce * commit '7df6a43805b7a86336d26e960a9ec9110ecf1116': Log name of borders and filters of saved images
|
f94531712f277ace7265edfc4413c246216de465 |
27-Apr-2013 |
Bobby Georgescu <georgescu@google.com> |
am 45377ce9: Merge "Log name of borders and filters of saved images" into gb-ub-photos-bryce * commit '45377ce902eb0dce6fb6b1e58925654822e25a19': Log name of borders and filters of saved images
|
4aef1995e486d16a6273baa59f4a53dbf4111a98 |
27-Apr-2013 |
Bobby Georgescu <georgescu@google.com> |
am 45377ce9: Merge "Log name of borders and filters of saved images" into gb-ub-photos-bryce * commit '45377ce902eb0dce6fb6b1e58925654822e25a19': Log name of borders and filters of saved images
|
cd1cb74daf3515419081494a9a45ae955db52eef |
27-Apr-2013 |
Bobby Georgescu <georgescu@google.com> |
am 45377ce9: Merge "Log name of borders and filters of saved images" into gb-ub-photos-bryce * commit '45377ce902eb0dce6fb6b1e58925654822e25a19': Log name of borders and filters of saved images
|
2f49674c621c66ac569319721bcaf3c5d331313e |
27-Apr-2013 |
Bobby Georgescu <georgescu@google.com> |
Merge "Log name of borders and filters of saved images" into gb-ub-photos-bryce
|
ba9862f353476fcb7ab77d5b7e601adca8a6d136 |
27-Apr-2013 |
Bobby Georgescu <georgescu@google.com> |
Merge "Log name of borders and filters of saved images" into gb-ub-photos-bryce
|
45377ce902eb0dce6fb6b1e58925654822e25a19 |
27-Apr-2013 |
Bobby Georgescu <georgescu@google.com> |
Merge "Log name of borders and filters of saved images" into gb-ub-photos-bryce
|
25d7f7ff3c39558cd55b42755b00271e31a48c0b |
27-Apr-2013 |
Michael Kolb <kolby@google.com> |
am 68e04f4c: am 8021e39d: Merge "Add new indicators" into gb-ub-photos-bryce * commit '68e04f4c344f838daaa980f3ff44d304f5de0090': Add new indicators
|
87ea8cf55157fd2a540285a8c94d5128970c62fe |
27-Apr-2013 |
Michael Kolb <kolby@google.com> |
am 8021e39d: Merge "Add new indicators" into gb-ub-photos-bryce * commit '8021e39d649be4603e66d5f82cef607ada87d56b': Add new indicators
|
a15131d94864644ec9c65ce5e2521a936f75bc4a |
27-Apr-2013 |
Michael Kolb <kolby@google.com> |
am 8021e39d: Merge "Add new indicators" into gb-ub-photos-bryce * commit '8021e39d649be4603e66d5f82cef607ada87d56b': Add new indicators
|
ebfd7ea8a0e6c38b08a104ce12a1b2767ff31217 |
27-Apr-2013 |
Michael Kolb <kolby@google.com> |
am 8021e39d: Merge "Add new indicators" into gb-ub-photos-bryce * commit '8021e39d649be4603e66d5f82cef607ada87d56b': Add new indicators
|
5cdaaf84486306bea697a4e3487cda3c8e4815cb |
27-Apr-2013 |
Michael Kolb <kolby@google.com> |
Merge "Add new indicators" into gb-ub-photos-bryce
|
1efdb8f8cbb5e23209b933efa6e71876dabb8220 |
27-Apr-2013 |
Michael Kolb <kolby@google.com> |
Merge "Add new indicators" into gb-ub-photos-bryce
|
8021e39d649be4603e66d5f82cef607ada87d56b |
27-Apr-2013 |
Michael Kolb <kolby@google.com> |
Merge "Add new indicators" into gb-ub-photos-bryce
|
81dc4d290692f050dd40066e0d2f329ecfb0e460 |
26-Apr-2013 |
Michael Kolb <kolby@google.com> |
Add new indicators Bug: 8640131 Change-Id: I9e567ddafa130e84af4d56a69ba7e389e64e3456
es/drawable-hdpi/ic_exposure_0.png
es/drawable-hdpi/ic_exposure_holo_light.png
es/drawable-hdpi/ic_exposure_n1.png
es/drawable-hdpi/ic_exposure_n2.png
es/drawable-hdpi/ic_exposure_n3.png
es/drawable-hdpi/ic_exposure_p1.png
es/drawable-hdpi/ic_exposure_p2.png
es/drawable-hdpi/ic_exposure_p3.png
es/drawable-hdpi/ic_flash_auto_holo_light.png
es/drawable-hdpi/ic_flash_off_holo_light.png
es/drawable-hdpi/ic_flash_on_holo_light.png
es/drawable-hdpi/ic_flash_torch.png
es/drawable-hdpi/ic_hdr.png
es/drawable-hdpi/ic_hdr_off.png
es/drawable-hdpi/ic_indicator_ev_0.png
es/drawable-hdpi/ic_indicator_ev_n1.png
es/drawable-hdpi/ic_indicator_ev_n2.png
es/drawable-hdpi/ic_indicator_ev_n3.png
es/drawable-hdpi/ic_indicator_ev_p1.png
es/drawable-hdpi/ic_indicator_ev_p2.png
es/drawable-hdpi/ic_indicator_ev_p3.png
es/drawable-hdpi/ic_indicator_flash_auto.png
es/drawable-hdpi/ic_indicator_flash_off.png
es/drawable-hdpi/ic_indicator_flash_on.png
es/drawable-hdpi/ic_indicator_loc_off.png
es/drawable-hdpi/ic_indicator_loc_on.png
es/drawable-hdpi/ic_indicator_sce_hdr.png
es/drawable-hdpi/ic_indicator_sce_off.png
es/drawable-hdpi/ic_indicator_sce_on.png
es/drawable-hdpi/ic_indicator_timer_off.png
es/drawable-hdpi/ic_indicator_timer_on.png
es/drawable-hdpi/ic_indicator_wb_cloudy.png
es/drawable-hdpi/ic_indicator_wb_daylight.png
es/drawable-hdpi/ic_indicator_wb_fluorescent.png
es/drawable-hdpi/ic_indicator_wb_off.png
es/drawable-hdpi/ic_indicator_wb_tungsten.png
es/drawable-hdpi/ic_location.png
es/drawable-hdpi/ic_location_off.png
es/drawable-hdpi/ic_sce.png
es/drawable-hdpi/ic_sce_action.png
es/drawable-hdpi/ic_sce_night.png
es/drawable-hdpi/ic_sce_off.png
es/drawable-hdpi/ic_sce_party.png
es/drawable-hdpi/ic_sce_sunset.png
es/drawable-hdpi/ic_settings_holo_light.png
es/drawable-hdpi/ic_switch_back.png
es/drawable-hdpi/ic_switch_front.png
es/drawable-hdpi/ic_timer_10s.png
es/drawable-hdpi/ic_timer_15s.png
es/drawable-hdpi/ic_timer_1s.png
es/drawable-hdpi/ic_timer_3s.png
es/drawable-hdpi/ic_timer_off.png
es/drawable-hdpi/ic_wb_auto.png
es/drawable-hdpi/ic_wb_cloudy.png
es/drawable-hdpi/ic_wb_fluorescent.png
es/drawable-hdpi/ic_wb_incandescent.png
es/drawable-hdpi/ic_wb_sunlight.png
es/drawable-mdpi/ic_exposure_0.png
es/drawable-mdpi/ic_exposure_holo_light.png
es/drawable-mdpi/ic_exposure_n1.png
es/drawable-mdpi/ic_exposure_n2.png
es/drawable-mdpi/ic_exposure_n3.png
es/drawable-mdpi/ic_exposure_p1.png
es/drawable-mdpi/ic_exposure_p2.png
es/drawable-mdpi/ic_exposure_p3.png
es/drawable-mdpi/ic_flash_auto_holo_light.png
es/drawable-mdpi/ic_flash_off_holo_light.png
es/drawable-mdpi/ic_flash_on_holo_light.png
es/drawable-mdpi/ic_flash_torch.png
es/drawable-mdpi/ic_hdr.png
es/drawable-mdpi/ic_hdr_off.png
es/drawable-mdpi/ic_indicator_ev_0.png
es/drawable-mdpi/ic_indicator_ev_n1.png
es/drawable-mdpi/ic_indicator_ev_n2.png
es/drawable-mdpi/ic_indicator_ev_n3.png
es/drawable-mdpi/ic_indicator_ev_p1.png
es/drawable-mdpi/ic_indicator_ev_p2.png
es/drawable-mdpi/ic_indicator_ev_p3.png
es/drawable-mdpi/ic_indicator_flash_auto.png
es/drawable-mdpi/ic_indicator_flash_off.png
es/drawable-mdpi/ic_indicator_flash_on.png
es/drawable-mdpi/ic_indicator_loc_off.png
es/drawable-mdpi/ic_indicator_loc_on.png
es/drawable-mdpi/ic_indicator_sce_hdr.png
es/drawable-mdpi/ic_indicator_sce_off.png
es/drawable-mdpi/ic_indicator_sce_on.png
es/drawable-mdpi/ic_indicator_timer_off.png
es/drawable-mdpi/ic_indicator_timer_on.png
es/drawable-mdpi/ic_indicator_wb_cloudy.png
es/drawable-mdpi/ic_indicator_wb_daylight.png
es/drawable-mdpi/ic_indicator_wb_fluorescent.png
es/drawable-mdpi/ic_indicator_wb_off.png
es/drawable-mdpi/ic_indicator_wb_tungsten.png
es/drawable-mdpi/ic_location.png
es/drawable-mdpi/ic_location_off.png
es/drawable-mdpi/ic_sce.png
es/drawable-mdpi/ic_sce_action.png
es/drawable-mdpi/ic_sce_night.png
es/drawable-mdpi/ic_sce_off.png
es/drawable-mdpi/ic_sce_party.png
es/drawable-mdpi/ic_sce_sunset.png
es/drawable-mdpi/ic_settings_holo_light.png
es/drawable-mdpi/ic_switch_back.png
es/drawable-mdpi/ic_switch_front.png
es/drawable-mdpi/ic_timer_10s.png
es/drawable-mdpi/ic_timer_15s.png
es/drawable-mdpi/ic_timer_1s.png
es/drawable-mdpi/ic_timer_3s.png
es/drawable-mdpi/ic_timer_off.png
es/drawable-mdpi/ic_wb_auto.png
es/drawable-mdpi/ic_wb_cloudy.png
es/drawable-mdpi/ic_wb_fluorescent.png
es/drawable-mdpi/ic_wb_incandescent.png
es/drawable-mdpi/ic_wb_sunlight.png
es/drawable-xhdpi/ic_exposure_0.png
es/drawable-xhdpi/ic_exposure_holo_light.png
es/drawable-xhdpi/ic_exposure_n1.png
es/drawable-xhdpi/ic_exposure_n2.png
es/drawable-xhdpi/ic_exposure_n3.png
es/drawable-xhdpi/ic_exposure_p1.png
es/drawable-xhdpi/ic_exposure_p2.png
es/drawable-xhdpi/ic_exposure_p3.png
es/drawable-xhdpi/ic_flash_auto_holo_light.png
es/drawable-xhdpi/ic_flash_off_holo_light.png
es/drawable-xhdpi/ic_flash_on_holo_light.png
es/drawable-xhdpi/ic_flash_torch.png
es/drawable-xhdpi/ic_hdr.png
es/drawable-xhdpi/ic_hdr_off.png
es/drawable-xhdpi/ic_indicator_ev_0.png
es/drawable-xhdpi/ic_indicator_ev_n1.png
es/drawable-xhdpi/ic_indicator_ev_n2.png
es/drawable-xhdpi/ic_indicator_ev_n3.png
es/drawable-xhdpi/ic_indicator_ev_p1.png
es/drawable-xhdpi/ic_indicator_ev_p2.png
es/drawable-xhdpi/ic_indicator_ev_p3.png
es/drawable-xhdpi/ic_indicator_flash_auto.png
es/drawable-xhdpi/ic_indicator_flash_off.png
es/drawable-xhdpi/ic_indicator_flash_on.png
es/drawable-xhdpi/ic_indicator_loc_off.png
es/drawable-xhdpi/ic_indicator_loc_on.png
es/drawable-xhdpi/ic_indicator_sce_hdr.png
es/drawable-xhdpi/ic_indicator_sce_off.png
es/drawable-xhdpi/ic_indicator_sce_on.png
es/drawable-xhdpi/ic_indicator_timer_off.png
es/drawable-xhdpi/ic_indicator_timer_on.png
es/drawable-xhdpi/ic_indicator_wb_cloudy.png
es/drawable-xhdpi/ic_indicator_wb_daylight.png
es/drawable-xhdpi/ic_indicator_wb_fluorescent.png
es/drawable-xhdpi/ic_indicator_wb_off.png
es/drawable-xhdpi/ic_indicator_wb_tungsten.png
es/drawable-xhdpi/ic_sce.png
es/drawable-xhdpi/ic_sce_action.png
es/drawable-xhdpi/ic_sce_night.png
es/drawable-xhdpi/ic_sce_off.png
es/drawable-xhdpi/ic_sce_party.png
es/drawable-xhdpi/ic_sce_sunset.png
es/drawable-xhdpi/ic_settings_holo_light.png
es/drawable-xhdpi/ic_switch_back.png
es/drawable-xhdpi/ic_switch_front.png
es/drawable-xhdpi/ic_timer_10s.png
es/drawable-xhdpi/ic_timer_15s.png
es/drawable-xhdpi/ic_timer_1s.png
es/drawable-xhdpi/ic_timer_3s.png
es/drawable-xhdpi/ic_timer_off.png
es/drawable-xhdpi/ic_wb_auto.png
es/drawable-xhdpi/ic_wb_cloudy.png
es/drawable-xhdpi/ic_wb_fluorescent.png
es/drawable-xhdpi/ic_wb_incandescent.png
es/drawable-xhdpi/ic_wb_sunlight.png
es/layout-land/camera_controls.xml
es/layout-port/camera_controls.xml
es/layout/menu_indicators.xml
es/values/arrays.xml
|
eb8adc1754fc668435ee57d1be2235b80fc8c009 |
26-Apr-2013 |
Michael Kolb <kolby@google.com> |
Add new indicators Bug: 8640131 Change-Id: I9e567ddafa130e84af4d56a69ba7e389e64e3456
rc/com/android/camera/ListPreference.java
rc/com/android/camera/OnScreenIndicators.java
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/PhotoUI.java
rc/com/android/camera/VideoUI.java
|
ec0f890e3283acd81cd1e3d2c55c7bf7b2b406d6 |
26-Apr-2013 |
Michael Kolb <kolby@google.com> |
Add new indicators Bug: 8640131 Change-Id: I9e567ddafa130e84af4d56a69ba7e389e64e3456
es/drawable-hdpi/ic_exposure_0.png
es/drawable-hdpi/ic_exposure_holo_light.png
es/drawable-hdpi/ic_exposure_n1.png
es/drawable-hdpi/ic_exposure_n2.png
es/drawable-hdpi/ic_exposure_n3.png
es/drawable-hdpi/ic_exposure_p1.png
es/drawable-hdpi/ic_exposure_p2.png
es/drawable-hdpi/ic_exposure_p3.png
es/drawable-hdpi/ic_flash_auto_holo_light.png
es/drawable-hdpi/ic_flash_off_holo_light.png
es/drawable-hdpi/ic_flash_on_holo_light.png
es/drawable-hdpi/ic_flash_torch.png
es/drawable-hdpi/ic_hdr.png
es/drawable-hdpi/ic_hdr_off.png
es/drawable-hdpi/ic_indicator_ev_0.png
es/drawable-hdpi/ic_indicator_ev_n1.png
es/drawable-hdpi/ic_indicator_ev_n2.png
es/drawable-hdpi/ic_indicator_ev_n3.png
es/drawable-hdpi/ic_indicator_ev_p1.png
es/drawable-hdpi/ic_indicator_ev_p2.png
es/drawable-hdpi/ic_indicator_ev_p3.png
es/drawable-hdpi/ic_indicator_flash_auto.png
es/drawable-hdpi/ic_indicator_flash_off.png
es/drawable-hdpi/ic_indicator_flash_on.png
es/drawable-hdpi/ic_indicator_loc_off.png
es/drawable-hdpi/ic_indicator_loc_on.png
es/drawable-hdpi/ic_indicator_sce_hdr.png
es/drawable-hdpi/ic_indicator_sce_off.png
es/drawable-hdpi/ic_indicator_sce_on.png
es/drawable-hdpi/ic_indicator_timer_off.png
es/drawable-hdpi/ic_indicator_timer_on.png
es/drawable-hdpi/ic_indicator_wb_cloudy.png
es/drawable-hdpi/ic_indicator_wb_daylight.png
es/drawable-hdpi/ic_indicator_wb_fluorescent.png
es/drawable-hdpi/ic_indicator_wb_off.png
es/drawable-hdpi/ic_indicator_wb_tungsten.png
es/drawable-hdpi/ic_location.png
es/drawable-hdpi/ic_location_off.png
es/drawable-hdpi/ic_sce.png
es/drawable-hdpi/ic_sce_action.png
es/drawable-hdpi/ic_sce_night.png
es/drawable-hdpi/ic_sce_off.png
es/drawable-hdpi/ic_sce_party.png
es/drawable-hdpi/ic_sce_sunset.png
es/drawable-hdpi/ic_settings_holo_light.png
es/drawable-hdpi/ic_switch_back.png
es/drawable-hdpi/ic_switch_front.png
es/drawable-hdpi/ic_timer_10s.png
es/drawable-hdpi/ic_timer_15s.png
es/drawable-hdpi/ic_timer_1s.png
es/drawable-hdpi/ic_timer_3s.png
es/drawable-hdpi/ic_timer_off.png
es/drawable-hdpi/ic_wb_auto.png
es/drawable-hdpi/ic_wb_cloudy.png
es/drawable-hdpi/ic_wb_fluorescent.png
es/drawable-hdpi/ic_wb_incandescent.png
es/drawable-hdpi/ic_wb_sunlight.png
es/drawable-mdpi/ic_exposure_0.png
es/drawable-mdpi/ic_exposure_holo_light.png
es/drawable-mdpi/ic_exposure_n1.png
es/drawable-mdpi/ic_exposure_n2.png
es/drawable-mdpi/ic_exposure_n3.png
es/drawable-mdpi/ic_exposure_p1.png
es/drawable-mdpi/ic_exposure_p2.png
es/drawable-mdpi/ic_exposure_p3.png
es/drawable-mdpi/ic_flash_auto_holo_light.png
es/drawable-mdpi/ic_flash_off_holo_light.png
es/drawable-mdpi/ic_flash_on_holo_light.png
es/drawable-mdpi/ic_flash_torch.png
es/drawable-mdpi/ic_hdr.png
es/drawable-mdpi/ic_hdr_off.png
es/drawable-mdpi/ic_indicator_ev_0.png
es/drawable-mdpi/ic_indicator_ev_n1.png
es/drawable-mdpi/ic_indicator_ev_n2.png
es/drawable-mdpi/ic_indicator_ev_n3.png
es/drawable-mdpi/ic_indicator_ev_p1.png
es/drawable-mdpi/ic_indicator_ev_p2.png
es/drawable-mdpi/ic_indicator_ev_p3.png
es/drawable-mdpi/ic_indicator_flash_auto.png
es/drawable-mdpi/ic_indicator_flash_off.png
es/drawable-mdpi/ic_indicator_flash_on.png
es/drawable-mdpi/ic_indicator_loc_off.png
es/drawable-mdpi/ic_indicator_loc_on.png
es/drawable-mdpi/ic_indicator_sce_hdr.png
es/drawable-mdpi/ic_indicator_sce_off.png
es/drawable-mdpi/ic_indicator_sce_on.png
es/drawable-mdpi/ic_indicator_timer_off.png
es/drawable-mdpi/ic_indicator_timer_on.png
es/drawable-mdpi/ic_indicator_wb_cloudy.png
es/drawable-mdpi/ic_indicator_wb_daylight.png
es/drawable-mdpi/ic_indicator_wb_fluorescent.png
es/drawable-mdpi/ic_indicator_wb_off.png
es/drawable-mdpi/ic_indicator_wb_tungsten.png
es/drawable-mdpi/ic_location.png
es/drawable-mdpi/ic_location_off.png
es/drawable-mdpi/ic_sce.png
es/drawable-mdpi/ic_sce_action.png
es/drawable-mdpi/ic_sce_night.png
es/drawable-mdpi/ic_sce_off.png
es/drawable-mdpi/ic_sce_party.png
es/drawable-mdpi/ic_sce_sunset.png
es/drawable-mdpi/ic_settings_holo_light.png
es/drawable-mdpi/ic_switch_back.png
es/drawable-mdpi/ic_switch_front.png
es/drawable-mdpi/ic_timer_10s.png
es/drawable-mdpi/ic_timer_15s.png
es/drawable-mdpi/ic_timer_1s.png
es/drawable-mdpi/ic_timer_3s.png
es/drawable-mdpi/ic_timer_off.png
es/drawable-mdpi/ic_wb_auto.png
es/drawable-mdpi/ic_wb_cloudy.png
es/drawable-mdpi/ic_wb_fluorescent.png
es/drawable-mdpi/ic_wb_incandescent.png
es/drawable-mdpi/ic_wb_sunlight.png
es/drawable-xhdpi/ic_exposure_0.png
es/drawable-xhdpi/ic_exposure_holo_light.png
es/drawable-xhdpi/ic_exposure_n1.png
es/drawable-xhdpi/ic_exposure_n2.png
es/drawable-xhdpi/ic_exposure_n3.png
es/drawable-xhdpi/ic_exposure_p1.png
es/drawable-xhdpi/ic_exposure_p2.png
es/drawable-xhdpi/ic_exposure_p3.png
es/drawable-xhdpi/ic_flash_auto_holo_light.png
es/drawable-xhdpi/ic_flash_off_holo_light.png
es/drawable-xhdpi/ic_flash_on_holo_light.png
es/drawable-xhdpi/ic_flash_torch.png
es/drawable-xhdpi/ic_hdr.png
es/drawable-xhdpi/ic_hdr_off.png
es/drawable-xhdpi/ic_indicator_ev_0.png
es/drawable-xhdpi/ic_indicator_ev_n1.png
es/drawable-xhdpi/ic_indicator_ev_n2.png
es/drawable-xhdpi/ic_indicator_ev_n3.png
es/drawable-xhdpi/ic_indicator_ev_p1.png
es/drawable-xhdpi/ic_indicator_ev_p2.png
es/drawable-xhdpi/ic_indicator_ev_p3.png
es/drawable-xhdpi/ic_indicator_flash_auto.png
es/drawable-xhdpi/ic_indicator_flash_off.png
es/drawable-xhdpi/ic_indicator_flash_on.png
es/drawable-xhdpi/ic_indicator_loc_off.png
es/drawable-xhdpi/ic_indicator_loc_on.png
es/drawable-xhdpi/ic_indicator_sce_hdr.png
es/drawable-xhdpi/ic_indicator_sce_off.png
es/drawable-xhdpi/ic_indicator_sce_on.png
es/drawable-xhdpi/ic_indicator_timer_off.png
es/drawable-xhdpi/ic_indicator_timer_on.png
es/drawable-xhdpi/ic_indicator_wb_cloudy.png
es/drawable-xhdpi/ic_indicator_wb_daylight.png
es/drawable-xhdpi/ic_indicator_wb_fluorescent.png
es/drawable-xhdpi/ic_indicator_wb_off.png
es/drawable-xhdpi/ic_indicator_wb_tungsten.png
es/drawable-xhdpi/ic_sce.png
es/drawable-xhdpi/ic_sce_action.png
es/drawable-xhdpi/ic_sce_night.png
es/drawable-xhdpi/ic_sce_off.png
es/drawable-xhdpi/ic_sce_party.png
es/drawable-xhdpi/ic_sce_sunset.png
es/drawable-xhdpi/ic_settings_holo_light.png
es/drawable-xhdpi/ic_switch_back.png
es/drawable-xhdpi/ic_switch_front.png
es/drawable-xhdpi/ic_timer_10s.png
es/drawable-xhdpi/ic_timer_15s.png
es/drawable-xhdpi/ic_timer_1s.png
es/drawable-xhdpi/ic_timer_3s.png
es/drawable-xhdpi/ic_timer_off.png
es/drawable-xhdpi/ic_wb_auto.png
es/drawable-xhdpi/ic_wb_cloudy.png
es/drawable-xhdpi/ic_wb_fluorescent.png
es/drawable-xhdpi/ic_wb_incandescent.png
es/drawable-xhdpi/ic_wb_sunlight.png
es/layout-land/camera_controls.xml
es/layout-port/camera_controls.xml
es/layout/menu_indicators.xml
es/values/arrays.xml
rc/com/android/camera/ListPreference.java
rc/com/android/camera/OnScreenIndicators.java
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/PhotoUI.java
rc/com/android/camera/VideoUI.java
|
69db2ab0e79b6bb2081ac8a09026fdb4020c39d3 |
27-Apr-2013 |
Bobby Georgescu <georgescu@google.com> |
am 42a5183f: am 568a8cf9: Dismiss MTP notification on device disconnect * commit '42a5183f2308b8c2cf9b58b921879aefaca7d6a9': Dismiss MTP notification on device disconnect
|
23b30f6efa13b233d8bf5c398ba12d11beb513c5 |
27-Apr-2013 |
Bobby Georgescu <georgescu@google.com> |
am 568a8cf9: Dismiss MTP notification on device disconnect * commit '568a8cf9ec253a635a36866efc0e3acebbba2a2e': Dismiss MTP notification on device disconnect
|
c64c13708cb3336a5982c35e1295af44fb2dd44b |
27-Apr-2013 |
Bobby Georgescu <georgescu@google.com> |
am 568a8cf9: Dismiss MTP notification on device disconnect * commit '568a8cf9ec253a635a36866efc0e3acebbba2a2e': Dismiss MTP notification on device disconnect
|
fb5aa16743f6c66b39cb5550d93ddf13d399c7ee |
27-Apr-2013 |
Bobby Georgescu <georgescu@google.com> |
Log name of borders and filters of saved images Bug: 8712946 Change-Id: Id7b32ceb00b131299c6d8630bca181141dc204fd
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
|
5201d6da9f5c6d08a80cab1dab4bf7f1913455c4 |
27-Apr-2013 |
Bobby Georgescu <georgescu@google.com> |
Log name of borders and filters of saved images Bug: 8712946 Change-Id: Id7b32ceb00b131299c6d8630bca181141dc204fd
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
|
1401b2fec43ebc349a3102153bb1b3597f358838 |
27-Apr-2013 |
Bobby Georgescu <georgescu@google.com> |
Log name of borders and filters of saved images Bug: 8712946 Change-Id: Id7b32ceb00b131299c6d8630bca181141dc204fd
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
|
11dc9b8fdb77c5e569a284ea2dedf59ba1b889ac |
27-Apr-2013 |
Bobby Georgescu <georgescu@google.com> |
Dismiss MTP notification on device disconnect Bug: 8158516 Change-Id: I7d7fd78b5fb9dc199e9ecdd78440e0f8147fe58d
rc/com/android/gallery3d/ingest/IngestService.java
|
568a8cf9ec253a635a36866efc0e3acebbba2a2e |
27-Apr-2013 |
Bobby Georgescu <georgescu@google.com> |
Dismiss MTP notification on device disconnect Bug: 8158516 Change-Id: I7d7fd78b5fb9dc199e9ecdd78440e0f8147fe58d
rc/com/android/gallery3d/ingest/IngestService.java
|
ddbf404ceb07a788fd98c5974cff9bc9753dec28 |
27-Apr-2013 |
Baligh Uddin <baligh@google.com> |
am 6d742d71: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev * commit '6d742d71065cadcfb34a5d98cf684992a5ae4fc9': Import translations. DO NOT MERGE
|
a6652ac2157418b55e011082688afc858486c8aa |
27-Apr-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE"
|
2f6fb197409564411b4d611f66b6f09fa7f670ae |
27-Apr-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
|
575c439b205287a7606b46095c47636987be2d4e |
27-Apr-2013 |
Baligh Uddin <baligh@google.com> |
am 272e9e02: am 4060811a: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce * commit '272e9e023f0e1492b8a3cc66b6de493f859fccd1': Import translations. DO NOT MERGE
|
8f4ca941f3b79fa1836037405191049a95cba40c |
26-Apr-2013 |
Angus Kong <shkong@google.com> |
Delegate the texture copy to DrawClient. bug:8109314 Change-Id: Ib70b9d4fa4edbf094bc0d4644b3994a5e8303013
rc/com/android/camera/CameraScreenNail.java
|
7824f923763158596b6f184ccb2188e5aeb9e437 |
26-Apr-2013 |
Angus Kong <shkong@google.com> |
Delegate the texture copy to DrawClient. bug:8109314 Change-Id: Ib70b9d4fa4edbf094bc0d4644b3994a5e8303013
rc/com/android/camera/CameraScreenNail.java
|
9f71b35548494d4b989e3ea95e2663fb1332c0ff |
27-Apr-2013 |
Baligh Uddin <baligh@google.com> |
am 577c826a: am 9a21fba3: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce * commit '577c826a5bd88e64784f0290a49a0ae67f662bbc': Import translations. DO NOT MERGE
|
c5044daa3e9f6635402fe5fd8e12517f9e79461a |
27-Apr-2013 |
Baligh Uddin <baligh@google.com> |
am 4060811a: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce * commit '4060811aa01c7fc4ed98aa3f1c98b8948fd0a395': Import translations. DO NOT MERGE
|
aa65998a5de7106d16213c78f57e0039669034cf |
26-Apr-2013 |
Baligh Uddin <baligh@google.com> |
am 4060811a: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce * commit '4060811aa01c7fc4ed98aa3f1c98b8948fd0a395': Import translations. DO NOT MERGE
|
c9efed19d3d7546f6450ea7a31551afaf7b04bc8 |
26-Apr-2013 |
Baligh Uddin <baligh@google.com> |
am 9a21fba3: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce * commit '9a21fba30a55c75ac6ad76f3f180e16436e5e31d': Import translations. DO NOT MERGE
|
2b9e67667ce592c70f2b340204084bd1d078f8c7 |
26-Apr-2013 |
Baligh Uddin <baligh@google.com> |
am 5e0b6b4e: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev * commit '5e0b6b4ef38f180e9a8b194321ee2c9ae2acd6f7': Import translations. DO NOT MERGE
|
ff2d6a270bc2b644f44a269df771fe6092a4f4c7 |
26-Apr-2013 |
Baligh Uddin <baligh@google.com> |
am 9a21fba3: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce * commit '9a21fba30a55c75ac6ad76f3f180e16436e5e31d': Import translations. DO NOT MERGE
|
e8a7716835d6e1f996b18295c9435f83f2c0c7f3 |
26-Apr-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
|
4060811aa01c7fc4ed98aa3f1c98b8948fd0a395 |
26-Apr-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
|
6d64fbc8f95f35d3ac9ad1c74e1393ce6204c328 |
26-Apr-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE"
|
add0904bd10e08d48d86e1240837f2b618b358d5 |
26-Apr-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
|
9a21fba30a55c75ac6ad76f3f180e16436e5e31d |
26-Apr-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
|
c2ef57308eec9d930e9a241ef36c2618dd6aeb01 |
26-Apr-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
|
c479e47518b5ec96985390c12bdaa3da00992884 |
26-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Cleanup crop activity UI. Bug: 8734193 Bug: 8723843 Change-Id: I09f0e8fcb0d919c573ad9a6f7b9f060f667d1d0d
rc/com/android/gallery3d/filtershow/crop/CropActivity.java
rc/com/android/gallery3d/filtershow/crop/CropDrawingUtils.java
rc/com/android/gallery3d/filtershow/crop/CropMath.java
rc/com/android/gallery3d/filtershow/crop/CropView.java
|
c166f5c4c34478f1c192fbbfc4c7e1f993bd2ad1 |
26-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Cleanup crop activity UI. Bug: 8734193 Bug: 8723843 Change-Id: I09f0e8fcb0d919c573ad9a6f7b9f060f667d1d0d
es/values/crop_colors.xml
es/values/crop_dimens.xml
rc/com/android/gallery3d/filtershow/crop/CropActivity.java
rc/com/android/gallery3d/filtershow/crop/CropDrawingUtils.java
rc/com/android/gallery3d/filtershow/crop/CropMath.java
rc/com/android/gallery3d/filtershow/crop/CropView.java
|
e0bed663dd382ec0a359d7eb39c0820d92cd4170 |
26-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Cleanup crop activity UI. Bug: 8734193 Bug: 8723843 Change-Id: I09f0e8fcb0d919c573ad9a6f7b9f060f667d1d0d
es/values/crop_colors.xml
es/values/crop_dimens.xml
|
b37a56364016130ddd5016d9e5b6aa70bfd8944e |
26-Apr-2013 |
Bobby Georgescu <georgescu@google.com> |
am 340658be: am 16d5904e: am ec6d1d85: Merge "Show notification to relaunch MTP importer" into gb-ub-photos-bryce * commit '340658be53cea352fa94d544ec891ec15d83e24c': Show notification to relaunch MTP importer
|
1b39e84e6ad1c5c98b0fae63555d7fa1cf0f4a90 |
26-Apr-2013 |
Bobby Georgescu <georgescu@google.com> |
am 16d5904e: am ec6d1d85: Merge "Show notification to relaunch MTP importer" into gb-ub-photos-bryce * commit '16d5904ed1774f95429aceca14adb293e1d51e2b': Show notification to relaunch MTP importer
|
b036011cd76d488a83c113d85d521a437522ea6d |
26-Apr-2013 |
Bobby Georgescu <georgescu@google.com> |
am ec6d1d85: Merge "Show notification to relaunch MTP importer" into gb-ub-photos-bryce * commit 'ec6d1d852e7970da5c64dd9e37f58f741b713fa2': Show notification to relaunch MTP importer
|
28ab674adc018f88ea8666b87674dec248822169 |
26-Apr-2013 |
Bobby Georgescu <georgescu@google.com> |
am ec6d1d85: Merge "Show notification to relaunch MTP importer" into gb-ub-photos-bryce * commit 'ec6d1d852e7970da5c64dd9e37f58f741b713fa2': Show notification to relaunch MTP importer
|
729fdb6c279e458849f0ae62c2467cc516ed0e02 |
26-Apr-2013 |
Bobby Georgescu <georgescu@google.com> |
Merge "Show notification to relaunch MTP importer" into gb-ub-photos-bryce
|
ec6d1d852e7970da5c64dd9e37f58f741b713fa2 |
26-Apr-2013 |
Bobby Georgescu <georgescu@google.com> |
Merge "Show notification to relaunch MTP importer" into gb-ub-photos-bryce
|
8ea527b77a835ba3632c659669bd08013a1384a1 |
26-Apr-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I39dd9e202d0966c533d52ce07e76bcac61d37ab9 Auto-generated-cl: translation import
es/values-af/filtershow_strings.xml
es/values-am/filtershow_strings.xml
es/values-ar/filtershow_strings.xml
es/values-be/filtershow_strings.xml
es/values-bg/filtershow_strings.xml
es/values-ca/filtershow_strings.xml
es/values-cs/filtershow_strings.xml
es/values-da/filtershow_strings.xml
es/values-de/filtershow_strings.xml
es/values-el/filtershow_strings.xml
es/values-es-rUS/filtershow_strings.xml
es/values-es/filtershow_strings.xml
es/values-et/filtershow_strings.xml
es/values-fi/filtershow_strings.xml
es/values-fr/filtershow_strings.xml
es/values-hi/filtershow_strings.xml
es/values-hr/filtershow_strings.xml
es/values-hu/filtershow_strings.xml
es/values-in/filtershow_strings.xml
es/values-it/filtershow_strings.xml
es/values-iw/filtershow_strings.xml
es/values-ja/filtershow_strings.xml
es/values-ko/filtershow_strings.xml
es/values-lt/filtershow_strings.xml
es/values-lv/filtershow_strings.xml
es/values-ms/filtershow_strings.xml
es/values-nb/filtershow_strings.xml
es/values-nl/filtershow_strings.xml
es/values-pl/filtershow_strings.xml
es/values-pt-rPT/filtershow_strings.xml
es/values-pt/filtershow_strings.xml
es/values-ro/filtershow_strings.xml
es/values-ru/filtershow_strings.xml
es/values-sk/filtershow_strings.xml
es/values-sl/filtershow_strings.xml
es/values-sr/filtershow_strings.xml
es/values-sv/filtershow_strings.xml
es/values-sw/filtershow_strings.xml
es/values-th/filtershow_strings.xml
es/values-tl/filtershow_strings.xml
es/values-tr/filtershow_strings.xml
es/values-uk/filtershow_strings.xml
es/values-vi/filtershow_strings.xml
es/values-zh-rCN/filtershow_strings.xml
es/values-zh-rTW/filtershow_strings.xml
es/values-zu/filtershow_strings.xml
|
dd0957fd8c33b3cc07deb9aef084731e27278950 |
26-Apr-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ia0d5a6134f5ffa3ec94c1b2d0ecb0f8f8538848b Auto-generated-cl: translation import
es/values-af/filtershow_strings.xml
es/values-am/filtershow_strings.xml
es/values-ar/filtershow_strings.xml
es/values-be/filtershow_strings.xml
es/values-bg/filtershow_strings.xml
es/values-ca/filtershow_strings.xml
es/values-cs/filtershow_strings.xml
es/values-da/filtershow_strings.xml
es/values-de/filtershow_strings.xml
es/values-el/filtershow_strings.xml
es/values-es-rUS/filtershow_strings.xml
es/values-es/filtershow_strings.xml
es/values-et/filtershow_strings.xml
es/values-fi/filtershow_strings.xml
es/values-fr/filtershow_strings.xml
es/values-hi/filtershow_strings.xml
es/values-hr/filtershow_strings.xml
es/values-hu/filtershow_strings.xml
es/values-in/filtershow_strings.xml
es/values-it/filtershow_strings.xml
es/values-iw/filtershow_strings.xml
es/values-ja/filtershow_strings.xml
es/values-ko/filtershow_strings.xml
es/values-lt/filtershow_strings.xml
es/values-lv/filtershow_strings.xml
es/values-ms/filtershow_strings.xml
es/values-nb/filtershow_strings.xml
es/values-nl/filtershow_strings.xml
es/values-pl/filtershow_strings.xml
es/values-pt-rPT/filtershow_strings.xml
es/values-pt/filtershow_strings.xml
es/values-ro/filtershow_strings.xml
es/values-ru/filtershow_strings.xml
es/values-sk/filtershow_strings.xml
es/values-sl/filtershow_strings.xml
es/values-sr/filtershow_strings.xml
es/values-sv/filtershow_strings.xml
es/values-sw/filtershow_strings.xml
es/values-th/filtershow_strings.xml
es/values-tl/filtershow_strings.xml
es/values-tr/filtershow_strings.xml
es/values-uk/filtershow_strings.xml
es/values-vi/filtershow_strings.xml
es/values-zh-rCN/filtershow_strings.xml
es/values-zh-rTW/filtershow_strings.xml
es/values-zu/filtershow_strings.xml
|
c05810c9e5f2f7609194c24e2153ed19d3315ab6 |
26-Apr-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I638990d511e9c7186d7a6096a9d7308cccbaf9b3 Auto-generated-cl: translation import
es/values-bg/filtershow_strings.xml
es/values-cs/filtershow_strings.xml
es/values-da/filtershow_strings.xml
es/values-de/filtershow_strings.xml
es/values-es-rUS/filtershow_strings.xml
es/values-es/filtershow_strings.xml
es/values-et/filtershow_strings.xml
es/values-fi/filtershow_strings.xml
es/values-fr/filtershow_strings.xml
es/values-hi/filtershow_strings.xml
es/values-hr/filtershow_strings.xml
es/values-hu/filtershow_strings.xml
es/values-in/filtershow_strings.xml
es/values-it/filtershow_strings.xml
es/values-ja/filtershow_strings.xml
es/values-lt/filtershow_strings.xml
es/values-lv/filtershow_strings.xml
es/values-nb/filtershow_strings.xml
es/values-nl/filtershow_strings.xml
es/values-pl/filtershow_strings.xml
es/values-pt-rPT/filtershow_strings.xml
es/values-pt/filtershow_strings.xml
es/values-rm/filtershow_strings.xml
es/values-ro/filtershow_strings.xml
es/values-ru/filtershow_strings.xml
es/values-sk/filtershow_strings.xml
es/values-sl/filtershow_strings.xml
es/values-sr/filtershow_strings.xml
es/values-sv/filtershow_strings.xml
es/values-sw/filtershow_strings.xml
es/values-tr/filtershow_strings.xml
es/values-uk/filtershow_strings.xml
es/values-vi/filtershow_strings.xml
es/values-zh-rCN/filtershow_strings.xml
es/values-zh-rTW/filtershow_strings.xml
|
11ba60bc086e4f50abb930d4e2841ce8d2f2f903 |
26-Apr-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I638990d511e9c7186d7a6096a9d7308cccbaf9b3 Auto-generated-cl: translation import
es/values-bg/filtershow_strings.xml
es/values-cs/filtershow_strings.xml
es/values-da/filtershow_strings.xml
es/values-de/filtershow_strings.xml
es/values-es-rUS/filtershow_strings.xml
es/values-es/filtershow_strings.xml
es/values-et/filtershow_strings.xml
es/values-fi/filtershow_strings.xml
es/values-fr/filtershow_strings.xml
es/values-hi/filtershow_strings.xml
es/values-hr/filtershow_strings.xml
es/values-hu/filtershow_strings.xml
es/values-in/filtershow_strings.xml
es/values-it/filtershow_strings.xml
es/values-ja/filtershow_strings.xml
es/values-lt/filtershow_strings.xml
es/values-lv/filtershow_strings.xml
es/values-nb/filtershow_strings.xml
es/values-nl/filtershow_strings.xml
es/values-pl/filtershow_strings.xml
es/values-pt-rPT/filtershow_strings.xml
es/values-pt/filtershow_strings.xml
es/values-rm/filtershow_strings.xml
es/values-ro/filtershow_strings.xml
es/values-ru/filtershow_strings.xml
es/values-sk/filtershow_strings.xml
es/values-sl/filtershow_strings.xml
es/values-sr/filtershow_strings.xml
es/values-sv/filtershow_strings.xml
es/values-sw/filtershow_strings.xml
es/values-tr/filtershow_strings.xml
es/values-uk/filtershow_strings.xml
es/values-vi/filtershow_strings.xml
es/values-zh-rCN/filtershow_strings.xml
es/values-zh-rTW/filtershow_strings.xml
|
c7fccec63cecc6f5d5045dad043bb4b137c79cf6 |
26-Apr-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Icd16f6477f1b6c4c5b0a999bce9e463bce886c31 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
79a39467ad65c06111f4ef56a1ae2f899cf5fdf7 |
26-Apr-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Icab0edbeef13f98fca4ae41e20f0fa5030c23bc7 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
d378ea76b022d705ed9b7db1202529900e019ca7 |
26-Apr-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I5d5299a773df9f8bf62e3057f626d414569989fb Auto-generated-cl: translation import
es/values-bg/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-ja/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
5fa237b04196d8ab9b9667cf9caf9fecafa46b9c |
26-Apr-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I5d5299a773df9f8bf62e3057f626d414569989fb Auto-generated-cl: translation import
es/values-bg/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-ja/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
96d2277b478ff77000ea21ba7c53c87c2b65cf2b |
26-Apr-2013 |
Michael Kolb <kolby@google.com> |
am 8677d977: am 539b6435: am d04ba19a: Merge "Center Video menu" into gb-ub-photos-bryce * commit '8677d9777be874a96052a3fdf1844df94974ad2d': Center Video menu
|
660e80d0be54eb8de75315c6602fb7cd1df73c34 |
26-Apr-2013 |
Michael Kolb <kolby@google.com> |
am fe73ebcf: am ab371536: am 132eb666: Merge "Don\'t render label on focus ring" into gb-ub-photos-bryce * commit 'fe73ebcfd1f9fce50df568c86175475d702bb75d': Don't render label on focus ring
|
e67c8ed9ce1eb24a6e80b360cfd08a9cfd6bcf86 |
26-Apr-2013 |
Michael Kolb <kolby@google.com> |
am 539b6435: am d04ba19a: Merge "Center Video menu" into gb-ub-photos-bryce * commit '539b6435ab202d2109af915fa92b5ec928f64c97': Center Video menu
|
a030cf0eaa4a7ac71ff45402bc9c5cca5182f8e0 |
26-Apr-2013 |
Michael Kolb <kolby@google.com> |
am ab371536: am 132eb666: Merge "Don\'t render label on focus ring" into gb-ub-photos-bryce * commit 'ab3715367a5aee93a7f570a46e82ac66f1f4ada4': Don't render label on focus ring
|
069e2de2e373177710283ecfa16a418db5b944f6 |
26-Apr-2013 |
Michael Kolb <kolby@google.com> |
am d04ba19a: Merge "Center Video menu" into gb-ub-photos-bryce * commit 'd04ba19a49bc26e34c7b5c7832c46058100e986d': Center Video menu
|
e34714b9c087ce0f5ff3a2fbfe878ab0b36f019d |
26-Apr-2013 |
Michael Kolb <kolby@google.com> |
am 132eb666: Merge "Don\'t render label on focus ring" into gb-ub-photos-bryce * commit '132eb666756115e578dada36624b977ac4d10e38': Don't render label on focus ring
|
e550dce9b12b5608e87b294fbf1ea7803f73a46d |
26-Apr-2013 |
Michael Kolb <kolby@google.com> |
am d04ba19a: Merge "Center Video menu" into gb-ub-photos-bryce * commit 'd04ba19a49bc26e34c7b5c7832c46058100e986d': Center Video menu
|
22c308a444a4b746090cbc670169d41947691dfb |
26-Apr-2013 |
Michael Kolb <kolby@google.com> |
am 132eb666: Merge "Don\'t render label on focus ring" into gb-ub-photos-bryce * commit '132eb666756115e578dada36624b977ac4d10e38': Don't render label on focus ring
|
abd5efe72de6b571aada1b69633a4d02aced5616 |
26-Apr-2013 |
Michael Kolb <kolby@google.com> |
Merge "Center Video menu" into gb-ub-photos-bryce
|
d04ba19a49bc26e34c7b5c7832c46058100e986d |
26-Apr-2013 |
Michael Kolb <kolby@google.com> |
Merge "Center Video menu" into gb-ub-photos-bryce
|
132eb666756115e578dada36624b977ac4d10e38 |
26-Apr-2013 |
Michael Kolb <kolby@google.com> |
Merge "Don't render label on focus ring" into gb-ub-photos-bryce
|
ba57946072e4f9f4c78259ae288c6d0667180e56 |
26-Apr-2013 |
Michael Kolb <kolby@google.com> |
Merge "Don't render label on focus ring" into gb-ub-photos-bryce
|
6d431ff08b315081193a6473302ed3060a08adc2 |
26-Apr-2013 |
Doris Liu <tianliu@google.com> |
am 5ed7c697: (-s ours) Merge "Remove new camera activity code from Bryce" into gb-ub-photos-bryce * commit '5ed7c697ded34de36f81c0fc4b61d6b46d76124a': Remove new camera activity code from Bryce
ndroidManifest.xml
|
bcf681409c00a632b7a0a3015153dfbfa98514dd |
26-Apr-2013 |
Doris Liu <tianliu@google.com> |
am 5ed7c697: (-s ours) Merge "Remove new camera activity code from Bryce" into gb-ub-photos-bryce * commit '5ed7c697ded34de36f81c0fc4b61d6b46d76124a': Remove new camera activity code from Bryce
|
c08270573d539a0eedd5a7562696343bdf4e2aba |
26-Apr-2013 |
Doris Liu <tianliu@google.com> |
am 5ed7c697: (-s ours) Merge "Remove new camera activity code from Bryce" into gb-ub-photos-bryce * commit '5ed7c697ded34de36f81c0fc4b61d6b46d76124a': Remove new camera activity code from Bryce
|
e8ca12cdb0aa3cc67e00e582a82a49aa32f223b3 |
26-Apr-2013 |
Doris Liu <tianliu@google.com> |
am 9ef3ce3b: am 327497ef: am 5ed7c697: Merge "Remove new camera activity code from Bryce" into gb-ub-photos-bryce * commit '9ef3ce3bb708e404f063591254c7fedb218fc47d': Remove new camera activity code from Bryce
|
313c7372a28b1e78d69ac198896fe6796239cbbc |
26-Apr-2013 |
Doris Liu <tianliu@google.com> |
am 327497ef: am 5ed7c697: Merge "Remove new camera activity code from Bryce" into gb-ub-photos-bryce * commit '327497ef7e59436733314fb46068e3212bddd0ea': Remove new camera activity code from Bryce
|
27f5c9cde79b2503e21370616d3b5724d03a5052 |
26-Apr-2013 |
Doris Liu <tianliu@google.com> |
am 5ed7c697: Merge "Remove new camera activity code from Bryce" into gb-ub-photos-bryce * commit '5ed7c697ded34de36f81c0fc4b61d6b46d76124a': Remove new camera activity code from Bryce
|
877482335f89da699d0c986e585e489dc7f2d7d9 |
26-Apr-2013 |
Doris Liu <tianliu@google.com> |
Merge "Remove new camera activity code from Bryce" into gb-ub-photos-bryce
|
5ed7c697ded34de36f81c0fc4b61d6b46d76124a |
26-Apr-2013 |
Doris Liu <tianliu@google.com> |
Merge "Remove new camera activity code from Bryce" into gb-ub-photos-bryce
|
bc33156713500e4de7224c1945b57bbc003e81e9 |
26-Apr-2013 |
Doris Liu <tianliu@google.com> |
Merge "Remove new camera activity code from Bryce" into gb-ub-photos-bryce
|
f0fe9763a62238593845537d0283042a80b55ad8 |
26-Apr-2013 |
Doris Liu <tianliu@google.com> |
am 41ca863f: am 11858014: am 37177f96: Merge "Make sure the initial rotation is set" into gb-ub-photos-bryce * commit '41ca863f3be46125eefd4d0c32c1ea69dbf04499': Make sure the initial rotation is set
|
1fc110686dc3fed57ada78a697ef263523b5b45f |
26-Apr-2013 |
Doris Liu <tianliu@google.com> |
am 11858014: am 37177f96: Merge "Make sure the initial rotation is set" into gb-ub-photos-bryce * commit '11858014cabbc8ee6d5a007b605da779195ccd29': Make sure the initial rotation is set
|
0d588fe96a654e46d3bb31c6a5de4110fcc3374c |
26-Apr-2013 |
Doris Liu <tianliu@google.com> |
am 37177f96: Merge "Make sure the initial rotation is set" into gb-ub-photos-bryce * commit '37177f96a852fd7aa4b8c06d34fd3fb445541994': Make sure the initial rotation is set
|
9905a7a5e8337fa902a212a3d1ac316a461f986d |
26-Apr-2013 |
Doris Liu <tianliu@google.com> |
am 37177f96: Merge "Make sure the initial rotation is set" into gb-ub-photos-bryce * commit '37177f96a852fd7aa4b8c06d34fd3fb445541994': Make sure the initial rotation is set
|
37177f96a852fd7aa4b8c06d34fd3fb445541994 |
26-Apr-2013 |
Doris Liu <tianliu@google.com> |
Merge "Make sure the initial rotation is set" into gb-ub-photos-bryce
|
2b26ee170c6bc846530bcec2a768891843a0ab9d |
26-Apr-2013 |
Doris Liu <tianliu@google.com> |
Merge "Make sure the initial rotation is set" into gb-ub-photos-bryce
|
c835849b179c481b92a308157d518bb3ad73f069 |
26-Apr-2013 |
Michael Kolb <kolby@google.com> |
Center Video menu Bug: 8660834 Change-Id: I17bec35506fee5d590436811eb7411f4277b7b6c
rc/com/android/camera/VideoMenu.java
|
0d54a937e61a71edc814d924fc6601a72f1632d6 |
26-Apr-2013 |
Michael Kolb <kolby@google.com> |
Center Video menu Bug: 8660834 Change-Id: I17bec35506fee5d590436811eb7411f4277b7b6c
rc/com/android/camera/VideoMenu.java
|
e74be613be0991bc36e3841ba72fe9f787fe9291 |
26-Apr-2013 |
Michael Kolb <kolby@google.com> |
Don't render label on focus ring Bug: 8719036 Change-Id: If783b96aaa8c56fceb98cb52fceb9a8afda0d59a
rc/com/android/camera/ui/PieRenderer.java
|
9e012f853e3eb5c9d36c84351961f588eef4788f |
26-Apr-2013 |
Michael Kolb <kolby@google.com> |
Don't render label on focus ring Bug: 8719036 Change-Id: If783b96aaa8c56fceb98cb52fceb9a8afda0d59a
rc/com/android/camera/ui/PieRenderer.java
|
25e1c0d0a677f0ebc8d44ba1a36ef58db2c5bb00 |
26-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 2ad8267e: am d888ee54: am eda2f0ce: Merge "Fix offset and ASCII type handling in exif." into gb-ub-photos-bryce * commit '2ad8267eff8e158db13e8436e7cec87ec0a9efc9': Fix offset and ASCII type handling in exif.
|
909b2b1ae43dfbdc14087c0d0faa0ca70cb98bbc |
26-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am f4027a68: am c086da3b: am d5060931: Merge "Remove UI param for straighten." into gb-ub-photos-bryce * commit 'f4027a68e7da1cd190445cc4b427befa58933a04': Remove UI param for straighten.
|
d8c85260abfba9e0b1fba6d56204fb86a19145e2 |
26-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am d888ee54: am eda2f0ce: Merge "Fix offset and ASCII type handling in exif." into gb-ub-photos-bryce * commit 'd888ee54051fef8afa13e34a407fe15c28ae4f77': Fix offset and ASCII type handling in exif.
|
8fee745fd41ba0838cdbccdf7cd45e9e696e0170 |
26-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am c086da3b: am d5060931: Merge "Remove UI param for straighten." into gb-ub-photos-bryce * commit 'c086da3badae78092c32abb226c335a0ba9b4701': Remove UI param for straighten.
|
40c7d43982eec43ab76dcff52e041fc142361fa4 |
26-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am eda2f0ce: Merge "Fix offset and ASCII type handling in exif." into gb-ub-photos-bryce * commit 'eda2f0ce805ee078715b17df7a935e967218a7df': Fix offset and ASCII type handling in exif.
|
3a71f7338ce18545229e910930d14b1f3aaf0939 |
26-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am d5060931: Merge "Remove UI param for straighten." into gb-ub-photos-bryce * commit 'd50609310e425df36e340120c794f08691d55808': Remove UI param for straighten.
|
d4915b09c686d3864220e82f6bbb8c381635e862 |
26-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am eda2f0ce: Merge "Fix offset and ASCII type handling in exif." into gb-ub-photos-bryce * commit 'eda2f0ce805ee078715b17df7a935e967218a7df': Fix offset and ASCII type handling in exif.
|
e46c5ce1412d3d88c7351ee37db76e84d3a2fdf7 |
26-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am d5060931: Merge "Remove UI param for straighten." into gb-ub-photos-bryce * commit 'd50609310e425df36e340120c794f08691d55808': Remove UI param for straighten.
|
e40c5c943001b61acdf5eba5390a764bc2cc8b67 |
26-Apr-2013 |
Bobby Georgescu <georgescu@google.com> |
Show notification to relaunch MTP importer Bug: 8158516 Change-Id: I98a57f9ac6e6935595b44e1277ddffa378065068
rc/com/android/gallery3d/ingest/IngestService.java
|
13fec90b6a03e21a88cb8b8425e65289904d4186 |
26-Apr-2013 |
Bobby Georgescu <georgescu@google.com> |
Show notification to relaunch MTP importer Bug: 8158516 Change-Id: I98a57f9ac6e6935595b44e1277ddffa378065068
rc/com/android/gallery3d/ingest/IngestService.java
|
eda2f0ce805ee078715b17df7a935e967218a7df |
26-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Fix offset and ASCII type handling in exif." into gb-ub-photos-bryce
|
65a6fa8dca42b855efcfde4f8660d574b4c05e1f |
26-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Fix offset and ASCII type handling in exif." into gb-ub-photos-bryce
|
1beb91fbf4b43322c353146fea922b6ab3bc30b3 |
26-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Remove UI param for straighten." into gb-ub-photos-bryce
|
d50609310e425df36e340120c794f08691d55808 |
26-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Remove UI param for straighten." into gb-ub-photos-bryce
|
c9f9562d27bcb36635646a54b6406e0a6f76aff9 |
26-Apr-2013 |
Baligh Uddin <baligh@google.com> |
am 99e001cc: am 94d7f7ef: am bdc9421f: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce * commit '99e001cc4dfb632c28b2c12847ebe6ba0b51d213': Import translations. DO NOT MERGE
|
3d6721ccab4231911ef2759544f1b9e6e5b10dc6 |
26-Apr-2013 |
Baligh Uddin <baligh@google.com> |
am a4a22ae8: am f0c001fd: am 729a04f6: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce * commit 'a4a22ae8cf9b76530b2428c6c16cb55be7ee7535': Import translations. DO NOT MERGE
|
424c63dc8a1884788d0442e7c7a2b9a19c37fe8f |
26-Apr-2013 |
Baligh Uddin <baligh@google.com> |
am 94d7f7ef: am bdc9421f: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce * commit '94d7f7efea331f92a7d9a8d22230febeb1c05f65': Import translations. DO NOT MERGE
|
0fddc380325014c0b0caf320189f4dd0003c16f8 |
26-Apr-2013 |
Baligh Uddin <baligh@google.com> |
am f0c001fd: am 729a04f6: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce * commit 'f0c001fdb0519b93a064d6ff3556b6ac1d8ac171': Import translations. DO NOT MERGE
|
bbbef74c4d2cbcd3c01395b02ad4534e32e9fe53 |
26-Apr-2013 |
Doris Liu <tianliu@google.com> |
Make sure the initial rotation is set Bug: 8718884 Change-Id: I4d1890f5dc9a4838b84872b1de395440757a7b4b
rc/com/android/camera/ui/RotatableLayout.java
|
ee62d817e50baf404339510105f04cbc6d984210 |
26-Apr-2013 |
Doris Liu <tianliu@google.com> |
Make sure the initial rotation is set Bug: 8718884 Change-Id: I4d1890f5dc9a4838b84872b1de395440757a7b4b
rc/com/android/camera/ui/RotatableLayout.java
|
cda03760ace95552e31a76daa2b247e46129a519 |
26-Apr-2013 |
Baligh Uddin <baligh@google.com> |
am bdc9421f: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce * commit 'bdc9421fb87cf60500b1d137a70a82f189dc320e': Import translations. DO NOT MERGE
|
775c7699b9a2ea92272420e23e70462073a0dc19 |
26-Apr-2013 |
Baligh Uddin <baligh@google.com> |
am 729a04f6: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce * commit '729a04f638e7fc7d93932024a9309adc4fc35bf5': Import translations. DO NOT MERGE
|
d749f04216d06c4b79ff564053e21c394008d575 |
26-Apr-2013 |
Baligh Uddin <baligh@google.com> |
am bdc9421f: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce * commit 'bdc9421fb87cf60500b1d137a70a82f189dc320e': Import translations. DO NOT MERGE
|
27db41e3341ffbad513797888c4fdd63130ac707 |
26-Apr-2013 |
Baligh Uddin <baligh@google.com> |
am 729a04f6: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce * commit '729a04f638e7fc7d93932024a9309adc4fc35bf5': Import translations. DO NOT MERGE
|
f385c107c35225d2ad4181eeaa18860bb480f1ce |
25-Apr-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
|
bdc9421fb87cf60500b1d137a70a82f189dc320e |
25-Apr-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
|
729a04f638e7fc7d93932024a9309adc4fc35bf5 |
25-Apr-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
|
07d3e4767c4e2d0c12ea1caeded067dfa5fdbf78 |
25-Apr-2013 |
Doris Liu <tianliu@google.com> |
Remove new camera activity code from Bryce Bug: 8722017 Change-Id: Ife3f45511f6724c61fb01c4753078df14571fc4a
ndroidManifest.xml
|
020026d033db02ffb47d2ae73c7f54e72a315107 |
25-Apr-2013 |
Doris Liu <tianliu@google.com> |
Remove new camera activity code from Bryce Bug: 8722017 Change-Id: Ife3f45511f6724c61fb01c4753078df14571fc4a
es/layout/camera.xml
es/layout/camera_filmstrip.xml
es/layout/new_photo_module.xml
es/layout/new_video_module.xml
rc/com/android/camera/NewPreviewGestures.java
|
52a069f0839cbc0bff49ea359a497f65d127ef3b |
25-Apr-2013 |
Doris Liu <tianliu@google.com> |
Remove new camera activity code from Bryce Bug: 8722017 Change-Id: Ife3f45511f6724c61fb01c4753078df14571fc4a
ndroidManifest.xml
es/layout/camera.xml
es/layout/camera_filmstrip.xml
es/layout/new_photo_module.xml
es/layout/new_video_module.xml
rc/com/android/camera/NewCameraActivity.java
rc/com/android/camera/NewCameraModule.java
rc/com/android/camera/NewPhotoMenu.java
rc/com/android/camera/NewPhotoModule.java
rc/com/android/camera/NewPhotoUI.java
rc/com/android/camera/NewPreviewGestures.java
rc/com/android/camera/NewVideoMenu.java
rc/com/android/camera/NewVideoModule.java
rc/com/android/camera/NewVideoUI.java
rc/com/android/camera/data/CameraDataAdapter.java
rc/com/android/camera/ui/FaceView.java
rc/com/android/camera/ui/FilmStripGestureRecognizer.java
rc/com/android/camera/ui/FilmStripView.java
rc/com/android/camera/ui/NewCameraRootView.java
|
685b8e30b5c031e3d10b78143cc160eb204ca891 |
25-Apr-2013 |
Doris Liu <tianliu@google.com> |
Remove new camera activity code from Bryce Bug: 8722017 Change-Id: Ife3f45511f6724c61fb01c4753078df14571fc4a
rc/com/android/camera/NewCameraActivity.java
rc/com/android/camera/NewCameraModule.java
rc/com/android/camera/NewPhotoMenu.java
rc/com/android/camera/NewPhotoModule.java
rc/com/android/camera/NewPhotoUI.java
rc/com/android/camera/NewPreviewGestures.java
rc/com/android/camera/NewVideoMenu.java
rc/com/android/camera/NewVideoModule.java
rc/com/android/camera/NewVideoUI.java
rc/com/android/camera/data/CameraDataAdapter.java
rc/com/android/camera/ui/FaceView.java
rc/com/android/camera/ui/FilmStripGestureRecognizer.java
rc/com/android/camera/ui/FilmStripView.java
rc/com/android/camera/ui/NewCameraRootView.java
|
0d72c8f5124d6ed62a01524790aedd078d2a841d |
25-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 97c4af0a: am 13fdb6b5: am 69f5d8cb: Fixes EDIT intents. * commit '97c4af0a77b941538575c7a7ef01429ed07d7995': Fixes EDIT intents.
|
936ae2aa7a62f5b01201c30f0c04ff4da4d13978 |
25-Apr-2013 |
Doris Liu <tianliu@google.com> |
am c432e31a: am 6d18d2a1: am 2e7f1704: Merge "Avoid rendering underneath nav bar" into gb-ub-photos-bryce * commit 'c432e31a40cc264f81681d70b0f3586b0771e95b': Avoid rendering underneath nav bar
|
53b0427f7d06634da5eb63344168afe43b2d17b5 |
25-Apr-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ief67e6650c12d3db1f6bd82f4bf22b8f2a580078 Auto-generated-cl: translation import
es/values-af/filtershow_strings.xml
es/values-am/filtershow_strings.xml
es/values-ar/filtershow_strings.xml
es/values-be/filtershow_strings.xml
es/values-ca/filtershow_strings.xml
es/values-el/filtershow_strings.xml
es/values-iw/filtershow_strings.xml
es/values-ko/filtershow_strings.xml
es/values-ms/filtershow_strings.xml
es/values-rm/filtershow_strings.xml
es/values-th/filtershow_strings.xml
es/values-tl/filtershow_strings.xml
es/values-zu/filtershow_strings.xml
|
7375d26aece986d13fb20248a522c62c5b1a5cd0 |
25-Apr-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ief67e6650c12d3db1f6bd82f4bf22b8f2a580078 Auto-generated-cl: translation import
es/values-af/filtershow_strings.xml
es/values-am/filtershow_strings.xml
es/values-ar/filtershow_strings.xml
es/values-be/filtershow_strings.xml
es/values-ca/filtershow_strings.xml
es/values-el/filtershow_strings.xml
es/values-iw/filtershow_strings.xml
es/values-ko/filtershow_strings.xml
es/values-ms/filtershow_strings.xml
es/values-rm/filtershow_strings.xml
es/values-th/filtershow_strings.xml
es/values-tl/filtershow_strings.xml
es/values-zu/filtershow_strings.xml
|
aa62130cd9495c6f39e994a7a0d156bf66038bc8 |
25-Apr-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I53653ac2d7e1228f4aecedcb2831b4f037a85b99 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-ca/strings.xml
es/values-el/strings.xml
es/values-iw/strings.xml
es/values-ko/strings.xml
es/values-ms/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-zu/strings.xml
|
bac1be909b58dee88b2329abd2cc317ed729d03a |
25-Apr-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I53653ac2d7e1228f4aecedcb2831b4f037a85b99 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-ca/strings.xml
es/values-el/strings.xml
es/values-iw/strings.xml
es/values-ko/strings.xml
es/values-ms/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-zu/strings.xml
|
310ef8d4745a15f04e647b834a7d94e9dc7e1cab |
25-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Fix offset and ASCII type handling in exif. Bug: 8713891 Change-Id: I8adaf1bc42eea2cda741d149de5f1a64c3e4c74c
allerycommon/src/com/android/gallery3d/exif/ExifParser.java
allerycommon/src/com/android/gallery3d/exif/ExifTag.java
|
6e91433bb48ad64cb48ccba7513bfac388c1eaf4 |
25-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Fix offset and ASCII type handling in exif. Bug: 8713891 Change-Id: I8adaf1bc42eea2cda741d149de5f1a64c3e4c74c
allerycommon/src/com/android/gallery3d/exif/ExifParser.java
allerycommon/src/com/android/gallery3d/exif/ExifTag.java
|
5e29fc8b8bbcbeab012587b119ba47a6c647db83 |
25-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Fix offset and ASCII type handling in exif. Bug: 8713891 Change-Id: I8adaf1bc42eea2cda741d149de5f1a64c3e4c74c
allerycommon/src/com/android/gallery3d/exif/ExifParser.java
allerycommon/src/com/android/gallery3d/exif/ExifTag.java
|
0872f787ea2f2fc217c6b88ec2357e7abee36651 |
25-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 13fdb6b5: am 69f5d8cb: Fixes EDIT intents. * commit '13fdb6b5b37737eb667cd888b399e5ba94aaec76': Fixes EDIT intents.
|
9628b5f71cd423d20155742f2cf1ccac5160dad0 |
25-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 69f5d8cb: Fixes EDIT intents. * commit '69f5d8cbf51422454257a00d7959b2e8d50cb0ca': Fixes EDIT intents.
|
36360217dc641ffe06544f0b152f463e34e6cc50 |
25-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 69f5d8cb: Fixes EDIT intents. * commit '69f5d8cbf51422454257a00d7959b2e8d50cb0ca': Fixes EDIT intents.
|
d7eedcd228a27536f31b4a80141fde831ebc6d86 |
25-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Fixes EDIT intents. Bug: 8712238 Change-Id: I63bb07dc304b2745a29e3bf7510e8b38ccb59c48
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/cache/CachingPipeline.java
rc/com/android/gallery3d/filtershow/imageshow/MasterImage.java
|
69f5d8cbf51422454257a00d7959b2e8d50cb0ca |
25-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Fixes EDIT intents. Bug: 8712238 Change-Id: I63bb07dc304b2745a29e3bf7510e8b38ccb59c48
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/cache/CachingPipeline.java
rc/com/android/gallery3d/filtershow/imageshow/MasterImage.java
|
6c2b13ab9dbfbc97e0cb37e04d86fa0e699e4ccf |
25-Apr-2013 |
Doris Liu <tianliu@google.com> |
am 6d18d2a1: am 2e7f1704: Merge "Avoid rendering underneath nav bar" into gb-ub-photos-bryce * commit '6d18d2a16874f23b5eb6806bebfd9d33c33d7dd7': Avoid rendering underneath nav bar
|
74658059e396190169c17802e2937806bc296d80 |
25-Apr-2013 |
Doris Liu <tianliu@google.com> |
am 2e7f1704: Merge "Avoid rendering underneath nav bar" into gb-ub-photos-bryce * commit '2e7f1704c6a30f0d6febfa6ac29d5b3f665c656c': Avoid rendering underneath nav bar
|
59b7344b0f689fe6417bf44fcef07152064babb1 |
25-Apr-2013 |
Doris Liu <tianliu@google.com> |
am 2e7f1704: Merge "Avoid rendering underneath nav bar" into gb-ub-photos-bryce * commit '2e7f1704c6a30f0d6febfa6ac29d5b3f665c656c': Avoid rendering underneath nav bar
|
2e7f1704c6a30f0d6febfa6ac29d5b3f665c656c |
25-Apr-2013 |
Doris Liu <tianliu@google.com> |
Merge "Avoid rendering underneath nav bar" into gb-ub-photos-bryce
|
a63fa601615a1b5ca465fcd0ee327ceaa8e05570 |
25-Apr-2013 |
Doris Liu <tianliu@google.com> |
Merge "Avoid rendering underneath nav bar" into gb-ub-photos-bryce
|
020aae74d3aa9d63a2f0fd7298552487b66d9ef5 |
25-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
resolved conflicts for merge of 6cc7a476 to gb-ub-photos-carlsbad Change-Id: Ide133370403bbcc6a509aa9f064ee8da38abac25
|
d2a62e72a38a5a569f357d75c62b1348ed9bc5cc |
25-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
resolved conflicts for merge of 6cc7a476 to gb-ub-photos-carlsbad Change-Id: Ide133370403bbcc6a509aa9f064ee8da38abac25
|
66eed090735ed0bfeb179b9795bd9dc756e7850c |
25-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
am 9b60f4af: am 6f3b8be5: am 6cc7a476: Merge "UI changes" into gb-ub-photos-bryce * commit '9b60f4af369e1ebde89b2cf2826bc7ab0609283f': UI changes
|
a369a4df23533ea67d94d0c8c10338b21e5f4259 |
25-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
am 6f3b8be5: am 6cc7a476: Merge "UI changes" into gb-ub-photos-bryce * commit '6f3b8be572ee0b89900bd9d27905fc3f99054fc6': UI changes
|
b430c9b4fe245419ef4001ce228475427e8a4021 |
25-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
am 6cc7a476: Merge "UI changes" into gb-ub-photos-bryce * commit '6cc7a476fd56f758e287b7c46092371aa281c0ec': UI changes
|
7873e5b0f4e97aaadbcbb9064f31fdba48405945 |
25-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
Merge "UI changes" into gb-ub-photos-bryce
|
6cc7a476fd56f758e287b7c46092371aa281c0ec |
25-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
Merge "UI changes" into gb-ub-photos-bryce
|
948687589af6cb7cb21122352ab1e828b2c16a5c |
25-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
Merge "UI changes" into gb-ub-photos-bryce
|
7840ef538a0e50f9d66ce33ddff49031c208d26a |
25-Apr-2013 |
The Android Automerger <android-build@android.com> |
merge in jb-mr2-release history after reset to jb-mr2-dev
|
c4ee244da0fe31a9fce8cb5ec07ad1d8e52d6daf |
20-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
UI changes bug:8664728 Change-Id: I133328543af534c745526d0d58aa7a61f5748a9d
es/anim/slide_in_left.xml
es/anim/slide_in_right.xml
es/anim/slide_out_left.xml
es/anim/slide_out_right.xml
es/drawable-nodpi/filtershow_icon_vignette.png
es/layout-land/filtershow_activity.xml
es/layout-land/filtershow_category_panel_new.xml
es/layout-land/filtershow_editor_panel.xml
es/layout-land/filtershow_main_panel.xml
es/layout-land/filtershow_state_panel_new.xml
es/layout/filtershow_activity.xml
es/layout/filtershow_category_panel_new.xml
es/layout/filtershow_control_title_slider.xml
es/layout/filtershow_editor_panel.xml
es/layout/filtershow_imagestate_row.xml
es/layout/filtershow_main_panel.xml
es/layout/filtershow_seekbar.xml
es/layout/filtershow_state_panel_new.xml
es/values-large/filtershow_values.xml
es/values-xlarge/filtershow_values.xml
es/values/attrs.xml
es/values/dimensions.xml
es/values/filtershow_color.xml
es/values/filtershow_strings.xml
es/values/filtershow_values.xml
es/values/filtershow_values_attrs.xml
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
|
f5eedf1635eba7edfa7d41fd4e991cced978c4b2 |
20-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
UI changes bug:8664728 Change-Id: I133328543af534c745526d0d58aa7a61f5748a9d
es/anim/slide_in_left.xml
es/anim/slide_in_right.xml
es/anim/slide_out_left.xml
es/anim/slide_out_right.xml
es/drawable-nodpi/filtershow_icon_vignette.png
es/layout-land/filtershow_activity.xml
es/layout-land/filtershow_category_panel_new.xml
es/layout-land/filtershow_editor_panel.xml
es/layout-land/filtershow_main_panel.xml
es/layout-land/filtershow_state_panel_new.xml
es/layout/filtershow_activity.xml
es/layout/filtershow_category_panel_new.xml
es/layout/filtershow_control_title_slider.xml
es/layout/filtershow_editor_panel.xml
es/layout/filtershow_imagestate_row.xml
es/layout/filtershow_main_panel.xml
es/layout/filtershow_seekbar.xml
es/layout/filtershow_state_panel_new.xml
es/values-large/filtershow_values.xml
es/values-xlarge/filtershow_values.xml
es/values/attrs.xml
es/values/dimensions.xml
es/values/filtershow_color.xml
es/values/filtershow_strings.xml
es/values/filtershow_values.xml
es/values/filtershow_values_attrs.xml
rc/com/android/gallery3d/filtershow/EditorPlaceHolder.java
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/ImageStateAdapter.java
rc/com/android/gallery3d/filtershow/MovableLinearLayout.java
rc/com/android/gallery3d/filtershow/PanelController.java
rc/com/android/gallery3d/filtershow/category/Action.java
rc/com/android/gallery3d/filtershow/category/CategoryAdapter.java
rc/com/android/gallery3d/filtershow/category/CategoryPanel.java
rc/com/android/gallery3d/filtershow/category/CategoryTrack.java
rc/com/android/gallery3d/filtershow/category/CategoryView.java
rc/com/android/gallery3d/filtershow/category/MainPanel.java
rc/com/android/gallery3d/filtershow/editors/BasicEditor.java
rc/com/android/gallery3d/filtershow/editors/Editor.java
rc/com/android/gallery3d/filtershow/editors/EditorPanel.java
rc/com/android/gallery3d/filtershow/editors/ParametricEditor.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterVignette.java
rc/com/android/gallery3d/filtershow/imageshow/ImageGeometry.java
rc/com/android/gallery3d/filtershow/imageshow/ImageShow.java
rc/com/android/gallery3d/filtershow/imageshow/ImageStraighten.java
rc/com/android/gallery3d/filtershow/imageshow/MasterImage.java
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
rc/com/android/gallery3d/filtershow/state/StateAdapter.java
rc/com/android/gallery3d/filtershow/state/StatePanel.java
rc/com/android/gallery3d/filtershow/state/StatePanelTrack.java
rc/com/android/gallery3d/filtershow/state/StateView.java
rc/com/android/gallery3d/filtershow/ui/FilterIconButton.java
rc/com/android/gallery3d/filtershow/ui/ImageCurves.java
|
61ef319ade6d32f35e2f61a20c6208e6fbac8076 |
20-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
UI changes bug:8664728 Change-Id: I133328543af534c745526d0d58aa7a61f5748a9d
rc/com/android/gallery3d/filtershow/EditorPlaceHolder.java
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/ImageStateAdapter.java
rc/com/android/gallery3d/filtershow/MovableLinearLayout.java
rc/com/android/gallery3d/filtershow/PanelController.java
rc/com/android/gallery3d/filtershow/category/Action.java
rc/com/android/gallery3d/filtershow/category/CategoryAdapter.java
rc/com/android/gallery3d/filtershow/category/CategoryPanel.java
rc/com/android/gallery3d/filtershow/category/CategoryTrack.java
rc/com/android/gallery3d/filtershow/category/CategoryView.java
rc/com/android/gallery3d/filtershow/category/MainPanel.java
rc/com/android/gallery3d/filtershow/editors/BasicEditor.java
rc/com/android/gallery3d/filtershow/editors/Editor.java
rc/com/android/gallery3d/filtershow/editors/EditorPanel.java
rc/com/android/gallery3d/filtershow/editors/ParametricEditor.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterVignette.java
rc/com/android/gallery3d/filtershow/imageshow/ImageGeometry.java
rc/com/android/gallery3d/filtershow/imageshow/ImageShow.java
rc/com/android/gallery3d/filtershow/imageshow/ImageStraighten.java
rc/com/android/gallery3d/filtershow/imageshow/MasterImage.java
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
rc/com/android/gallery3d/filtershow/state/StateAdapter.java
rc/com/android/gallery3d/filtershow/state/StatePanel.java
rc/com/android/gallery3d/filtershow/state/StatePanelTrack.java
rc/com/android/gallery3d/filtershow/state/StateView.java
rc/com/android/gallery3d/filtershow/ui/FilterIconButton.java
rc/com/android/gallery3d/filtershow/ui/ImageCurves.java
|
7d5eb0bd117c7223393165c2ee93536258f53385 |
25-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Remove UI param for straighten. Bug: 8322933 Change-Id: I718fc15fb551572ab2452097ac850fd395e59302
rc/com/android/gallery3d/filtershow/editors/EditorStraighten.java
|
9e5656be77bc3d06e414915a99c5346873ddab80 |
25-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Remove UI param for straighten. Bug: 8322933 Change-Id: I718fc15fb551572ab2452097ac850fd395e59302
rc/com/android/gallery3d/filtershow/editors/EditorStraighten.java
|
1d8ea53d93e977b5bebead4acf73b03e7514ae92 |
25-Apr-2013 |
Doris Liu <tianliu@google.com> |
Avoid rendering underneath nav bar Bug: 8647833 Change-Id: I84591c723bf289d8c57b8cb8920342566b64c528
rc/com/android/camera/ui/CameraRootView.java
|
cb62cff674473133bedc32d06c2c0d6c02cbec90 |
25-Apr-2013 |
Doris Liu <tianliu@google.com> |
Avoid rendering underneath nav bar Bug: 8647833 Change-Id: I84591c723bf289d8c57b8cb8920342566b64c528
rc/com/android/camera/ui/CameraRootView.java
|
46dda4d328bbfe16b01aec5ce17e3bb684335069 |
25-Apr-2013 |
Michael Kolb <kolby@google.com> |
am 8542464b: am a4da35ed: am 474c2273: Merge "New capture animation" into gb-ub-photos-bryce * commit '8542464ba0f4d7fac8a503fdefba657cbd391994': New capture animation
|
e3a25519dc052a1f0ed3e77ee53e5529b46b6e0b |
25-Apr-2013 |
Michael Kolb <kolby@google.com> |
am a4da35ed: am 474c2273: Merge "New capture animation" into gb-ub-photos-bryce * commit 'a4da35edbcc26b96937328c25cc817b3297810b4': New capture animation
|
896431d0bf58f76b35edf5cd59bf8e9c7fab454f |
25-Apr-2013 |
Michael Kolb <kolby@google.com> |
am 474c2273: Merge "New capture animation" into gb-ub-photos-bryce * commit '474c2273f02b2333e0bed22fa40918a0939b5a69': New capture animation
|
0819a57868f0b68c9766a0115253912fb6d3c9e7 |
25-Apr-2013 |
Michael Kolb <kolby@google.com> |
am 474c2273: Merge "New capture animation" into gb-ub-photos-bryce * commit '474c2273f02b2333e0bed22fa40918a0939b5a69': New capture animation
|
933b49e59267d69c97fc7c81e3aba33ba1541042 |
25-Apr-2013 |
Michael Kolb <kolby@google.com> |
am 474c2273: Merge "New capture animation" into gb-ub-photos-bryce * commit '474c2273f02b2333e0bed22fa40918a0939b5a69': New capture animation
|
1bdfe386e73ce15c41c2c17ba347c693776b4a08 |
25-Apr-2013 |
Michael Kolb <kolby@google.com> |
Merge "New capture animation" into gb-ub-photos-bryce
|
474c2273f02b2333e0bed22fa40918a0939b5a69 |
25-Apr-2013 |
Michael Kolb <kolby@google.com> |
Merge "New capture animation" into gb-ub-photos-bryce
|
c646fb4b7400210c54e8b535a290d10d4c0ca49d |
25-Apr-2013 |
Michael Kolb <kolby@google.com> |
Merge "New capture animation" into gb-ub-photos-bryce
|
15e085d6e7ff22623acb8e0224fce91a814c6315 |
22-Apr-2013 |
Michael Kolb <kolby@google.com> |
New capture animation Bug: 8253060 Match new UX design for capture animation Custom layout for camera controls Change-Id: I91875ae1685d52d4f9dbb2e6e9299428a8424766
es/values-land/dimensions.xml
es/values/dimens.xml
|
b22b852c53dff209764249a685725379ebe449ac |
22-Apr-2013 |
Michael Kolb <kolby@google.com> |
New capture animation Bug: 8253060 Match new UX design for capture animation Custom layout for camera controls Change-Id: I91875ae1685d52d4f9dbb2e6e9299428a8424766
es/values-land/dimensions.xml
es/values/dimens.xml
rc/com/android/camera/ActivityBase.java
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/CameraScreenNail.java
rc/com/android/camera/CaptureAnimManager.java
rc/com/android/camera/ShutterButton.java
rc/com/android/camera/ui/CameraControls.java
|
705604dfd85362a4b98887b2b1a173e6658853d8 |
22-Apr-2013 |
Michael Kolb <kolby@google.com> |
New capture animation Bug: 8253060 Match new UX design for capture animation Custom layout for camera controls Change-Id: I91875ae1685d52d4f9dbb2e6e9299428a8424766
rc/com/android/camera/ActivityBase.java
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/CameraScreenNail.java
rc/com/android/camera/CaptureAnimManager.java
rc/com/android/camera/ShutterButton.java
rc/com/android/camera/ui/CameraControls.java
|
703b807b5864777c4aadc59bef687b3ddc8c2cb9 |
25-Apr-2013 |
Doris Liu <tianliu@google.com> |
am 22c36388: am 146aaed0: am 2e85f988: Merge "Fix for popuping being hard to dismiss" into gb-ub-photos-bryce * commit '22c36388b844e96aef26bf300e6f46f562389ce7': Fix for popuping being hard to dismiss
|
92051e33673dbeb7e1001a66c468c57393af8170 |
25-Apr-2013 |
Doris Liu <tianliu@google.com> |
am 146aaed0: am 2e85f988: Merge "Fix for popuping being hard to dismiss" into gb-ub-photos-bryce * commit '146aaed0814d42c3a005b878f9d164a58cc910cd': Fix for popuping being hard to dismiss
|
24f28df4463551065c7201c38329b9805c4cdb4e |
25-Apr-2013 |
Doris Liu <tianliu@google.com> |
am 2e85f988: Merge "Fix for popuping being hard to dismiss" into gb-ub-photos-bryce * commit '2e85f98891ffdccb1b7da1945f80af2de5c9a414': Fix for popuping being hard to dismiss
|
dc03560b3aa04ff04c010c83b34d417785e7af79 |
25-Apr-2013 |
Doris Liu <tianliu@google.com> |
am 2e85f988: Merge "Fix for popuping being hard to dismiss" into gb-ub-photos-bryce * commit '2e85f98891ffdccb1b7da1945f80af2de5c9a414': Fix for popuping being hard to dismiss
|
bcf97fdb5516111ee3e3b422c7936f2af85f412f |
25-Apr-2013 |
Doris Liu <tianliu@google.com> |
am 2e85f988: Merge "Fix for popuping being hard to dismiss" into gb-ub-photos-bryce * commit '2e85f98891ffdccb1b7da1945f80af2de5c9a414': Fix for popuping being hard to dismiss
|
dc9395b287bef9007594959e61d302cd3276ed21 |
25-Apr-2013 |
Doris Liu <tianliu@google.com> |
Merge "Fix for popuping being hard to dismiss" into gb-ub-photos-bryce
|
2e85f98891ffdccb1b7da1945f80af2de5c9a414 |
25-Apr-2013 |
Doris Liu <tianliu@google.com> |
Merge "Fix for popuping being hard to dismiss" into gb-ub-photos-bryce
|
ce019e94d92f0097d73a6fc986d0a1e593b74b4d |
25-Apr-2013 |
Doris Liu <tianliu@google.com> |
Merge "Fix for popuping being hard to dismiss" into gb-ub-photos-bryce
|
38e3cb259f8820c0822c26baebc56d9993148ac3 |
25-Apr-2013 |
Michael Kolb <kolby@google.com> |
am a43c364e: am 42ed4ab4: am 31a50d72: Merge "Reset ongoing animation when opening menu" into gb-ub-photos-bryce * commit 'a43c364e708cd2e3e38d4cd3acf38d0117c45472': Reset ongoing animation when opening menu
|
62f711b1301c3a31a02f3d0ea6e5695e6a59ad45 |
25-Apr-2013 |
Michael Kolb <kolby@google.com> |
am 42ed4ab4: am 31a50d72: Merge "Reset ongoing animation when opening menu" into gb-ub-photos-bryce * commit '42ed4ab44d7960682c73460d8a2805717268912a': Reset ongoing animation when opening menu
|
ca005b44323f60983c0cbbf7706becdaad507b9f |
24-Apr-2013 |
Michael Kolb <kolby@google.com> |
am 31a50d72: Merge "Reset ongoing animation when opening menu" into gb-ub-photos-bryce * commit '31a50d72488ec057d78dedfce290eab9264baed5': Reset ongoing animation when opening menu
|
59159dec120ac6739ab42392b0160f99fbf6905a |
24-Apr-2013 |
Michael Kolb <kolby@google.com> |
am 31a50d72: Merge "Reset ongoing animation when opening menu" into gb-ub-photos-bryce * commit '31a50d72488ec057d78dedfce290eab9264baed5': Reset ongoing animation when opening menu
|
31a50d72488ec057d78dedfce290eab9264baed5 |
24-Apr-2013 |
Michael Kolb <kolby@google.com> |
Merge "Reset ongoing animation when opening menu" into gb-ub-photos-bryce
|
6d73e4574907809bf328f1535cd88d7ec564804b |
24-Apr-2013 |
Michael Kolb <kolby@google.com> |
Merge "Reset ongoing animation when opening menu" into gb-ub-photos-bryce
|
9366aa90973d7c5750cc0df14c750e19cc0ac899 |
24-Apr-2013 |
Michael Kolb <kolby@google.com> |
Reset ongoing animation when opening menu Bug: 8687199 The XFade animation was not reset and yielded a transparent alpha Change-Id: Ie2e43eccb2b4351ebf7d00075c567950ca6b2967
rc/com/android/camera/ui/PieRenderer.java
|
0233bade51dfcce5fa1f49b5c2e200a719feab22 |
24-Apr-2013 |
Michael Kolb <kolby@google.com> |
Reset ongoing animation when opening menu Bug: 8687199 The XFade animation was not reset and yielded a transparent alpha Change-Id: Ie2e43eccb2b4351ebf7d00075c567950ca6b2967
rc/com/android/camera/ui/PieRenderer.java
|
e743e4abbc58e16c2be4078a5b683393d40a4595 |
24-Apr-2013 |
John Hoford <hoford@google.com> |
am ff12bfad: am 8f9a61de: am cc7bcd07: Merge "Fix Curves" into gb-ub-photos-bryce * commit 'ff12bfadd99e9bbe1b730baa1081faff6e8207e0': Fix Curves
|
9e774664aa282ef8e8b5fcec925f31ebed10f637 |
24-Apr-2013 |
Mangesh Ghiware <mghiware@google.com> |
am a871bcd7: am cbabd03d: am ef95774e: Merge "Fix for blank Gallery widgets on a DB upgrade" into gb-ub-photos-bryce * commit 'a871bcd7fbf9a0af88876ad65421dcb8d29c39a7': Fix for blank Gallery widgets on a DB upgrade
|
a877a6f1bc82852c1c3f5f8bddde282a79440b64 |
24-Apr-2013 |
John Hoford <hoford@google.com> |
am 8f9a61de: am cc7bcd07: Merge "Fix Curves" into gb-ub-photos-bryce * commit '8f9a61de29add65b06121fb54a240015e79231f7': Fix Curves
|
abe5907db686b2775b86a155dcaa70a963af6db9 |
24-Apr-2013 |
Mangesh Ghiware <mghiware@google.com> |
am cbabd03d: am ef95774e: Merge "Fix for blank Gallery widgets on a DB upgrade" into gb-ub-photos-bryce * commit 'cbabd03d5ebb1b83f88a3324da7a18fed4e86dd7': Fix for blank Gallery widgets on a DB upgrade
|
9828e58d1b6209c37fa2d4008678082bea1917d1 |
24-Apr-2013 |
John Hoford <hoford@google.com> |
am cc7bcd07: Merge "Fix Curves" into gb-ub-photos-bryce * commit 'cc7bcd0721735723c683b2f27267a52a76ff4244': Fix Curves
|
9355f2e9a01b023dea26b296f379039251082b13 |
24-Apr-2013 |
John Hoford <hoford@google.com> |
am cc7bcd07: Merge "Fix Curves" into gb-ub-photos-bryce * commit 'cc7bcd0721735723c683b2f27267a52a76ff4244': Fix Curves
|
73cc12e992e3efc900f73596f9636f631d39038c |
24-Apr-2013 |
John Hoford <hoford@google.com> |
am cc7bcd07: Merge "Fix Curves" into gb-ub-photos-bryce * commit 'cc7bcd0721735723c683b2f27267a52a76ff4244': Fix Curves
|
cc7bcd0721735723c683b2f27267a52a76ff4244 |
24-Apr-2013 |
John Hoford <hoford@google.com> |
Merge "Fix Curves" into gb-ub-photos-bryce
|
b341bb5ddda66c8df047cb5a7ad7a2f6bb9b2991 |
24-Apr-2013 |
John Hoford <hoford@google.com> |
Merge "Fix Curves" into gb-ub-photos-bryce
|
6757c724c1d8d36050075edcd7102b8afc92f79a |
24-Apr-2013 |
Mangesh Ghiware <mghiware@google.com> |
am ef95774e: Merge "Fix for blank Gallery widgets on a DB upgrade" into gb-ub-photos-bryce * commit 'ef95774e2463a3d3537d1ddd9b0dfca21c6d56df': Fix for blank Gallery widgets on a DB upgrade
|
78bbe3f54603aac103784201fdbff96772ba1933 |
24-Apr-2013 |
Mangesh Ghiware <mghiware@google.com> |
am ef95774e: Merge "Fix for blank Gallery widgets on a DB upgrade" into gb-ub-photos-bryce * commit 'ef95774e2463a3d3537d1ddd9b0dfca21c6d56df': Fix for blank Gallery widgets on a DB upgrade
|
ef95774e2463a3d3537d1ddd9b0dfca21c6d56df |
24-Apr-2013 |
Mangesh Ghiware <mghiware@google.com> |
Merge "Fix for blank Gallery widgets on a DB upgrade" into gb-ub-photos-bryce
|
7ff114927c5e02e296485df58966c0fb116376a0 |
24-Apr-2013 |
Mangesh Ghiware <mghiware@google.com> |
Merge "Fix for blank Gallery widgets on a DB upgrade" into gb-ub-photos-bryce
|
4b0616ffaccb57d66e62897fab3281cd7382409b |
24-Apr-2013 |
Sascha Haeberling <haeberling@google.com> |
am 1205f2b8: am 2da0ddbc: am 2b247c58: Merge "Store location for SRI panoramas." into gb-ub-photos-bryce * commit '1205f2b854ef685522f7d408f2e9bb02d6319d84': Store location for SRI panoramas.
|
86a548003e1b093051f5fdc9d7899caeee47e127 |
24-Apr-2013 |
Sascha Haeberling <haeberling@google.com> |
am 2da0ddbc: am 2b247c58: Merge "Store location for SRI panoramas." into gb-ub-photos-bryce * commit '2da0ddbc26d9fbb19c8c3abf70045b5d7e6eccc7': Store location for SRI panoramas.
|
ac1e8231b96042b3fdfef504dd03ba04c71c5fd0 |
24-Apr-2013 |
John Hoford <hoford@google.com> |
Fix Curves bug:8710572 Change-Id: I49a8ea124be59de6d246ae0f9fb16f04fe447af7
rc/com/android/gallery3d/filtershow/filters/FilterCurvesRepresentation.java
|
d009e38321c3e46966370623f950215534d96925 |
24-Apr-2013 |
John Hoford <hoford@google.com> |
Fix Curves bug:8710572 Change-Id: I49a8ea124be59de6d246ae0f9fb16f04fe447af7
rc/com/android/gallery3d/filtershow/filters/FilterCurvesRepresentation.java
rc/com/android/gallery3d/filtershow/ui/ImageCurves.java
rc/com/android/gallery3d/filtershow/ui/Spline.java
|
707be905bf998c98ac948bfc8e3b2c2abea8adff |
24-Apr-2013 |
John Hoford <hoford@google.com> |
Fix Curves bug:8710572 Change-Id: I49a8ea124be59de6d246ae0f9fb16f04fe447af7
rc/com/android/gallery3d/filtershow/filters/FilterCurvesRepresentation.java
rc/com/android/gallery3d/filtershow/ui/ImageCurves.java
rc/com/android/gallery3d/filtershow/ui/Spline.java
|
7ec75454974200bd253a90ecb01daf95a6a4063d |
24-Apr-2013 |
John Hoford <hoford@google.com> |
am 23ee0106: am 086aa588: am dc464a12: Merge "Fix local adjust" into gb-ub-photos-bryce * commit '23ee010615871d40e571f0aa579d57381a24813b': Fix local adjust
|
67d24f6986163cb1b3e01111a567f79b28ab1711 |
24-Apr-2013 |
John Hoford <hoford@google.com> |
am 086aa588: am dc464a12: Merge "Fix local adjust" into gb-ub-photos-bryce * commit '086aa5885fc61eecff0345732943ece8c8cde9da': Fix local adjust
|
935b662edc2395efe0d6857f57d5d637bc38c9de |
24-Apr-2013 |
Sascha Haeberling <haeberling@google.com> |
am 2b247c58: Merge "Store location for SRI panoramas." into gb-ub-photos-bryce * commit '2b247c58611779c69aa2f0f243acf0b6d0a65333': Store location for SRI panoramas.
|
ba0c994c63b5dd8b8c36efa6b7c0a7cb4537d0ee |
24-Apr-2013 |
Mangesh Ghiware <mghiware@google.com> |
Fix for blank Gallery widgets on a DB upgrade Bug: 8660303 Change-Id: I06910ab0811d5f71ba6849d53ddc03c008fc77ad
rc/com/android/gallery3d/gadget/MediaSetSource.java
rc/com/android/gallery3d/gadget/WidgetService.java
|
065199dcbb180442dc1c0e3b4878158a14100681 |
24-Apr-2013 |
Mangesh Ghiware <mghiware@google.com> |
Fix for blank Gallery widgets on a DB upgrade Bug: 8660303 Change-Id: I06910ab0811d5f71ba6849d53ddc03c008fc77ad
rc/com/android/gallery3d/gadget/MediaSetSource.java
rc/com/android/gallery3d/gadget/WidgetService.java
|
3fe31386413590bcaf89f7a8f66e7b4d272000dd |
24-Apr-2013 |
Sascha Haeberling <haeberling@google.com> |
am 2b247c58: Merge "Store location for SRI panoramas." into gb-ub-photos-bryce * commit '2b247c58611779c69aa2f0f243acf0b6d0a65333': Store location for SRI panoramas.
|
2b247c58611779c69aa2f0f243acf0b6d0a65333 |
24-Apr-2013 |
Sascha Haeberling <haeberling@google.com> |
Merge "Store location for SRI panoramas." into gb-ub-photos-bryce
|
a98155693b15506d369fc6978b47202f72d040f8 |
24-Apr-2013 |
Sascha Haeberling <haeberling@google.com> |
Merge "Store location for SRI panoramas." into gb-ub-photos-bryce
|
094e80ef5fe0752c5e0ac95dcf34ad9ec1f6590b |
24-Apr-2013 |
John Hoford <hoford@google.com> |
am dc464a12: Merge "Fix local adjust" into gb-ub-photos-bryce * commit 'dc464a129bad2a2918531fc8a4415c41b60605e6': Fix local adjust
|
70db3b4facf3dafb68c54c41b952dc64739b1bcc |
24-Apr-2013 |
John Hoford <hoford@google.com> |
am dc464a12: Merge "Fix local adjust" into gb-ub-photos-bryce * commit 'dc464a129bad2a2918531fc8a4415c41b60605e6': Fix local adjust
|
b83e36df79a9bc3fadc9baa152dfa1608c214bdd |
24-Apr-2013 |
John Hoford <hoford@google.com> |
am dc464a12: Merge "Fix local adjust" into gb-ub-photos-bryce * commit 'dc464a129bad2a2918531fc8a4415c41b60605e6': Fix local adjust
|
678dbdec82968816a40df237965b5c9e9b44fa82 |
24-Apr-2013 |
John Hoford <hoford@google.com> |
Merge "Fix local adjust" into gb-ub-photos-bryce
|
dc464a129bad2a2918531fc8a4415c41b60605e6 |
24-Apr-2013 |
John Hoford <hoford@google.com> |
Merge "Fix local adjust" into gb-ub-photos-bryce
|
3c0d3967315515d53e48546ee6bd31a42bab7257 |
24-Apr-2013 |
Baligh Uddin <baligh@google.com> |
am a2ab8c0e: am b7dc30d0: am 8acf85be: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce * commit 'a2ab8c0ec8a4f153ad54f20f2cececebf05b042d': Import translations. DO NOT MERGE
|
f908592e386e147ca060446327f0703a5c0a238c |
24-Apr-2013 |
Baligh Uddin <baligh@google.com> |
am ba7e9941: am 99f6ddff: am a6e5864f: (-s ours) Import translations. DO NOT MERGE * commit 'ba7e9941214f5b45900cb3a028316f0d6e325ebb': Import translations. DO NOT MERGE
|
1a116b816df2e0c9f0b415225d61d2e79416aa11 |
24-Apr-2013 |
Baligh Uddin <baligh@google.com> |
am 5294aafe: am 99df4847: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev * commit '5294aafe14c5625d408045c48e0baa8f4cb22b51': Import translations. DO NOT MERGE
|
9c1d19b06ad872f9681a5088a31cf750f5702756 |
24-Apr-2013 |
Baligh Uddin <baligh@google.com> |
am 42b21292: am 2b3e35df: Import translations. DO NOT MERGE * commit '42b2129215bda42fcb63c7ee6162056698cb6c2c': Import translations. DO NOT MERGE
|
9bebf503e823a31ac20af09334c30d688e262833 |
24-Apr-2013 |
Baligh Uddin <baligh@google.com> |
am b7dc30d0: am 8acf85be: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce * commit 'b7dc30d05a349cef46c40ed91915036b716c67b8': Import translations. DO NOT MERGE
|
e7e0f023a3e70993f24e5836b5ed5649fc061bcf |
24-Apr-2013 |
Baligh Uddin <baligh@google.com> |
am 99f6ddff: am a6e5864f: (-s ours) Import translations. DO NOT MERGE * commit '99f6ddff6dd38e80c5f2ec7dd09b0b7799f59fc9': Import translations. DO NOT MERGE
|
71b2a9c217c7e3888ed3641300ce02640b316553 |
24-Apr-2013 |
Baligh Uddin <baligh@google.com> |
am 99df4847: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev * commit '99df484788523fdcc54483bc92ab3ed49d8bb3c5': Import translations. DO NOT MERGE
|
9d792f2f4754b793d2d28fa4fc8a86acf589ce47 |
24-Apr-2013 |
Baligh Uddin <baligh@google.com> |
am 2b3e35df: Import translations. DO NOT MERGE * commit '2b3e35dfea337fc5f2c5e42c633519e325e601b0': Import translations. DO NOT MERGE
|
d3594edb2bc89782ab7fc3a6628710a79e32c673 |
24-Apr-2013 |
Baligh Uddin <baligh@google.com> |
am 8acf85be: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce * commit '8acf85be0bccc53db78075fb7cf7f85b9706e828': Import translations. DO NOT MERGE
|
3c7750b6d4741ab708142f08b2b02ac5c953c57d |
24-Apr-2013 |
Baligh Uddin <baligh@google.com> |
am a6e5864f: (-s ours) Import translations. DO NOT MERGE * commit 'a6e5864f592fcca5d0ef907753bf2ffd52cd5d48': Import translations. DO NOT MERGE
|
e87718d21998623547565fd51d4956f09fa805cf |
24-Apr-2013 |
Baligh Uddin <baligh@google.com> |
am 8acf85be: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce * commit '8acf85be0bccc53db78075fb7cf7f85b9706e828': Import translations. DO NOT MERGE
|
d8b5c4c717907c391dc50f90a695547a93454849 |
24-Apr-2013 |
Baligh Uddin <baligh@google.com> |
am a6e5864f: (-s ours) Import translations. DO NOT MERGE * commit 'a6e5864f592fcca5d0ef907753bf2ffd52cd5d48': Import translations. DO NOT MERGE
|
a82baa8f0234465c00255938d7c476179e937113 |
24-Apr-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE"
|
0431d513fe5564eaa4017b560278df4d8d9cd8e2 |
24-Apr-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
|
4101acb821bc454bf3a875515d69abf146c1be91 |
24-Apr-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
|
8acf85be0bccc53db78075fb7cf7f85b9706e828 |
24-Apr-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
|
3224646e36b0838c6c07c8ff5e6281eca3cd040d |
24-Apr-2013 |
Sascha Haeberling <haeberling@google.com> |
Store location for SRI panoramas. Bug: 8692005 Change-Id: I1499de0103e518ee321ebb0c566b9fb4a7a853d3
rc/com/android/camera/PanoramaModule.java
|
b3aa8b64087ecf64254134208b0fa0be7bd43800 |
24-Apr-2013 |
Sascha Haeberling <haeberling@google.com> |
Store location for SRI panoramas. Bug: 8692005 Change-Id: I1499de0103e518ee321ebb0c566b9fb4a7a853d3
rc/com/android/camera/PanoramaModule.java
|
41fadb992a717788f93b34ce3f9da379312918b7 |
24-Apr-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I2d06b618ba978274d1d5cee5e94730c8965df991 Auto-generated-cl: translation import
es/values-en-rGB/filtershow_strings.xml
|
1eef88b4f5f187f331b58308b445e03305064544 |
24-Apr-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ic55d840aa70552899c4644c650ebe2683f05c4dc Auto-generated-cl: translation import
es/values-en-rGB/filtershow_strings.xml
|
06a09aadb6e224d44e824183abc76357dfb486e3 |
24-Apr-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I8cd5a603a76b616df7a2bc1cb8b8ae0db4f2d5ee Auto-generated-cl: translation import
es/values-en-rGB/filtershow_strings.xml
|
704c0016d32c6c23694b44ad4acef2ea0bca5992 |
24-Apr-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I8cd5a603a76b616df7a2bc1cb8b8ae0db4f2d5ee Auto-generated-cl: translation import
es/values-en-rGB/filtershow_strings.xml
|
4e15d1faa7232beff83fd0139a867a191df5ec6d |
24-Apr-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ic6cd127deb6514f9a9d614bb53b4518983af94d8 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
120456f6da8c65594db573a6ac25ef40b452d15c |
24-Apr-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ie13b166aed21b53e43ab04a9c45ee3fc36d4d533 Auto-generated-cl: translation import
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-fa/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
|
a6e5864f592fcca5d0ef907753bf2ffd52cd5d48 |
24-Apr-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I0034c392392c3f822a5945d84dcd2a958d147970 Auto-generated-cl: translation import
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-fa/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
|
31a1154d10f8a2dad9886024b760fea4d1e3de8c |
24-Apr-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I0034c392392c3f822a5945d84dcd2a958d147970 Auto-generated-cl: translation import
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-fa/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
|
d550d1d60e5a472be93df9b242eec010cc1c6043 |
24-Apr-2013 |
The Android Automerger <android-build@android.com> |
merge in jb-mr2-release history after reset to jb-mr2-dev
|
dcd31fe8f7bc219b4e8f7608a6d5ad016da0f885 |
20-Apr-2013 |
John Hoford <hoford@google.com> |
Fix local adjust bug:8655977 Change-Id: I0aa4ac30de077663f52418528757a842372e0fc2
rc/com/android/gallery3d/filtershow/controller/ActionSlider.java
rc/com/android/gallery3d/filtershow/controller/BasicParameterStyle.java
rc/com/android/gallery3d/filtershow/controller/ParameterActionAndInt.java
rc/com/android/gallery3d/filtershow/editors/Editor.java
rc/com/android/gallery3d/filtershow/editors/ParametricEditor.java
|
7d520712bab06a526c9ec1462651486f62e64345 |
20-Apr-2013 |
John Hoford <hoford@google.com> |
Fix local adjust bug:8655977 Change-Id: I0aa4ac30de077663f52418528757a842372e0fc2
es/drawable-hdpi/ic_localadjust_add.png
es/drawable-hdpi/ic_localadjust_delete.png
es/drawable-hdpi/localadjust_defocused.png
es/drawable-hdpi/localadjust_focused.png
es/drawable-mdpi/ic_localadjust_add.png
es/drawable-mdpi/ic_localadjust_delete.png
es/drawable-mdpi/localadjust_defocused.png
es/drawable-mdpi/localadjust_focused.png
es/drawable-xhdpi/ic_localadjust_add.png
es/drawable-xhdpi/ic_localadjust_delete.png
es/drawable-xhdpi/localadjust_defocused.png
es/drawable-xhdpi/localadjust_focused.png
es/drawable/filtershow_addpoint.png
es/layout/filtershow_control_action_slider.xml
|
7112720bc6100049d24845cfbf3de69cdbd4fdeb |
20-Apr-2013 |
John Hoford <hoford@google.com> |
Fix local adjust bug:8655977 Change-Id: I0aa4ac30de077663f52418528757a842372e0fc2
es/drawable-hdpi/ic_localadjust_add.png
es/drawable-hdpi/ic_localadjust_delete.png
es/drawable-hdpi/localadjust_defocused.png
es/drawable-hdpi/localadjust_focused.png
es/drawable-mdpi/ic_localadjust_add.png
es/drawable-mdpi/ic_localadjust_delete.png
es/drawable-mdpi/localadjust_defocused.png
es/drawable-mdpi/localadjust_focused.png
es/drawable-xhdpi/ic_localadjust_add.png
es/drawable-xhdpi/ic_localadjust_delete.png
es/drawable-xhdpi/localadjust_defocused.png
es/drawable-xhdpi/localadjust_focused.png
es/drawable/filtershow_addpoint.png
es/layout/filtershow_control_action_slider.xml
rc/com/android/gallery3d/filtershow/controller/ActionSlider.java
rc/com/android/gallery3d/filtershow/controller/BasicParameterStyle.java
rc/com/android/gallery3d/filtershow/controller/ParameterActionAndInt.java
rc/com/android/gallery3d/filtershow/editors/Editor.java
rc/com/android/gallery3d/filtershow/editors/ParametricEditor.java
|
50b082ec2fdd4ef882f079f94238ad141c9cbc45 |
24-Apr-2013 |
John Hoford <hoford@google.com> |
am 68be3944: am 1648b0c4: am 0c71308c: Merge "interruptible renderer" into gb-ub-photos-bryce * commit '68be3944511cbd9deec7033930bc223aedf6645d': interruptible renderer
|
f563f3fa9258d390cfe00fca939107e232c2737f |
24-Apr-2013 |
John Hoford <hoford@google.com> |
am 1648b0c4: am 0c71308c: Merge "interruptible renderer" into gb-ub-photos-bryce * commit '1648b0c40fd9d765ac1b255c03674fdc4ce70bd1': interruptible renderer
|
ce67ac9b69c1bc3b4f64ba98542bfc3a5271a586 |
24-Apr-2013 |
John Hoford <hoford@google.com> |
am 0c71308c: Merge "interruptible renderer" into gb-ub-photos-bryce * commit '0c71308c9d2a72d4a3faf00242707de773d5beba': interruptible renderer
|
0630dcde223db78f0b474bca451e27e1791adf29 |
24-Apr-2013 |
John Hoford <hoford@google.com> |
am 0c71308c: Merge "interruptible renderer" into gb-ub-photos-bryce * commit '0c71308c9d2a72d4a3faf00242707de773d5beba': interruptible renderer
|
11704ee1f06a74c316caa27aaf31a27224692a7c |
24-Apr-2013 |
John Hoford <hoford@google.com> |
am 0c71308c: Merge "interruptible renderer" into gb-ub-photos-bryce * commit '0c71308c9d2a72d4a3faf00242707de773d5beba': interruptible renderer
|
0c71308c9d2a72d4a3faf00242707de773d5beba |
24-Apr-2013 |
John Hoford <hoford@google.com> |
Merge "interruptible renderer" into gb-ub-photos-bryce
|
f9ff7ffe2004ed2077f38a91dafb213495e5bf70 |
24-Apr-2013 |
John Hoford <hoford@google.com> |
Merge "interruptible renderer" into gb-ub-photos-bryce
|
63b535c317b449c30d594c633b82d3aabcff7329 |
24-Apr-2013 |
Angus Kong <shkong@google.com> |
am 029e1531: am 68fa800e: am 7d62e546: Use FULL_SENSOR for unlocked orientation. * commit '029e1531c0b5838397f38bc7554e2d346864b6b2': Use FULL_SENSOR for unlocked orientation.
|
3a2f800f52d31bb6ad4f66744b7c3026c6d12fa9 |
24-Apr-2013 |
Angus Kong <shkong@google.com> |
am 68fa800e: am 7d62e546: Use FULL_SENSOR for unlocked orientation. * commit '68fa800eb82468072f94e6dbbd4b63d3ccb7075e': Use FULL_SENSOR for unlocked orientation.
|
b75bc8e2573e1e7602ee70b6c548800cce5afa28 |
24-Apr-2013 |
Angus Kong <shkong@google.com> |
am 7d62e546: Use FULL_SENSOR for unlocked orientation. * commit '7d62e546b3b9eedc1f5c9d8f3ee644025f554fe3': Use FULL_SENSOR for unlocked orientation.
|
6d284418f20fd526b874cc3ca18758c0f732bf2f |
24-Apr-2013 |
Angus Kong <shkong@google.com> |
am 7d62e546: Use FULL_SENSOR for unlocked orientation. * commit '7d62e546b3b9eedc1f5c9d8f3ee644025f554fe3': Use FULL_SENSOR for unlocked orientation.
|
7d62e546b3b9eedc1f5c9d8f3ee644025f554fe3 |
24-Apr-2013 |
Angus Kong <shkong@google.com> |
Use FULL_SENSOR for unlocked orientation. bug:8689453 Change-Id: Ia81d970772f091fbd9bec142acfd5e9f84e0a0fb
rc/com/android/gallery3d/app/OrientationManager.java
|
44ed61abd2dfd0e0a07887131a617e0518f28221 |
24-Apr-2013 |
Angus Kong <shkong@google.com> |
Use FULL_SENSOR for unlocked orientation. bug:8689453 Change-Id: Ia81d970772f091fbd9bec142acfd5e9f84e0a0fb
rc/com/android/gallery3d/app/OrientationManager.java
|
c6ee564f2b01e0b18147e7847699fd04c0e0b039 |
24-Apr-2013 |
John Hoford <hoford@google.com> |
interruptible renderer bug:8632908 Change-Id: I4df59fb0c82370491d953292fd1cd17443054ab3
rc/com/android/gallery3d/filtershow/presets/FilterEnvironment.java
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
|
17218987cfa32cff5dc719cfb88d0e3ce3677f00 |
24-Apr-2013 |
John Hoford <hoford@google.com> |
interruptible renderer bug:8632908 Change-Id: I4df59fb0c82370491d953292fd1cd17443054ab3
rc/com/android/gallery3d/filtershow/cache/CachingPipeline.java
rc/com/android/gallery3d/filtershow/cache/FilteringPipeline.java
rc/com/android/gallery3d/filtershow/presets/FilterEnvironment.java
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
|
c4109628aec151e2ba70c4be729a869960e1b960 |
24-Apr-2013 |
John Hoford <hoford@google.com> |
interruptible renderer bug:8632908 Change-Id: I4df59fb0c82370491d953292fd1cd17443054ab3
rc/com/android/gallery3d/filtershow/cache/CachingPipeline.java
rc/com/android/gallery3d/filtershow/cache/FilteringPipeline.java
rc/com/android/gallery3d/filtershow/presets/FilterEnvironment.java
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
|
b52d33ddbf8db38fb9327c660a5c97d6b7ceac36 |
24-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am e6db2801: am 88e3486d: am 8600c562: Fix to check if crop activity got bad bitmap. * commit 'e6db2801cb0add327cb017e93348736c1482dac9': Fix to check if crop activity got bad bitmap.
|
c2e00184b8ec362e81dbb5c18ec58e8c0a502ca0 |
24-Apr-2013 |
Sascha Haeberling <haeberling@google.com> |
am bc084e34: am e4dd20bd: am ae52b3e3: Fixes video mode indicators by resetting them on init. * commit 'bc084e34ab006bf424e80841eeb271099d20b5df': Fixes video mode indicators by resetting them on init.
|
13b2d69f16f1e62d4a65b096258ba688a924034f |
23-Apr-2013 |
Doris Liu <tianliu@google.com> |
Fix for popuping being hard to dismiss Bug: 8688503 Change-Id: I86f1451867d7606060e5f81fdd3b8b0af1e0a6d3
rc/com/android/camera/PreviewGestures.java
|
f9adf16cc73ad803dee8e973e9e9205f583e1481 |
23-Apr-2013 |
Doris Liu <tianliu@google.com> |
Fix for popuping being hard to dismiss Bug: 8688503 Change-Id: I86f1451867d7606060e5f81fdd3b8b0af1e0a6d3
rc/com/android/camera/PhotoUI.java
rc/com/android/camera/PreviewGestures.java
rc/com/android/camera/VideoUI.java
|
fd2e619a2fb263315816b3579a9c6751c398132d |
23-Apr-2013 |
Doris Liu <tianliu@google.com> |
Fix for popuping being hard to dismiss Bug: 8688503 Change-Id: I86f1451867d7606060e5f81fdd3b8b0af1e0a6d3
rc/com/android/camera/PhotoUI.java
rc/com/android/camera/PreviewGestures.java
rc/com/android/camera/VideoUI.java
|
6b5224684436eedea2e921396111d6b1e1cd6edf |
23-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 88e3486d: am 8600c562: Fix to check if crop activity got bad bitmap. * commit '88e3486dc30f428d47ce198af47f9f2d83911d83': Fix to check if crop activity got bad bitmap.
|
9823871527bdbe9a268c39fb83cb7a80004dd0af |
23-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 8600c562: Fix to check if crop activity got bad bitmap. * commit '8600c562b8ed0f636bc966a8aac83dc90326f0fb': Fix to check if crop activity got bad bitmap.
|
55a418629485867b911b1815df7768800724cb40 |
23-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 8600c562: Fix to check if crop activity got bad bitmap. * commit '8600c562b8ed0f636bc966a8aac83dc90326f0fb': Fix to check if crop activity got bad bitmap.
|
8600c562b8ed0f636bc966a8aac83dc90326f0fb |
23-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Fix to check if crop activity got bad bitmap. Bug: 8692297 Change-Id: I1900c45c71b3d1c6203e4d25a7ad5354f409fcf2
rc/com/android/gallery3d/filtershow/crop/CropActivity.java
|
dc84a61759d87e17e191d9a7a5f3c008d3f62abc |
23-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Fix to check if crop activity got bad bitmap. Bug: 8692297 Change-Id: I1900c45c71b3d1c6203e4d25a7ad5354f409fcf2
rc/com/android/gallery3d/filtershow/crop/CropActivity.java
|
8b2f52003372f16fa25dbc96eb2567ab27cda5af |
23-Apr-2013 |
Sascha Haeberling <haeberling@google.com> |
am e4dd20bd: am ae52b3e3: Fixes video mode indicators by resetting them on init. * commit 'e4dd20bd33456e401a1d5b23f8e4438621f91984': Fixes video mode indicators by resetting them on init.
|
7c530ecf8fcd2ed575226904ef21c943af91598f |
23-Apr-2013 |
Sascha Haeberling <haeberling@google.com> |
am ae52b3e3: Fixes video mode indicators by resetting them on init. * commit 'ae52b3e3f0f356e1b91e883729d0d82cb40d7a42': Fixes video mode indicators by resetting them on init.
|
f0aadde61c0e1ad79ef7628699bc85a71da45cf7 |
23-Apr-2013 |
Sascha Haeberling <haeberling@google.com> |
am ae52b3e3: Fixes video mode indicators by resetting them on init. * commit 'ae52b3e3f0f356e1b91e883729d0d82cb40d7a42': Fixes video mode indicators by resetting them on init.
|
ae52b3e3f0f356e1b91e883729d0d82cb40d7a42 |
23-Apr-2013 |
Sascha Haeberling <haeberling@google.com> |
Fixes video mode indicators by resetting them on init. Bug: 8696004 Change-Id: I2bfc235ac87d836c29a53425e623121304a4c08a
rc/com/android/camera/OnScreenIndicators.java
rc/com/android/camera/VideoUI.java
|
140c263ebb2504fe1a0212a835f0098ce7973a22 |
23-Apr-2013 |
Sascha Haeberling <haeberling@google.com> |
Fixes video mode indicators by resetting them on init. Bug: 8696004 Change-Id: I2bfc235ac87d836c29a53425e623121304a4c08a
rc/com/android/camera/OnScreenIndicators.java
rc/com/android/camera/VideoUI.java
|
f0d513f1e6a30a5d3a5d1ce053348692c7b9fbf6 |
23-Apr-2013 |
The Android Automerger <android-build@android.com> |
merge in jb-mr2-release history after reset to jb-mr2-dev
|
969c52ae0acfc6e082040f53fc0c7020152f3f46 |
23-Apr-2013 |
Bart Sears <bsears@google.com> |
am 6b494fe2: am 7ec05edd: am 86d622f7: Bump up the version number to 1.1.40011 * commit '6b494fe248b64d418207c6a27451d48bfad1918a': Bump up the version number to 1.1.40011
|
ae275bbede811e9771225540b8c60c6cf181ca8c |
23-Apr-2013 |
Sascha Haeberling <haeberling@google.com> |
am ec61729f: am 7f899d25: am d313bb0a: Merge "Make sure we don\'t add the pano sharing menu in the secure lock screen." into gb-ub-photos-bryce * commit 'ec61729f01207a4316ae1305d28fd6d0f6c4cf68': Make sure we don't add the pano sharing menu in the secure lock screen.
|
a924cd053c6fcf998c6b48dc00ee53c15f82cf28 |
23-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 29e6e15e: am 123dc81c: am 98698ea0: Merge "Fix wallpaper crop UI." into gb-ub-photos-bryce * commit '29e6e15ed24ca0b79ac9b7dd729476f360ff0ed6': Fix wallpaper crop UI.
|
1d83cf71b81e68408462fd0b5261ba5c2031a881 |
23-Apr-2013 |
Sascha Haeberling <haeberling@google.com> |
am 93d2a3b4: am c0bb6532: am 7706d294: Merge "Refactor the methods for changing the on-screen indicators." into gb-ub-photos-bryce * commit '93d2a3b4c73f10b1345f41f55ee32807c7b7b37b': Refactor the methods for changing the on-screen indicators.
|
0717c1365bb1fe09d9cf8cafbc699452a23dd5e9 |
23-Apr-2013 |
Baligh Uddin <baligh@google.com> |
am 005e9bb2: am cd3f1cb9: am 15b83326: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce * commit '005e9bb2b2def48bc881115c8bb15beb3c66afef': Import translations. DO NOT MERGE
|
bb7c7f2dcc905c71bc7a5438929a193ab0581e7b |
23-Apr-2013 |
Baligh Uddin <baligh@google.com> |
am 44fc9793: am 10d495c2: am 6fe2995e: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce * commit '44fc979315f7a30be1c54dc9beaa6ce5914c20b8': Import translations. DO NOT MERGE
|
2223257e9aa1ace2db7c81cdcf65a3db43c18749 |
23-Apr-2013 |
Baligh Uddin <baligh@google.com> |
am cfba92e7: am 89434fb2: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev * commit 'cfba92e7038143ac7a6d72c191356803219dded5': Import translations. DO NOT MERGE
|
6efa687eeb1a800ad33c3070b860dcf7726f95f2 |
23-Apr-2013 |
Baligh Uddin <baligh@google.com> |
am e3f4f4a0: (-s ours) am 0f609692: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev * commit 'e3f4f4a0013080fb83d99ce73b847337d281b9a3': Import translations. DO NOT MERGE
|
968f02543651b82cc8c4821acc3596f2139a5c07 |
23-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 381e21c7: am 21dfb866: am 9c48a6c3: Fixes build. Removes dead code. * commit '381e21c709108e89ac245e7eec86f59ce38b8d15': Fixes build. Removes dead code.
|
4bef38dfa9d7da1464bfe01f751004cd4d593d0d |
23-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 189989c7: am ed0ee835: am 1365eec6: Merge "Fix orientation changes for wallpaper setter." into gb-ub-photos-bryce * commit '189989c7ac5f82ef63d048652b4072f22b86bd72': Fix orientation changes for wallpaper setter.
|
2d85dba7914c5335b6b2836ba2e218cb378f5486 |
23-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 1bdbd362: am 0ce21047: am 4a6dc2b1: Merge "Reenables crop aspect ratio menu." into gb-ub-photos-bryce * commit '1bdbd36255ae93fb4cd3c48f8f4ef326e112e973': Reenables crop aspect ratio menu.
|
39539d224da4c27ff4c9103ebe52b353f36a4fcd |
23-Apr-2013 |
Michael Kolb <kolby@google.com> |
am 219f3663: am 440e43ed: am 608f7c98: Merge "More menu fixes" into gb-ub-photos-bryce * commit '219f36635af3b0f724f0a8b990ba075bd8e84407': More menu fixes
|
b946c8ec9d544b512b2593ba5acc3a848d96c4db |
23-Apr-2013 |
Doris Liu <tianliu@google.com> |
am 250829a4: am 33109243: am d6e6533a: Merge "Fix for camera switcher hard to hit" into gb-ub-photos-bryce * commit '250829a462f43cd930fbd44b38a0047333b64529': Fix for camera switcher hard to hit
|
26cdbeeb80fdc8e6139dd0cd00cd1096e19d35ce |
23-Apr-2013 |
Doris Liu <tianliu@google.com> |
am da69d98a: am 5d19a1c3: am ed689873: Merge "Fix camera buttons showing up at wrong position" into gb-ub-photos-bryce * commit 'da69d98a803fc01b0c0ed7a9810103ed1786cfc5': Fix camera buttons showing up at wrong position
|
a0933ff6dff84167771844c10609ee270d1606e0 |
23-Apr-2013 |
Bobby Georgescu <georgescu@google.com> |
am 5b3b0b50: am 5dccb63e: am ca6f04e2: Remove dead code * commit '5b3b0b50d50d801fd1bcd8a91080ef81ffa0935f': Remove dead code
|
c099afc4c297b9e40883316fafe763b511bd1d93 |
23-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
am 166419fa: am ae1b2a55: am d97733b2: Strings update * commit '166419fa3215507c8b2b058e39b250f730333637': Strings update
|
92e6b606bd776856adb0a45d6087b945196c74b5 |
23-Apr-2013 |
Nicolas Roard <nicolasroard@google.com> |
am 3f9a9b48: am 9b407b5f: am bb894c4f: Merge "String updates." into gb-ub-photos-bryce * commit '3f9a9b48bb2424db7eaf8a75e8aaf0fc9a2d10d0': String updates.
|
8d35be48501b62ae95e4c1279e8053227d593496 |
23-Apr-2013 |
Michael Kolb <kolby@google.com> |
am ac42ec56: am 36affdf2: am 237216ee: Rename scenemode AUTO to NONE * commit 'ac42ec56620acf0d03e5d99949d8f43b40cfed08': Rename scenemode AUTO to NONE
|
5c8dde33ddacbd20199480c47c90a54bc10e4091 |
23-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 2229db8a: am 413fa970: am f53eea80: Merge "Ensure consistent image thumbnail handling." into gb-ub-photos-bryce * commit '2229db8a2fd622bc4b7131b21b43af20c2636572': Ensure consistent image thumbnail handling.
|
86c22bda4ed93fa92446fa9959bfd85a73d9d717 |
23-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 9ca05418: am 6e2b9c13: am afc46d5a: Merge "Fix saved video timestamps." into gb-ub-photos-bryce * commit '9ca054186939d276db728463e5af00acc0b33cec': Fix saved video timestamps.
|
30b8f84cade53285746f11f6f501075e2185d416 |
23-Apr-2013 |
Chad Jones <chadj@google.com> |
am 4d2bfb34: am 41d628b3: Merge commit \'91d26f6c\' into jb-mr2-dev * commit '4d2bfb343c2ea3814ce5af2439362412516e5744':
|
769ee914a27cd5432ab8cec23a73778649626c11 |
23-Apr-2013 |
Bart Sears <bsears@google.com> |
am 7ec05edd: am 86d622f7: Bump up the version number to 1.1.40011 * commit '7ec05edd5e9fa2854a23d99ef3db4ee05787ccb6': Bump up the version number to 1.1.40011
|
998493a41106edb8d20e4e09fb59fc3485b2f6aa |
23-Apr-2013 |
Sascha Haeberling <haeberling@google.com> |
am 7f899d25: am d313bb0a: Merge "Make sure we don\'t add the pano sharing menu in the secure lock screen." into gb-ub-photos-bryce * commit '7f899d254cb17b1361fa66eb42a57dca8823a3d8': Make sure we don't add the pano sharing menu in the secure lock screen.
|
96997dc57fe0c8365355daadb59d0b10c0ef6b2d |
23-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 123dc81c: am 98698ea0: Merge "Fix wallpaper crop UI." into gb-ub-photos-bryce * commit '123dc81ca52754eb9ed0fe873c7f71fe2fc6cb3f': Fix wallpaper crop UI.
|
41831ce0cc49bef35ab571d8c74e1f1b1a593ec2 |
23-Apr-2013 |
Sascha Haeberling <haeberling@google.com> |
am c0bb6532: am 7706d294: Merge "Refactor the methods for changing the on-screen indicators." into gb-ub-photos-bryce * commit 'c0bb6532306091be320fe1ea343e7539069a7113': Refactor the methods for changing the on-screen indicators.
|
1851c2b12989c2a575e462f52e9b8156833b5f23 |
23-Apr-2013 |
Baligh Uddin <baligh@google.com> |
am cd3f1cb9: am 15b83326: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce * commit 'cd3f1cb9402d75ba3f77c2238b24b1b5b2d15dcb': Import translations. DO NOT MERGE
|
0d605ebc8f5309ad4bab3e2c48b64cf10e1487b8 |
23-Apr-2013 |
Baligh Uddin <baligh@google.com> |
am 10d495c2: am 6fe2995e: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce * commit '10d495c2ec88ae0ca7c388e2065ac470940c6169': Import translations. DO NOT MERGE
|
48e0e2887670f949b8af99db8ddb039c5b9b5448 |
23-Apr-2013 |
Baligh Uddin <baligh@google.com> |
am 89434fb2: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev * commit '89434fb2dff21f9d1d4e81f6e760a1e98a3d2f9d': Import translations. DO NOT MERGE
|
b2b99dfe00b0a494120fdd299c9548c1a9c6f4df |
23-Apr-2013 |
Baligh Uddin <baligh@google.com> |
am 0f609692: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev * commit '0f609692766a2031baa2623ab6e1d29f69c71162': Import translations. DO NOT MERGE
|
bdf685e3bb0960c73f7608697e5a600ce70b0241 |
23-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 21dfb866: am 9c48a6c3: Fixes build. Removes dead code. * commit '21dfb86667fcef76c642ee460c99effef1bd2b11': Fixes build. Removes dead code.
|
bb52b55279944f31fc9b1f7e589979ab8f4ce1aa |
23-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am ed0ee835: am 1365eec6: Merge "Fix orientation changes for wallpaper setter." into gb-ub-photos-bryce * commit 'ed0ee835d4191625f2c966a1803290dfb43f94d8': Fix orientation changes for wallpaper setter.
|
12ef846506c153677cf9a765968f1f4e15942042 |
23-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 0ce21047: am 4a6dc2b1: Merge "Reenables crop aspect ratio menu." into gb-ub-photos-bryce * commit '0ce21047ba69c4a5fb070be8dec969174e998916': Reenables crop aspect ratio menu.
|
b95b9c42e2f67883e2a53d1e1e1bb4f76c20ffb2 |
23-Apr-2013 |
Michael Kolb <kolby@google.com> |
am 440e43ed: am 608f7c98: Merge "More menu fixes" into gb-ub-photos-bryce * commit '440e43ed863a22ac4205b20835e6e67222c98fa0': More menu fixes
|
328fafc75bda015174818fb7a0cfd906070401c9 |
23-Apr-2013 |
Doris Liu <tianliu@google.com> |
am 33109243: am d6e6533a: Merge "Fix for camera switcher hard to hit" into gb-ub-photos-bryce * commit '331092439db22092898321e790bba8ba62cf6266': Fix for camera switcher hard to hit
|
2c935ff958c23badc8327ddbbffc789a6ec46da2 |
23-Apr-2013 |
Doris Liu <tianliu@google.com> |
am 5d19a1c3: am ed689873: Merge "Fix camera buttons showing up at wrong position" into gb-ub-photos-bryce * commit '5d19a1c38575ee2e182bc90171a08863dcbac7ca': Fix camera buttons showing up at wrong position
|
ac7753b2d7662db06905f63a40de5694df58b2d4 |
23-Apr-2013 |
Bobby Georgescu <georgescu@google.com> |
am 5dccb63e: am ca6f04e2: Remove dead code * commit '5dccb63ecbcd869cdf06a306396c6726b726f778': Remove dead code
|
f899f4d3cd3fe10fd2626836bc28a8a1d7f70e08 |
23-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
am ae1b2a55: am d97733b2: Strings update * commit 'ae1b2a552cd76f66db4da3ac1713e4dbb584be4c': Strings update
|
beb78e7b80fc080efb6bb2d90e19c77c4365ed1c |
23-Apr-2013 |
Nicolas Roard <nicolasroard@google.com> |
am 9b407b5f: am bb894c4f: Merge "String updates." into gb-ub-photos-bryce * commit '9b407b5fba68a82f98f3d71f48c7cffec161b3fe': String updates.
|
6c183182f8cafaa57461ee07a1fad293723f9b33 |
23-Apr-2013 |
Michael Kolb <kolby@google.com> |
am 36affdf2: am 237216ee: Rename scenemode AUTO to NONE * commit '36affdf28ccc181c1151c757a57d7fdfe03ec254': Rename scenemode AUTO to NONE
|
5877e68f406b801d3d5a9b484abd0fafbcc576f6 |
23-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 413fa970: am f53eea80: Merge "Ensure consistent image thumbnail handling." into gb-ub-photos-bryce * commit '413fa9709da680b650c3c8d9ac4c5884a461fb46': Ensure consistent image thumbnail handling.
|
a5f2a1f535b69f8187a5838108f008e3b3cbaeb1 |
23-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 6e2b9c13: am afc46d5a: Merge "Fix saved video timestamps." into gb-ub-photos-bryce * commit '6e2b9c136000dcb4bf38b5c89d67e0e10d6fd696': Fix saved video timestamps.
|
fd80d7b38dc558a06ff5188ba9793dd0c0c75a32 |
23-Apr-2013 |
Chad Jones <chadj@google.com> |
am 41d628b3: Merge commit \'91d26f6c\' into jb-mr2-dev * commit '41d628b3c5bbad3cf52bfc7fac47b7b14b91b8aa':
|
22c1ab0dd33112862b85912c2518f772999c4d22 |
23-Apr-2013 |
Bart Sears <bsears@google.com> |
am 86d622f7: Bump up the version number to 1.1.40011 * commit '86d622f79e9b72b78b7d9b34c66c6ed9d83c9ea5': Bump up the version number to 1.1.40011
|
dc3aeb4696701ed6e80695241030ef43f8019d08 |
23-Apr-2013 |
Bart Sears <bsears@google.com> |
Bump up the version number to 1.1.40011 Bug: 8607157 Change-Id: I7fc2c526228d9526b0af28181b6505173bbfbd7d
ndroidManifest.xml
|
86d622f79e9b72b78b7d9b34c66c6ed9d83c9ea5 |
23-Apr-2013 |
Bart Sears <bsears@google.com> |
Bump up the version number to 1.1.40011 Bug: 8607157 Change-Id: I7fc2c526228d9526b0af28181b6505173bbfbd7d
ndroidManifest.xml
|
a815b0266cb5215726382503e14ec680eca3ee26 |
23-Apr-2013 |
Sascha Haeberling <haeberling@google.com> |
am d313bb0a: Merge "Make sure we don\'t add the pano sharing menu in the secure lock screen." into gb-ub-photos-bryce * commit 'd313bb0acf2bc8b1114180fa9a7f50d6393168a2': Make sure we don't add the pano sharing menu in the secure lock screen.
|
258d7cd035c0530b7a377a394def55311ed4d846 |
23-Apr-2013 |
Sascha Haeberling <haeberling@google.com> |
am d313bb0a: Merge "Make sure we don\'t add the pano sharing menu in the secure lock screen." into gb-ub-photos-bryce * commit 'd313bb0acf2bc8b1114180fa9a7f50d6393168a2': Make sure we don't add the pano sharing menu in the secure lock screen.
|
95040c43501306cca22c997f3d961e32b200b134 |
23-Apr-2013 |
Sascha Haeberling <haeberling@google.com> |
Merge "Make sure we don't add the pano sharing menu in the secure lock screen." into gb-ub-photos-bryce
|
d313bb0acf2bc8b1114180fa9a7f50d6393168a2 |
23-Apr-2013 |
Sascha Haeberling <haeberling@google.com> |
Merge "Make sure we don't add the pano sharing menu in the secure lock screen." into gb-ub-photos-bryce
|
6bcabca903ef1232d0363759303bd0acb72a88bf |
23-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 98698ea0: Merge "Fix wallpaper crop UI." into gb-ub-photos-bryce * commit '98698ea0dd09f0cdc4ecdc92ae4718ea60164fd2': Fix wallpaper crop UI.
|
c49f82ea893d6520bed3543a0cd749979bb7030b |
23-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 98698ea0: Merge "Fix wallpaper crop UI." into gb-ub-photos-bryce * commit '98698ea0dd09f0cdc4ecdc92ae4718ea60164fd2': Fix wallpaper crop UI.
|
ff92c5f50f65c87eac38f34bdd1fc5aa2fed4d01 |
23-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 98698ea0: Merge "Fix wallpaper crop UI." into gb-ub-photos-bryce * commit '98698ea0dd09f0cdc4ecdc92ae4718ea60164fd2': Fix wallpaper crop UI.
|
745360403e0b8e075b00db154b4f1c92c0baf5c3 |
23-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Fix wallpaper crop UI." into gb-ub-photos-bryce
|
a8168bb5e39aa524c96569d5089d8949870a1cd0 |
23-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Fix wallpaper crop UI." into gb-ub-photos-bryce
|
98698ea0dd09f0cdc4ecdc92ae4718ea60164fd2 |
23-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Fix wallpaper crop UI." into gb-ub-photos-bryce
|
3f6b05195519445ab274b684c9eec6fd16ef7057 |
23-Apr-2013 |
Sascha Haeberling <haeberling@google.com> |
Make sure we don't add the pano sharing menu in the secure lock screen. Bug: 8473022 Change-Id: Ie2221b6a660b7c9dc39cef89a509da4b2659adb3
rc/com/android/gallery3d/app/PhotoPage.java
|
8e5828374ffd5d96e7d1efeb36db1b940972b818 |
23-Apr-2013 |
Sascha Haeberling <haeberling@google.com> |
Make sure we don't add the pano sharing menu in the secure lock screen. Bug: 8473022 Change-Id: Ie2221b6a660b7c9dc39cef89a509da4b2659adb3
rc/com/android/gallery3d/app/PhotoPage.java
|
47e9331457d4d2532a2b4ed1da56d962e1ddba08 |
23-Apr-2013 |
Sascha Haeberling <haeberling@google.com> |
am 7706d294: Merge "Refactor the methods for changing the on-screen indicators." into gb-ub-photos-bryce * commit '7706d29493dc3c45cc8e4a276232177954cfe1b6': Refactor the methods for changing the on-screen indicators.
|
70093b29e8d1f413e7c31a0e99102af61f547960 |
23-Apr-2013 |
Sascha Haeberling <haeberling@google.com> |
am 7706d294: Merge "Refactor the methods for changing the on-screen indicators." into gb-ub-photos-bryce * commit '7706d29493dc3c45cc8e4a276232177954cfe1b6': Refactor the methods for changing the on-screen indicators.
|
7706d29493dc3c45cc8e4a276232177954cfe1b6 |
23-Apr-2013 |
Sascha Haeberling <haeberling@google.com> |
Merge "Refactor the methods for changing the on-screen indicators." into gb-ub-photos-bryce
|
4d6af34a6f949d7f51a12c3a0d420b250adacfff |
23-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Fix wallpaper crop UI. Bug: 8687759 Change-Id: Ice32fdabdae585fc39e78ce1f3e7e1796c5d99b3
es/values/crop_colors.xml
|
0aaddefd03cd48a9254e6a996493a3d29f9e3647 |
23-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Fix wallpaper crop UI. Bug: 8687759 Change-Id: Ice32fdabdae585fc39e78ce1f3e7e1796c5d99b3
rc/com/android/gallery3d/filtershow/crop/CropActivity.java
rc/com/android/gallery3d/filtershow/crop/CropDrawingUtils.java
rc/com/android/gallery3d/filtershow/crop/CropView.java
|
e02dc6458f039b536d74cb7cca827a04af6c9500 |
23-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Fix wallpaper crop UI. Bug: 8687759 Change-Id: Ice32fdabdae585fc39e78ce1f3e7e1796c5d99b3
es/values/crop_colors.xml
rc/com/android/gallery3d/filtershow/crop/CropActivity.java
rc/com/android/gallery3d/filtershow/crop/CropDrawingUtils.java
rc/com/android/gallery3d/filtershow/crop/CropView.java
|
8860d611aa60e7234b295a27551f659c21935198 |
22-Apr-2013 |
Baligh Uddin <baligh@google.com> |
am 15b83326: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce * commit '15b83326d22b58058b745255aade9f9bf5c09111': Import translations. DO NOT MERGE
|
38df139565d63e0f80a2752b401223fe25fdc7f9 |
22-Apr-2013 |
Baligh Uddin <baligh@google.com> |
am 15b83326: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce * commit '15b83326d22b58058b745255aade9f9bf5c09111': Import translations. DO NOT MERGE
|
836a3b3da255b564fe14170c4273fe6d111ac150 |
22-Apr-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE"
|
79c4c2192046b5dc29be7b99ac70990e81e6325c |
22-Apr-2013 |
Baligh Uddin <baligh@google.com> |
am 6fe2995e: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce * commit '6fe2995e44f38e7393ca4c12e5af5bf5b02d6297': Import translations. DO NOT MERGE
|
9870335f0e8453f829d0804ca43f4c1d0074dc08 |
22-Apr-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
|
a1c1e3a1e3e9bc3e62fd490c3a8fdd859a5d91d8 |
22-Apr-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
|
15b83326d22b58058b745255aade9f9bf5c09111 |
22-Apr-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
|
753e49b5f2de710f677cc1a39615be33998b4257 |
22-Apr-2013 |
Baligh Uddin <baligh@google.com> |
am 6fe2995e: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce * commit '6fe2995e44f38e7393ca4c12e5af5bf5b02d6297': Import translations. DO NOT MERGE
|
47d7cbaecbbc0069a2feccde7e794769af91aeaf |
22-Apr-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
|
6fe2995e44f38e7393ca4c12e5af5bf5b02d6297 |
22-Apr-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
|
49c1f208f0910763f003ba8243b32d322aeb89dd |
22-Apr-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
|
c7965e2bc8f69006de09b4be6fad61c4d2313e07 |
22-Apr-2013 |
Sascha Haeberling <haeberling@google.com> |
Refactor the methods for changing the on-screen indicators. Bug: 8609355 This will be used in PanoramaModule to set the indicators to their default values when the module is initialized. Change-Id: I02f230fb222cbbc184b9265aac75f4a3f17b4cd6
rc/com/android/camera/OnScreenIndicators.java
rc/com/android/camera/PhotoUI.java
|
e3e2554e824f1ed0b4eee9bf26ba67ae9e86abba |
22-Apr-2013 |
Sascha Haeberling <haeberling@google.com> |
Refactor the methods for changing the on-screen indicators. Bug: 8609355 This will be used in PanoramaModule to set the indicators to their default values when the module is initialized. Change-Id: I02f230fb222cbbc184b9265aac75f4a3f17b4cd6
rc/com/android/camera/OnScreenIndicators.java
rc/com/android/camera/PhotoUI.java
|
c86502577f40121dc1b5d5e56a4c1d97ee7abfe1 |
22-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 9c48a6c3: Fixes build. Removes dead code. * commit '9c48a6c30b2d663d382a8a4bc1c61ea75dfe46a1': Fixes build. Removes dead code.
|
0f51d8b8085c56b048aebd485d01de97a4414f9a |
22-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 1365eec6: Merge "Fix orientation changes for wallpaper setter." into gb-ub-photos-bryce * commit '1365eec634694796c1e3432abff54dd658bd4641': Fix orientation changes for wallpaper setter.
|
1bb252743ea2072fb24876204ee8413ae05f3457 |
22-Apr-2013 |
Michael Kolb <kolby@google.com> |
am 608f7c98: Merge "More menu fixes" into gb-ub-photos-bryce * commit '608f7c9843f48aeccc1678622dc3327958150c31': More menu fixes
|
f47c8b2dd79739e12dcf8ced120ee3842ddae339 |
22-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 4a6dc2b1: Merge "Reenables crop aspect ratio menu." into gb-ub-photos-bryce * commit '4a6dc2b147af34ab4545f6f647b4038c64fc80d0': Reenables crop aspect ratio menu.
|
b1c6f02f5041cad04b7ec89a130493e70b5a9879 |
22-Apr-2013 |
Michael Kolb <kolby@google.com> |
am 608f7c98: Merge "More menu fixes" into gb-ub-photos-bryce * commit '608f7c9843f48aeccc1678622dc3327958150c31': More menu fixes
|
66a7d8df79df7a8ac475a1fed4777d101ccd5bda |
22-Apr-2013 |
Doris Liu <tianliu@google.com> |
am d6e6533a: Merge "Fix for camera switcher hard to hit" into gb-ub-photos-bryce * commit 'd6e6533a054ea526021c3331a18f93a618442f13': Fix for camera switcher hard to hit
|
88ac4e7bdb3f367ec55c2f41f80f69648919cf33 |
22-Apr-2013 |
Doris Liu <tianliu@google.com> |
am d6e6533a: Merge "Fix for camera switcher hard to hit" into gb-ub-photos-bryce * commit 'd6e6533a054ea526021c3331a18f93a618442f13': Fix for camera switcher hard to hit
|
e6f866b0cbdaf1d51444bcc30600313c511a6c57 |
22-Apr-2013 |
Doris Liu <tianliu@google.com> |
am ed689873: Merge "Fix camera buttons showing up at wrong position" into gb-ub-photos-bryce * commit 'ed689873c9da338859dc8858c08afa4fa31578f2': Fix camera buttons showing up at wrong position
|
50ec4c264fb010a413b32f65b4db094ab8e13758 |
22-Apr-2013 |
Bobby Georgescu <georgescu@google.com> |
am ca6f04e2: Remove dead code * commit 'ca6f04e27bbcab953bd3f9dcf50476a1c4b70aac': Remove dead code
|
277545df5b36531331f0b67d8025bf49e095f1ed |
22-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
am d97733b2: Strings update * commit 'd97733b2d3cd1fe7398bb399a1fbd227ef0ba746': Strings update
|
124eb7bebb7c954eaa1fff807c415482bb8d96e4 |
22-Apr-2013 |
Nicolas Roard <nicolasroard@google.com> |
am bb894c4f: Merge "String updates." into gb-ub-photos-bryce * commit 'bb894c4f321b27ede8e97c42117973376bbaf32f': String updates.
|
9d1563064200b3268112df5e5be4ecc5afa144f5 |
22-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am f53eea80: Merge "Ensure consistent image thumbnail handling." into gb-ub-photos-bryce * commit 'f53eea80c773a1686631f9e2ec6edab23c8944b5': Ensure consistent image thumbnail handling.
|
04641e628e487285de20a4041f1406a406191b91 |
22-Apr-2013 |
Michael Kolb <kolby@google.com> |
am 237216ee: Rename scenemode AUTO to NONE * commit '237216eeba5c05d63aa075ac8dc4af423044f302': Rename scenemode AUTO to NONE
|
e462c52ea24a4458244f031ef143561f6767016b |
22-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am afc46d5a: Merge "Fix saved video timestamps." into gb-ub-photos-bryce * commit 'afc46d5a608ccfc1f370cc705e0c27eb0b678ded': Fix saved video timestamps.
|
f5680df00ebd06172efeca4149af633e9aa02fad |
22-Apr-2013 |
John Hoford <hoford@google.com> |
am 91d26f6c: tiny planet fix * commit '91d26f6c3b183862eeffc1856e2d758e800d13f4': tiny planet fix
|
f61e5fdd4c946f671b391e3022c1d5be51eabc79 |
22-Apr-2013 |
John Hoford <hoford@google.com> |
am 91d26f6c: tiny planet fix * commit '91d26f6c3b183862eeffc1856e2d758e800d13f4': tiny planet fix
|
08a11bddeb561f9f4c9ef26f8ea65865b2ecee3f |
22-Apr-2013 |
Michael Kolb <kolby@google.com> |
am beba6b1c: Merge "Fix labels" into gb-ub-photos-bryce * commit 'beba6b1c36f79aded98f71dbf45454dd947ce7b8': Fix labels
|
ebda34f3d637fe87fa2aa01353fed9277ce86fc0 |
22-Apr-2013 |
Angus Kong <shkong@google.com> |
am 935d4c80: Merge "Make MediaSaveService destroyed after unbound." into gb-ub-photos-bryce * commit '935d4c8037d7b5f56e4dea1c96bd8f4b68cb6236': Make MediaSaveService destroyed after unbound.
|
5387b8f1ec2ba18946811149c3bc23a6ef58ce1d |
22-Apr-2013 |
Angus Kong <shkong@google.com> |
am ca3875b2: Merge "Save video using MediaSaveService." into gb-ub-photos-bryce * commit 'ca3875b21375defd0d42c57c05994cd67f0d59cd': Save video using MediaSaveService.
|
2b8c1c3300fa4c152a0702e0d5ff51517d5ed054 |
22-Apr-2013 |
Bobby Georgescu <georgescu@google.com> |
am faf2f040: Fix multi selection issue * commit 'faf2f040f38532213fa237cf45c9794cf1a85859': Fix multi selection issue
|
ba6b16d99b0faf438ae557a8fdc478101ac75643 |
22-Apr-2013 |
Michael Kolb <kolby@google.com> |
am 32049103: Merge "Lock camera orientation using FW API" into gb-ub-photos-bryce * commit '32049103305c99e8be1f7af3e46933277e02a7c3': Lock camera orientation using FW API
|
c04b516ed7c9a90973bd50d62e00f70318e00a5e |
22-Apr-2013 |
Angus Kong <shkong@google.com> |
am 45826e18: Merge "Pass the camera to recorders after all is set." into gb-ub-photos-bryce * commit '45826e188598cd6171fc0ec3112e2fbf52fbc952': Pass the camera to recorders after all is set.
|
d59c1784bb3715bed55eb5386e6ec535b0499ebc |
22-Apr-2013 |
Doris Liu <tianliu@google.com> |
am b1051814: Merge "Fix memory leak in pie controller" into gb-ub-photos-bryce * commit 'b10518142bb84abe2ffe1bd3aa10ff4ee7982370': Fix memory leak in pie controller
|
03109433ea28355fb98d9c80243463f1e19c1e37 |
22-Apr-2013 |
Doris Liu <tianliu@google.com> |
am 14fe2887: Merge "Allow swiping to filmstrip from blocker bar" into gb-ub-photos-bryce * commit '14fe288784c574c84edbf84306329dc8b70d8b4d': Allow swiping to filmstrip from blocker bar
|
98a72bbed3a052782e6f7f01ab5ee560b92ef49c |
22-Apr-2013 |
Doris Liu <tianliu@google.com> |
am 14fe2887: Merge "Allow swiping to filmstrip from blocker bar" into gb-ub-photos-bryce * commit '14fe288784c574c84edbf84306329dc8b70d8b4d': Allow swiping to filmstrip from blocker bar
|
96fc6a6aa9497d88a04f0f13ba64ae69399b0ad3 |
22-Apr-2013 |
Michael Kolb <kolby@google.com> |
am a7e098c8: Merge "Drop in new assets of correct size" into gb-ub-photos-bryce * commit 'a7e098c8e798160fdc2410867ec7eba325b7cd96': Drop in new assets of correct size
|
00d843b89f8d90b19f99bc8af9add53f15886811 |
22-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 316af8dd: Merge "Fix crop activity aspect ratio and orientation handling." into gb-ub-photos-bryce * commit '316af8dd675d777f4bd9512b8af5391c7c89363f': Fix crop activity aspect ratio and orientation handling.
|
cd2114728c5c9ea938aece6648ee3369fccccfcc |
22-Apr-2013 |
repo sync <hoford@google.com> |
resolved conflicts for merge of a1939d22 to gb-ub-photos-carlsbad Change-Id: Ic6759448c932823720021e85e1232736ff2085f8
|
d4030b19d30b0f72ec85b8506bdbac62aee43880 |
22-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 9c48a6c3: Fixes build. Removes dead code. * commit '9c48a6c30b2d663d382a8a4bc1c61ea75dfe46a1': Fixes build. Removes dead code.
|
9c48a6c30b2d663d382a8a4bc1c61ea75dfe46a1 |
22-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Fixes build. Removes dead code. Change-Id: Ieef56407304254235295d81e09e55f1cd69b87cb
rc/com/android/gallery3d/filtershow/imageshow/ImageCrop.java
|
37c006fc72a6a3f849545587ad85c82466862bc4 |
22-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Fixes build. Removes dead code. Change-Id: Ieef56407304254235295d81e09e55f1cd69b87cb
rc/com/android/gallery3d/filtershow/imageshow/ImageCrop.java
|
d0bb5087cc502187b12e6471db0f60343cc1400d |
22-Apr-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ibc399c5be99f22c4fc4fb1e42545a2eb574ae2d5 Auto-generated-cl: translation import
es/values-af/filtershow_strings.xml
es/values-am/filtershow_strings.xml
es/values-ar/filtershow_strings.xml
es/values-be/filtershow_strings.xml
es/values-bg/filtershow_strings.xml
es/values-ca/filtershow_strings.xml
es/values-cs/filtershow_strings.xml
es/values-da/filtershow_strings.xml
es/values-de/filtershow_strings.xml
es/values-el/filtershow_strings.xml
es/values-en-rGB/filtershow_strings.xml
es/values-es-rUS/filtershow_strings.xml
es/values-es/filtershow_strings.xml
es/values-et/filtershow_strings.xml
es/values-fa/filtershow_strings.xml
es/values-fi/filtershow_strings.xml
es/values-fr/filtershow_strings.xml
es/values-hi/filtershow_strings.xml
es/values-hr/filtershow_strings.xml
es/values-hu/filtershow_strings.xml
es/values-in/filtershow_strings.xml
es/values-it/filtershow_strings.xml
es/values-iw/filtershow_strings.xml
es/values-ja/filtershow_strings.xml
es/values-ko/filtershow_strings.xml
es/values-lt/filtershow_strings.xml
es/values-lv/filtershow_strings.xml
es/values-ms/filtershow_strings.xml
es/values-nb/filtershow_strings.xml
es/values-nl/filtershow_strings.xml
es/values-pl/filtershow_strings.xml
es/values-pt-rPT/filtershow_strings.xml
es/values-pt/filtershow_strings.xml
es/values-ro/filtershow_strings.xml
es/values-ru/filtershow_strings.xml
es/values-sk/filtershow_strings.xml
es/values-sl/filtershow_strings.xml
es/values-sr/filtershow_strings.xml
es/values-sv/filtershow_strings.xml
es/values-sw/filtershow_strings.xml
es/values-th/filtershow_strings.xml
es/values-tl/filtershow_strings.xml
es/values-tr/filtershow_strings.xml
es/values-uk/filtershow_strings.xml
es/values-vi/filtershow_strings.xml
es/values-zh-rCN/filtershow_strings.xml
es/values-zh-rTW/filtershow_strings.xml
es/values-zu/filtershow_strings.xml
|
3cf288eb96616b059f4789004dfaa8dac75b344d |
22-Apr-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I48df56ff30fe3834e152f051ac9ee30c36e69a15 Auto-generated-cl: translation import
es/values-af/filtershow_strings.xml
es/values-am/filtershow_strings.xml
es/values-ar/filtershow_strings.xml
es/values-be/filtershow_strings.xml
es/values-bg/filtershow_strings.xml
es/values-ca/filtershow_strings.xml
es/values-cs/filtershow_strings.xml
es/values-da/filtershow_strings.xml
es/values-de/filtershow_strings.xml
es/values-el/filtershow_strings.xml
es/values-en-rGB/filtershow_strings.xml
es/values-es-rUS/filtershow_strings.xml
es/values-es/filtershow_strings.xml
es/values-et/filtershow_strings.xml
es/values-fa/filtershow_strings.xml
es/values-fi/filtershow_strings.xml
es/values-fr/filtershow_strings.xml
es/values-hi/filtershow_strings.xml
es/values-hr/filtershow_strings.xml
es/values-hu/filtershow_strings.xml
es/values-in/filtershow_strings.xml
es/values-it/filtershow_strings.xml
es/values-iw/filtershow_strings.xml
es/values-ja/filtershow_strings.xml
es/values-ko/filtershow_strings.xml
es/values-lt/filtershow_strings.xml
es/values-lv/filtershow_strings.xml
es/values-ms/filtershow_strings.xml
es/values-nb/filtershow_strings.xml
es/values-nl/filtershow_strings.xml
es/values-pl/filtershow_strings.xml
es/values-pt-rPT/filtershow_strings.xml
es/values-pt/filtershow_strings.xml
es/values-ro/filtershow_strings.xml
es/values-ru/filtershow_strings.xml
es/values-sk/filtershow_strings.xml
es/values-sl/filtershow_strings.xml
es/values-sr/filtershow_strings.xml
es/values-sv/filtershow_strings.xml
es/values-sw/filtershow_strings.xml
es/values-th/filtershow_strings.xml
es/values-tl/filtershow_strings.xml
es/values-tr/filtershow_strings.xml
es/values-uk/filtershow_strings.xml
es/values-vi/filtershow_strings.xml
es/values-zh-rCN/filtershow_strings.xml
es/values-zh-rTW/filtershow_strings.xml
es/values-zu/filtershow_strings.xml
|
05a6c10ba3c1b6b3b5af9c12e1d165354fb444a8 |
22-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 1365eec6: Merge "Fix orientation changes for wallpaper setter." into gb-ub-photos-bryce * commit '1365eec634694796c1e3432abff54dd658bd4641': Fix orientation changes for wallpaper setter.
|
266b223b0d4cbb06a5cca64bb48b20737dfba9ff |
22-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 4a6dc2b1: Merge "Reenables crop aspect ratio menu." into gb-ub-photos-bryce * commit '4a6dc2b147af34ab4545f6f647b4038c64fc80d0': Reenables crop aspect ratio menu.
|
6b16364b3590740b22a32af4cc0fc93f4a8f860e |
22-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Fix orientation changes for wallpaper setter." into gb-ub-photos-bryce
|
1365eec634694796c1e3432abff54dd658bd4641 |
22-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Fix orientation changes for wallpaper setter." into gb-ub-photos-bryce
|
16779a31155001a39014bf51924123c0ead5c59f |
22-Apr-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I29d0fd49904f33631aeb4f77e1e0174186d99e88 Auto-generated-cl: translation import
es/values-af/filtershow_strings.xml
es/values-am/filtershow_strings.xml
es/values-ar/filtershow_strings.xml
es/values-be/filtershow_strings.xml
es/values-bg/filtershow_strings.xml
es/values-ca/filtershow_strings.xml
es/values-cs/filtershow_strings.xml
es/values-da/filtershow_strings.xml
es/values-de/filtershow_strings.xml
es/values-el/filtershow_strings.xml
es/values-en-rGB/filtershow_strings.xml
es/values-es-rUS/filtershow_strings.xml
es/values-es/filtershow_strings.xml
es/values-et/filtershow_strings.xml
es/values-fa/filtershow_strings.xml
es/values-fi/filtershow_strings.xml
es/values-fr/filtershow_strings.xml
es/values-hi/filtershow_strings.xml
es/values-hr/filtershow_strings.xml
es/values-hu/filtershow_strings.xml
es/values-in/filtershow_strings.xml
es/values-it/filtershow_strings.xml
es/values-iw/filtershow_strings.xml
es/values-ja/filtershow_strings.xml
es/values-ko/filtershow_strings.xml
es/values-lt/filtershow_strings.xml
es/values-lv/filtershow_strings.xml
es/values-ms/filtershow_strings.xml
es/values-nb/filtershow_strings.xml
es/values-nl/filtershow_strings.xml
es/values-pl/filtershow_strings.xml
es/values-pt-rPT/filtershow_strings.xml
es/values-pt/filtershow_strings.xml
es/values-ro/filtershow_strings.xml
es/values-ru/filtershow_strings.xml
es/values-sk/filtershow_strings.xml
es/values-sl/filtershow_strings.xml
es/values-sr/filtershow_strings.xml
es/values-sv/filtershow_strings.xml
es/values-sw/filtershow_strings.xml
es/values-th/filtershow_strings.xml
es/values-tl/filtershow_strings.xml
es/values-tr/filtershow_strings.xml
es/values-uk/filtershow_strings.xml
es/values-vi/filtershow_strings.xml
es/values-zh-rCN/filtershow_strings.xml
es/values-zh-rTW/filtershow_strings.xml
es/values-zu/filtershow_strings.xml
|
40c7f1b0cf75e4efb6d3f09990f572cd212463da |
22-Apr-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I29d0fd49904f33631aeb4f77e1e0174186d99e88 Auto-generated-cl: translation import
es/values-af/filtershow_strings.xml
es/values-am/filtershow_strings.xml
es/values-ar/filtershow_strings.xml
es/values-be/filtershow_strings.xml
es/values-bg/filtershow_strings.xml
es/values-ca/filtershow_strings.xml
es/values-cs/filtershow_strings.xml
es/values-da/filtershow_strings.xml
es/values-de/filtershow_strings.xml
es/values-el/filtershow_strings.xml
es/values-en-rGB/filtershow_strings.xml
es/values-es-rUS/filtershow_strings.xml
es/values-es/filtershow_strings.xml
es/values-et/filtershow_strings.xml
es/values-fa/filtershow_strings.xml
es/values-fi/filtershow_strings.xml
es/values-fr/filtershow_strings.xml
es/values-hi/filtershow_strings.xml
es/values-hr/filtershow_strings.xml
es/values-hu/filtershow_strings.xml
es/values-in/filtershow_strings.xml
es/values-it/filtershow_strings.xml
es/values-iw/filtershow_strings.xml
es/values-ja/filtershow_strings.xml
es/values-ko/filtershow_strings.xml
es/values-lt/filtershow_strings.xml
es/values-lv/filtershow_strings.xml
es/values-ms/filtershow_strings.xml
es/values-nb/filtershow_strings.xml
es/values-nl/filtershow_strings.xml
es/values-pl/filtershow_strings.xml
es/values-pt-rPT/filtershow_strings.xml
es/values-pt/filtershow_strings.xml
es/values-ro/filtershow_strings.xml
es/values-ru/filtershow_strings.xml
es/values-sk/filtershow_strings.xml
es/values-sl/filtershow_strings.xml
es/values-sr/filtershow_strings.xml
es/values-sv/filtershow_strings.xml
es/values-sw/filtershow_strings.xml
es/values-th/filtershow_strings.xml
es/values-tl/filtershow_strings.xml
es/values-tr/filtershow_strings.xml
es/values-uk/filtershow_strings.xml
es/values-vi/filtershow_strings.xml
es/values-zh-rCN/filtershow_strings.xml
es/values-zh-rTW/filtershow_strings.xml
es/values-zu/filtershow_strings.xml
|
5737ed9f333fdff0a99150a21c70c9abea4f1f97 |
22-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Reenables crop aspect ratio menu." into gb-ub-photos-bryce
|
4a6dc2b147af34ab4545f6f647b4038c64fc80d0 |
22-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Reenables crop aspect ratio menu." into gb-ub-photos-bryce
|
5adc61bfa652f2d977921c8985d666b2e28531ba |
22-Apr-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I042daabca1f112762baf91d91fd9d23cf24da9ec Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
89c1a2b6349168e6784fec9452bef1623ab1d29a |
22-Apr-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I53e202c86e4d6850682879ca557129a8aa74f61b Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
dc99adcab749628be9e115606e7015fcc7945f4d |
22-Apr-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I5792f361b2f301c4acf5ef80fd33d149acc081dd Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
560f34f598b75141e3160b64f73583a4928a0bf1 |
22-Apr-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I5792f361b2f301c4acf5ef80fd33d149acc081dd Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
2825e69fca018b7831bbd91cd43c642a4450681e |
22-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Fix orientation changes for wallpaper setter. Bug: 8670036 Change-Id: I44932bcc8cd8b89686186e42fa1eb2644af87b47
rc/com/android/gallery3d/filtershow/crop/CropActivity.java
|
87151ce304c45d67e1e578816edb864b95d09edf |
22-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Fix orientation changes for wallpaper setter. Bug: 8670036 Change-Id: I44932bcc8cd8b89686186e42fa1eb2644af87b47
rc/com/android/gallery3d/filtershow/crop/CropActivity.java
|
d2c74cea2cccb8c1b862478a456c3a7e3408805b |
22-Apr-2013 |
Michael Kolb <kolby@google.com> |
am 608f7c98: Merge "More menu fixes" into gb-ub-photos-bryce * commit '608f7c9843f48aeccc1678622dc3327958150c31': More menu fixes
|
2ab0ce034ac33477ceb3e403d0a14af29c52c881 |
22-Apr-2013 |
Michael Kolb <kolby@google.com> |
Merge "More menu fixes" into gb-ub-photos-bryce
|
53fc9e17ce4b1e64f8fa53f6921cef304a39e1da |
22-Apr-2013 |
Michael Kolb <kolby@google.com> |
Merge "More menu fixes" into gb-ub-photos-bryce
|
608f7c9843f48aeccc1678622dc3327958150c31 |
22-Apr-2013 |
Michael Kolb <kolby@google.com> |
Merge "More menu fixes" into gb-ub-photos-bryce
|
1db4eb03e115872c7e04780f0993b07259cbdd11 |
20-Apr-2013 |
Michael Kolb <kolby@google.com> |
More menu fixes Bug: 8660834 Add label dropshadow, reposition fixed menu Adjust dead zone and angle Change-Id: I7d62c03bcdcdec6268ef805f56114327f471b6d7
es/values/dimens.xml
|
f465110e4b8ed787589e052e5ac746c588c5ac8f |
20-Apr-2013 |
Michael Kolb <kolby@google.com> |
More menu fixes Bug: 8660834 Add label dropshadow, reposition fixed menu Adjust dead zone and angle Change-Id: I7d62c03bcdcdec6268ef805f56114327f471b6d7
rc/com/android/camera/drawable/TextDrawable.java
rc/com/android/camera/ui/PieRenderer.java
|
ed97a5eb29908a05f39fa28477a09990db9fb3ee |
20-Apr-2013 |
Michael Kolb <kolby@google.com> |
More menu fixes Bug: 8660834 Add label dropshadow, reposition fixed menu Adjust dead zone and angle Change-Id: I7d62c03bcdcdec6268ef805f56114327f471b6d7
es/values/dimens.xml
rc/com/android/camera/drawable/TextDrawable.java
rc/com/android/camera/ui/PieRenderer.java
|
355677d1312bbd33fa6e6f2fe29f8e6cafde0981 |
22-Apr-2013 |
Doris Liu <tianliu@google.com> |
am d6e6533a: Merge "Fix for camera switcher hard to hit" into gb-ub-photos-bryce * commit 'd6e6533a054ea526021c3331a18f93a618442f13': Fix for camera switcher hard to hit
|
c9ebdd1fdc967a5a4d6c8f56e109e4cd5d9cd135 |
22-Apr-2013 |
Doris Liu <tianliu@google.com> |
am ed689873: Merge "Fix camera buttons showing up at wrong position" into gb-ub-photos-bryce * commit 'ed689873c9da338859dc8858c08afa4fa31578f2': Fix camera buttons showing up at wrong position
|
dc9f3b4a314423bab8d7e18ec7066f7ca3f07188 |
22-Apr-2013 |
Bobby Georgescu <georgescu@google.com> |
am ca6f04e2: Remove dead code * commit 'ca6f04e27bbcab953bd3f9dcf50476a1c4b70aac': Remove dead code
|
9523e9148356c875044512ad3a321490b665fbda |
22-Apr-2013 |
Doris Liu <tianliu@google.com> |
Merge "Fix for camera switcher hard to hit" into gb-ub-photos-bryce
|
d6e6533a054ea526021c3331a18f93a618442f13 |
22-Apr-2013 |
Doris Liu <tianliu@google.com> |
Merge "Fix for camera switcher hard to hit" into gb-ub-photos-bryce
|
d4883e406ad43df815ede45e9aff23c6a4aa4457 |
22-Apr-2013 |
Doris Liu <tianliu@google.com> |
Merge "Fix camera buttons showing up at wrong position" into gb-ub-photos-bryce
|
ed689873c9da338859dc8858c08afa4fa31578f2 |
22-Apr-2013 |
Doris Liu <tianliu@google.com> |
Merge "Fix camera buttons showing up at wrong position" into gb-ub-photos-bryce
|
668675b64fa3fe88585b9808678352b77b3aaceb |
22-Apr-2013 |
The Android Automerger <android-build@android.com> |
merge in jb-mr2-release history after reset to jb-mr2-dev
|
acad574d1c2f3c09b4794720921fcc9b2607f1a9 |
20-Apr-2013 |
Doris Liu <tianliu@google.com> |
Fix for camera switcher hard to hit Bug: 8667079 Change-Id: I9d40617f4e3bcfcd810223d818b212d335c80707
rc/com/android/camera/PreviewGestures.java
|
8afd3b1f1ec70ea110bf99e3948cc2d7343680ea |
20-Apr-2013 |
Doris Liu <tianliu@google.com> |
Fix for camera switcher hard to hit Bug: 8667079 Change-Id: I9d40617f4e3bcfcd810223d818b212d335c80707
rc/com/android/camera/PreviewGestures.java
|
faff668b6f7d0e5d35a65aa926f3af589da6289e |
20-Apr-2013 |
Doris Liu <tianliu@google.com> |
Fix for camera switcher hard to hit Bug: 8667079 Change-Id: I9d40617f4e3bcfcd810223d818b212d335c80707
rc/com/android/camera/PreviewGestures.java
|
3b148d0e719a6ae42c0147bdf63fe0c14cff2fd8 |
20-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Reenables crop aspect ratio menu. Bug: 8471812 Change-Id: I50044f4c787ba326e24f67c5370e1f8a220eb005
rc/com/android/gallery3d/filtershow/editors/EditorCrop.java
rc/com/android/gallery3d/filtershow/imageshow/ImageCrop.java
|
b08acdc5bf6b6fd937636434fa28849ef0a8c040 |
20-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Reenables crop aspect ratio menu. Bug: 8471812 Change-Id: I50044f4c787ba326e24f67c5370e1f8a220eb005
rc/com/android/gallery3d/filtershow/editors/EditorCrop.java
rc/com/android/gallery3d/filtershow/imageshow/ImageCrop.java
|
bec9cf0afe17d4fc26b4d8b6b5c7d95549bb35fe |
20-Apr-2013 |
Doris Liu <tianliu@google.com> |
Fix camera buttons showing up at wrong position Bug: 8607034 Change-Id: Ia796a9f5e56fd0566e2f4853ec48b9371e8134e2
rc/com/android/camera/ui/RotatableLayout.java
|
1f17ec30d1b6b0d976d5dd3857bd305aaa8923ee |
20-Apr-2013 |
Doris Liu <tianliu@google.com> |
Fix camera buttons showing up at wrong position Bug: 8607034 Change-Id: Ia796a9f5e56fd0566e2f4853ec48b9371e8134e2
rc/com/android/camera/ui/RotatableLayout.java
|
79c3d920a138728fe5e64cfb90037df8c1af9949 |
20-Apr-2013 |
Bobby Georgescu <georgescu@google.com> |
Remove dead code Bug: 8672542 Change-Id: Ia6046b17f8ae77ffe6b8090b5fbd1dda2bc0327e
rc/com/android/gallery3d/app/AbstractGalleryActivity.java
rc_pd/com/android/gallery3d/util/UsageStatistics.java
|
ca6f04e27bbcab953bd3f9dcf50476a1c4b70aac |
20-Apr-2013 |
Bobby Georgescu <georgescu@google.com> |
Remove dead code Bug: 8672542 Change-Id: Ia6046b17f8ae77ffe6b8090b5fbd1dda2bc0327e
rc/com/android/gallery3d/app/AbstractGalleryActivity.java
rc_pd/com/android/gallery3d/util/UsageStatistics.java
|
97e89d957057816d92b7e0eb305c7b0537cfe553 |
20-Apr-2013 |
Chad Jones <chadj@google.com> |
am 0a6b7bb8: Merge commit \'91d26f6c\' into jb-mr2-dev-plus-aosp * commit '0a6b7bb8a963182ba54833a0e8a79b94350271eb':
|
2419584ccd9bcf2d642dfb625c2eed1b31c2aa8a |
20-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
am d97733b2: Strings update * commit 'd97733b2d3cd1fe7398bb399a1fbd227ef0ba746': Strings update
|
631ed303262a790872e1a155d2b80d1a882535cc |
20-Apr-2013 |
Nicolas Roard <nicolasroard@google.com> |
am bb894c4f: Merge "String updates." into gb-ub-photos-bryce * commit 'bb894c4f321b27ede8e97c42117973376bbaf32f': String updates.
|
9ad178b7434a42c3b14802f1fdca23d443bff94f |
20-Apr-2013 |
Michael Kolb <kolby@google.com> |
am 237216ee: Rename scenemode AUTO to NONE * commit '237216eeba5c05d63aa075ac8dc4af423044f302': Rename scenemode AUTO to NONE
|
29fb0622ae25bb0a8c12d196dd90284333432d7a |
20-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am f53eea80: Merge "Ensure consistent image thumbnail handling." into gb-ub-photos-bryce * commit 'f53eea80c773a1686631f9e2ec6edab23c8944b5': Ensure consistent image thumbnail handling.
|
59f0370bd4299f8d3c9613b48ba115d8026a14d7 |
20-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am afc46d5a: Merge "Fix saved video timestamps." into gb-ub-photos-bryce * commit 'afc46d5a608ccfc1f370cc705e0c27eb0b678ded': Fix saved video timestamps.
|
147128a6292e2445b328f0d731a7398816ed2beb |
20-Apr-2013 |
Chad Jones <chadj@google.com> |
Merge commit '91d26f6c'
|
c3238f2d7ccfd67e6fe0430830ab9ac573c938a3 |
20-Apr-2013 |
Chad Jones <chadj@google.com> |
Merge commit '91d26f6c' into jb-mr2-dev
|
f131bcc350ce41eb8900bc4f7a0be04b2b082162 |
20-Apr-2013 |
Chad Jones <chadj@google.com> |
Merge commit '91d26f6c' into jb-mr2-dev-plus-aosp
|
568c6e9947fac1237c8f1e8df1bc4009efb8ed0a |
20-Apr-2013 |
Chad Jones <chadj@google.com> |
Merge commit 'd76366be'
|
ae5ec8e93167f3b5e925809631421202edc4425d |
20-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
Strings update bug:8664728 Change-Id: I8844ebb6557bbc5e8ea31277f164fdb61afadfd9
es/values/filtershow_strings.xml
|
d97733b2d3cd1fe7398bb399a1fbd227ef0ba746 |
20-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
Strings update bug:8664728 Change-Id: I8844ebb6557bbc5e8ea31277f164fdb61afadfd9
es/values/filtershow_strings.xml
|
f6e11c6d41fa5998285686882a0e87f8104212b7 |
20-Apr-2013 |
Nicolas Roard <nicolasroard@google.com> |
Merge "String updates." into gb-ub-photos-bryce
|
bb894c4f321b27ede8e97c42117973376bbaf32f |
20-Apr-2013 |
Nicolas Roard <nicolasroard@google.com> |
Merge "String updates." into gb-ub-photos-bryce
|
c0c9003aa0865c1688800f463d24e95cf4a1b966 |
20-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
String updates. Bug: 8664728 Change-Id: Idc23ab0d75a9f1656c5e38a0b0e318a63d6875b5
es/values/filtershow_strings.xml
|
a9c280328d36b5c7d6feda96432071af78ebfc50 |
20-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
String updates. Bug: 8664728 Change-Id: Idc23ab0d75a9f1656c5e38a0b0e318a63d6875b5
es/values/filtershow_strings.xml
|
52508fbc87d6c4c6d9fbc1cd776b8b7ebeaf15ac |
20-Apr-2013 |
Michael Kolb <kolby@google.com> |
Rename scenemode AUTO to NONE Bug: 8660834 Change-Id: Ia2900821c5983d3e4fe3a6aeab720f2070c7ebfa
es/values/strings.xml
|
237216eeba5c05d63aa075ac8dc4af423044f302 |
20-Apr-2013 |
Michael Kolb <kolby@google.com> |
Rename scenemode AUTO to NONE Bug: 8660834 Change-Id: Ia2900821c5983d3e4fe3a6aeab720f2070c7ebfa
es/values/strings.xml
|
2429727fc3e751edec61042846ae268ec70ea2e6 |
20-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Ensure consistent image thumbnail handling." into gb-ub-photos-bryce
|
f53eea80c773a1686631f9e2ec6edab23c8944b5 |
20-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Ensure consistent image thumbnail handling." into gb-ub-photos-bryce
|
a7738962015e19cc7d5c43629ed679990628b016 |
20-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Fix saved video timestamps." into gb-ub-photos-bryce
|
afc46d5a608ccfc1f370cc705e0c27eb0b678ded |
20-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Fix saved video timestamps." into gb-ub-photos-bryce
|
3ed2bf8291df2606d84dc5b6a1735d1c2bd5364e |
20-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Ensure consistent image thumbnail handling. Bug: 7192433 Change-Id: Ie86ade06b7234681a0d955a87cacfb337bc39145
rc/com/android/gallery3d/filtershow/tools/SaveCopyTask.java
|
aee6dffcadf2a5387fde1c9c123698f602d9bb18 |
20-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Ensure consistent image thumbnail handling. Bug: 7192433 Change-Id: Ie86ade06b7234681a0d955a87cacfb337bc39145
rc/com/android/gallery3d/filtershow/tools/SaveCopyTask.java
|
1600796a43cf584b3db49c5f21ec103529d7368d |
20-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Fix saved video timestamps. Bug: 8002939 Change-Id: I771b2b4082acd19bbf9b52c65f51da9489827c18
rc/com/android/camera/VideoModule.java
|
767962b715249b8a0cad0eea172a36bd1ba4a441 |
20-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Fix saved video timestamps. Bug: 8002939 Change-Id: I771b2b4082acd19bbf9b52c65f51da9489827c18
rc/com/android/camera/VideoModule.java
|
4f6bf7a888db6603a21eedae6f1ce4bd179d76b6 |
19-Apr-2013 |
John Hoford <hoford@google.com> |
tiny planet fix bug:8323524 Change-Id: I39283face7079574dbe25e797323a84141930f9a
ni/filters/tinyplanet.cc
|
be3e14d561ed1033fa44526ab83b170cfae45b4f |
19-Apr-2013 |
John Hoford <hoford@google.com> |
tiny planet fix bug:8323524 Change-Id: I39283face7079574dbe25e797323a84141930f9a
rc/com/android/gallery3d/filtershow/filters/FilterTinyPlanetRepresentation.java
rc/com/android/gallery3d/filtershow/presets/FilterEnvironment.java
|
55afc2dcadf2f88774fbbe2eb7b11a5639b9fa29 |
19-Apr-2013 |
John Hoford <hoford@google.com> |
tiny planet fix bug:8323524 Change-Id: I39283face7079574dbe25e797323a84141930f9a
rc/com/android/gallery3d/filtershow/EditorPlaceHolder.java
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/cache/CachingPipeline.java
rc/com/android/gallery3d/filtershow/cache/TripleBufferBitmap.java
rc/com/android/gallery3d/filtershow/editors/Editor.java
rc/com/android/gallery3d/filtershow/editors/EditorTinyPlanet.java
rc/com/android/gallery3d/filtershow/editors/ParametricEditor.java
rc/com/android/gallery3d/filtershow/filters/FilterTinyPlanetRepresentation.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterTinyPlanet.java
rc/com/android/gallery3d/filtershow/imageshow/ImageTinyPlanet.java
rc/com/android/gallery3d/filtershow/presets/FilterEnvironment.java
|
91d26f6c3b183862eeffc1856e2d758e800d13f4 |
19-Apr-2013 |
John Hoford <hoford@google.com> |
tiny planet fix bug:8323524 Change-Id: I39283face7079574dbe25e797323a84141930f9a
ni/filters/tinyplanet.cc
rc/com/android/gallery3d/filtershow/EditorPlaceHolder.java
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/cache/CachingPipeline.java
rc/com/android/gallery3d/filtershow/cache/TripleBufferBitmap.java
rc/com/android/gallery3d/filtershow/editors/Editor.java
rc/com/android/gallery3d/filtershow/editors/EditorTinyPlanet.java
rc/com/android/gallery3d/filtershow/editors/ParametricEditor.java
rc/com/android/gallery3d/filtershow/filters/FilterTinyPlanetRepresentation.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterTinyPlanet.java
rc/com/android/gallery3d/filtershow/imageshow/ImageTinyPlanet.java
rc/com/android/gallery3d/filtershow/presets/FilterEnvironment.java
|
eeb5b71b03dbe1b6e43528bdeafe1cc23089be0e |
19-Apr-2013 |
John Reck <jreck@google.com> |
Merge "Remove photos from gallery2 manifest" into gb-ub-photos-bryce
|
cf3285ee0ba48a6773863bdc27a636d3a928e1d7 |
19-Apr-2013 |
Michael Kolb <kolby@google.com> |
am 7530c16b: am beba6b1c: Merge "Fix labels" into gb-ub-photos-bryce * commit '7530c16b98f03930c6f644853f97eb6bfa7819b7': Fix labels
|
4ef33a71724f924a4502d4b9fad57a37892e4b17 |
19-Apr-2013 |
Michael Kolb <kolby@google.com> |
am beba6b1c: Merge "Fix labels" into gb-ub-photos-bryce * commit 'beba6b1c36f79aded98f71dbf45454dd947ce7b8': Fix labels
|
549fdc722684afee93372e7f57a0bfc3433347ed |
19-Apr-2013 |
John Reck <jreck@google.com> |
Remove photos from gallery2 manifest Bug: 8659787 Change-Id: I72c85db38b3f7409a2ce84b2a6a7b7ccab41a351
ndroidManifest.xml
|
93074e91a15a926c079a40d7bc86025d5297259b |
19-Apr-2013 |
John Reck <jreck@google.com> |
Remove photos from gallery2 manifest Bug: 8659787 Change-Id: I72c85db38b3f7409a2ce84b2a6a7b7ccab41a351
ndroidManifest.xml
|
beba6b1c36f79aded98f71dbf45454dd947ce7b8 |
19-Apr-2013 |
Michael Kolb <kolby@google.com> |
Merge "Fix labels" into gb-ub-photos-bryce
|
5ea6e3a782a86c3237e15fc54909b55b5c71cd96 |
19-Apr-2013 |
Angus Kong <shkong@google.com> |
am eb985346: am 935d4c80: Merge "Make MediaSaveService destroyed after unbound." into gb-ub-photos-bryce * commit 'eb9853468e2bc9f54fdc1f5ec4e883627228bea4': Make MediaSaveService destroyed after unbound.
|
5dbae22450899b9624a25e89861840c2a639fb12 |
19-Apr-2013 |
Angus Kong <shkong@google.com> |
am 1bfd6aff: am ca3875b2: Merge "Save video using MediaSaveService." into gb-ub-photos-bryce * commit '1bfd6affbc079073d8b13f23b821e84f10a27cfa': Save video using MediaSaveService.
|
e7cb33d130d2e86f4ef664b9203167afbfee42ff |
19-Apr-2013 |
Michael Kolb <kolby@google.com> |
Fix labels Bug: 8660834 Change-Id: I92efdfb136fd57fabe30547f6cd1eb8abf94bf1a
es/values/arrays.xml
es/values/strings.xml
|
d3d91f2b9c95bf04121a4c881583325295f7882a |
19-Apr-2013 |
Michael Kolb <kolby@google.com> |
Fix labels Bug: 8660834 Change-Id: I92efdfb136fd57fabe30547f6cd1eb8abf94bf1a
es/values/arrays.xml
es/values/strings.xml
|
3cc9df8e466e2842d3b7af961582530dd1628bf6 |
19-Apr-2013 |
Angus Kong <shkong@google.com> |
am 935d4c80: Merge "Make MediaSaveService destroyed after unbound." into gb-ub-photos-bryce * commit '935d4c8037d7b5f56e4dea1c96bd8f4b68cb6236': Make MediaSaveService destroyed after unbound.
|
577d94df8433f93c52c5a16b6b6e82e459025b4e |
19-Apr-2013 |
Angus Kong <shkong@google.com> |
am ca3875b2: Merge "Save video using MediaSaveService." into gb-ub-photos-bryce * commit 'ca3875b21375defd0d42c57c05994cd67f0d59cd': Save video using MediaSaveService.
|
8d732159c1093e7ce970cb34bc6d36a14f26e3fa |
19-Apr-2013 |
Angus Kong <shkong@google.com> |
Merge "Make MediaSaveService destroyed after unbound." into gb-ub-photos-bryce
|
935d4c8037d7b5f56e4dea1c96bd8f4b68cb6236 |
19-Apr-2013 |
Angus Kong <shkong@google.com> |
Merge "Make MediaSaveService destroyed after unbound." into gb-ub-photos-bryce
|
736765766c6869c8add352641464dc5b099bc0f5 |
19-Apr-2013 |
Angus Kong <shkong@google.com> |
Merge "Save video using MediaSaveService." into gb-ub-photos-bryce
|
ca3875b21375defd0d42c57c05994cd67f0d59cd |
19-Apr-2013 |
Angus Kong <shkong@google.com> |
Merge "Save video using MediaSaveService." into gb-ub-photos-bryce
|
ff950886142267b72bd4fd66b25133daa4f46e1c |
19-Apr-2013 |
Bobby Georgescu <georgescu@google.com> |
am e752945d: am eb701e04: am 50e2d80f: am faf2f040: Fix multi selection issue * commit 'e752945da9072e1881d168be76c5279e4d2b25b0': Fix multi selection issue
|
737dcaf6932304e59f22d865be593e6bd96b3364 |
19-Apr-2013 |
Bobby Georgescu <georgescu@google.com> |
am eb701e04: am 50e2d80f: am faf2f040: Fix multi selection issue * commit 'eb701e04dbbec9e38d69c60a350d3b41724d1d0a': Fix multi selection issue
|
8572bfec29ef03f3f17b35d96d30cc509f699c36 |
19-Apr-2013 |
Bobby Georgescu <georgescu@google.com> |
am 50e2d80f: am faf2f040: Fix multi selection issue * commit '50e2d80fbe4087c5a54e0f6e62181d83f07f00bc': Fix multi selection issue
|
f02cf271ec89ef55e06c95ac531881e565b8fe51 |
19-Apr-2013 |
Bobby Georgescu <georgescu@google.com> |
am faf2f040: Fix multi selection issue * commit 'faf2f040f38532213fa237cf45c9794cf1a85859': Fix multi selection issue
|
83a99ae51a11af28553dfb77ef0ec91148671c9b |
18-Apr-2013 |
Angus Kong <shkong@google.com> |
Save video using MediaSaveService. bug:8511719 Change-Id: I3fc5054bf7661953181b27e66cc70ba95082d36c
rc/com/android/camera/MediaSaveService.java
rc/com/android/camera/VideoModule.java
|
a0bdfb2774e9f5aa324dd807dca18f0820d0e31c |
18-Apr-2013 |
Angus Kong <shkong@google.com> |
Save video using MediaSaveService. bug:8511719 Change-Id: I3fc5054bf7661953181b27e66cc70ba95082d36c
rc/com/android/camera/MediaSaveService.java
rc/com/android/camera/VideoModule.java
|
b13f87be0defbea052e317302f37e9d260244c9a |
19-Apr-2013 |
Angus Kong <shkong@google.com> |
Make MediaSaveService destroyed after unbound. bug:8528779 Change-Id: I1e6b78d5603b10cde3399969cd7a8cc19655051b
rc/com/android/camera/CameraActivity.java
|
9ff697aa128947d415c2343700f23c49ecca2fef |
19-Apr-2013 |
Angus Kong <shkong@google.com> |
Make MediaSaveService destroyed after unbound. bug:8528779 Change-Id: I1e6b78d5603b10cde3399969cd7a8cc19655051b
rc/com/android/camera/CameraActivity.java
|
0887f1f7fb843009bcf2643ea58514bad2bfb1a0 |
19-Apr-2013 |
Michael Kolb <kolby@google.com> |
am a7e098c8: Merge "Drop in new assets of correct size" into gb-ub-photos-bryce * commit 'a7e098c8e798160fdc2410867ec7eba325b7cd96': Drop in new assets of correct size
es/drawable-hdpi/ic_exposure_0.png
es/drawable-hdpi/ic_exposure_holo_light.png
es/drawable-hdpi/ic_exposure_n1.png
es/drawable-hdpi/ic_exposure_n2.png
es/drawable-hdpi/ic_exposure_n3.png
es/drawable-hdpi/ic_exposure_p1.png
es/drawable-hdpi/ic_exposure_p2.png
es/drawable-hdpi/ic_exposure_p3.png
es/drawable-hdpi/ic_flash_auto_holo_light.png
es/drawable-hdpi/ic_flash_off_holo_light.png
es/drawable-hdpi/ic_flash_on_holo_light.png
es/drawable-hdpi/ic_flash_torch.png
es/drawable-hdpi/ic_hdr.png
es/drawable-hdpi/ic_hdr_off.png
es/drawable-hdpi/ic_location.png
es/drawable-hdpi/ic_location_off.png
es/drawable-hdpi/ic_sce.png
es/drawable-hdpi/ic_sce_action.png
es/drawable-hdpi/ic_sce_night.png
es/drawable-hdpi/ic_sce_party.png
es/drawable-hdpi/ic_sce_sunset.png
es/drawable-hdpi/ic_settings_holo_light.png
es/drawable-hdpi/ic_switch_back.png
es/drawable-hdpi/ic_switch_front.png
es/drawable-hdpi/ic_timer_10s.png
es/drawable-hdpi/ic_timer_15s.png
es/drawable-hdpi/ic_timer_1s.png
es/drawable-hdpi/ic_timer_3s.png
es/drawable-hdpi/ic_timer_off.png
es/drawable-hdpi/ic_wb_auto.png
es/drawable-hdpi/ic_wb_cloudy.png
es/drawable-hdpi/ic_wb_fluorescent.png
es/drawable-hdpi/ic_wb_incandescent.png
es/drawable-hdpi/ic_wb_sunlight.png
es/drawable-mdpi/ic_exposure_0.png
es/drawable-mdpi/ic_exposure_holo_light.png
es/drawable-mdpi/ic_exposure_n1.png
es/drawable-mdpi/ic_exposure_n2.png
es/drawable-mdpi/ic_exposure_n3.png
es/drawable-mdpi/ic_exposure_p1.png
es/drawable-mdpi/ic_exposure_p2.png
es/drawable-mdpi/ic_exposure_p3.png
es/drawable-mdpi/ic_flash_auto_holo_light.png
es/drawable-mdpi/ic_flash_off_holo_light.png
es/drawable-mdpi/ic_flash_on_holo_light.png
es/drawable-mdpi/ic_flash_torch.png
es/drawable-mdpi/ic_hdr.png
es/drawable-mdpi/ic_hdr_off.png
es/drawable-mdpi/ic_location.png
es/drawable-mdpi/ic_location_off.png
es/drawable-mdpi/ic_sce.png
es/drawable-mdpi/ic_sce_action.png
es/drawable-mdpi/ic_sce_night.png
es/drawable-mdpi/ic_sce_party.png
es/drawable-mdpi/ic_sce_sunset.png
es/drawable-mdpi/ic_settings_holo_light.png
es/drawable-mdpi/ic_switch_back.png
es/drawable-mdpi/ic_switch_front.png
es/drawable-mdpi/ic_timer_10s.png
es/drawable-mdpi/ic_timer_15s.png
es/drawable-mdpi/ic_timer_1s.png
es/drawable-mdpi/ic_timer_3s.png
es/drawable-mdpi/ic_timer_off.png
es/drawable-mdpi/ic_wb_auto.png
es/drawable-mdpi/ic_wb_cloudy.png
es/drawable-mdpi/ic_wb_fluorescent.png
es/drawable-mdpi/ic_wb_incandescent.png
es/drawable-mdpi/ic_wb_sunlight.png
es/drawable-xhdpi/ic_exposure_0.png
es/drawable-xhdpi/ic_exposure_holo_light.png
es/drawable-xhdpi/ic_exposure_n1.png
es/drawable-xhdpi/ic_exposure_n2.png
es/drawable-xhdpi/ic_exposure_n3.png
es/drawable-xhdpi/ic_exposure_p1.png
es/drawable-xhdpi/ic_exposure_p2.png
es/drawable-xhdpi/ic_exposure_p3.png
es/drawable-xhdpi/ic_flash_auto_holo_light.png
es/drawable-xhdpi/ic_flash_off_holo_light.png
es/drawable-xhdpi/ic_flash_on_holo_light.png
es/drawable-xhdpi/ic_flash_torch.png
es/drawable-xhdpi/ic_hdr.png
es/drawable-xhdpi/ic_hdr_off.png
es/drawable-xhdpi/ic_location.png
es/drawable-xhdpi/ic_location_off.png
es/drawable-xhdpi/ic_sce.png
es/drawable-xhdpi/ic_sce_action.png
es/drawable-xhdpi/ic_sce_night.png
es/drawable-xhdpi/ic_sce_party.png
es/drawable-xhdpi/ic_sce_sunset.png
es/drawable-xhdpi/ic_settings_holo_light.png
es/drawable-xhdpi/ic_switch_back.png
es/drawable-xhdpi/ic_switch_front.png
es/drawable-xhdpi/ic_timer_10s.png
es/drawable-xhdpi/ic_timer_15s.png
es/drawable-xhdpi/ic_timer_1s.png
es/drawable-xhdpi/ic_timer_3s.png
es/drawable-xhdpi/ic_timer_off.png
es/drawable-xhdpi/ic_wb_auto.png
es/drawable-xhdpi/ic_wb_cloudy.png
es/drawable-xhdpi/ic_wb_fluorescent.png
es/drawable-xhdpi/ic_wb_incandescent.png
es/drawable-xhdpi/ic_wb_sunlight.png
|
aca7b2ef1a81d5e4973d1d181df6b983ea6a358c |
19-Apr-2013 |
Bobby Georgescu <georgescu@google.com> |
Fix multi selection issue Bug: 8663155 Change-Id: Ic6aa98c04b5134df9deb1b14736e614bf1618f03
rc/com/android/gallery3d/ui/SelectionManager.java
|
faf2f040f38532213fa237cf45c9794cf1a85859 |
19-Apr-2013 |
Bobby Georgescu <georgescu@google.com> |
Fix multi selection issue Bug: 8663155 Change-Id: Ic6aa98c04b5134df9deb1b14736e614bf1618f03
rc/com/android/gallery3d/ui/SelectionManager.java
|
47c842458bfd94f9cc695459e64ebcc4c352c79e |
19-Apr-2013 |
ztenghui <ztenghui@google.com> |
Merge "Update the duration information when saving new video" into gb-ub-photos-carlsbad
|
e9be1241a9eaed037725cc102fb56ef51d52d008 |
19-Apr-2013 |
Michael Kolb <kolby@google.com> |
am 309cfa25: am ad0c1056: am f5d5c639: am 32049103: Merge "Lock camera orientation using FW API" into gb-ub-photos-bryce * commit '309cfa25bdf02054a21ddae815085ec404918d1e': Lock camera orientation using FW API
|
07e57fd769f88081633277742596bb276eab5e60 |
19-Apr-2013 |
Michael Kolb <kolby@google.com> |
am ad0c1056: am f5d5c639: am 32049103: Merge "Lock camera orientation using FW API" into gb-ub-photos-bryce * commit 'ad0c10565b02a3a7b4e2247701431f12e3903f6d': Lock camera orientation using FW API
|
2ea7e86445f53c430d6c7ae5b7dc56e77e8bcd24 |
19-Apr-2013 |
Michael Kolb <kolby@google.com> |
am f5d5c639: am 32049103: Merge "Lock camera orientation using FW API" into gb-ub-photos-bryce * commit 'f5d5c63904ee5eb70b2088d0ed27b3bc5fbc5c57': Lock camera orientation using FW API
|
83958bc909dfe6ac61584d26aee2dcd290ed2d81 |
18-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am c3178ca4: Gallery crop uses new activity. Fixed image quality. * commit 'c3178ca4daf7ed570f3432f3433959c208ecc105': Gallery crop uses new activity. Fixed image quality.
es/drawable-nodpi/geometry_shadow.9.png
es/values/crop_colors.xml
es/values/crop_dimens.xml
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/filtershow/crop/CropActivity.java
rc/com/android/gallery3d/filtershow/crop/CropDrawingUtils.java
rc/com/android/gallery3d/filtershow/crop/CropLoader.java
rc/com/android/gallery3d/filtershow/crop/CropMath.java
rc/com/android/gallery3d/filtershow/crop/CropView.java
|
79202ba57e40917bd29523e923eb9ee614e40d28 |
19-Apr-2013 |
Michael Kolb <kolby@google.com> |
am 32049103: Merge "Lock camera orientation using FW API" into gb-ub-photos-bryce * commit '32049103305c99e8be1f7af3e46933277e02a7c3': Lock camera orientation using FW API
|
6270fb2b7ca6707f98d4ede6979e8c7d6ee738d6 |
19-Apr-2013 |
Angus Kong <shkong@google.com> |
am 0bb1bb7f: am c856063a: am 2163b6f8: am 45826e18: Merge "Pass the camera to recorders after all is set." into gb-ub-photos-bryce * commit '0bb1bb7fa9d7ea7c500dec369cd97af3be25938d': Pass the camera to recorders after all is set.
|
4327fbf44250e568adb6f7f0b647e24ead54f035 |
19-Apr-2013 |
Michael Kolb <kolby@google.com> |
Merge "Lock camera orientation using FW API" into gb-ub-photos-bryce
|
32049103305c99e8be1f7af3e46933277e02a7c3 |
19-Apr-2013 |
Michael Kolb <kolby@google.com> |
Merge "Lock camera orientation using FW API" into gb-ub-photos-bryce
|
aed632a889a0c7bf8f2d732db524f315a29ab7db |
19-Apr-2013 |
Angus Kong <shkong@google.com> |
am c856063a: am 2163b6f8: am 45826e18: Merge "Pass the camera to recorders after all is set." into gb-ub-photos-bryce * commit 'c856063aad88996a52e5c3df42d0a5c829921c33': Pass the camera to recorders after all is set.
|
204c1845184bef416b2015876fd89717833883a1 |
19-Apr-2013 |
Angus Kong <shkong@google.com> |
am 2163b6f8: am 45826e18: Merge "Pass the camera to recorders after all is set." into gb-ub-photos-bryce * commit '2163b6f83ffa252e177c9f9f214c6dfdd79d0d6d': Pass the camera to recorders after all is set.
|
93a214a30108283085617560034b8d6f5e7a5f20 |
19-Apr-2013 |
Doris Liu <tianliu@google.com> |
am 4e8d290d: am 2fab154d: am f5f23189: am b1051814: Merge "Fix memory leak in pie controller" into gb-ub-photos-bryce * commit '4e8d290d5ec9c55d1c9ec6dbdc80e10da592d9dd': Fix memory leak in pie controller
|
e281364cee7162bcfe50b06e2c96b83b2176971d |
19-Apr-2013 |
Doris Liu <tianliu@google.com> |
am 05140ab9: am 09f9fe18: am 66f7e7d7: am 14fe2887: Merge "Allow swiping to filmstrip from blocker bar" into gb-ub-photos-bryce * commit '05140ab966214be0b55c7b31d0eaef4cee26d93c': Allow swiping to filmstrip from blocker bar
|
1570f48c27217c828f03b2d9de2efd688b43c4a6 |
19-Apr-2013 |
Angus Kong <shkong@google.com> |
am 45826e18: Merge "Pass the camera to recorders after all is set." into gb-ub-photos-bryce * commit '45826e188598cd6171fc0ec3112e2fbf52fbc952': Pass the camera to recorders after all is set.
|
ecfda0826b2f96a7c35b4863ccaf851813a71a9e |
19-Apr-2013 |
Doris Liu <tianliu@google.com> |
am 2fab154d: am f5f23189: am b1051814: Merge "Fix memory leak in pie controller" into gb-ub-photos-bryce * commit '2fab154ded96e45c6a8bcd5bb66aec5577734da7': Fix memory leak in pie controller
|
4e69600a7c618d810c2a50c7585351aca091624d |
19-Apr-2013 |
Doris Liu <tianliu@google.com> |
am 09f9fe18: am 66f7e7d7: am 14fe2887: Merge "Allow swiping to filmstrip from blocker bar" into gb-ub-photos-bryce * commit '09f9fe1837317b47773947d6f0a7fe2eaccb0c31': Allow swiping to filmstrip from blocker bar
|
32cae72fda76329e181c20aa2f0b74e0f391fa8f |
19-Apr-2013 |
Angus Kong <shkong@google.com> |
Merge "Pass the camera to recorders after all is set." into gb-ub-photos-bryce
|
45826e188598cd6171fc0ec3112e2fbf52fbc952 |
19-Apr-2013 |
Angus Kong <shkong@google.com> |
Merge "Pass the camera to recorders after all is set." into gb-ub-photos-bryce
|
d838199238484972dfe31a22296d928493fbd6a2 |
19-Apr-2013 |
Doris Liu <tianliu@google.com> |
am f5f23189: am b1051814: Merge "Fix memory leak in pie controller" into gb-ub-photos-bryce * commit 'f5f23189e0219a4bed7f108057018c2807ddd5e3': Fix memory leak in pie controller
|
7dbe9c35d4b16f0f051ce752db8b087861264263 |
19-Apr-2013 |
Doris Liu <tianliu@google.com> |
am 66f7e7d7: am 14fe2887: Merge "Allow swiping to filmstrip from blocker bar" into gb-ub-photos-bryce * commit '66f7e7d7c431b10c8336b6c7baddf150fbfbba5b': Allow swiping to filmstrip from blocker bar
|
a248ffca52476f5051c3ec15f148e1d128074a65 |
19-Apr-2013 |
Doris Liu <tianliu@google.com> |
am b1051814: Merge "Fix memory leak in pie controller" into gb-ub-photos-bryce * commit 'b10518142bb84abe2ffe1bd3aa10ff4ee7982370': Fix memory leak in pie controller
|
866f3c1bbadf8739b2fe85da715d1dc8f0f8ba0b |
19-Apr-2013 |
Doris Liu <tianliu@google.com> |
am 14fe2887: Merge "Allow swiping to filmstrip from blocker bar" into gb-ub-photos-bryce * commit '14fe288784c574c84edbf84306329dc8b70d8b4d': Allow swiping to filmstrip from blocker bar
|
b7636cf9eb15a25fb63a0c3aaf5d5fd47cde0f0d |
19-Apr-2013 |
Michael Kolb <kolby@google.com> |
am 17b54e7f: am 2336a861: am a2fb4deb: am a7e098c8: Merge "Drop in new assets of correct size" into gb-ub-photos-bryce * commit '17b54e7f4df5d237e66adc778d0a38580dd8579e': Drop in new assets of correct size
|
7e2796f51a96a57ca91b42ec2976f72c13f71d11 |
19-Apr-2013 |
Doris Liu <tianliu@google.com> |
Merge "Fix memory leak in pie controller" into gb-ub-photos-bryce
|
b10518142bb84abe2ffe1bd3aa10ff4ee7982370 |
19-Apr-2013 |
Doris Liu <tianliu@google.com> |
Merge "Fix memory leak in pie controller" into gb-ub-photos-bryce
|
0732c0cf88176d3e0353ccc91d43a28e2b7015b4 |
19-Apr-2013 |
Doris Liu <tianliu@google.com> |
Merge "Allow swiping to filmstrip from blocker bar" into gb-ub-photos-bryce
|
29f5085a0b27ca62744974df67394f2c4b1df136 |
19-Apr-2013 |
Doris Liu <tianliu@google.com> |
Merge "Allow swiping to filmstrip from blocker bar" into gb-ub-photos-bryce
|
14fe288784c574c84edbf84306329dc8b70d8b4d |
19-Apr-2013 |
Doris Liu <tianliu@google.com> |
Merge "Allow swiping to filmstrip from blocker bar" into gb-ub-photos-bryce
|
8676f2f74d9e509c2ee675e01390cb4b3292d21d |
19-Apr-2013 |
Michael Kolb <kolby@google.com> |
am 2336a861: am a2fb4deb: am a7e098c8: Merge "Drop in new assets of correct size" into gb-ub-photos-bryce * commit '2336a861714c1f63fabe03d0825bf4ff4e829690': Drop in new assets of correct size
|
c0c86ab0a46a2f0421bdc7f325f563de54cc3729 |
19-Apr-2013 |
Michael Kolb <kolby@google.com> |
am a2fb4deb: am a7e098c8: Merge "Drop in new assets of correct size" into gb-ub-photos-bryce * commit 'a2fb4deb06d9d8c4b7fb1f5c6191ee1b06cc5355': Drop in new assets of correct size
|
54dab3fcc9c2fb90cecfa683331ff41c9a9e0504 |
19-Apr-2013 |
Michael Kolb <kolby@google.com> |
am a7e098c8: Merge "Drop in new assets of correct size" into gb-ub-photos-bryce * commit 'a7e098c8e798160fdc2410867ec7eba325b7cd96': Drop in new assets of correct size
|
a7e098c8e798160fdc2410867ec7eba325b7cd96 |
19-Apr-2013 |
Michael Kolb <kolby@google.com> |
Merge "Drop in new assets of correct size" into gb-ub-photos-bryce
|
4341490dcec4f90e40a5a9c594d3d9276b7a5710 |
19-Apr-2013 |
Michael Kolb <kolby@google.com> |
Drop in new assets of correct size Bug: 8640131 Change-Id: Iefcff08ae190c07700b5526a6847b664fe1b51a7
es/drawable-hdpi/ic_exposure_0.png
es/drawable-hdpi/ic_exposure_holo_light.png
es/drawable-hdpi/ic_exposure_n1.png
es/drawable-hdpi/ic_exposure_n2.png
es/drawable-hdpi/ic_exposure_n3.png
es/drawable-hdpi/ic_exposure_p1.png
es/drawable-hdpi/ic_exposure_p2.png
es/drawable-hdpi/ic_exposure_p3.png
es/drawable-hdpi/ic_flash_auto_holo_light.png
es/drawable-hdpi/ic_flash_off_holo_light.png
es/drawable-hdpi/ic_flash_on_holo_light.png
es/drawable-hdpi/ic_flash_torch.png
es/drawable-hdpi/ic_hdr.png
es/drawable-hdpi/ic_hdr_off.png
es/drawable-hdpi/ic_location.png
es/drawable-hdpi/ic_location_off.png
es/drawable-hdpi/ic_sce.png
es/drawable-hdpi/ic_sce_action.png
es/drawable-hdpi/ic_sce_night.png
es/drawable-hdpi/ic_sce_party.png
es/drawable-hdpi/ic_sce_sunset.png
es/drawable-hdpi/ic_settings_holo_light.png
es/drawable-hdpi/ic_switch_back.png
es/drawable-hdpi/ic_switch_front.png
es/drawable-hdpi/ic_timer_10s.png
es/drawable-hdpi/ic_timer_15s.png
es/drawable-hdpi/ic_timer_1s.png
es/drawable-hdpi/ic_timer_3s.png
es/drawable-hdpi/ic_timer_off.png
es/drawable-hdpi/ic_wb_auto.png
es/drawable-hdpi/ic_wb_cloudy.png
es/drawable-hdpi/ic_wb_fluorescent.png
es/drawable-hdpi/ic_wb_incandescent.png
es/drawable-hdpi/ic_wb_sunlight.png
es/drawable-mdpi/ic_exposure_0.png
es/drawable-mdpi/ic_exposure_holo_light.png
es/drawable-mdpi/ic_exposure_n1.png
es/drawable-mdpi/ic_exposure_n2.png
es/drawable-mdpi/ic_exposure_n3.png
es/drawable-mdpi/ic_exposure_p1.png
es/drawable-mdpi/ic_exposure_p2.png
es/drawable-mdpi/ic_exposure_p3.png
es/drawable-mdpi/ic_flash_auto_holo_light.png
es/drawable-mdpi/ic_flash_off_holo_light.png
es/drawable-mdpi/ic_flash_on_holo_light.png
es/drawable-mdpi/ic_flash_torch.png
es/drawable-mdpi/ic_hdr.png
es/drawable-mdpi/ic_hdr_off.png
es/drawable-mdpi/ic_location.png
es/drawable-mdpi/ic_location_off.png
es/drawable-mdpi/ic_sce.png
es/drawable-mdpi/ic_sce_action.png
es/drawable-mdpi/ic_sce_night.png
es/drawable-mdpi/ic_sce_party.png
es/drawable-mdpi/ic_sce_sunset.png
es/drawable-mdpi/ic_settings_holo_light.png
es/drawable-mdpi/ic_switch_back.png
es/drawable-mdpi/ic_switch_front.png
es/drawable-mdpi/ic_timer_10s.png
es/drawable-mdpi/ic_timer_15s.png
es/drawable-mdpi/ic_timer_1s.png
es/drawable-mdpi/ic_timer_3s.png
es/drawable-mdpi/ic_timer_off.png
es/drawable-mdpi/ic_wb_auto.png
es/drawable-mdpi/ic_wb_cloudy.png
es/drawable-mdpi/ic_wb_fluorescent.png
es/drawable-mdpi/ic_wb_incandescent.png
es/drawable-mdpi/ic_wb_sunlight.png
es/drawable-xhdpi/ic_exposure_0.png
es/drawable-xhdpi/ic_exposure_holo_light.png
es/drawable-xhdpi/ic_exposure_n1.png
es/drawable-xhdpi/ic_exposure_n2.png
es/drawable-xhdpi/ic_exposure_n3.png
es/drawable-xhdpi/ic_exposure_p1.png
es/drawable-xhdpi/ic_exposure_p2.png
es/drawable-xhdpi/ic_exposure_p3.png
es/drawable-xhdpi/ic_flash_auto_holo_light.png
es/drawable-xhdpi/ic_flash_off_holo_light.png
es/drawable-xhdpi/ic_flash_on_holo_light.png
es/drawable-xhdpi/ic_flash_torch.png
es/drawable-xhdpi/ic_hdr.png
es/drawable-xhdpi/ic_hdr_off.png
es/drawable-xhdpi/ic_location.png
es/drawable-xhdpi/ic_location_off.png
es/drawable-xhdpi/ic_sce.png
es/drawable-xhdpi/ic_sce_action.png
es/drawable-xhdpi/ic_sce_night.png
es/drawable-xhdpi/ic_sce_party.png
es/drawable-xhdpi/ic_sce_sunset.png
es/drawable-xhdpi/ic_settings_holo_light.png
es/drawable-xhdpi/ic_switch_back.png
es/drawable-xhdpi/ic_switch_front.png
es/drawable-xhdpi/ic_timer_10s.png
es/drawable-xhdpi/ic_timer_15s.png
es/drawable-xhdpi/ic_timer_1s.png
es/drawable-xhdpi/ic_timer_3s.png
es/drawable-xhdpi/ic_timer_off.png
es/drawable-xhdpi/ic_wb_auto.png
es/drawable-xhdpi/ic_wb_cloudy.png
es/drawable-xhdpi/ic_wb_fluorescent.png
es/drawable-xhdpi/ic_wb_incandescent.png
es/drawable-xhdpi/ic_wb_sunlight.png
|
6f1eced65ea30c4787b5ca01e8687baada2546fc |
19-Apr-2013 |
Michael Kolb <kolby@google.com> |
Drop in new assets of correct size Bug: 8640131 Change-Id: Iefcff08ae190c07700b5526a6847b664fe1b51a7
es/drawable-hdpi/ic_exposure_0.png
es/drawable-hdpi/ic_exposure_holo_light.png
es/drawable-hdpi/ic_exposure_n1.png
es/drawable-hdpi/ic_exposure_n2.png
es/drawable-hdpi/ic_exposure_n3.png
es/drawable-hdpi/ic_exposure_p1.png
es/drawable-hdpi/ic_exposure_p2.png
es/drawable-hdpi/ic_exposure_p3.png
es/drawable-hdpi/ic_flash_auto_holo_light.png
es/drawable-hdpi/ic_flash_off_holo_light.png
es/drawable-hdpi/ic_flash_on_holo_light.png
es/drawable-hdpi/ic_flash_torch.png
es/drawable-hdpi/ic_hdr.png
es/drawable-hdpi/ic_hdr_off.png
es/drawable-hdpi/ic_location.png
es/drawable-hdpi/ic_location_off.png
es/drawable-hdpi/ic_sce.png
es/drawable-hdpi/ic_sce_action.png
es/drawable-hdpi/ic_sce_night.png
es/drawable-hdpi/ic_sce_party.png
es/drawable-hdpi/ic_sce_sunset.png
es/drawable-hdpi/ic_settings_holo_light.png
es/drawable-hdpi/ic_switch_back.png
es/drawable-hdpi/ic_switch_front.png
es/drawable-hdpi/ic_timer_10s.png
es/drawable-hdpi/ic_timer_15s.png
es/drawable-hdpi/ic_timer_1s.png
es/drawable-hdpi/ic_timer_3s.png
es/drawable-hdpi/ic_timer_off.png
es/drawable-hdpi/ic_wb_auto.png
es/drawable-hdpi/ic_wb_cloudy.png
es/drawable-hdpi/ic_wb_fluorescent.png
es/drawable-hdpi/ic_wb_incandescent.png
es/drawable-hdpi/ic_wb_sunlight.png
es/drawable-mdpi/ic_exposure_0.png
es/drawable-mdpi/ic_exposure_holo_light.png
es/drawable-mdpi/ic_exposure_n1.png
es/drawable-mdpi/ic_exposure_n2.png
es/drawable-mdpi/ic_exposure_n3.png
es/drawable-mdpi/ic_exposure_p1.png
es/drawable-mdpi/ic_exposure_p2.png
es/drawable-mdpi/ic_exposure_p3.png
es/drawable-mdpi/ic_flash_auto_holo_light.png
es/drawable-mdpi/ic_flash_off_holo_light.png
es/drawable-mdpi/ic_flash_on_holo_light.png
es/drawable-mdpi/ic_flash_torch.png
es/drawable-mdpi/ic_hdr.png
es/drawable-mdpi/ic_hdr_off.png
es/drawable-mdpi/ic_location.png
es/drawable-mdpi/ic_location_off.png
es/drawable-mdpi/ic_sce.png
es/drawable-mdpi/ic_sce_action.png
es/drawable-mdpi/ic_sce_night.png
es/drawable-mdpi/ic_sce_party.png
es/drawable-mdpi/ic_sce_sunset.png
es/drawable-mdpi/ic_settings_holo_light.png
es/drawable-mdpi/ic_switch_back.png
es/drawable-mdpi/ic_switch_front.png
es/drawable-mdpi/ic_timer_10s.png
es/drawable-mdpi/ic_timer_15s.png
es/drawable-mdpi/ic_timer_1s.png
es/drawable-mdpi/ic_timer_3s.png
es/drawable-mdpi/ic_timer_off.png
es/drawable-mdpi/ic_wb_auto.png
es/drawable-mdpi/ic_wb_cloudy.png
es/drawable-mdpi/ic_wb_fluorescent.png
es/drawable-mdpi/ic_wb_incandescent.png
es/drawable-mdpi/ic_wb_sunlight.png
es/drawable-xhdpi/ic_exposure_0.png
es/drawable-xhdpi/ic_exposure_holo_light.png
es/drawable-xhdpi/ic_exposure_n1.png
es/drawable-xhdpi/ic_exposure_n2.png
es/drawable-xhdpi/ic_exposure_n3.png
es/drawable-xhdpi/ic_exposure_p1.png
es/drawable-xhdpi/ic_exposure_p2.png
es/drawable-xhdpi/ic_exposure_p3.png
es/drawable-xhdpi/ic_flash_auto_holo_light.png
es/drawable-xhdpi/ic_flash_off_holo_light.png
es/drawable-xhdpi/ic_flash_on_holo_light.png
es/drawable-xhdpi/ic_flash_torch.png
es/drawable-xhdpi/ic_hdr.png
es/drawable-xhdpi/ic_hdr_off.png
es/drawable-xhdpi/ic_location.png
es/drawable-xhdpi/ic_location_off.png
es/drawable-xhdpi/ic_sce.png
es/drawable-xhdpi/ic_sce_action.png
es/drawable-xhdpi/ic_sce_night.png
es/drawable-xhdpi/ic_sce_party.png
es/drawable-xhdpi/ic_sce_sunset.png
es/drawable-xhdpi/ic_settings_holo_light.png
es/drawable-xhdpi/ic_switch_back.png
es/drawable-xhdpi/ic_switch_front.png
es/drawable-xhdpi/ic_timer_10s.png
es/drawable-xhdpi/ic_timer_15s.png
es/drawable-xhdpi/ic_timer_1s.png
es/drawable-xhdpi/ic_timer_3s.png
es/drawable-xhdpi/ic_timer_off.png
es/drawable-xhdpi/ic_wb_auto.png
es/drawable-xhdpi/ic_wb_cloudy.png
es/drawable-xhdpi/ic_wb_fluorescent.png
es/drawable-xhdpi/ic_wb_incandescent.png
es/drawable-xhdpi/ic_wb_sunlight.png
|
50eff23b78385a41440b0a40eb2c1c4ca78e1d87 |
19-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 7eae6bf8: am eb630552: am 1e17e692: am 316af8dd: Merge "Fix crop activity aspect ratio and orientation handling." into gb-ub-photos-bryce * commit '7eae6bf87607d5c00ff866ee2b1dacac1555c878': Fix crop activity aspect ratio and orientation handling.
|
6307168e1698b79cfc3e6d061c832750ae5a4f23 |
19-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am eb630552: am 1e17e692: am 316af8dd: Merge "Fix crop activity aspect ratio and orientation handling." into gb-ub-photos-bryce * commit 'eb630552e1ba3f995b2fda865821fe3b38c8cb39': Fix crop activity aspect ratio and orientation handling.
|
1159ff1cabffb5160dde92e3ad641a97571082dd |
19-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 1e17e692: am 316af8dd: Merge "Fix crop activity aspect ratio and orientation handling." into gb-ub-photos-bryce * commit '1e17e69237eaa80b1c48d1dcff1ee3a71000d4ee': Fix crop activity aspect ratio and orientation handling.
|
13b2db20c6d79113d37f5db568dd3de45107901f |
19-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 316af8dd: Merge "Fix crop activity aspect ratio and orientation handling." into gb-ub-photos-bryce * commit '316af8dd675d777f4bd9512b8af5391c7c89363f': Fix crop activity aspect ratio and orientation handling.
|
d3f4b9350cfa2caf6fb175731b36626cf00e9dd9 |
19-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Fix crop activity aspect ratio and orientation handling." into gb-ub-photos-bryce
|
316af8dd675d777f4bd9512b8af5391c7c89363f |
19-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Fix crop activity aspect ratio and orientation handling." into gb-ub-photos-bryce
|
de34c3e3b283e078ebf766ac9785615027f4326b |
19-Apr-2013 |
John Hoford <hoford@google.com> |
am d1c5e3c5: am 1388f728: am a2b7cea2: am a1939d22: Merge "fixed borders issues" into gb-ub-photos-bryce * commit 'd1c5e3c5d43a9c5eec82e37d9683ece2d40e3848': fixed borders issues
|
325f5f3aa920359b2d09fce7bd80179696b19569 |
19-Apr-2013 |
John Hoford <hoford@google.com> |
am 1388f728: am a2b7cea2: am a1939d22: Merge "fixed borders issues" into gb-ub-photos-bryce * commit '1388f7284f3ab67141cf86719e9bba40d69738da': fixed borders issues
|
5df234ea50c6c60c0154367f97d7804238518bda |
19-Apr-2013 |
John Hoford <hoford@google.com> |
am a2b7cea2: am a1939d22: Merge "fixed borders issues" into gb-ub-photos-bryce * commit 'a2b7cea2ee21c48f7f4b53236c58159e92ecb113': fixed borders issues
|
eef606245900ede4f50fde0c901c6634326487f4 |
19-Apr-2013 |
John Hoford <hoford@google.com> |
am a1939d22: Merge "fixed borders issues" into gb-ub-photos-bryce * commit 'a1939d22f631ddcb7e942cc0ad2ffa7ef78b763f': fixed borders issues
|
d81bba2275dc393278239aa1d5617d3d6a7bfe2a |
19-Apr-2013 |
John Hoford <hoford@google.com> |
Merge "fixed borders issues" into gb-ub-photos-bryce
|
a1939d22f631ddcb7e942cc0ad2ffa7ef78b763f |
19-Apr-2013 |
John Hoford <hoford@google.com> |
Merge "fixed borders issues" into gb-ub-photos-bryce
|
1ce28c910dca3de9a832079acc77cb807b25d178 |
19-Apr-2013 |
Doris Liu <tianliu@google.com> |
Fix memory leak in pie controller Bug: 7622218 Change-Id: Iaab96008a4f4b506bb0be98f489af9120d607251
rc/com/android/camera/PieController.java
|
1c25347b77e3127d84f9abefb921c664ec844cc2 |
19-Apr-2013 |
Doris Liu <tianliu@google.com> |
Fix memory leak in pie controller Bug: 7622218 Change-Id: Iaab96008a4f4b506bb0be98f489af9120d607251
rc/com/android/camera/PieController.java
|
8cb7055c0ea13b7b219e2cdc46cbfbf62e97c96e |
19-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Fix crop activity aspect ratio and orientation handling. Bug: 8659064 Bug: 8647628 Change-Id: I3e4293cc3bba7d55334acb396e20a23cc92f8f82
rc/com/android/gallery3d/filtershow/crop/CropActivity.java
rc/com/android/gallery3d/filtershow/crop/CropLoader.java
rc/com/android/gallery3d/filtershow/crop/CropObject.java
rc/com/android/gallery3d/filtershow/crop/CropView.java
|
88cd551c2f42061ca7482b884c0c5bb686ec7eb2 |
19-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Fix crop activity aspect ratio and orientation handling. Bug: 8659064 Bug: 8647628 Change-Id: I3e4293cc3bba7d55334acb396e20a23cc92f8f82
rc/com/android/gallery3d/filtershow/crop/CropActivity.java
rc/com/android/gallery3d/filtershow/crop/CropLoader.java
rc/com/android/gallery3d/filtershow/crop/CropObject.java
rc/com/android/gallery3d/filtershow/crop/CropView.java
|
f603fabaa712c19f60604efee90d7a79e11fd50f |
19-Apr-2013 |
ztenghui <ztenghui@google.com> |
Update the duration information when saving new video Change-Id: I9c3fd33dba7f04d9d905429c6bb17cf9a10b7628
rc/com/android/gallery3d/util/SaveVideoFileUtils.java
|
afe35327429d4c34489f220cd6b3df5b2a47b4a9 |
19-Apr-2013 |
Flavio Lerda <flerda@google.com> |
am d0982ce3: am 70ef3fd8: am 7f5d0331: am ed2f1790: Merge "Remove unused imports." into gb-ub-photos-bryce * commit 'd0982ce3bf45b80cf9c5b2b660d807187114a74e': Remove unused imports.
|
48f0cf975a27af2abfce2e8b2a109b5553d187a6 |
19-Apr-2013 |
Flavio Lerda <flerda@google.com> |
am 70ef3fd8: am 7f5d0331: am ed2f1790: Merge "Remove unused imports." into gb-ub-photos-bryce * commit '70ef3fd8916d2c1f11a31ee8c8101032a450b5c0': Remove unused imports.
|
823b93f5f63d99bbac735d9a36ac4448cf4f1442 |
19-Apr-2013 |
Flavio Lerda <flerda@google.com> |
am 7f5d0331: am ed2f1790: Merge "Remove unused imports." into gb-ub-photos-bryce * commit '7f5d0331b16923df1eec2501ba0709c05c845c74': Remove unused imports.
|
eccc6d954a0a1913de6f9e0163e41d02ba857247 |
19-Apr-2013 |
Michael Kolb <kolby@google.com> |
am 8d19e885: am 9765a573: am 59c8f492: am 5b083f89: Add more menu options/icons * commit '8d19e8851ea690486e9eae6faea48f83dc8995d3': Add more menu options/icons
|
53b8bfe932ba1428c965635b556b662987be79cf |
19-Apr-2013 |
Flavio Lerda <flerda@google.com> |
am ed2f1790: Merge "Remove unused imports." into gb-ub-photos-bryce * commit 'ed2f17903bbbca08ac98af4aa6c1dd9d22504a1d': Remove unused imports.
|
5327af1220eaf5b35cca6229466ccdc51970ee8b |
19-Apr-2013 |
Angus Kong <shkong@google.com> |
Pass the camera to recorders after all is set. bug:8049369 Change-Id: I5cd658e78905a7b41f97ee0cce820f0c8bc99dd5
rc/com/android/camera/VideoModule.java
|
5b532be33f0e31712ad2b4f2838a282d82c6baa0 |
19-Apr-2013 |
Angus Kong <shkong@google.com> |
Pass the camera to recorders after all is set. bug:8049369 Change-Id: I5cd658e78905a7b41f97ee0cce820f0c8bc99dd5
rc/com/android/camera/VideoModule.java
|
b4ddad4bf71572a11e9b5864547fe539c712e483 |
19-Apr-2013 |
Flavio Lerda <flerda@google.com> |
am ed2f1790: Merge "Remove unused imports." into gb-ub-photos-bryce * commit 'ed2f17903bbbca08ac98af4aa6c1dd9d22504a1d': Remove unused imports.
|
0c65f5f024b62c67293073afff3543d72a84a5d0 |
19-Apr-2013 |
Flavio Lerda <flerda@google.com> |
Merge "Remove unused imports." into gb-ub-photos-bryce
|
ed2f17903bbbca08ac98af4aa6c1dd9d22504a1d |
19-Apr-2013 |
Flavio Lerda <flerda@google.com> |
Merge "Remove unused imports." into gb-ub-photos-bryce
|
fee2967672e2b711fa163d639cd32bf871b6aeb4 |
19-Apr-2013 |
George Mount <mount@google.com> |
am 70fff66e: am ee8b05cf: am a9fbbc0c: am b726c83a: Merge "Change labels so that it doesn\'t clash with PanoUiLib." into gb-ub-photos-bryce * commit '70fff66edb83f984b82253bcc943d878d83e22f5': Change labels so that it doesn't clash with PanoUiLib.
|
e66549c190e83c3c67a3ebafa761645fdec1e157 |
19-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 65458e43: am 68e7e978: am 8a931f9d: am c3178ca4: Gallery crop uses new activity. Fixed image quality. * commit '65458e43626ab18695c147d0060ffcd3e953a9ca': Gallery crop uses new activity. Fixed image quality.
|
69ce30255bde05de79e0607ce5ca06228a1d8bd7 |
19-Apr-2013 |
Baligh Uddin <baligh@google.com> |
am 11a7b487: (-s ours) am c99bd971: am 42a13dcb: am c54e3418: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce * commit '11a7b4874b9c04ae09ad256c3588220fef9604f1': Import translations. DO NOT MERGE
|
637fe62aae47c3dffbdfcca173b2de19d308e066 |
19-Apr-2013 |
Baligh Uddin <baligh@google.com> |
am 5e398198: (-s ours) am 622db9a0: am f2a17aee: am df9e8b91: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce * commit '5e398198ae83b640d669455d0b5718b5f7730467': Import translations. DO NOT MERGE
|
bbb18194f86b22b3edf5869fd71a4f694211e4b8 |
19-Apr-2013 |
Baligh Uddin <baligh@google.com> |
am 6ce62237: (-s ours) am d57098b2: am 86def04c: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev * commit '6ce622378c7d3d47ee3b22308a2ebe5a974b0acd': Import translations. DO NOT MERGE
|
3dbd4e38edc451d2976ac7f8b39e28658f6cd6a3 |
19-Apr-2013 |
Baligh Uddin <baligh@google.com> |
am d9d4185b: (-s ours) am 1c9ce63d: am 17d1c732: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev * commit 'd9d4185be568901ce650c855daee8696df32dafb': Import translations. DO NOT MERGE
|
79fef5987be1c6276cac57c811fb32050d41e559 |
19-Apr-2013 |
Baligh Uddin <baligh@google.com> |
am 3284568b: (-s ours) Merge "Import translations. DO NOT MERGE" * commit '3284568be45053359e7496f2858b5b3df036698e': Import translations. DO NOT MERGE
|
ea0637a0704120721872c773a927ad1546669920 |
19-Apr-2013 |
Baligh Uddin <baligh@google.com> |
am f18c450e: (-s ours) Merge "Import translations. DO NOT MERGE" * commit 'f18c450ea799603cdf2a3547e6baf5b90ec912db': Import translations. DO NOT MERGE
|
24228e39f38eeeb616c7c73752950d89b200be73 |
19-Apr-2013 |
Flavio Lerda <flerda@google.com> |
am 28bfde95: am 51757f32: am 9581384f: am 47f28614: Merge "Usage statistics for sharing." into gb-ub-photos-bryce * commit '28bfde95bb61bda5c8218c3342b74afa1780f510': Usage statistics for sharing.
|
1426ba71ae1c9238893dd98f93a689a2475a437c |
18-Apr-2013 |
Flavio Lerda <flerda@google.com> |
Remove unused imports. This is follow-up on the previous fix for b/8433834, addressing reviewer comments. Bug: 8433834 Change-Id: I06f466704175a62d8febc5be471a2ca1f50e898d
rc/com/android/gallery3d/app/PhotoPage.java
|
11f2b39b9a44f7f26177fbeecf7c07b9dc4edc86 |
18-Apr-2013 |
Flavio Lerda <flerda@google.com> |
Remove unused imports. This is follow-up on the previous fix for b/8433834, addressing reviewer comments. Bug: 8433834 Change-Id: I06f466704175a62d8febc5be471a2ca1f50e898d
rc/com/android/gallery3d/app/PhotoPage.java
|
ad65b4bf4fd1dd2c53c3348b4a4427c743265104 |
19-Apr-2013 |
Michael Kolb <kolby@google.com> |
am 9765a573: am 59c8f492: am 5b083f89: Add more menu options/icons * commit '9765a5738d5c62d00328c923d93707092b3e89fb': Add more menu options/icons
|
4c52b34caa8f09f689c726b3f72a6a432d199d2e |
19-Apr-2013 |
Michael Kolb <kolby@google.com> |
am 59c8f492: am 5b083f89: Add more menu options/icons * commit '59c8f492a413cbd786c9051fe765621ecec23c51': Add more menu options/icons
|
07edfe4cf547df653b138493468ee455cc5c707b |
19-Apr-2013 |
Michael Kolb <kolby@google.com> |
am 5b083f89: Add more menu options/icons * commit '5b083f89c9c87f8e19e0942d1d7c2de623e527be': Add more menu options/icons
|
52b912de1f5f672299ce25317fc9ab2b52b70a26 |
19-Apr-2013 |
Michael Kolb <kolby@google.com> |
am 5b083f89: Add more menu options/icons * commit '5b083f89c9c87f8e19e0942d1d7c2de623e527be': Add more menu options/icons
|
b73f50d6d4d8815d29a76f99d5b4e04906d870ae |
19-Apr-2013 |
Michael Kolb <kolby@google.com> |
am 5b083f89: Add more menu options/icons * commit '5b083f89c9c87f8e19e0942d1d7c2de623e527be': Add more menu options/icons
|
b4524a16022b35d1c76dfb8580d83f7fdd91dc36 |
18-Apr-2013 |
Michael Kolb <kolby@google.com> |
Add more menu options/icons Bug: 8640131 Added location and scene mode to secondary menu Updated HDR icons Change-Id: I5bed39a2ec037aecf67702d88f738befe61846d4
es/values/arrays.xml
es/values/strings.xml
es/xml/camera_preferences.xml
|
5b083f89c9c87f8e19e0942d1d7c2de623e527be |
18-Apr-2013 |
Michael Kolb <kolby@google.com> |
Add more menu options/icons Bug: 8640131 Added location and scene mode to secondary menu Updated HDR icons Change-Id: I5bed39a2ec037aecf67702d88f738befe61846d4
es/values/arrays.xml
es/values/strings.xml
es/xml/camera_preferences.xml
rc/com/android/camera/PhotoMenu.java
rc/com/android/camera/PieController.java
|
25c0ec4c1252a8d0f9de74ba7ade74bc7af3f5b2 |
18-Apr-2013 |
Michael Kolb <kolby@google.com> |
Add more menu options/icons Bug: 8640131 Added location and scene mode to secondary menu Updated HDR icons Change-Id: I5bed39a2ec037aecf67702d88f738befe61846d4
rc/com/android/camera/PhotoMenu.java
rc/com/android/camera/PieController.java
|
d907f1698db958f6e3898166ea6d374fcc492c59 |
18-Apr-2013 |
George Mount <mount@google.com> |
am ee8b05cf: am a9fbbc0c: am b726c83a: Merge "Change labels so that it doesn\'t clash with PanoUiLib." into gb-ub-photos-bryce * commit 'ee8b05cfca2ea41f1b3ca2c858a3655b56ccb51f': Change labels so that it doesn't clash with PanoUiLib.
|
e962d16b2b0c253be56902add40bdcd2dc57feba |
18-Apr-2013 |
George Mount <mount@google.com> |
am a9fbbc0c: am b726c83a: Merge "Change labels so that it doesn\'t clash with PanoUiLib." into gb-ub-photos-bryce * commit 'a9fbbc0ca0a348a0b5d302d130395f35cf88a1db': Change labels so that it doesn't clash with PanoUiLib.
|
32b20ec6d1b7b291d4aa33d98c179669819af91d |
18-Apr-2013 |
George Mount <mount@google.com> |
am b726c83a: Merge "Change labels so that it doesn\'t clash with PanoUiLib." into gb-ub-photos-bryce * commit 'b726c83ab60b0ec8e93cad9724857999b3bb8ec5': Change labels so that it doesn't clash with PanoUiLib.
|
fc2d20d20ac00f6e9aba1f1b82e62ee30db1a00e |
18-Apr-2013 |
George Mount <mount@google.com> |
am b726c83a: Merge "Change labels so that it doesn\'t clash with PanoUiLib." into gb-ub-photos-bryce * commit 'b726c83ab60b0ec8e93cad9724857999b3bb8ec5': Change labels so that it doesn't clash with PanoUiLib.
|
094fe6c2c6ac18f9293f6f2492808f2f1d28bea0 |
18-Apr-2013 |
George Mount <mount@google.com> |
am b726c83a: Merge "Change labels so that it doesn\'t clash with PanoUiLib." into gb-ub-photos-bryce * commit 'b726c83ab60b0ec8e93cad9724857999b3bb8ec5': Change labels so that it doesn't clash with PanoUiLib.
|
9d39c070458686fa31c3173c72332eee60c4dd14 |
18-Apr-2013 |
George Mount <mount@google.com> |
Merge "Change labels so that it doesn't clash with PanoUiLib." into gb-ub-photos-bryce
|
b726c83ab60b0ec8e93cad9724857999b3bb8ec5 |
18-Apr-2013 |
George Mount <mount@google.com> |
Merge "Change labels so that it doesn't clash with PanoUiLib." into gb-ub-photos-bryce
|
06fe6accb6abb284b77acd66e8db98421024b99b |
18-Apr-2013 |
George Mount <mount@google.com> |
Merge "Change labels so that it doesn't clash with PanoUiLib." into gb-ub-photos-bryce
|
4ff414daa2dd75446aaf0957dc433d74c03f3c1a |
16-Apr-2013 |
Doris Liu <tianliu@google.com> |
Allow swiping to filmstrip from blocker bar Bug: 8607910 Change-Id: I69bfcf8d95d6071be7d65fbf433916740cbb655c
es/layout-land/camera_controls.xml
es/layout-port/camera_controls.xml
rc/com/android/camera/PreviewGestures.java
|
9cdfe00cf57f05f81e6d02ca050e6afd8cc4a25f |
16-Apr-2013 |
Doris Liu <tianliu@google.com> |
Allow swiping to filmstrip from blocker bar Bug: 8607910 Change-Id: I69bfcf8d95d6071be7d65fbf433916740cbb655c
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/PhotoUI.java
rc/com/android/camera/PreviewGestures.java
rc/com/android/camera/VideoUI.java
|
cf18f7e34ea9c175e0cf10150a339e5ff016a57c |
16-Apr-2013 |
Doris Liu <tianliu@google.com> |
Allow swiping to filmstrip from blocker bar Bug: 8607910 Change-Id: I69bfcf8d95d6071be7d65fbf433916740cbb655c
es/layout-land/camera_controls.xml
es/layout-port/camera_controls.xml
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/PhotoUI.java
rc/com/android/camera/PreviewGestures.java
rc/com/android/camera/VideoUI.java
|
1ffe73e1e757b3c658f24c151358bfb4163460ba |
18-Apr-2013 |
John Hoford <hoford@google.com> |
fixed borders issues bug:8315216 Change-Id: I04d62984c70e7e514b8625e6a4b5ed9395137471
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/PanelController.java
rc/com/android/gallery3d/filtershow/cache/FilteringPipeline.java
rc/com/android/gallery3d/filtershow/editors/ImageOnlyEditor.java
rc/com/android/gallery3d/filtershow/filters/BaseFiltersManager.java
rc_pd/com/android/gallery3d/filtershow/filters/FiltersManager.java
|
4c792cc7b44be1ea0a2cfc2e7259828b81b0e4a4 |
18-Apr-2013 |
John Hoford <hoford@google.com> |
fixed borders issues bug:8315216 Change-Id: I04d62984c70e7e514b8625e6a4b5ed9395137471
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/PanelController.java
rc/com/android/gallery3d/filtershow/cache/FilteringPipeline.java
rc/com/android/gallery3d/filtershow/editors/ImageOnlyEditor.java
rc/com/android/gallery3d/filtershow/filters/BaseFiltersManager.java
rc_pd/com/android/gallery3d/filtershow/filters/FiltersManager.java
|
37275c939a66b98659c6015400e7ad68d576ecb2 |
18-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 68e7e978: am 8a931f9d: am c3178ca4: Gallery crop uses new activity. Fixed image quality. * commit '68e7e978faa04f43cb4b7fe02858bb32bd6250a5': Gallery crop uses new activity. Fixed image quality.
|
06b436eaa646dfbba7428dbb6d2977c2249c6f05 |
18-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 8a931f9d: am c3178ca4: Gallery crop uses new activity. Fixed image quality. * commit '8a931f9d440e2ce415048401e23a42aedb0c8abd': Gallery crop uses new activity. Fixed image quality.
|
4565d623643baf3713f18ffcd78da91af039a204 |
18-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am c3178ca4: Gallery crop uses new activity. Fixed image quality. * commit 'c3178ca4daf7ed570f3432f3433959c208ecc105': Gallery crop uses new activity. Fixed image quality.
|
00fc7327064900630c85e649888a82dfdd7e985e |
18-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am c3178ca4: Gallery crop uses new activity. Fixed image quality. * commit 'c3178ca4daf7ed570f3432f3433959c208ecc105': Gallery crop uses new activity. Fixed image quality.
|
3ec040be52b27e45155787aad80f2add71aead0b |
18-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am c3178ca4: Gallery crop uses new activity. Fixed image quality. * commit 'c3178ca4daf7ed570f3432f3433959c208ecc105': Gallery crop uses new activity. Fixed image quality.
|
b0e82433a948ab7625d5c0343a4207ea9a45bbf7 |
17-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Gallery crop uses new activity. Fixed image quality. Bug: 8639287 Bug: 8617799 Bug: 8600483 Bug: 8586301 Bug: 8526929 Bug: 8181859 Bug: 7561681 Change-Id: Ib275b970931dd324e93d1629be75e5309c9dcb4e
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/filtershow/crop/CropActivity.java
rc/com/android/gallery3d/filtershow/crop/CropDrawingUtils.java
rc/com/android/gallery3d/filtershow/crop/CropLoader.java
rc/com/android/gallery3d/filtershow/crop/CropMath.java
rc/com/android/gallery3d/filtershow/crop/CropView.java
|
c3178ca4daf7ed570f3432f3433959c208ecc105 |
17-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Gallery crop uses new activity. Fixed image quality. Bug: 8639287 Bug: 8617799 Bug: 8600483 Bug: 8586301 Bug: 8526929 Bug: 8181859 Bug: 7561681 Change-Id: Ib275b970931dd324e93d1629be75e5309c9dcb4e
es/drawable-nodpi/geometry_shadow.9.png
es/values/crop_colors.xml
es/values/crop_dimens.xml
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/filtershow/crop/CropActivity.java
rc/com/android/gallery3d/filtershow/crop/CropDrawingUtils.java
rc/com/android/gallery3d/filtershow/crop/CropLoader.java
rc/com/android/gallery3d/filtershow/crop/CropMath.java
rc/com/android/gallery3d/filtershow/crop/CropView.java
|
6f4e0db3406c54feb479bb828fdb054333d1af27 |
17-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Gallery crop uses new activity. Fixed image quality. Bug: 8639287 Bug: 8617799 Bug: 8600483 Bug: 8586301 Bug: 8526929 Bug: 8181859 Bug: 7561681 Change-Id: Ib275b970931dd324e93d1629be75e5309c9dcb4e
es/drawable-nodpi/geometry_shadow.9.png
es/values/crop_colors.xml
es/values/crop_dimens.xml
|
1e259a86f780b2857793b8fba82d98c871989639 |
18-Apr-2013 |
George Mount <mount@google.com> |
Change labels so that it doesn't clash with PanoUiLib. Bug 8401273 PanoUiLib is required for all Gallery Wolfie UI. Change-Id: Icd58c5f4c03945c29f6bf3be286d2321abf2f63a
rc/com/android/camera/ListPreference.java
|
f453f1cc2e2c93b4357e3b0fb140f6cd3c119440 |
18-Apr-2013 |
George Mount <mount@google.com> |
Change labels so that it doesn't clash with PanoUiLib. Bug 8401273 PanoUiLib is required for all Gallery Wolfie UI. Change-Id: Icd58c5f4c03945c29f6bf3be286d2321abf2f63a
es/values/attrs.xml
es/xml/camera_preferences.xml
es/xml/video_preferences.xml
rc/com/android/camera/ListPreference.java
|
f8602430548c07a35b91f16b134bb0fcc007cbbe |
18-Apr-2013 |
George Mount <mount@google.com> |
Change labels so that it doesn't clash with PanoUiLib. Bug 8401273 PanoUiLib is required for all Gallery Wolfie UI. Change-Id: Icd58c5f4c03945c29f6bf3be286d2321abf2f63a
es/values/attrs.xml
es/xml/camera_preferences.xml
es/xml/video_preferences.xml
|
d5cbd8fc0b689d9141f8b74480f9e6a7ae4e9516 |
18-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
Add extra perf logging Change-Id: Iebbb4491e69d356c0c73cd314c295857a2d6e357
rc/com/android/gallery3d/filtershow/filters/ImageFilterRS.java
|
99e5f5b7fe6a2483d2ebfa1da41b8e119ab11023 |
18-Apr-2013 |
Baligh Uddin <baligh@google.com> |
am c99bd971: am 42a13dcb: am c54e3418: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce * commit 'c99bd9718016864fb89652451f12039d240cd3c0': Import translations. DO NOT MERGE
|
6996e14ed8edb976654f3fb62f6dcc7271460e96 |
18-Apr-2013 |
Baligh Uddin <baligh@google.com> |
am 622db9a0: am f2a17aee: am df9e8b91: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce * commit '622db9a03e717afce029dfc9a239045df668697d': Import translations. DO NOT MERGE
|
025e2430d69c3041dc57fa82afc1611efaa1a2bb |
18-Apr-2013 |
Baligh Uddin <baligh@google.com> |
am d57098b2: am 86def04c: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev * commit 'd57098b230f0f6613660e0c79d9c77f6188966ae': Import translations. DO NOT MERGE
|
71012ec316f8d9270decd2534bae7fa5596d73f0 |
18-Apr-2013 |
Baligh Uddin <baligh@google.com> |
am 1c9ce63d: am 17d1c732: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev * commit '1c9ce63d99e77a8095cd7331436bbd711dd74cbd': Import translations. DO NOT MERGE
|
065d2422043e88e873fa5767751ba56fafa1c16d |
18-Apr-2013 |
Baligh Uddin <baligh@google.com> |
am 42a13dcb: am c54e3418: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce * commit '42a13dcbfe3def75ceba13740fd1d01d30d2284c': Import translations. DO NOT MERGE
|
5407c2a7137bb25e8fee125cb7d34deefc48754f |
18-Apr-2013 |
Baligh Uddin <baligh@google.com> |
am f2a17aee: am df9e8b91: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce * commit 'f2a17aee8824caf401fff0ebaf6024a546d598e2': Import translations. DO NOT MERGE
|
35ab87cf65a7c9740f5bc37f09a0d1a508f7665c |
18-Apr-2013 |
Baligh Uddin <baligh@google.com> |
am c54e3418: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce * commit 'c54e3418578d1419ff3370fa4ee38bdd43397ce1': Import translations. DO NOT MERGE
|
8b2d16b38d2c0ea358146e97620d50b737540884 |
18-Apr-2013 |
Baligh Uddin <baligh@google.com> |
am df9e8b91: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce * commit 'df9e8b91919a3b0b2097dc63f708854d20183a16': Import translations. DO NOT MERGE
|
458e80ba0eaf99090e36896bda7b5febab84e203 |
18-Apr-2013 |
Baligh Uddin <baligh@google.com> |
am 86def04c: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev * commit '86def04cbab343bd12c1be3a286bf8260e604c23': Import translations. DO NOT MERGE
|
def36589b4cf39791f5b8d95da3ae7b6bfe3ed22 |
18-Apr-2013 |
Baligh Uddin <baligh@google.com> |
am 17d1c732: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev * commit '17d1c73295822b0d79d2dd50a66a6c68d5a1328c': Import translations. DO NOT MERGE
|
a04a0a11212505dc9f364702c1bf63dabb6cef92 |
18-Apr-2013 |
Baligh Uddin <baligh@google.com> |
am c54e3418: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce * commit 'c54e3418578d1419ff3370fa4ee38bdd43397ce1': Import translations. DO NOT MERGE
|
e59bc854f5426f01dae1291a5f54969d50d8005c |
18-Apr-2013 |
Baligh Uddin <baligh@google.com> |
am df9e8b91: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce * commit 'df9e8b91919a3b0b2097dc63f708854d20183a16': Import translations. DO NOT MERGE
|
9168638726090e7b65318c0ee3f5e27c2e230f55 |
18-Apr-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE"
|
beb6d042d4ee51a556131965fda1469bd7ef25e9 |
18-Apr-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
|
c54e3418578d1419ff3370fa4ee38bdd43397ce1 |
18-Apr-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
|
50bf28f991b75ab783c4ad8f6e4f0dd546b43d7a |
18-Apr-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
|
80a001052866accdd097d4a225e57b6b0d3341e5 |
18-Apr-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into master-security-dev
|
637122d40d6e9cd83ad933ce58244df1cb086165 |
18-Apr-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE"
|
b88b02d53dedd1e0d479881797199572edde35e0 |
18-Apr-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
|
df9e8b91919a3b0b2097dc63f708854d20183a16 |
18-Apr-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
|
6f5f7936bf0e6f4dff065fe46935b601a581d561 |
18-Apr-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
|
64f3eebfa17864ba73750974e6225517ac319d61 |
18-Apr-2013 |
Flavio Lerda <flerda@google.com> |
am 51757f32: am 9581384f: am 47f28614: Merge "Usage statistics for sharing." into gb-ub-photos-bryce * commit '51757f326b320dc6770aea64880caf8e1c8d9574': Usage statistics for sharing.
|
de12796ed60a079305011fbc0b6e6c640fa2fa66 |
18-Apr-2013 |
Flavio Lerda <flerda@google.com> |
am 9581384f: am 47f28614: Merge "Usage statistics for sharing." into gb-ub-photos-bryce * commit '9581384f4bb5d167883ef14aadf8ef8462dc8815': Usage statistics for sharing.
|
2552b8956b2fbf963646aa207aec2fa8c04215c6 |
18-Apr-2013 |
Flavio Lerda <flerda@google.com> |
am 47f28614: Merge "Usage statistics for sharing." into gb-ub-photos-bryce * commit '47f28614605a19726d2ab81b90333ba718223b72': Usage statistics for sharing.
|
91fdefe0260cbb2773c3b1769e38c4c84e4577f0 |
18-Apr-2013 |
Flavio Lerda <flerda@google.com> |
am 47f28614: Merge "Usage statistics for sharing." into gb-ub-photos-bryce * commit '47f28614605a19726d2ab81b90333ba718223b72': Usage statistics for sharing.
|
c70983629903524194ad20b829894feb4ea140d5 |
18-Apr-2013 |
Flavio Lerda <flerda@google.com> |
Merge "Usage statistics for sharing." into gb-ub-photos-bryce
|
47f28614605a19726d2ab81b90333ba718223b72 |
18-Apr-2013 |
Flavio Lerda <flerda@google.com> |
Merge "Usage statistics for sharing." into gb-ub-photos-bryce
|
1748172b33023e12bd56569ef437d4924ea99011 |
18-Apr-2013 |
The Android Automerger <android-build@android.com> |
merge in jb-mr2-release history after reset to jb-mr2-dev
|
29b7511a1a41a43796c3890b272486f89a268105 |
18-Apr-2013 |
John Hoford <hoford@google.com> |
Merge "Support for save state in images" into gb-ub-photos-carlsbad
|
f740cfd287e1a83e9f247e54cf2862587c889294 |
18-Apr-2013 |
John Hoford <hoford@google.com> |
Merge "Support for save state in images" into gb-ub-photos-carlsbad
|
40e6c86fe8548cf74b26a82e4d2caa3624bf5427 |
18-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 7adbd947: am 04440b3c: am 5ed8e518: am 61f3f111: Remove call to superclass onTouch in curves. * commit '7adbd947f7a904717353bb73c73b133cac976a2f': Remove call to superclass onTouch in curves.
|
a2c2ced6a545243eec483fad73ac92914284de9e |
18-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 04440b3c: am 5ed8e518: am 61f3f111: Remove call to superclass onTouch in curves. * commit '04440b3c55e11d798510484e7b7eccb04f0b8a1e': Remove call to superclass onTouch in curves.
|
b46e4f13280a1e3419e78aef222e64dcf359fffa |
18-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 5ed8e518: am 61f3f111: Remove call to superclass onTouch in curves. * commit '5ed8e518b4208e3d748aa421778a885a95f17756': Remove call to superclass onTouch in curves.
|
f6419b8b40d0dfcec04c750f8dd71851afa3046e |
18-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 61f3f111: Remove call to superclass onTouch in curves. * commit '61f3f1113a5b4f8583fd9fcae4d24734617cae21': Remove call to superclass onTouch in curves.
|
ccc75e0f4cec050c2030cb28298ba0918ac0e48c |
18-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 61f3f111: Remove call to superclass onTouch in curves. * commit '61f3f1113a5b4f8583fd9fcae4d24734617cae21': Remove call to superclass onTouch in curves.
|
e9011168ade9199b2ffebee23fdee49d4be0ab8e |
18-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Remove call to superclass onTouch in curves. Bug: 8523301 Change-Id: I0102a228c2d1b3199412c9897a9f1abdb4bcb41f
rc/com/android/gallery3d/filtershow/ui/ImageCurves.java
|
61f3f1113a5b4f8583fd9fcae4d24734617cae21 |
18-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Remove call to superclass onTouch in curves. Bug: 8523301 Change-Id: I0102a228c2d1b3199412c9897a9f1abdb4bcb41f
rc/com/android/gallery3d/filtershow/ui/ImageCurves.java
|
bd2f1d6f97d197052c2a1501ce65b60db0dc4ca6 |
18-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am fd7a7bfa: am b343fc4a: am 550a4871: am 869cb048: Merge "Remove redeye filter." into gb-ub-photos-bryce * commit 'fd7a7bfaaf59f949d1007da8b556fb0eb93864ef': Remove redeye filter.
|
d4e8e04d66a6a7f9923b8b51bbe2122d4a511e3e |
18-Apr-2013 |
Sascha Haeberling <haeberling@google.com> |
am 6f85c1bf: am 9aefbe13: am 5aa6cb20: am 49ee213f: Merge "Add method for returning SoundPool audio type." into gb-ub-photos-bryce * commit '6f85c1bf75b8b8de73289539834ed8524f1f5cd7': Add method for returning SoundPool audio type.
|
22218d866879a07e4e1079b5d675be7bb77aeb5d |
18-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Revert "Remove redeye filter." Bug: 8609003 Change-Id: Iac397cf2db7fd991b278f70de63fa18f1b620312
rc/com/android/gallery3d/filtershow/filters/BaseFiltersManager.java
|
e4985e71f547ce4f52fe02664d05184481a054bf |
18-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am b343fc4a: am 550a4871: am 869cb048: Merge "Remove redeye filter." into gb-ub-photos-bryce * commit 'b343fc4ab76d38830e86cfd5b923dbfcc50339a9': Remove redeye filter.
|
e168cc6f293a119c226144bcea6324ff543fe619 |
18-Apr-2013 |
Sascha Haeberling <haeberling@google.com> |
am 9aefbe13: am 5aa6cb20: am 49ee213f: Merge "Add method for returning SoundPool audio type." into gb-ub-photos-bryce * commit '9aefbe13d8dfb74ca011ca5fca9823b2dcd7ac73': Add method for returning SoundPool audio type.
|
d513e9e915c9ce7bc71a77c77252b82b39bc2be2 |
18-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 550a4871: am 869cb048: Merge "Remove redeye filter." into gb-ub-photos-bryce * commit '550a4871904503748660f0d4fc524e83a5756707': Remove redeye filter.
|
317e1591206c2aab700244cae4a94c6d1e0a8477 |
18-Apr-2013 |
Sascha Haeberling <haeberling@google.com> |
am 5aa6cb20: am 49ee213f: Merge "Add method for returning SoundPool audio type." into gb-ub-photos-bryce * commit '5aa6cb20f0971c633982711666f5be7a61cc37d6': Add method for returning SoundPool audio type.
|
a7367cce83e2ea7ce5d29fa93ae505430fe43592 |
18-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 869cb048: Merge "Remove redeye filter." into gb-ub-photos-bryce * commit '869cb0484c1c9e77d089abe198817709d3e89eb9': Remove redeye filter.
|
bd7c502a9f565cdfce423b79f16ccb5e906a7e08 |
18-Apr-2013 |
Sascha Haeberling <haeberling@google.com> |
am 49ee213f: Merge "Add method for returning SoundPool audio type." into gb-ub-photos-bryce * commit '49ee213fbb0f3434002693889bdae3e7c0d5b378': Add method for returning SoundPool audio type.
|
86545917a2f35e359952824593e11ac59cc17c93 |
18-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 869cb048: Merge "Remove redeye filter." into gb-ub-photos-bryce * commit '869cb0484c1c9e77d089abe198817709d3e89eb9': Remove redeye filter.
|
310cd55c778978e9a98bedf11b5bd329262972af |
18-Apr-2013 |
Sascha Haeberling <haeberling@google.com> |
am 49ee213f: Merge "Add method for returning SoundPool audio type." into gb-ub-photos-bryce * commit '49ee213fbb0f3434002693889bdae3e7c0d5b378': Add method for returning SoundPool audio type.
|
f74df5b2ddf6edc3a519d63c1924fd5b12291fa7 |
18-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Remove redeye filter." into gb-ub-photos-bryce
|
869cb0484c1c9e77d089abe198817709d3e89eb9 |
18-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Remove redeye filter." into gb-ub-photos-bryce
|
49ee213fbb0f3434002693889bdae3e7c0d5b378 |
18-Apr-2013 |
Sascha Haeberling <haeberling@google.com> |
Merge "Add method for returning SoundPool audio type." into gb-ub-photos-bryce
|
491c6915aefe4fdcd23176c78ec1199ef74ef50f |
18-Apr-2013 |
Sascha Haeberling <haeberling@google.com> |
Merge "Add method for returning SoundPool audio type." into gb-ub-photos-bryce
|
d659b589fbb7506390c2602576e3a87c5a86d0e8 |
18-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Remove redeye filter. Bug: 8609003 Change-Id: I7f10e928fa775e5186146f06877dda34b3df699a
rc/com/android/gallery3d/filtershow/filters/BaseFiltersManager.java
|
21512659d1f098f13249516a40bee69d7e98de29 |
18-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Remove redeye filter. Bug: 8609003 Change-Id: I7f10e928fa775e5186146f06877dda34b3df699a
rc/com/android/gallery3d/filtershow/filters/BaseFiltersManager.java
|
a1c2c919b25b0cae55dd1dddd6592d3b7c3d0ee3 |
18-Apr-2013 |
John Hoford <hoford@google.com> |
am a7a57818: am 0ee15ec9: am dd42cac8: am 12cd0222: Merge "improve pinch to zoom behavior" into gb-ub-photos-bryce * commit 'a7a578188e11ef772ce3f4d6910c630f8d6f8d8d': improve pinch to zoom behavior
|
5977281809bca8c18bf57698ad720c50d2c5ccfe |
18-Apr-2013 |
John Hoford <hoford@google.com> |
am 0ee15ec9: am dd42cac8: am 12cd0222: Merge "improve pinch to zoom behavior" into gb-ub-photos-bryce * commit '0ee15ec9f463f8b6c8e8294e4e4fc5d99bb707dd': improve pinch to zoom behavior
|
7135ba334ae734a5ff3ef179cb1d4abdcce98ad3 |
18-Apr-2013 |
Michael Kolb <kolby@google.com> |
am 18fcbe23: am 4bcc3286: am 133f92d4: am 1c7d2bc2: First part of asset drop * commit '18fcbe2321a6e8ac1e5135334b8a5c45f919ff91': First part of asset drop
|
1f3a7ad4535306635d5004fb8a34e6abdfe09231 |
18-Apr-2013 |
John Hoford <hoford@google.com> |
am dd42cac8: am 12cd0222: Merge "improve pinch to zoom behavior" into gb-ub-photos-bryce * commit 'dd42cac8336dd6651968fe87e63bac4d84a81b21': improve pinch to zoom behavior
|
77aa016409cec50d7911e9c763e707a0462f1e3a |
18-Apr-2013 |
ztenghui <ztenghui@google.com> |
am 69c56c13: am 6e6a0c2d: am f4f9e425: am 75408cd3: Add accessibility to video player controller. * commit '69c56c13f625f4e5f9aee4e4e2e9e6f7532c9d4f': Add accessibility to video player controller.
|
ef347a79509371c4234254fa54b41be95b78eb02 |
18-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
am 04ca4b6f: am 071544b6: am 19191a4f: am 83bd8d34: Remove History panel * commit '04ca4b6f063f48fe161ea2be4f78b73113855919': Remove History panel
|
83c4478ca4620b7a015f9993342c73c7d1b9a62e |
18-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am fe724d6d: am c10b3066: am 965a99b8: am 113e0fbd: Merge "Shows final set of filters in UI." into gb-ub-photos-bryce * commit 'fe724d6d1e0523ca44fe2b18868403e5afe59627': Shows final set of filters in UI.
|
36c0c77c196a327a4fd55e67d1e244b9dc2a0a61 |
18-Apr-2013 |
Doris Liu <tianliu@google.com> |
am 8fab3452: am c44633a0: am 6aa5d2df: am 953f109b: Merge "Fix face unlock failure" into gb-ub-photos-bryce * commit '8fab34527a24e115f73e30df2fb16646ab58bb94': Fix face unlock failure
|
3439036daf24c58a852b614bf9b802fe6163e881 |
18-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
am 8f4dd1ca: am 92a587f9: am ccc18a73: am 03332473: Make convertBitmap() protected so that Frames can use it. * commit '8f4dd1ca45f61f6a31ecce9a0ea0c9e0a685cbeb': Make convertBitmap() protected so that Frames can use it.
|
63885e37631b4638c209bf3d3f89e69ad1d4feb3 |
18-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
am 8ae1a45f: am c6a1e41f: am d80c69a8: am f3f0aae4: Merge "Remove the Simple Edit menu item in Gallery" into gb-ub-photos-bryce * commit '8ae1a45fbc69512f3778283262ae8fdc50bea4fe': Remove the Simple Edit menu item in Gallery
|
ad8912d1b325d2829703aa347d56dc1982855b6d |
18-Apr-2013 |
Angus Kong <shkong@google.com> |
am f9e0c3f7: am fcabacf4: am 65f3514a: am bc02d7dc: Don\'t wait for Mosaic Renderer ready in UI thread. * commit 'f9e0c3f70360216f19000a6a701d55d1dd127b30': Don't wait for Mosaic Renderer ready in UI thread.
|
4f64e913549e71132d148868f17f197372f309e0 |
18-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
am 763d7d4a: am b6d61d16: am 9472ae6f: am fb6a8e16: New state panel * commit '763d7d4addc3f12aea54126e8432f930fcc07766': New state panel
|
e7ad943eff9b9e710742a92725f03fdcf66aa730 |
18-Apr-2013 |
John Hoford <hoford@google.com> |
am 12cd0222: Merge "improve pinch to zoom behavior" into gb-ub-photos-bryce * commit '12cd022273f14a64d9cdf79aa6a27feb099b9107': improve pinch to zoom behavior
|
13d7999e033ad12ad63d343f00a55062f1915afa |
18-Apr-2013 |
John Hoford <hoford@google.com> |
am 12cd0222: Merge "improve pinch to zoom behavior" into gb-ub-photos-bryce * commit '12cd022273f14a64d9cdf79aa6a27feb099b9107': improve pinch to zoom behavior
|
35aa90e80c2994dff3e64ca66460ec9a45503776 |
18-Apr-2013 |
Michael Kolb <kolby@google.com> |
am 843408f3: am 53bd5f2c: am 44d3d602: am 0786c387: Merge "Angle menu at edge of screen" into gb-ub-photos-bryce * commit '843408f31d52092a9680e98212aec3e3219277a3': Angle menu at edge of screen
|
12cd022273f14a64d9cdf79aa6a27feb099b9107 |
18-Apr-2013 |
John Hoford <hoford@google.com> |
Merge "improve pinch to zoom behavior" into gb-ub-photos-bryce
|
446224243616dbb95c3101c4b311ac6453517bc4 |
18-Apr-2013 |
John Hoford <hoford@google.com> |
Merge "improve pinch to zoom behavior" into gb-ub-photos-bryce
|
197180f0f9960f890f7f2b211db14d8e656f84eb |
18-Apr-2013 |
Michael Kolb <kolby@google.com> |
am 4bcc3286: am 133f92d4: am 1c7d2bc2: First part of asset drop * commit '4bcc3286df4879744ce073e71691674b4d413697': First part of asset drop
|
3e124f5815241462c87f79055b3d232965a59517 |
18-Apr-2013 |
Michael Kolb <kolby@google.com> |
am 133f92d4: am 1c7d2bc2: First part of asset drop * commit '133f92d47e420aa9c6455122fa67daa22a3910e8': First part of asset drop
|
919f2a4cf0964aab2b03d6aa81e7b0fc3c83e11c |
18-Apr-2013 |
Michael Kolb <kolby@google.com> |
am 1c7d2bc2: First part of asset drop * commit '1c7d2bc293a1ff824db768756d0309dfbc7f08d8': First part of asset drop
|
aa4041bb85846ddf9a4492df3ad940e21adfeb01 |
18-Apr-2013 |
Michael Kolb <kolby@google.com> |
am 1c7d2bc2: First part of asset drop * commit '1c7d2bc293a1ff824db768756d0309dfbc7f08d8': First part of asset drop
|
34b332f8db3e91b0c49f2d1d3b5be9b52f39d651 |
18-Apr-2013 |
Michael Kolb <kolby@google.com> |
am 1c7d2bc2: First part of asset drop * commit '1c7d2bc293a1ff824db768756d0309dfbc7f08d8': First part of asset drop
|
172d37e178a33fd1138d7e3a9b08f8c541959cc3 |
18-Apr-2013 |
Michael Kolb <kolby@google.com> |
First part of asset drop Bug: 8640131 Added new assets, updated front/back menu entry. Change-Id: I9b007cde14eeb9f44706d99ea485e03ce1de9d53
rc/com/android/camera/PhotoMenu.java
rc/com/android/camera/VideoMenu.java
|
1c7d2bc293a1ff824db768756d0309dfbc7f08d8 |
18-Apr-2013 |
Michael Kolb <kolby@google.com> |
First part of asset drop Bug: 8640131 Added new assets, updated front/back menu entry. Change-Id: I9b007cde14eeb9f44706d99ea485e03ce1de9d53
es/drawable-hdpi/ic_exposure_0.png
es/drawable-hdpi/ic_exposure_holo_light.png
es/drawable-hdpi/ic_exposure_n1.png
es/drawable-hdpi/ic_exposure_n2.png
es/drawable-hdpi/ic_exposure_n3.png
es/drawable-hdpi/ic_exposure_p1.png
es/drawable-hdpi/ic_exposure_p2.png
es/drawable-hdpi/ic_exposure_p3.png
es/drawable-hdpi/ic_flash_auto_holo_light.png
es/drawable-hdpi/ic_flash_off_holo_light.png
es/drawable-hdpi/ic_flash_on_holo_light.png
es/drawable-hdpi/ic_flash_torch.png
es/drawable-hdpi/ic_hdr.png
es/drawable-hdpi/ic_hdr_off.png
es/drawable-hdpi/ic_location.png
es/drawable-hdpi/ic_location_off.png
es/drawable-hdpi/ic_sce.png
es/drawable-hdpi/ic_sce_action.png
es/drawable-hdpi/ic_sce_night.png
es/drawable-hdpi/ic_sce_party.png
es/drawable-hdpi/ic_sce_sunset.png
es/drawable-hdpi/ic_settings_holo_light.png
es/drawable-hdpi/ic_switch_back.png
es/drawable-hdpi/ic_switch_front.png
es/drawable-hdpi/ic_timer_10s.png
es/drawable-hdpi/ic_timer_15s.png
es/drawable-hdpi/ic_timer_1s.png
es/drawable-hdpi/ic_timer_3s.png
es/drawable-hdpi/ic_timer_off.png
es/drawable-hdpi/ic_wb_auto.png
es/drawable-hdpi/ic_wb_cloudy.png
es/drawable-hdpi/ic_wb_fluorescent.png
es/drawable-hdpi/ic_wb_incandescent.png
es/drawable-hdpi/ic_wb_sunlight.png
es/drawable-mdpi/ic_exposure_0.png
es/drawable-mdpi/ic_exposure_holo_light.png
es/drawable-mdpi/ic_exposure_n1.png
es/drawable-mdpi/ic_exposure_n2.png
es/drawable-mdpi/ic_exposure_n3.png
es/drawable-mdpi/ic_exposure_p1.png
es/drawable-mdpi/ic_exposure_p2.png
es/drawable-mdpi/ic_exposure_p3.png
es/drawable-mdpi/ic_flash_auto_holo_light.png
es/drawable-mdpi/ic_flash_off_holo_light.png
es/drawable-mdpi/ic_flash_on_holo_light.png
es/drawable-mdpi/ic_flash_torch.png
es/drawable-mdpi/ic_hdr.png
es/drawable-mdpi/ic_hdr_off.png
es/drawable-mdpi/ic_location.png
es/drawable-mdpi/ic_location_off.png
es/drawable-mdpi/ic_sce.png
es/drawable-mdpi/ic_sce_action.png
es/drawable-mdpi/ic_sce_night.png
es/drawable-mdpi/ic_sce_party.png
es/drawable-mdpi/ic_sce_sunset.png
es/drawable-mdpi/ic_settings_holo_light.png
es/drawable-mdpi/ic_switch_back.png
es/drawable-mdpi/ic_switch_front.png
es/drawable-mdpi/ic_timer_10s.png
es/drawable-mdpi/ic_timer_15s.png
es/drawable-mdpi/ic_timer_1s.png
es/drawable-mdpi/ic_timer_3s.png
es/drawable-mdpi/ic_timer_off.png
es/drawable-mdpi/ic_wb_auto.png
es/drawable-mdpi/ic_wb_cloudy.png
es/drawable-mdpi/ic_wb_fluorescent.png
es/drawable-mdpi/ic_wb_incandescent.png
es/drawable-mdpi/ic_wb_sunlight.png
es/drawable-xhdpi/ic_exposure_0.png
es/drawable-xhdpi/ic_exposure_holo_light.png
es/drawable-xhdpi/ic_exposure_n1.png
es/drawable-xhdpi/ic_exposure_n2.png
es/drawable-xhdpi/ic_exposure_n3.png
es/drawable-xhdpi/ic_exposure_p1.png
es/drawable-xhdpi/ic_exposure_p2.png
es/drawable-xhdpi/ic_exposure_p3.png
es/drawable-xhdpi/ic_flash_auto_holo_light.png
es/drawable-xhdpi/ic_flash_off_holo_light.png
es/drawable-xhdpi/ic_flash_on_holo_light.png
es/drawable-xhdpi/ic_flash_torch.png
es/drawable-xhdpi/ic_hdr.png
es/drawable-xhdpi/ic_hdr_off.png
es/drawable-xhdpi/ic_location.png
es/drawable-xhdpi/ic_location_off.png
es/drawable-xhdpi/ic_sce.png
es/drawable-xhdpi/ic_sce_action.png
es/drawable-xhdpi/ic_sce_night.png
es/drawable-xhdpi/ic_sce_party.png
es/drawable-xhdpi/ic_sce_sunset.png
es/drawable-xhdpi/ic_settings_holo_light.png
es/drawable-xhdpi/ic_switch_back.png
es/drawable-xhdpi/ic_switch_front.png
es/drawable-xhdpi/ic_timer_10s.png
es/drawable-xhdpi/ic_timer_15s.png
es/drawable-xhdpi/ic_timer_1s.png
es/drawable-xhdpi/ic_timer_3s.png
es/drawable-xhdpi/ic_timer_off.png
es/drawable-xhdpi/ic_wb_auto.png
es/drawable-xhdpi/ic_wb_cloudy.png
es/drawable-xhdpi/ic_wb_fluorescent.png
es/drawable-xhdpi/ic_wb_incandescent.png
es/drawable-xhdpi/ic_wb_sunlight.png
es/values/arrays.xml
rc/com/android/camera/PhotoMenu.java
rc/com/android/camera/VideoMenu.java
|
86299cb80e14adc48ff2062000bae201bc6d501a |
18-Apr-2013 |
Michael Kolb <kolby@google.com> |
First part of asset drop Bug: 8640131 Added new assets, updated front/back menu entry. Change-Id: I9b007cde14eeb9f44706d99ea485e03ce1de9d53
es/drawable-hdpi/ic_exposure_0.png
es/drawable-hdpi/ic_exposure_holo_light.png
es/drawable-hdpi/ic_exposure_n1.png
es/drawable-hdpi/ic_exposure_n2.png
es/drawable-hdpi/ic_exposure_n3.png
es/drawable-hdpi/ic_exposure_p1.png
es/drawable-hdpi/ic_exposure_p2.png
es/drawable-hdpi/ic_exposure_p3.png
es/drawable-hdpi/ic_flash_auto_holo_light.png
es/drawable-hdpi/ic_flash_off_holo_light.png
es/drawable-hdpi/ic_flash_on_holo_light.png
es/drawable-hdpi/ic_flash_torch.png
es/drawable-hdpi/ic_hdr.png
es/drawable-hdpi/ic_hdr_off.png
es/drawable-hdpi/ic_location.png
es/drawable-hdpi/ic_location_off.png
es/drawable-hdpi/ic_sce.png
es/drawable-hdpi/ic_sce_action.png
es/drawable-hdpi/ic_sce_night.png
es/drawable-hdpi/ic_sce_party.png
es/drawable-hdpi/ic_sce_sunset.png
es/drawable-hdpi/ic_settings_holo_light.png
es/drawable-hdpi/ic_switch_back.png
es/drawable-hdpi/ic_switch_front.png
es/drawable-hdpi/ic_timer_10s.png
es/drawable-hdpi/ic_timer_15s.png
es/drawable-hdpi/ic_timer_1s.png
es/drawable-hdpi/ic_timer_3s.png
es/drawable-hdpi/ic_timer_off.png
es/drawable-hdpi/ic_wb_auto.png
es/drawable-hdpi/ic_wb_cloudy.png
es/drawable-hdpi/ic_wb_fluorescent.png
es/drawable-hdpi/ic_wb_incandescent.png
es/drawable-hdpi/ic_wb_sunlight.png
es/drawable-mdpi/ic_exposure_0.png
es/drawable-mdpi/ic_exposure_holo_light.png
es/drawable-mdpi/ic_exposure_n1.png
es/drawable-mdpi/ic_exposure_n2.png
es/drawable-mdpi/ic_exposure_n3.png
es/drawable-mdpi/ic_exposure_p1.png
es/drawable-mdpi/ic_exposure_p2.png
es/drawable-mdpi/ic_exposure_p3.png
es/drawable-mdpi/ic_flash_auto_holo_light.png
es/drawable-mdpi/ic_flash_off_holo_light.png
es/drawable-mdpi/ic_flash_on_holo_light.png
es/drawable-mdpi/ic_flash_torch.png
es/drawable-mdpi/ic_hdr.png
es/drawable-mdpi/ic_hdr_off.png
es/drawable-mdpi/ic_location.png
es/drawable-mdpi/ic_location_off.png
es/drawable-mdpi/ic_sce.png
es/drawable-mdpi/ic_sce_action.png
es/drawable-mdpi/ic_sce_night.png
es/drawable-mdpi/ic_sce_party.png
es/drawable-mdpi/ic_sce_sunset.png
es/drawable-mdpi/ic_settings_holo_light.png
es/drawable-mdpi/ic_switch_back.png
es/drawable-mdpi/ic_switch_front.png
es/drawable-mdpi/ic_timer_10s.png
es/drawable-mdpi/ic_timer_15s.png
es/drawable-mdpi/ic_timer_1s.png
es/drawable-mdpi/ic_timer_3s.png
es/drawable-mdpi/ic_timer_off.png
es/drawable-mdpi/ic_wb_auto.png
es/drawable-mdpi/ic_wb_cloudy.png
es/drawable-mdpi/ic_wb_fluorescent.png
es/drawable-mdpi/ic_wb_incandescent.png
es/drawable-mdpi/ic_wb_sunlight.png
es/drawable-xhdpi/ic_exposure_0.png
es/drawable-xhdpi/ic_exposure_holo_light.png
es/drawable-xhdpi/ic_exposure_n1.png
es/drawable-xhdpi/ic_exposure_n2.png
es/drawable-xhdpi/ic_exposure_n3.png
es/drawable-xhdpi/ic_exposure_p1.png
es/drawable-xhdpi/ic_exposure_p2.png
es/drawable-xhdpi/ic_exposure_p3.png
es/drawable-xhdpi/ic_flash_auto_holo_light.png
es/drawable-xhdpi/ic_flash_off_holo_light.png
es/drawable-xhdpi/ic_flash_on_holo_light.png
es/drawable-xhdpi/ic_flash_torch.png
es/drawable-xhdpi/ic_hdr.png
es/drawable-xhdpi/ic_hdr_off.png
es/drawable-xhdpi/ic_location.png
es/drawable-xhdpi/ic_location_off.png
es/drawable-xhdpi/ic_sce.png
es/drawable-xhdpi/ic_sce_action.png
es/drawable-xhdpi/ic_sce_night.png
es/drawable-xhdpi/ic_sce_party.png
es/drawable-xhdpi/ic_sce_sunset.png
es/drawable-xhdpi/ic_settings_holo_light.png
es/drawable-xhdpi/ic_switch_back.png
es/drawable-xhdpi/ic_switch_front.png
es/drawable-xhdpi/ic_timer_10s.png
es/drawable-xhdpi/ic_timer_15s.png
es/drawable-xhdpi/ic_timer_1s.png
es/drawable-xhdpi/ic_timer_3s.png
es/drawable-xhdpi/ic_timer_off.png
es/drawable-xhdpi/ic_wb_auto.png
es/drawable-xhdpi/ic_wb_cloudy.png
es/drawable-xhdpi/ic_wb_fluorescent.png
es/drawable-xhdpi/ic_wb_incandescent.png
es/drawable-xhdpi/ic_wb_sunlight.png
es/values/arrays.xml
|
0a52dc428a9c185305d360b0792f7da0281d165b |
17-Apr-2013 |
John Hoford <hoford@google.com> |
improve pinch to zoom behavior bug:8630925 Change-Id: Ica4c4ab83e726901a8e729056529aa8379cb52ae
rc/com/android/gallery3d/filtershow/imageshow/ImageShow.java
|
2967dc0912bf511d7cd97ff502c672565a548a00 |
17-Apr-2013 |
John Hoford <hoford@google.com> |
improve pinch to zoom behavior bug:8630925 Change-Id: Ica4c4ab83e726901a8e729056529aa8379cb52ae
rc/com/android/gallery3d/filtershow/imageshow/ImageShow.java
|
eb8562ae2a6614a0d06d2511ea388c3499fe7480 |
17-Apr-2013 |
Sascha Haeberling <haeberling@google.com> |
Add method for returning SoundPool audio type. Bug: 7402245 Change-Id: Ib45ef78265a66d59f0b27473d9dfcdfa4624c8fa
rc/com/android/camera/SoundClips.java
|
02cc9b9fbd42edfe6edd6db872f7eec84a274849 |
17-Apr-2013 |
Sascha Haeberling <haeberling@google.com> |
Add method for returning SoundPool audio type. Bug: 7402245 Change-Id: Ib45ef78265a66d59f0b27473d9dfcdfa4624c8fa
rc/com/android/camera/SoundClips.java
|
3b254c2012f4862994bbd2c2e8d012a8e28b9931 |
17-Apr-2013 |
ztenghui <ztenghui@google.com> |
Merge "When video not seekable, don't show the scrubber" into gb-ub-photos-carlsbad
|
b5a40b231ecc4105c8a80d9d1e8bb52b5efb9e56 |
17-Apr-2013 |
ztenghui <ztenghui@google.com> |
When video not seekable, don't show the scrubber bug:7117365 Change-Id: I133ea68eaebf1d875a27336ac524d785efe71cc2
rc/com/android/gallery3d/app/CommonControllerOverlay.java
rc/com/android/gallery3d/app/MoviePlayer.java
rc/com/android/gallery3d/app/TimeBar.java
|
7313b1a1c0690f4b66df9e066e7b45578f28dab1 |
17-Apr-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I5e257c70b129f65097d46e80f46a4f81ef444d40 Auto-generated-cl: translation import
es/values-af/filtershow_strings.xml
es/values-am/filtershow_strings.xml
es/values-ar/filtershow_strings.xml
es/values-be/filtershow_strings.xml
es/values-bg/filtershow_strings.xml
es/values-ca/filtershow_strings.xml
es/values-cs/filtershow_strings.xml
es/values-da/filtershow_strings.xml
es/values-de/filtershow_strings.xml
es/values-el/filtershow_strings.xml
es/values-en-rGB/filtershow_strings.xml
es/values-es-rUS/filtershow_strings.xml
es/values-es/filtershow_strings.xml
es/values-et/filtershow_strings.xml
es/values-fa/filtershow_strings.xml
es/values-fi/filtershow_strings.xml
es/values-fr/filtershow_strings.xml
es/values-hi/filtershow_strings.xml
es/values-hr/filtershow_strings.xml
es/values-hu/filtershow_strings.xml
es/values-in/filtershow_strings.xml
es/values-it/filtershow_strings.xml
es/values-iw/filtershow_strings.xml
es/values-ja/filtershow_strings.xml
es/values-ko/filtershow_strings.xml
es/values-lt/filtershow_strings.xml
es/values-lv/filtershow_strings.xml
es/values-ms/filtershow_strings.xml
es/values-nb/filtershow_strings.xml
es/values-nl/filtershow_strings.xml
es/values-pl/filtershow_strings.xml
es/values-pt-rPT/filtershow_strings.xml
es/values-pt/filtershow_strings.xml
es/values-ro/filtershow_strings.xml
es/values-ru/filtershow_strings.xml
es/values-sk/filtershow_strings.xml
es/values-sl/filtershow_strings.xml
es/values-sr/filtershow_strings.xml
es/values-sv/filtershow_strings.xml
es/values-sw/filtershow_strings.xml
es/values-th/filtershow_strings.xml
es/values-tl/filtershow_strings.xml
es/values-tr/filtershow_strings.xml
es/values-uk/filtershow_strings.xml
es/values-vi/filtershow_strings.xml
es/values-zh-rCN/filtershow_strings.xml
es/values-zh-rTW/filtershow_strings.xml
es/values-zu/filtershow_strings.xml
|
8c04153a5597195c1b1565cc326a106ec29bf79c |
17-Apr-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ifa9719cff3e8c9694ae010df054468110d02130e Auto-generated-cl: translation import
es/values-af/filtershow_strings.xml
es/values-am/filtershow_strings.xml
es/values-ar/filtershow_strings.xml
es/values-be/filtershow_strings.xml
es/values-bg/filtershow_strings.xml
es/values-ca/filtershow_strings.xml
es/values-cs/filtershow_strings.xml
es/values-da/filtershow_strings.xml
es/values-de/filtershow_strings.xml
es/values-el/filtershow_strings.xml
es/values-en-rGB/filtershow_strings.xml
es/values-es-rUS/filtershow_strings.xml
es/values-es/filtershow_strings.xml
es/values-et/filtershow_strings.xml
es/values-fa/filtershow_strings.xml
es/values-fi/filtershow_strings.xml
es/values-fr/filtershow_strings.xml
es/values-hi/filtershow_strings.xml
es/values-hr/filtershow_strings.xml
es/values-hu/filtershow_strings.xml
es/values-in/filtershow_strings.xml
es/values-it/filtershow_strings.xml
es/values-iw/filtershow_strings.xml
es/values-ja/filtershow_strings.xml
es/values-ko/filtershow_strings.xml
es/values-lt/filtershow_strings.xml
es/values-lv/filtershow_strings.xml
es/values-ms/filtershow_strings.xml
es/values-nb/filtershow_strings.xml
es/values-nl/filtershow_strings.xml
es/values-pl/filtershow_strings.xml
es/values-pt-rPT/filtershow_strings.xml
es/values-pt/filtershow_strings.xml
es/values-ro/filtershow_strings.xml
es/values-ru/filtershow_strings.xml
es/values-sk/filtershow_strings.xml
es/values-sl/filtershow_strings.xml
es/values-sr/filtershow_strings.xml
es/values-sv/filtershow_strings.xml
es/values-sw/filtershow_strings.xml
es/values-th/filtershow_strings.xml
es/values-tl/filtershow_strings.xml
es/values-tr/filtershow_strings.xml
es/values-uk/filtershow_strings.xml
es/values-vi/filtershow_strings.xml
es/values-zh-rCN/filtershow_strings.xml
es/values-zh-rTW/filtershow_strings.xml
es/values-zu/filtershow_strings.xml
|
fa19c7d3832782858ade6caa4c2cf71a25bb0899 |
17-Apr-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I40c3456be1b6c6cecda7cc3c8c819972c7e42c6b Auto-generated-cl: translation import
es/values-af/filtershow_strings.xml
es/values-am/filtershow_strings.xml
es/values-ar/filtershow_strings.xml
es/values-be/filtershow_strings.xml
es/values-bg/filtershow_strings.xml
es/values-ca/filtershow_strings.xml
es/values-cs/filtershow_strings.xml
es/values-da/filtershow_strings.xml
es/values-de/filtershow_strings.xml
es/values-el/filtershow_strings.xml
es/values-en-rGB/filtershow_strings.xml
es/values-es-rUS/filtershow_strings.xml
es/values-es/filtershow_strings.xml
es/values-et/filtershow_strings.xml
es/values-fa/filtershow_strings.xml
es/values-fi/filtershow_strings.xml
es/values-fr/filtershow_strings.xml
es/values-hi/filtershow_strings.xml
es/values-hr/filtershow_strings.xml
es/values-hu/filtershow_strings.xml
es/values-in/filtershow_strings.xml
es/values-it/filtershow_strings.xml
es/values-iw/filtershow_strings.xml
es/values-ja/filtershow_strings.xml
es/values-ko/filtershow_strings.xml
es/values-lt/filtershow_strings.xml
es/values-lv/filtershow_strings.xml
es/values-ms/filtershow_strings.xml
es/values-nb/filtershow_strings.xml
es/values-nl/filtershow_strings.xml
es/values-pl/filtershow_strings.xml
es/values-pt-rPT/filtershow_strings.xml
es/values-pt/filtershow_strings.xml
es/values-ro/filtershow_strings.xml
es/values-ru/filtershow_strings.xml
es/values-sk/filtershow_strings.xml
es/values-sl/filtershow_strings.xml
es/values-sr/filtershow_strings.xml
es/values-sv/filtershow_strings.xml
es/values-sw/filtershow_strings.xml
es/values-th/filtershow_strings.xml
es/values-tl/filtershow_strings.xml
es/values-tr/filtershow_strings.xml
es/values-uk/filtershow_strings.xml
es/values-vi/filtershow_strings.xml
es/values-zh-rCN/filtershow_strings.xml
es/values-zh-rTW/filtershow_strings.xml
es/values-zu/filtershow_strings.xml
|
3a91f92c4cd97b5ceb14ffdad47bf8d012fbc6bd |
17-Apr-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I40c3456be1b6c6cecda7cc3c8c819972c7e42c6b Auto-generated-cl: translation import
es/values-af/filtershow_strings.xml
es/values-am/filtershow_strings.xml
es/values-ar/filtershow_strings.xml
es/values-be/filtershow_strings.xml
es/values-bg/filtershow_strings.xml
es/values-ca/filtershow_strings.xml
es/values-cs/filtershow_strings.xml
es/values-da/filtershow_strings.xml
es/values-de/filtershow_strings.xml
es/values-el/filtershow_strings.xml
es/values-en-rGB/filtershow_strings.xml
es/values-es-rUS/filtershow_strings.xml
es/values-es/filtershow_strings.xml
es/values-et/filtershow_strings.xml
es/values-fa/filtershow_strings.xml
es/values-fi/filtershow_strings.xml
es/values-fr/filtershow_strings.xml
es/values-hi/filtershow_strings.xml
es/values-hr/filtershow_strings.xml
es/values-hu/filtershow_strings.xml
es/values-in/filtershow_strings.xml
es/values-it/filtershow_strings.xml
es/values-iw/filtershow_strings.xml
es/values-ja/filtershow_strings.xml
es/values-ko/filtershow_strings.xml
es/values-lt/filtershow_strings.xml
es/values-lv/filtershow_strings.xml
es/values-ms/filtershow_strings.xml
es/values-nb/filtershow_strings.xml
es/values-nl/filtershow_strings.xml
es/values-pl/filtershow_strings.xml
es/values-pt-rPT/filtershow_strings.xml
es/values-pt/filtershow_strings.xml
es/values-ro/filtershow_strings.xml
es/values-ru/filtershow_strings.xml
es/values-sk/filtershow_strings.xml
es/values-sl/filtershow_strings.xml
es/values-sr/filtershow_strings.xml
es/values-sv/filtershow_strings.xml
es/values-sw/filtershow_strings.xml
es/values-th/filtershow_strings.xml
es/values-tl/filtershow_strings.xml
es/values-tr/filtershow_strings.xml
es/values-uk/filtershow_strings.xml
es/values-vi/filtershow_strings.xml
es/values-zh-rCN/filtershow_strings.xml
es/values-zh-rTW/filtershow_strings.xml
es/values-zu/filtershow_strings.xml
|
5d92e6660ba6d7775403a3fb350ba2309cd61c44 |
17-Apr-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ic734d26e128768b3be402b99c478354a8bfeb263 Auto-generated-cl: translation import
es/values-cs/strings.xml
es/values-fa/strings.xml
es/values-sw/strings.xml
|
1551deb64dabaf63a891e74a497950effce5bca0 |
17-Apr-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Icabf4e0f4daf66081fdd133b2a5f0c98aa030009 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
94a54b45eab906018e01a4db99ec4411ab218062 |
17-Apr-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I964583b655d810df84aff9b5462aeca7199ed1f1 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
1d08720cd7ff32378a344dd7e7f4f22e1bbe526c |
17-Apr-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ibddba812775d4c197ceab7640c2f1bfce26eb4b3 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
69d5b347d3f4b69714fec65a6bf10b712e24594f |
17-Apr-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ibddba812775d4c197ceab7640c2f1bfce26eb4b3 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
a67091e7732470e9ea3dd8ce6e05c297da56b36f |
17-Apr-2013 |
Angus Kong <shkong@google.com> |
am 8a67fc80: am 595c2ae1: am 03152021: am f7771f98: Use extra copy of parameters for concurrent access * commit '8a67fc80a0ba65b1cc8903f3b17bcf07218ddf67': Use extra copy of parameters for concurrent access
|
c90d22a145466605c69d993e9593217c26af4000 |
17-Apr-2013 |
ztenghui <ztenghui@google.com> |
am 6e6a0c2d: am f4f9e425: am 75408cd3: Add accessibility to video player controller. * commit '6e6a0c2d3bb78b399fe265e3432a952e3ee9c030': Add accessibility to video player controller.
|
0d548e4e619731681ac717c0431a62b5631db0fb |
17-Apr-2013 |
Michael Kolb <kolby@google.com> |
am 0b998afb: am 81d1589e: am baf6d4de: am 78991864: Merge "Also, add labels to video menu" into gb-ub-photos-bryce * commit '0b998afb4c0845f7d9de560d259b0b8fbd619422': Also, add labels to video menu
|
17ba93b670f09dce31d3cb53298271c92f6ddc19 |
17-Apr-2013 |
Baligh Uddin <baligh@google.com> |
am 7d702984: (-s ours) am 4c58da80: am 9219a1f4: am a8de1aa5: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce * commit '7d702984857c03fb66a7b19cee5201761ad013fc': Import translations. DO NOT MERGE
|
869e4f8aa9395a2feea48fa6568c8dc7d347b19a |
17-Apr-2013 |
Baligh Uddin <baligh@google.com> |
am 2a737529: (-s ours) am 627d601c: am 09c275b2: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev * commit '2a73752985688ae54463709d85a3ff3eaaf75504': Import translations. DO NOT MERGE
|
b1754255f929dd793881a26d82e0d707e6ca2f9d |
17-Apr-2013 |
Baligh Uddin <baligh@google.com> |
am de7f6eaa: (-s ours) Merge "Import translations. DO NOT MERGE" * commit 'de7f6eaacdd94d77ee12646e1cb99629624cc109': Import translations. DO NOT MERGE
|
a6962040f3d3801dcada7926f6540de9769a4f73 |
17-Apr-2013 |
Michael Kolb <kolby@google.com> |
am 04a4d5fb: am 38ee8965: am 272566d7: am ad30f960: Merge "Add menu labels" into gb-ub-photos-bryce * commit '04a4d5fb460bc5004a6223d8c6b6233b3d03fe47': Add menu labels
|
eead37cdd954883ff6248200d8ec1a662f21bec1 |
17-Apr-2013 |
Bobby Georgescu <georgescu@google.com> |
am e0e06eb9: am ec909ce6: am 814c5c52: am 3dc6a630: Merge "Fix performance and other issues related to multi-selection" into gb-ub-photos-bryce * commit 'e0e06eb95ce959a676b4c6de172c2a48945fee86': Fix performance and other issues related to multi-selection
|
bf43141cad9ff815d4698940ce8c8c0299d8ffc1 |
17-Apr-2013 |
John Hoford <hoford@google.com> |
am 9ae5d77d: am 63ae852c: am 1c8e45bf: am d2f5fe60: support for simplified parameters in filter * commit '9ae5d77d363d6b1a175cc2c2934256fe95fc0cd8': support for simplified parameters in filter
|
9af9a8630126e11c6d71d28fd224f63c1c58f102 |
17-Apr-2013 |
The Android Open Source Project <initial-contribution@android.com> |
am 0b0a4466: (-s ours) am 1e606658: Reconcile with jb-mr2-release - do not merge * commit '0b0a44662d384fe0b59028e280b5ec71cdc1fa2d': am bacc5027: Merge "Add checks for NPE in video pie menu." into gb-ub-photos-bryce
|
7459e2af541360c7a6d114c660291f02eb7be93d |
17-Apr-2013 |
ztenghui <ztenghui@google.com> |
am f4f9e425: am 75408cd3: Add accessibility to video player controller. * commit 'f4f9e425d631c863503f509180015e1d7eca820b': Add accessibility to video player controller.
|
572927fc83bcdd2669405bcae105cdb86ce97fd4 |
17-Apr-2013 |
ztenghui <ztenghui@google.com> |
am 75408cd3: Add accessibility to video player controller. * commit '75408cd38e7efe0755addcf3170932c8b3190bc1': Add accessibility to video player controller.
|
1d71790901d07e311ff432b3bebf84190aa9209c |
17-Apr-2013 |
ztenghui <ztenghui@google.com> |
am 75408cd3: Add accessibility to video player controller. * commit '75408cd38e7efe0755addcf3170932c8b3190bc1': Add accessibility to video player controller.
|
8e84a78436c5837b5124131fb781c812a75a129f |
17-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
am c512f6b1: am a827ce9d: am cba8574c: am 4b6ea5bc: Add direct rendering for border * commit 'c512f6b1e1d0563d659c0f2bb1ad1758f0f471b8': Add direct rendering for border
|
81c44894c0b10f2f23929c5a0499889127bf7fc0 |
17-Apr-2013 |
ztenghui <ztenghui@google.com> |
am 75408cd3: Add accessibility to video player controller. * commit '75408cd38e7efe0755addcf3170932c8b3190bc1': Add accessibility to video player controller.
|
b4c4bc070de7414bddcabdbc4f36f242701a0bc0 |
17-Apr-2013 |
Baligh Uddin <baligh@google.com> |
am 6cf36e8e: (-s ours) am c47dc315: am ced505a6: am b9db2d6a: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce * commit '6cf36e8ed77182711e1a123fe3ef3621bfa4284f': Import translations. DO NOT MERGE
|
215b8dcc5ecdd26c59a2595f05b4796622c62f09 |
17-Apr-2013 |
Baligh Uddin <baligh@google.com> |
am 2451423d: (-s ours) am 859a2ae9: am 6b4c389d: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev * commit '2451423dd619890799c9722aa90ef47796c3619d': Import translations. DO NOT MERGE
|
7f292168423a1d85baa8f25e3a9aa373cd84b555 |
17-Apr-2013 |
Baligh Uddin <baligh@google.com> |
am d5dafb3b: (-s ours) Merge "Import translations. DO NOT MERGE" * commit 'd5dafb3b04640b54ea594be1f75f9fdee1dc8e27': Import translations. DO NOT MERGE
|
8cdec0a5163de54f3bbddafb0d2d080b37ae9429 |
17-Apr-2013 |
Bart Sears <bsears@google.com> |
am 2d8247e7: am fe0eeedd: am cadaa899: am 4772792d: Bump up the version number to 1.1.40010 * commit '2d8247e7aab5a216dfc2a6bb3f78432dad302f78': Bump up the version number to 1.1.40010
|
3a47e6de722bd6c272ee671714951724ca04e1f9 |
17-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
am 3af66978: am 951d74d2: am 439b028e: am 93ef658b: Add a direct rendering mode * commit '3af6697817c775e0385b6a5248fccb88e78ddf3e': Add a direct rendering mode
|
63ec01a37f454c2652bd8cfc1a2ba75b8cd6919a |
17-Apr-2013 |
Michael Kolb <kolby@google.com> |
am 4f579b88: am c2e1a167: am fb4605d7: am bacc5027: Merge "Add checks for NPE in video pie menu." into gb-ub-photos-bryce * commit '4f579b88864e7f842a00f22207e4a81b7e6e34e0': Add checks for NPE in video pie menu.
|
fc3e4306a355e8989e9daab5bf5e29c2a0daea62 |
17-Apr-2013 |
Michael Kolb <kolby@google.com> |
am 2efb7da9: am 95cb5157: am 76193ba8: am af998215: Merge "Fix NPE in PieRenderer" into gb-ub-photos-bryce * commit '2efb7da949698896d9245702c3b27f170e616f7f': Fix NPE in PieRenderer
|
57f578ad70522fb8f42c6c647dff447884f6b3c7 |
17-Apr-2013 |
Doris Liu <tianliu@google.com> |
am 0097e253: am a6e42ecb: am 2bcea6d6: am d8259c06: Merge "Fix ICS recording aspect ratio" into gb-ub-photos-bryce * commit '0097e2534d11f21020f8616bf488c222b44db05e': Fix ICS recording aspect ratio
|
1b4d875d0434b226182dd37c4756ac468a660b94 |
16-Apr-2013 |
ztenghui <ztenghui@google.com> |
Add accessibility to video player controller. bug:5714277 cherry pick the Carlsbad CL: https://googleplex-android-review.git.corp.google.com/#/c/297944/ Change-Id: If0de1ec250a211890e1914d89e8b61780542a675
rc/com/android/gallery3d/app/CommonControllerOverlay.java
|
75408cd38e7efe0755addcf3170932c8b3190bc1 |
16-Apr-2013 |
ztenghui <ztenghui@google.com> |
Add accessibility to video player controller. bug:5714277 cherry pick the Carlsbad CL: https://googleplex-android-review.git.corp.google.com/#/c/297944/ Change-Id: If0de1ec250a211890e1914d89e8b61780542a675
es/values/strings.xml
rc/com/android/gallery3d/app/CommonControllerOverlay.java
|
906fcec7a2bd7510a1b6bfb38d6cc4d3c01f7c0b |
16-Apr-2013 |
ztenghui <ztenghui@google.com> |
Add accessibility to video player controller. bug:5714277 cherry pick the Carlsbad CL: https://googleplex-android-review.git.corp.google.com/#/c/297944/ Change-Id: If0de1ec250a211890e1914d89e8b61780542a675
es/values/strings.xml
|
0c53bbc7da61556d5af8e7f8c6be6cf96432012e |
16-Apr-2013 |
John Hoford <hoford@google.com> |
Support for save state in images bug:8626775 Change-Id: I2a34a6027b23dab9c1802f672bfbf399cac0c4f7
es/values/filtershow_strings.xml
rc/com/android/gallery3d/filtershow/filters/FilterBasicRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterCurvesRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterDrawRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterFxRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterRedEyeRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterTinyPlanetRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterVignetteRepresentation.java
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
rc/com/android/gallery3d/filtershow/tools/XmpPresets.java
|
f8f28abe5efd4c3db7cf6ae8522107c44392b7c0 |
16-Apr-2013 |
John Hoford <hoford@google.com> |
Support for save state in images bug:8626775 Change-Id: I2a34a6027b23dab9c1802f672bfbf399cac0c4f7
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/controller/BasicParameterStyle.java
rc/com/android/gallery3d/filtershow/controller/BasicSlider.java
rc/com/android/gallery3d/filtershow/filters/BaseFiltersManager.java
rc/com/android/gallery3d/filtershow/filters/FilterBasicRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterCurvesRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterDrawRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterFxRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterRedEyeRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterTinyPlanetRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterVignetteRepresentation.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterBwFilter.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterContrast.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterDownsample.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterEdge.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterExposure.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterFx.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterHighlights.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterHue.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterKMeans.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterNegative.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterSaturated.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterShadows.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterSharpen.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterVibrance.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterWBalance.java
rc/com/android/gallery3d/filtershow/imageshow/GeometryMetadata.java
rc/com/android/gallery3d/filtershow/imageshow/MasterImage.java
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
rc/com/android/gallery3d/filtershow/tools/SaveCopyTask.java
rc/com/android/gallery3d/filtershow/tools/XmpPresets.java
|
6698821d6dd80f2e2a6615d4ab4806b241f7a30e |
17-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
Fix border apply if no filter applied Change-Id: Ic5b319625b42adb298094c4ad202d6c161538644
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
|
e7abc9ca7565ba123032784e9b14d2d6d1590393 |
17-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
Fix border apply if no filter applied Change-Id: Ic5b319625b42adb298094c4ad202d6c161538644
rc/com/android/gallery3d/filtershow/cache/CachingPipeline.java
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
|
591ed068d79591dccb8e88a5b3d06d9d09e7d1a6 |
17-Apr-2013 |
The Android Automerger <android-build@android.com> |
merge in jb-mr2-release history after reset to jb-mr2-dev
|
db559f02b471e2a53ea7a3dba950967ac69217b1 |
16-Apr-2013 |
Flavio Lerda <flerda@google.com> |
Usage statistics for sharing. Bug: 8433834 Change-Id: Iaec6150443258daa213395b6fb1e8d8d3e6123b3
rc/com/android/gallery3d/app/GalleryActionBar.java
rc/com/android/gallery3d/app/PhotoPage.java
rc_pd/com/android/gallery3d/util/UsageStatistics.java
|
2251386437163898eb4b6f7546705d1365744fd1 |
16-Apr-2013 |
Flavio Lerda <flerda@google.com> |
Usage statistics for sharing. Bug: 8433834 Change-Id: Iaec6150443258daa213395b6fb1e8d8d3e6123b3
rc/com/android/gallery3d/app/GalleryActionBar.java
rc/com/android/gallery3d/app/PhotoPage.java
rc_pd/com/android/gallery3d/util/UsageStatistics.java
|
a40200389cc61d6164dcbce0299dbcb77b810c66 |
17-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Revert "Shows final set of filters in UI."" into gb-ub-photos-carlsbad
|
7a1dfce7ed97217464b1a44fb8c067104806c25d |
17-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
am 071544b6: am 19191a4f: am 83bd8d34: Remove History panel * commit '071544b6003966b4154e78ce5a91ca1267031406': Remove History panel
|
817631116f7221d9ec8dba417e12f0dd6fd5e61e |
17-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
am 19191a4f: am 83bd8d34: Remove History panel * commit '19191a4f58f4d80529b3400d1bd653faeacfbc2a': Remove History panel
|
170fc0c22cff4d58d388e5713a338aafd792e78f |
17-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
am 83bd8d34: Remove History panel * commit '83bd8d346d295e4fe06212da957feb77ee23c04d': Remove History panel
|
219cbae90daf14c17d715489e94148b21448e5db |
17-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
am 83bd8d34: Remove History panel * commit '83bd8d346d295e4fe06212da957feb77ee23c04d': Remove History panel
|
766c7421f39f5f1aca13b83cca2d1be0c53b54fd |
17-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
am 83bd8d34: Remove History panel * commit '83bd8d346d295e4fe06212da957feb77ee23c04d': Remove History panel
|
83bd8d346d295e4fe06212da957feb77ee23c04d |
17-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
Remove History panel Now that we have the state, history is not that useful. For clarity's sake we are removing it. bug:8620913 bug:8503386 bug:8324322 bug:8324023 Change-Id: Ife86f3ab67c05d5781234496c7518866b506631b
es/menu/filtershow_activity_menu.xml
es/values/filtershow_strings.xml
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/imageshow/ImageShow.java
rc/com/android/gallery3d/filtershow/imageshow/MasterImage.java
|
7dede255bfe114c9f72916d8db481e2c4ac3062e |
17-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
Remove History panel Now that we have the state, history is not that useful. For clarity's sake we are removing it. bug:8620913 bug:8503386 bug:8324322 bug:8324023 Change-Id: Ife86f3ab67c05d5781234496c7518866b506631b
es/menu/filtershow_activity_menu.xml
es/values/filtershow_strings.xml
|
bff393cee9eb2fc5d3a89fbcebb2fea988ab4cb2 |
17-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
Remove History panel Now that we have the state, history is not that useful. For clarity's sake we are removing it. bug:8620913 bug:8503386 bug:8324322 bug:8324023 Change-Id: Ife86f3ab67c05d5781234496c7518866b506631b
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/imageshow/ImageShow.java
rc/com/android/gallery3d/filtershow/imageshow/MasterImage.java
|
b25104efc5de8c72f5ec19a5aa231b7206525ef7 |
17-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Revert "Shows final set of filters in UI." Bug: 8609003 Change-Id: I24c343f62aa5e5c9a903cdd746abf2dc2b992418
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
|
390365ce36905d6a8b76b13361abb3f51c1101bc |
17-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am c10b3066: am 965a99b8: am 113e0fbd: Merge "Shows final set of filters in UI." into gb-ub-photos-bryce * commit 'c10b3066e063e14cc9bf9cbecf6f8098f955340b': Shows final set of filters in UI.
|
7fa9f2566bf5275aefb0ea836c4278c6ef10f465 |
17-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 965a99b8: am 113e0fbd: Merge "Shows final set of filters in UI." into gb-ub-photos-bryce * commit '965a99b87b38bc1a846c7dfb4349d399f9e1bc1e': Shows final set of filters in UI.
|
6fbc56c69961a2a527f114881df8476baff6ecde |
17-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 113e0fbd: Merge "Shows final set of filters in UI." into gb-ub-photos-bryce * commit '113e0fbd251966629719f390e43b320b84751304': Shows final set of filters in UI.
|
f357008ebec8d2232de28aa0f1d96c8def67ee0b |
17-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 113e0fbd: Merge "Shows final set of filters in UI." into gb-ub-photos-bryce * commit '113e0fbd251966629719f390e43b320b84751304': Shows final set of filters in UI.
|
3aa15ee3823ccbf3426bf3bf78a21afa86808144 |
17-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
Re-enable Simple Editor menu item Change-Id: I080dfffeb6394b78a1dc2bd10b52ff15b1e55ac9
rc/com/android/gallery3d/ui/MenuExecutor.java
|
113e0fbd251966629719f390e43b320b84751304 |
17-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Shows final set of filters in UI." into gb-ub-photos-bryce
|
7f6c95557c9b510bbb434a0714be49363975ddb5 |
17-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Shows final set of filters in UI." into gb-ub-photos-bryce
|
c08af6a3b2c466982fa54a69afd619586dd29391 |
17-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Shows final set of filters in UI. Bug: 8609003 Change-Id: Id7530da3e11fb88a964b881ba8f8fad70b40bc23
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
|
095eefb3cc0cea8279ec9175ab0a9542af236eea |
17-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Shows final set of filters in UI. Bug: 8609003 Change-Id: Id7530da3e11fb88a964b881ba8f8fad70b40bc23
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
|
eed82f300b811b7e05e9dea7d9641a954a0a8965 |
17-Apr-2013 |
Doris Liu <tianliu@google.com> |
am c44633a0: am 6aa5d2df: am 953f109b: Merge "Fix face unlock failure" into gb-ub-photos-bryce * commit 'c44633a0e53ad406bc2629196b69bec325581b66': Fix face unlock failure
|
e46223426cc2d2609cfea6aab29eceb1eda2227a |
17-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
am 92a587f9: am ccc18a73: am 03332473: Make convertBitmap() protected so that Frames can use it. * commit '92a587f98ab0e7f40ce1c6ba5b164057dad7363c': Make convertBitmap() protected so that Frames can use it.
|
003dadddec7332d2148ef04beae8cf1c2a42d1b9 |
17-Apr-2013 |
Doris Liu <tianliu@google.com> |
am 6aa5d2df: am 953f109b: Merge "Fix face unlock failure" into gb-ub-photos-bryce * commit '6aa5d2dfbf4890a027512d114759864fc4207025': Fix face unlock failure
|
24c7a3b064b05325bb454888bd97ef3da6e47f3c |
17-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
am ccc18a73: am 03332473: Make convertBitmap() protected so that Frames can use it. * commit 'ccc18a734f2f3de9230a09b0d31a9ce27baef000': Make convertBitmap() protected so that Frames can use it.
|
a7f91d8e431da7d97cad5b59f0ff412c52a03401 |
17-Apr-2013 |
Doris Liu <tianliu@google.com> |
am 953f109b: Merge "Fix face unlock failure" into gb-ub-photos-bryce * commit '953f109b688477b086281fe09074d3886ef87fba': Fix face unlock failure
|
3e405242d07601a547686c5e4c884e01300d871c |
17-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
am 03332473: Make convertBitmap() protected so that Frames can use it. * commit '0333247337b910bb981c6ba17ca0cc76d5b614ff': Make convertBitmap() protected so that Frames can use it.
|
39a20595777bfb40aa84c6fd4d04fee5b5c6835e |
17-Apr-2013 |
Doris Liu <tianliu@google.com> |
am 953f109b: Merge "Fix face unlock failure" into gb-ub-photos-bryce * commit '953f109b688477b086281fe09074d3886ef87fba': Fix face unlock failure
|
d56dfab86bb86817625ae7a46abdbb0bc3b58e7a |
17-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
am 03332473: Make convertBitmap() protected so that Frames can use it. * commit '0333247337b910bb981c6ba17ca0cc76d5b614ff': Make convertBitmap() protected so that Frames can use it.
|
953f109b688477b086281fe09074d3886ef87fba |
17-Apr-2013 |
Doris Liu <tianliu@google.com> |
Merge "Fix face unlock failure" into gb-ub-photos-bryce
|
cc41601e7344f948452013b4751b8b541c6f7432 |
17-Apr-2013 |
Doris Liu <tianliu@google.com> |
Merge "Fix face unlock failure" into gb-ub-photos-bryce
|
0333247337b910bb981c6ba17ca0cc76d5b614ff |
17-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
Make convertBitmap() protected so that Frames can use it. bug:8633011 Change-Id: Ic731a1d906a6a388a22568f396111f8ca3b4475e
rc/com/android/gallery3d/filtershow/filters/ImageFilterRS.java
|
2eb339731638b67b0be4a180fd1eb7d6c81fde5e |
17-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
Make convertBitmap() protected so that Frames can use it. bug:8633011 Change-Id: Ic731a1d906a6a388a22568f396111f8ca3b4475e
rc/com/android/gallery3d/filtershow/filters/ImageFilterRS.java
|
4a10c9782bc397ab3b77e5d7a439a90169484b1a |
17-Apr-2013 |
Doris Liu <tianliu@google.com> |
Fix face unlock failure Bug: 7494156 Change-Id: I6c909e498305ff3e66efdeeb9fb5581ea8f51715
rc/com/android/gallery3d/app/SlideshowPage.java
|
80c042e197bc710424add30d75c35c58a16b1e8f |
17-Apr-2013 |
Doris Liu <tianliu@google.com> |
Fix face unlock failure Bug: 7494156 Change-Id: I6c909e498305ff3e66efdeeb9fb5581ea8f51715
rc/com/android/gallery3d/app/SlideshowPage.java
|
78899370d0206b0c9fe6cc58eafcc5e1e012c1d0 |
17-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
am c6a1e41f: am d80c69a8: am f3f0aae4: Merge "Remove the Simple Edit menu item in Gallery" into gb-ub-photos-bryce * commit 'c6a1e41fb7272a5227a4c73652c1226df8afd928': Remove the Simple Edit menu item in Gallery
|
70c1e959b8eaf7bd1bda12ae24e4b9164bab5bdf |
17-Apr-2013 |
ztenghui <ztenghui@google.com> |
Merge "Add accessibility to video player controller." into gb-ub-photos-carlsbad
|
235f32be550c9e7de2383b3dd699a13dd264b640 |
17-Apr-2013 |
ztenghui <ztenghui@google.com> |
Merge "Add accessibility to video player controller." into gb-ub-photos-carlsbad
|
395464f40be6f0346b28b874aa838e604762f3ef |
17-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
am d80c69a8: am f3f0aae4: Merge "Remove the Simple Edit menu item in Gallery" into gb-ub-photos-bryce * commit 'd80c69a8398e79296e99f026e4d6e184c07dce39': Remove the Simple Edit menu item in Gallery
|
6a6eb29944dd52140f3c458d5584780fa872a49b |
17-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
am f3f0aae4: Merge "Remove the Simple Edit menu item in Gallery" into gb-ub-photos-bryce * commit 'f3f0aae490911245ad6a5602b77b72f0546b93cc': Remove the Simple Edit menu item in Gallery
|
fe898cf489b094f96c7e69138fc9f648aad57fe0 |
17-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
am f3f0aae4: Merge "Remove the Simple Edit menu item in Gallery" into gb-ub-photos-bryce * commit 'f3f0aae490911245ad6a5602b77b72f0546b93cc': Remove the Simple Edit menu item in Gallery
|
f3f0aae490911245ad6a5602b77b72f0546b93cc |
17-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
Merge "Remove the Simple Edit menu item in Gallery" into gb-ub-photos-bryce
|
70108789ff49596e4f3034c64ccb94c1e126e3ab |
17-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
Merge "Remove the Simple Edit menu item in Gallery" into gb-ub-photos-bryce
|
0b227127bbaa279bb02046e75e4b53d4a68866c8 |
16-Apr-2013 |
ztenghui <ztenghui@google.com> |
Add accessibility to video player controller. bug:5714277 Change-Id: If0de1ec250a211890e1914d89e8b61780542a675
rc/com/android/gallery3d/app/CommonControllerOverlay.java
|
f2d3ac881992d35f4dfe9eeefc584abe77614217 |
16-Apr-2013 |
ztenghui <ztenghui@google.com> |
Add accessibility to video player controller. bug:5714277 Change-Id: If0de1ec250a211890e1914d89e8b61780542a675
es/values/strings.xml
|
8f5580a4aa1376be22395024ebda2b9dcda23170 |
16-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
Remove the Simple Edit menu item in Gallery bug:8609003 Change-Id: Ida6bfec65bf4b78c7c1b64f759c750ef9255bb6c
rc/com/android/gallery3d/ui/MenuExecutor.java
|
04da08ac700c94f6ade3fec704ac0ba6b0c201d8 |
16-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
Remove the Simple Edit menu item in Gallery bug:8609003 Change-Id: Ida6bfec65bf4b78c7c1b64f759c750ef9255bb6c
rc/com/android/gallery3d/ui/MenuExecutor.java
|
f9857e2b8d6347448661907d33c38d7c119faa96 |
16-Apr-2013 |
Angus Kong <shkong@google.com> |
am fcabacf4: am 65f3514a: am bc02d7dc: Don\'t wait for Mosaic Renderer ready in UI thread. * commit 'fcabacf449cbca3bd219d5eb4031d6ac5a779caf': Don't wait for Mosaic Renderer ready in UI thread.
|
d58871c44e2b77808675924008443a521ddcf6a9 |
16-Apr-2013 |
Angus Kong <shkong@google.com> |
am 65f3514a: am bc02d7dc: Don\'t wait for Mosaic Renderer ready in UI thread. * commit '65f3514aa0d91ac86927a1b5c5026c2ad3763700': Don't wait for Mosaic Renderer ready in UI thread.
|
2519ab950bf66c5fe1094808353acd807327f4a4 |
16-Apr-2013 |
Angus Kong <shkong@google.com> |
am bc02d7dc: Don\'t wait for Mosaic Renderer ready in UI thread. * commit 'bc02d7dcb2e9716a1f1e297fef435c8b0275aafe': Don't wait for Mosaic Renderer ready in UI thread.
|
a4efa8c41c75f6267138df5bd62ed5166fcee96f |
16-Apr-2013 |
Angus Kong <shkong@google.com> |
am bc02d7dc: Don\'t wait for Mosaic Renderer ready in UI thread. * commit 'bc02d7dcb2e9716a1f1e297fef435c8b0275aafe': Don't wait for Mosaic Renderer ready in UI thread.
|
bc02d7dcb2e9716a1f1e297fef435c8b0275aafe |
16-Apr-2013 |
Angus Kong <shkong@google.com> |
Don't wait for Mosaic Renderer ready in UI thread. bug:8292711 Change-Id: Ic318c353fc420c0f7e573c74814757b79c798c5d
rc/com/android/camera/PanoramaModule.java
|
0808c38f4ac300f7df047bf7884a607e0f069553 |
16-Apr-2013 |
Angus Kong <shkong@google.com> |
Don't wait for Mosaic Renderer ready in UI thread. bug:8292711 Change-Id: Ic318c353fc420c0f7e573c74814757b79c798c5d
rc/com/android/camera/PanoramaModule.java
|
dcf8ba8cc8fabd21cbb715895596ec499c202311 |
16-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
am b6d61d16: am 9472ae6f: am fb6a8e16: New state panel * commit 'b6d61d1601d9cddfba22672b45ac4c3ad7758e2d': New state panel
|
5294e7965f910a5c5c91e49d023ae0ea1deaeb19 |
16-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
am 9472ae6f: am fb6a8e16: New state panel * commit '9472ae6f9bbe0a0a6b86c827585ea429e07f0220': New state panel
|
9c9a3ddbcb0ebff3b14257b398953bb0b8c6a1d1 |
16-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
am fb6a8e16: New state panel * commit 'fb6a8e166f0a46d2a994a408b1679e3a67fdcb52': New state panel
|
7d0b28be5231411d86c9cdfca11bb43a37535156 |
16-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
am fb6a8e16: New state panel * commit 'fb6a8e166f0a46d2a994a408b1679e3a67fdcb52': New state panel
|
a683cac9dc86f77af14e9914c1a49a4938b3ebee |
16-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
am fb6a8e16: New state panel * commit 'fb6a8e166f0a46d2a994a408b1679e3a67fdcb52': New state panel
|
abf8734fbf9afee227c4949b7302e4882c24bb25 |
16-Apr-2013 |
Christian Wichner <cwichner@google.com> |
convertBitmap is needed by ImageFilterFixedFrame. Change-Id: I2094c54745f94dab2283e2a466371d15d5a57b0a
rc/com/android/gallery3d/filtershow/filters/ImageFilterRS.java
|
899e0aeda4fefda758968e626c7b98da05aee986 |
16-Apr-2013 |
The Android Automerger <android-build@android.com> |
merge in jb-mr2-release history after reset to jb-mr2-dev
|
191da1ab42e2a70989ad5527513a4d51af577d79 |
15-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
New state panel bug:8620913 bug:8503386 Change-Id: I35c95103e3b5097df93fa3f48e5562a479915f06
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/PanelController.java
rc/com/android/gallery3d/filtershow/imageshow/MasterImage.java
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
rc/com/android/gallery3d/filtershow/state/DragListener.java
rc/com/android/gallery3d/filtershow/state/PanelTrack.java
rc/com/android/gallery3d/filtershow/state/State.java
rc/com/android/gallery3d/filtershow/state/StateAdapter.java
rc/com/android/gallery3d/filtershow/state/StatePanel.java
rc/com/android/gallery3d/filtershow/state/StatePanelTrack.java
rc/com/android/gallery3d/filtershow/state/StateView.java
|
fb6a8e166f0a46d2a994a408b1679e3a67fdcb52 |
15-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
New state panel bug:8620913 bug:8503386 Change-Id: I35c95103e3b5097df93fa3f48e5562a479915f06
es/layout-land/filtershow_activity.xml
es/layout/filtershow_state_panel_new.xml
es/values/filtershow_strings.xml
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/PanelController.java
rc/com/android/gallery3d/filtershow/imageshow/MasterImage.java
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
rc/com/android/gallery3d/filtershow/state/DragListener.java
rc/com/android/gallery3d/filtershow/state/PanelTrack.java
rc/com/android/gallery3d/filtershow/state/State.java
rc/com/android/gallery3d/filtershow/state/StateAdapter.java
rc/com/android/gallery3d/filtershow/state/StatePanel.java
rc/com/android/gallery3d/filtershow/state/StatePanelTrack.java
rc/com/android/gallery3d/filtershow/state/StateView.java
|
673f7408a381705db18e87243755e5ec19247290 |
15-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
New state panel bug:8620913 bug:8503386 Change-Id: I35c95103e3b5097df93fa3f48e5562a479915f06
es/layout-land/filtershow_activity.xml
es/layout/filtershow_state_panel_new.xml
es/values/filtershow_strings.xml
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
|
09e38e1ed4a7b1761e08671acd02944b59ede8ab |
16-Apr-2013 |
Michael Kolb <kolby@google.com> |
am 53bd5f2c: am 44d3d602: am 0786c387: Merge "Angle menu at edge of screen" into gb-ub-photos-bryce * commit '53bd5f2c166cf70a3380acd3aa3dd2d21a0d515d': Angle menu at edge of screen
|
01d03e0b21ac5e25f42de64d4e239e8fdf147839 |
16-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Add local database for filters. Bug: 8621039 Change-Id: I7b13ff0167483f148b354204cb01262fe40da2ba
rc/com/android/gallery3d/filtershow/data/FilterStackDBHelper.java
rc/com/android/gallery3d/filtershow/data/FilterStackSource.java
|
fa6d05666a8c6bd6099f7c6d399f26e89f46ccf8 |
16-Apr-2013 |
Michael Kolb <kolby@google.com> |
am 44d3d602: am 0786c387: Merge "Angle menu at edge of screen" into gb-ub-photos-bryce * commit '44d3d6023273403a5957c7f807744602cdb84d47': Angle menu at edge of screen
|
60c739f0bd883b4d2c4158d33dde8b0baea5d9e9 |
16-Apr-2013 |
Michael Kolb <kolby@google.com> |
am 0786c387: Merge "Angle menu at edge of screen" into gb-ub-photos-bryce * commit '0786c387413d434438257697475cf743661df296': Angle menu at edge of screen
|
598ed6a7e13ee0294b0ef96708cfa6e3e52702c0 |
16-Apr-2013 |
Michael Kolb <kolby@google.com> |
am 0786c387: Merge "Angle menu at edge of screen" into gb-ub-photos-bryce * commit '0786c387413d434438257697475cf743661df296': Angle menu at edge of screen
|
71a995593b1521caa8d11c4e7574a00d8c824f9a |
16-Apr-2013 |
Michael Kolb <kolby@google.com> |
am 0786c387: Merge "Angle menu at edge of screen" into gb-ub-photos-bryce * commit '0786c387413d434438257697475cf743661df296': Angle menu at edge of screen
|
6e8057ea04160a4aeb83dfe3b4f1d4d9520f5c8b |
16-Apr-2013 |
Michael Kolb <kolby@google.com> |
Merge "Angle menu at edge of screen" into gb-ub-photos-bryce
|
0786c387413d434438257697475cf743661df296 |
16-Apr-2013 |
Michael Kolb <kolby@google.com> |
Merge "Angle menu at edge of screen" into gb-ub-photos-bryce
|
c646b996bd327995a4219ea4e103db620eb8d1f8 |
16-Apr-2013 |
Michael Kolb <kolby@google.com> |
Merge "Angle menu at edge of screen" into gb-ub-photos-bryce
|
0f4a5ae4fae89cc7cde711f6aad8d7f571132ca9 |
10-Apr-2013 |
Michael Kolb <kolby@google.com> |
Angle menu at edge of screen Bug: 8618699 Adjust touch slices; adjust label position Change-Id: I5bbf16fc570eb9801198847991395699de89ffa3
rc/com/android/camera/ui/PieRenderer.java
|
c246c3717430d5a3d84d2bcbaedbd4094f65bad9 |
10-Apr-2013 |
Michael Kolb <kolby@google.com> |
Angle menu at edge of screen Bug: 8618699 Adjust touch slices; adjust label position Change-Id: I5bbf16fc570eb9801198847991395699de89ffa3
es/values/dimens.xml
rc/com/android/camera/ui/PieRenderer.java
|
46180795357f69d6d45c9eafb4b0d943f94592a6 |
10-Apr-2013 |
Michael Kolb <kolby@google.com> |
Angle menu at edge of screen Bug: 8618699 Adjust touch slices; adjust label position Change-Id: I5bbf16fc570eb9801198847991395699de89ffa3
es/values/dimens.xml
|
9513d50fa44b79827af1391aef4a759e52a935f5 |
16-Apr-2013 |
Angus Kong <shkong@google.com> |
am 595c2ae1: am 03152021: am f7771f98: Use extra copy of parameters for concurrent access * commit '595c2ae1cde680fb37fd8fdd1610722813ea160f': Use extra copy of parameters for concurrent access
|
361b2ba5808a19ffc4c67241810daa504802cad9 |
16-Apr-2013 |
Angus Kong <shkong@google.com> |
am 03152021: am f7771f98: Use extra copy of parameters for concurrent access * commit '0315202122c3d6b89d2597c2480b9bb81fc2ba35': Use extra copy of parameters for concurrent access
|
5a11c1081b8a2e5f6101f60d95bce6c9ba7b541c |
16-Apr-2013 |
Angus Kong <shkong@google.com> |
am f7771f98: Use extra copy of parameters for concurrent access * commit 'f7771f98aed9f253048af7dd8b2a143b9258c139': Use extra copy of parameters for concurrent access
|
aec0b43e4157cdf39262cc8cfa9f2e4ce2e667a1 |
16-Apr-2013 |
Angus Kong <shkong@google.com> |
am f7771f98: Use extra copy of parameters for concurrent access * commit 'f7771f98aed9f253048af7dd8b2a143b9258c139': Use extra copy of parameters for concurrent access
|
f7771f98aed9f253048af7dd8b2a143b9258c139 |
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
rc/com/android/camera/NewPhotoModule.java
rc/com/android/camera/NewVideoModule.java
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/VideoModule.java
|
36ed867759d089723fc40947d772bb21deba5096 |
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
rc/com/android/camera/NewPhotoModule.java
rc/com/android/camera/NewVideoModule.java
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/VideoModule.java
|
2c0b2c9357d63986a43972ece7a072ec74970494 |
15-Apr-2013 |
Michael Kolb <kolby@google.com> |
am 81d1589e: am baf6d4de: am 78991864: Merge "Also, add labels to video menu" into gb-ub-photos-bryce * commit '81d1589e8fcce10cd68b2a0dd438f59a7fe0fc70': Also, add labels to video menu
|
7c59f69132f6ffd71d7e76aa500b619fc4239c73 |
15-Apr-2013 |
Michael Kolb <kolby@google.com> |
am baf6d4de: am 78991864: Merge "Also, add labels to video menu" into gb-ub-photos-bryce * commit 'baf6d4de50ddfcea53ed051b9e42770afe754854': Also, add labels to video menu
|
d1e0a6e78d686cdc259a2978e988cdd734ca6a2f |
15-Apr-2013 |
Michael Kolb <kolby@google.com> |
Lock camera orientation using FW API Bug: 8617536 Change-Id: Id3a5ae777f6f87d24984cbca48202470651cd71c
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
|
b2c323e3538820dc1da537c7a207ca6c9bd6d92b |
15-Apr-2013 |
Michael Kolb <kolby@google.com> |
Lock camera orientation using FW API Bug: 8617536 Change-Id: Id3a5ae777f6f87d24984cbca48202470651cd71c
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
rc/com/android/gallery3d/app/OrientationManager.java
|
72d611a96c9c0458b3d8a41cd9b9b19a6ca061ae |
15-Apr-2013 |
Michael Kolb <kolby@google.com> |
Lock camera orientation using FW API Bug: 8617536 Change-Id: Id3a5ae777f6f87d24984cbca48202470651cd71c
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
rc/com/android/gallery3d/app/OrientationManager.java
|
4738d828c188c4ee6513acb2ee17c08081b5da0e |
15-Apr-2013 |
Michael Kolb <kolby@google.com> |
am 78991864: Merge "Also, add labels to video menu" into gb-ub-photos-bryce * commit '789918643e2b682e387435002b5b0c287f35b39b': Also, add labels to video menu
|
eae68c6a368947394f3e8900eaf4cc616226f67a |
15-Apr-2013 |
Michael Kolb <kolby@google.com> |
am 78991864: Merge "Also, add labels to video menu" into gb-ub-photos-bryce * commit '789918643e2b682e387435002b5b0c287f35b39b': Also, add labels to video menu
|
c817a3a31ce10af05e567a0528b81ff81f1f6586 |
15-Apr-2013 |
Michael Kolb <kolby@google.com> |
am 78991864: Merge "Also, add labels to video menu" into gb-ub-photos-bryce * commit '789918643e2b682e387435002b5b0c287f35b39b': Also, add labels to video menu
|
d0089b2d453acd2d6d8ec240b0e9fd6a4e139cd3 |
15-Apr-2013 |
Michael Kolb <kolby@google.com> |
Merge "Also, add labels to video menu" into gb-ub-photos-bryce
|
789918643e2b682e387435002b5b0c287f35b39b |
15-Apr-2013 |
Michael Kolb <kolby@google.com> |
Merge "Also, add labels to video menu" into gb-ub-photos-bryce
|
0408c9aef21d1e4e9afb1862897afdc8e21906fd |
15-Apr-2013 |
Michael Kolb <kolby@google.com> |
Also, add labels to video menu Bug: 8618169 Change-Id: Ia933db79eccf2564c785a12c8c6551fa8eb1007c
rc/com/android/camera/VideoMenu.java
|
1ec05e293169416dd369f2df78d3af2df5fd392f |
15-Apr-2013 |
Michael Kolb <kolby@google.com> |
Also, add labels to video menu Bug: 8618169 Change-Id: Ia933db79eccf2564c785a12c8c6551fa8eb1007c
es/xml/video_preferences.xml
|
3a9d84201ede2dbf150cce384a894924dc051dd1 |
15-Apr-2013 |
Michael Kolb <kolby@google.com> |
Also, add labels to video menu Bug: 8618169 Change-Id: Ia933db79eccf2564c785a12c8c6551fa8eb1007c
es/xml/video_preferences.xml
rc/com/android/camera/VideoMenu.java
|
789fa8fabdfcc62f152dccee8c1ceb854e2b48ed |
15-Apr-2013 |
Baligh Uddin <baligh@google.com> |
am 4c58da80: am 9219a1f4: am a8de1aa5: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce * commit '4c58da807dd7018f19274ae64b212c76b5eadb02': Import translations. DO NOT MERGE
|
63883e3b4e3f583a8cb37bd511b973a9eb33f8c1 |
15-Apr-2013 |
Baligh Uddin <baligh@google.com> |
am 627d601c: am 09c275b2: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev * commit '627d601cf6b7d17c1e7624a55dad3413a91f1753': Import translations. DO NOT MERGE
|
b2d87164456831b4555029c719e41a2fe4b7b4a1 |
15-Apr-2013 |
Baligh Uddin <baligh@google.com> |
am 9219a1f4: am a8de1aa5: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce * commit '9219a1f484f41384a7bc6fc366b83df7ded721b1': Import translations. DO NOT MERGE
|
c00c4f8b4847d4e0244cab89e50509420c037613 |
15-Apr-2013 |
Baligh Uddin <baligh@google.com> |
am 09c275b2: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev * commit '09c275b24056b6eab298d15822680ba0fb63d305': Import translations. DO NOT MERGE
|
fbd86bc68acb8932029fba02d5e921232dc1a2e1 |
15-Apr-2013 |
Baligh Uddin <baligh@google.com> |
am a8de1aa5: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce * commit 'a8de1aa5606cf6586876fd00913e0506f67aebce': Import translations. DO NOT MERGE
|
2604e855bff8f05f0ae1ed46bc1ba177b12abc6a |
15-Apr-2013 |
Baligh Uddin <baligh@google.com> |
am a8de1aa5: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce * commit 'a8de1aa5606cf6586876fd00913e0506f67aebce': Import translations. DO NOT MERGE
|
9b3f4ca8a909a0abcaa6ca8b49d68a4ec8fe3535 |
15-Apr-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE"
|
ca3cfd89f8daf95ff3dd9467e47ee93070e3c25d |
15-Apr-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
|
b96e5360397dcc0435f78993ab03c1b7fe21b028 |
15-Apr-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
|
a8de1aa5606cf6586876fd00913e0506f67aebce |
15-Apr-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
|
d1dfc3c30d358d6dcdf05fb999911431167f6ce0 |
15-Apr-2013 |
Michael Kolb <kolby@google.com> |
am 38ee8965: am 272566d7: am ad30f960: Merge "Add menu labels" into gb-ub-photos-bryce * commit '38ee8965a1fcdc572e00ef131fcaec49153044fb': Add menu labels
|
ea490f5641ba32e47c6ead6b6d23f79e2d58e8cd |
15-Apr-2013 |
Michael Kolb <kolby@google.com> |
am 272566d7: am ad30f960: Merge "Add menu labels" into gb-ub-photos-bryce * commit '272566d783fb4a93d7148436fdb7849d380c7b68': Add menu labels
|
8842886cfb1a57c1955ddd949cb3cc7f21d7e060 |
15-Apr-2013 |
Michael Kolb <kolby@google.com> |
am ad30f960: Merge "Add menu labels" into gb-ub-photos-bryce * commit 'ad30f960879285c4dadb10d5b7531e05c345587f': Add menu labels
|
76cead1fe6d92175b745afd1ab260fabd9763447 |
15-Apr-2013 |
Michael Kolb <kolby@google.com> |
am ad30f960: Merge "Add menu labels" into gb-ub-photos-bryce * commit 'ad30f960879285c4dadb10d5b7531e05c345587f': Add menu labels
|
53dd6157d8ec48dbf5707dc066d49c11acfa0b7e |
15-Apr-2013 |
Michael Kolb <kolby@google.com> |
am ad30f960: Merge "Add menu labels" into gb-ub-photos-bryce * commit 'ad30f960879285c4dadb10d5b7531e05c345587f': Add menu labels
|
5b9375cebbe4bc357b734a022837d8ab85eb71d6 |
15-Apr-2013 |
Michael Kolb <kolby@google.com> |
Merge "Add menu labels" into gb-ub-photos-bryce
|
ad30f960879285c4dadb10d5b7531e05c345587f |
15-Apr-2013 |
Michael Kolb <kolby@google.com> |
Merge "Add menu labels" into gb-ub-photos-bryce
|
149b7899fa3da8005d5a09478012ef34979d6b14 |
15-Apr-2013 |
Michael Kolb <kolby@google.com> |
Merge "Add menu labels" into gb-ub-photos-bryce
|
5384aa92adaaa9c6319d8491583c1abf1dea89f3 |
15-Apr-2013 |
Bobby Georgescu <georgescu@google.com> |
am ec909ce6: am 814c5c52: am 3dc6a630: Merge "Fix performance and other issues related to multi-selection" into gb-ub-photos-bryce * commit 'ec909ce64ff71cf165ea6934ec5342bb93f118f1': Fix performance and other issues related to multi-selection
|
5d70c755c2c1436ae1ac154884ae0892960c2d25 |
15-Apr-2013 |
Bobby Georgescu <georgescu@google.com> |
am 814c5c52: am 3dc6a630: Merge "Fix performance and other issues related to multi-selection" into gb-ub-photos-bryce * commit '814c5c527b49fca0524f71ce51b152e4f3b79e6b': Fix performance and other issues related to multi-selection
|
577e2e5de21fdc8827d56cb0e410276f8c8bb4fc |
15-Apr-2013 |
Bobby Georgescu <georgescu@google.com> |
am 3dc6a630: Merge "Fix performance and other issues related to multi-selection" into gb-ub-photos-bryce * commit '3dc6a630aff5be323c54b4616fd3a373cbad31f7': Fix performance and other issues related to multi-selection
|
3a8a520eb42154b4c68b215a50c3c7f591582915 |
15-Apr-2013 |
Bobby Georgescu <georgescu@google.com> |
am 3dc6a630: Merge "Fix performance and other issues related to multi-selection" into gb-ub-photos-bryce * commit '3dc6a630aff5be323c54b4616fd3a373cbad31f7': Fix performance and other issues related to multi-selection
|
e5cee4bf6cea89360dd5823d47eb8b836bc371de |
15-Apr-2013 |
Bobby Georgescu <georgescu@google.com> |
Merge "Fix performance and other issues related to multi-selection" into gb-ub-photos-bryce
|
3dc6a630aff5be323c54b4616fd3a373cbad31f7 |
15-Apr-2013 |
Bobby Georgescu <georgescu@google.com> |
Merge "Fix performance and other issues related to multi-selection" into gb-ub-photos-bryce
|
9060c5b16d90169381a2cb16af633159dbf43928 |
15-Apr-2013 |
John Hoford <hoford@google.com> |
am 63ae852c: am 1c8e45bf: am d2f5fe60: support for simplified parameters in filter * commit '63ae852c8f91fd53cf57cd50023382f17146d509': support for simplified parameters in filter
|
f5e7c90119aeadec91f2cbd8b70d9eab38e20025 |
15-Apr-2013 |
John Hoford <hoford@google.com> |
am 1c8e45bf: am d2f5fe60: support for simplified parameters in filter * commit '1c8e45bfb4e0f331cb40d060a4dac455032f2d45': support for simplified parameters in filter
|
16d532785c81c0f3cf865002631f118b0ed769b4 |
15-Apr-2013 |
John Hoford <hoford@google.com> |
am d2f5fe60: support for simplified parameters in filter * commit 'd2f5fe607ee6d7b5f79862b495495e2f6024cdab': support for simplified parameters in filter
|
93588f460333a58441a6a396ce6b72e832b70fe5 |
15-Apr-2013 |
John Hoford <hoford@google.com> |
am d2f5fe60: support for simplified parameters in filter * commit 'd2f5fe607ee6d7b5f79862b495495e2f6024cdab': support for simplified parameters in filter
|
ed94a102391ad27a9cf9cc6c0f012ac0eab799a7 |
15-Apr-2013 |
John Hoford <hoford@google.com> |
am d2f5fe60: support for simplified parameters in filter * commit 'd2f5fe607ee6d7b5f79862b495495e2f6024cdab': support for simplified parameters in filter
|
10f4ba0198904a3d7679771ce845c847d940226f |
10-Apr-2013 |
Michael Kolb <kolby@google.com> |
Add menu labels Bug: 8618169 Change-Id: Iea1ac7256450afd2870c144099459f32868c699f
rc/com/android/camera/CameraSettings.java
rc/com/android/camera/ListPreference.java
rc/com/android/camera/PhotoMenu.java
rc/com/android/camera/PieController.java
rc/com/android/camera/drawable/TextDrawable.java
rc/com/android/camera/ui/PieItem.java
rc/com/android/camera/ui/PieRenderer.java
|
3d25de2e7bbf81d49b50be577923f7d99a0180de |
10-Apr-2013 |
Michael Kolb <kolby@google.com> |
Add menu labels Bug: 8618169 Change-Id: Iea1ac7256450afd2870c144099459f32868c699f
es/values/arrays.xml
es/values/attrs.xml
es/values/strings.xml
es/xml/camera_preferences.xml
rc/com/android/camera/CameraSettings.java
rc/com/android/camera/ListPreference.java
rc/com/android/camera/PhotoMenu.java
rc/com/android/camera/PieController.java
rc/com/android/camera/drawable/TextDrawable.java
rc/com/android/camera/ui/PieItem.java
rc/com/android/camera/ui/PieRenderer.java
|
317b5997e9b3f5bb6d30d1f447b2736418630502 |
10-Apr-2013 |
Michael Kolb <kolby@google.com> |
Add menu labels Bug: 8618169 Change-Id: Iea1ac7256450afd2870c144099459f32868c699f
es/values/arrays.xml
es/values/attrs.xml
es/values/strings.xml
es/xml/camera_preferences.xml
|
5be44318a9963cffafb255b6a0727af9c47a8b60 |
10-Apr-2013 |
John Hoford <hoford@google.com> |
support for simplified parameters in filter Change-Id: I623e6fb90e8175c7e5e2dfc146f927eecba29817
rc/com/android/gallery3d/filtershow/filters/FilterBasicRepresentation.java
|
cb482deecb95a140b63d4bd43e2560fb9033df86 |
10-Apr-2013 |
John Hoford <hoford@google.com> |
support for simplified parameters in filter Change-Id: I623e6fb90e8175c7e5e2dfc146f927eecba29817
rc/com/android/gallery3d/filtershow/controller/BasicParameterInt.java
rc/com/android/gallery3d/filtershow/controller/BasicParameterStyle.java
rc/com/android/gallery3d/filtershow/controller/FilterView.java
rc/com/android/gallery3d/filtershow/controller/Parameter.java
rc/com/android/gallery3d/filtershow/controller/ParameterSet.java
rc/com/android/gallery3d/filtershow/editors/BasicEditor.java
rc/com/android/gallery3d/filtershow/filters/FilterBasicRepresentation.java
|
d2f5fe607ee6d7b5f79862b495495e2f6024cdab |
10-Apr-2013 |
John Hoford <hoford@google.com> |
support for simplified parameters in filter Change-Id: I623e6fb90e8175c7e5e2dfc146f927eecba29817
rc/com/android/gallery3d/filtershow/controller/BasicParameterInt.java
rc/com/android/gallery3d/filtershow/controller/BasicParameterStyle.java
rc/com/android/gallery3d/filtershow/controller/FilterView.java
rc/com/android/gallery3d/filtershow/controller/Parameter.java
rc/com/android/gallery3d/filtershow/controller/ParameterSet.java
rc/com/android/gallery3d/filtershow/editors/BasicEditor.java
rc/com/android/gallery3d/filtershow/filters/FilterBasicRepresentation.java
|
656629d38135c111c70ff4b0e6cc7454d883aead |
15-Apr-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I0054ad10c78ba5faf10dc8ba025845a2e2721e58 Auto-generated-cl: translation import
es/values-de/strings.xml
es/values-lt/strings.xml
|
2a142c573abcfab5dfc891265f6904e3db0979cf |
15-Apr-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I8aeeb4b7b789a837367ca6ccb4b415053b094c74 Auto-generated-cl: translation import
es/values-de/strings.xml
es/values-lt/strings.xml
|
75f14c352bd5b14f2573d7ceb9c2de21a4849a88 |
15-Apr-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ie192a857eb06b19ae8e7b612739a5f160e636e62 Auto-generated-cl: translation import
es/values-de/strings.xml
es/values-lt/strings.xml
|
20f9cf6b5cdc023babda9e4a6d0b16d03f4fa79e |
15-Apr-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ib788a26efef90860ae6bf9a3ef3bd283bca99c5d Auto-generated-cl: translation import
es/values-de/strings.xml
es/values-lt/strings.xml
|
2c648584661fd60f14a4ca036232200a9e556909 |
15-Apr-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ib788a26efef90860ae6bf9a3ef3bd283bca99c5d Auto-generated-cl: translation import
es/values-de/strings.xml
es/values-lt/strings.xml
|
8b693a339c00aacb08a0e3c67a173d5b3dddcb0a |
15-Apr-2013 |
The Android Open Source Project <initial-contribution@android.com> |
am 1e606658: Reconcile with jb-mr2-release - do not merge * commit '1e60665812eea64ac9094882908147cd0dc5d110': am bacc5027: Merge "Add checks for NPE in video pie menu." into gb-ub-photos-bryce
|
cdbf5892e12770821afd85f0ff51a269b3682573 |
15-Apr-2013 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with jb-mr2-release - do not merge Change-Id: Id113b987c3c1423d0af9464a63edcec9840cc870
|
f937ba83d800aaa37b9f0aeca5b3c58209047ada |
15-Apr-2013 |
The Android Automerger <android-build@android.com> |
merge in jb-mr2-release history after reset to jb-mr2-dev
|
6844f05e74fa3b0c3179c32f82bf502ae4313abc |
13-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
am a827ce9d: am cba8574c: am 4b6ea5bc: Add direct rendering for border * commit 'a827ce9d82c533f65d9e34691a593c6ebdd97ef3': Add direct rendering for border
|
7cfbe6c541a7c7813da18f38d368ae1dbc12a985 |
13-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
am cba8574c: am 4b6ea5bc: Add direct rendering for border * commit 'cba8574c2b42f61a11a7e01c2f706f0c1f9cfc9c': Add direct rendering for border
|
dd95d843da26f8e1dc1d8277dad0cbb507f8e308 |
13-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
am 4b6ea5bc: Add direct rendering for border * commit '4b6ea5bce9b68eea16eb8a0980501f671e7fbf44': Add direct rendering for border
|
5ef0565929c7c9185776143eba01a536b470e097 |
13-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
am 4b6ea5bc: Add direct rendering for border * commit '4b6ea5bce9b68eea16eb8a0980501f671e7fbf44': Add direct rendering for border
|
2103df1e0c6916aff50505dd32e82238d7c81e4c |
13-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
am 4b6ea5bc: Add direct rendering for border * commit '4b6ea5bce9b68eea16eb8a0980501f671e7fbf44': Add direct rendering for border
|
d02932454e58d6858ec80d64932247f73dd0b19b |
13-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
Add direct rendering for border bug:8603245 Change-Id: Ibc1bde9adb19f930b474e4076a0c2720fbe0bc8d
rc/com/android/gallery3d/filtershow/cache/CachingPipeline.java
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
|
4b6ea5bce9b68eea16eb8a0980501f671e7fbf44 |
13-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
Add direct rendering for border bug:8603245 Change-Id: Ibc1bde9adb19f930b474e4076a0c2720fbe0bc8d
rc/com/android/gallery3d/filtershow/cache/CachingPipeline.java
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
|
b6733f8911de010106411714ac2e03f8863628e2 |
13-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
Add direct rendering for border bug:8603245 Change-Id: Ibc1bde9adb19f930b474e4076a0c2720fbe0bc8d
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
|
3952c323a14e55ba176e63197f5c6aa6c9cbdb7e |
13-Apr-2013 |
Bobby Georgescu <georgescu@google.com> |
Fix performance and other issues related to multi-selection Bug: 8606565 Bug: 8607510 Change-Id: I5bd01745b6d1047571d562e1637a2999afddfec2
rc/com/android/gallery3d/ui/ActionModeHandler.java
rc/com/android/gallery3d/ui/SelectionManager.java
|
549c968947cccc8bacca994f954629228b6b877f |
13-Apr-2013 |
Bobby Georgescu <georgescu@google.com> |
Fix performance and other issues related to multi-selection Bug: 8606565 Bug: 8607510 Change-Id: I5bd01745b6d1047571d562e1637a2999afddfec2
rc/com/android/gallery3d/ui/ActionModeHandler.java
rc/com/android/gallery3d/ui/SelectionManager.java
|
3ec311fef501e4ec32d75057518abb567a945a1f |
13-Apr-2013 |
Baligh Uddin <baligh@google.com> |
am c47dc315: am ced505a6: am b9db2d6a: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce * commit 'c47dc315e74eb6a505faa22072b3cabe1ec5282d': Import translations. DO NOT MERGE
|
504fa93286d4bf2cab1fa99d0c46f704d952808f |
13-Apr-2013 |
Baligh Uddin <baligh@google.com> |
am ced505a6: am b9db2d6a: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce * commit 'ced505a6a7364b8623849354aa3f3134bad35830': Import translations. DO NOT MERGE
|
f40696a8f65225a912350649582ee15dcaad0a05 |
13-Apr-2013 |
Baligh Uddin <baligh@google.com> |
am 859a2ae9: am 6b4c389d: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev * commit '859a2ae99f0c6f3c62fdd37fde8f8800a463ea28': Import translations. DO NOT MERGE
|
690ef9f8495a88805ec8aa28b7e6b1b46ed97743 |
13-Apr-2013 |
Baligh Uddin <baligh@google.com> |
am 6b4c389d: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev * commit '6b4c389d201cd87e49699995a8ee4d68d68af37e': Import translations. DO NOT MERGE
|
90306d691d426b04ab0301738ccdd0f30740c36f |
13-Apr-2013 |
Baligh Uddin <baligh@google.com> |
am b9db2d6a: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce * commit 'b9db2d6aeb5b3b1d6a2335509de14612ce4453c3': Import translations. DO NOT MERGE
|
0a124f75961562363d2007eb963a3ed4b02ca866 |
13-Apr-2013 |
Baligh Uddin <baligh@google.com> |
am b9db2d6a: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce * commit 'b9db2d6aeb5b3b1d6a2335509de14612ce4453c3': Import translations. DO NOT MERGE
|
6160fa5c3de7f5da788149c86408737e29c01def |
13-Apr-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE"
|
1480866d417c0aec6a33b2b4c8693f47a30f2b06 |
13-Apr-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
|
b9db2d6aeb5b3b1d6a2335509de14612ce4453c3 |
13-Apr-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
|
96f4db1b999640b1f65f6fabb57d249be30356e5 |
13-Apr-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
|
0a93cd70de75bbd1547fa58330d68ba953607115 |
13-Apr-2013 |
Angus Kong <shkong@google.com> |
Load video items in the new camera filmstrip. Also fixes: 1. NPE when no data to load. 2. The last item is skipped. 3. date and id should be long instead of int. Change-Id: I7cad06998d78e0d3f0a30be24e65eb0f777b9c0e
rc/com/android/camera/data/CameraDataAdapter.java
rc/com/android/camera/ui/FilmStripView.java
|
56aefdc2da64dd6df01564198277c54a980c16a3 |
12-Apr-2013 |
Bart Sears <bsears@google.com> |
am fe0eeedd: am cadaa899: am 4772792d: Bump up the version number to 1.1.40010 * commit 'fe0eeedd664f41112bdd76ee1414ca387a62e21b': Bump up the version number to 1.1.40010
|
f07c7feea8d94e7700cf5d7d7e07de9db5bfce5f |
12-Apr-2013 |
Bart Sears <bsears@google.com> |
am cadaa899: am 4772792d: Bump up the version number to 1.1.40010 * commit 'cadaa89992808a8fca782e24f2c42c17d07dac1b': Bump up the version number to 1.1.40010
|
c7369787a34bc03396d5e78356234657abcb7553 |
12-Apr-2013 |
Bart Sears <bsears@google.com> |
am 4772792d: Bump up the version number to 1.1.40010 * commit '4772792dbe4a29bd90139eead6a881f47523ede5': Bump up the version number to 1.1.40010
|
3ef9305df00a469bd2da73d893b8f75f1bae7c86 |
12-Apr-2013 |
Bart Sears <bsears@google.com> |
Bump up the version number to 1.1.40010 Bug: 8607157 Change-Id: I4c0f4cd481d0989cad2fd9cadbda9f7768b81765
ndroidManifest.xml
|
4772792dbe4a29bd90139eead6a881f47523ede5 |
12-Apr-2013 |
Bart Sears <bsears@google.com> |
Bump up the version number to 1.1.40010 Bug: 8607157 Change-Id: I4c0f4cd481d0989cad2fd9cadbda9f7768b81765
ndroidManifest.xml
|
074a9e50c253a639fa2d933a3204364474b46d1f |
12-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
am 951d74d2: am 439b028e: am 93ef658b: Add a direct rendering mode * commit '951d74d281abd98bb3846caacd5050f197670d8f': Add a direct rendering mode
|
339a0c1332102aa1e9d9151f0cc2e074daae5621 |
12-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
am 439b028e: am 93ef658b: Add a direct rendering mode * commit '439b028e7a74bbc56b96d43c2e58f1679207be7b': Add a direct rendering mode
|
106591358192ebddab0ea7b6f2c59de18359daf6 |
12-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
am 93ef658b: Add a direct rendering mode * commit '93ef658bf44d7ecd79894a9a225a400c2741058f': Add a direct rendering mode
|
fb602d93faf15489debd27e21b2480634f1ed1f5 |
12-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
am 93ef658b: Add a direct rendering mode * commit '93ef658bf44d7ecd79894a9a225a400c2741058f': Add a direct rendering mode
|
a3211b06f224ea79db8dac02b5ed19ccdb9f9094 |
11-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
Add a direct rendering mode This takes input and output allocations. Also added a utility method in ImageFilterRS to scale textures at screen resolution. bug:8603245 bug:8588853 Change-Id: Ic5e4dea2289f0edd7518fc07f04b523be5316e82
rc/com/android/gallery3d/filtershow/cache/CachingPipeline.java
rc/com/android/gallery3d/filtershow/filters/ImageFilter.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterRS.java
rc/com/android/gallery3d/filtershow/presets/FilterEnvironment.java
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
|
93ef658bf44d7ecd79894a9a225a400c2741058f |
11-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
Add a direct rendering mode This takes input and output allocations. Also added a utility method in ImageFilterRS to scale textures at screen resolution. bug:8603245 bug:8588853 Change-Id: Ic5e4dea2289f0edd7518fc07f04b523be5316e82
rc/com/android/gallery3d/filtershow/cache/CachingPipeline.java
rc/com/android/gallery3d/filtershow/filters/ImageFilter.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterRS.java
rc/com/android/gallery3d/filtershow/presets/FilterEnvironment.java
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
|
6675f242f747d60da2429d7ef949731a05b612c7 |
11-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
Add a direct rendering mode This takes input and output allocations. Also added a utility method in ImageFilterRS to scale textures at screen resolution. bug:8603245 bug:8588853 Change-Id: Ic5e4dea2289f0edd7518fc07f04b523be5316e82
rc/com/android/gallery3d/filtershow/presets/FilterEnvironment.java
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
|
1a23a854a230c116ab0af5bc1e7b48d28a1b17d9 |
12-Apr-2013 |
Michael Kolb <kolby@google.com> |
am bacc5027: Merge "Add checks for NPE in video pie menu." into gb-ub-photos-bryce * commit 'bacc5027e5ecfb92d6d0ba8824e878f6bea9a80e': Add checks for NPE in video pie menu.
rc/com/android/camera/VideoMenu.java
|
5a3d5a9e21369359cca3bf53f7ed92e00e1a7846 |
12-Apr-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I227e15361bc88443c8e44da8db5f7341d0c3eb33 Auto-generated-cl: translation import
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
5a06d4889153a08b0af6cc7ce613bbb49ab7ff5a |
12-Apr-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ia8295be72b66a5eacb395f8ffc55878ab03ebc79 Auto-generated-cl: translation import
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
f7e035bd6d57045c5dd2b29d090b4f40c56a13b5 |
12-Apr-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I985fe436b0d183ed5aa36a3a9db826be010fb97b Auto-generated-cl: translation import
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
22787d473452aa45ebe267052e70d03fb8cd997d |
12-Apr-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ib9a794dd416ad278849b4a0900307f0fbdd8f927 Auto-generated-cl: translation import
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
8078eab865f508bd01a704d186cdcc4a62c88687 |
12-Apr-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ib9a794dd416ad278849b4a0900307f0fbdd8f927 Auto-generated-cl: translation import
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
a6be8c13d385a7e2ceab085c5da4a346eeca0914 |
12-Apr-2013 |
Michael Kolb <kolby@google.com> |
am c2e1a167: am fb4605d7: am bacc5027: Merge "Add checks for NPE in video pie menu." into gb-ub-photos-bryce * commit 'c2e1a167f4a128c13445406d7087ebead2a262b7': Add checks for NPE in video pie menu.
|
77da7354016a7cc7fdb8385312b8f837fe421819 |
12-Apr-2013 |
Michael Kolb <kolby@google.com> |
am 95cb5157: am 76193ba8: am af998215: Merge "Fix NPE in PieRenderer" into gb-ub-photos-bryce * commit '95cb5157b6691371190d08fc85237e91ac8e8121': Fix NPE in PieRenderer
|
001dd769479026f37c8aa8b61317674d8b4dc930 |
12-Apr-2013 |
Doris Liu <tianliu@google.com> |
am a6e42ecb: am 2bcea6d6: am d8259c06: Merge "Fix ICS recording aspect ratio" into gb-ub-photos-bryce * commit 'a6e42ecb7d4923a0a11c5581b34aa7b07107feef': Fix ICS recording aspect ratio
|
3ee1818a43875316fc74633ce758f80832511537 |
12-Apr-2013 |
Michael Kolb <kolby@google.com> |
am fb4605d7: am bacc5027: Merge "Add checks for NPE in video pie menu." into gb-ub-photos-bryce * commit 'fb4605d780396f5e6c4e5043985b460e24308758': Add checks for NPE in video pie menu.
|
196b5864cfe789f17476e6ee5f425e325a546e5d |
12-Apr-2013 |
Michael Kolb <kolby@google.com> |
am bacc5027: Merge "Add checks for NPE in video pie menu." into gb-ub-photos-bryce * commit 'bacc5027e5ecfb92d6d0ba8824e878f6bea9a80e': Add checks for NPE in video pie menu.
|
743dfdcd88081ff19fa6100dbd7d9c84aabe71c0 |
12-Apr-2013 |
Michael Kolb <kolby@google.com> |
Merge "Add checks for NPE in video pie menu." into gb-ub-photos-bryce
|
bacc5027e5ecfb92d6d0ba8824e878f6bea9a80e |
12-Apr-2013 |
Michael Kolb <kolby@google.com> |
Merge "Add checks for NPE in video pie menu." into gb-ub-photos-bryce
|
d8cb8ef3404723584c96222521c517f4a9c84200 |
12-Apr-2013 |
Michael Kolb <kolby@google.com> |
am 76193ba8: am af998215: Merge "Fix NPE in PieRenderer" into gb-ub-photos-bryce * commit '76193ba848ca9d146360224522835d2347e899c0': Fix NPE in PieRenderer
|
9cf3a9937925d7c8be42be9229f8ce214857f976 |
12-Apr-2013 |
Michael Kolb <kolby@google.com> |
am af998215: Merge "Fix NPE in PieRenderer" into gb-ub-photos-bryce * commit 'af998215b46e2b0ffaa2a47a762ba78f7c522e60': Fix NPE in PieRenderer
|
8b3bf3df6b6a574adcad3e6ef6310ee6a632cb06 |
12-Apr-2013 |
Doris Liu <tianliu@google.com> |
am 2bcea6d6: am d8259c06: Merge "Fix ICS recording aspect ratio" into gb-ub-photos-bryce * commit '2bcea6d69ba09568a4d64fb14fc062c04a8ab8b8': Fix ICS recording aspect ratio
|
6608b57af0fd3b561022b589d4dc7ece567cf759 |
12-Apr-2013 |
Michael Kolb <kolby@google.com> |
Merge "Fix NPE in PieRenderer" into gb-ub-photos-bryce
|
af998215b46e2b0ffaa2a47a762ba78f7c522e60 |
12-Apr-2013 |
Michael Kolb <kolby@google.com> |
Merge "Fix NPE in PieRenderer" into gb-ub-photos-bryce
|
308d5d34fcdb38f41f24176927e9ea0a62e3b7a3 |
12-Apr-2013 |
Doris Liu <tianliu@google.com> |
am d8259c06: Merge "Fix ICS recording aspect ratio" into gb-ub-photos-bryce * commit 'd8259c06a0ed459eb937cf3bd3ddd79db1ea2533': Fix ICS recording aspect ratio
|
14b553530417960d51ac173f09c2fbabf590cd81 |
12-Apr-2013 |
Doris Liu <tianliu@google.com> |
Merge "Fix ICS recording aspect ratio" into gb-ub-photos-bryce
|
d8259c06a0ed459eb937cf3bd3ddd79db1ea2533 |
12-Apr-2013 |
Doris Liu <tianliu@google.com> |
Merge "Fix ICS recording aspect ratio" into gb-ub-photos-bryce
|
dc7d1ac9c9fd4ba9f4c689e17a4a248a27463fbe |
12-Apr-2013 |
Michael Kolb <kolby@google.com> |
Fix NPE in PieRenderer Bug: 8579025 Change-Id: I1faaa4fc8a48e6abedca303e80dbf48d7b5e7574
rc/com/android/camera/ui/PieRenderer.java
|
0c1d83cf2ca1517c5db6346af9795c9df2257dec |
12-Apr-2013 |
Michael Kolb <kolby@google.com> |
Fix NPE in PieRenderer Bug: 8579025 Change-Id: I1faaa4fc8a48e6abedca303e80dbf48d7b5e7574
rc/com/android/camera/ui/PieRenderer.java
|
5767a11acb4ebd94a1fde5906d07fd32cb4ec99e |
12-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 1fb1150a: am dd185557: am eb0347b9: am 6cfb081c: G+ crop overlay shadows. Aspect ratios. * commit '1fb1150af4bdaac97ee8580f24ab08124f0cdf28': G+ crop overlay shadows. Aspect ratios.
|
89976ef82d7838bc3eba109a6b66cfad41c8e149 |
12-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am dd185557: am eb0347b9: am 6cfb081c: G+ crop overlay shadows. Aspect ratios. * commit 'dd1855572f0e354a18bee8876f182068c8b2d849': G+ crop overlay shadows. Aspect ratios.
|
125776d8e91d8747baa33acf1fbd6dd75450d157 |
12-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am eb0347b9: am 6cfb081c: G+ crop overlay shadows. Aspect ratios. * commit 'eb0347b95eb58fca649aa13c533775d19fd57927': G+ crop overlay shadows. Aspect ratios.
|
e3ff30d4ed50f41ed38c0b560217200b3298ba45 |
12-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 6cfb081c: G+ crop overlay shadows. Aspect ratios. * commit '6cfb081cdf5acf454ecb05c50c575bcb3ce74cf0': G+ crop overlay shadows. Aspect ratios.
|
6cfb081cdf5acf454ecb05c50c575bcb3ce74cf0 |
12-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
G+ crop overlay shadows. Aspect ratios. Bug: 8597538 Change-Id: I9a7225a125bef7e11d6bf420bf1fa55e7f22c909
rc/com/android/gallery3d/filtershow/crop/CropDrawingUtils.java
rc/com/android/gallery3d/filtershow/crop/CropMath.java
rc/com/android/gallery3d/filtershow/crop/CropObject.java
|
22596004f272da6b07b91d791540e9bb85ff5a17 |
12-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
G+ crop overlay shadows. Aspect ratios. Bug: 8597538 Change-Id: I9a7225a125bef7e11d6bf420bf1fa55e7f22c909
rc/com/android/gallery3d/filtershow/crop/CropDrawingUtils.java
rc/com/android/gallery3d/filtershow/crop/CropMath.java
rc/com/android/gallery3d/filtershow/crop/CropObject.java
|
4205d50cbb7fcf822e992c955719d4f8872f37d5 |
12-Apr-2013 |
Jason Noguchi <jnoguchi@google.com> |
Add checks for NPE in video pie menu. Bug: 8536361 Change-Id: Iabd818e4e9fadf1f36ffed894ca7248f9568e6c9
rc/com/android/camera/VideoMenu.java
|
cf184b00b0b9c261e147ab80dc4f5a18e10e3b4d |
12-Apr-2013 |
Jason Noguchi <jnoguchi@google.com> |
Add checks for NPE in video pie menu. Bug: 8536361 Change-Id: Iabd818e4e9fadf1f36ffed894ca7248f9568e6c9
rc/com/android/camera/VideoMenu.java
|
e11dffa6d4d34cd6754d58a245b867a13385945c |
10-Apr-2013 |
Doris Liu <tianliu@google.com> |
Fix ICS recording aspect ratio Change-Id: I092a4303959b1b3cee870c891070e2605ab9e0b0
rc/com/android/camera/NewVideoUI.java
|
d99ec324793317fd6a8ea8dcee3c333b7c0653b5 |
10-Apr-2013 |
Doris Liu <tianliu@google.com> |
Fix ICS recording aspect ratio Change-Id: I092a4303959b1b3cee870c891070e2605ab9e0b0
rc/com/android/camera/NewVideoUI.java
|
d9ba9d1c312975ca719d6ac01a4bedc0d26e8766 |
12-Apr-2013 |
Bobby Georgescu <georgescu@google.com> |
am d169078d: am a9ff51c5: am 0fc0fbf1: am e51f236b: Merge "Show loading indicator in full-screen importer view" into gb-ub-photos-bryce * commit 'd169078dab52e5ec6e174dd461769cb085befae7': Show loading indicator in full-screen importer view
|
274f52374da4bdcc69860086f14f3101ffa822e6 |
12-Apr-2013 |
Bobby Georgescu <georgescu@google.com> |
am a9ff51c5: am 0fc0fbf1: am e51f236b: Merge "Show loading indicator in full-screen importer view" into gb-ub-photos-bryce * commit 'a9ff51c5b3d8895ab95929739cb5cc406cd5aadf': Show loading indicator in full-screen importer view
|
79d935ea959587845967bf0b10a2452623e9a336 |
12-Apr-2013 |
Bobby Georgescu <georgescu@google.com> |
am 0fc0fbf1: am e51f236b: Merge "Show loading indicator in full-screen importer view" into gb-ub-photos-bryce * commit '0fc0fbf14b8113b2655ae798ef9d7616f37f0d68': Show loading indicator in full-screen importer view
|
de43cdde53d4d04d47cbdf4c260a3bc992fb21d1 |
12-Apr-2013 |
Angus Kong <shkong@google.com> |
am 527af0df: am a3c16e5b: am bdb35784: am 2634fe5f: Merge "Integrate FilmStripView." into gb-ub-photos-bryce * commit '527af0df9587f04bea16735949a37fbe8d356462': Integrate FilmStripView.
|
0b9b67a4a9165eda80382d78c6d707037c78f46a |
12-Apr-2013 |
Bobby Georgescu <georgescu@google.com> |
am e51f236b: Merge "Show loading indicator in full-screen importer view" into gb-ub-photos-bryce * commit 'e51f236bfcc617979871f0be7ce46691cf5415c8': Show loading indicator in full-screen importer view
|
a1a78b2aed697e44df078b434b8c0ec28a3177e1 |
12-Apr-2013 |
Bobby Georgescu <georgescu@google.com> |
am e51f236b: Merge "Show loading indicator in full-screen importer view" into gb-ub-photos-bryce * commit 'e51f236bfcc617979871f0be7ce46691cf5415c8': Show loading indicator in full-screen importer view
|
c90e43b26ba16258e935e4e4c3fada3271f7821f |
12-Apr-2013 |
Angus Kong <shkong@google.com> |
am a3c16e5b: am bdb35784: am 2634fe5f: Merge "Integrate FilmStripView." into gb-ub-photos-bryce * commit 'a3c16e5b3e1b1e45b622cc012a3a0e6d0cbcc41d': Integrate FilmStripView.
|
e51f236bfcc617979871f0be7ce46691cf5415c8 |
12-Apr-2013 |
Bobby Georgescu <georgescu@google.com> |
Merge "Show loading indicator in full-screen importer view" into gb-ub-photos-bryce
|
6c5f5f43f18b466e7a51b8ebcd133e81029dba67 |
12-Apr-2013 |
Bobby Georgescu <georgescu@google.com> |
Merge "Show loading indicator in full-screen importer view" into gb-ub-photos-bryce
|
8f315c85d5222e5dc402b3a0580017771b850b89 |
12-Apr-2013 |
Bobby Georgescu <georgescu@google.com> |
Merge "Show loading indicator in full-screen importer view" into gb-ub-photos-bryce
|
4f704fc398e7c506b5029ede215394e4882e5b98 |
12-Apr-2013 |
Angus Kong <shkong@google.com> |
am bdb35784: am 2634fe5f: Merge "Integrate FilmStripView." into gb-ub-photos-bryce * commit 'bdb3578486870647fe24d8bae74eaed552d6527b': Integrate FilmStripView.
|
0683fe0a1c913d6cc48a127bf6a1486422d1b040 |
12-Apr-2013 |
Bobby Georgescu <georgescu@google.com> |
Show loading indicator in full-screen importer view Bug: 8599282 Change-Id: I568d5077e8e5450da49cd4d75df39973b84d081f
es/layout/ingest_fullsize.xml
rc/com/android/gallery3d/ingest/ui/MtpImageView.java
|
580a67c198e351f9dd1bbc8c361e81da8329d4de |
12-Apr-2013 |
Bobby Georgescu <georgescu@google.com> |
Show loading indicator in full-screen importer view Bug: 8599282 Change-Id: I568d5077e8e5450da49cd4d75df39973b84d081f
rc/com/android/gallery3d/ingest/ui/MtpImageView.java
|
36f8d9d27dc128544491909fa25aec798f1251bb |
12-Apr-2013 |
Bobby Georgescu <georgescu@google.com> |
Show loading indicator in full-screen importer view Bug: 8599282 Change-Id: I568d5077e8e5450da49cd4d75df39973b84d081f
es/layout/ingest_fullsize.xml
|
fdbdc830da49bf79192a15487d68055b420929ec |
12-Apr-2013 |
Angus Kong <shkong@google.com> |
am 2634fe5f: Merge "Integrate FilmStripView." into gb-ub-photos-bryce * commit '2634fe5fb34ed749d25c0e13113a9ba6c6e8cf90': Integrate FilmStripView.
|
3dd3677d323a8893bbc57e54c9fb210c0c66c839 |
12-Apr-2013 |
Angus Kong <shkong@google.com> |
am 2634fe5f: Merge "Integrate FilmStripView." into gb-ub-photos-bryce * commit '2634fe5fb34ed749d25c0e13113a9ba6c6e8cf90': Integrate FilmStripView.
|
2634fe5fb34ed749d25c0e13113a9ba6c6e8cf90 |
12-Apr-2013 |
Angus Kong <shkong@google.com> |
Merge "Integrate FilmStripView." into gb-ub-photos-bryce
|
1124dd507a7512303abd674aaff1dbbf797226ee |
12-Apr-2013 |
Angus Kong <shkong@google.com> |
Merge "Integrate FilmStripView." into gb-ub-photos-bryce
|
c04606029ce334f83fd2d73d2e89aba5fd614583 |
12-Apr-2013 |
Angus Kong <shkong@google.com> |
Merge "Integrate FilmStripView." into gb-ub-photos-bryce
|
978116f252175d54e5dbdfe0472de999052ad651 |
12-Apr-2013 |
George Mount <mount@google.com> |
am 49bdc9dd: am 46e60b07: am 85233f2c: am 34a50f0c: Merge "Add _COUNT support for PhotoProvider to help performance of All Photos." into gb-ub-photos-bryce * commit '49bdc9ddb8035b4e0218cc002062ecb2302cf090': Add _COUNT support for PhotoProvider to help performance of All Photos.
|
5ce3fbdd6a3eaae5b58cbbd355aba109512393c9 |
12-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 1da23d81: am e27690be: am f2b05458: am ea2fa83c: Setup geometry xforms and propogation chain. * commit '1da23d81eaa4d19f88963cb416a91845fd528cf8': Setup geometry xforms and propogation chain.
|
608bf2f8603508b15f57696bfbd56516c6f90838 |
11-Apr-2013 |
George Mount <mount@google.com> |
am 46e60b07: am 85233f2c: am 34a50f0c: Merge "Add _COUNT support for PhotoProvider to help performance of All Photos." into gb-ub-photos-bryce * commit '46e60b07f086646c842255a614d895ae07a08f6e': Add _COUNT support for PhotoProvider to help performance of All Photos.
|
173dee89c8a4f18b775c318f6e2264a8dfdf516f |
11-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am e27690be: am f2b05458: am ea2fa83c: Setup geometry xforms and propogation chain. * commit 'e27690befeb135e7f63061bfe48a03c72ec8adaf': Setup geometry xforms and propogation chain.
|
637691eeb13d7ca2a2092c35c1c292460b003fe9 |
11-Apr-2013 |
George Mount <mount@google.com> |
am 85233f2c: am 34a50f0c: Merge "Add _COUNT support for PhotoProvider to help performance of All Photos." into gb-ub-photos-bryce * commit '85233f2c08759aa4731314899dbe43cfc16adc6f': Add _COUNT support for PhotoProvider to help performance of All Photos.
|
79a13fd2187aad0ef790901d159a36fe56e8c188 |
11-Apr-2013 |
George Mount <mount@google.com> |
am 34a50f0c: Merge "Add _COUNT support for PhotoProvider to help performance of All Photos." into gb-ub-photos-bryce * commit '34a50f0c3db6890e857abc68f5b9280f95c14d2e': Add _COUNT support for PhotoProvider to help performance of All Photos.
|
34a50f0c3db6890e857abc68f5b9280f95c14d2e |
11-Apr-2013 |
George Mount <mount@google.com> |
Merge "Add _COUNT support for PhotoProvider to help performance of All Photos." into gb-ub-photos-bryce
|
d6d4cccf7d4393fc90d2b8504873894c714aec2d |
11-Apr-2013 |
George Mount <mount@google.com> |
Merge "Add _COUNT support for PhotoProvider to help performance of All Photos." into gb-ub-photos-bryce
|
2254afac1e5a94fe14b72c1124746c44de5bd8b7 |
11-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am f2b05458: am ea2fa83c: Setup geometry xforms and propogation chain. * commit 'f2b0545806a679e38e230233c80080a5d9c24033': Setup geometry xforms and propogation chain.
|
c2a8f046247440533269e4df6f343806768634b9 |
11-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am ea2fa83c: Setup geometry xforms and propogation chain. * commit 'ea2fa83c2dd2b59b8a67ec363e4ac431748f997b': Setup geometry xforms and propogation chain.
|
ea2fa83c2dd2b59b8a67ec363e4ac431748f997b |
11-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Setup geometry xforms and propogation chain. Bug: 8597538 Change-Id: I4a6b8ebcfadfd30850a73217742c740835761388
rc/com/android/gallery3d/filtershow/crop/BoundedRect.java
rc/com/android/gallery3d/filtershow/crop/CropObject.java
|
966f219a6bd36c4ddb8d07259fa31097a441745e |
11-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Setup geometry xforms and propogation chain. Bug: 8597538 Change-Id: I4a6b8ebcfadfd30850a73217742c740835761388
rc/com/android/gallery3d/filtershow/crop/BoundedRect.java
rc/com/android/gallery3d/filtershow/crop/CropObject.java
|
84eb27a4656a910fda012c672bfba5a7fc9c9e3d |
10-Apr-2013 |
Angus Kong <shkong@google.com> |
Integrate FilmStripView. Change-Id: Ib9f280a4c58a5c120775d5e9340ea04d56c0343d
es/layout/camera.xml
es/layout/camera_filmstrip.xml
rc/com/android/camera/NewCameraActivity.java
rc/com/android/camera/NewPhotoUI.java
rc/com/android/camera/data/CameraDataAdapter.java
rc/com/android/camera/ui/FilmStripView.java
rc/com/android/camera/ui/NewCameraRootView.java
|
125efb44995fb3307572c2832b259307e8b7aadc |
10-Apr-2013 |
Angus Kong <shkong@google.com> |
Integrate FilmStripView. Change-Id: Ib9f280a4c58a5c120775d5e9340ea04d56c0343d
rc/com/android/camera/NewCameraActivity.java
rc/com/android/camera/NewPhotoUI.java
rc/com/android/camera/data/CameraDataAdapter.java
rc/com/android/camera/ui/FilmStripView.java
rc/com/android/camera/ui/NewCameraRootView.java
|
19fb00429458fa3e01d0d5a244f5b31150c76cc5 |
10-Apr-2013 |
Angus Kong <shkong@google.com> |
Integrate FilmStripView. Change-Id: Ib9f280a4c58a5c120775d5e9340ea04d56c0343d
es/layout/camera.xml
es/layout/camera_filmstrip.xml
|
a9313dc7c0826812ef8c7b10f41a7e97161c9d71 |
11-Apr-2013 |
Doris Liu <tianliu@google.com> |
am 5294a3b4: am cad5c880: am 901b8e1a: am 1f60d9cd: Merge "Fix camera preview being squished" into gb-ub-photos-bryce * commit '5294a3b4e648aa7b1486a685c066b2e6dbe40ee9': Fix camera preview being squished
|
ba1d7caf633631e3195e3938a39b86efd820869a |
09-Apr-2013 |
George Mount <mount@google.com> |
Add _COUNT support for PhotoProvider to help performance of All Photos. Bug 8594818 Change-Id: Iab14a945e33ffcbf539b1d7acc704538e4bf48b6
rc/com/android/photos/data/PhotoProvider.java
|
6e19729992bb98f77a72d34ce330d2e2c0910c68 |
09-Apr-2013 |
George Mount <mount@google.com> |
Add _COUNT support for PhotoProvider to help performance of All Photos. Bug 8594818 Change-Id: Iab14a945e33ffcbf539b1d7acc704538e4bf48b6
rc/com/android/photos/data/PhotoProvider.java
|
448a73037b267fa86b7827e511896e85544d430c |
11-Apr-2013 |
Doris Liu <tianliu@google.com> |
am cad5c880: am 901b8e1a: am 1f60d9cd: Merge "Fix camera preview being squished" into gb-ub-photos-bryce * commit 'cad5c880350422cb9110cf9c61c8d38c302e5c92': Fix camera preview being squished
|
c3dfcfb425905e50c2abc338094262bd19174f3c |
11-Apr-2013 |
Doris Liu <tianliu@google.com> |
am 901b8e1a: am 1f60d9cd: Merge "Fix camera preview being squished" into gb-ub-photos-bryce * commit '901b8e1abb5d53db44abfcfe44168e0cdc45a902': Fix camera preview being squished
|
045910b140108fb60f740e5a31aaef064b158634 |
11-Apr-2013 |
Doris Liu <tianliu@google.com> |
am 1f60d9cd: Merge "Fix camera preview being squished" into gb-ub-photos-bryce * commit '1f60d9cd60e01da716a736803994ce14016947ac': Fix camera preview being squished
|
7c6140adb4ea219da3a45f5d69daae3f4340593a |
11-Apr-2013 |
Doris Liu <tianliu@google.com> |
Merge "Fix camera preview being squished" into gb-ub-photos-bryce
|
1f60d9cd60e01da716a736803994ce14016947ac |
11-Apr-2013 |
Doris Liu <tianliu@google.com> |
Merge "Fix camera preview being squished" into gb-ub-photos-bryce
|
e368a1c382b17af6219e539ee09c47df28340433 |
11-Apr-2013 |
The Android Open Source Project <initial-contribution@android.com> |
am 42261cac: (-s ours) am 7906ee68: Reconcile with jb-mr2-release - do not merge * commit '42261cac62383adf1a45c7a4077e61ce56665568':
|
79a3a894b3d91e254a3b85fb2653664cd32427b9 |
11-Apr-2013 |
The Android Open Source Project <initial-contribution@android.com> |
am 7906ee68: Reconcile with jb-mr2-release - do not merge * commit '7906ee682bef8d0acd15fd3e0852697100606f29':
|
5aba6b0c66e417940714eb5e00ad00bc02747f4e |
11-Apr-2013 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with jb-mr2-release - do not merge Change-Id: I04fc3a249c15bac81c330ad09fd9edeca78b784f
|
51785e194db6f5979ff4c7b64e91bb76c119cac8 |
11-Apr-2013 |
The Android Automerger <android-build@android.com> |
merge in jb-mr2-release history after reset to jb-mr2-dev
|
4696f6c5520df04e28a9ef6daaa3f24856a0e3f5 |
11-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 688e0fef: am 468542ec: am 8c18867c: am 41185c4f: Fix downsampling check in crop. * commit '688e0fef59e1ae8843b201155b7e74b7f2f9cce5': Fix downsampling check in crop.
|
baa446e9266960e5d5237ac5d96a7b9e378075e7 |
11-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 468542ec: am 8c18867c: am 41185c4f: Fix downsampling check in crop. * commit '468542ec0dc136c6703076bf2cc72fe3140f0eef': Fix downsampling check in crop.
|
f78d417ea14eb049e5d9715a0fb7e74eb66019fc |
11-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 8c18867c: am 41185c4f: Fix downsampling check in crop. * commit '8c18867c4dce46eb80ba02732a3cbe0c420e6a64': Fix downsampling check in crop.
|
03b42a90e97059c0ddb75803bdf4b53c0d40ee94 |
11-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 41185c4f: Fix downsampling check in crop. * commit '41185c4fdbccad17b79697306a7f8044b8f7ffd3': Fix downsampling check in crop.
|
f37454e2ec94f83bc52177b9c986935006619b75 |
11-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Fix downsampling check in crop. Bug: 8586301 Change-Id: I4c5441f779122adb984368609cfea39a60190848
rc/com/android/gallery3d/filtershow/crop/CropLoader.java
|
41185c4fdbccad17b79697306a7f8044b8f7ffd3 |
11-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Fix downsampling check in crop. Bug: 8586301 Change-Id: I4c5441f779122adb984368609cfea39a60190848
rc/com/android/gallery3d/filtershow/crop/CropLoader.java
|
28dc7f348b70ee6735d208b48ca12a94e9cd222f |
11-Apr-2013 |
Doris Liu <tianliu@google.com> |
Fix camera preview being squished Bug: 8585407 Change-Id: Ie9a3a44c58599f4cccfa0017d48749e9883af6cd
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/PhotoUI.java
|
dfde1ea857cb9282feceac90cd7ea029cf215a4f |
11-Apr-2013 |
Doris Liu <tianliu@google.com> |
Fix camera preview being squished Bug: 8585407 Change-Id: Ie9a3a44c58599f4cccfa0017d48749e9883af6cd
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/PhotoUI.java
|
db483efb956c0088be5ec3e86a7bf73dab49556e |
10-Apr-2013 |
Baligh Uddin <baligh@google.com> |
am eefa9dfa: (-s ours) am 2a9ce784: am 5bb44c4b: am 27b9459f: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce * commit 'eefa9dfa9fcfc57c366cac7e13fbbeb24639b2a6': Import translations. DO NOT MERGE
|
2179ac9ebb4eed740952833def127a89064bfa08 |
10-Apr-2013 |
Baligh Uddin <baligh@google.com> |
am 08554c90: (-s ours) am 55f7eb96: am a084c8d3: am ba81a885: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce * commit '08554c90c46b063953442824c7b793c53b84223c': Import translations. DO NOT MERGE
|
4f1581b6980964d19c63b05f53f5dcb4bd593164 |
10-Apr-2013 |
Baligh Uddin <baligh@google.com> |
am 120e2a4d: (-s ours) am e67741ab: am 3869b8db: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev * commit '120e2a4df2b49ae6628f698d7949c0d77b5eb6da': Import translations. DO NOT MERGE
|
bec40833b128bc6cbac1391a9ba1c6a9f8f0a22f |
10-Apr-2013 |
Baligh Uddin <baligh@google.com> |
am 6deece68: (-s ours) am f6800b4d: am 35e29cb6: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev * commit '6deece6876b4e7cb357974196f56b1ef34312141': Import translations. DO NOT MERGE
|
b379118705f8baac5c6cc24c84a5fd20ace3470d |
10-Apr-2013 |
Baligh Uddin <baligh@google.com> |
am 2a9ce784: am 5bb44c4b: am 27b9459f: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce * commit '2a9ce78469937c974f243ad45ef4548c8017b25d': Import translations. DO NOT MERGE
|
cbde4b4bfcb87b01f10379bb862575c77677a674 |
10-Apr-2013 |
Baligh Uddin <baligh@google.com> |
am 55f7eb96: am a084c8d3: am ba81a885: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce * commit '55f7eb9680a6f2fe3003e4cec5b9ea88bb02b1bf': Import translations. DO NOT MERGE
|
19abb219fa47b7215af8b183f8797359e6390364 |
10-Apr-2013 |
Baligh Uddin <baligh@google.com> |
am e67741ab: am 3869b8db: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev * commit 'e67741ab6b9ca35cab1a527efecfcaaf7b5593cf': Import translations. DO NOT MERGE
|
ac2e7e8a780c646b42d43318836d9bb50191508f |
10-Apr-2013 |
Baligh Uddin <baligh@google.com> |
am f6800b4d: am 35e29cb6: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev * commit 'f6800b4dfde049578d8230c73a10d1d74a050a99': Import translations. DO NOT MERGE
|
ba568dcee103124aebb4b9d1d1c4be594c6dd5b9 |
10-Apr-2013 |
Baligh Uddin <baligh@google.com> |
am 5bb44c4b: am 27b9459f: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce * commit '5bb44c4bef4190364ef0fa34ef643c926e42803a': Import translations. DO NOT MERGE
|
a3bab284f4c3a10f9e12ebccf58d32d206acf8a1 |
10-Apr-2013 |
Baligh Uddin <baligh@google.com> |
am a084c8d3: am ba81a885: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce * commit 'a084c8d3e7787544394d8622f61984b074a06b89': Import translations. DO NOT MERGE
|
7df85128ec3f6c432f68608be98580ef493820f5 |
10-Apr-2013 |
Baligh Uddin <baligh@google.com> |
am 3869b8db: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev * commit '3869b8db1b66c1a470c03d4b97455e3608c4f990': Import translations. DO NOT MERGE
|
7e4e2521d142e99cfd9ee0b11b47a7014374fc93 |
10-Apr-2013 |
Baligh Uddin <baligh@google.com> |
am 35e29cb6: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev * commit '35e29cb6f248176682fd88b6a7bf8c99487551ff': Import translations. DO NOT MERGE
|
5db72e409ad5a6cdae6d25714f7aa5222866fc24 |
10-Apr-2013 |
Baligh Uddin <baligh@google.com> |
am 9a5129cd: (-s ours) Merge "Import translations. DO NOT MERGE" * commit '9a5129cdfbe83379453adef4005bb73178a116b4': Import translations. DO NOT MERGE
|
c532058b1ea23005051e0fe2c4d817af8f1b2465 |
10-Apr-2013 |
Baligh Uddin <baligh@google.com> |
am a54163ad: (-s ours) Merge "Import translations. DO NOT MERGE" * commit 'a54163ad823909d931eac3256795b22c75ccd70b': Import translations. DO NOT MERGE
|
5fd6cd33e59aa63197abdff3acafaf41f9744986 |
10-Apr-2013 |
Baligh Uddin <baligh@google.com> |
am 27b9459f: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce * commit '27b9459f3764d45d46092aa541e691ff861e0aff': Import translations. DO NOT MERGE
|
fc4b2fc44f9add238a6d68537ee849d77e326f5b |
10-Apr-2013 |
Baligh Uddin <baligh@google.com> |
am ba81a885: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce * commit 'ba81a885844c3a04e58f70f6eed90de01b5ea44e': Import translations. DO NOT MERGE
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
0fd2f93395adbb3a6d6b7270142d0ce070837ef7 |
10-Apr-2013 |
Baligh Uddin <baligh@google.com> |
am 27b9459f: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce * commit '27b9459f3764d45d46092aa541e691ff861e0aff': Import translations. DO NOT MERGE
|
cb807e5e637674e7ad946b633d080c629d52c479 |
10-Apr-2013 |
Baligh Uddin <baligh@google.com> |
am ba81a885: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce * commit 'ba81a885844c3a04e58f70f6eed90de01b5ea44e': Import translations. DO NOT MERGE
|
2aadeb181152e69e78586dc8e43f3c938489696f |
10-Apr-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into master-security-dev
|
37e1266cbc7939ff5cbcbab1bd2019264e67c374 |
10-Apr-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE"
|
7819593681c0498311d7dfc34297eb8bdbcefd8b |
10-Apr-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
|
ffb2729c834f1ec85b1bdf5f4f5c4e2203d9031e |
10-Apr-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
|
27b9459f3764d45d46092aa541e691ff861e0aff |
10-Apr-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
|
812408cbbdcd791a4e261618b1df8f859f7f9da1 |
10-Apr-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into master-security-dev
|
acc96a8557bf55d35a23c2c5b8089a5a88456c84 |
10-Apr-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE"
|
101b60e59ff2c64eb6ad73f11c20c84bed869233 |
10-Apr-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
|
097b0bc415441182e648ab367c9603017b2ddbb6 |
10-Apr-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
|
ba81a885844c3a04e58f70f6eed90de01b5ea44e |
10-Apr-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
|
bc292f5203561772e1d4850a115c55d8693d8c86 |
10-Apr-2013 |
Bobby Georgescu <georgescu@google.com> |
am 87d57574: am f9c5cd31: am f5e37e42: am 6b138c22: Merge "Correctly scale images in MTP importer" into gb-ub-photos-bryce * commit '87d57574b538f5eac5444374e534c1ecc04c8c6e': Correctly scale images in MTP importer
|
1857dd4dfd3b7c49f6b7e03542c954d7729a3a4c |
10-Apr-2013 |
Bobby Georgescu <georgescu@google.com> |
am f9c5cd31: am f5e37e42: am 6b138c22: Merge "Correctly scale images in MTP importer" into gb-ub-photos-bryce * commit 'f9c5cd315f6b5fe87655c59397de604285c64b39': Correctly scale images in MTP importer
|
786b45b10cc43ac95defdc40755c8a4ca6a7f435 |
10-Apr-2013 |
Bobby Georgescu <georgescu@google.com> |
am f5e37e42: am 6b138c22: Merge "Correctly scale images in MTP importer" into gb-ub-photos-bryce * commit 'f5e37e421790f01024f846d4bc45c6da0c00fb3f': Correctly scale images in MTP importer
|
a22b5e34acbb5ee88994c0f7cd54fc55ac7ea4b5 |
10-Apr-2013 |
Bobby Georgescu <georgescu@google.com> |
am 6b138c22: Merge "Correctly scale images in MTP importer" into gb-ub-photos-bryce * commit '6b138c2240d35571e1f49258f84ec2659223d251': Correctly scale images in MTP importer
|
7f8e138c86f77e64df7d85ab5d51148418c56ca1 |
10-Apr-2013 |
Bobby Georgescu <georgescu@google.com> |
Merge "Correctly scale images in MTP importer" into gb-ub-photos-bryce
|
0f93e8be601f961804d7794a00df550300eb7fb7 |
10-Apr-2013 |
Bobby Georgescu <georgescu@google.com> |
Merge "Correctly scale images in MTP importer" into gb-ub-photos-bryce
|
6b138c2240d35571e1f49258f84ec2659223d251 |
10-Apr-2013 |
Bobby Georgescu <georgescu@google.com> |
Merge "Correctly scale images in MTP importer" into gb-ub-photos-bryce
|
0b23dca1817e48e7e72804a7eaef23c283e79a55 |
10-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 07261700: am 97c6f7c9: am 3bc8cc41: am b6b2d1c4: Merge "Adding simple crop ui. Refactoring." into gb-ub-photos-bryce * commit '07261700719f9af8eda00f9be23bf3d53dc597fd': Adding simple crop ui. Refactoring.
|
e5a0bebbaa9b1e0a44e713027364c86aa6048a9e |
10-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 97c6f7c9: am 3bc8cc41: am b6b2d1c4: Merge "Adding simple crop ui. Refactoring." into gb-ub-photos-bryce * commit '97c6f7c92e78cc61e53de60f353ff4b48b2fe454': Adding simple crop ui. Refactoring.
|
56fe3f0199c59bb4a4052d883b009ffe32ecbba3 |
10-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 3bc8cc41: am b6b2d1c4: Merge "Adding simple crop ui. Refactoring." into gb-ub-photos-bryce * commit '3bc8cc417e7b874b7b3f401cc33f073756762ebf': Adding simple crop ui. Refactoring.
|
b8dfc4a49d1548a6666e83e3a3cea3259cfee4b9 |
10-Apr-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ib687e618b0e915d269175ec18af6b6f016af4022 Auto-generated-cl: translation import
es/values-de/filtershow_strings.xml
|
b7679d74bd7f5c57c2422076fb0edee02248dc9b |
10-Apr-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I887a07d700cdfc672db20cc1775e9d65b4ca0bda Auto-generated-cl: translation import
es/values-de/filtershow_strings.xml
|
6653590c9831b427c17c8efddbf695bacb002e3f |
10-Apr-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I6e2a262f7c5c46a89c3298d86969347338be77ce Auto-generated-cl: translation import
es/values-de/filtershow_strings.xml
|
113eb0a20479cb1c1d2c09d4140f764ede9e6906 |
10-Apr-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I0bf928fbe2856bb3519c3586fb91422ee87da533 Auto-generated-cl: translation import
es/values-de/filtershow_strings.xml
|
6bbc6c627eba0685c62328d58b856467ef47e0ae |
10-Apr-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I0bf928fbe2856bb3519c3586fb91422ee87da533 Auto-generated-cl: translation import
es/values-de/filtershow_strings.xml
|
56e73bfe41a18cb4bb97c59949592f6263d5ff54 |
10-Apr-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I5b5670a94af6745f04cb0eba67ca7cd18ae6e4d6 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
139177fe199abbdc03d33268a3b53588dae046f2 |
10-Apr-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I3bc2cd867e0271fe202d8561d9f667a110a82c5f Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
d37ba43d483027e744bcd30cee024f6af102698b |
10-Apr-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I9789a0f1295136ca95b2d7b19d7fa6f0dc13e192 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
95b2ad301a4ed434a55eccdb156af50403b4fe09 |
10-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am b6b2d1c4: Merge "Adding simple crop ui. Refactoring." into gb-ub-photos-bryce * commit 'b6b2d1c45f889ca0388b11bb49ae0ce1a1694e90': Adding simple crop ui. Refactoring.
|
a355bed9e654109d63aa38a5faa315c3dc5a7cf2 |
10-Apr-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I7d953d7ca29bd4ffd4ba96270845448fb6c3d194 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
604a6e7477fdd8333c6631f1e0b04fe9aa1306d6 |
10-Apr-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I7d953d7ca29bd4ffd4ba96270845448fb6c3d194 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
f7ed2bba1b549c4cced8b5b762aa12b5d52012ea |
10-Apr-2013 |
Bobby Georgescu <georgescu@google.com> |
Correctly scale images in MTP importer Bug: 8293048 Change-Id: Ib46a6ce13aeea6a59706790b69be29215be7ebc4
rc/com/android/gallery3d/ingest/ui/MtpImageView.java
|
ca2b8a59482158870980e64dfce4ddef73d5ef84 |
10-Apr-2013 |
Bobby Georgescu <georgescu@google.com> |
Correctly scale images in MTP importer Bug: 8293048 Change-Id: Ib46a6ce13aeea6a59706790b69be29215be7ebc4
es/layout/ingest_fullsize.xml
|
573dfae59a96663b6ff6e47b4c7db326c651a3cf |
10-Apr-2013 |
Bobby Georgescu <georgescu@google.com> |
Correctly scale images in MTP importer Bug: 8293048 Change-Id: Ib46a6ce13aeea6a59706790b69be29215be7ebc4
es/layout/ingest_fullsize.xml
rc/com/android/gallery3d/ingest/ui/MtpImageView.java
|
b6b2d1c45f889ca0388b11bb49ae0ce1a1694e90 |
10-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Adding simple crop ui. Refactoring." into gb-ub-photos-bryce
|
97963eb474d44d7c0e059f5c0d1f0564c79d4f06 |
10-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Adding simple crop ui. Refactoring." into gb-ub-photos-bryce
|
e51dc93b42879b879ef2a1438f5265f8236d39d9 |
10-Apr-2013 |
ztenghui <ztenghui@google.com> |
am 1566314e: am 260c37c7: am a1a67123: am 3eb2fb4d: Merge "Use MediaMuxer for the video trim and mute." into gb-ub-photos-bryce * commit '1566314e711c6a51c85e4644fe804f3d8be94048': Use MediaMuxer for the video trim and mute.
|
443808f1a1e1bd8f125c3998f42b3881dcd3bc45 |
10-Apr-2013 |
ztenghui <ztenghui@google.com> |
am 260c37c7: am a1a67123: am 3eb2fb4d: Merge "Use MediaMuxer for the video trim and mute." into gb-ub-photos-bryce * commit '260c37c7e3eb3168981d446c066f549cf69d0d18': Use MediaMuxer for the video trim and mute.
|
fc6ce94cc99188c8d056ff13ac03b21be9d6d814 |
10-Apr-2013 |
ztenghui <ztenghui@google.com> |
am a1a67123: am 3eb2fb4d: Merge "Use MediaMuxer for the video trim and mute." into gb-ub-photos-bryce * commit 'a1a67123245321d970058d668ca50bb218bddb19': Use MediaMuxer for the video trim and mute.
|
94abba848d3a5070746f76fb6ad09e1177c0330b |
10-Apr-2013 |
ztenghui <ztenghui@google.com> |
am 3eb2fb4d: Merge "Use MediaMuxer for the video trim and mute." into gb-ub-photos-bryce * commit '3eb2fb4dd2ede7f65ee307061213f0e8860f15f6': Use MediaMuxer for the video trim and mute.
|
6734a36f96dd5b4fd158321a4b59de3b2a79554b |
10-Apr-2013 |
ztenghui <ztenghui@google.com> |
Merge "Use MediaMuxer for the video trim and mute." into gb-ub-photos-bryce
|
3eb2fb4dd2ede7f65ee307061213f0e8860f15f6 |
10-Apr-2013 |
ztenghui <ztenghui@google.com> |
Merge "Use MediaMuxer for the video trim and mute." into gb-ub-photos-bryce
|
94bd4b0e6bd1b41f16ea37cc94c80e064f1de14a |
10-Apr-2013 |
ztenghui <ztenghui@google.com> |
Merge "Use MediaMuxer for the video trim and mute." into gb-ub-photos-bryce
|
ac765f6db6e450c4e8e38bea9439e080d9151485 |
08-Apr-2013 |
ztenghui <ztenghui@google.com> |
Use MediaMuxer for the video trim and mute. bug:8548085 Change-Id: I55955285ee141ebab6437950a154280cc5fefcc0
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
|
8b9de91b3c01664b24deda202acb5db8594db503 |
08-Apr-2013 |
ztenghui <ztenghui@google.com> |
Use MediaMuxer for the video trim and mute. bug:8548085 Change-Id: I55955285ee141ebab6437950a154280cc5fefcc0
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
rc/com/android/gallery3d/app/TrimVideo.java
rc/com/android/gallery3d/app/VideoUtils.java
|
dca875bd0bc713c809e319ddb0adc3bab2d080a6 |
08-Apr-2013 |
ztenghui <ztenghui@google.com> |
Use MediaMuxer for the video trim and mute. bug:8548085 Change-Id: I55955285ee141ebab6437950a154280cc5fefcc0
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
rc/com/android/gallery3d/app/TrimVideo.java
rc/com/android/gallery3d/app/VideoUtils.java
|
0b6d1f0571efcddcc172709129388f10733cef8d |
10-Apr-2013 |
Angus Kong <shkong@google.com> |
am b985f82f: am 8d12b88d: am 0c22972b: am 2fc6641b: Merge "Refactor CameraDataAdapter for other data types." into gb-ub-photos-bryce * commit 'b985f82fdb2fe7472d02c7f6f7134feaf52bf6e8': Refactor CameraDataAdapter for other data types.
|
492e5b00ec29d9fc091876280176f37d5ccceef9 |
10-Apr-2013 |
Angus Kong <shkong@google.com> |
am 8d12b88d: am 0c22972b: am 2fc6641b: Merge "Refactor CameraDataAdapter for other data types." into gb-ub-photos-bryce * commit '8d12b88d7c1df5798e247039ec9e1d9b0895047f': Refactor CameraDataAdapter for other data types.
|
70714bc8ea70b31b8f5d9655d4904d4c2b0acd6a |
10-Apr-2013 |
Angus Kong <shkong@google.com> |
am 0c22972b: am 2fc6641b: Merge "Refactor CameraDataAdapter for other data types." into gb-ub-photos-bryce * commit '0c22972b061dd2f458eb1185702c2b4ac8d13d1a': Refactor CameraDataAdapter for other data types.
|
d3c2a02ac3749ce3aabd420112d5165f6eb9354b |
10-Apr-2013 |
Angus Kong <shkong@google.com> |
am 2fc6641b: Merge "Refactor CameraDataAdapter for other data types." into gb-ub-photos-bryce * commit '2fc6641b80a7aedf54062cbd01c40cbf0764a6ca': Refactor CameraDataAdapter for other data types.
|
2fc6641b80a7aedf54062cbd01c40cbf0764a6ca |
10-Apr-2013 |
Angus Kong <shkong@google.com> |
Merge "Refactor CameraDataAdapter for other data types." into gb-ub-photos-bryce
|
3aebab17d67d7acbf8da17d69a0e51f9cd428c35 |
10-Apr-2013 |
Angus Kong <shkong@google.com> |
Merge "Refactor CameraDataAdapter for other data types." into gb-ub-photos-bryce
|
20d9c109bd30da403a85cbb12364c8b1214c3358 |
10-Apr-2013 |
The Android Open Source Project <initial-contribution@android.com> |
am 23f4673d: (-s ours) am 711d2c79: Reconcile with jb-mr2-release - do not merge * commit '23f4673d3de46215cf748a20a8b28adf83003a35':
|
b19e7704e8644a803b0de568a3d2cd513e188e40 |
10-Apr-2013 |
The Android Open Source Project <initial-contribution@android.com> |
am 711d2c79: Reconcile with jb-mr2-release - do not merge * commit '711d2c797505288085016d0e4e6f3236e02f1263':
|
8733593a1814da96b9fe28970e29cbfbbf84c916 |
10-Apr-2013 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with jb-mr2-release - do not merge Change-Id: I1ffbbe79376c9e0f93dea90e11dfb86b07715328
|
57fcadd0cbe8f1fe15c4b06eeeee558471edd6d6 |
10-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
am 1dd60491: am 53699202: am 8656a57c: am 3bc806a8: Small cleanup in setting resources * commit '1dd604913e2e37716be86966d66c4a22a8cb1436': Small cleanup in setting resources
|
535eb215f1ed6c4de85eee4b2c8f31e33e9d9ad4 |
10-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
am 53699202: am 8656a57c: am 3bc806a8: Small cleanup in setting resources * commit '53699202c00e7e6090d324b655c30ea2b8b58f74': Small cleanup in setting resources
|
541a393fd7e238f74003321efbaeaaf8e8953ecf |
10-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
am 8656a57c: am 3bc806a8: Small cleanup in setting resources * commit '8656a57c6cbbae23cc4fa5ede0b3e816864dc12f': Small cleanup in setting resources
|
f2573dd11bbec234545a0d1ae02204ab8d2f450c |
10-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
am 3bc806a8: Small cleanup in setting resources * commit '3bc806a8575072c9459fe3698675d3713300d1d3': Small cleanup in setting resources
|
3bc806a8575072c9459fe3698675d3713300d1d3 |
10-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
Small cleanup in setting resources Change-Id: Icd275aaddcee59a578f916c57903012ce35469ad
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/cache/FilteringPipeline.java
rc/com/android/gallery3d/filtershow/filters/BaseFiltersManager.java
rc_pd/com/android/gallery3d/filtershow/filters/FiltersManager.java
|
326cc9a7939046476d8fa44c9f31c6e0c388a233 |
10-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
Small cleanup in setting resources Change-Id: Icd275aaddcee59a578f916c57903012ce35469ad
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/cache/FilteringPipeline.java
rc/com/android/gallery3d/filtershow/filters/BaseFiltersManager.java
rc_pd/com/android/gallery3d/filtershow/filters/FiltersManager.java
|
cde095ea478cdb80b4f8be0cc81c74edbf0c0cdb |
10-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
am c1633888: am 18063b26: am 990e5979: am e29b5733: Add a third pipeline reserved for the high res preview * commit 'c1633888a1ee04bc2feef85e10a2c67ea8add0ef': Add a third pipeline reserved for the high res preview
|
44cd101c5c1b8ee16e28daac008dc7faa7c167e0 |
10-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
am 18063b26: am 990e5979: am e29b5733: Add a third pipeline reserved for the high res preview * commit '18063b265a1a3a8cbe876bbd90e309a575b22be6': Add a third pipeline reserved for the high res preview
|
2bbdab25088670f5817e1e597fdf2685b8d3ba16 |
10-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
am 990e5979: am e29b5733: Add a third pipeline reserved for the high res preview * commit '990e59793b569db2552cced4aae55194814a3001': Add a third pipeline reserved for the high res preview
|
015b14ef0230ddcea29347dd6a9f964ce6e17c30 |
10-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
am e29b5733: Add a third pipeline reserved for the high res preview * commit 'e29b57330be471dd74672a7bdc74a93dcae3a98b': Add a third pipeline reserved for the high res preview
|
7464d76829d18cd426c8d7668df4b3f84e4447e4 |
10-Apr-2013 |
The Android Automerger <android-build@android.com> |
merge in jb-mr2-release history after reset to jb-mr2-dev
|
4c538286a5fd604c8ac22c480def31b2e56e6c25 |
10-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Adding simple crop ui. Refactoring. Change-Id: I904ce776ca31cf2f782b0aa8e6456ab54b15e540
rc/com/android/gallery3d/filtershow/crop/CropDrawingUtils.java
rc/com/android/gallery3d/filtershow/crop/CropLoader.java
rc/com/android/gallery3d/filtershow/crop/CropView.java
|
b70dbfcdc6fc52bbff98e1f5fae765bbc500273a |
10-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Adding simple crop ui. Refactoring. Change-Id: I904ce776ca31cf2f782b0aa8e6456ab54b15e540
rc/com/android/gallery3d/filtershow/crop/CropDrawingUtils.java
rc/com/android/gallery3d/filtershow/crop/CropLoader.java
rc/com/android/gallery3d/filtershow/crop/CropView.java
|
30ddbfb5277d3f538b12209877fffaffc9b66835 |
10-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
Add a third pipeline reserved for the high res preview Change-Id: I1f35f0a7195157e5fe742d7d7c5506b3f84ece1b
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/cache/FilteringPipeline.java
rc_pd/com/android/gallery3d/filtershow/filters/FiltersManager.java
|
e29b57330be471dd74672a7bdc74a93dcae3a98b |
10-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
Add a third pipeline reserved for the high res preview Change-Id: I1f35f0a7195157e5fe742d7d7c5506b3f84ece1b
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/cache/FilteringPipeline.java
rc_pd/com/android/gallery3d/filtershow/filters/FiltersManager.java
|
5913a96a58c305b3fa8f381425f5d8fe7f58828c |
10-Apr-2013 |
John Hoford <hoford@google.com> |
am badc4b4b: am a92202f1: am 81dac121: am 701955ac: Merge "support icon styles" into gb-ub-photos-bryce * commit 'badc4b4b438d41b5104b324d26371475dfbcb218': support icon styles
|
5e5157a8e9166c1d09601935424b9d7ad08e031b |
10-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
am 962f8c30: am 8c624c31: am e8cf8a59: am 7668544e: Detach old editor * commit '962f8c30da06d6f4485b23428880908e311d97e6': Detach old editor
|
e9e45998a45bb3ef6982323275a0affcb2422b2e |
10-Apr-2013 |
John Hoford <hoford@google.com> |
am a92202f1: am 81dac121: am 701955ac: Merge "support icon styles" into gb-ub-photos-bryce * commit 'a92202f1d7992fe3848afbdce2dd814aa9e59acc': support icon styles
|
8c3d7ed0483504e3afc8475e4678cc3ea08d2ad5 |
10-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
am 8c624c31: am e8cf8a59: am 7668544e: Detach old editor * commit '8c624c3168395f6541dc873eb387f694784b0f91': Detach old editor
|
ff0665ce8d147e959bfefc0bd5ac515e965e8b05 |
09-Apr-2013 |
Angus Kong <shkong@google.com> |
Refactor CameraDataAdapter for other data types. Change-Id: I4d925a4f2a9c2d6d14beda8781a1d4ca5cf3c1f4
rc/com/android/camera/data/CameraDataAdapter.java
rc/com/android/camera/ui/FilmStripView.java
|
107009fa3120563f9bdcdcce9c1ba92e58761b7a |
09-Apr-2013 |
Angus Kong <shkong@google.com> |
Refactor CameraDataAdapter for other data types. Change-Id: I4d925a4f2a9c2d6d14beda8781a1d4ca5cf3c1f4
rc/com/android/camera/data/CameraDataAdapter.java
rc/com/android/camera/ui/FilmStripView.java
|
5829de899c23417a540c26e38aa85446b223a648 |
10-Apr-2013 |
John Hoford <hoford@google.com> |
am 81dac121: am 701955ac: Merge "support icon styles" into gb-ub-photos-bryce * commit '81dac121ec44462ef68dc1b41de75c3f630997db': support icon styles
|
99ae3cc0d7f02807c8ff488cb736903aed95d366 |
10-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
am e8cf8a59: am 7668544e: Detach old editor * commit 'e8cf8a5931d8933963c64f2d09b2118d8f80f7be': Detach old editor
|
3dd5d7bbd55ba5df77ae71a5531f86d6873bfd06 |
10-Apr-2013 |
John Hoford <hoford@google.com> |
am 701955ac: Merge "support icon styles" into gb-ub-photos-bryce * commit '701955ac93bb05bff2a826c79ea60f921b3745fc': support icon styles
|
9a750b5b4d3735145ee87d0cf1a094cc8d7acae8 |
10-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
am 7668544e: Detach old editor * commit '7668544ee3e8ba3b14d127b9ecd1cf4a3b2f3e11': Detach old editor
|
6ff650fd8ef417e5bdd181ebad0cbfa15fdb25c6 |
10-Apr-2013 |
John Hoford <hoford@google.com> |
Merge "support icon styles" into gb-ub-photos-bryce
|
701955ac93bb05bff2a826c79ea60f921b3745fc |
10-Apr-2013 |
John Hoford <hoford@google.com> |
Merge "support icon styles" into gb-ub-photos-bryce
|
0f095dbd21725f646fce60f14bd954e5aceead24 |
10-Apr-2013 |
John Hoford <hoford@google.com> |
Merge "support icon styles" into gb-ub-photos-bryce
|
7668544ee3e8ba3b14d127b9ecd1cf4a3b2f3e11 |
10-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
Detach old editor Change-Id: I1b0a30aa334a83011d9f03ea629e1b0f36ea21d2
rc/com/android/gallery3d/filtershow/PanelController.java
rc/com/android/gallery3d/filtershow/editors/Editor.java
|
c79fcc2ee8741705fc00849c66d06561f2219fc7 |
10-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
Detach old editor Change-Id: I1b0a30aa334a83011d9f03ea629e1b0f36ea21d2
rc/com/android/gallery3d/filtershow/PanelController.java
rc/com/android/gallery3d/filtershow/editors/Editor.java
|
495618d3f372c4e7ee8d0c065ad3e02b780b6d1d |
10-Apr-2013 |
John Hoford <hoford@google.com> |
support icon styles Change-Id: I9a4af2826824fd519099363b3190fc417b67c022
rc/com/android/gallery3d/filtershow/filters/FilterRepresentation.java
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
|
4ee3cfd8a59f5daaf271b67c2f634d72290d45d0 |
10-Apr-2013 |
John Hoford <hoford@google.com> |
support icon styles Change-Id: I9a4af2826824fd519099363b3190fc417b67c022
rc/com/android/gallery3d/filtershow/cache/CachingPipeline.java
rc/com/android/gallery3d/filtershow/cache/RenderingRequest.java
rc/com/android/gallery3d/filtershow/controller/StyleChooser.java
rc/com/android/gallery3d/filtershow/filters/FilterRepresentation.java
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
|
49a6d76f505148e1b3a4842bd358cc155c051c74 |
10-Apr-2013 |
John Hoford <hoford@google.com> |
support icon styles Change-Id: I9a4af2826824fd519099363b3190fc417b67c022
rc/com/android/gallery3d/filtershow/cache/CachingPipeline.java
rc/com/android/gallery3d/filtershow/cache/RenderingRequest.java
rc/com/android/gallery3d/filtershow/controller/StyleChooser.java
rc/com/android/gallery3d/filtershow/filters/FilterRepresentation.java
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
|
acc8b37dd7cece04ed51f4f6d06bbefbee2457a8 |
10-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
am 890d6da9: am ce8a4493: am 3c11e0a2: am 8eb8dd6b: Merge "Implements swipe in editor menu" into gb-ub-photos-bryce * commit '890d6da919fd7229efc68fc2b59dacbae5d28605': Implements swipe in editor menu
|
9a516abd4bb9e02c082bfc6b4734fd5253f3e299 |
10-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
am ce8a4493: am 3c11e0a2: am 8eb8dd6b: Merge "Implements swipe in editor menu" into gb-ub-photos-bryce * commit 'ce8a449351140ef0fe5a86f13c47faa741cb5859': Implements swipe in editor menu
|
9ddfd444806a21a2ce8749c4f541dfbb76488e77 |
10-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
am 3c11e0a2: am 8eb8dd6b: Merge "Implements swipe in editor menu" into gb-ub-photos-bryce * commit '3c11e0a234925657a4c9b59bdda10342e4412c55': Implements swipe in editor menu
|
e6e938b20a7a6ebafa3a0e8164428cfaba86a513 |
10-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
am 8eb8dd6b: Merge "Implements swipe in editor menu" into gb-ub-photos-bryce * commit '8eb8dd6ba1957d7e8e75e6fab9f5654ad55d2fe4': Implements swipe in editor menu
|
77c6b786faf522a1cb5b214e9070553e3a690ca6 |
10-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
Merge "Implements swipe in editor menu" into gb-ub-photos-bryce
|
8eb8dd6ba1957d7e8e75e6fab9f5654ad55d2fe4 |
10-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
Merge "Implements swipe in editor menu" into gb-ub-photos-bryce
|
d6448052595a2bef9a69a93a01ef74e331288484 |
10-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
Merge "Implements swipe in editor menu" into gb-ub-photos-bryce
|
d86c31d3864393efdf5e00ac70031642ed6fa321 |
10-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 841d8ff6: am bebf7a65: am 80e32c08: am 4c644f36: Fix to imports in NewPhotoModule. * commit '841d8ff6ecdd0b70f6aa641911ee2962b25b5c45': Fix to imports in NewPhotoModule.
|
3729f19d41a3ea33a2494f864e154a4871a10c89 |
10-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am bebf7a65: am 80e32c08: am 4c644f36: Fix to imports in NewPhotoModule. * commit 'bebf7a65a049df339ad63018803f64a7650bbefb': Fix to imports in NewPhotoModule.
|
15195584abc96979f1ee6923cdf6c38e9b295be2 |
10-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 80e32c08: am 4c644f36: Fix to imports in NewPhotoModule. * commit '80e32c082f971c88627692b3faa4656390439f66': Fix to imports in NewPhotoModule.
|
4a6b2c586d9bc246206b3efc4ea58acd2990e780 |
10-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 4c644f36: Fix to imports in NewPhotoModule. * commit '4c644f3687d88ea13ff82c3f79b36585ea2c387b': Fix to imports in NewPhotoModule.
|
36f5bca248fb1ecf98238e892febfc8cc44c7be1 |
10-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 8dae8a3b: am 47ff8168: am 1b34000f: am dcd1dd98: Merge "Moving crop to a separate activity. Refactoring." into gb-ub-photos-bryce * commit '8dae8a3b8aaf3f069ac29aedbf1d2e02da01ef4d': Moving crop to a separate activity. Refactoring.
|
068d13a53544ceac02fd7887f63b55be4ab9a4aa |
10-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 47ff8168: am 1b34000f: am dcd1dd98: Merge "Moving crop to a separate activity. Refactoring." into gb-ub-photos-bryce * commit '47ff8168aba192176aef4574cfe2d7bf2a338620': Moving crop to a separate activity. Refactoring.
|
4c644f3687d88ea13ff82c3f79b36585ea2c387b |
10-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Fix to imports in NewPhotoModule. Change-Id: Ifdb6d09e458bae7bba8bba253b0a2e8202f318ef
rc/com/android/camera/NewPhotoModule.java
|
81b3e97257261df7252e1b481ec97aa82987d423 |
10-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Fix to imports in NewPhotoModule. Change-Id: Ifdb6d09e458bae7bba8bba253b0a2e8202f318ef
rc/com/android/camera/NewPhotoModule.java
|
172cc02e9711b988578674ae076938fff104d1a5 |
10-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 1b34000f: am dcd1dd98: Merge "Moving crop to a separate activity. Refactoring." into gb-ub-photos-bryce * commit '1b34000f478e616a9681623385255418ed562ae6': Moving crop to a separate activity. Refactoring.
|
3d517b00e5922fdabeab4bb172b8846ace95daff |
10-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am dcd1dd98: Merge "Moving crop to a separate activity. Refactoring." into gb-ub-photos-bryce * commit 'dcd1dd986bc8455ce822e8d9e7a46ea103228351': Moving crop to a separate activity. Refactoring.
|
e581721729f9a592562d499e95ab84229c934b76 |
10-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Moving crop to a separate activity. Refactoring." into gb-ub-photos-bryce
|
72eb8276bc1bea0deb63146ada1f6801eb8e410c |
10-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Moving crop to a separate activity. Refactoring." into gb-ub-photos-bryce
|
dcd1dd986bc8455ce822e8d9e7a46ea103228351 |
10-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Moving crop to a separate activity. Refactoring." into gb-ub-photos-bryce
|
8b7ac108eed98fbee43a21d5fd9ce41b9deda5ca |
10-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Moving crop to a separate activity. Refactoring." into gb-ub-photos-bryce
|
871ed9a6a857e013a7d3c3b07f6a1d69e998ea9b |
05-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Moving crop to a separate activity. Refactoring. Bug: 8526929 Change-Id: I8acf6d46de069dd84c31afea6b4a7ae8e1c2fcce
ndroidManifest.xml
|
4176a268e7a06e98fc41d12d5e806cd7af1f3132 |
05-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Moving crop to a separate activity. Refactoring. Bug: 8526929 Change-Id: I8acf6d46de069dd84c31afea6b4a7ae8e1c2fcce
es/layout/crop_activity.xml
|
6fe165b7d28299d5b2f97deb135b233d84eb300f |
05-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Moving crop to a separate activity. Refactoring. Bug: 8526929 Change-Id: I8acf6d46de069dd84c31afea6b4a7ae8e1c2fcce
ndroidManifest.xml
es/layout/crop_activity.xml
rc/com/android/camera/PhotoModule.java
rc/com/android/gallery3d/app/AlbumPage.java
rc/com/android/gallery3d/app/Wallpaper.java
rc/com/android/gallery3d/filtershow/CropExtras.java
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/crop/BoundedRect.java
rc/com/android/gallery3d/filtershow/crop/CropActivity.java
rc/com/android/gallery3d/filtershow/crop/CropExtras.java
rc/com/android/gallery3d/filtershow/crop/CropLoader.java
rc/com/android/gallery3d/filtershow/crop/CropMath.java
rc/com/android/gallery3d/filtershow/crop/CropObject.java
rc/com/android/gallery3d/filtershow/crop/CropView.java
rc/com/android/gallery3d/filtershow/editors/EditorCrop.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterGeometry.java
rc/com/android/gallery3d/filtershow/imageshow/BoundedRect.java
rc/com/android/gallery3d/filtershow/imageshow/CropMath.java
rc/com/android/gallery3d/filtershow/imageshow/GeometryMetadata.java
rc/com/android/gallery3d/filtershow/imageshow/ImageCrop.java
rc/com/android/gallery3d/gadget/WidgetConfigure.java
|
1a664450bed2737660057def2d25b0c6b49b3ba8 |
05-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Moving crop to a separate activity. Refactoring. Bug: 8526929 Change-Id: I8acf6d46de069dd84c31afea6b4a7ae8e1c2fcce
rc/com/android/camera/PhotoModule.java
rc/com/android/gallery3d/app/AlbumPage.java
rc/com/android/gallery3d/app/Wallpaper.java
rc/com/android/gallery3d/filtershow/CropExtras.java
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/crop/BoundedRect.java
rc/com/android/gallery3d/filtershow/crop/CropActivity.java
rc/com/android/gallery3d/filtershow/crop/CropExtras.java
rc/com/android/gallery3d/filtershow/crop/CropLoader.java
rc/com/android/gallery3d/filtershow/crop/CropMath.java
rc/com/android/gallery3d/filtershow/crop/CropObject.java
rc/com/android/gallery3d/filtershow/crop/CropView.java
rc/com/android/gallery3d/filtershow/editors/EditorCrop.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterGeometry.java
rc/com/android/gallery3d/filtershow/imageshow/BoundedRect.java
rc/com/android/gallery3d/filtershow/imageshow/CropMath.java
rc/com/android/gallery3d/filtershow/imageshow/GeometryMetadata.java
rc/com/android/gallery3d/filtershow/imageshow/ImageCrop.java
rc/com/android/gallery3d/gadget/WidgetConfigure.java
|
6749b0b416d043b8cb327f8ae8864874e1e868d1 |
10-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
Implements swipe in editor menu Change-Id: I5871da89d2e911d5b6663cdee8dc660ab0777393
es/layout/filtershow_editor_panel.xml
|
2ff0e04ddcf770a782f94ddee936a1c205e1f322 |
10-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
Implements swipe in editor menu Change-Id: I5871da89d2e911d5b6663cdee8dc660ab0777393
es/layout/filtershow_editor_panel.xml
rc/com/android/gallery3d/filtershow/editors/Editor.java
rc/com/android/gallery3d/filtershow/editors/SwapButton.java
|
850d5b25cbec18006f39c93e425515b57be0f026 |
10-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
Implements swipe in editor menu Change-Id: I5871da89d2e911d5b6663cdee8dc660ab0777393
rc/com/android/gallery3d/filtershow/editors/Editor.java
rc/com/android/gallery3d/filtershow/editors/SwapButton.java
|
7e299a30c21e532f65e90cf66ca497d2cc4914ae |
10-Apr-2013 |
Angus Kong <shkong@google.com> |
am 14458a72: am 2a7fc983: am 1d18d4f2: am 355eaea0: Merge "Add more gestures and animations in FilmStripView." into gb-ub-photos-bryce * commit '14458a7281290151c091dce6dedf0596a0b42af7': Add more gestures and animations in FilmStripView.
|
40c54461abffebba26597aa75a5e2285522ffb88 |
09-Apr-2013 |
Angus Kong <shkong@google.com> |
am 2a7fc983: am 1d18d4f2: am 355eaea0: Merge "Add more gestures and animations in FilmStripView." into gb-ub-photos-bryce * commit '2a7fc983723164cad37189f9801321c02d6d959f': Add more gestures and animations in FilmStripView.
|
bac641c920276b1f861015ee7612096acaee4279 |
09-Apr-2013 |
Angus Kong <shkong@google.com> |
am 1d18d4f2: am 355eaea0: Merge "Add more gestures and animations in FilmStripView." into gb-ub-photos-bryce * commit '1d18d4f2552df090c3da69aba29faba00f813d6c': Add more gestures and animations in FilmStripView.
|
4f8d9601d5bd90554dcb0c3d82cb4890f98392d9 |
09-Apr-2013 |
Angus Kong <shkong@google.com> |
am 355eaea0: Merge "Add more gestures and animations in FilmStripView." into gb-ub-photos-bryce * commit '355eaea088a348c394909fea6c9f812ff25e87ac': Add more gestures and animations in FilmStripView.
|
355eaea088a348c394909fea6c9f812ff25e87ac |
09-Apr-2013 |
Angus Kong <shkong@google.com> |
Merge "Add more gestures and animations in FilmStripView." into gb-ub-photos-bryce
|
d7bdf84448ecedf914b205e6270e81ad5027715b |
09-Apr-2013 |
Angus Kong <shkong@google.com> |
Merge "Add more gestures and animations in FilmStripView." into gb-ub-photos-bryce
|
768f038e1596f5dad4dea350bb5b014258d9c9ff |
09-Apr-2013 |
Angus Kong <shkong@google.com> |
am a026b065: am 01359f63: am 6b775d62: am 7811d8de: Merge "Refresh parameters during recording." into gb-ub-photos-bryce * commit 'a026b06598adfe440ed30d031f07d8d4bcf5164f': Refresh parameters during recording.
|
90c3d58ed3e105208448194b1c9b5fe507f39f06 |
09-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
am f6ee470d: am 0b209056: am 15d05dc7: am a4ff1776: Merge "Hide the category panel when editing" into gb-ub-photos-bryce * commit 'f6ee470d0fc324e8241682c23cb71214f209d18c': Hide the category panel when editing
|
118b8e12fee427d62de003719d6da44051d3d033 |
09-Apr-2013 |
John Hoford <hoford@google.com> |
am ba635f61: am 1d44a7ef: am 34d607c8: am ddcb0880: Merge "ui cleanup" into gb-ub-photos-bryce * commit 'ba635f617a405ac8e20c9e98c53019e03b86d18d': ui cleanup
|
e78a63980239c672aa581f879ffb0d9568fe5b1d |
09-Apr-2013 |
Bobby Georgescu <georgescu@google.com> |
am 65d94c03: am 8e9faa89: am 16eafe60: am f79a935f: Remove unneeded READ_SMS permission * commit '65d94c036347ea9aba03674680179e1f09c41d0c': Remove unneeded READ_SMS permission
|
269591737bdd2dd5e6cfa7d0227edcc640227c5e |
09-Apr-2013 |
Doris Liu <tianliu@google.com> |
am e1725525: am 9a58b957: am a5d3f7e3: am fb063617: Work in progress - Put preview in TextureView * commit 'e1725525ca3820419fae426e8c0dfe1e76f20527': Work in progress - Put preview in TextureView
|
91c169cedf19d9b7a835250e4744a36df8c87ce0 |
09-Apr-2013 |
Angus Kong <shkong@google.com> |
am 01359f63: am 6b775d62: am 7811d8de: Merge "Refresh parameters during recording." into gb-ub-photos-bryce * commit '01359f63499f2821fc579e484d594d134ce9f6e8': Refresh parameters during recording.
|
11133f38caabe1012a3dfba5a9cb17c4dd1d03a9 |
09-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
am 0b209056: am 15d05dc7: am a4ff1776: Merge "Hide the category panel when editing" into gb-ub-photos-bryce * commit '0b20905636ee79518d61da314ef95cd3d1c2dd63': Hide the category panel when editing
|
27633aa5f3ad2918da1d643b99c8bb98ea4fb42a |
09-Apr-2013 |
John Hoford <hoford@google.com> |
am 1d44a7ef: am 34d607c8: am ddcb0880: Merge "ui cleanup" into gb-ub-photos-bryce * commit '1d44a7efa6f6a683bbf5511413b2ea5cd12ddae4': ui cleanup
|
b9c15b10418452e0acea021381947c59cab39deb |
09-Apr-2013 |
Bobby Georgescu <georgescu@google.com> |
am 8e9faa89: am 16eafe60: am f79a935f: Remove unneeded READ_SMS permission * commit '8e9faa89c8bf9e4875b9015293f5a5d534602475': Remove unneeded READ_SMS permission
|
fdefb5f3774c0b5a3df12857c7a266a0daac4b4c |
09-Apr-2013 |
Doris Liu <tianliu@google.com> |
am 9a58b957: am a5d3f7e3: am fb063617: Work in progress - Put preview in TextureView * commit '9a58b957489b76800145b77c8c59290ef6a12cc2': Work in progress - Put preview in TextureView
|
f17bb59f5069b179cb4486f59ac43a253b5489a0 |
09-Apr-2013 |
Angus Kong <shkong@google.com> |
am 6b775d62: am 7811d8de: Merge "Refresh parameters during recording." into gb-ub-photos-bryce * commit '6b775d626cffc2b863da881e800238816caae818': Refresh parameters during recording.
|
801f28b6fea5416cdbbb1907a39d0f946ed6f158 |
09-Apr-2013 |
Angus Kong <shkong@google.com> |
am 7811d8de: Merge "Refresh parameters during recording." into gb-ub-photos-bryce * commit '7811d8def7fe1b9d6111566b55a18f6b137f487a': Refresh parameters during recording.
|
7811d8def7fe1b9d6111566b55a18f6b137f487a |
09-Apr-2013 |
Angus Kong <shkong@google.com> |
Merge "Refresh parameters during recording." into gb-ub-photos-bryce
|
c37653459da7e36644d9b5070ae6377cdcd1b98e |
09-Apr-2013 |
Angus Kong <shkong@google.com> |
Merge "Refresh parameters during recording." into gb-ub-photos-bryce
|
a7e85b7ce7c87ad9d233bb941e568dcc5b8cf5e7 |
04-Apr-2013 |
Angus Kong <shkong@google.com> |
Refresh parameters during recording. bug:8504803 Change-Id: I1a1838a8415ed4eccad8c76c37cd61d667d92d66
rc/com/android/camera/CameraManager.java
rc/com/android/camera/NewVideoModule.java
rc/com/android/camera/VideoModule.java
|
104e0012f33dfac317a23511dd8b2e832da5af4d |
04-Apr-2013 |
Angus Kong <shkong@google.com> |
Refresh parameters during recording. bug:8504803 Change-Id: I1a1838a8415ed4eccad8c76c37cd61d667d92d66
rc/com/android/camera/CameraManager.java
rc/com/android/camera/NewVideoModule.java
rc/com/android/camera/VideoModule.java
|
8f973eb03d4f349eb9328842bde85b9d54172e14 |
09-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
am 15d05dc7: am a4ff1776: Merge "Hide the category panel when editing" into gb-ub-photos-bryce * commit '15d05dc79cdea1a43284883679093c8c5ac943a7': Hide the category panel when editing
|
394b58ac4312540c5110800db300f25c4fcc8725 |
09-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
am a4ff1776: Merge "Hide the category panel when editing" into gb-ub-photos-bryce * commit 'a4ff177637432e9f1e5eeb29b9c5dc6bb2949b2a': Hide the category panel when editing
|
a4ff177637432e9f1e5eeb29b9c5dc6bb2949b2a |
09-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
Merge "Hide the category panel when editing" into gb-ub-photos-bryce
|
7c45514d585e92abb069a06fe5867bc5f01127c2 |
09-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
Merge "Hide the category panel when editing" into gb-ub-photos-bryce
|
efe8b71220d03bdeb84ed095a4dd0c8434a35e3d |
09-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
Hide the category panel when editing Change-Id: I181ab1aa3ee27bf38a88999caf31eedc263cfe96
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/PanelController.java
|
9d042ad5d685e2316f5906072ace30c365aa26e9 |
09-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
Hide the category panel when editing Change-Id: I181ab1aa3ee27bf38a88999caf31eedc263cfe96
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/PanelController.java
|
ba3498bbda669b27e1112297066298c84634f4fa |
09-Apr-2013 |
John Hoford <hoford@google.com> |
am 34d607c8: am ddcb0880: Merge "ui cleanup" into gb-ub-photos-bryce * commit '34d607c88f26252325058eaa76dfead319bb6eb6': ui cleanup
|
c1427c350ac2582ae532b1f745d70d2ae9b6d28d |
09-Apr-2013 |
John Hoford <hoford@google.com> |
am ddcb0880: Merge "ui cleanup" into gb-ub-photos-bryce * commit 'ddcb0880c9748ce9a77f1472864977c767f46f0f': ui cleanup
|
ef8ae52196f05475f1d51859aa2c95f2746985aa |
09-Apr-2013 |
Bobby Georgescu <georgescu@google.com> |
am 16eafe60: am f79a935f: Remove unneeded READ_SMS permission * commit '16eafe6016a70ae9d6e31461321ec5c7b5933aa6': Remove unneeded READ_SMS permission
|
61f3913aa47f7c181c4c408b6728775d5b05b4c6 |
09-Apr-2013 |
Bobby Georgescu <georgescu@google.com> |
am f79a935f: Remove unneeded READ_SMS permission * commit 'f79a935f1ce85c55c8fba0b46dee362c653a8a78': Remove unneeded READ_SMS permission
|
ddcb0880c9748ce9a77f1472864977c767f46f0f |
09-Apr-2013 |
John Hoford <hoford@google.com> |
Merge "ui cleanup" into gb-ub-photos-bryce
|
5101490b4a54a26620856f1154c31a01ed6cd062 |
09-Apr-2013 |
John Hoford <hoford@google.com> |
Merge "ui cleanup" into gb-ub-photos-bryce
|
23ac64db523ea75c0ad7b55af2b59ec97dda79ef |
09-Apr-2013 |
John Hoford <hoford@google.com> |
Merge "ui cleanup" into gb-ub-photos-bryce
|
9e0d687320eb9302b4b96f615083c31edbdeb08b |
09-Apr-2013 |
John Hoford <hoford@google.com> |
ui cleanup Change-Id: Ifb08af6bfad2f049b66932360901b2e52ff07f01
es/layout/filtershow_activity.xml
es/layout/filtershow_control_action_slider.xml
es/layout/filtershow_control_style_chooser.xml
es/layout/filtershow_editor_panel.xml
rc/com/android/gallery3d/filtershow/controller/StyleChooser.java
|
b990071d1a9b8464c29333a9fac8ae41563f4621 |
09-Apr-2013 |
John Hoford <hoford@google.com> |
ui cleanup Change-Id: Ifb08af6bfad2f049b66932360901b2e52ff07f01
rc/com/android/gallery3d/filtershow/controller/StyleChooser.java
|
47d2012c7128a782bfc9aacce66cfd069a5a5af2 |
09-Apr-2013 |
John Hoford <hoford@google.com> |
ui cleanup Change-Id: Ifb08af6bfad2f049b66932360901b2e52ff07f01
es/layout/filtershow_activity.xml
es/layout/filtershow_control_action_slider.xml
es/layout/filtershow_control_style_chooser.xml
es/layout/filtershow_editor_panel.xml
|
89d478788204c118329bc8e36cf961f8749a1a1d |
08-Apr-2013 |
Bobby Georgescu <georgescu@google.com> |
Remove unneeded READ_SMS permission Bug: 8469283 Change-Id: I0d211705fe1fb86dc0ce85230e82d500f0202291
ndroidManifest.xml
|
f79a935f1ce85c55c8fba0b46dee362c653a8a78 |
08-Apr-2013 |
Bobby Georgescu <georgescu@google.com> |
Remove unneeded READ_SMS permission Bug: 8469283 Change-Id: I0d211705fe1fb86dc0ce85230e82d500f0202291
ndroidManifest.xml
|
25ec1603f6ca6d17dfaa281e4c9c4eafd6f98ce4 |
09-Apr-2013 |
Doris Liu <tianliu@google.com> |
am a5d3f7e3: am fb063617: Work in progress - Put preview in TextureView * commit 'a5d3f7e3c7b75a6c8315770e39c5b241a7693ec2': Work in progress - Put preview in TextureView
|
25eb232b2ee3815962d477f9fd71f54fe2838770 |
09-Apr-2013 |
Doris Liu <tianliu@google.com> |
am fb063617: Work in progress - Put preview in TextureView * commit 'fb0636179335a7786ec2c0edf9889a55596db126': Work in progress - Put preview in TextureView
|
753bb8aa56fff425fe16b93be368b9b236e4751f |
15-Mar-2013 |
Doris Liu <tianliu@google.com> |
Work in progress - Put preview in TextureView Fixed gesture recognizing and pie menu. Fixed camera picker. Exposure setting got fixed with rebasing. Rebased for new pie menu Fixed camera mode switch listener Ongoing: secure album, aspect ratio for video recording on ICS Change-Id: Iedae80815faf81cb49c791885810c8427034a6d1
rc/com/android/camera/NewCameraActivity.java
rc/com/android/camera/NewCameraModule.java
rc/com/android/camera/NewPhotoMenu.java
rc/com/android/camera/NewPhotoModule.java
rc/com/android/camera/NewPhotoUI.java
rc/com/android/camera/NewPreviewGestures.java
rc/com/android/camera/NewVideoMenu.java
rc/com/android/camera/NewVideoModule.java
rc/com/android/camera/NewVideoUI.java
rc/com/android/camera/PhotoMenu.java
rc/com/android/camera/PieController.java
rc/com/android/camera/VideoMenu.java
rc/com/android/camera/VideoUI.java
rc/com/android/camera/ui/CameraSwitcher.java
rc/com/android/camera/ui/FaceView.java
rc/com/android/camera/ui/NewCameraRootView.java
|
fffe840ee919a43c1a1fa8f11782068e93c8cd13 |
15-Mar-2013 |
Doris Liu <tianliu@google.com> |
Work in progress - Put preview in TextureView Fixed gesture recognizing and pie menu. Fixed camera picker. Exposure setting got fixed with rebasing. Rebased for new pie menu Fixed camera mode switch listener Ongoing: secure album, aspect ratio for video recording on ICS Change-Id: Iedae80815faf81cb49c791885810c8427034a6d1
es/layout/camera.xml
es/layout/new_photo_module.xml
es/layout/new_video_module.xml
rc/com/android/camera/NewPreviewGestures.java
|
fb0636179335a7786ec2c0edf9889a55596db126 |
15-Mar-2013 |
Doris Liu <tianliu@google.com> |
Work in progress - Put preview in TextureView Fixed gesture recognizing and pie menu. Fixed camera picker. Exposure setting got fixed with rebasing. Rebased for new pie menu Fixed camera mode switch listener Ongoing: secure album, aspect ratio for video recording on ICS Change-Id: Iedae80815faf81cb49c791885810c8427034a6d1
ndroidManifest.xml
es/layout/camera.xml
es/layout/new_photo_module.xml
es/layout/new_video_module.xml
rc/com/android/camera/NewCameraActivity.java
rc/com/android/camera/NewCameraModule.java
rc/com/android/camera/NewPhotoMenu.java
rc/com/android/camera/NewPhotoModule.java
rc/com/android/camera/NewPhotoUI.java
rc/com/android/camera/NewPreviewGestures.java
rc/com/android/camera/NewVideoMenu.java
rc/com/android/camera/NewVideoModule.java
rc/com/android/camera/NewVideoUI.java
rc/com/android/camera/PhotoMenu.java
rc/com/android/camera/PieController.java
rc/com/android/camera/VideoMenu.java
rc/com/android/camera/VideoUI.java
rc/com/android/camera/ui/CameraSwitcher.java
rc/com/android/camera/ui/FaceView.java
rc/com/android/camera/ui/NewCameraRootView.java
|
89f5589769629ba7d8ad7a496a371df95d9b63d3 |
15-Mar-2013 |
Doris Liu <tianliu@google.com> |
Work in progress - Put preview in TextureView Fixed gesture recognizing and pie menu. Fixed camera picker. Exposure setting got fixed with rebasing. Rebased for new pie menu Fixed camera mode switch listener Ongoing: secure album, aspect ratio for video recording on ICS Change-Id: Iedae80815faf81cb49c791885810c8427034a6d1
ndroidManifest.xml
|
6db750bb3e1956161aa17911ce171073d85f8729 |
09-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
am e1b1837f: am 001e2989: am 6177241b: am b1c75f60: Fix panel color background in landscape * commit 'e1b1837f765cb9dfe6d4d98eb06fa89044d0a69a': Fix panel color background in landscape
|
c0d1d89ab41f41b21675e9cc544ed7b604c7c6b0 |
09-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
am 001e2989: am 6177241b: am b1c75f60: Fix panel color background in landscape * commit '001e29896a085ebfbc84c1ca56862a1f0e693831': Fix panel color background in landscape
|
3f145868b82c29f6a609199adbdce0291018d87c |
09-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
am 6177241b: am b1c75f60: Fix panel color background in landscape * commit '6177241b8b2fc91c627abbf88dca95a7cd35ff81': Fix panel color background in landscape
|
99678e1cc64b7fd11cbd597ac4ec2428918dcfb0 |
09-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
am b1c75f60: Fix panel color background in landscape * commit 'b1c75f6028ecbf7bd05f945c542da0f848bc594b': Fix panel color background in landscape
|
9802c4a39467ffd4bfbe2481a981633c61eb47cf |
09-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
Fix panel color background in landscape Change-Id: Id1a0470c8df5fe39f5504a43e1602672ac0d584d
es/layout-land/filtershow_activity.xml
|
b1c75f6028ecbf7bd05f945c542da0f848bc594b |
09-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
Fix panel color background in landscape Change-Id: Id1a0470c8df5fe39f5504a43e1602672ac0d584d
es/layout-land/filtershow_activity.xml
|
05998bfac4888996775c444d97a0caa176619a9d |
09-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
am 12d4b5dd: am eddc3ca4: am f35ee031: am 01a4beb1: Fix history original image Change 1st and 2nd panel background color * commit '12d4b5dd3536fe3532d1f28dd8d27fcec41b4612': Fix history original image Change 1st and 2nd panel background color
|
c18e9cfb6cdd9742507fc0dc2b0c7a79ce1f7e45 |
09-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
am eddc3ca4: am f35ee031: am 01a4beb1: Fix history original image Change 1st and 2nd panel background color * commit 'eddc3ca420d53bfc818b6d6732239de8a95a709c': Fix history original image Change 1st and 2nd panel background color
|
8f9a916d7a58cbf3f6abe9e1e25c0911b6ce81e2 |
09-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
am f35ee031: am 01a4beb1: Fix history original image Change 1st and 2nd panel background color * commit 'f35ee0318655de92bb37c3763c750f8cff77131d': Fix history original image Change 1st and 2nd panel background color
|
7019a805b4e1663b76bd3ab0e913e5aa6eb8ee84 |
09-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
am 01a4beb1: Fix history original image Change 1st and 2nd panel background color * commit '01a4beb197d74dddf788efaf6aedef434dfb8f8f': Fix history original image Change 1st and 2nd panel background color
|
01a4beb197d74dddf788efaf6aedef434dfb8f8f |
09-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
Fix history original image Change 1st and 2nd panel background color Change-Id: Ib6a1033f99a4a1460c1a31be1e67ebd965e00add
es/drawable/filtershow_state_button_background
es/layout/filtershow_activity.xml
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/HistoryAdapter.java
|
15f4efb50b40fbdf108121e367bfd6f50d5b2c41 |
09-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
Fix history original image Change 1st and 2nd panel background color Change-Id: Ib6a1033f99a4a1460c1a31be1e67ebd965e00add
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/HistoryAdapter.java
|
4e7f7fe1ba46bb780ae45ff31bf2b1d7dfa05b81 |
09-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
Fix history original image Change 1st and 2nd panel background color Change-Id: Ib6a1033f99a4a1460c1a31be1e67ebd965e00add
es/drawable/filtershow_state_button_background
es/layout/filtershow_activity.xml
|
2820b5556e1eac308c292d8bf2a73f90d244f832 |
09-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
am e83856fe: am f928d8ee: am 5aff32af: am 948a4e6e: Fix history panel first appearance * commit 'e83856fe6f891d1257e9282b5c965853eb630593': Fix history panel first appearance
|
93db73cb5a6ca0ad065bd2f561e96a0bdbf3e872 |
09-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
am f928d8ee: am 5aff32af: am 948a4e6e: Fix history panel first appearance * commit 'f928d8ee846e06893c14acee8127c85e971df462': Fix history panel first appearance
|
010ba5fa870ed67cff020c7eb2e9a95fb726fb61 |
09-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
am 5aff32af: am 948a4e6e: Fix history panel first appearance * commit '5aff32afed49528cb104cdcf912bedf6f3440d9b': Fix history panel first appearance
|
46bbcbce0c36bdde5ceba763d4e35951cea40619 |
09-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
am 948a4e6e: Fix history panel first appearance * commit '948a4e6e38d8d9ec9926877524478d6692437105': Fix history panel first appearance
|
948a4e6e38d8d9ec9926877524478d6692437105 |
09-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
Fix history panel first appearance Change-Id: I49c3f91d1d65cc64b15080c64709f769fc8a8f22
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
|
40190f6917a127e156af72f72bfac9814de61ba8 |
09-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
Fix history panel first appearance Change-Id: I49c3f91d1d65cc64b15080c64709f769fc8a8f22
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
|
50fe9f469bb6a0a73abff718baae56849f31036f |
09-Apr-2013 |
The Android Automerger <android-build@android.com> |
merge in jb-mr2-release history after reset to jb-mr2-dev
|
07f4561e5ebeae8d07df29ca41c74f7c31c010b9 |
09-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
am b1a84f1e: am 3b39df6d: am 8fafeaff: am d98f781d: Fix positioning of cancel/done buttons * commit 'b1a84f1ed70965198b1c0d1ed957d866b449670f': Fix positioning of cancel/done buttons
|
74add34a7d6d02a9f4e5717980974a737e53214f |
09-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
am 3b39df6d: am 8fafeaff: am d98f781d: Fix positioning of cancel/done buttons * commit '3b39df6d0fbb4f6e3435c7e2efc6095c6d709052': Fix positioning of cancel/done buttons
|
d1acc8239d23172a1305e1b94e165abc4b6bd5e3 |
09-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
am 8fafeaff: am d98f781d: Fix positioning of cancel/done buttons * commit '8fafeaff4820fe88cd9f854c79fac90b8040f5c2': Fix positioning of cancel/done buttons
|
66c1d602d12c59ca61bb1f95813eccb84748f180 |
09-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
am d98f781d: Fix positioning of cancel/done buttons * commit 'd98f781dd0899477ff5be42279a06da81fd6e526': Fix positioning of cancel/done buttons
|
fa0ae38e43b574d9d67e58f47aa1e5a5a6e7f54a |
09-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
Fix positioning of cancel/done buttons Change-Id: Ie229a20d882841444ece28a3ab63cbc6ea916699
es/layout/filtershow_editor_panel.xml
|
d98f781dd0899477ff5be42279a06da81fd6e526 |
09-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
Fix positioning of cancel/done buttons Change-Id: Ie229a20d882841444ece28a3ab63cbc6ea916699
es/layout/filtershow_editor_panel.xml
|
381479eb4d598e7beef903e0f71ba0099f8d736b |
09-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
am c52ab9b0: am 171b216c: am 923140cf: am 1fe7caee: Fix crash in curves * commit 'c52ab9b0364cb7f540d8424536b586f6c9de7713': Fix crash in curves
|
3ed0f4327c96e12746569fd602cfab6941796350 |
09-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
am 171b216c: am 923140cf: am 1fe7caee: Fix crash in curves * commit '171b216c4a3920a869aa748f9d1254a041e07f1b': Fix crash in curves
|
7fd070c9bcaf9a5830301270c7a604e8ea29a90e |
09-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
am 923140cf: am 1fe7caee: Fix crash in curves * commit '923140cf2301ed611568cb9da3a88a725d2328f0': Fix crash in curves
|
4e5df2bcb6cc71a1879345d2313d2f248aa8c26a |
09-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
am 1fe7caee: Fix crash in curves * commit '1fe7caeeaab314cd70d0b54f8f3dd3225c71c081': Fix crash in curves
|
68136b13230d1ed3b3c4659851cd9c4d0ac1b014 |
09-Apr-2013 |
John Hoford <hoford@google.com> |
am 04dad18e: am a8c64209: am 70071d7b: am 16652433: make basic editor based on ParametricEditor * commit '04dad18eb5419ab5bfa85dc156571c8eea106933': make basic editor based on ParametricEditor
|
86d6efd61bc46a1f83b132ef118ec0a9026f2fcb |
09-Apr-2013 |
John Hoford <hoford@google.com> |
am a8c64209: am 70071d7b: am 16652433: make basic editor based on ParametricEditor * commit 'a8c642098aea0edb6af0ecbaf23fc5a768773cbf': make basic editor based on ParametricEditor
|
0a7651a90329360104c3d689df81a3965d7ddefd |
09-Apr-2013 |
John Hoford <hoford@google.com> |
am 70071d7b: am 16652433: make basic editor based on ParametricEditor * commit '70071d7b940debe0ddf77c8306ce33dcadc35638': make basic editor based on ParametricEditor
|
dd96f6891f8eb8bb6ea723354b7cc77af94fa31a |
09-Apr-2013 |
John Hoford <hoford@google.com> |
am 16652433: make basic editor based on ParametricEditor * commit '166524339e9f8ad86c0922142b961776e0da3d8f': make basic editor based on ParametricEditor
|
1d728cf75969807b607838c77d2c8418462a92d6 |
09-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
Fix crash in curves Change-Id: Ic5b61b3a4653f718bf2e4327f3920b5f39162a49
rc/com/android/gallery3d/filtershow/ui/ImageCurves.java
|
1fe7caeeaab314cd70d0b54f8f3dd3225c71c081 |
09-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
Fix crash in curves Change-Id: Ic5b61b3a4653f718bf2e4327f3920b5f39162a49
rc/com/android/gallery3d/filtershow/ui/ImageCurves.java
|
96f739af12ccb08351dc548d6851fd9bd9cdbcd1 |
09-Apr-2013 |
John Hoford <hoford@google.com> |
make basic editor based on ParametricEditor Change-Id: Ie0a799d7e85f4e21fdd86ffbdca9814a3cc40c61
es/layout/filtershow_control_style_chooser.xml
|
166524339e9f8ad86c0922142b961776e0da3d8f |
09-Apr-2013 |
John Hoford <hoford@google.com> |
make basic editor based on ParametricEditor Change-Id: Ie0a799d7e85f4e21fdd86ffbdca9814a3cc40c61
es/layout/filtershow_control_style_chooser.xml
rc/com/android/gallery3d/filtershow/controller/BasicSlider.java
rc/com/android/gallery3d/filtershow/controller/ParameterStyles.java
rc/com/android/gallery3d/filtershow/controller/StyleChooser.java
rc/com/android/gallery3d/filtershow/controller/TitledSlider.java
rc/com/android/gallery3d/filtershow/editors/BasicEditor.java
rc/com/android/gallery3d/filtershow/editors/ParametricEditor.java
|
a5e47821f783cc14ba0ec3d3910af79dab3a870c |
09-Apr-2013 |
John Hoford <hoford@google.com> |
make basic editor based on ParametricEditor Change-Id: Ie0a799d7e85f4e21fdd86ffbdca9814a3cc40c61
rc/com/android/gallery3d/filtershow/controller/BasicSlider.java
rc/com/android/gallery3d/filtershow/controller/ParameterStyles.java
rc/com/android/gallery3d/filtershow/controller/StyleChooser.java
rc/com/android/gallery3d/filtershow/controller/TitledSlider.java
rc/com/android/gallery3d/filtershow/editors/BasicEditor.java
rc/com/android/gallery3d/filtershow/editors/ParametricEditor.java
|
d62142e20289babb9f677453d40ade667c01c8a6 |
09-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
am a6fa496b: am c2a0f3f2: am 78561589: am 719fa31b: Deactivate Vintage & BW Color FX * commit 'a6fa496b3254ce07a7ffebf374a32724b7fb4ce5': Deactivate Vintage & BW Color FX
|
7537d49cbc51a70242cc2159f606dfe22bf04b08 |
09-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
am c2a0f3f2: am 78561589: am 719fa31b: Deactivate Vintage & BW Color FX * commit 'c2a0f3f2f421e61e445c8a8477812a46c0b257e3': Deactivate Vintage & BW Color FX
|
d02e5f835cc63fb36137c4b2d49f0adc58922d90 |
09-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
am 78561589: am 719fa31b: Deactivate Vintage & BW Color FX * commit '78561589c611172fd0a1b4644416c4ea03022ac1': Deactivate Vintage & BW Color FX
|
febb803f0f7dc2193e611e9c3c79c76f70783196 |
09-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
am a9b85b2d: am d6dbe79e: am e507b716: am 387fffa4: Merge "Add menu item to start the simple editor" into gb-ub-photos-bryce * commit 'a9b85b2d211ba726b21efa323e5e94a2b8ea4289': Add menu item to start the simple editor
|
23fcc64de803bd49e21dccb673761e6e7f8bcdba |
09-Apr-2013 |
Bart Sears <bsears@google.com> |
am 7aacffb3: am 3475ecf1: am 17f6f33a: am 5317e540: Bump up the version number to 1.1.40009 * commit '7aacffb385e226dc1462cee9c2c3bbe2eb093eb4': Bump up the version number to 1.1.40009
|
2b4c849e44cdd8aa5f89cb3ada9aa132e85025aa |
09-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
am 719fa31b: Deactivate Vintage & BW Color FX * commit '719fa31bc4df6605f45a65feb504d5c4e6e59db3': Deactivate Vintage & BW Color FX
|
27a00c086f877fd1f93a044e3ec818ec23d7fdd3 |
09-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
am d6dbe79e: am e507b716: am 387fffa4: Merge "Add menu item to start the simple editor" into gb-ub-photos-bryce * commit 'd6dbe79efc4cdf0a3ecc5f50d33040ad6afb06ca': Add menu item to start the simple editor
|
308ca6350e3146c88dbe8fd4e8c392f512030d97 |
09-Apr-2013 |
Bart Sears <bsears@google.com> |
am 3475ecf1: am 17f6f33a: am 5317e540: Bump up the version number to 1.1.40009 * commit '3475ecf1e0a8ecbdaaee019a9bab6d87873de0a2': Bump up the version number to 1.1.40009
|
719fa31bc4df6605f45a65feb504d5c4e6e59db3 |
09-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
Deactivate Vintage & BW Color FX bug:8503451 Change-Id: I5415551698a3f3db4cd0739b7d90c3576d458587
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
|
d54c1e3d699defd21a581686eda4cdc94baa1fec |
09-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
Deactivate Vintage & BW Color FX bug:8503451 Change-Id: I5415551698a3f3db4cd0739b7d90c3576d458587
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
|
0df767a7af1129157e74123a1ac1043bc6959791 |
09-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
am e507b716: am 387fffa4: Merge "Add menu item to start the simple editor" into gb-ub-photos-bryce * commit 'e507b716011e8a99f006f7009704fc0f87f0c3c4': Add menu item to start the simple editor
|
530873e0cc2d927359d395f286ba9cd7807ab358 |
09-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
am 387fffa4: Merge "Add menu item to start the simple editor" into gb-ub-photos-bryce * commit '387fffa4034e94336d5b2b28bf2cf7d0a9cf6048': Add menu item to start the simple editor
|
9a68c456cf05086b4d03ed5525890d80d9872063 |
09-Apr-2013 |
Bart Sears <bsears@google.com> |
am 17f6f33a: am 5317e540: Bump up the version number to 1.1.40009 * commit '17f6f33acf86bf90d22f73aa7257a00ec0663fa4': Bump up the version number to 1.1.40009
|
387fffa4034e94336d5b2b28bf2cf7d0a9cf6048 |
09-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
Merge "Add menu item to start the simple editor" into gb-ub-photos-bryce
|
1a4c039e1a1c3989c910e3d43fa93466d5cb90b9 |
09-Apr-2013 |
Bart Sears <bsears@google.com> |
am 5317e540: Bump up the version number to 1.1.40009 * commit '5317e54019bc1c88c82333a9e42882623691270f': Bump up the version number to 1.1.40009
|
782dc556aefabcc4b9c9cbc3c3593fbb0bfa8aae |
09-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
Add menu item to start the simple editor Change-Id: Iac3ca76838a5f91186527863b3d990cbcad3faf0
es/menu/photo.xml
es/values/strings.xml
|
7b9eac6dd0f1262773cc0a3b1acab27576e765bf |
09-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
Add menu item to start the simple editor Change-Id: Iac3ca76838a5f91186527863b3d990cbcad3faf0
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/ui/MenuExecutor.java
|
8c4e95f4380a4104c9968963a363b62746e6c967 |
09-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
Add menu item to start the simple editor Change-Id: Iac3ca76838a5f91186527863b3d990cbcad3faf0
es/menu/photo.xml
es/values/strings.xml
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/ui/MenuExecutor.java
|
da26da5604061976ba63a5f8b6de7fff84629473 |
09-Apr-2013 |
Bart Sears <bsears@google.com> |
Bump up the version number to 1.1.40009 Change-Id: Ia266e6493a535cd4ae36fda2fa497195b810ebb4
ndroidManifest.xml
|
5317e54019bc1c88c82333a9e42882623691270f |
09-Apr-2013 |
Bart Sears <bsears@google.com> |
Bump up the version number to 1.1.40009 Change-Id: Ia266e6493a535cd4ae36fda2fa497195b810ebb4
ndroidManifest.xml
|
0e1c7b395df65bfa67c6f8629c1fd583a3aa5f47 |
09-Apr-2013 |
Tim Murray <timmurray@google.com> |
am d460568e: am c4435097: am 893ea430: am 31721073: Merge "Allow use of texture." into gb-ub-photos-bryce * commit 'd460568ed334df054ac6551f0933e30337ae1b97': Allow use of texture.
|
e888c3184d9685e44c948c6ff45bb4ce9d561e70 |
09-Apr-2013 |
Tim Murray <timmurray@google.com> |
am 0b103f1b: am c1e80002: am 3627907b: am a8d4e882: Merge "Limit creation of greyscale converter RS script." into gb-ub-photos-bryce * commit '0b103f1beab869563fe1100cdd592c129fa936ba': Limit creation of greyscale converter RS script.
|
dfdc667bd3bd51b0fae5ed856495bd54e0dccd3c |
09-Apr-2013 |
Tim Murray <timmurray@google.com> |
am c4435097: am 893ea430: am 31721073: Merge "Allow use of texture." into gb-ub-photos-bryce * commit 'c443509795eff3a832f9e3be806d05cf8490cdff': Allow use of texture.
|
220d3efd4528a50adbe930af0c91c31db01bc83e |
09-Apr-2013 |
Tim Murray <timmurray@google.com> |
am c1e80002: am 3627907b: am a8d4e882: Merge "Limit creation of greyscale converter RS script." into gb-ub-photos-bryce * commit 'c1e8000207d979f231adc8dbc50c385213c4e679': Limit creation of greyscale converter RS script.
|
d751a1018727bfa4042172f9b6c286767440b028 |
09-Apr-2013 |
Tim Murray <timmurray@google.com> |
am 893ea430: am 31721073: Merge "Allow use of texture." into gb-ub-photos-bryce * commit '893ea430c9d3f78291843e22f4370319af0b2451': Allow use of texture.
|
871122b8eec2cb4487382e101a017f73aafe286e |
09-Apr-2013 |
Tim Murray <timmurray@google.com> |
am 3627907b: am a8d4e882: Merge "Limit creation of greyscale converter RS script." into gb-ub-photos-bryce * commit '3627907b3bfdb03c596fe01437a3fc4300ad25a1': Limit creation of greyscale converter RS script.
|
c153b6b316cf03c355ac4034a2e5d90a12656399 |
09-Apr-2013 |
Tim Murray <timmurray@google.com> |
am 31721073: Merge "Allow use of texture." into gb-ub-photos-bryce * commit '31721073a7fae162a931f1d4998b12101a98916c': Allow use of texture.
|
50164f628caa91b5b978c01d6cb637a10d842116 |
09-Apr-2013 |
Tim Murray <timmurray@google.com> |
am a8d4e882: Merge "Limit creation of greyscale converter RS script." into gb-ub-photos-bryce * commit 'a8d4e88207432fc07385d49245ca2221d6fe0be9': Limit creation of greyscale converter RS script.
|
31721073a7fae162a931f1d4998b12101a98916c |
09-Apr-2013 |
Tim Murray <timmurray@google.com> |
Merge "Allow use of texture." into gb-ub-photos-bryce
|
a8d4e88207432fc07385d49245ca2221d6fe0be9 |
09-Apr-2013 |
Tim Murray <timmurray@google.com> |
Merge "Limit creation of greyscale converter RS script." into gb-ub-photos-bryce
|
39766b49b97ebbd5b4100075ce8bd6b23dbc473a |
08-Apr-2013 |
Tim Murray <timmurray@google.com> |
Allow use of texture. Change-Id: Ibc75616484d2833d9212c7c68027f83ad40b16cf
rc/com/android/gallery3d/filtershow/filters/ImageFilterRS.java
|
7a584e068d274ca95286fcf2804c068d38fe8753 |
08-Apr-2013 |
Tim Murray <timmurray@google.com> |
Allow use of texture. Change-Id: Ibc75616484d2833d9212c7c68027f83ad40b16cf
rc/com/android/gallery3d/filtershow/filters/ImageFilterRS.java
|
e193e864a849f4f816c55cff83a9dc7b39e0018f |
08-Apr-2013 |
Tim Murray <timmurray@google.com> |
Limit creation of greyscale converter RS script. Change-Id: I2725ae6cb5ba829fec61dce114513762fce53067
rc/com/android/gallery3d/filtershow/filters/ImageFilterRS.java
|
1a28e2e4dab537a4efd7f11cdc2f038a9e37ea0a |
08-Apr-2013 |
Tim Murray <timmurray@google.com> |
Limit creation of greyscale converter RS script. Change-Id: I2725ae6cb5ba829fec61dce114513762fce53067
rc/com/android/gallery3d/filtershow/filters/ImageFilterRS.java
|
001100d177113ae75c3d918a391dbb3542782a8e |
08-Apr-2013 |
John Hoford <hoford@google.com> |
am 1c29ca03: am e4cab3e2: am a97306fc: am f1d6d21d: Increase the CHAR LIMIT for color_pick_select * commit '1c29ca03ccafb013af77757e2774454ba7d32601': Increase the CHAR LIMIT for color_pick_select
|
c75c9ac471a25ab8bd2a9e7c55579d0ef5fe9e72 |
08-Apr-2013 |
John Hoford <hoford@google.com> |
am e4cab3e2: am a97306fc: am f1d6d21d: Increase the CHAR LIMIT for color_pick_select * commit 'e4cab3e24d58ac111c853ae8de51670ff19f7539': Increase the CHAR LIMIT for color_pick_select
|
b7ca7c3d7975de61081c7824be6ee64deae84ebb |
08-Apr-2013 |
John Hoford <hoford@google.com> |
am a97306fc: am f1d6d21d: Increase the CHAR LIMIT for color_pick_select * commit 'a97306fc282087e6a67347d5f6c36923962b16df': Increase the CHAR LIMIT for color_pick_select
|
be3e9920f36caeed3f527d759f6621b1356a3c4f |
05-Apr-2013 |
Angus Kong <shkong@google.com> |
Add more gestures and animations in FilmStripView. Now supports fullscreen mode and filmstrip mode. Change-Id: I4c568e37f3306d970b3439f86ac6757b15c7cd4f
rc/com/android/camera/data/CameraDataAdapter.java
rc/com/android/camera/ui/FilmStripGestureRecognizer.java
rc/com/android/camera/ui/FilmStripView.java
|
3eb0acbe1fcdcd10e962abaab7d946c6013343b3 |
05-Apr-2013 |
Angus Kong <shkong@google.com> |
Add more gestures and animations in FilmStripView. Now supports fullscreen mode and filmstrip mode. Change-Id: I4c568e37f3306d970b3439f86ac6757b15c7cd4f
rc/com/android/camera/data/CameraDataAdapter.java
rc/com/android/camera/ui/FilmStripGestureRecognizer.java
rc/com/android/camera/ui/FilmStripView.java
|
1891bf3b0f95148082960140466b90fa371d0d0a |
08-Apr-2013 |
John Hoford <hoford@google.com> |
am f1d6d21d: Increase the CHAR LIMIT for color_pick_select * commit 'f1d6d21dfcf59d69a7ba8a3658fcedbf2aa04779': Increase the CHAR LIMIT for color_pick_select
|
bedb5c0ccf56390c9526e942329d0c6c89cb3537 |
08-Apr-2013 |
The Android Open Source Project <initial-contribution@android.com> |
am b9ac669d: (-s ours) am 9cacd519: Reconcile with jb-mr2-release - do not merge * commit 'b9ac669d3fc91d7de1231cd60e70591483367e71':
|
a133d48b8d9eec7489effa0e9d4d03a8bf5ab96b |
08-Apr-2013 |
The Android Open Source Project <initial-contribution@android.com> |
am 9cacd519: Reconcile with jb-mr2-release - do not merge * commit '9cacd519354bb5249a9cc3ac05d3220748c24a16':
|
04e7e51c574c26e25c628ba0c5dffee50eb02603 |
08-Apr-2013 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with jb-mr2-release - do not merge Change-Id: I4014afe3d67f5b17d5877083bdea8e34bf32ab9e
|
b794c564e0fa9939fb0fb2bac194473e05d23084 |
08-Apr-2013 |
John Hoford <hoford@google.com> |
Increase the CHAR LIMIT for color_pick_select bug: 8131770 Change-Id: I665316d3ff6ec10fcace8ee1bb9237f4057a4797
es/values/filtershow_strings.xml
|
f1d6d21dfcf59d69a7ba8a3658fcedbf2aa04779 |
08-Apr-2013 |
John Hoford <hoford@google.com> |
Increase the CHAR LIMIT for color_pick_select bug: 8131770 Change-Id: I665316d3ff6ec10fcace8ee1bb9237f4057a4797
es/values/filtershow_strings.xml
|
a33e79545c70961cc36f04bf689e8998dddeb475 |
08-Apr-2013 |
John Hoford <hoford@google.com> |
am b29d6806: am 469bc0ef: am 4b87a0bd: am 7ce32619: support for simplified computed icons * commit 'b29d68063788f96c2805c0abf93f1a202fb6f291': support for simplified computed icons
|
ef506ed747f551de51ace225caf8c4bb3cb7729d |
08-Apr-2013 |
John Hoford <hoford@google.com> |
am 469bc0ef: am 4b87a0bd: am 7ce32619: support for simplified computed icons * commit '469bc0efed25ec4a8d40bfdfa3997931eb1a7383': support for simplified computed icons
|
c06f97c19e2846b7998a73bc036b409db47e7ee5 |
08-Apr-2013 |
John Hoford <hoford@google.com> |
am 4b87a0bd: am 7ce32619: support for simplified computed icons * commit '4b87a0bdc331993b0bc6fa46efb11b62abcc8dfb': support for simplified computed icons
|
2e028ca3b096a78e70a4da309f22e4e6adc171e1 |
08-Apr-2013 |
John Hoford <hoford@google.com> |
am 7ce32619: support for simplified computed icons * commit '7ce32619d3f107125d219b80c4041681a0bd85cc': support for simplified computed icons
|
7ce32619d3f107125d219b80c4041681a0bd85cc |
05-Apr-2013 |
John Hoford <hoford@google.com> |
support for simplified computed icons Change-Id: Id886a0a2151037420d3672f34d2838c5d9c69cbd
rc/com/android/gallery3d/filtershow/filters/IconUtilities.java
rc/com/android/gallery3d/filtershow/filters/ImageFilter.java
|
ca13834b449c4586292ca9cc1853fd8e65884edd |
05-Apr-2013 |
John Hoford <hoford@google.com> |
support for simplified computed icons Change-Id: Id886a0a2151037420d3672f34d2838c5d9c69cbd
rc/com/android/gallery3d/filtershow/filters/IconUtilities.java
rc/com/android/gallery3d/filtershow/filters/ImageFilter.java
|
97a9277584cc4c2f91a1035c1de5c1f4838603e0 |
08-Apr-2013 |
The Android Automerger <android-build@android.com> |
merge in jb-mr2-release history after reset to jb-mr2-dev
|
457d18a00342d1f3df6abde25200ca6e927bd026 |
06-Apr-2013 |
Bart Sears <bsears@google.com> |
am 00775fa8: am 8c880d68: am be89575f: am 08ac58de: Merge "Bump up the version number to 1.1.40008" into gb-ub-photos-bryce * commit '00775fa875227293344a3b9b72680985995ddaf5': Bump up the version number to 1.1.40008
|
ede5dadf1e259dccfd092549026c71c27bd6b4be |
06-Apr-2013 |
Bart Sears <bsears@google.com> |
am 8c880d68: am be89575f: am 08ac58de: Merge "Bump up the version number to 1.1.40008" into gb-ub-photos-bryce * commit '8c880d68b72aad2af1588b75a5e68ccaf6ab6910': Bump up the version number to 1.1.40008
|
b7b02ff875ebd58a1ca15320fc06a9d5b1fe0a9d |
06-Apr-2013 |
Bart Sears <bsears@google.com> |
am be89575f: am 08ac58de: Merge "Bump up the version number to 1.1.40008" into gb-ub-photos-bryce * commit 'be89575f1dd99651b3e4979bd5eda06c13ab54b0': Bump up the version number to 1.1.40008
|
bda611bdc941782d9a9b8051ceb6852973dd5d73 |
06-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am b514ae67: am 80b49106: am 351f96ee: am c59be382: Added check to strip out uninitialized EXIF tags. * commit 'b514ae67360c7c33656767a1c28240c316108df3': Added check to strip out uninitialized EXIF tags.
|
d00da6d2fc484970d586f61ff8df4b9e697a810f |
06-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 80b49106: am 351f96ee: am c59be382: Added check to strip out uninitialized EXIF tags. * commit '80b491062306ab817a63cb0f195fa00ae0c74fb5': Added check to strip out uninitialized EXIF tags.
|
ccc39ba6c1884658729f47cb96dce94abdc56bb0 |
06-Apr-2013 |
Bart Sears <bsears@google.com> |
am 08ac58de: Merge "Bump up the version number to 1.1.40008" into gb-ub-photos-bryce * commit '08ac58de117c2b8c24ef8b4eabca6d25ae581ff3': Bump up the version number to 1.1.40008
|
08ac58de117c2b8c24ef8b4eabca6d25ae581ff3 |
06-Apr-2013 |
Bart Sears <bsears@google.com> |
Merge "Bump up the version number to 1.1.40008" into gb-ub-photos-bryce
|
b2b27a6e5a35955d65a8b0f1a601df63dc6019ef |
06-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 351f96ee: am c59be382: Added check to strip out uninitialized EXIF tags. * commit '351f96eeacc4342385ee2d215af1322ac079cfdc': Added check to strip out uninitialized EXIF tags.
|
b2a1e5f114dc57f5ad7df243698be47002652e44 |
06-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am c59be382: Added check to strip out uninitialized EXIF tags. * commit 'c59be38287ed3d58f6945d63713b03ac20510c22': Added check to strip out uninitialized EXIF tags.
|
a0c21c94c35865b0464cae27436f21d50ff1eb31 |
06-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Added check to strip out uninitialized EXIF tags. Bug: 8552339 Change-Id: Ib6ae4f59f9e393e5f6b46877a4b2c3b2fe1852d3
allerycommon/src/com/android/gallery3d/exif/ExifOutputStream.java
|
d16187301386ce1234a57fa6da9f805624227570 |
06-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Added check to strip out uninitialized EXIF tags. Bug: 8552339 Change-Id: Ib6ae4f59f9e393e5f6b46877a4b2c3b2fe1852d3
allerycommon/src/com/android/gallery3d/exif/ExifOutputStream.java
|
c59be38287ed3d58f6945d63713b03ac20510c22 |
06-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Added check to strip out uninitialized EXIF tags. Bug: 8552339 Change-Id: Ib6ae4f59f9e393e5f6b46877a4b2c3b2fe1852d3
allerycommon/src/com/android/gallery3d/exif/ExifOutputStream.java
|
783a6bfaf572f671d44a6cd56edd5b35d4e22423 |
05-Apr-2013 |
Bart Sears <bsears@google.com> |
Bump up the version number to 1.1.40008 Change-Id: I42dce1bc936b54a4d4f72c2179d2f1d9e27f72d7
ndroidManifest.xml
|
a7879852cc93cde93c415da59453a3cb2c91c12d |
05-Apr-2013 |
Bart Sears <bsears@google.com> |
Bump up the version number to 1.1.40008 Change-Id: I42dce1bc936b54a4d4f72c2179d2f1d9e27f72d7
ndroidManifest.xml
|
8c88a3d999576f910ac9b62484b352754e5f6791 |
05-Apr-2013 |
Baligh Uddin <baligh@google.com> |
am 526bcbb1: (-s ours) am b0cf2dcd: am 20b837a9: am f9ee06b2: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce * commit '526bcbb1699dc08962e39aeee2129a085c1c028a': Import translations. DO NOT MERGE
|
e816b9d3621d29520c01d5a47e7e6ef5d87890ce |
05-Apr-2013 |
Baligh Uddin <baligh@google.com> |
am 1f7a915f: (-s ours) am fd8906a0: am 88154ff2: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev * commit '1f7a915fa18fe2708fc80bc33ad4fad2361d2f91': Import translations. DO NOT MERGE
|
e687efb7ec52f8b28b645e55b22af1eb1b24a3a0 |
05-Apr-2013 |
Baligh Uddin <baligh@google.com> |
am b0cf2dcd: am 20b837a9: am f9ee06b2: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce * commit 'b0cf2dcda6279062b115a27efe4ce8aaecaa9546': Import translations. DO NOT MERGE
|
313a032bee8db0708e9a394b35d21fbd2dbc036d |
05-Apr-2013 |
Baligh Uddin <baligh@google.com> |
am fd8906a0: am 88154ff2: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev * commit 'fd8906a0dc72cb2e816c2a9a5a8be7d27ca70e09': Import translations. DO NOT MERGE
|
1ea2489bc8987f2704198e7ad20c2df453701cbf |
05-Apr-2013 |
Baligh Uddin <baligh@google.com> |
am 20b837a9: am f9ee06b2: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce * commit '20b837a995a150ec4024324dd1b6874ff4f9113f': Import translations. DO NOT MERGE
|
61103a35d32eccdc719c853bb47a0e26b05b6f3a |
05-Apr-2013 |
Baligh Uddin <baligh@google.com> |
am 88154ff2: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev * commit '88154ff2a4c440732aafdc80776e41affe9d8980': Import translations. DO NOT MERGE
|
147d90fb2882932b5302b7c9e26349b34a0476c5 |
05-Apr-2013 |
Baligh Uddin <baligh@google.com> |
am 3f935e73: (-s ours) Merge "Import translations. DO NOT MERGE" * commit '3f935e7300a2873c777fecbb6b41467bde0312dc': Import translations. DO NOT MERGE
|
5094ef6240b5e90e43dc72a9ef5d74180b263f18 |
05-Apr-2013 |
Baligh Uddin <baligh@google.com> |
am f9ee06b2: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce * commit 'f9ee06b28b9e8992c25ac8ce48ac76a2990a44ec': Import translations. DO NOT MERGE
|
77c9c5552997ff1c264af69890fdc64ce04fca7b |
05-Apr-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into master-security-dev
|
cd2e9b08ac5a82fcff46926fea85bf95e5756c52 |
05-Apr-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE"
|
c348e098b24b3eaad00d63c2bec7339ada489f44 |
05-Apr-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
|
f9ee06b28b9e8992c25ac8ce48ac76a2990a44ec |
05-Apr-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
|
635e959a0eafb3c8122b1975aced980ee3771152 |
05-Apr-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ic2469cc67cbf4fc1ed3d78d340faabec7f40a11a Auto-generated-cl: translation import
es/values-af/filtershow_strings.xml
es/values-am/filtershow_strings.xml
es/values-ar/filtershow_strings.xml
es/values-es-rUS/filtershow_strings.xml
es/values-fa/filtershow_strings.xml
es/values-hi/filtershow_strings.xml
es/values-sw/filtershow_strings.xml
es/values-zu/filtershow_strings.xml
|
f3f105fb3085464eac81993c89e1e1e18487fa22 |
05-Apr-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ic1ae7e1370f8b2c2350ccc4f0944d0e9d155f8aa Auto-generated-cl: translation import
es/values-af/filtershow_strings.xml
es/values-am/filtershow_strings.xml
es/values-ar/filtershow_strings.xml
es/values-es-rUS/filtershow_strings.xml
es/values-fa/filtershow_strings.xml
es/values-hi/filtershow_strings.xml
es/values-sw/filtershow_strings.xml
es/values-zu/filtershow_strings.xml
|
e126822d20e57e217a70896008aa46e37bb39279 |
05-Apr-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Iade3eb6b07c585bd1e7a7ab9e0f3f8e74d512aeb Auto-generated-cl: translation import
es/values-af/filtershow_strings.xml
es/values-am/filtershow_strings.xml
es/values-ar/filtershow_strings.xml
es/values-es-rUS/filtershow_strings.xml
es/values-fa/filtershow_strings.xml
es/values-hi/filtershow_strings.xml
es/values-sw/filtershow_strings.xml
es/values-zu/filtershow_strings.xml
|
414dcb6925dcf830ff7aed7e1c51beac7bbaa1bd |
05-Apr-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I2e919072c23a9b7d081416f1f55dd5991381a56b Auto-generated-cl: translation import
es/values-af/filtershow_strings.xml
es/values-am/filtershow_strings.xml
es/values-ar/filtershow_strings.xml
es/values-es-rUS/filtershow_strings.xml
es/values-fa/filtershow_strings.xml
es/values-hi/filtershow_strings.xml
es/values-sw/filtershow_strings.xml
es/values-zu/filtershow_strings.xml
|
8e05abc69596703886aebee49e556710c4b0551b |
05-Apr-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I2e919072c23a9b7d081416f1f55dd5991381a56b Auto-generated-cl: translation import
es/values-af/filtershow_strings.xml
es/values-am/filtershow_strings.xml
es/values-ar/filtershow_strings.xml
es/values-es-rUS/filtershow_strings.xml
es/values-fa/filtershow_strings.xml
es/values-hi/filtershow_strings.xml
es/values-sw/filtershow_strings.xml
es/values-zu/filtershow_strings.xml
|
59dd2ca9d0b1a7713d0d15b75381b9c0d9936089 |
05-Apr-2013 |
Michael Kolb <kolby@google.com> |
am 2ced1901: am 47811c4c: am b94167bd: am 5e1e5a5e: Merge "Don\'t add unsupported options to menu" into gb-ub-photos-bryce * commit '2ced19010889e957d16fe243368f7a3f6d4cddad': Don't add unsupported options to menu
|
157f572160f13c15ecc4f6f78599de456bc44de6 |
05-Apr-2013 |
Michael Kolb <kolby@google.com> |
am 47811c4c: am b94167bd: am 5e1e5a5e: Merge "Don\'t add unsupported options to menu" into gb-ub-photos-bryce * commit '47811c4c307de0bbcabb08c0052ff4320f3bcc3e': Don't add unsupported options to menu
|
47d1ff4a9011f9001f0f33d655bd37d3465ea307 |
05-Apr-2013 |
Michael Kolb <kolby@google.com> |
am b94167bd: am 5e1e5a5e: Merge "Don\'t add unsupported options to menu" into gb-ub-photos-bryce * commit 'b94167bd52a343d0c74a3b8bc0523f1747490a7e': Don't add unsupported options to menu
|
94e61f3fc09cce907a742b339433c9e42e628a7e |
05-Apr-2013 |
Michael Kolb <kolby@google.com> |
am 5e1e5a5e: Merge "Don\'t add unsupported options to menu" into gb-ub-photos-bryce * commit '5e1e5a5e301491249d24c9f3a4d1014d07e72985': Don't add unsupported options to menu
|
b9107fdcf2c17bebc4eeb0e13c92ba5f301f52b6 |
05-Apr-2013 |
Michael Kolb <kolby@google.com> |
Merge "Don't add unsupported options to menu" into gb-ub-photos-bryce
|
5e1e5a5e301491249d24c9f3a4d1014d07e72985 |
05-Apr-2013 |
Michael Kolb <kolby@google.com> |
Merge "Don't add unsupported options to menu" into gb-ub-photos-bryce
|
5cf3c47333d558abacd8962d68ccb1ff3e285005 |
05-Apr-2013 |
Michael Kolb <kolby@google.com> |
Don't add unsupported options to menu Bug: 8549712 Exposure compensation and whitebalance were not checked when added to the menu. Change-Id: I90e2baea25e0273ed96e3678b3ed4c99184475df
rc/com/android/camera/PhotoMenu.java
|
265ea6fd74b7365b494f95f2825b145a75151cf2 |
05-Apr-2013 |
Michael Kolb <kolby@google.com> |
Don't add unsupported options to menu Bug: 8549712 Exposure compensation and whitebalance were not checked when added to the menu. Change-Id: I90e2baea25e0273ed96e3678b3ed4c99184475df
rc/com/android/camera/PhotoMenu.java
|
0c78af680fb1e769b21663ec858505c5ac8d6ac6 |
05-Apr-2013 |
ztenghui <ztenghui@google.com> |
am fec8429c: am c8216ed7: am e9ba7351: am 214f7869: Merge "Remove redudant setName" into gb-ub-photos-bryce * commit 'fec8429c804a76385defc0eb3b8109a62086ff6f': Remove redudant setName
|
fcdc65c8a5b101c0521bf338979b3bf3173f9892 |
05-Apr-2013 |
Bart Sears <bsears@google.com> |
am 3cd0916b: am 662f5176: am 5e575401: am 4f58f875: Bump up the version number to 1.1.40007 * commit '3cd0916b4777f3876f7e8fb546d58a966d56afce': Bump up the version number to 1.1.40007
|
28a0333b7aa7e23366afaa1cf3df19c229b0521c |
05-Apr-2013 |
ztenghui <ztenghui@google.com> |
am c8216ed7: am e9ba7351: am 214f7869: Merge "Remove redudant setName" into gb-ub-photos-bryce * commit 'c8216ed74ea214eb4fd0b10c308ace60cc003eeb': Remove redudant setName
|
aa8aa633f0cf8f2f80b457ab519c016b5edd0329 |
05-Apr-2013 |
Bart Sears <bsears@google.com> |
am 662f5176: am 5e575401: am 4f58f875: Bump up the version number to 1.1.40007 * commit '662f5176f328be4379b42078de25866f5c8c47e1': Bump up the version number to 1.1.40007
|
9f691f9df1c265f3ab08bd7d8bdb274b7a1cee24 |
05-Apr-2013 |
ztenghui <ztenghui@google.com> |
am e9ba7351: am 214f7869: Merge "Remove redudant setName" into gb-ub-photos-bryce * commit 'e9ba7351f6598ec950c6df007448567dcaa555b6': Remove redudant setName
|
f09410e3768bc27f7c696c91d1d0bbca33cbc26d |
05-Apr-2013 |
Bart Sears <bsears@google.com> |
am 5e575401: am 4f58f875: Bump up the version number to 1.1.40007 * commit '5e575401757d93c4d18ba40f05d146bbdf6e9e6f': Bump up the version number to 1.1.40007
|
771a6e06a2a292b4be7435d259d682f4d72d13bc |
05-Apr-2013 |
ztenghui <ztenghui@google.com> |
am 214f7869: Merge "Remove redudant setName" into gb-ub-photos-bryce * commit '214f786938fd0924ec89190b5f38d034f0be7291': Remove redudant setName
|
c4c25f955ecf334af668997e8db0282a4e707b04 |
05-Apr-2013 |
Bart Sears <bsears@google.com> |
am 4f58f875: Bump up the version number to 1.1.40007 * commit '4f58f87598044f3742d6faaf1ac8ff777c7dcffc': Bump up the version number to 1.1.40007
|
214f786938fd0924ec89190b5f38d034f0be7291 |
05-Apr-2013 |
ztenghui <ztenghui@google.com> |
Merge "Remove redudant setName" into gb-ub-photos-bryce
|
2f81a0fe104d8806308dc4c6056090206f13ba84 |
05-Apr-2013 |
ztenghui <ztenghui@google.com> |
Merge "Remove redudant setName" into gb-ub-photos-bryce
|
9f15c4ab622bd5b47fb53cbf3f3bacd7fbaf8250 |
05-Apr-2013 |
Bart Sears <bsears@google.com> |
Bump up the version number to 1.1.40007 Change-Id: Ia494e2c210f642ec0232394d0cfabaf5e1b8f96a
ndroidManifest.xml
|
4f58f87598044f3742d6faaf1ac8ff777c7dcffc |
05-Apr-2013 |
Bart Sears <bsears@google.com> |
Bump up the version number to 1.1.40007 Change-Id: Ia494e2c210f642ec0232394d0cfabaf5e1b8f96a
ndroidManifest.xml
|
319695a4c39ddbd4c59a7cb01cc10333ee37b246 |
04-Apr-2013 |
ztenghui <ztenghui@google.com> |
Remove redudant setName Change-Id: Id9c5f2ee268b275ba4272f66a0f72c1aa4786f9c
rc/com/android/gallery3d/filtershow/imageshow/GeometryMetadata.java
|
1a65e735e935b7627c75617c8546af9eef7aba1b |
04-Apr-2013 |
ztenghui <ztenghui@google.com> |
Remove redudant setName Change-Id: Id9c5f2ee268b275ba4272f66a0f72c1aa4786f9c
rc/com/android/gallery3d/filtershow/imageshow/GeometryMetadata.java
|
7feadb40a783e83020abda1550bca3477b6673ab |
04-Apr-2013 |
John Hoford <hoford@google.com> |
am d74129bf: am cecc50f5: am e65a9f48: am 3b763852: Merge "fixed the value that quality was getting set to" into gb-ub-photos-bryce * commit 'd74129bf2d0796b3c6e1d273243ef63c916d8f6d': fixed the value that quality was getting set to
|
b0e42720fe57c80ea141f1942a9eacba0428fb90 |
04-Apr-2013 |
John Hoford <hoford@google.com> |
am cecc50f5: am e65a9f48: am 3b763852: Merge "fixed the value that quality was getting set to" into gb-ub-photos-bryce * commit 'cecc50f599ddef3cc8db7552354f40c5b2a9887b': fixed the value that quality was getting set to
|
6d06c0d456cf6fea92cbcb794eb67901f0c2f893 |
04-Apr-2013 |
John Hoford <hoford@google.com> |
am e65a9f48: am 3b763852: Merge "fixed the value that quality was getting set to" into gb-ub-photos-bryce * commit 'e65a9f48a545f6ed2043e89cbe6637aeadf6c30a': fixed the value that quality was getting set to
|
59e3b39f7571510b7e5004589d97e7ed0f63241c |
04-Apr-2013 |
John Hoford <hoford@google.com> |
am 3b763852: Merge "fixed the value that quality was getting set to" into gb-ub-photos-bryce * commit '3b7638527bf8f472bedf99ed412d692e4031d03e': fixed the value that quality was getting set to
|
b26251860824f962dd2306778a1f3cf9764bd702 |
04-Apr-2013 |
John Hoford <hoford@google.com> |
Merge "fixed the value that quality was getting set to" into gb-ub-photos-bryce
|
3b7638527bf8f472bedf99ed412d692e4031d03e |
04-Apr-2013 |
John Hoford <hoford@google.com> |
Merge "fixed the value that quality was getting set to" into gb-ub-photos-bryce
|
42a2d8687889feed3b6d68710edaea8570bef16a |
04-Apr-2013 |
The Android Automerger <android-build@android.com> |
merge in jb-mr2-release history after reset to jb-mr2-dev
|
4716746eeb2776a381da96a059b9eb052185e2ee |
04-Apr-2013 |
The Android Open Source Project <initial-contribution@android.com> |
am f7ea34e6: (-s ours) am 1a37c1b0: Reconcile with jb-mr2-release - do not merge * commit 'f7ea34e6da6f361c995663ff378f490f8d3edcd5': am 2b246048: Merge "fix calling Allocation.copyFrom without context" into gb-ub-photos-bryce am 0e018f44: Merge "Make stopPreview synchronous." into gb-ub-photos-bryce
|
214c5bf3be9085a0abd1e861bb1ffc00be9df3fe |
04-Apr-2013 |
The Android Open Source Project <initial-contribution@android.com> |
am 1a37c1b0: Reconcile with jb-mr2-release - do not merge * commit '1a37c1b012e4c38cafa1c4e945cd8cd690e7e105': am 2b246048: Merge "fix calling Allocation.copyFrom without context" into gb-ub-photos-bryce am 0e018f44: Merge "Make stopPreview synchronous." into gb-ub-photos-bryce
|
8d37289db2fdf37e38411d06a3235f11534931aa |
04-Apr-2013 |
John Hoford <hoford@google.com> |
fixed the value that quality was getting set to Change-Id: I493c37c065e180ed3a7a785df4132812bd53add4
rc/com/android/gallery3d/filtershow/cache/CachingPipeline.java
|
80bd74274be9ade36b2b4ac0d5c130ed7e5e3219 |
04-Apr-2013 |
John Hoford <hoford@google.com> |
fixed the value that quality was getting set to Change-Id: I493c37c065e180ed3a7a785df4132812bd53add4
rc/com/android/gallery3d/filtershow/cache/CachingPipeline.java
|
ee5fbff2e65297f91609ddc523e4f56915dc8dcf |
04-Apr-2013 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with jb-mr2-release - do not merge Change-Id: I666a136b9a745370acd7ed37cb78c19939d6ac00
|
efb404e7a2d12d0352a54bd8590e1ba07bbe89e5 |
04-Apr-2013 |
Michael Kolb <kolby@google.com> |
am 8285f913: am 20462495: am 00d755f4: am 56b8463a: Merge "Adjust camera menu further" into gb-ub-photos-bryce * commit '8285f913dfda1beca42612be2bd2bbfff516fa99': Adjust camera menu further
|
0480ae9506d08549b015f2345c19a48017a20b46 |
04-Apr-2013 |
Michael Kolb <kolby@google.com> |
am 20462495: am 00d755f4: am 56b8463a: Merge "Adjust camera menu further" into gb-ub-photos-bryce * commit '2046249565caca3df9806e5ebdddafb328535608': Adjust camera menu further
|
d20402541703a5b06d8ce2f313fc475c02269407 |
04-Apr-2013 |
Michael Kolb <kolby@google.com> |
am 00d755f4: am 56b8463a: Merge "Adjust camera menu further" into gb-ub-photos-bryce * commit '00d755f4bdd39307ffb9e9372393047cb7c97e0a': Adjust camera menu further
|
3e7208df1c8e2f0ec5e8803dbc63bd8d047911e1 |
04-Apr-2013 |
Angus Kong <shkong@google.com> |
am a405630b: am fe8a8a7b: am 6db9f6ff: am a2dcdfe3: Merge "Don\'t access mParameters dirty bit in other thread" into gb-ub-photos-bryce * commit 'a405630b6607990e3a2f5ee352923ffc8c976383': Don't access mParameters dirty bit in other thread
|
da47cce21c102deb6433f6216090c16ed30800e0 |
04-Apr-2013 |
Michael Kolb <kolby@google.com> |
am 56b8463a: Merge "Adjust camera menu further" into gb-ub-photos-bryce * commit '56b8463ae34900368f735d9ba75ac39d635ad7cc': Adjust camera menu further
|
20194fdb288b03ef18f9533fa0d307d36af82099 |
04-Apr-2013 |
Michael Kolb <kolby@google.com> |
Merge "Adjust camera menu further" into gb-ub-photos-bryce
|
8a9bee75383fba5a612c5e7ef7c6488495961bec |
04-Apr-2013 |
Michael Kolb <kolby@google.com> |
Merge "Adjust camera menu further" into gb-ub-photos-bryce
|
56b8463ae34900368f735d9ba75ac39d635ad7cc |
04-Apr-2013 |
Michael Kolb <kolby@google.com> |
Merge "Adjust camera menu further" into gb-ub-photos-bryce
|
b2e7afe66c154914c257bfa17f82bc8ea71e0289 |
04-Apr-2013 |
Angus Kong <shkong@google.com> |
am fe8a8a7b: am 6db9f6ff: am a2dcdfe3: Merge "Don\'t access mParameters dirty bit in other thread" into gb-ub-photos-bryce * commit 'fe8a8a7bff1956d30ab3b421aa44ed194ae4886c': Don't access mParameters dirty bit in other thread
|
0787a4d2b5fffd1baa6b857fb687fac782c9c3b6 |
04-Apr-2013 |
Angus Kong <shkong@google.com> |
am 6db9f6ff: am a2dcdfe3: Merge "Don\'t access mParameters dirty bit in other thread" into gb-ub-photos-bryce * commit '6db9f6ff79c991ade56e226ecc24bd5b14d132cc': Don't access mParameters dirty bit in other thread
|
81feb08c144349ba13252d5f6c5556cfd2380254 |
04-Apr-2013 |
Angus Kong <shkong@google.com> |
am a2dcdfe3: Merge "Don\'t access mParameters dirty bit in other thread" into gb-ub-photos-bryce * commit 'a2dcdfe34f634cc07acfcf92d8829a0373cec969': Don't access mParameters dirty bit in other thread
|
5a7a5ce7a4ea9603649e8b9aff74e829ca8179c1 |
04-Apr-2013 |
Angus Kong <shkong@google.com> |
Merge "Don't access mParameters dirty bit in other thread" into gb-ub-photos-bryce
|
a2dcdfe34f634cc07acfcf92d8829a0373cec969 |
04-Apr-2013 |
Angus Kong <shkong@google.com> |
Merge "Don't access mParameters dirty bit in other thread" into gb-ub-photos-bryce
|
1369a58dddef4aa7b2093eb72376de91491d6e56 |
03-Apr-2013 |
Michael Kolb <kolby@google.com> |
Adjust camera menu further Change-Id: I7e062608a7ee8e16932209640bd50b1864336a40
es/values/dimens.xml
|
3daa3518c3bfa1a2c1da37c56e1a34e9a0cac259 |
03-Apr-2013 |
Michael Kolb <kolby@google.com> |
Adjust camera menu further Change-Id: I7e062608a7ee8e16932209640bd50b1864336a40
rc/com/android/camera/PhotoMenu.java
rc/com/android/camera/PieController.java
rc/com/android/camera/VideoMenu.java
rc/com/android/camera/ui/PieItem.java
rc/com/android/camera/ui/PieRenderer.java
|
45ee707fc868ea1d4901435e401c831316f8c22f |
03-Apr-2013 |
Michael Kolb <kolby@google.com> |
Adjust camera menu further Change-Id: I7e062608a7ee8e16932209640bd50b1864336a40
es/values/dimens.xml
rc/com/android/camera/PhotoMenu.java
rc/com/android/camera/PieController.java
rc/com/android/camera/VideoMenu.java
rc/com/android/camera/ui/PieItem.java
rc/com/android/camera/ui/PieRenderer.java
|
668972947570e983049a5c741d1e936fcb33ec70 |
04-Apr-2013 |
Baligh Uddin <baligh@google.com> |
am c88842c5: (-s ours) am f99b3c68: am e9364e70: am e4ec8797: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce * commit 'c88842c5a96f9c34c6468fa708b81fd1f8726a9e': Import translations. DO NOT MERGE
|
097c5c1d78d609f2b505eece81923399ddf525a2 |
04-Apr-2013 |
Baligh Uddin <baligh@google.com> |
am 0ccc8645: (-s ours) am 5fde40c5: am 3c2780c1: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev * commit '0ccc8645923ec7ac05ef65772cd065f3c51d43b0': Import translations. DO NOT MERGE
|
c07d8097295df9aab70903b0bbdcba3fa0a5c3d1 |
04-Apr-2013 |
Baligh Uddin <baligh@google.com> |
am 5d9bf932: (-s ours) am e80d06c6: am 5fdb5643: am 7f1ca673: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce * commit '5d9bf93261eb4f4c6395ffad5f8fa3581a3508cd': Import translations. DO NOT MERGE
|
7c55ee68f7ddc29b3ae034238430cd4c003acbb7 |
04-Apr-2013 |
Baligh Uddin <baligh@google.com> |
am 17413ac4: (-s ours) am a46448ef: am 1573bd48: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev * commit '17413ac40a5ab2845d47e83cc3fd359c987dde20': Import translations. DO NOT MERGE
|
1d2726df8854090b1f9baceb993b5cf90668b264 |
04-Apr-2013 |
Baligh Uddin <baligh@google.com> |
am f99b3c68: am e9364e70: am e4ec8797: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce * commit 'f99b3c68ccc6f2c9ed21c7ae40524cee45de0fc0': Import translations. DO NOT MERGE
|
ed00abfddf503f7cf37d564d95dd5222ed33f458 |
04-Apr-2013 |
Baligh Uddin <baligh@google.com> |
am 5fde40c5: am 3c2780c1: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev * commit '5fde40c5968c7fc14149366dbea6641e6215fcdb': Import translations. DO NOT MERGE
|
3677dcbc82dd92aca68e1ffbfadb6def15bf078d |
04-Apr-2013 |
Baligh Uddin <baligh@google.com> |
am e80d06c6: am 5fdb5643: am 7f1ca673: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce * commit 'e80d06c63c12f389460dd6a64daae561d7d217f4': Import translations. DO NOT MERGE
|
8aa47247ba3c92208d3b5505764f03a69442c151 |
04-Apr-2013 |
Baligh Uddin <baligh@google.com> |
am a46448ef: am 1573bd48: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev * commit 'a46448ef00af9b9a07686f6c58f5dcbe1475b4c9': Import translations. DO NOT MERGE
|
121b8e0b7e3a018ecc222c490f2af9a443ff0349 |
04-Apr-2013 |
Baligh Uddin <baligh@google.com> |
am e9364e70: am e4ec8797: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce * commit 'e9364e70a2b70a5cab4a6ec0f59714d2b5c367c8': Import translations. DO NOT MERGE
|
fcf22932b4cc6e302b4ff1fa016981af964a13cf |
04-Apr-2013 |
Baligh Uddin <baligh@google.com> |
am 3c2780c1: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev * commit '3c2780c1cb4472a0ba62b3d913c8d06055a82e00': Import translations. DO NOT MERGE
|
a359a54ebd16df699387454131eea6188c24d01d |
04-Apr-2013 |
Baligh Uddin <baligh@google.com> |
am 9aef2ffa: (-s ours) Merge "Import translations. DO NOT MERGE" * commit '9aef2ffa02d85291752a0e84e02762b02e2a6609': Import translations. DO NOT MERGE
|
c7524ff003b4fa01e5bef2e86b880af2f90eaccf |
04-Apr-2013 |
Baligh Uddin <baligh@google.com> |
am 5fdb5643: am 7f1ca673: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce * commit '5fdb564375b04761aea41b47b0f1da8e6299a40a': Import translations. DO NOT MERGE
|
a8542c1fca6c78d3f438a9e16ac3ec4fd19de1f4 |
04-Apr-2013 |
Baligh Uddin <baligh@google.com> |
am 1573bd48: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev * commit '1573bd489792795983639ccbdb8a88dae3c34d68': Import translations. DO NOT MERGE
|
a1c47ca152b8ae187a1f6a25973ff1b80062b004 |
04-Apr-2013 |
Baligh Uddin <baligh@google.com> |
am e4ec8797: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce * commit 'e4ec8797892e0fa6fe91b874b0fab584ecb03055': Import translations. DO NOT MERGE
|
b3789f7f0de5edb4a4d97816cf98109d506025b8 |
04-Apr-2013 |
Baligh Uddin <baligh@google.com> |
am 1c2dc64d: (-s ours) Merge "Import translations. DO NOT MERGE" * commit '1c2dc64d4985ac1ab40bf15f5938b64c3a04ba2f': Import translations. DO NOT MERGE
|
3d668404ff60684baa559a7a87c705d1acc2f22c |
04-Apr-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into master-security-dev
|
59a1ef9eebd959138bd65242c174fe849bb8e58d |
04-Apr-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE"
|
3f90e3a1a70203b486cc1b70760c0d5d9e1d8db1 |
04-Apr-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
|
e4ec8797892e0fa6fe91b874b0fab584ecb03055 |
03-Apr-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
|
52e172727e6acd811dafd13a558e88cca6429bda |
03-Apr-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
|
b7ef3e106c99dfe785ebfbb357dab6e9c381c944 |
03-Apr-2013 |
Baligh Uddin <baligh@google.com> |
am 7f1ca673: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce * commit '7f1ca673ab787c916c07f35ad3a5c868eb700ada': Import translations. DO NOT MERGE
|
9c4c3f76ff654473fafb52b65a78e6826a47ac8f |
03-Apr-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into master-security-dev
|
7636f141eb72c8e3b4df9d76a0a9cea224a0e3b4 |
03-Apr-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE"
|
32e4c1800189ba10bf47f21cb297f4c5bf26ee0f |
03-Apr-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
|
7f1ca673ab787c916c07f35ad3a5c868eb700ada |
03-Apr-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
|
91119c61cdbc3334b5c04912d718427ec0b9ec7e |
03-Apr-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
|
ea4f64a9d1627dd85091f2fe0bc1adda01ccab1d |
03-Apr-2013 |
Doris Liu <tianliu@google.com> |
am 0a44543f: am cd1b8043: am d922866f: am 048a61c7: Improve black bar to keep camera controls in place * commit '0a44543fca1eb4d144bfb503f53608aadf087384': Improve black bar to keep camera controls in place
|
00aa520c375dafda280dcd6ee94cd0681e458693 |
03-Apr-2013 |
Doris Liu <tianliu@google.com> |
am cd1b8043: am d922866f: am 048a61c7: Improve black bar to keep camera controls in place * commit 'cd1b804318e5de51cbb182ab52ca1202c5143349': Improve black bar to keep camera controls in place
|
89444532bf9ea98cdc67f6208546f44c17326821 |
03-Apr-2013 |
Doris Liu <tianliu@google.com> |
am d922866f: am 048a61c7: Improve black bar to keep camera controls in place * commit 'd922866fa47d55a64bc63ec0b292897046065c33': Improve black bar to keep camera controls in place
|
26fae21b46e3c46b4b81cd876da89945c3c2ac19 |
03-Apr-2013 |
Doris Liu <tianliu@google.com> |
am 048a61c7: Improve black bar to keep camera controls in place * commit '048a61c7ab3f63688faeb39c253251e58f30c5f8': Improve black bar to keep camera controls in place
|
802c7437dea616c3d85671668612488dff96e1be |
03-Apr-2013 |
John Hoford <hoford@google.com> |
am bca2cdd5: am a417518f: am 48f8d515: am 8ce4df01: fix touch action in draw * commit 'bca2cdd51480c76e6f63bfd22bff5e5f7ce5ef06': fix touch action in draw
|
bbee3bfe85ab29acda2e13c422459d3cb96b1917 |
03-Apr-2013 |
Doris Liu <tianliu@google.com> |
Improve black bar to keep camera controls in place Bug: 8340996 Change-Id: Ibca4a9f1ed84bd59e29cc988df346f1567de2a5b
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/PhotoUI.java
rc/com/android/camera/ui/CameraControls.java
rc/com/android/camera/ui/CameraRootView.java
rc/com/android/camera/ui/RotatableLayout.java
rc/com/android/camera/ui/SwitcherBackgroundView.java
|
048a61c7ab3f63688faeb39c253251e58f30c5f8 |
03-Apr-2013 |
Doris Liu <tianliu@google.com> |
Improve black bar to keep camera controls in place Bug: 8340996 Change-Id: Ibca4a9f1ed84bd59e29cc988df346f1567de2a5b
es/layout-land/camera_controls.xml
es/layout-port/camera_controls.xml
es/layout/camera_main.xml
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/PhotoUI.java
rc/com/android/camera/ui/CameraControls.java
rc/com/android/camera/ui/CameraRootView.java
rc/com/android/camera/ui/RotatableLayout.java
rc/com/android/camera/ui/SwitcherBackgroundView.java
|
62c2ed606197c8d8e99367f099ac4c30c6015364 |
03-Apr-2013 |
Doris Liu <tianliu@google.com> |
Improve black bar to keep camera controls in place Bug: 8340996 Change-Id: Ibca4a9f1ed84bd59e29cc988df346f1567de2a5b
es/layout-land/camera_controls.xml
es/layout-port/camera_controls.xml
es/layout/camera_main.xml
|
b7571ec575785c79430dd3b93bbc0856ab1578df |
03-Apr-2013 |
John Hoford <hoford@google.com> |
am a417518f: am 48f8d515: am 8ce4df01: fix touch action in draw * commit 'a417518fc9a3c8c7c551cb57fce9dda5dca539b9': fix touch action in draw
|
1a71afb51ce0868798071df074320c35873f89e1 |
03-Apr-2013 |
John Hoford <hoford@google.com> |
am 48f8d515: am 8ce4df01: fix touch action in draw * commit '48f8d51527ecfeab71c0d23c9642b3c1d9059a5f': fix touch action in draw
|
ae29909196a0a210edce7009786bf6147c4edea9 |
03-Apr-2013 |
John Hoford <hoford@google.com> |
am 8ce4df01: fix touch action in draw * commit '8ce4df0105e645aed8503c3f03c98c208621911d': fix touch action in draw
|
adabbeba01188787e8f93213fea6267c5ec32eeb |
03-Apr-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ica7b15ad0f4bc203699d6ffa7867561d9c6b2203 Auto-generated-cl: translation import
es/values-af/filtershow_strings.xml
es/values-am/filtershow_strings.xml
es/values-ar/filtershow_strings.xml
es/values-be/filtershow_strings.xml
es/values-bg/filtershow_strings.xml
es/values-ca/filtershow_strings.xml
es/values-cs/filtershow_strings.xml
es/values-da/filtershow_strings.xml
es/values-de/filtershow_strings.xml
es/values-el/filtershow_strings.xml
es/values-en-rGB/filtershow_strings.xml
es/values-es-rUS/filtershow_strings.xml
es/values-es/filtershow_strings.xml
es/values-et/filtershow_strings.xml
es/values-fa/filtershow_strings.xml
es/values-fi/filtershow_strings.xml
es/values-fr/filtershow_strings.xml
es/values-hi/filtershow_strings.xml
es/values-hr/filtershow_strings.xml
es/values-hu/filtershow_strings.xml
es/values-in/filtershow_strings.xml
es/values-it/filtershow_strings.xml
es/values-iw/filtershow_strings.xml
es/values-ja/filtershow_strings.xml
es/values-ko/filtershow_strings.xml
es/values-lt/filtershow_strings.xml
es/values-lv/filtershow_strings.xml
es/values-ms/filtershow_strings.xml
es/values-nb/filtershow_strings.xml
es/values-nl/filtershow_strings.xml
es/values-pl/filtershow_strings.xml
es/values-pt-rPT/filtershow_strings.xml
es/values-pt/filtershow_strings.xml
es/values-ro/filtershow_strings.xml
es/values-ru/filtershow_strings.xml
es/values-sk/filtershow_strings.xml
es/values-sl/filtershow_strings.xml
es/values-sr/filtershow_strings.xml
es/values-sv/filtershow_strings.xml
es/values-sw/filtershow_strings.xml
es/values-th/filtershow_strings.xml
es/values-tl/filtershow_strings.xml
es/values-tr/filtershow_strings.xml
es/values-uk/filtershow_strings.xml
es/values-vi/filtershow_strings.xml
es/values-zh-rCN/filtershow_strings.xml
es/values-zh-rTW/filtershow_strings.xml
es/values-zu/filtershow_strings.xml
|
cacda31c1178473f3c614ef3533f203f1b7a619b |
03-Apr-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I2ade9f6efc5d5b01ee88c5b4105ce7b18e4a2800 Auto-generated-cl: translation import
es/values-af/filtershow_strings.xml
es/values-am/filtershow_strings.xml
es/values-ar/filtershow_strings.xml
es/values-be/filtershow_strings.xml
es/values-bg/filtershow_strings.xml
es/values-ca/filtershow_strings.xml
es/values-cs/filtershow_strings.xml
es/values-da/filtershow_strings.xml
es/values-de/filtershow_strings.xml
es/values-el/filtershow_strings.xml
es/values-en-rGB/filtershow_strings.xml
es/values-es-rUS/filtershow_strings.xml
es/values-es/filtershow_strings.xml
es/values-et/filtershow_strings.xml
es/values-fa/filtershow_strings.xml
es/values-fi/filtershow_strings.xml
es/values-fr/filtershow_strings.xml
es/values-hi/filtershow_strings.xml
es/values-hr/filtershow_strings.xml
es/values-hu/filtershow_strings.xml
es/values-in/filtershow_strings.xml
es/values-it/filtershow_strings.xml
es/values-iw/filtershow_strings.xml
es/values-ja/filtershow_strings.xml
es/values-ko/filtershow_strings.xml
es/values-lt/filtershow_strings.xml
es/values-lv/filtershow_strings.xml
es/values-ms/filtershow_strings.xml
es/values-nb/filtershow_strings.xml
es/values-nl/filtershow_strings.xml
es/values-pl/filtershow_strings.xml
es/values-pt-rPT/filtershow_strings.xml
es/values-pt/filtershow_strings.xml
es/values-ro/filtershow_strings.xml
es/values-ru/filtershow_strings.xml
es/values-sk/filtershow_strings.xml
es/values-sl/filtershow_strings.xml
es/values-sr/filtershow_strings.xml
es/values-sv/filtershow_strings.xml
es/values-sw/filtershow_strings.xml
es/values-th/filtershow_strings.xml
es/values-tl/filtershow_strings.xml
es/values-tr/filtershow_strings.xml
es/values-uk/filtershow_strings.xml
es/values-vi/filtershow_strings.xml
es/values-zh-rCN/filtershow_strings.xml
es/values-zh-rTW/filtershow_strings.xml
es/values-zu/filtershow_strings.xml
|
7782dea2a909949c9914d2acd38e79cc96f79be5 |
03-Apr-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I23ea8bc294e56b060d63cc67059d4dd4f26b9143 Auto-generated-cl: translation import
es/values-af/filtershow_strings.xml
es/values-am/filtershow_strings.xml
es/values-ar/filtershow_strings.xml
es/values-be/filtershow_strings.xml
es/values-bg/filtershow_strings.xml
es/values-ca/filtershow_strings.xml
es/values-cs/filtershow_strings.xml
es/values-da/filtershow_strings.xml
es/values-de/filtershow_strings.xml
es/values-el/filtershow_strings.xml
es/values-en-rGB/filtershow_strings.xml
es/values-es-rUS/filtershow_strings.xml
es/values-es/filtershow_strings.xml
es/values-et/filtershow_strings.xml
es/values-fa/filtershow_strings.xml
es/values-fi/filtershow_strings.xml
es/values-fr/filtershow_strings.xml
es/values-hi/filtershow_strings.xml
es/values-hr/filtershow_strings.xml
es/values-hu/filtershow_strings.xml
es/values-in/filtershow_strings.xml
es/values-it/filtershow_strings.xml
es/values-iw/filtershow_strings.xml
es/values-ja/filtershow_strings.xml
es/values-ko/filtershow_strings.xml
es/values-lt/filtershow_strings.xml
es/values-lv/filtershow_strings.xml
es/values-ms/filtershow_strings.xml
es/values-nb/filtershow_strings.xml
es/values-nl/filtershow_strings.xml
es/values-pl/filtershow_strings.xml
es/values-pt-rPT/filtershow_strings.xml
es/values-pt/filtershow_strings.xml
es/values-ro/filtershow_strings.xml
es/values-ru/filtershow_strings.xml
es/values-sk/filtershow_strings.xml
es/values-sl/filtershow_strings.xml
es/values-sr/filtershow_strings.xml
es/values-sv/filtershow_strings.xml
es/values-sw/filtershow_strings.xml
es/values-th/filtershow_strings.xml
es/values-tl/filtershow_strings.xml
es/values-tr/filtershow_strings.xml
es/values-uk/filtershow_strings.xml
es/values-vi/filtershow_strings.xml
es/values-zh-rCN/filtershow_strings.xml
es/values-zh-rTW/filtershow_strings.xml
es/values-zu/filtershow_strings.xml
|
24621f56be05485c6a8015e5d60e627e7aa14529 |
03-Apr-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I67a90d5cfd30f854cda228e0a5f54cd640813e16 Auto-generated-cl: translation import
es/values-af/filtershow_strings.xml
es/values-am/filtershow_strings.xml
es/values-ar/filtershow_strings.xml
es/values-be/filtershow_strings.xml
es/values-bg/filtershow_strings.xml
es/values-ca/filtershow_strings.xml
es/values-cs/filtershow_strings.xml
es/values-da/filtershow_strings.xml
es/values-de/filtershow_strings.xml
es/values-el/filtershow_strings.xml
es/values-en-rGB/filtershow_strings.xml
es/values-es-rUS/filtershow_strings.xml
es/values-es/filtershow_strings.xml
es/values-et/filtershow_strings.xml
es/values-fa/filtershow_strings.xml
es/values-fi/filtershow_strings.xml
es/values-fr/filtershow_strings.xml
es/values-hi/filtershow_strings.xml
es/values-hr/filtershow_strings.xml
es/values-hu/filtershow_strings.xml
es/values-in/filtershow_strings.xml
es/values-it/filtershow_strings.xml
es/values-iw/filtershow_strings.xml
es/values-ja/filtershow_strings.xml
es/values-ko/filtershow_strings.xml
es/values-lt/filtershow_strings.xml
es/values-lv/filtershow_strings.xml
es/values-ms/filtershow_strings.xml
es/values-nb/filtershow_strings.xml
es/values-nl/filtershow_strings.xml
es/values-pl/filtershow_strings.xml
es/values-pt-rPT/filtershow_strings.xml
es/values-pt/filtershow_strings.xml
es/values-ro/filtershow_strings.xml
es/values-ru/filtershow_strings.xml
es/values-sk/filtershow_strings.xml
es/values-sl/filtershow_strings.xml
es/values-sr/filtershow_strings.xml
es/values-sv/filtershow_strings.xml
es/values-sw/filtershow_strings.xml
es/values-th/filtershow_strings.xml
es/values-tl/filtershow_strings.xml
es/values-tr/filtershow_strings.xml
es/values-uk/filtershow_strings.xml
es/values-vi/filtershow_strings.xml
es/values-zh-rCN/filtershow_strings.xml
es/values-zh-rTW/filtershow_strings.xml
es/values-zu/filtershow_strings.xml
|
4f47a6ce7add3d00c90beec867e555c691df9132 |
03-Apr-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I67a90d5cfd30f854cda228e0a5f54cd640813e16 Auto-generated-cl: translation import
es/values-af/filtershow_strings.xml
es/values-am/filtershow_strings.xml
es/values-ar/filtershow_strings.xml
es/values-be/filtershow_strings.xml
es/values-bg/filtershow_strings.xml
es/values-ca/filtershow_strings.xml
es/values-cs/filtershow_strings.xml
es/values-da/filtershow_strings.xml
es/values-de/filtershow_strings.xml
es/values-el/filtershow_strings.xml
es/values-en-rGB/filtershow_strings.xml
es/values-es-rUS/filtershow_strings.xml
es/values-es/filtershow_strings.xml
es/values-et/filtershow_strings.xml
es/values-fa/filtershow_strings.xml
es/values-fi/filtershow_strings.xml
es/values-fr/filtershow_strings.xml
es/values-hi/filtershow_strings.xml
es/values-hr/filtershow_strings.xml
es/values-hu/filtershow_strings.xml
es/values-in/filtershow_strings.xml
es/values-it/filtershow_strings.xml
es/values-iw/filtershow_strings.xml
es/values-ja/filtershow_strings.xml
es/values-ko/filtershow_strings.xml
es/values-lt/filtershow_strings.xml
es/values-lv/filtershow_strings.xml
es/values-ms/filtershow_strings.xml
es/values-nb/filtershow_strings.xml
es/values-nl/filtershow_strings.xml
es/values-pl/filtershow_strings.xml
es/values-pt-rPT/filtershow_strings.xml
es/values-pt/filtershow_strings.xml
es/values-ro/filtershow_strings.xml
es/values-ru/filtershow_strings.xml
es/values-sk/filtershow_strings.xml
es/values-sl/filtershow_strings.xml
es/values-sr/filtershow_strings.xml
es/values-sv/filtershow_strings.xml
es/values-sw/filtershow_strings.xml
es/values-th/filtershow_strings.xml
es/values-tl/filtershow_strings.xml
es/values-tr/filtershow_strings.xml
es/values-uk/filtershow_strings.xml
es/values-vi/filtershow_strings.xml
es/values-zh-rCN/filtershow_strings.xml
es/values-zh-rTW/filtershow_strings.xml
es/values-zu/filtershow_strings.xml
|
5678f6a700c81c2600132c8147fe35f20e7891f3 |
03-Apr-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I833123fad4717e00635ded9806b6a1819f242397 Auto-generated-cl: translation import
es/values-ko/strings.xml
es/values-ru/strings.xml
|
0ee761aa4783ad3b4d499d9dd25d33a4838cfcc3 |
03-Apr-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I0b763d7d7583883896263edab9697755911ef957 Auto-generated-cl: translation import
es/values-ko/strings.xml
es/values-ru/strings.xml
|
f26737a07791f501d5be779305353e940f6e521b |
03-Apr-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I2e0293945a088c14757a9bc734b05ac741b5de4d Auto-generated-cl: translation import
es/values-ko/strings.xml
es/values-ru/strings.xml
|
20c027e4976b2f7b7487b5731e19f889c8462902 |
03-Apr-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I3d22344797079b775de3781b0e3d8b73623dcec9 Auto-generated-cl: translation import
es/values-ko/strings.xml
es/values-ru/strings.xml
|
2f21907c5136cd2e51f71fcbe754fd388a7008df |
03-Apr-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I3d22344797079b775de3781b0e3d8b73623dcec9 Auto-generated-cl: translation import
es/values-ko/strings.xml
es/values-ru/strings.xml
|
5a58fb2146ec75061cc2a9a038628a6b7f340b34 |
03-Apr-2013 |
John Hoford <hoford@google.com> |
fix touch action in draw Change-Id: I8c1e040a795186c47c8319441ed1c371497a5f6d
rc/com/android/gallery3d/filtershow/imageshow/ImageDraw.java
|
8ce4df0105e645aed8503c3f03c98c208621911d |
03-Apr-2013 |
John Hoford <hoford@google.com> |
fix touch action in draw Change-Id: I8c1e040a795186c47c8319441ed1c371497a5f6d
rc/com/android/gallery3d/filtershow/imageshow/ImageDraw.java
|
2ebee8fc991443fed9f043045a5c8feb2ff9342c |
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
|
b1666afb8778b371c52e7a9cc7680f1c3a05de34 |
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
|
7dca39d8b25676c6400c75a70d6ac8a498441270 |
03-Apr-2013 |
The Android Automerger <android-build@android.com> |
merge in jb-mr2-release history after reset to jb-mr2-dev
|
2aee949e04aa5fba2a6125b6490f1861e144ded1 |
03-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
am 7c69ecd1: am 7b46e8db: am 0d74b562: am 2538c992: Fix segfaults in RS filters * commit '7c69ecd17eb8d86d4c5c0afc9f103d5ad115fe79': Fix segfaults in RS filters
|
a567089eb64c63238187c38bf12366be84c6859b |
03-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
am 7b46e8db: am 0d74b562: am 2538c992: Fix segfaults in RS filters * commit '7b46e8db4d7535b2961e6bec1c8a60d04e82b3d4': Fix segfaults in RS filters
|
8ea87125c732cccb68a5eba4d42dd79c5706eeab |
03-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
am 0d74b562: am 2538c992: Fix segfaults in RS filters * commit '0d74b562db388f87f146931c410ccf3da1c72681': Fix segfaults in RS filters
|
12aa47fdde6249a3e5d24c1b776db3b68ce3498b |
03-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
am 2538c992: Fix segfaults in RS filters * commit '2538c992dc70b3eda7487ef68dba0390b2f337d7': Fix segfaults in RS filters
|
67dd6e6af3b652893c5890f24c35b2b5acfd633d |
03-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
Fix segfaults in RS filters We did not recreate the filters in all cases when the input size change. bug:8530112 Change-Id: I4cb47498532618271b90e56c01ec63ad991db787
rc/com/android/gallery3d/filtershow/filters/ImageFilterRS.java
|
2538c992dc70b3eda7487ef68dba0390b2f337d7 |
03-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
Fix segfaults in RS filters We did not recreate the filters in all cases when the input size change. bug:8530112 Change-Id: I4cb47498532618271b90e56c01ec63ad991db787
rc/com/android/gallery3d/filtershow/filters/ImageFilterRS.java
|
88f022126b8fe9e5710fd2f599277870fce45ba6 |
03-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am ab807016: am de689168: am 62e921d2: am ca926f9c: Merge "Speed improvements for ExifOutputStream." into gb-ub-photos-bryce * commit 'ab807016441d22295dbdf206bba9667663b44707': Speed improvements for ExifOutputStream.
|
8411829ab572abccca47f5a4b84d081c0c8b49e2 |
03-Apr-2013 |
John Hoford <hoford@google.com> |
am dbc5b622: am 7f24dcdd: am 6d35b711: am 2b246048: Merge "fix calling Allocation.copyFrom without context" into gb-ub-photos-bryce * commit 'dbc5b6224e7da76b11d2b0300b92356b7794fcd8': fix calling Allocation.copyFrom without context
|
dba75ed3b9952bbb6cd59b0f323a0dd6a5df4873 |
03-Apr-2013 |
Angus Kong <shkong@google.com> |
am 4d8cc44f: am ef44ce86: am e0193fa9: am 0e018f44: Merge "Make stopPreview synchronous." into gb-ub-photos-bryce * commit '4d8cc44f22623dd39e6ec7eb206c9b1d6b76bcea': Make stopPreview synchronous.
|
c72a451e4398e70fa68846f11e9bccfd8b6f97fb |
03-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 5aaeed1d: am acd9cb30: am f8f2b484: am 7bf0f568: Merge "Cleanup sloppy memory handling in ExifOutputStream." into gb-ub-photos-bryce * commit '5aaeed1dc0bd786aa36218c7fbc5e5399e4af434': Cleanup sloppy memory handling in ExifOutputStream.
|
9c4a8976e2f9834636b7505c8eff03d2e1235cc8 |
03-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am de689168: am 62e921d2: am ca926f9c: Merge "Speed improvements for ExifOutputStream." into gb-ub-photos-bryce * commit 'de68916887a055fd456bf6fe547da1e9101ae68f': Speed improvements for ExifOutputStream.
|
744dbdd761139d5c71d812b734ca2c0f0f04e37e |
03-Apr-2013 |
John Hoford <hoford@google.com> |
am 7f24dcdd: am 6d35b711: am 2b246048: Merge "fix calling Allocation.copyFrom without context" into gb-ub-photos-bryce * commit '7f24dcdd259248102d42a6aa0986625c52956fa3': fix calling Allocation.copyFrom without context
|
fda200628a1e21ed06798a68fe01f709612ebc18 |
03-Apr-2013 |
Angus Kong <shkong@google.com> |
am ef44ce86: am e0193fa9: am 0e018f44: Merge "Make stopPreview synchronous." into gb-ub-photos-bryce * commit 'ef44ce8626f5ed7b60a4b3b69a8cfafefb6d8fe7': Make stopPreview synchronous.
|
74f5239ea470934c01a2687c5e37938d97aff42f |
03-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am acd9cb30: am f8f2b484: am 7bf0f568: Merge "Cleanup sloppy memory handling in ExifOutputStream." into gb-ub-photos-bryce * commit 'acd9cb3049984759d7a41ca1bbb85b086f5843cf': Cleanup sloppy memory handling in ExifOutputStream.
|
1fd61c578e10d34397d322b0aa05700ede5214e5 |
03-Apr-2013 |
John Hoford <hoford@google.com> |
am 2b246048: Merge "fix calling Allocation.copyFrom without context" into gb-ub-photos-bryce * commit '2b24604837aa9821d7e5ed409c2164ede803e0c4': fix calling Allocation.copyFrom without context
rc/com/android/gallery3d/filtershow/cache/CachingPipeline.java
|
60238c6483063acb7eaca78e3678b1fe7d4714f1 |
03-Apr-2013 |
Angus Kong <shkong@google.com> |
am 0e018f44: Merge "Make stopPreview synchronous." into gb-ub-photos-bryce * commit '0e018f44d4ecccd9be27bd4eac04957741ae57d2': Make stopPreview synchronous.
rc/com/android/camera/CameraManager.java
|
9b6781c8bcc10351110aa44655b0b53e2a2dc90c |
03-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 62e921d2: am ca926f9c: Merge "Speed improvements for ExifOutputStream." into gb-ub-photos-bryce * commit '62e921d237895fead41ad969cc03befcc760d6d5': Speed improvements for ExifOutputStream.
|
20ab273b17536bbea2018fe809c1cae48b2e5951 |
03-Apr-2013 |
John Hoford <hoford@google.com> |
am 6d35b711: am 2b246048: Merge "fix calling Allocation.copyFrom without context" into gb-ub-photos-bryce * commit '6d35b711ff02de4a9d22cc4a913cd34ed0b1c15b': fix calling Allocation.copyFrom without context
|
f51d0eeec2c4a9a742e3a7d6b585b527c4056c39 |
03-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am ca926f9c: Merge "Speed improvements for ExifOutputStream." into gb-ub-photos-bryce * commit 'ca926f9c13fdd3f813811b02782d4fb4fb79d7f5': Speed improvements for ExifOutputStream.
|
b16f45c1791d8d4513da02f0a07de25ef9bbb944 |
03-Apr-2013 |
John Hoford <hoford@google.com> |
am 2b246048: Merge "fix calling Allocation.copyFrom without context" into gb-ub-photos-bryce * commit '2b24604837aa9821d7e5ed409c2164ede803e0c4': fix calling Allocation.copyFrom without context
|
93d76a69aecf03e7ac7653bd088fe6bb64356ec1 |
03-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Speed improvements for ExifOutputStream." into gb-ub-photos-bryce
|
d97f8b62e8ca61c86292d2d1ad826914c439ac6f |
03-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Speed improvements for ExifOutputStream." into gb-ub-photos-bryce
|
ca926f9c13fdd3f813811b02782d4fb4fb79d7f5 |
03-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Speed improvements for ExifOutputStream." into gb-ub-photos-bryce
|
143574aedfb2ca31db2bb512220c119b62fda1e6 |
03-Apr-2013 |
Angus Kong <shkong@google.com> |
am e0193fa9: am 0e018f44: Merge "Make stopPreview synchronous." into gb-ub-photos-bryce * commit 'e0193fa9603e9fefe7b0f4640f7ac337e56fe7f4': Make stopPreview synchronous.
|
eb5c3ee0b43fcf905bd89ef6f168f31e03b5820d |
03-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am f8f2b484: am 7bf0f568: Merge "Cleanup sloppy memory handling in ExifOutputStream." into gb-ub-photos-bryce * commit 'f8f2b48464627496fdb0e71d6f29b25942f5d3c4': Cleanup sloppy memory handling in ExifOutputStream.
|
2b24604837aa9821d7e5ed409c2164ede803e0c4 |
03-Apr-2013 |
John Hoford <hoford@google.com> |
Merge "fix calling Allocation.copyFrom without context" into gb-ub-photos-bryce
|
02ecf8478a64c466cb2b70cf3ccde09ff895c58c |
03-Apr-2013 |
John Hoford <hoford@google.com> |
Merge "fix calling Allocation.copyFrom without context" into gb-ub-photos-bryce
|
a30415e11cad39cc3a5fdf53e98671be4a1470a2 |
03-Apr-2013 |
Angus Kong <shkong@google.com> |
am 0e018f44: Merge "Make stopPreview synchronous." into gb-ub-photos-bryce * commit '0e018f44d4ecccd9be27bd4eac04957741ae57d2': Make stopPreview synchronous.
|
da7c27f1aa36a0c654287e77d777f9ee88331a3f |
03-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 7bf0f568: Merge "Cleanup sloppy memory handling in ExifOutputStream." into gb-ub-photos-bryce * commit '7bf0f568f7e09275477f1ff2a4ac107274798329': Cleanup sloppy memory handling in ExifOutputStream.
|
0e018f44d4ecccd9be27bd4eac04957741ae57d2 |
03-Apr-2013 |
Angus Kong <shkong@google.com> |
Merge "Make stopPreview synchronous." into gb-ub-photos-bryce
|
7a02a7916312cc25e03badd30a76b36c92a007bc |
03-Apr-2013 |
Angus Kong <shkong@google.com> |
Merge "Make stopPreview synchronous." into gb-ub-photos-bryce
|
205a0901d5b070e8740e865079bd868c976c67c3 |
03-Apr-2013 |
John Hoford <hoford@google.com> |
fix calling Allocation.copyFrom without context bug:8526929 Change-Id: I407539fae153642ea9be46a2f4102ab827e24164
rc/com/android/gallery3d/filtershow/cache/CachingPipeline.java
|
33acee47cf7e6e107321fdbe4b78554ed2dd6728 |
03-Apr-2013 |
John Hoford <hoford@google.com> |
fix calling Allocation.copyFrom without context bug:8526929 Change-Id: I407539fae153642ea9be46a2f4102ab827e24164
rc/com/android/gallery3d/filtershow/cache/CachingPipeline.java
|
43b9c0c3fce9cb877ca73cb34917fb2c7556c4d4 |
02-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Speed improvements for ExifOutputStream. Change-Id: I7d3ee9c157aefe67734e7b49cfa7868254c134ef
allerycommon/src/com/android/gallery3d/exif/ExifInterface.java
allerycommon/src/com/android/gallery3d/exif/ExifOutputStream.java
|
0cea1fca1ac717b0bf6f4f75c2e41e8549bc97e2 |
02-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Speed improvements for ExifOutputStream. Change-Id: I7d3ee9c157aefe67734e7b49cfa7868254c134ef
allerycommon/src/com/android/gallery3d/exif/ExifInterface.java
allerycommon/src/com/android/gallery3d/exif/ExifOutputStream.java
ests/src/com/android/gallery3d/exif/ExifOutputStreamTest.java
ests/src/com/android/gallery3d/exif/ExifXmlDataTestCase.java
|
4bee0f203dc96652aca02516f6f2d7d2493fab52 |
02-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Speed improvements for ExifOutputStream. Change-Id: I7d3ee9c157aefe67734e7b49cfa7868254c134ef
allerycommon/src/com/android/gallery3d/exif/ExifInterface.java
allerycommon/src/com/android/gallery3d/exif/ExifOutputStream.java
ests/src/com/android/gallery3d/exif/ExifOutputStreamTest.java
ests/src/com/android/gallery3d/exif/ExifXmlDataTestCase.java
|
7bf0f568f7e09275477f1ff2a4ac107274798329 |
03-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Cleanup sloppy memory handling in ExifOutputStream." into gb-ub-photos-bryce
|
f16b61831d53b1319f6543e1df616805b34b5279 |
03-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Cleanup sloppy memory handling in ExifOutputStream." into gb-ub-photos-bryce
|
676be54cad694d27342ec5573acba4ce0560834e |
02-Apr-2013 |
Angus Kong <shkong@google.com> |
Make stopPreview synchronous. bug:8517092 Change-Id: I66d218e206dab8ad8c80f61ca480923a6be0b0b6
rc/com/android/camera/CameraManager.java
|
b71331b1c245e039901b89f20342749e95d9d7a8 |
02-Apr-2013 |
Angus Kong <shkong@google.com> |
Make stopPreview synchronous. bug:8517092 Change-Id: I66d218e206dab8ad8c80f61ca480923a6be0b0b6
rc/com/android/camera/CameraManager.java
|
e3961e715d17179849901f2274e046b925b1a058 |
02-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Cleanup sloppy memory handling in ExifOutputStream. Change-Id: Ifc34a958a6214fa89ee52cfbdeb6d53baa8cd3fd
allerycommon/src/com/android/gallery3d/exif/ExifOutputStream.java
|
14954a62d0d103a5b120225ccf1d7da38b8694e3 |
02-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Cleanup sloppy memory handling in ExifOutputStream. Change-Id: Ifc34a958a6214fa89ee52cfbdeb6d53baa8cd3fd
allerycommon/src/com/android/gallery3d/exif/ExifOutputStream.java
|
046757b54f66733656db02692b5e9fef97c13c52 |
02-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Cleanup sloppy memory handling in ExifOutputStream. Change-Id: Ifc34a958a6214fa89ee52cfbdeb6d53baa8cd3fd
allerycommon/src/com/android/gallery3d/exif/ExifOutputStream.java
|
ae8be27cfc48de7ef5fde1bff9fd98f39358a50e |
02-Apr-2013 |
Bobby Georgescu <georgescu@google.com> |
am 17dfe32c: am 35542a64: am d006c659: am 54762e1e: Merge "Usage statistics for photo and video capture" into gb-ub-photos-bryce * commit '17dfe32cb9c9f9159a021f6fbd7cc759f3f1bc8f': Usage statistics for photo and video capture
|
35a24c96335233bc0fcf8a597646c7352c6aeb59 |
02-Apr-2013 |
Bobby Georgescu <georgescu@google.com> |
am 35542a64: am d006c659: am 54762e1e: Merge "Usage statistics for photo and video capture" into gb-ub-photos-bryce * commit '35542a64f34e2c349fb52499aca54365d9fd67a1': Usage statistics for photo and video capture
|
53e958c912bf872d0f7d321cc0fd2f33c7ffd604 |
02-Apr-2013 |
Bobby Georgescu <georgescu@google.com> |
am d006c659: am 54762e1e: Merge "Usage statistics for photo and video capture" into gb-ub-photos-bryce * commit 'd006c65988e61f4f8ebe0764139b673c2bd0f68d': Usage statistics for photo and video capture
|
0bfe98f484e9914825bf5fab05cbf5b0f901725f |
02-Apr-2013 |
Bobby Georgescu <georgescu@google.com> |
am 54762e1e: Merge "Usage statistics for photo and video capture" into gb-ub-photos-bryce * commit '54762e1e909d7bf85dc913414b047be9a499c18a': Usage statistics for photo and video capture
|
54762e1e909d7bf85dc913414b047be9a499c18a |
02-Apr-2013 |
Bobby Georgescu <georgescu@google.com> |
Merge "Usage statistics for photo and video capture" into gb-ub-photos-bryce
|
0235199a906f7cda3713a689018930912688b866 |
02-Apr-2013 |
Bobby Georgescu <georgescu@google.com> |
Merge "Usage statistics for photo and video capture" into gb-ub-photos-bryce
|
440de3edf6451ab7757bb1773c77ab9ef5e055c1 |
02-Apr-2013 |
The Android Open Source Project <initial-contribution@android.com> |
am 39b63c73: (-s ours) am ad8d0e65: Reconcile with jb-mr2-release - do not merge * commit '39b63c736f2eaa5546bc65ded09b5fed1dcdfa17': am ce9ca226: Merge "Handle InterruptedException in waitDone" into gb-ub-photos-bryce am 36cac0c2: Merge "Don\'t use SynchronousQueue to pass results." into gb-ub-photos-bryce am bb746823: Merge "Fix NPE when reconnecting camera." into gb-ub-photos-bryce Make camera releasing synchronous.
|
96a153762ee07b56dcd8ce724aa4d0dd158d4376 |
02-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
am 3476f21c: am dd55e4c4: am b1c06b88: am 20eb41f8: Fix stickiness issues with UI * commit '3476f21c3510e4d2184f3275ba7e1c6ffed0f1b1': Fix stickiness issues with UI
|
d834b4d104480270b989e747f682cba988eff75e |
02-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
am a1f310b8: am 687baab4: am 64597c85: am 5bd6e14f: Don\'t try freeing resources on a different thread.. * commit 'a1f310b8f9c31261ecf8df7e00a1163017ff33e1': Don't try freeing resources on a different thread..
|
810536209544dbf446b3b03e9d1fa4b1d9a70427 |
02-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 5fd2066f: am 8ef3622e: am 890ebeb0: am e7aa98e5: Changed editor back button behavior. * commit '5fd2066feacc87f0474c2280618d419ecfb7f92c': Changed editor back button behavior.
|
b17170a798acf68839578924422031aa0d16ded1 |
02-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 27f47ac5: am 83f44a35: am dd9a6fb6: am 902a6f7f: Merge "Change panels organization. Also fixes border updates handling." into gb-ub-photos-bryce * commit '27f47ac56de987db354b0e3a1cb333054563c50d': Change panels organization. Also fixes border updates handling.
|
3d488880c397cfecd5a2a3dccb6c95dcabd71ee8 |
02-Apr-2013 |
Michael Kolb <kolby@google.com> |
am 10caccaf: am c93dc7b6: am 63d9e873: am fa3b121e: Merge "Pie design update" into gb-ub-photos-bryce * commit '10caccaf91c6fd316e43d70761a56ca7294f416b': Pie design update
|
a59cb7b63010403dffaa703ff06983a88fe64322 |
02-Apr-2013 |
Angus Kong <shkong@google.com> |
am 9b7f2229: am 58cf8871: am b4edf5b3: am ce9ca226: Merge "Handle InterruptedException in waitDone" into gb-ub-photos-bryce * commit '9b7f2229f8e4af029c9963adc7fb37f05b97cb28': Handle InterruptedException in waitDone
|
ecfdb8f744225827ca3357e74106aa861f7f9b7f |
02-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 250dc692: am a1dfc07a: am 65ef29f9: am 0b65c2c2: Merge "Added apply UI callbacks for rotate/mirror operations." into gb-ub-photos-bryce * commit '250dc69246b6ac4b35cba9c2f026d3c725159fab': Added apply UI callbacks for rotate/mirror operations.
|
4deda440c90d329179173724ba08fa5b3bf13beb |
02-Apr-2013 |
Angus Kong <shkong@google.com> |
am c7c90c1d: am 11854b43: am 07abb731: am 36cac0c2: Merge "Don\'t use SynchronousQueue to pass results." into gb-ub-photos-bryce * commit 'c7c90c1dcea5a99ed39dda40e440141d1809db21': Don't use SynchronousQueue to pass results.
|
d52af7296b0e6873d19ed43b630d6f9e9cdb3591 |
02-Apr-2013 |
Bobby Georgescu <georgescu@google.com> |
am d63077e3: am b1436075: am adde6e72: am 8f8811fa: Merge "Usage statistics for camera settings" into gb-ub-photos-bryce * commit 'd63077e333f4b1581e136d0fba11829f698dafc3': Usage statistics for camera settings
|
6659d2b53c41476cad532f0728a8ea6c458b381a |
02-Apr-2013 |
Bobby Georgescu <georgescu@google.com> |
am 4f1ed267: am 8e841e91: am 36f54901: am 6058af44: Enforce bmp type in pool, handle MTP image decode failure * commit '4f1ed2679730b9037ead3811915edffb1a559789': Enforce bmp type in pool, handle MTP image decode failure
|
046a48291b75fb4915f39199534c5ea3f87e86df |
02-Apr-2013 |
The Android Open Source Project <initial-contribution@android.com> |
am ad8d0e65: Reconcile with jb-mr2-release - do not merge * commit 'ad8d0e6512b89af0310f454e7f16b710fef16e96': am ce9ca226: Merge "Handle InterruptedException in waitDone" into gb-ub-photos-bryce am 36cac0c2: Merge "Don\'t use SynchronousQueue to pass results." into gb-ub-photos-bryce am bb746823: Merge "Fix NPE when reconnecting camera." into gb-ub-photos-bryce Make camera releasing synchronous.
|
fff9f80d5d437c3fc5fabcd9ba60bed36bec07c1 |
02-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
am dd55e4c4: am b1c06b88: am 20eb41f8: Fix stickiness issues with UI * commit 'dd55e4c4816aabae250e28ea8b87ce41d1b416af': Fix stickiness issues with UI
|
c9b42a3e3d7144c5cb029d0f0c4d27a57924f46d |
02-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
am 687baab4: am 64597c85: am 5bd6e14f: Don\'t try freeing resources on a different thread.. * commit '687baab4ea05e1a5569edfe9224a705f285d5afd': Don't try freeing resources on a different thread..
|
03395fbe016f47f49d0b046c3ff7f3187a910877 |
02-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 8ef3622e: am 890ebeb0: am e7aa98e5: Changed editor back button behavior. * commit '8ef3622e8e3dfed4a0ddf6b26b3603c4823b3a1d': Changed editor back button behavior.
|
e50ae6f3f973bdf2e3bcb4e005a6604a252801f1 |
02-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 83f44a35: am dd9a6fb6: am 902a6f7f: Merge "Change panels organization. Also fixes border updates handling." into gb-ub-photos-bryce * commit '83f44a3534583cc9900dc3804e028cc11a56adca': Change panels organization. Also fixes border updates handling.
|
9bf0b6c73580d0f858e2358bb5772e61a4a69982 |
02-Apr-2013 |
Michael Kolb <kolby@google.com> |
am c93dc7b6: am 63d9e873: am fa3b121e: Merge "Pie design update" into gb-ub-photos-bryce * commit 'c93dc7b61af4fa41070abfb7c61eff39c54710aa': Pie design update
|
a4311a4458f15729fdc78cdc90837875978f84d8 |
02-Apr-2013 |
Angus Kong <shkong@google.com> |
am 58cf8871: am b4edf5b3: am ce9ca226: Merge "Handle InterruptedException in waitDone" into gb-ub-photos-bryce * commit '58cf88713ce6e006ace8ce91e8fe7214a0c54f6f': Handle InterruptedException in waitDone
|
a3ce06a2ef73f5c70f564ecbb9252eeca8b256aa |
02-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am a1dfc07a: am 65ef29f9: am 0b65c2c2: Merge "Added apply UI callbacks for rotate/mirror operations." into gb-ub-photos-bryce * commit 'a1dfc07a0ae2dbfea570617954d3b5853d8b8bcd': Added apply UI callbacks for rotate/mirror operations.
|
eca69e1b5ee24f90568e93e7a99eee65c5800370 |
02-Apr-2013 |
Angus Kong <shkong@google.com> |
am 11854b43: am 07abb731: am 36cac0c2: Merge "Don\'t use SynchronousQueue to pass results." into gb-ub-photos-bryce * commit '11854b435f54c8cd6191c245a76c465f0d29ff03': Don't use SynchronousQueue to pass results.
|
57e64e71ef4f9b039e86969cf2e8c709a02a693d |
02-Apr-2013 |
Bobby Georgescu <georgescu@google.com> |
am b1436075: am adde6e72: am 8f8811fa: Merge "Usage statistics for camera settings" into gb-ub-photos-bryce * commit 'b1436075172ca51e3181f4aae7385775cb6ccb76': Usage statistics for camera settings
|
e470809ef48f780a4b875c603a728f5606a43800 |
02-Apr-2013 |
Bobby Georgescu <georgescu@google.com> |
am 8e841e91: am 36f54901: am 6058af44: Enforce bmp type in pool, handle MTP image decode failure * commit '8e841e9125e78f8c8f8c07979c2838cccdf3ca62': Enforce bmp type in pool, handle MTP image decode failure
|
1d99f5c584affd24a88edb0514533fa05327cb0d |
02-Apr-2013 |
Bobby Georgescu <georgescu@google.com> |
Usage statistics for photo and video capture Bug: 8433834 Change-Id: Idb4343a9e8d6895adbf9707e8c7811d007acc984
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/VideoModule.java
rc_pd/com/android/gallery3d/util/UsageStatistics.java
|
301b64679cfbd452060ac5b9595d315135550120 |
02-Apr-2013 |
Bobby Georgescu <georgescu@google.com> |
Usage statistics for photo and video capture Bug: 8433834 Change-Id: Idb4343a9e8d6895adbf9707e8c7811d007acc984
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/VideoModule.java
rc_pd/com/android/gallery3d/util/UsageStatistics.java
|
42a4a22eb36da1f7950476cc217ee827be7b8af8 |
02-Apr-2013 |
The Android Automerger <android-build@android.com> |
merge in jb-mr2-release history after reset to jb-mr2-dev
|
04f495b436521cf1182c4e9c4cb496d9ab9dddf3 |
02-Apr-2013 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with jb-mr2-release - do not merge Change-Id: Ia460e8a06b1d068077f52c35c045ad7325e78470
|
11cc9b07dec9f1ec7a74fe3cfcd71f7824bf3824 |
02-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
am b1c06b88: am 20eb41f8: Fix stickiness issues with UI * commit 'b1c06b881abcfff66951173819d73faaf0e40005': Fix stickiness issues with UI
|
df2b481c637633436eb32052e28b0015274e514d |
02-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
am 64597c85: am 5bd6e14f: Don\'t try freeing resources on a different thread.. * commit '64597c85ddfcc3800c81e1738c9a7b75649a0ae9': Don't try freeing resources on a different thread..
|
2395a176ba6b02fe1e081152e2b1f34c24430a0f |
02-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 890ebeb0: am e7aa98e5: Changed editor back button behavior. * commit '890ebeb0a7af5f804f6ae567f0e10d2b7323626f': Changed editor back button behavior.
|
ddbf557dc709f05a8e172432e452601b8cfb287d |
02-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am dd9a6fb6: am 902a6f7f: Merge "Change panels organization. Also fixes border updates handling." into gb-ub-photos-bryce * commit 'dd9a6fb653d3dbb0238d7436087dc7bce8a9f00d': Change panels organization. Also fixes border updates handling.
|
d159557690a39d529491254507a75e602c92a3bd |
02-Apr-2013 |
Michael Kolb <kolby@google.com> |
am 63d9e873: am fa3b121e: Merge "Pie design update" into gb-ub-photos-bryce * commit '63d9e87389ac1ecc5b68c6e49794a5462c415a21': Pie design update
|
ea91adfabfce823a150f30654bb413f83f799444 |
02-Apr-2013 |
Angus Kong <shkong@google.com> |
am b4edf5b3: am ce9ca226: Merge "Handle InterruptedException in waitDone" into gb-ub-photos-bryce * commit 'b4edf5b3d83a369f1197617891dc959109e703b8': Handle InterruptedException in waitDone
|
eb34c7a0d5a7d54862289f7dfde59ae062d6cc68 |
02-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 65ef29f9: am 0b65c2c2: Merge "Added apply UI callbacks for rotate/mirror operations." into gb-ub-photos-bryce * commit '65ef29f96b44267076ca38c4bffc752d92d1f087': Added apply UI callbacks for rotate/mirror operations.
|
360cb904768722a6d0a1611a9777468471309f45 |
02-Apr-2013 |
Angus Kong <shkong@google.com> |
am 07abb731: am 36cac0c2: Merge "Don\'t use SynchronousQueue to pass results." into gb-ub-photos-bryce * commit '07abb731115e3e6c3aec954d7bcec495aed2a262': Don't use SynchronousQueue to pass results.
|
bca27da2d681699c96be6e51ae1a874787d1a252 |
02-Apr-2013 |
Bobby Georgescu <georgescu@google.com> |
am adde6e72: am 8f8811fa: Merge "Usage statistics for camera settings" into gb-ub-photos-bryce * commit 'adde6e725f2e721cb9fc18c4ca2d3f8d62d0bda4': Usage statistics for camera settings
|
e99380c7046e34865cf2976612ae80376ffc42b8 |
02-Apr-2013 |
Bobby Georgescu <georgescu@google.com> |
am 36f54901: am 6058af44: Enforce bmp type in pool, handle MTP image decode failure * commit '36f54901e1a475c74c633cd9ad6b9ba8ae28448f': Enforce bmp type in pool, handle MTP image decode failure
|
f529c5700be89180ae77d39c15cece93f416aa3e |
02-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
am 20eb41f8: Fix stickiness issues with UI * commit '20eb41f87e35033a783adf76286c10bb1534a56d': Fix stickiness issues with UI
|
20eb41f87e35033a783adf76286c10bb1534a56d |
02-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
Fix stickiness issues with UI The renderGeometryIcon() function shouldn't be synchronized -- it's independent of the rest of the pipeline and is only used to apply a given geometry. Change-Id: I91a5d2ec3f28f15c489066ed2c5a5009e29fa7b3
rc/com/android/gallery3d/filtershow/cache/CachingPipeline.java
|
187a09a330f9c62783741b85b86b12610b2f595d |
02-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
Fix stickiness issues with UI The renderGeometryIcon() function shouldn't be synchronized -- it's independent of the rest of the pipeline and is only used to apply a given geometry. Change-Id: I91a5d2ec3f28f15c489066ed2c5a5009e29fa7b3
rc/com/android/gallery3d/filtershow/cache/CachingPipeline.java
|
4b23541914c56bfcbb93dc88837863b149340b61 |
02-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
am 5bd6e14f: Don\'t try freeing resources on a different thread.. * commit '5bd6e14f2c2b06943fa542921241b79566b3c6e2': Don't try freeing resources on a different thread..
|
5bd6e14f2c2b06943fa542921241b79566b3c6e2 |
02-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
Don't try freeing resources on a different thread.. This call to freeResources happens on the main thread. It's also not really useful. The geometry instance shouldn't be shared either. bug:8522497 Change-Id: I7b144713428ab803b3640b3d8226fd862db824f4
rc/com/android/gallery3d/filtershow/cache/CachingPipeline.java
|
2b28723e58966471cde60d9452cc90e860df1d20 |
02-Apr-2013 |
nicolasroard <nicolasroard@google.com> |
Don't try freeing resources on a different thread.. This call to freeResources happens on the main thread. It's also not really useful. The geometry instance shouldn't be shared either. bug:8522497 Change-Id: I7b144713428ab803b3640b3d8226fd862db824f4
rc/com/android/gallery3d/filtershow/cache/CachingPipeline.java
|
eb5fba4ede854fa890b688af0e0c5724177a7b20 |
02-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am e7aa98e5: Changed editor back button behavior. * commit 'e7aa98e533531f5e82f5de37c24701bc44bc6cd1': Changed editor back button behavior.
|
e7aa98e533531f5e82f5de37c24701bc44bc6cd1 |
02-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Changed editor back button behavior. Bug: 8522150 Change-Id: I803054138df931c4c48ef03930afe79e272f0d4b
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
|
475a821d2bd16590c0a4c61cf3fca9228636c534 |
02-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Changed editor back button behavior. Bug: 8522150 Change-Id: I803054138df931c4c48ef03930afe79e272f0d4b
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
|
8e182113318a085620411972d10322009376025d |
02-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 902a6f7f: Merge "Change panels organization. Also fixes border updates handling." into gb-ub-photos-bryce * commit '902a6f7f6bea14b22fe16f61c55e7ca6306cc210': Change panels organization. Also fixes border updates handling.
|
3d52d5e335bb29298d32c31f1506eac7516d1424 |
02-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Change panels organization. Also fixes border updates handling." into gb-ub-photos-bryce
|
902a6f7f6bea14b22fe16f61c55e7ca6306cc210 |
02-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Change panels organization. Also fixes border updates handling." into gb-ub-photos-bryce
|
bc0df4d0c02d701c57e6dcd3d4ad1d1977efc0e3 |
02-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Change panels organization. Also fixes border updates handling." into gb-ub-photos-bryce
|
d78df3f7e38648b99c81e72c2010fb019ee9c2eb |
02-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Change panels organization. Also fixes border updates handling. Change-Id: If96754e821b1e80238d2a04e65f1b57ee9683efe
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
|
d88683e307eb058e71c083bb795bd31945ed1292 |
02-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Change panels organization. Also fixes border updates handling. Change-Id: If96754e821b1e80238d2a04e65f1b57ee9683efe
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/filters/BaseFiltersManager.java
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
|
b71ec3a67d425fb44621fe75086fec3bcc33eae7 |
02-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Change panels organization. Also fixes border updates handling. Change-Id: If96754e821b1e80238d2a04e65f1b57ee9683efe
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/filters/BaseFiltersManager.java
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
|
3e127dfa1c71388cadcfa9a7647eda2fd91049b2 |
02-Apr-2013 |
Michael Kolb <kolby@google.com> |
am fa3b121e: Merge "Pie design update" into gb-ub-photos-bryce * commit 'fa3b121ebfa10149e4c721838a89a76235a8a0c8': Pie design update
|
fa3b121ebfa10149e4c721838a89a76235a8a0c8 |
02-Apr-2013 |
Michael Kolb <kolby@google.com> |
Merge "Pie design update" into gb-ub-photos-bryce
|
461159a112fb3fa098962bd384ff1ca72e463045 |
02-Apr-2013 |
Michael Kolb <kolby@google.com> |
Merge "Pie design update" into gb-ub-photos-bryce
|
952c5124e1a2fe35d3803018e8d06f297e0ec123 |
12-Mar-2013 |
Michael Kolb <kolby@google.com> |
Pie design update Change-Id: Ifb0d50938332bdae50e45523850605d0aafed7fb
es/values/dimens.xml
rc/com/android/camera/PreviewGestures.java
|
f79ef61a719d8edc9e76ddc00a6f667db2c363e4 |
12-Mar-2013 |
Michael Kolb <kolby@google.com> |
Pie design update Change-Id: Ifb0d50938332bdae50e45523850605d0aafed7fb
es/values/dimens.xml
rc/com/android/camera/PhotoMenu.java
rc/com/android/camera/PhotoUI.java
rc/com/android/camera/PieController.java
rc/com/android/camera/PreviewGestures.java
rc/com/android/camera/VideoMenu.java
rc/com/android/camera/VideoUI.java
rc/com/android/camera/ui/PieItem.java
rc/com/android/camera/ui/PieRenderer.java
|
3bc96b2d1106fc5ebec6fda6aad3bca4d62e81c0 |
12-Mar-2013 |
Michael Kolb <kolby@google.com> |
Pie design update Change-Id: Ifb0d50938332bdae50e45523850605d0aafed7fb
rc/com/android/camera/PhotoMenu.java
rc/com/android/camera/PhotoUI.java
rc/com/android/camera/PieController.java
rc/com/android/camera/PreviewGestures.java
rc/com/android/camera/VideoMenu.java
rc/com/android/camera/VideoUI.java
rc/com/android/camera/ui/PieItem.java
rc/com/android/camera/ui/PieRenderer.java
|
78ebdb534d2631dbb74ac06688ec6829a3020646 |
02-Apr-2013 |
Angus Kong <shkong@google.com> |
am ce9ca226: Merge "Handle InterruptedException in waitDone" into gb-ub-photos-bryce * commit 'ce9ca226e0c24865314e962b3b276b5ed2f2899d': Handle InterruptedException in waitDone
rc/com/android/camera/CameraManager.java
|
082827573869bd4758f90faa72b9e45f1b4f4380 |
02-Apr-2013 |
Angus Kong <shkong@google.com> |
am 36cac0c2: Merge "Don\'t use SynchronousQueue to pass results." into gb-ub-photos-bryce * commit '36cac0c2a107a05225185430969975f7dfd81c89': Don't use SynchronousQueue to pass results.
rc/com/android/camera/CameraManager.java
|
5063bd04ce642d6ceb2a3d6e5c812b5591e2c504 |
01-Apr-2013 |
Angus Kong <shkong@google.com> |
am bb746823: Merge "Fix NPE when reconnecting camera." into gb-ub-photos-bryce * commit 'bb746823c1b966562ed4f0f170289cd133f6ff6c': Fix NPE when reconnecting camera.
rc/com/android/camera/CameraManager.java
|
5c126003c47a59d4b981fe07f4f5a60f5792d72f |
02-Apr-2013 |
Angus Kong <shkong@google.com> |
am ce9ca226: Merge "Handle InterruptedException in waitDone" into gb-ub-photos-bryce * commit 'ce9ca226e0c24865314e962b3b276b5ed2f2899d': Handle InterruptedException in waitDone
|
ce9ca226e0c24865314e962b3b276b5ed2f2899d |
02-Apr-2013 |
Angus Kong <shkong@google.com> |
Merge "Handle InterruptedException in waitDone" into gb-ub-photos-bryce
|
98827845a0761792ce57d8d6a48f8f9772d77202 |
02-Apr-2013 |
Angus Kong <shkong@google.com> |
Merge "Handle InterruptedException in waitDone" into gb-ub-photos-bryce
|
192a885764b6695de60ccb3bfc5f1710b0a6cee9 |
02-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 0b65c2c2: Merge "Added apply UI callbacks for rotate/mirror operations." into gb-ub-photos-bryce * commit '0b65c2c2fdf5f9ce4d0740697db4c74a9b6cbdc6': Added apply UI callbacks for rotate/mirror operations.
|
0b65c2c2fdf5f9ce4d0740697db4c74a9b6cbdc6 |
02-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Added apply UI callbacks for rotate/mirror operations." into gb-ub-photos-bryce
|
8985b7b890aa7e84effe44ac11989c6158767f0d |
02-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Added apply UI callbacks for rotate/mirror operations." into gb-ub-photos-bryce
|
fe549800064a2b50211b005dbd2c727b256c44b0 |
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
|
fd363b27e87ad4b9dc23bcd415d3d9fb5619cdfb |
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
|
e31a2aef7d9228b7f3970b9b430a23a97ae51cb5 |
02-Apr-2013 |
Angus Kong <shkong@google.com> |
am 36cac0c2: Merge "Don\'t use SynchronousQueue to pass results." into gb-ub-photos-bryce * commit '36cac0c2a107a05225185430969975f7dfd81c89': Don't use SynchronousQueue to pass results.
|
36cac0c2a107a05225185430969975f7dfd81c89 |
02-Apr-2013 |
Angus Kong <shkong@google.com> |
Merge "Don't use SynchronousQueue to pass results." into gb-ub-photos-bryce
|
87efd29660cfc53023667ff8c124364fcdbcc88c |
02-Apr-2013 |
Angus Kong <shkong@google.com> |
Merge "Don't use SynchronousQueue to pass results." into gb-ub-photos-bryce
|
3cc47764ae04eef5d50e3c0d070baee9b4a21150 |
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
|
73749f2d3c4a403b7b8455edcfd260c1d8633be8 |
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
|
a0ec02270333faf1dc05ef08408714859c71b28a |
01-Apr-2013 |
Bobby Georgescu <georgescu@google.com> |
am 8f8811fa: Merge "Usage statistics for camera settings" into gb-ub-photos-bryce * commit '8f8811fa16147532716e5a4a70fda2f555d20589': Usage statistics for camera settings
|
1ff10256bcaf8e844c9f32dc5e807077e53b4a67 |
01-Apr-2013 |
Bobby Georgescu <georgescu@google.com> |
am 6058af44: Enforce bmp type in pool, handle MTP image decode failure * commit '6058af443b087ba50741cc3e61ec70e830e498fa': Enforce bmp type in pool, handle MTP image decode failure
|
8f8811fa16147532716e5a4a70fda2f555d20589 |
01-Apr-2013 |
Bobby Georgescu <georgescu@google.com> |
Merge "Usage statistics for camera settings" into gb-ub-photos-bryce
|
41666d79533a352e273892a9a9bf33e4b99305c2 |
01-Apr-2013 |
Bobby Georgescu <georgescu@google.com> |
Merge "Usage statistics for camera settings" into gb-ub-photos-bryce
|
8ab1d6661201d30063067f3b6c2fbd87e1ef9f67 |
01-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Added apply UI callbacks for rotate/mirror operations. Change-Id: I30bfb439d742248c3241742bd11f64a1b4a22640
rc/com/android/gallery3d/filtershow/editors/EditorFlip.java
rc/com/android/gallery3d/filtershow/editors/EditorRotate.java
rc/com/android/gallery3d/filtershow/imageshow/ImageFlip.java
rc/com/android/gallery3d/filtershow/imageshow/ImageRotate.java
|
ebe79e4f32a6d8871e49fc91c45a3ef2d61e7f9a |
01-Apr-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Added apply UI callbacks for rotate/mirror operations. Change-Id: I30bfb439d742248c3241742bd11f64a1b4a22640
rc/com/android/gallery3d/filtershow/editors/EditorFlip.java
rc/com/android/gallery3d/filtershow/editors/EditorRotate.java
rc/com/android/gallery3d/filtershow/imageshow/ImageFlip.java
rc/com/android/gallery3d/filtershow/imageshow/ImageRotate.java
|
6058af443b087ba50741cc3e61ec70e830e498fa |
01-Apr-2013 |
Bobby Georgescu <georgescu@google.com> |
Enforce bmp type in pool, handle MTP image decode failure - GalleryBitmapPool didn't reject bitmap types other than ARGB_8888 which could lead to problems when a different type is used for recycling. - BitmapFactory throws an exception rather than returning null when image decoding fails and an existing bitmap was supplied for recycling, even if the failure was not caused by the use of that bitmap. When decoding things from an MTP device, we need to handle this since unsupported formats may be returned. Change-Id: I8cc8aa46f5a741b360e806814991f74a131e9039
rc/com/android/gallery3d/ingest/data/MtpBitmapFetch.java
rc/com/android/photos/data/GalleryBitmapPool.java
|
12545f7a4a5e66fd59d6d6b2fdf907800e2df051 |
01-Apr-2013 |
Bobby Georgescu <georgescu@google.com> |
Enforce bmp type in pool, handle MTP image decode failure - GalleryBitmapPool didn't reject bitmap types other than ARGB_8888 which could lead to problems when a different type is used for recycling. - BitmapFactory throws an exception rather than returning null when image decoding fails and an existing bitmap was supplied for recycling, even if the failure was not caused by the use of that bitmap. When decoding things from an MTP device, we need to handle this since unsupported formats may be returned. Change-Id: I8cc8aa46f5a741b360e806814991f74a131e9039
rc/com/android/gallery3d/ingest/data/MtpBitmapFetch.java
rc/com/android/photos/data/GalleryBitmapPool.java
|
0c08ea088594814e785c51633dc0fa0e59ac34bf |
01-Apr-2013 |
Bobby Georgescu <georgescu@google.com> |
Usage statistics for camera settings Change-Id: I1e683fa8114ab9e15d9da6b81a3caca952d75647
rc/com/android/camera/ComboPreferences.java
|
806e78b99ae440423547aca436fe5361882bcc33 |
01-Apr-2013 |
Bobby Georgescu <georgescu@google.com> |
Usage statistics for camera settings Change-Id: I1e683fa8114ab9e15d9da6b81a3caca952d75647
rc/com/android/camera/ComboPreferences.java
|
90efe03a4260304a4545c5653752fc563848dcf4 |
01-Apr-2013 |
Angus Kong <shkong@google.com> |
am 22a8d2a7: am bf462e82: am 960cad7f: am bb746823: Merge "Fix NPE when reconnecting camera." into gb-ub-photos-bryce * commit '22a8d2a7be2e1625e22c56c53911927b1dd0411e': Fix NPE when reconnecting camera.
|
d5eedf6c1811948bac55e0b69c1623cb8f6b205b |
01-Apr-2013 |
Angus Kong <shkong@google.com> |
am bf462e82: am 960cad7f: am bb746823: Merge "Fix NPE when reconnecting camera." into gb-ub-photos-bryce * commit 'bf462e8294c3602ac0a72f6c6e3f7e8982f3a74b': Fix NPE when reconnecting camera.
|
95a8e8bd56f9d3bb5cdb29a3a2e4acebb0335825 |
01-Apr-2013 |
Angus Kong <shkong@google.com> |
am 960cad7f: am bb746823: Merge "Fix NPE when reconnecting camera." into gb-ub-photos-bryce * commit '960cad7f4c7ccdd1d0979c06fe5c97fb610aefa6': Fix NPE when reconnecting camera.
|
f3fe466e1bdf17a91851f209810cbbc61d586acc |
01-Apr-2013 |
Angus Kong <shkong@google.com> |
am bb746823: Merge "Fix NPE when reconnecting camera." into gb-ub-photos-bryce * commit 'bb746823c1b966562ed4f0f170289cd133f6ff6c': Fix NPE when reconnecting camera.
|
bb746823c1b966562ed4f0f170289cd133f6ff6c |
01-Apr-2013 |
Angus Kong <shkong@google.com> |
Merge "Fix NPE when reconnecting camera." into gb-ub-photos-bryce
|
e5a79a5bd8ca3e25c14e4fe5df7c1ee1b544dc7e |
01-Apr-2013 |
Angus Kong <shkong@google.com> |
Merge "Fix NPE when reconnecting camera." into gb-ub-photos-bryce
|
90cf878eea731c3fe6cdc97967bfdc79956f0aaf |
01-Apr-2013 |
Bobby Georgescu <georgescu@google.com> |
am f85b84cd: am e6c4372c: am 62b8cc9e: am 8227ac66: Merge "Preliminary Album grid header in new gallery" into gb-ub-photos-bryce * commit 'f85b84cd8569a59b5e65d884d1c286673a91d839': Preliminary Album grid header in new gallery
|
646b308964b8b424235b70b2d78e9c4a958719c8 |
01-Apr-2013 |
Bobby Georgescu <georgescu@google.com> |
am e6c4372c: am 62b8cc9e: am 8227ac66: Merge "Preliminary Album grid header in new gallery" into gb-ub-photos-bryce * commit 'e6c4372c79b7fdec41ccc4bc325b670200faa2ef': Preliminary Album grid header in new gallery
|
597f3c106bf99fb237e7efc63692250643a21065 |
01-Apr-2013 |
Bobby Georgescu <georgescu@google.com> |
am 62b8cc9e: am 8227ac66: Merge "Preliminary Album grid header in new gallery" into gb-ub-photos-bryce * commit '62b8cc9e846f33503e4fa3c03f543b26f6a932e6': Preliminary Album grid header in new gallery
|
4ca8c08c89736c73f561843d94346301661a7d12 |
01-Apr-2013 |
Bobby Georgescu <georgescu@google.com> |
am 8227ac66: Merge "Preliminary Album grid header in new gallery" into gb-ub-photos-bryce * commit '8227ac6685be19bda8e3601c3980847ae8cf3041': Preliminary Album grid header in new gallery
|
a1665151a65c32b3ab3c4190d24bebf2c22cbbb1 |
01-Apr-2013 |
Bobby Georgescu <georgescu@google.com> |
Merge "Preliminary Album grid header in new gallery" into gb-ub-photos-bryce
|
8227ac6685be19bda8e3601c3980847ae8cf3041 |
01-Apr-2013 |
Bobby Georgescu <georgescu@google.com> |
Merge "Preliminary Album grid header in new gallery" into gb-ub-photos-bryce
|
46252663f34021bf93586234396ce1139ae5d02e |
01-Apr-2013 |
Bobby Georgescu <georgescu@google.com> |
Merge "Preliminary Album grid header in new gallery" into gb-ub-photos-bryce
|
959ce4c2d61776864034425cdf243c65386bca75 |
29-Mar-2013 |
Bobby Georgescu <georgescu@google.com> |
Preliminary Album grid header in new gallery Change-Id: I90942de920795aedc5475f23cc3ede459949cc16
es/drawable/white_text_bg_gradient.xml
es/layout/album_content.xml
es/layout/album_header.xml
es/layout/multigrid_content.xml
|
559535174c8c70f12a342fe46f00647c31080383 |
29-Mar-2013 |
Bobby Georgescu <georgescu@google.com> |
Preliminary Album grid header in new gallery Change-Id: I90942de920795aedc5475f23cc3ede459949cc16
es/drawable/white_text_bg_gradient.xml
es/layout/album_content.xml
es/layout/album_header.xml
es/layout/multigrid_content.xml
rc/com/android/photos/AlbumActivity.java
rc/com/android/photos/AlbumFragment.java
rc/com/android/photos/MultiSelectGridFragment.java
|
31d492996d3aa49318a185489bebf2fa1a144c2f |
29-Mar-2013 |
Bobby Georgescu <georgescu@google.com> |
Preliminary Album grid header in new gallery Change-Id: I90942de920795aedc5475f23cc3ede459949cc16
rc/com/android/photos/AlbumActivity.java
rc/com/android/photos/AlbumFragment.java
rc/com/android/photos/MultiSelectGridFragment.java
|
229ae13858ed8da8defc70eeaae6aac4091c7607 |
01-Apr-2013 |
Angus Kong <shkong@google.com> |
Fix NPE when reconnecting camera. bug:8513852 Change-Id: I45150e5519604f695d25c830262c8b6eb363b1d3
rc/com/android/camera/CameraManager.java
|
918f811c21eb5a325626bf523a390926d4e6cb77 |
01-Apr-2013 |
Angus Kong <shkong@google.com> |
Fix NPE when reconnecting camera. bug:8513852 Change-Id: I45150e5519604f695d25c830262c8b6eb363b1d3
rc/com/android/camera/CameraManager.java
|
4810eeff9516a7983a450e9499d899b8af3f871d |
01-Apr-2013 |
George Mount <mount@google.com> |
am 193b6885: am 9b56ea76: am 1dba3693: am c6a1167e: Merge "Remove ImageCache from PhotoProvider in favor of MediaCache." into gb-ub-photos-bryce * commit '193b6885501239968fc9b8ec816ea227fdacd179': Remove ImageCache from PhotoProvider in favor of MediaCache.
|
32fb13085e8428262b8ed0f50b19f664ce174da5 |
01-Apr-2013 |
George Mount <mount@google.com> |
am 9b56ea76: am 1dba3693: am c6a1167e: Merge "Remove ImageCache from PhotoProvider in favor of MediaCache." into gb-ub-photos-bryce * commit '9b56ea76449a30169122ce80f0e93bacd4ebd0ba': Remove ImageCache from PhotoProvider in favor of MediaCache.
|
9274f4cc3cdbe805ca70c5a216a7d6fb50db3e22 |
01-Apr-2013 |
George Mount <mount@google.com> |
am 1dba3693: am c6a1167e: Merge "Remove ImageCache from PhotoProvider in favor of MediaCache." into gb-ub-photos-bryce * commit '1dba3693c3ca87b288b8329e5b243c1067d29c04': Remove ImageCache from PhotoProvider in favor of MediaCache.
|
205c43ca048a968c1e0db060ff61cfc3f848657a |
01-Apr-2013 |
George Mount <mount@google.com> |
am c6a1167e: Merge "Remove ImageCache from PhotoProvider in favor of MediaCache." into gb-ub-photos-bryce * commit 'c6a1167ec0e461ad202b58614f1a53ec38443654': Remove ImageCache from PhotoProvider in favor of MediaCache.
|
c6a1167ec0e461ad202b58614f1a53ec38443654 |
01-Apr-2013 |
George Mount <mount@google.com> |
Merge "Remove ImageCache from PhotoProvider in favor of MediaCache." into gb-ub-photos-bryce
|
8034eec63a1d84450d1841844a9294a10d14ba6d |
01-Apr-2013 |
George Mount <mount@google.com> |
Merge "Remove ImageCache from PhotoProvider in favor of MediaCache." into gb-ub-photos-bryce
|
04b9e117bd712c55112298952ad899a10c804c39 |
01-Apr-2013 |
The Android Automerger <android-build@android.com> |
merge in jb-mr2-release history after reset to jb-mr2-dev
|
ff1d114c553dba8ca2ed5ddfea2d80a761933d33 |
30-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
am 58a85cbc: am 3ea3a6e1: am 9af3e6b8: am 5997a013: Merge "Fix double-tap behaviour" into gb-ub-photos-bryce * commit '58a85cbc11eaa8591807e01aebd62e6038adf98a': Fix double-tap behaviour
|
9a12fcd5dd737296b8a02c95d2744fd5b23c7a81 |
30-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
am 6baaa546: am 42a02931: am de0f9f15: am 1ad3cd57: Fixes some state synchronization issues * commit '6baaa5469e7219d6d903790ddc2be50c6b80661f': Fixes some state synchronization issues
|
8b2acf51172f353f8bd062520957ac662c35ea5c |
30-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
am 3ea3a6e1: am 9af3e6b8: am 5997a013: Merge "Fix double-tap behaviour" into gb-ub-photos-bryce * commit '3ea3a6e13f23c995e2577a639499fa857d39c47f': Fix double-tap behaviour
|
9c60fcb37575a679748d79fb7cf5ebac0bdd07b1 |
30-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
am 42a02931: am de0f9f15: am 1ad3cd57: Fixes some state synchronization issues * commit '42a02931086f20a99d4af1a4ce35a137309d3b15': Fixes some state synchronization issues
|
9a758718b78cc4bb02defdffc89e7b92495d704f |
30-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
am 9af3e6b8: am 5997a013: Merge "Fix double-tap behaviour" into gb-ub-photos-bryce * commit '9af3e6b8d517ca7a1585dc5f373072b8148adb74': Fix double-tap behaviour
|
a918b25b24b4d823751a6e5ad10d8bbcf6ce6b6f |
30-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
am de0f9f15: am 1ad3cd57: Fixes some state synchronization issues * commit 'de0f9f15badb8cc26cfbdf5e93321a838a6fa6d8': Fixes some state synchronization issues
|
790c63d518b84d29d69c9c32eabd594521d8230a |
30-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
am 5997a013: Merge "Fix double-tap behaviour" into gb-ub-photos-bryce * commit '5997a0138287fe08f414ffb097c8e088a47bf101': Fix double-tap behaviour
|
6cef1592ec76cf0ecfda68e2615bc5fee9ef9889 |
30-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
am 1ad3cd57: Fixes some state synchronization issues * commit '1ad3cd574da4e998e55e4ff4861ff19e2ea982bd': Fixes some state synchronization issues
|
5997a0138287fe08f414ffb097c8e088a47bf101 |
30-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
Merge "Fix double-tap behaviour" into gb-ub-photos-bryce
|
408fbfdd78ea6d90f4fd2bdfa234a161a436d1aa |
30-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
Merge "Fix double-tap behaviour" into gb-ub-photos-bryce
|
f3bcc676e245727b20c7d6123cb39361e84b1dc9 |
30-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
Fix double-tap behaviour Change-Id: I17282bce5af9d65b704e3853181ef3cbfde4992e
rc/com/android/gallery3d/filtershow/cache/RenderingRequest.java
rc/com/android/gallery3d/filtershow/imageshow/MasterImage.java
|
05022e50a7d280d990c2dca74f69a7da55bdd3b8 |
30-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
Fix double-tap behaviour Change-Id: I17282bce5af9d65b704e3853181ef3cbfde4992e
rc/com/android/gallery3d/filtershow/cache/RenderingRequest.java
rc/com/android/gallery3d/filtershow/imageshow/MasterImage.java
|
8ad7dab950fe61cdeeb6899c659f3df04c2a7e36 |
30-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
Fixes some state synchronization issues Change-Id: Iea0f2b8d9c885795bddfb0d3001c8a351caed63c
rc/com/android/gallery3d/filtershow/filters/FilterRepresentation.java
|
1ad3cd574da4e998e55e4ff4861ff19e2ea982bd |
30-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
Fixes some state synchronization issues Change-Id: Iea0f2b8d9c885795bddfb0d3001c8a351caed63c
rc/com/android/gallery3d/filtershow/cache/FilteringPipeline.java
rc/com/android/gallery3d/filtershow/filters/FilterRepresentation.java
|
d4545febbff39febd1058e1aa60e0c8b7659204f |
30-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
Fixes some state synchronization issues Change-Id: Iea0f2b8d9c885795bddfb0d3001c8a351caed63c
rc/com/android/gallery3d/filtershow/cache/FilteringPipeline.java
rc/com/android/gallery3d/filtershow/filters/FilterRepresentation.java
|
d39cde459d63a21a09ce1ad74cddf0b3cf8909a0 |
30-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
am d3a4d1ce: am dd7b4713: am dd43c25b: am ad420275: Merge "Implements progressive rendering" into gb-ub-photos-bryce * commit 'd3a4d1ce9f706b5796dc52d19e2c81774cdc2835': Implements progressive rendering
|
7983e003e23dba40350bb740d4d11353e8b3b9bd |
30-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
am dd7b4713: am dd43c25b: am ad420275: Merge "Implements progressive rendering" into gb-ub-photos-bryce * commit 'dd7b4713e851e5827a667b59117e8a188b9cc600': Implements progressive rendering
|
05dc7fa80163f59b7b99b91bfcbcb5000f1d9082 |
30-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
am dd43c25b: am ad420275: Merge "Implements progressive rendering" into gb-ub-photos-bryce * commit 'dd43c25b0b2e58a02369d791404f101d9cab1990': Implements progressive rendering
|
345848e7f33420066c27a2a0a064eec660b78de2 |
30-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
am ad420275: Merge "Implements progressive rendering" into gb-ub-photos-bryce * commit 'ad42027590c52fcc522c06d311f28742e0441ec0': Implements progressive rendering
|
ad42027590c52fcc522c06d311f28742e0441ec0 |
30-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
Merge "Implements progressive rendering" into gb-ub-photos-bryce
|
d94a961e445adbf2ebd6af702209020475c6cab3 |
30-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
Merge "Implements progressive rendering" into gb-ub-photos-bryce
|
4dad1a9e3f213e95a4f419c06ea885fee75d3297 |
29-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
Implements progressive rendering Change-Id: I32bd2072126a4fad4342f7d9ffa1cff3b5da84cf
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/cache/CachingPipeline.java
rc/com/android/gallery3d/filtershow/cache/FilteringPipeline.java
rc/com/android/gallery3d/filtershow/cache/ImageLoader.java
rc/com/android/gallery3d/filtershow/cache/RenderingRequest.java
rc/com/android/gallery3d/filtershow/imageshow/ImageShow.java
rc/com/android/gallery3d/filtershow/imageshow/MasterImage.java
|
3134c5478897af10e0c712794df4336fe6e3f995 |
29-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
Implements progressive rendering Change-Id: I32bd2072126a4fad4342f7d9ffa1cff3b5da84cf
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/cache/CachingPipeline.java
rc/com/android/gallery3d/filtershow/cache/FilteringPipeline.java
rc/com/android/gallery3d/filtershow/cache/ImageLoader.java
rc/com/android/gallery3d/filtershow/cache/RenderingRequest.java
rc/com/android/gallery3d/filtershow/imageshow/ImageShow.java
rc/com/android/gallery3d/filtershow/imageshow/MasterImage.java
|
e75e5e35a6e295402c68af48c5c6e7e61031ef37 |
30-Mar-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 20483fcd: am ee68e231: am f989f148: am e0e9fff3: Merge "Added "discard unsaved changes" behavior for exiting." into gb-ub-photos-bryce * commit '20483fcdc3ecce2d10bd5c97ab76028471aa9a42': Added "discard unsaved changes" behavior for exiting.
|
c468b0fa35d042cc1ebad0d597a9342d0a77e6e8 |
30-Mar-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am ee68e231: am f989f148: am e0e9fff3: Merge "Added "discard unsaved changes" behavior for exiting." into gb-ub-photos-bryce * commit 'ee68e231281cec7035e1f9e608e0beac7ba8e0a5': Added "discard unsaved changes" behavior for exiting.
|
cc2cfd760336650ee40d44fb557750f853f4bba5 |
30-Mar-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am f989f148: am e0e9fff3: Merge "Added "discard unsaved changes" behavior for exiting." into gb-ub-photos-bryce * commit 'f989f14860ce9e0b551f140141816464a7024616': Added "discard unsaved changes" behavior for exiting.
|
72a19991d751e90052a8cc29f6b505e156a54304 |
30-Mar-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am e0e9fff3: Merge "Added "discard unsaved changes" behavior for exiting." into gb-ub-photos-bryce * commit 'e0e9fff3ff81faec02b243eabb1502a97a4e4adb': Added "discard unsaved changes" behavior for exiting.
|
f08e03a53fb35398d2069f4ed6357aa914dc499e |
30-Mar-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Added "discard unsaved changes" behavior for exiting." into gb-ub-photos-bryce
|
e0e9fff3ff81faec02b243eabb1502a97a4e4adb |
30-Mar-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Added "discard unsaved changes" behavior for exiting." into gb-ub-photos-bryce
|
373b137fd10a6db5daa605a2813b639b09dffe57 |
30-Mar-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Added "discard unsaved changes" behavior for exiting." into gb-ub-photos-bryce
|
d4681a3c9d417970a9602112bd83f921ac16af96 |
28-Mar-2013 |
George Mount <mount@google.com> |
Remove ImageCache from PhotoProvider in favor of MediaCache. Change-Id: I4e75a094d1dc033ac892c2b95bdc6b6a4a165304
rc/com/android/photos/data/MediaCache.java
rc/com/android/photos/data/MediaCacheDatabase.java
rc/com/android/photos/data/MediaCacheUtils.java
rc/com/android/photos/data/PhotoProvider.java
ests/src/com/android/photos/data/MediaCacheTest.java
|
b658ef4f610fcbafff4fa5e584cabe253e76d879 |
28-Mar-2013 |
George Mount <mount@google.com> |
Remove ImageCache from PhotoProvider in favor of MediaCache. Change-Id: I4e75a094d1dc033ac892c2b95bdc6b6a4a165304
rc/com/android/photos/data/MediaCache.java
rc/com/android/photos/data/MediaCacheDatabase.java
rc/com/android/photos/data/MediaCacheUtils.java
rc/com/android/photos/data/PhotoProvider.java
ests/src/com/android/photos/data/MediaCacheTest.java
|
dfd302b2830d0e53d08a97f84b29e21c0bbe2d7c |
30-Mar-2013 |
George Mount <mount@google.com> |
am 5073131c: am e3b42481: am b164f7f6: am fe2aa4ba: Merge "Add initial implementation of MediaCache." into gb-ub-photos-bryce * commit '5073131cd0e613275fbaf63f6b70fecc85827e36': Add initial implementation of MediaCache.
|
0a9807555d1cfaf69122bcd7d0b10cd2ca4da36f |
30-Mar-2013 |
George Mount <mount@google.com> |
am e3b42481: am b164f7f6: am fe2aa4ba: Merge "Add initial implementation of MediaCache." into gb-ub-photos-bryce * commit 'e3b42481ead78ac0d768331cf31d29506c27b526': Add initial implementation of MediaCache.
|
b1ee904f0b5221890080b99b60b1d8791f258c34 |
30-Mar-2013 |
George Mount <mount@google.com> |
am b164f7f6: am fe2aa4ba: Merge "Add initial implementation of MediaCache." into gb-ub-photos-bryce * commit 'b164f7f694d1f93090e26fc242b45a3c8d4fb7ce': Add initial implementation of MediaCache.
|
0b480513de8a7c2be449b1fc825838c1b44c8b36 |
30-Mar-2013 |
George Mount <mount@google.com> |
am fe2aa4ba: Merge "Add initial implementation of MediaCache." into gb-ub-photos-bryce * commit 'fe2aa4ba06d045895d0d038627547e02adc6b945': Add initial implementation of MediaCache.
|
28461189b820d253e84a6bf42719021724df7913 |
30-Mar-2013 |
George Mount <mount@google.com> |
Merge "Add initial implementation of MediaCache." into gb-ub-photos-bryce
|
fe2aa4ba06d045895d0d038627547e02adc6b945 |
30-Mar-2013 |
George Mount <mount@google.com> |
Merge "Add initial implementation of MediaCache." into gb-ub-photos-bryce
|
8e498a060dca7e0a1d2ceaa39b902d1cce7f7c4a |
30-Mar-2013 |
George Mount <mount@google.com> |
Merge "Add initial implementation of MediaCache." into gb-ub-photos-bryce
|
778228b67b831cfd676f6aa9a791aed62082ff8a |
18-Mar-2013 |
George Mount <mount@google.com> |
Add initial implementation of MediaCache. Change-Id: I94d357bab0e57cc60b8be790d912ba036730298b
ests/res/raw/android_lawn.mp4
|
49508252ccb37a92bf06da468e4683c4b1909a33 |
18-Mar-2013 |
George Mount <mount@google.com> |
Add initial implementation of MediaCache. Change-Id: I94d357bab0e57cc60b8be790d912ba036730298b
rc/com/android/gallery3d/app/GalleryAppImpl.java
rc/com/android/photos/data/FileRetriever.java
rc/com/android/photos/data/MediaCache.java
rc/com/android/photos/data/MediaCacheDatabase.java
rc/com/android/photos/data/MediaCacheUtils.java
rc/com/android/photos/data/MediaRetriever.java
ests/res/raw/android_lawn.mp4
ests/src/com/android/photos/data/DataTestRunner.java
ests/src/com/android/photos/data/MediaCacheTest.java
|
314de4034664ab668aea61e1ecd14946f1b4a978 |
18-Mar-2013 |
George Mount <mount@google.com> |
Add initial implementation of MediaCache. Change-Id: I94d357bab0e57cc60b8be790d912ba036730298b
rc/com/android/gallery3d/app/GalleryAppImpl.java
rc/com/android/photos/data/FileRetriever.java
rc/com/android/photos/data/MediaCache.java
rc/com/android/photos/data/MediaCacheDatabase.java
rc/com/android/photos/data/MediaCacheUtils.java
rc/com/android/photos/data/MediaRetriever.java
ests/src/com/android/photos/data/DataTestRunner.java
ests/src/com/android/photos/data/MediaCacheTest.java
|
15d9e408f1b19effd08c0d1ef58436789c58a4c6 |
29-Mar-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Added "discard unsaved changes" behavior for exiting. Bug: 7534778 Change-Id: I3136fa04585a42912bad6235a776937a4cb4dcac
es/values/filtershow_strings.xml
|
a3dbbd7dcbd9aead7b10653b95685f5d2a71947a |
29-Mar-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Added "discard unsaved changes" behavior for exiting. Bug: 7534778 Change-Id: I3136fa04585a42912bad6235a776937a4cb4dcac
es/values/filtershow_strings.xml
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
|
3171c21d51cc6b3197b0d25167f09237cb05840d |
29-Mar-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Added "discard unsaved changes" behavior for exiting. Bug: 7534778 Change-Id: I3136fa04585a42912bad6235a776937a4cb4dcac
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
|
402491929480665d6bf59c8ad26ac3c66bcb26be |
29-Mar-2013 |
John Hoford <hoford@google.com> |
am a4ba2f1e: am 5156a6cd: am 8e81dd5c: am 3f312857: Merge "add flexable ui for parameters" into gb-ub-photos-bryce * commit 'a4ba2f1ea6678c467800276c75002bd971627f6d': add flexable ui for parameters
|
bc6d708098919b31cd6cd20fefa109a51d0e6264 |
29-Mar-2013 |
Michael Kolb <kolby@google.com> |
am 4e5fe350: am a0815128: am 6c9f88af: am 19f625a1: Merge "Make camera releasing synchronous." into gb-ub-photos-bryce * commit '4e5fe35063b29f7c56e0025a772f0871653ffb07': Make camera releasing synchronous.
|
d100af0a29d42d5d1fb19e227043236e546ee5dc |
29-Mar-2013 |
John Hoford <hoford@google.com> |
am 5156a6cd: am 8e81dd5c: am 3f312857: Merge "add flexable ui for parameters" into gb-ub-photos-bryce * commit '5156a6cd6da43dbb38f7fc7d0797c4e41904f969': add flexable ui for parameters
|
2ad5495f4f3fac805a0260137b298f9c9fd60bd7 |
29-Mar-2013 |
Michael Kolb <kolby@google.com> |
am a0815128: am 6c9f88af: am 19f625a1: Merge "Make camera releasing synchronous." into gb-ub-photos-bryce * commit 'a08151280b80ac2b90b82a292a2bc6d922f3d118': Make camera releasing synchronous.
|
0543caa0d98a93ba16da0e5ef64b5ecca75fb5f2 |
29-Mar-2013 |
Angus Kong <shkong@google.com> |
Make camera releasing synchronous. bug:8502943 Change-Id: I48d71c07894fefa909db1a78c0dbe9b8f72e5166
rc/com/android/camera/CameraManager.java
|
c65a335bc8e6cb0269fb18d7ab1b5ddc3f960e5c |
29-Mar-2013 |
John Hoford <hoford@google.com> |
am 8e81dd5c: am 3f312857: Merge "add flexable ui for parameters" into gb-ub-photos-bryce * commit '8e81dd5c98d8d13fcc15f1c2a24565c55f815085': add flexable ui for parameters
|
861ae800e248146e4b77936b72256c1e14ccef22 |
29-Mar-2013 |
John Hoford <hoford@google.com> |
am 3f312857: Merge "add flexable ui for parameters" into gb-ub-photos-bryce * commit '3f3128579b1215142ce71268bdb5be33426d6ccb': add flexable ui for parameters
|
3f3128579b1215142ce71268bdb5be33426d6ccb |
29-Mar-2013 |
John Hoford <hoford@google.com> |
Merge "add flexable ui for parameters" into gb-ub-photos-bryce
|
534386cf6264df921f633f4c90edcab169778d26 |
29-Mar-2013 |
John Hoford <hoford@google.com> |
Merge "add flexable ui for parameters" into gb-ub-photos-bryce
|
2cb73ef95cce4abf582979da142f269fb97c3d38 |
29-Mar-2013 |
John Hoford <hoford@google.com> |
Merge "add flexable ui for parameters" into gb-ub-photos-bryce
|
235d2179374bec14040f20af91dc753e38ea3639 |
13-Mar-2013 |
John Hoford <hoford@google.com> |
add flexable ui for parameters Change-Id: Ifa9862ceb7f9a12b1b9b985fdc737dc1bb679921
es/drawable/filtershow_addpoint.png
es/drawable/filtershow_delpoint.png
es/drawable/filtershow_vertical_bar.png
es/layout/filtershow_control_action_slider.xml
es/layout/filtershow_control_title_slider.xml
es/layout/filtershow_editor_panel.xml
es/layout/filtershow_seekbar.xml
es/values/filtershow_ids.xml
rc/com/android/gallery3d/filtershow/PanelController.java
rc/com/android/gallery3d/filtershow/controller/ActionSlider.java
rc/com/android/gallery3d/filtershow/controller/BasicSlider.java
rc/com/android/gallery3d/filtershow/controller/Control.java
rc/com/android/gallery3d/filtershow/controller/Parameter.java
rc/com/android/gallery3d/filtershow/controller/ParameterActionAndInt.java
rc/com/android/gallery3d/filtershow/controller/ParameterInteger.java
rc/com/android/gallery3d/filtershow/controller/TitledSlider.java
rc/com/android/gallery3d/filtershow/editors/Editor.java
rc/com/android/gallery3d/filtershow/editors/EditorVignette.java
rc/com/android/gallery3d/filtershow/editors/ParametricEditor.java
rc/com/android/gallery3d/filtershow/filters/FilterBasicRepresentation.java
rc/com/android/gallery3d/filtershow/imageshow/ImageVignette.java
|
06016438139fba0511dcd1e12646b53287b3bb3f |
13-Mar-2013 |
John Hoford <hoford@google.com> |
add flexable ui for parameters Change-Id: Ifa9862ceb7f9a12b1b9b985fdc737dc1bb679921
rc/com/android/gallery3d/filtershow/PanelController.java
rc/com/android/gallery3d/filtershow/controller/ActionSlider.java
rc/com/android/gallery3d/filtershow/controller/BasicSlider.java
rc/com/android/gallery3d/filtershow/controller/Control.java
rc/com/android/gallery3d/filtershow/controller/Parameter.java
rc/com/android/gallery3d/filtershow/controller/ParameterActionAndInt.java
rc/com/android/gallery3d/filtershow/controller/ParameterInteger.java
rc/com/android/gallery3d/filtershow/controller/TitledSlider.java
rc/com/android/gallery3d/filtershow/editors/Editor.java
rc/com/android/gallery3d/filtershow/editors/EditorVignette.java
rc/com/android/gallery3d/filtershow/editors/ParametricEditor.java
rc/com/android/gallery3d/filtershow/filters/FilterBasicRepresentation.java
rc/com/android/gallery3d/filtershow/imageshow/ImageVignette.java
|
a1ea1adce9007d85e9810d7c71d306ae814b63b9 |
13-Mar-2013 |
John Hoford <hoford@google.com> |
add flexable ui for parameters Change-Id: Ifa9862ceb7f9a12b1b9b985fdc737dc1bb679921
es/drawable/filtershow_addpoint.png
es/drawable/filtershow_delpoint.png
es/drawable/filtershow_vertical_bar.png
es/layout/filtershow_control_action_slider.xml
es/layout/filtershow_control_title_slider.xml
es/layout/filtershow_editor_panel.xml
es/layout/filtershow_seekbar.xml
es/values/filtershow_ids.xml
rc/com/android/gallery3d/filtershow/filters/FilterBasicRepresentation.java
|
9a28d945398fab54d23815e4f75ca1a0bc146598 |
29-Mar-2013 |
Michael Kolb <kolby@google.com> |
am 6c9f88af: am 19f625a1: Merge "Make camera releasing synchronous." into gb-ub-photos-bryce * commit '6c9f88af5336ee07779cc6ef172e8f4524039eb0': Make camera releasing synchronous.
|
4f767bbcb629e845b04250a6182935fcdc9b023f |
29-Mar-2013 |
Michael Kolb <kolby@google.com> |
am 19f625a1: Merge "Make camera releasing synchronous." into gb-ub-photos-bryce * commit '19f625a13abf3ea418a541299630481f1a7aaa45': Make camera releasing synchronous.
|
19f625a13abf3ea418a541299630481f1a7aaa45 |
29-Mar-2013 |
Michael Kolb <kolby@google.com> |
Merge "Make camera releasing synchronous." into gb-ub-photos-bryce
|
d6f3162a473066a24838c8dc6f2c6f96d4db0f0c |
29-Mar-2013 |
Michael Kolb <kolby@google.com> |
Merge "Make camera releasing synchronous." into gb-ub-photos-bryce
|
69db464b374a33375944d497d46dd01664e42816 |
29-Mar-2013 |
The Android Open Source Project <initial-contribution@android.com> |
am e74a9597: (-s ours) am 357f00a1: (-s ours) Reconcile with jb-mr2-release - do not merge * commit 'e74a9597d37dcf7fbee7c81349e0f63d6b4d70eb': Disable preview gestures when shutter is pressed
|
09367df15a8dc82d02e4f9471a918a1fde52a25f |
29-Mar-2013 |
The Android Open Source Project <initial-contribution@android.com> |
am 357f00a1: (-s ours) Reconcile with jb-mr2-release - do not merge * commit '357f00a1ce1f1b8584982083f8263e9283117cfa': Disable preview gestures when shutter is pressed
|
370c5e441d8c5902fbaa1e5c388409c7f3186771 |
29-Mar-2013 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with jb-mr2-release - do not merge Change-Id: I824c53b5cb75e9076acb41d0e5385499a25f3141
|
e6c554a3a4c0ebf0aae21a19326aec137f4a25a6 |
29-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
am eced16a2: am d7518617: am b8b165ba: am d4e3912d: Merge "Re-enable caching step in RS filters" into gb-ub-photos-bryce * commit 'eced16a22d14cb944498c64eec51334af344d1be': Re-enable caching step in RS filters
|
6bfde62fb17491760bfd1614e1c74699ad8ee359 |
29-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
am d7518617: am b8b165ba: am d4e3912d: Merge "Re-enable caching step in RS filters" into gb-ub-photos-bryce * commit 'd75186178d4f5c89ee7339b5d1acf4f682772066': Re-enable caching step in RS filters
|
6283715f1349a2148196e772742676d9c8d9a844 |
29-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
am b8b165ba: am d4e3912d: Merge "Re-enable caching step in RS filters" into gb-ub-photos-bryce * commit 'b8b165badbebc7bd7b75c43db5f89cc13dbd1f9c': Re-enable caching step in RS filters
|
c06ab6e5dcd1ec2ea957987b2c0bca46ad807d34 |
29-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
am d4e3912d: Merge "Re-enable caching step in RS filters" into gb-ub-photos-bryce * commit 'd4e3912d3f6f92da6e2fd0441cd65aef2c4d06da': Re-enable caching step in RS filters
|
d4e3912d3f6f92da6e2fd0441cd65aef2c4d06da |
29-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
Merge "Re-enable caching step in RS filters" into gb-ub-photos-bryce
|
7857fc5931953ed5d63fbcbd1c810740f6e0eef6 |
29-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
Merge "Re-enable caching step in RS filters" into gb-ub-photos-bryce
|
316d91c42ab3c822d261cf692d8540035d867457 |
29-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
Re-enable caching step in RS filters Bug: 8478659 Bug: 8459181 Bug: 8450339 Bug: 8457323 With the compatibility library, different Scripts instances actually points to the same thing. We thus need to explicitely rebind all the variables to the correct script instance before running RS filters... Change-Id: Id6cd4e44b5a67a3d2588e158c616b2b44e214a5b
rc/com/android/gallery3d/filtershow/presets/FilterEnvironment.java
|
0c90af2257105a289c19a355e33d4035bd1fc61f |
29-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
Re-enable caching step in RS filters Bug: 8478659 Bug: 8459181 Bug: 8450339 Bug: 8457323 With the compatibility library, different Scripts instances actually points to the same thing. We thus need to explicitely rebind all the variables to the correct script instance before running RS filters... Change-Id: Id6cd4e44b5a67a3d2588e158c616b2b44e214a5b
rc/com/android/gallery3d/filtershow/filters/ImageFilterRS.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterSharpen.java
rc/com/android/gallery3d/filtershow/presets/FilterEnvironment.java
|
b782f6d9e38c84124735044708246112e62ddc9a |
29-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
Re-enable caching step in RS filters Bug: 8478659 Bug: 8459181 Bug: 8450339 Bug: 8457323 With the compatibility library, different Scripts instances actually points to the same thing. We thus need to explicitely rebind all the variables to the correct script instance before running RS filters... Change-Id: Id6cd4e44b5a67a3d2588e158c616b2b44e214a5b
rc/com/android/gallery3d/filtershow/filters/ImageFilterRS.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterSharpen.java
rc/com/android/gallery3d/filtershow/presets/FilterEnvironment.java
|
eb543cfb2f598b68791321a7747cdba02204e1fa |
29-Mar-2013 |
Angus Kong <shkong@google.com> |
Make camera releasing synchronous. bug:8502943 Change-Id: I48d71c07894fefa909db1a78c0dbe9b8f72e5166
rc/com/android/camera/CameraManager.java
|
0925a4e9d7f62f57cf9d8ed40ce22d08af1583a3 |
29-Mar-2013 |
Angus Kong <shkong@google.com> |
Make camera releasing synchronous. bug:8502943 Change-Id: I48d71c07894fefa909db1a78c0dbe9b8f72e5166
rc/com/android/camera/CameraManager.java
|
40197c7b877c508cc7adce042611b5833f403845 |
29-Mar-2013 |
Bobby Georgescu <georgescu@google.com> |
am 68621a49: am e1284d2d: am b4723e51: am 62cc2aa4: Add HeaderGridView implementation * commit '68621a49af6f1f228283b16d83bbeabf4138fb14': Add HeaderGridView implementation
|
fd993a55ae2384677dc449b9612c31733b00b124 |
29-Mar-2013 |
Bobby Georgescu <georgescu@google.com> |
am e1284d2d: am b4723e51: am 62cc2aa4: Add HeaderGridView implementation * commit 'e1284d2df081ed26acf81642474cc3f9712bef81': Add HeaderGridView implementation
|
f72e073919fbc30a204248167ccaea840d1831ff |
29-Mar-2013 |
Bobby Georgescu <georgescu@google.com> |
am b4723e51: am 62cc2aa4: Add HeaderGridView implementation * commit 'b4723e5144712d43f6ab1e91cae5299b8d394a49': Add HeaderGridView implementation
|
d06d3cb21c54f2ba942ec2b1dfcb3865a7a44172 |
29-Mar-2013 |
Bobby Georgescu <georgescu@google.com> |
am 62cc2aa4: Add HeaderGridView implementation * commit '62cc2aa4400a4ad03cfc6025e9d25c61015cdef4': Add HeaderGridView implementation
|
62cc2aa4400a4ad03cfc6025e9d25c61015cdef4 |
28-Mar-2013 |
Bobby Georgescu <georgescu@google.com> |
Add HeaderGridView implementation Change-Id: Id0e699be0e40310c4919a9d55503edb9b07d4b58
rc/com/android/photos/views/HeaderGridView.java
|
2e45fd060ca623a3f28858eabd17be891b4fba89 |
28-Mar-2013 |
Bobby Georgescu <georgescu@google.com> |
Add HeaderGridView implementation Change-Id: Id0e699be0e40310c4919a9d55503edb9b07d4b58
rc/com/android/photos/views/HeaderGridView.java
|
bca9db3d65e4171a2f901f0d10a29bbcf6a3af88 |
28-Mar-2013 |
Doris Liu <tianliu@google.com> |
Disable preview gestures when shutter is pressed Bug:8333662 Change-Id: Ia204822c5651ab98cca6f67ee45058b6d9d81b31
rc/com/android/camera/VideoModule.java
rc/com/android/camera/VideoUI.java
|
5ef14ed6e66f3e27217cb2c7f30b05bda1b08414 |
28-Mar-2013 |
Doris Liu <tianliu@google.com> |
am 245bdbb4: am 0b69db0c: am 30edf575: am 10bd1e0c: Merge "Disable preview gestures when shutter is pressed" into gb-ub-photos-bryce * commit '245bdbb42fa6709170408eb12c3099c512f6b4cd': Disable preview gestures when shutter is pressed
|
9824f318a63b49d9b177c507add8b476d17ba860 |
28-Mar-2013 |
Doris Liu <tianliu@google.com> |
am 0b69db0c: am 30edf575: am 10bd1e0c: Merge "Disable preview gestures when shutter is pressed" into gb-ub-photos-bryce * commit '0b69db0c888dba0de5499a0c6a6b501fcb006404': Disable preview gestures when shutter is pressed
|
cfa17c541caaf9fba0667b41eb2cc1f683f6fbba |
28-Mar-2013 |
Doris Liu <tianliu@google.com> |
am 30edf575: am 10bd1e0c: Merge "Disable preview gestures when shutter is pressed" into gb-ub-photos-bryce * commit '30edf57559cd46e7cdb191a61fd2138bf6ead905': Disable preview gestures when shutter is pressed
|
c2ae5415a2b362ed063e6c8dc8984cf9fcd258a6 |
28-Mar-2013 |
Doris Liu <tianliu@google.com> |
am 10bd1e0c: Merge "Disable preview gestures when shutter is pressed" into gb-ub-photos-bryce * commit '10bd1e0c43b39ad3314a213822403588141cc7f5': Disable preview gestures when shutter is pressed
|
10bd1e0c43b39ad3314a213822403588141cc7f5 |
28-Mar-2013 |
Doris Liu <tianliu@google.com> |
Merge "Disable preview gestures when shutter is pressed" into gb-ub-photos-bryce
|
2a68debc4c7a285dff36c7639387fed1e8e02b45 |
28-Mar-2013 |
Doris Liu <tianliu@google.com> |
Merge "Disable preview gestures when shutter is pressed" into gb-ub-photos-bryce
|
f8418b2cdd29de013cda0cb6fe7c8a5fd0b96a6c |
28-Mar-2013 |
The Android Automerger <android-build@android.com> |
merge in jb-mr2-release history after reset to jb-mr2-dev
|
4af9ad5c241dcb7774beb3eed8e47b3226c27048 |
28-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
am 03b8abd2: am b0846578: am 0fe505ec: am 560f959b: Fix deadlock. * commit '03b8abd29bc70bffeef7b34588aa1fc465b38cd2': Fix deadlock.
|
54eb7e71b95fb34e6a8250f88269b5f761e032fd |
28-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
am b0846578: am 0fe505ec: am 560f959b: Fix deadlock. * commit 'b0846578faa364180aafbec9d7a2829cc4960db7': Fix deadlock.
|
1d60629c64d06b88b42889ecfc47080c156335e3 |
28-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
am 0fe505ec: am 560f959b: Fix deadlock. * commit '0fe505ec49f69dccf3ceb0a409e1acb55a9d9a03': Fix deadlock.
|
9b0a10d61186a9643f9d0e007200a2d402bd165e |
28-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
am 560f959b: Fix deadlock. * commit '560f959b659bb510a6ac9a92831534c5dfcf16be': Fix deadlock.
|
560f959b659bb510a6ac9a92831534c5dfcf16be |
28-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
Fix deadlock. Move the RenderScript context and Resources to CachingPipeline. bug:8491107 Change-Id: I912555c87b060e4515cc1a4c66c8a8c9c840532d
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/cache/CachingPipeline.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterRS.java
|
83facdef714b729aeab4d51919206d95a7afb165 |
28-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
Fix deadlock. Move the RenderScript context and Resources to CachingPipeline. bug:8491107 Change-Id: I912555c87b060e4515cc1a4c66c8a8c9c840532d
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/cache/CachingPipeline.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterRS.java
|
f5292608058dbadaae0676aa22b118ac828dd29e |
28-Mar-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 23ab14f7: am 9b41ee2c: am 7a46da5f: am 4a1caa57: Merge "Fixed renderscript crashes." into gb-ub-photos-bryce * commit '23ab14f7d9dff932f410fd89c7a631d410324f15': Fixed renderscript crashes.
|
80b84a327dc738c68f2d8c31326e6e31a8ef893c |
28-Mar-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 9b41ee2c: am 7a46da5f: am 4a1caa57: Merge "Fixed renderscript crashes." into gb-ub-photos-bryce * commit '9b41ee2c68289e2de29e763a4a217b0273bc6ce0': Fixed renderscript crashes.
|
2e30a0823b6a519c098dd831adcc3f513d355211 |
28-Mar-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 7a46da5f: am 4a1caa57: Merge "Fixed renderscript crashes." into gb-ub-photos-bryce * commit '7a46da5f63f021f6675849fe7ba8b4fe54c9b3d5': Fixed renderscript crashes.
|
83e93b9fe3613a6aa7caefb7d993c0fda3bb8bfd |
28-Mar-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 4a1caa57: Merge "Fixed renderscript crashes." into gb-ub-photos-bryce * commit '4a1caa577565fb64804706de3abf8917ba915a1f': Fixed renderscript crashes.
|
4a1caa577565fb64804706de3abf8917ba915a1f |
28-Mar-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Fixed renderscript crashes." into gb-ub-photos-bryce
|
6d2104b2dd31e39e8f3c178375d4d91055a24a54 |
28-Mar-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Fixed renderscript crashes." into gb-ub-photos-bryce
|
29002527ec98a38326f602661abda4d8968baeec |
28-Mar-2013 |
Doris Liu <tianliu@google.com> |
Disable preview gestures when shutter is pressed Bug:8333662 Change-Id: Ia204822c5651ab98cca6f67ee45058b6d9d81b31
rc/com/android/camera/VideoModule.java
rc/com/android/camera/VideoUI.java
|
61f2b082014fe4402dd208029e9378dd5cb1fd1d |
28-Mar-2013 |
Doris Liu <tianliu@google.com> |
Disable preview gestures when shutter is pressed Bug:8333662 Change-Id: Ia204822c5651ab98cca6f67ee45058b6d9d81b31
rc/com/android/camera/VideoModule.java
rc/com/android/camera/VideoUI.java
|
3bb74a15f4c5f7f5f5c8e12cc696e78a8b5dcb45 |
27-Mar-2013 |
Angus Kong <shkong@google.com> |
am c4c528c4: am 696ea2d1: am d216ea46: am 759ef774: Merge "Make camera calls asynchronous" into gb-ub-photos-bryce * commit 'c4c528c4bd4a017b0f215f4d3875565ba6f91bfb': Make camera calls asynchronous
|
9542e0936cedb9de90a5f2e49f37f24fd296cd90 |
27-Mar-2013 |
Angus Kong <shkong@google.com> |
am 696ea2d1: am d216ea46: am 759ef774: Merge "Make camera calls asynchronous" into gb-ub-photos-bryce * commit '696ea2d16cb03fe11df7311e6981943ac4144fd7': Make camera calls asynchronous
|
73d2feaf2abbb3306a47308f20e94b3e53198c7c |
27-Mar-2013 |
Angus Kong <shkong@google.com> |
am d216ea46: am 759ef774: Merge "Make camera calls asynchronous" into gb-ub-photos-bryce * commit 'd216ea465e60d5e447fa2c32ff950bbb1e9d02a9': Make camera calls asynchronous
|
cf0f82d46bb0c50a4cad427251f754744b56404a |
27-Mar-2013 |
Angus Kong <shkong@google.com> |
am 759ef774: Merge "Make camera calls asynchronous" into gb-ub-photos-bryce * commit '759ef774229db788024b2da6cadefe06fd96cd96': Make camera calls asynchronous
|
759ef774229db788024b2da6cadefe06fd96cd96 |
27-Mar-2013 |
Angus Kong <shkong@google.com> |
Merge "Make camera calls asynchronous" into gb-ub-photos-bryce
|
2a23c46ca52e9af02aac7c454a89d2b9c4f2e539 |
27-Mar-2013 |
Angus Kong <shkong@google.com> |
Merge "Make camera calls asynchronous" into gb-ub-photos-bryce
|
1d75253194716a89e5f5a865b1993bc2bb9b492d |
26-Mar-2013 |
Angus Kong <shkong@google.com> |
Make camera calls asynchronous bug:8438047 Change-Id: I151d5ff85f0fb3646432a64b5841256a1448f101
rc/com/android/camera/CameraManager.java
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/VideoModule.java
|
dcb0ef1d6eacdd7d18a6881ae75f67c9851a858c |
26-Mar-2013 |
Angus Kong <shkong@google.com> |
Make camera calls asynchronous bug:8438047 Change-Id: I151d5ff85f0fb3646432a64b5841256a1448f101
rc/com/android/camera/CameraManager.java
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/VideoModule.java
|
bc94848ce73ba9a23be2f7f3a12c4a7404ae3eb2 |
27-Mar-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Fixed renderscript crashes. Bug: 8478659 Bug: 8459181 Bug: 8450339 Bug: 8457323 createFilter() initializes a ton of parameters in the RenderScript filters. Using stale parameters from a previous call to createFilter() causes segfaults. Change-Id: Id54b956b7fe83be5089b1d47c3bedcca66237ddf
rc/com/android/gallery3d/filtershow/filters/ImageFilterRS.java
|
2f7cb89c74f7d0c01d847bdfe7fbd8c31c2d0fb5 |
27-Mar-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Fixed renderscript crashes. Bug: 8478659 Bug: 8459181 Bug: 8450339 Bug: 8457323 createFilter() initializes a ton of parameters in the RenderScript filters. Using stale parameters from a previous call to createFilter() causes segfaults. Change-Id: Id54b956b7fe83be5089b1d47c3bedcca66237ddf
rc/com/android/gallery3d/filtershow/filters/ImageFilterRS.java
|
bad64d4488342f98b0005e7749d106ac40aa7ebc |
27-Mar-2013 |
Doris Liu <tianliu@google.com> |
am 58211cfe: am 346fd2ef: am 3fa3adce: am 4520e5ed: Merge "Workaround for switcher popup being cut off on ICS" into gb-ub-photos-bryce * commit '58211cfe58c94b022f979f1df0a86ddc00773679': Workaround for switcher popup being cut off on ICS
|
5a3b35157787125da6bde07b14961b2678a9ce5e |
27-Mar-2013 |
Doris Liu <tianliu@google.com> |
am 346fd2ef: am 3fa3adce: am 4520e5ed: Merge "Workaround for switcher popup being cut off on ICS" into gb-ub-photos-bryce * commit '346fd2ef30ce7b0841e13e9e63bdba48141f17db': Workaround for switcher popup being cut off on ICS
|
5e0e3f2aff3e23881321786b3d40e41423bccc05 |
27-Mar-2013 |
Doris Liu <tianliu@google.com> |
am 3fa3adce: am 4520e5ed: Merge "Workaround for switcher popup being cut off on ICS" into gb-ub-photos-bryce * commit '3fa3adcea76a693d51ae29aed0edd283ff1706d3': Workaround for switcher popup being cut off on ICS
|
4a732684bcb1f3ecf8092ecfe4792d0cc1dbafcb |
27-Mar-2013 |
Doris Liu <tianliu@google.com> |
am 4520e5ed: Merge "Workaround for switcher popup being cut off on ICS" into gb-ub-photos-bryce * commit '4520e5edf00761e8f90e023330d9a90f0de37e70': Workaround for switcher popup being cut off on ICS
|
4520e5edf00761e8f90e023330d9a90f0de37e70 |
27-Mar-2013 |
Doris Liu <tianliu@google.com> |
Merge "Workaround for switcher popup being cut off on ICS" into gb-ub-photos-bryce
|
c6af786bdc2488c2c7a69846b81261f31ffdccb3 |
27-Mar-2013 |
Doris Liu <tianliu@google.com> |
Merge "Workaround for switcher popup being cut off on ICS" into gb-ub-photos-bryce
|
44a312b18ada8dc2df6c7eaba27dbcd065acbead |
27-Mar-2013 |
Doris Liu <tianliu@google.com> |
Workaround for switcher popup being cut off on ICS Bug: 8390375 Change-Id: Ie4a196824751ae6717849f210c3e8e17e4aa014d
rc/com/android/camera/ui/CameraSwitcher.java
|
1f69b697746b62c76c8a4892c62e20380151be69 |
27-Mar-2013 |
Doris Liu <tianliu@google.com> |
Workaround for switcher popup being cut off on ICS Bug: 8390375 Change-Id: Ie4a196824751ae6717849f210c3e8e17e4aa014d
rc/com/android/camera/ui/CameraSwitcher.java
|
4819a61070f6214cc1ec7bc8b8b9409f4d99e055 |
27-Mar-2013 |
The Android Automerger <android-build@android.com> |
merge in jb-mr2-release history after reset to jb-mr2-dev
|
1fbbc395bdf05d42cc4c034db769999646eedad2 |
27-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
am 186f4312: am a287a77d: am c2bc7ba3: am 0629d70d: Merge "Moves ownership of the environment to the pipeline" into gb-ub-photos-bryce * commit '186f43123ae18f8e03329ee41240be7208ea2c26': Moves ownership of the environment to the pipeline
|
57d7d79b6091f36bfc36a027dd215dc41b76ca87 |
27-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
am a287a77d: am c2bc7ba3: am 0629d70d: Merge "Moves ownership of the environment to the pipeline" into gb-ub-photos-bryce * commit 'a287a77d19f056fafd54745d12640684d3897cf6': Moves ownership of the environment to the pipeline
|
35fd654fae8f3c98a097125619e866abc64f1d69 |
27-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
am c2bc7ba3: am 0629d70d: Merge "Moves ownership of the environment to the pipeline" into gb-ub-photos-bryce * commit 'c2bc7ba3b404ed7556e99e7f9cb50150e242dab1': Moves ownership of the environment to the pipeline
|
f4fd6ae7b8e0f36f11a14e0d6aef33a883b799c0 |
27-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
am 0629d70d: Merge "Moves ownership of the environment to the pipeline" into gb-ub-photos-bryce * commit '0629d70d6b03a84741050ac9f3add8db0adad9c6': Moves ownership of the environment to the pipeline
|
0629d70d6b03a84741050ac9f3add8db0adad9c6 |
27-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
Merge "Moves ownership of the environment to the pipeline" into gb-ub-photos-bryce
|
a148e5b2139e6dad6c77f79e3440abb671db70b2 |
27-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
Merge "Moves ownership of the environment to the pipeline" into gb-ub-photos-bryce
|
af6967f0f56b38ea73f8ff01cb0dc5eb6b7478af |
23-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
Moves ownership of the environment to the pipeline Change-Id: I256e679a6f47831ebf00fe57d38b9c0372be38ec
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
|
b75da4c91e16bbd83cd839207224c0645a6ecefd |
23-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
Moves ownership of the environment to the pipeline Change-Id: I256e679a6f47831ebf00fe57d38b9c0372be38ec
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/cache/CachingPipeline.java
rc/com/android/gallery3d/filtershow/cache/ImageLoader.java
rc/com/android/gallery3d/filtershow/cache/RenderingRequest.java
rc/com/android/gallery3d/filtershow/filters/BaseFiltersManager.java
rc/com/android/gallery3d/filtershow/imageshow/ImageZoom.java
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
|
c07f1badee5eb2debeb55e7d15d894163e03f3e8 |
23-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
Moves ownership of the environment to the pipeline Change-Id: I256e679a6f47831ebf00fe57d38b9c0372be38ec
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/cache/CachingPipeline.java
rc/com/android/gallery3d/filtershow/cache/ImageLoader.java
rc/com/android/gallery3d/filtershow/cache/RenderingRequest.java
rc/com/android/gallery3d/filtershow/filters/BaseFiltersManager.java
rc/com/android/gallery3d/filtershow/imageshow/ImageZoom.java
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
|
d4101b3bd46a1db4870d9af9178bb1871183e4d0 |
27-Mar-2013 |
Angus Kong <shkong@google.com> |
am 17664da8: am ddacee42: am e1073df5: am 53a06d0d: Remove debug log. * commit '17664da8a4211a4b25ec6739aa0be10c460901a8': Remove debug log.
|
03bc39a18b8133aa35702bd4252c160b8f41d35d |
27-Mar-2013 |
Angus Kong <shkong@google.com> |
am ddacee42: am e1073df5: am 53a06d0d: Remove debug log. * commit 'ddacee4298c841ed8c42d40319cf50ccf5c6433d': Remove debug log.
|
faba0e68635ea14be87add1b4cd9fa140a2ef9c6 |
27-Mar-2013 |
Angus Kong <shkong@google.com> |
am e1073df5: am 53a06d0d: Remove debug log. * commit 'e1073df5751cfd90c81ae30d97319d9b54513578': Remove debug log.
|
15a16f1f4b26a719398829c01f808bca1323be6e |
27-Mar-2013 |
Angus Kong <shkong@google.com> |
am 53a06d0d: Remove debug log. * commit '53a06d0d76c7f59aa5678f9a8d72f211b3ace773': Remove debug log.
|
53a06d0d76c7f59aa5678f9a8d72f211b3ace773 |
27-Mar-2013 |
Angus Kong <shkong@google.com> |
Remove debug log. Change-Id: I9df3172c2f082fd9bdbbbf8edc8135983c837c43
rc/com/android/camera/PhotoModule.java
|
81c9d5d383e366670cb88c3a16a457428cdc18dd |
27-Mar-2013 |
Angus Kong <shkong@google.com> |
Remove debug log. Change-Id: I9df3172c2f082fd9bdbbbf8edc8135983c837c43
rc/com/android/camera/PhotoModule.java
|
2bebea6ee815adf9145c3f5a0bb9b1ebdb4744bb |
27-Mar-2013 |
Angus Kong <shkong@google.com> |
am 70427473: am 44dc1fb2: am 4c11a2b6: am dd2e511d: Add GPSDirection tag using ExifInterface. * commit '7042747323e705800e1abca46dc8ab5bb4869a05': Add GPSDirection tag using ExifInterface.
|
4999c25bebcc8843be7bb8b6230d594ad60aa6d1 |
27-Mar-2013 |
Angus Kong <shkong@google.com> |
am 44dc1fb2: am 4c11a2b6: am dd2e511d: Add GPSDirection tag using ExifInterface. * commit '44dc1fb2f4c5e9125124fa3f960e837ba4ee3e95': Add GPSDirection tag using ExifInterface.
|
22edcacc38f2726b49253ffe8fcd39b0a3770994 |
27-Mar-2013 |
Angus Kong <shkong@google.com> |
am 4c11a2b6: am dd2e511d: Add GPSDirection tag using ExifInterface. * commit '4c11a2b6131e8c428451484375f372833c9aa7de': Add GPSDirection tag using ExifInterface.
|
99f4ae4ce78e5534ffa3a5e2c17f85dff5da3c12 |
27-Mar-2013 |
Angus Kong <shkong@google.com> |
am dd2e511d: Add GPSDirection tag using ExifInterface. * commit 'dd2e511d212ddc438760b23b8cdf5081daccc9ef': Add GPSDirection tag using ExifInterface.
|
dd2e511d212ddc438760b23b8cdf5081daccc9ef |
26-Mar-2013 |
Angus Kong <shkong@google.com> |
Add GPSDirection tag using ExifInterface. bug:8115825 Change-Id: Iefcbbddbb7f9fed0c386214b428d4743f67d0dd9
rc/com/android/camera/Exif.java
rc/com/android/camera/MediaSaveService.java
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/Storage.java
rc/com/android/camera/VideoModule.java
|
0d00a8907096b9970ac64f52abbd2bfc1ed751b6 |
26-Mar-2013 |
Angus Kong <shkong@google.com> |
Add GPSDirection tag using ExifInterface. bug:8115825 Change-Id: Iefcbbddbb7f9fed0c386214b428d4743f67d0dd9
rc/com/android/camera/Exif.java
rc/com/android/camera/MediaSaveService.java
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/Storage.java
rc/com/android/camera/VideoModule.java
|
a53152fa749c8adcafb251220f051f93a8ae3c0f |
26-Mar-2013 |
The Android Open Source Project <initial-contribution@android.com> |
am c702060a: (-s ours) am e410946c: (-s ours) Reconcile with jb-mr2-release - do not merge * commit 'c702060a1b5d640c5e1f3a7f45d40f2d82bd9951':
|
a3a186eb9fcf4c159dbcb4db44ec2914c283b412 |
26-Mar-2013 |
The Android Open Source Project <initial-contribution@android.com> |
am e410946c: (-s ours) Reconcile with jb-mr2-release - do not merge * commit 'e410946c085f6a6b679c5e597abf4b40dbd5ba28':
|
28ac489c21587e30bf1a509b4e52bd10feb06b9e |
26-Mar-2013 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with jb-mr2-release - do not merge Change-Id: Ia8c3c7215b620c1cf453cd01fa8420d50061f879
|
3a305ea742e96ee4b5477bfe024a33fc853c7c28 |
26-Mar-2013 |
The Android Automerger <android-build@android.com> |
merge in jb-mr2-release history after reset to jb-mr2-dev
|
c8722dd1e3bb7e51e0802753a03b27350f75f75f |
26-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
am 4563a73a: am 136223bb: am 91dd4e7b: am be31e587: Hides popup indicator on some editors * commit '4563a73a97be59f9e1bb5aafe1c604f894ebe849': Hides popup indicator on some editors
|
329509a84a7c734b5165fd7ebd510c5f47aa90a9 |
26-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
am 136223bb: am 91dd4e7b: am be31e587: Hides popup indicator on some editors * commit '136223bbbc4c8968778168e81e565feb7a71a430': Hides popup indicator on some editors
|
b4882f5d4788a8fa81d8db3031d2bc6e7459eea3 |
26-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
am 91dd4e7b: am be31e587: Hides popup indicator on some editors * commit '91dd4e7b12f32d72ab2f7baaf538a939ca7bfaeb': Hides popup indicator on some editors
|
2fb228eb7e097b68daa499777248916102ce921e |
26-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
am be31e587: Hides popup indicator on some editors * commit 'be31e587c1485fb8e3d7c8b079250ffbdc26e1b9': Hides popup indicator on some editors
|
be31e587c1485fb8e3d7c8b079250ffbdc26e1b9 |
26-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
Hides popup indicator on some editors Change-Id: I88f17b9352c582f26f09a74db9d91e1fb81dbeae
rc/com/android/gallery3d/filtershow/editors/Editor.java
rc/com/android/gallery3d/filtershow/editors/EditorFlip.java
rc/com/android/gallery3d/filtershow/editors/EditorRotate.java
rc/com/android/gallery3d/filtershow/editors/EditorStraighten.java
|
88efa27609d08a749cda7ba928cb825de71a7f2b |
26-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
Hides popup indicator on some editors Change-Id: I88f17b9352c582f26f09a74db9d91e1fb81dbeae
rc/com/android/gallery3d/filtershow/editors/Editor.java
rc/com/android/gallery3d/filtershow/editors/EditorFlip.java
rc/com/android/gallery3d/filtershow/editors/EditorRotate.java
rc/com/android/gallery3d/filtershow/editors/EditorStraighten.java
|
92951be9f66120c25cb86670087584e0fd12b3db |
26-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
am 2c901dbd: am 35334379: am 4cdcd1d6: am 91be98c3: Hides seekbar in some editors * commit '2c901dbdbe0d9adb0e500ac6e8e7d0c70b668033': Hides seekbar in some editors
|
aa086cd955688043c6b6d17425a7312bbcb4176b |
26-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
am 35334379: am 4cdcd1d6: am 91be98c3: Hides seekbar in some editors * commit '353343798d22bddd8cca4260e32b8068566f4f09': Hides seekbar in some editors
|
3b59360f9617d2d643bf2f24c5c880aa152472a3 |
26-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
am 4cdcd1d6: am 91be98c3: Hides seekbar in some editors * commit '4cdcd1d611c31dc4535a124ab9e2a5f00e1dfa14': Hides seekbar in some editors
|
2c9da4c8f4c1f0c31f8ea6e4eafafaa44982803a |
26-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
am 91be98c3: Hides seekbar in some editors * commit '91be98c35f6c5f19d7629bb29e7261970b2f4c67': Hides seekbar in some editors
|
91be98c35f6c5f19d7629bb29e7261970b2f4c67 |
26-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
Hides seekbar in some editors Change-Id: Ifce385f9a6bf9b741f0873f49d826fbcf453d97c
rc/com/android/gallery3d/filtershow/editors/Editor.java
rc/com/android/gallery3d/filtershow/editors/EditorCrop.java
rc/com/android/gallery3d/filtershow/editors/EditorCurves.java
rc/com/android/gallery3d/filtershow/editors/EditorDraw.java
rc/com/android/gallery3d/filtershow/editors/EditorFlip.java
rc/com/android/gallery3d/filtershow/editors/EditorRedEye.java
rc/com/android/gallery3d/filtershow/editors/EditorRotate.java
rc/com/android/gallery3d/filtershow/editors/EditorStraighten.java
|
175fc2198c8ff313fa90f0c37d09d80fa0c604cb |
26-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
Hides seekbar in some editors Change-Id: Ifce385f9a6bf9b741f0873f49d826fbcf453d97c
rc/com/android/gallery3d/filtershow/editors/Editor.java
rc/com/android/gallery3d/filtershow/editors/EditorCrop.java
rc/com/android/gallery3d/filtershow/editors/EditorCurves.java
rc/com/android/gallery3d/filtershow/editors/EditorDraw.java
rc/com/android/gallery3d/filtershow/editors/EditorFlip.java
rc/com/android/gallery3d/filtershow/editors/EditorRedEye.java
rc/com/android/gallery3d/filtershow/editors/EditorRotate.java
rc/com/android/gallery3d/filtershow/editors/EditorStraighten.java
|
efae7b5becdb1309ae87f63934f298a09f2d224f |
26-Mar-2013 |
Doris Liu <tianliu@google.com> |
am b4d9ca48: am 37a55c37: am 8c6e88ad: am 0dd47d9e: Merge "Adding switcher background back in" into gb-ub-photos-bryce * commit 'b4d9ca48cb6522550a95ea641c8f6f4b9e6f7b7e': Adding switcher background back in
|
4f7c5e56ae5725d93a633bd3d597ec160e95677f |
26-Mar-2013 |
Doris Liu <tianliu@google.com> |
am 37a55c37: am 8c6e88ad: am 0dd47d9e: Merge "Adding switcher background back in" into gb-ub-photos-bryce * commit '37a55c370e83a134ef41bbdb204f0815d3016796': Adding switcher background back in
|
9276d7a62346f512903f2b1b343645590081ab5e |
26-Mar-2013 |
Doris Liu <tianliu@google.com> |
am 8c6e88ad: am 0dd47d9e: Merge "Adding switcher background back in" into gb-ub-photos-bryce * commit '8c6e88add526e3e28beb04b4cba42e86db0d2bd7': Adding switcher background back in
|
13ee468d2602c9b72aef5d453d4afe95dc49bbf7 |
26-Mar-2013 |
Doris Liu <tianliu@google.com> |
am 0dd47d9e: Merge "Adding switcher background back in" into gb-ub-photos-bryce * commit '0dd47d9e60cc94f30253a656ec893347160832de': Adding switcher background back in
|
ff0d28c765409dc89f86ae6b521640e2e4b284c4 |
26-Mar-2013 |
Doris Liu <tianliu@google.com> |
Merge "Adding switcher background back in" into gb-ub-photos-bryce
|
0dd47d9e60cc94f30253a656ec893347160832de |
26-Mar-2013 |
Doris Liu <tianliu@google.com> |
Merge "Adding switcher background back in" into gb-ub-photos-bryce
|
8737bd93a989cc5608065b13f0682f60a6e18e27 |
26-Mar-2013 |
Doris Liu <tianliu@google.com> |
Merge "Adding switcher background back in" into gb-ub-photos-bryce
|
30f7eb3ad757fe42d8891afa7d32e8f5a6a02cb9 |
26-Mar-2013 |
Doris Liu <tianliu@google.com> |
Adding switcher background back in Fixed switcher background's rotation issue. Bug: 8436031 Change-Id: Icc6c3fa38c98587c1ff37fea7d53980679943938
es/layout-land/camera_controls.xml
es/layout-port/camera_controls.xml
|
8b2e6d4d656bc7e8e4c844269d9da63fa67855d6 |
26-Mar-2013 |
Doris Liu <tianliu@google.com> |
Adding switcher background back in Fixed switcher background's rotation issue. Bug: 8436031 Change-Id: Icc6c3fa38c98587c1ff37fea7d53980679943938
es/layout-land/camera_controls.xml
es/layout-port/camera_controls.xml
rc/com/android/camera/ui/SwitcherBackgroundView.java
|
c0bbf7c9a11e8c4e02045672989a8545e4c1279d |
26-Mar-2013 |
Doris Liu <tianliu@google.com> |
Adding switcher background back in Fixed switcher background's rotation issue. Bug: 8436031 Change-Id: Icc6c3fa38c98587c1ff37fea7d53980679943938
rc/com/android/camera/ui/SwitcherBackgroundView.java
|
eef4ab3474e0d99970551b1b510b591e8feaa291 |
26-Mar-2013 |
Mangesh Ghiware <mghiware@google.com> |
am 405992b2: am 05bb0642: am ed4bfae9: am b2a64665: Add album type to albums table. * commit '405992b2f420b8a51427faddb814092d2ec96df0': Add album type to albums table.
|
f4cd8eb23740b6d8a88de6c7940ec56f09ef5031 |
25-Mar-2013 |
Mangesh Ghiware <mghiware@google.com> |
am 05bb0642: am ed4bfae9: am b2a64665: Add album type to albums table. * commit '05bb0642f0e195c4ccdcec058e0d1ff20d0e9528': Add album type to albums table.
|
69deb11a321a2dd267e12493ae0e12aeeba6fc78 |
25-Mar-2013 |
Mangesh Ghiware <mghiware@google.com> |
am ed4bfae9: am b2a64665: Add album type to albums table. * commit 'ed4bfae941dcc8ecc6112d3a313245bd3d057f76': Add album type to albums table.
|
bfb04044db40297011a6c6b2af8d0e7f091dd847 |
25-Mar-2013 |
Mangesh Ghiware <mghiware@google.com> |
am b2a64665: Add album type to albums table. * commit 'b2a646658c87378b681d85a130db705a39d07171': Add album type to albums table.
|
b2a646658c87378b681d85a130db705a39d07171 |
25-Mar-2013 |
Mangesh Ghiware <mghiware@google.com> |
Add album type to albums table. Change-Id: Ib4dfb1de9d814d2ee41c5b855b69f09115912e57
rc/com/android/photos/data/PhotoDatabase.java
rc/com/android/photos/data/PhotoProvider.java
|
e67807fc8cb22fcd6b210fe660501dbf102c12eb |
25-Mar-2013 |
Mangesh Ghiware <mghiware@google.com> |
Add album type to albums table. Change-Id: Ib4dfb1de9d814d2ee41c5b855b69f09115912e57
rc/com/android/photos/data/PhotoDatabase.java
rc/com/android/photos/data/PhotoProvider.java
|
97ccb1d3f3c4fe551aed07f65d587a3c581e9b04 |
25-Mar-2013 |
The Android Automerger <android-build@android.com> |
merge in jb-mr2-release history after reset to jb-mr2-dev
|
188647e6836b2bb8bf0abbdf732383c2918dd7e7 |
23-Mar-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 2ba8779d: am 6facf4ee: am 8de91d71: am 05762614: Merge "Refactoring: removed unnecessary apply calls." into gb-ub-photos-bryce * commit '2ba8779d97c63448df795902f51e359269804092': Refactoring: removed unnecessary apply calls.
|
238e557e98b5df8d716ad269e557a130cfb6ede7 |
23-Mar-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 6facf4ee: am 8de91d71: am 05762614: Merge "Refactoring: removed unnecessary apply calls." into gb-ub-photos-bryce * commit '6facf4ee4dac960af01bf048add8a5a90c0620bb': Refactoring: removed unnecessary apply calls.
|
d49d937799ae885ff9f138bc0fc1be1aa3a65b70 |
23-Mar-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 8de91d71: am 05762614: Merge "Refactoring: removed unnecessary apply calls." into gb-ub-photos-bryce * commit '8de91d71647581203f5513c210798dc8ddf4a51f': Refactoring: removed unnecessary apply calls.
|
318a4a37db1fd0ffca6848969d971c08df715f36 |
23-Mar-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 05762614: Merge "Refactoring: removed unnecessary apply calls." into gb-ub-photos-bryce * commit '05762614aa36d5b8b5ed7acd107360a1abc602e3': Refactoring: removed unnecessary apply calls.
|
05762614aa36d5b8b5ed7acd107360a1abc602e3 |
23-Mar-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Refactoring: removed unnecessary apply calls." into gb-ub-photos-bryce
|
e09b8f4e1d3b2d1fb99e79f07312d06db87f652d |
23-Mar-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Refactoring: removed unnecessary apply calls. Change-Id: Ic592a00a8487f6a2499c34929b0ec8afad2a73b6
rc/com/android/gallery3d/filtershow/ImageStateAdapter.java
rc/com/android/gallery3d/filtershow/filters/ImageFilter.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterBorder.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterDownsample.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterGeometry.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterParametricBorder.java
rc/com/android/gallery3d/filtershow/filters/SimpleImageFilter.java
rc/com/android/gallery3d/filtershow/imageshow/MasterImage.java
rc/com/android/gallery3d/filtershow/ui/FilterIconButton.java
|
f4486566491c2f6c51817f92ee1000d12db41c1b |
23-Mar-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Refactoring: removed unnecessary apply calls. Change-Id: Ic592a00a8487f6a2499c34929b0ec8afad2a73b6
rc/com/android/gallery3d/filtershow/ImageStateAdapter.java
rc/com/android/gallery3d/filtershow/filters/ImageFilter.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterBorder.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterDownsample.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterGeometry.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterParametricBorder.java
rc/com/android/gallery3d/filtershow/filters/SimpleImageFilter.java
rc/com/android/gallery3d/filtershow/imageshow/MasterImage.java
rc/com/android/gallery3d/filtershow/ui/FilterIconButton.java
|
924b9e60d1327a62c869f1ed813c16bf698c7bf2 |
23-Mar-2013 |
Baligh Uddin <baligh@google.com> |
am 006a1ba3: (-s ours) am acfea8f0: (-s ours) am b06f92de: am 2c88c2be: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce * commit '006a1ba387d7c90e49f3393d10a4f2cc6c90bd70': Import translations. DO NOT MERGE
|
d62f4bf10a3fd80f208282d433510c9638b873da |
23-Mar-2013 |
Baligh Uddin <baligh@google.com> |
am acfea8f0: (-s ours) am b06f92de: am 2c88c2be: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce * commit 'acfea8f0bbff96e50a577263827ad5a731ab63db': Import translations. DO NOT MERGE
|
8aaa14a042fe8b659a4d6901c5bc674c13126c34 |
23-Mar-2013 |
Baligh Uddin <baligh@google.com> |
am dee63c60: (-s ours) am 66aa37eb: (-s ours) am 6c0410a3: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev * commit 'dee63c60486ed9cfb4747e9f187f68f28da53e1b': Import translations. DO NOT MERGE
|
9169ef312e73929dee8101ba789ffab69961fce8 |
23-Mar-2013 |
Baligh Uddin <baligh@google.com> |
am b06f92de: am 2c88c2be: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce * commit 'b06f92de6901802c2b910097052ce88769268e9d': Import translations. DO NOT MERGE
|
28e83b56ae58775185b363ab8143bfb48534ef15 |
23-Mar-2013 |
Baligh Uddin <baligh@google.com> |
am 66aa37eb: (-s ours) am 6c0410a3: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev * commit '66aa37ebeecd284cd177b284b1e2bd14147e8be4': Import translations. DO NOT MERGE
|
3b9707da10c638fddd32781384bed7e530025219 |
23-Mar-2013 |
Baligh Uddin <baligh@google.com> |
am 3d274c33: (-s ours) Merge "Import translations. DO NOT MERGE" * commit '3d274c33c984c1bfe17034c291ce12ea43b4c8f8': Import translations. DO NOT MERGE
|
53671cf13ce89d01cf9d7c1a423a7ada62149889 |
23-Mar-2013 |
Baligh Uddin <baligh@google.com> |
am 6c0410a3: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev * commit '6c0410a3c497d67054512d518981efe3f76bb724': Import translations. DO NOT MERGE
|
cd04f855d58c75f6af4eb0212d4a619afa6efacc |
23-Mar-2013 |
Baligh Uddin <baligh@google.com> |
am 2c88c2be: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce * commit '2c88c2be6947321fbdab4a2bcd99c5eb204a4d71': Import translations. DO NOT MERGE
|
8a3b54116acab613e43c6ef06b15f9c671357da2 |
23-Mar-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into master-security-dev
|
acfc3786fbfa4450e8308780573e463fc3c7d2e2 |
23-Mar-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE"
|
d643430355b2026dc4b0a2289744427471286de7 |
23-Mar-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
|
2c88c2be6947321fbdab4a2bcd99c5eb204a4d71 |
23-Mar-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
|
a715e4d6d94924eed2284458aa7fa35f6420ba33 |
22-Mar-2013 |
Bart Sears <bsears@google.com> |
am 630f3aa5: am 0bc20a33: am 1ca57b51: am 47657615: Bump up the version number to 1.1.40006 * commit '630f3aa52b8dea353dd41d07c6b79bafc369fb4a': Bump up the version number to 1.1.40006
|
163252c56e8b93b2173d6f988d1450293f86f7f5 |
22-Mar-2013 |
Bart Sears <bsears@google.com> |
am 0bc20a33: am 1ca57b51: am 47657615: Bump up the version number to 1.1.40006 * commit '0bc20a33f6f7e6b944f8526b02440b2958702605': Bump up the version number to 1.1.40006
|
955d34f2d5401a62c2fb29fbe38c680739355112 |
22-Mar-2013 |
Bart Sears <bsears@google.com> |
am 1ca57b51: am 47657615: Bump up the version number to 1.1.40006 * commit '1ca57b51268ff2c522b064829a239d2d89774849': Bump up the version number to 1.1.40006
|
53dcb8fc9ebb868a0d066bb09531a01a341b5e9a |
22-Mar-2013 |
Bart Sears <bsears@google.com> |
am 47657615: Bump up the version number to 1.1.40006 * commit '476576159c2ecbfaca99c696b5b46c56b30f3d19': Bump up the version number to 1.1.40006
|
3577e991ab75efbb1fe24b5fa1c48473688e4ce3 |
22-Mar-2013 |
Michael Kolb <kolby@google.com> |
am 8e737500: am 02727874: am 476385b2: am e5265447: Fix NPE in Camera * commit '8e7375002b3837124857643634bc64bfc3d5960a': Fix NPE in Camera
|
65cf53401aff6ca001478ad7b15aea77dabc87f2 |
22-Mar-2013 |
Michael Kolb <kolby@google.com> |
am 02727874: am 476385b2: am e5265447: Fix NPE in Camera * commit '0272787403cfddd2df46ec4dd4481d954e500b85': Fix NPE in Camera
|
a43b6cbbb970c08fc983357813b3912563176235 |
22-Mar-2013 |
Michael Kolb <kolby@google.com> |
am 476385b2: am e5265447: Fix NPE in Camera * commit '476385b2a9ff26149ae15e5da9c2d502cb58809d': Fix NPE in Camera
|
b7c4b3aa1a5295d4a52f299bbf072bf3a6da9e9e |
22-Mar-2013 |
Bart Sears <bsears@google.com> |
Bump up the version number to 1.1.40006 Change-Id: Id256fd9a7fdde81ea140b7a58b06f1eb87944b2c
ndroidManifest.xml
|
476576159c2ecbfaca99c696b5b46c56b30f3d19 |
22-Mar-2013 |
Bart Sears <bsears@google.com> |
Bump up the version number to 1.1.40006 Change-Id: Id256fd9a7fdde81ea140b7a58b06f1eb87944b2c
ndroidManifest.xml
|
1a1f35be85cc34fde46b4e9d61820d61968a3e16 |
22-Mar-2013 |
Michael Kolb <kolby@google.com> |
am e5265447: Fix NPE in Camera * commit 'e5265447dddd9d48c4c78192bd21a6aba5588f9f': Fix NPE in Camera
|
955e5c57ec592003abea8e6b8f0bc2bfb3e201bc |
22-Mar-2013 |
Michael Kolb <kolby@google.com> |
Fix NPE in Camera Bug: 8409508 Change-Id: I962a7eccec9ca2e1c190eb1c2c252020cd0926e0
rc/com/android/camera/CameraActivity.java
|
e5265447dddd9d48c4c78192bd21a6aba5588f9f |
22-Mar-2013 |
Michael Kolb <kolby@google.com> |
Fix NPE in Camera Bug: 8409508 Change-Id: I962a7eccec9ca2e1c190eb1c2c252020cd0926e0
rc/com/android/camera/CameraActivity.java
|
c0c2625a43266f26a943ab3bc4e474f4478c5ffe |
22-Mar-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ie21cfef763fca2edb25d848c28acae4ba321e0cf Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
fc8851f124f45f63f602f17de873887e3264864b |
22-Mar-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I9071aa38eb5164396c1d0019c538c1609014a45a Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
9d8e116f70fe0dc267a7792866bb1f105a711cd1 |
22-Mar-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ifbfe1c4f13e850eed3bddda7434cdb8438640a3b Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
3d5911f09d51c252990d1ee7c6e6d39ad15c491f |
22-Mar-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I5037cd2630cb0f95db7ca665133a85c0826240d3 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
26e1a4099b0a425da846b89e3d1037f029cf8177 |
22-Mar-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I5037cd2630cb0f95db7ca665133a85c0826240d3 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
aadf42cb2b3667d556cb9a8e2cb741a706f87cc0 |
22-Mar-2013 |
Michael Kolb <kolby@google.com> |
am fea12bf0: am 37919405: am d8651ca5: am f0c33e79: Add renderers only once * commit 'fea12bf048e64235107fe5aa1f9ac61d4dc869b5': Add renderers only once
|
a01923d020a2d389747bc31c8f056e12ca5f11f9 |
22-Mar-2013 |
Michael Kolb <kolby@google.com> |
am 37919405: am d8651ca5: am f0c33e79: Add renderers only once * commit '37919405d5aa3636747f0188e9bdf89f2c3821d8': Add renderers only once
|
2f97fb59f32d2ffb6d9370d41d297cfbb8cb8796 |
22-Mar-2013 |
Michael Kolb <kolby@google.com> |
am d8651ca5: am f0c33e79: Add renderers only once * commit 'd8651ca54dafa74aea2d008c4044132083f7168d': Add renderers only once
|
a5728a300883f4449702030504a8f2f50f7b197b |
22-Mar-2013 |
Michael Kolb <kolby@google.com> |
am f0c33e79: Add renderers only once * commit 'f0c33e7991f6778534e958551938db8d239957ba': Add renderers only once
|
e3974bb4614d027e88ad915f70c4c05fb5ff76b1 |
22-Mar-2013 |
Michael Kolb <kolby@google.com> |
Add renderers only once Change-Id: I819c0486d23e358d7d7b989a051da9087fa292a1
rc/com/android/camera/PhotoUI.java
|
f0c33e7991f6778534e958551938db8d239957ba |
22-Mar-2013 |
Michael Kolb <kolby@google.com> |
Add renderers only once Change-Id: I819c0486d23e358d7d7b989a051da9087fa292a1
rc/com/android/camera/PhotoUI.java
|
47885bf016d9a5cb31d1ce806bdece8f7be46272 |
22-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
am 07dd241b: am 202ad881: am 5842f8e9: am 18027792: Fix problem applying the Fx filter Also adds some debug info * commit '07dd241bec7caa36ff89df20cd847fedb1690e79': Fix problem applying the Fx filter Also adds some debug info
|
40034e345dbe8d8ba2bf3bda9846d50609b45032 |
22-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
am 202ad881: am 5842f8e9: am 18027792: Fix problem applying the Fx filter Also adds some debug info * commit '202ad8819ad5bcab95278997afbc7626e7ccd0f0': Fix problem applying the Fx filter Also adds some debug info
|
b37722cbbcff2a004780feb210014dbcf4483f22 |
22-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
am 5842f8e9: am 18027792: Fix problem applying the Fx filter Also adds some debug info * commit '5842f8e941898e8b48d15dd8f3e79fadc97268ef': Fix problem applying the Fx filter Also adds some debug info
|
fa7e36264021536cb856721817617d7319f81ff1 |
22-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
am 18027792: Fix problem applying the Fx filter Also adds some debug info * commit '180277924bebf6b600ee5ce5adf9ff807a038570': Fix problem applying the Fx filter Also adds some debug info
|
180277924bebf6b600ee5ce5adf9ff807a038570 |
22-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
Fix problem applying the Fx filter Also adds some debug info bug:8442036 Change-Id: Ife7fd4be664ae011e41969e74c7745da0a7a52f5
rc/com/android/gallery3d/filtershow/cache/CachingPipeline.java
rc/com/android/gallery3d/filtershow/cache/FilteringPipeline.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterFx.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterRS.java
rc/com/android/gallery3d/filtershow/tools/SaveCopyTask.java
|
cbbaef3e674898c3045486ae4930966c3dff1147 |
22-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
Fix problem applying the Fx filter Also adds some debug info bug:8442036 Change-Id: Ife7fd4be664ae011e41969e74c7745da0a7a52f5
rc/com/android/gallery3d/filtershow/cache/CachingPipeline.java
rc/com/android/gallery3d/filtershow/cache/FilteringPipeline.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterFx.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterRS.java
rc/com/android/gallery3d/filtershow/tools/SaveCopyTask.java
|
7c39fc28427582810db8705a8880004a41e6ffba |
22-Mar-2013 |
John Reck <jreck@google.com> |
am 0cc76d53: am 8453f144: am 67eae7ff: am b4e071b5: Merge "Revert "New loading model"" into gb-ub-photos-bryce * commit '0cc76d5340d9b9fd93c9d0f30e53d6ecdf6f1864': Revert "New loading model"
|
ed6b2a85d0fd3c042b27375ef13e384b7a633501 |
22-Mar-2013 |
John Reck <jreck@google.com> |
am 8453f144: am 67eae7ff: am b4e071b5: Merge "Revert "New loading model"" into gb-ub-photos-bryce * commit '8453f1445f59bafcc1d056fd513c36a32091543e': Revert "New loading model"
|
f77c253363749926166ba777d8e7f2cd6c02ec24 |
22-Mar-2013 |
John Reck <jreck@google.com> |
am 67eae7ff: am b4e071b5: Merge "Revert "New loading model"" into gb-ub-photos-bryce * commit '67eae7ff7d6a563b7321399a9a4b845a19858881': Revert "New loading model"
|
ec985f3c7ec42c8309d08981cf826f0c7602a50d |
22-Mar-2013 |
John Reck <jreck@google.com> |
am b4e071b5: Merge "Revert "New loading model"" into gb-ub-photos-bryce * commit 'b4e071b57e0cc3d07131a44cf55ad5e59538a342': Revert "New loading model"
|
b4e071b57e0cc3d07131a44cf55ad5e59538a342 |
22-Mar-2013 |
John Reck <jreck@google.com> |
Merge "Revert "New loading model"" into gb-ub-photos-bryce
|
dc19e2f107b02b62f887dc500e107ad8f4a9cb07 |
22-Mar-2013 |
John Reck <jreck@google.com> |
Merge "Revert "New loading model"" into gb-ub-photos-bryce
|
eb3456524354b46855c5ad89a2afadc15e6918d1 |
21-Mar-2013 |
Bobby Georgescu <georgescu@google.com> |
am 78ec2171: am a64f8808: am 2e05f3b8: am 1b88ac53: Merge "Refactor grid fragments in new gallery" into gb-ub-photos-bryce * commit '78ec21718195d98776d2878c24ba94df8b1f935c': Refactor grid fragments in new gallery
|
39b1220fd40a0562ee2c2a1d695c44e7a52d1c35 |
21-Mar-2013 |
Bobby Georgescu <georgescu@google.com> |
am a64f8808: am 2e05f3b8: am 1b88ac53: Merge "Refactor grid fragments in new gallery" into gb-ub-photos-bryce * commit 'a64f8808a4c122036a99b86805f3706e80dd6e32': Refactor grid fragments in new gallery
|
084c87495159286b76b1cc36455e6d02958d7b17 |
21-Mar-2013 |
Bobby Georgescu <georgescu@google.com> |
am 2e05f3b8: am 1b88ac53: Merge "Refactor grid fragments in new gallery" into gb-ub-photos-bryce * commit '2e05f3b85fdabec59910769760615b81cda2cc9c': Refactor grid fragments in new gallery
|
b5348cf01a63a5569f92c1f7080b5e8e1d70d5ba |
21-Mar-2013 |
Bobby Georgescu <georgescu@google.com> |
am 1b88ac53: Merge "Refactor grid fragments in new gallery" into gb-ub-photos-bryce * commit '1b88ac5351975d3373ff9014055962efe00ccc42': Refactor grid fragments in new gallery
|
07ec0f0ebd6c3bc521b160cdede889c58da83c70 |
21-Mar-2013 |
Bobby Georgescu <georgescu@google.com> |
Merge "Refactor grid fragments in new gallery" into gb-ub-photos-bryce
|
1b88ac5351975d3373ff9014055962efe00ccc42 |
21-Mar-2013 |
Bobby Georgescu <georgescu@google.com> |
Merge "Refactor grid fragments in new gallery" into gb-ub-photos-bryce
|
400f35866b8758118e35541aa834b93fcfc5d1be |
21-Mar-2013 |
Bobby Georgescu <georgescu@google.com> |
Merge "Refactor grid fragments in new gallery" into gb-ub-photos-bryce
|
705dc819661cb8c8e839a04577b0641bd6caad53 |
21-Mar-2013 |
John Reck <jreck@google.com> |
Revert "New loading model" Change-Id: I5d3d4c7a4ca0d11de01278529e1413fc62e6b4ed
rc/com/android/gallery3d/app/AlbumDataLoader.java
rc/com/android/gallery3d/app/AlbumSetDataLoader.java
rc/com/android/gallery3d/app/PhotoDataAdapter.java
rc/com/android/gallery3d/app/SlideshowPage.java
rc/com/android/gallery3d/data/ClusterAlbum.java
rc/com/android/gallery3d/data/ClusterAlbumSet.java
rc/com/android/gallery3d/data/ComboAlbum.java
rc/com/android/gallery3d/data/ComboAlbumSet.java
rc/com/android/gallery3d/data/FilterDeleteSet.java
rc/com/android/gallery3d/data/FilterEmptyPromptSet.java
rc/com/android/gallery3d/data/FilterTypeSet.java
rc/com/android/gallery3d/data/LocalAlbum.java
rc/com/android/gallery3d/data/LocalAlbumSet.java
rc/com/android/gallery3d/data/LocalMergeAlbum.java
rc/com/android/gallery3d/data/MediaSet.java
rc/com/android/gallery3d/data/MediaSetWrapper.java
rc/com/android/gallery3d/data/SecureAlbum.java
rc/com/android/gallery3d/data/SingleItemAlbum.java
rc/com/android/gallery3d/data/SnailAlbum.java
rc/com/android/gallery3d/gadget/MediaSetSource.java
rc/com/android/photos/shims/MediaItemsLoader.java
rc/com/android/photos/shims/MediaSetLoader.java
rc_pd/com/android/gallery3d/picasasource/PicasaSource.java
ests/src/com/android/gallery3d/data/LocalDataTest.java
ests/src/com/android/gallery3d/data/MockSet.java
ests/src/com/android/gallery3d/data/RealDataTest.java
|
51177aac9078da153bcb191864fb368faf105681 |
21-Mar-2013 |
John Reck <jreck@google.com> |
Revert "New loading model" Change-Id: I5d3d4c7a4ca0d11de01278529e1413fc62e6b4ed
rc/com/android/gallery3d/app/AlbumDataLoader.java
rc/com/android/gallery3d/app/AlbumSetDataLoader.java
rc/com/android/gallery3d/app/PhotoDataAdapter.java
rc/com/android/gallery3d/app/SlideshowPage.java
rc/com/android/gallery3d/data/ClusterAlbum.java
rc/com/android/gallery3d/data/ClusterAlbumSet.java
rc/com/android/gallery3d/data/ComboAlbum.java
rc/com/android/gallery3d/data/ComboAlbumSet.java
rc/com/android/gallery3d/data/FilterDeleteSet.java
rc/com/android/gallery3d/data/FilterEmptyPromptSet.java
rc/com/android/gallery3d/data/FilterTypeSet.java
rc/com/android/gallery3d/data/LocalAlbum.java
rc/com/android/gallery3d/data/LocalAlbumSet.java
rc/com/android/gallery3d/data/LocalMergeAlbum.java
rc/com/android/gallery3d/data/MediaSet.java
rc/com/android/gallery3d/data/MediaSetWrapper.java
rc/com/android/gallery3d/data/SecureAlbum.java
rc/com/android/gallery3d/data/SingleItemAlbum.java
rc/com/android/gallery3d/data/SnailAlbum.java
rc/com/android/gallery3d/gadget/MediaSetSource.java
rc/com/android/photos/shims/MediaItemsLoader.java
rc/com/android/photos/shims/MediaSetLoader.java
rc_pd/com/android/gallery3d/picasasource/PicasaSource.java
ests/src/com/android/gallery3d/data/LocalDataTest.java
ests/src/com/android/gallery3d/data/MockSet.java
ests/src/com/android/gallery3d/data/RealDataTest.java
|
2d3564110b421bf6c292442e1847a4ee0baaff77 |
21-Mar-2013 |
John Reck <jreck@google.com> |
am b9d037f2: am bf24a8d8: am 5889af45: am d6db9403: Merge "Changes for CanvasProvider" into gb-ub-photos-bryce * commit 'b9d037f21aabb7af751ea813039ebcf4ba2aa5a5': Changes for CanvasProvider
|
b167ca7b8cc23bcdcabcb71b6b64446386a8dd1a |
21-Mar-2013 |
John Reck <jreck@google.com> |
am bf24a8d8: am 5889af45: am d6db9403: Merge "Changes for CanvasProvider" into gb-ub-photos-bryce * commit 'bf24a8d8516649cf358ed511e977c8b700cc3037': Changes for CanvasProvider
|
4870bc7b9f799d4da157c34d1bb09b0b353d47a8 |
21-Mar-2013 |
John Reck <jreck@google.com> |
am 5889af45: am d6db9403: Merge "Changes for CanvasProvider" into gb-ub-photos-bryce * commit '5889af4525419e0addbc2aa3d8aac5c5752a2c63': Changes for CanvasProvider
|
81ab0e29fb6e7ba5459fed36fee1a61025670f5f |
21-Mar-2013 |
John Reck <jreck@google.com> |
am d6db9403: Merge "Changes for CanvasProvider" into gb-ub-photos-bryce * commit 'd6db9403125261d46e410db60b8a25f1d9014d2b': Changes for CanvasProvider
|
d6db9403125261d46e410db60b8a25f1d9014d2b |
21-Mar-2013 |
John Reck <jreck@google.com> |
Merge "Changes for CanvasProvider" into gb-ub-photos-bryce
|
03d6a96b088e6a3d8884cc4025c9d7cb9550c2f2 |
21-Mar-2013 |
John Reck <jreck@google.com> |
Merge "Changes for CanvasProvider" into gb-ub-photos-bryce
|
0421f81169a1f100072858323bdb4786dd7dcb4d |
21-Mar-2013 |
The Android Automerger <android-build@android.com> |
merge in jb-mr2-release history after reset to jb-mr2-dev
|
5c124e4d5a4c9c8f783dfa39e2449814980c6ed8 |
21-Mar-2013 |
Jason Noguchi <jnoguchi@google.com> |
am 94f1a2e0: am 8bcd1a2f: am 346995f0: am 8b65a2a7: Merge "Removing obsolete test." into gb-ub-photos-bryce * commit '94f1a2e0abea4a1796054d53a3d84285cd98dbb0': Removing obsolete test.
|
7bb78152dc23807ddee5c2280c08585919e6b962 |
21-Mar-2013 |
Jason Noguchi <jnoguchi@google.com> |
am 8bcd1a2f: am 346995f0: am 8b65a2a7: Merge "Removing obsolete test." into gb-ub-photos-bryce * commit '8bcd1a2fb42403690299ec186e38aae4d0cd3ad2': Removing obsolete test.
|
158c9f68ab8c2da79767a2de78d79c4bd7bb0d7b |
21-Mar-2013 |
Jason Noguchi <jnoguchi@google.com> |
am 346995f0: am 8b65a2a7: Merge "Removing obsolete test." into gb-ub-photos-bryce * commit '346995f05112e8fc8a37ecfcc6f4fa8bbe8f441f': Removing obsolete test.
|
a798ef53cbaf5d5049d18777cb8c3c783f9faab6 |
21-Mar-2013 |
Jason Noguchi <jnoguchi@google.com> |
am 8b65a2a7: Merge "Removing obsolete test." into gb-ub-photos-bryce * commit '8b65a2a7a415f80e54f993973661b4060e6384f5': Removing obsolete test.
|
8b65a2a7a415f80e54f993973661b4060e6384f5 |
21-Mar-2013 |
Jason Noguchi <jnoguchi@google.com> |
Merge "Removing obsolete test." into gb-ub-photos-bryce
|
bc8d55d07dd85f65a08a7b817cd22662b2999189 |
21-Mar-2013 |
Jason Noguchi <jnoguchi@google.com> |
Merge "Removing obsolete test." into gb-ub-photos-bryce
|
3656fb9dbd3bfc73fac5bbd2fa4d367851031cfb |
21-Mar-2013 |
Doris Liu <tianliu@google.com> |
am 86fef5f5: am 7be9492b: am 4fee4e4c: am a088f92a: Merge "Fix for record button not responding" into gb-ub-photos-bryce * commit '86fef5f546fa409169828edc8c0fda2c0e235b14': Fix for record button not responding
|
de01b89abeb9a704d1b3f344b045b024a2ae1c71 |
21-Mar-2013 |
Doris Liu <tianliu@google.com> |
am 7be9492b: am 4fee4e4c: am a088f92a: Merge "Fix for record button not responding" into gb-ub-photos-bryce * commit '7be9492b4d4d7df58e17c6df189985805264e468': Fix for record button not responding
|
bcc433adb1b97267620ac4386a73de8bf603293c |
21-Mar-2013 |
Doris Liu <tianliu@google.com> |
am 4fee4e4c: am a088f92a: Merge "Fix for record button not responding" into gb-ub-photos-bryce * commit '4fee4e4cc97b7706a6c3bb9ee74034e9f249c5c4': Fix for record button not responding
|
e33355bdc274ef0ba7b10b9ac9d89f5953afabf4 |
21-Mar-2013 |
Doris Liu <tianliu@google.com> |
am a088f92a: Merge "Fix for record button not responding" into gb-ub-photos-bryce * commit 'a088f92a1e18c64231da6b693bb541ace8d8f952': Fix for record button not responding
|
a088f92a1e18c64231da6b693bb541ace8d8f952 |
21-Mar-2013 |
Doris Liu <tianliu@google.com> |
Merge "Fix for record button not responding" into gb-ub-photos-bryce
|
1b5a7a61f02b2a057c7eb64d9d90558b1b291ace |
21-Mar-2013 |
Doris Liu <tianliu@google.com> |
Merge "Fix for record button not responding" into gb-ub-photos-bryce
|
419f3d6e0b8de606c344df559ff983f0b4b39d0c |
21-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
am 81e6286d: am e83c044d: am ec16059f: am 3024aa22: Don\'t show the original image in the Curves editor * commit '81e6286d9f8742b644d833d8cea2a78000388d71': Don't show the original image in the Curves editor
|
0e256eff4a1eb567b4659e76c4e9206b4ae421c6 |
21-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
am e83c044d: am ec16059f: am 3024aa22: Don\'t show the original image in the Curves editor * commit 'e83c044dfe84035ebbfd60b96a71dc094cbf2616': Don't show the original image in the Curves editor
|
176adf132694afbf02249c2dbb771217264420e0 |
21-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
am ec16059f: am 3024aa22: Don\'t show the original image in the Curves editor * commit 'ec16059f822d5701da5f716d0bdda5ee3fdfc43e': Don't show the original image in the Curves editor
|
206e6717175d072a78774c5ddf4cdccd8f5ba2d4 |
21-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
am 3024aa22: Don\'t show the original image in the Curves editor * commit '3024aa22d372c0d6608b143a0c46b86c2104f9b1': Don't show the original image in the Curves editor
|
adea7b3c574e84899f5aae90a650c0f3b6897e4f |
21-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
am 04e8a394: am 980e0303: am 6e3b080a: am d37039a9: Merge "Fix crashes with RS filters" into gb-ub-photos-bryce * commit '04e8a394254feb769f692013589ef47cac99ec39': Fix crashes with RS filters
|
7bd42831e5d8038de9b43b7481a6ec51d81aeebc |
21-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
am 980e0303: am 6e3b080a: am d37039a9: Merge "Fix crashes with RS filters" into gb-ub-photos-bryce * commit '980e030307e4640fa069efa738a9a86c75f16737': Fix crashes with RS filters
|
3024aa22d372c0d6608b143a0c46b86c2104f9b1 |
21-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
Don't show the original image in the Curves editor Change-Id: I884f6113c5b39d02b8b1f217ce8bec5fd19aaf4e
rc/com/android/gallery3d/filtershow/imageshow/ImageShow.java
rc/com/android/gallery3d/filtershow/ui/ImageCurves.java
|
0ac3415c9b28f492614462641b87792c477de2f4 |
21-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
Don't show the original image in the Curves editor Change-Id: I884f6113c5b39d02b8b1f217ce8bec5fd19aaf4e
rc/com/android/gallery3d/filtershow/imageshow/ImageShow.java
rc/com/android/gallery3d/filtershow/ui/ImageCurves.java
|
63d9a22acc09ca96a3f2c0acd492896267d900b2 |
21-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
am 6e3b080a: am d37039a9: Merge "Fix crashes with RS filters" into gb-ub-photos-bryce * commit '6e3b080abd80a88c9dff8fd5d2904b3d7c5b7e31': Fix crashes with RS filters
|
46e6baf3b4cf10a70c477eeadb2995aacebc48ef |
21-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
am d37039a9: Merge "Fix crashes with RS filters" into gb-ub-photos-bryce * commit 'd37039a9222b740b7c3f10626af91d2a351c89f3': Fix crashes with RS filters
|
d37039a9222b740b7c3f10626af91d2a351c89f3 |
21-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
Merge "Fix crashes with RS filters" into gb-ub-photos-bryce
|
fdc3d8bcea0cee2caa5a2662fb202e8876e18abb |
21-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
Merge "Fix crashes with RS filters" into gb-ub-photos-bryce
|
58cce37b5f4bcf1708fbcacebd431eb0984d0947 |
20-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
Fix crashes with RS filters bug:8418537 Change-Id: I37f8ad8a77f04faed9f721122872f00f7aaaa365
rc/com/android/gallery3d/filtershow/presets/FilterEnvironment.java
|
fc8a6a38c699c0d75fa29664d9aaa369d361c335 |
20-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
Fix crashes with RS filters bug:8418537 Change-Id: I37f8ad8a77f04faed9f721122872f00f7aaaa365
rc/com/android/gallery3d/filtershow/cache/CachingPipeline.java
rc/com/android/gallery3d/filtershow/filters/ImageFilter.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterRS.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterSharpen.java
rc/com/android/gallery3d/filtershow/presets/FilterEnvironment.java
|
7847f8d2fef696ac30d502a9875afeb0c727a5f1 |
20-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
Fix crashes with RS filters bug:8418537 Change-Id: I37f8ad8a77f04faed9f721122872f00f7aaaa365
rc/com/android/gallery3d/filtershow/cache/CachingPipeline.java
rc/com/android/gallery3d/filtershow/filters/ImageFilter.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterRS.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterSharpen.java
rc/com/android/gallery3d/filtershow/presets/FilterEnvironment.java
|
f39b4babc7bc9b04e889ac15566748acda502c34 |
21-Mar-2013 |
Doris Liu <tianliu@google.com> |
Fix for record button not responding Bug: 8437944 Change-Id: I0393434d094b9288232c70b2f65cd5eb4d0719a4
rc/com/android/camera/VideoModule.java
|
c774ff93ae8026a76bddbf9b7a29f04de50721da |
21-Mar-2013 |
Doris Liu <tianliu@google.com> |
Fix for record button not responding Bug: 8437944 Change-Id: I0393434d094b9288232c70b2f65cd5eb4d0719a4
rc/com/android/camera/VideoModule.java
|
6c2656441d76c68f694570f9a06f6c3972dffa5d |
21-Mar-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am af6ad9f4: am ddf9a74d: am 7cf8eb3b: am 5455ac56: Added accessability description for filter buttons. * commit 'af6ad9f4884d84b9378387cfd9c23824a0e7ad4f': Added accessability description for filter buttons.
|
f49805f35302601af00c471636f9743e98898f52 |
21-Mar-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am ddf9a74d: am 7cf8eb3b: am 5455ac56: Added accessability description for filter buttons. * commit 'ddf9a74df65894ccea17a816ba8b2548d620ed30': Added accessability description for filter buttons.
|
60b1c56230cd6b253511e5231df211518d533abb |
21-Mar-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 7cf8eb3b: am 5455ac56: Added accessability description for filter buttons. * commit '7cf8eb3bb27f1e7bafcb3828c76a6bc3b8341ae5': Added accessability description for filter buttons.
|
f4311739eb1e2ece4c3ae80d5d6ac545e597b861 |
21-Mar-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 5455ac56: Added accessability description for filter buttons. * commit '5455ac56cbde7505687cd885b62f7a9d03d826b2': Added accessability description for filter buttons.
|
8d3d4306d0b86b2424327cdb6a41f7738dbbd047 |
21-Mar-2013 |
Jason Noguchi <jnoguchi@google.com> |
Removing obsolete test. Change-Id: I061846d42d7cbe0a115724060a9600cef6e7433c
ests/src/com/android/gallery3d/power/ImageAndVideoCapture.java
|
b529aa869222f9d33834ace7f559400544a650a8 |
21-Mar-2013 |
Jason Noguchi <jnoguchi@google.com> |
Removing obsolete test. Change-Id: I061846d42d7cbe0a115724060a9600cef6e7433c
ests/src/com/android/gallery3d/power/ImageAndVideoCapture.java
|
5455ac56cbde7505687cd885b62f7a9d03d826b2 |
21-Mar-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Added accessability description for filter buttons. Change-Id: I20b780cf54a3fa4beed41845693c87e2369c33ae
rc/com/android/gallery3d/filtershow/ui/FilterIconButton.java
|
a9a61610044ec3a94628ca91f5a0c041d21431c3 |
21-Mar-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Added accessability description for filter buttons. Change-Id: I20b780cf54a3fa4beed41845693c87e2369c33ae
rc/com/android/gallery3d/filtershow/ui/FilterIconButton.java
|
a24b0ec35c797bf59b4e5ea4f2b9155fc3a0aa72 |
20-Mar-2013 |
Bobby Georgescu <georgescu@google.com> |
Refactor grid fragments in new gallery Change-Id: I087cd68ddf8a0a23547d85082f146b6effd68f22
es/layout/album_set.xml
es/layout/multigrid_content.xml
es/layout/photo_set.xml
|
c1a015f3b9a896179d2b4778e50988460cfd34fb |
20-Mar-2013 |
Bobby Georgescu <georgescu@google.com> |
Refactor grid fragments in new gallery Change-Id: I087cd68ddf8a0a23547d85082f146b6effd68f22
es/layout/album_set.xml
es/layout/multigrid_content.xml
es/layout/photo_set.xml
rc/com/android/photos/AlbumActivity.java
rc/com/android/photos/AlbumFragment.java
rc/com/android/photos/AlbumSetFragment.java
rc/com/android/photos/GalleryActivity.java
rc/com/android/photos/GalleryFragmentHost.java
rc/com/android/photos/MultiChoiceManager.java
rc/com/android/photos/MultiSelectGridFragment.java
rc/com/android/photos/PhotoSetFragment.java
rc/com/android/photos/SelectionManager.java
|
add9a89e6f81adbaf19992d7e0ce8be4d221fdf1 |
20-Mar-2013 |
Bobby Georgescu <georgescu@google.com> |
Refactor grid fragments in new gallery Change-Id: I087cd68ddf8a0a23547d85082f146b6effd68f22
rc/com/android/photos/AlbumActivity.java
rc/com/android/photos/AlbumFragment.java
rc/com/android/photos/AlbumSetFragment.java
rc/com/android/photos/GalleryActivity.java
rc/com/android/photos/GalleryFragmentHost.java
rc/com/android/photos/MultiChoiceManager.java
rc/com/android/photos/MultiSelectGridFragment.java
rc/com/android/photos/PhotoSetFragment.java
rc/com/android/photos/SelectionManager.java
|
1a7caec663cedddf4fc80f2f33bc2eb8944a6f38 |
19-Mar-2013 |
John Reck <jreck@google.com> |
Changes for CanvasProvider Change-Id: I0f90f08f4413717933083d110d5020f494d9ed5f
rc/com/android/photos/data/SQLiteContentProvider.java
|
a3b520678f0ad543847f81d23db580b89bc008ed |
19-Mar-2013 |
John Reck <jreck@google.com> |
Changes for CanvasProvider Change-Id: I0f90f08f4413717933083d110d5020f494d9ed5f
rc/com/android/photos/data/SQLiteContentProvider.java
|
015181665320a259b792be439da7b2541adbb8c4 |
20-Mar-2013 |
Bobby Georgescu <georgescu@google.com> |
am 2f0d3dc9: am f3b784ab: am 5fac0735: am 7e3756f1: Merge "Refactor fragment/activity coupling in new Gallery" into gb-ub-photos-bryce * commit '2f0d3dc950edff4febf98035aa8fac1dd4e9ec47': Refactor fragment/activity coupling in new Gallery
|
af66b89b99efb1327998a1f64ec582311b2fd03f |
20-Mar-2013 |
Bobby Georgescu <georgescu@google.com> |
am f3b784ab: am 5fac0735: am 7e3756f1: Merge "Refactor fragment/activity coupling in new Gallery" into gb-ub-photos-bryce * commit 'f3b784ab9f9465504b764a5cd8faedc5cb602b22': Refactor fragment/activity coupling in new Gallery
|
d5843fbd464cd73a02e7e90f9de446e6c1b43f10 |
20-Mar-2013 |
Bobby Georgescu <georgescu@google.com> |
am 5fac0735: am 7e3756f1: Merge "Refactor fragment/activity coupling in new Gallery" into gb-ub-photos-bryce * commit '5fac07357ce9a97000b4bb636445112aa1fa6171': Refactor fragment/activity coupling in new Gallery
|
e230af4d969ca8eda43262f9e2f5f7dfe8b09b88 |
20-Mar-2013 |
Bobby Georgescu <georgescu@google.com> |
am 7e3756f1: Merge "Refactor fragment/activity coupling in new Gallery" into gb-ub-photos-bryce * commit '7e3756f133965651434f581255646da497b90a51': Refactor fragment/activity coupling in new Gallery
|
7e3756f133965651434f581255646da497b90a51 |
20-Mar-2013 |
Bobby Georgescu <georgescu@google.com> |
Merge "Refactor fragment/activity coupling in new Gallery" into gb-ub-photos-bryce
|
a40965b95af786ed2aa13ff63e38b92881f3c315 |
20-Mar-2013 |
Bobby Georgescu <georgescu@google.com> |
Refactor fragment/activity coupling in new Gallery Change-Id: I7cc54b352197e1975cff286f4add7d0f42637841
rc/com/android/photos/AlbumActivity.java
rc/com/android/photos/AlbumFragment.java
rc/com/android/photos/AlbumSetFragment.java
rc/com/android/photos/GalleryActivity.java
rc/com/android/photos/GalleryFragmentHost.java
rc/com/android/photos/MultiChoiceManager.java
rc/com/android/photos/PhotoSetFragment.java
|
ef43b57345a7fbb39e22289328f52f16dcd45635 |
20-Mar-2013 |
Bobby Georgescu <georgescu@google.com> |
Refactor fragment/activity coupling in new Gallery Change-Id: I7cc54b352197e1975cff286f4add7d0f42637841
rc/com/android/photos/AlbumActivity.java
rc/com/android/photos/AlbumFragment.java
rc/com/android/photos/AlbumSetFragment.java
rc/com/android/photos/GalleryActivity.java
rc/com/android/photos/GalleryFragmentHost.java
rc/com/android/photos/MultiChoiceManager.java
rc/com/android/photos/PhotoSetFragment.java
|
8f300804c1ee6cb0480d6fcc8be9b5634f144216 |
20-Mar-2013 |
Baligh Uddin <baligh@google.com> |
am 7d79e7d6: (-s ours) am 1f56bab5: (-s ours) am aec00599: am 89afc6b9: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce * commit '7d79e7d6ced34458762ea5187bfa9376b42e61b5': Import translations. DO NOT MERGE
|
448b7c069cd5c403fb357300e032bb5fc9394adc |
20-Mar-2013 |
Baligh Uddin <baligh@google.com> |
am e28c8f9a: (-s ours) am 14461dfc: (-s ours) am aa30f02c: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev * commit 'e28c8f9ae74e3a461003d2005e8aa54eae32ad00': Import translations. DO NOT MERGE
|
5a96320598be5a7dabde58564ef254f55ec58f80 |
20-Mar-2013 |
Baligh Uddin <baligh@google.com> |
am 1f56bab5: (-s ours) am aec00599: am 89afc6b9: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce * commit '1f56bab540c067b976ec763ab8c63081c929b737': Import translations. DO NOT MERGE
|
3bd79eb1b40806dcaefb12c8938de1d0dea17738 |
20-Mar-2013 |
Baligh Uddin <baligh@google.com> |
am 14461dfc: (-s ours) am aa30f02c: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev * commit '14461dfcb0719e9e299f6078fd9eebec9defbc0e': Import translations. DO NOT MERGE
|
d7121bdcd6eb1b35edae44ef4db5e489e1ea199b |
20-Mar-2013 |
Baligh Uddin <baligh@google.com> |
am aec00599: am 89afc6b9: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce * commit 'aec0059908d54b17877d55037bd71924924b938f': Import translations. DO NOT MERGE
|
52a45668d5a1098298f21edb26a9fe96ddc9854c |
20-Mar-2013 |
Baligh Uddin <baligh@google.com> |
am aa30f02c: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev * commit 'aa30f02c789a633223743d2ecf0a1374362d7b3f': Import translations. DO NOT MERGE
|
9d1e3eadfe0fb3940cbed8f5c0a3c49df7e08d59 |
20-Mar-2013 |
Baligh Uddin <baligh@google.com> |
am 255dd16e: (-s ours) Merge "Import translations. DO NOT MERGE" * commit '255dd16e23bffb76cabec7d9e1b8c48a3ece8920': Import translations. DO NOT MERGE
|
2d65b67c6d3326876f44ae552a4ad1056cbc6a00 |
20-Mar-2013 |
Baligh Uddin <baligh@google.com> |
am 89afc6b9: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce * commit '89afc6b96d924499e44417ddae197372915b6465': Import translations. DO NOT MERGE
|
fecdbeb894bd55ce59d63820b709d38c6da6ea8c |
20-Mar-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into master-security-dev
|
fd2e339bb2f8ce1166dedcd72182c07ca407e606 |
20-Mar-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE"
|
8ac53bca71771d580d1d2d9914297dd8d7b0878b |
20-Mar-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
|
89afc6b96d924499e44417ddae197372915b6465 |
20-Mar-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
|
00f83e04c3358e46ed15bfe868f157bfa215d06f |
20-Mar-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I29c055db4e5a3ec44a30b8baf4f7d714aa635362 Auto-generated-cl: translation import
es/values-ar/strings.xml
es/values-en-rGB/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-pt-rPT/strings.xml
es/values-sw/strings.xml
es/values-uk/strings.xml
|
a0e20a8d1d5113df4ebbd768da7f1a91b89ad154 |
20-Mar-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ic39bfd5a5464d43516895f5382698bf37d319511 Auto-generated-cl: translation import
es/values-ar/strings.xml
es/values-en-rGB/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-pt-rPT/strings.xml
es/values-sw/strings.xml
es/values-uk/strings.xml
|
868d268abdae7dd9762ccf195169c51d1d71ae6d |
20-Mar-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Id942a4f913f1dca304350d4fabf179b4ef729134 Auto-generated-cl: translation import
es/values-ar/strings.xml
es/values-en-rGB/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-pt-rPT/strings.xml
es/values-sw/strings.xml
es/values-uk/strings.xml
|
e568c8e08b317f1b8bc4c041e5fb0224f68f9e7f |
20-Mar-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I0c692bb1b18145477d6de892ae6cccd46ef93c0b Auto-generated-cl: translation import
es/values-ar/strings.xml
es/values-en-rGB/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-pt-rPT/strings.xml
es/values-sw/strings.xml
es/values-uk/strings.xml
|
7fb563de4a24585f6ce123345dd43708082cb3d7 |
20-Mar-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I0c692bb1b18145477d6de892ae6cccd46ef93c0b Auto-generated-cl: translation import
es/values-ar/strings.xml
es/values-en-rGB/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-pt-rPT/strings.xml
es/values-sw/strings.xml
es/values-uk/strings.xml
|
ccd7d42fd9e37b7e8cc4c9edc0cca7d45d3aa10f |
20-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
am 428c653c: am 165b3b59: am def1e4ae: am 2ddedb86: Merge "Refactor the pipeline - add a CachingPipeline class - FilteringPipeline only deals with communication - fix large critical sections performance issues - improves stability" into gb-ub-photos-bryce * commit '428c653c90bd87a692962df538c84876f526f818': Refactor the pipeline - add a CachingPipeline class - FilteringPipeline only deals with communication - fix large critical sections performance issues - improves stability
|
9293069e05e1f0c8799a17d942117043bb84717d |
20-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
am 165b3b59: am def1e4ae: am 2ddedb86: Merge "Refactor the pipeline - add a CachingPipeline class - FilteringPipeline only deals with communication - fix large critical sections performance issues - improves stability" into gb-ub-photos-bryce * commit '165b3b599680e8897cb6ea8f843563bcda9f6adb': Refactor the pipeline - add a CachingPipeline class - FilteringPipeline only deals with communication - fix large critical sections performance issues - improves stability
|
05b79ee61136e0cedf52fc12d8dcc677932d0a8f |
20-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
am def1e4ae: am 2ddedb86: Merge "Refactor the pipeline - add a CachingPipeline class - FilteringPipeline only deals with communication - fix large critical sections performance issues - improves stability" into gb-ub-photos-bryce * commit 'def1e4aebf67193e0187fb591a2c0458f72b60c9': Refactor the pipeline - add a CachingPipeline class - FilteringPipeline only deals with communication - fix large critical sections performance issues - improves stability
|
2409a79e0f3a10aef871e7c8e02e7dbc8cb2f108 |
20-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
am 2ddedb86: Merge "Refactor the pipeline - add a CachingPipeline class - FilteringPipeline only deals with communication - fix large critical sections performance issues - improves stability" into gb-ub-photos-bryce * commit '2ddedb8630e6c2324c41d12509d893c4ec3744f2': Refactor the pipeline - add a CachingPipeline class - FilteringPipeline only deals with communication - fix large critical sections performance issues - improves stability
|
932aee29ce7ad3f77ee7c5e57082efb638b75d65 |
20-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
Merge "Refactor the pipeline - add a CachingPipeline class - FilteringPipeline only deals with communication - fix large critical sections performance issues - improves stability" into gb-ub-photos-bryce
|
2ddedb8630e6c2324c41d12509d893c4ec3744f2 |
20-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
Merge "Refactor the pipeline - add a CachingPipeline class - FilteringPipeline only deals with communication - fix large critical sections performance issues - improves stability" into gb-ub-photos-bryce
|
09ec2d5a01ccfce82b58c77959ec1464ec670855 |
20-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
Refactor the pipeline - add a CachingPipeline class - FilteringPipeline only deals with communication - fix large critical sections performance issues - improves stability bug:8418537 Change-Id: Id18edf71b2e2aec19a8b25fcce711c4acbb1a724
rc/com/android/gallery3d/filtershow/cache/CachingPipeline.java
rc/com/android/gallery3d/filtershow/cache/FilteringPipeline.java
rc/com/android/gallery3d/filtershow/imageshow/ImageVignette.java
|
7097d5173dbbddae315d13251572feb910954a70 |
20-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
Refactor the pipeline - add a CachingPipeline class - FilteringPipeline only deals with communication - fix large critical sections performance issues - improves stability bug:8418537 Change-Id: Id18edf71b2e2aec19a8b25fcce711c4acbb1a724
rc/com/android/gallery3d/filtershow/cache/CachingPipeline.java
rc/com/android/gallery3d/filtershow/cache/FilteringPipeline.java
rc/com/android/gallery3d/filtershow/imageshow/ImageVignette.java
|
9e529e53078553b307d57d29c18391a9263a6963 |
20-Mar-2013 |
The Android Open Source Project <initial-contribution@android.com> |
am a71294be: (-s ours) am bbe63c7c: (-s ours) Reconcile with jb-mr2-release - do not merge * commit 'a71294be477249bda2e42c86293bf0a72a528272': am 783a72da: Merge "Add nakasi resources. xhdpi resources are stripped..." into gb-ub-photos-bryce am 3ccb0e3e: Add a cleanstep for the build server... am 42559630: Merge "Fix "drop table" problem." into gb-ub-photos-bryce am 0198d64d: Merge "Fix exposure compensation" into gb-ub-photos-bryce am 978f4aae: Fix for crash upon saving image am d15e43fb: Merge "Fix Monkey NPE" into gb-ub-photos-bryce am 39d2192d: Merge "Open camera only once in Video module" into gb-ub-photos-bryce
|
a1d8e53c58a7d88b060344b80b427e5052f0e24f |
20-Mar-2013 |
The Android Open Source Project <initial-contribution@android.com> |
am bbe63c7c: (-s ours) Reconcile with jb-mr2-release - do not merge * commit 'bbe63c7c84d92f7f59be207af2bfdb5662a6dc8f': am 783a72da: Merge "Add nakasi resources. xhdpi resources are stripped..." into gb-ub-photos-bryce am 3ccb0e3e: Add a cleanstep for the build server... am 42559630: Merge "Fix "drop table" problem." into gb-ub-photos-bryce am 0198d64d: Merge "Fix exposure compensation" into gb-ub-photos-bryce am 978f4aae: Fix for crash upon saving image am d15e43fb: Merge "Fix Monkey NPE" into gb-ub-photos-bryce am 39d2192d: Merge "Open camera only once in Video module" into gb-ub-photos-bryce
|
12445840fb80175bc0fa8016f7345b0f9cfc4ffe |
20-Mar-2013 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with jb-mr2-release - do not merge Change-Id: Id9603d15a01a36a07a95a23336e62a6b2c58bc16
|
0a48f2fc46a94f802a42f239ee295e39a0e8b26d |
20-Mar-2013 |
The Android Automerger <android-build@android.com> |
merge in jb-mr2-release history after reset to jb-mr2-dev
|
0a62d39bb28386a6b351bddc87ec7708a9babfcc |
20-Mar-2013 |
Victor Doba <dobavictor@google.com> |
am c823d4a8: am d571b703: am 26bf2194: am 00551024: Method added to load scaled resource (with only alpha channel). * commit 'c823d4a81b23ef051e1283a89c329b20ffd1223b': Method added to load scaled resource (with only alpha channel).
|
8334e4e1dd42a2fa2eeebe8909dcf250cbf277a4 |
20-Mar-2013 |
Victor Doba <dobavictor@google.com> |
am d571b703: am 26bf2194: am 00551024: Method added to load scaled resource (with only alpha channel). * commit 'd571b703f939e1663bf6c7ab12ffad0c025897df': Method added to load scaled resource (with only alpha channel).
|
5b286fc1841df2a788af9dcd7fa4dd05455da6df |
20-Mar-2013 |
Victor Doba <dobavictor@google.com> |
am 26bf2194: am 00551024: Method added to load scaled resource (with only alpha channel). * commit '26bf21943edfa94dd9d0d7f6c0dbcc1ed05b5289': Method added to load scaled resource (with only alpha channel).
|
88632ec12a3032ff5e2ffe9a82c2148509cac265 |
20-Mar-2013 |
Victor Doba <dobavictor@google.com> |
am 00551024: Method added to load scaled resource (with only alpha channel). * commit '0055102404c767af2cd5fabf70acbc8317e33fe3': Method added to load scaled resource (with only alpha channel).
|
0055102404c767af2cd5fabf70acbc8317e33fe3 |
20-Mar-2013 |
Victor Doba <dobavictor@google.com> |
Method added to load scaled resource (with only alpha channel). Change-Id: I1b9a58e0fd4c33c9748ad03f53d635c426a5102c
rc/com/android/gallery3d/filtershow/filters/ImageFilterRS.java
|
2fc0f1143674f9896dfca2273b75d92772cb69de |
20-Mar-2013 |
Victor Doba <dobavictor@google.com> |
Method added to load scaled resource (with only alpha channel). Change-Id: I1b9a58e0fd4c33c9748ad03f53d635c426a5102c
rc/com/android/gallery3d/filtershow/filters/ImageFilterRS.java
|
afb6e61b75aff9070fbd88795ecc448f56c7fd13 |
20-Mar-2013 |
Bart Sears <bsears@google.com> |
am fc57d4f2: am 0731870b: am 91adfa42: am 39c14cee: Merge "Bump up the version number to 1.1.40005" into gb-ub-photos-bryce * commit 'fc57d4f2f2c4d465ffbebe448bfb89229dc6c9bb': Bump up the version number to 1.1.40005
|
6a2c76e46162a4f625fda682ea9f2a20f048f6c6 |
20-Mar-2013 |
Bart Sears <bsears@google.com> |
am 0731870b: am 91adfa42: am 39c14cee: Merge "Bump up the version number to 1.1.40005" into gb-ub-photos-bryce * commit '0731870b624f4c888ad041268ebcc3b516ae3014': Bump up the version number to 1.1.40005
|
2f74212bd7b7c225cb70bfaecd422bd48ddef78f |
20-Mar-2013 |
Bart Sears <bsears@google.com> |
am 91adfa42: am 39c14cee: Merge "Bump up the version number to 1.1.40005" into gb-ub-photos-bryce * commit '91adfa42485f6724a2dc60db0ba09fd2739b8cc6': Bump up the version number to 1.1.40005
|
225a88488faee9ad2289809f4abf04a6ab7d6623 |
20-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
am 8f5847f5: am 55b0b5e8: am e9fce93e: am 269d2c86: Add accessor for filters to the source bitmap passed to apply() * commit '8f5847f541b39f1f053cc1a48995e8693fd0c56b': Add accessor for filters to the source bitmap passed to apply()
|
4c8050505769854375f4afaadce2525a73508700 |
20-Mar-2013 |
Bart Sears <bsears@google.com> |
am 39c14cee: Merge "Bump up the version number to 1.1.40005" into gb-ub-photos-bryce * commit '39c14cee9cc748a932d78fb9d430effa12027f7b': Bump up the version number to 1.1.40005
|
4485e2aaadcd5149d7a4b1b1108e90173e77d22c |
20-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
am 55b0b5e8: am e9fce93e: am 269d2c86: Add accessor for filters to the source bitmap passed to apply() * commit '55b0b5e8e4804d28a3d5a166b656195dab427593': Add accessor for filters to the source bitmap passed to apply()
|
c157e94d5188461d15fb834387d1bf8b671d31d5 |
20-Mar-2013 |
Bart Sears <bsears@google.com> |
Merge "Bump up the version number to 1.1.40005" into gb-ub-photos-bryce
|
39c14cee9cc748a932d78fb9d430effa12027f7b |
20-Mar-2013 |
Bart Sears <bsears@google.com> |
Merge "Bump up the version number to 1.1.40005" into gb-ub-photos-bryce
|
5d8e79a458dcbac871e2787ddd3bad9bb9e0e936 |
20-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
am e9fce93e: am 269d2c86: Add accessor for filters to the source bitmap passed to apply() * commit 'e9fce93e9db512be5da55731dec51c3d7154890f': Add accessor for filters to the source bitmap passed to apply()
|
30c99817a76861b473c3003eadf0a2e56a56e273 |
20-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
am 269d2c86: Add accessor for filters to the source bitmap passed to apply() * commit '269d2c8602e8893b0bf399324b2072783ba0f37c': Add accessor for filters to the source bitmap passed to apply()
|
3bd74269f760dd35e8efcbe904284679202ff365 |
20-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
Add accessor for filters to the source bitmap passed to apply() Change-Id: I2900c5b799592c388daa9049093ef8c80fa4f5c6
rc/com/android/gallery3d/filtershow/filters/ImageFilterRS.java
|
269d2c8602e8893b0bf399324b2072783ba0f37c |
20-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
Add accessor for filters to the source bitmap passed to apply() Change-Id: I2900c5b799592c388daa9049093ef8c80fa4f5c6
rc/com/android/gallery3d/filtershow/filters/ImageFilterRS.java
|
40b6517352b604b0b998f9dac98e2fc00eb653f6 |
20-Mar-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 1271c734: am 9d2e6c78: am c8e5be66: am 8898eaab: Fixed onDestroy ordering for RS context. * commit '1271c734e5893d36b4c16da7e0aa9b75b1f44a84': Fixed onDestroy ordering for RS context.
|
3c4dab840872bc5343ff970ffa2a749438d895f5 |
20-Mar-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 9d2e6c78: am c8e5be66: am 8898eaab: Fixed onDestroy ordering for RS context. * commit '9d2e6c78497a615ff195a71bfa98cba7caf5ff18': Fixed onDestroy ordering for RS context.
|
60487842661690e97a79e88ac4359cc5fc87a715 |
20-Mar-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am c8e5be66: am 8898eaab: Fixed onDestroy ordering for RS context. * commit 'c8e5be6690e11fde21f288d22653a46bef56d013': Fixed onDestroy ordering for RS context.
|
67263ff191501cf1d7d4f4c3a12dc415999d5cad |
20-Mar-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 8898eaab: Fixed onDestroy ordering for RS context. * commit '8898eaabfa0cdf70e00078d2dea810f9aab4dfd1': Fixed onDestroy ordering for RS context.
|
09d311c58be3825ba5fb9d4d42d7952fc6c1bbac |
20-Mar-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Fixed onDestroy ordering for RS context. Bug: 8420637 Change-Id: Iddceaa3aefd3d905bbc7435350b768d10215b1d8
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
|
8898eaabfa0cdf70e00078d2dea810f9aab4dfd1 |
20-Mar-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Fixed onDestroy ordering for RS context. Bug: 8420637 Change-Id: Iddceaa3aefd3d905bbc7435350b768d10215b1d8
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
|
478dc5c912b82a5b43ff757ad7947e4b2a3936a1 |
19-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
am 5deec30c: am 0de08996: am f0e726c5: am 33fca9ef: Fix some startup issues, performance issues on ICS * commit '5deec30c39e7d48319495e285f4d03302e82abe9': Fix some startup issues, performance issues on ICS
|
8afc474546b2e2e76ea48bea660661a0c6863c53 |
19-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
am 0de08996: am f0e726c5: am 33fca9ef: Fix some startup issues, performance issues on ICS * commit '0de089969e1f59a83e9c316390400f3badef1da9': Fix some startup issues, performance issues on ICS
|
dc826efbce66759d01f06906b2efa138046abff6 |
19-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
am f0e726c5: am 33fca9ef: Fix some startup issues, performance issues on ICS * commit 'f0e726c539b4f9193a7764a881809c00433a26c4': Fix some startup issues, performance issues on ICS
|
8b1c0682f82f609e01164b54b891778e082d193c |
19-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
am 33fca9ef: Fix some startup issues, performance issues on ICS * commit '33fca9ef7f89b60e3b1a361fdf5fc597b3994e74': Fix some startup issues, performance issues on ICS
|
f024156f35ecfe1c8104eb871b27ae7ce3dca669 |
19-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
Fix some startup issues, performance issues on ICS Change-Id: Iccbcc5a78bf4feb5614e1c420022ef8440606baf
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/cache/FilteringPipeline.java
rc/com/android/gallery3d/filtershow/imageshow/GeometryMetadata.java
|
33fca9ef7f89b60e3b1a361fdf5fc597b3994e74 |
19-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
Fix some startup issues, performance issues on ICS Change-Id: Iccbcc5a78bf4feb5614e1c420022ef8440606baf
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/cache/FilteringPipeline.java
rc/com/android/gallery3d/filtershow/imageshow/GeometryMetadata.java
|
63ee0e515fe28c3a8ce91f95c39219ae89aba34b |
19-Mar-2013 |
Bobby Georgescu <georgescu@google.com> |
am d0d98ad1: am d8a14e78: am bb547e5e: am 94660ff8: Merge "Add album viewing to new Gallery" into gb-ub-photos-bryce * commit 'd0d98ad121b434371d53dadbc4ef9a71ddb36111': Add album viewing to new Gallery
|
d65d84f63b55fb458b001403b6541410ef588fa6 |
19-Mar-2013 |
Bobby Georgescu <georgescu@google.com> |
am d8a14e78: am bb547e5e: am 94660ff8: Merge "Add album viewing to new Gallery" into gb-ub-photos-bryce * commit 'd8a14e78aca0c7645c1f949fca1493a9859df340': Add album viewing to new Gallery
|
8016b5d0e5ade5902df4261ba6a2a21ec1005748 |
19-Mar-2013 |
Bobby Georgescu <georgescu@google.com> |
am bb547e5e: am 94660ff8: Merge "Add album viewing to new Gallery" into gb-ub-photos-bryce * commit 'bb547e5efc0aaca5c2035a20639980a376b9a1a4': Add album viewing to new Gallery
|
6401757b473f98ef5f410732f13860fe9869dec8 |
19-Mar-2013 |
Bobby Georgescu <georgescu@google.com> |
am 94660ff8: Merge "Add album viewing to new Gallery" into gb-ub-photos-bryce * commit '94660ff80259917e207fa15a971db1cd619dad5b': Add album viewing to new Gallery
|
f3c6bd763c84f5a99f57dffe38a345514583dfb1 |
19-Mar-2013 |
Bobby Georgescu <georgescu@google.com> |
Merge "Add album viewing to new Gallery" into gb-ub-photos-bryce
|
94660ff80259917e207fa15a971db1cd619dad5b |
19-Mar-2013 |
Bobby Georgescu <georgescu@google.com> |
Merge "Add album viewing to new Gallery" into gb-ub-photos-bryce
|
d4899510ae5579ae03be9a2280f31a11b7d40e0b |
18-Mar-2013 |
Bobby Georgescu <georgescu@google.com> |
Add album viewing to new Gallery Change-Id: I71230541db0b06d41e2d23d51e83f0b3b8e8caf4
ndroidManifest.xml
|
2b18812c460e7cc721d4c4c25b3c6f1cf179554d |
18-Mar-2013 |
Bobby Georgescu <georgescu@google.com> |
Add album viewing to new Gallery Change-Id: I71230541db0b06d41e2d23d51e83f0b3b8e8caf4
rc/com/android/photos/AlbumActivity.java
rc/com/android/photos/AlbumFragment.java
rc/com/android/photos/AlbumSetFragment.java
|
def3606a1e7ffa20171c473d792af7a0bbec4ea8 |
18-Mar-2013 |
Bobby Georgescu <georgescu@google.com> |
Add album viewing to new Gallery Change-Id: I71230541db0b06d41e2d23d51e83f0b3b8e8caf4
ndroidManifest.xml
rc/com/android/photos/AlbumActivity.java
rc/com/android/photos/AlbumFragment.java
rc/com/android/photos/AlbumSetFragment.java
|
cb91581e3053b66bdee61c90211bb545fe371757 |
19-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
am efa57c3d: am 47dcc9c5: am ff24fbbe: am 94202ecf: Improves double-tap and comparison mechanism * commit 'efa57c3d87a4631b65b68f1ca2db44ff3c4a0e68': Improves double-tap and comparison mechanism
|
d8ace66b9c59099e5bbef1bc3796a32f50bf0a4f |
19-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
am 47dcc9c5: am ff24fbbe: am 94202ecf: Improves double-tap and comparison mechanism * commit '47dcc9c526aa001bce53c7ec00680ec052dc0806': Improves double-tap and comparison mechanism
|
928daa0910ef4c1d25eb476dd99fb6f8cc491397 |
19-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
am ff24fbbe: am 94202ecf: Improves double-tap and comparison mechanism * commit 'ff24fbbe8d8a57bff85c48009faba567ce361808': Improves double-tap and comparison mechanism
|
70af1ea57905daa320056e2c9dc0bb97acd71ae6 |
19-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
am 94202ecf: Improves double-tap and comparison mechanism * commit '94202ecf77d68ca7ed1b0adfe3b37daf6851e39d': Improves double-tap and comparison mechanism
|
3f26536bf18efcd9862d1553c4900d4100edd5a5 |
16-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
Improves double-tap and comparison mechanism Change-Id: I1fda50d7d179703db9e0e525550018c259233e89
rc/com/android/gallery3d/filtershow/imageshow/ImageShow.java
rc/com/android/gallery3d/filtershow/imageshow/MasterImage.java
|
94202ecf77d68ca7ed1b0adfe3b37daf6851e39d |
16-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
Improves double-tap and comparison mechanism Change-Id: I1fda50d7d179703db9e0e525550018c259233e89
rc/com/android/gallery3d/filtershow/imageshow/ImageShow.java
rc/com/android/gallery3d/filtershow/imageshow/MasterImage.java
|
422b4f865d482de1c8fe13fd9eecd01d0925b67c |
19-Mar-2013 |
The Android Automerger <android-build@android.com> |
merge in jb-mr2-release history after reset to jb-mr2-dev
|
5d733d635e955c27a73f7753bbe34d0001fec86b |
19-Mar-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 9b6aa4f2: am 387c7cee: am c3b08ad7: am f79f954f: ImageFilterRS filters reset properly. FilterPipeline delay till after load. * commit '9b6aa4f2a117139f9475399c9ae60d549274b053': ImageFilterRS filters reset properly. FilterPipeline delay till after load.
|
f2b942392b8211611bef21af11555e3da7fd2f11 |
19-Mar-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 387c7cee: am c3b08ad7: am f79f954f: ImageFilterRS filters reset properly. FilterPipeline delay till after load. * commit '387c7cee5f185d9a5372af04f80710a15a10c540': ImageFilterRS filters reset properly. FilterPipeline delay till after load.
|
491d904c1d88b215762ee36e085a65662d67b75e |
19-Mar-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am c3b08ad7: am f79f954f: ImageFilterRS filters reset properly. FilterPipeline delay till after load. * commit 'c3b08ad78799de49294ae1a5f52e3cd90fb917d5': ImageFilterRS filters reset properly. FilterPipeline delay till after load.
|
db96c9a7e621ca13558385cfd625daa330679720 |
19-Mar-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am f79f954f: ImageFilterRS filters reset properly. FilterPipeline delay till after load. * commit 'f79f954f4eb23bce55061c683a07fc7b3a965451': ImageFilterRS filters reset properly. FilterPipeline delay till after load.
|
4dc98460359023d2a7d11752c09efa656fc17595 |
19-Mar-2013 |
Ruben Brunk <rubenbrunk@google.com> |
ImageFilterRS filters reset properly. FilterPipeline delay till after load. Bug: 8293404 Bug: 8417804 Change-Id: I4e3fbbdb86bcb790d73455f21044e6dee9398a5d
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/cache/FilteringPipeline.java
rc/com/android/gallery3d/filtershow/cache/TripleBufferBitmap.java
rc/com/android/gallery3d/filtershow/filters/BaseFiltersManager.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterFx.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterRS.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterSharpen.java
rc/com/android/gallery3d/filtershow/ui/FilterIconButton.java
|
f79f954f4eb23bce55061c683a07fc7b3a965451 |
19-Mar-2013 |
Ruben Brunk <rubenbrunk@google.com> |
ImageFilterRS filters reset properly. FilterPipeline delay till after load. Bug: 8293404 Bug: 8417804 Change-Id: I4e3fbbdb86bcb790d73455f21044e6dee9398a5d
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/cache/FilteringPipeline.java
rc/com/android/gallery3d/filtershow/cache/TripleBufferBitmap.java
rc/com/android/gallery3d/filtershow/filters/BaseFiltersManager.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterFx.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterRS.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterSharpen.java
rc/com/android/gallery3d/filtershow/ui/FilterIconButton.java
|
75aff53f1d431bd8835019ca33cda5ebefab6cd4 |
19-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
am 9f675f9a: am 762d8ab4: am d2773420: am b8270a94: Fix disappearing panels and animations on ICS * commit '9f675f9ac2a2b547bb4db61a33a61ac741e19130': Fix disappearing panels and animations on ICS
|
08f76af2f939de1293a09bd5316655b125348475 |
19-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
am 762d8ab4: am d2773420: am b8270a94: Fix disappearing panels and animations on ICS * commit '762d8ab4259e1f13f44c1cb542d2e275224266ad': Fix disappearing panels and animations on ICS
|
4c3fcd3f550544f2718529a7097a2e3270efb8ff |
19-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
am d2773420: am b8270a94: Fix disappearing panels and animations on ICS * commit 'd277342034a998e7f70fe07f655f55ef9fb38e4d': Fix disappearing panels and animations on ICS
|
0ca724d6062bcb65567877a543a074da587aa0fd |
19-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
am b8270a94: Fix disappearing panels and animations on ICS * commit 'b8270a94e539fc1944ae350c73b00b9df45832d5': Fix disappearing panels and animations on ICS
|
e51b0beee7514a975a2353a42299ad24d61bab44 |
19-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
Fix disappearing panels and animations on ICS bug:8405402 Change-Id: I9c0da8fbf20c424cc64ae5cc1be42414cb2f0964
es/layout/filtershow_activity.xml
|
35afd8f09183ae9b92e9b1b722cfa806032f189c |
19-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
Fix disappearing panels and animations on ICS bug:8405402 Change-Id: I9c0da8fbf20c424cc64ae5cc1be42414cb2f0964
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/PanelController.java
|
b8270a94e539fc1944ae350c73b00b9df45832d5 |
19-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
Fix disappearing panels and animations on ICS bug:8405402 Change-Id: I9c0da8fbf20c424cc64ae5cc1be42414cb2f0964
es/layout/filtershow_activity.xml
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/PanelController.java
|
ec29c073312d40d996ac54a4126ffcb644165de3 |
19-Mar-2013 |
Bart Sears <bsears@google.com> |
Bump up the version number to 1.1.40005 Change-Id: Ic01aa447fdae6628a84cd9d9561134c32c521df8
ndroidManifest.xml
|
345e819f618af931e83bbd72882a173187c856af |
19-Mar-2013 |
Bart Sears <bsears@google.com> |
Bump up the version number to 1.1.40005 Change-Id: Ic01aa447fdae6628a84cd9d9561134c32c521df8
ndroidManifest.xml
|
49ff4a25b8c3191e7cda8ed5b7fbdedbadc131fa |
19-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
am f00ddecc: am 83ee6b69: am ac08be9e: am 783a72da: Merge "Add nakasi resources. xhdpi resources are stripped..." into gb-ub-photos-bryce * commit 'f00ddecc9bacf7ffa1b3b5d8790a7818deb2d4c7': Add nakasi resources. xhdpi resources are stripped...
|
a3d2c014911f78c7592462d32485ed256d5fdd41 |
19-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
am 83ee6b69: am ac08be9e: am 783a72da: Merge "Add nakasi resources. xhdpi resources are stripped..." into gb-ub-photos-bryce * commit '83ee6b69fdb8cd7f9ff2b53e1bc12e61b4e946b9': Add nakasi resources. xhdpi resources are stripped...
|
ffad6dfd7fe9e253f9160cb9677fea20767a61af |
19-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
am 783a72da: Merge "Add nakasi resources. xhdpi resources are stripped..." into gb-ub-photos-bryce * commit '783a72dae8376fd73ea0c9972d8976909731321b': Add nakasi resources. xhdpi resources are stripped...
es/drawable-hdpi/filtershow_scrubber_control_disabled.png
es/drawable-hdpi/filtershow_scrubber_control_focused.png
es/drawable-hdpi/filtershow_scrubber_control_normal.png
es/drawable-hdpi/filtershow_scrubber_control_pressed.png
es/drawable-hdpi/filtershow_scrubber_primary.9.png
es/drawable-hdpi/filtershow_scrubber_secondary.9.png
es/drawable-hdpi/filtershow_scrubber_track.9.png
es/drawable-mdpi/filtershow_scrubber_control_disabled.png
es/drawable-mdpi/filtershow_scrubber_control_focused.png
es/drawable-mdpi/filtershow_scrubber_control_normal.png
es/drawable-mdpi/filtershow_scrubber_control_pressed.png
es/drawable-mdpi/filtershow_scrubber_primary.9.png
es/drawable-mdpi/filtershow_scrubber_secondary.9.png
es/drawable-mdpi/filtershow_scrubber_track.9.png
|
6c24ab13957bf3f1f944f9ad367c2fddbb76a0f1 |
18-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
am 3ccb0e3e: Add a cleanstep for the build server... * commit '3ccb0e3ef144ad54cc918779cc3ee10e7a182c28': Add a cleanstep for the build server...
leanSpec.mk
|
aaaada51193dadae2d04446a430984d3738a665f |
18-Mar-2013 |
George Mount <mount@google.com> |
am 42559630: Merge "Fix "drop table" problem." into gb-ub-photos-bryce * commit '42559630d746e79fb139c65b2b12a35742eb0354': Fix "drop table" problem.
rc/com/android/photos/data/PhotoDatabase.java
|
6bd3ca161798728dfca12dca161210a3ce2936b0 |
19-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
am ac08be9e: am 783a72da: Merge "Add nakasi resources. xhdpi resources are stripped..." into gb-ub-photos-bryce * commit 'ac08be9e23c795ebe820650c528a3b10395f302c': Add nakasi resources. xhdpi resources are stripped...
|
2928fa695642edc6478f9769543a1a5393e70b92 |
19-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
am 783a72da: Merge "Add nakasi resources. xhdpi resources are stripped..." into gb-ub-photos-bryce * commit '783a72dae8376fd73ea0c9972d8976909731321b': Add nakasi resources. xhdpi resources are stripped...
|
c52b8c971bdf37fda3e12b138c2aa3d90cc41ecc |
19-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
Merge "Add nakasi resources. xhdpi resources are stripped..." into gb-ub-photos-bryce
|
783a72dae8376fd73ea0c9972d8976909731321b |
19-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
Merge "Add nakasi resources. xhdpi resources are stripped..." into gb-ub-photos-bryce
|
d7615b8b6d502177bc18eae996c23d4ed20bf933 |
19-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
Add nakasi resources. xhdpi resources are stripped... bug:8410820 Change-Id: I8a5624e1285bfd0608890ea186859706fb9c241f
es/drawable-hdpi/filtershow_scrubber_control_disabled.png
es/drawable-hdpi/filtershow_scrubber_control_focused.png
es/drawable-hdpi/filtershow_scrubber_control_normal.png
es/drawable-hdpi/filtershow_scrubber_control_pressed.png
es/drawable-hdpi/filtershow_scrubber_primary.9.png
es/drawable-hdpi/filtershow_scrubber_secondary.9.png
es/drawable-hdpi/filtershow_scrubber_track.9.png
es/drawable-mdpi/filtershow_scrubber_control_disabled.png
es/drawable-mdpi/filtershow_scrubber_control_focused.png
es/drawable-mdpi/filtershow_scrubber_control_normal.png
es/drawable-mdpi/filtershow_scrubber_control_pressed.png
es/drawable-mdpi/filtershow_scrubber_primary.9.png
es/drawable-mdpi/filtershow_scrubber_secondary.9.png
es/drawable-mdpi/filtershow_scrubber_track.9.png
|
6cb6007cd070a9ea5f0e30e584a8cf2313fdbc3a |
19-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
Add nakasi resources. xhdpi resources are stripped... bug:8410820 Change-Id: I8a5624e1285bfd0608890ea186859706fb9c241f
es/drawable-hdpi/filtershow_scrubber_control_disabled.png
es/drawable-hdpi/filtershow_scrubber_control_focused.png
es/drawable-hdpi/filtershow_scrubber_control_normal.png
es/drawable-hdpi/filtershow_scrubber_control_pressed.png
es/drawable-hdpi/filtershow_scrubber_primary.9.png
es/drawable-hdpi/filtershow_scrubber_secondary.9.png
es/drawable-hdpi/filtershow_scrubber_track.9.png
es/drawable-mdpi/filtershow_scrubber_control_disabled.png
es/drawable-mdpi/filtershow_scrubber_control_focused.png
es/drawable-mdpi/filtershow_scrubber_control_normal.png
es/drawable-mdpi/filtershow_scrubber_control_pressed.png
es/drawable-mdpi/filtershow_scrubber_primary.9.png
es/drawable-mdpi/filtershow_scrubber_secondary.9.png
es/drawable-mdpi/filtershow_scrubber_track.9.png
|
fb74399d78a1c98474cc90b44a007fe7638976f3 |
19-Mar-2013 |
Baligh Uddin <baligh@google.com> |
am 74eb2c17: (-s ours) am 93dd3b7d: (-s ours) am 91bbb6e0: am cd7bd24d: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce * commit '74eb2c17d14d676c0e76312a958607cc2071027e': Import translations. DO NOT MERGE
|
0fd25dc82eb9a628ebbe28f6db2c21c3778ce113 |
19-Mar-2013 |
Baligh Uddin <baligh@google.com> |
am 93dd3b7d: (-s ours) am 91bbb6e0: am cd7bd24d: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce * commit '93dd3b7dab10c4b81e8745a18255ecae1e7ecc10': Import translations. DO NOT MERGE
|
7268286d07d7909c36aa0566df526c10507560d9 |
19-Mar-2013 |
Baligh Uddin <baligh@google.com> |
am a0031816: (-s ours) am 539ac3a2: (-s ours) am fa248e48: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev * commit 'a003181618a8d2bf0f1a3e93a5daf627f164ae53': Import translations. DO NOT MERGE
|
9fd86b3369cb46d34108ee0b4288c764db0b0e1f |
19-Mar-2013 |
Baligh Uddin <baligh@google.com> |
am 539ac3a2: (-s ours) am fa248e48: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev * commit '539ac3a2f0602c40d0c016914ef66e91eec186b0': Import translations. DO NOT MERGE
|
707256a2fcf89624d972e0f728962af933cf089f |
19-Mar-2013 |
Baligh Uddin <baligh@google.com> |
am 91bbb6e0: am cd7bd24d: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce * commit '91bbb6e057c8cc7149f4554d3981386f83f99e54': Import translations. DO NOT MERGE
|
f41e6147ebfb3886b305159f8e23e29a67068f83 |
19-Mar-2013 |
Baligh Uddin <baligh@google.com> |
am 9307f52b: (-s ours) Merge "Import translations. DO NOT MERGE" * commit '9307f52bdb35ab892b11f4e4faf4bcc526708118': Import translations. DO NOT MERGE
|
7790a29a6a968cf78e943cab518eb6af1790b194 |
19-Mar-2013 |
Baligh Uddin <baligh@google.com> |
am fa248e48: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev * commit 'fa248e482547e404cc696ec34171b30628036d19': Import translations. DO NOT MERGE
|
039bc5191479c664af6a998b55f04e8bc90b1fdd |
19-Mar-2013 |
Baligh Uddin <baligh@google.com> |
am cd7bd24d: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce * commit 'cd7bd24d6d8a9c709beefe252e90f452caa4c2b6': Import translations. DO NOT MERGE
|
93ba278251f61d44716fbac562b54a53fdc5ec5d |
19-Mar-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into master-security-dev
|
cdbc25133f85342b379df419480dba244c79821e |
19-Mar-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE"
|
b6bf037a666e5db57541d548febb6450cabc4513 |
19-Mar-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
|
cd7bd24d6d8a9c709beefe252e90f452caa4c2b6 |
19-Mar-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
|
8348639ff3e5675b5ba43ff15ed58ed94c1178b0 |
18-Mar-2013 |
John Reck <jreck@google.com> |
am d188cbac: am 040bc7f6: am a885ea9e: am 75819cfe: Merge "Fix notifyChange" into gb-ub-photos-bryce * commit 'd188cbaccf1602735281b174b273cc5c3f5a96de': Fix notifyChange
|
af1e29241e36c71afeead24463792daeca42541e |
18-Mar-2013 |
John Reck <jreck@google.com> |
am 040bc7f6: am a885ea9e: am 75819cfe: Merge "Fix notifyChange" into gb-ub-photos-bryce * commit '040bc7f6f9871fdb47c75567dbc5eb4853ed2931': Fix notifyChange
|
e3ed7b11642a53f65948ba7b7a8e23f14bf441e8 |
18-Mar-2013 |
John Reck <jreck@google.com> |
am a885ea9e: am 75819cfe: Merge "Fix notifyChange" into gb-ub-photos-bryce * commit 'a885ea9e6ecec4d4fbc8d35b0792538dc564ed61': Fix notifyChange
|
dbfb0f8d65fbf44b7055f80a0fa4168628786c1c |
18-Mar-2013 |
John Reck <jreck@google.com> |
am 75819cfe: Merge "Fix notifyChange" into gb-ub-photos-bryce * commit '75819cfec58ba48b5ee81eb9214c8e49dccfce76': Fix notifyChange
|
9a5c1beb3b8f5586a91b465fb013d6c4cea6b87c |
18-Mar-2013 |
John Reck <jreck@google.com> |
Merge "Fix notifyChange" into gb-ub-photos-bryce
|
75819cfec58ba48b5ee81eb9214c8e49dccfce76 |
18-Mar-2013 |
John Reck <jreck@google.com> |
Merge "Fix notifyChange" into gb-ub-photos-bryce
|
88b5c5dc982dc7bd5f5d490cd8f5cc4fb87156aa |
18-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
am 5eece6ed: am d60a743e: am 57ee52de: am 3ccb0e3e: Add a cleanstep for the build server... * commit '5eece6edb14b6f5c3c77e08f660e1b87ff6ce27f': Add a cleanstep for the build server...
|
f0d87be0e286ddd6b3a93f73dcd31d2c569cf749 |
18-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
am d60a743e: am 57ee52de: am 3ccb0e3e: Add a cleanstep for the build server... * commit 'd60a743ed63690cdaf789d782f9b7abc701aa264': Add a cleanstep for the build server...
|
49b97c92d84e39bb319b57d49dd9bc36a8520666 |
18-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
am 57ee52de: am 3ccb0e3e: Add a cleanstep for the build server... * commit '57ee52def2c9517e4d80342e770a9a9b6d858718': Add a cleanstep for the build server...
|
aa39f3649b07ec65daeb82cddd3b11155fabd99a |
18-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
am 3ccb0e3e: Add a cleanstep for the build server... * commit '3ccb0e3ef144ad54cc918779cc3ee10e7a182c28': Add a cleanstep for the build server...
|
eda82c0267bc81b9a48989b8213dbf4cad5f77c1 |
18-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
Add a cleanstep for the build server... Change-Id: Ic882c28b33e04c346a1f326b1eb7cc10b870a8a3
leanSpec.mk
|
3ccb0e3ef144ad54cc918779cc3ee10e7a182c28 |
18-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
Add a cleanstep for the build server... Change-Id: Ic882c28b33e04c346a1f326b1eb7cc10b870a8a3
leanSpec.mk
|
246781394544be41ce315293b6f67302b3504c87 |
18-Mar-2013 |
John Reck <jreck@google.com> |
Fix notifyChange Change-Id: I48d6c756a5272465b6cfaa632c879683aa51083d
rc/com/android/photos/data/PhotoProvider.java
|
835a0d50318e9cd61bbbd834e36ddda4cff9c59d |
18-Mar-2013 |
John Reck <jreck@google.com> |
Fix notifyChange Change-Id: I48d6c756a5272465b6cfaa632c879683aa51083d
rc/com/android/photos/data/PhotoProvider.java
|
1dd8fdacd2a0d94a2bfdda8f617a0a7d738b8428 |
18-Mar-2013 |
George Mount <mount@google.com> |
am 0284c097: am b7238b6e: am c113bbba: am 59073597: Merge "Change delete cascade" into gb-ub-photos-bryce * commit '0284c09778ac68e5cdb6bd4c3d95be9d3684a3a4': Change delete cascade
|
8f275e7a185d301a709f550db953a09c111e42d6 |
18-Mar-2013 |
George Mount <mount@google.com> |
am b7238b6e: am c113bbba: am 59073597: Merge "Change delete cascade" into gb-ub-photos-bryce * commit 'b7238b6e17dad1a8d7acfb4e064e618b8c709210': Change delete cascade
|
c1cf2c971b2105a3468b4dc5dd2108ac7d56dae8 |
18-Mar-2013 |
George Mount <mount@google.com> |
am c113bbba: am 59073597: Merge "Change delete cascade" into gb-ub-photos-bryce * commit 'c113bbba2d81111ef45f0e9010e8566043ea8712': Change delete cascade
|
5ecae60616dcf8310a3b03b5b9abeeea36ed0885 |
18-Mar-2013 |
George Mount <mount@google.com> |
am 59073597: Merge "Change delete cascade" into gb-ub-photos-bryce * commit '59073597fe605a519a5f74f52d400b55d071de0d': Change delete cascade
|
96be5d9e7c66b64f9dd24a29eb0fb69ebd920106 |
18-Mar-2013 |
George Mount <mount@google.com> |
Merge "Change delete cascade" into gb-ub-photos-bryce
|
59073597fe605a519a5f74f52d400b55d071de0d |
18-Mar-2013 |
George Mount <mount@google.com> |
Merge "Change delete cascade" into gb-ub-photos-bryce
|
5b743de44cec814b6dab6241aee9b7ab733b4c08 |
15-Mar-2013 |
George Mount <mount@google.com> |
Change delete cascade Change-Id: Ib40b0989ed437c923ff82b379e539b1141225529
rc/com/android/photos/data/PhotoProvider.java
|
8324b3355817e8f6d08ac0b1f7349926df8a9bc7 |
15-Mar-2013 |
George Mount <mount@google.com> |
Change delete cascade Change-Id: Ib40b0989ed437c923ff82b379e539b1141225529
rc/com/android/photos/data/PhotoProvider.java
|
5e76ee8d1a240167dd842e5385c4ccaf57d97fad |
18-Mar-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: If4fcdc2eeeec9b701d8ea0e447097b612ca81349 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
1623f6ee215e103549b2ed22c65ec89c4e669449 |
18-Mar-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I748f8863dd8170df93915a9d4a233297a1d8baf7 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
bb49d9974a3c6efcd88317efd5244d5ae9cc34e7 |
18-Mar-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I4bfd0c303b8ebb6fd0e33582d4f91a76bb31fb60 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
de1dfbd45d02af607a2f2a00892360388643adac |
18-Mar-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ida36bea845582d04f3f8d8c8dea9576a6279be5e Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
ba328d1be1c20151e51e4a8df7a04909197f0c1d |
18-Mar-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ida36bea845582d04f3f8d8c8dea9576a6279be5e Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
d6e036172b59caa196cd9ab006376f99370aa93e |
18-Mar-2013 |
George Mount <mount@google.com> |
am 35379c9c: am d7f3fcb0: am 1199caa4: am 42559630: Merge "Fix "drop table" problem." into gb-ub-photos-bryce * commit '35379c9ce809e3e37180e342fcd2a947a667d378': Fix "drop table" problem.
|
fbc364a4f85dd7b52523b55ba75542f6164b7499 |
18-Mar-2013 |
George Mount <mount@google.com> |
am d7f3fcb0: am 1199caa4: am 42559630: Merge "Fix "drop table" problem." into gb-ub-photos-bryce * commit 'd7f3fcb00226029abdf882f353ae42bbfeb218c0': Fix "drop table" problem.
|
24d29ec95da8d38ec6692254b714e2ac64fb84ee |
18-Mar-2013 |
George Mount <mount@google.com> |
am 1199caa4: am 42559630: Merge "Fix "drop table" problem." into gb-ub-photos-bryce * commit '1199caa49792dd8047306008878168b7b3138344': Fix "drop table" problem.
|
284d5db7e2ee8a7df7d71badbfc42e4a3155ca6b |
18-Mar-2013 |
George Mount <mount@google.com> |
am 42559630: Merge "Fix "drop table" problem." into gb-ub-photos-bryce * commit '42559630d746e79fb139c65b2b12a35742eb0354': Fix "drop table" problem.
|
736c4ccef53d67bebcc567371825c75d3103a40b |
18-Mar-2013 |
Angus Kong <shkong@google.com> |
am 04227cbd: am 0873c59c: am e690d1a2: am dc798933: Merge "Add shared preference key of LightCycle." into gb-ub-photos-bryce * commit '04227cbdbcb858be2aadf0610d3896a53c9ffdc9': Add shared preference key of LightCycle.
|
575489b66b1e9c8397d4f497cb262c19e4c1aa8b |
18-Mar-2013 |
George Mount <mount@google.com> |
Merge "Fix "drop table" problem." into gb-ub-photos-bryce
|
42559630d746e79fb139c65b2b12a35742eb0354 |
18-Mar-2013 |
George Mount <mount@google.com> |
Merge "Fix "drop table" problem." into gb-ub-photos-bryce
|
3bdfdf8930ee7ea2784beed4b8b8bc81643bc64e |
18-Mar-2013 |
Angus Kong <shkong@google.com> |
am 0873c59c: am e690d1a2: am dc798933: Merge "Add shared preference key of LightCycle." into gb-ub-photos-bryce * commit '0873c59c442d9d8ede1a305c15c79f012e32ac79': Add shared preference key of LightCycle.
|
660d70bbe56977d288e52e2ce300ca87e159318e |
18-Mar-2013 |
Angus Kong <shkong@google.com> |
am e690d1a2: am dc798933: Merge "Add shared preference key of LightCycle." into gb-ub-photos-bryce * commit 'e690d1a209afc8cb9c316e714553a61154c58207': Add shared preference key of LightCycle.
|
51ec846e42ba4adad469a2b41dffda37e5a68b19 |
18-Mar-2013 |
Angus Kong <shkong@google.com> |
am dc798933: Merge "Add shared preference key of LightCycle." into gb-ub-photos-bryce * commit 'dc7989333319d5042c112805d4244aeeec41e9d7': Add shared preference key of LightCycle.
|
a331a12a4b1da7cb17f5a078cf21a03896e37496 |
18-Mar-2013 |
Angus Kong <shkong@google.com> |
Merge "Add shared preference key of LightCycle." into gb-ub-photos-bryce
|
dc7989333319d5042c112805d4244aeeec41e9d7 |
18-Mar-2013 |
Angus Kong <shkong@google.com> |
Merge "Add shared preference key of LightCycle." into gb-ub-photos-bryce
|
a248e314296419fb96e48a900e742226240357ab |
18-Mar-2013 |
George Mount <mount@google.com> |
Fix "drop table" problem. Bug 8404285 Should drop table if exists when upgrading, not just drop a table. Change-Id: Ic75fa0efc6ab44be073b2b78a8520e2289cd3148
rc/com/android/photos/data/PhotoDatabase.java
|
fcdcdd7627bcebe97284e200daee9e8e284aa7f4 |
18-Mar-2013 |
George Mount <mount@google.com> |
Fix "drop table" problem. Bug 8404285 Should drop table if exists when upgrading, not just drop a table. Change-Id: Ic75fa0efc6ab44be073b2b78a8520e2289cd3148
rc/com/android/photos/data/PhotoDatabase.java
|
95cce15d6624f83915a7837fdaa82d7a08426ada |
18-Mar-2013 |
The Android Automerger <android-build@android.com> |
merge in jb-mr2-release history after reset to jb-mr2-dev
|
86ceca70de54eed6caf062a7cb1ddc6e864e4896 |
17-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
am fe2f7d6f: am aa60bdb1: am 6abfce86: am 4ea01ce2: Fix xmp crash * commit 'fe2f7d6f8924b8f1f3e57ad36ae87019d6cf9b16': Fix xmp crash
|
8f91a95826ab384fc9dca1b17100fda0800ca03e |
17-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
am 82f62d00: am 5df6dfbd: am b647e277: am 38ac5c3e: Merge "Add new slider style" into gb-ub-photos-bryce * commit '82f62d004d90dfbd2e854f40eba1506bac1b5f25': Add new slider style
|
ad8515859344fd547e1e09d7318c477a51ba54f5 |
17-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
am aa60bdb1: am 6abfce86: am 4ea01ce2: Fix xmp crash * commit 'aa60bdb1c4022dbbb7e974cf384c99249b96d38b': Fix xmp crash
|
50e166e536a432539f0aa6d6db3f869e36ce16e7 |
17-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
am 5df6dfbd: am b647e277: am 38ac5c3e: Merge "Add new slider style" into gb-ub-photos-bryce * commit '5df6dfbdc949dacab6b3f7933f8923696397f2f1': Add new slider style
|
1872131ae618beb27f8630be3e10e5a42cd319ad |
17-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
am 6abfce86: am 4ea01ce2: Fix xmp crash * commit '6abfce86f578313ef4a287ac04efd4a5f502ec32': Fix xmp crash
|
9a9b54bb32b44b6e18e6425fb25715a3c3a398ac |
17-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
am b647e277: am 38ac5c3e: Merge "Add new slider style" into gb-ub-photos-bryce * commit 'b647e27728433567ebb962857e3b33fa1e6659df': Add new slider style
|
b10a2e86c2ef88c64afacb9794be5cdbe3216833 |
17-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
am 4ea01ce2: Fix xmp crash * commit '4ea01ce27d0aecd1b63d7e99b747c9858fa93b02': Fix xmp crash
|
bb1855dedee1197ab06fe17c5a6a2c295394cd29 |
17-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
am 38ac5c3e: Merge "Add new slider style" into gb-ub-photos-bryce * commit '38ac5c3eab22ac051859b8eda40cfa5ceb675d53': Add new slider style
|
4ea01ce27d0aecd1b63d7e99b747c9858fa93b02 |
16-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
Fix xmp crash Change-Id: I256062b19e540fa77ff982552e62977789caf29b
rc/com/android/gallery3d/filtershow/filters/ImageFilterTinyPlanet.java
|
4230534827415a30840e122347354ea0be95a701 |
16-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
Fix xmp crash Change-Id: I256062b19e540fa77ff982552e62977789caf29b
rc/com/android/gallery3d/filtershow/filters/ImageFilterTinyPlanet.java
|
b539023a8c93d091aedb25b48456eb8739b4549e |
16-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
Merge "Add new slider style" into gb-ub-photos-bryce
|
38ac5c3eab22ac051859b8eda40cfa5ceb675d53 |
16-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
Merge "Add new slider style" into gb-ub-photos-bryce
|
7e54986578fba76e2ad3aa86ef816afad45ea0d8 |
16-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
Add new slider style Change-Id: I3c749058b6432765b5c8d8d39d26dc4467437ddf
es/drawable-xhdpi/filtershow_scrubber_control_disabled.png
es/drawable-xhdpi/filtershow_scrubber_control_focused.png
es/drawable-xhdpi/filtershow_scrubber_control_normal.png
es/drawable-xhdpi/filtershow_scrubber_control_pressed.png
es/drawable-xhdpi/filtershow_scrubber_primary.9.png
es/drawable-xhdpi/filtershow_scrubber_secondary.9.png
es/drawable-xhdpi/filtershow_scrubber_track.9.png
es/drawable/filtershow_scrubber.xml
es/drawable/filtershow_slider.xml
es/layout/filtershow_editor_panel.xml
es/values/filtershow_styles.xml
|
473ba67c57720054c6478719bed97ed8c3e87f9a |
16-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
Add new slider style Change-Id: I3c749058b6432765b5c8d8d39d26dc4467437ddf
es/drawable-xhdpi/filtershow_scrubber_control_disabled.png
es/drawable-xhdpi/filtershow_scrubber_control_focused.png
es/drawable-xhdpi/filtershow_scrubber_control_normal.png
es/drawable-xhdpi/filtershow_scrubber_control_pressed.png
es/drawable-xhdpi/filtershow_scrubber_primary.9.png
es/drawable-xhdpi/filtershow_scrubber_secondary.9.png
es/drawable-xhdpi/filtershow_scrubber_track.9.png
es/drawable/filtershow_scrubber.xml
es/drawable/filtershow_slider.xml
es/layout/filtershow_editor_panel.xml
es/values/filtershow_styles.xml
|
1580df6aed1e5569ede61af0949279819ec03119 |
16-Mar-2013 |
Angus Kong <shkong@google.com> |
Add shared preference key of LightCycle. Change-Id: Ifd3171502cfde321769e3bc2b554ec14bf7bdd21
rc/com/android/camera/CameraSettings.java
rc/com/android/camera/ComboPreferences.java
|
d767d63fecca636bd5da9c12d933104c6ed76e1f |
16-Mar-2013 |
Angus Kong <shkong@google.com> |
Add shared preference key of LightCycle. Change-Id: Ifd3171502cfde321769e3bc2b554ec14bf7bdd21
rc/com/android/camera/CameraSettings.java
rc/com/android/camera/ComboPreferences.java
|
853b676e74aa5248087644ddc56a96443ac746e8 |
16-Mar-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 71ae05be: am ce813f67: am ffaa8d03: am 7dc5b6b3: Merge "Refactoring iconbutton." into gb-ub-photos-bryce * commit '71ae05bed21d1ce9b423fc4a485c04a310bb485b': Refactoring iconbutton.
|
76a323b1bb2ebf7cfa388a5a2542a45c842d5f39 |
16-Mar-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am ce813f67: am ffaa8d03: am 7dc5b6b3: Merge "Refactoring iconbutton." into gb-ub-photos-bryce * commit 'ce813f67d63318f771033d26157c3acedb6f9e9c': Refactoring iconbutton.
|
25aaa6b4fa364fdb134b836b0bf7f5553207e9ac |
16-Mar-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am ffaa8d03: am 7dc5b6b3: Merge "Refactoring iconbutton." into gb-ub-photos-bryce * commit 'ffaa8d039f92e6da287ff30487b32e4d41eb8fe7': Refactoring iconbutton.
|
ef666249902b39fd0458313dca999179b9489089 |
16-Mar-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 7dc5b6b3: Merge "Refactoring iconbutton." into gb-ub-photos-bryce * commit '7dc5b6b32d566d47a70ef32d93057a3fcf7524c9': Refactoring iconbutton.
|
ef976a7a48bf3c626c558d8bdcf68e2743d83a6f |
16-Mar-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Refactoring iconbutton." into gb-ub-photos-bryce
|
7dc5b6b32d566d47a70ef32d93057a3fcf7524c9 |
16-Mar-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Refactoring iconbutton." into gb-ub-photos-bryce
|
f88f1d99563ddcfe15fed8fe98a293c0a5de0d82 |
15-Mar-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Refactoring iconbutton. Change-Id: Ie1538d978605ae28bb4fa6779eb2802794a35312
rc/com/android/gallery3d/filtershow/cache/ImageLoader.java
rc/com/android/gallery3d/filtershow/tools/IconFactory.java
rc/com/android/gallery3d/filtershow/ui/FilterIconButton.java
rc/com/android/gallery3d/filtershow/ui/IconButton.java
|
1ce9b42534da231c85d40be442c455e5b7cbc59e |
15-Mar-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Refactoring iconbutton. Change-Id: Ie1538d978605ae28bb4fa6779eb2802794a35312
rc/com/android/gallery3d/filtershow/cache/ImageLoader.java
rc/com/android/gallery3d/filtershow/tools/IconFactory.java
rc/com/android/gallery3d/filtershow/ui/FilterIconButton.java
rc/com/android/gallery3d/filtershow/ui/IconButton.java
|
ad56ecaf367697786849468a61a0a4198c39e448 |
16-Mar-2013 |
Bobby Georgescu <georgescu@google.com> |
am 742ea9b7: am 236618b2: am 5b1ae393: am 9674c47d: Merge "Improve AlbumSet UI in new gallery" into gb-ub-photos-bryce * commit '742ea9b7a260f3240d9183642d206057424097e9': Improve AlbumSet UI in new gallery
|
736f20ed32b9de52b04daf0a5a76b4f32d58cdd9 |
16-Mar-2013 |
Bobby Georgescu <georgescu@google.com> |
am 236618b2: am 5b1ae393: am 9674c47d: Merge "Improve AlbumSet UI in new gallery" into gb-ub-photos-bryce * commit '236618b29aa974446db3e557efe05e6462e89ad9': Improve AlbumSet UI in new gallery
|
59a4a1d214e64610d30bc9f4db1d6f17894a3b0e |
15-Mar-2013 |
Bobby Georgescu <georgescu@google.com> |
am 5b1ae393: am 9674c47d: Merge "Improve AlbumSet UI in new gallery" into gb-ub-photos-bryce * commit '5b1ae3933cbc01256e7530f7897ecfecda20c806': Improve AlbumSet UI in new gallery
|
5f9b42d21edf2a52510d5a79e30ddeb80026caf4 |
15-Mar-2013 |
Bobby Georgescu <georgescu@google.com> |
am 9674c47d: Merge "Improve AlbumSet UI in new gallery" into gb-ub-photos-bryce * commit '9674c47ddc19351379888f0bc221190e8e05122b': Improve AlbumSet UI in new gallery
|
372368a941a38d74ea4671a64e3042a1e5698b83 |
15-Mar-2013 |
Bobby Georgescu <georgescu@google.com> |
Merge "Improve AlbumSet UI in new gallery" into gb-ub-photos-bryce
|
9674c47ddc19351379888f0bc221190e8e05122b |
15-Mar-2013 |
Bobby Georgescu <georgescu@google.com> |
Merge "Improve AlbumSet UI in new gallery" into gb-ub-photos-bryce
|
14b53b9c942cb78bee775a8d107c16639681af88 |
15-Mar-2013 |
Bobby Georgescu <georgescu@google.com> |
Merge "Improve AlbumSet UI in new gallery" into gb-ub-photos-bryce
|
6dc2f6ba41d6a7065ced232cfee5d1013171be34 |
15-Mar-2013 |
Bobby Georgescu <georgescu@google.com> |
Improve AlbumSet UI in new gallery Change-Id: I31cbf7cf8c0c7b5f5f3413a59ad94142b13870d2
rc/com/android/photos/adapters/AlbumSetCursorAdapter.java
|
d9928654036e0a9fd43fcc186f8c66537dabe28a |
15-Mar-2013 |
Bobby Georgescu <georgescu@google.com> |
Improve AlbumSet UI in new gallery Change-Id: I31cbf7cf8c0c7b5f5f3413a59ad94142b13870d2
es/layout/album_set.xml
es/layout/album_set_item.xml
es/values/dimensions.xml
es/values/strings.xml
rc/com/android/photos/adapters/AlbumSetCursorAdapter.java
|
301059e8e1b39fdcdd52d85c7cf93355f68d9ccc |
15-Mar-2013 |
Bobby Georgescu <georgescu@google.com> |
Improve AlbumSet UI in new gallery Change-Id: I31cbf7cf8c0c7b5f5f3413a59ad94142b13870d2
es/layout/album_set.xml
es/layout/album_set_item.xml
es/values/dimensions.xml
es/values/strings.xml
|
5225d21b07bf40e2dccb75e60794380d86f0db71 |
15-Mar-2013 |
John Reck <jreck@google.com> |
am 58bd9484: am b322b22a: am 84cf9da3: am ad0a874d: Prepare to switch to panolibs * commit '58bd9484fd382730e86c1843cfec87e3ac803dd0': Prepare to switch to panolibs
|
9b62d25b291c239efe5b3e4c5aaec9eac2805b0e |
15-Mar-2013 |
John Reck <jreck@google.com> |
am b322b22a: am 84cf9da3: am ad0a874d: Prepare to switch to panolibs * commit 'b322b22aa49b97d9635771f2124b9dd2773f3eb3': Prepare to switch to panolibs
|
fe2ec539de07b942a135ff9e0a3bda2b7ef00ce3 |
15-Mar-2013 |
John Reck <jreck@google.com> |
am 84cf9da3: am ad0a874d: Prepare to switch to panolibs * commit '84cf9da37fec302ca591a53f92dd7bc0456bcb44': Prepare to switch to panolibs
|
cd2d80d459c1cae731722019843eee766bebc7f6 |
15-Mar-2013 |
John Reck <jreck@google.com> |
am ad0a874d: Prepare to switch to panolibs * commit 'ad0a874d0383106a412d22138ebec6b51a13d88e': Prepare to switch to panolibs
|
5a052ea0a4e0064b7c3e6a056243330f23ca0c42 |
15-Mar-2013 |
John Reck <jreck@google.com> |
Prepare to switch to panolibs Change-Id: Ie29c0014fcb08105cab1ee6043f66b58e5ac85f8
ndroidManifest.xml
|
0fe391a43d0c549fa0effddd21ece4eb4ba86194 |
15-Mar-2013 |
John Reck <jreck@google.com> |
Prepare to switch to panolibs Change-Id: Ie29c0014fcb08105cab1ee6043f66b58e5ac85f8
rc/com/android/photos/canvas/CanvasActivity.java
rc/com/android/photos/canvas/CanvasProvider.java
rc/com/android/photos/canvas/CanvasProviderBase.java
rc/com/android/photos/canvas/EnableSyncActivity.java
rc/com/google/android/pano/data/Cluster.java
rc/com/google/android/pano/data/util/UriUtils.java
rc/com/google/android/pano/provider/PanoContract.java
|
ad0a874d0383106a412d22138ebec6b51a13d88e |
15-Mar-2013 |
John Reck <jreck@google.com> |
Prepare to switch to panolibs Change-Id: Ie29c0014fcb08105cab1ee6043f66b58e5ac85f8
ndroidManifest.xml
es/xml/canvas_info.xml
rc/com/android/photos/canvas/CanvasActivity.java
rc/com/android/photos/canvas/CanvasProvider.java
rc/com/android/photos/canvas/CanvasProviderBase.java
rc/com/android/photos/canvas/EnableSyncActivity.java
rc/com/google/android/pano/data/Cluster.java
rc/com/google/android/pano/data/util/UriUtils.java
rc/com/google/android/pano/provider/PanoContract.java
|
ef8adc0fc55e903612e331d0212b6c0664d778d0 |
15-Mar-2013 |
John Reck <jreck@google.com> |
Prepare to switch to panolibs Change-Id: Ie29c0014fcb08105cab1ee6043f66b58e5ac85f8
es/xml/canvas_info.xml
|
73327cb5361e5664fc6543ff419de598ef7aad94 |
15-Mar-2013 |
George Mount <mount@google.com> |
am 7969dcc5: am cc099f42: am 79a638d5: am b5ab491c: Delete and recreate database on upgrade. * commit '7969dcc5e7e5b7c4dd35ce1ffce20bde940345c6': Delete and recreate database on upgrade.
|
8ad70f5267407885fcf98eefca03098dbd4225db |
15-Mar-2013 |
George Mount <mount@google.com> |
am cc099f42: am 79a638d5: am b5ab491c: Delete and recreate database on upgrade. * commit 'cc099f422fa89725df45458348e73dc2e3153006': Delete and recreate database on upgrade.
|
608c9d7356bbdc1d865dfc426f358d8e3ef79b85 |
15-Mar-2013 |
George Mount <mount@google.com> |
am 79a638d5: am b5ab491c: Delete and recreate database on upgrade. * commit '79a638d5d0260e235b81e0d76c662f25c024aa28': Delete and recreate database on upgrade.
|
2fd525aefb97a74fb5af499a87357c4ded1f40d3 |
15-Mar-2013 |
George Mount <mount@google.com> |
am b5ab491c: Delete and recreate database on upgrade. * commit 'b5ab491c5461df7fedb9c83f42e80acef4fd8a8e': Delete and recreate database on upgrade.
|
4fc93d01548b8b67cb4cdd4a9e540ea0e004df49 |
15-Mar-2013 |
George Mount <mount@google.com> |
Delete and recreate database on upgrade. Change-Id: I0125697dd673568ddfee7be8d7d0d693018b61d5
rc/com/android/photos/data/PhotoDatabase.java
ests/src/com/android/photos/data/PhotoDatabaseTest.java
|
b5ab491c5461df7fedb9c83f42e80acef4fd8a8e |
15-Mar-2013 |
George Mount <mount@google.com> |
Delete and recreate database on upgrade. Change-Id: I0125697dd673568ddfee7be8d7d0d693018b61d5
rc/com/android/photos/data/PhotoDatabase.java
ests/src/com/android/photos/data/PhotoDatabaseTest.java
|
21602db00f48aef16c9539a76530f33a256b5bf9 |
15-Mar-2013 |
George Mount <mount@google.com> |
am edd73765: am a0dea8be: am 2bdc7087: am 091314b7: Use cancellationSignal only on API Level 16 and above. * commit 'edd737650a3da36ccf2376e0a9db17e467c4b69e': Use cancellationSignal only on API Level 16 and above.
|
a32c373b6dcdfa7d8b6d1c7a889dbbd69d5a2340 |
15-Mar-2013 |
George Mount <mount@google.com> |
am a0dea8be: am 2bdc7087: am 091314b7: Use cancellationSignal only on API Level 16 and above. * commit 'a0dea8be17e1a8f5d0b9436ec7dcbb0fdfa36a34': Use cancellationSignal only on API Level 16 and above.
|
07f6bb3ef3ad787558d5f74300f50ce6a375ab6c |
15-Mar-2013 |
George Mount <mount@google.com> |
am 2bdc7087: am 091314b7: Use cancellationSignal only on API Level 16 and above. * commit '2bdc7087c3941087387fbba41199c4df9e5099aa': Use cancellationSignal only on API Level 16 and above.
|
d50931b4f6dad3ed534bb0a8e4f66eb8c79b92d3 |
15-Mar-2013 |
George Mount <mount@google.com> |
am 091314b7: Use cancellationSignal only on API Level 16 and above. * commit '091314b7ea73e774ce96c981bd7007c94ad80e30': Use cancellationSignal only on API Level 16 and above.
|
ae08ffa53ee52fa78fe30d76865a05814d64984c |
15-Mar-2013 |
George Mount <mount@google.com> |
Use cancellationSignal only on API Level 16 and above. Bug 8390238 Change-Id: If2dacb1eb74e531d004b6f281d32a81f7cd59139
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
|
b7cc5e99563bc695ec871f897914eb2cb797ad53 |
15-Mar-2013 |
George Mount <mount@google.com> |
Use cancellationSignal only on API Level 16 and above. Bug 8390238 Change-Id: If2dacb1eb74e531d004b6f281d32a81f7cd59139
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
rc/com/android/photos/data/PhotoProvider.java
|
091314b7ea73e774ce96c981bd7007c94ad80e30 |
15-Mar-2013 |
George Mount <mount@google.com> |
Use cancellationSignal only on API Level 16 and above. Bug 8390238 Change-Id: If2dacb1eb74e531d004b6f281d32a81f7cd59139
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
rc/com/android/photos/data/PhotoProvider.java
|
1be4aa06809ef60a007a8f246e1305698f199e60 |
15-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
am 973c66d1: am c92cff7b: am 938289d8: am a2729a16: Fix layout issue on rotation * commit '973c66d190824a977441877c05632a134edeec24': Fix layout issue on rotation
|
a29433b00b134754e6de97d22e1b150c88ee3679 |
15-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
am c92cff7b: am 938289d8: am a2729a16: Fix layout issue on rotation * commit 'c92cff7bb64fc64d65591a8f225536e32a4f228a': Fix layout issue on rotation
|
81ea992dd301140e16452df5b48db51c8a737430 |
15-Mar-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 7de468fa: am 11126f9a: am b53e6e7b: am 0ca39072: Merge "Fixed more threading bugs in the ImageFilterRS and the FiltersManager." into gb-ub-photos-bryce * commit '7de468fa19422c278cf8470769154d6dbd32492e': Fixed more threading bugs in the ImageFilterRS and the FiltersManager.
|
64ae91073c9c8b8f31344885ea7002df9bcb781e |
15-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
am 938289d8: am a2729a16: Fix layout issue on rotation * commit '938289d8e7c1e4862b83a2d35a797a15dc018224': Fix layout issue on rotation
|
cc2b37af15f6a64145b37e77b8e0080dac95ee26 |
15-Mar-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 11126f9a: am b53e6e7b: am 0ca39072: Merge "Fixed more threading bugs in the ImageFilterRS and the FiltersManager." into gb-ub-photos-bryce * commit '11126f9abfa1e65439ac9d8cd7c4c7da3f2e3bf3': Fixed more threading bugs in the ImageFilterRS and the FiltersManager.
|
c001d2bcdd162b7da11e48c8b2a70fb54bb4b6c4 |
15-Mar-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am b53e6e7b: am 0ca39072: Merge "Fixed more threading bugs in the ImageFilterRS and the FiltersManager." into gb-ub-photos-bryce * commit 'b53e6e7bd761e1dd0084a818e47cdb880639eedb': Fixed more threading bugs in the ImageFilterRS and the FiltersManager.
|
22344e340aa8fc84c6b49851a7a67783fd92da53 |
15-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
am a2729a16: Fix layout issue on rotation * commit 'a2729a16717ec0e7bdaf8fa112d7a1d1760ba2e3': Fix layout issue on rotation
|
2e73dca71ba700f285b23fcab0c8f32b9b3ce5a4 |
15-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
Fix layout issue on rotation Change-Id: I93956687c5c4332c3ceae6f1e3c7041fb322b041
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
|
a2729a16717ec0e7bdaf8fa112d7a1d1760ba2e3 |
15-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
Fix layout issue on rotation Change-Id: I93956687c5c4332c3ceae6f1e3c7041fb322b041
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
|
cde0d27998ed607f4d66ed91c446772f0ee57e4a |
15-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
am 526c8808: am 9ba0738a: am a6558d56: am 253b0816: Enable touch panning by default * commit '526c8808ecfab585f375a78b3b1803e43103ca92': Enable touch panning by default
|
4c4f1cd9a3f5c8d7e561ab783e1a590818252463 |
15-Mar-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 0ca39072: Merge "Fixed more threading bugs in the ImageFilterRS and the FiltersManager." into gb-ub-photos-bryce * commit '0ca39072098a16da35fbe95f91892eca3d6aa077': Fixed more threading bugs in the ImageFilterRS and the FiltersManager.
|
0ca39072098a16da35fbe95f91892eca3d6aa077 |
15-Mar-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Fixed more threading bugs in the ImageFilterRS and the FiltersManager." into gb-ub-photos-bryce
|
dadfbb888c13b67acbf302f6dfad022683ace001 |
15-Mar-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Fixed more threading bugs in the ImageFilterRS and the FiltersManager." into gb-ub-photos-bryce
|
bd67ccf084a2350324b39ff7dd27fe0d48543b31 |
15-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
am 9ba0738a: am a6558d56: am 253b0816: Enable touch panning by default * commit '9ba0738ad8998d01298e5a24121c100e8c77a72e': Enable touch panning by default
|
25631459d9b875cbc7901e6ba8bae268fbe92a29 |
15-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
am a6558d56: am 253b0816: Enable touch panning by default * commit 'a6558d56370003e13872774b3415d295d2a1c7bc': Enable touch panning by default
|
31b80f2b0c2aa83d9422c86c31ea58345c871713 |
15-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
am 253b0816: Enable touch panning by default * commit '253b0816b2e979a1e4fef1d99df3345483580655': Enable touch panning by default
|
ea5355e6aa782bb61fbf079f4811873a67a83808 |
15-Mar-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Fixed more threading bugs in the ImageFilterRS and the FiltersManager. Bug: 8392832 Change-Id: I87b3af9ddb62524f02858a82eac2cc3bd2209418
rc/com/android/gallery3d/filtershow/filters/ImageFilterRS.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterSharpen.java
rc_pd/com/android/gallery3d/filtershow/filters/FiltersManager.java
|
c16e2afe3b7bb764f3de53cc34cd70afa413660e |
15-Mar-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Fixed more threading bugs in the ImageFilterRS and the FiltersManager. Bug: 8392832 Change-Id: I87b3af9ddb62524f02858a82eac2cc3bd2209418
rc/com/android/gallery3d/filtershow/filters/ImageFilterRS.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterSharpen.java
rc_pd/com/android/gallery3d/filtershow/filters/FiltersManager.java
|
253b0816b2e979a1e4fef1d99df3345483580655 |
15-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
Enable touch panning by default Change-Id: I7d0ced296fe84c2cfff820fbcb99f5731f9ade44
rc/com/android/gallery3d/filtershow/imageshow/ImageShow.java
|
e06880d55d8c98491b95d6f8c0cdb1653d90c557 |
15-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
Enable touch panning by default Change-Id: I7d0ced296fe84c2cfff820fbcb99f5731f9ade44
rc/com/android/gallery3d/filtershow/imageshow/ImageShow.java
|
e02903fb20d54659f796c003a5fe6887eb795ef8 |
15-Mar-2013 |
Bobby Georgescu <georgescu@google.com> |
am 99d592be: am 1bbf58b2: am f05cbe86: am 8d3031b3: Merge "Add many contextual actions to new gallery" into gb-ub-photos-bryce * commit '99d592be5f5ba7eb6867f52fd85bf9cc482a3007': Add many contextual actions to new gallery
|
0950cf0213d40d508b50581c5d07ea5325358a7f |
15-Mar-2013 |
Bobby Georgescu <georgescu@google.com> |
am 1bbf58b2: am f05cbe86: am 8d3031b3: Merge "Add many contextual actions to new gallery" into gb-ub-photos-bryce * commit '1bbf58b2615a058c4f64f91dca67170ff8ffecca': Add many contextual actions to new gallery
|
181152a0f68e45c2edff0b6350255a8f442de6f0 |
15-Mar-2013 |
Bobby Georgescu <georgescu@google.com> |
am f05cbe86: am 8d3031b3: Merge "Add many contextual actions to new gallery" into gb-ub-photos-bryce * commit 'f05cbe86a637a847a542ea583a514057041bea17': Add many contextual actions to new gallery
|
dc02ec3ea008dba48e56996222179ce9e73355d4 |
15-Mar-2013 |
Bobby Georgescu <georgescu@google.com> |
am 8d3031b3: Merge "Add many contextual actions to new gallery" into gb-ub-photos-bryce * commit '8d3031b3b2f7c74d9677f72a2979b43766a677de': Add many contextual actions to new gallery
|
856b1d5b519f0bed32f5e95146e306248a18c288 |
15-Mar-2013 |
Bobby Georgescu <georgescu@google.com> |
Merge "Add many contextual actions to new gallery" into gb-ub-photos-bryce
|
8d3031b3b2f7c74d9677f72a2979b43766a677de |
15-Mar-2013 |
Bobby Georgescu <georgescu@google.com> |
Merge "Add many contextual actions to new gallery" into gb-ub-photos-bryce
|
61872e727127150b5a2bd5e7da30f92f8737b6b7 |
15-Mar-2013 |
Bobby Georgescu <georgescu@google.com> |
Merge "Add many contextual actions to new gallery" into gb-ub-photos-bryce
|
f1f4a0ecb5edcffd2bce6af0d7e02a1bf6d0aedf |
15-Mar-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am bc7ff144: am fd3f7e06: am de17db0b: am 987bd62f: Merge "Requested RS method rename." into gb-ub-photos-bryce * commit 'bc7ff144a5bd39d2d68d14c03c6bde589e85f32e': Requested RS method rename.
|
42c01e1ee2653f874e99855e7f59aeae863938ad |
15-Mar-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am fd3f7e06: am de17db0b: am 987bd62f: Merge "Requested RS method rename." into gb-ub-photos-bryce * commit 'fd3f7e063655a22b822a360edcd2694ebe517828': Requested RS method rename.
|
8803f42a562bb2a83e2f5a3dacf09574d2db24ad |
15-Mar-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am de17db0b: am 987bd62f: Merge "Requested RS method rename." into gb-ub-photos-bryce * commit 'de17db0bcb10ce6851406f5bff763ce2f00b5bcd': Requested RS method rename.
|
ae066eb20caaf8fe2d96d26f22642a0d6c42f8f2 |
15-Mar-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 987bd62f: Merge "Requested RS method rename." into gb-ub-photos-bryce * commit '987bd62fda1decf793657e533408a4e74ad1cf22': Requested RS method rename.
|
987bd62fda1decf793657e533408a4e74ad1cf22 |
15-Mar-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Requested RS method rename." into gb-ub-photos-bryce
|
55be3667e6807261a8b60185aff63f9669c26f84 |
15-Mar-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Requested RS method rename." into gb-ub-photos-bryce
|
8645f0a077d8b14bcea63703d37ac33482103b30 |
14-Mar-2013 |
Bobby Georgescu <georgescu@google.com> |
Add many contextual actions to new gallery Change-Id: Ied57636c7bf0804ad015ddc664e177633c549e08
es/menu/gallery_multiselect.xml
|
1a719804ddd5c6fc9a6914ef5a2b6e914834d1f9 |
14-Mar-2013 |
Bobby Georgescu <georgescu@google.com> |
Add many contextual actions to new gallery Change-Id: Ied57636c7bf0804ad015ddc664e177633c549e08
es/menu/gallery_multiselect.xml
rc/com/android/gallery3d/app/MuteVideo.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/photos/AlbumSetFragment.java
rc/com/android/photos/MultiChoiceManager.java
rc/com/android/photos/PhotoSetFragment.java
rc/com/android/photos/SelectionManager.java
|
48e9a7730db170c4dfd36156323cd54ddafe7117 |
14-Mar-2013 |
Bobby Georgescu <georgescu@google.com> |
Add many contextual actions to new gallery Change-Id: Ied57636c7bf0804ad015ddc664e177633c549e08
rc/com/android/gallery3d/app/MuteVideo.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/photos/AlbumSetFragment.java
rc/com/android/photos/MultiChoiceManager.java
rc/com/android/photos/PhotoSetFragment.java
rc/com/android/photos/SelectionManager.java
|
b792038b160c375c354d65176b6319248bfadb96 |
14-Mar-2013 |
Michael Kolb <kolby@google.com> |
am 4802a88f: am 5033a56b: am f6df9674: am 0198d64d: Merge "Fix exposure compensation" into gb-ub-photos-bryce * commit '4802a88f02c33556512bf444f80a8211d05cc8e1': Fix exposure compensation
|
bedcccf350078eb7cb420e976dc1bc9a96c86b6b |
14-Mar-2013 |
Michael Kolb <kolby@google.com> |
am 5033a56b: am f6df9674: am 0198d64d: Merge "Fix exposure compensation" into gb-ub-photos-bryce * commit '5033a56b26f2d085903f690115dc063be91d4eea': Fix exposure compensation
|
d401c67844848d78607c616b7f041b9f21c275eb |
14-Mar-2013 |
Michael Kolb <kolby@google.com> |
am f6df9674: am 0198d64d: Merge "Fix exposure compensation" into gb-ub-photos-bryce * commit 'f6df96741603d7448aa5409251a268154c34fefc': Fix exposure compensation
|
d907d8d391f10060a423e58950fa50ad57a93ccc |
14-Mar-2013 |
Michael Kolb <kolby@google.com> |
am 0198d64d: Merge "Fix exposure compensation" into gb-ub-photos-bryce * commit '0198d64d86ad05e72c2459ae1055f482d30b5305': Fix exposure compensation
rc/com/android/camera/CameraSettings.java
|
f21dc0f78c10da61221f096214d65bff29e017f9 |
14-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
am 978f4aae: Fix for crash upon saving image * commit '978f4aae1d2923fd125f85a6d5c568a26c571522': Fix for crash upon saving image
allerycommon/src/com/android/gallery3d/exif/ExifOutputStream.java
allerycommon/src/com/android/gallery3d/exif/ExifTag.java
|
d7c61b63a1ea0d86cd10861834fd2783c54a4632 |
14-Mar-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Requested RS method rename. Change-Id: I2f158cb6cfb6ab23907e49c89f93681692e56dfb
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterRS.java
|
9591c24b04ef85f971f89ed8cf8b4b28f9d2eb9e |
14-Mar-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Requested RS method rename. Change-Id: I2f158cb6cfb6ab23907e49c89f93681692e56dfb
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterRS.java
|
e5df44d981ad59fb270de7d3f09b3681fa0698c5 |
14-Mar-2013 |
Michael Kolb <kolby@google.com> |
am 0198d64d: Merge "Fix exposure compensation" into gb-ub-photos-bryce * commit '0198d64d86ad05e72c2459ae1055f482d30b5305': Fix exposure compensation
|
0198d64d86ad05e72c2459ae1055f482d30b5305 |
14-Mar-2013 |
Michael Kolb <kolby@google.com> |
Merge "Fix exposure compensation" into gb-ub-photos-bryce
|
ae42bc21941565920db450ea68a7c5de3433196d |
14-Mar-2013 |
Michael Kolb <kolby@google.com> |
Merge "Fix exposure compensation" into gb-ub-photos-bryce
|
293e9957b38df89b677f9eb70ddd73cae99cb184 |
14-Mar-2013 |
Michael Kolb <kolby@google.com> |
Fix exposure compensation Bug: 8391082 Change-Id: I346b57dd0c1ed240ab4daa61147c2dd8f8892b44
rc/com/android/camera/CameraSettings.java
|
7e0ee8bbc790e2eef67f4bbe0cd1c5550d055ea9 |
14-Mar-2013 |
Michael Kolb <kolby@google.com> |
Fix exposure compensation Bug: 8391082 Change-Id: I346b57dd0c1ed240ab4daa61147c2dd8f8892b44
rc/com/android/camera/CameraSettings.java
|
eb028e99c07156d6c5aaa2fd1cc943b4712650d1 |
14-Mar-2013 |
Justin Koh <justinkoh@google.com> |
am 8194aa9d: am 9daf2bae: am d373ad15: am 4a204853: Merge "Update Gallery Pano Provider." into gb-ub-photos-bryce * commit '8194aa9d150eeccef746cd232303c40e63dd833d': Update Gallery Pano Provider.
|
fd0d0eda1d77c623fff565e35f2d39098daffaf8 |
14-Mar-2013 |
Justin Koh <justinkoh@google.com> |
am 9daf2bae: am d373ad15: am 4a204853: Merge "Update Gallery Pano Provider." into gb-ub-photos-bryce * commit '9daf2bae902cc07cb80bfe44cbb295a821fee39f': Update Gallery Pano Provider.
|
aae0c9e73bca29edac70700d57153a8b65e12356 |
14-Mar-2013 |
Justin Koh <justinkoh@google.com> |
am d373ad15: am 4a204853: Merge "Update Gallery Pano Provider." into gb-ub-photos-bryce * commit 'd373ad15dab6c4e6379f00ac17076912066cbbff': Update Gallery Pano Provider.
|
06a2c4ad79bfa16f2272a9c0fe8a8d26f5eb6f8a |
14-Mar-2013 |
Justin Koh <justinkoh@google.com> |
am 4a204853: Merge "Update Gallery Pano Provider." into gb-ub-photos-bryce * commit '4a204853b57a6e855b0f4c2179d41bebce591ea7': Update Gallery Pano Provider.
|
4a204853b57a6e855b0f4c2179d41bebce591ea7 |
14-Mar-2013 |
Justin Koh <justinkoh@google.com> |
Merge "Update Gallery Pano Provider." into gb-ub-photos-bryce
|
b0c811a0a56de7cee718ce17ff8273c845d5007d |
14-Mar-2013 |
Justin Koh <justinkoh@google.com> |
Merge "Update Gallery Pano Provider." into gb-ub-photos-bryce
|
7f710636d42fc225803d47f8b699429055a3168b |
14-Mar-2013 |
Justin Koh <justinkoh@google.com> |
Update Gallery Pano Provider. Update Gallery Pano Provider. Use DIP instead of PX. Change-Id: I8871502aa215012a8647401f7ee1e7906e110fe4
rc/com/android/photos/canvas/CanvasProvider.java
|
1c227156b0771f96ade6496d15326ecf416d8118 |
14-Mar-2013 |
Justin Koh <justinkoh@google.com> |
Update Gallery Pano Provider. Update Gallery Pano Provider. Use DIP instead of PX. Change-Id: I8871502aa215012a8647401f7ee1e7906e110fe4
rc/com/android/photos/canvas/CanvasProvider.java
|
485227c03d1919d228ea9f0a15e50a1934345ff3 |
14-Mar-2013 |
Tim Murray <timmurray@google.com> |
am 1efe5ccc: am 4e985b88: am 3e6a37b6: am fdb2fbc7: Merge "Change element type to A_8 to support sampling." into gb-ub-photos-bryce * commit '1efe5ccc1313cb2fc6f5ca717d0dd9840c1c1e82': Change element type to A_8 to support sampling.
|
198348d7ffe8c80ec7978e19daf79869c5216b57 |
14-Mar-2013 |
Tim Murray <timmurray@google.com> |
am 4e985b88: am 3e6a37b6: am fdb2fbc7: Merge "Change element type to A_8 to support sampling." into gb-ub-photos-bryce * commit '4e985b88638d7eeb0d862ce163c3244d88555912': Change element type to A_8 to support sampling.
|
708344b4befe827acb56ae7f167e5f423075dd79 |
14-Mar-2013 |
Tim Murray <timmurray@google.com> |
am 3e6a37b6: am fdb2fbc7: Merge "Change element type to A_8 to support sampling." into gb-ub-photos-bryce * commit '3e6a37b69f23918ff2003f6541ce8ff5130cd97d': Change element type to A_8 to support sampling.
|
a046a3ff92ca18354c1122ac57272b42312fe885 |
14-Mar-2013 |
Tim Murray <timmurray@google.com> |
am fdb2fbc7: Merge "Change element type to A_8 to support sampling." into gb-ub-photos-bryce * commit 'fdb2fbc75750869dacb5e61779e00d93b25aed8e': Change element type to A_8 to support sampling.
|
fdb2fbc75750869dacb5e61779e00d93b25aed8e |
14-Mar-2013 |
Tim Murray <timmurray@google.com> |
Merge "Change element type to A_8 to support sampling." into gb-ub-photos-bryce
|
8aa93945e2bc377261f39ac19e6968bc08a0b23b |
14-Mar-2013 |
Tim Murray <timmurray@google.com> |
Merge "Change element type to A_8 to support sampling." into gb-ub-photos-bryce
|
0fc5dcad5b407e11b8a6d8491f784c73622b8c95 |
14-Mar-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am dd29c245: am f641ccd8: am 25f3564d: am 6cdae525: Merge "Fix image icons on Razr M." into gb-ub-photos-bryce * commit 'dd29c2453e7c399b62357710b4cdf0b913a7c076': Fix image icons on Razr M.
|
c45a94b442ab7dc86325b818b592ad4811901d7d |
14-Mar-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am f641ccd8: am 25f3564d: am 6cdae525: Merge "Fix image icons on Razr M." into gb-ub-photos-bryce * commit 'f641ccd8760a943c91e97395f41faa9e81e1f033': Fix image icons on Razr M.
|
feb994bae03d53a2e275ae0aaf8c7cde1b974cdf |
14-Mar-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 25f3564d: am 6cdae525: Merge "Fix image icons on Razr M." into gb-ub-photos-bryce * commit '25f3564dcc9d0b52a01bd469f9052c3631703338': Fix image icons on Razr M.
|
d2721995ad39702936de3c43d145ad38c62465cc |
14-Mar-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 6cdae525: Merge "Fix image icons on Razr M." into gb-ub-photos-bryce * commit '6cdae525a4c602860b464823685b7b6ac0298abc': Fix image icons on Razr M.
|
6cdae525a4c602860b464823685b7b6ac0298abc |
14-Mar-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Fix image icons on Razr M." into gb-ub-photos-bryce
|
9a5247eeb3e0f606ed6fe02666b9edfc4a6b3f5f |
14-Mar-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Fix image icons on Razr M." into gb-ub-photos-bryce
|
c5c19110a65e35602c1c99090d713512130ceb1b |
14-Mar-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Fix image icons on Razr M. Change-Id: I9f47dd043055fb5dc25dda643a3e9c81356bd0d5
rc/com/android/gallery3d/filtershow/ui/FilterIconButton.java
rc/com/android/gallery3d/filtershow/ui/IconButton.java
|
7a09fa86ed2b9bd00c8fbf9ec2dc861641b54a6f |
14-Mar-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Fix image icons on Razr M. Change-Id: I9f47dd043055fb5dc25dda643a3e9c81356bd0d5
rc/com/android/gallery3d/filtershow/ui/FilterIconButton.java
rc/com/android/gallery3d/filtershow/ui/IconButton.java
|
7428a933c89e2d49036a1854143d5c28078fec75 |
14-Mar-2013 |
Tim Murray <timmurray@google.com> |
Change element type to A_8 to support sampling. Change-Id: Ib91c924c9c2966bf431e24519af8ade7e360cf88
rc/com/android/gallery3d/filtershow/filters/ImageFilterRS.java
|
2a7d821f5c6c3532f9bdf9bdd83b8853fa6666bc |
14-Mar-2013 |
Tim Murray <timmurray@google.com> |
Change element type to A_8 to support sampling. Change-Id: Ib91c924c9c2966bf431e24519af8ade7e360cf88
rc/com/android/gallery3d/filtershow/filters/ImageFilterRS.java
|
80038b6b724a03dfe96ffc3f082a3f369c96c174 |
14-Mar-2013 |
Mangesh Ghiware <mghiware@google.com> |
am 9bd2b5ae: am e971fb78: am d1672194: am 693a5b7a: Use plurals for table names for consistency. * commit '9bd2b5ae0e26301cf38986a6bdfcab6d585c7659': Use plurals for table names for consistency.
|
ab95da99bcfc75b3c69e186ab0f4c3055b26d0aa |
14-Mar-2013 |
Mangesh Ghiware <mghiware@google.com> |
am e971fb78: am d1672194: am 693a5b7a: Use plurals for table names for consistency. * commit 'e971fb78f11ea2a07eb6c29687db7eaaf3c26197': Use plurals for table names for consistency.
|
21e5207c5059b4a4f3c280ef95b61f25b5468961 |
14-Mar-2013 |
Mangesh Ghiware <mghiware@google.com> |
am d1672194: am 693a5b7a: Use plurals for table names for consistency. * commit 'd16721944074567c8246db99dc198e9f95c5785a': Use plurals for table names for consistency.
|
2a9afd585cd4abae35fba4e0df9e369eb146ef76 |
14-Mar-2013 |
Mangesh Ghiware <mghiware@google.com> |
am 693a5b7a: Use plurals for table names for consistency. * commit '693a5b7a18066d4757d49a44214356a3dd9f61a0': Use plurals for table names for consistency.
|
693a5b7a18066d4757d49a44214356a3dd9f61a0 |
14-Mar-2013 |
Mangesh Ghiware <mghiware@google.com> |
Use plurals for table names for consistency. Change-Id: I663c0085ed467f3f61f6060147374d9128967e2d
rc/com/android/photos/data/PhotoProvider.java
|
11d7e8d1eaad1f0a16e3deaa45e89a6452815e9d |
14-Mar-2013 |
Mangesh Ghiware <mghiware@google.com> |
Use plurals for table names for consistency. Change-Id: I663c0085ed467f3f61f6060147374d9128967e2d
rc/com/android/photos/data/PhotoProvider.java
|
d51e308252a0b68d57833ddd38913e9c462d47e1 |
14-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
am 1a972905: am a093b45e: am 71e9e32d: am 978f4aae: Fix for crash upon saving image * commit '1a9729059c52f387f5aaaed5f0127be7650cd4d4': Fix for crash upon saving image
|
476fcfa3dbd3f936386b64dd2ec65f5a7df9170a |
14-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
am a093b45e: am 71e9e32d: am 978f4aae: Fix for crash upon saving image * commit 'a093b45e21e7c180a67a096bb0753d7f9da58061': Fix for crash upon saving image
|
690039a42ae3bfb65d53273ff9c092aa0fa35638 |
14-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
am 71e9e32d: am 978f4aae: Fix for crash upon saving image * commit '71e9e32dfcc9404305906e3274800d5584597e50': Fix for crash upon saving image
|
f93b2573238c1313976cb00ed1aa21086da88719 |
14-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
am 978f4aae: Fix for crash upon saving image * commit '978f4aae1d2923fd125f85a6d5c568a26c571522': Fix for crash upon saving image
|
2e47253cfb049943199faa43c04f77d0bab0b5ee |
14-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
Fix for crash upon saving image Change-Id: I305626a61a07d2290e7d5600da4c26f2a82ab1c9
allerycommon/src/com/android/gallery3d/exif/ExifOutputStream.java
allerycommon/src/com/android/gallery3d/exif/ExifTag.java
|
978f4aae1d2923fd125f85a6d5c568a26c571522 |
14-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
Fix for crash upon saving image Change-Id: I305626a61a07d2290e7d5600da4c26f2a82ab1c9
allerycommon/src/com/android/gallery3d/exif/ExifOutputStream.java
allerycommon/src/com/android/gallery3d/exif/ExifTag.java
|
1398c04d264d340f136100f0d2af3e675358fb9d |
14-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
Fix for crash upon saving image Change-Id: I305626a61a07d2290e7d5600da4c26f2a82ab1c9
allerycommon/src/com/android/gallery3d/exif/ExifOutputStream.java
allerycommon/src/com/android/gallery3d/exif/ExifTag.java
|
9e299fa8796e8af3a47c4bec5f506f722e68c7b9 |
14-Mar-2013 |
The Android Automerger <android-build@android.com> |
merge in jb-mr2-release history after reset to jb-mr2-dev
|
97943c2cb8389242289dc5a3cb3e5ce590a686f8 |
14-Mar-2013 |
Baligh Uddin <baligh@google.com> |
am f15b00ba: (-s ours) am 85105d94: (-s ours) am 09a5ac0b: am 0dc23631: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce * commit 'f15b00ba875beb1e8565f184ca7e9c4f032c22ef': Import translations. DO NOT MERGE
|
e04dabdc652ef192ebbaed5f24004ce972e1ffa6 |
14-Mar-2013 |
Baligh Uddin <baligh@google.com> |
am 2bb250e5: (-s ours) am 1732cfd5: (-s ours) am d455e893: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev * commit '2bb250e527ce3e5a87588dd0da5fe6d9ded568d9': Import translations. DO NOT MERGE
|
6f3019f2d9a2071b50e5d070d1c6fdeb11fd2151 |
14-Mar-2013 |
Baligh Uddin <baligh@google.com> |
am 85105d94: (-s ours) am 09a5ac0b: am 0dc23631: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce * commit '85105d94fa85363ae59b8b8f40aa4c0b53ec10a6': Import translations. DO NOT MERGE
|
997b2168f6e427b3eef5d59e20e4236d54b1ed40 |
14-Mar-2013 |
Baligh Uddin <baligh@google.com> |
am 1732cfd5: (-s ours) am d455e893: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev * commit '1732cfd57c9594be9c921b31a98cd9ff48007a23': Import translations. DO NOT MERGE
|
c4da8bbeffdaeffe5e8ebdde8fa60ce6b9fa14a3 |
14-Mar-2013 |
Baligh Uddin <baligh@google.com> |
am 09a5ac0b: am 0dc23631: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce * commit '09a5ac0b29770434d91df0edb3cddde768c25a30': Import translations. DO NOT MERGE
|
06d812d5bc03b32ae9fd4b97cc0bfb6185f0f810 |
14-Mar-2013 |
Baligh Uddin <baligh@google.com> |
am d455e893: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev * commit 'd455e89338178277571b147735c0be54e9944c73': Import translations. DO NOT MERGE
|
850379573347256c0f6f974ec7980fa12794b5ac |
14-Mar-2013 |
Baligh Uddin <baligh@google.com> |
am 3811a3af: (-s ours) Merge "Import translations. DO NOT MERGE" * commit '3811a3af5b823f5b16a18075215dec0320b25bde': Import translations. DO NOT MERGE
|
3f8d301d1f3a3ba07f527cc333c3c7df0d9f5bdd |
14-Mar-2013 |
Baligh Uddin <baligh@google.com> |
am 0dc23631: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce * commit '0dc236310352422e27ce5f045d4fc4d27163b08e': Import translations. DO NOT MERGE
|
859ad1a0967d874fde81d2357f82a494f06edb02 |
14-Mar-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into master-security-dev
|
7823ba41d788d311485a6b6d6d4b90038fac92be |
14-Mar-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE"
|
19ffaa0cb33446d539395e3c8eba58c9492da4c0 |
14-Mar-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
|
af145a99f42a41393463349773818a67c3f053b5 |
14-Mar-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
|
0dc236310352422e27ce5f045d4fc4d27163b08e |
14-Mar-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
|
170107f0db0aa5cad73fe5ca637628b6aded9a5d |
14-Mar-2013 |
Nicolas Roard <nicolasroard@google.com> |
am 839f0809: am 8e5b1211: am 866ace1e: am bbf96f27: Merge "Fix photo editor RS allocation on orientation change." into gb-ub-photos-bryce * commit '839f0809aa8ffa39adfbab220cfc99f41707024f': Fix photo editor RS allocation on orientation change.
|
86b13cb9ac978ed5bd04f4ac0f338985e87dd53e |
14-Mar-2013 |
Nicolas Roard <nicolasroard@google.com> |
am 8e5b1211: am 866ace1e: am bbf96f27: Merge "Fix photo editor RS allocation on orientation change." into gb-ub-photos-bryce * commit '8e5b1211e504058811d22ef981be09708bf798ec': Fix photo editor RS allocation on orientation change.
|
e305f6a0a9c40cc7b7cd55724471a0100e671484 |
14-Mar-2013 |
Nicolas Roard <nicolasroard@google.com> |
am 866ace1e: am bbf96f27: Merge "Fix photo editor RS allocation on orientation change." into gb-ub-photos-bryce * commit '866ace1efaa93a55a0f43e98e0c7795d30666fe6': Fix photo editor RS allocation on orientation change.
|
42338f996de2f182d9b0688993f169e2bf53677b |
14-Mar-2013 |
Nicolas Roard <nicolasroard@google.com> |
am bbf96f27: Merge "Fix photo editor RS allocation on orientation change." into gb-ub-photos-bryce * commit 'bbf96f2785c3f3f91d497b18f8b2dd9c0cb2b9b6': Fix photo editor RS allocation on orientation change.
|
4ad8648a2a8892aa1ff4d3107c2e6ecd3af192ab |
14-Mar-2013 |
John Hoford <hoford@google.com> |
am f27056ba: am 27111761: am ab7e3079: am c6a12b24: Merge "add icon to indicate menu" into gb-ub-photos-bryce * commit 'f27056ba7ea7c2b094c75c46fe6c3ec3826abb71': add icon to indicate menu
|
278fb4714d77bc0f9fe64a774b3a59561d51ad68 |
14-Mar-2013 |
Nicolas Roard <nicolasroard@google.com> |
Merge "Fix photo editor RS allocation on orientation change." into gb-ub-photos-bryce
|
bbf96f2785c3f3f91d497b18f8b2dd9c0cb2b9b6 |
14-Mar-2013 |
Nicolas Roard <nicolasroard@google.com> |
Merge "Fix photo editor RS allocation on orientation change." into gb-ub-photos-bryce
|
9c9511fef70908fc9960980e885eabce81d2fa6d |
14-Mar-2013 |
John Hoford <hoford@google.com> |
am 27111761: am ab7e3079: am c6a12b24: Merge "add icon to indicate menu" into gb-ub-photos-bryce * commit '27111761c5137d2641043648d395cca52e9e8363': add icon to indicate menu
|
4e30ec111db6e840ad2f4fcead7dfbbfd4047a94 |
14-Mar-2013 |
John Hoford <hoford@google.com> |
am ab7e3079: am c6a12b24: Merge "add icon to indicate menu" into gb-ub-photos-bryce * commit 'ab7e3079a43c8a9652a1e45fb60f3561da166b66': add icon to indicate menu
|
86b88e9518658b7bcf3b83c292d11e61087be43b |
14-Mar-2013 |
John Hoford <hoford@google.com> |
am c6a12b24: Merge "add icon to indicate menu" into gb-ub-photos-bryce * commit 'c6a12b24b4662ba9fa7cc8c7d072ecb0a8f79e46': add icon to indicate menu
|
c6a12b24b4662ba9fa7cc8c7d072ecb0a8f79e46 |
14-Mar-2013 |
John Hoford <hoford@google.com> |
Merge "add icon to indicate menu" into gb-ub-photos-bryce
|
86bbd806aa85f038daa2ff47ae87ea8ff044726f |
14-Mar-2013 |
John Hoford <hoford@google.com> |
add icon to indicate menu Change-Id: I3327751cd78dd9b654e51e99a6756967c6fb82f5
es/drawable/filtershow_menu_marker.png
es/layout/filtershow_editor_panel.xml
|
9f26185bff28731e37d162a0ec59060b3ec0220a |
14-Mar-2013 |
John Hoford <hoford@google.com> |
add icon to indicate menu Change-Id: I3327751cd78dd9b654e51e99a6756967c6fb82f5
es/drawable/filtershow_menu_marker.png
es/layout/filtershow_editor_panel.xml
|
d668cf731d1cfd7ba6b9b851ebaea9ba4161321c |
14-Mar-2013 |
Doris Liu <tianliu@google.com> |
am 247b3809: am a5ad5adb: am c9e6ee84: am 5bedc41e: Merge "Use Model-View-Controller pattern on video module" into gb-ub-photos-bryce * commit '247b3809b38363e5a56876b740a27ed64663aa51': Use Model-View-Controller pattern on video module
|
69ae4e42b83aefa0db668c0ca790a0032057ecae |
14-Mar-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 246303d2: am f1d8fa40: am 9083a098: am 6e6a5243: Exif parser modifications. * commit '246303d24b4e3d123916d44e1bbf7937c39c4d2b': Exif parser modifications.
|
9367d84e977bc43c20738c03a0f91d7ff2cb4508 |
14-Mar-2013 |
Bobby Georgescu <georgescu@google.com> |
am 70996861: am 8c12fb08: am 3755eda0: am 8cc88f03: Merge "size tweak" into gb-ub-photos-bryce * commit '709968610c291821c7f162c5bf99bab9dfc97105': size tweak
|
f10d9a0ce669676072fe9211640053ce13b9a6f3 |
14-Mar-2013 |
Angus Kong <shkong@google.com> |
am ea658853: am 097e31b5: am ff24f384: am 215bb750: Merge "Horizontal scrollable filmstrip view." into gb-ub-photos-bryce * commit 'ea658853c49d3d989a5186121392f7b44f43c55e': Horizontal scrollable filmstrip view.
|
1ce2305cfb0d5a679925d2a6b8f8bb26e8f66160 |
14-Mar-2013 |
Bobby Georgescu <georgescu@google.com> |
am 1858a0ba: am f2a41fc0: am bd1f0121: am f069751e: Merge "Sharing support for albums, bulk operations infrastructure" into gb-ub-photos-bryce * commit '1858a0ba8b6a4728768d4a4942ee9a1a4ebce86b': Sharing support for albums, bulk operations infrastructure
|
238ec714a108adbfae3e96856e70263e12b5cc3c |
14-Mar-2013 |
Bobby Georgescu <georgescu@google.com> |
am bf2799fe: am 737cf7c6: am bb0ce1c2: am 730685b2: Merge "Add coarse grained events for camera mode, filmstrip stats" into gb-ub-photos-bryce * commit 'bf2799fe893a57994462020042a55acafbb608a1': Add coarse grained events for camera mode, filmstrip stats
|
321603d761bcf0e6c56f1fd55115a6386fab7fb4 |
14-Mar-2013 |
Michael Kolb <kolby@google.com> |
am b3ed2d66: am 9e8d7539: am 3b1c48ee: am d52594cf: Merge "Fix bug in exposure setting" into gb-ub-photos-bryce * commit 'b3ed2d664e9226994fea766342637c2606e9da8e': Fix bug in exposure setting
|
a5bf0479cad1a7dd9c1a9ec73c08d27462416bce |
14-Mar-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 225ecd83: am 75b6a0b7: am 70f9e167: am 4563676b: Merge "Added locking for FilteringPipeline and ImageFilterRS. Gets rid of leaked threads." into gb-ub-photos-bryce * commit '225ecd832da9d8ebe4fdc05c3e22586c36d7ec76': Added locking for FilteringPipeline and ImageFilterRS. Gets rid of leaked threads.
|
a22d677c880567306082b7426e0beb7489d48585 |
14-Mar-2013 |
Michael Kolb <kolby@google.com> |
am c8fae92c: am e128208b: am cb029f20: am d15e43fb: Merge "Fix Monkey NPE" into gb-ub-photos-bryce * commit 'c8fae92c821d8ffb212a9d39cac1435c60799f04': Fix Monkey NPE
|
80c84ebfbdfe139183558b60855705e1e6a819e0 |
14-Mar-2013 |
Bobby Georgescu <georgescu@google.com> |
am 7dff559d: am 6157620b: am f62d137e: am f37648b8: Usage statistics collection for camera module, filmstrip * commit '7dff559d1734cb10b221c828ba2b610c340b3cf6': Usage statistics collection for camera module, filmstrip
|
eb8ffe4b5f1c69ec037b5c2aecd97cb9bd20afbb |
14-Mar-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Fix photo editor RS allocation on orientation change. Bug: 8383050 Change-Id: Ic549d1f3fae22238dda08260cd7410c6054ce7b1
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
|
8809afdff9cb717023652ce221e1eb2da3a646dd |
14-Mar-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Fix photo editor RS allocation on orientation change. Bug: 8383050 Change-Id: Ic549d1f3fae22238dda08260cd7410c6054ce7b1
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
|
df980e8a0c9ab98c481cac7cf73903c920475704 |
14-Mar-2013 |
Doris Liu <tianliu@google.com> |
am a5ad5adb: am c9e6ee84: am 5bedc41e: Merge "Use Model-View-Controller pattern on video module" into gb-ub-photos-bryce * commit 'a5ad5adbf575dc98bd61f2ff68756c428d1495d9': Use Model-View-Controller pattern on video module
|
0223887ca679f29da806adc85a8884ced14f6679 |
14-Mar-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am f1d8fa40: am 9083a098: am 6e6a5243: Exif parser modifications. * commit 'f1d8fa403297c2e21b8e81d56fed2a33ced4cfd9': Exif parser modifications.
|
2de2eaa404970c090afee78176ceafca63e74c37 |
14-Mar-2013 |
Bobby Georgescu <georgescu@google.com> |
am 8c12fb08: am 3755eda0: am 8cc88f03: Merge "size tweak" into gb-ub-photos-bryce * commit '8c12fb08c0c2eb47c237dddd86b37633832816c1': size tweak
|
83cd371331254ebfa6ffdbfebad02feabbc13a5f |
14-Mar-2013 |
Angus Kong <shkong@google.com> |
am 097e31b5: am ff24f384: am 215bb750: Merge "Horizontal scrollable filmstrip view." into gb-ub-photos-bryce * commit '097e31b5eaa295c02372c2e479d8fee0c02042b9': Horizontal scrollable filmstrip view.
|
2a6dd118b5f000296ef555c71749829323b4738f |
14-Mar-2013 |
Bobby Georgescu <georgescu@google.com> |
am f2a41fc0: am bd1f0121: am f069751e: Merge "Sharing support for albums, bulk operations infrastructure" into gb-ub-photos-bryce * commit 'f2a41fc05bd0f6c3b5639236fe918a1ffe934c82': Sharing support for albums, bulk operations infrastructure
|
ff2cbf4eb1fcd20aec2c88dfd9bc2d326201be0f |
14-Mar-2013 |
Bobby Georgescu <georgescu@google.com> |
am 737cf7c6: am bb0ce1c2: am 730685b2: Merge "Add coarse grained events for camera mode, filmstrip stats" into gb-ub-photos-bryce * commit '737cf7c68f3b6431722390b3480dfe76b313e1ee': Add coarse grained events for camera mode, filmstrip stats
|
a305ca4a6a674f81749f3691d1918e7448fcdb9c |
14-Mar-2013 |
Michael Kolb <kolby@google.com> |
am 9e8d7539: am 3b1c48ee: am d52594cf: Merge "Fix bug in exposure setting" into gb-ub-photos-bryce * commit '9e8d7539e754f28b1934007431d8b3f34e9cb5fa': Fix bug in exposure setting
|
29db550fd9774e3586ae0f295aed2b4fad72ea37 |
14-Mar-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 75b6a0b7: am 70f9e167: am 4563676b: Merge "Added locking for FilteringPipeline and ImageFilterRS. Gets rid of leaked threads." into gb-ub-photos-bryce * commit '75b6a0b727911e3aa9c642629ffaea96b805405f': Added locking for FilteringPipeline and ImageFilterRS. Gets rid of leaked threads.
|
fc8dab48ec4d0d42a6b07ca37e3fe51483ae55e8 |
14-Mar-2013 |
Michael Kolb <kolby@google.com> |
am e128208b: am cb029f20: am d15e43fb: Merge "Fix Monkey NPE" into gb-ub-photos-bryce * commit 'e128208b4705a81d10281dd4a2f637aca6cc642e': Fix Monkey NPE
|
3561632f3a993d9ce512257a7f697f5108a13dc2 |
14-Mar-2013 |
Bobby Georgescu <georgescu@google.com> |
am 6157620b: am f62d137e: am f37648b8: Usage statistics collection for camera module, filmstrip * commit '6157620bf3e24d5db0eb8bd102611bbaae72242c': Usage statistics collection for camera module, filmstrip
|
cc3d31d7dd2be14622caf407ec6a37700c6ed5f5 |
14-Mar-2013 |
Doris Liu <tianliu@google.com> |
am c9e6ee84: am 5bedc41e: Merge "Use Model-View-Controller pattern on video module" into gb-ub-photos-bryce * commit 'c9e6ee84502f710228e84a1f27f5e4f4db68cb2e': Use Model-View-Controller pattern on video module
|
af09ef461e406310197bab09b0f85bc3635e8e7b |
14-Mar-2013 |
Doris Liu <tianliu@google.com> |
am 5bedc41e: Merge "Use Model-View-Controller pattern on video module" into gb-ub-photos-bryce * commit '5bedc41eb4bf30fe277de3977db8331f970c8f0b': Use Model-View-Controller pattern on video module
|
cd5c7040e91e0bdb3b966642d91b6de290fd1035 |
14-Mar-2013 |
Doris Liu <tianliu@google.com> |
Merge "Use Model-View-Controller pattern on video module" into gb-ub-photos-bryce
|
5bedc41eb4bf30fe277de3977db8331f970c8f0b |
14-Mar-2013 |
Doris Liu <tianliu@google.com> |
Merge "Use Model-View-Controller pattern on video module" into gb-ub-photos-bryce
|
f5c4ed490e383133cf3ab6d758d4d47ca703579f |
14-Mar-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 9083a098: am 6e6a5243: Exif parser modifications. * commit '9083a098c0367ad040eb7a1cc81057fd68fcc595': Exif parser modifications.
|
7cb4f277dcffd8d081bedd014acf9642d42eecdd |
14-Mar-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 6e6a5243: Exif parser modifications. * commit '6e6a524390d8ddebce5de0dcc8ae258e652ec80a': Exif parser modifications.
|
64cf19a431c4bfe20260cb36356e1f76b7e820e0 |
12-Mar-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Exif parser modifications. Bug: 8018327 Change-Id: I66a2ec309f9807ac255bbf29d8f5f26de60e89b8
roguard.flags
|
c274ded801f745d6318186958107622e7a4fef33 |
12-Mar-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Exif parser modifications. Bug: 8018327 Change-Id: I66a2ec309f9807ac255bbf29d8f5f26de60e89b8
allerycommon/src/com/android/gallery3d/exif/ExifData.java
allerycommon/src/com/android/gallery3d/exif/ExifInterface.java
allerycommon/src/com/android/gallery3d/exif/ExifModifier.java
allerycommon/src/com/android/gallery3d/exif/ExifOutputStream.java
allerycommon/src/com/android/gallery3d/exif/ExifParser.java
allerycommon/src/com/android/gallery3d/exif/ExifReader.java
allerycommon/src/com/android/gallery3d/exif/ExifTag.java
allerycommon/src/com/android/gallery3d/exif/IfdData.java
allerycommon/src/com/android/gallery3d/exif/IfdId.java
allerycommon/src/com/android/gallery3d/exif/OrderedDataOutputStream.java
allerycommon/src/com/android/gallery3d/exif/Rational.java
|
29fd4aa661f7e626a1d11558f09e8f7c011efcc2 |
12-Mar-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Exif parser modifications. Bug: 8018327 Change-Id: I66a2ec309f9807ac255bbf29d8f5f26de60e89b8
allerycommon/src/com/android/gallery3d/exif/ExifData.java
allerycommon/src/com/android/gallery3d/exif/ExifInterface.java
allerycommon/src/com/android/gallery3d/exif/ExifModifier.java
allerycommon/src/com/android/gallery3d/exif/ExifOutputStream.java
allerycommon/src/com/android/gallery3d/exif/ExifParser.java
allerycommon/src/com/android/gallery3d/exif/ExifReader.java
allerycommon/src/com/android/gallery3d/exif/ExifTag.java
allerycommon/src/com/android/gallery3d/exif/IfdData.java
allerycommon/src/com/android/gallery3d/exif/IfdId.java
allerycommon/src/com/android/gallery3d/exif/OrderedDataOutputStream.java
allerycommon/src/com/android/gallery3d/exif/Rational.java
rc/com/android/camera/Exif.java
rc/com/android/camera/PanoramaModule.java
rc/com/android/gallery3d/data/Exif.java
rc/com/android/gallery3d/data/LocalImage.java
rc/com/android/gallery3d/data/MediaDetails.java
rc/com/android/gallery3d/filtershow/cache/ImageLoader.java
rc/com/android/gallery3d/filtershow/tools/SaveCopyTask.java
rc_pd/com/android/gallery3d/picasasource/PicasaSource.java
ests/src/com/android/gallery3d/exif/ExifDataTest.java
ests/src/com/android/gallery3d/exif/ExifInterfaceTest.java
ests/src/com/android/gallery3d/exif/ExifModifierTest.java
ests/src/com/android/gallery3d/exif/ExifOutputStreamTest.java
ests/src/com/android/gallery3d/exif/ExifParserTest.java
ests/src/com/android/gallery3d/exif/ExifReaderTest.java
ests/src/com/android/gallery3d/exif/ExifTagTest.java
ests/src/com/android/gallery3d/exif/ExifTestRunner.java
ests/src/com/android/gallery3d/exif/ExifXmlDataTestCase.java
ests/src/com/android/gallery3d/exif/ExifXmlReader.java
ests/src/com/android/gallery3d/exif/Util.java
|
6e6a524390d8ddebce5de0dcc8ae258e652ec80a |
12-Mar-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Exif parser modifications. Bug: 8018327 Change-Id: I66a2ec309f9807ac255bbf29d8f5f26de60e89b8
allerycommon/src/com/android/gallery3d/exif/ExifData.java
allerycommon/src/com/android/gallery3d/exif/ExifInterface.java
allerycommon/src/com/android/gallery3d/exif/ExifModifier.java
allerycommon/src/com/android/gallery3d/exif/ExifOutputStream.java
allerycommon/src/com/android/gallery3d/exif/ExifParser.java
allerycommon/src/com/android/gallery3d/exif/ExifReader.java
allerycommon/src/com/android/gallery3d/exif/ExifTag.java
allerycommon/src/com/android/gallery3d/exif/IfdData.java
allerycommon/src/com/android/gallery3d/exif/IfdId.java
allerycommon/src/com/android/gallery3d/exif/OrderedDataOutputStream.java
allerycommon/src/com/android/gallery3d/exif/Rational.java
roguard.flags
rc/com/android/camera/Exif.java
rc/com/android/camera/PanoramaModule.java
rc/com/android/gallery3d/data/Exif.java
rc/com/android/gallery3d/data/LocalImage.java
rc/com/android/gallery3d/data/MediaDetails.java
rc/com/android/gallery3d/filtershow/cache/ImageLoader.java
rc/com/android/gallery3d/filtershow/tools/SaveCopyTask.java
rc_pd/com/android/gallery3d/picasasource/PicasaSource.java
ests/src/com/android/gallery3d/exif/ExifDataTest.java
ests/src/com/android/gallery3d/exif/ExifInterfaceTest.java
ests/src/com/android/gallery3d/exif/ExifModifierTest.java
ests/src/com/android/gallery3d/exif/ExifOutputStreamTest.java
ests/src/com/android/gallery3d/exif/ExifParserTest.java
ests/src/com/android/gallery3d/exif/ExifReaderTest.java
ests/src/com/android/gallery3d/exif/ExifTagTest.java
ests/src/com/android/gallery3d/exif/ExifTestRunner.java
ests/src/com/android/gallery3d/exif/ExifXmlDataTestCase.java
ests/src/com/android/gallery3d/exif/ExifXmlReader.java
ests/src/com/android/gallery3d/exif/Util.java
|
6827ce281bd3a83ca2ffa552cd090e2b427c5f83 |
13-Mar-2013 |
Doris Liu <tianliu@google.com> |
Use Model-View-Controller pattern on video module Change-Id: Id673efd1da9f53d4f74aab880504850152d1edfa
rc/com/android/camera/VideoController.java
rc/com/android/camera/VideoMenu.java
rc/com/android/camera/VideoModule.java
rc/com/android/camera/VideoUI.java
|
ea784b705602cdc424bab9b310ba21fdd95919eb |
13-Mar-2013 |
Doris Liu <tianliu@google.com> |
Use Model-View-Controller pattern on video module Change-Id: Id673efd1da9f53d4f74aab880504850152d1edfa
rc/com/android/camera/VideoController.java
rc/com/android/camera/VideoMenu.java
rc/com/android/camera/VideoModule.java
rc/com/android/camera/VideoUI.java
|
a93d14f58e3fd102bbf57a681649c2bc7ffb0d7a |
13-Mar-2013 |
Michael Kolb <kolby@google.com> |
am d15e43fb: Merge "Fix Monkey NPE" into gb-ub-photos-bryce * commit 'd15e43fb5295ae0cf6af45663043d603e2e181ba': Fix Monkey NPE
rc/com/android/camera/PhotoUI.java
|
616ef289f3d60266ee2d1a7a2df3105f97788300 |
13-Mar-2013 |
Bobby Georgescu <georgescu@google.com> |
am 3755eda0: am 8cc88f03: Merge "size tweak" into gb-ub-photos-bryce * commit '3755eda093fd1a095cfe6c728ef02e36100639c5': size tweak
|
00d701e96d4bf6c9849e6975f54bdfb6588fd382 |
13-Mar-2013 |
Bobby Georgescu <georgescu@google.com> |
am 8cc88f03: Merge "size tweak" into gb-ub-photos-bryce * commit '8cc88f0320a4b62f8256fb33faebf0f75cf172e0': size tweak
|
bbb52f0ed9cab8db937270ef952a1fc77a2a5374 |
13-Mar-2013 |
Bobby Georgescu <georgescu@google.com> |
Merge "size tweak" into gb-ub-photos-bryce
|
8cc88f0320a4b62f8256fb33faebf0f75cf172e0 |
13-Mar-2013 |
Bobby Georgescu <georgescu@google.com> |
Merge "size tweak" into gb-ub-photos-bryce
|
53014a32e83160b4b9caf60f24ad5a2c9da8b31c |
13-Mar-2013 |
John Reck <jreck@google.com> |
size tweak Change-Id: I2153774ef05f67b313f86c4552ccd0471fae1f6e
es/values/dimensions.xml
|
1c3fefd4c3d1de34e1b04b9c19e83f34818696e8 |
13-Mar-2013 |
John Reck <jreck@google.com> |
size tweak Change-Id: I2153774ef05f67b313f86c4552ccd0471fae1f6e
es/values/dimensions.xml
|
67df2ac34091c2d9a443527ba7b05269a83ffcea |
13-Mar-2013 |
Angus Kong <shkong@google.com> |
am ff24f384: am 215bb750: Merge "Horizontal scrollable filmstrip view." into gb-ub-photos-bryce * commit 'ff24f3841b6a9f75b27c23add1cebfbc88ce57a3': Horizontal scrollable filmstrip view.
|
fe1932fae0ebcad6207ebc6d045e97431c19edbe |
13-Mar-2013 |
Angus Kong <shkong@google.com> |
am 215bb750: Merge "Horizontal scrollable filmstrip view." into gb-ub-photos-bryce * commit '215bb750dcb21e449227acb3cdf76da3cb6173a2': Horizontal scrollable filmstrip view.
|
acca4ee0fefe6442b853510b6b360f6cb7ad1bc5 |
13-Mar-2013 |
Angus Kong <shkong@google.com> |
Merge "Horizontal scrollable filmstrip view." into gb-ub-photos-bryce
|
215bb750dcb21e449227acb3cdf76da3cb6173a2 |
13-Mar-2013 |
Angus Kong <shkong@google.com> |
Merge "Horizontal scrollable filmstrip view." into gb-ub-photos-bryce
|
231dbbc2938cad114dcb7d214718a4f394ac0a0e |
13-Mar-2013 |
Bobby Georgescu <georgescu@google.com> |
am bd1f0121: am f069751e: Merge "Sharing support for albums, bulk operations infrastructure" into gb-ub-photos-bryce * commit 'bd1f0121ccb9430d6a2d6dee64ca8c322dd8a710': Sharing support for albums, bulk operations infrastructure
|
fbccb2cb0d4e00934fd48516188aca5ef6e11c4f |
13-Mar-2013 |
Bobby Georgescu <georgescu@google.com> |
am f069751e: Merge "Sharing support for albums, bulk operations infrastructure" into gb-ub-photos-bryce * commit 'f069751e1adcb85ce14934b7a275f1276f5490a8': Sharing support for albums, bulk operations infrastructure
|
7e57c641c1a53ce20b2194e2375e63412d6d14d0 |
13-Mar-2013 |
Bobby Georgescu <georgescu@google.com> |
Merge "Sharing support for albums, bulk operations infrastructure" into gb-ub-photos-bryce
|
f069751e1adcb85ce14934b7a275f1276f5490a8 |
13-Mar-2013 |
Bobby Georgescu <georgescu@google.com> |
Merge "Sharing support for albums, bulk operations infrastructure" into gb-ub-photos-bryce
|
6616551e7d9bf78a6b630893602e63379e81ef2b |
22-Feb-2013 |
Angus Kong <shkong@google.com> |
Horizontal scrollable filmstrip view. Change-Id: I076a07cd9a949ecdc8e4499b171b64e7becdbef2
rc/com/android/camera/data/CameraDataAdapter.java
rc/com/android/camera/ui/FilmStripView.java
|
a60926e11b0488c9ed58d60cc4384a831f3f0e0e |
22-Feb-2013 |
Angus Kong <shkong@google.com> |
Horizontal scrollable filmstrip view. Change-Id: I076a07cd9a949ecdc8e4499b171b64e7becdbef2
rc/com/android/camera/data/CameraDataAdapter.java
rc/com/android/camera/ui/FilmStripView.java
|
ece1ae4bcdc51e8b222413a503f5ec70aa003ba3 |
13-Mar-2013 |
Bobby Georgescu <georgescu@google.com> |
am bb0ce1c2: am 730685b2: Merge "Add coarse grained events for camera mode, filmstrip stats" into gb-ub-photos-bryce * commit 'bb0ce1c2e6642e7289dc80ff495d4993787dc486': Add coarse grained events for camera mode, filmstrip stats
|
7694a9d1bf644d882c19e5c392809ad496b21f88 |
13-Mar-2013 |
Bobby Georgescu <georgescu@google.com> |
am 730685b2: Merge "Add coarse grained events for camera mode, filmstrip stats" into gb-ub-photos-bryce * commit '730685b2b4c286d32d97f92283d12254df284f0c': Add coarse grained events for camera mode, filmstrip stats
|
e0ebb91d3b5a740f04ec0d1339bd21a769e1a5c6 |
13-Mar-2013 |
Bobby Georgescu <georgescu@google.com> |
Merge "Add coarse grained events for camera mode, filmstrip stats" into gb-ub-photos-bryce
|
730685b2b4c286d32d97f92283d12254df284f0c |
13-Mar-2013 |
Bobby Georgescu <georgescu@google.com> |
Merge "Add coarse grained events for camera mode, filmstrip stats" into gb-ub-photos-bryce
|
1056af8a1f272236c658add1ba5196c53a04576b |
09-Mar-2013 |
Bobby Georgescu <georgescu@google.com> |
Sharing support for albums, bulk operations infrastructure Change-Id: I590f60ab85ffbd9cf9d7cd9982627604fa1b427f
es/menu/gallery_multiselect.xml
|
e2bc54a09412790da5ac7d19c52b964e49e14c25 |
09-Mar-2013 |
Bobby Georgescu <georgescu@google.com> |
Sharing support for albums, bulk operations infrastructure Change-Id: I590f60ab85ffbd9cf9d7cd9982627604fa1b427f
rc/com/android/photos/AlbumSetFragment.java
rc/com/android/photos/GalleryActivity.java
rc/com/android/photos/MultiChoiceManager.java
rc/com/android/photos/PhotoSetFragment.java
rc/com/android/photos/SelectionManager.java
rc/com/android/photos/adapters/AlbumSetCursorAdapter.java
rc/com/android/photos/data/AlbumSetLoader.java
rc/com/android/photos/data/PhotoSetLoader.java
rc/com/android/photos/shims/LoaderCompatShim.java
rc/com/android/photos/shims/MediaItemsLoader.java
rc/com/android/photos/shims/MediaSetLoader.java
|
869f4a62594c4508aa57a8622b461b6825b74e7c |
09-Mar-2013 |
Bobby Georgescu <georgescu@google.com> |
Sharing support for albums, bulk operations infrastructure Change-Id: I590f60ab85ffbd9cf9d7cd9982627604fa1b427f
es/menu/gallery_multiselect.xml
rc/com/android/photos/AlbumSetFragment.java
rc/com/android/photos/GalleryActivity.java
rc/com/android/photos/MultiChoiceManager.java
rc/com/android/photos/PhotoSetFragment.java
rc/com/android/photos/SelectionManager.java
rc/com/android/photos/adapters/AlbumSetCursorAdapter.java
rc/com/android/photos/data/AlbumSetLoader.java
rc/com/android/photos/data/PhotoSetLoader.java
rc/com/android/photos/shims/LoaderCompatShim.java
rc/com/android/photos/shims/MediaItemsLoader.java
rc/com/android/photos/shims/MediaSetLoader.java
|
214b933f3a0a62f9edbdad11963442c36aa75158 |
13-Mar-2013 |
Michael Kolb <kolby@google.com> |
am 3b1c48ee: am d52594cf: Merge "Fix bug in exposure setting" into gb-ub-photos-bryce * commit '3b1c48ee7f0f06fcebcb39fccffc322e1a386e80': Fix bug in exposure setting
|
8483d6dc5236f24bf69a9aa109f39b3114e08054 |
13-Mar-2013 |
Michael Kolb <kolby@google.com> |
am d52594cf: Merge "Fix bug in exposure setting" into gb-ub-photos-bryce * commit 'd52594cf7993e156491a806ade65b6f85e639b20': Fix bug in exposure setting
|
fa0cef25eee1d1d4fb252dd191e85b561dc209d4 |
13-Mar-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 70f9e167: am 4563676b: Merge "Added locking for FilteringPipeline and ImageFilterRS. Gets rid of leaked threads." into gb-ub-photos-bryce * commit '70f9e167c7cda54dfa1e47ff263b37ef68975f36': Added locking for FilteringPipeline and ImageFilterRS. Gets rid of leaked threads.
|
a27f45a5c142ec752f68ba752542972476dae8eb |
13-Mar-2013 |
Michael Kolb <kolby@google.com> |
Merge "Fix bug in exposure setting" into gb-ub-photos-bryce
|
d52594cf7993e156491a806ade65b6f85e639b20 |
13-Mar-2013 |
Michael Kolb <kolby@google.com> |
Merge "Fix bug in exposure setting" into gb-ub-photos-bryce
|
b9f7d505c1339a540d1764c4051c8b06deeeac05 |
13-Mar-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 4563676b: Merge "Added locking for FilteringPipeline and ImageFilterRS. Gets rid of leaked threads." into gb-ub-photos-bryce * commit '4563676bbf9d32a3dce180123bca7adc6940809e': Added locking for FilteringPipeline and ImageFilterRS. Gets rid of leaked threads.
|
a335561b5d8e7237c725b3611742a8b11da7b897 |
13-Mar-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Added locking for FilteringPipeline and ImageFilterRS. Gets rid of leaked threads." into gb-ub-photos-bryce
|
4563676bbf9d32a3dce180123bca7adc6940809e |
13-Mar-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Added locking for FilteringPipeline and ImageFilterRS. Gets rid of leaked threads." into gb-ub-photos-bryce
|
963fffa259a557f3de917809ada0b6d54ee78066 |
13-Mar-2013 |
Michael Kolb <kolby@google.com> |
Fix bug in exposure setting Bug: 8314498 Limit exposure compensation to -3 to 3; some devices offer -4 to 4, and we don't have icons covering that range Change-Id: I2b334733c7630d57682b905d41dfe2ceb5641133
rc/com/android/camera/CameraSettings.java
|
40abb46e3b7f9d3ec0a354fa38e1150752656e33 |
13-Mar-2013 |
Michael Kolb <kolby@google.com> |
Fix bug in exposure setting Bug: 8314498 Limit exposure compensation to -3 to 3; some devices offer -4 to 4, and we don't have icons covering that range Change-Id: I2b334733c7630d57682b905d41dfe2ceb5641133
rc/com/android/camera/CameraSettings.java
|
2d0c9a59d3d742b9b42a133b29a6cfb9e3936ff7 |
13-Mar-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Added locking for FilteringPipeline and ImageFilterRS. Gets rid of leaked threads. Bug: 8373600 Bug: 8363001 Bug: 8344345 Bug: 8264659 This CL fixes several things: - FilteringPipeline no longer leaks a handler thread every time photoeditor is reopened. - ImageFilterRS no longer leaks an RS context and thread every time photoeditor is reopened. - ImageFilterRS now uses locking. - ImageFilterRS no longer leaks Bitmap references or static renderscript allocations. Change-Id: I79ebde1a8ba8ad689791c2af8db0c3c907e06399
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/cache/FilteringPipeline.java
rc/com/android/gallery3d/filtershow/filters/BaseFiltersManager.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterRS.java
|
575ce6f72fd87a62af1686edb3f17c0041031b86 |
13-Mar-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Added locking for FilteringPipeline and ImageFilterRS. Gets rid of leaked threads. Bug: 8373600 Bug: 8363001 Bug: 8344345 Bug: 8264659 This CL fixes several things: - FilteringPipeline no longer leaks a handler thread every time photoeditor is reopened. - ImageFilterRS no longer leaks an RS context and thread every time photoeditor is reopened. - ImageFilterRS now uses locking. - ImageFilterRS no longer leaks Bitmap references or static renderscript allocations. Change-Id: I79ebde1a8ba8ad689791c2af8db0c3c907e06399
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/cache/FilteringPipeline.java
rc/com/android/gallery3d/filtershow/filters/BaseFiltersManager.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterRS.java
|
f4e9e17ee02b9812e12887168c55b37d881f4de7 |
13-Mar-2013 |
Michael Kolb <kolby@google.com> |
am cb029f20: am d15e43fb: Merge "Fix Monkey NPE" into gb-ub-photos-bryce * commit 'cb029f209225f8927ea150ff7a2b64855e936ddf': Fix Monkey NPE
|
8f9f4d3e9bce9421a8f2471785b46691ce825652 |
13-Mar-2013 |
Michael Kolb <kolby@google.com> |
am d15e43fb: Merge "Fix Monkey NPE" into gb-ub-photos-bryce * commit 'd15e43fb5295ae0cf6af45663043d603e2e181ba': Fix Monkey NPE
|
9bdae6d02381d1efeea91401be1d08d01ac30d7d |
13-Mar-2013 |
Michael Kolb <kolby@google.com> |
Merge "Fix Monkey NPE" into gb-ub-photos-bryce
|
d15e43fb5295ae0cf6af45663043d603e2e181ba |
13-Mar-2013 |
Michael Kolb <kolby@google.com> |
Merge "Fix Monkey NPE" into gb-ub-photos-bryce
|
2441ada50f4bfa3a6c59472ebd3b6339778b8b6b |
13-Mar-2013 |
Michael Kolb <kolby@google.com> |
Fix Monkey NPE Bug: 8377895 Change-Id: Iaa89330e8c69961d700e0aab91d7855d579874f0
rc/com/android/camera/PhotoUI.java
|
1092d2719c55d3ad12d557ac003040a87e6e7ffc |
13-Mar-2013 |
Michael Kolb <kolby@google.com> |
Fix Monkey NPE Bug: 8377895 Change-Id: Iaa89330e8c69961d700e0aab91d7855d579874f0
rc/com/android/camera/PhotoUI.java
|
03fc4e9aa172e091134d9dec8f51087cb6581c0d |
13-Mar-2013 |
Bobby Georgescu <georgescu@google.com> |
Add coarse grained events for camera mode, filmstrip stats Change-Id: I9c48f1646e9dff44efd27180065a6435110c5d16
rc/com/android/camera/ui/CameraSwitcher.java
rc/com/android/gallery3d/app/PhotoPage.java
|
9b4c3e9fa3f921e40f4abc549983fd35fb0a0a85 |
13-Mar-2013 |
Bobby Georgescu <georgescu@google.com> |
Add coarse grained events for camera mode, filmstrip stats Change-Id: I9c48f1646e9dff44efd27180065a6435110c5d16
rc/com/android/camera/ui/CameraSwitcher.java
rc/com/android/gallery3d/app/PhotoPage.java
|
6cdc5d34443800105b6219024bbfc8b171a5fd93 |
13-Mar-2013 |
Bobby Georgescu <georgescu@google.com> |
am f62d137e: am f37648b8: Usage statistics collection for camera module, filmstrip * commit 'f62d137ede8ede46bd19ecec3d32bd733673982c': Usage statistics collection for camera module, filmstrip
|
995b68fe7809a282839ab60a7525b9ba43639139 |
13-Mar-2013 |
Bobby Georgescu <georgescu@google.com> |
am f37648b8: Usage statistics collection for camera module, filmstrip * commit 'f37648b877bf6029d7afead31e965b473114c89c': Usage statistics collection for camera module, filmstrip
|
4e3c6f33c6b112f0e5cd008aa0010a8481a53600 |
13-Mar-2013 |
The Android Automerger <android-build@android.com> |
merge in jb-mr2-release history after reset to jb-mr2-dev
|
0a7dd573732a06879b35cdd07a8c0ee08b62a32e |
13-Mar-2013 |
Bobby Georgescu <georgescu@google.com> |
Usage statistics collection for camera module, filmstrip Change-Id: Ib3e7dfb8948e99541f6d492c7d7bd4bfbad1e53d
rc/com/android/camera/PanoramaModule.java
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/VideoModule.java
rc/com/android/camera/ui/CameraSwitcher.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/app/StateManager.java
rc/com/android/gallery3d/ui/PhotoView.java
|
f37648b877bf6029d7afead31e965b473114c89c |
13-Mar-2013 |
Bobby Georgescu <georgescu@google.com> |
Usage statistics collection for camera module, filmstrip Change-Id: Ib3e7dfb8948e99541f6d492c7d7bd4bfbad1e53d
rc/com/android/camera/PanoramaModule.java
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/VideoModule.java
rc/com/android/camera/ui/CameraSwitcher.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/app/StateManager.java
rc/com/android/gallery3d/ui/PhotoView.java
|
fd2c168634e1f15d3d2533d126751890e97eb268 |
13-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
am 9f4b4b4d: am 1e2f3686: am 6067d17e: am e5e61f88: Merge "Fix preview synchronization" into gb-ub-photos-bryce * commit '9f4b4b4d1507ef8a64911acb5bab9c70f9f990d0': Fix preview synchronization
|
2c009121d9f6633f5f98dc958df32c8e11b1fdc1 |
13-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
am 1e2f3686: am 6067d17e: am e5e61f88: Merge "Fix preview synchronization" into gb-ub-photos-bryce * commit '1e2f368694fc6fb774877a0cf1e18e12302175da': Fix preview synchronization
|
13d3fca3d776c50b2fca85a45b2cd6320fba6744 |
13-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
am 6067d17e: am e5e61f88: Merge "Fix preview synchronization" into gb-ub-photos-bryce * commit '6067d17efa6f6db8ad5c61381f513d288c7881b9': Fix preview synchronization
|
c0a4f2a53064fdca69316b4c3888ce35f8028780 |
13-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
am e5e61f88: Merge "Fix preview synchronization" into gb-ub-photos-bryce * commit 'e5e61f884c59d5ba15aae6b228c4bcaad58e0642': Fix preview synchronization
|
0a0b07103efeaca101747f59e7a491a2ef71ce24 |
13-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
Merge "Fix preview synchronization" into gb-ub-photos-bryce
|
b2edf4808b52024ca6f84bfa63e9d167407dc68d |
13-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
Merge "Fix preview synchronization" into gb-ub-photos-bryce
|
e5e61f884c59d5ba15aae6b228c4bcaad58e0642 |
13-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
Merge "Fix preview synchronization" into gb-ub-photos-bryce
|
c3fbd3d6131cd6928bad517c0b569374ef9da110 |
13-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
Fix preview synchronization Change-Id: Id6b5e5a140a3c366f2f5d4c29809e83ac1530d04
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
|
79a8733231a81dcd79e10f50ec142005b537269c |
13-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
Fix preview synchronization Change-Id: Id6b5e5a140a3c366f2f5d4c29809e83ac1530d04
rc/com/android/gallery3d/filtershow/ImageStateAdapter.java
rc/com/android/gallery3d/filtershow/cache/FilteringPipeline.java
rc/com/android/gallery3d/filtershow/imageshow/ImageShow.java
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
|
750798dbb099954b365beedffbc04ee573d11209 |
13-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
Fix preview synchronization Change-Id: Id6b5e5a140a3c366f2f5d4c29809e83ac1530d04
rc/com/android/gallery3d/filtershow/ImageStateAdapter.java
rc/com/android/gallery3d/filtershow/cache/FilteringPipeline.java
rc/com/android/gallery3d/filtershow/imageshow/ImageShow.java
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
|
1acb24b929f2d0733e7592b38b9229b1286f5146 |
13-Mar-2013 |
John Reck <jreck@google.com> |
am db5e2726: am 9a4d5cd2: am 86180691: am 8a3ab566: fix build * commit 'db5e27265be1cdb437a40f7aa2e515a83db5c6ce': fix build
|
7f643cd10629084d1f10ba493bfea1113f6359ae |
13-Mar-2013 |
John Reck <jreck@google.com> |
am 9a4d5cd2: am 86180691: am 8a3ab566: fix build * commit '9a4d5cd28b48ae3dbfddfc5f6ecffc7630c3f9d4': fix build
|
d64594a8cc8e021e81fc4a4194b9e5136c0bbb51 |
13-Mar-2013 |
John Reck <jreck@google.com> |
am 86180691: am 8a3ab566: fix build * commit '861806911294d20e7b184104d9ef5a38f73f05d5': fix build
|
15c4776abbeb9d60dba2ba54bb4ad77e71ac9f56 |
13-Mar-2013 |
John Reck <jreck@google.com> |
am 8a3ab566: fix build * commit '8a3ab5665c57590b9f41f75c4a2fdf1ea1cffa00': fix build
|
aecf04a450fffb1463118156ce303116ecc33c1d |
13-Mar-2013 |
John Reck <jreck@google.com> |
fix build Change-Id: I41898041ad2e6d59973af30680288c436f3c6357
es/values/ids.xml
|
793207329f14517f2fd8998046acc2dfa52dc705 |
13-Mar-2013 |
John Reck <jreck@google.com> |
fix build Change-Id: I41898041ad2e6d59973af30680288c436f3c6357
rc/com/android/photos/GalleryActivity.java
|
8a3ab5665c57590b9f41f75c4a2fdf1ea1cffa00 |
13-Mar-2013 |
John Reck <jreck@google.com> |
fix build Change-Id: I41898041ad2e6d59973af30680288c436f3c6357
es/values/ids.xml
rc/com/android/photos/GalleryActivity.java
|
b57ba28bbf597a064539a54fb92d22f65a4b2967 |
13-Mar-2013 |
John Reck <jreck@google.com> |
am 2a8d5768: am 8aecae62: am 86b531ea: am 2f205d54: basic activated support * commit '2a8d57687a0b39d54d2b220a9296a26e5e7410ff': basic activated support
|
8cf06d103b16c4a31e1ff4c7c611c9c908716eb4 |
13-Mar-2013 |
John Reck <jreck@google.com> |
am 9e97ab1c: am cba262a5: am 5860483e: am af0343eb: Use viewpager * commit '9e97ab1c9a22edb60220278f73868d3a34de04ac': Use viewpager
|
4e29ce706a393ce0f3dc4d6c01d05264c4f0376f |
13-Mar-2013 |
John Reck <jreck@google.com> |
am 8aecae62: am 86b531ea: am 2f205d54: basic activated support * commit '8aecae62543dc2e16665b85ccd3d69c22e249e1b': basic activated support
|
110a724ae6e0a112cf3da246c17e60f32d82f502 |
13-Mar-2013 |
John Reck <jreck@google.com> |
am cba262a5: am 5860483e: am af0343eb: Use viewpager * commit 'cba262a54a2b460c6435327a0b9adae0dfbbb1ed': Use viewpager
|
3a500fb4df44849d4aa32ca18dbca4a074033f47 |
13-Mar-2013 |
John Reck <jreck@google.com> |
am 86b531ea: am 2f205d54: basic activated support * commit '86b531ea2b8ebf2e11cab85d48e0f893ab618137': basic activated support
|
ece5943b1b216e4a3cfad05acd4ef87671db8bd3 |
13-Mar-2013 |
John Reck <jreck@google.com> |
am 5860483e: am af0343eb: Use viewpager * commit '5860483e696c5e6d9c501487030eef39e4772b5a': Use viewpager
|
c18e9dff9ccbeb61be777f1dfad9a9be3b5294da |
13-Mar-2013 |
John Reck <jreck@google.com> |
am 2f205d54: basic activated support * commit '2f205d54c88ea3f6b1a1a0630201fdb10b0689e2': basic activated support
|
d25ca0cca68bd3697e23b8d9a4560a54b563a507 |
13-Mar-2013 |
John Reck <jreck@google.com> |
am af0343eb: Use viewpager * commit 'af0343eb04ecd0e1895042e0f0656db0cc52dd4c': Use viewpager
|
967d6c8c9723b925900d389acfbd6391e6060614 |
13-Mar-2013 |
John Reck <jreck@google.com> |
basic activated support Change-Id: If1c1faf42311ddbc76b617bff5f3c6bdafdef5d1
es/layout/photo_set.xml
es/layout/photo_set_item.xml
|
2f205d54c88ea3f6b1a1a0630201fdb10b0689e2 |
13-Mar-2013 |
John Reck <jreck@google.com> |
basic activated support Change-Id: If1c1faf42311ddbc76b617bff5f3c6bdafdef5d1
es/layout/photo_set.xml
es/layout/photo_set_item.xml
rc/com/android/photos/adapters/PhotoThumbnailAdapter.java
|
e1bb3b1bcf1db22e82d9c44d55d168ea948cb309 |
13-Mar-2013 |
John Reck <jreck@google.com> |
basic activated support Change-Id: If1c1faf42311ddbc76b617bff5f3c6bdafdef5d1
rc/com/android/photos/adapters/PhotoThumbnailAdapter.java
|
af0343eb04ecd0e1895042e0f0656db0cc52dd4c |
12-Mar-2013 |
John Reck <jreck@google.com> |
Use viewpager Change-Id: Icd320799ce1e13815e34b2a0e45a9f6a47736de3
rc/com/android/photos/GalleryActivity.java
|
fff0fbecb9f27e21c6e66a35861bcd8aa019db21 |
12-Mar-2013 |
John Reck <jreck@google.com> |
Use viewpager Change-Id: Icd320799ce1e13815e34b2a0e45a9f6a47736de3
rc/com/android/photos/GalleryActivity.java
|
d9b695494b0989ae90a98a796df729204acaa7cc |
12-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
am 70a19833: am d2c82e0f: am 300b9697: am 9eaa85a0: Merge "Add loading resources helper functions to ImageFilterRS" into gb-ub-photos-bryce * commit '70a19833e0eedde220c375656beeb58d843a681f': Add loading resources helper functions to ImageFilterRS
|
7564de2ea36bdeb5625ac86dc69ad7d52763b4fc |
12-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
am d2c82e0f: am 300b9697: am 9eaa85a0: Merge "Add loading resources helper functions to ImageFilterRS" into gb-ub-photos-bryce * commit 'd2c82e0fd112f57c1b0a40dda60925afc82438b0': Add loading resources helper functions to ImageFilterRS
|
8957741ed5c3869d8fdc09910a28ad09a239a886 |
12-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
am 300b9697: am 9eaa85a0: Merge "Add loading resources helper functions to ImageFilterRS" into gb-ub-photos-bryce * commit '300b9697d5b246dc7d2c6e011908b2a9c7d06240': Add loading resources helper functions to ImageFilterRS
|
f6395fb6da265f56c245edced21e7e1312975684 |
12-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
am 9eaa85a0: Merge "Add loading resources helper functions to ImageFilterRS" into gb-ub-photos-bryce * commit '9eaa85a0384f1c39c16dedb486aaab2b32911d04': Add loading resources helper functions to ImageFilterRS
|
b2fc6a4fb6519fd998d9691e244cdbab3587b54c |
12-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
Merge "Add loading resources helper functions to ImageFilterRS" into gb-ub-photos-bryce
|
9eaa85a0384f1c39c16dedb486aaab2b32911d04 |
12-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
Merge "Add loading resources helper functions to ImageFilterRS" into gb-ub-photos-bryce
|
8c89a0435de4b39380dd2ec9830b1aa5886130ca |
12-Mar-2013 |
Michael Kolb <kolby@google.com> |
am 39d2192d: Merge "Open camera only once in Video module" into gb-ub-photos-bryce * commit '39d2192d8c93b40e19f047bbd2bef24a3e987e44': Open camera only once in Video module
rc/com/android/camera/VideoModule.java
|
3243862413deeda922d2a1f087b89ceb789882b5 |
12-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
Add loading resources helper functions to ImageFilterRS Change-Id: I79b4996b5da0fa05536f2f53f770d01e9735b96c
rc/com/android/gallery3d/filtershow/filters/ImageFilterRS.java
|
96df19b2a4b7286a01aeb690a38d8c99bc43449c |
12-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
Add loading resources helper functions to ImageFilterRS Change-Id: I79b4996b5da0fa05536f2f53f770d01e9735b96c
rc/com/android/gallery3d/filtershow/filters/ImageFilterRS.java
|
ceebaf91aed2fb785d8803ae838eae2a48ac0fd4 |
12-Mar-2013 |
George Mount <mount@google.com> |
am 6d557f7f: am 657ddfa9: am d2730296: am b3831f77: Merge "Add delete cascade for Accounts." into gb-ub-photos-bryce * commit '6d557f7fa56c588326a9eaa193965a805be3b0c8': Add delete cascade for Accounts.
|
4bc5bfdccca0259e55cbd1a18e9233d4ce1bc5fe |
12-Mar-2013 |
George Mount <mount@google.com> |
am 657ddfa9: am d2730296: am b3831f77: Merge "Add delete cascade for Accounts." into gb-ub-photos-bryce * commit '657ddfa95f712c1f2da5d9d4fb5af90aa497edce': Add delete cascade for Accounts.
|
a3d3e2b6f6b97d9d0b67b06f1ab4a0e86413cbe7 |
12-Mar-2013 |
George Mount <mount@google.com> |
am d2730296: am b3831f77: Merge "Add delete cascade for Accounts." into gb-ub-photos-bryce * commit 'd2730296cd0f1c62796c606204d38622a8273228': Add delete cascade for Accounts.
|
3c5659c5186edb12ddfa6f8dcaf8b6868ee658fb |
12-Mar-2013 |
George Mount <mount@google.com> |
am b3831f77: Merge "Add delete cascade for Accounts." into gb-ub-photos-bryce * commit 'b3831f7714715f2e1693b89d5bc4854381918bbc': Add delete cascade for Accounts.
|
9a8bf36157644e4f52c9bb3561575e6bdfcdb36a |
12-Mar-2013 |
George Mount <mount@google.com> |
Merge "Add delete cascade for Accounts." into gb-ub-photos-bryce
|
b3831f7714715f2e1693b89d5bc4854381918bbc |
12-Mar-2013 |
George Mount <mount@google.com> |
Merge "Add delete cascade for Accounts." into gb-ub-photos-bryce
|
9bd3f529ee0dc79c9c9c5c9aa89309336e232a49 |
12-Mar-2013 |
George Mount <mount@google.com> |
Add delete cascade for Accounts. Change-Id: I962c7cb657643c3eddbbeb6a691b26de5553d4df
rc/com/android/photos/data/PhotoProvider.java
ests/src/com/android/photos/data/PhotoDatabaseUtils.java
ests/src/com/android/photos/data/PhotoProviderTest.java
|
56c42ad3265ceac0674e6a4c00800336101a230c |
12-Mar-2013 |
George Mount <mount@google.com> |
Add delete cascade for Accounts. Change-Id: I962c7cb657643c3eddbbeb6a691b26de5553d4df
rc/com/android/photos/data/PhotoProvider.java
ests/src/com/android/photos/data/PhotoDatabaseUtils.java
ests/src/com/android/photos/data/PhotoProviderTest.java
|
8f8340ee7ace490c52f0dc86771b6530ff60c922 |
12-Mar-2013 |
John Reck <jreck@google.com> |
am 1aa34c7b: am ff6ae394: am 5ec22bd8: am 1124090a: Fix ICS compatibility issues * commit '1aa34c7bac0e1feb7d3d34669498b8c361f30813': Fix ICS compatibility issues
|
cb6ae9431aad31465169cdc30624ab8f7a626ad8 |
12-Mar-2013 |
John Reck <jreck@google.com> |
am ff6ae394: am 5ec22bd8: am 1124090a: Fix ICS compatibility issues * commit 'ff6ae394828a5d043ee7fc15965ce0d6a16096d8': Fix ICS compatibility issues
|
b66b77b043e9c63f9ad95f203978b4d912aa5ae2 |
12-Mar-2013 |
John Reck <jreck@google.com> |
am 5ec22bd8: am 1124090a: Fix ICS compatibility issues * commit '5ec22bd839dd7c0ba7fde6ab3c4e39205dd659d6': Fix ICS compatibility issues
|
7b005413f0f4f0664df171c80391ef680b262dfd |
12-Mar-2013 |
John Reck <jreck@google.com> |
am 1124090a: Fix ICS compatibility issues * commit '1124090a300e96f6d1d5b0c67f3fe314daf32743': Fix ICS compatibility issues
|
2594ea2c0c650c6f0d03ce5575315dfd0787d189 |
12-Mar-2013 |
John Reck <jreck@google.com> |
Fix ICS compatibility issues Change-Id: I43f3236b9da0424fde66d3ad4d46403223fde8bf
rc/com/android/photos/SelectionManager.java
rc/com/android/photos/adapters/PhotoThumbnailAdapter.java
rc/com/android/photos/views/SquareImageView.java
|
1124090a300e96f6d1d5b0c67f3fe314daf32743 |
12-Mar-2013 |
John Reck <jreck@google.com> |
Fix ICS compatibility issues Change-Id: I43f3236b9da0424fde66d3ad4d46403223fde8bf
es/layout/photo_set_item.xml
rc/com/android/photos/SelectionManager.java
rc/com/android/photos/adapters/PhotoThumbnailAdapter.java
rc/com/android/photos/views/SquareImageView.java
|
9654b9a7d990241781b6bd03a6926671e7c4257b |
12-Mar-2013 |
John Reck <jreck@google.com> |
Fix ICS compatibility issues Change-Id: I43f3236b9da0424fde66d3ad4d46403223fde8bf
es/layout/photo_set_item.xml
|
8c6a12a86232074dab4c5816b5a0a1221303ca6b |
12-Mar-2013 |
Justin Koh <justinkoh@google.com> |
am 4dadfa9d: am a043b351: am 8384597d: am f402ec18: Merge "Update Pano XML tag and permission." into gb-ub-photos-bryce * commit '4dadfa9d277526748171976cb2e75cf188b1c305': Update Pano XML tag and permission.
|
4b40ef77bddad06660fba8fc4d2b2f076ef8bf86 |
12-Mar-2013 |
Justin Koh <justinkoh@google.com> |
am a043b351: am 8384597d: am f402ec18: Merge "Update Pano XML tag and permission." into gb-ub-photos-bryce * commit 'a043b351bdbe46ba21a520b5d4dc05c202bff6dd': Update Pano XML tag and permission.
|
6e7cbe09621a3627febf7102dcf6c8a01e73109c |
12-Mar-2013 |
Justin Koh <justinkoh@google.com> |
am 8384597d: am f402ec18: Merge "Update Pano XML tag and permission." into gb-ub-photos-bryce * commit '8384597dc2253d49da0e716a9e85f7fa778f403e': Update Pano XML tag and permission.
|
6580418aa8ea43eb18f1ef4aa4b61c7f1602fe43 |
12-Mar-2013 |
Justin Koh <justinkoh@google.com> |
am f402ec18: Merge "Update Pano XML tag and permission." into gb-ub-photos-bryce * commit 'f402ec180c7e5f406ee30075dc6dac7a90f9310e': Update Pano XML tag and permission.
|
f402ec180c7e5f406ee30075dc6dac7a90f9310e |
12-Mar-2013 |
Justin Koh <justinkoh@google.com> |
Merge "Update Pano XML tag and permission." into gb-ub-photos-bryce
|
2cc46aa7c1a72eb1780028ea0e9484950e20342e |
12-Mar-2013 |
George Mount <mount@google.com> |
am 25e17de6: am 4891dde8: am efc4f7dc: am f450fb6b: Merge "Add support for local storage of uploaded pictures." into gb-ub-photos-bryce * commit '25e17de6ec553905ba768a83d94d57e8ca4ee31b': Add support for local storage of uploaded pictures.
|
31c05fb8f1a54657c59cb8109e8254ae5d23d039 |
12-Mar-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Id4d21a665f93068449b28e78fd184eda857aafae Auto-generated-cl: translation import
es/values-th/filtershow_strings.xml
|
e5b1ea23eba7976d0eeca1887c71e066a3bfd7e2 |
12-Mar-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ib705e5cf28cb27abc69d9e8c7ad15ec4a8211d07 Auto-generated-cl: translation import
es/values-th/filtershow_strings.xml
|
6d151c6aade7888b07197fcedf44ca8ac22922c0 |
12-Mar-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I138f7ae46beb3cdfec1ba5bb6f4e812bb4f683ae Auto-generated-cl: translation import
es/values-th/filtershow_strings.xml
|
04d09e5b272d57635465649d35f3e132aa6c0232 |
12-Mar-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I9ba7e5ba20791e379d32305688aa7a7d6e2bce98 Auto-generated-cl: translation import
es/values-th/filtershow_strings.xml
|
cb9814181f8389c38168fbe0334bd340e5d49811 |
12-Mar-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I9ba7e5ba20791e379d32305688aa7a7d6e2bce98 Auto-generated-cl: translation import
es/values-th/filtershow_strings.xml
|
224b819d265bed4ab20cd778396ffeda5cf30f88 |
12-Mar-2013 |
George Mount <mount@google.com> |
am 4891dde8: am efc4f7dc: am f450fb6b: Merge "Add support for local storage of uploaded pictures." into gb-ub-photos-bryce * commit '4891dde8597316b2c9828de569f60f8f555cdf3d': Add support for local storage of uploaded pictures.
|
acf19b75b0fa9a06a59ff00e46fbe92e0462c305 |
12-Mar-2013 |
George Mount <mount@google.com> |
am efc4f7dc: am f450fb6b: Merge "Add support for local storage of uploaded pictures." into gb-ub-photos-bryce * commit 'efc4f7dc3afb9211818f0cac6e702b49bc41336a': Add support for local storage of uploaded pictures.
|
1fa82661ad7d868a6f663e828c555d763f6f2ee9 |
12-Mar-2013 |
George Mount <mount@google.com> |
am f450fb6b: Merge "Add support for local storage of uploaded pictures." into gb-ub-photos-bryce * commit 'f450fb6b2130998cf7ee7eb3b82074cb3b37b1a0': Add support for local storage of uploaded pictures.
|
05a480847362eb9dbf57f73c83092e6a67f919f4 |
12-Mar-2013 |
George Mount <mount@google.com> |
Merge "Add support for local storage of uploaded pictures." into gb-ub-photos-bryce
|
f450fb6b2130998cf7ee7eb3b82074cb3b37b1a0 |
12-Mar-2013 |
George Mount <mount@google.com> |
Merge "Add support for local storage of uploaded pictures." into gb-ub-photos-bryce
|
1ae842c98cdb9cfcccd0e5421395d6205121b277 |
12-Mar-2013 |
Michael Kolb <kolby@google.com> |
am 5293d521: am 7a0e735e: am f3ca5b80: am 39d2192d: Merge "Open camera only once in Video module" into gb-ub-photos-bryce * commit '5293d521a855f9ef097739f74b6a7a628d518fc7': Open camera only once in Video module
|
451f31d8fe5bd88f33ac95b52c50ce40ad58d5bc |
12-Mar-2013 |
Michael Kolb <kolby@google.com> |
am 7a0e735e: am f3ca5b80: am 39d2192d: Merge "Open camera only once in Video module" into gb-ub-photos-bryce * commit '7a0e735e0afc116a6cd7a3b78da5d73d9af3aeff': Open camera only once in Video module
|
dbfbeb23dd890f4e5ef791f07d97e5459aca22fa |
12-Mar-2013 |
Justin Koh <justinkoh@google.com> |
Update Pano XML tag and permission. Update Pano XML tag and permission. Bug: 8359058 Change-Id: I92626f03f5c6857951d5f17fb6f811ffbc24e74f
ndroidManifest.xml
|
d4caa58d6e08a88d5493ab02b2260bdcf4034c32 |
12-Mar-2013 |
Justin Koh <justinkoh@google.com> |
Update Pano XML tag and permission. Update Pano XML tag and permission. Bug: 8359058 Change-Id: I92626f03f5c6857951d5f17fb6f811ffbc24e74f
ndroidManifest.xml
es/xml/canvas_info.xml
|
44de093c43b1b16acabdc5f1e349bdd51ef19f0a |
12-Mar-2013 |
Justin Koh <justinkoh@google.com> |
Update Pano XML tag and permission. Update Pano XML tag and permission. Bug: 8359058 Change-Id: I92626f03f5c6857951d5f17fb6f811ffbc24e74f
es/xml/canvas_info.xml
|
3cc0c1ee31642c46fa3dfdb94583206c54934740 |
12-Mar-2013 |
Michael Kolb <kolby@google.com> |
am f3ca5b80: am 39d2192d: Merge "Open camera only once in Video module" into gb-ub-photos-bryce * commit 'f3ca5b80749966e3c39336e9cfb5b76f1496204d': Open camera only once in Video module
|
e3f571dcccac9027a5c5ad8b7c96eb5e7442e359 |
12-Mar-2013 |
Michael Kolb <kolby@google.com> |
am 39d2192d: Merge "Open camera only once in Video module" into gb-ub-photos-bryce * commit '39d2192d8c93b40e19f047bbd2bef24a3e987e44': Open camera only once in Video module
|
d42263b6cbd7ef47d6fa9d2f03ee9b88bc2a01c3 |
12-Mar-2013 |
Michael Kolb <kolby@google.com> |
Merge "Open camera only once in Video module" into gb-ub-photos-bryce
|
39d2192d8c93b40e19f047bbd2bef24a3e987e44 |
12-Mar-2013 |
Michael Kolb <kolby@google.com> |
Merge "Open camera only once in Video module" into gb-ub-photos-bryce
|
b7e9fe88792cb2329bedb8af770236799177d44b |
12-Mar-2013 |
Michael Kolb <kolby@google.com> |
Open camera only once in Video module Bug: 8272736 Change-Id: Id28fde5da62083651627dc8c734e818afe22a6e0
rc/com/android/camera/VideoModule.java
|
6a48f359bc69e442c47bffa744b8980945a98b92 |
12-Mar-2013 |
Michael Kolb <kolby@google.com> |
Open camera only once in Video module Bug: 8272736 Change-Id: Id28fde5da62083651627dc8c734e818afe22a6e0
rc/com/android/camera/VideoModule.java
|
c6d41f2fbb578fa2e86d35ac18b9711d7c6dd213 |
12-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
am a4c0d489: am 809d801b: am 30ba8145: am b6b5b5a3: Fix potential problem with default rsc number * commit 'a4c0d489f6df684b0e205cf045cc42a2119769ee': Fix potential problem with default rsc number
|
6934dcd66090f11cbe6cb8d9603c9bcfa68250fe |
12-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
am 809d801b: am 30ba8145: am b6b5b5a3: Fix potential problem with default rsc number * commit '809d801bcb3d9b47fd3a2751820c7e14d34e136d': Fix potential problem with default rsc number
|
46622651eed4f175fd4a3c7e88f7ac7abd06b475 |
12-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
am 30ba8145: am b6b5b5a3: Fix potential problem with default rsc number * commit '30ba81452a1d70b3c1697548337ecd6a3419fd5a': Fix potential problem with default rsc number
|
d26e9d05050ef46732893110b7186b39a75292d5 |
12-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
am b6b5b5a3: Fix potential problem with default rsc number * commit 'b6b5b5a357710b19236d64fb4ee4438724d763a8': Fix potential problem with default rsc number
|
5af1efc714f304ef444285ffa19fb561a25fa28a |
12-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
am c1390606: am 5be99e68: am a3f5378b: am b2fcd425: Fix layout on phones * commit 'c139060603bae1ebbf242c3a12f3d7375628ccce': Fix layout on phones
|
a907514cf323c55122c4837c4c376777fae7fc57 |
12-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
am 5be99e68: am a3f5378b: am b2fcd425: Fix layout on phones * commit '5be99e6856fe7dc92bdd4a5e6764b093d635516c': Fix layout on phones
|
b22a84a9baa7e64b5f9c77244c1586385e38a241 |
12-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
Fix potential problem with default rsc number Change-Id: I8205dbb2488232084f984a10963bb9286ff19e0e
rc/com/android/gallery3d/filtershow/filters/ImageFilterFx.java
|
b6b5b5a357710b19236d64fb4ee4438724d763a8 |
12-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
Fix potential problem with default rsc number Change-Id: I8205dbb2488232084f984a10963bb9286ff19e0e
rc/com/android/gallery3d/filtershow/filters/ImageFilterFx.java
|
aa3d40ff8fcb962acb31c176073040eb8c8043f0 |
12-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
am a3f5378b: am b2fcd425: Fix layout on phones * commit 'a3f5378b0cc5f84243821856975afcee490e284a': Fix layout on phones
|
d3c5866743b9120469685544db3b5148f1f10d6f |
12-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
am b2fcd425: Fix layout on phones * commit 'b2fcd4252cbcee124e68412bb53a8b875ce9ba36': Fix layout on phones
|
1d3429626b5b6e46783169058285ee5fe8154da8 |
11-Mar-2013 |
George Mount <mount@google.com> |
Add support for local storage of uploaded pictures. Change-Id: I23c86e6a95871effcb76a54b16b9ab7720a63383
rc/com/android/photos/data/PhotoProvider.java
|
09bfc1d566621498d08903559ae707161a701571 |
11-Mar-2013 |
George Mount <mount@google.com> |
Add support for local storage of uploaded pictures. Change-Id: I23c86e6a95871effcb76a54b16b9ab7720a63383
rc/com/android/photos/data/PhotoProvider.java
|
7d980736d454ac06182ed7fcb9dafa4991196cd7 |
12-Mar-2013 |
The Android Open Source Project <initial-contribution@android.com> |
am b566c822: (-s ours) am c2349abd: (-s ours) Reconcile with jb-mr2-release - do not merge * commit 'b566c82211e72af234c786eac65fec3ecb9a8fb8': Don't record video before preview is started Fix camera switcher mode picker fix undo bug Fix NPE in switcher popup
|
524b787e152b926f7e93447a64ed3d9b955f9ddf |
12-Mar-2013 |
The Android Open Source Project <initial-contribution@android.com> |
am c2349abd: (-s ours) Reconcile with jb-mr2-release - do not merge * commit 'c2349abde4087ce2cb4b260d7ba7b26844365a2b': Don't record video before preview is started Fix camera switcher mode picker fix undo bug Fix NPE in switcher popup
|
fbff14d927133d0c3b0aa35c5669cceba37b5137 |
12-Mar-2013 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with jb-mr2-release - do not merge Change-Id: Iee469c89331fc9626c24bf2c42890c8abb7f1380
|
6bf114bfda3b36729bc4e4ce7fddc1a7dc7bbc82 |
12-Mar-2013 |
The Android Automerger <android-build@android.com> |
merge in jb-mr2-release history after reset to jb-mr2-dev
|
f39d8a0ce4081403cdc113f6d0f351a0b4756c45 |
12-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
Fix layout on phones Change-Id: I147b00f1abf032877c7461138ec78149bfd8b519
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
|
b2fcd4252cbcee124e68412bb53a8b875ce9ba36 |
12-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
Fix layout on phones Change-Id: I147b00f1abf032877c7461138ec78149bfd8b519
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
|
3892b8de6e259eafa49fbc718059cf334f0315dc |
12-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
am a64bab3c: am 3974ae68: am ad961df1: am 8d2c7ee0: Various bugfixes/improvements for Fx Filters: - fix bug in history with Fx filters - don\'t load Fx bitmaps at startup - free bitmaps when unneeded - fix history preview bitmaps * commit 'a64bab3c7cffc20a342109edb142ce823d0d1c31': Various bugfixes/improvements for Fx Filters: - fix bug in history with Fx filters - don't load Fx bitmaps at startup - free bitmaps when unneeded - fix history preview bitmaps
|
74f9048482686f9bab7f64740a556ec5f43bcf6f |
12-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
am 3974ae68: am ad961df1: am 8d2c7ee0: Various bugfixes/improvements for Fx Filters: - fix bug in history with Fx filters - don\'t load Fx bitmaps at startup - free bitmaps when unneeded - fix history preview bitmaps * commit '3974ae689fafc2d19458416342e0da0915badd29': Various bugfixes/improvements for Fx Filters: - fix bug in history with Fx filters - don't load Fx bitmaps at startup - free bitmaps when unneeded - fix history preview bitmaps
|
f586024a83ab431fdecdd2ef100fe502ed210573 |
12-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
am ad961df1: am 8d2c7ee0: Various bugfixes/improvements for Fx Filters: - fix bug in history with Fx filters - don\'t load Fx bitmaps at startup - free bitmaps when unneeded - fix history preview bitmaps * commit 'ad961df1ae6c75ad767177db10f03dda2e6d3e65': Various bugfixes/improvements for Fx Filters: - fix bug in history with Fx filters - don't load Fx bitmaps at startup - free bitmaps when unneeded - fix history preview bitmaps
|
ea5ac4cd1ad2dad8c4e9cc104b03b8a2bbc91918 |
12-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
am 8d2c7ee0: Various bugfixes/improvements for Fx Filters: - fix bug in history with Fx filters - don\'t load Fx bitmaps at startup - free bitmaps when unneeded - fix history preview bitmaps * commit '8d2c7ee02c8fde53effc787c172b10b14ae34d42': Various bugfixes/improvements for Fx Filters: - fix bug in history with Fx filters - don't load Fx bitmaps at startup - free bitmaps when unneeded - fix history preview bitmaps
|
1440e7564079e4e6e54216e0ed80c809a3cec421 |
12-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
Various bugfixes/improvements for Fx Filters: - fix bug in history with Fx filters - don't load Fx bitmaps at startup - free bitmaps when unneeded - fix history preview bitmaps Change-Id: I5631a5bcec12c121871b3575066c201486896a14
rc/com/android/gallery3d/filtershow/filters/FilterFxRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterRepresentation.java
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
|
8d2c7ee02c8fde53effc787c172b10b14ae34d42 |
12-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
Various bugfixes/improvements for Fx Filters: - fix bug in history with Fx filters - don't load Fx bitmaps at startup - free bitmaps when unneeded - fix history preview bitmaps Change-Id: I5631a5bcec12c121871b3575066c201486896a14
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/HistoryAdapter.java
rc/com/android/gallery3d/filtershow/PanelController.java
rc/com/android/gallery3d/filtershow/filters/FilterFxRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterRepresentation.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterFx.java
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
|
57d885d112544f36d81c49033c470ae0dc619278 |
12-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
Various bugfixes/improvements for Fx Filters: - fix bug in history with Fx filters - don't load Fx bitmaps at startup - free bitmaps when unneeded - fix history preview bitmaps Change-Id: I5631a5bcec12c121871b3575066c201486896a14
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/HistoryAdapter.java
rc/com/android/gallery3d/filtershow/PanelController.java
rc/com/android/gallery3d/filtershow/filters/FilterFxRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterRepresentation.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterFx.java
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
|
2e346bff9425f6fee08d5254960705998e37a5d6 |
12-Mar-2013 |
John Hoford <hoford@google.com> |
am 94a48af1: am 9c300018: am c0672b12: am 001283a7: fix menus for all editors * commit '94a48af1acfe548a1710b4e47fd7515aea336a98': fix menus for all editors
|
69f527d1e731f7578d1cdc8e3870bcfa6fc42245 |
12-Mar-2013 |
John Hoford <hoford@google.com> |
am 9c300018: am c0672b12: am 001283a7: fix menus for all editors * commit '9c3000187eb43746b2fa99c945b92e7bcc6e92d7': fix menus for all editors
|
72e72abfa9870d0d94e2dc1082ed47ec64539de7 |
12-Mar-2013 |
John Hoford <hoford@google.com> |
am c0672b12: am 001283a7: fix menus for all editors * commit 'c0672b12dd63e8bc1d61a9e5a3dae80a2592ef49': fix menus for all editors
|
a7b45f052afe682925fab7a2f076b70370abc297 |
12-Mar-2013 |
John Hoford <hoford@google.com> |
am 001283a7: fix menus for all editors * commit '001283a72d451999e3308f45dc365d4defc0af39': fix menus for all editors
|
001283a72d451999e3308f45dc365d4defc0af39 |
11-Mar-2013 |
John Hoford <hoford@google.com> |
fix menus for all editors Change-Id: I93e7eef3176b38480d55df176166646709a875fe
rc/com/android/gallery3d/filtershow/editors/Editor.java
rc/com/android/gallery3d/filtershow/editors/EditorDraw.java
|
aafbc72fb5aa2d67964c85b6c7c77dd00ae2c965 |
11-Mar-2013 |
John Hoford <hoford@google.com> |
fix menus for all editors Change-Id: I93e7eef3176b38480d55df176166646709a875fe
rc/com/android/gallery3d/filtershow/editors/Editor.java
rc/com/android/gallery3d/filtershow/editors/EditorDraw.java
|
7e8dcc701d075f6e18f30244b54c153174e506a4 |
11-Mar-2013 |
Mangesh Ghiware <mghiware@google.com> |
am c6b1c6bb: am 2c5204e6: am f35f4f62: am dc32aaf9: Enable operations on accounts table. * commit 'c6b1c6bbd5af6b60322ca65c6848f7b86eaa8521': Enable operations on accounts table.
|
4be6e96eaf7e67bd1983ecb1b99a5113a7296219 |
11-Mar-2013 |
Mangesh Ghiware <mghiware@google.com> |
am 2c5204e6: am f35f4f62: am dc32aaf9: Enable operations on accounts table. * commit '2c5204e6ef49ce196f7050e189957fc1581a4988': Enable operations on accounts table.
|
2d70d144e2b5af0f865117b67e4ef0faaba31e9c |
11-Mar-2013 |
Mangesh Ghiware <mghiware@google.com> |
am f35f4f62: am dc32aaf9: Enable operations on accounts table. * commit 'f35f4f6262167dd715d2a8059e61403fe88e1f09': Enable operations on accounts table.
|
7de7dfdbe322a901c57c6cfa503ee0803294bf07 |
11-Mar-2013 |
Michael Kolb <kolby@google.com> |
Don't record video before preview is started Bug: 8358998 Change-Id: I5d2380020b3e999f904b8a715324db13b25ebb5a
rc/com/android/camera/VideoModule.java
|
36e82cb5be229e94609b1958d91c6593b8242765 |
11-Mar-2013 |
Mangesh Ghiware <mghiware@google.com> |
am dc32aaf9: Enable operations on accounts table. * commit 'dc32aaf95fd6925796474688c24704b3265a1ae7': Enable operations on accounts table.
|
5cdaca858571b568c40ea0f1139e477a51859ef3 |
11-Mar-2013 |
Mangesh Ghiware <mghiware@google.com> |
Enable operations on accounts table. Change-Id: Ida0e379cad422dbeffb3b4ea89232db7f45a36e4
rc/com/android/photos/data/PhotoProvider.java
|
dc32aaf95fd6925796474688c24704b3265a1ae7 |
11-Mar-2013 |
Mangesh Ghiware <mghiware@google.com> |
Enable operations on accounts table. Change-Id: Ida0e379cad422dbeffb3b4ea89232db7f45a36e4
rc/com/android/photos/data/PhotoProvider.java
|
eb6f109c4f55ee9ffd676ab50f032623b4212e28 |
11-Mar-2013 |
Michael Kolb <kolby@google.com> |
am 46ce4c1b: am c8ec0b60: am ab608128: am 54c1256f: Merge "Spring cleaning" into gb-ub-photos-bryce * commit '46ce4c1b4f040af5fb2d1de93e1f376664076dc2': Spring cleaning
|
b343a6157b86d5af2c159dcfe32ee1d490bf7cc6 |
11-Mar-2013 |
John Hoford <hoford@google.com> |
am 760aaa5e: am 68c5119f: am c84552dd: am 6f3ff5b4: split filter show into multiple files * commit '760aaa5e8d8555bf68bb86910186e4516c99f241': split filter show into multiple files
|
351d94bab5c761e22a1dcebba62568cbda87d4ac |
11-Mar-2013 |
Michael Kolb <kolby@google.com> |
am c8ec0b60: am ab608128: am 54c1256f: Merge "Spring cleaning" into gb-ub-photos-bryce * commit 'c8ec0b60f87c56ebab2d6b8b90ef93ca86bea6e6': Spring cleaning
|
a446a378ceabfbeaa3817f6fd3d5555f3ee3eec2 |
11-Mar-2013 |
John Hoford <hoford@google.com> |
am 68c5119f: am c84552dd: am 6f3ff5b4: split filter show into multiple files * commit '68c5119fd4d407e4ad181afbf938e9718f5dd71a': split filter show into multiple files
|
5b0b6b14d378abf358160b987a117db65ef84d7f |
11-Mar-2013 |
Michael Kolb <kolby@google.com> |
am ab608128: am 54c1256f: Merge "Spring cleaning" into gb-ub-photos-bryce * commit 'ab60812856e3181e3e1748259b1c1b155de4a1c8': Spring cleaning
|
f6cb6100a4d3a812cc830e07422418ea0a8be689 |
11-Mar-2013 |
John Hoford <hoford@google.com> |
am c84552dd: am 6f3ff5b4: split filter show into multiple files * commit 'c84552ddd45b79f0b04a7bd5b148c3154512e9c1': split filter show into multiple files
|
a1b650027de468afcfa711e56af7e8d548c98147 |
11-Mar-2013 |
Michael Kolb <kolby@google.com> |
am 54c1256f: Merge "Spring cleaning" into gb-ub-photos-bryce * commit '54c1256ffd0f578f4b33680c54d50ab6901d9098': Spring cleaning
|
59e493b32fcc8c1f5e665f1e0a5c1c9cb773e976 |
11-Mar-2013 |
John Hoford <hoford@google.com> |
am 6f3ff5b4: split filter show into multiple files * commit '6f3ff5b486e30221361afd066510a7374962fd09': split filter show into multiple files
|
bced6706a5c0a383e6cb9c5b9b7ddf4dd11f1a1d |
11-Mar-2013 |
Michael Kolb <kolby@google.com> |
Merge "Spring cleaning" into gb-ub-photos-bryce
|
d3ebbcf13190110baddf3d60bc65400d2ff73099 |
11-Mar-2013 |
Michael Kolb <kolby@google.com> |
Merge "Spring cleaning" into gb-ub-photos-bryce
|
54c1256ffd0f578f4b33680c54d50ab6901d9098 |
11-Mar-2013 |
Michael Kolb <kolby@google.com> |
Merge "Spring cleaning" into gb-ub-photos-bryce
|
6f3ff5b486e30221361afd066510a7374962fd09 |
11-Mar-2013 |
John Hoford <hoford@google.com> |
split filter show into multiple files Change-Id: I3d6b61ed893befa24a8c8306981d74096db91535
es/layout-land/filtershow_activity.xml
es/layout/filtershow_activity.xml
es/layout/filtershow_category_panel.xml
es/layout/filtershow_editor_panel.xml
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
|
5c6c86bea240bbaadf48ded1190d6ea4622b6986 |
11-Mar-2013 |
John Hoford <hoford@google.com> |
split filter show into multiple files Change-Id: I3d6b61ed893befa24a8c8306981d74096db91535
es/layout-land/filtershow_activity.xml
es/layout/filtershow_activity.xml
es/layout/filtershow_category_panel.xml
es/layout/filtershow_editor_panel.xml
|
f0765f183c87fc5ab47f5a05193a06f8fc95757e |
11-Mar-2013 |
John Hoford <hoford@google.com> |
split filter show into multiple files Change-Id: I3d6b61ed893befa24a8c8306981d74096db91535
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
|
bd4c5321fc3ff77b3e3329bb28596e50cfa6344a |
09-Mar-2013 |
Michael Kolb <kolby@google.com> |
Spring cleaning Change-Id: I00d7176301501784a6a400bc9ea2cb23ff9ec90a
rc/com/android/camera/PreviewGestures.java
|
d6954f337e20365fc24ecffdd6f30e17c6b31eff |
09-Mar-2013 |
Michael Kolb <kolby@google.com> |
Spring cleaning Change-Id: I00d7176301501784a6a400bc9ea2cb23ff9ec90a
rc/com/android/camera/CameraModule.java
rc/com/android/camera/FocusOverlayManager.java
rc/com/android/camera/MediaSaveService.java
rc/com/android/camera/PanoramaModule.java
rc/com/android/camera/PhotoController.java
rc/com/android/camera/PhotoMenu.java
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/PhotoUI.java
rc/com/android/camera/PreviewGestures.java
rc/com/android/camera/VideoController.java
rc/com/android/camera/VideoMenu.java
rc/com/android/camera/VideoModule.java
|
b28942d44bcfcef145aece58545b07332a741c05 |
09-Mar-2013 |
Michael Kolb <kolby@google.com> |
Spring cleaning Change-Id: I00d7176301501784a6a400bc9ea2cb23ff9ec90a
rc/com/android/camera/CameraModule.java
rc/com/android/camera/FocusOverlayManager.java
rc/com/android/camera/MediaSaveService.java
rc/com/android/camera/PanoramaModule.java
rc/com/android/camera/PhotoController.java
rc/com/android/camera/PhotoMenu.java
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/PhotoUI.java
rc/com/android/camera/PreviewGestures.java
rc/com/android/camera/VideoController.java
rc/com/android/camera/VideoMenu.java
rc/com/android/camera/VideoModule.java
|
69bcf9d38f8fe2281e5b60b0c8e8efa1c4636b84 |
11-Mar-2013 |
John Hoford <hoford@google.com> |
am 533fb9ae: am a937e06e: am 0364b363: am 6a07dfbe: refactoring to make Editor classes do more * commit '533fb9aeb2e68438918f403e5b8d4696ea4f685e': refactoring to make Editor classes do more
|
4ee856bd74dfbabc9feeb5deb7f229dce745a1d0 |
11-Mar-2013 |
John Hoford <hoford@google.com> |
am a937e06e: am 0364b363: am 6a07dfbe: refactoring to make Editor classes do more * commit 'a937e06ed6cdd83aa3f6dcba90e89b7e45f363f1': refactoring to make Editor classes do more
|
7c8df47861e4b684196b346aa9573f76a64722e3 |
11-Mar-2013 |
John Hoford <hoford@google.com> |
am 0364b363: am 6a07dfbe: refactoring to make Editor classes do more * commit '0364b363468ee047ce7ac02134424837048ac6df': refactoring to make Editor classes do more
|
e0d039a2cf4547072d766ccfdc9a610178ea86f7 |
11-Mar-2013 |
John Hoford <hoford@google.com> |
am 6a07dfbe: refactoring to make Editor classes do more * commit '6a07dfbe03c8396cc43840a1630ea480a2cff663': refactoring to make Editor classes do more
|
6a07dfbe03c8396cc43840a1630ea480a2cff663 |
11-Mar-2013 |
John Hoford <hoford@google.com> |
refactoring to make Editor classes do more Change-Id: Id0885929cf3a9410bd0e5d3bf96eb99e8c7e1cf9
es/drawable/filtershow_vertical_line.xml
es/layout-land/filtershow_activity.xml
es/layout/filtershow_activity.xml
es/layout/filtershow_default_editor.xml
es/layout/filtershow_tiny_planet_editor.xml
es/layout/filtershow_vignette_editor.xml
es/layout/filtershow_zoom_editor.xml
es/values/filtershow_color.xml
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/PanelController.java
rc/com/android/gallery3d/filtershow/editors/BasicEditor.java
rc/com/android/gallery3d/filtershow/editors/Editor.java
rc/com/android/gallery3d/filtershow/editors/EditorCurves.java
rc/com/android/gallery3d/filtershow/editors/EditorStraighten.java
rc/com/android/gallery3d/filtershow/editors/EditorTinyPlanet.java
rc/com/android/gallery3d/filtershow/imageshow/GeometryMetadata.java
rc/com/android/gallery3d/filtershow/imageshow/ImageShow.java
rc/com/android/gallery3d/filtershow/ui/ImageCurves.java
|
7c1bb24f0b7d240acee416dcb222b61830382dc8 |
11-Mar-2013 |
John Hoford <hoford@google.com> |
refactoring to make Editor classes do more Change-Id: Id0885929cf3a9410bd0e5d3bf96eb99e8c7e1cf9
es/drawable/filtershow_vertical_line.xml
es/layout-land/filtershow_activity.xml
es/layout/filtershow_activity.xml
es/layout/filtershow_default_editor.xml
es/layout/filtershow_tiny_planet_editor.xml
es/layout/filtershow_vignette_editor.xml
es/layout/filtershow_zoom_editor.xml
es/values/filtershow_color.xml
|
887bde65742747aea7ab6dcf7c300ca8ec1f1ebf |
11-Mar-2013 |
John Hoford <hoford@google.com> |
refactoring to make Editor classes do more Change-Id: Id0885929cf3a9410bd0e5d3bf96eb99e8c7e1cf9
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/PanelController.java
rc/com/android/gallery3d/filtershow/editors/BasicEditor.java
rc/com/android/gallery3d/filtershow/editors/Editor.java
rc/com/android/gallery3d/filtershow/editors/EditorCurves.java
rc/com/android/gallery3d/filtershow/editors/EditorStraighten.java
rc/com/android/gallery3d/filtershow/editors/EditorTinyPlanet.java
rc/com/android/gallery3d/filtershow/imageshow/GeometryMetadata.java
rc/com/android/gallery3d/filtershow/imageshow/ImageShow.java
rc/com/android/gallery3d/filtershow/ui/ImageCurves.java
|
213852feec4b9987cb632fa211acf5bcd23ff6ec |
11-Mar-2013 |
Jean-Baptiste Queru <jbq@google.com> |
am f21553ba: (-s ours) am 464aa220: (-s ours) am 9c2e42a2: am 009b0502: am 63e1a5a9: am 4c13ac43: am 73d8e5d2: (-s ours) am 63da0db6: (-s ours) Reconcile with jb-mr1-release - do not merge * commit 'f21553ba855e53d03c7e887346304c200c99844f':
|
b92af567290196bd53fbfe03a3138e7c55f9b5cf |
11-Mar-2013 |
Michael Kolb <kolby@google.com> |
am e4afb2c8: am 86d50ea5: am 4a9152a0: am de175c80: Don\'t record video before preview is started * commit 'e4afb2c886b07f0e349483398c43e44436a543e2': Don't record video before preview is started
|
773160e86acae7b1b05850289f1a37c49acdc5d8 |
11-Mar-2013 |
Jean-Baptiste Queru <jbq@google.com> |
am 464aa220: (-s ours) am 9c2e42a2: am 009b0502: am 63e1a5a9: am 4c13ac43: am 73d8e5d2: (-s ours) am 63da0db6: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '464aa220ca5b6f2b392d742e95edca7e1a86dc12':
|
f0976f756736acb1f31e543401825c66a513372f |
11-Mar-2013 |
Jean-Baptiste Queru <jbq@google.com> |
am 9c2e42a2: am 009b0502: am 63e1a5a9: am 4c13ac43: am 73d8e5d2: (-s ours) am 63da0db6: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '9c2e42a2ed84f668bd759190481c5144421f1fd8':
|
92cdf5f9aa4be0c2f2f5a39288a3fec74d2996fc |
11-Mar-2013 |
Michael Kolb <kolby@google.com> |
am 86d50ea5: am 4a9152a0: am de175c80: Don\'t record video before preview is started * commit '86d50ea5a8a86edd4f3ce2ecf9687fb0d965615b': Don't record video before preview is started
|
025ac5cb733c34920f1f97f5a9b8387d88871d8c |
11-Mar-2013 |
Michael Kolb <kolby@google.com> |
am 4a9152a0: am de175c80: Don\'t record video before preview is started * commit '4a9152a04ffdc20407cc11978e4dd92ec1128c1e': Don't record video before preview is started
|
457b120366b21388b397577469e79b09bc39c1ac |
11-Mar-2013 |
Jean-Baptiste Queru <jbq@google.com> |
am 009b0502: am 63e1a5a9: am 4c13ac43: am 73d8e5d2: (-s ours) am 63da0db6: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '009b05028ced67523e257a2abbdc5c07776f0ceb':
|
009b05028ced67523e257a2abbdc5c07776f0ceb |
11-Mar-2013 |
Jean-Baptiste Queru <jbq@google.com> |
am 63e1a5a9: am 4c13ac43: am 73d8e5d2: (-s ours) am 63da0db6: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '63e1a5a9076f90e9e704e06956ba414a1d28c6a3':
|
c2aed29d423b9a7f11c7af643ad6b5233fb4550f |
11-Mar-2013 |
Michael Kolb <kolby@google.com> |
am de175c80: Don\'t record video before preview is started * commit 'de175c806c524e08b4ca7c6ec991a5610c3856d9': Don't record video before preview is started
|
63e1a5a9076f90e9e704e06956ba414a1d28c6a3 |
11-Mar-2013 |
Jean-Baptiste Queru <jbq@google.com> |
am 4c13ac43: am 73d8e5d2: (-s ours) am 63da0db6: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '4c13ac4382d3bde4eb8b3c448a8ee6cb05a541d0':
|
de175c806c524e08b4ca7c6ec991a5610c3856d9 |
11-Mar-2013 |
Michael Kolb <kolby@google.com> |
Don't record video before preview is started Bug: 8358998 Change-Id: I5d2380020b3e999f904b8a715324db13b25ebb5a
rc/com/android/camera/VideoModule.java
|
b1aeb3963fb67b1ea251cb5f7790b2d2f8261a0c |
11-Mar-2013 |
Michael Kolb <kolby@google.com> |
Don't record video before preview is started Bug: 8358998 Change-Id: I5d2380020b3e999f904b8a715324db13b25ebb5a
rc/com/android/camera/VideoModule.java
|
4c13ac4382d3bde4eb8b3c448a8ee6cb05a541d0 |
11-Mar-2013 |
Jean-Baptiste Queru <jbq@google.com> |
am 73d8e5d2: (-s ours) am 63da0db6: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '73d8e5d2652b7fd50361d4fc4542140c62591404':
|
73d8e5d2652b7fd50361d4fc4542140c62591404 |
11-Mar-2013 |
Jean-Baptiste Queru <jbq@google.com> |
am 63da0db6: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '63da0db6333796d7b3a94af55de58039cea94b8d':
|
578dbd654a6d02160913c54c510fdb03b9202b9a |
11-Mar-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am aa8e41b3: am 9dd535cd: am 9941f7f6: am f07bb274: Clear Gallery\'s bitmap pool before starting photoeditor. * commit 'aa8e41b39b2f30bcabe392d1fae6827fb3ac241e': Clear Gallery's bitmap pool before starting photoeditor.
|
63da0db6333796d7b3a94af55de58039cea94b8d |
11-Mar-2013 |
Jean-Baptiste Queru <jbq@google.com> |
Reconcile with jb-mr1-release - do not merge
|
8ea27b32c99402171c58f08454e1e8e5cc24dd1b |
11-Mar-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 9dd535cd: am 9941f7f6: am f07bb274: Clear Gallery\'s bitmap pool before starting photoeditor. * commit '9dd535cdd1c712c4a67452a271332235c2c0a969': Clear Gallery's bitmap pool before starting photoeditor.
|
6dedcf245bcb842ef835ae8b7f23c461435d390a |
11-Mar-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 9941f7f6: am f07bb274: Clear Gallery\'s bitmap pool before starting photoeditor. * commit '9941f7f6d254580b23832b16ddbe9f93e26d443c': Clear Gallery's bitmap pool before starting photoeditor.
|
a2c4c646ba7938fb67bb4ff9d69a924682ddf2b6 |
11-Mar-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am f07bb274: Clear Gallery\'s bitmap pool before starting photoeditor. * commit 'f07bb27436a65b233c1caf4aa06c6257a9cf4046': Clear Gallery's bitmap pool before starting photoeditor.
|
4ef1d738b796d9b6af448d9bfc46e262a97eafcd |
11-Mar-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Clear Gallery's bitmap pool before starting photoeditor. Change-Id: Iaa1f559db12ba22e53673b2e9fe2c3fbabf33514
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
|
f07bb27436a65b233c1caf4aa06c6257a9cf4046 |
11-Mar-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Clear Gallery's bitmap pool before starting photoeditor. Change-Id: Iaa1f559db12ba22e53673b2e9fe2c3fbabf33514
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
|
1db40e57cb669714f81aedd5cf4bb77a8f7fb1a5 |
11-Mar-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am cf376f9f: am 4e04979c: am 4e47e35b: am 5a17cc93: Merge "Revert "Clear Gallery\'s bitmap pool on photo editor start. Minor refactoring."" into gb-ub-photos-bryce * commit 'cf376f9f43a9e72f27915b9c02f5e9e979b86a6e': Revert "Clear Gallery's bitmap pool on photo editor start. Minor refactoring."
|
6154985ef2208d824e784ef914062c87b15ad659 |
11-Mar-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 4e04979c: am 4e47e35b: am 5a17cc93: Merge "Revert "Clear Gallery\'s bitmap pool on photo editor start. Minor refactoring."" into gb-ub-photos-bryce * commit '4e04979c13201368e82a3ed2052d7406beb714fe': Revert "Clear Gallery's bitmap pool on photo editor start. Minor refactoring."
|
ab923bd0cd4ffde9b333a6ee5efdf722dac0d46b |
11-Mar-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 4e47e35b: am 5a17cc93: Merge "Revert "Clear Gallery\'s bitmap pool on photo editor start. Minor refactoring."" into gb-ub-photos-bryce * commit '4e47e35b259a3b52db8d23a1d9f76842d8c76566': Revert "Clear Gallery's bitmap pool on photo editor start. Minor refactoring."
|
1335b37eb2c98da72c51b67b1e14f4c79b0ec8ac |
11-Mar-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 5a17cc93: Merge "Revert "Clear Gallery\'s bitmap pool on photo editor start. Minor refactoring."" into gb-ub-photos-bryce * commit '5a17cc93c3a34f0494eaa38353c0ac727086222d': Revert "Clear Gallery's bitmap pool on photo editor start. Minor refactoring."
|
6231c5eefb9a05a719907753e1c6145243d98b50 |
11-Mar-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 33317221: am 0ec2298d: am 549f55a8: am 9ecbf66d: Merge "Clear Gallery\'s bitmap pool on photo editor start. Minor refactoring." into gb-ub-photos-bryce * commit '3331722130ccd9b32e0ba0ee4be9eedf1bb9ae1f': Clear Gallery's bitmap pool on photo editor start. Minor refactoring.
|
e0654dad632fa12959335dc68d6ae27b0d846376 |
11-Mar-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Revert "Clear Gallery's bitmap pool on photo editor start. Minor refactoring."" into gb-ub-photos-bryce
|
5a17cc93c3a34f0494eaa38353c0ac727086222d |
11-Mar-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Revert "Clear Gallery's bitmap pool on photo editor start. Minor refactoring."" into gb-ub-photos-bryce
|
ce2ca1181a6c9e936a7089b3f3bf16efea64170c |
11-Mar-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 0ec2298d: am 549f55a8: am 9ecbf66d: Merge "Clear Gallery\'s bitmap pool on photo editor start. Minor refactoring." into gb-ub-photos-bryce * commit '0ec2298d848791d5ac3114f73f780902ad95d123': Clear Gallery's bitmap pool on photo editor start. Minor refactoring.
|
91cd1c2654ed9d7540be06569b548569aa9ecd28 |
11-Mar-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Revert "Clear Gallery's bitmap pool on photo editor start. Minor refactoring." This reverts commit 65948b17607d6fab9a2561749a90e16889fd1eea Change-Id: Iea682767fced173fe56dd6e91244f0ef70d1f74b
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/cache/ImageLoader.java
rc/com/android/gallery3d/filtershow/tools/BitmapTask.java
|
c01187e2ef31115518cd1eb900ebf4cfa14e1976 |
11-Mar-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Revert "Clear Gallery's bitmap pool on photo editor start. Minor refactoring." This reverts commit 65948b17607d6fab9a2561749a90e16889fd1eea Change-Id: Iea682767fced173fe56dd6e91244f0ef70d1f74b
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/cache/ImageLoader.java
rc/com/android/gallery3d/filtershow/tools/BitmapTask.java
|
a2eafc8118c36b6df3a6987f49a16b1c6f0c30cd |
11-Mar-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 549f55a8: am 9ecbf66d: Merge "Clear Gallery\'s bitmap pool on photo editor start. Minor refactoring." into gb-ub-photos-bryce * commit '549f55a82bc26d9a681434e2f08706c3f5c3fe39': Clear Gallery's bitmap pool on photo editor start. Minor refactoring.
|
8d866a3b98fd9203ca69dd146d8e26ee5cb89062 |
11-Mar-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 9ecbf66d: Merge "Clear Gallery\'s bitmap pool on photo editor start. Minor refactoring." into gb-ub-photos-bryce * commit '9ecbf66d54204f78e9b51bee6f76d2bde1dc6882': Clear Gallery's bitmap pool on photo editor start. Minor refactoring.
|
7b5e88bf8ce55d9b5bd757eada579422cee2a246 |
11-Mar-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Clear Gallery's bitmap pool on photo editor start. Minor refactoring." into gb-ub-photos-bryce
|
9ecbf66d54204f78e9b51bee6f76d2bde1dc6882 |
11-Mar-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Clear Gallery's bitmap pool on photo editor start. Minor refactoring." into gb-ub-photos-bryce
|
6320d90fb41fe1276a02b17fa27a660e76f21ba8 |
11-Mar-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Clear Gallery's bitmap pool on photo editor start. Minor refactoring. Change-Id: I02e29bf6cfd85a9cecd3850f8828cccae91badd2
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/cache/ImageLoader.java
rc/com/android/gallery3d/filtershow/tools/BitmapTask.java
|
65948b17607d6fab9a2561749a90e16889fd1eea |
11-Mar-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Clear Gallery's bitmap pool on photo editor start. Minor refactoring. Change-Id: I02e29bf6cfd85a9cecd3850f8828cccae91badd2
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/cache/ImageLoader.java
rc/com/android/gallery3d/filtershow/tools/BitmapTask.java
|
c5b6649807c2ab8b0edbf01927305b726243773f |
11-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
am bcc1fd12: am 84814bc9: am 41a8581c: am 6019ad95: Add tiled background * commit 'bcc1fd12f03bb19d55367ef13c751581d23d8d4e': Add tiled background
|
d8d7008e9a737669b62070c7245b0150d826fd87 |
11-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
am 84814bc9: am 41a8581c: am 6019ad95: Add tiled background * commit '84814bc98446c9ff6e3e299e4c167a06f9f89649': Add tiled background
|
59ce6aa4955920723702544b8dd30f1f5f6775ee |
11-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
am 41a8581c: am 6019ad95: Add tiled background * commit '41a8581cdb2eea01b996936b44a83211a18b06a5': Add tiled background
|
3e1c2efd2682a9af7e3ca2f8eac0fdef42231947 |
11-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
am 6019ad95: Add tiled background * commit '6019ad95f1c85786488d2d4cae1cbb665d33bd30': Add tiled background
|
8124706f162f15238e92ca72e7fcf18c12d32eda |
09-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
Add tiled background Change-Id: I52292f6cae4f1121795829663dc4738cb38a953b
es/drawable/filtershow_background.png
es/drawable/filtershow_tiled_background.xml
es/layout-land/filtershow_activity.xml
es/layout/filtershow_activity.xml
es/layout/filtershow_history_operation_row.xml
es/layout/filtershow_history_panel.xml
es/layout/filtershow_state_panel.xml
|
28bf7ac129344ca6306d83fc114759c9cf923806 |
09-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
Add tiled background Change-Id: I52292f6cae4f1121795829663dc4738cb38a953b
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/HistoryAdapter.java
rc/com/android/gallery3d/filtershow/imageshow/ImageShow.java
|
6019ad95f1c85786488d2d4cae1cbb665d33bd30 |
09-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
Add tiled background Change-Id: I52292f6cae4f1121795829663dc4738cb38a953b
es/drawable/filtershow_background.png
es/drawable/filtershow_tiled_background.xml
es/layout-land/filtershow_activity.xml
es/layout/filtershow_activity.xml
es/layout/filtershow_history_operation_row.xml
es/layout/filtershow_history_panel.xml
es/layout/filtershow_state_panel.xml
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/HistoryAdapter.java
rc/com/android/gallery3d/filtershow/imageshow/ImageShow.java
|
99ae139f7cf52a483d34a9402554e035f457f38b |
11-Mar-2013 |
The Android Automerger <android-build@android.com> |
merge in jb-mr2-release history after reset to jb-mr2-dev
|
715516d16afc58e03e8258545cab83f81e05c1ff |
09-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
am 1613bf07: am 253e6e22: am 776d8751: am 402dd963: Clear border resources to save memory * commit '1613bf07b552dcbfe67898decdbe143315b912a4': Clear border resources to save memory
|
542c0a7a724a6dba173783647c017575f9dea860 |
09-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
am 253e6e22: am 776d8751: am 402dd963: Clear border resources to save memory * commit '253e6e224c06c398c00e0814b23b8ee7c8a0456e': Clear border resources to save memory
|
21808817e21cc1b0784a3603fe7a13f137e9cdc2 |
09-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
am 776d8751: am 402dd963: Clear border resources to save memory * commit '776d87513f87608c340ad12ec12775ae47ea94ce': Clear border resources to save memory
|
72b6f457d49c18716a90a65b887192fb7d663096 |
09-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
am 402dd963: Clear border resources to save memory * commit '402dd963ad8fb1dfed81cca63cbaf82e93533a94': Clear border resources to save memory
|
976e017fa90c7134ef62cd69f61bbc08315b6042 |
09-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
Clear border resources to save memory Change-Id: I1bd9668eb3c7b2815bdc0123445185c8f9d21ad2
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/filters/FilterImageBorderRepresentation.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterBorder.java
|
402dd963ad8fb1dfed81cca63cbaf82e93533a94 |
09-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
Clear border resources to save memory Change-Id: I1bd9668eb3c7b2815bdc0123445185c8f9d21ad2
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/filters/FilterImageBorderRepresentation.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterBorder.java
|
bfef719b34ba8548e789665c3696ac980831dbeb |
09-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
Clear border resources to save memory Change-Id: I1bd9668eb3c7b2815bdc0123445185c8f9d21ad2
rc/com/android/gallery3d/filtershow/filters/FilterImageBorderRepresentation.java
|
ea545b9600fc5f66635fa3556f45c39a182c8691 |
09-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
am 3291095b: am 0b917145: am 45a47c33: am 259bb0f4: Merge "Memory usage improvements, speed improvement - free filters resources agressively - implements multiple rendering pipelines - some cleanup" into gb-ub-photos-bryce * commit '3291095bf16a5dfb8b760c8a72ed549ffc3809fd': Memory usage improvements, speed improvement - free filters resources agressively - implements multiple rendering pipelines - some cleanup
|
6c9e323e1ef492728b4d63b916e0bcf19c9d1357 |
09-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
am 0b917145: am 45a47c33: am 259bb0f4: Merge "Memory usage improvements, speed improvement - free filters resources agressively - implements multiple rendering pipelines - some cleanup" into gb-ub-photos-bryce * commit '0b9171455ca5718292c5f2f573a15432bccf480c': Memory usage improvements, speed improvement - free filters resources agressively - implements multiple rendering pipelines - some cleanup
|
7a0845dd4a7c55c3df3210a3c0099044ef41ba6c |
09-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
am 45a47c33: am 259bb0f4: Merge "Memory usage improvements, speed improvement - free filters resources agressively - implements multiple rendering pipelines - some cleanup" into gb-ub-photos-bryce * commit '45a47c33942bcee9b51597e032bd1ebf330050e9': Memory usage improvements, speed improvement - free filters resources agressively - implements multiple rendering pipelines - some cleanup
|
602a4cd94e36b973b48c111cea7da9b3dfa290d2 |
09-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
am 259bb0f4: Merge "Memory usage improvements, speed improvement - free filters resources agressively - implements multiple rendering pipelines - some cleanup" into gb-ub-photos-bryce * commit '259bb0f4a960d87bc0d3fa7d3b9f626bf1f16d0c': Memory usage improvements, speed improvement - free filters resources agressively - implements multiple rendering pipelines - some cleanup
|
375705a63eea9dd2eb329d5ff42aeb9f9f73465c |
09-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
Merge "Memory usage improvements, speed improvement - free filters resources agressively - implements multiple rendering pipelines - some cleanup" into gb-ub-photos-bryce
|
259bb0f4a960d87bc0d3fa7d3b9f626bf1f16d0c |
09-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
Merge "Memory usage improvements, speed improvement - free filters resources agressively - implements multiple rendering pipelines - some cleanup" into gb-ub-photos-bryce
|
b28f50eeb5bd4f6081405ad2698bdcd08c4d9fad |
09-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
Merge "Memory usage improvements, speed improvement - free filters resources agressively - implements multiple rendering pipelines - some cleanup" into gb-ub-photos-bryce
|
8f87def525800a584ea38bff209ceb1e80e95078 |
08-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
Memory usage improvements, speed improvement - free filters resources agressively - implements multiple rendering pipelines - some cleanup Change-Id: Ib9ed268b0b2662d0bf5c049adcf046b556954c37
rc/com/android/gallery3d/filtershow/cache/BitmapCache.java
rc/com/android/gallery3d/filtershow/cache/Cache.java
rc/com/android/gallery3d/filtershow/cache/FilteringPipeline.java
rc/com/android/gallery3d/filtershow/cache/ImageLoader.java
rc/com/android/gallery3d/filtershow/cache/RenderingRequest.java
rc/com/android/gallery3d/filtershow/filters/BaseFiltersManager.java
rc/com/android/gallery3d/filtershow/filters/FilterImageBorderRepresentation.java
rc/com/android/gallery3d/filtershow/filters/ImageFilter.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterRS.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterSharpen.java
rc/com/android/gallery3d/filtershow/imageshow/MasterImage.java
rc/com/android/gallery3d/filtershow/presets/FilterEnvironment.java
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
rc/com/android/gallery3d/filtershow/tools/SaveCopyTask.java
rc_pd/com/android/gallery3d/filtershow/filters/FiltersManager.java
|
7706e506dc74fa634a69b9ce8c7e5e2c457f01fc |
08-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
Memory usage improvements, speed improvement - free filters resources agressively - implements multiple rendering pipelines - some cleanup Change-Id: Ib9ed268b0b2662d0bf5c049adcf046b556954c37
rc/com/android/gallery3d/filtershow/cache/BitmapCache.java
rc/com/android/gallery3d/filtershow/cache/Cache.java
rc/com/android/gallery3d/filtershow/cache/FilteringPipeline.java
rc/com/android/gallery3d/filtershow/cache/ImageLoader.java
rc/com/android/gallery3d/filtershow/cache/RenderingRequest.java
rc/com/android/gallery3d/filtershow/filters/BaseFiltersManager.java
rc/com/android/gallery3d/filtershow/filters/FilterImageBorderRepresentation.java
rc/com/android/gallery3d/filtershow/filters/ImageFilter.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterRS.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterSharpen.java
rc/com/android/gallery3d/filtershow/imageshow/MasterImage.java
rc/com/android/gallery3d/filtershow/presets/FilterEnvironment.java
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
rc/com/android/gallery3d/filtershow/tools/SaveCopyTask.java
rc_pd/com/android/gallery3d/filtershow/filters/FiltersManager.java
|
b99bc54030c67f34d51468817f51e5e109df10df |
08-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
Memory usage improvements, speed improvement - free filters resources agressively - implements multiple rendering pipelines - some cleanup Change-Id: Ib9ed268b0b2662d0bf5c049adcf046b556954c37
rc/com/android/gallery3d/filtershow/filters/FilterImageBorderRepresentation.java
rc/com/android/gallery3d/filtershow/presets/FilterEnvironment.java
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
|
899a6346d97297477b2fcdaf55042e209852c8a6 |
09-Mar-2013 |
Bobby Georgescu <georgescu@google.com> |
am df041ac4: am 02ddf11a: am 77f26894: am 08157c9c: Merge "Add sharing support" into gb-ub-photos-bryce * commit 'df041ac4d54822b36b5a59a14f99f490786fffa3': Add sharing support
|
ef4e60c8723eb1ae284ca5016747616c5edb273f |
09-Mar-2013 |
Bobby Georgescu <georgescu@google.com> |
am 02ddf11a: am 77f26894: am 08157c9c: Merge "Add sharing support" into gb-ub-photos-bryce * commit '02ddf11a89841caf2307093a3878ab5f586a3e8e': Add sharing support
|
0a830577346b417101018724c4cd34dab5f90711 |
09-Mar-2013 |
Bobby Georgescu <georgescu@google.com> |
am 77f26894: am 08157c9c: Merge "Add sharing support" into gb-ub-photos-bryce * commit '77f268944a6c3262f4aeabbfe5ae2a904c0bc5c0': Add sharing support
|
71e419d4a4ce0412e68f311804f40fe6369ce775 |
09-Mar-2013 |
Bobby Georgescu <georgescu@google.com> |
am 08157c9c: Merge "Add sharing support" into gb-ub-photos-bryce * commit '08157c9c2a1eb63dabd756f49e7b8fefe4b25c50': Add sharing support
|
6333cb430ad3b354e0073266b58f8807b0b905ab |
09-Mar-2013 |
Bobby Georgescu <georgescu@google.com> |
Merge "Add sharing support" into gb-ub-photos-bryce
|
08157c9c2a1eb63dabd756f49e7b8fefe4b25c50 |
09-Mar-2013 |
Bobby Georgescu <georgescu@google.com> |
Merge "Add sharing support" into gb-ub-photos-bryce
|
8f69397b9c6acf6da28244a8ccea596546f34f87 |
07-Mar-2013 |
Bobby Georgescu <georgescu@google.com> |
Add sharing support Change-Id: I2c7f18b0d6dd057c1fba96c1133d563f32abf55c
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
|
e5e563c6bacff6ae25d1cb0e1ee77abdfa8002ea |
07-Mar-2013 |
Bobby Georgescu <georgescu@google.com> |
Add sharing support Change-Id: I2c7f18b0d6dd057c1fba96c1133d563f32abf55c
es/menu/gallery_multiselect.xml
|
755e327f63197c2798394bc805df8d98c2f6b6d3 |
07-Mar-2013 |
Bobby Georgescu <georgescu@google.com> |
Add sharing support Change-Id: I2c7f18b0d6dd057c1fba96c1133d563f32abf55c
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
rc/com/android/photos/GalleryActivity.java
rc/com/android/photos/PhotoSetFragment.java
rc/com/android/photos/SelectionManager.java
rc/com/android/photos/adapters/PhotoThumbnailAdapter.java
rc/com/android/photos/data/PhotoSetLoader.java
rc/com/android/photos/shims/BitmapJobDrawable.java
rc/com/android/photos/shims/MediaItemsLoader.java
|
fb6132b0b3079153fd1d15acf1dc3c6100aa2e00 |
07-Mar-2013 |
Bobby Georgescu <georgescu@google.com> |
Add sharing support Change-Id: I2c7f18b0d6dd057c1fba96c1133d563f32abf55c
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
es/menu/gallery_multiselect.xml
rc/com/android/photos/GalleryActivity.java
rc/com/android/photos/PhotoSetFragment.java
rc/com/android/photos/SelectionManager.java
rc/com/android/photos/adapters/PhotoThumbnailAdapter.java
rc/com/android/photos/data/PhotoSetLoader.java
rc/com/android/photos/shims/BitmapJobDrawable.java
rc/com/android/photos/shims/MediaItemsLoader.java
|
5f3b181238daed927ec577294d9830e2a0fd287e |
09-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
am ae26e892: am 657d2b80: am 6414da1c: am 0f1d09c9: Merge "Implements double-tap to zoom" into gb-ub-photos-bryce * commit 'ae26e892029bfb9c6a1c579585924ca331055f68': Implements double-tap to zoom
|
ef5bf13785b0e9e5393ab319785ee5e7361bebd8 |
09-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
am 657d2b80: am 6414da1c: am 0f1d09c9: Merge "Implements double-tap to zoom" into gb-ub-photos-bryce * commit '657d2b80183057039675b35db6e0e5a103f7577a': Implements double-tap to zoom
|
f155d97a7fe317abd9fa321defca3988785c693b |
09-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
am 6414da1c: am 0f1d09c9: Merge "Implements double-tap to zoom" into gb-ub-photos-bryce * commit '6414da1cd348f2d5551e2af1c4a6a7a614951ecc': Implements double-tap to zoom
|
66c766ffe62067aad98ac9810739a80bc53253a4 |
09-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
am 0f1d09c9: Merge "Implements double-tap to zoom" into gb-ub-photos-bryce * commit '0f1d09c93b961369a0e6aef7b6ec708052099e21': Implements double-tap to zoom
|
b04ff63a0c3b6dab780ead467586d3a52363a6d2 |
09-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
Merge "Implements double-tap to zoom" into gb-ub-photos-bryce
|
0f1d09c93b961369a0e6aef7b6ec708052099e21 |
09-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
Merge "Implements double-tap to zoom" into gb-ub-photos-bryce
|
d67b04acddf651017b0a2b11df05fc07e050d982 |
08-Mar-2013 |
Bart Sears <bsears@google.com> |
am bc771f31: am a29a78a4: am a4e10299: am db2a1e4d: Merge "Bump up the version number to 1.1.40004" into gb-ub-photos-bryce * commit 'bc771f31d98ef60ef2adf627c24d78aad51754fa': Bump up the version number to 1.1.40004
|
51c95c9f9516ce0fc5298017d4fd61143dd718fa |
08-Mar-2013 |
John Reck <jreck@google.com> |
am 576996fd: am b3216555: am 388eea50: am f6e687bc: Support clicking on photos to view them * commit '576996fd1564fc3ab7948841144b7dc4a0daee8a': Support clicking on photos to view them
|
1714424b2e0c8198fd14e7de8e772e6cad997298 |
08-Mar-2013 |
Bart Sears <bsears@google.com> |
am a29a78a4: am a4e10299: am db2a1e4d: Merge "Bump up the version number to 1.1.40004" into gb-ub-photos-bryce * commit 'a29a78a47121d3445c05bd6c83f46775c58a38bd': Bump up the version number to 1.1.40004
|
784937dd6848c3552d82f9850cb3fb123bc874fe |
08-Mar-2013 |
John Reck <jreck@google.com> |
am b3216555: am 388eea50: am f6e687bc: Support clicking on photos to view them * commit 'b321655532e0cd5efca5560aa34cdfc3455e7e64': Support clicking on photos to view them
|
38231ba350427f9764f43c7864664faa6575b79e |
08-Mar-2013 |
Bart Sears <bsears@google.com> |
am a4e10299: am db2a1e4d: Merge "Bump up the version number to 1.1.40004" into gb-ub-photos-bryce * commit 'a4e10299bb6f5591d8b2badb78688b745a281f47': Bump up the version number to 1.1.40004
|
6eaf3c554323517aa84e9febe99f4cc7214acd57 |
08-Mar-2013 |
John Reck <jreck@google.com> |
am 388eea50: am f6e687bc: Support clicking on photos to view them * commit '388eea509400e46428a0b0ec1c46a9b0703e4ec5': Support clicking on photos to view them
|
8ba476053059d4783a4a550edac2a4464fa8c374 |
08-Mar-2013 |
Bart Sears <bsears@google.com> |
am db2a1e4d: Merge "Bump up the version number to 1.1.40004" into gb-ub-photos-bryce * commit 'db2a1e4d1091f3422845d48d4b24cb6995fc68f8': Bump up the version number to 1.1.40004
|
74bab1d935ae2bd0ba9b30ee4d377ee39b2cd375 |
08-Mar-2013 |
Bart Sears <bsears@google.com> |
Merge "Bump up the version number to 1.1.40004" into gb-ub-photos-bryce
|
db2a1e4d1091f3422845d48d4b24cb6995fc68f8 |
08-Mar-2013 |
Bart Sears <bsears@google.com> |
Merge "Bump up the version number to 1.1.40004" into gb-ub-photos-bryce
|
4038a5b733b3d6621e3593badf6c46f64325e046 |
08-Mar-2013 |
Bart Sears <bsears@google.com> |
Bump up the version number to 1.1.40004 Change-Id: If5e430e9877c6b881f33893a544313eff0647ce5
ndroidManifest.xml
|
bb69ac1f43192dc10ce350f6f42f81cb69b87e76 |
08-Mar-2013 |
Bart Sears <bsears@google.com> |
Bump up the version number to 1.1.40004 Change-Id: If5e430e9877c6b881f33893a544313eff0647ce5
ndroidManifest.xml
|
4ce3c5b51f151d201aca357306af1338cdb55758 |
08-Mar-2013 |
John Reck <jreck@google.com> |
am f6e687bc: Support clicking on photos to view them * commit 'f6e687bc30887695374580712092aeb917c84253': Support clicking on photos to view them
|
0d84f476ed24922864f39d54e09274f6feac085e |
08-Mar-2013 |
John Reck <jreck@google.com> |
Support clicking on photos to view them Change-Id: I511af0cbe46c833d81cbbd563b9c2b4feec2bffe
rc/com/android/photos/AlbumSetFragment.java
rc/com/android/photos/PhotoSetFragment.java
rc/com/android/photos/data/PhotoSetLoader.java
rc/com/android/photos/drawables/DrawableFactory.java
rc/com/android/photos/shims/LoaderCompatShim.java
rc/com/android/photos/shims/MediaItemsLoader.java
rc/com/android/photos/shims/MediaSetLoader.java
|
f6e687bc30887695374580712092aeb917c84253 |
08-Mar-2013 |
John Reck <jreck@google.com> |
Support clicking on photos to view them Change-Id: I511af0cbe46c833d81cbbd563b9c2b4feec2bffe
ndroidManifest.xml
rc/com/android/photos/AlbumSetFragment.java
rc/com/android/photos/PhotoSetFragment.java
rc/com/android/photos/data/PhotoSetLoader.java
rc/com/android/photos/drawables/DrawableFactory.java
rc/com/android/photos/shims/LoaderCompatShim.java
rc/com/android/photos/shims/MediaItemsLoader.java
rc/com/android/photos/shims/MediaSetLoader.java
|
211b65d8bd99ce6a6975043465f6c4432c72ed24 |
08-Mar-2013 |
John Reck <jreck@google.com> |
Support clicking on photos to view them Change-Id: I511af0cbe46c833d81cbbd563b9c2b4feec2bffe
ndroidManifest.xml
|
c83c703e5ba986f8b64350b2a78eaad61bb31da9 |
08-Mar-2013 |
John Reck <jreck@google.com> |
am e8932929: am 66e99b5f: am d675ab59: am d3d2e276: Support rotation * commit 'e8932929783c5321115eb3f322ccb245c2637eb2': Support rotation
|
6e585f5fac87939126c4ac0f2a86337e11bf607c |
08-Mar-2013 |
John Reck <jreck@google.com> |
am 66e99b5f: am d675ab59: am d3d2e276: Support rotation * commit '66e99b5f1855e88fd0f474b3bc860c039a5550e3': Support rotation
|
f07d22b668f5298c6b85b0f98a623255ad09fbe6 |
08-Mar-2013 |
John Reck <jreck@google.com> |
am d675ab59: am d3d2e276: Support rotation * commit 'd675ab593a3eeb46f1fccde621804263cf6babe4': Support rotation
|
d11330bafb78107f66560afcaee573994fbd22b5 |
08-Mar-2013 |
John Reck <jreck@google.com> |
am d3d2e276: Support rotation * commit 'd3d2e2763bb4187a2dd3ac350d3a3c51d092890a': Support rotation
|
d3d2e2763bb4187a2dd3ac350d3a3c51d092890a |
08-Mar-2013 |
John Reck <jreck@google.com> |
Support rotation Change-Id: Ic93bed50851f788803124ea2453128fd0497a746
rc/com/android/photos/shims/BitmapJobDrawable.java
|
75f1d6c7f6d9cb32187ff7d1bc443916c496e38a |
08-Mar-2013 |
John Reck <jreck@google.com> |
Support rotation Change-Id: Ic93bed50851f788803124ea2453128fd0497a746
rc/com/android/photos/shims/BitmapJobDrawable.java
|
520e88f0e66f7fdfffa52d7a90cbbbfcd892c130 |
08-Mar-2013 |
John Reck <jreck@google.com> |
am 193fe6bc: am ec6bdfed: am b9efb190: am f1787e59: Merge "Fix stuff" into gb-ub-photos-bryce * commit '193fe6bcca43b6c1a23ceef744d429da7399263b': Fix stuff
|
28222cc6a50e561a4a79c160f356cb4839e0ce5d |
08-Mar-2013 |
John Reck <jreck@google.com> |
am ec6bdfed: am b9efb190: am f1787e59: Merge "Fix stuff" into gb-ub-photos-bryce * commit 'ec6bdfed065559e75edb605c68fff0032a6c8095': Fix stuff
|
c5a5eb3238f5b5ba62fb80861c7f8672231f27ee |
08-Mar-2013 |
John Reck <jreck@google.com> |
am b9efb190: am f1787e59: Merge "Fix stuff" into gb-ub-photos-bryce * commit 'b9efb190b871e2f0eddef15da02b7030217d32ae': Fix stuff
|
80224f84d9a0539a01c39df605e2b4d482eb1e9d |
08-Mar-2013 |
John Reck <jreck@google.com> |
am f1787e59: Merge "Fix stuff" into gb-ub-photos-bryce * commit 'f1787e59ee4a6da2604d33eae36e59c15eee7523': Fix stuff
|
f1787e59ee4a6da2604d33eae36e59c15eee7523 |
08-Mar-2013 |
John Reck <jreck@google.com> |
Merge "Fix stuff" into gb-ub-photos-bryce
|
7924bfe301b05c3c38b9b4c1ec9af541688facff |
08-Mar-2013 |
John Reck <jreck@google.com> |
Merge "Fix stuff" into gb-ub-photos-bryce
|
b7ac6ff84972ad7c66965b779324a45e70053fa8 |
08-Mar-2013 |
Bobby Georgescu <georgescu@google.com> |
am 6bb1fd39: am 59befbf9: am 9b4da3bf: am 33a5a21f: Merge "Add possibility for UX improvement measurements" into gb-ub-photos-bryce * commit '6bb1fd39107c26d4158ca27b7ff9c8a7f7abab17': Add possibility for UX improvement measurements
|
f1968b2a57a521eb7ba63c7cb497280bc776d125 |
08-Mar-2013 |
Bobby Georgescu <georgescu@google.com> |
am 59befbf9: am 9b4da3bf: am 33a5a21f: Merge "Add possibility for UX improvement measurements" into gb-ub-photos-bryce * commit '59befbf93b690a1eb359e78f854dd044c742c35f': Add possibility for UX improvement measurements
|
638d9ec56c26d9f3cff55145ccbd20b35bb964f5 |
08-Mar-2013 |
John Reck <jreck@google.com> |
Fix stuff Change-Id: Ib263a00a13f169388e6ee796359255fda2a26b37
rc/com/android/photos/AlbumSetFragment.java
rc/com/android/photos/PhotoSetFragment.java
rc/com/android/photos/shims/BitmapJobDrawable.java
rc/com/android/photos/shims/MediaItemsLoader.java
rc/com/android/photos/shims/MediaSetLoader.java
|
6a8ded56f04fdac34bad34bc22f34df69228b9e6 |
08-Mar-2013 |
John Reck <jreck@google.com> |
Fix stuff Change-Id: Ib263a00a13f169388e6ee796359255fda2a26b37
rc/com/android/photos/AlbumSetFragment.java
rc/com/android/photos/PhotoSetFragment.java
rc/com/android/photos/shims/BitmapJobDrawable.java
rc/com/android/photos/shims/MediaItemsLoader.java
rc/com/android/photos/shims/MediaSetLoader.java
|
0c86dd3333cfe0cd558cc613159c6a039ab9aa78 |
08-Mar-2013 |
Bobby Georgescu <georgescu@google.com> |
am 9b4da3bf: am 33a5a21f: Merge "Add possibility for UX improvement measurements" into gb-ub-photos-bryce * commit '9b4da3bf17dfebd5a94c6e6cbc2fe77d051a9cd2': Add possibility for UX improvement measurements
|
465a83ccd26fad5159ba6ce3f7ffdca1a4e06911 |
08-Mar-2013 |
Bobby Georgescu <georgescu@google.com> |
am 33a5a21f: Merge "Add possibility for UX improvement measurements" into gb-ub-photos-bryce * commit '33a5a21f513209bd6261b88b060e63ed044b7755': Add possibility for UX improvement measurements
|
33a5a21f513209bd6261b88b060e63ed044b7755 |
08-Mar-2013 |
Bobby Georgescu <georgescu@google.com> |
Merge "Add possibility for UX improvement measurements" into gb-ub-photos-bryce
|
84931eeed7067c2607786fd3cd61b87d893d79f5 |
08-Mar-2013 |
Bobby Georgescu <georgescu@google.com> |
Merge "Add possibility for UX improvement measurements" into gb-ub-photos-bryce
|
7f19035680c02d2a769bc040a776a895aeb161f7 |
07-Mar-2013 |
Tim Murray <timmurray@google.com> |
am 262f0b97: am 38b80059: am d11b5c3f: am de72a83d: Merge "Add convertRGBAtoA." into gb-ub-photos-bryce * commit '262f0b97bc0f3dd0952ce4827f32a7a7583a5094': Add convertRGBAtoA.
|
d0bf7ffa3e80c3bbc703f09dddbbf8c8b22d48d0 |
07-Mar-2013 |
Tim Murray <timmurray@google.com> |
am 38b80059: am d11b5c3f: am de72a83d: Merge "Add convertRGBAtoA." into gb-ub-photos-bryce * commit '38b8005915648ed5dccd8270d5f81d1b2fa05e26': Add convertRGBAtoA.
|
7f184fa005bd05a4ccc6bab4bed01ac4d627a435 |
07-Mar-2013 |
Tim Murray <timmurray@google.com> |
am d11b5c3f: am de72a83d: Merge "Add convertRGBAtoA." into gb-ub-photos-bryce * commit 'd11b5c3f37cc1903e953fae0aed3cd9a964e297d': Add convertRGBAtoA.
|
f09e2a2493874e5d3283b6cdaccccd45900a347f |
07-Mar-2013 |
Tim Murray <timmurray@google.com> |
am de72a83d: Merge "Add convertRGBAtoA." into gb-ub-photos-bryce * commit 'de72a83d12de1183c8382c609af2da6ac829c011': Add convertRGBAtoA.
|
de72a83d12de1183c8382c609af2da6ac829c011 |
07-Mar-2013 |
Tim Murray <timmurray@google.com> |
Merge "Add convertRGBAtoA." into gb-ub-photos-bryce
|
e0a55d0735fd6f2fc48b1d960b6d353c2d8e72e9 |
07-Mar-2013 |
Tim Murray <timmurray@google.com> |
Merge "Add convertRGBAtoA." into gb-ub-photos-bryce
|
2d2c3866b0b78d50856fd6a72044ec8194bd7f20 |
07-Mar-2013 |
Bobby Georgescu <georgescu@google.com> |
am 975f427f: am e7d20532: am 88f8328b: am 62a1046c: Merge "Album set shim" into gb-ub-photos-bryce * commit '975f427f901bec6068b23f4b708f4209d1336b39': Album set shim
|
49d91c1493a69d5ec3cdd146b27edae2a2f981ce |
07-Mar-2013 |
Bobby Georgescu <georgescu@google.com> |
am e7d20532: am 88f8328b: am 62a1046c: Merge "Album set shim" into gb-ub-photos-bryce * commit 'e7d20532cb209f76d9aa90039834e84d27dcc48c': Album set shim
|
e8f92450bfd72e16d6f7838bdc849f95aeed0a47 |
07-Mar-2013 |
Bobby Georgescu <georgescu@google.com> |
am 88f8328b: am 62a1046c: Merge "Album set shim" into gb-ub-photos-bryce * commit '88f8328bf03ea1e037c4160a866655bc3851850f': Album set shim
|
b21c01019233b26f4b0211080af6418ef7f58c2a |
07-Mar-2013 |
Bobby Georgescu <georgescu@google.com> |
am 62a1046c: Merge "Album set shim" into gb-ub-photos-bryce * commit '62a1046c9482b4ac54d73130623ba7e37da2f275': Album set shim
|
62a1046c9482b4ac54d73130623ba7e37da2f275 |
07-Mar-2013 |
Bobby Georgescu <georgescu@google.com> |
Merge "Album set shim" into gb-ub-photos-bryce
|
37dae82890a04fd4912d3a704066cb800712686f |
07-Mar-2013 |
Bobby Georgescu <georgescu@google.com> |
Merge "Album set shim" into gb-ub-photos-bryce
|
bab7e655f1ad6fb7bb0281cd5b738792719f13cf |
07-Mar-2013 |
George Mount <mount@google.com> |
am 77799292: am 7140cb1f: am 5a95ad86: am 6f3bd23d: Merge "Add batch operations to PhotoProvider" into gb-ub-photos-bryce * commit '77799292189c7c2a827a0aa8ddfbd7f6a6d3de91': Add batch operations to PhotoProvider
|
a7723fb08098c0c7682b02cf459cafa3792a4ce4 |
07-Mar-2013 |
Tim Murray <timmurray@google.com> |
Add convertRGBAtoA. Change-Id: I358bc0517480883c470df51189f46fb238fde101
rc/com/android/gallery3d/filtershow/filters/ImageFilterRS.java
rc/com/android/gallery3d/filtershow/filters/grey.rs
|
cc3d6dcfdf3070f78fbef2b458349db71d32844b |
07-Mar-2013 |
Tim Murray <timmurray@google.com> |
Add convertRGBAtoA. Change-Id: I358bc0517480883c470df51189f46fb238fde101
rc/com/android/gallery3d/filtershow/filters/ImageFilterRS.java
rc/com/android/gallery3d/filtershow/filters/grey.rs
|
2a9f288245f4ead7d151f35e013742f46b96110d |
07-Mar-2013 |
George Mount <mount@google.com> |
am 7140cb1f: am 5a95ad86: am 6f3bd23d: Merge "Add batch operations to PhotoProvider" into gb-ub-photos-bryce * commit '7140cb1f127b0837fc9a852003a9ba242aa40108': Add batch operations to PhotoProvider
|
3099b4ea052e4bb742a3b0b204ce92bdfd8834f2 |
07-Mar-2013 |
George Mount <mount@google.com> |
am 5a95ad86: am 6f3bd23d: Merge "Add batch operations to PhotoProvider" into gb-ub-photos-bryce * commit '5a95ad869eedac439c1f9ef21c48cc0eb28e30fa': Add batch operations to PhotoProvider
|
38231686a3f61baecfecfc76e87075bcef8491d5 |
07-Mar-2013 |
George Mount <mount@google.com> |
am 6f3bd23d: Merge "Add batch operations to PhotoProvider" into gb-ub-photos-bryce * commit '6f3bd23d7fd83a67f5e357939b06057f40051df3': Add batch operations to PhotoProvider
|
6f3bd23d7fd83a67f5e357939b06057f40051df3 |
07-Mar-2013 |
George Mount <mount@google.com> |
Merge "Add batch operations to PhotoProvider" into gb-ub-photos-bryce
|
e988eba768db85bb81b335c0c1db5aad6988480d |
07-Mar-2013 |
George Mount <mount@google.com> |
Merge "Add batch operations to PhotoProvider" into gb-ub-photos-bryce
|
5139ee00d28c3f694df74f0ccf13cec402707aea |
07-Mar-2013 |
George Mount <mount@google.com> |
Add batch operations to PhotoProvider Change-Id: I36b2f0305e2ef7502df7b896c8baedc86519ac52
rc/com/android/photos/data/NotificationWatcher.java
rc/com/android/photos/data/PhotoProvider.java
rc/com/android/photos/data/SQLiteContentProvider.java
ests/src/com/android/photos/data/PhotoProviderTest.java
|
07d00fa7535566d401ad4cf5002af626f907a514 |
07-Mar-2013 |
George Mount <mount@google.com> |
Add batch operations to PhotoProvider Change-Id: I36b2f0305e2ef7502df7b896c8baedc86519ac52
rc/com/android/photos/data/NotificationWatcher.java
rc/com/android/photos/data/PhotoProvider.java
rc/com/android/photos/data/SQLiteContentProvider.java
ests/src/com/android/photos/data/PhotoProviderTest.java
|
1d234ba4b4129ea2e3b47389d0cd8a4aa1e78439 |
07-Mar-2013 |
John Reck <jreck@google.com> |
am e7f8c874: am 47435801: am a43b3787: am 2ff8d800: recycle bitmaps * commit 'e7f8c87428d11fd4a1bbe7185ab42f1a3689a49f': recycle bitmaps
|
a81d7817af4fe6353a45be5069a2df5bb15fd4ae |
07-Mar-2013 |
Bobby Georgescu <georgescu@google.com> |
Album set shim Change-Id: I12257ea09b7b5bc4b1d5ef638e685c66df86538a
es/layout/album_set_item.xml
|
8c12028e716792bb083dc57dda58b8be26a16ef7 |
07-Mar-2013 |
Bobby Georgescu <georgescu@google.com> |
Album set shim Change-Id: I12257ea09b7b5bc4b1d5ef638e685c66df86538a
es/layout/album_set_item.xml
rc/com/android/photos/AlbumSetFragment.java
rc/com/android/photos/data/AlbumSetLoader.java
rc/com/android/photos/shims/MediaSetLoader.java
|
ef620effddf212694b61ccb26c36c968f1e7d626 |
07-Mar-2013 |
Bobby Georgescu <georgescu@google.com> |
Album set shim Change-Id: I12257ea09b7b5bc4b1d5ef638e685c66df86538a
rc/com/android/photos/AlbumSetFragment.java
rc/com/android/photos/data/AlbumSetLoader.java
rc/com/android/photos/shims/MediaSetLoader.java
|
3c8f28729f6cfb7b561fda95fe579d9825ffa9f5 |
07-Mar-2013 |
John Reck <jreck@google.com> |
am 47435801: am a43b3787: am 2ff8d800: recycle bitmaps * commit '47435801379d4c9b4f9970f62dacb6a14b7d23bb': recycle bitmaps
|
880316393c9503c9b5b25807c0473498c99e7eec |
07-Mar-2013 |
John Reck <jreck@google.com> |
am a43b3787: am 2ff8d800: recycle bitmaps * commit 'a43b378741be7a75eaafa5f6eba90e520a25b80b': recycle bitmaps
|
73985834884ebec394c01432ce96176b08d27175 |
07-Mar-2013 |
John Reck <jreck@google.com> |
am 2ff8d800: recycle bitmaps * commit '2ff8d80018c27abdd475a7610ab3d684c4b33acb': recycle bitmaps
|
2ff8d80018c27abdd475a7610ab3d684c4b33acb |
07-Mar-2013 |
John Reck <jreck@google.com> |
recycle bitmaps Change-Id: I3afda4f009fda07b4e2858cb65dee4444f8484e5
rc/com/android/photos/shims/BitmapJobDrawable.java
|
9603a0c884208a0dc9ef906043387a1758a97656 |
07-Mar-2013 |
John Reck <jreck@google.com> |
recycle bitmaps Change-Id: I3afda4f009fda07b4e2858cb65dee4444f8484e5
rc/com/android/photos/shims/BitmapJobDrawable.java
|
7cfd6f230af022711347b1f8ca778e0cbce6afe8 |
07-Mar-2013 |
Mangesh Ghiware <mghiware@google.com> |
am 1b2fe8d9: am c6c7948a: am c1c711ee: am 17362f81: Remove redundant Album NAME (replaced by TITLE) * commit '1b2fe8d9b288cd26225a0990fba807dcdcdf0296': Remove redundant Album NAME (replaced by TITLE)
|
d380f82a6b099e179519520e8846d368ea553592 |
07-Mar-2013 |
George Mount <mount@google.com> |
am a02f7da8: am add69740: am 404219e5: am cad2ab01: Merge "Add inserts to PhotoProvider." into gb-ub-photos-bryce * commit 'a02f7da8863c4afe0b4854c6d101028833d50923': Add inserts to PhotoProvider.
|
b1e6f7c64bde2324fffac2383b330c596dbaf55f |
07-Mar-2013 |
George Mount <mount@google.com> |
am 4535124d: am e10e8e78: am d258438c: am e1796ac1: Merge "Add album cover art downloading." into gb-ub-photos-bryce * commit '4535124df7341e12fa3e4ac0dc436f346b9f0ef5': Add album cover art downloading.
|
382203712ab1c3b8e685c3935529c146b3a6a8b2 |
07-Mar-2013 |
Baligh Uddin <baligh@google.com> |
am be356b58: (-s ours) am c0b89b0e: (-s ours) am 2fee25d9: am 7607b9a9: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce * commit 'be356b58ce4719d2305dd87ccf5b0c420a9e8c29': Import translations. DO NOT MERGE
|
2daf70ff767da3fdd0f4e0c33d9e327726c43b7e |
07-Mar-2013 |
Baligh Uddin <baligh@google.com> |
am 581bd60e: (-s ours) am 766843cf: (-s ours) am 956d934e: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev * commit '581bd60eb585e037105ab81a0933b4efb2d61e9c': Import translations. DO NOT MERGE
|
55e25ea560f8648ec42cf5963d9a40f91b919317 |
07-Mar-2013 |
Mangesh Ghiware <mghiware@google.com> |
am c6c7948a: am c1c711ee: am 17362f81: Remove redundant Album NAME (replaced by TITLE) * commit 'c6c7948a3d4070820ea3c96bd30b67ffe2e5c108': Remove redundant Album NAME (replaced by TITLE)
|
779c02afa81d7bbf8ede28560b428253df97e819 |
07-Mar-2013 |
Mangesh Ghiware <mghiware@google.com> |
am c1c711ee: am 17362f81: Remove redundant Album NAME (replaced by TITLE) * commit 'c1c711ee1eb7d0de4a886020e9da9f9cd5212968': Remove redundant Album NAME (replaced by TITLE)
|
6967427c25acfeb624f5b3b5402d3a285288e77c |
07-Mar-2013 |
George Mount <mount@google.com> |
am add69740: am 404219e5: am cad2ab01: Merge "Add inserts to PhotoProvider." into gb-ub-photos-bryce * commit 'add697405fbe94d0850eb88c6db7c42b494744ec': Add inserts to PhotoProvider.
|
1ff47b138d2954cc9a811142bd7464a185ea9696 |
07-Mar-2013 |
George Mount <mount@google.com> |
am e10e8e78: am d258438c: am e1796ac1: Merge "Add album cover art downloading." into gb-ub-photos-bryce * commit 'e10e8e7839431631a8eb82c194093b0fb6202ce2': Add album cover art downloading.
|
93f8fa85d09a70bd574c0f572f8c49a43f7a95fb |
07-Mar-2013 |
Baligh Uddin <baligh@google.com> |
am c0b89b0e: (-s ours) am 2fee25d9: am 7607b9a9: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce * commit 'c0b89b0e3b2bfdce3a1145366f058cdc157604cc': Import translations. DO NOT MERGE
|
72098499b8734e30a7a4d40165c8971b91b10163 |
07-Mar-2013 |
Baligh Uddin <baligh@google.com> |
am 766843cf: (-s ours) am 956d934e: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev * commit '766843cf39bda36c214280b722e649de76599ac2': Import translations. DO NOT MERGE
|
2bafe3b833e18e07b3f531b3f4a58814c90ec0f0 |
07-Mar-2013 |
Baligh Uddin <baligh@google.com> |
am 8cc6c923: (-s ours) Merge "Import translations. DO NOT MERGE" * commit '8cc6c9230c8f5c9dc19db8b1680b38c6c5fc9d79': Import translations. DO NOT MERGE
|
7e1dbaff936df6db65189deb8abf2336aa7679f3 |
07-Mar-2013 |
Mangesh Ghiware <mghiware@google.com> |
am 17362f81: Remove redundant Album NAME (replaced by TITLE) * commit '17362f811fa92ff0d9f92b3c733f08704de2f135': Remove redundant Album NAME (replaced by TITLE)
|
22709c4371933e29317b12bc4111876d28899c05 |
07-Mar-2013 |
George Mount <mount@google.com> |
am 404219e5: am cad2ab01: Merge "Add inserts to PhotoProvider." into gb-ub-photos-bryce * commit '404219e55171b6fcfb666f16174b41fa25fba794': Add inserts to PhotoProvider.
|
84217d55c67b132d908677347d1bf69c19dbc0e3 |
07-Mar-2013 |
George Mount <mount@google.com> |
am d258438c: am e1796ac1: Merge "Add album cover art downloading." into gb-ub-photos-bryce * commit 'd258438cbfedb5184adcfd9238f28299de1c38a3': Add album cover art downloading.
|
62d2de4aeb3451f0d78da559a05119b8505e03fa |
07-Mar-2013 |
Baligh Uddin <baligh@google.com> |
am 2fee25d9: am 7607b9a9: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce * commit '2fee25d93cbdabfb87152038b3ea788d9895921b': Import translations. DO NOT MERGE
|
ec3adf838e60981cf2272b6e60bb542e88c931d1 |
07-Mar-2013 |
Baligh Uddin <baligh@google.com> |
am 956d934e: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev * commit '956d934ebf9307d350babad7cc49dc33c7e8b2c7': Import translations. DO NOT MERGE
|
17362f811fa92ff0d9f92b3c733f08704de2f135 |
07-Mar-2013 |
Mangesh Ghiware <mghiware@google.com> |
Remove redundant Album NAME (replaced by TITLE) Change-Id: I0482f8b4bd85e07aefe4af02b1e8dab4702eb9f6
rc/com/android/photos/data/PhotoDatabase.java
rc/com/android/photos/data/PhotoProvider.java
ests/src/com/android/photos/data/PhotoDatabaseUtils.java
ests/src/com/android/photos/data/PhotoProviderTest.java
|
5e46468ff8bce4c2912b9f5fb64df68f24f281cc |
07-Mar-2013 |
Mangesh Ghiware <mghiware@google.com> |
Remove redundant Album NAME (replaced by TITLE) Change-Id: I0482f8b4bd85e07aefe4af02b1e8dab4702eb9f6
rc/com/android/photos/data/PhotoDatabase.java
rc/com/android/photos/data/PhotoProvider.java
ests/src/com/android/photos/data/PhotoDatabaseUtils.java
ests/src/com/android/photos/data/PhotoProviderTest.java
|
3142f412d85cd252326f867cd2b9ec27b981dc66 |
07-Mar-2013 |
George Mount <mount@google.com> |
am cad2ab01: Merge "Add inserts to PhotoProvider." into gb-ub-photos-bryce * commit 'cad2ab01fe5d95f8a98f15c898fe532f85daeb89': Add inserts to PhotoProvider.
|
7a4b3d0d63d4ad50fb2283ddba274d5b2d600745 |
07-Mar-2013 |
George Mount <mount@google.com> |
am e1796ac1: Merge "Add album cover art downloading." into gb-ub-photos-bryce * commit 'e1796ac13fad20584ae95767f6790c4090bffc3a': Add album cover art downloading.
|
cad2ab01fe5d95f8a98f15c898fe532f85daeb89 |
07-Mar-2013 |
George Mount <mount@google.com> |
Merge "Add inserts to PhotoProvider." into gb-ub-photos-bryce
|
2678d9626f3efc6b0728de52c193598ecef02a8a |
07-Mar-2013 |
George Mount <mount@google.com> |
Merge "Add inserts to PhotoProvider." into gb-ub-photos-bryce
|
e1796ac13fad20584ae95767f6790c4090bffc3a |
07-Mar-2013 |
George Mount <mount@google.com> |
Merge "Add album cover art downloading." into gb-ub-photos-bryce
|
74fe1bc1bcbcef4a49eb68b4ef985d80912f7da9 |
07-Mar-2013 |
George Mount <mount@google.com> |
Merge "Add album cover art downloading." into gb-ub-photos-bryce
|
aebb3b012aef838001c5f9e6adfa4bbcc7bb6569 |
07-Mar-2013 |
George Mount <mount@google.com> |
Add inserts to PhotoProvider. Change-Id: Ie91df59975d185948c7c2fd96432d311847c3e00
rc/com/android/photos/data/PhotoProvider.java
ests/src/com/android/photos/data/PhotoProviderTest.java
|
3360e27e1d0e37f803c10f27257a81b2600b209c |
07-Mar-2013 |
George Mount <mount@google.com> |
Add inserts to PhotoProvider. Change-Id: Ie91df59975d185948c7c2fd96432d311847c3e00
rc/com/android/photos/data/PhotoProvider.java
ests/src/com/android/photos/data/PhotoProviderTest.java
|
cb8c486b85267f81511d71f89a4c13d8e1dcfc19 |
07-Mar-2013 |
George Mount <mount@google.com> |
Add album cover art downloading. Change-Id: I660761c3bf59b1b314be9674fc3f1e43f307c686
rc/com/android/photos/data/PhotoProvider.java
|
b07453fb2522b82a2f2e5f8c98279dfb9b56ec4d |
07-Mar-2013 |
George Mount <mount@google.com> |
Add album cover art downloading. Change-Id: I660761c3bf59b1b314be9674fc3f1e43f307c686
rc/com/android/photos/data/PhotoProvider.java
|
b78e1f2450046efaa599bfd3a5ef09c7dcedb6f6 |
07-Mar-2013 |
The Android Automerger <android-build@android.com> |
merge in jb-mr2-release history after reset to jb-mr2-dev
|
a95001ce9653b210882ee98b09d558863f0b7029 |
07-Mar-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into master-security-dev
|
06f325d74101bc713f6d078907b44fadb56451c6 |
07-Mar-2013 |
Baligh Uddin <baligh@google.com> |
am 7607b9a9: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce * commit '7607b9a9f5be5486595d8040c01a506a125ed7b6': Import translations. DO NOT MERGE
|
d3d2e1e69d9f618083b6a338dd0e6fa697c46c5f |
07-Mar-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE"
|
45a4a9d2302274b726e14c24891679b8c19b7809 |
07-Mar-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
|
e8e20f316abb089b2b3dea823d256d3a7ab3bdaa |
07-Mar-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
|
7607b9a9f5be5486595d8040c01a506a125ed7b6 |
07-Mar-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
|
b934bb29cfde95303d92f00bc6c428e15ee12327 |
07-Mar-2013 |
John Reck <jreck@google.com> |
am c6495d18: am e2aa63ce: am 3aaf6efa: am 0eed2b56: Merge "Data provider shim" into gb-ub-photos-bryce * commit 'c6495d180c64cf79f422479871227a1a2f0de3de': Data provider shim
|
7a0c23ac12212419e8e344334977a7435092719f |
07-Mar-2013 |
John Reck <jreck@google.com> |
am e2aa63ce: am 3aaf6efa: am 0eed2b56: Merge "Data provider shim" into gb-ub-photos-bryce * commit 'e2aa63ce9f3ee1bb494315fd0278034313a5cd37': Data provider shim
|
a4b2ad44e662569b1bb23cb62e713e03ca1cc9a3 |
07-Mar-2013 |
John Reck <jreck@google.com> |
am 3aaf6efa: am 0eed2b56: Merge "Data provider shim" into gb-ub-photos-bryce * commit '3aaf6efa0f55721976b2e055c6b23485b6786734': Data provider shim
|
d287db535eb1e15d92c6a7a22052c4cbafb37383 |
07-Mar-2013 |
John Reck <jreck@google.com> |
am 0eed2b56: Merge "Data provider shim" into gb-ub-photos-bryce * commit '0eed2b56583420f85a02f01707e49f37467bbad7': Data provider shim
|
4154324ca8480c13d9c4e22d8303d425a4e5d7d3 |
07-Mar-2013 |
John Reck <jreck@google.com> |
Merge "Data provider shim" into gb-ub-photos-bryce
|
14347c1e88cb50e438286b5e5a72cf4b0e472ecc |
07-Mar-2013 |
John Reck <jreck@google.com> |
Merge "Data provider shim" into gb-ub-photos-bryce
|
0eed2b56583420f85a02f01707e49f37467bbad7 |
07-Mar-2013 |
John Reck <jreck@google.com> |
Merge "Data provider shim" into gb-ub-photos-bryce
|
dc0bb6232a45a646799db8a79e9d678c494fc956 |
07-Mar-2013 |
John Reck <jreck@google.com> |
Data provider shim Bolt the new UI framework on top of the old data model temporarily to unblock UI work Change-Id: I2f61f70647faca1f6a95b1f02f719ec4277fa5fb
rc/com/android/photos/PhotoSetFragment.java
rc/com/android/photos/data/MediaSetLoader.java
rc/com/android/photos/data/PhotoSetLoader.java
rc/com/android/photos/drawables/DrawableFactory.java
rc/com/android/photos/shims/BitmapJobDrawable.java
rc/com/android/photos/shims/MediaItemsLoader.java
rc/com/android/photos/shims/MediaSetLoader.java
|
8ee44cd00a15c442f7b64de3459d3efb58111777 |
07-Mar-2013 |
John Reck <jreck@google.com> |
Data provider shim Bolt the new UI framework on top of the old data model temporarily to unblock UI work Change-Id: I2f61f70647faca1f6a95b1f02f719ec4277fa5fb
es/layout/photo_set.xml
es/layout/photo_set_item.xml
|
d228222e5efca7df8c7f2fe49e5ec76696cbbc05 |
07-Mar-2013 |
John Reck <jreck@google.com> |
Data provider shim Bolt the new UI framework on top of the old data model temporarily to unblock UI work Change-Id: I2f61f70647faca1f6a95b1f02f719ec4277fa5fb
es/layout/photo_set.xml
es/layout/photo_set_item.xml
rc/com/android/photos/PhotoSetFragment.java
rc/com/android/photos/data/MediaSetLoader.java
rc/com/android/photos/data/PhotoSetLoader.java
rc/com/android/photos/drawables/DrawableFactory.java
rc/com/android/photos/shims/BitmapJobDrawable.java
rc/com/android/photos/shims/MediaItemsLoader.java
rc/com/android/photos/shims/MediaSetLoader.java
|
2659fb134a5bfe9981f368713bf11eaf8c421742 |
07-Mar-2013 |
George Mount <mount@google.com> |
am 2466a1e9: am eb2ccd67: am 9f387c22: am 1732a9cf: Merge "Add required fields to PhotoProvider." into gb-ub-photos-bryce * commit '2466a1e9af19c9ffc9d3b52afe8021ad7379dff3': Add required fields to PhotoProvider.
|
c121879ca25f8e60d43d57657c8242ea51b8fcb0 |
07-Mar-2013 |
George Mount <mount@google.com> |
am eb2ccd67: am 9f387c22: am 1732a9cf: Merge "Add required fields to PhotoProvider." into gb-ub-photos-bryce * commit 'eb2ccd677d861607933fdd531d0f2c1c7893bc2a': Add required fields to PhotoProvider.
|
2d4b79b846391822518a388f84360054765484c6 |
07-Mar-2013 |
George Mount <mount@google.com> |
am 9f387c22: am 1732a9cf: Merge "Add required fields to PhotoProvider." into gb-ub-photos-bryce * commit '9f387c22ac516f0f4df69034dbdafc794d08cff9': Add required fields to PhotoProvider.
|
efc5c39bfea406bc04600abff48b0693bd513006 |
07-Mar-2013 |
George Mount <mount@google.com> |
am 1732a9cf: Merge "Add required fields to PhotoProvider." into gb-ub-photos-bryce * commit '1732a9cfe68564c7b55b0157575561ecf0f9fdc4': Add required fields to PhotoProvider.
|
1732a9cfe68564c7b55b0157575561ecf0f9fdc4 |
07-Mar-2013 |
George Mount <mount@google.com> |
Merge "Add required fields to PhotoProvider." into gb-ub-photos-bryce
|
0625b81efa0b98f54f45827316d03b03dda0e2ed |
07-Mar-2013 |
George Mount <mount@google.com> |
Merge "Add required fields to PhotoProvider." into gb-ub-photos-bryce
|
2f5a064980ad79e88616ba124268e4d7298c68a5 |
06-Mar-2013 |
George Mount <mount@google.com> |
Add required fields to PhotoProvider. Change-Id: I1e830702412d4431ba3b01fe4945a4818385b6cd
rc/com/android/photos/data/PhotoDatabase.java
rc/com/android/photos/data/PhotoProvider.java
ests/src/com/android/photos/data/PhotoDatabaseTest.java
ests/src/com/android/photos/data/PhotoDatabaseUtils.java
ests/src/com/android/photos/data/PhotoProviderTest.java
|
f73f725d0b5d771b77041349fbad6e9f02023f87 |
06-Mar-2013 |
George Mount <mount@google.com> |
Add required fields to PhotoProvider. Change-Id: I1e830702412d4431ba3b01fe4945a4818385b6cd
rc/com/android/photos/data/PhotoDatabase.java
rc/com/android/photos/data/PhotoProvider.java
ests/src/com/android/photos/data/PhotoDatabaseTest.java
ests/src/com/android/photos/data/PhotoDatabaseUtils.java
ests/src/com/android/photos/data/PhotoProviderTest.java
|
4b4bb0e2f3acc4a6e5159e668929fd80a56e6c9a |
07-Mar-2013 |
Bobby Georgescu <georgescu@google.com> |
am 4d1704ee: am e0f28954: am 687c2a2f: am fd21feac: Merge "Preliminary AlbumSet UI" into gb-ub-photos-bryce * commit '4d1704ee44ba214c2d5b62c2948ae196e2c656a1': Preliminary AlbumSet UI
|
2479aff2f620ac7a792e6fbe98b4042f559d67e2 |
06-Mar-2013 |
Doris Liu <tianliu@google.com> |
Fix camera switcher mode picker Bug: 8330008 Change-Id: I08ccd38a6898e88d28214cceb22cee6688ce0b3f
rc/com/android/camera/ui/CameraSwitcher.java
|
b061c76196cdc167a3f08ecdbb8c88434e43d5e3 |
06-Mar-2013 |
John Hoford <hoford@google.com> |
fix undo bug bug:8319433 Change-Id: If6bea005677b63267130d446e7b0298d21bbb3be
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
|
5414ea37f59332c1dbd063a72b2c1385d6686708 |
06-Mar-2013 |
Doris Liu <tianliu@google.com> |
Fix NPE in switcher popup Bug: 8327966 Change-Id: I4181a59871c065435756c100b3e8b43930781ee5
rc/com/android/camera/ui/CameraSwitcher.java
|
c0cac67a2dfec41820053889987a21805ff8e749 |
07-Mar-2013 |
Bobby Georgescu <georgescu@google.com> |
am e0f28954: am 687c2a2f: am fd21feac: Merge "Preliminary AlbumSet UI" into gb-ub-photos-bryce * commit 'e0f289542c6726ef9fc7d99bd114a85374656e8e': Preliminary AlbumSet UI
|
278895babe981fad9ad533a990909502ab628eb2 |
07-Mar-2013 |
Bobby Georgescu <georgescu@google.com> |
am 687c2a2f: am fd21feac: Merge "Preliminary AlbumSet UI" into gb-ub-photos-bryce * commit '687c2a2f596c39ebff119b6f6250563039c5eed0': Preliminary AlbumSet UI
|
a0f905df73cf5073e6e9dd351ace45bdaafaf267 |
07-Mar-2013 |
Bobby Georgescu <georgescu@google.com> |
am fd21feac: Merge "Preliminary AlbumSet UI" into gb-ub-photos-bryce * commit 'fd21feacb7bca840056f82ad219d6e93374a73c2': Preliminary AlbumSet UI
|
db35b0bdf829509addd006b7893559f37164f504 |
07-Mar-2013 |
Bobby Georgescu <georgescu@google.com> |
Merge "Preliminary AlbumSet UI" into gb-ub-photos-bryce
|
fd21feacb7bca840056f82ad219d6e93374a73c2 |
07-Mar-2013 |
Bobby Georgescu <georgescu@google.com> |
Merge "Preliminary AlbumSet UI" into gb-ub-photos-bryce
|
124225a1dbea6ea2c66879804f259d74e31ab4fc |
07-Mar-2013 |
Bobby Georgescu <georgescu@google.com> |
Merge "Preliminary AlbumSet UI" into gb-ub-photos-bryce
|
4e7197785c19d17b18f7e8afb46a213b1f781170 |
06-Mar-2013 |
Doris Liu <tianliu@google.com> |
am f8d28af5: am 4a3f34a6: am 7233f395: am 8d2a3057: Fix camera switcher mode picker * commit 'f8d28af51ffec5b1a6fd7ce4cdcebc6819acb4aa': Fix camera switcher mode picker
|
cc0df3d3e483866e69cd447846ebcc1d5732147d |
06-Mar-2013 |
Doris Liu <tianliu@google.com> |
am 4a3f34a6: am 7233f395: am 8d2a3057: Fix camera switcher mode picker * commit '4a3f34a682e11002daefbc0433906af6d4cd0bf2': Fix camera switcher mode picker
|
829852f5b4b16ed2653e3f266f2926ae2fed27df |
06-Mar-2013 |
Doris Liu <tianliu@google.com> |
am 7233f395: am 8d2a3057: Fix camera switcher mode picker * commit '7233f39558f0d80d697d3d5415ed66bf0d9a162e': Fix camera switcher mode picker
|
2d26ed89ff146a6c13220655ea94d94e374135bc |
06-Mar-2013 |
Doris Liu <tianliu@google.com> |
am 8d2a3057: Fix camera switcher mode picker * commit '8d2a3057bb8a4a3bbaa5be3ef9ac91f00ff50957': Fix camera switcher mode picker
|
8d2a3057bb8a4a3bbaa5be3ef9ac91f00ff50957 |
06-Mar-2013 |
Doris Liu <tianliu@google.com> |
Fix camera switcher mode picker Bug: 8330008 Change-Id: I08ccd38a6898e88d28214cceb22cee6688ce0b3f
rc/com/android/camera/ui/CameraSwitcher.java
|
556713fa25b492b6cba9ed8bf4ea6e2f56298fb5 |
06-Mar-2013 |
Doris Liu <tianliu@google.com> |
Fix camera switcher mode picker Bug: 8330008 Change-Id: I08ccd38a6898e88d28214cceb22cee6688ce0b3f
rc/com/android/camera/ui/CameraSwitcher.java
|
220f02edf7c6fbfcc108f9487afeadeb05309114 |
06-Mar-2013 |
John Hoford <hoford@google.com> |
am 47b80d01: am 92ca581d: am 997b0a75: am 4e330be1: Merge "fix undo bug" into gb-ub-photos-bryce * commit '47b80d01bdb690fb0e38a9954569927df8297f10': fix undo bug
|
4499cbfdc78e07a44b1f5b2dfccc06b1981e2ace |
06-Mar-2013 |
John Hoford <hoford@google.com> |
am 92ca581d: am 997b0a75: am 4e330be1: Merge "fix undo bug" into gb-ub-photos-bryce * commit '92ca581dc9314ec139cfc1f9f504f98c5affff2f': fix undo bug
|
243ffad04190c0182e7e816a1971ae4df588190b |
06-Mar-2013 |
John Hoford <hoford@google.com> |
am 997b0a75: am 4e330be1: Merge "fix undo bug" into gb-ub-photos-bryce * commit '997b0a7578ecbcdf89152f18611f62230d0d0411': fix undo bug
|
ebb962f23e568902ffb4298ca01e966e9c24f08e |
06-Mar-2013 |
John Hoford <hoford@google.com> |
am 4e330be1: Merge "fix undo bug" into gb-ub-photos-bryce * commit '4e330be1512162dd0ed4988352cd32017758f3d6': fix undo bug
|
4e330be1512162dd0ed4988352cd32017758f3d6 |
06-Mar-2013 |
John Hoford <hoford@google.com> |
Merge "fix undo bug" into gb-ub-photos-bryce
|
8cfb75ad0f0c60e5115b1c0feb3d717ab4e4bfee |
06-Mar-2013 |
John Hoford <hoford@google.com> |
Merge "fix undo bug" into gb-ub-photos-bryce
|
19d2d157146841442feaef6e0be002581b69335b |
06-Mar-2013 |
John Hoford <hoford@google.com> |
fix undo bug bug:8319433 Change-Id: If6bea005677b63267130d446e7b0298d21bbb3be
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
|
8c500a4700889c62d5e9e1d457d73e3ea9ac3f59 |
06-Mar-2013 |
John Hoford <hoford@google.com> |
fix undo bug bug:8319433 Change-Id: If6bea005677b63267130d446e7b0298d21bbb3be
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
|
4189493e352f8befe3776748e980103164ae47ba |
06-Mar-2013 |
Doris Liu <tianliu@google.com> |
am db187215: am 04cdfc09: am 38f86e40: am 8892e5e7: Fix NPE in switcher popup * commit 'db187215d13ad28975cb52bb4bb7c809f09bcbd5': Fix NPE in switcher popup
|
8ad3b1bef4c90341aebbda148bac738e63d05701 |
06-Mar-2013 |
Doris Liu <tianliu@google.com> |
am 04cdfc09: am 38f86e40: am 8892e5e7: Fix NPE in switcher popup * commit '04cdfc09e7712fd69a14f75642940a4431de8b4b': Fix NPE in switcher popup
|
6797d5a0c52a9594494d7e372451f68579547af9 |
06-Mar-2013 |
Doris Liu <tianliu@google.com> |
am 38f86e40: am 8892e5e7: Fix NPE in switcher popup * commit '38f86e402df3d99032b22eeac4578efdfa269f12': Fix NPE in switcher popup
|
cebfe0fe32a7af476709d18ade5844b7df10e3a9 |
06-Mar-2013 |
Doris Liu <tianliu@google.com> |
am 8892e5e7: Fix NPE in switcher popup * commit '8892e5e7ffa1f33b527b7753b07723dfd685a9cd': Fix NPE in switcher popup
|
8892e5e7ffa1f33b527b7753b07723dfd685a9cd |
06-Mar-2013 |
Doris Liu <tianliu@google.com> |
Fix NPE in switcher popup Bug: 8327966 Change-Id: I4181a59871c065435756c100b3e8b43930781ee5
rc/com/android/camera/ui/CameraSwitcher.java
|
5b45e26674bcbb91bdc195bed15a897ba3b96b0e |
06-Mar-2013 |
Doris Liu <tianliu@google.com> |
Fix NPE in switcher popup Bug: 8327966 Change-Id: I4181a59871c065435756c100b3e8b43930781ee5
rc/com/android/camera/ui/CameraSwitcher.java
|
7ebfa292e6c407c2fb0f88c4498b7e5fe673a856 |
06-Mar-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I4f04a3b504eaebe624f21cc1f519b7cd70acce3d Auto-generated-cl: translation import
es/values-be/filtershow_strings.xml
es/values-et/filtershow_strings.xml
es/values-fr/filtershow_strings.xml
es/values-ko/filtershow_strings.xml
es/values-lt/filtershow_strings.xml
es/values-lv/filtershow_strings.xml
es/values-pl/filtershow_strings.xml
es/values-pt/filtershow_strings.xml
es/values-ro/filtershow_strings.xml
es/values-ru/filtershow_strings.xml
es/values-sk/filtershow_strings.xml
es/values-sv/filtershow_strings.xml
es/values-sw/filtershow_strings.xml
es/values-tr/filtershow_strings.xml
es/values-zh-rCN/filtershow_strings.xml
|
dbdab049bff94a3aa0de3f3240729c38eb1b8d37 |
06-Mar-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Id539b9e3a7dc14e859dfe217d047313cfe28824d Auto-generated-cl: translation import
es/values-be/filtershow_strings.xml
es/values-et/filtershow_strings.xml
es/values-fr/filtershow_strings.xml
es/values-ko/filtershow_strings.xml
es/values-lt/filtershow_strings.xml
es/values-lv/filtershow_strings.xml
es/values-pl/filtershow_strings.xml
es/values-pt/filtershow_strings.xml
es/values-ro/filtershow_strings.xml
es/values-ru/filtershow_strings.xml
es/values-sk/filtershow_strings.xml
es/values-sv/filtershow_strings.xml
es/values-sw/filtershow_strings.xml
es/values-tr/filtershow_strings.xml
es/values-zh-rCN/filtershow_strings.xml
|
efcc41e364a461de66eda66e4f12832d796fd979 |
06-Mar-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I7d69704e22e7cd37510d37047c3b570b5d78fb09 Auto-generated-cl: translation import
es/values-be/filtershow_strings.xml
es/values-et/filtershow_strings.xml
es/values-fr/filtershow_strings.xml
es/values-ko/filtershow_strings.xml
es/values-lt/filtershow_strings.xml
es/values-lv/filtershow_strings.xml
es/values-pl/filtershow_strings.xml
es/values-pt/filtershow_strings.xml
es/values-ro/filtershow_strings.xml
es/values-ru/filtershow_strings.xml
es/values-sk/filtershow_strings.xml
es/values-sv/filtershow_strings.xml
es/values-sw/filtershow_strings.xml
es/values-tr/filtershow_strings.xml
es/values-zh-rCN/filtershow_strings.xml
|
f63c047fa5e023764d680a5138c8cfac033a500e |
06-Mar-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ie62ac98733f3baad857d0b1e7ebc4b6898b7c10f Auto-generated-cl: translation import
es/values-be/filtershow_strings.xml
es/values-et/filtershow_strings.xml
es/values-fr/filtershow_strings.xml
es/values-ko/filtershow_strings.xml
es/values-lt/filtershow_strings.xml
es/values-lv/filtershow_strings.xml
es/values-pl/filtershow_strings.xml
es/values-pt/filtershow_strings.xml
es/values-ro/filtershow_strings.xml
es/values-ru/filtershow_strings.xml
es/values-sk/filtershow_strings.xml
es/values-sv/filtershow_strings.xml
es/values-sw/filtershow_strings.xml
es/values-tr/filtershow_strings.xml
es/values-zh-rCN/filtershow_strings.xml
|
a00370d18208f0a28e24b7f54aa9aed3fe3ac961 |
06-Mar-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ie62ac98733f3baad857d0b1e7ebc4b6898b7c10f Auto-generated-cl: translation import
es/values-be/filtershow_strings.xml
es/values-et/filtershow_strings.xml
es/values-fr/filtershow_strings.xml
es/values-ko/filtershow_strings.xml
es/values-lt/filtershow_strings.xml
es/values-lv/filtershow_strings.xml
es/values-pl/filtershow_strings.xml
es/values-pt/filtershow_strings.xml
es/values-ro/filtershow_strings.xml
es/values-ru/filtershow_strings.xml
es/values-sk/filtershow_strings.xml
es/values-sv/filtershow_strings.xml
es/values-sw/filtershow_strings.xml
es/values-tr/filtershow_strings.xml
es/values-zh-rCN/filtershow_strings.xml
|
d3f31f5040596e8ef145e7371f56609df7f9d1d1 |
06-Mar-2013 |
Baligh Uddin <baligh@google.com> |
am a6adeb67: (-s ours) am 6846c5d0: (-s ours) am 2962966e: am f831c736: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce * commit 'a6adeb67c4efd7b927556060ac0b0f5ff8e076ee': Import translations. DO NOT MERGE
|
ac678b65c06d37fc4bb95bb1fe8900df69e8f3fe |
06-Mar-2013 |
Baligh Uddin <baligh@google.com> |
am 88e4fa77: (-s ours) am 3bc1bc3c: (-s ours) am 670444be: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev * commit '88e4fa77a8acc61063adcff7deda4f049c1559ac': Import translations. DO NOT MERGE
|
cb6c9caf3968ad6c414f8d1bfa72c15afb37ca5f |
06-Mar-2013 |
Doris Liu <tianliu@google.com> |
am 4e0971d5: am 0e53c3a7: am 9a08794f: am 7f51a845: Merge "Add a black bar symmetric to nav bar" into gb-ub-photos-bryce * commit '4e0971d53240836b20cb29ca8c8d7df2f1ac6211': Add a black bar symmetric to nav bar
|
9fa6139b7bb964dc6e4bb3fa9dd94de51c81112b |
06-Mar-2013 |
Doris Liu <tianliu@google.com> |
am 1fbeaeb7: am 2e4f5399: am 62bacd5d: am 457bab95: Merge "Keep camera controls on the same physical side" into gb-ub-photos-bryce * commit '1fbeaeb7da57a674ff6ad6612e72800bffcdf0bc': Keep camera controls on the same physical side
|
44735b904bc940b477a2bd485150b45ef3279455 |
06-Mar-2013 |
Baligh Uddin <baligh@google.com> |
am 6846c5d0: (-s ours) am 2962966e: am f831c736: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce * commit '6846c5d0b7373a2c515e0573041e57f0989171c7': Import translations. DO NOT MERGE
|
1302a2ea0b52b067639cdc47c140f9df22d86307 |
06-Mar-2013 |
Baligh Uddin <baligh@google.com> |
am 3bc1bc3c: (-s ours) am 670444be: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev * commit '3bc1bc3ca7aed8582e7990edce13b25239bd54ff': Import translations. DO NOT MERGE
|
ae095e7424cb933c3be9a21f74d90125559f8a12 |
06-Mar-2013 |
Doris Liu <tianliu@google.com> |
am 0e53c3a7: am 9a08794f: am 7f51a845: Merge "Add a black bar symmetric to nav bar" into gb-ub-photos-bryce * commit '0e53c3a74f4ab4a7aab04ff048a62ede0a737c08': Add a black bar symmetric to nav bar
|
21c4955b5a7fb5f9dcff665008cbe34b070f59b7 |
06-Mar-2013 |
Doris Liu <tianliu@google.com> |
am 2e4f5399: am 62bacd5d: am 457bab95: Merge "Keep camera controls on the same physical side" into gb-ub-photos-bryce * commit '2e4f5399d2e3b79708d743672d30e480157a6b12': Keep camera controls on the same physical side
|
c0311ee2ee868e8264d7955f03286e168f6ff427 |
06-Mar-2013 |
Baligh Uddin <baligh@google.com> |
am 2962966e: am f831c736: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce * commit '2962966e5f274b77380cf5716a61aff5c1b55355': Import translations. DO NOT MERGE
|
2e96ba3b256770a362c7fbe10f6bb52c083c0822 |
06-Mar-2013 |
Baligh Uddin <baligh@google.com> |
am 670444be: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev * commit '670444be68f153511e05af6df89beeabe89313b2': Import translations. DO NOT MERGE
|
4d5912a92ced0597a87e68aca9f9b0866c927292 |
06-Mar-2013 |
Doris Liu <tianliu@google.com> |
am 9a08794f: am 7f51a845: Merge "Add a black bar symmetric to nav bar" into gb-ub-photos-bryce * commit '9a08794fcb62acde0cc1dcd09a739060d1a4ea0b': Add a black bar symmetric to nav bar
|
fcb748844bf6dd8830153bd85def171b4f2f18b0 |
06-Mar-2013 |
Doris Liu <tianliu@google.com> |
am 62bacd5d: am 457bab95: Merge "Keep camera controls on the same physical side" into gb-ub-photos-bryce * commit '62bacd5dfad22b619d2ded3b8a9680b2538869e5': Keep camera controls on the same physical side
|
38e7151c8cbae7996c540ea5aacf83c9cc151481 |
06-Mar-2013 |
Baligh Uddin <baligh@google.com> |
am 6f5ddafb: (-s ours) Merge "Import translations. DO NOT MERGE" * commit '6f5ddafb00db61c670ab239eb9a021785f75dcd9': Import translations. DO NOT MERGE
|
11934f0d1f5f13086a911bd2174d6a3690b43d01 |
06-Mar-2013 |
The Android Automerger <android-build@android.com> |
merge in jb-mr2-release history after reset to jb-mr2-dev
|
c53a01f09ee80931b0e0cf7ca8cecaf2926b8bc5 |
06-Mar-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into master-security-dev
|
030669501ab789d4c733dc33c65afda9036bcfb9 |
06-Mar-2013 |
Baligh Uddin <baligh@google.com> |
am f831c736: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce * commit 'f831c736a3c0c20b59873d98f8abe5b2a234f402': Import translations. DO NOT MERGE
|
91bc0a99c47e4de5fb74e861cb9e25ae4286eed7 |
06-Mar-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE"
|
efdfc708e579eaaa8af0ffb8519c9a0edebb4152 |
06-Mar-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
|
6631899c23789c887a45c6da966da70b9376d779 |
06-Mar-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
|
f831c736a3c0c20b59873d98f8abe5b2a234f402 |
06-Mar-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
|
a2b21b592e9d3652aeafcb4086fb7d30293a229e |
06-Mar-2013 |
Doris Liu <tianliu@google.com> |
am 7f51a845: Merge "Add a black bar symmetric to nav bar" into gb-ub-photos-bryce * commit '7f51a8455b34d794797388d31c1b42b0de9844d5': Add a black bar symmetric to nav bar
|
17e0b5cbf21e98d932b2c277d5c75a4930f002e3 |
06-Mar-2013 |
Doris Liu <tianliu@google.com> |
am 457bab95: Merge "Keep camera controls on the same physical side" into gb-ub-photos-bryce * commit '457bab952ea6b8babf2d37c817f06aed3829ba61': Keep camera controls on the same physical side
|
3aff80f9b0e4507b0f0775b581b4518a01e34da0 |
06-Mar-2013 |
Doris Liu <tianliu@google.com> |
Merge "Add a black bar symmetric to nav bar" into gb-ub-photos-bryce
|
eb32d4464abc9c788fa380272f0e3e43275e35b6 |
06-Mar-2013 |
Doris Liu <tianliu@google.com> |
Merge "Add a black bar symmetric to nav bar" into gb-ub-photos-bryce
|
7f51a8455b34d794797388d31c1b42b0de9844d5 |
06-Mar-2013 |
Doris Liu <tianliu@google.com> |
Merge "Add a black bar symmetric to nav bar" into gb-ub-photos-bryce
|
457bab952ea6b8babf2d37c817f06aed3829ba61 |
06-Mar-2013 |
Doris Liu <tianliu@google.com> |
Merge "Keep camera controls on the same physical side" into gb-ub-photos-bryce
|
e07aedb584f9604e0b18929647fd31fe5dcc1b9f |
06-Mar-2013 |
Doris Liu <tianliu@google.com> |
Merge "Keep camera controls on the same physical side" into gb-ub-photos-bryce
|
9a9dba70e7aa9f5cae7838d9ec11e142b346d78b |
06-Mar-2013 |
Doris Liu <tianliu@google.com> |
Merge "Keep camera controls on the same physical side" into gb-ub-photos-bryce
|
09106a41ee6acc6b20553662cb9b730702a8f08a |
05-Mar-2013 |
Doris Liu <tianliu@google.com> |
Add a black bar symmetric to nav bar Also fix bug: 8323926 Change-Id: I4886b285dee8ad71ad72a55e96bf699b7c18c9f4
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/PhotoModule.java
|
7f24b3a94a723327ce9c2fcd5bb437cb9a0c5b77 |
05-Mar-2013 |
Doris Liu <tianliu@google.com> |
Add a black bar symmetric to nav bar Also fix bug: 8323926 Change-Id: I4886b285dee8ad71ad72a55e96bf699b7c18c9f4
es/layout-port/camera_controls.xml
es/layout/camera_main.xml
es/values/dimens.xml
|
7298e88db5eabc049da1ba3b092f9800a5ccedad |
05-Mar-2013 |
Doris Liu <tianliu@google.com> |
Add a black bar symmetric to nav bar Also fix bug: 8323926 Change-Id: I4886b285dee8ad71ad72a55e96bf699b7c18c9f4
es/layout-port/camera_controls.xml
es/layout/camera_main.xml
es/values/dimens.xml
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/PhotoModule.java
|
2bb0c98d91bce5e061ccb4dd6dd8765d74f89ce2 |
04-Mar-2013 |
Bobby Georgescu <georgescu@google.com> |
Preliminary AlbumSet UI Change-Id: Ie99bd2939bfcb47c80605cbb22b84b1064098e91
es/layout/album_set.xml
es/layout/album_set_item.xml
es/values/dimensions.xml
|
a73acc17eea200014edba9c9c6a40f1c632fa57d |
04-Mar-2013 |
Bobby Georgescu <georgescu@google.com> |
Preliminary AlbumSet UI Change-Id: Ie99bd2939bfcb47c80605cbb22b84b1064098e91
es/layout/album_set.xml
es/layout/album_set_item.xml
es/values/dimensions.xml
rc/com/android/photos/AlbumSetFragment.java
rc/com/android/photos/data/AlbumSetLoader.java
rc/com/android/photos/drawables/AutoThumbnailDrawable.java
|
8485a62af07a376e6741ff7c6b8c7c6b6d9ebc61 |
04-Mar-2013 |
Bobby Georgescu <georgescu@google.com> |
Preliminary AlbumSet UI Change-Id: Ie99bd2939bfcb47c80605cbb22b84b1064098e91
rc/com/android/photos/AlbumSetFragment.java
rc/com/android/photos/data/AlbumSetLoader.java
rc/com/android/photos/drawables/AutoThumbnailDrawable.java
|
e287f5b9af06ffbf7fcddd97342d140df921f75a |
06-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
Implements double-tap to zoom Change-Id: I716d847d6320504c963b197f11b0deea1fc338cb
rc/com/android/gallery3d/filtershow/imageshow/ImageShow.java
rc/com/android/gallery3d/filtershow/imageshow/MasterImage.java
|
6f72c44e600a365ab4986ee78fdbfd01a8f4cdb6 |
06-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
Implements double-tap to zoom Change-Id: I716d847d6320504c963b197f11b0deea1fc338cb
rc/com/android/gallery3d/filtershow/imageshow/ImageShow.java
rc/com/android/gallery3d/filtershow/imageshow/MasterImage.java
|
75d8c3be735d3d9521e39c4acf2188e7db8e7dc5 |
05-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
am b0d54928: am e0525c05: am 72693710: am 63b33e8c: Improves visual history * commit 'b0d54928b9e386e686073ae9491a27b51127dfb5': Improves visual history
|
e5932e39ab59853c2021809d5a74b87b4b277275 |
05-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
am e0525c05: am 72693710: am 63b33e8c: Improves visual history * commit 'e0525c05191a56624a27fcaccf0a21a74fd6abd0': Improves visual history
|
27db12a1e8b87024af1f105e942d194b5be13b9c |
05-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
am 72693710: am 63b33e8c: Improves visual history * commit '726937108a1d39b3c8ecdd7e2088ffccc7d1dd1d': Improves visual history
|
615ea48806f866afb8bf331bad6d48e5a723c7ae |
05-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
am 63b33e8c: Improves visual history * commit '63b33e8c7ebeeec2b520fb419d89ada712ad6604': Improves visual history
|
63b33e8c7ebeeec2b520fb419d89ada712ad6604 |
05-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
Improves visual history Change-Id: Ie43e99777d590a504b068d81f327119cca03b9d9
es/layout-land/filtershow_activity.xml
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
|
542c3832c24909c6f43b9b91fed4931a850b2fef |
05-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
Improves visual history Change-Id: Ie43e99777d590a504b068d81f327119cca03b9d9
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
|
dd26ed4af3d9575e7dae882ee0304fc50b463f55 |
05-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
Improves visual history Change-Id: Ie43e99777d590a504b068d81f327119cca03b9d9
es/layout-land/filtershow_activity.xml
|
8d2d0f5f0f7fffce9dbcc70da6924af545eba26d |
05-Mar-2013 |
Doris Liu <tianliu@google.com> |
Keep camera controls on the same physical side Change-Id: I09c50650c77a89fadfeb376564ef43e750994f8a
es/layout-land/camera_controls.xml
es/layout-port/camera_controls.xml
es/values/dimens.xml
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/ShutterButton.java
rc/com/android/camera/ui/CameraSwitcher.java
rc/com/android/camera/ui/RotatableLayout.java
|
48239f4dd39040a9ab2ffc977586035a8784fd78 |
05-Mar-2013 |
Doris Liu <tianliu@google.com> |
Keep camera controls on the same physical side Change-Id: I09c50650c77a89fadfeb376564ef43e750994f8a
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/ShutterButton.java
rc/com/android/camera/ui/CameraSwitcher.java
rc/com/android/camera/ui/RotatableLayout.java
|
b9f88b9c12a3d0b33120321349f8f662d0fda217 |
05-Mar-2013 |
Doris Liu <tianliu@google.com> |
Keep camera controls on the same physical side Change-Id: I09c50650c77a89fadfeb376564ef43e750994f8a
es/layout-land/camera_controls.xml
es/layout-port/camera_controls.xml
es/values/dimens.xml
|
aeb0d36638e8914093b2fa8260a7f9e2394ca9de |
05-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
am 33aa75ea: am 00d7942c: am a28dcb04: am 6ee7feee: Visual History * commit '33aa75eab7c74b69f18db0c38ca17f9bf58c1f0c': Visual History
|
a383938d373c299f6f2cb09bc5849b1416737a44 |
05-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
am 00d7942c: am a28dcb04: am 6ee7feee: Visual History * commit '00d7942c45618750c89eb1f246a78526b653b854': Visual History
|
e4471f377bb54a6341a2907b9d13fd3ff6eb5e5f |
05-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
am a28dcb04: am 6ee7feee: Visual History * commit 'a28dcb04f4975fdc9e5ab8a5f212dd4de1b49904': Visual History
|
37a24096b056cddd3061c107847fb92bd220bed7 |
05-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
am 6ee7feee: Visual History * commit '6ee7feeefec9e99ea6b98408323a416214d0e817': Visual History
|
fdd4d992d7920e38ec21512c2435aabfe547d79b |
05-Mar-2013 |
The Android Automerger <android-build@android.com> |
merge in jb-mr2-release history after reset to jb-mr2-dev
|
6ee7feeefec9e99ea6b98408323a416214d0e817 |
05-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
Visual History Change-Id: I3397c44b8c47985c97de5b82456c03469b2fb8db
es/layout/filtershow_history_operation_row.xml
rc/com/android/gallery3d/filtershow/HistoryAdapter.java
rc/com/android/gallery3d/filtershow/cache/RenderingRequest.java
rc/com/android/gallery3d/filtershow/imageshow/ImageShow.java
rc/com/android/gallery3d/filtershow/imageshow/MasterImage.java
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
|
6aa73e7615a165c185778c238a7d6c73b6b56eff |
05-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
Visual History Change-Id: I3397c44b8c47985c97de5b82456c03469b2fb8db
rc/com/android/gallery3d/filtershow/HistoryAdapter.java
rc/com/android/gallery3d/filtershow/cache/RenderingRequest.java
rc/com/android/gallery3d/filtershow/imageshow/ImageShow.java
rc/com/android/gallery3d/filtershow/imageshow/MasterImage.java
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
|
a1f1499f43dc10e03c7cd66416e23a98487bcb59 |
05-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
Visual History Change-Id: I3397c44b8c47985c97de5b82456c03469b2fb8db
es/layout/filtershow_history_operation_row.xml
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
|
bba72440f597a1ce352268fb1e9646f8415fa9cc |
05-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
am 04498ea1: am 21b79201: am 4446c661: am a0adf211: Merge "Simplify and speed up thumbnail creation" into gb-ub-photos-bryce * commit '04498ea1c7950321e222f1603c413b8e1933df34': Simplify and speed up thumbnail creation
|
7140194c3126d9c614271a8050a8525865edde3a |
05-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
am 21b79201: am 4446c661: am a0adf211: Merge "Simplify and speed up thumbnail creation" into gb-ub-photos-bryce * commit '21b792016eafbe0e73d59308543821d1e02aa85e': Simplify and speed up thumbnail creation
|
9b679c0aae866a1b9996acca696701abb26474c9 |
05-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
am 4446c661: am a0adf211: Merge "Simplify and speed up thumbnail creation" into gb-ub-photos-bryce * commit '4446c6619033a62980e453ece3e72bb7bc105143': Simplify and speed up thumbnail creation
|
f9eec762467aa0b7886d91d3ff755fc565f5461b |
05-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
am a0adf211: Merge "Simplify and speed up thumbnail creation" into gb-ub-photos-bryce * commit 'a0adf2113b8728d92f270953ca8cab50335fe68e': Simplify and speed up thumbnail creation
|
a0adf2113b8728d92f270953ca8cab50335fe68e |
05-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
Merge "Simplify and speed up thumbnail creation" into gb-ub-photos-bryce
|
72db7ea0c18e5cc2f465252b53d9b6d2a8dcc6a0 |
05-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
Merge "Simplify and speed up thumbnail creation" into gb-ub-photos-bryce
|
4e1d35506bb72a2a6c16f08f8bd86bdfe8d1c902 |
05-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
Simplify and speed up thumbnail creation Change-Id: I1423573c600a807081f81d3cb3036b690e426f9e
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/imageshow/MasterImage.java
rc/com/android/gallery3d/filtershow/ui/FilterIconButton.java
|
b692dff92bc6caa24b546df1aa8a0b4c39e57112 |
05-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
Simplify and speed up thumbnail creation Change-Id: I1423573c600a807081f81d3cb3036b690e426f9e
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/imageshow/MasterImage.java
rc/com/android/gallery3d/filtershow/ui/FilterIconButton.java
|
a36afc6097b71fc9b28f4b2a192d2262873e361b |
05-Mar-2013 |
John Hoford <hoford@google.com> |
am 5873f637: am a2f1227a: am b5941762: am fc7d4651: fixed vignetnette refresh during pan/zoom * commit '5873f6376a0134f41e375bbecb995ad3e6587cd9': fixed vignetnette refresh during pan/zoom
|
70a2982ca439aa73742e1308dbfbc3bebe3ff130 |
05-Mar-2013 |
John Hoford <hoford@google.com> |
am a2f1227a: am b5941762: am fc7d4651: fixed vignetnette refresh during pan/zoom * commit 'a2f1227a0442c037806260c832ded2a662df5900': fixed vignetnette refresh during pan/zoom
|
f5c08c8a1dbe74af694a4e46196c83a1b4933f1d |
05-Mar-2013 |
John Hoford <hoford@google.com> |
am b5941762: am fc7d4651: fixed vignetnette refresh during pan/zoom * commit 'b59417626daa9513246171b53f965a37f7273597': fixed vignetnette refresh during pan/zoom
|
e34ebc841a1fac84ca880a86705c2fc883d4c86c |
05-Mar-2013 |
John Hoford <hoford@google.com> |
am fc7d4651: fixed vignetnette refresh during pan/zoom * commit 'fc7d46515db7a3a50f7416c2462030609391cf95': fixed vignetnette refresh during pan/zoom
|
fc7d46515db7a3a50f7416c2462030609391cf95 |
05-Mar-2013 |
John Hoford <hoford@google.com> |
fixed vignetnette refresh during pan/zoom Change-Id: I6bcc13cdd5232a15f199d8f64258c450f045c1cf
rc/com/android/gallery3d/filtershow/imageshow/ImageVignette.java
|
377b9710723e1a316be0574fcbc4bb78dd9b11c9 |
05-Mar-2013 |
John Hoford <hoford@google.com> |
fixed vignetnette refresh during pan/zoom Change-Id: I6bcc13cdd5232a15f199d8f64258c450f045c1cf
rc/com/android/gallery3d/filtershow/imageshow/ImageVignette.java
|
6fd172a3f5a87fb752cb4afbb6538dcf5bd4cc6d |
05-Mar-2013 |
John Hoford <hoford@google.com> |
am fd8c3daa: am 81e7e885: am 2a20a8a2: am 5300e0c5: fix tiny planet shown after rotation * commit 'fd8c3daa72959a6733cabaede149036a95d70987': fix tiny planet shown after rotation
|
9836c92fdc0a6ae9eecc141ee5252a142969eb01 |
05-Mar-2013 |
John Hoford <hoford@google.com> |
am 81e7e885: am 2a20a8a2: am 5300e0c5: fix tiny planet shown after rotation * commit '81e7e8858cc5417b36fe4db9e54418a3607fd05f': fix tiny planet shown after rotation
|
615bfda19163f71c48ef16e0930293c3c01a1fb0 |
05-Mar-2013 |
John Hoford <hoford@google.com> |
am 2a20a8a2: am 5300e0c5: fix tiny planet shown after rotation * commit '2a20a8a21f42649a50c60636605c7d57f87d49f4': fix tiny planet shown after rotation
|
5cfcc8b4b944991dcf542e3b75b453921a191ea3 |
05-Mar-2013 |
John Hoford <hoford@google.com> |
am 5300e0c5: fix tiny planet shown after rotation * commit '5300e0c54110d67f85fdb2ee9c90be58f50ca4ac': fix tiny planet shown after rotation
|
a10154c40e578de4e3ff11d401ee4f3f3b5479ac |
05-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
am 355ff89a: am 27b3dc49: am a4a98183: am cdea1074: Improves state/history panel behaviour * commit '355ff89a03bf762ca446ea6c83a10439ad2b489a': Improves state/history panel behaviour
|
7847b749d1b8cb148ff5f38a63dfa449c21ad681 |
05-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
am 27b3dc49: am a4a98183: am cdea1074: Improves state/history panel behaviour * commit '27b3dc499ba6491829ec80777130035cf596c2b0': Improves state/history panel behaviour
|
5300e0c54110d67f85fdb2ee9c90be58f50ca4ac |
05-Mar-2013 |
John Hoford <hoford@google.com> |
fix tiny planet shown after rotation Change-Id: Ia27f424c7936b8f3c7fb69d3b80966d4f364f116
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
|
27ebe00df84917c6aeee22350ddf62129611c4f8 |
05-Mar-2013 |
John Hoford <hoford@google.com> |
fix tiny planet shown after rotation Change-Id: Ia27f424c7936b8f3c7fb69d3b80966d4f364f116
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
|
8b9c585b0c46bf311974f9f13b1ab40e173342b2 |
05-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
am a4a98183: am cdea1074: Improves state/history panel behaviour * commit 'a4a98183d17fc4d9f130819698fd6988670982ea': Improves state/history panel behaviour
|
f54b470b5605fdbb02a326aed5eab3034f0eb10d |
05-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
am cdea1074: Improves state/history panel behaviour * commit 'cdea10749cbdb6bab8f49f1b5b562b6e89781981': Improves state/history panel behaviour
|
842971d516c9ed873a686bdb54153dd25d84b468 |
05-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
Improves state/history panel behaviour Change-Id: Icfd071aa5de11f1fe8cbba34f2837d5a850f9a68
es/layout-land/filtershow_activity.xml
|
cdea10749cbdb6bab8f49f1b5b562b6e89781981 |
05-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
Improves state/history panel behaviour Change-Id: Icfd071aa5de11f1fe8cbba34f2837d5a850f9a68
es/layout-land/filtershow_activity.xml
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
|
6e998555df98738bfc0f5a4290791c83aa6cee09 |
05-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
Improves state/history panel behaviour Change-Id: Icfd071aa5de11f1fe8cbba34f2837d5a850f9a68
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
|
be3ab91606bd5ec8bbfdac1c03575f8d97eb9bf7 |
05-Mar-2013 |
George Mount <mount@google.com> |
am 2527ae33: am 93f62367: am e9af7056: am 9c223cf1: Merge "Fix build break." into gb-ub-photos-bryce * commit '2527ae3380321b9fd1e66cd0a561e637d2a0660a': Fix build break.
|
5d6afdffa0b607cf2771eb83e79e1b1d3b32989f |
05-Mar-2013 |
George Mount <mount@google.com> |
am 93f62367: am e9af7056: am 9c223cf1: Merge "Fix build break." into gb-ub-photos-bryce * commit '93f62367d7a8d8a82f95cc7beb0d2b9912626df6': Fix build break.
|
6aed6ce88fb66043e290caf8ff9e8a1ccb3b0ea5 |
05-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
am 91ddd713: am ea67dbae: am c241545a: am c882c3fe: Merge "UI cleanup" into gb-ub-photos-bryce * commit '91ddd713de94ffeaabe257fb33dcdaae3c2e2a79': UI cleanup
|
b9e22e0be81d6564b2766200a88d9e9ee2eb9e50 |
05-Mar-2013 |
George Mount <mount@google.com> |
am e9af7056: am 9c223cf1: Merge "Fix build break." into gb-ub-photos-bryce * commit 'e9af70567534c4c946347b3cfd9f005a363c5c0a': Fix build break.
|
6bf6d15147c889368615ebfb84ece6a3730e5871 |
05-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
am ea67dbae: am c241545a: am c882c3fe: Merge "UI cleanup" into gb-ub-photos-bryce * commit 'ea67dbae8ddc6b8e1cf0e6e7ffd2cfc7b1973db0': UI cleanup
|
8a7cfd09326b96354929ef68d6437708fa3f8164 |
05-Mar-2013 |
George Mount <mount@google.com> |
am 9c223cf1: Merge "Fix build break." into gb-ub-photos-bryce * commit '9c223cf1072172845c9118fac028371b5a57919a': Fix build break.
|
ec136191b33b4daa7cdde1eab5e6996129bea913 |
05-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
am c241545a: am c882c3fe: Merge "UI cleanup" into gb-ub-photos-bryce * commit 'c241545ab013a81f4d30528c52139a7b664edf2e': UI cleanup
|
2a149944b6b991f61816823e972159f87cc0c051 |
05-Mar-2013 |
George Mount <mount@google.com> |
am 17d3e33a: am 3bd9aa89: am 6f991596: am 8438e102: Merge "Update PhotoProvider and tests to allow tests to run against GalleryGoogle.apk" into gb-ub-photos-bryce * commit '17d3e33ac65d8ec16b1035afefd8f2a52276150e': Update PhotoProvider and tests to allow tests to run against GalleryGoogle.apk
|
487288cb959ec9fa063c9787a3be52482d9ada36 |
05-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
am c882c3fe: Merge "UI cleanup" into gb-ub-photos-bryce * commit 'c882c3fec7409a40d4b4ff401fcfa81be7684424': UI cleanup
|
1bf3f3238727cc73a156e3eb61a2d2343ac3bdc0 |
05-Mar-2013 |
George Mount <mount@google.com> |
Merge "Fix build break." into gb-ub-photos-bryce
|
9c223cf1072172845c9118fac028371b5a57919a |
05-Mar-2013 |
George Mount <mount@google.com> |
Merge "Fix build break." into gb-ub-photos-bryce
|
f2ce69e2ef6395313d0a361f3849e338a7cf6969 |
05-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
Merge "UI cleanup" into gb-ub-photos-bryce
|
c882c3fec7409a40d4b4ff401fcfa81be7684424 |
05-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
Merge "UI cleanup" into gb-ub-photos-bryce
|
65fe4bb42ce4e517e6c51aa357a5a40747d462a7 |
05-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
Merge "UI cleanup" into gb-ub-photos-bryce
|
00c8b427b4371748b339be9660f61e3d1f6ece41 |
05-Mar-2013 |
George Mount <mount@google.com> |
Fix build break. Change-Id: If19356395fe005a98036888cd9a688c4d36720ea
rc/com/android/photos/data/PhotoProvider.java
|
8c8e86dcb25cd65631d461940ce93bccabecf473 |
05-Mar-2013 |
George Mount <mount@google.com> |
Fix build break. Change-Id: If19356395fe005a98036888cd9a688c4d36720ea
rc/com/android/photos/data/PhotoProvider.java
|
37883ceccc6edfb8c3afbe5b5a7c399d94e793a1 |
05-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
UI cleanup Change-Id: Iaf138455651511e610b640a716820bd846284948
leanSpec.mk
|
ec776b17fc04d329944eaea7bf82d6bb87750d03 |
05-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
UI cleanup Change-Id: Iaf138455651511e610b640a716820bd846284948
es/drawable/filtershow_drawing.png
es/menu/filtershow_activity_menu.xml
rc/com/android/gallery3d/filtershow/filters/FilterDrawRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterRedEyeRepresentation.java
|
38fc044a6d45e7283f05e6fe800bc5faf9f2e573 |
05-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
UI cleanup Change-Id: Iaf138455651511e610b640a716820bd846284948
leanSpec.mk
es/drawable/filtershow_drawing.png
es/menu/filtershow_activity_menu.xml
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/filters/BaseFiltersManager.java
rc/com/android/gallery3d/filtershow/filters/FilterDrawRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterRedEyeRepresentation.java
rc_pd/com/android/gallery3d/filtershow/filters/FiltersManager.java
|
b69f9cb14c4d47ab681f50379bfbada4b1bd00d0 |
05-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
UI cleanup Change-Id: Iaf138455651511e610b640a716820bd846284948
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/filters/BaseFiltersManager.java
rc/com/android/gallery3d/filtershow/filters/FilterDrawRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterRedEyeRepresentation.java
rc_pd/com/android/gallery3d/filtershow/filters/FiltersManager.java
|
b05948eb0d3f10fe4cc4aa74d1a43ad5dd247549 |
05-Mar-2013 |
George Mount <mount@google.com> |
am 3bd9aa89: am 6f991596: am 8438e102: Merge "Update PhotoProvider and tests to allow tests to run against GalleryGoogle.apk" into gb-ub-photos-bryce * commit '3bd9aa89c398e0a319647bc98b7bb5b60bdde847': Update PhotoProvider and tests to allow tests to run against GalleryGoogle.apk
|
a8cca8a4011a0cd8be960bb9d50769ca5a5bb558 |
05-Mar-2013 |
George Mount <mount@google.com> |
am 6f991596: am 8438e102: Merge "Update PhotoProvider and tests to allow tests to run against GalleryGoogle.apk" into gb-ub-photos-bryce * commit '6f99159695f952b4e2d1d3a968354bdd3b9e4e64': Update PhotoProvider and tests to allow tests to run against GalleryGoogle.apk
|
67ffe12bd4fe14b3fdc1eebbed4f574c3a9e3196 |
05-Mar-2013 |
George Mount <mount@google.com> |
am 8438e102: Merge "Update PhotoProvider and tests to allow tests to run against GalleryGoogle.apk" into gb-ub-photos-bryce * commit '8438e10230fe1ce102e5c29f8eac6c96e4eec900': Update PhotoProvider and tests to allow tests to run against GalleryGoogle.apk
|
e05821303f17cb8f20d2b3eac9cc909bb9e2660d |
05-Mar-2013 |
George Mount <mount@google.com> |
Merge "Update PhotoProvider and tests to allow tests to run against GalleryGoogle.apk" into gb-ub-photos-bryce
|
8438e10230fe1ce102e5c29f8eac6c96e4eec900 |
05-Mar-2013 |
George Mount <mount@google.com> |
Merge "Update PhotoProvider and tests to allow tests to run against GalleryGoogle.apk" into gb-ub-photos-bryce
|
50f73c1ffef9cc470936cf85103eaa895bcfd1f8 |
05-Mar-2013 |
George Mount <mount@google.com> |
Merge "Update PhotoProvider and tests to allow tests to run against GalleryGoogle.apk" into gb-ub-photos-bryce
|
c0a5c3b8cd7d9724b0f9b692008283abc750f0d0 |
28-Feb-2013 |
George Mount <mount@google.com> |
Update PhotoProvider and tests to allow tests to run against GalleryGoogle.apk Change-Id: I6630e7a5ba0883b887915f63094885a2dc9f025c
rc/com/android/photos/data/NotificationWatcher.java
rc/com/android/photos/data/PhotoDatabase.java
rc/com/android/photos/data/PhotoProvider.java
rc_pd/com/android/photos/data/PhotoProviderAuthority.java
ests/src/com/android/photos/data/PhotoDatabaseTest.java
ests/src/com/android/photos/data/PhotoDatabaseUtils.java
ests/src/com/android/photos/data/PhotoProviderTest.java
ests/src/com/android/photos/data/TestHelper.java
|
135c2e576f3dfea954ba628942c55adcb35a7cf6 |
28-Feb-2013 |
George Mount <mount@google.com> |
Update PhotoProvider and tests to allow tests to run against GalleryGoogle.apk Change-Id: I6630e7a5ba0883b887915f63094885a2dc9f025c
es/values/dimens.xml
rc/com/android/photos/data/NotificationWatcher.java
rc/com/android/photos/data/PhotoDatabase.java
rc/com/android/photos/data/PhotoProvider.java
rc_pd/com/android/photos/data/PhotoProviderAuthority.java
ests/src/com/android/photos/data/PhotoDatabaseTest.java
ests/src/com/android/photos/data/PhotoDatabaseUtils.java
ests/src/com/android/photos/data/PhotoProviderTest.java
ests/src/com/android/photos/data/TestHelper.java
|
b4ca18399c369ec04b4ad1266e5a6645501478a1 |
28-Feb-2013 |
George Mount <mount@google.com> |
Update PhotoProvider and tests to allow tests to run against GalleryGoogle.apk Change-Id: I6630e7a5ba0883b887915f63094885a2dc9f025c
es/values/dimens.xml
|
82033fa0a02c0ebc8088928cbb8cbe3884d2df30 |
04-Mar-2013 |
Bobby Georgescu <georgescu@google.com> |
am e8811895: am 14427b5e: am 8dab2ccb: am 4cf62cd1: Merge "Clean up comments" into gb-ub-photos-bryce * commit 'e8811895d188ff3067076657660784a5689065b5': Clean up comments
|
6b6d502d3a132a80d763f1d595c2d0a9d3c84542 |
04-Mar-2013 |
Bobby Georgescu <georgescu@google.com> |
am 14427b5e: am 8dab2ccb: am 4cf62cd1: Merge "Clean up comments" into gb-ub-photos-bryce * commit '14427b5e98bfbad82c263fe1a060a3040107fc8c': Clean up comments
|
9779fe38247ece9e4e3b64c901fba4e54a1d86f0 |
04-Mar-2013 |
Bobby Georgescu <georgescu@google.com> |
am 8dab2ccb: am 4cf62cd1: Merge "Clean up comments" into gb-ub-photos-bryce * commit '8dab2ccb07e41a5b5fa9b53cc3290cb42c508978': Clean up comments
|
4b4052814b9afdac779a5137115005451a73d485 |
04-Mar-2013 |
Bobby Georgescu <georgescu@google.com> |
am 4cf62cd1: Merge "Clean up comments" into gb-ub-photos-bryce * commit '4cf62cd1c8ee14a7e4b698f0be49ceba00f1b085': Clean up comments
|
4cf62cd1c8ee14a7e4b698f0be49ceba00f1b085 |
04-Mar-2013 |
Bobby Georgescu <georgescu@google.com> |
Merge "Clean up comments" into gb-ub-photos-bryce
|
e9f4e8c565de133a6cc16e562050d304e02e4cb6 |
04-Mar-2013 |
Bobby Georgescu <georgescu@google.com> |
Merge "Clean up comments" into gb-ub-photos-bryce
|
b078179c9219dc4cd99c2e4e7c5e5266587adaac |
04-Mar-2013 |
Bobby Georgescu <georgescu@google.com> |
Clean up comments Change-Id: I29e6d7ffef6b6b319262982709794aadd7919d8c
rc/com/android/photos/drawables/AutoThumbnailDrawable.java
|
011dd556c4058a7832a584298f68c637a0eee0cd |
04-Mar-2013 |
Bobby Georgescu <georgescu@google.com> |
Clean up comments Change-Id: I29e6d7ffef6b6b319262982709794aadd7919d8c
rc/com/android/photos/drawables/AutoThumbnailDrawable.java
|
c5fb7b14ff535355ea9df2a5af05c84cc1dbc4f4 |
04-Mar-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I230e568e9da104f2bdb039c0fd2fd560e38cfa4d Auto-generated-cl: translation import
es/values-af/filtershow_strings.xml
es/values-am/filtershow_strings.xml
es/values-ar/filtershow_strings.xml
es/values-be/filtershow_strings.xml
es/values-bg/filtershow_strings.xml
es/values-ca/filtershow_strings.xml
es/values-cs/filtershow_strings.xml
es/values-da/filtershow_strings.xml
es/values-de/filtershow_strings.xml
es/values-el/filtershow_strings.xml
es/values-en-rGB/filtershow_strings.xml
es/values-es-rUS/filtershow_strings.xml
es/values-es/filtershow_strings.xml
es/values-et/filtershow_strings.xml
es/values-fa/filtershow_strings.xml
es/values-fi/filtershow_strings.xml
es/values-fr/filtershow_strings.xml
es/values-hi/filtershow_strings.xml
es/values-hr/filtershow_strings.xml
es/values-hu/filtershow_strings.xml
es/values-in/filtershow_strings.xml
es/values-it/filtershow_strings.xml
es/values-iw/filtershow_strings.xml
es/values-ja/filtershow_strings.xml
es/values-ko/filtershow_strings.xml
es/values-lt/filtershow_strings.xml
es/values-lv/filtershow_strings.xml
es/values-ms/filtershow_strings.xml
es/values-nb/filtershow_strings.xml
es/values-nl/filtershow_strings.xml
es/values-pl/filtershow_strings.xml
es/values-pt-rPT/filtershow_strings.xml
es/values-pt/filtershow_strings.xml
es/values-ro/filtershow_strings.xml
es/values-ru/filtershow_strings.xml
es/values-sk/filtershow_strings.xml
es/values-sl/filtershow_strings.xml
es/values-sr/filtershow_strings.xml
es/values-sv/filtershow_strings.xml
es/values-sw/filtershow_strings.xml
es/values-th/filtershow_strings.xml
es/values-tl/filtershow_strings.xml
es/values-tr/filtershow_strings.xml
es/values-uk/filtershow_strings.xml
es/values-vi/filtershow_strings.xml
es/values-zh-rCN/filtershow_strings.xml
es/values-zh-rTW/filtershow_strings.xml
es/values-zu/filtershow_strings.xml
|
a72de630a99d15e67a60c2f7560b3efa75f6d82a |
04-Mar-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I9fbf1ac0828d33d7c048d49210cd24bc6d6aad63 Auto-generated-cl: translation import
es/values-af/filtershow_strings.xml
es/values-am/filtershow_strings.xml
es/values-ar/filtershow_strings.xml
es/values-be/filtershow_strings.xml
es/values-bg/filtershow_strings.xml
es/values-ca/filtershow_strings.xml
es/values-cs/filtershow_strings.xml
es/values-da/filtershow_strings.xml
es/values-de/filtershow_strings.xml
es/values-el/filtershow_strings.xml
es/values-en-rGB/filtershow_strings.xml
es/values-es-rUS/filtershow_strings.xml
es/values-es/filtershow_strings.xml
es/values-et/filtershow_strings.xml
es/values-fa/filtershow_strings.xml
es/values-fi/filtershow_strings.xml
es/values-fr/filtershow_strings.xml
es/values-hi/filtershow_strings.xml
es/values-hr/filtershow_strings.xml
es/values-hu/filtershow_strings.xml
es/values-in/filtershow_strings.xml
es/values-it/filtershow_strings.xml
es/values-iw/filtershow_strings.xml
es/values-ja/filtershow_strings.xml
es/values-ko/filtershow_strings.xml
es/values-lt/filtershow_strings.xml
es/values-lv/filtershow_strings.xml
es/values-ms/filtershow_strings.xml
es/values-nb/filtershow_strings.xml
es/values-nl/filtershow_strings.xml
es/values-pl/filtershow_strings.xml
es/values-pt-rPT/filtershow_strings.xml
es/values-pt/filtershow_strings.xml
es/values-ro/filtershow_strings.xml
es/values-ru/filtershow_strings.xml
es/values-sk/filtershow_strings.xml
es/values-sl/filtershow_strings.xml
es/values-sr/filtershow_strings.xml
es/values-sv/filtershow_strings.xml
es/values-sw/filtershow_strings.xml
es/values-th/filtershow_strings.xml
es/values-tl/filtershow_strings.xml
es/values-tr/filtershow_strings.xml
es/values-uk/filtershow_strings.xml
es/values-vi/filtershow_strings.xml
es/values-zh-rCN/filtershow_strings.xml
es/values-zh-rTW/filtershow_strings.xml
es/values-zu/filtershow_strings.xml
|
ef21c6d64c60a833a33b360b82c6a5d7bb5a38c1 |
04-Mar-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ic524e207ef265824359c697e352dd4007af74f31 Auto-generated-cl: translation import
es/values-af/filtershow_strings.xml
es/values-am/filtershow_strings.xml
es/values-ar/filtershow_strings.xml
es/values-be/filtershow_strings.xml
es/values-bg/filtershow_strings.xml
es/values-ca/filtershow_strings.xml
es/values-cs/filtershow_strings.xml
es/values-da/filtershow_strings.xml
es/values-de/filtershow_strings.xml
es/values-el/filtershow_strings.xml
es/values-en-rGB/filtershow_strings.xml
es/values-es-rUS/filtershow_strings.xml
es/values-es/filtershow_strings.xml
es/values-et/filtershow_strings.xml
es/values-fa/filtershow_strings.xml
es/values-fi/filtershow_strings.xml
es/values-fr/filtershow_strings.xml
es/values-hi/filtershow_strings.xml
es/values-hr/filtershow_strings.xml
es/values-hu/filtershow_strings.xml
es/values-in/filtershow_strings.xml
es/values-it/filtershow_strings.xml
es/values-iw/filtershow_strings.xml
es/values-ja/filtershow_strings.xml
es/values-ko/filtershow_strings.xml
es/values-lt/filtershow_strings.xml
es/values-lv/filtershow_strings.xml
es/values-ms/filtershow_strings.xml
es/values-nb/filtershow_strings.xml
es/values-nl/filtershow_strings.xml
es/values-pl/filtershow_strings.xml
es/values-pt-rPT/filtershow_strings.xml
es/values-pt/filtershow_strings.xml
es/values-ro/filtershow_strings.xml
es/values-ru/filtershow_strings.xml
es/values-sk/filtershow_strings.xml
es/values-sl/filtershow_strings.xml
es/values-sr/filtershow_strings.xml
es/values-sv/filtershow_strings.xml
es/values-sw/filtershow_strings.xml
es/values-th/filtershow_strings.xml
es/values-tl/filtershow_strings.xml
es/values-tr/filtershow_strings.xml
es/values-uk/filtershow_strings.xml
es/values-vi/filtershow_strings.xml
es/values-zh-rCN/filtershow_strings.xml
es/values-zh-rTW/filtershow_strings.xml
es/values-zu/filtershow_strings.xml
|
b73300173757f36607ac677c2aee7ae04782325f |
04-Mar-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Id6aba0c7b2d7a9efe94a6f5cd15c146f58b45e13 Auto-generated-cl: translation import
es/values-af/filtershow_strings.xml
es/values-am/filtershow_strings.xml
es/values-ar/filtershow_strings.xml
es/values-be/filtershow_strings.xml
es/values-bg/filtershow_strings.xml
es/values-ca/filtershow_strings.xml
es/values-cs/filtershow_strings.xml
es/values-da/filtershow_strings.xml
es/values-de/filtershow_strings.xml
es/values-el/filtershow_strings.xml
es/values-en-rGB/filtershow_strings.xml
es/values-es-rUS/filtershow_strings.xml
es/values-es/filtershow_strings.xml
es/values-et/filtershow_strings.xml
es/values-fa/filtershow_strings.xml
es/values-fi/filtershow_strings.xml
es/values-fr/filtershow_strings.xml
es/values-hi/filtershow_strings.xml
es/values-hr/filtershow_strings.xml
es/values-hu/filtershow_strings.xml
es/values-in/filtershow_strings.xml
es/values-it/filtershow_strings.xml
es/values-iw/filtershow_strings.xml
es/values-ja/filtershow_strings.xml
es/values-ko/filtershow_strings.xml
es/values-lt/filtershow_strings.xml
es/values-lv/filtershow_strings.xml
es/values-ms/filtershow_strings.xml
es/values-nb/filtershow_strings.xml
es/values-nl/filtershow_strings.xml
es/values-pl/filtershow_strings.xml
es/values-pt-rPT/filtershow_strings.xml
es/values-pt/filtershow_strings.xml
es/values-ro/filtershow_strings.xml
es/values-ru/filtershow_strings.xml
es/values-sk/filtershow_strings.xml
es/values-sl/filtershow_strings.xml
es/values-sr/filtershow_strings.xml
es/values-sv/filtershow_strings.xml
es/values-sw/filtershow_strings.xml
es/values-th/filtershow_strings.xml
es/values-tl/filtershow_strings.xml
es/values-tr/filtershow_strings.xml
es/values-uk/filtershow_strings.xml
es/values-vi/filtershow_strings.xml
es/values-zh-rCN/filtershow_strings.xml
es/values-zh-rTW/filtershow_strings.xml
es/values-zu/filtershow_strings.xml
|
1d911c099c767860e6dce8c5d8596bef1496f885 |
04-Mar-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Id6aba0c7b2d7a9efe94a6f5cd15c146f58b45e13 Auto-generated-cl: translation import
es/values-af/filtershow_strings.xml
es/values-am/filtershow_strings.xml
es/values-ar/filtershow_strings.xml
es/values-be/filtershow_strings.xml
es/values-bg/filtershow_strings.xml
es/values-ca/filtershow_strings.xml
es/values-cs/filtershow_strings.xml
es/values-da/filtershow_strings.xml
es/values-de/filtershow_strings.xml
es/values-el/filtershow_strings.xml
es/values-en-rGB/filtershow_strings.xml
es/values-es-rUS/filtershow_strings.xml
es/values-es/filtershow_strings.xml
es/values-et/filtershow_strings.xml
es/values-fa/filtershow_strings.xml
es/values-fi/filtershow_strings.xml
es/values-fr/filtershow_strings.xml
es/values-hi/filtershow_strings.xml
es/values-hr/filtershow_strings.xml
es/values-hu/filtershow_strings.xml
es/values-in/filtershow_strings.xml
es/values-it/filtershow_strings.xml
es/values-iw/filtershow_strings.xml
es/values-ja/filtershow_strings.xml
es/values-ko/filtershow_strings.xml
es/values-lt/filtershow_strings.xml
es/values-lv/filtershow_strings.xml
es/values-ms/filtershow_strings.xml
es/values-nb/filtershow_strings.xml
es/values-nl/filtershow_strings.xml
es/values-pl/filtershow_strings.xml
es/values-pt-rPT/filtershow_strings.xml
es/values-pt/filtershow_strings.xml
es/values-ro/filtershow_strings.xml
es/values-ru/filtershow_strings.xml
es/values-sk/filtershow_strings.xml
es/values-sl/filtershow_strings.xml
es/values-sr/filtershow_strings.xml
es/values-sv/filtershow_strings.xml
es/values-sw/filtershow_strings.xml
es/values-th/filtershow_strings.xml
es/values-tl/filtershow_strings.xml
es/values-tr/filtershow_strings.xml
es/values-uk/filtershow_strings.xml
es/values-vi/filtershow_strings.xml
es/values-zh-rCN/filtershow_strings.xml
es/values-zh-rTW/filtershow_strings.xml
es/values-zu/filtershow_strings.xml
|
ad5dca52fd4f13cab8ebebc45e27cc535ce69d9f |
04-Mar-2013 |
The Android Open Source Project <initial-contribution@android.com> |
am 6e3b0275: (-s ours) am dd3f00a0: (-s ours) Reconcile with jb-mr2-release - do not merge * commit '6e3b02758544d1f326c26d2c410dbd486266c274': Fix for applied ratios Fix crop ratio
|
fd24e40b848842762dda2c38fb441360ebad468a |
04-Mar-2013 |
The Android Open Source Project <initial-contribution@android.com> |
am dd3f00a0: (-s ours) Reconcile with jb-mr2-release - do not merge * commit 'dd3f00a05b018b94209a1f32f5d5d384c071285e': Fix for applied ratios Fix crop ratio
|
d59ea7abc25970a8242b795426e830be42c824cd |
04-Mar-2013 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with jb-mr2-release - do not merge Change-Id: I33a0b7686aaf8e8a10c3ec222b673297ad7e76a1
|
9694048b65a52eed27e0930660ef9d45f4547c16 |
04-Mar-2013 |
Doris Liu <tianliu@google.com> |
am 62963838: am cb0103e2: am fa7440b0: Merge "Flatten view hierarchy and rotate views" into gb-ub-photos-bryce * commit '62963838e6ed6a8f340b1a0f0c224d56347bc0ac': Flatten view hierarchy and rotate views
|
464a580231480debdbdc53aac8f32946ed16b3b7 |
04-Mar-2013 |
Doris Liu <tianliu@google.com> |
am cb0103e2: am fa7440b0: Merge "Flatten view hierarchy and rotate views" into gb-ub-photos-bryce * commit 'cb0103e283880817a4f02a5381b04b68f89a4879': Flatten view hierarchy and rotate views
|
f30f25ca878ddcb6d78184ff17553c3714cdd13b |
04-Mar-2013 |
Doris Liu <tianliu@google.com> |
am fa7440b0: Merge "Flatten view hierarchy and rotate views" into gb-ub-photos-bryce * commit 'fa7440b031c06a8c69e19ee0f6a3d44a0beb8e71': Flatten view hierarchy and rotate views
|
5bb5fea402f0d584cacf237bfb7be53cf06e6489 |
04-Mar-2013 |
Doris Liu <tianliu@google.com> |
Merge "Flatten view hierarchy and rotate views" into gb-ub-photos-bryce
|
fa7440b031c06a8c69e19ee0f6a3d44a0beb8e71 |
04-Mar-2013 |
Doris Liu <tianliu@google.com> |
Merge "Flatten view hierarchy and rotate views" into gb-ub-photos-bryce
|
ee4db343e856800b141dcf4d69fe96b1270339e4 |
04-Mar-2013 |
Doris Liu <tianliu@google.com> |
Merge "Flatten view hierarchy and rotate views" into gb-ub-photos-bryce
|
08a98b9946503e97549d70fd0228dea81175159e |
26-Feb-2013 |
Doris Liu <tianliu@google.com> |
Flatten view hierarchy and rotate views TODO: SRI pano and Lightcycle can use a bit more flattening. I will get to them next. (Maybe in a different CL.) TODO: Need to cancel capture animation in onConfigurationChanged() Change-Id: I00fd3e098117d9fb74fde2c128407ab6275bcedf
es/layout-land/camera_controls.xml
es/layout-land/camera_shutter_switcher.xml
es/layout-land/pano_module_capture.xml
es/layout-land/photo_module_content.xml
es/layout-land/review_module_control.xml
es/layout-land/switcher_popup.xml
es/layout-land/video_module.xml
es/layout-port/camera_controls.xml
es/layout-port/camera_shutter_switcher.xml
es/layout-port/pano_module_capture.xml
es/layout-port/photo_module_content.xml
es/layout-port/review_module_control.xml
es/layout-port/switcher_popup.xml
es/layout-port/video_module.xml
es/layout/camera_main.xml
es/layout/panorama_module.xml
es/layout/photo_module.xml
es/layout/preview_module_frame.xml
es/layout/preview_module_frame_video.xml
es/layout/preview_surface_view.xml
es/layout/video_module.xml
|
c7fe2c5b1792edfc4054022e72ab3f45e272f361 |
26-Feb-2013 |
Doris Liu <tianliu@google.com> |
Flatten view hierarchy and rotate views TODO: SRI pano and Lightcycle can use a bit more flattening. I will get to them next. (Maybe in a different CL.) TODO: Need to cancel capture animation in onConfigurationChanged() Change-Id: I00fd3e098117d9fb74fde2c128407ab6275bcedf
es/layout-land/camera_controls.xml
es/layout-land/camera_shutter_switcher.xml
es/layout-land/pano_module_capture.xml
es/layout-land/photo_module_content.xml
es/layout-land/review_module_control.xml
es/layout-land/switcher_popup.xml
es/layout-land/video_module.xml
es/layout-port/camera_controls.xml
es/layout-port/camera_shutter_switcher.xml
es/layout-port/pano_module_capture.xml
es/layout-port/photo_module_content.xml
es/layout-port/review_module_control.xml
es/layout-port/switcher_popup.xml
es/layout-port/video_module.xml
es/layout/camera_main.xml
es/layout/panorama_module.xml
es/layout/photo_module.xml
es/layout/preview_module_frame.xml
es/layout/preview_module_frame_video.xml
es/layout/preview_surface_view.xml
es/layout/video_module.xml
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/CameraModule.java
rc/com/android/camera/PanoramaModule.java
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/PreviewFrameLayout.java
rc/com/android/camera/ShutterButton.java
rc/com/android/camera/VideoModule.java
rc/com/android/camera/ui/CameraSwitcher.java
rc/com/android/camera/ui/RotatableLayout.java
|
6a0de79a7066d4ae5cc4677f88989abd15e892ff |
26-Feb-2013 |
Doris Liu <tianliu@google.com> |
Flatten view hierarchy and rotate views TODO: SRI pano and Lightcycle can use a bit more flattening. I will get to them next. (Maybe in a different CL.) TODO: Need to cancel capture animation in onConfigurationChanged() Change-Id: I00fd3e098117d9fb74fde2c128407ab6275bcedf
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/CameraModule.java
rc/com/android/camera/PanoramaModule.java
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/PreviewFrameLayout.java
rc/com/android/camera/ShutterButton.java
rc/com/android/camera/VideoModule.java
rc/com/android/camera/ui/CameraSwitcher.java
rc/com/android/camera/ui/RotatableLayout.java
|
07d87e2d057c6aad7626987f5df7c25be1fc185f |
04-Mar-2013 |
The Android Automerger <android-build@android.com> |
merge in jb-mr2-release history after reset to jb-mr2-dev
|
900bed52315daf1ed97a7daf1b5901f0345aedbb |
03-Mar-2013 |
Bobby Georgescu <georgescu@google.com> |
am 07826912: am f960b10f: am e118ac53: Merge "Refactor AutoThumbnailDrawable, fix race conditions" into gb-ub-photos-bryce * commit '07826912ad44e60549959c5f42dfe5b0cd3ff62f': Refactor AutoThumbnailDrawable, fix race conditions
|
5ff59aaefe4bfb3fbd743f9c8d68c13957fd67cb |
03-Mar-2013 |
Bobby Georgescu <georgescu@google.com> |
am f960b10f: am e118ac53: Merge "Refactor AutoThumbnailDrawable, fix race conditions" into gb-ub-photos-bryce * commit 'f960b10f37a395216dcf173f861f38ba018bf494': Refactor AutoThumbnailDrawable, fix race conditions
|
9ff591f0012a543431cb9e4b637862ee6ed7f769 |
03-Mar-2013 |
Bobby Georgescu <georgescu@google.com> |
am e118ac53: Merge "Refactor AutoThumbnailDrawable, fix race conditions" into gb-ub-photos-bryce * commit 'e118ac5340f04b2cd8e421bee3f85db723a51d38': Refactor AutoThumbnailDrawable, fix race conditions
|
e118ac5340f04b2cd8e421bee3f85db723a51d38 |
02-Mar-2013 |
Bobby Georgescu <georgescu@google.com> |
Merge "Refactor AutoThumbnailDrawable, fix race conditions" into gb-ub-photos-bryce
|
22fc7aac58ceceea9aaa391023cab8a02a8eb004 |
02-Mar-2013 |
Bobby Georgescu <georgescu@google.com> |
Merge "Refactor AutoThumbnailDrawable, fix race conditions" into gb-ub-photos-bryce
|
b4338b0fefea317bf18a3116c1bf231097535d35 |
01-Mar-2013 |
Bobby Georgescu <georgescu@google.com> |
Refactor AutoThumbnailDrawable, fix race conditions Change-Id: I80243ee177387e0d9b309acb5a7c1d364cc73530
rc/com/android/photos/PhotoSetFragment.java
rc/com/android/photos/drawables/AutoThumbnailDrawable.java
rc/com/android/photos/drawables/DataUriThumbnailDrawable.java
rc/com/android/photos/drawables/MtpThumbnailDrawable.java
|
232aa1369beb0a26a35b7792b8a927e09023961f |
01-Mar-2013 |
Bobby Georgescu <georgescu@google.com> |
Refactor AutoThumbnailDrawable, fix race conditions Change-Id: I80243ee177387e0d9b309acb5a7c1d364cc73530
rc/com/android/photos/PhotoSetFragment.java
rc/com/android/photos/drawables/AutoThumbnailDrawable.java
rc/com/android/photos/drawables/DataUriThumbnailDrawable.java
rc/com/android/photos/drawables/MtpThumbnailDrawable.java
|
cee9920f2605f9eb8a81665bd1249dbaef5fd7bb |
02-Mar-2013 |
Bart Sears <bsears@google.com> |
am d9e7e348: am 9655fd0b: am d64f356d: Bump up the version number to 1.1.40003 * commit 'd9e7e3480af192df7f7ae1c48b93fc33d89ecea6': Bump up the version number to 1.1.40003
|
3817da1a72e8b67984b608f801a305b3e34531cd |
02-Mar-2013 |
Bart Sears <bsears@google.com> |
am 9655fd0b: am d64f356d: Bump up the version number to 1.1.40003 * commit '9655fd0b137c254785da24d17aedecca7c25af80': Bump up the version number to 1.1.40003
|
c62b2260eda3ab30f61fa0c3bb41ecb971bf9b1b |
02-Mar-2013 |
Bart Sears <bsears@google.com> |
am d64f356d: Bump up the version number to 1.1.40003 * commit 'd64f356dfbd8d555a8a474bb61af3b2d2b40b208': Bump up the version number to 1.1.40003
|
f488cd4d0ba30efc0b57fff2aa2e445399946f4c |
02-Mar-2013 |
Bart Sears <bsears@google.com> |
Bump up the version number to 1.1.40003 Change-Id: I696aae61f9f3c61d810e3bb78e2b804ca2106173
ndroidManifest.xml
|
d64f356dfbd8d555a8a474bb61af3b2d2b40b208 |
02-Mar-2013 |
Bart Sears <bsears@google.com> |
Bump up the version number to 1.1.40003 Change-Id: I696aae61f9f3c61d810e3bb78e2b804ca2106173
ndroidManifest.xml
|
bd6fc8655883d93b31f206ec425f03e27bba2fbd |
02-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
am eb7b7589: am fd2a70f1: am 276a04db: Fix preview rendering speed... * commit 'eb7b7589caaf4803fae15da6a99c5d7227a12a05': Fix preview rendering speed...
|
5ee998c7c8a4aa34cbe705634a7a7897228a74cf |
02-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
am fd2a70f1: am 276a04db: Fix preview rendering speed... * commit 'fd2a70f17e4e1e97f0d7921473fa07eb2e516b81': Fix preview rendering speed...
|
67bd87cb3fb2a04e6de42f74e186c952ff5ec5f2 |
01-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
am 276a04db: Fix preview rendering speed... * commit '276a04dbeb9202239a6a6fec4109ad3c38ba4d5d': Fix preview rendering speed...
|
56c35f8f9c173e618df34f94df6b4a0269bd7da5 |
01-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
Fix preview rendering speed... Change-Id: I6a6ba3c14a91d60446f28f5dce52fd3c4bc49f79
rc/com/android/gallery3d/filtershow/imageshow/GeometryMetadata.java
rc/com/android/gallery3d/filtershow/imageshow/MasterImage.java
|
276a04dbeb9202239a6a6fec4109ad3c38ba4d5d |
01-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
Fix preview rendering speed... Change-Id: I6a6ba3c14a91d60446f28f5dce52fd3c4bc49f79
rc/com/android/gallery3d/filtershow/imageshow/GeometryMetadata.java
rc/com/android/gallery3d/filtershow/imageshow/MasterImage.java
|
7202b565aab7ea3d15468b69c540959c72750030 |
01-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
am 777d8002: am accef0c1: am 36633e24: Fix disappearing border thumbnails * commit '777d80020fd06abb2d0c96500d2d31ea17b6f928': Fix disappearing border thumbnails
|
cb9d1c88130ee37be7327d8e02896d6aa1644d46 |
01-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
am accef0c1: am 36633e24: Fix disappearing border thumbnails * commit 'accef0c1368ef25027cbd7545279abfe6833cb60': Fix disappearing border thumbnails
|
1055d377392df35f0e35f4e17f9ef6f4a8362c49 |
01-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
am 36633e24: Fix disappearing border thumbnails * commit '36633e241115ff047fff3da5450bbd75adb343f1': Fix disappearing border thumbnails
|
2e1f31c7cd69892886e608a103cb05d338fe43b2 |
01-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
Fix disappearing border thumbnails Change-Id: I9ed43646a353658a590354f13e51dc96fa760442
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
|
36633e241115ff047fff3da5450bbd75adb343f1 |
01-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
Fix disappearing border thumbnails Change-Id: I9ed43646a353658a590354f13e51dc96fa760442
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
|
09309616347b7a473a1a674d894b8946c723df02 |
01-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
am 5e220eac: am bbc7c4aa: am 3a5556d3: Improves State panel and Refactor FilterShowActivity - handles multiple xml layout - add a portrait layout - improves the state panel (delete, etc.) * commit '5e220eac167d3319185a43e5fb1957f2d5ab6597': Improves State panel and Refactor FilterShowActivity - handles multiple xml layout - add a portrait layout - improves the state panel (delete, etc.)
|
26ef5a3d727b31fe541ce4f325f1898c93bce7e4 |
01-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
am bbc7c4aa: am 3a5556d3: Improves State panel and Refactor FilterShowActivity - handles multiple xml layout - add a portrait layout - improves the state panel (delete, etc.) * commit 'bbc7c4aa6e1329e3ca844e02eed586ae589b5bdf': Improves State panel and Refactor FilterShowActivity - handles multiple xml layout - add a portrait layout - improves the state panel (delete, etc.)
|
d61f5774cec83cd2456628a128098f20320b4238 |
01-Mar-2013 |
nicolasroard <nicolasroard@google.com> |
am 3a5556d3: Improves State panel and Refactor FilterShowActivity - handles multiple xml layout - add a portrait layout - improves the state panel (delete, etc.) * commit '3a5556d3ce5dba33021867468ae0d5d222f256db': Improves State panel and Refactor FilterShowActivity - handles multiple xml layout - add a portrait layout - improves the state panel (delete, etc.)
|
db86316826cf38e63d8d68ed2835532b07259953 |
01-Mar-2013 |
John Hoford <hoford@google.com> |
am c5cc3742: am 6bd8caa9: am 87835aa0: fix imports * commit 'c5cc3742fbae9ad6a8f8d71fa8e58a6763f38ba5': fix imports
|
8ff9d9ebf0df5adb7fc8b85830d580f257d5570a |
01-Mar-2013 |
John Hoford <hoford@google.com> |
am 6bd8caa9: am 87835aa0: fix imports * commit '6bd8caa97e53bb50cb48792262a42fbf516c04fc': fix imports
|
ea2828e1010345253d60de6fd38097d1e125f5f9 |
01-Mar-2013 |
John Hoford <hoford@google.com> |
am 87835aa0: fix imports * commit '87835aa01412f9ba20eb57ac0cbbad3a19b48623': fix imports
|
2a025ee773a4c40b05de6c70a4681abdb4e243bd |
28-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Improves State panel and Refactor FilterShowActivity - handles multiple xml layout - add a portrait layout - improves the state panel (delete, etc.) Change-Id: I29762c99cdd467db8705174c660304c8ed673ce2
es/layout-land/filtershow_activity.xml
es/layout/filtershow_activity.xml
es/layout/filtershow_imagestate_row.xml
es/values/filtershow_strings.xml
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
|
d167e2fccc895a59a31afe47233bb1766809ddfb |
28-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Improves State panel and Refactor FilterShowActivity - handles multiple xml layout - add a portrait layout - improves the state panel (delete, etc.) Change-Id: I29762c99cdd467db8705174c660304c8ed673ce2
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/ImageStateAdapter.java
rc/com/android/gallery3d/filtershow/MovableLinearLayout.java
rc/com/android/gallery3d/filtershow/PanelController.java
rc/com/android/gallery3d/filtershow/imageshow/MasterImage.java
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
rc/com/android/gallery3d/filtershow/ui/FilterIconButton.java
|
3a5556d3ce5dba33021867468ae0d5d222f256db |
28-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Improves State panel and Refactor FilterShowActivity - handles multiple xml layout - add a portrait layout - improves the state panel (delete, etc.) Change-Id: I29762c99cdd467db8705174c660304c8ed673ce2
es/layout-land/filtershow_activity.xml
es/layout/filtershow_activity.xml
es/layout/filtershow_imagestate_row.xml
es/values/filtershow_strings.xml
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/ImageStateAdapter.java
rc/com/android/gallery3d/filtershow/MovableLinearLayout.java
rc/com/android/gallery3d/filtershow/PanelController.java
rc/com/android/gallery3d/filtershow/imageshow/MasterImage.java
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
rc/com/android/gallery3d/filtershow/ui/FilterIconButton.java
|
d366a406c8ed493da9b678e8748b21ec789701a5 |
01-Mar-2013 |
John Reck <jreck@google.com> |
am 650e5410: am 1c73be8d: am 3a60b6bc: Merge "Fix crash if a tile ends up with a width or height of 0" into gb-ub-photos-bryce * commit '650e541008d758847f27428bfccf2ad0fdca6fe1': Fix crash if a tile ends up with a width or height of 0
|
87835aa01412f9ba20eb57ac0cbbad3a19b48623 |
01-Mar-2013 |
John Hoford <hoford@google.com> |
fix imports Change-Id: I07ac06ae4890bfcae48ea404cf7e67c2b0c084d7
rc/com/android/gallery3d/filtershow/EditorPlaceHolder.java
rc/com/android/gallery3d/filtershow/HistoryAdapter.java
rc/com/android/gallery3d/filtershow/ImageStateAdapter.java
rc/com/android/gallery3d/filtershow/cache/ImageLoader.java
rc/com/android/gallery3d/filtershow/cache/TripleBufferBitmap.java
rc/com/android/gallery3d/filtershow/colorpicker/ColorGridDialog.java
rc/com/android/gallery3d/filtershow/editors/BasicEditor.java
rc/com/android/gallery3d/filtershow/editors/EditorRedEye.java
rc/com/android/gallery3d/filtershow/editors/EditorTinyPlanet.java
rc/com/android/gallery3d/filtershow/editors/EditorVignette.java
rc/com/android/gallery3d/filtershow/filters/FilterRedEyeRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterRepresentation.java
rc/com/android/gallery3d/filtershow/filters/ImageFilter.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterBorder.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterCurves.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterDraw.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterFx.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterHighlights.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterKMeans.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterParametricBorder.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterTinyPlanet.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterVignette.java
rc/com/android/gallery3d/filtershow/imageshow/ImageCrop.java
rc/com/android/gallery3d/filtershow/imageshow/ImageDraw.java
rc/com/android/gallery3d/filtershow/imageshow/ImageGeometry.java
rc/com/android/gallery3d/filtershow/imageshow/ImagePoint.java
rc/com/android/gallery3d/filtershow/imageshow/ImageShow.java
rc/com/android/gallery3d/filtershow/imageshow/ImageStraighten.java
rc/com/android/gallery3d/filtershow/imageshow/ImageTinyPlanet.java
rc/com/android/gallery3d/filtershow/ui/FilterIconButton.java
rc/com/android/gallery3d/filtershow/ui/IconButton.java
|
5df0d2333fd3ade6a0396124ae4ce85e51ef7f0d |
01-Mar-2013 |
John Hoford <hoford@google.com> |
fix imports Change-Id: I07ac06ae4890bfcae48ea404cf7e67c2b0c084d7
rc/com/android/gallery3d/filtershow/filters/FilterRedEyeRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterRepresentation.java
|
5bb3cf43dd8470fc692f9b634967b2dc89dc1ee9 |
01-Mar-2013 |
John Hoford <hoford@google.com> |
fix imports Change-Id: I07ac06ae4890bfcae48ea404cf7e67c2b0c084d7
rc/com/android/gallery3d/filtershow/EditorPlaceHolder.java
rc/com/android/gallery3d/filtershow/HistoryAdapter.java
rc/com/android/gallery3d/filtershow/ImageStateAdapter.java
rc/com/android/gallery3d/filtershow/cache/ImageLoader.java
rc/com/android/gallery3d/filtershow/cache/TripleBufferBitmap.java
rc/com/android/gallery3d/filtershow/colorpicker/ColorGridDialog.java
rc/com/android/gallery3d/filtershow/editors/BasicEditor.java
rc/com/android/gallery3d/filtershow/editors/EditorRedEye.java
rc/com/android/gallery3d/filtershow/editors/EditorTinyPlanet.java
rc/com/android/gallery3d/filtershow/editors/EditorVignette.java
rc/com/android/gallery3d/filtershow/filters/FilterRedEyeRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterRepresentation.java
rc/com/android/gallery3d/filtershow/filters/ImageFilter.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterBorder.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterCurves.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterDraw.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterFx.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterHighlights.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterKMeans.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterParametricBorder.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterTinyPlanet.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterVignette.java
rc/com/android/gallery3d/filtershow/imageshow/ImageCrop.java
rc/com/android/gallery3d/filtershow/imageshow/ImageDraw.java
rc/com/android/gallery3d/filtershow/imageshow/ImageGeometry.java
rc/com/android/gallery3d/filtershow/imageshow/ImagePoint.java
rc/com/android/gallery3d/filtershow/imageshow/ImageShow.java
rc/com/android/gallery3d/filtershow/imageshow/ImageStraighten.java
rc/com/android/gallery3d/filtershow/imageshow/ImageTinyPlanet.java
rc/com/android/gallery3d/filtershow/ui/FilterIconButton.java
rc/com/android/gallery3d/filtershow/ui/IconButton.java
|
80de1fc1071752fceccf7feeabf4e93f608bc8e4 |
01-Mar-2013 |
John Reck <jreck@google.com> |
am 1c73be8d: am 3a60b6bc: Merge "Fix crash if a tile ends up with a width or height of 0" into gb-ub-photos-bryce * commit '1c73be8d249a646f6e7cfe3aba62ad61bae0b90d': Fix crash if a tile ends up with a width or height of 0
|
c3bb816126a864bce4e1ab98b3fa99f2878ccd0c |
01-Mar-2013 |
John Hoford <hoford@google.com> |
am 6cb6e981: am bbec362e: am 7b9a9475: Merge "fixed hiding of tiny planet" into gb-ub-photos-bryce * commit '6cb6e981b6642835d72b067292fafa6f9530557f': fixed hiding of tiny planet
|
5ba04887664833ebd04d530637ff1a1459c728f8 |
01-Mar-2013 |
John Reck <jreck@google.com> |
am 3a60b6bc: Merge "Fix crash if a tile ends up with a width or height of 0" into gb-ub-photos-bryce * commit '3a60b6bc3f972dcd3ff6b7812b7ebaf5ca2e4a58': Fix crash if a tile ends up with a width or height of 0
|
6e9d5d2b09e6d914e9048e2a9cfbd7ab99dabe07 |
01-Mar-2013 |
John Hoford <hoford@google.com> |
am bbec362e: am 7b9a9475: Merge "fixed hiding of tiny planet" into gb-ub-photos-bryce * commit 'bbec362ec2b624063e9abd5d63164aeda7c2239b': fixed hiding of tiny planet
|
3a60b6bc3f972dcd3ff6b7812b7ebaf5ca2e4a58 |
01-Mar-2013 |
John Reck <jreck@google.com> |
Merge "Fix crash if a tile ends up with a width or height of 0" into gb-ub-photos-bryce
|
4b3084078c1c503e0d7ba17dfadc244ab246da06 |
01-Mar-2013 |
John Reck <jreck@google.com> |
Merge "Fix crash if a tile ends up with a width or height of 0" into gb-ub-photos-bryce
|
c4e0ccd40ce6cb9025099061f1bf3c12f0638118 |
01-Mar-2013 |
John Hoford <hoford@google.com> |
am 7b9a9475: Merge "fixed hiding of tiny planet" into gb-ub-photos-bryce * commit '7b9a9475f04b7f6a547c66a5446f651f2b7c693e': fixed hiding of tiny planet
|
7b9a9475f04b7f6a547c66a5446f651f2b7c693e |
01-Mar-2013 |
John Hoford <hoford@google.com> |
Merge "fixed hiding of tiny planet" into gb-ub-photos-bryce
|
86d9386787c95ac8c98b661e69c458aa8de0e02a |
01-Mar-2013 |
John Hoford <hoford@google.com> |
Merge "fixed hiding of tiny planet" into gb-ub-photos-bryce
|
d4653680279a85720f792f21e32578ccf5c6c34f |
01-Mar-2013 |
John Hoford <hoford@google.com> |
fixed hiding of tiny planet Change-Id: I0d23a640cf4aee5ae03e6552637ba3663db85bde
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/PanelController.java
rc/com/android/gallery3d/filtershow/imageshow/EclipseControl.java
|
82148a5664f7d14712c6e9d5d7bb9d2a6374304e |
01-Mar-2013 |
John Hoford <hoford@google.com> |
fixed hiding of tiny planet Change-Id: I0d23a640cf4aee5ae03e6552637ba3663db85bde
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/PanelController.java
rc/com/android/gallery3d/filtershow/imageshow/EclipseControl.java
|
26353bc4c528057ae171d89ad3251586b832e69b |
01-Mar-2013 |
John Reck <jreck@google.com> |
Fix crash if a tile ends up with a width or height of 0 Bug: 8242279 Change-Id: Id8f9d85b46f07fb5aea8063a081524b9a3d992ae
rc/com/android/gallery3d/glrenderer/BasicTexture.java
|
9d999905fdd75a2f6fce89ef7e73815d206d54f5 |
01-Mar-2013 |
John Reck <jreck@google.com> |
Fix crash if a tile ends up with a width or height of 0 Bug: 8242279 Change-Id: Id8f9d85b46f07fb5aea8063a081524b9a3d992ae
rc/com/android/gallery3d/glrenderer/BasicTexture.java
|
af35c700057f5151c3a216432fc24344a16991fb |
01-Mar-2013 |
John Reck <jreck@google.com> |
am 2df4e2fc: am a96e88e1: am e2fd033b: Merge "Add full screen image view" into gb-ub-photos-bryce * commit '2df4e2fc1e0bcb2f07670b364982751279555382': Add full screen image view
|
93a3fbc7201d4c439302789da647e56b9633d29a |
01-Mar-2013 |
John Reck <jreck@google.com> |
am a96e88e1: am e2fd033b: Merge "Add full screen image view" into gb-ub-photos-bryce * commit 'a96e88e16b28f4221dbae1ef92863bffcaadf1c1': Add full screen image view
|
f4f2d971625a424bc2895eba13869b481d5ec30b |
01-Mar-2013 |
John Reck <jreck@google.com> |
am e2fd033b: Merge "Add full screen image view" into gb-ub-photos-bryce * commit 'e2fd033b6d836365779f3db73d8f0f305e1d9a62': Add full screen image view
|
6bf4265c8a5e4e6ffab5c9648ff4c869ea055137 |
01-Mar-2013 |
John Reck <jreck@google.com> |
Merge "Add full screen image view" into gb-ub-photos-bryce
|
e2fd033b6d836365779f3db73d8f0f305e1d9a62 |
01-Mar-2013 |
John Reck <jreck@google.com> |
Merge "Add full screen image view" into gb-ub-photos-bryce
|
6af159148657ac1c10652a29ae415b14d5a41930 |
01-Mar-2013 |
John Reck <jreck@google.com> |
Merge "Add full screen image view" into gb-ub-photos-bryce
|
c26ae26aa33a5cc622db70eea2bd7b4bf9e7a2e1 |
28-Feb-2013 |
John Reck <jreck@google.com> |
Add full screen image view Change-Id: I5b3db9ce4c86788b640a48bafa87cd9e952739d4
ndroidManifest.xml
|
559f46bd90079eceb9e78c6b2f43c1de4b24edd6 |
28-Feb-2013 |
John Reck <jreck@google.com> |
Add full screen image view Change-Id: I5b3db9ce4c86788b640a48bafa87cd9e952739d4
es/values-v14/styles.xml
|
d8732610ff48dc57063559d55ea3c84775e30e41 |
28-Feb-2013 |
John Reck <jreck@google.com> |
Add full screen image view Change-Id: I5b3db9ce4c86788b640a48bafa87cd9e952739d4
ndroidManifest.xml
es/values-v14/styles.xml
rc/com/android/photos/BitmapRegionTileSource.java
rc/com/android/photos/FullscreenViewer.java
rc/com/android/photos/PhotoSetFragment.java
rc/com/android/photos/views/BlockingGLTextureView.java
rc/com/android/photos/views/TiledImageRenderer.java
rc/com/android/photos/views/TiledImageView.java
|
053580e9890d528f8adb9e20e7e84618f89e823b |
28-Feb-2013 |
John Reck <jreck@google.com> |
Add full screen image view Change-Id: I5b3db9ce4c86788b640a48bafa87cd9e952739d4
rc/com/android/photos/BitmapRegionTileSource.java
rc/com/android/photos/FullscreenViewer.java
rc/com/android/photos/PhotoSetFragment.java
rc/com/android/photos/views/BlockingGLTextureView.java
rc/com/android/photos/views/TiledImageRenderer.java
rc/com/android/photos/views/TiledImageView.java
|
657063ae49fc33d9fc8328c370a42c0b3151c625 |
01-Mar-2013 |
Baligh Uddin <baligh@google.com> |
am 33e4f0c4: (-s ours) am 8d20a142: (-s ours) am 0cc98a35: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce * commit '33e4f0c479cf8719d9dd477aa99ce210104e634a': Import translations. DO NOT MERGE
|
bc4037ece301575ceeda2a1fd8ed63e24173c321 |
01-Mar-2013 |
Baligh Uddin <baligh@google.com> |
am 41d69276: (-s ours) am 41bd81d4: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr2-dev * commit '41d69276d1ba1cbf086d4d8259c49684ffaac7f7': Import translations. DO NOT MERGE
|
621ff65b4ef3d4f47c600d5e1a5445377330801b |
01-Mar-2013 |
Baligh Uddin <baligh@google.com> |
am 8d20a142: (-s ours) am 0cc98a35: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce * commit '8d20a142761ce42a428a9c7b37c15348aebcab0e': Import translations. DO NOT MERGE
|
2fbf392db22a748d0c99042d7abd4889665b41e6 |
01-Mar-2013 |
Baligh Uddin <baligh@google.com> |
am 41bd81d4: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr2-dev * commit '41bd81d4d4292d0b63aa09002b7ecd6d2a7c04ff': Import translations. DO NOT MERGE
|
e44da4c2c69e476589abdff79ede642523c06f8d |
01-Mar-2013 |
Baligh Uddin <baligh@google.com> |
am 6d808df6: (-s ours) Merge "Import translations. DO NOT MERGE" * commit '6d808df6ca6015f4faf77e8e1443c9c3d1145f44': Import translations. DO NOT MERGE
|
48c7032b75f7a43a75442cb80acefdb349c2e3c8 |
01-Mar-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into master-security-dev
|
b65eab3b3f3c58f5a852dfca72e230c7dac27b1a |
01-Mar-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE"
|
6232d57c86adb29a41dbb7b852fb19e346b5123d |
01-Mar-2013 |
Baligh Uddin <baligh@google.com> |
am 2f4c5b9f: (-s ours) am 2d4bb18f: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr2-dev * commit '2f4c5b9f571178a0408fc3d942608657cb2831b5': Import translations. DO NOT MERGE
|
32bd8e655a33681767e65401e520c90b69faacae |
01-Mar-2013 |
Baligh Uddin <baligh@google.com> |
am 2d4bb18f: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr2-dev * commit '2d4bb18f3d07368b3275e40f0dea931806b0e065': Import translations. DO NOT MERGE
|
47933507c005165f8eda92415e651d3297f2e02b |
01-Mar-2013 |
Baligh Uddin <baligh@google.com> |
am 0cc98a35: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce * commit '0cc98a35565ee8df2aa04f3f83da15fe30c2af5c': Import translations. DO NOT MERGE
|
6d0d5445564934b3846430a792e4d3f86a5cec55 |
01-Mar-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
|
0cc98a35565ee8df2aa04f3f83da15fe30c2af5c |
01-Mar-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
|
03034a434fa1d000f725e17ad7251806ab3fb0f1 |
01-Mar-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into master-security-dev
|
5f7a71a92ee27ab346d1089f11535707e63d5c14 |
01-Mar-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
|
7f641276762b792903cba2c9b9d3bbc536beed60 |
01-Mar-2013 |
John Reck <jreck@google.com> |
am 2271ecc1: am e2bc2bc1: am 08c0f250: Fix race condition * commit '2271ecc179f3d183efb3ae7f58ee796f24073104': Fix race condition
|
af4cf50292b2ab7c3c335d722b0e3499f89027c2 |
01-Mar-2013 |
John Reck <jreck@google.com> |
am e2bc2bc1: am 08c0f250: Fix race condition * commit 'e2bc2bc14fcd23c47459db937bcc9a74d4900f32': Fix race condition
|
7ea5f187bbd97125ca2fb293625b4eeff86c7489 |
01-Mar-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I3e99e1bab44e119ad57c0244208dcbbb38d3cfe1 Auto-generated-cl: translation import
es/values-af/filtershow_strings.xml
es/values-am/filtershow_strings.xml
es/values-ar/filtershow_strings.xml
es/values-be/filtershow_strings.xml
es/values-bg/filtershow_strings.xml
es/values-ca/filtershow_strings.xml
es/values-cs/filtershow_strings.xml
es/values-da/filtershow_strings.xml
es/values-de/filtershow_strings.xml
es/values-el/filtershow_strings.xml
es/values-en-rGB/filtershow_strings.xml
es/values-es-rUS/filtershow_strings.xml
es/values-es/filtershow_strings.xml
es/values-et/filtershow_strings.xml
es/values-fa/filtershow_strings.xml
es/values-fi/filtershow_strings.xml
es/values-fr/filtershow_strings.xml
es/values-hi/filtershow_strings.xml
es/values-hr/filtershow_strings.xml
es/values-hu/filtershow_strings.xml
es/values-in/filtershow_strings.xml
es/values-it/filtershow_strings.xml
es/values-iw/filtershow_strings.xml
es/values-ja/filtershow_strings.xml
es/values-ko/filtershow_strings.xml
es/values-lt/filtershow_strings.xml
es/values-lv/filtershow_strings.xml
es/values-ms/filtershow_strings.xml
es/values-nb/filtershow_strings.xml
es/values-nl/filtershow_strings.xml
es/values-pl/filtershow_strings.xml
es/values-pt-rPT/filtershow_strings.xml
es/values-pt/filtershow_strings.xml
es/values-ro/filtershow_strings.xml
es/values-ru/filtershow_strings.xml
es/values-sk/filtershow_strings.xml
es/values-sl/filtershow_strings.xml
es/values-sr/filtershow_strings.xml
es/values-sv/filtershow_strings.xml
es/values-sw/filtershow_strings.xml
es/values-th/filtershow_strings.xml
es/values-tl/filtershow_strings.xml
es/values-tr/filtershow_strings.xml
es/values-uk/filtershow_strings.xml
es/values-vi/filtershow_strings.xml
es/values-zh-rCN/filtershow_strings.xml
es/values-zh-rTW/filtershow_strings.xml
es/values-zu/filtershow_strings.xml
|
a9e47b1ac2e0fbe011c35903fdc64fdc9da9d5b7 |
01-Mar-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Iac2e268288a219ae41afe6d7ad129239fce5a814 Auto-generated-cl: translation import
es/values-es-rUS/filtershow_strings.xml
es/values-hr/filtershow_strings.xml
es/values-nl/filtershow_strings.xml
es/values-sr/filtershow_strings.xml
es/values-sv/filtershow_strings.xml
es/values-sw/filtershow_strings.xml
es/values-zh-rCN/filtershow_strings.xml
|
5cedc444e983c7019f1dee822ed7e90be13c40b8 |
01-Mar-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I4da8209c247552379974058a3f325cfdbd313ea4 Auto-generated-cl: translation import
es/values-af/filtershow_strings.xml
es/values-am/filtershow_strings.xml
es/values-ar/filtershow_strings.xml
es/values-be/filtershow_strings.xml
es/values-bg/filtershow_strings.xml
es/values-ca/filtershow_strings.xml
es/values-cs/filtershow_strings.xml
es/values-da/filtershow_strings.xml
es/values-de/filtershow_strings.xml
es/values-el/filtershow_strings.xml
es/values-en-rGB/filtershow_strings.xml
es/values-es-rUS/filtershow_strings.xml
es/values-es/filtershow_strings.xml
es/values-et/filtershow_strings.xml
es/values-fa/filtershow_strings.xml
es/values-fi/filtershow_strings.xml
es/values-fr/filtershow_strings.xml
es/values-hi/filtershow_strings.xml
es/values-hr/filtershow_strings.xml
es/values-hu/filtershow_strings.xml
es/values-in/filtershow_strings.xml
es/values-it/filtershow_strings.xml
es/values-iw/filtershow_strings.xml
es/values-ja/filtershow_strings.xml
es/values-ko/filtershow_strings.xml
es/values-lt/filtershow_strings.xml
es/values-lv/filtershow_strings.xml
es/values-ms/filtershow_strings.xml
es/values-nb/filtershow_strings.xml
es/values-nl/filtershow_strings.xml
es/values-pl/filtershow_strings.xml
es/values-pt-rPT/filtershow_strings.xml
es/values-pt/filtershow_strings.xml
es/values-ro/filtershow_strings.xml
es/values-ru/filtershow_strings.xml
es/values-sk/filtershow_strings.xml
es/values-sl/filtershow_strings.xml
es/values-sr/filtershow_strings.xml
es/values-sv/filtershow_strings.xml
es/values-sw/filtershow_strings.xml
es/values-th/filtershow_strings.xml
es/values-tl/filtershow_strings.xml
es/values-tr/filtershow_strings.xml
es/values-uk/filtershow_strings.xml
es/values-vi/filtershow_strings.xml
es/values-zh-rCN/filtershow_strings.xml
es/values-zh-rTW/filtershow_strings.xml
es/values-zu/filtershow_strings.xml
|
d3aa6686999555aec6f76f53dd46b7ddc0535982 |
01-Mar-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: If43bbaaf4c504da6aa0031b5f1e81bd1c90afa26 Auto-generated-cl: translation import
es/values-es-rUS/filtershow_strings.xml
es/values-hr/filtershow_strings.xml
es/values-nl/filtershow_strings.xml
es/values-sr/filtershow_strings.xml
es/values-sv/filtershow_strings.xml
es/values-sw/filtershow_strings.xml
es/values-zh-rCN/filtershow_strings.xml
|
796cbe83c1404163654b17238210ede1abc5c560 |
01-Mar-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: If43bbaaf4c504da6aa0031b5f1e81bd1c90afa26 Auto-generated-cl: translation import
es/values-es-rUS/filtershow_strings.xml
es/values-hr/filtershow_strings.xml
es/values-nl/filtershow_strings.xml
es/values-sr/filtershow_strings.xml
es/values-sv/filtershow_strings.xml
es/values-sw/filtershow_strings.xml
es/values-zh-rCN/filtershow_strings.xml
|
57e92197295850eeb1d618299b272ac4ff60a68f |
01-Mar-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I8a84c360e98677a2956d3167ab68097ee9a64835 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
9d15a9e0c0edcfa801cd0581ee08a526f17743ce |
01-Mar-2013 |
John Reck <jreck@google.com> |
am 08c0f250: Fix race condition * commit '08c0f25091f20c4d618b5adaa381ed6eedf4695f': Fix race condition
|
b82085947da216e1c489a20d89d516639e89c99f |
01-Mar-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ie290a999c6df7a9dcc8143da7f2685ec09ea7c77 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
08c0f25091f20c4d618b5adaa381ed6eedf4695f |
01-Mar-2013 |
John Reck <jreck@google.com> |
Fix race condition Change-Id: I6cf9207d067d4c0c3c4271d6ce6f44b213d7296b
rc/com/android/photos/data/GalleryBitmapPool.java
|
d6feb46dacd76ae0a4cc97f24e1c0a07515e6055 |
01-Mar-2013 |
John Reck <jreck@google.com> |
Fix race condition Change-Id: I6cf9207d067d4c0c3c4271d6ce6f44b213d7296b
rc/com/android/photos/data/GalleryBitmapPool.java
|
24de8cd0cb6a667d8d8b488eae1c13bdc9acd58c |
01-Mar-2013 |
John Reck <jreck@google.com> |
am 951409ba: am cb206ef2: am d26f1ad5: Clarify threading, cleanup locking * commit '951409ba3d53dc761740686aaf218cbb3ea1b35d': Clarify threading, cleanup locking
|
d5e4632d53c3608a1df1177f5051f3a66b26ac96 |
01-Mar-2013 |
John Reck <jreck@google.com> |
am cb206ef2: am d26f1ad5: Clarify threading, cleanup locking * commit 'cb206ef2a7d40faf5cad8c3c399ab5d9b691d4ad': Clarify threading, cleanup locking
|
434a72b5666553818c07349dd27cf5d4d202f60c |
01-Mar-2013 |
John Reck <jreck@google.com> |
am d26f1ad5: Clarify threading, cleanup locking * commit 'd26f1ad5a859da0847ab181df2eebd45e155118b': Clarify threading, cleanup locking
|
d26f1ad5a859da0847ab181df2eebd45e155118b |
01-Mar-2013 |
John Reck <jreck@google.com> |
Clarify threading, cleanup locking Bug: 8285317 Change-Id: I8b1b0eda74a41f388e97fee6bcd4ce948bb6e15a
rc/com/android/photos/drawables/AutoThumbnailDrawable.java
|
facd6eec5e6e5ff63725d00a791662c462c111c4 |
01-Mar-2013 |
John Reck <jreck@google.com> |
Clarify threading, cleanup locking Bug: 8285317 Change-Id: I8b1b0eda74a41f388e97fee6bcd4ce948bb6e15a
rc/com/android/photos/drawables/AutoThumbnailDrawable.java
|
3bc84b21e96284675293aecd36ffcab9a9248967 |
28-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Fix for applied ratios Change-Id: Idbb7366522751c4b330cc99b88129df5808048e9
rc/com/android/gallery3d/filtershow/editors/EditorCrop.java
rc/com/android/gallery3d/filtershow/editors/EditorFlip.java
rc/com/android/gallery3d/filtershow/editors/EditorRotate.java
rc/com/android/gallery3d/filtershow/editors/EditorStraighten.java
|
c48ab2854ea7cd9fc772be7e2aa78f9b984918e7 |
28-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Fix crop ratio bug:8291961 Change-Id: Ia279c35115fbfc0774505bf3318b7fac7d84d2eb
rc/com/android/gallery3d/filtershow/imageshow/ImageCrop.java
|
3794d78ceb37c3b7cddc31afef5c03fa351fd582 |
28-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
am d5b14cc7: am 3dbb86aa: am 839d529f: Fix for applied ratios * commit 'd5b14cc7097996a59e3e5655a4519e116df0e985': Fix for applied ratios
|
87498910830b8e5640d018e35c528eb8d0ac8222 |
28-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
am 32ff2902: am 1147fa4d: am 92720495: Fix crop ratio * commit '32ff2902d39503f896cf4c97c5c00f69d3ce3982': Fix crop ratio
|
fe83d605456078e067f0f5eba62cf63d443a25d9 |
28-Feb-2013 |
Nicolas Roard <nicolasroard@google.com> |
am fc3117df: am 4ef217e2: am e8c2b314: Revert "Cleanup ImagePreset" * commit 'fc3117df962ca9abc1ffdcfa2b4ca1175896e57d': Revert "Cleanup ImagePreset"
|
692cb6ac696ae645d5b853a130e573c60c5e5c40 |
28-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
am acb85236: am 3c981e55: am 0f076567: Cleanup ImagePreset * commit 'acb852369d8ba7c29518b36552e17bf433a9fa48': Cleanup ImagePreset
|
607a90f3cfc359b1f4d501c8b0d1a8d784c1be70 |
28-Feb-2013 |
John Hoford <hoford@google.com> |
am b5524256: am 8b0656a1: am be61c1fc: crop fix * commit 'b55242569f5024ffccbac59d6cd7f4e95233c394': crop fix
|
90067880218508d647024d3e17304095a203610b |
28-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
am 5aa061b5: am d418d297: am e1c3724f: Fix full res preview * commit '5aa061b558642dc3454a90c05a0a25b4c80b8cde': Fix full res preview
|
9b0564cad1da5c2098aa55ca0cac18696bb11b33 |
28-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
am 86d89b9c: am d7222545: am 65e47f69: Fix scale and full res preview * commit '86d89b9c856fa8900b35bacb981a026aff9faea0': Fix scale and full res preview
|
939a9de2a43afbb762bd3bcb5a00c9a9990ffeb8 |
28-Feb-2013 |
John Hoford <hoford@google.com> |
am 0c391f3e: am fbc653f7: am cad3dd97: Merge "refactor the geometry code" into gb-ub-photos-bryce * commit '0c391f3ed44af48fae476e3a1b9af58421abe589': refactor the geometry code
|
5d17830aadb4fc065025ddf37db5a0b9d39a78ed |
28-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
am 3dbb86aa: am 839d529f: Fix for applied ratios * commit '3dbb86aa2ca64789bb4f590e82c8928912e861bc': Fix for applied ratios
|
8a711c1df4aea39379887c1ea10c7e058004ed2f |
28-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
am 1147fa4d: am 92720495: Fix crop ratio * commit '1147fa4d0451638cb594a2bc02da77069c379641': Fix crop ratio
|
fcd108cba63f4dec4c17248f8325b2fd7bd05d4c |
28-Feb-2013 |
Nicolas Roard <nicolasroard@google.com> |
am 4ef217e2: am e8c2b314: Revert "Cleanup ImagePreset" * commit '4ef217e23dd911eac1ffa0dfa980ace525fd1e72': Revert "Cleanup ImagePreset"
|
e8b1e10b679c1cf97f22ce96fa6c151dc450463d |
28-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
am 3c981e55: am 0f076567: Cleanup ImagePreset * commit '3c981e5536ff859f60429a6b7b2226163817bc0e': Cleanup ImagePreset
|
ab88aa37e87ac0435773a9ce0ccc09aaefe17096 |
28-Feb-2013 |
John Hoford <hoford@google.com> |
am 8b0656a1: am be61c1fc: crop fix * commit '8b0656a17708f02fe14dd798d25aa8ff30740dd4': crop fix
|
ab7640e4891e979329e0eb2143279314e24f3305 |
28-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
am d418d297: am e1c3724f: Fix full res preview * commit 'd418d29782276e3a93effdaaaee82316e013480a': Fix full res preview
|
435fb30ce22ae1c4eb0f21c75bde300252b90463 |
28-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
am d7222545: am 65e47f69: Fix scale and full res preview * commit 'd722254587b96a7d67bddffcceb9c99fe2fab7b7': Fix scale and full res preview
|
7476d0232b48831e2880b081cd9e46819929bc39 |
28-Feb-2013 |
John Hoford <hoford@google.com> |
am fbc653f7: am cad3dd97: Merge "refactor the geometry code" into gb-ub-photos-bryce * commit 'fbc653f77564784d560eb98553f2f7c41749dba5': refactor the geometry code
|
75fbd573f1bbaba8536007761480420595660b8a |
28-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
am 839d529f: Fix for applied ratios * commit '839d529f800adcd1ef5fcd262322bc939c2c2089': Fix for applied ratios
|
ebc23b32e4629c73dd08cecf83aeb0098ae13b2f |
28-Feb-2013 |
Justin Koh <justinkoh@google.com> |
am ebc9b486: am 44e1e65f: am 94c06451: Merge "Updated Gallery2 with Pano." into gb-ub-photos-bryce * commit 'ebc9b486185ae9d73d126bf8e5c137c023108a7b': Updated Gallery2 with Pano.
|
71c22fa772ae1d07d34350d9a8a237662ef09b8c |
28-Feb-2013 |
Justin Koh <justinkoh@google.com> |
am 44e1e65f: am 94c06451: Merge "Updated Gallery2 with Pano." into gb-ub-photos-bryce * commit '44e1e65f81184e8fe53ec25601d097c49b19bace': Updated Gallery2 with Pano.
|
839d529f800adcd1ef5fcd262322bc939c2c2089 |
28-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Fix for applied ratios Change-Id: Idbb7366522751c4b330cc99b88129df5808048e9
rc/com/android/gallery3d/filtershow/editors/EditorCrop.java
rc/com/android/gallery3d/filtershow/editors/EditorFlip.java
rc/com/android/gallery3d/filtershow/editors/EditorRotate.java
rc/com/android/gallery3d/filtershow/editors/EditorStraighten.java
|
20b5ca5bfa5e07db5f909c0869d1c758c586d7d9 |
28-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Fix for applied ratios Change-Id: Idbb7366522751c4b330cc99b88129df5808048e9
rc/com/android/gallery3d/filtershow/editors/EditorCrop.java
rc/com/android/gallery3d/filtershow/editors/EditorFlip.java
rc/com/android/gallery3d/filtershow/editors/EditorRotate.java
rc/com/android/gallery3d/filtershow/editors/EditorStraighten.java
|
641c606e32b7cab40cef2a9174b6e224d7b344d2 |
28-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
am 92720495: Fix crop ratio * commit '92720495a2cac79c373bbcc9ccdd0191d746c7c0': Fix crop ratio
|
92720495a2cac79c373bbcc9ccdd0191d746c7c0 |
28-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Fix crop ratio bug:8291961 Change-Id: Ia279c35115fbfc0774505bf3318b7fac7d84d2eb
rc/com/android/gallery3d/filtershow/imageshow/ImageCrop.java
|
67e00e042fab5f5234bfa7c33148724d9119b817 |
28-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Fix crop ratio bug:8291961 Change-Id: Ia279c35115fbfc0774505bf3318b7fac7d84d2eb
rc/com/android/gallery3d/filtershow/imageshow/ImageCrop.java
|
569bac64e2822d7b3c27f86ad0610b9769ad978c |
28-Feb-2013 |
The Android Automerger <android-build@android.com> |
merge in jb-mr2-release history after reset to jb-mr2-dev
|
f41d1db0475c0e81b58f8ea5bf6ca6ced2d48414 |
28-Feb-2013 |
Nicolas Roard <nicolasroard@google.com> |
am e8c2b314: Revert "Cleanup ImagePreset" * commit 'e8c2b314d8f3c5d79227fae97a0ec1ca68a1e611': Revert "Cleanup ImagePreset"
|
aa10209a66a3afb426612eb1b75eaf5a6292f0d6 |
28-Feb-2013 |
Nicolas Roard <nicolasroard@google.com> |
Revert "Cleanup ImagePreset" This reverts commit 0f0765676e5be73c7187a44ee88e500ab691bf01 Change-Id: Id5a7eec61cdac3d57c8c4c790d24adf258410545
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
|
e8c2b314d8f3c5d79227fae97a0ec1ca68a1e611 |
28-Feb-2013 |
Nicolas Roard <nicolasroard@google.com> |
Revert "Cleanup ImagePreset" This reverts commit 0f0765676e5be73c7187a44ee88e500ab691bf01 Change-Id: Id5a7eec61cdac3d57c8c4c790d24adf258410545
rc/com/android/gallery3d/filtershow/imageshow/GeometryMetadata.java
rc/com/android/gallery3d/filtershow/imageshow/MasterImage.java
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
rc/com/android/gallery3d/filtershow/ui/FilterIconButton.java
|
1a07da3cd8060d49afabd11df33044ff9d05b48e |
28-Feb-2013 |
Nicolas Roard <nicolasroard@google.com> |
Revert "Cleanup ImagePreset" This reverts commit 0f0765676e5be73c7187a44ee88e500ab691bf01 Change-Id: Id5a7eec61cdac3d57c8c4c790d24adf258410545
rc/com/android/gallery3d/filtershow/imageshow/GeometryMetadata.java
rc/com/android/gallery3d/filtershow/imageshow/MasterImage.java
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
rc/com/android/gallery3d/filtershow/ui/FilterIconButton.java
|
1f2f2e12aebde46bb6ac90b22c4d1fe761bfb4bc |
28-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
am 0f076567: Cleanup ImagePreset * commit '0f0765676e5be73c7187a44ee88e500ab691bf01': Cleanup ImagePreset
|
2ac8f4680b66a1540cdc95511a84729fac76e959 |
28-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Cleanup ImagePreset Change-Id: I89e180293a290adb76d4fc8a9a8965fa1445440e
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
|
0f0765676e5be73c7187a44ee88e500ab691bf01 |
28-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Cleanup ImagePreset Change-Id: I89e180293a290adb76d4fc8a9a8965fa1445440e
rc/com/android/gallery3d/filtershow/imageshow/GeometryMetadata.java
rc/com/android/gallery3d/filtershow/imageshow/MasterImage.java
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
rc/com/android/gallery3d/filtershow/ui/FilterIconButton.java
|
ec5da88505d9b3c1562b13ce8448bc1a6b02ed27 |
28-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Cleanup ImagePreset Change-Id: I89e180293a290adb76d4fc8a9a8965fa1445440e
rc/com/android/gallery3d/filtershow/imageshow/GeometryMetadata.java
rc/com/android/gallery3d/filtershow/imageshow/MasterImage.java
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
rc/com/android/gallery3d/filtershow/ui/FilterIconButton.java
|
7c49a865f8b01e41a8a3360035e2a1a23b33bc0f |
28-Feb-2013 |
John Hoford <hoford@google.com> |
am be61c1fc: crop fix * commit 'be61c1fcfae87f00d2b3111b15e90bbf4a88b6bc': crop fix
|
be61c1fcfae87f00d2b3111b15e90bbf4a88b6bc |
28-Feb-2013 |
John Hoford <hoford@google.com> |
crop fix Change-Id: Ie2e79992bf45fffb0ae00c4a4fd879546fa1450f
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/cache/ImageLoader.java
rc/com/android/gallery3d/filtershow/editors/EditorCrop.java
rc/com/android/gallery3d/filtershow/imageshow/MasterImage.java
|
0483c7cc6d321fd6e07dc602f6bac69bc365a401 |
28-Feb-2013 |
John Hoford <hoford@google.com> |
crop fix Change-Id: Ie2e79992bf45fffb0ae00c4a4fd879546fa1450f
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/cache/ImageLoader.java
rc/com/android/gallery3d/filtershow/editors/EditorCrop.java
rc/com/android/gallery3d/filtershow/imageshow/MasterImage.java
|
89891406437fd32f96045b47855482a5302be2c3 |
28-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
am e1c3724f: Fix full res preview * commit 'e1c3724ff23c91d8e6d783545fb0f2d3bba8ce2b': Fix full res preview
|
e1c3724ff23c91d8e6d783545fb0f2d3bba8ce2b |
28-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Fix full res preview Change-Id: Ia727d06b9ff9866dfbb883968a23c0ed105e57fa
rc/com/android/gallery3d/filtershow/cache/FilteringPipeline.java
|
a510868d10c0977acb232a9e0eba3284b3bd4250 |
28-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Fix full res preview Change-Id: Ia727d06b9ff9866dfbb883968a23c0ed105e57fa
rc/com/android/gallery3d/filtershow/cache/FilteringPipeline.java
|
9b7112de5588368cd521d02a61a1b7f3bfeede4c |
28-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
am 65e47f69: Fix scale and full res preview * commit '65e47f698043f95ed8067e8c41397c472e5e433a': Fix scale and full res preview
|
bf5cefc0de7320bcac3773fba261566a5cc7518d |
28-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Fix scale and full res preview Change-Id: Ie432c2d1d631c37f54bd144c22d62cd59d7a665d
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
|
65e47f698043f95ed8067e8c41397c472e5e433a |
28-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Fix scale and full res preview Change-Id: Ie432c2d1d631c37f54bd144c22d62cd59d7a665d
rc/com/android/gallery3d/filtershow/cache/ImageLoader.java
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
|
7313e0cd0eb903e91b6bc166ad74145b294dd814 |
28-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Fix scale and full res preview Change-Id: Ie432c2d1d631c37f54bd144c22d62cd59d7a665d
rc/com/android/gallery3d/filtershow/cache/ImageLoader.java
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
|
e187283b7fb34643dd6d00b548bcec2dc610003d |
28-Feb-2013 |
John Hoford <hoford@google.com> |
am cad3dd97: Merge "refactor the geometry code" into gb-ub-photos-bryce * commit 'cad3dd97f0c169b22e9d55e5ef38384075a4f4be': refactor the geometry code
|
680d30fad60bf7e7ffd9f6fca1e9ac8f36d6f4f0 |
28-Feb-2013 |
John Hoford <hoford@google.com> |
Merge "refactor the geometry code" into gb-ub-photos-bryce
|
cad3dd97f0c169b22e9d55e5ef38384075a4f4be |
28-Feb-2013 |
John Hoford <hoford@google.com> |
Merge "refactor the geometry code" into gb-ub-photos-bryce
|
1e3384b2f7b01c104e76d5dd538fcb8967017b68 |
28-Feb-2013 |
John Hoford <hoford@google.com> |
Merge "refactor the geometry code" into gb-ub-photos-bryce
|
54b3d67486c05343471e520cdc8d9b882cb0483f |
27-Feb-2013 |
John Hoford <hoford@google.com> |
refactor the geometry code Change-Id: I5b0381ec5e127aabf37924af64fbeb490755bc9a
es/layout/filtershow_activity.xml
es/values/filtershow_ids.xml
rc/com/android/gallery3d/filtershow/filters/FilterRepresentation.java
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
|
d61a2f9fcaad0309132b6b9b666c3dc6df62fed7 |
27-Feb-2013 |
John Hoford <hoford@google.com> |
refactor the geometry code Change-Id: I5b0381ec5e127aabf37924af64fbeb490755bc9a
es/layout/filtershow_activity.xml
es/values/filtershow_ids.xml
rc/com/android/gallery3d/filtershow/EditorPlaceHolder.java
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/PanelController.java
rc/com/android/gallery3d/filtershow/cache/ImageLoader.java
rc/com/android/gallery3d/filtershow/editors/EditorCrop.java
rc/com/android/gallery3d/filtershow/editors/EditorFlip.java
rc/com/android/gallery3d/filtershow/editors/EditorInfo.java
rc/com/android/gallery3d/filtershow/editors/EditorRotate.java
rc/com/android/gallery3d/filtershow/editors/EditorStraighten.java
rc/com/android/gallery3d/filtershow/filters/BaseFiltersManager.java
rc/com/android/gallery3d/filtershow/filters/FilterRepresentation.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterGeometry.java
rc/com/android/gallery3d/filtershow/imageshow/GeometryMetadata.java
rc/com/android/gallery3d/filtershow/imageshow/ImageCrop.java
rc/com/android/gallery3d/filtershow/imageshow/ImageFlip.java
rc/com/android/gallery3d/filtershow/imageshow/ImageGeometry.java
rc/com/android/gallery3d/filtershow/imageshow/ImageRotate.java
rc/com/android/gallery3d/filtershow/imageshow/ImageStraighten.java
rc/com/android/gallery3d/filtershow/imageshow/MasterImage.java
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
rc/com/android/gallery3d/filtershow/ui/FilterIconButton.java
rc_pd/com/android/gallery3d/filtershow/editors/EditorManager.java
|
63cc04c3b51d544598c8af5c8c16a29b1e902a26 |
27-Feb-2013 |
John Hoford <hoford@google.com> |
refactor the geometry code Change-Id: I5b0381ec5e127aabf37924af64fbeb490755bc9a
rc/com/android/gallery3d/filtershow/EditorPlaceHolder.java
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/PanelController.java
rc/com/android/gallery3d/filtershow/cache/ImageLoader.java
rc/com/android/gallery3d/filtershow/editors/EditorCrop.java
rc/com/android/gallery3d/filtershow/editors/EditorFlip.java
rc/com/android/gallery3d/filtershow/editors/EditorInfo.java
rc/com/android/gallery3d/filtershow/editors/EditorRotate.java
rc/com/android/gallery3d/filtershow/editors/EditorStraighten.java
rc/com/android/gallery3d/filtershow/filters/BaseFiltersManager.java
rc/com/android/gallery3d/filtershow/filters/FilterRepresentation.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterGeometry.java
rc/com/android/gallery3d/filtershow/imageshow/GeometryMetadata.java
rc/com/android/gallery3d/filtershow/imageshow/ImageCrop.java
rc/com/android/gallery3d/filtershow/imageshow/ImageFlip.java
rc/com/android/gallery3d/filtershow/imageshow/ImageGeometry.java
rc/com/android/gallery3d/filtershow/imageshow/ImageRotate.java
rc/com/android/gallery3d/filtershow/imageshow/ImageStraighten.java
rc/com/android/gallery3d/filtershow/imageshow/MasterImage.java
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
rc/com/android/gallery3d/filtershow/ui/FilterIconButton.java
rc_pd/com/android/gallery3d/filtershow/editors/EditorManager.java
|
878ea7500dc08f1147a65431c67e4fe8fe1c98e3 |
28-Feb-2013 |
Justin Koh <justinkoh@google.com> |
am 94c06451: Merge "Updated Gallery2 with Pano." into gb-ub-photos-bryce * commit '94c06451103e8e6b43c927f2248b814bd803a6dc': Updated Gallery2 with Pano.
|
94c06451103e8e6b43c927f2248b814bd803a6dc |
28-Feb-2013 |
Justin Koh <justinkoh@google.com> |
Merge "Updated Gallery2 with Pano." into gb-ub-photos-bryce
|
dc6bc364aa2de2ffb2dde33efd661311fa4f1c95 |
28-Feb-2013 |
Justin Koh <justinkoh@google.com> |
Merge "Updated Gallery2 with Pano." into gb-ub-photos-bryce
|
7c16c0fe16921002aad4486f19a300cd72b08a3f |
28-Feb-2013 |
Justin Koh <justinkoh@google.com> |
Updated Gallery2 with Pano. Updated Gallery2 with Pano. Bug: 8263808 Change-Id: Iedaba9dc478fb20480f3b37e9708bc8d67cf6003
ndroidManifest.xml
|
dcf862b0444fff3bb79421380f7a79fe682584fe |
28-Feb-2013 |
Justin Koh <justinkoh@google.com> |
Updated Gallery2 with Pano. Updated Gallery2 with Pano. Bug: 8263808 Change-Id: Iedaba9dc478fb20480f3b37e9708bc8d67cf6003
ndroidManifest.xml
rc/com/android/photos/canvas/CanvasActivity.java
rc/com/android/photos/canvas/CanvasProvider.java
rc/com/android/photos/canvas/CanvasProviderBase.java
rc/com/google/android/canvas/data/Cluster.java
rc/com/google/android/canvas/data/util/UriUtils.java
rc/com/google/android/canvas/provider/CanvasContract.java
rc/com/google/android/pano/data/Cluster.java
rc/com/google/android/pano/data/util/UriUtils.java
rc/com/google/android/pano/provider/PanoContract.java
|
d878376c09d6cf65b0af051dd4241deab66bbf3d |
28-Feb-2013 |
Justin Koh <justinkoh@google.com> |
Updated Gallery2 with Pano. Updated Gallery2 with Pano. Bug: 8263808 Change-Id: Iedaba9dc478fb20480f3b37e9708bc8d67cf6003
rc/com/android/photos/canvas/CanvasActivity.java
rc/com/android/photos/canvas/CanvasProvider.java
rc/com/android/photos/canvas/CanvasProviderBase.java
rc/com/google/android/canvas/data/Cluster.java
rc/com/google/android/canvas/data/util/UriUtils.java
rc/com/google/android/canvas/provider/CanvasContract.java
rc/com/google/android/pano/data/Cluster.java
rc/com/google/android/pano/data/util/UriUtils.java
rc/com/google/android/pano/provider/PanoContract.java
|
6c3acbfcb868a88410a397340ce707118947d4d6 |
28-Feb-2013 |
Michael Kolb <kolby@google.com> |
am 379d09a9: am 6be07666: am 7b17c647: Merge "Highlight menu selection better" into gb-ub-photos-bryce * commit '379d09a95e76b4b98d88ba333cfb7ed0d5dc0685': Highlight menu selection better
|
6cac66aa9bd6e3da7e05917c2a6d5457d0f144a8 |
28-Feb-2013 |
Baligh Uddin <baligh@google.com> |
am cc374a6f: (-s ours) am 4b55a247: (-s ours) am c1424ad2: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce * commit 'cc374a6ff632d5436989f1b29ed079273abc3ff5': Import translations. DO NOT MERGE
|
149a2991d34ef30d72c924a2dbf72cb4a8ccf73b |
28-Feb-2013 |
Baligh Uddin <baligh@google.com> |
am b20286da: (-s ours) am adcb7735: (-s ours) am 2f2eca6c: (-s ours) Import translations. DO NOT MERGE * commit 'b20286dad5a0d721bf5f1592847ac941acbdc4cc': Import translations. DO NOT MERGE
|
4ad223462a86564e3f1efafce6e1df3dc97ce508 |
28-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
am 6753d59b: am cb19baba: am e1d87575: Fix vignette startup draw * commit '6753d59b9db53d13ae234582e2dcd5600c7606ff': Fix vignette startup draw
|
c4bfb872144b8e633b105744790e9ccd2caa4d9b |
28-Feb-2013 |
John Reck <jreck@google.com> |
am 76e1544e: am 778364cf: am 158cbda6: Merge "Thumbnails for PhotoSetPage" into gb-ub-photos-bryce * commit '76e1544e5072ebf06fd05f2d7952794db880dc5d': Thumbnails for PhotoSetPage
|
8dbddc615089c6c555827e048d98ec1610de91a7 |
28-Feb-2013 |
Michael Kolb <kolby@google.com> |
am 6be07666: am 7b17c647: Merge "Highlight menu selection better" into gb-ub-photos-bryce * commit '6be076663ad36ab74c69a99c8d7b55f74d3d9d82': Highlight menu selection better
|
56766262a9d0237f2d34b87c2b5368a1bb606f28 |
28-Feb-2013 |
Baligh Uddin <baligh@google.com> |
am 4b55a247: (-s ours) am c1424ad2: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce * commit '4b55a24719c8065fc5ad63e3cf629b50ae7b858f': Import translations. DO NOT MERGE
|
4e9bbed1448a14fc242d36fc18f12bfa353180d3 |
28-Feb-2013 |
Baligh Uddin <baligh@google.com> |
am adcb7735: (-s ours) am 2f2eca6c: (-s ours) Import translations. DO NOT MERGE * commit 'adcb7735b236bf0064ae6668954dfccbea241b14': Import translations. DO NOT MERGE
|
d6682944a8cbd66dd256b68a1114d9cdfacd21de |
28-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
am cb19baba: am e1d87575: Fix vignette startup draw * commit 'cb19babaccfb8912c828fc35d9b74c7c25e018cb': Fix vignette startup draw
|
e1035338f9ad3a72a5380697495257776d811b12 |
28-Feb-2013 |
John Reck <jreck@google.com> |
am 778364cf: am 158cbda6: Merge "Thumbnails for PhotoSetPage" into gb-ub-photos-bryce * commit '778364cfb6cfd83dbf82dc5b5a2ff36401dcb978': Thumbnails for PhotoSetPage
|
b409cc147efd202e31163fd6e34cdc3e3e9b7f48 |
27-Feb-2013 |
Michael Kolb <kolby@google.com> |
am 7b17c647: Merge "Highlight menu selection better" into gb-ub-photos-bryce * commit '7b17c647bb037373332634a6a88ceb066336f9ee': Highlight menu selection better
|
7b17c647bb037373332634a6a88ceb066336f9ee |
27-Feb-2013 |
Michael Kolb <kolby@google.com> |
Merge "Highlight menu selection better" into gb-ub-photos-bryce
|
089b1490d0ead0512e734e6f23b70e7bbdf885e0 |
27-Feb-2013 |
Michael Kolb <kolby@google.com> |
Merge "Highlight menu selection better" into gb-ub-photos-bryce
|
78901688d3234cfb4be83abbaa6e60ee08ee91aa |
27-Feb-2013 |
Baligh Uddin <baligh@google.com> |
am 1b786b8f: (-s ours) Merge "Import translations. DO NOT MERGE" * commit '1b786b8f5537b2cd0aaed22fb315571afe71c14f': Import translations. DO NOT MERGE
|
b00ce43d6ceb09703219bba35616d0a511b931e2 |
27-Feb-2013 |
Baligh Uddin <baligh@google.com> |
am f7f01ca8: (-s ours) Import translations. DO NOT MERGE * commit 'f7f01ca850cd55bf309b04ba7e99960e1e7dd78a': Import translations. DO NOT MERGE
|
d51a1ba2437c32e1dfc3e6528f0f8598012b42a2 |
27-Feb-2013 |
Baligh Uddin <baligh@google.com> |
am c1424ad2: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce * commit 'c1424ad2a2612b21201f8377004713a06d357b3c': Import translations. DO NOT MERGE
|
db41f4809f07356f8f6fce5a8d249b7777757b0f |
27-Feb-2013 |
Baligh Uddin <baligh@google.com> |
am 2f2eca6c: (-s ours) Import translations. DO NOT MERGE * commit '2f2eca6c78e738c7d06fc2ff517d53beefd54673': Import translations. DO NOT MERGE
|
29fb1016976aa5e43f3a7d34507a3c23c32391af |
27-Feb-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE"
|
ac4e910c72e99d3b11e50b0174c89113ca981b6b |
27-Feb-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
|
c1424ad2a2612b21201f8377004713a06d357b3c |
27-Feb-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
|
58d722f184fa217f1e219d98c2205ac699697ef3 |
27-Feb-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Id8f4e691f2ec06819b8176463d30cb627a7cfdaf Auto-generated-cl: translation import
es/values-af/filtershow_strings.xml
es/values-am/filtershow_strings.xml
es/values-ar/filtershow_strings.xml
es/values-be/filtershow_strings.xml
es/values-bg/filtershow_strings.xml
es/values-ca/filtershow_strings.xml
es/values-cs/filtershow_strings.xml
es/values-da/filtershow_strings.xml
es/values-de/filtershow_strings.xml
es/values-el/filtershow_strings.xml
es/values-en-rGB/filtershow_strings.xml
es/values-es-rUS/filtershow_strings.xml
es/values-es/filtershow_strings.xml
es/values-et/filtershow_strings.xml
es/values-fa/filtershow_strings.xml
es/values-fi/filtershow_strings.xml
es/values-fr/filtershow_strings.xml
es/values-hi/filtershow_strings.xml
es/values-hr/filtershow_strings.xml
es/values-hu/filtershow_strings.xml
es/values-in/filtershow_strings.xml
es/values-it/filtershow_strings.xml
es/values-iw/filtershow_strings.xml
es/values-ja/filtershow_strings.xml
es/values-ko/filtershow_strings.xml
es/values-lt/filtershow_strings.xml
es/values-lv/filtershow_strings.xml
es/values-ms/filtershow_strings.xml
es/values-nb/filtershow_strings.xml
es/values-nl/filtershow_strings.xml
es/values-pl/filtershow_strings.xml
es/values-pt-rPT/filtershow_strings.xml
es/values-pt/filtershow_strings.xml
es/values-ro/filtershow_strings.xml
es/values-ru/filtershow_strings.xml
es/values-sk/filtershow_strings.xml
es/values-sl/filtershow_strings.xml
es/values-sr/filtershow_strings.xml
es/values-sv/filtershow_strings.xml
es/values-sw/filtershow_strings.xml
es/values-th/filtershow_strings.xml
es/values-tl/filtershow_strings.xml
es/values-tr/filtershow_strings.xml
es/values-uk/filtershow_strings.xml
es/values-vi/filtershow_strings.xml
es/values-zh-rCN/filtershow_strings.xml
es/values-zh-rTW/filtershow_strings.xml
es/values-zu/filtershow_strings.xml
|
6b5f64962274049fc6db4b27bfaa7f6b7b1d9284 |
27-Feb-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ib435e397fb94039d4a4cc4da66ae4afcc198dac2 Auto-generated-cl: translation import
es/values-af/filtershow_strings.xml
es/values-am/filtershow_strings.xml
es/values-ar/filtershow_strings.xml
es/values-be/filtershow_strings.xml
es/values-bg/filtershow_strings.xml
es/values-ca/filtershow_strings.xml
es/values-cs/filtershow_strings.xml
es/values-da/filtershow_strings.xml
es/values-de/filtershow_strings.xml
es/values-el/filtershow_strings.xml
es/values-en-rGB/filtershow_strings.xml
es/values-es-rUS/filtershow_strings.xml
es/values-es/filtershow_strings.xml
es/values-et/filtershow_strings.xml
es/values-fa/filtershow_strings.xml
es/values-fi/filtershow_strings.xml
es/values-fr/filtershow_strings.xml
es/values-hi/filtershow_strings.xml
es/values-hr/filtershow_strings.xml
es/values-hu/filtershow_strings.xml
es/values-in/filtershow_strings.xml
es/values-it/filtershow_strings.xml
es/values-iw/filtershow_strings.xml
es/values-ja/filtershow_strings.xml
es/values-ko/filtershow_strings.xml
es/values-lt/filtershow_strings.xml
es/values-lv/filtershow_strings.xml
es/values-ms/filtershow_strings.xml
es/values-nb/filtershow_strings.xml
es/values-nl/filtershow_strings.xml
es/values-pl/filtershow_strings.xml
es/values-pt-rPT/filtershow_strings.xml
es/values-pt/filtershow_strings.xml
es/values-ro/filtershow_strings.xml
es/values-ru/filtershow_strings.xml
es/values-sk/filtershow_strings.xml
es/values-sl/filtershow_strings.xml
es/values-sr/filtershow_strings.xml
es/values-sv/filtershow_strings.xml
es/values-sw/filtershow_strings.xml
es/values-th/filtershow_strings.xml
es/values-tl/filtershow_strings.xml
es/values-tr/filtershow_strings.xml
es/values-uk/filtershow_strings.xml
es/values-vi/filtershow_strings.xml
es/values-zh-rCN/filtershow_strings.xml
es/values-zh-rTW/filtershow_strings.xml
es/values-zu/filtershow_strings.xml
|
902dbbd6acd57cbadcebed9bafbec13cad6ec665 |
27-Feb-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ib435e397fb94039d4a4cc4da66ae4afcc198dac2 Auto-generated-cl: translation import
es/values-af/filtershow_strings.xml
es/values-am/filtershow_strings.xml
es/values-ar/filtershow_strings.xml
es/values-be/filtershow_strings.xml
es/values-bg/filtershow_strings.xml
es/values-ca/filtershow_strings.xml
es/values-cs/filtershow_strings.xml
es/values-da/filtershow_strings.xml
es/values-de/filtershow_strings.xml
es/values-el/filtershow_strings.xml
es/values-en-rGB/filtershow_strings.xml
es/values-es-rUS/filtershow_strings.xml
es/values-es/filtershow_strings.xml
es/values-et/filtershow_strings.xml
es/values-fa/filtershow_strings.xml
es/values-fi/filtershow_strings.xml
es/values-fr/filtershow_strings.xml
es/values-hi/filtershow_strings.xml
es/values-hr/filtershow_strings.xml
es/values-hu/filtershow_strings.xml
es/values-in/filtershow_strings.xml
es/values-it/filtershow_strings.xml
es/values-iw/filtershow_strings.xml
es/values-ja/filtershow_strings.xml
es/values-ko/filtershow_strings.xml
es/values-lt/filtershow_strings.xml
es/values-lv/filtershow_strings.xml
es/values-ms/filtershow_strings.xml
es/values-nb/filtershow_strings.xml
es/values-nl/filtershow_strings.xml
es/values-pl/filtershow_strings.xml
es/values-pt-rPT/filtershow_strings.xml
es/values-pt/filtershow_strings.xml
es/values-ro/filtershow_strings.xml
es/values-ru/filtershow_strings.xml
es/values-sk/filtershow_strings.xml
es/values-sl/filtershow_strings.xml
es/values-sr/filtershow_strings.xml
es/values-sv/filtershow_strings.xml
es/values-sw/filtershow_strings.xml
es/values-th/filtershow_strings.xml
es/values-tl/filtershow_strings.xml
es/values-tr/filtershow_strings.xml
es/values-uk/filtershow_strings.xml
es/values-vi/filtershow_strings.xml
es/values-zh-rCN/filtershow_strings.xml
es/values-zh-rTW/filtershow_strings.xml
es/values-zu/filtershow_strings.xml
|
ee1c8103b105463233f3fc42e5c2e3370548b063 |
27-Feb-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I62422e670a58bba808df28ee9e9d3445cd69015f Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
2f2eca6c78e738c7d06fc2ff517d53beefd54673 |
27-Feb-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Id252293b9f782ee6744738fe20fc86230a898fb8 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
15229e58497669b0b8ab1a93651673181b6fbc88 |
27-Feb-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Id252293b9f782ee6744738fe20fc86230a898fb8 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
2d4c57ae2bf831aa347a978d4509f75e986b897b |
27-Feb-2013 |
Michael Kolb <kolby@google.com> |
Highlight menu selection better Keep the selected slice highlighted longer before fading out Timing might need further adjusting Change-Id: I9c3febf4ad2b73f2c80d47259fa9cd7578445dd4
rc/com/android/camera/ui/PieRenderer.java
|
ebcf6fed531d00cfb6900a1fb5d83c60aa7f9693 |
27-Feb-2013 |
Michael Kolb <kolby@google.com> |
Highlight menu selection better Keep the selected slice highlighted longer before fading out Timing might need further adjusting Change-Id: I9c3febf4ad2b73f2c80d47259fa9cd7578445dd4
rc/com/android/camera/ui/PieRenderer.java
|
2c0f1da82bafb04853770bb4ac2d766bc3d8fec5 |
27-Feb-2013 |
The Android Automerger <android-build@android.com> |
merge in jb-mr2-release history after reset to jb-mr2-dev
|
9e322955b2983ac4bc0221fd9c9e19c1f5b8e940 |
27-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
am e1d87575: Fix vignette startup draw * commit 'e1d875757bbe6634d7224c4f759d904688de4013': Fix vignette startup draw
|
e1d875757bbe6634d7224c4f759d904688de4013 |
27-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Fix vignette startup draw Change-Id: Ifaab3167e44db05be6c788e10d234975b1f51b56
rc/com/android/gallery3d/filtershow/imageshow/ImageVignette.java
|
7c3ff29f5d187a9f8c660f8571a43f5a91b46836 |
27-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Fix vignette startup draw Change-Id: Ifaab3167e44db05be6c788e10d234975b1f51b56
rc/com/android/gallery3d/filtershow/imageshow/ImageVignette.java
|
bdbfb9253c941b99ef2abf8c8036356656a20302 |
27-Feb-2013 |
John Reck <jreck@google.com> |
am 158cbda6: Merge "Thumbnails for PhotoSetPage" into gb-ub-photos-bryce * commit '158cbda6ff7443fc86321a509341d326455d868c': Thumbnails for PhotoSetPage
|
91b7dda504552881be7ece059373d33ccfb2d369 |
27-Feb-2013 |
John Reck <jreck@google.com> |
Merge "Thumbnails for PhotoSetPage" into gb-ub-photos-bryce
|
f228f8e699192fdbab7b9c89c5bfb1deb3fba6df |
27-Feb-2013 |
John Reck <jreck@google.com> |
Merge "Thumbnails for PhotoSetPage" into gb-ub-photos-bryce
|
158cbda6ff7443fc86321a509341d326455d868c |
27-Feb-2013 |
John Reck <jreck@google.com> |
Merge "Thumbnails for PhotoSetPage" into gb-ub-photos-bryce
|
076446478f0034de3b563b28f12c18cf62395d7a |
27-Feb-2013 |
John Reck <jreck@google.com> |
Merge "Thumbnails for PhotoSetPage" into gb-ub-photos-bryce
|
d67a8b93c05a7e15ad562257976869479d538900 |
27-Feb-2013 |
John Reck <jreck@google.com> |
Thumbnails for PhotoSetPage Change-Id: I8d62b4ca0d0902ca2a18b087a344d35d17a97fa7
es/layout/photo_set.xml
|
6f039fb31bc4b9e655373fb0977f751b225efb20 |
27-Feb-2013 |
John Reck <jreck@google.com> |
Thumbnails for PhotoSetPage Change-Id: I8d62b4ca0d0902ca2a18b087a344d35d17a97fa7
ndroidManifest.xml
|
71bfefaf9029df26ba4c6e4077c4e3e2f259634f |
27-Feb-2013 |
John Reck <jreck@google.com> |
Thumbnails for PhotoSetPage Change-Id: I8d62b4ca0d0902ca2a18b087a344d35d17a97fa7
ndroidManifest.xml
es/layout/photo_set.xml
rc/com/android/photos/PhotoSetFragment.java
rc/com/android/photos/drawables/AutoThumbnailDrawable.java
rc/com/android/photos/views/GalleryThumbnailView.java
|
5c9eeb4916824dcce3a2271d5677a9a925a35938 |
27-Feb-2013 |
John Reck <jreck@google.com> |
Thumbnails for PhotoSetPage Change-Id: I8d62b4ca0d0902ca2a18b087a344d35d17a97fa7
rc/com/android/photos/PhotoSetFragment.java
rc/com/android/photos/drawables/AutoThumbnailDrawable.java
rc/com/android/photos/views/GalleryThumbnailView.java
|
5927277f689e4ab04222a7578d090b98530f3251 |
27-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
am 0248af72: am 10ece61a: FilterShowActivity cleanup * commit '0248af72cbca9972f51aaf31d6504fde7297aaf7': FilterShowActivity cleanup
|
b310be44f7abb0407dc1ce01834c054946ab089d |
27-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
am 10ece61a: FilterShowActivity cleanup * commit '10ece61a285633c1b06921ec7b8ce3c50bb37b73': FilterShowActivity cleanup
|
9e2528ce3cea55bc09b089a505cb882a40b96567 |
26-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
FilterShowActivity cleanup Change-Id: Iac674c6ca981b7dafb76af3602c75b925d4cbbed
es/layout/filtershow_activity.xml
|
10ece61a285633c1b06921ec7b8ce3c50bb37b73 |
26-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
FilterShowActivity cleanup Change-Id: Iac674c6ca981b7dafb76af3602c75b925d4cbbed
es/layout/filtershow_activity.xml
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/PanelController.java
|
ee556ffc31da361596ca13021bbdd11ba9b30c2b |
26-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
FilterShowActivity cleanup Change-Id: Iac674c6ca981b7dafb76af3602c75b925d4cbbed
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/PanelController.java
|
be78188c7eee96e301fb7a8a815f34f3c0cb909e |
26-Feb-2013 |
John Hoford <hoford@google.com> |
am 0f1a695b: am 69cc3eba: Merge "add upoint" into gb-ub-photos-bryce * commit '0f1a695b3a41718f1a8b57ee9ffd552e585fdf40': add upoint
|
87779c572bff1a3c4224c0ed55c52c295457c8fa |
26-Feb-2013 |
John Hoford <hoford@google.com> |
am 69cc3eba: Merge "add upoint" into gb-ub-photos-bryce * commit '69cc3eba9a4405190d6429df52609fb0d7079c52': add upoint
|
69cc3eba9a4405190d6429df52609fb0d7079c52 |
26-Feb-2013 |
John Hoford <hoford@google.com> |
Merge "add upoint" into gb-ub-photos-bryce
|
a79f94b38f82ce20cff5b4bbb45a110c96ddb9ab |
26-Feb-2013 |
John Hoford <hoford@google.com> |
Merge "add upoint" into gb-ub-photos-bryce
|
046ffc78689d0cd3f7e2e9b364561b0fa34fa70f |
26-Feb-2013 |
George Mount <mount@google.com> |
am a38660e9: am c8419b4e: Add initial implementation of PhotosProvider. * commit 'a38660e926467819376658865e2293fcb76c5dfa': Add initial implementation of PhotosProvider.
|
db87b37483252febe58697cce0c82606d6cf5dee |
26-Feb-2013 |
George Mount <mount@google.com> |
am c8419b4e: Add initial implementation of PhotosProvider. * commit 'c8419b4e5e3302f2efc7ea629891041a14219aa7': Add initial implementation of PhotosProvider.
|
b2b1e6cbf4a090215bc903762782e2c6961de61a |
21-Feb-2013 |
George Mount <mount@google.com> |
Add initial implementation of PhotosProvider. Change-Id: I98694cf54bd0fb549703a7184e1816e9590a05ff
ndroidManifest.xml
ests/AndroidManifest.xml
|
c8419b4e5e3302f2efc7ea629891041a14219aa7 |
21-Feb-2013 |
George Mount <mount@google.com> |
Add initial implementation of PhotosProvider. Change-Id: I98694cf54bd0fb549703a7184e1816e9590a05ff
ndroidManifest.xml
rc/com/android/photos/data/PhotoDatabase.java
rc/com/android/photos/data/PhotoProvider.java
ests/AndroidManifest.xml
ests/src/com/android/photos/data/DataTestRunner.java
ests/src/com/android/photos/data/PhotoDatabaseTest.java
ests/src/com/android/photos/data/PhotoDatabaseUtils.java
ests/src/com/android/photos/data/PhotoProviderTest.java
|
178b04f4cea6dcbe0f84f0f189e9280d4c0d1442 |
21-Feb-2013 |
George Mount <mount@google.com> |
Add initial implementation of PhotosProvider. Change-Id: I98694cf54bd0fb549703a7184e1816e9590a05ff
rc/com/android/photos/data/PhotoDatabase.java
rc/com/android/photos/data/PhotoProvider.java
ests/src/com/android/photos/data/DataTestRunner.java
ests/src/com/android/photos/data/PhotoDatabaseTest.java
ests/src/com/android/photos/data/PhotoDatabaseUtils.java
ests/src/com/android/photos/data/PhotoProviderTest.java
|
0a898008099c6747a1393f81c1b4de92e3bc04eb |
26-Feb-2013 |
John Hoford <hoford@google.com> |
add upoint Change-Id: I484d2c6658e4ea06e22fa037ef2262c17b9e8d79
rc/com/android/gallery3d/filtershow/PanelController.java
rc/com/android/gallery3d/filtershow/imageshow/EclipseControl.java
|
bdfaf6b49802ad9073adac89237076a1268bbdb1 |
26-Feb-2013 |
John Hoford <hoford@google.com> |
add upoint Change-Id: I484d2c6658e4ea06e22fa037ef2262c17b9e8d79
rc/com/android/gallery3d/filtershow/PanelController.java
rc/com/android/gallery3d/filtershow/imageshow/EclipseControl.java
|
a2335e183834d6fbadaddddc5fa801a3af6f9cca |
26-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
am bd015fc5: am db4cedf1: Disable full res when dealing with jpeg orientation * commit 'bd015fc5e34bc34eebf54fd31ca3664592f04c8c': Disable full res when dealing with jpeg orientation
|
278413d7e86ce9318e503a456e4ea48ae3ea078d |
26-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
am db4cedf1: Disable full res when dealing with jpeg orientation * commit 'db4cedf1feb3899840963b2648dc3e2b4d0a1d6f': Disable full res when dealing with jpeg orientation
|
db4cedf1feb3899840963b2648dc3e2b4d0a1d6f |
26-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Disable full res when dealing with jpeg orientation Change-Id: Ie29f25addcb66a6c8a2effa2bfbf89155ce6465a
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
|
aae069d8a006e4664414df56750b86844825b39c |
26-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Disable full res when dealing with jpeg orientation Change-Id: Ie29f25addcb66a6c8a2effa2bfbf89155ce6465a
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
|
bd21f7a5e8cbb137dcc440a33986d4e8d0a3f36e |
26-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Disable full res when dealing with jpeg orientation Change-Id: Ie29f25addcb66a6c8a2effa2bfbf89155ce6465a
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
|
0f3e72f5b79a9489ef865df6ca857ae6e443c6fa |
26-Feb-2013 |
The Android Automerger <android-build@android.com> |
merge in jb-mr2-release history after reset to jb-mr2-dev
|
f7c504180086477ade080649ec9bdcf92229b8e5 |
26-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
am 84c77863: am a3a4c954: Fix compare swipe * commit '84c77863c34c6174e88e1857e321956d7adefb2a': Fix compare swipe
|
40a329d6c0c47c235199d52f409845c26ce64a08 |
26-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
am a3a4c954: Fix compare swipe * commit 'a3a4c954c6917375a852d3f3c64d0c76693b5677': Fix compare swipe
|
a3a4c954c6917375a852d3f3c64d0c76693b5677 |
26-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Fix compare swipe bug:8266511
rc/com/android/gallery3d/filtershow/imageshow/ImageShow.java
|
a59102e397360b94ba921e3b574f8eb52acd474d |
26-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Fix compare swipe bug:8266511
rc/com/android/gallery3d/filtershow/imageshow/ImageShow.java
|
8fe9a0fc91202cd9bcbf60494b5b15409c0ed79e |
26-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
am ddbbd5bc: am 8b4c7f99: Merge "Fix crash on applying borders" into gb-ub-photos-bryce * commit 'ddbbd5bc304660c83494b587d5bb065187a99103': Fix crash on applying borders
|
fb4c813acf8584ee98135b748e2ce18335d6cb18 |
26-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
am 8b4c7f99: Merge "Fix crash on applying borders" into gb-ub-photos-bryce * commit '8b4c7f99ddd23cfba032f1f2f878d644f0659972': Fix crash on applying borders
|
8d574fe1d8a6594cde38c10dcc3d265c9c8079c4 |
26-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Merge "Fix crash on applying borders" into gb-ub-photos-bryce
|
8b4c7f99ddd23cfba032f1f2f878d644f0659972 |
26-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Merge "Fix crash on applying borders" into gb-ub-photos-bryce
|
fb68b59d4a6677c9d41b621133c93551d6a93d49 |
26-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Merge "Fix crash on applying borders" into gb-ub-photos-bryce
|
08b7b624b8fd56c0254be45957bb170c57a27e8a |
26-Feb-2013 |
Michael Kolb <kolby@google.com> |
am 7702732b: am e858477f: Merge "Use cross fade rotation animation" into gb-ub-photos-bryce * commit '7702732b916b23fa298e103133733df1ec54d177': Use cross fade rotation animation
|
67c00a10cbe2df3155cad96949ea62f02295148e |
26-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Fix crash on applying borders bug:8265497 Change-Id: I7e6b22cb7666fd3876119051552e34e91df894a2
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
|
f503fda639ee0d5dd765ac8d6372c3c3a74f8d20 |
26-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Fix crash on applying borders bug:8265497 Change-Id: I7e6b22cb7666fd3876119051552e34e91df894a2
rc/com/android/gallery3d/filtershow/cache/FilteringPipeline.java
rc/com/android/gallery3d/filtershow/cache/ImageLoader.java
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
|
5a8f86ddfe3030af349bce1c4a3b48835f0156e1 |
26-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Fix crash on applying borders bug:8265497 Change-Id: I7e6b22cb7666fd3876119051552e34e91df894a2
rc/com/android/gallery3d/filtershow/cache/FilteringPipeline.java
rc/com/android/gallery3d/filtershow/cache/ImageLoader.java
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
|
f0923bfabce985a5e190ccb6f9ec76c160af8692 |
26-Feb-2013 |
Michael Kolb <kolby@google.com> |
am e858477f: Merge "Use cross fade rotation animation" into gb-ub-photos-bryce * commit 'e858477ff8ed81b39031f1197ed6d92de56e51f6': Use cross fade rotation animation
|
6fa131b388a527b91313a1fc4d05710819634963 |
26-Feb-2013 |
Michael Kolb <kolby@google.com> |
Merge "Use cross fade rotation animation" into gb-ub-photos-bryce
|
e858477ff8ed81b39031f1197ed6d92de56e51f6 |
26-Feb-2013 |
Michael Kolb <kolby@google.com> |
Merge "Use cross fade rotation animation" into gb-ub-photos-bryce
|
b47db2e6d04a8bb2aa8f62f6149526593d0def52 |
26-Feb-2013 |
Michael Kolb <kolby@google.com> |
Merge "Use cross fade rotation animation" into gb-ub-photos-bryce
|
6afdb1769adddaf94116a7d1cad82740a9455641 |
26-Feb-2013 |
Michael Kolb <kolby@google.com> |
Use cross fade rotation animation Bug: 8257846 Change-Id: I891eda12f3de2ec0cd0f7672b991a19e6464873c
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
|
dd864378be752aa1477f44e33c18578131fe70b2 |
26-Feb-2013 |
Michael Kolb <kolby@google.com> |
Use cross fade rotation animation Bug: 8257846 Change-Id: I891eda12f3de2ec0cd0f7672b991a19e6464873c
es/values/dimens.xml
|
edc63ddadb7c256aba3c8452e419268032185ada |
26-Feb-2013 |
Michael Kolb <kolby@google.com> |
Use cross fade rotation animation Bug: 8257846 Change-Id: I891eda12f3de2ec0cd0f7672b991a19e6464873c
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
es/values/dimens.xml
rc/com/android/camera/CameraActivity.java
|
08650187c1f1a2d1ef7f754be0f479a29958daaa |
26-Feb-2013 |
Michael Kolb <kolby@google.com> |
Use cross fade rotation animation Bug: 8257846 Change-Id: I891eda12f3de2ec0cd0f7672b991a19e6464873c
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
rc/com/android/camera/CameraActivity.java
|
fac2507f5f3068badb3d39a1ca36f889b0751e61 |
26-Feb-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 85470ab7: am 21a01faa: Fixed more of filtershows large bitmap reference leaks. * commit '85470ab7e034b81f25007e3fb6e7b210032ce788': Fixed more of filtershows large bitmap reference leaks.
|
eb348d98ab2750dbcb7583081f36f870970c75a8 |
26-Feb-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 21a01faa: Fixed more of filtershows large bitmap reference leaks. * commit '21a01faab1125c5c347a3dfbf6a71de6aec233a1': Fixed more of filtershows large bitmap reference leaks.
|
8ac3068ca4bacb43c17ed73e733f72909fe00245 |
26-Feb-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Fixed more of filtershows large bitmap reference leaks. Bug: 8253109 Change-Id: Iaff381e759d02baae701a01d6c081c49f4b3c772
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
|
21a01faab1125c5c347a3dfbf6a71de6aec233a1 |
26-Feb-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Fixed more of filtershows large bitmap reference leaks. Bug: 8253109 Change-Id: Iaff381e759d02baae701a01d6c081c49f4b3c772
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/cache/FilteringPipeline.java
rc/com/android/gallery3d/filtershow/filters/BaseFiltersManager.java
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
rc/com/android/gallery3d/filtershow/ui/ImageCurves.java
rc_pd/com/android/gallery3d/filtershow/filters/FiltersManager.java
|
f26b3580d1f2f9a3736fb77aebf0ebb9d5a33001 |
26-Feb-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Fixed more of filtershows large bitmap reference leaks. Bug: 8253109 Change-Id: Iaff381e759d02baae701a01d6c081c49f4b3c772
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/cache/FilteringPipeline.java
rc/com/android/gallery3d/filtershow/filters/BaseFiltersManager.java
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
rc/com/android/gallery3d/filtershow/ui/ImageCurves.java
rc_pd/com/android/gallery3d/filtershow/filters/FiltersManager.java
|
3847e4e8e26ed6c6f18ee4a6b2984d33051d155e |
14-Nov-2012 |
Bobby Georgescu <georgescu@google.com> |
Add possibility for UX improvement measurements Bug: 4293199 Change-Id: I45f8a63c676c8d7700c422a0a18f799fb6d02d2e
rc/com/android/gallery3d/app/AbstractGalleryActivity.java
rc/com/android/gallery3d/app/GalleryAppImpl.java
rc/com/android/gallery3d/app/StateManager.java
rc_pd/com/android/gallery3d/util/UsageStatistics.java
|
a84dd7a82442ed41e7671b84c9d2c5ab744b25a7 |
14-Nov-2012 |
Bobby Georgescu <georgescu@google.com> |
Add possibility for UX improvement measurements Bug: 4293199 Change-Id: I45f8a63c676c8d7700c422a0a18f799fb6d02d2e
rc/com/android/gallery3d/app/AbstractGalleryActivity.java
rc/com/android/gallery3d/app/GalleryAppImpl.java
rc/com/android/gallery3d/app/StateManager.java
rc_pd/com/android/gallery3d/util/UsageStatistics.java
|
9fb214cdcf45c6dcf08de9444c776342f7db266d |
25-Feb-2013 |
Baligh Uddin <baligh@google.com> |
am 622852bc: (-s ours) am 313a2093: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce * commit '622852bc8cf70c839f3d8407d08fc705714d4080': Import translations. DO NOT MERGE
|
80a68d0b535e7f739b647d250004f2b8acb19909 |
25-Feb-2013 |
Baligh Uddin <baligh@google.com> |
am 91753119: (-s ours) am 47b0fd0a: (-s ours) Import translations. DO NOT MERGE * commit '917531195c7e286b157cfc2e48b591f4376f473a': Import translations. DO NOT MERGE
|
9945f5ec3d04926c8a4baaa0b75877925016d5d2 |
25-Feb-2013 |
Baligh Uddin <baligh@google.com> |
am 4cb9f9fe: (-s ours) Merge "Import translations. DO NOT MERGE" * commit '4cb9f9fee0a8a74f68d34aa3d5f832f4d057f96c': Import translations. DO NOT MERGE
|
19ba101401ba7e478b69cc7a8f84eb83ccfec44d |
25-Feb-2013 |
Baligh Uddin <baligh@google.com> |
am d01279cd: (-s ours) Import translations. DO NOT MERGE * commit 'd01279cd93b2d2d53c64fbb019f148bee29eb32d': Import translations. DO NOT MERGE
|
184b6a3d089fe612d51258fbc3537819cca75794 |
25-Feb-2013 |
Baligh Uddin <baligh@google.com> |
am 313a2093: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce * commit '313a20935178edcf34fcd8ecdf394c82f0b3d2dd': Import translations. DO NOT MERGE
|
3efc622ffa987c2bb39370387efcdcf1601e8a92 |
25-Feb-2013 |
Baligh Uddin <baligh@google.com> |
am 47b0fd0a: (-s ours) Import translations. DO NOT MERGE * commit '47b0fd0a0fabeec59f92690ee619319c61221874': Import translations. DO NOT MERGE
|
bfa14e3825d119b71a8973208d855ec7f6267241 |
25-Feb-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE"
|
c9b633e7dd02f22de632823f7653a0e10b88321b |
25-Feb-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
|
313a20935178edcf34fcd8ecdf394c82f0b3d2dd |
25-Feb-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
|
a544e45db5f7acddba6d652b09ce3ace038cf00e |
25-Feb-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I64b92d95a6df0146a78c190618dc0d12edefd8c9 Auto-generated-cl: translation import
es/values-af/filtershow_strings.xml
es/values-am/filtershow_strings.xml
es/values-ar/filtershow_strings.xml
es/values-be/filtershow_strings.xml
es/values-bg/filtershow_strings.xml
es/values-ca/filtershow_strings.xml
es/values-cs/filtershow_strings.xml
es/values-da/filtershow_strings.xml
es/values-de/filtershow_strings.xml
es/values-el/filtershow_strings.xml
es/values-en-rGB/filtershow_strings.xml
es/values-es-rUS/filtershow_strings.xml
es/values-es/filtershow_strings.xml
es/values-et/filtershow_strings.xml
es/values-fa/filtershow_strings.xml
es/values-fi/filtershow_strings.xml
es/values-fr/filtershow_strings.xml
es/values-hi/filtershow_strings.xml
es/values-hr/filtershow_strings.xml
es/values-hu/filtershow_strings.xml
es/values-in/filtershow_strings.xml
es/values-it/filtershow_strings.xml
es/values-iw/filtershow_strings.xml
es/values-ja/filtershow_strings.xml
es/values-ko/filtershow_strings.xml
es/values-lt/filtershow_strings.xml
es/values-lv/filtershow_strings.xml
es/values-ms/filtershow_strings.xml
es/values-nb/filtershow_strings.xml
es/values-nl/filtershow_strings.xml
es/values-pl/filtershow_strings.xml
es/values-pt-rPT/filtershow_strings.xml
es/values-pt/filtershow_strings.xml
es/values-ro/filtershow_strings.xml
es/values-ru/filtershow_strings.xml
es/values-sk/filtershow_strings.xml
es/values-sl/filtershow_strings.xml
es/values-sr/filtershow_strings.xml
es/values-sv/filtershow_strings.xml
es/values-sw/filtershow_strings.xml
es/values-th/filtershow_strings.xml
es/values-tl/filtershow_strings.xml
es/values-tr/filtershow_strings.xml
es/values-uk/filtershow_strings.xml
es/values-vi/filtershow_strings.xml
es/values-zh-rCN/filtershow_strings.xml
es/values-zh-rTW/filtershow_strings.xml
es/values-zu/filtershow_strings.xml
|
e9e2debe8c9a74efe57bd3e8fcf232ca8b538477 |
25-Feb-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I833d58d07a1126966484a53851f6a84b45068152 Auto-generated-cl: translation import
es/values-af/filtershow_strings.xml
es/values-am/filtershow_strings.xml
es/values-ar/filtershow_strings.xml
es/values-be/filtershow_strings.xml
es/values-bg/filtershow_strings.xml
es/values-ca/filtershow_strings.xml
es/values-cs/filtershow_strings.xml
es/values-da/filtershow_strings.xml
es/values-de/filtershow_strings.xml
es/values-el/filtershow_strings.xml
es/values-en-rGB/filtershow_strings.xml
es/values-es-rUS/filtershow_strings.xml
es/values-es/filtershow_strings.xml
es/values-et/filtershow_strings.xml
es/values-fa/filtershow_strings.xml
es/values-fi/filtershow_strings.xml
es/values-fr/filtershow_strings.xml
es/values-hi/filtershow_strings.xml
es/values-hr/filtershow_strings.xml
es/values-hu/filtershow_strings.xml
es/values-in/filtershow_strings.xml
es/values-it/filtershow_strings.xml
es/values-iw/filtershow_strings.xml
es/values-ja/filtershow_strings.xml
es/values-ko/filtershow_strings.xml
es/values-lt/filtershow_strings.xml
es/values-lv/filtershow_strings.xml
es/values-ms/filtershow_strings.xml
es/values-nb/filtershow_strings.xml
es/values-nl/filtershow_strings.xml
es/values-pl/filtershow_strings.xml
es/values-pt-rPT/filtershow_strings.xml
es/values-pt/filtershow_strings.xml
es/values-ro/filtershow_strings.xml
es/values-ru/filtershow_strings.xml
es/values-sk/filtershow_strings.xml
es/values-sl/filtershow_strings.xml
es/values-sr/filtershow_strings.xml
es/values-sv/filtershow_strings.xml
es/values-sw/filtershow_strings.xml
es/values-th/filtershow_strings.xml
es/values-tl/filtershow_strings.xml
es/values-tr/filtershow_strings.xml
es/values-uk/filtershow_strings.xml
es/values-vi/filtershow_strings.xml
es/values-zh-rCN/filtershow_strings.xml
es/values-zh-rTW/filtershow_strings.xml
es/values-zu/filtershow_strings.xml
|
e593aad0116598c7e63cd53f2c7ecafeaea22f69 |
25-Feb-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I833d58d07a1126966484a53851f6a84b45068152 Auto-generated-cl: translation import
es/values-af/filtershow_strings.xml
es/values-am/filtershow_strings.xml
es/values-ar/filtershow_strings.xml
es/values-be/filtershow_strings.xml
es/values-bg/filtershow_strings.xml
es/values-ca/filtershow_strings.xml
es/values-cs/filtershow_strings.xml
es/values-da/filtershow_strings.xml
es/values-de/filtershow_strings.xml
es/values-el/filtershow_strings.xml
es/values-en-rGB/filtershow_strings.xml
es/values-es-rUS/filtershow_strings.xml
es/values-es/filtershow_strings.xml
es/values-et/filtershow_strings.xml
es/values-fa/filtershow_strings.xml
es/values-fi/filtershow_strings.xml
es/values-fr/filtershow_strings.xml
es/values-hi/filtershow_strings.xml
es/values-hr/filtershow_strings.xml
es/values-hu/filtershow_strings.xml
es/values-in/filtershow_strings.xml
es/values-it/filtershow_strings.xml
es/values-iw/filtershow_strings.xml
es/values-ja/filtershow_strings.xml
es/values-ko/filtershow_strings.xml
es/values-lt/filtershow_strings.xml
es/values-lv/filtershow_strings.xml
es/values-ms/filtershow_strings.xml
es/values-nb/filtershow_strings.xml
es/values-nl/filtershow_strings.xml
es/values-pl/filtershow_strings.xml
es/values-pt-rPT/filtershow_strings.xml
es/values-pt/filtershow_strings.xml
es/values-ro/filtershow_strings.xml
es/values-ru/filtershow_strings.xml
es/values-sk/filtershow_strings.xml
es/values-sl/filtershow_strings.xml
es/values-sr/filtershow_strings.xml
es/values-sv/filtershow_strings.xml
es/values-sw/filtershow_strings.xml
es/values-th/filtershow_strings.xml
es/values-tl/filtershow_strings.xml
es/values-tr/filtershow_strings.xml
es/values-uk/filtershow_strings.xml
es/values-vi/filtershow_strings.xml
es/values-zh-rCN/filtershow_strings.xml
es/values-zh-rTW/filtershow_strings.xml
es/values-zu/filtershow_strings.xml
|
a5f445a7703f760d15dd3faf62febc99075a9bf5 |
25-Feb-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I8d641cbf3a090ef65ff4adb8f5a7694b08ccfdd2 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
47b0fd0a0fabeec59f92690ee619319c61221874 |
25-Feb-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I545c00f3af3c4d7ab8dee256e8f3119bea41e6f7 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
1858c4dac9d3399b701771d0f644002218b28795 |
25-Feb-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I545c00f3af3c4d7ab8dee256e8f3119bea41e6f7 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
7ffc322a7ea532e2c7582eba41b89b7e41372198 |
25-Feb-2013 |
The Android Automerger <android-build@android.com> |
merge in jb-mr2-release history after reset to master
|
3abc7c19296f2000c70a881d0921183531bd75e7 |
23-Feb-2013 |
Doris Liu <tianliu@google.com> |
am 0af269dc: am e455b777: Merge "Release surface texture to fix gray camera preview" into gb-ub-photos-bryce * commit '0af269dc91098dfd6c2577ba81392793aec43305': Release surface texture to fix gray camera preview
|
6099d21f2d67e58f1b5658fc74964701b2a7834a |
23-Feb-2013 |
Doris Liu <tianliu@google.com> |
am e455b777: Merge "Release surface texture to fix gray camera preview" into gb-ub-photos-bryce * commit 'e455b777139921c5e72a9afca3f9ba3ae21975ba': Release surface texture to fix gray camera preview
|
02ef5ba117462eda524820b6004f84d26b28f647 |
23-Feb-2013 |
Doris Liu <tianliu@google.com> |
Merge "Release surface texture to fix gray camera preview" into gb-ub-photos-bryce
|
e455b777139921c5e72a9afca3f9ba3ae21975ba |
23-Feb-2013 |
Doris Liu <tianliu@google.com> |
Merge "Release surface texture to fix gray camera preview" into gb-ub-photos-bryce
|
cb3fd0ec6a8b5bae0b0a99cb1598276bdbb77ec3 |
23-Feb-2013 |
John Reck <jreck@google.com> |
am 138a617c: am 5f30b98d: Start of photos * commit '138a617c8fd3b1e6c31fac397fd6505d355bda2a': Start of photos
|
79bf726c3e165fa80e55bfef0f9e502d8bb8f80e |
23-Feb-2013 |
John Reck <jreck@google.com> |
am 5f30b98d: Start of photos * commit '5f30b98d6ac98c6aa863d48f47e9b8e2b77a1820': Start of photos
|
b8cf250c6351cd96f069fd16087db5e7b0f6b1d6 |
22-Feb-2013 |
Doris Liu <tianliu@google.com> |
Release surface texture to fix gray camera preview Bug: 8133672 Change-Id: Ie71c8fd1ea07a19eccf5bbd773054e095426fe80
rc/com/android/camera/PhotoModule.java
|
67de663ca106c32cf0b1f4fdf676f0fb10c30b83 |
22-Feb-2013 |
Doris Liu <tianliu@google.com> |
Release surface texture to fix gray camera preview Bug: 8133672 Change-Id: Ie71c8fd1ea07a19eccf5bbd773054e095426fe80
rc/com/android/camera/PhotoModule.java
|
bf71e192267a603ae6b06d6dfa8aa0446713c868 |
23-Feb-2013 |
Baligh Uddin <baligh@google.com> |
am d9efd139: (-s ours) Merge "Import translations. DO NOT MERGE" * commit 'd9efd139f94ce1c74c7ced361e2a15c412d5fbc9': Import translations. DO NOT MERGE
|
5aeae2f97595cd95e80adb675f0a3210bcabce8a |
23-Feb-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE"
|
40eee8e4ae94b1ed8d0832812e03a14af0a46802 |
15-Feb-2013 |
John Reck <jreck@google.com> |
Start of photos Change-Id: Id53dd96d8873e0fe6c2685e07cd7bdc0cde7ea75
ndroidManifest.xml
|
01ded9e9f39af6b09d807521a647272ad4e296cd |
15-Feb-2013 |
John Reck <jreck@google.com> |
Start of photos Change-Id: Id53dd96d8873e0fe6c2685e07cd7bdc0cde7ea75
es/layout/photo_set.xml
es/menu/gallery.xml
es/values-v14/styles.xml
es/values/strings.xml
|
608ef5cf3a15f235aa7b6d80924edbdb0fda365b |
15-Feb-2013 |
John Reck <jreck@google.com> |
Start of photos Change-Id: Id53dd96d8873e0fe6c2685e07cd7bdc0cde7ea75
rc/com/android/gallery3d/data/DataManager.java
rc/com/android/photos/AlbumSetFragment.java
rc/com/android/photos/GalleryActivity.java
rc/com/android/photos/PhotoFragment.java
rc/com/android/photos/PhotoSetFragment.java
rc/com/android/photos/data/MediaSetLoader.java
rc/com/android/photos/data/PhotoSetLoader.java
|
5f30b98d6ac98c6aa863d48f47e9b8e2b77a1820 |
15-Feb-2013 |
John Reck <jreck@google.com> |
Start of photos Change-Id: Id53dd96d8873e0fe6c2685e07cd7bdc0cde7ea75
ndroidManifest.xml
es/layout/photo_set.xml
es/menu/gallery.xml
es/values-v14/styles.xml
es/values/strings.xml
rc/com/android/gallery3d/data/DataManager.java
rc/com/android/photos/AlbumSetFragment.java
rc/com/android/photos/GalleryActivity.java
rc/com/android/photos/PhotoFragment.java
rc/com/android/photos/PhotoSetFragment.java
rc/com/android/photos/data/MediaSetLoader.java
rc/com/android/photos/data/PhotoSetLoader.java
|
ef15facbcb2d5e8ff056dd6a5403e502d6b4c1b6 |
22-Feb-2013 |
Baligh Uddin <baligh@google.com> |
am 27303ce1: (-s ours) am e7719898: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce * commit '27303ce16f50740fac1b8814fc11278aa67b2cbb': Import translations. DO NOT MERGE
|
396a3c7fb8b128157707116ea6e5936aa3d553b8 |
22-Feb-2013 |
Baligh Uddin <baligh@google.com> |
am e7719898: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce * commit 'e77198985fc22ed2cf24f5d497309742165bc69f': Import translations. DO NOT MERGE
|
e561dd49f4cafe6264733814932550734919a532 |
22-Feb-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
|
e77198985fc22ed2cf24f5d497309742165bc69f |
22-Feb-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
|
1a2657d789f64a6a59991ebd99aee5138cfcf3a7 |
22-Feb-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am f132461d: am d5633ea9: Merge "Stopgap fixes for more of the photo editor\'s memory issues." into gb-ub-photos-bryce * commit 'f132461df8cc54afe33272381af1e2fbefe30223': Stopgap fixes for more of the photo editor's memory issues.
|
3e249b3d31d60722589d30c102b416f80d2733c6 |
22-Feb-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am d5633ea9: Merge "Stopgap fixes for more of the photo editor\'s memory issues." into gb-ub-photos-bryce * commit 'd5633ea950ab82be13189705004ce97bce6a5715': Stopgap fixes for more of the photo editor's memory issues.
|
f3e14d196191672129e2897e25627cc41f5f6534 |
22-Feb-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Stopgap fixes for more of the photo editor's memory issues." into gb-ub-photos-bryce
|
d5633ea950ab82be13189705004ce97bce6a5715 |
22-Feb-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Stopgap fixes for more of the photo editor's memory issues." into gb-ub-photos-bryce
|
4cd043da0ee99d76ee7c3c33163404c38a26f01c |
22-Feb-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 3c7fdae3: am ddec680a: Merge "Revert "Stopgap fixes for more of the photo editor\'s memory issues."" into gb-ub-photos-bryce * commit '3c7fdae3dea349b4111e18dee29f21da5e9b0c66': Revert "Stopgap fixes for more of the photo editor's memory issues."
|
5ebc5b3bc483b6c16aab9138995bb83f81ffc0c1 |
22-Feb-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Stopgap fixes for more of the photo editor's memory issues. Bug: 8253109 Bug: 8233895 Change-Id: Idd55618807ff0a0c5ac0cbb8c71db167fa32e70b
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/cache/FilteringPipeline.java
rc/com/android/gallery3d/filtershow/cache/ImageLoader.java
rc/com/android/gallery3d/filtershow/filters/ImageFilter.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterRS.java
|
b17b1b0758799914fbad5f4a3afae71ce58891fc |
22-Feb-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Stopgap fixes for more of the photo editor's memory issues. Bug: 8253109 Bug: 8233895 Change-Id: Idd55618807ff0a0c5ac0cbb8c71db167fa32e70b
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/cache/FilteringPipeline.java
rc/com/android/gallery3d/filtershow/cache/ImageLoader.java
rc/com/android/gallery3d/filtershow/filters/ImageFilter.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterRS.java
|
ecd7f5cff81713e0bf9770b8dad6de73eb765df1 |
22-Feb-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am ddec680a: Merge "Revert "Stopgap fixes for more of the photo editor\'s memory issues."" into gb-ub-photos-bryce * commit 'ddec680a6d4604bc6fd44b29dfbf964422f40fcb': Revert "Stopgap fixes for more of the photo editor's memory issues."
|
36cb78bce439ecc6be815b520bdb9c9ad9829d1c |
22-Feb-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 4b55dbe5: am fc673e13: Merge "Stopgap fixes for more of the photo editor\'s memory issues." into gb-ub-photos-bryce * commit '4b55dbe54fb589aa82693b8e28b870d43d29a8e7': Stopgap fixes for more of the photo editor's memory issues.
|
ab893207b973361784ee1b57533134765a897627 |
22-Feb-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Revert "Stopgap fixes for more of the photo editor's memory issues."" into gb-ub-photos-bryce
|
ddec680a6d4604bc6fd44b29dfbf964422f40fcb |
22-Feb-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Revert "Stopgap fixes for more of the photo editor's memory issues."" into gb-ub-photos-bryce
|
9110226b1852334dd98c548dbd927600684684d5 |
22-Feb-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Revert "Stopgap fixes for more of the photo editor's memory issues." This reverts commit 4c91156f9a2e48ebaec86e3a46ea9b7855392cfd Change-Id: If94d87fd4d84bd518b7cc113c3cd422b59fdd3ed
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/cache/FilteringPipeline.java
rc/com/android/gallery3d/filtershow/cache/ImageLoader.java
rc/com/android/gallery3d/filtershow/filters/ImageFilter.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterRS.java
|
33ec1c79846ccc8b44014b16b555ad2323943b3c |
22-Feb-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Revert "Stopgap fixes for more of the photo editor's memory issues." This reverts commit 4c91156f9a2e48ebaec86e3a46ea9b7855392cfd Change-Id: If94d87fd4d84bd518b7cc113c3cd422b59fdd3ed
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/cache/FilteringPipeline.java
rc/com/android/gallery3d/filtershow/cache/ImageLoader.java
rc/com/android/gallery3d/filtershow/filters/ImageFilter.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterRS.java
|
97891a55a396976d1709ac44ebed596cf25cc786 |
22-Feb-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am fc673e13: Merge "Stopgap fixes for more of the photo editor\'s memory issues." into gb-ub-photos-bryce * commit 'fc673e131aa3482e5202fad1b54208442df35c2c': Stopgap fixes for more of the photo editor's memory issues.
|
9022b7185a5fe80d761f88fe362469b65923b1e8 |
22-Feb-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Stopgap fixes for more of the photo editor's memory issues." into gb-ub-photos-bryce
|
fc673e131aa3482e5202fad1b54208442df35c2c |
22-Feb-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Stopgap fixes for more of the photo editor's memory issues." into gb-ub-photos-bryce
|
74bb3319af75a0022da94ec0159aead33612ae29 |
22-Feb-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Stopgap fixes for more of the photo editor's memory issues. Bug: 8253109 Bug: 8233895 Change-Id: I676b6749f3b273a431323609add01e82b88db456
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/cache/FilteringPipeline.java
rc/com/android/gallery3d/filtershow/cache/ImageLoader.java
rc/com/android/gallery3d/filtershow/filters/ImageFilter.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterRS.java
|
4c91156f9a2e48ebaec86e3a46ea9b7855392cfd |
22-Feb-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Stopgap fixes for more of the photo editor's memory issues. Bug: 8253109 Bug: 8233895 Change-Id: I676b6749f3b273a431323609add01e82b88db456
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/cache/FilteringPipeline.java
rc/com/android/gallery3d/filtershow/cache/ImageLoader.java
rc/com/android/gallery3d/filtershow/filters/ImageFilter.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterRS.java
|
27068ebb1e36afac91a869c5e1b7e2d692866f49 |
22-Feb-2013 |
Bobby Georgescu <georgescu@google.com> |
am 2d5cc3c1: am fae7bf85: Merge "Replace various BitmapPools with a smarter unified pool" into gb-ub-photos-bryce * commit '2d5cc3c1ff8533d4452446e899f4923eb957a46d': Replace various BitmapPools with a smarter unified pool
|
31f98c9b0fad627dfe94fb45a879b9e7dda2aa2c |
22-Feb-2013 |
Bobby Georgescu <georgescu@google.com> |
am fae7bf85: Merge "Replace various BitmapPools with a smarter unified pool" into gb-ub-photos-bryce * commit 'fae7bf8557f7de818a768d7a8c30425a9a5641d8': Replace various BitmapPools with a smarter unified pool
|
fae7bf8557f7de818a768d7a8c30425a9a5641d8 |
22-Feb-2013 |
Bobby Georgescu <georgescu@google.com> |
Merge "Replace various BitmapPools with a smarter unified pool" into gb-ub-photos-bryce
|
e1c1c9b36ef36679ff2cd87ee7771c4d54be024d |
22-Feb-2013 |
Bobby Georgescu <georgescu@google.com> |
Merge "Replace various BitmapPools with a smarter unified pool" into gb-ub-photos-bryce
|
f52ceba89962829aa12f5caba131580e8da85880 |
20-Feb-2013 |
Bobby Georgescu <georgescu@google.com> |
Replace various BitmapPools with a smarter unified pool Make all of gallery use a single shared pool, and pave the way for making the pool more adaptive based on the current workload. Change-Id: Ia32561ad50b1b9716ebe2fd32a7bf02737685dac
rc/android/util/Pools.java
rc/com/android/gallery3d/app/AbstractGalleryActivity.java
rc/com/android/gallery3d/app/PhotoDataAdapter.java
rc/com/android/gallery3d/data/BitmapPool.java
rc/com/android/gallery3d/data/DecodeUtils.java
rc/com/android/gallery3d/data/ImageCacheRequest.java
rc/com/android/gallery3d/data/MediaItem.java
rc/com/android/gallery3d/ingest/IngestService.java
rc/com/android/gallery3d/ingest/data/MtpBitmapFetch.java
rc/com/android/gallery3d/ui/AlbumLabelMaker.java
rc/com/android/gallery3d/ui/AlbumSetSlidingWindow.java
rc/com/android/gallery3d/ui/AlbumSlidingWindow.java
rc/com/android/gallery3d/ui/BitmapLoader.java
rc/com/android/gallery3d/ui/BitmapTileProvider.java
rc/com/android/gallery3d/ui/TileImageView.java
rc/com/android/gallery3d/ui/TileImageViewAdapter.java
rc/com/android/gallery3d/ui/TiledScreenNail.java
rc/com/android/photos/data/GalleryBitmapPool.java
rc/com/android/photos/data/SparseArrayBitmapPool.java
|
11cfeeddedd61d3c4aa40945fef0bc2d87c7559d |
20-Feb-2013 |
Bobby Georgescu <georgescu@google.com> |
Replace various BitmapPools with a smarter unified pool Make all of gallery use a single shared pool, and pave the way for making the pool more adaptive based on the current workload. Change-Id: Ia32561ad50b1b9716ebe2fd32a7bf02737685dac
rc/android/util/Pools.java
rc/com/android/gallery3d/app/AbstractGalleryActivity.java
rc/com/android/gallery3d/app/PhotoDataAdapter.java
rc/com/android/gallery3d/data/BitmapPool.java
rc/com/android/gallery3d/data/DecodeUtils.java
rc/com/android/gallery3d/data/ImageCacheRequest.java
rc/com/android/gallery3d/data/MediaItem.java
rc/com/android/gallery3d/ingest/IngestService.java
rc/com/android/gallery3d/ingest/data/MtpBitmapFetch.java
rc/com/android/gallery3d/ui/AlbumLabelMaker.java
rc/com/android/gallery3d/ui/AlbumSetSlidingWindow.java
rc/com/android/gallery3d/ui/AlbumSlidingWindow.java
rc/com/android/gallery3d/ui/BitmapLoader.java
rc/com/android/gallery3d/ui/BitmapTileProvider.java
rc/com/android/gallery3d/ui/TileImageView.java
rc/com/android/gallery3d/ui/TileImageViewAdapter.java
rc/com/android/gallery3d/ui/TiledScreenNail.java
rc/com/android/photos/data/GalleryBitmapPool.java
rc/com/android/photos/data/SparseArrayBitmapPool.java
|
66d7a52a5827f513c047b546b38a849a358d1d67 |
22-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
am 102b2e0a: am ea332c69: Don\'t apply the filters twice in partial rendering... * commit '102b2e0aaf5354101ffd17d91d707f8fbda61238': Don't apply the filters twice in partial rendering...
|
91a8402d5ef4f69d14650a3271dea2138b219837 |
22-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
am ea332c69: Don\'t apply the filters twice in partial rendering... * commit 'ea332c69f084322ebdd13419424ee5fab2351760': Don't apply the filters twice in partial rendering...
|
ea332c69f084322ebdd13419424ee5fab2351760 |
22-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Don't apply the filters twice in partial rendering... Change-Id: I5ddcb74e2a6cf09852eec0049bee47581b402f28
rc/com/android/gallery3d/filtershow/cache/ImageLoader.java
|
bd940c98109d8cf605d81281add83ffe787c4842 |
22-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Don't apply the filters twice in partial rendering... Change-Id: I5ddcb74e2a6cf09852eec0049bee47581b402f28
rc/com/android/gallery3d/filtershow/cache/ImageLoader.java
|
04af8d388010e33dca91dbf4e396518f6de1568c |
22-Feb-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 9f43cff6: am 2c87aafc: Merge "Move setting wallpaper to a background thread." into gb-ub-photos-bryce * commit '9f43cff67793dbd84c1f3ee124accf7653b323b4': Move setting wallpaper to a background thread.
|
631bce78538dd703fad113001a94663f5ab18639 |
22-Feb-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 2c87aafc: Merge "Move setting wallpaper to a background thread." into gb-ub-photos-bryce * commit '2c87aafc0e4c5f67fe41c0cac301eabb6d5c716e': Move setting wallpaper to a background thread.
|
9c55388e7866bab49e40d373641cfe45dbcca410 |
22-Feb-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Move setting wallpaper to a background thread." into gb-ub-photos-bryce
|
8d363f83371b18bef02ad7aeeacc5060f3097c96 |
22-Feb-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Move setting wallpaper to a background thread." into gb-ub-photos-bryce
|
2c87aafc0e4c5f67fe41c0cac301eabb6d5c716e |
22-Feb-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Move setting wallpaper to a background thread." into gb-ub-photos-bryce
|
7b9155bd92f1e16804161cbf0008a9c654684f5e |
22-Feb-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Move setting wallpaper to a background thread. Bug: 8088767 Change-Id: I168032418a15f766ac09e18cd12707c7270b07f3
es/values/filtershow_strings.xml
|
3a34e9e173535888edd154fe76f74ffd82a3d93b |
22-Feb-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Move setting wallpaper to a background thread. Bug: 8088767 Change-Id: I168032418a15f766ac09e18cd12707c7270b07f3
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
|
a24145829118672e8b9b98e18de78eae71daaa08 |
22-Feb-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Move setting wallpaper to a background thread. Bug: 8088767 Change-Id: I168032418a15f766ac09e18cd12707c7270b07f3
es/values/filtershow_strings.xml
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
|
c5597fe7495f80aa6240b00c65b6e80aeccd481e |
22-Feb-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I25144d117077ba76dff4a24a255dbc3513533fa3 Auto-generated-cl: translation import
es/values-af/filtershow_strings.xml
es/values-am/filtershow_strings.xml
es/values-ar/filtershow_strings.xml
es/values-be/filtershow_strings.xml
es/values-bg/filtershow_strings.xml
es/values-ca/filtershow_strings.xml
es/values-cs/filtershow_strings.xml
es/values-da/filtershow_strings.xml
es/values-de/filtershow_strings.xml
es/values-el/filtershow_strings.xml
es/values-en-rGB/filtershow_strings.xml
es/values-es-rUS/filtershow_strings.xml
es/values-es/filtershow_strings.xml
es/values-et/filtershow_strings.xml
es/values-fa/filtershow_strings.xml
es/values-fi/filtershow_strings.xml
es/values-fr/filtershow_strings.xml
es/values-hi/filtershow_strings.xml
es/values-hr/filtershow_strings.xml
es/values-hu/filtershow_strings.xml
es/values-in/filtershow_strings.xml
es/values-it/filtershow_strings.xml
es/values-iw/filtershow_strings.xml
es/values-ja/filtershow_strings.xml
es/values-ko/filtershow_strings.xml
es/values-lt/filtershow_strings.xml
es/values-lv/filtershow_strings.xml
es/values-ms/filtershow_strings.xml
es/values-nb/filtershow_strings.xml
es/values-nl/filtershow_strings.xml
es/values-pl/filtershow_strings.xml
es/values-pt-rPT/filtershow_strings.xml
es/values-pt/filtershow_strings.xml
es/values-ro/filtershow_strings.xml
es/values-ru/filtershow_strings.xml
es/values-sk/filtershow_strings.xml
es/values-sl/filtershow_strings.xml
es/values-sr/filtershow_strings.xml
es/values-sv/filtershow_strings.xml
es/values-sw/filtershow_strings.xml
es/values-th/filtershow_strings.xml
es/values-tl/filtershow_strings.xml
es/values-tr/filtershow_strings.xml
es/values-uk/filtershow_strings.xml
es/values-vi/filtershow_strings.xml
es/values-zh-rCN/filtershow_strings.xml
es/values-zh-rTW/filtershow_strings.xml
es/values-zu/filtershow_strings.xml
|
65a0c23224d00e4e07d05e911c21f70095e83336 |
22-Feb-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Iab4b1ffed69207e4d4e3962d15845d4d550e7022 Auto-generated-cl: translation import
es/values-af/filtershow_strings.xml
es/values-am/filtershow_strings.xml
es/values-ar/filtershow_strings.xml
es/values-be/filtershow_strings.xml
es/values-bg/filtershow_strings.xml
es/values-ca/filtershow_strings.xml
es/values-cs/filtershow_strings.xml
es/values-da/filtershow_strings.xml
es/values-de/filtershow_strings.xml
es/values-el/filtershow_strings.xml
es/values-en-rGB/filtershow_strings.xml
es/values-es-rUS/filtershow_strings.xml
es/values-es/filtershow_strings.xml
es/values-et/filtershow_strings.xml
es/values-fa/filtershow_strings.xml
es/values-fi/filtershow_strings.xml
es/values-fr/filtershow_strings.xml
es/values-hi/filtershow_strings.xml
es/values-hr/filtershow_strings.xml
es/values-hu/filtershow_strings.xml
es/values-in/filtershow_strings.xml
es/values-it/filtershow_strings.xml
es/values-iw/filtershow_strings.xml
es/values-ja/filtershow_strings.xml
es/values-ko/filtershow_strings.xml
es/values-lt/filtershow_strings.xml
es/values-lv/filtershow_strings.xml
es/values-ms/filtershow_strings.xml
es/values-nb/filtershow_strings.xml
es/values-nl/filtershow_strings.xml
es/values-pl/filtershow_strings.xml
es/values-pt-rPT/filtershow_strings.xml
es/values-pt/filtershow_strings.xml
es/values-ro/filtershow_strings.xml
es/values-ru/filtershow_strings.xml
es/values-sk/filtershow_strings.xml
es/values-sl/filtershow_strings.xml
es/values-sr/filtershow_strings.xml
es/values-sv/filtershow_strings.xml
es/values-sw/filtershow_strings.xml
es/values-th/filtershow_strings.xml
es/values-tl/filtershow_strings.xml
es/values-tr/filtershow_strings.xml
es/values-uk/filtershow_strings.xml
es/values-vi/filtershow_strings.xml
es/values-zh-rCN/filtershow_strings.xml
es/values-zh-rTW/filtershow_strings.xml
es/values-zu/filtershow_strings.xml
|
2f084d48f8ae27ef4d0df888ab3f026b2d37e81e |
22-Feb-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Iab4b1ffed69207e4d4e3962d15845d4d550e7022 Auto-generated-cl: translation import
es/values-af/filtershow_strings.xml
es/values-am/filtershow_strings.xml
es/values-ar/filtershow_strings.xml
es/values-be/filtershow_strings.xml
es/values-bg/filtershow_strings.xml
es/values-ca/filtershow_strings.xml
es/values-cs/filtershow_strings.xml
es/values-da/filtershow_strings.xml
es/values-de/filtershow_strings.xml
es/values-el/filtershow_strings.xml
es/values-en-rGB/filtershow_strings.xml
es/values-es-rUS/filtershow_strings.xml
es/values-es/filtershow_strings.xml
es/values-et/filtershow_strings.xml
es/values-fa/filtershow_strings.xml
es/values-fi/filtershow_strings.xml
es/values-fr/filtershow_strings.xml
es/values-hi/filtershow_strings.xml
es/values-hr/filtershow_strings.xml
es/values-hu/filtershow_strings.xml
es/values-in/filtershow_strings.xml
es/values-it/filtershow_strings.xml
es/values-iw/filtershow_strings.xml
es/values-ja/filtershow_strings.xml
es/values-ko/filtershow_strings.xml
es/values-lt/filtershow_strings.xml
es/values-lv/filtershow_strings.xml
es/values-ms/filtershow_strings.xml
es/values-nb/filtershow_strings.xml
es/values-nl/filtershow_strings.xml
es/values-pl/filtershow_strings.xml
es/values-pt-rPT/filtershow_strings.xml
es/values-pt/filtershow_strings.xml
es/values-ro/filtershow_strings.xml
es/values-ru/filtershow_strings.xml
es/values-sk/filtershow_strings.xml
es/values-sl/filtershow_strings.xml
es/values-sr/filtershow_strings.xml
es/values-sv/filtershow_strings.xml
es/values-sw/filtershow_strings.xml
es/values-th/filtershow_strings.xml
es/values-tl/filtershow_strings.xml
es/values-tr/filtershow_strings.xml
es/values-uk/filtershow_strings.xml
es/values-vi/filtershow_strings.xml
es/values-zh-rCN/filtershow_strings.xml
es/values-zh-rTW/filtershow_strings.xml
es/values-zu/filtershow_strings.xml
|
47f7161f7fd64cf19ee77ba4dd34492d66c56e44 |
22-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
am 728544cf: am e5498da0: Pinch to zoom refine * commit '728544cfd335384bcf3698fd5bd0be1992d9cbfd': Pinch to zoom refine
|
1f705e6946ef480c5edca92f3ca3e7e42d5d15a1 |
22-Feb-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 5de2f5f4: am 0f8047fe: Fix for null check with RS allocations. * commit '5de2f5f42d4b787388ca9af8d2476636953b05ab': Fix for null check with RS allocations.
|
3c2ecac04f1591396397d3f7b239df9b229fcd9c |
22-Feb-2013 |
John Hoford <hoford@google.com> |
am 2a708786: am 2fc7efdc: fix draw and ellipse to handle pinch to zoom * commit '2a7087869e58cd2c1598a19e98095e3a467ce8bc': fix draw and ellipse to handle pinch to zoom
|
38546559c906ec3b7a49e1575913abec3f7d11b3 |
22-Feb-2013 |
Michael Kolb <kolby@google.com> |
am 299e47ef: am 8539fc1a: Adjust capture animation timing * commit '299e47eff624708a4e6366935b5900c60d212e50': Adjust capture animation timing
|
6414cd6a49d30d112b3eee89d35d836b09d0eef1 |
22-Feb-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 4749d8a8: am e406ec4d: Merge "Temporary handling when running out of heap in filtershow." into gb-ub-photos-bryce * commit '4749d8a81927fae0b36dfdfed8d5cca138053563': Temporary handling when running out of heap in filtershow.
|
8923eb96b7d0aff157c9d29a36bcd5b6dc28148c |
22-Feb-2013 |
John Hoford <hoford@google.com> |
am 70c13f97: am 8921c28c: add highlight filter * commit '70c13f97af6e675884930178f0d06faedda44f2d': add highlight filter
|
e976fda775730e0097852ec6aff45ec2c00e74b3 |
22-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
am 853b9ec3: am 91b80b25: Remove SliderController class * commit '853b9ec3e780984f320de864d64005cee5b73a1a': Remove SliderController class
|
3704394da90f0b82ffd2188f0a60f9e0194d0329 |
22-Feb-2013 |
Jason Noguchi <jnoguchi@google.com> |
am 33afd05e: am 48f739a3: Merge "Scaling down the stress test defaults iteration counts to some base level. For true stress testing, need to pass arguments to scale these back up to 100. Also, temporarily removing SwitchPreview test which needs updating and currently * commit '33afd05e3815c28df82944ad1787918bcab1e8c9': Scaling down the stress test defaults iteration counts to some base level. For true stress testing, need to pass arguments to scale these back up to 100. Also, temporarily removing SwitchPreview test which needs updating and currently would block other tests in stress suite.
|
b871e75fdd9967ade35b579abd14645ba6510119 |
22-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
am f84e8b9b: am 431aa19d: Merge "Remove slider in ImageShow, cleanup code" into gb-ub-photos-bryce * commit 'f84e8b9b3f40148df6592542435c30c3dc15040c': Remove slider in ImageShow, cleanup code
|
0694865d24fd3b4d570943550eff120b36ded117 |
22-Feb-2013 |
Doris Liu <tianliu@google.com> |
am 2cae524b: am 8850b8e7: Merge "Fix NPE for when camera is disabled" into gb-ub-photos-bryce * commit '2cae524b83b8eecd14eb71bb0b74e12e5edbccfe': Fix NPE for when camera is disabled
|
f1f0a5265b28c29b257fac00c3c4e706e21d3795 |
22-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
am d2463092: am 969fc020: Fix typo * commit 'd246309204bc969ef76b331b6341619be46aaffe': Fix typo
|
73da06fba9f7a1c0d460cc423f4b9cf942463b48 |
22-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
am d27afb8d: am df0b0c4e: Add pinch to zoom * commit 'd27afb8d8db986c49bdfff6b459823c8ae3ebfda': Add pinch to zoom
|
9dcb74352a3928452c881d856892880e094c08e2 |
22-Feb-2013 |
The Android Automerger <android-build@android.com> |
Merge commit '8539fc1a5406af9edd5414fba3615cc045aa63ec' into jb-mr2-release
|
81c76a495092f3a4e8a8f0d52189309aacb2e7eb |
22-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
am e5498da0: Pinch to zoom refine * commit 'e5498da0262fc836738aad63ea30286d8afa643c': Pinch to zoom refine
|
841196959e1a2906ca1141dda8ae4bc21496e3d8 |
22-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Pinch to zoom refine Change-Id: I538defa55a4ed898dd7c936ec813f052ac1b9e0a
rc/com/android/gallery3d/filtershow/filters/FilterCurvesRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterFxRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterRepresentation.java
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
|
a5fadcfd9faca04fed5c41669fe3895d1ac9c283 |
22-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Pinch to zoom refine Change-Id: I538defa55a4ed898dd7c936ec813f052ac1b9e0a
rc/com/android/gallery3d/filtershow/PanelController.java
rc/com/android/gallery3d/filtershow/cache/FilteringPipeline.java
rc/com/android/gallery3d/filtershow/cache/ImageLoader.java
rc/com/android/gallery3d/filtershow/cache/RenderingRequest.java
rc/com/android/gallery3d/filtershow/filters/FilterCurvesRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterFxRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterRepresentation.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterBwFilter.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterContrast.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterEdge.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterExposure.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterHighlights.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterHue.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterKMeans.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterNegative.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterSaturated.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterShadows.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterSharpen.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterVibrance.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterWBalance.java
rc/com/android/gallery3d/filtershow/imageshow/ImageShow.java
rc/com/android/gallery3d/filtershow/imageshow/ImageZoom.java
rc/com/android/gallery3d/filtershow/imageshow/MasterImage.java
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
|
e5498da0262fc836738aad63ea30286d8afa643c |
22-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Pinch to zoom refine Change-Id: I538defa55a4ed898dd7c936ec813f052ac1b9e0a
rc/com/android/gallery3d/filtershow/PanelController.java
rc/com/android/gallery3d/filtershow/cache/FilteringPipeline.java
rc/com/android/gallery3d/filtershow/cache/ImageLoader.java
rc/com/android/gallery3d/filtershow/cache/RenderingRequest.java
rc/com/android/gallery3d/filtershow/filters/FilterCurvesRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterFxRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterRepresentation.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterBwFilter.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterContrast.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterEdge.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterExposure.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterHighlights.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterHue.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterKMeans.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterNegative.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterSaturated.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterShadows.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterSharpen.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterVibrance.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterWBalance.java
rc/com/android/gallery3d/filtershow/imageshow/ImageShow.java
rc/com/android/gallery3d/filtershow/imageshow/ImageZoom.java
rc/com/android/gallery3d/filtershow/imageshow/MasterImage.java
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
|
ccabbfaa7a38a0f4f5361ffb91a184f0610639a1 |
22-Feb-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 0f8047fe: Fix for null check with RS allocations. * commit '0f8047fe826a84829ab37bc7cd24c8a4dea0db64': Fix for null check with RS allocations.
|
c619b9510f048f5aab7ae3b2a1482e695dc6cfd7 |
22-Feb-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Fix for null check with RS allocations. Bug: 8243554 Change-Id: I49da16f530a7283a801b3739ee7ba06bc7e4dad7
rc/com/android/gallery3d/filtershow/filters/ImageFilterRS.java
|
0f8047fe826a84829ab37bc7cd24c8a4dea0db64 |
22-Feb-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Fix for null check with RS allocations. Bug: 8243554 Change-Id: I49da16f530a7283a801b3739ee7ba06bc7e4dad7
rc/com/android/gallery3d/filtershow/filters/ImageFilterRS.java
|
44f693058b57829b79392707248c8a5ac6f877e6 |
22-Feb-2013 |
John Hoford <hoford@google.com> |
am 2fc7efdc: fix draw and ellipse to handle pinch to zoom * commit '2fc7efdcd75279649091471dda3ee600db25a995': fix draw and ellipse to handle pinch to zoom
|
304e05b54abfa5e3ba4c366ce6bffae78b5133fd |
22-Feb-2013 |
John Hoford <hoford@google.com> |
fix draw and ellipse to handle pinch to zoom Change-Id: I8af9b37dcd98425959742a4142756963363d1cec
rc/com/android/gallery3d/filtershow/filters/FilterDrawRepresentation.java
|
c67da3cdf3cc655a384d9d591fee051fdafb4630 |
22-Feb-2013 |
John Hoford <hoford@google.com> |
fix draw and ellipse to handle pinch to zoom Change-Id: I8af9b37dcd98425959742a4142756963363d1cec
rc/com/android/gallery3d/filtershow/filters/FilterDrawRepresentation.java
rc/com/android/gallery3d/filtershow/imageshow/ImageDraw.java
rc/com/android/gallery3d/filtershow/imageshow/ImageShow.java
rc/com/android/gallery3d/filtershow/imageshow/ImageVignette.java
|
2fc7efdcd75279649091471dda3ee600db25a995 |
22-Feb-2013 |
John Hoford <hoford@google.com> |
fix draw and ellipse to handle pinch to zoom Change-Id: I8af9b37dcd98425959742a4142756963363d1cec
rc/com/android/gallery3d/filtershow/filters/FilterDrawRepresentation.java
rc/com/android/gallery3d/filtershow/imageshow/ImageDraw.java
rc/com/android/gallery3d/filtershow/imageshow/ImageShow.java
rc/com/android/gallery3d/filtershow/imageshow/ImageVignette.java
|
13136bc7c420509de4a264f862a93da7987658c8 |
22-Feb-2013 |
Michael Kolb <kolby@google.com> |
am 8539fc1a: Adjust capture animation timing * commit '8539fc1a5406af9edd5414fba3615cc045aa63ec': Adjust capture animation timing
|
8539fc1a5406af9edd5414fba3615cc045aa63ec |
21-Feb-2013 |
Michael Kolb <kolby@google.com> |
Adjust capture animation timing Change-Id: I77c44baeafa58d2a28aa9f4ce85008e14a7f61eb
rc/com/android/camera/CaptureAnimManager.java
|
8ae11144fc1fc15062297d03fb86d6bfb443953a |
21-Feb-2013 |
Michael Kolb <kolby@google.com> |
Adjust capture animation timing Change-Id: I77c44baeafa58d2a28aa9f4ce85008e14a7f61eb
rc/com/android/camera/CaptureAnimManager.java
|
b99f64c68fd900e87f52f8eff2bea588942c04d3 |
21-Feb-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am e406ec4d: Merge "Temporary handling when running out of heap in filtershow." into gb-ub-photos-bryce * commit 'e406ec4ddcfe6336c4119de9044b27f38197fff7': Temporary handling when running out of heap in filtershow.
|
481563aacceccc30098a34de357c3e23764a1c26 |
21-Feb-2013 |
John Hoford <hoford@google.com> |
am 8921c28c: add highlight filter * commit '8921c28c7333ad2b4d34f013904ad4737044f366': add highlight filter
|
e3e21e0287d2028adda0fddde431b88032eafd10 |
21-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
am 91b80b25: Remove SliderController class * commit '91b80b2560e663b15ee75ab1bca775028c7868c0': Remove SliderController class
|
fda28e28473f90b186b211fbdf18451c7887780c |
21-Feb-2013 |
Jason Noguchi <jnoguchi@google.com> |
am 48f739a3: Merge "Scaling down the stress test defaults iteration counts to some base level. For true stress testing, need to pass arguments to scale these back up to 100. Also, temporarily removing SwitchPreview test which needs updating and currently would block o * commit '48f739a395194ffcd589751c8689a75721b2ce97': Scaling down the stress test defaults iteration counts to some base level. For true stress testing, need to pass arguments to scale these back up to 100. Also, temporarily removing SwitchPreview test which needs updating and currently would block other tests in stress suite.
|
ae8aa17a366a2731f7dadc47cea8d16982528fa6 |
21-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
am 431aa19d: Merge "Remove slider in ImageShow, cleanup code" into gb-ub-photos-bryce * commit '431aa19d3ab2e9d7d87ef6ee67984a4c649841c0': Remove slider in ImageShow, cleanup code
|
9b5193679061d8411359fdd83bc02245f06f2e95 |
21-Feb-2013 |
Doris Liu <tianliu@google.com> |
am 8850b8e7: Merge "Fix NPE for when camera is disabled" into gb-ub-photos-bryce * commit '8850b8e776d984a3924e9849629f096c57920a7a': Fix NPE for when camera is disabled
|
04ea0c6eb5e3c3077609473c246982ca86accc4e |
21-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
am 969fc020: Fix typo * commit '969fc02063b47fc2151a6fc6ef9af9793da4c08a': Fix typo
|
8ec81299ec417f5f5d3509c4dcb456f626de2bba |
21-Feb-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am d633306b: am 88158f57: Removed unsupported GL operations. * commit 'd633306b1bbc8e97033e26960d633b5168be470d': Removed unsupported GL operations.
|
e406ec4ddcfe6336c4119de9044b27f38197fff7 |
21-Feb-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Temporary handling when running out of heap in filtershow." into gb-ub-photos-bryce
|
d08258a1322a9a7f02f7cb30e91d5325cb49fd72 |
21-Feb-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Temporary handling when running out of heap in filtershow." into gb-ub-photos-bryce
|
182659f7e3b04af88198cc3004af96e4944e32e5 |
21-Feb-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Temporary handling when running out of heap in filtershow. Bug: 8233895 Change-Id: Id078d2a4b387127c0d230bc5d9de4590f0e9f72b
rc/com/android/gallery3d/filtershow/cache/ImageLoader.java
rc/com/android/gallery3d/filtershow/tools/SaveCopyTask.java
|
2d5b41f229ee8d19a9a092ba15e925a22bc97190 |
21-Feb-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Temporary handling when running out of heap in filtershow. Bug: 8233895 Change-Id: Id078d2a4b387127c0d230bc5d9de4590f0e9f72b
rc/com/android/gallery3d/filtershow/cache/ImageLoader.java
rc/com/android/gallery3d/filtershow/tools/SaveCopyTask.java
|
1c4facc140098b4550c2c8a522f16cb05299c9fc |
21-Feb-2013 |
John Hoford <hoford@google.com> |
add highlight filter Change-Id: I2e59e09fbc80172b9dfe27b3ce8ff2f1e24c5872
ni/Android.mk
|
e4f998bbf493636cf93554fbb2a3d90186e65b5f |
21-Feb-2013 |
John Hoford <hoford@google.com> |
add highlight filter Change-Id: I2e59e09fbc80172b9dfe27b3ce8ff2f1e24c5872
ni/Android.mk
ni/filters/contrast.c
ni/filters/filters.h
ni/filters/highlight.c
|
f72cda8e943fb68c80f2f5f5e34b8d97b42b6364 |
21-Feb-2013 |
John Hoford <hoford@google.com> |
add highlight filter Change-Id: I2e59e09fbc80172b9dfe27b3ce8ff2f1e24c5872
es/values/filtershow_ids.xml
es/values/filtershow_strings.xml
|
8921c28c7333ad2b4d34f013904ad4737044f366 |
21-Feb-2013 |
John Hoford <hoford@google.com> |
add highlight filter Change-Id: I2e59e09fbc80172b9dfe27b3ce8ff2f1e24c5872
ni/Android.mk
ni/filters/contrast.c
ni/filters/filters.h
ni/filters/highlight.c
es/values/filtershow_ids.xml
es/values/filtershow_strings.xml
rc/com/android/gallery3d/filtershow/filters/BaseFiltersManager.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterHighlights.java
rc/com/android/gallery3d/filtershow/filters/SplineMath.java
|
bfca10950268205b8af207e0a21f86dbda8d9b7f |
21-Feb-2013 |
John Hoford <hoford@google.com> |
add highlight filter Change-Id: I2e59e09fbc80172b9dfe27b3ce8ff2f1e24c5872
rc/com/android/gallery3d/filtershow/filters/BaseFiltersManager.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterHighlights.java
rc/com/android/gallery3d/filtershow/filters/SplineMath.java
|
91b80b2560e663b15ee75ab1bca775028c7868c0 |
21-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Remove SliderController class Change-Id: I59ed20a63a59e4c48c0a44ff52d82852ea159331
rc/com/android/gallery3d/filtershow/imageshow/ImageShow.java
rc/com/android/gallery3d/filtershow/ui/SliderController.java
rc/com/android/gallery3d/filtershow/ui/SliderListener.java
|
4472d1fad46b194b6114a8039910bd7a605485d4 |
21-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Remove SliderController class Change-Id: I59ed20a63a59e4c48c0a44ff52d82852ea159331
rc/com/android/gallery3d/filtershow/imageshow/ImageShow.java
rc/com/android/gallery3d/filtershow/ui/SliderController.java
rc/com/android/gallery3d/filtershow/ui/SliderListener.java
|
48f739a395194ffcd589751c8689a75721b2ce97 |
21-Feb-2013 |
Jason Noguchi <jnoguchi@google.com> |
Merge "Scaling down the stress test defaults iteration counts to some base level. For true stress testing, need to pass arguments to scale these back up to 100. Also, temporarily removing SwitchPreview test which needs updating and currently would block other tests in stress suite." into gb-ub-photos-bryce
|
181cc4198bdf8f608d75319dd8c3245cc31a8180 |
21-Feb-2013 |
Jason Noguchi <jnoguchi@google.com> |
Merge "Scaling down the stress test defaults iteration counts to some base level. For true stress testing, need to pass arguments to scale these back up to 100. Also, temporarily removing SwitchPreview test which needs updating and currently would block other tests in stress suite." into gb-ub-photos-bryce
|
431aa19d3ab2e9d7d87ef6ee67984a4c649841c0 |
21-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Merge "Remove slider in ImageShow, cleanup code" into gb-ub-photos-bryce
|
275ca8be28783b3e87410533766cb1c2ec61e068 |
21-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Merge "Remove slider in ImageShow, cleanup code" into gb-ub-photos-bryce
|
8850b8e776d984a3924e9849629f096c57920a7a |
21-Feb-2013 |
Doris Liu <tianliu@google.com> |
Merge "Fix NPE for when camera is disabled" into gb-ub-photos-bryce
|
f11861ff210d0eace106fa4a4385489e8b0b7a32 |
21-Feb-2013 |
Doris Liu <tianliu@google.com> |
Merge "Fix NPE for when camera is disabled" into gb-ub-photos-bryce
|
4462eac40cd6023251431b60a556afeb0f27e79b |
21-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Remove slider in ImageShow, cleanup code Change-Id: I005d4ecd33a5b6fcd23af6a6ba46419e7c9fc683
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/PanelController.java
rc/com/android/gallery3d/filtershow/imageshow/ImageShow.java
rc/com/android/gallery3d/filtershow/imageshow/ImageZoom.java
|
02103c6b2298a8f7e52164c33aacf1e0e1d1678c |
21-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Remove slider in ImageShow, cleanup code Change-Id: I005d4ecd33a5b6fcd23af6a6ba46419e7c9fc683
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/PanelController.java
rc/com/android/gallery3d/filtershow/imageshow/ImageShow.java
rc/com/android/gallery3d/filtershow/imageshow/ImageZoom.java
|
d1d32ad29360992e9fad3615e2dda4ab47112aba |
21-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Fix typo Change-Id: I6c41782a033d5ad1bb5780b22d99658223b23a0b
rc/com/android/gallery3d/filtershow/imageshow/ImageShow.java
|
969fc02063b47fc2151a6fc6ef9af9793da4c08a |
21-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Fix typo Change-Id: I6c41782a033d5ad1bb5780b22d99658223b23a0b
rc/com/android/gallery3d/filtershow/imageshow/ImageShow.java
|
a344b816b823e7584883620a59ef2f0939badffc |
21-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
am df0b0c4e: Add pinch to zoom * commit 'df0b0c4eaafcc9e4652fe6ec0791e4abe1c3b750': Add pinch to zoom
|
edc48484bc67bd14a7e5fc4036de9d59f542c4fc |
15-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Add pinch to zoom Change-Id: I5d90a7ce5d890f613fa957244c6ac5291496cf1a
rc/com/android/gallery3d/filtershow/imageshow/ImageDraw.java
rc/com/android/gallery3d/filtershow/imageshow/ImageRedEye.java
rc/com/android/gallery3d/filtershow/imageshow/ImageShow.java
rc/com/android/gallery3d/filtershow/imageshow/ImageZoom.java
rc/com/android/gallery3d/filtershow/imageshow/MasterImage.java
rc/com/android/gallery3d/filtershow/ui/ImageCurves.java
|
df0b0c4eaafcc9e4652fe6ec0791e4abe1c3b750 |
15-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Add pinch to zoom Change-Id: I5d90a7ce5d890f613fa957244c6ac5291496cf1a
rc/com/android/gallery3d/filtershow/imageshow/ImageDraw.java
rc/com/android/gallery3d/filtershow/imageshow/ImageRedEye.java
rc/com/android/gallery3d/filtershow/imageshow/ImageShow.java
rc/com/android/gallery3d/filtershow/imageshow/ImageZoom.java
rc/com/android/gallery3d/filtershow/imageshow/MasterImage.java
rc/com/android/gallery3d/filtershow/ui/ImageCurves.java
|
59613d641b93660749e34cb913462f43192a6cf8 |
21-Feb-2013 |
Doris Liu <tianliu@google.com> |
Fix NPE for when camera is disabled Bug: 7950211 Change-Id: I3983209211bc4afdff3a8878f458a9bf275c5639
rc/com/android/camera/VideoModule.java
|
537718ca08c3b65e529f5cf70b3ae65a3263bcc4 |
21-Feb-2013 |
Doris Liu <tianliu@google.com> |
Fix NPE for when camera is disabled Bug: 7950211 Change-Id: I3983209211bc4afdff3a8878f458a9bf275c5639
rc/com/android/camera/VideoModule.java
|
bceb3b00240f41467779b5255d321d16a45e6ab5 |
20-Feb-2013 |
Jason Noguchi <jnoguchi@google.com> |
Scaling down the stress test defaults iteration counts to some base level. For true stress testing, need to pass arguments to scale these back up to 100. Also, temporarily removing SwitchPreview test which needs updating and currently would block other tests in stress suite. Change-Id: I9dd92e0090e2554aca5cb4b23fed2d33554c9c5e
ests/src/com/android/gallery3d/StressTests.java
ests/src/com/android/gallery3d/stress/CameraStressTestRunner.java
|
b9f71cbf9ddd927510dc445cea30331b7818a04b |
20-Feb-2013 |
Jason Noguchi <jnoguchi@google.com> |
Scaling down the stress test defaults iteration counts to some base level. For true stress testing, need to pass arguments to scale these back up to 100. Also, temporarily removing SwitchPreview test which needs updating and currently would block other tests in stress suite. Change-Id: I9dd92e0090e2554aca5cb4b23fed2d33554c9c5e
ests/src/com/android/gallery3d/StressTests.java
ests/src/com/android/gallery3d/stress/CameraStressTestRunner.java
|
81d9773a9682e19b671e586f34a6a55cdae7fe9e |
20-Feb-2013 |
Jason Noguchi <jnoguchi@google.com> |
Scaling down the stress test defaults iteration counts to some base level. For true stress testing, need to pass arguments to scale these back up to 100. Also, temporarily removing SwitchPreview test which needs updating and currently would block other tests in stress suite. Change-Id: I9dd92e0090e2554aca5cb4b23fed2d33554c9c5e
ests/src/com/android/gallery3d/StressTests.java
ests/src/com/android/gallery3d/stress/CameraStressTestRunner.java
|
ef0c5a184549cf3e56125e0610d2e9ffe575dd8e |
21-Feb-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 88158f57: Removed unsupported GL operations. * commit '88158f577a2d80a7a3ab5ad92452b6e32b059271': Removed unsupported GL operations.
|
8e08b01ed79efa2c026559fb2d9814e80d3eb05b |
20-Feb-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Removed unsupported GL operations. Bug: 8223749 Change-Id: I722220def36aa4a9e53666540471100df6609d74
rc/com/android/gallery3d/filtershow/imageshow/ImageStraighten.java
|
88158f577a2d80a7a3ab5ad92452b6e32b059271 |
20-Feb-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Removed unsupported GL operations. Bug: 8223749 Change-Id: I722220def36aa4a9e53666540471100df6609d74
rc/com/android/gallery3d/filtershow/imageshow/ImageStraighten.java
|
b47d82e23bce66ce6986c106d73b8a4216477f30 |
20-Feb-2013 |
Ed Heyl <edheyl@google.com> |
am 264247a7: Merge remote-tracking branch \'goog/jb-mr2-release\' * commit '264247a73a61664d9b76c9eb11f305d264d8e0e2': Add null check on the source URI Fix memory leak in ComboPreferences
|
ddd6671a6cdda84fea272fca5bb2b83bba6e3eee |
20-Feb-2013 |
Ed Heyl <edheyl@google.com> |
Merge remote-tracking branch 'goog/jb-mr2-release'
|
23c28917103891fc6054bb5ccfbef86322e3fad6 |
20-Feb-2013 |
Victor Doba <dobavictor@google.com> |
am 1e3693c0: am c8e00663: Merge "Show the Utility Panel by default." into gb-ub-photos-bryce * commit '1e3693c03d9a08392bbf4a907055ee2baa89f097': Show the Utility Panel by default.
|
b66bcd07f4555a705a04f6b4fdd61a05c791e434 |
20-Feb-2013 |
Victor Doba <dobavictor@google.com> |
am c8e00663: Merge "Show the Utility Panel by default." into gb-ub-photos-bryce * commit 'c8e006639baf1512715e0d7f2c02f88204ab55c0': Show the Utility Panel by default.
|
9564406066e257580e68d26b67b93b6952fedfc4 |
20-Feb-2013 |
Victor Doba <dobavictor@google.com> |
Merge "Show the Utility Panel by default." into gb-ub-photos-bryce
|
c8e006639baf1512715e0d7f2c02f88204ab55c0 |
20-Feb-2013 |
Victor Doba <dobavictor@google.com> |
Merge "Show the Utility Panel by default." into gb-ub-photos-bryce
|
ef880b7c26c7aa9389244399faa43f79a424e6c3 |
20-Feb-2013 |
John Hoford <hoford@google.com> |
am 789cffa1: am 1863a311: fix vignette startup issues * commit '789cffa174bb5f73ee932bedae9b19ba1a20bf92': fix vignette startup issues
|
826696f0c9004d45bcf91c68dcd58fc1083c55f5 |
20-Feb-2013 |
John Hoford <hoford@google.com> |
am 1863a311: fix vignette startup issues * commit '1863a3119a802517b1c2a53763f904f73fdc940b': fix vignette startup issues
|
0342a57fb113f26a6aed567a7f1434efd59a78fe |
20-Feb-2013 |
John Hoford <hoford@google.com> |
fix vignette startup issues Change-Id: I3a8461edf3239044565611ed35b41cb87e5a529f
rc/com/android/gallery3d/filtershow/imageshow/EclipseControl.java
rc/com/android/gallery3d/filtershow/imageshow/ImageVignette.java
|
1863a3119a802517b1c2a53763f904f73fdc940b |
20-Feb-2013 |
John Hoford <hoford@google.com> |
fix vignette startup issues Change-Id: I3a8461edf3239044565611ed35b41cb87e5a529f
rc/com/android/gallery3d/filtershow/imageshow/EclipseControl.java
rc/com/android/gallery3d/filtershow/imageshow/ImageVignette.java
|
0b2f2a98294fa30f25f272b43faff1450408dc09 |
20-Feb-2013 |
The Android Automerger <android-build@android.com> |
merge in jb-mr2-release history after reset to master
|
d3e4df59e58d852f000a71818d2b7cf5984d2e81 |
20-Feb-2013 |
John Hoford <hoford@google.com> |
am 50046bd3: am a93d5ee9: add movable vignette * commit '50046bd326f943460c05399ca55886922ad818eb': add movable vignette
|
35216fbee375e0c5b132523c877cc3e5ea30de67 |
20-Feb-2013 |
John Hoford <hoford@google.com> |
am a93d5ee9: add movable vignette * commit 'a93d5ee9c409e2328dcbe2326591436f8ac23146': add movable vignette
|
4c54808f10fa647c4dc8f95551eb369172535d50 |
16-Feb-2013 |
John Hoford <hoford@google.com> |
add movable vignette Change-Id: I54f2fccd0d748ca4c908d5b0f3c3ef7349cd686d
ni/filters/vignette.c
|
5c2a3041de052ae94cd8b884173bb09c3f60fd4e |
16-Feb-2013 |
John Hoford <hoford@google.com> |
add movable vignette Change-Id: I54f2fccd0d748ca4c908d5b0f3c3ef7349cd686d
es/layout/filtershow_vignette_editor.xml
es/values/filtershow_ids.xml
rc/com/android/gallery3d/filtershow/filters/FilterVignetteRepresentation.java
|
a93d5ee9c409e2328dcbe2326591436f8ac23146 |
16-Feb-2013 |
John Hoford <hoford@google.com> |
add movable vignette Change-Id: I54f2fccd0d748ca4c908d5b0f3c3ef7349cd686d
ni/filters/vignette.c
es/layout/filtershow_vignette_editor.xml
es/values/filtershow_ids.xml
rc/com/android/gallery3d/filtershow/editors/EditorVignette.java
rc/com/android/gallery3d/filtershow/filters/FilterVignetteRepresentation.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterVignette.java
rc/com/android/gallery3d/filtershow/imageshow/EclipseControl.java
rc/com/android/gallery3d/filtershow/imageshow/ImagePoint.java
rc/com/android/gallery3d/filtershow/imageshow/ImageRedEye.java
rc/com/android/gallery3d/filtershow/imageshow/ImageShow.java
rc/com/android/gallery3d/filtershow/imageshow/ImageTinyPlanet.java
rc/com/android/gallery3d/filtershow/imageshow/ImageVignette.java
rc/com/android/gallery3d/filtershow/imageshow/Oval.java
rc_pd/com/android/gallery3d/filtershow/editors/EditorManager.java
|
ffe5a12da3a9f61607c8ee5d81e21dfce763b7d9 |
16-Feb-2013 |
John Hoford <hoford@google.com> |
add movable vignette Change-Id: I54f2fccd0d748ca4c908d5b0f3c3ef7349cd686d
rc/com/android/gallery3d/filtershow/editors/EditorVignette.java
rc/com/android/gallery3d/filtershow/filters/FilterVignetteRepresentation.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterVignette.java
rc/com/android/gallery3d/filtershow/imageshow/EclipseControl.java
rc/com/android/gallery3d/filtershow/imageshow/ImagePoint.java
rc/com/android/gallery3d/filtershow/imageshow/ImageRedEye.java
rc/com/android/gallery3d/filtershow/imageshow/ImageShow.java
rc/com/android/gallery3d/filtershow/imageshow/ImageTinyPlanet.java
rc/com/android/gallery3d/filtershow/imageshow/ImageVignette.java
rc/com/android/gallery3d/filtershow/imageshow/Oval.java
rc_pd/com/android/gallery3d/filtershow/editors/EditorManager.java
|
0c17773ce9656121642fe57354c30aebdc54ee64 |
19-Feb-2013 |
Baligh Uddin <baligh@google.com> |
am 3c198e8b: (-s ours) am 03010e45: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce * commit '3c198e8bce7f168a128d1359e8f454cc6cc8ab9b': Import translations. DO NOT MERGE
|
e3cf57ae494e7159787f4da9ee19a915f67e9b5d |
19-Feb-2013 |
Baligh Uddin <baligh@google.com> |
am 8e86278b: (-s ours) Merge "Import translations. DO NOT MERGE" * commit '8e86278b9c27a6236464c936b084ffc907892199': Import translations. DO NOT MERGE
|
d510e7e88ffd976bf57d1f33c7aa75de1a652ee7 |
19-Feb-2013 |
Baligh Uddin <baligh@google.com> |
am 7ebc6f3f: (-s ours) Merge "Import translations. DO NOT MERGE" * commit '7ebc6f3fa1e0be98a60268fe2ffdc060e21e0195': Import translations. DO NOT MERGE
|
41250a2d8370e011a4e79756b94ccf1ed30e19d8 |
19-Feb-2013 |
Baligh Uddin <baligh@google.com> |
am 03010e45: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce * commit '03010e45387b8f1a715fd7f5cfac0793008fdc9b': Import translations. DO NOT MERGE
|
fc6cefa1b3b66e00607ab74972dce06d723f232c |
19-Feb-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE"
|
556a4230de3ea7ff5c506c4d12de1367db1d89db |
19-Feb-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
|
03010e45387b8f1a715fd7f5cfac0793008fdc9b |
19-Feb-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
|
7fc9d7d11ba44d4ce559c5d8cf32dc727de97413 |
19-Feb-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE"
|
9b22d75745b355b965b4ed2a038eaae3727c0cc5 |
19-Feb-2013 |
Baligh Uddin <baligh@google.com> |
am 346f5bb0: (-s ours) am fc18a75c: (-s ours) Import translations. DO NOT MERGE * commit '346f5bb06b8a73dae28b123e61164bf45d71c092': Import translations. DO NOT MERGE
|
f9ffc6ccd70410595d026def6c65b89ab5cd54bc |
19-Feb-2013 |
Baligh Uddin <baligh@google.com> |
am fc18a75c: (-s ours) Import translations. DO NOT MERGE * commit 'fc18a75c530669285ea09714a69ef6c0094c889b': Import translations. DO NOT MERGE
|
63b8ac833522c5ccbd99d56a78daa8c597c55f6d |
19-Feb-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I9dbc652fcb3ab0bc43774e57de6f2aa00454a742 Auto-generated-cl: translation import
es/values-da/filtershow_strings.xml
|
982f1bf6ee3ebdb24f71faaeed496dfa34ee0449 |
19-Feb-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: If262abcd9e8910ccaf49d20f3a853dcf97cd9b63 Auto-generated-cl: translation import
es/values-da/filtershow_strings.xml
|
140580a830303db84ea93353035198d22aa58bd0 |
19-Feb-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: If262abcd9e8910ccaf49d20f3a853dcf97cd9b63 Auto-generated-cl: translation import
es/values-da/filtershow_strings.xml
|
b4f3688e53dbad14eb86c0d9efe6caf86b6c8f66 |
19-Feb-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Idc5fea5d79c5cfdbccf8fb4ba3eaa427a148e042 Auto-generated-cl: translation import
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-sw/strings.xml
|
b4c11d33065feb56ffa15205a4f451f25422d54e |
19-Feb-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ic697e873594208549955d01399accad284b239db Auto-generated-cl: translation import
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-sw/strings.xml
|
fc18a75c530669285ea09714a69ef6c0094c889b |
19-Feb-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ic697e873594208549955d01399accad284b239db Auto-generated-cl: translation import
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-sw/strings.xml
|
08a83ec4502b629aed14e05d6e512375e83b1a71 |
19-Feb-2013 |
Michael Kolb <kolby@google.com> |
am 13e5b565: am a96e8879: Fix auto-focus areas * commit '13e5b565a30f2fefee91c42d76f84460d2225efc': Fix auto-focus areas
|
e9f3fe63bc70fd57454f27bc9601cb95087f6c10 |
19-Feb-2013 |
The Android Automerger <android-build@android.com> |
merge in jb-mr2-release history after reset to master
|
0ae1709dd677a6217aae22ac7d0a672a9b5ce440 |
19-Feb-2013 |
Michael Kolb <kolby@google.com> |
am a96e8879: Fix auto-focus areas * commit 'a96e8879473c9f9c937a5f14dbbd35579b4d0952': Fix auto-focus areas
|
b8a76515b25a0163eb74e4636b04ac621285f79f |
19-Feb-2013 |
Michael Kolb <kolby@google.com> |
am 0888a7b0: am 1bf8b9a5: Fix AF animation * commit '0888a7b0eaf31893bb9adfa634ff38740a1ed306': Fix AF animation
|
a96e8879473c9f9c937a5f14dbbd35579b4d0952 |
16-Feb-2013 |
Michael Kolb <kolby@google.com> |
Fix auto-focus areas Use a specific focus area in continuous AF Use a smaller AF area for tap to focus Change-Id: Ia633dec7c1830c7c03f56434614e9bce3f5697e6
rc/com/android/camera/FocusOverlayManager.java
|
0718d480a144ba0a44c07c48f90e85cf4ec669c6 |
16-Feb-2013 |
Michael Kolb <kolby@google.com> |
Fix auto-focus areas Use a specific focus area in continuous AF Use a smaller AF area for tap to focus Change-Id: Ia633dec7c1830c7c03f56434614e9bce3f5697e6
rc/com/android/camera/FocusOverlayManager.java
|
9578176a7db9afb344fd7428aa5b9a475916791a |
19-Feb-2013 |
Michael Kolb <kolby@google.com> |
am 1bf8b9a5: Fix AF animation * commit '1bf8b9a5b418891836435f4ec502846640368690': Fix AF animation
|
1bf8b9a5b418891836435f4ec502846640368690 |
19-Feb-2013 |
Michael Kolb <kolby@google.com> |
Fix AF animation Bug: 8219462 Change-Id: I9c39c70aad8f1ca6763acfc2d2a5ff5c918c71a5
rc/com/android/camera/FocusOverlayManager.java
rc/com/android/camera/ui/PieRenderer.java
|
e3de7223ee3fe56e097d68f50c5a59ae61370d65 |
19-Feb-2013 |
Michael Kolb <kolby@google.com> |
Fix AF animation Bug: 8219462 Change-Id: I9c39c70aad8f1ca6763acfc2d2a5ff5c918c71a5
rc/com/android/camera/FocusOverlayManager.java
rc/com/android/camera/ui/PieRenderer.java
|
ede9667b25dd0af7f07ab52d7f78ca80e1cf0204 |
16-Feb-2013 |
The Android Automerger <android-build@android.com> |
keep history after reset to master again
|
dbac74f03d83b5584eccc7f2a6e059b72345a492 |
16-Feb-2013 |
Doris Liu <tianliu@google.com> |
am d9de7afa: Merge "Make photo orientation consistent with UI" into gb-ub-photos-bryce * commit 'd9de7afa6c343e85b9c2c0221ca280c69a349c5f': Make photo orientation consistent with UI
|
d9de7afa6c343e85b9c2c0221ca280c69a349c5f |
16-Feb-2013 |
Doris Liu <tianliu@google.com> |
Merge "Make photo orientation consistent with UI" into gb-ub-photos-bryce
|
f7159e15dd704e9501a3538cb05498f40a30f042 |
16-Feb-2013 |
Doris Liu <tianliu@google.com> |
Merge "Make photo orientation consistent with UI" into gb-ub-photos-bryce
|
9a32480db4e07fe437dd119d6f1d8471382d503f |
15-Feb-2013 |
Doris Liu <tianliu@google.com> |
Make photo orientation consistent with UI Also fixed the wrong animation orientation. Bug: 7302506 Change-Id: I58615a7b3cc2e08c2a8dc4e174512a502c2482f5
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/PhotoModule.java
|
3cf565c4242a9deab7da5eb84fc302c79d594f11 |
15-Feb-2013 |
Doris Liu <tianliu@google.com> |
Make photo orientation consistent with UI Also fixed the wrong animation orientation. Bug: 7302506 Change-Id: I58615a7b3cc2e08c2a8dc4e174512a502c2482f5
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/PhotoModule.java
|
00ea31b5675f6cb92661f59bd815cf846f0f752d |
16-Feb-2013 |
Angus Kong <shkong@google.com> |
am c86e1ca3: Merge "Bump up the version number to 1.1.40002" into gb-ub-photos-bryce * commit 'c86e1ca339d770b9199cc332a27edcd0f0c42900': Bump up the version number to 1.1.40002
|
c86e1ca339d770b9199cc332a27edcd0f0c42900 |
16-Feb-2013 |
Angus Kong <shkong@google.com> |
Merge "Bump up the version number to 1.1.40002" into gb-ub-photos-bryce
|
e016af4fefcdd32f3c4875f8e21207ed544094db |
16-Feb-2013 |
Bobby Georgescu <georgescu@google.com> |
am aa96c225: am add77dfc: Merge "Importer: Full-screen viewing, UI refinement, refactoring" into gb-ub-photos-bryce * commit 'aa96c2253bd8650423d9ea4dd5c50b0850df0416': Importer: Full-screen viewing, UI refinement, refactoring
|
8e20cc24c50e1909de804645980d821e9e5d4d4b |
16-Feb-2013 |
John Reck <jreck@google.com> |
am 7db6eb02: Remove more com.android.camera.R * commit '7db6eb02312a4c649d34351d1d78add1d8ec814b': Remove more com.android.camera.R
|
adf5e0c0dbb5ecf78690810637cd9bb39bdcf2f0 |
16-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
am deee4235: am cd627a70: Merge "Pass the ImagePreset to ImageFilter" into gb-ub-photos-bryce * commit 'deee423567dc2cc13b009a3485cdfe395dbdf231': Pass the ImagePreset to ImageFilter
|
87bd8f442ada68cc16870ab95e936cb37d88ff0d |
16-Feb-2013 |
Baligh Uddin <baligh@google.com> |
am 28ab637f: (-s ours) am e956f5d5: (-s ours) Import translations. DO NOT MERGE * commit '28ab637f20ac2994be00b5f97b7a2efa8d6acc3e': Import translations. DO NOT MERGE
|
ead64700244fdb508dd9b451b8388936063c481b |
16-Feb-2013 |
Baligh Uddin <baligh@google.com> |
am 34ab9444: (-s ours) Import translations. DO NOT MERGE * commit '34ab9444c56922ab5edebd6a50a7327ba0a7c2e2': Import translations. DO NOT MERGE
|
1bd94e16748529f0346091948fb26201638aff25 |
16-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
am c8505cd1: am f7cfa85f: Fix curves slowness * commit 'c8505cd188d04759056079a3ddd18e8b0e4753cd': Fix curves slowness
|
1d3d98efbcffa6e351f0ea19a40b2ba5a3a62028 |
16-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
am a78b4141: am c8aa8ac1: Clean up red eye correction * commit 'a78b4141955d592b7eb15637b249d93d772bd738': Clean up red eye correction
|
19e3471a75500591aeb1b639d58131c5262ab5c2 |
16-Feb-2013 |
John Hoford <hoford@google.com> |
am 72fc5775: am 4b1e6fbd: fix ranges for various filters * commit '72fc5775c5e9040dff8515117e5c545dd227ba09': fix ranges for various filters
|
65a74a2093cd875fbcdf8199cd07245c0d6d66cf |
16-Feb-2013 |
Angus Kong <shkong@google.com> |
am 1a2ed3a3: am a241341d: Merge "Wait for the previous MosaicPreviewRenderer to end" into gb-ub-photos-bryce * commit '1a2ed3a35ded96fa50d2387645cad3f4e9138810': Wait for the previous MosaicPreviewRenderer to end
|
6076d98bfad75ed06d6141f14844447177db518b |
16-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
am cca464d0: am 4d25bee7: Merge "Turn back on the state panel" into gb-ub-photos-bryce * commit 'cca464d01a9cd0bdfa10ea467e643609e0f0eda5': Turn back on the state panel
|
4f1153597525ca7fe11d69440b1a58a9246b9742 |
16-Feb-2013 |
John Hoford <hoford@google.com> |
am a6faa75e: am ac75eb40: Merge "fix the draw clear bug" into gb-ub-photos-bryce * commit 'a6faa75e53070f4da959a75bcb6f92e578400baa': fix the draw clear bug
|
26ac2619cc54a743aac488a2b348805c155d1a39 |
16-Feb-2013 |
John Reck <jreck@google.com> |
Remove more com.android.camera.R Change-Id: I410baaf4a3f0d824d44ea24435a1716cad3bb966
ests/src/com/android/gallery3d/functional/ImageCaptureIntentTest.java
ests/src/com/android/gallery3d/functional/VideoCaptureIntentTest.java
ests_camera/src/com/android/camera/activity/CameraActivityTest.java
ests_camera/src/com/android/camera/activity/CameraTestCase.java
ests_camera/src/com/android/camera/functional/ImageCaptureIntentTest.java
ests_camera/src/com/android/camera/functional/VideoCaptureIntentTest.java
|
7db6eb02312a4c649d34351d1d78add1d8ec814b |
16-Feb-2013 |
John Reck <jreck@google.com> |
Remove more com.android.camera.R Change-Id: I410baaf4a3f0d824d44ea24435a1716cad3bb966
ests/src/com/android/gallery3d/functional/ImageCaptureIntentTest.java
ests/src/com/android/gallery3d/functional/VideoCaptureIntentTest.java
ests_camera/src/com/android/camera/activity/CameraActivityTest.java
ests_camera/src/com/android/camera/activity/CameraTestCase.java
ests_camera/src/com/android/camera/functional/ImageCaptureIntentTest.java
ests_camera/src/com/android/camera/functional/VideoCaptureIntentTest.java
|
796f2adf1076f9f01bd232b74dab91160d7bce48 |
16-Feb-2013 |
Tenghui Zhu <ztenghui@google.com> |
am f9a2c514: (-s ours) am 882d3acc: (-s ours) Merge "DO NOT MERGE: Don\'t call requestLayout from onLayout" into gb-ub-photos-bryce * commit 'f9a2c514b460052f91dd4fedd136fdd26cbcdb32': DO NOT MERGE: Don't call requestLayout from onLayout
|
57a8f023592193b9350475770eba5e05f22947e0 |
16-Feb-2013 |
Angus Kong <shkong@google.com> |
Bump up the version number to 1.1.40002 Change-Id: I5911eb3345b7774a6690372999fce3673b551f84
ndroidManifest.xml
|
26781cfc12df7ff35fc7eed254057d43a74cb113 |
16-Feb-2013 |
Angus Kong <shkong@google.com> |
Bump up the version number to 1.1.40002 Change-Id: I5911eb3345b7774a6690372999fce3673b551f84
ndroidManifest.xml
|
15fcf391ea0f9c7ffede365818f0a984b1a8c88d |
16-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
am b7ab84b1: am a0d689f1: Add null check on the source URI * commit 'b7ab84b19b030df753a2248fe9dfa70e1b959ee6': Add null check on the source URI
|
0581dca00dea4e6e36fdc2bf8d18de572aa1f05e |
16-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
am a4a0fde6: am 80149cd6: Merge "Limit preview size" into gb-ub-photos-bryce * commit 'a4a0fde618be31cb0c02c8f316e0c62ccd025130': Limit preview size
|
eae46a27c7a3e61a405de68b5bf84f870b3a881f |
16-Feb-2013 |
Baligh Uddin <baligh@google.com> |
am 6f8adf03: (-s ours) am 6ed18cb4: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce * commit '6f8adf030f86c32df7ea4f6dcf4a5b815a4ee4f8': Import translations. DO NOT MERGE
|
8333a8292014a66ba7438156796a48464c043041 |
16-Feb-2013 |
Baligh Uddin <baligh@google.com> |
am 288a0da1: (-s ours) am 5f8bb818: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce * commit '288a0da10287c8c60fe89bea37f5c781be453b17': Import translations. DO NOT MERGE
|
5affe2f9fc89b0edb4bbd07835041d3b3de17e2d |
16-Feb-2013 |
Baligh Uddin <baligh@google.com> |
am 4dd79940: (-s ours) Merge "Import translations. DO NOT MERGE" * commit '4dd799404ae4c521e2a3b29ffed54903f996802a': Import translations. DO NOT MERGE
|
0d4853802ccd59bcb1bc125f867486bda6d567b8 |
16-Feb-2013 |
Baligh Uddin <baligh@google.com> |
am 02272b84: (-s ours) Merge "Import translations. DO NOT MERGE" * commit '02272b84dbbaf704527d296dcc021b81eff267a7': Import translations. DO NOT MERGE
|
7cdf2b687e17450fa3c6b867faf0b22d741e0841 |
16-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
am 6dc837b3: am f6076047: Refactor FiltersManager * commit '6dc837b3abb31fcb52aa341f7a470d99f73c87bb': Refactor FiltersManager
|
d9bba08ae2c48d5886a2571688c8f303d5210e86 |
16-Feb-2013 |
John Hoford <hoford@google.com> |
am e44880f3: am 99baf613: refactor quality to be int * commit 'e44880f3f94927360bde6b1695d7bdd5f76a6386': refactor quality to be int
|
1d6ba4dbd0cc088b4537b50d937c5dddd3834820 |
16-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
am 9e7e35cf: am b01a3282: Add reset bitmap for RS filters * commit '9e7e35cf47a4de7ba71f54c2044246e36ab88ef2': Add reset bitmap for RS filters
|
4e5410504ead8a2339bddc6f74992e02f479b16c |
16-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
am 3a39e2cd: am 4a3c526c: Update thumbnails when the geometry changes * commit '3a39e2cdde40b72cdeef8cd53a952c27d082d529': Update thumbnails when the geometry changes
|
a2b5dca842a644d19e12f56233a58e8fc3cf4744 |
16-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
am fa77fa1a: am 263eb844: Merge "Generate thumbnails asynchronously" into gb-ub-photos-bryce * commit 'fa77fa1a84968ab6a28509a62ff468f70eacb5b6': Generate thumbnails asynchronously
|
f67cc1b7c2c8c898ea62705d28aa5197492d6607 |
16-Feb-2013 |
John Hoford <hoford@google.com> |
am 98b031de: am c364d9f2: remove animations if before Jelly Bean * commit '98b031de5ac3ee18edd4c663318b99dc385de520': remove animations if before Jelly Bean
|
2136d941bac146ce6ec7758000b28e38f176eeac |
16-Feb-2013 |
John Hoford <hoford@google.com> |
am 40ad5fdf: am e2c4d033: fixes the draw and clean up the UI * commit '40ad5fdf758b199f5574edd4b379bcef960859d1': fixes the draw and clean up the UI
|
21633bad04c1b82580ae8d45d8b2b445835983a3 |
16-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
am 7a1b8f1c: am 4b2933f8: Merge "Adding support for ICS" into gb-ub-photos-bryce * commit '7a1b8f1c5a162ef2238e475d208254ee37ac7bf2': Adding support for ICS
|
8a23984108f48fdf08abce435214b5b1e78c3c42 |
16-Feb-2013 |
John Hoford <hoford@google.com> |
am 0d663fd5: am 431f45e1: Merge "fix red eye to use the new system" into gb-ub-photos-bryce * commit '0d663fd56b288f29f3f202584462353f7f8fdc5d': fix red eye to use the new system
|
807d774a2efef78d85b0d031fbe0c2a40d097ac1 |
16-Feb-2013 |
Stephen Hines <srhines@google.com> |
am f4f4be2e: am 46dcad6e: Merge "Switch to GalleryGoogle as default provider for RS files (from Gallery2)." into gb-ub-photos-bryce * commit 'f4f4be2e68feee304a1c343a9b4d1e9ae2cb6a46': Switch to GalleryGoogle as default provider for RS files (from Gallery2).
|
869769409cbab01e0ff75f4728fd189aaad0ad07 |
16-Feb-2013 |
Tim Murray <timmurray@google.com> |
am 10854dc7: am 32ee1acb: Merge "Only create one RS context." into gb-ub-photos-bryce * commit '10854dc7b83abe3625c40e8fc22f71ecce908dc4': Only create one RS context.
|
8292c9aa362e62c28b17c99003e6403749c66e19 |
16-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
am 8bc463b6: am 31e52aae: Move useFilterRepresentation to PanelController * commit '8bc463b69019c0389b21e2ebcfb0abc092891468': Move useFilterRepresentation to PanelController
|
c96625489d0cd61fa59e63e2b197d6298133a3cd |
16-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
am 31ec8983: am 2d5cc151: Merge "Cleaning filters" into gb-ub-photos-bryce * commit '31ec89833da1ef32dc46f08b3505581355575931': Cleaning filters
|
f8b77411181826f3fe862cf289ac969ccd3ce952 |
16-Feb-2013 |
Doris Liu <tianliu@google.com> |
am 644fd645: am 61b332d8: Merge "Lock focus during countdown" into gb-ub-photos-bryce * commit '644fd645672cd0f80c9352ec3248e8e7dbab618f': Lock focus during countdown
|
47aab36b4b9d365bd8c41a916b35347819e7d4a6 |
16-Feb-2013 |
Doris Liu <tianliu@google.com> |
am 70a87204: am 401756be: Merge "Fix camera setting icons appearing in wrong place" into gb-ub-photos-bryce * commit '70a87204c4d2f53b23879ab5e8a6bbe619bd51b3': Fix camera setting icons appearing in wrong place
|
70745d7a27a8b1543e906bbba8b286a8a0a8eb74 |
16-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
am 6a8cadbc: am cef6ad5d: Move filter type to representations * commit '6a8cadbc30693122f752ddfacc8dcf0129cdfb58': Move filter type to representations
|
5c1193cd24b539f50ff663ecb1efb3ee81dabf80 |
16-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
am f75463e3: am 50ffa175: Fix crash when reset * commit 'f75463e342be0c6fcca0b65bfc5a564776473840': Fix crash when reset
|
274c3c954648400825278689daefeb7099d9c797 |
16-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
am 5c3d0982: am 4aabe9d1: Merge "Fix loading screen" into gb-ub-photos-bryce * commit '5c3d0982badedea68ac991041bb609461f0c631c': Fix loading screen
|
10474d18b349f5cab9b827408abbdbbb54a2ef51 |
16-Feb-2013 |
John Hoford <hoford@google.com> |
am 574abbce: am 44a499a6: Fix tiny planet to work with the new framework * commit '574abbce8ae2afc854bf7cadd5b552fef5c76f2f': Fix tiny planet to work with the new framework
|
388aad7d30215922b5c0572ee9da6af93eb1090e |
16-Feb-2013 |
John Hoford <hoford@google.com> |
am 38d71117: am 8029c856: remove slider from FX and Border UI * commit '38d71117e7425504354b697471ca2933fe88b864': remove slider from FX and Border UI
|
d13f965a54441286c646f9e40b0cdb98ae24ba3b |
16-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
am df130325: am 6d088c52: Merge "Fix leaks / init" into gb-ub-photos-bryce * commit 'df1303250231ebb65a0d0cc4fcd9e8f23a8c6c01': Fix leaks / init
|
520aeff784b7e8ea6c8d51717f92e9b9d1ce153e |
16-Feb-2013 |
Bobby Georgescu <georgescu@google.com> |
am af8ffc3c: am 2db8b143: Change transition from Gallery to Filtershow * commit 'af8ffc3c2c391fb77d084b58adb23c3e55368c7b': Change transition from Gallery to Filtershow
|
ebc376cabee8a3b7b2184f4ee3af9b6ac3c538ef |
16-Feb-2013 |
Bobby Georgescu <georgescu@google.com> |
am 4d22bada: am 7d9a6595: Merge "Replace background getDrawable calls to avoid ANR" into gb-ub-photos-bryce * commit '4d22badac1f0b81ac28e7f7a514354fb88fd069e': Replace background getDrawable calls to avoid ANR
|
b37e3a630b47775dc663aea307b19f7bce247f84 |
16-Feb-2013 |
John Reck <jreck@google.com> |
am ace62b69: Merge "Remove com.android.camera.R" into gb-ub-photos-bryce * commit 'ace62b69bd53518faea7be986f6c7481b271ca3f': Remove com.android.camera.R
|
71aa679c11883fd2366cc759af85776b69003755 |
16-Feb-2013 |
John Reck <jreck@google.com> |
Merge "Remove com.android.camera.R" into gb-ub-photos-bryce
|
b82dbc6173b8b51134dce95a5ff598a1e95841f9 |
16-Feb-2013 |
John Reck <jreck@google.com> |
Merge "Remove com.android.camera.R" into gb-ub-photos-bryce
|
ad16c6799d559d304bb8688e37a02d2d9bc53a42 |
16-Feb-2013 |
John Reck <jreck@google.com> |
Merge "Remove com.android.camera.R" into gb-ub-photos-bryce
|
ace62b69bd53518faea7be986f6c7481b271ca3f |
16-Feb-2013 |
John Reck <jreck@google.com> |
Merge "Remove com.android.camera.R" into gb-ub-photos-bryce
|
f2f904b0c77cf1ebbf41e118d1f4307a6caee6a9 |
16-Feb-2013 |
Baligh Uddin <baligh@google.com> |
am ebe294e4: (-s ours) am 61f29adf: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce * commit 'ebe294e42c4f6e4a70a602d857af7cf6857d3472': Import translations. DO NOT MERGE
|
8771350dbf259cecb30ca97f287be3b226d4d973 |
16-Feb-2013 |
Baligh Uddin <baligh@google.com> |
am 4e4ff77d: (-s ours) Merge "Import translations. DO NOT MERGE" * commit '4e4ff77df2d9fe55cd13bc6b9dd7c64ee1ce6a30': Import translations. DO NOT MERGE
|
1075b1b2000a7bd422de4b3102b474048bc9c327 |
16-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
am f5e71347: am 856acb65: Cleanup * commit 'f5e71347c6c19d418038fc491de61e5676e5e380': Cleanup
|
b385b6a0a4a18520f0bc4c47309d313ef5e559a4 |
16-Feb-2013 |
John Reck <jreck@google.com> |
Remove com.android.camera.R Change-Id: I0bb03da1423401f872c3bf13caffb9c87d850449
ndroid.mk
|
a864120f302da2b91bdf5af982f62b17e634dabe |
16-Feb-2013 |
John Reck <jreck@google.com> |
Remove com.android.camera.R Change-Id: I0bb03da1423401f872c3bf13caffb9c87d850449
rc/com/android/camera/PreviewGestures.java
|
54987e8d3af88214ce4f3aed0b5c4e9ded5b1392 |
16-Feb-2013 |
John Reck <jreck@google.com> |
Remove com.android.camera.R Change-Id: I0bb03da1423401f872c3bf13caffb9c87d850449
rc/com/android/camera/ActivityBase.java
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/CameraPreference.java
rc/com/android/camera/CameraSettings.java
rc/com/android/camera/CountDownTimerPreference.java
rc/com/android/camera/EffectsRecorder.java
rc/com/android/camera/IconListPreference.java
rc/com/android/camera/ListPreference.java
rc/com/android/camera/OnScreenHint.java
rc/com/android/camera/PanoramaModule.java
rc/com/android/camera/PhotoController.java
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/PreviewFrameLayout.java
rc/com/android/camera/PreviewGestures.java
rc/com/android/camera/RotateDialogController.java
rc/com/android/camera/SoundClips.java
rc/com/android/camera/Util.java
rc/com/android/camera/VideoController.java
rc/com/android/camera/VideoModule.java
rc/com/android/camera/ui/AbstractSettingPopup.java
rc/com/android/camera/ui/CameraSwitcher.java
rc/com/android/camera/ui/CountDownView.java
rc/com/android/camera/ui/EffectSettingPopup.java
rc/com/android/camera/ui/FaceView.java
rc/com/android/camera/ui/InLineSettingCheckBox.java
rc/com/android/camera/ui/InLineSettingItem.java
rc/com/android/camera/ui/InLineSettingMenu.java
rc/com/android/camera/ui/ListPrefSettingPopup.java
rc/com/android/camera/ui/MoreSettingPopup.java
rc/com/android/camera/ui/PieRenderer.java
rc/com/android/camera/ui/RotateTextToast.java
rc/com/android/camera/ui/Switch.java
rc/com/android/camera/ui/TimeIntervalPopup.java
rc/com/android/camera/ui/TimerSettingPopup.java
rc/com/android/camera/ui/ZoomRenderer.java
|
a3dc2c0dd75f4659146fcd257ce32acc3800ae5f |
16-Feb-2013 |
John Reck <jreck@google.com> |
Remove com.android.camera.R Change-Id: I0bb03da1423401f872c3bf13caffb9c87d850449
ndroid.mk
rc/com/android/camera/ActivityBase.java
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/CameraPreference.java
rc/com/android/camera/CameraSettings.java
rc/com/android/camera/CountDownTimerPreference.java
rc/com/android/camera/EffectsRecorder.java
rc/com/android/camera/IconListPreference.java
rc/com/android/camera/ListPreference.java
rc/com/android/camera/OnScreenHint.java
rc/com/android/camera/PanoramaModule.java
rc/com/android/camera/PhotoController.java
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/PreviewFrameLayout.java
rc/com/android/camera/PreviewGestures.java
rc/com/android/camera/RotateDialogController.java
rc/com/android/camera/SoundClips.java
rc/com/android/camera/Util.java
rc/com/android/camera/VideoController.java
rc/com/android/camera/VideoModule.java
rc/com/android/camera/ui/AbstractSettingPopup.java
rc/com/android/camera/ui/CameraSwitcher.java
rc/com/android/camera/ui/CountDownView.java
rc/com/android/camera/ui/EffectSettingPopup.java
rc/com/android/camera/ui/FaceView.java
rc/com/android/camera/ui/InLineSettingCheckBox.java
rc/com/android/camera/ui/InLineSettingItem.java
rc/com/android/camera/ui/InLineSettingMenu.java
rc/com/android/camera/ui/ListPrefSettingPopup.java
rc/com/android/camera/ui/MoreSettingPopup.java
rc/com/android/camera/ui/PieRenderer.java
rc/com/android/camera/ui/RotateTextToast.java
rc/com/android/camera/ui/Switch.java
rc/com/android/camera/ui/TimeIntervalPopup.java
rc/com/android/camera/ui/TimerSettingPopup.java
rc/com/android/camera/ui/ZoomRenderer.java
|
086cdd5bcb96a259f08a25a3839704cf94420e2f |
16-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
am 770b2fbe: am bfcc645d: Merge "Fix borders" into gb-ub-photos-bryce * commit '770b2fbe8ddfff82db37a46e5a713c2e3b61073f': Fix borders
|
73915a958b4d0fe5cdbc50606e3ef5e433f7a9d7 |
16-Feb-2013 |
Stephen Hines <srhines@google.com> |
am 97d3c00d: Merge "Switch to GalleryGoogle as default provider for RS files (from Gallery2)." * commit '97d3c00d213d03b1a5ca527daff8a84458d096d7': Switch to GalleryGoogle as default provider for RS files (from Gallery2).
|
a697a3173649aa640a57edcc0712914f14ec36d4 |
16-Feb-2013 |
Ying Wang <wangying@google.com> |
am f8109d2a: Merge "Fix build." * commit 'f8109d2a4344ee8676b47e57a3379cf192228b66': Fix build.
|
452cc805d56c19ea06d894a968ef6be1c811830f |
16-Feb-2013 |
Baligh Uddin <baligh@google.com> |
am 2ca2d0b4: (-s ours) am 728c036e: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce * commit '2ca2d0b4214f1bdbbba0d08134fd2a9cb9a88204': Import translations. DO NOT MERGE
|
29df7d05c60008f04f288f945ed4161dc166fa22 |
16-Feb-2013 |
Baligh Uddin <baligh@google.com> |
am d9b6794e: (-s ours) Merge "Import translations. DO NOT MERGE" * commit 'd9b6794ef9cd126d61b8517fbb1d74f3b27d6606': Import translations. DO NOT MERGE
|
e4d98b2d86ae42e5dab12e6d3d11b8aad71be7ef |
16-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
am f900f22d: am 41a03af3: Add todo * commit 'f900f22d0b836451eb11252645568407cea5a983': Add todo
|
5bc8b6417a21a70f5cfca653c1d72c101c1bbb47 |
16-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
am a6a24fe6: am 933f357a: Merge "Fix Fx filters" into gb-ub-photos-bryce * commit 'a6a24fe64957b4276f19c0a4bd884bd9332e748b': Fix Fx filters
|
aed12de4baa10f8926ff549afe8394b21b3625e3 |
16-Feb-2013 |
John Hoford <hoford@google.com> |
am b344142b: am b3825a60: Merge "fix draw and curves to use FilterRepresentation" into gb-ub-photos-bryce * commit 'b344142ba183e729cbd8470b9e29fe6882539de6': fix draw and curves to use FilterRepresentation
|
7934e2addb8e357732b3a4efeec250b1519e5de3 |
16-Feb-2013 |
Jason Noguchi <jnoguchi@google.com> |
am 659b1978: am 1933d8b2: Merge "Remove reference to local libraries. Make CameraTest build against the SDK instead." into gb-ub-photos-bryce * commit '659b19785a8673448e2939409f19fd39c8b63813': Remove reference to local libraries. Make CameraTest build against the SDK instead.
|
b6cdee46a9a206ccff4dc6fbc882f22345974c35 |
16-Feb-2013 |
Doris Liu <tianliu@google.com> |
am 6d0a2030: am 1fe1cc71: Merge "Fix memory leak in ComboPreferences" into gb-ub-photos-bryce * commit '6d0a2030c4bdd093880f1c3c9873f7fd049ed0dc': Fix memory leak in ComboPreferences
|
b2985f03294caaf6d25db417724dd08f03d40613 |
16-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
am 1ad95b77: am a31f446d: Fix flashing on geometry preview * commit '1ad95b778316638096d23368817c447f29c4d3f6': Fix flashing on geometry preview
|
713fd8effe3a51b510d0a84915ad508408572c81 |
16-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
am 7008c47d: am 00fa330e: Merge "Fix filters only + geometry only rendering" into gb-ub-photos-bryce * commit '7008c47d83c4e02518c417b1ff3870122f4b1778': Fix filters only + geometry only rendering
|
6dd90ea50329848767f8ff1b007d2b4281f78e21 |
15-Feb-2013 |
Baligh Uddin <baligh@google.com> |
am d87305a5: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce * commit 'd87305a547d614d47af48886d7e1c616ad20336e': Import translations. DO NOT MERGE
|
2a56e1d93829b43d419d70de4cd2c226f9eebd19 |
15-Feb-2013 |
Baligh Uddin <baligh@google.com> |
am 3b6283e9: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce * commit '3b6283e9c6756d7416eb985670f1eb4c4eb21ec9': Import translations. DO NOT MERGE
|
5c8c3f4dfa28584a989d6bdc16ff25a52d37bb51 |
15-Feb-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE"
|
2d64826989a6a0da1e8e31ebe3317c04abfac117 |
15-Feb-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
|
d87305a547d614d47af48886d7e1c616ad20336e |
15-Feb-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
|
748ea84797a58e0aed8af936f024d66e58d55c4a |
15-Feb-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE"
|
3b6283e9c6756d7416eb985670f1eb4c4eb21ec9 |
15-Feb-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
|
12d906df78953b6481dee19cea34629c3857fa01 |
15-Feb-2013 |
Bobby Georgescu <georgescu@google.com> |
am 4a94787f: Merge "Don\'t use AsyncTasks to fetch images via MTP" into gb-ub-photos-bryce * commit '4a94787ffc692090ec83b3f3c402c5d65afde4d9': Don't use AsyncTasks to fetch images via MTP
|
04026a407aca122132ce746a675ac20782f3ab08 |
15-Feb-2013 |
Bobby Georgescu <georgescu@google.com> |
Merge "Don't use AsyncTasks to fetch images via MTP" into gb-ub-photos-bryce
|
4a94787ffc692090ec83b3f3c402c5d65afde4d9 |
15-Feb-2013 |
Bobby Georgescu <georgescu@google.com> |
Merge "Don't use AsyncTasks to fetch images via MTP" into gb-ub-photos-bryce
|
5092902af1f8b255b7c7db429aa1e8b1706a6b56 |
15-Feb-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I32d848588279560363c19375e230c06396049f98 Auto-generated-cl: translation import
es/values-af/filtershow_strings.xml
es/values-am/filtershow_strings.xml
es/values-ar/filtershow_strings.xml
es/values-be/filtershow_strings.xml
es/values-bg/filtershow_strings.xml
es/values-ca/filtershow_strings.xml
es/values-cs/filtershow_strings.xml
es/values-da/filtershow_strings.xml
es/values-de/filtershow_strings.xml
es/values-el/filtershow_strings.xml
es/values-en-rGB/filtershow_strings.xml
es/values-es-rUS/filtershow_strings.xml
es/values-es/filtershow_strings.xml
es/values-et/filtershow_strings.xml
es/values-fa/filtershow_strings.xml
es/values-fi/filtershow_strings.xml
es/values-fr/filtershow_strings.xml
es/values-hi/filtershow_strings.xml
es/values-hr/filtershow_strings.xml
es/values-hu/filtershow_strings.xml
es/values-in/filtershow_strings.xml
es/values-it/filtershow_strings.xml
es/values-iw/filtershow_strings.xml
es/values-ja/filtershow_strings.xml
es/values-ko/filtershow_strings.xml
es/values-lt/filtershow_strings.xml
es/values-lv/filtershow_strings.xml
es/values-ms/filtershow_strings.xml
es/values-nb/filtershow_strings.xml
es/values-nl/filtershow_strings.xml
es/values-pl/filtershow_strings.xml
es/values-pt-rPT/filtershow_strings.xml
es/values-pt/filtershow_strings.xml
es/values-ro/filtershow_strings.xml
es/values-ru/filtershow_strings.xml
es/values-sk/filtershow_strings.xml
es/values-sl/filtershow_strings.xml
es/values-sr/filtershow_strings.xml
es/values-sv/filtershow_strings.xml
es/values-sw/filtershow_strings.xml
es/values-th/filtershow_strings.xml
es/values-tl/filtershow_strings.xml
es/values-tr/filtershow_strings.xml
es/values-uk/filtershow_strings.xml
es/values-vi/filtershow_strings.xml
es/values-zh-rCN/filtershow_strings.xml
es/values-zh-rTW/filtershow_strings.xml
es/values-zu/filtershow_strings.xml
|
e3181a5936b8ad51ff361a68e99c4dbcbd6b5880 |
15-Feb-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I7ae5988c73d412dd05a2f8b947cb8c97d5d1bba9 Auto-generated-cl: translation import
es/values-af/filtershow_strings.xml
es/values-am/filtershow_strings.xml
es/values-ar/filtershow_strings.xml
es/values-be/filtershow_strings.xml
es/values-bg/filtershow_strings.xml
es/values-ca/filtershow_strings.xml
es/values-cs/filtershow_strings.xml
es/values-da/filtershow_strings.xml
es/values-de/filtershow_strings.xml
es/values-el/filtershow_strings.xml
es/values-en-rGB/filtershow_strings.xml
es/values-es-rUS/filtershow_strings.xml
es/values-es/filtershow_strings.xml
es/values-et/filtershow_strings.xml
es/values-fa/filtershow_strings.xml
es/values-fi/filtershow_strings.xml
es/values-fr/filtershow_strings.xml
es/values-hi/filtershow_strings.xml
es/values-hr/filtershow_strings.xml
es/values-hu/filtershow_strings.xml
es/values-in/filtershow_strings.xml
es/values-it/filtershow_strings.xml
es/values-iw/filtershow_strings.xml
es/values-ja/filtershow_strings.xml
es/values-ko/filtershow_strings.xml
es/values-lt/filtershow_strings.xml
es/values-lv/filtershow_strings.xml
es/values-ms/filtershow_strings.xml
es/values-nb/filtershow_strings.xml
es/values-nl/filtershow_strings.xml
es/values-pl/filtershow_strings.xml
es/values-pt-rPT/filtershow_strings.xml
es/values-pt/filtershow_strings.xml
es/values-ro/filtershow_strings.xml
es/values-ru/filtershow_strings.xml
es/values-sk/filtershow_strings.xml
es/values-sl/filtershow_strings.xml
es/values-sr/filtershow_strings.xml
es/values-sv/filtershow_strings.xml
es/values-sw/filtershow_strings.xml
es/values-th/filtershow_strings.xml
es/values-tl/filtershow_strings.xml
es/values-tr/filtershow_strings.xml
es/values-uk/filtershow_strings.xml
es/values-vi/filtershow_strings.xml
es/values-zh-rCN/filtershow_strings.xml
es/values-zh-rTW/filtershow_strings.xml
es/values-zu/filtershow_strings.xml
|
c7146142628476a54b18131022a7c84df4e05ce3 |
15-Feb-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I7ae5988c73d412dd05a2f8b947cb8c97d5d1bba9 Auto-generated-cl: translation import
es/values-af/filtershow_strings.xml
es/values-am/filtershow_strings.xml
es/values-ar/filtershow_strings.xml
es/values-be/filtershow_strings.xml
es/values-bg/filtershow_strings.xml
es/values-ca/filtershow_strings.xml
es/values-cs/filtershow_strings.xml
es/values-da/filtershow_strings.xml
es/values-de/filtershow_strings.xml
es/values-el/filtershow_strings.xml
es/values-en-rGB/filtershow_strings.xml
es/values-es-rUS/filtershow_strings.xml
es/values-es/filtershow_strings.xml
es/values-et/filtershow_strings.xml
es/values-fa/filtershow_strings.xml
es/values-fi/filtershow_strings.xml
es/values-fr/filtershow_strings.xml
es/values-hi/filtershow_strings.xml
es/values-hr/filtershow_strings.xml
es/values-hu/filtershow_strings.xml
es/values-in/filtershow_strings.xml
es/values-it/filtershow_strings.xml
es/values-iw/filtershow_strings.xml
es/values-ja/filtershow_strings.xml
es/values-ko/filtershow_strings.xml
es/values-lt/filtershow_strings.xml
es/values-lv/filtershow_strings.xml
es/values-ms/filtershow_strings.xml
es/values-nb/filtershow_strings.xml
es/values-nl/filtershow_strings.xml
es/values-pl/filtershow_strings.xml
es/values-pt-rPT/filtershow_strings.xml
es/values-pt/filtershow_strings.xml
es/values-ro/filtershow_strings.xml
es/values-ru/filtershow_strings.xml
es/values-sk/filtershow_strings.xml
es/values-sl/filtershow_strings.xml
es/values-sr/filtershow_strings.xml
es/values-sv/filtershow_strings.xml
es/values-sw/filtershow_strings.xml
es/values-th/filtershow_strings.xml
es/values-tl/filtershow_strings.xml
es/values-tr/filtershow_strings.xml
es/values-uk/filtershow_strings.xml
es/values-vi/filtershow_strings.xml
es/values-zh-rCN/filtershow_strings.xml
es/values-zh-rTW/filtershow_strings.xml
es/values-zu/filtershow_strings.xml
|
42d45b71ec724e823b25d512852ac6f21454a189 |
15-Feb-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I3d38844df4fd1ec40eec417dcf330ea2bcae5fa8 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
3b9ef50b51fc0ed654129ace31c17db7ca54e306 |
15-Feb-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ieb36191410097c0161e4e847dab30b6b029b5de0 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
924cf1199e39286ea741011d283c9054c5043ebe |
15-Feb-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ieb36191410097c0161e4e847dab30b6b029b5de0 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
f5a982f403e694afbbc0dd1f96e075388f92f0f0 |
15-Feb-2013 |
Michael Kolb <kolby@google.com> |
am a54931e0: Merge "New capture animation" into gb-ub-photos-bryce * commit 'a54931e070a9134cf0a8d16cc628997844fc93dc': New capture animation
|
a54931e070a9134cf0a8d16cc628997844fc93dc |
15-Feb-2013 |
Michael Kolb <kolby@google.com> |
Merge "New capture animation" into gb-ub-photos-bryce
|
4d88243c1e0c8d0ac5390b79ef0cf3418adcf02a |
15-Feb-2013 |
Michael Kolb <kolby@google.com> |
Merge "New capture animation" into gb-ub-photos-bryce
|
dd3c37de2180cf9e1fe985bfe3f463c3243a9f6d |
15-Feb-2013 |
Victor Doba <dobavictor@google.com> |
Show the Utility Panel by default.
rc/com/android/gallery3d/filtershow/imageshow/ImageShow.java
|
824f9fa8bfb8c3c41de865dcff3898bcb73e74e9 |
15-Feb-2013 |
Victor Doba <dobavictor@google.com> |
Show the Utility Panel by default.
rc/com/android/gallery3d/filtershow/imageshow/ImageShow.java
|
9f0e50a06ec0da7904de7577010c67c6f0ce56ad |
15-Feb-2013 |
Jason Noguchi <jnoguchi@google.com> |
am c1560663: Merge "Merging camera test with gallery test." into gb-ub-photos-bryce # Via Android (Google) Code Review (1) and Jason Noguchi (1) * commit 'c15606633d024e0351517470b800590261403e8e': Merging camera test with gallery test.
|
b1d88d09969986dca01f972426ebf7d06d2fe66a |
15-Feb-2013 |
Jason Noguchi <jnoguchi@google.com> |
Merge "Merging camera test with gallery test." into gb-ub-photos-bryce
|
c15606633d024e0351517470b800590261403e8e |
15-Feb-2013 |
Jason Noguchi <jnoguchi@google.com> |
Merge "Merging camera test with gallery test." into gb-ub-photos-bryce
|
2672b311f68b49e5fae141f342a40f2827f3be47 |
15-Feb-2013 |
Jason Noguchi <jnoguchi@google.com> |
Merge "Merging camera test with gallery test." into gb-ub-photos-bryce
|
61d3ab7bdff78b5a3b79de5b4902fc92fe63c587 |
14-Feb-2013 |
Bobby Georgescu <georgescu@google.com> |
Don't use AsyncTasks to fetch images via MTP Bug: 8192491 Avoids allocations when scrolling through the importer grid by not using AsyncTasks anymore (which meant one object creation per change of the source image). Also fix an NPE if a device is unplugged during scrolling. Change-Id: I4e7022ca5d4573402e60b16fbd82ea65bc6627e0
rc/com/android/gallery3d/ingest/data/MtpBitmapFetch.java
rc/com/android/gallery3d/ingest/ui/MtpImageView.java
|
37faa3150feebccecd8872658af32bd88a0d2073 |
14-Feb-2013 |
Bobby Georgescu <georgescu@google.com> |
Don't use AsyncTasks to fetch images via MTP Bug: 8192491 Avoids allocations when scrolling through the importer grid by not using AsyncTasks anymore (which meant one object creation per change of the source image). Also fix an NPE if a device is unplugged during scrolling. Change-Id: I4e7022ca5d4573402e60b16fbd82ea65bc6627e0
rc/com/android/gallery3d/ingest/data/MtpBitmapFetch.java
rc/com/android/gallery3d/ingest/ui/MtpImageView.java
|
95ee5bfe7d4271014ba34769d3c90cf19bb5e8c1 |
15-Feb-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am aa4c3460: Merge "Fixed crop display for setting contacts/wallpapers." into gb-ub-photos-bryce # Via Android (Google) Code Review (1) and Ruben Brunk (1) * commit 'aa4c34606a697172987e5ac379e82ce41b7cbaa5': Fixed crop display for setting contacts/wallpapers.
|
098f37afd29e0d61ae32a23ae65e1e0d2cd533ec |
15-Feb-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Fixed crop display for setting contacts/wallpapers." into gb-ub-photos-bryce
|
aa4c34606a697172987e5ac379e82ce41b7cbaa5 |
15-Feb-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Fixed crop display for setting contacts/wallpapers." into gb-ub-photos-bryce
|
6a2dbeb43aa74dd16b290bacd52632452aea35ec |
15-Feb-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Fixed crop display for setting contacts/wallpapers. Bug: 8187056 Bug: 8196779 Bug: 8140241 Change-Id: Iaf3d113d9e53d365b73985fdc3350b627f8bda4c
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/cache/ImageLoader.java
|
ab779def9c3aa45b100872f2369ec2f4a1d9a709 |
15-Feb-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Fixed crop display for setting contacts/wallpapers. Bug: 8187056 Bug: 8196779 Bug: 8140241 Change-Id: Iaf3d113d9e53d365b73985fdc3350b627f8bda4c
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/cache/ImageLoader.java
|
e6371c5d61e79d7c8d11f106845b96ccc561660e |
14-Feb-2013 |
Jason Noguchi <jnoguchi@google.com> |
Merging camera test with gallery test. Change-Id: I8ef94a67dddc67a66c1d42a1b91e0a0c380b2841
ests/AndroidManifest.xml
|
32a590908dd878dc76132928c73d41f569b16a36 |
14-Feb-2013 |
Jason Noguchi <jnoguchi@google.com> |
Merging camera test with gallery test. Change-Id: I8ef94a67dddc67a66c1d42a1b91e0a0c380b2841
ests/Android.mk
|
d7a6d8613c9e97649a89569aca711e64233bb38e |
14-Feb-2013 |
Jason Noguchi <jnoguchi@google.com> |
Merging camera test with gallery test. Change-Id: I8ef94a67dddc67a66c1d42a1b91e0a0c380b2841
ests/src/com/android/gallery3d/StressTests.java
ests/src/com/android/gallery3d/stress/CameraLatency.java
ests/src/com/android/gallery3d/stress/CameraStartUp.java
ests/src/com/android/gallery3d/stress/CameraStressTestRunner.java
ests/src/com/android/gallery3d/stress/ImageCapture.java
ests/src/com/android/gallery3d/stress/ShotToShotLatency.java
ests/src/com/android/gallery3d/stress/SwitchPreview.java
ests/src/com/android/gallery3d/stress/TestUtil.java
ests/src/com/android/gallery3d/stress/VideoCapture.java
|
43a4f8b2b2f32299b945fca31bd95a5c3439d835 |
14-Feb-2013 |
Jason Noguchi <jnoguchi@google.com> |
Merging camera test with gallery test. Change-Id: I8ef94a67dddc67a66c1d42a1b91e0a0c380b2841
ests/Android.mk
ests/AndroidManifest.xml
ests/src/com/android/gallery3d/CameraTestRunner.java
ests/src/com/android/gallery3d/StressTests.java
ests/src/com/android/gallery3d/functional/CameraTest.java
ests/src/com/android/gallery3d/functional/ImageCaptureIntentTest.java
ests/src/com/android/gallery3d/functional/VideoCaptureIntentTest.java
ests/src/com/android/gallery3d/power/ImageAndVideoCapture.java
ests/src/com/android/gallery3d/stress/CameraLatency.java
ests/src/com/android/gallery3d/stress/CameraStartUp.java
ests/src/com/android/gallery3d/stress/CameraStressTestRunner.java
ests/src/com/android/gallery3d/stress/ImageCapture.java
ests/src/com/android/gallery3d/stress/ShotToShotLatency.java
ests/src/com/android/gallery3d/stress/SwitchPreview.java
ests/src/com/android/gallery3d/stress/TestUtil.java
ests/src/com/android/gallery3d/stress/VideoCapture.java
ests/src/com/android/gallery3d/unittest/CameraUnitTest.java
|
d0dab30df152db0e63a3334cb44e5550ffe423f5 |
14-Feb-2013 |
Jason Noguchi <jnoguchi@google.com> |
Merging camera test with gallery test. Change-Id: I8ef94a67dddc67a66c1d42a1b91e0a0c380b2841
ests/src/com/android/gallery3d/CameraTestRunner.java
ests/src/com/android/gallery3d/StressTests.java
ests/src/com/android/gallery3d/functional/CameraTest.java
ests/src/com/android/gallery3d/functional/ImageCaptureIntentTest.java
ests/src/com/android/gallery3d/functional/VideoCaptureIntentTest.java
ests/src/com/android/gallery3d/power/ImageAndVideoCapture.java
ests/src/com/android/gallery3d/stress/CameraLatency.java
ests/src/com/android/gallery3d/stress/CameraStartUp.java
ests/src/com/android/gallery3d/stress/CameraStressTestRunner.java
ests/src/com/android/gallery3d/stress/ImageCapture.java
ests/src/com/android/gallery3d/stress/ShotToShotLatency.java
ests/src/com/android/gallery3d/stress/SwitchPreview.java
ests/src/com/android/gallery3d/stress/TestUtil.java
ests/src/com/android/gallery3d/stress/VideoCapture.java
ests/src/com/android/gallery3d/unittest/CameraUnitTest.java
|
829ef50f2651c38d4d86b18f27ca0366fe2fa9d4 |
15-Feb-2013 |
John Hoford <hoford@google.com> |
am 886202f1: Merge "refactor to support many filter based on RedEye" into gb-ub-photos-bryce # Via Android (Google) Code Review (1) and John Hoford (1) * commit '886202f1f45ee49ee6571d0592aa1395607302aa': refactor to support many filter based on RedEye
|
c551fcd76cbbf0611f365bbe2b86c87c6226b348 |
15-Feb-2013 |
John Hoford <hoford@google.com> |
Merge "refactor to support many filter based on RedEye" into gb-ub-photos-bryce
|
886202f1f45ee49ee6571d0592aa1395607302aa |
15-Feb-2013 |
John Hoford <hoford@google.com> |
Merge "refactor to support many filter based on RedEye" into gb-ub-photos-bryce
|
6fc682025b6cee8af6d6d48242d2591dfa4d4a55 |
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/FilterPointRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterRedEyeRepresentation.java
|
7847563eaa8e039cd196a695485c322d81b1967e |
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
rc/com/android/gallery3d/filtershow/filters/FilterPointRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterRedEyeRepresentation.java
rc/com/android/gallery3d/filtershow/filters/ImageFilter.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterDraw.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterRedEye.java
rc/com/android/gallery3d/filtershow/filters/RedEyeCandidate.java
rc/com/android/gallery3d/filtershow/imageshow/ImagePoint.java
rc/com/android/gallery3d/filtershow/imageshow/ImageRedEye.java
|
12017c1b3bc314b5fee96c3b2a033d7877ea84e4 |
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
rc/com/android/gallery3d/filtershow/filters/FilterPointRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterRedEyeRepresentation.java
rc/com/android/gallery3d/filtershow/filters/ImageFilter.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterDraw.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterRedEye.java
rc/com/android/gallery3d/filtershow/filters/RedEyeCandidate.java
rc/com/android/gallery3d/filtershow/imageshow/ImagePoint.java
rc/com/android/gallery3d/filtershow/imageshow/ImageRedEye.java
|
a700cb4bd9735d1b0cdb1ef1265932ba5c120dfb |
14-Feb-2013 |
Michael Kolb <kolby@google.com> |
New capture animation Change-Id: I45dd4989fcebd5fc69cfff55d69827574a438ec4
rc/com/android/camera/CaptureAnimManager.java
|
d036a2fb3069224eeb5c2102f10c71d2005bde63 |
14-Feb-2013 |
Michael Kolb <kolby@google.com> |
New capture animation Change-Id: I45dd4989fcebd5fc69cfff55d69827574a438ec4
rc/com/android/camera/CaptureAnimManager.java
|
09b35ad243c8faee5c531606c7ebade9363d190a |
14-Feb-2013 |
Michael Kolb <kolby@google.com> |
am 0ada802b: Merge "Fix inexplicable monkey NPE" into gb-ub-photos-bryce # Via Android (Google) Code Review (1) and Michael Kolb (1) * commit '0ada802ba4753b08dea010aad0a35c3237034f7a': Fix inexplicable monkey NPE
|
ec2cebe4912bbb1a040b0bd52b250528671ef73d |
14-Feb-2013 |
Michael Kolb <kolby@google.com> |
Merge "Fix inexplicable monkey NPE" into gb-ub-photos-bryce
|
0ada802ba4753b08dea010aad0a35c3237034f7a |
14-Feb-2013 |
Michael Kolb <kolby@google.com> |
Merge "Fix inexplicable monkey NPE" into gb-ub-photos-bryce
|
4a40e126df5a77eaf44a52c73011cbfa91879b54 |
14-Feb-2013 |
Michael Kolb <kolby@google.com> |
Fix inexplicable monkey NPE Bug: 8049510 Change-Id: Idbd624a309bc026a1805030982cb0cb7ace698ee
rc/com/android/camera/FocusOverlayManager.java
|
3e34f81c281f1f715e1c75dfd3f666871d741fea |
14-Feb-2013 |
Michael Kolb <kolby@google.com> |
Fix inexplicable monkey NPE Bug: 8049510 Change-Id: Idbd624a309bc026a1805030982cb0cb7ace698ee
rc/com/android/camera/FocusOverlayManager.java
|
2a3a6b85e69710653774549b42e999f82d2eb2cc |
14-Feb-2013 |
The Android Automerger <android-build@android.com> |
merge in jb-mr2-release history after reset to master
|
d3d6eddbfedab7bc3cd135c082e54eb2842adeb2 |
14-Feb-2013 |
Doris Liu <tianliu@google.com> |
am e0d4962f: Fix video disappearing when rotated # Via Doris Liu * commit 'e0d4962f96a01b0ff403f8149b9e92ae81f58b77': Fix video disappearing when rotated
|
3c2fca3fe03888a3db308eea5e69b38479433706 |
14-Feb-2013 |
Doris Liu <tianliu@google.com> |
Fix video disappearing when rotated Bug: 7459723 Change-Id: I0f42e476cfda6c0c757ca1fda3dd8072bec25a37
rc/com/android/camera/VideoModule.java
|
e0d4962f96a01b0ff403f8149b9e92ae81f58b77 |
14-Feb-2013 |
Doris Liu <tianliu@google.com> |
Fix video disappearing when rotated Bug: 7459723 Change-Id: I0f42e476cfda6c0c757ca1fda3dd8072bec25a37
rc/com/android/camera/VideoModule.java
|
06fcce8ba216993edf140172b88607b21766d704 |
14-Feb-2013 |
Angus Kong <shkong@google.com> |
am a9ec959c: Make ShutterButton visible after initialization. # Via Angus Kong * commit 'a9ec959c6e43c00db0e74856f76efba976300f80': Make ShutterButton visible after initialization.
|
9147ab1b489170a3f6454e2b3f425d60505ea208 |
14-Feb-2013 |
Angus Kong <shkong@google.com> |
Make ShutterButton visible after initialization. bug:8186870 Change-Id: I45e33532e82cc128c25e61e3bf57843aef24edc2
rc/com/android/camera/VideoModule.java
|
a9ec959c6e43c00db0e74856f76efba976300f80 |
14-Feb-2013 |
Angus Kong <shkong@google.com> |
Make ShutterButton visible after initialization. bug:8186870 Change-Id: I45e33532e82cc128c25e61e3bf57843aef24edc2
rc/com/android/camera/VideoModule.java
|
a5f3039b2be815dd4476a7f676060e7971a63f68 |
14-Feb-2013 |
John Hoford <hoford@google.com> |
am 4e6c07b7: get redeye working again # Via John Hoford * commit '4e6c07b71b269ee3fe7f6fa455bc540238df9ded': get redeye working again
|
c96c311aacb2ca7f9123244d3d2bb044e4a4b242 |
14-Feb-2013 |
John Hoford <hoford@google.com> |
get redeye working again
es/layout/filtershow_zoom_editor.xml
rc/com/android/gallery3d/filtershow/filters/FilterRedEyeRepresentation.java
|
498d78073c24f25055a2dc4943cdd0a42f85702c |
14-Feb-2013 |
John Hoford <hoford@google.com> |
get redeye working again
rc/com/android/gallery3d/filtershow/editors/EditorRedEye.java
rc/com/android/gallery3d/filtershow/filters/FilterRedEyeRepresentation.java
rc/com/android/gallery3d/filtershow/filters/ImageFilter.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterGeometry.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterNegative.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterRS.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterRedEye.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterStraighten.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterWBalance.java
rc/com/android/gallery3d/filtershow/imageshow/ImageRedEye.java
|
4e6c07b71b269ee3fe7f6fa455bc540238df9ded |
14-Feb-2013 |
John Hoford <hoford@google.com> |
get redeye working again
es/layout/filtershow_zoom_editor.xml
rc/com/android/gallery3d/filtershow/editors/EditorRedEye.java
rc/com/android/gallery3d/filtershow/filters/FilterRedEyeRepresentation.java
rc/com/android/gallery3d/filtershow/filters/ImageFilter.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterGeometry.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterNegative.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterRS.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterRedEye.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterStraighten.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterWBalance.java
rc/com/android/gallery3d/filtershow/imageshow/ImageRedEye.java
|
b9d6c1038bdd3735939de3777772ed7e4ad50d93 |
14-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
am 31ebfb40: Merge "Fix sync representations" into gb-ub-photos-bryce # Via Android (Google) Code Review (1) and nicolasroard (1) * commit '31ebfb400aa73c51980ef78e4c26fcc1a39fdd4d': Fix sync representations
|
31ebfb400aa73c51980ef78e4c26fcc1a39fdd4d |
14-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Merge "Fix sync representations" into gb-ub-photos-bryce
|
33d614f5c2ba3526797286176c7898a32786486f |
14-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Fix sync representations Change-Id: I8b1b159a2350f7ee8bcdc7e71faf82ab5df2755b
rc/com/android/gallery3d/filtershow/filters/FilterRepresentation.java
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
|
147af26e86b7fa8f2d195651e3786c0102346702 |
14-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Fix sync representations Change-Id: I8b1b159a2350f7ee8bcdc7e71faf82ab5df2755b
rc/com/android/gallery3d/filtershow/PanelController.java
rc/com/android/gallery3d/filtershow/filters/FilterRepresentation.java
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
|
d4bec864946917e434bfb53846747d665bbe1d07 |
14-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Fix sync representations Change-Id: I8b1b159a2350f7ee8bcdc7e71faf82ab5df2755b
rc/com/android/gallery3d/filtershow/PanelController.java
rc/com/android/gallery3d/filtershow/filters/FilterRepresentation.java
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
|
c5c19f0f912f6f689cf3ae0435558da5bfa85c07 |
14-Feb-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 92decf25: Merge "Fix proguard and makefile targets for tests." into gb-ub-photos-bryce # Via Android (Google) Code Review (1) and Ruben Brunk (1) * commit '92decf254d7feb277d68fb94a4e4f90ba2c2dbeb': Fix proguard and makefile targets for tests.
|
92decf254d7feb277d68fb94a4e4f90ba2c2dbeb |
14-Feb-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Fix proguard and makefile targets for tests." into gb-ub-photos-bryce
|
29aa04d1dd6bada314ffd22ac264dfa11c069fab |
13-Feb-2013 |
John Hoford <hoford@google.com> |
am ecdda817: fix draw to support rotation/crop # Via John Hoford * commit 'ecdda817f112286ac6bab2ac4bf508e7dd8609ac': fix draw to support rotation/crop
|
df7e37face0245ce8651a50ba3ee16febc2b2bdb |
13-Feb-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Fix proguard and makefile targets for tests. Change-Id: I19f35567eff7c6d377a95b434dc4735faca93861
roguard.flags
|
ab24a05cd280452b7e3d8349c15bac7c576fd226 |
13-Feb-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Fix proguard and makefile targets for tests. Change-Id: I19f35567eff7c6d377a95b434dc4735faca93861
roguard.flags
|
da7b84da52579cc967816e11f10acd9d9b3c714b |
13-Feb-2013 |
John Hoford <hoford@google.com> |
fix draw to support rotation/crop Change-Id: Iea1db9e42f1fa2b86a452bf1d40b1663b69d03e2
rc/com/android/gallery3d/filtershow/cache/RenderingRequest.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterDraw.java
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
|
219bb7a4d8408cc27344e92fd9cfec371a0f861b |
13-Feb-2013 |
John Hoford <hoford@google.com> |
fix draw to support rotation/crop Change-Id: Iea1db9e42f1fa2b86a452bf1d40b1663b69d03e2
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
|
ecdda817f112286ac6bab2ac4bf508e7dd8609ac |
13-Feb-2013 |
John Hoford <hoford@google.com> |
fix draw to support rotation/crop Change-Id: Iea1db9e42f1fa2b86a452bf1d40b1663b69d03e2
rc/com/android/gallery3d/filtershow/cache/RenderingRequest.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterDraw.java
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
|
e6e52af6f07b3f4e0c3dba862becb6ab86404967 |
13-Feb-2013 |
Bobby Georgescu <georgescu@google.com> |
am add77dfc: Merge "Importer: Full-screen viewing, UI refinement, refactoring" into gb-ub-photos-bryce # Via Android (Google) Code Review (1) and Bobby Georgescu (1) * commit 'add77dfcee665d309e5eb20e344e1d10e7c4070e': Importer: Full-screen viewing, UI refinement, refactoring
|
add77dfcee665d309e5eb20e344e1d10e7c4070e |
13-Feb-2013 |
Bobby Georgescu <georgescu@google.com> |
Merge "Importer: Full-screen viewing, UI refinement, refactoring" into gb-ub-photos-bryce
|
c81c9a87075e89acb940ff6cb1293b48ac7b1cb0 |
13-Feb-2013 |
Bobby Georgescu <georgescu@google.com> |
Merge "Importer: Full-screen viewing, UI refinement, refactoring" into gb-ub-photos-bryce
|
a6c4ea75efb5d7cc72b5dab66f3a5a418ca4cab3 |
13-Feb-2013 |
Bobby Georgescu <georgescu@google.com> |
Merge "Importer: Full-screen viewing, UI refinement, refactoring" into gb-ub-photos-bryce
|
780826ef133605994097d8fbc4af1bdbde454385 |
13-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
am cd627a70: Merge "Pass the ImagePreset to ImageFilter" into gb-ub-photos-bryce # Via Android (Google) Code Review (1) and nicolasroard (1) * commit 'cd627a7010f6907204f7bcb5d13111ba02ee30fe': Pass the ImagePreset to ImageFilter
|
cd627a7010f6907204f7bcb5d13111ba02ee30fe |
13-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Merge "Pass the ImagePreset to ImageFilter" into gb-ub-photos-bryce
|
1d1bac5697c94c2be96918d2a95c9bc40e9dab97 |
13-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Merge "Pass the ImagePreset to ImageFilter" into gb-ub-photos-bryce
|
bfa696afec98657e7fa321522d60fcc514ff2637 |
13-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Pass the ImagePreset to ImageFilter Change-Id: I4c195a5eb6055c3bb43fed60e76751ed133ab725
rc/com/android/gallery3d/filtershow/filters/FilterRepresentation.java
rc/com/android/gallery3d/filtershow/filters/ImageFilter.java
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
|
19b307f5ef03b63493bd29e8e838a22c323a370a |
13-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Pass the ImagePreset to ImageFilter Change-Id: I4c195a5eb6055c3bb43fed60e76751ed133ab725
rc/com/android/gallery3d/filtershow/filters/FilterRepresentation.java
rc/com/android/gallery3d/filtershow/filters/ImageFilter.java
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
|
df95aa00f20a521a9eb830548d0bda6869a8704b |
13-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Pass the ImagePreset to ImageFilter Change-Id: I4c195a5eb6055c3bb43fed60e76751ed133ab725
rc/com/android/gallery3d/filtershow/filters/FilterRepresentation.java
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
|
a42416162bce41ca3428c1d424dc47280e6c84f4 |
13-Feb-2013 |
Baligh Uddin <baligh@google.com> |
am e956f5d5: (-s ours) Import translations. DO NOT MERGE # Via Baligh Uddin * commit 'e956f5d5e84c8ea3b75bba218bc173f03c6a1739': Import translations. DO NOT MERGE
|
22b692eb3bde65069573f9aa97804b9aea1aa7e3 |
13-Feb-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I83bb60752d8f060ab32413ee3a670228db5a8055 Auto-generated-cl: translation import
es/values-af/filtershow_strings.xml
es/values-am/filtershow_strings.xml
es/values-ar/filtershow_strings.xml
es/values-be/filtershow_strings.xml
es/values-bg/filtershow_strings.xml
es/values-ca/filtershow_strings.xml
es/values-cs/filtershow_strings.xml
es/values-da/filtershow_strings.xml
es/values-de/filtershow_strings.xml
es/values-el/filtershow_strings.xml
es/values-en-rGB/filtershow_strings.xml
es/values-es-rUS/filtershow_strings.xml
es/values-es/filtershow_strings.xml
es/values-et/filtershow_strings.xml
es/values-fa/filtershow_strings.xml
es/values-fi/filtershow_strings.xml
es/values-fr/filtershow_strings.xml
es/values-hi/filtershow_strings.xml
es/values-hr/filtershow_strings.xml
es/values-hu/filtershow_strings.xml
es/values-in/filtershow_strings.xml
es/values-it/filtershow_strings.xml
es/values-iw/filtershow_strings.xml
es/values-ja/filtershow_strings.xml
es/values-ko/filtershow_strings.xml
es/values-lt/filtershow_strings.xml
es/values-lv/filtershow_strings.xml
es/values-ms/filtershow_strings.xml
es/values-nb/filtershow_strings.xml
es/values-nl/filtershow_strings.xml
es/values-pl/filtershow_strings.xml
es/values-pt-rPT/filtershow_strings.xml
es/values-pt/filtershow_strings.xml
es/values-ro/filtershow_strings.xml
es/values-ru/filtershow_strings.xml
es/values-sk/filtershow_strings.xml
es/values-sl/filtershow_strings.xml
es/values-sr/filtershow_strings.xml
es/values-sv/filtershow_strings.xml
es/values-sw/filtershow_strings.xml
es/values-th/filtershow_strings.xml
es/values-tl/filtershow_strings.xml
es/values-tr/filtershow_strings.xml
es/values-uk/filtershow_strings.xml
es/values-vi/filtershow_strings.xml
es/values-zh-rCN/filtershow_strings.xml
es/values-zh-rTW/filtershow_strings.xml
es/values-zu/filtershow_strings.xml
|
e956f5d5e84c8ea3b75bba218bc173f03c6a1739 |
13-Feb-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I73eaf3450a743ae918e3391efcceb4acd355b85d Auto-generated-cl: translation import
es/values-af/filtershow_strings.xml
es/values-am/filtershow_strings.xml
es/values-ar/filtershow_strings.xml
es/values-be/filtershow_strings.xml
es/values-bg/filtershow_strings.xml
es/values-ca/filtershow_strings.xml
es/values-cs/filtershow_strings.xml
es/values-da/filtershow_strings.xml
es/values-de/filtershow_strings.xml
es/values-el/filtershow_strings.xml
es/values-en-rGB/filtershow_strings.xml
es/values-es-rUS/filtershow_strings.xml
es/values-es/filtershow_strings.xml
es/values-et/filtershow_strings.xml
es/values-fa/filtershow_strings.xml
es/values-fi/filtershow_strings.xml
es/values-fr/filtershow_strings.xml
es/values-hi/filtershow_strings.xml
es/values-hr/filtershow_strings.xml
es/values-hu/filtershow_strings.xml
es/values-in/filtershow_strings.xml
es/values-it/filtershow_strings.xml
es/values-iw/filtershow_strings.xml
es/values-ja/filtershow_strings.xml
es/values-ko/filtershow_strings.xml
es/values-lt/filtershow_strings.xml
es/values-lv/filtershow_strings.xml
es/values-ms/filtershow_strings.xml
es/values-nb/filtershow_strings.xml
es/values-nl/filtershow_strings.xml
es/values-pl/filtershow_strings.xml
es/values-pt-rPT/filtershow_strings.xml
es/values-pt/filtershow_strings.xml
es/values-ro/filtershow_strings.xml
es/values-ru/filtershow_strings.xml
es/values-sk/filtershow_strings.xml
es/values-sl/filtershow_strings.xml
es/values-sr/filtershow_strings.xml
es/values-sv/filtershow_strings.xml
es/values-sw/filtershow_strings.xml
es/values-th/filtershow_strings.xml
es/values-tl/filtershow_strings.xml
es/values-tr/filtershow_strings.xml
es/values-uk/filtershow_strings.xml
es/values-vi/filtershow_strings.xml
es/values-zh-rCN/filtershow_strings.xml
es/values-zh-rTW/filtershow_strings.xml
es/values-zu/filtershow_strings.xml
|
0b0b7c6e3624c4e76b342a3ebf74dedf3a5f4a15 |
13-Feb-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I73eaf3450a743ae918e3391efcceb4acd355b85d Auto-generated-cl: translation import
es/values-af/filtershow_strings.xml
es/values-am/filtershow_strings.xml
es/values-ar/filtershow_strings.xml
es/values-be/filtershow_strings.xml
es/values-bg/filtershow_strings.xml
es/values-ca/filtershow_strings.xml
es/values-cs/filtershow_strings.xml
es/values-da/filtershow_strings.xml
es/values-de/filtershow_strings.xml
es/values-el/filtershow_strings.xml
es/values-en-rGB/filtershow_strings.xml
es/values-es-rUS/filtershow_strings.xml
es/values-es/filtershow_strings.xml
es/values-et/filtershow_strings.xml
es/values-fa/filtershow_strings.xml
es/values-fi/filtershow_strings.xml
es/values-fr/filtershow_strings.xml
es/values-hi/filtershow_strings.xml
es/values-hr/filtershow_strings.xml
es/values-hu/filtershow_strings.xml
es/values-in/filtershow_strings.xml
es/values-it/filtershow_strings.xml
es/values-iw/filtershow_strings.xml
es/values-ja/filtershow_strings.xml
es/values-ko/filtershow_strings.xml
es/values-lt/filtershow_strings.xml
es/values-lv/filtershow_strings.xml
es/values-ms/filtershow_strings.xml
es/values-nb/filtershow_strings.xml
es/values-nl/filtershow_strings.xml
es/values-pl/filtershow_strings.xml
es/values-pt-rPT/filtershow_strings.xml
es/values-pt/filtershow_strings.xml
es/values-ro/filtershow_strings.xml
es/values-ru/filtershow_strings.xml
es/values-sk/filtershow_strings.xml
es/values-sl/filtershow_strings.xml
es/values-sr/filtershow_strings.xml
es/values-sv/filtershow_strings.xml
es/values-sw/filtershow_strings.xml
es/values-th/filtershow_strings.xml
es/values-tl/filtershow_strings.xml
es/values-tr/filtershow_strings.xml
es/values-uk/filtershow_strings.xml
es/values-vi/filtershow_strings.xml
es/values-zh-rCN/filtershow_strings.xml
es/values-zh-rTW/filtershow_strings.xml
es/values-zu/filtershow_strings.xml
|
4dd4d02ef6aaee135fcb0b1404e0570d0cbcc00d |
13-Feb-2013 |
The Android Automerger <android-build@android.com> |
merge in jb-mr2-release history after reset to master
|
76fa48598bd8801c4a014a576cd363e720771969 |
13-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
am f7cfa85f: Fix curves slowness # Via nicolasroard * commit 'f7cfa85f7dc2bb29affefff9374f3a4029b8a057': Fix curves slowness
|
94327736e3e16d5d7c8dae084c09b8e41496dd03 |
13-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Fix curves slowness Change-Id: If25f3ce1c3da02daa90405987075b87ce676c84e
rc/com/android/gallery3d/filtershow/ui/ImageCurves.java
|
f7cfa85f7dc2bb29affefff9374f3a4029b8a057 |
13-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Fix curves slowness Change-Id: If25f3ce1c3da02daa90405987075b87ce676c84e
rc/com/android/gallery3d/filtershow/ui/ImageCurves.java
|
fde04a552110d4891f1d3199b184bb4f930e9a00 |
01-Feb-2013 |
Bobby Georgescu <georgescu@google.com> |
Importer: Full-screen viewing, UI refinement, refactoring Bug: 7990333 Bug: 8151814 Bug: 8037411 This CL adds or changes the following things: - Full-screen image viewing and UI for switching modes - Moved general functionality from MtpThumbnailTileView to MtpImageView to allow for reuse in full-screen image use-case - MtpBitmapCache moved from ui to data package - Orientation now respected when set in image metadata - Miscellaneous UI consistency issues fixed - Miscellaneous instability issues fixed Change-Id: I5f188b763617b693e32fedc03273d711d604922a
ndroidManifest.xml
|
c8a9e86919dca8938948f97efc3dcbe143e806bf |
01-Feb-2013 |
Bobby Georgescu <georgescu@google.com> |
Importer: Full-screen viewing, UI refinement, refactoring Bug: 7990333 Bug: 8151814 Bug: 8037411 This CL adds or changes the following things: - Full-screen image viewing and UI for switching modes - Moved general functionality from MtpThumbnailTileView to MtpImageView to allow for reuse in full-screen image use-case - MtpBitmapCache moved from ui to data package - Orientation now respected when set in image metadata - Miscellaneous UI consistency issues fixed - Miscellaneous instability issues fixed Change-Id: I5f188b763617b693e32fedc03273d711d604922a
ndroidManifest.xml
es/layout/ingest_activity_item_list.xml
es/layout/ingest_fullsize.xml
es/menu/ingest_menu_item_list_selection.xml
es/values/strings.xml
rc/com/android/gallery3d/ingest/IngestActivity.java
rc/com/android/gallery3d/ingest/IngestService.java
rc/com/android/gallery3d/ingest/MtpDeviceIndex.java
rc/com/android/gallery3d/ingest/adapter/CheckBroker.java
rc/com/android/gallery3d/ingest/adapter/MtpAdapter.java
rc/com/android/gallery3d/ingest/adapter/MtpPagerAdapter.java
rc/com/android/gallery3d/ingest/data/BitmapWithMetadata.java
rc/com/android/gallery3d/ingest/data/MtpBitmapFetch.java
rc/com/android/gallery3d/ingest/ui/IngestGridView.java
rc/com/android/gallery3d/ingest/ui/MtpBitmapCache.java
rc/com/android/gallery3d/ingest/ui/MtpFullscreenView.java
rc/com/android/gallery3d/ingest/ui/MtpImageView.java
rc/com/android/gallery3d/ingest/ui/MtpThumbnailTileView.java
|
c97dddfe187be8ecfde9f8914e8018102ec6209a |
01-Feb-2013 |
Bobby Georgescu <georgescu@google.com> |
Importer: Full-screen viewing, UI refinement, refactoring Bug: 7990333 Bug: 8151814 Bug: 8037411 This CL adds or changes the following things: - Full-screen image viewing and UI for switching modes - Moved general functionality from MtpThumbnailTileView to MtpImageView to allow for reuse in full-screen image use-case - MtpBitmapCache moved from ui to data package - Orientation now respected when set in image metadata - Miscellaneous UI consistency issues fixed - Miscellaneous instability issues fixed Change-Id: I5f188b763617b693e32fedc03273d711d604922a
rc/com/android/gallery3d/ingest/IngestActivity.java
rc/com/android/gallery3d/ingest/IngestService.java
rc/com/android/gallery3d/ingest/MtpDeviceIndex.java
rc/com/android/gallery3d/ingest/adapter/CheckBroker.java
rc/com/android/gallery3d/ingest/adapter/MtpAdapter.java
rc/com/android/gallery3d/ingest/adapter/MtpPagerAdapter.java
rc/com/android/gallery3d/ingest/data/BitmapWithMetadata.java
rc/com/android/gallery3d/ingest/data/MtpBitmapFetch.java
rc/com/android/gallery3d/ingest/ui/IngestGridView.java
rc/com/android/gallery3d/ingest/ui/MtpBitmapCache.java
rc/com/android/gallery3d/ingest/ui/MtpFullscreenView.java
rc/com/android/gallery3d/ingest/ui/MtpImageView.java
rc/com/android/gallery3d/ingest/ui/MtpThumbnailTileView.java
|
8f93c89aaa7e99a9e924e054650ca2c3570bf490 |
01-Feb-2013 |
Bobby Georgescu <georgescu@google.com> |
Importer: Full-screen viewing, UI refinement, refactoring Bug: 7990333 Bug: 8151814 Bug: 8037411 This CL adds or changes the following things: - Full-screen image viewing and UI for switching modes - Moved general functionality from MtpThumbnailTileView to MtpImageView to allow for reuse in full-screen image use-case - MtpBitmapCache moved from ui to data package - Orientation now respected when set in image metadata - Miscellaneous UI consistency issues fixed - Miscellaneous instability issues fixed Change-Id: I5f188b763617b693e32fedc03273d711d604922a
es/layout/ingest_activity_item_list.xml
es/layout/ingest_fullsize.xml
es/menu/ingest_menu_item_list_selection.xml
es/values/strings.xml
|
919cc3dcde7c44f872c7d08a676a3d626ec79a13 |
13-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
am c8aa8ac1: Clean up red eye correction # Via nicolasroard * commit 'c8aa8ac19118f1c1be1bda63d4d72589aed49da4': Clean up red eye correction
|
835173d0e6fd90a8298d28f7688fa1bb5cb80c64 |
13-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Clean up red eye correction Change-Id: I19a8006ed31767ae8e33388cc5b11b5c68d5ae2d
es/layout/filtershow_activity.xml
rc/com/android/gallery3d/filtershow/filters/FilterRedEyeRepresentation.java
|
7caa8cc9073e5cdf195c73f1eb0fe06df1efe569 |
13-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Clean up red eye correction Change-Id: I19a8006ed31767ae8e33388cc5b11b5c68d5ae2d
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/PanelController.java
rc/com/android/gallery3d/filtershow/filters/FilterRedEyeRepresentation.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterRedEye.java
|
c8aa8ac19118f1c1be1bda63d4d72589aed49da4 |
13-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Clean up red eye correction Change-Id: I19a8006ed31767ae8e33388cc5b11b5c68d5ae2d
es/layout/filtershow_activity.xml
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/PanelController.java
rc/com/android/gallery3d/filtershow/filters/FilterRedEyeRepresentation.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterRedEye.java
|
4e162feb4a0a14c9ae7bef865ade30a4967c19fb |
13-Feb-2013 |
John Hoford <hoford@google.com> |
am 4b1e6fbd: fix ranges for various filters # Via John Hoford * commit '4b1e6fbdf437b7a25fb3eb18a2ed43c9ab4eccc8': fix ranges for various filters
|
1335f1395bdc518cbb6dd13f2faabdd4631a0253 |
13-Feb-2013 |
John Hoford <hoford@google.com> |
fix ranges for various filters Change-Id: I6790b06c5c4094c442ce19cb2ed7ddb6a4152f3a
rc/com/android/gallery3d/filtershow/editors/BasicEditor.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterContrast.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterExposure.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterHue.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterNegative.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterRedEye.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterSaturated.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterShadows.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterVibrance.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterVignette.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterWBalance.java
|
4b1e6fbdf437b7a25fb3eb18a2ed43c9ab4eccc8 |
13-Feb-2013 |
John Hoford <hoford@google.com> |
fix ranges for various filters Change-Id: I6790b06c5c4094c442ce19cb2ed7ddb6a4152f3a
rc/com/android/gallery3d/filtershow/editors/BasicEditor.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterContrast.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterExposure.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterHue.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterNegative.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterRedEye.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterSaturated.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterShadows.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterVibrance.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterVignette.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterWBalance.java
|
de9497dc0b19018de3f5d1b60b3d7c899bfad9ac |
13-Feb-2013 |
Angus Kong <shkong@google.com> |
am a241341d: Merge "Wait for the previous MosaicPreviewRenderer to end" into gb-ub-photos-bryce # Via Android (Google) Code Review (1) and Angus Kong (1) * commit 'a241341de88c982bc619d25f0455561075d177e8': Wait for the previous MosaicPreviewRenderer to end
|
ec0610102caf5353c07c8b271763d2509db474ee |
13-Feb-2013 |
Angus Kong <shkong@google.com> |
Merge "Wait for the previous MosaicPreviewRenderer to end" into gb-ub-photos-bryce
|
a241341de88c982bc619d25f0455561075d177e8 |
13-Feb-2013 |
Angus Kong <shkong@google.com> |
Merge "Wait for the previous MosaicPreviewRenderer to end" into gb-ub-photos-bryce
|
89d246bda7d6bbe8022df55bb849017d791ad0fc |
13-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
am 4d25bee7: Merge "Turn back on the state panel" into gb-ub-photos-bryce # Via Android (Google) Code Review (1) and nicolasroard (1) * commit '4d25bee70415aabd3fa8439a75d02e14323e187d': Turn back on the state panel
|
8fbb4ed61a15a864f5bba250f0faa1d1845b2085 |
13-Feb-2013 |
John Hoford <hoford@google.com> |
am ac75eb40: Merge "fix the draw clear bug" into gb-ub-photos-bryce # Via Android (Google) Code Review (1) and John Hoford (1) * commit 'ac75eb409e097ab01622427eabcbb2a3fd2f2c9c': fix the draw clear bug
|
40036d4793206e58f578436cae6b462f4e29e70c |
13-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Merge "Turn back on the state panel" into gb-ub-photos-bryce
|
a52d6674e576a15d1c3f71f951fa3843957bfa8b |
13-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Merge "Turn back on the state panel" into gb-ub-photos-bryce
|
4d25bee70415aabd3fa8439a75d02e14323e187d |
13-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Merge "Turn back on the state panel" into gb-ub-photos-bryce
|
ac75eb409e097ab01622427eabcbb2a3fd2f2c9c |
13-Feb-2013 |
John Hoford <hoford@google.com> |
Merge "fix the draw clear bug" into gb-ub-photos-bryce
|
dff54430a7f6a11dc8ef45496f2836a853bd6d42 |
13-Feb-2013 |
John Hoford <hoford@google.com> |
Merge "fix the draw clear bug" into gb-ub-photos-bryce
|
3c9697065497a94e03661c05d636df0187fb95c4 |
13-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Turn back on the state panel Change-Id: I22706078d4026ce4e24917c484a30a56de431983
es/menu/filtershow_activity_menu.xml
rc/com/android/gallery3d/filtershow/filters/FilterBasicRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterRepresentation.java
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
|
66b293e3d57988899a7fd5f1883e15f9d74b4a93 |
13-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Turn back on the state panel Change-Id: I22706078d4026ce4e24917c484a30a56de431983
rc/com/android/gallery3d/filtershow/ImageStateAdapter.java
rc/com/android/gallery3d/filtershow/filters/FilterBasicRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterRepresentation.java
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
|
2562a98c156a55b51239fea383838a11a0292c0e |
13-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Turn back on the state panel Change-Id: I22706078d4026ce4e24917c484a30a56de431983
es/menu/filtershow_activity_menu.xml
rc/com/android/gallery3d/filtershow/ImageStateAdapter.java
rc/com/android/gallery3d/filtershow/filters/FilterBasicRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterRepresentation.java
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
|
b4485f165a9936d6e5f6d75fe07d2c6802ec483c |
12-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Add null check on the source URI bug:8181133 Change-Id: I1a7226db3ceb42a759f24c9b70f140a63a4294f0
rc/com/android/gallery3d/filtershow/cache/ImageLoader.java
rc/com/android/gallery3d/filtershow/tools/SaveCopyTask.java
|
4f8d8dd4fbe5fa0be96f0942001b9f3cbaee317f |
13-Feb-2013 |
Tenghui Zhu <ztenghui@google.com> |
am 882d3acc: (-s ours) Merge "DO NOT MERGE: Don\'t call requestLayout from onLayout" into gb-ub-photos-bryce # By Marco Nelissen # Via Android (Google) Code Review (1) and ztenghui (1) * commit '882d3acccc98ec4a1bbe01d19a66d3e3a564a49b': DO NOT MERGE: Don't call requestLayout from onLayout
|
882d3acccc98ec4a1bbe01d19a66d3e3a564a49b |
12-Feb-2013 |
Tenghui Zhu <ztenghui@google.com> |
Merge "DO NOT MERGE: Don't call requestLayout from onLayout" into gb-ub-photos-bryce
|
e5349356383416c813db70544624cf2f3d72a65c |
12-Feb-2013 |
Tenghui Zhu <ztenghui@google.com> |
Merge "DO NOT MERGE: Don't call requestLayout from onLayout" into gb-ub-photos-bryce
|
192a16ce9690f6710c0af4c64d1a2617aff0cae1 |
07-Feb-2013 |
Marco Nelissen <marcone@google.com> |
DO NOT MERGE: Don't call requestLayout from onLayout Doing a layout within a layout can lead to various problems, so it should be avoided. There's some logging that warns of this, which got triggered by CommonControllerOverlay. I don't know what problem this code was originally trying to solve, but it doesn't seem to be necessary anymore. The line in question was originally introduced in change 209a9163d4e8cee0bfe162ae598ef40e6051479c, in Oct 2011. Note: This has been checked into master, this is just cherry picking into Bryce branch. Change-Id: I7651304491a90e8d130f4a0a3b3de8e29c4d0116
rc/com/android/gallery3d/app/CommonControllerOverlay.java
|
fc7f760667061a64e5acf09d80e08472fe148260 |
07-Feb-2013 |
Marco Nelissen <marcone@google.com> |
DO NOT MERGE: Don't call requestLayout from onLayout Doing a layout within a layout can lead to various problems, so it should be avoided. There's some logging that warns of this, which got triggered by CommonControllerOverlay. I don't know what problem this code was originally trying to solve, but it doesn't seem to be necessary anymore. The line in question was originally introduced in change 209a9163d4e8cee0bfe162ae598ef40e6051479c, in Oct 2011. Note: This has been checked into master, this is just cherry picking into Bryce branch. Change-Id: I7651304491a90e8d130f4a0a3b3de8e29c4d0116
rc/com/android/gallery3d/app/CommonControllerOverlay.java
|
94946a72d9162e9f96dfdc3b23520d4078f1fa82 |
12-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
am a0d689f1: Add null check on the source URI # Via nicolasroard * commit 'a0d689f180db4c995d5be39a326b1fb5b21ff5c0': Add null check on the source URI
|
80980cbad5867f10d5ad36687db2c5ef3101b5d7 |
12-Feb-2013 |
John Hoford <hoford@google.com> |
fix the draw clear bug Change-Id: I1050c3e1ad1280480f35a03c9d29dc1cd44b515f
rc/com/android/gallery3d/filtershow/filters/FilterDrawRepresentation.java
|
573295249304781fdd5ff5e42c729455f5a1dc7c |
12-Feb-2013 |
John Hoford <hoford@google.com> |
fix the draw clear bug Change-Id: I1050c3e1ad1280480f35a03c9d29dc1cd44b515f
rc/com/android/gallery3d/filtershow/editors/EditorDraw.java
rc/com/android/gallery3d/filtershow/filters/FilterDrawRepresentation.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterDraw.java
|
bd4c46989171b5171797e0dbf4b33a1914ffba49 |
12-Feb-2013 |
John Hoford <hoford@google.com> |
fix the draw clear bug Change-Id: I1050c3e1ad1280480f35a03c9d29dc1cd44b515f
rc/com/android/gallery3d/filtershow/editors/EditorDraw.java
rc/com/android/gallery3d/filtershow/filters/FilterDrawRepresentation.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterDraw.java
|
a0d689f180db4c995d5be39a326b1fb5b21ff5c0 |
12-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Add null check on the source URI bug:8181133 Change-Id: I1a7226db3ceb42a759f24c9b70f140a63a4294f0
rc/com/android/gallery3d/filtershow/cache/ImageLoader.java
rc/com/android/gallery3d/filtershow/tools/SaveCopyTask.java
|
0e1fd65c1b797dbed03570bf5e4f868600d680c3 |
12-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Add null check on the source URI bug:8181133 Change-Id: I1a7226db3ceb42a759f24c9b70f140a63a4294f0
rc/com/android/gallery3d/filtershow/cache/ImageLoader.java
rc/com/android/gallery3d/filtershow/tools/SaveCopyTask.java
|
66dbaf77e8eaf3cd9f4887825bc640a913eba5e1 |
12-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
am 80149cd6: Merge "Limit preview size" into gb-ub-photos-bryce # Via Android (Google) Code Review (1) and nicolasroard (1) * commit '80149cd62b58b32d5247eb76a6f9e1f3427549d6': Limit preview size
|
80149cd62b58b32d5247eb76a6f9e1f3427549d6 |
12-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Merge "Limit preview size" into gb-ub-photos-bryce
|
c424eac7acdeb2ab1f3aa900606c49bada94fcf6 |
12-Feb-2013 |
Baligh Uddin <baligh@google.com> |
am 6ed18cb4: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce # Via Android (Google) Code Review (1) and Baligh Uddin (1) * commit '6ed18cb44f09b423b184f836a779f088ea98bd66': Import translations. DO NOT MERGE
|
d0e2d758f5cf2340cb1894b00b4c40e1d5a36b6f |
12-Feb-2013 |
Baligh Uddin <baligh@google.com> |
am 5f8bb818: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce # Via Android (Google) Code Review (1) and Baligh Uddin (1) * commit '5f8bb818b06a6ddf6232f4da8e3819232562e368': Import translations. DO NOT MERGE
|
1c00e97c214dc8c0a73f02b9faec53ce02d81b54 |
12-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Limit preview size Change-Id: I4b9b43abcb509407f9244a776d31cc96876a26cd
rc/com/android/gallery3d/filtershow/cache/ImageLoader.java
|
17ce4d7a189d91ecb677205d1a02479ffea4fc2e |
12-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Limit preview size Change-Id: I4b9b43abcb509407f9244a776d31cc96876a26cd
rc/com/android/gallery3d/filtershow/cache/ImageLoader.java
|
20fcfe3f3f77a1d758fe05f5b6d87ae35541e772 |
12-Feb-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE"
|
32766ee5041cdefb8659c41a7fb075a6256f4b46 |
12-Feb-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
|
6ed18cb44f09b423b184f836a779f088ea98bd66 |
12-Feb-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
|
3f80f862674797fd23843e8a63129d232572c6b5 |
12-Feb-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE"
|
5f8bb818b06a6ddf6232f4da8e3819232562e368 |
12-Feb-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
|
7348528647b756ba1bd71af3c41afffa179c9314 |
12-Feb-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
|
eae66e01631a166511c76670f4259004b8ddf6d3 |
12-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
am f6076047: Refactor FiltersManager # Via nicolasroard * commit 'f60760478ec7c78446be0e0c6bc5502d1557974c': Refactor FiltersManager
|
ffc50f7a3ce2b9c290e4c3fddba16061ffbc3941 |
12-Feb-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I0c6290e33ba9aa3d2d099c5e0c1c6e286af6cd3f Auto-generated-cl: translation import
es/values-af/filtershow_strings.xml
es/values-am/filtershow_strings.xml
es/values-ar/filtershow_strings.xml
es/values-be/filtershow_strings.xml
es/values-bg/filtershow_strings.xml
es/values-ca/filtershow_strings.xml
es/values-cs/filtershow_strings.xml
es/values-da/filtershow_strings.xml
es/values-de/filtershow_strings.xml
es/values-el/filtershow_strings.xml
es/values-en-rGB/filtershow_strings.xml
es/values-es-rUS/filtershow_strings.xml
es/values-es/filtershow_strings.xml
es/values-et/filtershow_strings.xml
es/values-fa/filtershow_strings.xml
es/values-fi/filtershow_strings.xml
es/values-fr/filtershow_strings.xml
es/values-hi/filtershow_strings.xml
es/values-hr/filtershow_strings.xml
es/values-hu/filtershow_strings.xml
es/values-in/filtershow_strings.xml
es/values-it/filtershow_strings.xml
es/values-iw/filtershow_strings.xml
es/values-ja/filtershow_strings.xml
es/values-ko/filtershow_strings.xml
es/values-lt/filtershow_strings.xml
es/values-lv/filtershow_strings.xml
es/values-ms/filtershow_strings.xml
es/values-nb/filtershow_strings.xml
es/values-nl/filtershow_strings.xml
es/values-pl/filtershow_strings.xml
es/values-pt-rPT/filtershow_strings.xml
es/values-pt/filtershow_strings.xml
es/values-ro/filtershow_strings.xml
es/values-ru/filtershow_strings.xml
es/values-sk/filtershow_strings.xml
es/values-sl/filtershow_strings.xml
es/values-sr/filtershow_strings.xml
es/values-sv/filtershow_strings.xml
es/values-sw/filtershow_strings.xml
es/values-th/filtershow_strings.xml
es/values-tl/filtershow_strings.xml
es/values-tr/filtershow_strings.xml
es/values-uk/filtershow_strings.xml
es/values-vi/filtershow_strings.xml
es/values-zh-rCN/filtershow_strings.xml
es/values-zh-rTW/filtershow_strings.xml
es/values-zu/filtershow_strings.xml
|
3f1f054e2a02ed5bd64dc7b432072fb9bcd5fe8f |
12-Feb-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I4494f5cb2e1ed520a15a3a8052713559ee48e362 Auto-generated-cl: translation import
es/values-af/filtershow_strings.xml
es/values-am/filtershow_strings.xml
es/values-ar/filtershow_strings.xml
es/values-be/filtershow_strings.xml
es/values-bg/filtershow_strings.xml
es/values-ca/filtershow_strings.xml
es/values-cs/filtershow_strings.xml
es/values-da/filtershow_strings.xml
es/values-de/filtershow_strings.xml
es/values-el/filtershow_strings.xml
es/values-en-rGB/filtershow_strings.xml
es/values-es-rUS/filtershow_strings.xml
es/values-es/filtershow_strings.xml
es/values-et/filtershow_strings.xml
es/values-fa/filtershow_strings.xml
es/values-fi/filtershow_strings.xml
es/values-fr/filtershow_strings.xml
es/values-hi/filtershow_strings.xml
es/values-hr/filtershow_strings.xml
es/values-hu/filtershow_strings.xml
es/values-in/filtershow_strings.xml
es/values-it/filtershow_strings.xml
es/values-iw/filtershow_strings.xml
es/values-ja/filtershow_strings.xml
es/values-ko/filtershow_strings.xml
es/values-lt/filtershow_strings.xml
es/values-lv/filtershow_strings.xml
es/values-ms/filtershow_strings.xml
es/values-nb/filtershow_strings.xml
es/values-nl/filtershow_strings.xml
es/values-pl/filtershow_strings.xml
es/values-pt-rPT/filtershow_strings.xml
es/values-pt/filtershow_strings.xml
es/values-ro/filtershow_strings.xml
es/values-ru/filtershow_strings.xml
es/values-sk/filtershow_strings.xml
es/values-sl/filtershow_strings.xml
es/values-sr/filtershow_strings.xml
es/values-sv/filtershow_strings.xml
es/values-sw/filtershow_strings.xml
es/values-th/filtershow_strings.xml
es/values-tl/filtershow_strings.xml
es/values-tr/filtershow_strings.xml
es/values-uk/filtershow_strings.xml
es/values-vi/filtershow_strings.xml
es/values-zh-rCN/filtershow_strings.xml
es/values-zh-rTW/filtershow_strings.xml
es/values-zu/filtershow_strings.xml
|
98cd851db221f33445e4f178657ad3fd9f91e180 |
12-Feb-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I4494f5cb2e1ed520a15a3a8052713559ee48e362 Auto-generated-cl: translation import
es/values-af/filtershow_strings.xml
es/values-am/filtershow_strings.xml
es/values-ar/filtershow_strings.xml
es/values-be/filtershow_strings.xml
es/values-bg/filtershow_strings.xml
es/values-ca/filtershow_strings.xml
es/values-cs/filtershow_strings.xml
es/values-da/filtershow_strings.xml
es/values-de/filtershow_strings.xml
es/values-el/filtershow_strings.xml
es/values-en-rGB/filtershow_strings.xml
es/values-es-rUS/filtershow_strings.xml
es/values-es/filtershow_strings.xml
es/values-et/filtershow_strings.xml
es/values-fa/filtershow_strings.xml
es/values-fi/filtershow_strings.xml
es/values-fr/filtershow_strings.xml
es/values-hi/filtershow_strings.xml
es/values-hr/filtershow_strings.xml
es/values-hu/filtershow_strings.xml
es/values-in/filtershow_strings.xml
es/values-it/filtershow_strings.xml
es/values-iw/filtershow_strings.xml
es/values-ja/filtershow_strings.xml
es/values-ko/filtershow_strings.xml
es/values-lt/filtershow_strings.xml
es/values-lv/filtershow_strings.xml
es/values-ms/filtershow_strings.xml
es/values-nb/filtershow_strings.xml
es/values-nl/filtershow_strings.xml
es/values-pl/filtershow_strings.xml
es/values-pt-rPT/filtershow_strings.xml
es/values-pt/filtershow_strings.xml
es/values-ro/filtershow_strings.xml
es/values-ru/filtershow_strings.xml
es/values-sk/filtershow_strings.xml
es/values-sl/filtershow_strings.xml
es/values-sr/filtershow_strings.xml
es/values-sv/filtershow_strings.xml
es/values-sw/filtershow_strings.xml
es/values-th/filtershow_strings.xml
es/values-tl/filtershow_strings.xml
es/values-tr/filtershow_strings.xml
es/values-uk/filtershow_strings.xml
es/values-vi/filtershow_strings.xml
es/values-zh-rCN/filtershow_strings.xml
es/values-zh-rTW/filtershow_strings.xml
es/values-zu/filtershow_strings.xml
|
905f4ec3a9f7f673468ca508f7a9e3a95ae54acb |
12-Feb-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I8f68b37684a24695e146f8cd68fc7d2e1716b737 Auto-generated-cl: translation import
es/values-sw/strings.xml
|
dbfa3a38862034c2e8afc2118bcd8271291d111f |
12-Feb-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ie08f4a95d5662bfb313a851c12a2643997365eeb Auto-generated-cl: translation import
es/values-sw/strings.xml
|
fe61f3790d4c1fccfc0d63ca74ec2cba3fa54854 |
12-Feb-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ie08f4a95d5662bfb313a851c12a2643997365eeb Auto-generated-cl: translation import
es/values-sw/strings.xml
|
3c3f2336bfc8f6d5fc6d94a807d40df327481df7 |
12-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Refactor FiltersManager Change-Id: I4c42ddb90e65e90af873eb8dbe065f4fa3de69ef
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/cache/FilteringPipeline.java
rc/com/android/gallery3d/filtershow/filters/BaseFiltersManager.java
rc/com/android/gallery3d/filtershow/filters/FilterDrawRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterFxRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterRedEyeRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterTinyPlanetRepresentation.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterWBalance.java
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
rc/com/android/gallery3d/filtershow/ui/FilterIconButton.java
rc/com/android/gallery3d/filtershow/ui/ImageCurves.java
rc_pd/com/android/gallery3d/filtershow/filters/FiltersManager.java
|
f60760478ec7c78446be0e0c6bc5502d1557974c |
12-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Refactor FiltersManager Change-Id: I4c42ddb90e65e90af873eb8dbe065f4fa3de69ef
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/cache/FilteringPipeline.java
rc/com/android/gallery3d/filtershow/filters/BaseFiltersManager.java
rc/com/android/gallery3d/filtershow/filters/FilterDrawRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterFxRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterRedEyeRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterTinyPlanetRepresentation.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterWBalance.java
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
rc/com/android/gallery3d/filtershow/ui/FilterIconButton.java
rc/com/android/gallery3d/filtershow/ui/ImageCurves.java
rc_pd/com/android/gallery3d/filtershow/filters/FiltersManager.java
|
f4329b239c54d98e1fb7a0b29a9eb2c84ad97791 |
12-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Refactor FiltersManager Change-Id: I4c42ddb90e65e90af873eb8dbe065f4fa3de69ef
rc/com/android/gallery3d/filtershow/filters/FilterDrawRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterFxRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterRedEyeRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterTinyPlanetRepresentation.java
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
|
b75e3b3fd930f5f587b2d37b2e7ab413678e0c05 |
12-Feb-2013 |
John Hoford <hoford@google.com> |
am 99baf613: refactor quality to be int # Via John Hoford * commit '99baf61387ab1ef15bb9db5fa3b2b55591e87059': refactor quality to be int
|
c04f50dd1ed5523c21e587bc899e7d3610e68b25 |
12-Feb-2013 |
John Hoford <hoford@google.com> |
refactor quality to be int Change-Id: I0470abdbe75cf48c5228e80b9dc060ae6f3d8bbd
rc/com/android/gallery3d/filtershow/cache/FilteringPipeline.java
rc/com/android/gallery3d/filtershow/cache/ImageLoader.java
rc/com/android/gallery3d/filtershow/editors/EditorDraw.java
rc/com/android/gallery3d/filtershow/filters/FilterDrawRepresentation.java
rc/com/android/gallery3d/filtershow/filters/ImageFilter.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterBorder.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterBwFilter.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterContrast.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterCurves.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterDownsample.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterDraw.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterEdge.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterExposure.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterFx.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterGeometry.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterHue.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterKMeans.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterNegative.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterParametricBorder.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterRS.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterRedEye.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterSaturated.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterShadows.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterSharpen.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterStraighten.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterTinyPlanet.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterVibrance.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterVignette.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterWBalance.java
rc/com/android/gallery3d/filtershow/filters/SimpleImageFilter.java
rc/com/android/gallery3d/filtershow/imageshow/GeometryMetadata.java
rc/com/android/gallery3d/filtershow/imageshow/ImageDraw.java
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
|
99baf61387ab1ef15bb9db5fa3b2b55591e87059 |
12-Feb-2013 |
John Hoford <hoford@google.com> |
refactor quality to be int Change-Id: I0470abdbe75cf48c5228e80b9dc060ae6f3d8bbd
es/menu/filtershow_menu_draw.xml
es/values/filtershow_strings.xml
rc/com/android/gallery3d/filtershow/cache/FilteringPipeline.java
rc/com/android/gallery3d/filtershow/cache/ImageLoader.java
rc/com/android/gallery3d/filtershow/editors/EditorDraw.java
rc/com/android/gallery3d/filtershow/filters/FilterDrawRepresentation.java
rc/com/android/gallery3d/filtershow/filters/ImageFilter.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterBorder.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterBwFilter.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterContrast.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterCurves.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterDownsample.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterDraw.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterEdge.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterExposure.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterFx.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterGeometry.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterHue.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterKMeans.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterNegative.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterParametricBorder.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterRS.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterRedEye.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterSaturated.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterShadows.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterSharpen.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterStraighten.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterTinyPlanet.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterVibrance.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterVignette.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterWBalance.java
rc/com/android/gallery3d/filtershow/filters/SimpleImageFilter.java
rc/com/android/gallery3d/filtershow/imageshow/GeometryMetadata.java
rc/com/android/gallery3d/filtershow/imageshow/ImageDraw.java
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
|
7bddc10fbdc91973ba1cf922590e849f0d53c1f2 |
12-Feb-2013 |
John Hoford <hoford@google.com> |
refactor quality to be int Change-Id: I0470abdbe75cf48c5228e80b9dc060ae6f3d8bbd
es/menu/filtershow_menu_draw.xml
es/values/filtershow_strings.xml
rc/com/android/gallery3d/filtershow/filters/FilterDrawRepresentation.java
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
|
101182d28753efb105c0a31a6b14afc3010818df |
12-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
am b01a3282: Add reset bitmap for RS filters # Via nicolasroard * commit 'b01a32825018cfb79f2c965c1c3e3e25b5131229': Add reset bitmap for RS filters
|
b01a32825018cfb79f2c965c1c3e3e25b5131229 |
12-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Add reset bitmap for RS filters Change-Id: I34e28ca72d13f9b5f8054d8a2c07cfffca4e85c6
rc/com/android/gallery3d/filtershow/cache/FilteringPipeline.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterRS.java
rc_pd/com/android/gallery3d/filtershow/filters/FiltersManager.java
|
3d3a66695f3d022a71e8b9c77326eb68cd15b31d |
12-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Add reset bitmap for RS filters Change-Id: I34e28ca72d13f9b5f8054d8a2c07cfffca4e85c6
rc/com/android/gallery3d/filtershow/cache/FilteringPipeline.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterRS.java
rc_pd/com/android/gallery3d/filtershow/filters/FiltersManager.java
|
12499da77ecd31724962f81c5df5d1fd898bb5f3 |
12-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
am 4a3c526c: Update thumbnails when the geometry changes # Via nicolasroard * commit '4a3c526cd15979fbbd46c51dbf508747914f683f': Update thumbnails when the geometry changes
|
4a3c526cd15979fbbd46c51dbf508747914f683f |
12-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Update thumbnails when the geometry changes Change-Id: I44d70839efb7e00edfb1e6c1f73296beab09783c
rc/com/android/gallery3d/filtershow/imageshow/GeometryListener.java
rc/com/android/gallery3d/filtershow/imageshow/MasterImage.java
rc/com/android/gallery3d/filtershow/ui/FilterIconButton.java
|
c4816efb49d3e90e37835d9359a6fa8447df97df |
12-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Update thumbnails when the geometry changes Change-Id: I44d70839efb7e00edfb1e6c1f73296beab09783c
rc/com/android/gallery3d/filtershow/imageshow/GeometryListener.java
rc/com/android/gallery3d/filtershow/imageshow/MasterImage.java
rc/com/android/gallery3d/filtershow/ui/FilterIconButton.java
|
31019e09eaaa460e68b3f90a881ea3278fbd6108 |
12-Feb-2013 |
Angus Kong <shkong@google.com> |
Wait for the previous MosaicPreviewRenderer to end When changing orientations very fast, there might be 2 MosaicPreviewRenderer instances accessing the SRI native library at the same time. The library is not designed so. bug:8151753 Change-Id: Ie7a381349feeb95b40bae3c093cfcb66acba9069
rc/com/android/camera/MosaicFrameProcessor.java
rc/com/android/camera/MosaicPreviewRenderer.java
|
bcdad08ff2530da1b0a6991449ff9bb2998967ee |
12-Feb-2013 |
Angus Kong <shkong@google.com> |
Wait for the previous MosaicPreviewRenderer to end When changing orientations very fast, there might be 2 MosaicPreviewRenderer instances accessing the SRI native library at the same time. The library is not designed so. bug:8151753 Change-Id: Ie7a381349feeb95b40bae3c093cfcb66acba9069
rc/com/android/camera/MosaicFrameProcessor.java
rc/com/android/camera/MosaicPreviewRenderer.java
|
5293ac8008efa70da94bba956fce3504096e74cd |
12-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
am 263eb844: Merge "Generate thumbnails asynchronously" into gb-ub-photos-bryce # Via Android (Google) Code Review (1) and nicolasroard (1) * commit '263eb84489462e5792406710ddb1a9772135b4e9': Generate thumbnails asynchronously
|
0c5bacd7e45c4f08796ce047fbc356e696c4da65 |
12-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Merge "Generate thumbnails asynchronously" into gb-ub-photos-bryce
|
263eb84489462e5792406710ddb1a9772135b4e9 |
12-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Merge "Generate thumbnails asynchronously" into gb-ub-photos-bryce
|
627fc8510e6be9535741afab832786a441abc4d0 |
12-Feb-2013 |
John Hoford <hoford@google.com> |
am c364d9f2: remove animations if before Jelly Bean # Via John Hoford * commit 'c364d9f2de28f79c636fcb145c355da52f52b7ad': remove animations if before Jelly Bean
|
b4bab5ddbbb6aa15ae8646686b30021083718a3d |
12-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Generate thumbnails asynchronously Change-Id: I6a2520fc869280a2a7be9c9b5673e17038964a02
rc/com/android/gallery3d/filtershow/cache/FilteringPipeline.java
rc/com/android/gallery3d/filtershow/cache/RenderingRequest.java
rc/com/android/gallery3d/filtershow/imageshow/ImageShow.java
rc/com/android/gallery3d/filtershow/imageshow/MasterImage.java
rc/com/android/gallery3d/filtershow/ui/FilterIconButton.java
rc/com/android/gallery3d/filtershow/ui/IconButton.java
|
098159c2e78f506fcb63385526e038088fc34759 |
12-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Generate thumbnails asynchronously Change-Id: I6a2520fc869280a2a7be9c9b5673e17038964a02
rc/com/android/gallery3d/filtershow/cache/FilteringPipeline.java
rc/com/android/gallery3d/filtershow/cache/RenderingRequest.java
rc/com/android/gallery3d/filtershow/imageshow/ImageShow.java
rc/com/android/gallery3d/filtershow/imageshow/MasterImage.java
rc/com/android/gallery3d/filtershow/ui/FilterIconButton.java
rc/com/android/gallery3d/filtershow/ui/IconButton.java
|
627bd81fc0a71f6401a4e4ea4014c55353a706bd |
12-Feb-2013 |
John Hoford <hoford@google.com> |
remove animations if before Jelly Bean Change-Id: Ifb60390f513f60af2875cbc2218fdc185752e9b2
es/layout/filtershow_activity.xml
|
e7f63075622f37d40bbbc8b17eb1b4be1cb2cf82 |
12-Feb-2013 |
John Hoford <hoford@google.com> |
remove animations if before Jelly Bean Change-Id: Ifb60390f513f60af2875cbc2218fdc185752e9b2
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/PanelController.java
|
c364d9f2de28f79c636fcb145c355da52f52b7ad |
12-Feb-2013 |
John Hoford <hoford@google.com> |
remove animations if before Jelly Bean Change-Id: Ifb60390f513f60af2875cbc2218fdc185752e9b2
es/layout/filtershow_activity.xml
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/PanelController.java
|
6274de85ca529edd4cc6fb0ab1b3d8c0a01e2bc1 |
12-Feb-2013 |
John Hoford <hoford@google.com> |
am e2c4d033: fixes the draw and clean up the UI # Via John Hoford * commit 'e2c4d033de164d886af9d242d8672570730580d6': fixes the draw and clean up the UI
|
9bf2f37a9ae5392bd23cd585682cd6406954237b |
12-Feb-2013 |
The Android Automerger <android-build@android.com> |
merge in jb-mr2-release history after reset to master
|
87448bd5c6446fca8309eefa6399ac146868e72a |
12-Feb-2013 |
John Hoford <hoford@google.com> |
fixes the draw and clean up the UI Change-Id: Ia52dfc3ec407c307612dcfc91fb61a1fb89e32ec
es/drawable-nodpi/brush1.png
es/drawable-nodpi/brush2.png
es/drawable-nodpi/brush_marker.png
es/drawable-nodpi/brush_spatter.png
es/menu/filtershow_menu_draw.xml
es/values/filtershow_strings.xml
|
2d445b63f5d4d3204374a1955a4a679023362c96 |
12-Feb-2013 |
John Hoford <hoford@google.com> |
fixes the draw and clean up the UI Change-Id: Ia52dfc3ec407c307612dcfc91fb61a1fb89e32ec
rc/com/android/gallery3d/filtershow/editors/EditorDraw.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterDraw.java
rc/com/android/gallery3d/filtershow/imageshow/ImageDraw.java
|
e2c4d033de164d886af9d242d8672570730580d6 |
12-Feb-2013 |
John Hoford <hoford@google.com> |
fixes the draw and clean up the UI Change-Id: Ia52dfc3ec407c307612dcfc91fb61a1fb89e32ec
es/drawable-nodpi/brush1.png
es/drawable-nodpi/brush2.png
es/drawable-nodpi/brush_marker.png
es/drawable-nodpi/brush_spatter.png
es/menu/filtershow_menu_draw.xml
es/values/filtershow_strings.xml
rc/com/android/gallery3d/filtershow/editors/EditorDraw.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterDraw.java
rc/com/android/gallery3d/filtershow/imageshow/ImageDraw.java
|
d58456a6830e637efd936c15a7cd7334fb3e40bb |
12-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
am 4b2933f8: Merge "Adding support for ICS" into gb-ub-photos-bryce # Via Android (Google) Code Review (1) and nicolasroard (1) * commit '4b2933f87acaebc29556cbab244b56840a90425d': Adding support for ICS
|
1d160fd11e594a7ae77ae09d9f561b02cc9030a0 |
12-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Merge "Adding support for ICS" into gb-ub-photos-bryce
|
4b2933f87acaebc29556cbab244b56840a90425d |
12-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Merge "Adding support for ICS" into gb-ub-photos-bryce
|
d3b009b2c15c607c0b4bcc72412c45d231e26ca2 |
12-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Adding support for ICS Change-Id: I550d461b08a4cc5ceb3cdefd82301d5986325184
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/PanelController.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterBorder.java
|
d31603218b1f5f58a3617a21425622790ffff472 |
12-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Adding support for ICS Change-Id: I550d461b08a4cc5ceb3cdefd82301d5986325184
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/PanelController.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterBorder.java
|
bd58c533bcc3e368cbb6d7e9dfb9619692fb66a9 |
12-Feb-2013 |
John Hoford <hoford@google.com> |
am 431f45e1: Merge "fix red eye to use the new system" into gb-ub-photos-bryce # Via Android (Google) Code Review (1) and John Hoford (1) * commit '431f45e14bbfabdd43ba70de47451cc07ab4c949': fix red eye to use the new system
|
431f45e14bbfabdd43ba70de47451cc07ab4c949 |
12-Feb-2013 |
John Hoford <hoford@google.com> |
Merge "fix red eye to use the new system" into gb-ub-photos-bryce
|
1b5d8c1b9218bf0e9900e26ea13d9d271a94e1b9 |
12-Feb-2013 |
Stephen Hines <srhines@google.com> |
am 46dcad6e: Merge "Switch to GalleryGoogle as default provider for RS files (from Gallery2)." into gb-ub-photos-bryce # Via Android (Google) Code Review (1) and Stephen Hines (1) * commit '46dcad6e7c0178f58696feb25cdbfc4ce4cbf235': Switch to GalleryGoogle as default provider for RS files (from Gallery2).
|
46dcad6e7c0178f58696feb25cdbfc4ce4cbf235 |
12-Feb-2013 |
Stephen Hines <srhines@google.com> |
Merge "Switch to GalleryGoogle as default provider for RS files (from Gallery2)." into gb-ub-photos-bryce
|
e82cbe5123ddc860a443b5327182a5a89fc2ef6c |
09-Feb-2013 |
John Hoford <hoford@google.com> |
fix red eye to use the new system Change-Id: If79106dc3144cce374afd410f5f859692e564b83
es/layout/filtershow_activity.xml
es/values/filtershow_ids.xml
rc/com/android/gallery3d/filtershow/filters/FilterRedEyeRepresentation.java
|
3e926284099152f14a78910c744d462d13a044e5 |
09-Feb-2013 |
John Hoford <hoford@google.com> |
fix red eye to use the new system Change-Id: If79106dc3144cce374afd410f5f859692e564b83
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/editors/EditorRedEye.java
rc/com/android/gallery3d/filtershow/editors/EditorTinyPlanet.java
rc/com/android/gallery3d/filtershow/filters/FilterRedEyeRepresentation.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterRedEye.java
rc/com/android/gallery3d/filtershow/imageshow/ImageRedEye.java
rc/com/android/gallery3d/filtershow/imageshow/ImageRedEyes.java
rc_pd/com/android/gallery3d/filtershow/filters/FiltersManager.java
|
12c7c8ed14ca9dff9de64e121282f1970cbe7ae4 |
09-Feb-2013 |
John Hoford <hoford@google.com> |
fix red eye to use the new system Change-Id: If79106dc3144cce374afd410f5f859692e564b83
es/layout/filtershow_activity.xml
es/values/filtershow_ids.xml
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/editors/EditorRedEye.java
rc/com/android/gallery3d/filtershow/editors/EditorTinyPlanet.java
rc/com/android/gallery3d/filtershow/filters/FilterRedEyeRepresentation.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterRedEye.java
rc/com/android/gallery3d/filtershow/imageshow/ImageRedEye.java
rc/com/android/gallery3d/filtershow/imageshow/ImageRedEyes.java
rc_pd/com/android/gallery3d/filtershow/filters/FiltersManager.java
|
8d573605e561c84fd538d41a739e0ab9b79ab0f4 |
12-Feb-2013 |
Tim Murray <timmurray@google.com> |
am 32ee1acb: Merge "Only create one RS context." into gb-ub-photos-bryce # Via Android (Google) Code Review (1) and Tim Murray (1) * commit '32ee1acbd9f9ab0db382f0947a1ca1f3dfe52059': Only create one RS context.
|
efb0129a41d426b29818df6bb2e7a4920df4526d |
12-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
am 31e52aae: Move useFilterRepresentation to PanelController # Via nicolasroard * commit '31e52aae5eeefd8383cb238e7dd3047e883968ef': Move useFilterRepresentation to PanelController
|
83eeb942e8eda7da94303eb1c105164c253cdbba |
12-Feb-2013 |
Tim Murray <timmurray@google.com> |
Merge "Only create one RS context." into gb-ub-photos-bryce
|
32ee1acbd9f9ab0db382f0947a1ca1f3dfe52059 |
12-Feb-2013 |
Tim Murray <timmurray@google.com> |
Merge "Only create one RS context." into gb-ub-photos-bryce
|
31e52aae5eeefd8383cb238e7dd3047e883968ef |
12-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Move useFilterRepresentation to PanelController Change-Id: I8abd9b2bd1b808df6a84e334b6eaa36b1c16750d
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/PanelController.java
rc/com/android/gallery3d/filtershow/ui/FilterIconButton.java
|
da1c8d757aad7f7f0077ff99283b3db98e2ea395 |
12-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Move useFilterRepresentation to PanelController Change-Id: I8abd9b2bd1b808df6a84e334b6eaa36b1c16750d
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/PanelController.java
rc/com/android/gallery3d/filtershow/ui/FilterIconButton.java
|
3adce2f354258282f9c0e19667786ea79481feeb |
12-Feb-2013 |
Tim Murray <timmurray@google.com> |
Only create one RS context. Change-Id: I527da839142cd2e48fb81e8cb02b43f6f87147d6
rc/com/android/gallery3d/filtershow/filters/ImageFilterRS.java
|
7921e124d57759d6f0887a42ddc360d923e60cdd |
12-Feb-2013 |
Tim Murray <timmurray@google.com> |
Only create one RS context. Change-Id: I527da839142cd2e48fb81e8cb02b43f6f87147d6
rc/com/android/gallery3d/filtershow/filters/ImageFilterRS.java
|
a88389ca6facab7c0d2811c349b33eb2c9ea6268 |
11-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
am 2d5cc151: Merge "Cleaning filters" into gb-ub-photos-bryce # Via Android (Google) Code Review (1) and nicolasroard (1) * commit '2d5cc15139b6509d0328411fbed2f000b8c6343a': Cleaning filters
|
6c2d6d42f3fdf14fd2c99093dc01a305e23d5c56 |
11-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Merge "Cleaning filters" into gb-ub-photos-bryce
|
2d5cc15139b6509d0328411fbed2f000b8c6343a |
11-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Merge "Cleaning filters" into gb-ub-photos-bryce
|
c4447bec1e57d301739f37be3258ecc896edc595 |
11-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Merge "Cleaning filters" into gb-ub-photos-bryce
|
a02033985b2be6d366862bf537e02533f9653da4 |
11-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Cleaning filters Change-Id: I413b935f90cebdab37d3db73d7fcb0fe77a64579
rc/com/android/gallery3d/filtershow/filters/FilterColorBorderRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterCurvesRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterDrawRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterFxRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterImageBorderRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterTinyPlanetRepresentation.java
|
6900cad45d240c9a54b92991538b6a33652e766c |
11-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Cleaning filters Change-Id: I413b935f90cebdab37d3db73d7fcb0fe77a64579
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/PanelController.java
rc/com/android/gallery3d/filtershow/filters/FilterColorBorderRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterCurvesRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterDrawRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterFxRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterImageBorderRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterTinyPlanetRepresentation.java
rc/com/android/gallery3d/filtershow/filters/ImageFilter.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterBorder.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterBwFilter.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterContrast.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterCurves.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterDownsample.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterDraw.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterEdge.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterExposure.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterFx.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterGradient.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterHue.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterKMeans.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterNegative.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterParametricBorder.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterRedEye.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterSaturated.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterShadows.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterSharpen.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterTinyPlanet.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterVibrance.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterVignette.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterWBalance.java
rc/com/android/gallery3d/filtershow/filters/SimpleImageFilter.java
rc/com/android/gallery3d/filtershow/ui/FilterIconButton.java
rc_pd/com/android/gallery3d/filtershow/filters/FiltersManager.java
|
9c37635183f7908746982a191005d53f8efb71d6 |
11-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Cleaning filters Change-Id: I413b935f90cebdab37d3db73d7fcb0fe77a64579
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/PanelController.java
rc/com/android/gallery3d/filtershow/filters/FilterColorBorderRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterCurvesRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterDrawRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterFxRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterImageBorderRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterTinyPlanetRepresentation.java
rc/com/android/gallery3d/filtershow/filters/ImageFilter.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterBorder.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterBwFilter.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterContrast.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterCurves.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterDownsample.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterDraw.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterEdge.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterExposure.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterFx.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterGradient.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterHue.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterKMeans.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterNegative.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterParametricBorder.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterRedEye.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterSaturated.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterShadows.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterSharpen.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterTinyPlanet.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterVibrance.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterVignette.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterWBalance.java
rc/com/android/gallery3d/filtershow/filters/SimpleImageFilter.java
rc/com/android/gallery3d/filtershow/ui/FilterIconButton.java
rc_pd/com/android/gallery3d/filtershow/filters/FiltersManager.java
|
089b06147512cd73cfada01eb9cca429ee0094cc |
11-Feb-2013 |
Doris Liu <tianliu@google.com> |
am 61b332d8: Merge "Lock focus during countdown" into gb-ub-photos-bryce # Via Android (Google) Code Review (1) and Doris Liu (1) * commit '61b332d8fbed8772d01a08db82d0dc388b649013': Lock focus during countdown
|
cef56e96ff49a90d032699ed06b9991fc8486d2a |
11-Feb-2013 |
Doris Liu <tianliu@google.com> |
Merge "Lock focus during countdown" into gb-ub-photos-bryce
|
61b332d8fbed8772d01a08db82d0dc388b649013 |
11-Feb-2013 |
Doris Liu <tianliu@google.com> |
Merge "Lock focus during countdown" into gb-ub-photos-bryce
|
5beb76951a0c268a27b6f6b867ebac1ba9c3bd6d |
11-Feb-2013 |
Doris Liu <tianliu@google.com> |
am 401756be: Merge "Fix camera setting icons appearing in wrong place" into gb-ub-photos-bryce # Via Android (Google) Code Review (1) and Doris Liu (1) * commit '401756be3f741a0ac9255f103b07ccc645ff2252': Fix camera setting icons appearing in wrong place
|
3e23d53337d9f78ffed2523037f1cbb61a34398f |
11-Feb-2013 |
Doris Liu <tianliu@google.com> |
Merge "Fix camera setting icons appearing in wrong place" into gb-ub-photos-bryce
|
3f1665337123cbc5a21f7b424c224dc39c0f0d37 |
11-Feb-2013 |
Doris Liu <tianliu@google.com> |
Merge "Fix camera setting icons appearing in wrong place" into gb-ub-photos-bryce
|
401756be3f741a0ac9255f103b07ccc645ff2252 |
11-Feb-2013 |
Doris Liu <tianliu@google.com> |
Merge "Fix camera setting icons appearing in wrong place" into gb-ub-photos-bryce
|
a20095b28d895ef9fe63398320fa82c7e16fc1c1 |
11-Feb-2013 |
The Android Automerger <android-build@android.com> |
merge in jb-mr2-release history after reset to master
|
aa2d2b806cb4cc7a95eb412f2ac69268b893951c |
08-Feb-2013 |
Stephen Hines <srhines@google.com> |
Switch to GalleryGoogle as default provider for RS files (from Gallery2). Bug: 8138884 Change-Id: Ib2484852f0fa4299f6d0797838420493ce2607a0
ndroid.mk
|
52fa64616788bda77578bb82effc245c2c57747a |
08-Feb-2013 |
Stephen Hines <srhines@google.com> |
Switch to GalleryGoogle as default provider for RS files (from Gallery2). Bug: 8138884 Change-Id: Ib2484852f0fa4299f6d0797838420493ce2607a0
ndroid.mk
|
e9b527dfedb6dd8c6224690673629d9e8f4c4235 |
09-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
am cef6ad5d: Move filter type to representations # Via nicolasroard * commit 'cef6ad5d4a60a6e2960f7f72de624d5e60b3908a': Move filter type to representations
|
878fcb4379718e13504dbebe8cf51fc2b60de22b |
09-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Move filter type to representations Change-Id: I2d49447c57f4ff49001d27cdfa6482ca320c7a8b
rc/com/android/gallery3d/filtershow/filters/FilterColorBorderRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterFxRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterImageBorderRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterRepresentation.java
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
|
cef6ad5d4a60a6e2960f7f72de624d5e60b3908a |
09-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Move filter type to representations Change-Id: I2d49447c57f4ff49001d27cdfa6482ca320c7a8b
rc/com/android/gallery3d/filtershow/filters/FilterColorBorderRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterFxRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterImageBorderRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterRepresentation.java
rc/com/android/gallery3d/filtershow/filters/ImageFilter.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterDraw.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterFx.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterParametricBorder.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterTinyPlanet.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterVignette.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterWBalance.java
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
|
2b74cb3e2fbdde0a818eca06645b4a55553e371e |
09-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Move filter type to representations Change-Id: I2d49447c57f4ff49001d27cdfa6482ca320c7a8b
rc/com/android/gallery3d/filtershow/filters/FilterColorBorderRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterFxRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterImageBorderRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterRepresentation.java
rc/com/android/gallery3d/filtershow/filters/ImageFilter.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterDraw.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterFx.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterParametricBorder.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterTinyPlanet.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterVignette.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterWBalance.java
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
|
e2ee73235dadfa202e49b350bf11b8d4372ba194 |
09-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
am 50ffa175: Fix crash when reset # Via nicolasroard * commit '50ffa17594ab620b62db0cbb98d0b3a0fb4ac4fc': Fix crash when reset
|
50ffa17594ab620b62db0cbb98d0b3a0fb4ac4fc |
09-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Fix crash when reset Change-Id: Ibab01c4e218e30f3f4a67665d99dbc14bdc7d8ea
rc/com/android/gallery3d/filtershow/PanelController.java
|
c21332d00abceb1959fc43be2986a6c3d27a6707 |
09-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Fix crash when reset Change-Id: Ibab01c4e218e30f3f4a67665d99dbc14bdc7d8ea
rc/com/android/gallery3d/filtershow/PanelController.java
|
a60a8585f5faff5b893dbb8abb3fd207a15c7934 |
09-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
am 4aabe9d1: Merge "Fix loading screen" into gb-ub-photos-bryce # Via Android (Google) Code Review (1) and nicolasroard (1) * commit '4aabe9d1793ba797324cd7507f8d239d06fb547d': Fix loading screen
|
4aabe9d1793ba797324cd7507f8d239d06fb547d |
09-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Merge "Fix loading screen" into gb-ub-photos-bryce
|
b00a8188613462320491e5edad5feb6e7c01f788 |
09-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Merge "Fix loading screen" into gb-ub-photos-bryce
|
06b6cd2fdb02cd77ada72059a235928b7391c729 |
09-Feb-2013 |
Doris Liu <tianliu@google.com> |
Fix camera setting icons appearing in wrong place Bug: 7956904 Change-Id: I1b2d3fef8d82a3efeb0caa5130ce3dbb6808af70
es/layout-land/photo_module_content.xml
es/layout-land/video_module.xml
es/layout-port/photo_module_content.xml
es/layout-port/video_module.xml
|
40ac3829119a316ee11cbcc26d278b04ac581877 |
09-Feb-2013 |
Doris Liu <tianliu@google.com> |
Fix camera setting icons appearing in wrong place Bug: 7956904 Change-Id: I1b2d3fef8d82a3efeb0caa5130ce3dbb6808af70
rc/com/android/camera/ui/PieMenuButton.java
|
a6a3be3200f50dd1d18e9f2e970f4b6eac7af86c |
09-Feb-2013 |
Doris Liu <tianliu@google.com> |
Fix camera setting icons appearing in wrong place Bug: 7956904 Change-Id: I1b2d3fef8d82a3efeb0caa5130ce3dbb6808af70
es/layout-land/photo_module_content.xml
es/layout-land/video_module.xml
es/layout-port/photo_module_content.xml
es/layout-port/video_module.xml
rc/com/android/camera/ui/PieMenuButton.java
|
733a013ae1f2fe9979fb5a277b98af1544b8afb7 |
09-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Fix loading screen Change-Id: Id41c4c93782bea7f11d75f0ddcdd4529f4fc9758
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/PanelController.java
rc/com/android/gallery3d/filtershow/imageshow/ImageGeometry.java
rc/com/android/gallery3d/filtershow/imageshow/ImageShow.java
rc/com/android/gallery3d/filtershow/imageshow/MasterImage.java
|
e5d7ee43c55da14f6de1b392ea928db25499293b |
09-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Fix loading screen Change-Id: Id41c4c93782bea7f11d75f0ddcdd4529f4fc9758
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/PanelController.java
rc/com/android/gallery3d/filtershow/imageshow/ImageGeometry.java
rc/com/android/gallery3d/filtershow/imageshow/ImageShow.java
rc/com/android/gallery3d/filtershow/imageshow/MasterImage.java
|
0a8f2855283378a0387f1a8d026a42ebad499f02 |
09-Feb-2013 |
John Hoford <hoford@google.com> |
am 44a499a6: Fix tiny planet to work with the new framework # Via John Hoford * commit '44a499a64158cd5a12f8e44655f82b68c33bf3b2': Fix tiny planet to work with the new framework
|
7451e88f78f802542d25f4ad406b4f2f5f67c5f0 |
08-Feb-2013 |
John Hoford <hoford@google.com> |
Fix tiny planet to work with the new framework Change-Id: I57e87ade6f2cfdfee1b237cdfdf5914244ee98aa
es/layout/filtershow_tiny_planet_editor.xml
rc/com/android/gallery3d/filtershow/filters/FilterTinyPlanetRepresentation.java
|
44a499a64158cd5a12f8e44655f82b68c33bf3b2 |
08-Feb-2013 |
John Hoford <hoford@google.com> |
Fix tiny planet to work with the new framework Change-Id: I57e87ade6f2cfdfee1b237cdfdf5914244ee98aa
es/layout/filtershow_tiny_planet_editor.xml
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/editors/EditorTinyPlanet.java
rc/com/android/gallery3d/filtershow/filters/FilterTinyPlanetRepresentation.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterDraw.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterTinyPlanet.java
rc/com/android/gallery3d/filtershow/imageshow/ImageTinyPlanet.java
rc_pd/com/android/gallery3d/filtershow/editors/EditorManager.java
|
1bc931c09606f8a00fd8b41706e918a766389b20 |
08-Feb-2013 |
John Hoford <hoford@google.com> |
Fix tiny planet to work with the new framework Change-Id: I57e87ade6f2cfdfee1b237cdfdf5914244ee98aa
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/editors/EditorTinyPlanet.java
rc/com/android/gallery3d/filtershow/filters/FilterTinyPlanetRepresentation.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterDraw.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterTinyPlanet.java
rc/com/android/gallery3d/filtershow/imageshow/ImageTinyPlanet.java
rc_pd/com/android/gallery3d/filtershow/editors/EditorManager.java
|
fd645a1527ec34eee85e18bcf062cd942b48a80b |
08-Feb-2013 |
John Hoford <hoford@google.com> |
am 8029c856: remove slider from FX and Border UI # Via John Hoford * commit '8029c8567a162eb66fe54255bdeae264d594278d': remove slider from FX and Border UI
|
5d4f0916c8b990d86c0eb4e9517cfec50ddceca5 |
08-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
am 6d088c52: Merge "Fix leaks / init" into gb-ub-photos-bryce # Via Android (Google) Code Review (1) and nicolasroard (1) * commit '6d088c527485fb098833f8868a93bacd7d372443': Fix leaks / init
|
8029c8567a162eb66fe54255bdeae264d594278d |
08-Feb-2013 |
John Hoford <hoford@google.com> |
remove slider from FX and Border UI Change-Id: Ic1c38734c4351ab0150b90d5d4fc575cce9db9e9
es/layout/filtershow_activity.xml
es/values/filtershow_ids.xml
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/editors/ImageOnlyEditor.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterBorder.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterFx.java
|
b4e6733731e751afe7dcf2a3b9803d2f720cb253 |
08-Feb-2013 |
John Hoford <hoford@google.com> |
remove slider from FX and Border UI Change-Id: Ic1c38734c4351ab0150b90d5d4fc575cce9db9e9
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/editors/ImageOnlyEditor.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterBorder.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterFx.java
|
e954dde14204404ce14980d98c7b5504fa189d84 |
08-Feb-2013 |
John Hoford <hoford@google.com> |
remove slider from FX and Border UI Change-Id: Ic1c38734c4351ab0150b90d5d4fc575cce9db9e9
es/layout/filtershow_activity.xml
es/values/filtershow_ids.xml
|
6d088c527485fb098833f8868a93bacd7d372443 |
08-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Merge "Fix leaks / init" into gb-ub-photos-bryce
|
0606108a8126b357772db415ad4517395fce8875 |
08-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Merge "Fix leaks / init" into gb-ub-photos-bryce
|
47dbc0eb95c69d5eae633933af36cfcced5cd190 |
08-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Fix leaks / init Change-Id: I5befdc24cc89cdcfb73ee4d13f076b1c4a585cf6
rc/com/android/gallery3d/filtershow/filters/FilterImageBorderRepresentation.java
|
588c30c74178bc399b043a5401f0c1f93ae22378 |
08-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Fix leaks / init Change-Id: I5befdc24cc89cdcfb73ee4d13f076b1c4a585cf6
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/filters/FilterImageBorderRepresentation.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterBorder.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterRS.java
rc/com/android/gallery3d/filtershow/imageshow/MasterImage.java
|
deeddb19c78a4299cc0e4075ed0265820eeb20f0 |
08-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Fix leaks / init Change-Id: I5befdc24cc89cdcfb73ee4d13f076b1c4a585cf6
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/filters/FilterImageBorderRepresentation.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterBorder.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterRS.java
rc/com/android/gallery3d/filtershow/imageshow/MasterImage.java
|
79765ea5a8844cc9c7a4f4faa2e07180fbec8d77 |
08-Feb-2013 |
Bobby Georgescu <georgescu@google.com> |
am 2db8b143: Change transition from Gallery to Filtershow # Via Bobby Georgescu * commit '2db8b143cdcdecd81916c09e19e4c65e582dccf5': Change transition from Gallery to Filtershow
|
2db8b143cdcdecd81916c09e19e4c65e582dccf5 |
08-Feb-2013 |
Bobby Georgescu <georgescu@google.com> |
Change transition from Gallery to Filtershow Bug: 8163894 Change-Id: Iaed600df39a88b176cb8ed3316d187c26c6b7961
rc/com/android/gallery3d/app/PhotoPage.java
|
f46b5fd7f700252d303ca41bfb3fda0de04d0d4f |
08-Feb-2013 |
Bobby Georgescu <georgescu@google.com> |
Change transition from Gallery to Filtershow Bug: 8163894 Change-Id: Iaed600df39a88b176cb8ed3316d187c26c6b7961
rc/com/android/gallery3d/app/PhotoPage.java
|
ec67fb40bbd5663d770330d2dc95f3ccca8bc02f |
08-Feb-2013 |
Bobby Georgescu <georgescu@google.com> |
am 7d9a6595: Merge "Replace background getDrawable calls to avoid ANR" into gb-ub-photos-bryce # Via Android (Google) Code Review (1) and Bobby Georgescu (1) * commit '7d9a6595aa72a9e3a563bfb7cfbbfabca9602dbb': Replace background getDrawable calls to avoid ANR
|
7d9a6595aa72a9e3a563bfb7cfbbfabca9602dbb |
08-Feb-2013 |
Bobby Georgescu <georgescu@google.com> |
Merge "Replace background getDrawable calls to avoid ANR" into gb-ub-photos-bryce
|
f29204289b28ea947198880eaa81004415293831 |
08-Feb-2013 |
Baligh Uddin <baligh@google.com> |
am 61f29adf: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce # Via Android (Google) Code Review (1) and Baligh Uddin (1) * commit '61f29adfafdf44027761c2eec414ef212dd7e661': Import translations. DO NOT MERGE
|
56e8a0b82b289265bd0ccae40b54cf194d3d617e |
08-Feb-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE"
|
494b481c99ac03f207835d00f1bab488419828c0 |
08-Feb-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
|
61f29adfafdf44027761c2eec414ef212dd7e661 |
08-Feb-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
|
b7e69915ebc7fa89398649ec03e9aa619e9d9991 |
08-Feb-2013 |
Bobby Georgescu <georgescu@google.com> |
Replace background getDrawable calls to avoid ANR Bug: 8148243 Change-Id: I0b94c647bd39b2aabd9cd5316a82b3ef3573b710
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
|
8b9ea2fe62d9bcc342e0d69e94be1cb9b87ee0ba |
08-Feb-2013 |
Bobby Georgescu <georgescu@google.com> |
Replace background getDrawable calls to avoid ANR Bug: 8148243 Change-Id: I0b94c647bd39b2aabd9cd5316a82b3ef3573b710
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
|
e4930b94b3a6c68ae63da1e20887a3011a0a09ea |
08-Feb-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I4a88aa89ade346307e826982cf5dc6a03c285c9d Auto-generated-cl: translation import
es/values-ja/strings.xml
|
d61780eef3a85990e3b5acd1050f65d705b74cc1 |
08-Feb-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ib2608f12c4288a67289791c7bf41d51420550b8b Auto-generated-cl: translation import
es/values-ja/strings.xml
|
ad76ded4f381d804737c60a0e63655f712a4c1e2 |
08-Feb-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ib2608f12c4288a67289791c7bf41d51420550b8b Auto-generated-cl: translation import
es/values-ja/strings.xml
|
9eec5d37496ace84444f43f8ffb6959431fd1595 |
08-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
am 856acb65: Cleanup # Via nicolasroard * commit '856acb652fad51d650723a890cac08c536363fcd': Cleanup
|
856acb652fad51d650723a890cac08c536363fcd |
08-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Cleanup Change-Id: I30ccd935876a8cbf580d06c037b4bc7f86dafa42
rc/com/android/gallery3d/filtershow/filters/FilterCurvesRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterDrawRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterFxRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterRepresentation.java
rc/com/android/gallery3d/filtershow/filters/ImageFilter.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterBorder.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterBwFilter.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterCurves.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterDraw.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterFx.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterGeometry.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterGradient.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterHue.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterParametricBorder.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterRedEye.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterShadows.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterStraighten.java
|
e11aa659de39512c42f3c482a6485788bd32a34c |
08-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Cleanup Change-Id: I30ccd935876a8cbf580d06c037b4bc7f86dafa42
rc/com/android/gallery3d/filtershow/filters/FilterCurvesRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterDrawRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterFxRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterRepresentation.java
rc/com/android/gallery3d/filtershow/filters/ImageFilter.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterBorder.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterBwFilter.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterCurves.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterDraw.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterFx.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterGeometry.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterGradient.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterHue.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterParametricBorder.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterRedEye.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterShadows.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterStraighten.java
|
6ddf7e02012afe4b04b527f70daea37cf105305b |
08-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Cleanup Change-Id: I30ccd935876a8cbf580d06c037b4bc7f86dafa42
rc/com/android/gallery3d/filtershow/filters/FilterCurvesRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterDrawRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterFxRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterRepresentation.java
|
92701ddf5daf35c3ec4385e67dbd8f4e308aaab7 |
08-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
am bfcc645d: Merge "Fix borders" into gb-ub-photos-bryce # Via Android (Google) Code Review (1) and nicolasroard (1) * commit 'bfcc645d66addf77c49148da957f06e611a82fa9': Fix borders
|
4ca42c4d7cff86291ae2f6bc7dc03163c7cf908f |
08-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Merge "Fix borders" into gb-ub-photos-bryce
|
bfcc645d66addf77c49148da957f06e611a82fa9 |
08-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Merge "Fix borders" into gb-ub-photos-bryce
|
60c1cdd1fbdeb8f75d059f0b8fdc19ffc3d289b8 |
08-Feb-2013 |
Stephen Hines <srhines@google.com> |
Merge "Switch to GalleryGoogle as default provider for RS files (from Gallery2)."
|
743600e90f1318f8ff506d8a7e568060636ccfe7 |
08-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Fix borders Change-Id: Ia77660872f3baf10968e20b5656d97c4fbfc815e
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/filters/FilterColorBorderRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterFxRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterImageBorderRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterRepresentation.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterBorder.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterParametricBorder.java
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
rc_pd/com/android/gallery3d/filtershow/filters/FiltersManager.java
|
a3454ceb32741f7e2914958598b2372a05847805 |
08-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Fix borders Change-Id: Ia77660872f3baf10968e20b5656d97c4fbfc815e
rc/com/android/gallery3d/filtershow/filters/FilterColorBorderRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterFxRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterImageBorderRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterRepresentation.java
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
|
92e387187a872b3b0986b378954eb611aa83fdea |
08-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Fix borders Change-Id: Ia77660872f3baf10968e20b5656d97c4fbfc815e
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/filters/FilterColorBorderRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterFxRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterImageBorderRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterRepresentation.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterBorder.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterParametricBorder.java
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
rc_pd/com/android/gallery3d/filtershow/filters/FiltersManager.java
|
6176146081980afe936376764cd9f9958f51fc27 |
08-Feb-2013 |
Stephen Hines <srhines@google.com> |
Switch to GalleryGoogle as default provider for RS files (from Gallery2). Bug: 8138884 Change-Id: Ib2484852f0fa4299f6d0797838420493ce2607a0
ndroid.mk
|
e668e46cae25cd084d888c639bf9bdd66c867512 |
08-Feb-2013 |
Ying Wang <wangying@google.com> |
Merge "Fix build."
|
279b0f90c6f696392c169e0bcb3e01b2d233e459 |
08-Feb-2013 |
Ying Wang <wangying@google.com> |
Fix build. Change-Id: I1c7e931fb1119dc9c1b207d447320dec3a6d6f6b
ests_camera/Android.mk
|
0e5589bee867cddbf754752cebca30dffb17d79f |
08-Feb-2013 |
Baligh Uddin <baligh@google.com> |
am 728c036e: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce # Via Android (Google) Code Review (1) and Baligh Uddin (1) * commit '728c036e6e137f35f17a084a90f0eb917556c68c': Import translations. DO NOT MERGE
|
efc11a308fa70545428ed84a6ac2415ff5cbde0f |
08-Feb-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE"
|
3a1a2c829be599dcf3ca1403efd0c74f4cf77038 |
08-Feb-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
|
728c036e6e137f35f17a084a90f0eb917556c68c |
08-Feb-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
|
9ac47cb4edbfb9eec8f51b99d42cb0c9d6bf677f |
08-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
am 41a03af3: Add todo # Via nicolasroard * commit '41a03af3dec8915b5055570ad0631071346da40f': Add todo
|
4291bd573c1f9d13e11b14a8ef17b0b1a2a22267 |
08-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
am 933f357a: Merge "Fix Fx filters" into gb-ub-photos-bryce # Via Android (Google) Code Review (1) and nicolasroard (1) * commit '933f357aeeeba53ed9d3267107ab52dcb4a0fe5f': Fix Fx filters
|
fbd39b13a41a96142da85956625530e28075992e |
08-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Add todo Change-Id: I54fd72da364337833f80a0f1913beadf2af74277
rc/com/android/gallery3d/filtershow/filters/FilterFxRepresentation.java
|
a2413503eaddf5cb15ea55946b15026e1164be44 |
08-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Add todo Change-Id: I54fd72da364337833f80a0f1913beadf2af74277
rc/com/android/gallery3d/filtershow/filters/FilterFxRepresentation.java
|
41a03af3dec8915b5055570ad0631071346da40f |
08-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Add todo Change-Id: I54fd72da364337833f80a0f1913beadf2af74277
rc/com/android/gallery3d/filtershow/filters/FilterFxRepresentation.java
|
933f357aeeeba53ed9d3267107ab52dcb4a0fe5f |
08-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Merge "Fix Fx filters" into gb-ub-photos-bryce
|
7857b453e2aac07c0dbd5fdaa6d0df5e02ad2464 |
08-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Merge "Fix Fx filters" into gb-ub-photos-bryce
|
1fb2938a2b57107d54a62aefffa04f4fc5726530 |
08-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Merge "Fix Fx filters" into gb-ub-photos-bryce
|
d0bab8c396b0b10fdfd07a9d4fccf969d8d46747 |
08-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Fix Fx filters Change-Id: Id501ec3a7b4880e697e2b90c056a57fb3ec456ea
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/PanelController.java
rc/com/android/gallery3d/filtershow/filters/FilterBasicRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterFxRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterRepresentation.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterFx.java
rc/com/android/gallery3d/filtershow/ui/FilterIconButton.java
rc_pd/com/android/gallery3d/filtershow/filters/FiltersManager.java
|
99256e380cb0369df7f407192f279d3e39d5d5d1 |
08-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Fix Fx filters Change-Id: Id501ec3a7b4880e697e2b90c056a57fb3ec456ea
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/PanelController.java
rc/com/android/gallery3d/filtershow/filters/FilterBasicRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterFxRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterRepresentation.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterFx.java
rc/com/android/gallery3d/filtershow/ui/FilterIconButton.java
rc_pd/com/android/gallery3d/filtershow/filters/FiltersManager.java
|
c1d3121d40a3717c5bc1c8f35eb40878a1b0c13f |
08-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Fix Fx filters Change-Id: Id501ec3a7b4880e697e2b90c056a57fb3ec456ea
rc/com/android/gallery3d/filtershow/filters/FilterBasicRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterFxRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterRepresentation.java
|
50341f936e5ad78242925ecc9ae2433c8a61f3b4 |
07-Feb-2013 |
Doris Liu <tianliu@google.com> |
Fix memory leak in ComboPreferences Bug: 8028546 Change-Id: I05246ba6675c62f89b1eaeb90d594dcb9aaf7185
rc/com/android/camera/ComboPreferences.java
|
3d18db6f54d5d4ac8dad4fef2efc566e0bd63e04 |
07-Feb-2013 |
John Hoford <hoford@google.com> |
am b3825a60: Merge "fix draw and curves to use FilterRepresentation" into gb-ub-photos-bryce # Via Android (Google) Code Review (1) and John Hoford (1) * commit 'b3825a60032bc7b039b1f45fb280ea4c36ead766': fix draw and curves to use FilterRepresentation
|
211997a2799f3c24f349109fcacf73ccc21a0256 |
07-Feb-2013 |
Jason Noguchi <jnoguchi@google.com> |
am 1933d8b2: Merge "Remove reference to local libraries. Make CameraTest build against the SDK instead." into gb-ub-photos-bryce # Via Android (Google) Code Review (1) and Jason Noguchi (1) * commit '1933d8b2cc7c8f0c5fe5282a3cd463cd6c4bf95a': Remove reference to local libraries. Make CameraTest build against the SDK instead.
|
b3825a60032bc7b039b1f45fb280ea4c36ead766 |
07-Feb-2013 |
John Hoford <hoford@google.com> |
Merge "fix draw and curves to use FilterRepresentation" into gb-ub-photos-bryce
|
260fc36e76a140687868e86d9cb244e3a2523f39 |
07-Feb-2013 |
John Hoford <hoford@google.com> |
Merge "fix draw and curves to use FilterRepresentation" into gb-ub-photos-bryce
|
1933d8b2cc7c8f0c5fe5282a3cd463cd6c4bf95a |
07-Feb-2013 |
Jason Noguchi <jnoguchi@google.com> |
Merge "Remove reference to local libraries. Make CameraTest build against the SDK instead." into gb-ub-photos-bryce
|
9d44b653d1450dfdb66298a46850e3a0c91f0332 |
05-Feb-2013 |
John Hoford <hoford@google.com> |
fix draw and curves to use FilterRepresentation Change-Id: I500d9c04ea0e55cbc9b1927dee2f6a19a67d5349
es/drawable-nodpi/brush1.png
es/drawable-nodpi/brush2.png
rc/com/android/gallery3d/filtershow/filters/FilterCurvesRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterDrawRepresentation.java
|
19161944e0efb1ffe23274d7cf5315ce047e9dac |
05-Feb-2013 |
John Hoford <hoford@google.com> |
fix draw and curves to use FilterRepresentation Change-Id: I500d9c04ea0e55cbc9b1927dee2f6a19a67d5349
es/drawable-nodpi/brush1.png
es/drawable-nodpi/brush2.png
rc/com/android/gallery3d/filtershow/cache/ImageLoader.java
rc/com/android/gallery3d/filtershow/editors/EditorCurves.java
rc/com/android/gallery3d/filtershow/editors/EditorDraw.java
rc/com/android/gallery3d/filtershow/filters/FilterCurvesRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterDrawRepresentation.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterCurves.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterDraw.java
rc/com/android/gallery3d/filtershow/imageshow/ImageDraw.java
rc/com/android/gallery3d/filtershow/imageshow/MasterImage.java
rc/com/android/gallery3d/filtershow/ui/ImageCurves.java
rc/com/android/gallery3d/filtershow/ui/Spline.java
|
394c12c26d03f0ae341b2251c4e5ad35c4463e9c |
05-Feb-2013 |
John Hoford <hoford@google.com> |
fix draw and curves to use FilterRepresentation Change-Id: I500d9c04ea0e55cbc9b1927dee2f6a19a67d5349
rc/com/android/gallery3d/filtershow/cache/ImageLoader.java
rc/com/android/gallery3d/filtershow/editors/EditorCurves.java
rc/com/android/gallery3d/filtershow/editors/EditorDraw.java
rc/com/android/gallery3d/filtershow/filters/FilterCurvesRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterDrawRepresentation.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterCurves.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterDraw.java
rc/com/android/gallery3d/filtershow/imageshow/ImageDraw.java
rc/com/android/gallery3d/filtershow/imageshow/MasterImage.java
rc/com/android/gallery3d/filtershow/ui/ImageCurves.java
rc/com/android/gallery3d/filtershow/ui/Spline.java
|
da50e05c6f01a8de71e6c3e7293058b4f6985316 |
07-Feb-2013 |
Doris Liu <tianliu@google.com> |
Lock focus during countdown Change-Id: Ia8d4250daa488c35e276218e9fdb8efdf00836c2
rc/com/android/camera/PhotoModule.java
|
723353af8b36c655967cfc9a8c4176346aa4f72d |
07-Feb-2013 |
Doris Liu <tianliu@google.com> |
Lock focus during countdown Change-Id: Ia8d4250daa488c35e276218e9fdb8efdf00836c2
rc/com/android/camera/PhotoModule.java
|
6f9e4f36b2ec4aa6f6be4771eb7b88d609f02308 |
07-Feb-2013 |
Doris Liu <tianliu@google.com> |
am 1fe1cc71: Merge "Fix memory leak in ComboPreferences" into gb-ub-photos-bryce # Via Android (Google) Code Review (1) and Doris Liu (1) * commit '1fe1cc71a06f677e3715a62fd29692fcc7a424aa': Fix memory leak in ComboPreferences
|
4d9133ad6d48bdf45e1ed87fa8a934013ddc584f |
07-Feb-2013 |
Doris Liu <tianliu@google.com> |
Merge "Fix memory leak in ComboPreferences" into gb-ub-photos-bryce
|
1fe1cc71a06f677e3715a62fd29692fcc7a424aa |
07-Feb-2013 |
Doris Liu <tianliu@google.com> |
Merge "Fix memory leak in ComboPreferences" into gb-ub-photos-bryce
|
4e72c9098e96866fe9d7612c197a5b26f8f99d57 |
07-Feb-2013 |
Doris Liu <tianliu@google.com> |
Fix memory leak in ComboPreferences Bug: 8028546 Change-Id: I05246ba6675c62f89b1eaeb90d594dcb9aaf7185
rc/com/android/camera/ComboPreferences.java
|
ea9a07809c051b17b933ee85522ad3b4ce7095b3 |
07-Feb-2013 |
Doris Liu <tianliu@google.com> |
Fix memory leak in ComboPreferences Bug: 8028546 Change-Id: I05246ba6675c62f89b1eaeb90d594dcb9aaf7185
rc/com/android/camera/ComboPreferences.java
|
b9cfda108ee0c562fc968bc782ffd04cd31ce320 |
07-Feb-2013 |
Jason Noguchi <jnoguchi@google.com> |
Remove reference to local libraries. Make CameraTest build against the SDK instead. Change-Id: I5885de7f569f4c0e1e5156d8a1634fc13c1b558d
ests_camera/Android.mk
|
1b882c8148154cad7fcae105b30bc22253c5d1e2 |
07-Feb-2013 |
Jason Noguchi <jnoguchi@google.com> |
Remove reference to local libraries. Make CameraTest build against the SDK instead. Change-Id: I5885de7f569f4c0e1e5156d8a1634fc13c1b558d
ests_camera/Android.mk
|
4f56ab7a2a0c61e6f9d38fc5abd27813a604b5c8 |
07-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
am a31f446d: Fix flashing on geometry preview # Via nicolasroard * commit 'a31f446dca49c0915f8a08456d7bb7abe6f3037d': Fix flashing on geometry preview
|
a31f446dca49c0915f8a08456d7bb7abe6f3037d |
07-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Fix flashing on geometry preview Change-Id: I0f05d654c1c4373016d2d5766eb983a47fab2780
rc/com/android/gallery3d/filtershow/PanelController.java
|
96bba43f8ea135208d9c2a33ae309326a7abfd69 |
07-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Fix flashing on geometry preview Change-Id: I0f05d654c1c4373016d2d5766eb983a47fab2780
rc/com/android/gallery3d/filtershow/PanelController.java
|
b3a1d535d6759e07346aaeb49d60f548531307fd |
07-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
am 00fa330e: Merge "Fix filters only + geometry only rendering" into gb-ub-photos-bryce # Via Android (Google) Code Review (1) and nicolasroard (1) * commit '00fa330e9497157542e4867ee033badaaf1f224f': Fix filters only + geometry only rendering
|
00fa330e9497157542e4867ee033badaaf1f224f |
07-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Merge "Fix filters only + geometry only rendering" into gb-ub-photos-bryce
|
895cb496eddf5db0abff55100bdb2730a2515cae |
07-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Fix filters only + geometry only rendering Change-Id: Id8f0637ae53864488cb931def196ee50ae807f5c
rc/com/android/gallery3d/filtershow/cache/FilteringPipeline.java
rc/com/android/gallery3d/filtershow/cache/RenderingRequest.java
rc/com/android/gallery3d/filtershow/cache/RenderingRequestCaller.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterRS.java
rc/com/android/gallery3d/filtershow/imageshow/ImageGeometry.java
rc/com/android/gallery3d/filtershow/imageshow/MasterImage.java
|
3df4f831396ffbc11e4bbee0b6150794e8e44e0b |
07-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Fix filters only + geometry only rendering Change-Id: Id8f0637ae53864488cb931def196ee50ae807f5c
rc/com/android/gallery3d/filtershow/cache/FilteringPipeline.java
rc/com/android/gallery3d/filtershow/cache/RenderingRequest.java
rc/com/android/gallery3d/filtershow/cache/RenderingRequestCaller.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterRS.java
rc/com/android/gallery3d/filtershow/imageshow/ImageGeometry.java
rc/com/android/gallery3d/filtershow/imageshow/MasterImage.java
|
c44cc1bcd802f7e91765868a75e9277a843046f9 |
07-Feb-2013 |
The Android Automerger <android-build@android.com> |
merge in jb-mr2-release history after reset to master
|
9483369f257bd027ea828795e06b8d95a33074f3 |
07-Feb-2013 |
John Reck <jreck@google.com> |
am ec43f01d: Merge "Request GALLERY_PROVIDER permission" into gb-ub-photos-bryce # Via Android (Google) Code Review (1) and John Reck (1) * commit 'ec43f01d751af2010446d83db0db2c0654a21a6e': Request GALLERY_PROVIDER permission
|
ec43f01d751af2010446d83db0db2c0654a21a6e |
07-Feb-2013 |
John Reck <jreck@google.com> |
Merge "Request GALLERY_PROVIDER permission" into gb-ub-photos-bryce
|
8e74f5aa91d560b32f5cf6ea50a7fae2d60e4f87 |
07-Feb-2013 |
Marco Nelissen <marcone@google.com> |
Merge "Don't call requestLayout from onLayout"
|
9a29dc6670b0566edff2845d81a2a8d72faece65 |
07-Feb-2013 |
Marco Nelissen <marcone@google.com> |
Don't call requestLayout from onLayout Doing a layout within a layout can lead to various problems, so it should be avoided. There's some logging that warns of this, which got triggered by CommonControllerOverlay. I don't know what problem this code was originally trying to solve, but it doesn't seem to be necessary anymore. The line in question was originally introduced in change 209a9163d4e8cee0bfe162ae598ef40e6051479c, in Oct 2011. Change-Id: I1402a842df59df31b69ad981337ea1c8630103df
rc/com/android/gallery3d/app/CommonControllerOverlay.java
|
8157325c0b74a6575f283493ee86d2ed2e2b464a |
06-Feb-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Id9d5c5c28743cac94f47e9677734e9f79b1039bb Auto-generated-cl: translation import
es/values-es-rUS/filtershow_strings.xml
es/values-et/filtershow_strings.xml
es/values-ja/filtershow_strings.xml
es/values-sw/filtershow_strings.xml
es/values-zh-rTW/filtershow_strings.xml
|
5240e8e0af665edcb3ac9a454424621786ab45c4 |
06-Feb-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Idbf032a0393d123b931721ba9c6fb6a61e25ec74 Auto-generated-cl: translation import
es/values-es-rUS/filtershow_strings.xml
es/values-et/filtershow_strings.xml
es/values-ja/filtershow_strings.xml
es/values-sw/filtershow_strings.xml
es/values-zh-rTW/filtershow_strings.xml
|
2a2e2436da1636c97aac5fb8fe22bc3f7d1a383a |
06-Feb-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Idbf032a0393d123b931721ba9c6fb6a61e25ec74 Auto-generated-cl: translation import
es/values-es-rUS/filtershow_strings.xml
es/values-et/filtershow_strings.xml
es/values-ja/filtershow_strings.xml
es/values-sw/filtershow_strings.xml
es/values-zh-rTW/filtershow_strings.xml
|
88ede075f83eeab8cacc54447b0343c7fdf5280e |
06-Feb-2013 |
John Reck <jreck@google.com> |
Request GALLERY_PROVIDER permission Bug: 8138594 Change-Id: I39f446f8066cf15a62acf3f16c0faa84bc4b71d7
ndroidManifest.xml
|
0c7d07e101909bf5694ff372abbf678e951649b0 |
06-Feb-2013 |
John Reck <jreck@google.com> |
Request GALLERY_PROVIDER permission Bug: 8138594 Change-Id: I39f446f8066cf15a62acf3f16c0faa84bc4b71d7
ndroidManifest.xml
|
d70000e100964f44c2204a5be976ef3c484f52b0 |
06-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
am cf0b2aad: Refactor to use direct manipulations of FilterRepresentations. # Via nicolasroard * commit 'cf0b2aad3bc5d80c51316ae10e1cf2c3476259aa': Refactor to use direct manipulations of FilterRepresentations.
|
096f574bfc7c450e362fbfb5f3b41d983bff097a |
06-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Refactor to use direct manipulations of FilterRepresentations. Change-Id: If5f92f137283cb126835be004d315942ff95021c
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
|
cf0b2aad3bc5d80c51316ae10e1cf2c3476259aa |
06-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Refactor to use direct manipulations of FilterRepresentations. Change-Id: If5f92f137283cb126835be004d315942ff95021c
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/PanelController.java
rc/com/android/gallery3d/filtershow/cache/FilteringPipeline.java
rc/com/android/gallery3d/filtershow/cache/ImageLoader.java
rc/com/android/gallery3d/filtershow/cache/TripleBufferBitmap.java
rc/com/android/gallery3d/filtershow/editors/BasicEditor.java
rc/com/android/gallery3d/filtershow/editors/Editor.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterRS.java
rc/com/android/gallery3d/filtershow/imageshow/MasterImage.java
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
|
082803ec883c8182485872bbc34b63705b04d101 |
06-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Refactor to use direct manipulations of FilterRepresentations. Change-Id: If5f92f137283cb126835be004d315942ff95021c
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/PanelController.java
rc/com/android/gallery3d/filtershow/cache/FilteringPipeline.java
rc/com/android/gallery3d/filtershow/cache/ImageLoader.java
rc/com/android/gallery3d/filtershow/cache/TripleBufferBitmap.java
rc/com/android/gallery3d/filtershow/editors/BasicEditor.java
rc/com/android/gallery3d/filtershow/editors/Editor.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterRS.java
rc/com/android/gallery3d/filtershow/imageshow/MasterImage.java
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
|
2490806e6acf774aafaef19ddc0f7d0a4a5c5e34 |
06-Feb-2013 |
The Android Automerger <android-build@android.com> |
merge in jb-mr2-release history after reset to master
|
cc8250a1fb6115db9722649ef3c3329986aae35d |
05-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
am 5b85b092: fix editor visibility # Via nicolasroard * commit '5b85b092af404effd32aa513f9c45a0232d7ae81': fix editor visibility
|
ece5fc2795d6a1ab1d9e56cab31e9494018bc511 |
05-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
am 1c82642e: Merge "Refactor filters parameters - introduce FilterRepresentations - change filters lifecycle" into gb-ub-photos-bryce # Via Android (Google) Code Review (1) and nicolasroard (1) * commit '1c82642e74b9a8cec93f3fb0ecb2d06ec4593a76': Refactor filters parameters - introduce FilterRepresentations - change filters lifecycle
|
5b85b092af404effd32aa513f9c45a0232d7ae81 |
05-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
fix editor visibility Change-Id: I0c9c5273b49974884b8bdf365211b33de54c5598
rc/com/android/gallery3d/filtershow/EditorPlaceHolder.java
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/PanelController.java
|
083074c72999425c7e8a54ecafc965ae17dcbea8 |
05-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
fix editor visibility Change-Id: I0c9c5273b49974884b8bdf365211b33de54c5598
rc/com/android/gallery3d/filtershow/EditorPlaceHolder.java
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/PanelController.java
|
ba9ff0129221d3c36aac1cca8992ce22d85417fe |
05-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Merge "Refactor filters parameters - introduce FilterRepresentations - change filters lifecycle" into gb-ub-photos-bryce
|
1c82642e74b9a8cec93f3fb0ecb2d06ec4593a76 |
05-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Merge "Refactor filters parameters - introduce FilterRepresentations - change filters lifecycle" into gb-ub-photos-bryce
|
76776d3d5ab2ea3c5d101f668a35680e11094fe6 |
05-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Merge "Refactor filters parameters - introduce FilterRepresentations - change filters lifecycle" into gb-ub-photos-bryce
|
ba017e0036cfb1a8d25abad3a3abf367e9ce01be |
05-Feb-2013 |
John Reck <jreck@google.com> |
am 008e0bd1: Merge "Cleanup" into gb-ub-photos-bryce # Via Android (Google) Code Review (1) and John Reck (1) * commit '008e0bd1c0dee2f76dd46f02bbc4efc9efcdfc35': Cleanup
|
008e0bd1c0dee2f76dd46f02bbc4efc9efcdfc35 |
05-Feb-2013 |
John Reck <jreck@google.com> |
Merge "Cleanup" into gb-ub-photos-bryce
|
009dbc7b5ff33e97ca8a99fb60f1275ad07f572d |
05-Feb-2013 |
John Reck <jreck@google.com> |
Cleanup Move Canvas to com.android.photos.canvas Remove workaround for b/8079561 Change-Id: I14b832d5935eb8704e96e5591c58f33a7cd4de31
rc/com/android/gallery3d/app/Gallery.java
rc/com/android/gallery3d/provider/CanvasProvider.java
rc/com/android/gallery3d/provider/CanvasProviderBase.java
rc/com/android/photos/canvas/CanvasActivity.java
rc/com/android/photos/canvas/CanvasProvider.java
rc/com/android/photos/canvas/CanvasProviderBase.java
rc/com/android/photos/canvas/EnableSyncActivity.java
rc/com/google/android/canvas/provider/EnableSyncActivity.java
|
c5e5dea2d474b05f837f86ce7eb330e9a9e40bbc |
05-Feb-2013 |
John Reck <jreck@google.com> |
Cleanup Move Canvas to com.android.photos.canvas Remove workaround for b/8079561 Change-Id: I14b832d5935eb8704e96e5591c58f33a7cd4de31
ndroidManifest.xml
|
d78be769b9bc48a78d3220b9016344e9d794c114 |
05-Feb-2013 |
John Reck <jreck@google.com> |
Cleanup Move Canvas to com.android.photos.canvas Remove workaround for b/8079561 Change-Id: I14b832d5935eb8704e96e5591c58f33a7cd4de31
ndroidManifest.xml
rc/com/android/gallery3d/app/Gallery.java
rc/com/android/gallery3d/provider/CanvasProvider.java
rc/com/android/gallery3d/provider/CanvasProviderBase.java
rc/com/android/photos/canvas/CanvasActivity.java
rc/com/android/photos/canvas/CanvasProvider.java
rc/com/android/photos/canvas/CanvasProviderBase.java
rc/com/android/photos/canvas/EnableSyncActivity.java
rc/com/google/android/canvas/provider/EnableSyncActivity.java
|
1979488b20f00b7e68e139228f06350441496760 |
05-Feb-2013 |
Baligh Uddin <baligh@google.com> |
am 24756077: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce # Via Android (Google) Code Review (1) and Baligh Uddin (1) * commit '247560770ac07eee9a09a5d9b857d0780873996f': Import translations. DO NOT MERGE
|
fe0b1a8556f341d7639d4992f070b8244028578a |
05-Feb-2013 |
Baligh Uddin <baligh@google.com> |
am 9216e070: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce # Via Android (Google) Code Review (1) and Baligh Uddin (1) * commit '9216e0707c840dd3ab5e7f774bd8d9f615c1dcff': Import translations. DO NOT MERGE
|
29b31f2d45bc60bbdac54d725e2f3fbbfbcd3c5c |
05-Feb-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE"
|
209086167e30660b58c470b72679506955cff9e5 |
05-Feb-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
|
247560770ac07eee9a09a5d9b857d0780873996f |
05-Feb-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
|
e009b319b37418989ab9a32b71704be0dabe9609 |
05-Feb-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE"
|
9216e0707c840dd3ab5e7f774bd8d9f615c1dcff |
05-Feb-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
|
1c3a7fe38f2953baca7b66905ac162d3afa9583c |
05-Feb-2013 |
The Android Automerger <android-build@android.com> |
merge in jb-mr2-release history after reset to master
|
c730bfa52c73de2c5dbae0b238592ec3d774afa7 |
29-Jan-2013 |
nicolasroard <nicolasroard@google.com> |
Refactor filters parameters - introduce FilterRepresentations - change filters lifecycle Change-Id: I9416fca47a334d532a347cd5577795738c870933
rc/com/android/gallery3d/filtershow/filters/FilterBasicRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterDirectRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterRepresentation.java
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
|
71f04cbaedbb89e313e0b86b531640db2d3f6016 |
29-Jan-2013 |
nicolasroard <nicolasroard@google.com> |
Refactor filters parameters - introduce FilterRepresentations - change filters lifecycle Change-Id: I9416fca47a334d532a347cd5577795738c870933
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/ImageStateAdapter.java
rc/com/android/gallery3d/filtershow/PanelController.java
rc/com/android/gallery3d/filtershow/cache/FilteringPipeline.java
rc/com/android/gallery3d/filtershow/editors/BasicEditor.java
rc/com/android/gallery3d/filtershow/editors/EditorDraw.java
rc/com/android/gallery3d/filtershow/filters/FilterBasicRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterDirectRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterRepresentation.java
rc/com/android/gallery3d/filtershow/filters/ImageFilter.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterBorder.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterBwFilter.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterContrast.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterCurves.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterDownsample.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterDraw.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterEdge.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterExposure.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterFx.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterHue.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterKMeans.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterNegative.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterParametricBorder.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterRedEye.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterSaturated.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterShadows.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterSharpen.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterTinyPlanet.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterVibrance.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterVignette.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterWBalance.java
rc/com/android/gallery3d/filtershow/filters/SimpleImageFilter.java
rc/com/android/gallery3d/filtershow/imageshow/ImageShow.java
rc/com/android/gallery3d/filtershow/imageshow/MasterImage.java
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
rc/com/android/gallery3d/filtershow/ui/FilterIconButton.java
rc/com/android/gallery3d/filtershow/ui/ImageCurves.java
rc_pd/com/android/gallery3d/filtershow/filters/FiltersManager.java
|
da4de5aa86b49be455efe396455b77be44dec684 |
29-Jan-2013 |
nicolasroard <nicolasroard@google.com> |
Refactor filters parameters - introduce FilterRepresentations - change filters lifecycle Change-Id: I9416fca47a334d532a347cd5577795738c870933
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/ImageStateAdapter.java
rc/com/android/gallery3d/filtershow/PanelController.java
rc/com/android/gallery3d/filtershow/cache/FilteringPipeline.java
rc/com/android/gallery3d/filtershow/editors/BasicEditor.java
rc/com/android/gallery3d/filtershow/editors/EditorDraw.java
rc/com/android/gallery3d/filtershow/filters/FilterBasicRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterDirectRepresentation.java
rc/com/android/gallery3d/filtershow/filters/FilterRepresentation.java
rc/com/android/gallery3d/filtershow/filters/ImageFilter.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterBorder.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterBwFilter.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterContrast.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterCurves.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterDownsample.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterDraw.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterEdge.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterExposure.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterFx.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterHue.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterKMeans.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterNegative.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterParametricBorder.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterRedEye.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterSaturated.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterShadows.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterSharpen.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterTinyPlanet.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterVibrance.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterVignette.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterWBalance.java
rc/com/android/gallery3d/filtershow/filters/SimpleImageFilter.java
rc/com/android/gallery3d/filtershow/imageshow/ImageShow.java
rc/com/android/gallery3d/filtershow/imageshow/MasterImage.java
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
rc/com/android/gallery3d/filtershow/ui/FilterIconButton.java
rc/com/android/gallery3d/filtershow/ui/ImageCurves.java
rc_pd/com/android/gallery3d/filtershow/filters/FiltersManager.java
|
31041fd5f0a29b0bea9bf246ab2eefa7bb8d6d82 |
05-Feb-2013 |
Stephen Hines <srhines@google.com> |
am a93d5839: Merge "Remove RS intermediates to trigger a clean build." into gb-ub-photos-bryce # Via Android (Google) Code Review (1) and Stephen Hines (1) * commit 'a93d583970819f2bea4b12f1233655fb9ede3387': Remove RS intermediates to trigger a clean build.
|
a93d583970819f2bea4b12f1233655fb9ede3387 |
05-Feb-2013 |
Stephen Hines <srhines@google.com> |
Merge "Remove RS intermediates to trigger a clean build." into gb-ub-photos-bryce
|
38eb7627e2c05a85df4e9a61ca41f660fd65efbf |
05-Feb-2013 |
Stephen Hines <srhines@google.com> |
Remove RS intermediates to trigger a clean build. Change-Id: I4925dbf21b81876bac85413f8057049e84ca324c
leanSpec.mk
|
223f2596e1760811d967fdd18c8ac27dc5898311 |
05-Feb-2013 |
Stephen Hines <srhines@google.com> |
Remove RS intermediates to trigger a clean build. Change-Id: I4925dbf21b81876bac85413f8057049e84ca324c
leanSpec.mk
|
9ceba8143660a1752abdcb10bef21391ee8cd0b4 |
05-Feb-2013 |
John Reck <jreck@google.com> |
am 7d072016: Merge "Handle syncing better" into gb-ub-photos-bryce # Via Android (Google) Code Review (1) and John Reck (1) * commit '7d07201654ef965f3fe2e322a857fc911cc54ec9': Handle syncing better
|
465e25bd3cb2c76732102d7be98bc0335962f715 |
05-Feb-2013 |
John Reck <jreck@google.com> |
Merge "Handle syncing better" into gb-ub-photos-bryce
|
7d07201654ef965f3fe2e322a857fc911cc54ec9 |
05-Feb-2013 |
John Reck <jreck@google.com> |
Merge "Handle syncing better" into gb-ub-photos-bryce
|
6e99c176e9c8763a774dbad05bfcc5f2b0b788d5 |
05-Feb-2013 |
John Reck <jreck@google.com> |
Handle syncing better Bug: 8104531 Limit to every 15 minutes Avoid requesting a sync on a MediaSet that's already syncing Change-Id: Iac4522cd305c64696317cc7088b0e851a2b81893
rc/com/android/gallery3d/provider/CanvasProvider.java
rc/com/android/gallery3d/provider/CanvasProviderBase.java
|
4fd2a8aaa508cad4280a0de47294305cfa68fb3d |
05-Feb-2013 |
John Reck <jreck@google.com> |
Handle syncing better Bug: 8104531 Limit to every 15 minutes Avoid requesting a sync on a MediaSet that's already syncing Change-Id: Iac4522cd305c64696317cc7088b0e851a2b81893
rc/com/android/gallery3d/provider/CanvasProvider.java
rc/com/android/gallery3d/provider/CanvasProviderBase.java
|
0dc070bbc1e755372f53e042d6b3d4b998183c69 |
04-Feb-2013 |
Tim Murray <timmurray@google.com> |
am a6405169: Switch Gallery over to RS compatibility library. # Via Tim Murray * commit 'a64051696e46fb5d5e1c76e53ac95a4feba18585': Switch Gallery over to RS compatibility library.
|
c7cd1fc900058a66f03af52f536c98d0c71e3e95 |
04-Feb-2013 |
Tim Murray <timmurray@google.com> |
Switch Gallery over to RS compatibility library. Change-Id: If27809236534f3b196949bf455faed45c99f3da5
ndroid.mk
|
203f5149ab28dc2d3d33be5868c16209030835e8 |
04-Feb-2013 |
Tim Murray <timmurray@google.com> |
Switch Gallery over to RS compatibility library. Change-Id: If27809236534f3b196949bf455faed45c99f3da5
roguard.flags
|
a64051696e46fb5d5e1c76e53ac95a4feba18585 |
04-Feb-2013 |
Tim Murray <timmurray@google.com> |
Switch Gallery over to RS compatibility library. Change-Id: If27809236534f3b196949bf455faed45c99f3da5
ndroid.mk
roguard.flags
rc/com/android/gallery3d/filtershow/cache/FilteringPipeline.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterRS.java
|
1ddbdc88f9b6e8ab26ba344c5bebb5b6fa220941 |
04-Feb-2013 |
Tim Murray <timmurray@google.com> |
Switch Gallery over to RS compatibility library. Change-Id: If27809236534f3b196949bf455faed45c99f3da5
rc/com/android/gallery3d/filtershow/cache/FilteringPipeline.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterRS.java
|
5f55f7b7fa3b7ec0aa25876306dc9bc4f5ea5e6e |
04-Feb-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I576ed60925aa03ef01b65b5c9e9c739ec07702c5 Auto-generated-cl: translation import
es/values-af/filtershow_strings.xml
es/values-am/filtershow_strings.xml
es/values-ar/filtershow_strings.xml
es/values-be/filtershow_strings.xml
es/values-bg/filtershow_strings.xml
es/values-ca/filtershow_strings.xml
es/values-cs/filtershow_strings.xml
es/values-da/filtershow_strings.xml
es/values-de/filtershow_strings.xml
es/values-el/filtershow_strings.xml
es/values-en-rGB/filtershow_strings.xml
es/values-es-rUS/filtershow_strings.xml
es/values-es/filtershow_strings.xml
es/values-et/filtershow_strings.xml
es/values-fa/filtershow_strings.xml
es/values-fi/filtershow_strings.xml
es/values-fr/filtershow_strings.xml
es/values-hi/filtershow_strings.xml
es/values-hr/filtershow_strings.xml
es/values-hu/filtershow_strings.xml
es/values-in/filtershow_strings.xml
es/values-it/filtershow_strings.xml
es/values-iw/filtershow_strings.xml
es/values-ja/filtershow_strings.xml
es/values-ko/filtershow_strings.xml
es/values-lt/filtershow_strings.xml
es/values-lv/filtershow_strings.xml
es/values-ms/filtershow_strings.xml
es/values-nb/filtershow_strings.xml
es/values-nl/filtershow_strings.xml
es/values-pl/filtershow_strings.xml
es/values-pt-rPT/filtershow_strings.xml
es/values-pt/filtershow_strings.xml
es/values-ro/filtershow_strings.xml
es/values-ru/filtershow_strings.xml
es/values-sk/filtershow_strings.xml
es/values-sl/filtershow_strings.xml
es/values-sr/filtershow_strings.xml
es/values-sv/filtershow_strings.xml
es/values-sw/filtershow_strings.xml
es/values-th/filtershow_strings.xml
es/values-tl/filtershow_strings.xml
es/values-tr/filtershow_strings.xml
es/values-uk/filtershow_strings.xml
es/values-vi/filtershow_strings.xml
es/values-zh-rCN/filtershow_strings.xml
es/values-zh-rTW/filtershow_strings.xml
es/values-zu/filtershow_strings.xml
|
e98241dcea7bcffc4d77629dd39c4c0b7c3b9f18 |
04-Feb-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I25498bf6ba9f7c4987fb5c49efff040eb5068b31 Auto-generated-cl: translation import
es/values-af/filtershow_strings.xml
es/values-am/filtershow_strings.xml
es/values-ar/filtershow_strings.xml
es/values-be/filtershow_strings.xml
es/values-bg/filtershow_strings.xml
es/values-ca/filtershow_strings.xml
es/values-cs/filtershow_strings.xml
es/values-da/filtershow_strings.xml
es/values-de/filtershow_strings.xml
es/values-el/filtershow_strings.xml
es/values-en-rGB/filtershow_strings.xml
es/values-es-rUS/filtershow_strings.xml
es/values-es/filtershow_strings.xml
es/values-et/filtershow_strings.xml
es/values-fa/filtershow_strings.xml
es/values-fi/filtershow_strings.xml
es/values-fr/filtershow_strings.xml
es/values-hi/filtershow_strings.xml
es/values-hr/filtershow_strings.xml
es/values-hu/filtershow_strings.xml
es/values-in/filtershow_strings.xml
es/values-it/filtershow_strings.xml
es/values-iw/filtershow_strings.xml
es/values-ja/filtershow_strings.xml
es/values-ko/filtershow_strings.xml
es/values-lt/filtershow_strings.xml
es/values-lv/filtershow_strings.xml
es/values-ms/filtershow_strings.xml
es/values-nb/filtershow_strings.xml
es/values-nl/filtershow_strings.xml
es/values-pl/filtershow_strings.xml
es/values-pt-rPT/filtershow_strings.xml
es/values-pt/filtershow_strings.xml
es/values-ro/filtershow_strings.xml
es/values-ru/filtershow_strings.xml
es/values-sk/filtershow_strings.xml
es/values-sl/filtershow_strings.xml
es/values-sr/filtershow_strings.xml
es/values-sv/filtershow_strings.xml
es/values-sw/filtershow_strings.xml
es/values-th/filtershow_strings.xml
es/values-tl/filtershow_strings.xml
es/values-tr/filtershow_strings.xml
es/values-uk/filtershow_strings.xml
es/values-vi/filtershow_strings.xml
es/values-zh-rCN/filtershow_strings.xml
es/values-zh-rTW/filtershow_strings.xml
es/values-zu/filtershow_strings.xml
|
74afc365706911eb5266acb78d6fe8a54009808b |
04-Feb-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I25498bf6ba9f7c4987fb5c49efff040eb5068b31 Auto-generated-cl: translation import
es/values-af/filtershow_strings.xml
es/values-am/filtershow_strings.xml
es/values-ar/filtershow_strings.xml
es/values-be/filtershow_strings.xml
es/values-bg/filtershow_strings.xml
es/values-ca/filtershow_strings.xml
es/values-cs/filtershow_strings.xml
es/values-da/filtershow_strings.xml
es/values-de/filtershow_strings.xml
es/values-el/filtershow_strings.xml
es/values-en-rGB/filtershow_strings.xml
es/values-es-rUS/filtershow_strings.xml
es/values-es/filtershow_strings.xml
es/values-et/filtershow_strings.xml
es/values-fa/filtershow_strings.xml
es/values-fi/filtershow_strings.xml
es/values-fr/filtershow_strings.xml
es/values-hi/filtershow_strings.xml
es/values-hr/filtershow_strings.xml
es/values-hu/filtershow_strings.xml
es/values-in/filtershow_strings.xml
es/values-it/filtershow_strings.xml
es/values-iw/filtershow_strings.xml
es/values-ja/filtershow_strings.xml
es/values-ko/filtershow_strings.xml
es/values-lt/filtershow_strings.xml
es/values-lv/filtershow_strings.xml
es/values-ms/filtershow_strings.xml
es/values-nb/filtershow_strings.xml
es/values-nl/filtershow_strings.xml
es/values-pl/filtershow_strings.xml
es/values-pt-rPT/filtershow_strings.xml
es/values-pt/filtershow_strings.xml
es/values-ro/filtershow_strings.xml
es/values-ru/filtershow_strings.xml
es/values-sk/filtershow_strings.xml
es/values-sl/filtershow_strings.xml
es/values-sr/filtershow_strings.xml
es/values-sv/filtershow_strings.xml
es/values-sw/filtershow_strings.xml
es/values-th/filtershow_strings.xml
es/values-tl/filtershow_strings.xml
es/values-tr/filtershow_strings.xml
es/values-uk/filtershow_strings.xml
es/values-vi/filtershow_strings.xml
es/values-zh-rCN/filtershow_strings.xml
es/values-zh-rTW/filtershow_strings.xml
es/values-zu/filtershow_strings.xml
|
cd9df47ab5917ce8946a0f33b85e7216cda7d1c0 |
04-Feb-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I890a7d57713b2e5aa3c5aada1710384c76a7bba5 Auto-generated-cl: translation import
es/values-ru/strings.xml
|
e73f241c3432f0b14b978fa45c52dda85ec4cc40 |
04-Feb-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ie03d9483555fe0f4ac4d444be4cf1eef647c6e63 Auto-generated-cl: translation import
es/values-ru/strings.xml
|
b03fa58bc2f632fc65868f04cbbf80f9abbb2d79 |
04-Feb-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ie03d9483555fe0f4ac4d444be4cf1eef647c6e63 Auto-generated-cl: translation import
es/values-ru/strings.xml
|
6d13581113231dd0c0a11efd35566b858ba49d05 |
04-Feb-2013 |
The Android Automerger <android-build@android.com> |
merge in jb-mr2-release history after reset to master
|
aa4c9d579b067fa3a1c9eacc0f9325bd2692bb6e |
02-Feb-2013 |
John Hoford <hoford@google.com> |
am 87e889b1: fix performance problem with large images in draw # Via John Hoford * commit '87e889b195de98334048bb70bb1263a2ab76c76a': fix performance problem with large images in draw
|
88e34ef6e25ec2ee63b0400accb9f500bf88dc96 |
02-Feb-2013 |
John Hoford <hoford@google.com> |
fix performance problem with large images in draw Change-Id: I9fa5a90e58273c6dd6e80d7d0bf07c3371a6f10e
rc/com/android/gallery3d/filtershow/colorpicker/ColorOpacityView.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterDraw.java
|
87e889b195de98334048bb70bb1263a2ab76c76a |
02-Feb-2013 |
John Hoford <hoford@google.com> |
fix performance problem with large images in draw Change-Id: I9fa5a90e58273c6dd6e80d7d0bf07c3371a6f10e
rc/com/android/gallery3d/filtershow/colorpicker/ColorOpacityView.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterDraw.java
|
2519d51a81127ac80fd3947523054f13cc72a057 |
01-Feb-2013 |
John Hoford <hoford@google.com> |
am ff7743f5: Merge "fix sharpen to work under the new system" into gb-ub-photos-bryce # Via Android (Google) Code Review (1) and John Hoford (1) * commit 'ff7743f592fa5499acdbbbb9a0d303ace6f6e08b': fix sharpen to work under the new system
|
34bc750cc7c1e64f782333ff9f45377887b2e958 |
01-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
am c47b572a: Merge "Fix async loading of borders" into gb-ub-photos-bryce # Via Android (Google) Code Review (1) and nicolasroard (1) * commit 'c47b572abf302992bbdee33f9e36be8de1dfcb6a': Fix async loading of borders
|
aabe19ff54dc079f86df6f2d7b428779e122a573 |
01-Feb-2013 |
Doris Liu <tianliu@google.com> |
am 46526e49: Merge "Move tests from camera to gallery2" into gb-ub-photos-bryce # Via Android (Google) Code Review (1) and Doris Liu (1) * commit '46526e49de8f0a68e107cae2f64c70f8123f2249': Move tests from camera to gallery2
|
1192255c27827071c6ccf823aa6a9d6e362933a8 |
01-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Fix async loading of borders bug:8099597 Change-Id: I62584c87eff03539ec50aafafda4238850b4f743
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
|
efc561262664cbb9aaf2c4e39a74597329ae77de |
01-Feb-2013 |
John Hoford <hoford@google.com> |
Merge "fix sharpen to work under the new system" into gb-ub-photos-bryce
|
ff7743f592fa5499acdbbbb9a0d303ace6f6e08b |
01-Feb-2013 |
John Hoford <hoford@google.com> |
Merge "fix sharpen to work under the new system" into gb-ub-photos-bryce
|
c47b572abf302992bbdee33f9e36be8de1dfcb6a |
01-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Merge "Fix async loading of borders" into gb-ub-photos-bryce
|
315adad73e9e6221888fc2f35511a99dd3dda722 |
01-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Merge "Fix async loading of borders" into gb-ub-photos-bryce
|
fd7d6303402f98a5f682d9c0d37889c2948b9c76 |
01-Feb-2013 |
John Hoford <hoford@google.com> |
fix sharpen to work under the new system Change-Id: I25518a05511c8b2279ba171bc3902e8cb3181c19
es/layout/filtershow_zoom_editor.xml
|
f52b80ecac784c0d279cfde44f159e9d1aa74961 |
01-Feb-2013 |
John Hoford <hoford@google.com> |
fix sharpen to work under the new system Change-Id: I25518a05511c8b2279ba171bc3902e8cb3181c19
rc/com/android/gallery3d/filtershow/editors/BasicEditor.java
rc/com/android/gallery3d/filtershow/editors/EditorZoom.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterSharpen.java
|
c0b84ec1fe2573fba76784cec4c1e663254b2bb5 |
01-Feb-2013 |
John Hoford <hoford@google.com> |
fix sharpen to work under the new system Change-Id: I25518a05511c8b2279ba171bc3902e8cb3181c19
es/layout/filtershow_zoom_editor.xml
rc/com/android/gallery3d/filtershow/editors/BasicEditor.java
rc/com/android/gallery3d/filtershow/editors/EditorZoom.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterSharpen.java
|
9090141f56b4e2000704d0c4a778d3a819821726 |
01-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Fix async loading of borders bug:8099597 Change-Id: I62584c87eff03539ec50aafafda4238850b4f743
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
|
48e3a417d2d2dbae25410b2219ca823539e38325 |
01-Feb-2013 |
nicolasroard <nicolasroard@google.com> |
Fix async loading of borders bug:8099597 Change-Id: I62584c87eff03539ec50aafafda4238850b4f743
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
|
46526e49de8f0a68e107cae2f64c70f8123f2249 |
01-Feb-2013 |
Doris Liu <tianliu@google.com> |
Merge "Move tests from camera to gallery2" into gb-ub-photos-bryce
|
be5637e805b5526de718a55bd24717a09be910a3 |
01-Feb-2013 |
Doris Liu <tianliu@google.com> |
Merge "Move tests from camera to gallery2" into gb-ub-photos-bryce
|
6de0c2f73341332c148e879c49b5fea33c438cae |
01-Feb-2013 |
Doris Liu <tianliu@google.com> |
Merge "Move tests from camera to gallery2" into gb-ub-photos-bryce
|
41d9351e0a5c4ccbc1bad5e714bc88e0495f4440 |
01-Feb-2013 |
Doris Liu <tianliu@google.com> |
Move tests from camera to gallery2 Change-Id: If9143fff7d22295a5ad3bb01c4b860d07c3ee1c9
ests_camera/AndroidManifest.xml
|
97611a7010f55149aa18ed250f4961ff27438b55 |
01-Feb-2013 |
Doris Liu <tianliu@google.com> |
Move tests from camera to gallery2 Change-Id: If9143fff7d22295a5ad3bb01c4b860d07c3ee1c9
erftests/panorama/Android.mk
ests_camera/Android.mk
|
ae39d71b7959b1c71e0db92ff49beb0446f9ae8f |
01-Feb-2013 |
Doris Liu <tianliu@google.com> |
Move tests from camera to gallery2 Change-Id: If9143fff7d22295a5ad3bb01c4b860d07c3ee1c9
erftests/panorama/Android.mk
erftests/panorama/README.txt
erftests/panorama/benchmark.cpp
erftests/panorama/input/test_001.ppm
erftests/panorama/input/test_002.ppm
erftests/panorama/input/test_003.ppm
erftests/panorama/input/test_004.ppm
erftests/panorama/input/test_005.ppm
erftests/panorama/input/test_006.ppm
erftests/panorama/input/test_007.ppm
erftests/panorama/input/test_008.ppm
erftests/panorama/input/test_009.ppm
erftests/panorama/input/test_010.ppm
erftests/panorama/input/test_011.ppm
erftests/panorama/input/test_012.ppm
erftests/panorama/input/test_013.ppm
erftests/panorama/input/test_014.ppm
erftests/panorama/input/test_015.ppm
erftests/panorama/input/test_016.ppm
erftests/panorama/input/test_017.ppm
erftests/panorama/input/test_018.ppm
erftests/panorama/input/test_019.ppm
erftests/panorama/input/test_020.ppm
erftests/panorama/input/test_021.ppm
erftests/panorama/input/test_022.ppm
erftests/panorama/input/test_023.ppm
erftests/panorama/input/test_024.ppm
erftests/panorama/input/test_025.ppm
erftests/panorama/input/test_026.ppm
erftests/panorama/input/test_027.ppm
erftests/panorama/input/test_028.ppm
erftests/panorama/input/test_029.ppm
erftests/panorama/input/test_030.ppm
erftests/panorama/input/test_031.ppm
erftests/panorama/input/test_032.ppm
erftests/panorama/input/test_033.ppm
erftests/panorama/input/test_034.ppm
erftests/panorama/input/test_035.ppm
erftests/panorama/input/test_036.ppm
erftests/panorama/input/test_037.ppm
erftests/panorama/input/test_038.ppm
erftests/panorama/output/golden.ppm
ests_camera/Android.mk
ests_camera/AndroidManifest.xml
ests_camera/src/com/android/camera/CameraLaunchPerformance.java
ests_camera/src/com/android/camera/CameraTestRunner.java
ests_camera/src/com/android/camera/StressTests.java
ests_camera/src/com/android/camera/UnitTests.java
ests_camera/src/com/android/camera/activity/CameraActivityTest.java
ests_camera/src/com/android/camera/activity/CameraTestCase.java
ests_camera/src/com/android/camera/functional/CameraTest.java
ests_camera/src/com/android/camera/functional/ImageCaptureIntentTest.java
ests_camera/src/com/android/camera/functional/VideoCaptureIntentTest.java
ests_camera/src/com/android/camera/power/ImageAndVideoCapture.java
ests_camera/src/com/android/camera/stress/CameraLatency.java
ests_camera/src/com/android/camera/stress/CameraStartUp.java
ests_camera/src/com/android/camera/stress/CameraStressTestRunner.java
ests_camera/src/com/android/camera/stress/ImageCapture.java
ests_camera/src/com/android/camera/stress/ShotToShotLatency.java
ests_camera/src/com/android/camera/stress/SwitchPreview.java
ests_camera/src/com/android/camera/stress/TestUtil.java
ests_camera/src/com/android/camera/stress/VideoCapture.java
ests_camera/src/com/android/camera/unittest/CameraUnitTest.java
|
ffa6237aed496373cd578ccdb9d2a47cde90e25d |
01-Feb-2013 |
Doris Liu <tianliu@google.com> |
Move tests from camera to gallery2 Change-Id: If9143fff7d22295a5ad3bb01c4b860d07c3ee1c9
ests_camera/src/com/android/camera/CameraLaunchPerformance.java
ests_camera/src/com/android/camera/CameraTestRunner.java
ests_camera/src/com/android/camera/StressTests.java
ests_camera/src/com/android/camera/UnitTests.java
ests_camera/src/com/android/camera/activity/CameraActivityTest.java
ests_camera/src/com/android/camera/activity/CameraTestCase.java
ests_camera/src/com/android/camera/functional/CameraTest.java
ests_camera/src/com/android/camera/functional/ImageCaptureIntentTest.java
ests_camera/src/com/android/camera/functional/VideoCaptureIntentTest.java
ests_camera/src/com/android/camera/power/ImageAndVideoCapture.java
ests_camera/src/com/android/camera/stress/CameraLatency.java
ests_camera/src/com/android/camera/stress/CameraStartUp.java
ests_camera/src/com/android/camera/stress/CameraStressTestRunner.java
ests_camera/src/com/android/camera/stress/ImageCapture.java
ests_camera/src/com/android/camera/stress/ShotToShotLatency.java
ests_camera/src/com/android/camera/stress/SwitchPreview.java
ests_camera/src/com/android/camera/stress/TestUtil.java
ests_camera/src/com/android/camera/stress/VideoCapture.java
ests_camera/src/com/android/camera/unittest/CameraUnitTest.java
|
257548e71024663309456640b68eeb43acd7635e |
01-Feb-2013 |
Doris Liu <tianliu@google.com> |
Move tests from camera to gallery2 Change-Id: If9143fff7d22295a5ad3bb01c4b860d07c3ee1c9
ests_camera/src/com/android/camera/StressTests.java
ests_camera/src/com/android/camera/stress/CameraLatency.java
ests_camera/src/com/android/camera/stress/CameraStartUp.java
ests_camera/src/com/android/camera/stress/CameraStressTestRunner.java
ests_camera/src/com/android/camera/stress/ImageCapture.java
ests_camera/src/com/android/camera/stress/ShotToShotLatency.java
ests_camera/src/com/android/camera/stress/SwitchPreview.java
ests_camera/src/com/android/camera/stress/TestUtil.java
ests_camera/src/com/android/camera/stress/VideoCapture.java
|
053b950088d07251adf5d9d8cbc6403c934aa6b0 |
01-Feb-2013 |
Baligh Uddin <baligh@google.com> |
am 55aae5be: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce # Via Android (Google) Code Review (1) and Baligh Uddin (1) * commit '55aae5be9edcb95aed62106018671e68c3f42bda': Import translations. DO NOT MERGE
|
883e3f7d5c20599bb34e8bad75a73be794e95c8d |
01-Feb-2013 |
Baligh Uddin <baligh@google.com> |
am b8c62c9e: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce # Via Android (Google) Code Review (1) and Baligh Uddin (1) * commit 'b8c62c9ee6ff9c31151860047857fd13b1930a6d': Import translations. DO NOT MERGE
|
09bdb95e26cfa393bf5bff013f80e795834a9709 |
01-Feb-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE"
|
55aae5be9edcb95aed62106018671e68c3f42bda |
01-Feb-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
|
fb1b6e9f60caf1e8b3c97395e41550166af52c10 |
01-Feb-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
|
0fd2dacb6bafdb5b8f7b4584723ddfbe746e4a15 |
01-Feb-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE"
|
b8c62c9ee6ff9c31151860047857fd13b1930a6d |
01-Feb-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
|
715a12830edefe80c4a66dc50bfd9bd469ba52ad |
01-Feb-2013 |
Angus Kong <shkong@google.com> |
am 2007faf1: Merge "Make video snapshot save images in the background." into gb-ub-photos-bryce # Via Android (Google) Code Review (1) and Angus Kong (1) * commit '2007faf1f1f6f3aa589d907ff3416a671cea9abc': Make video snapshot save images in the background.
|
c1eab1d92167c1eeec216b8ff9894c232d08a3b4 |
01-Feb-2013 |
John Hoford <hoford@google.com> |
am 1b1a79f1: Fix curves refresh bug # Via John Hoford * commit '1b1a79f1ccb6f847d017a72fa4c288b2195ffd99': Fix curves refresh bug
|
141cc17189342efe78bbc2ab1c30e34bb980e200 |
01-Feb-2013 |
Angus Kong <shkong@google.com> |
Merge "Make video snapshot save images in the background." into gb-ub-photos-bryce
|
2007faf1f1f6f3aa589d907ff3416a671cea9abc |
01-Feb-2013 |
Angus Kong <shkong@google.com> |
Merge "Make video snapshot save images in the background." into gb-ub-photos-bryce
|
1b1a79f1ccb6f847d017a72fa4c288b2195ffd99 |
01-Feb-2013 |
John Hoford <hoford@google.com> |
Fix curves refresh bug Change-Id: I5c85dcfa118345d24a5fef120541741e7d1cbdd6
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterCurves.java
rc_pd/com/android/gallery3d/filtershow/editors/EditorManager.java
|
81795da6a519803efc46e46e3c2c4ba8a6e00e9b |
01-Feb-2013 |
John Hoford <hoford@google.com> |
Fix curves refresh bug Change-Id: I5c85dcfa118345d24a5fef120541741e7d1cbdd6
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterCurves.java
rc_pd/com/android/gallery3d/filtershow/editors/EditorManager.java
|
8370ea627f5a125d082f757879661fc0700c2e32 |
01-Feb-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I2ba59e627292005e1c7f6d592efd42f12886292f Auto-generated-cl: translation import
es/values-af/filtershow_strings.xml
es/values-am/filtershow_strings.xml
es/values-ar/filtershow_strings.xml
es/values-be/filtershow_strings.xml
es/values-bg/filtershow_strings.xml
es/values-ca/filtershow_strings.xml
es/values-cs/filtershow_strings.xml
es/values-da/filtershow_strings.xml
es/values-de/filtershow_strings.xml
es/values-el/filtershow_strings.xml
es/values-en-rGB/filtershow_strings.xml
es/values-es-rUS/filtershow_strings.xml
es/values-es/filtershow_strings.xml
es/values-et/filtershow_strings.xml
es/values-fa/filtershow_strings.xml
es/values-fi/filtershow_strings.xml
es/values-fr/filtershow_strings.xml
es/values-hi/filtershow_strings.xml
es/values-hr/filtershow_strings.xml
es/values-hu/filtershow_strings.xml
es/values-in/filtershow_strings.xml
es/values-it/filtershow_strings.xml
es/values-iw/filtershow_strings.xml
es/values-ja/filtershow_strings.xml
es/values-ko/filtershow_strings.xml
es/values-lt/filtershow_strings.xml
es/values-lv/filtershow_strings.xml
es/values-ms/filtershow_strings.xml
es/values-nb/filtershow_strings.xml
es/values-nl/filtershow_strings.xml
es/values-pl/filtershow_strings.xml
es/values-pt-rPT/filtershow_strings.xml
es/values-pt/filtershow_strings.xml
es/values-ro/filtershow_strings.xml
es/values-ru/filtershow_strings.xml
es/values-sk/filtershow_strings.xml
es/values-sl/filtershow_strings.xml
es/values-sr/filtershow_strings.xml
es/values-sv/filtershow_strings.xml
es/values-sw/filtershow_strings.xml
es/values-th/filtershow_strings.xml
es/values-tl/filtershow_strings.xml
es/values-tr/filtershow_strings.xml
es/values-uk/filtershow_strings.xml
es/values-vi/filtershow_strings.xml
es/values-zh-rCN/filtershow_strings.xml
es/values-zh-rTW/filtershow_strings.xml
es/values-zu/filtershow_strings.xml
|
25fe72590e3483a8794092cbf9249cdebc39f429 |
01-Feb-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ibc8434acc5356c40eddc6acd96a519efb806f6b9 Auto-generated-cl: translation import
es/values-af/filtershow_strings.xml
es/values-am/filtershow_strings.xml
es/values-ar/filtershow_strings.xml
es/values-be/filtershow_strings.xml
es/values-bg/filtershow_strings.xml
es/values-ca/filtershow_strings.xml
es/values-cs/filtershow_strings.xml
es/values-da/filtershow_strings.xml
es/values-de/filtershow_strings.xml
es/values-el/filtershow_strings.xml
es/values-en-rGB/filtershow_strings.xml
es/values-es-rUS/filtershow_strings.xml
es/values-es/filtershow_strings.xml
es/values-et/filtershow_strings.xml
es/values-fa/filtershow_strings.xml
es/values-fi/filtershow_strings.xml
es/values-fr/filtershow_strings.xml
es/values-hi/filtershow_strings.xml
es/values-hr/filtershow_strings.xml
es/values-hu/filtershow_strings.xml
es/values-in/filtershow_strings.xml
es/values-it/filtershow_strings.xml
es/values-iw/filtershow_strings.xml
es/values-ja/filtershow_strings.xml
es/values-ko/filtershow_strings.xml
es/values-lt/filtershow_strings.xml
es/values-lv/filtershow_strings.xml
es/values-ms/filtershow_strings.xml
es/values-nb/filtershow_strings.xml
es/values-nl/filtershow_strings.xml
es/values-pl/filtershow_strings.xml
es/values-pt-rPT/filtershow_strings.xml
es/values-pt/filtershow_strings.xml
es/values-ro/filtershow_strings.xml
es/values-ru/filtershow_strings.xml
es/values-sk/filtershow_strings.xml
es/values-sl/filtershow_strings.xml
es/values-sr/filtershow_strings.xml
es/values-sv/filtershow_strings.xml
es/values-sw/filtershow_strings.xml
es/values-th/filtershow_strings.xml
es/values-tl/filtershow_strings.xml
es/values-tr/filtershow_strings.xml
es/values-uk/filtershow_strings.xml
es/values-vi/filtershow_strings.xml
es/values-zh-rCN/filtershow_strings.xml
es/values-zh-rTW/filtershow_strings.xml
es/values-zu/filtershow_strings.xml
|
3d1570dd23c5420c93db978869e0e8c740bd4523 |
01-Feb-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ibc8434acc5356c40eddc6acd96a519efb806f6b9 Auto-generated-cl: translation import
es/values-af/filtershow_strings.xml
es/values-am/filtershow_strings.xml
es/values-ar/filtershow_strings.xml
es/values-be/filtershow_strings.xml
es/values-bg/filtershow_strings.xml
es/values-ca/filtershow_strings.xml
es/values-cs/filtershow_strings.xml
es/values-da/filtershow_strings.xml
es/values-de/filtershow_strings.xml
es/values-el/filtershow_strings.xml
es/values-en-rGB/filtershow_strings.xml
es/values-es-rUS/filtershow_strings.xml
es/values-es/filtershow_strings.xml
es/values-et/filtershow_strings.xml
es/values-fa/filtershow_strings.xml
es/values-fi/filtershow_strings.xml
es/values-fr/filtershow_strings.xml
es/values-hi/filtershow_strings.xml
es/values-hr/filtershow_strings.xml
es/values-hu/filtershow_strings.xml
es/values-in/filtershow_strings.xml
es/values-it/filtershow_strings.xml
es/values-iw/filtershow_strings.xml
es/values-ja/filtershow_strings.xml
es/values-ko/filtershow_strings.xml
es/values-lt/filtershow_strings.xml
es/values-lv/filtershow_strings.xml
es/values-ms/filtershow_strings.xml
es/values-nb/filtershow_strings.xml
es/values-nl/filtershow_strings.xml
es/values-pl/filtershow_strings.xml
es/values-pt-rPT/filtershow_strings.xml
es/values-pt/filtershow_strings.xml
es/values-ro/filtershow_strings.xml
es/values-ru/filtershow_strings.xml
es/values-sk/filtershow_strings.xml
es/values-sl/filtershow_strings.xml
es/values-sr/filtershow_strings.xml
es/values-sv/filtershow_strings.xml
es/values-sw/filtershow_strings.xml
es/values-th/filtershow_strings.xml
es/values-tl/filtershow_strings.xml
es/values-tr/filtershow_strings.xml
es/values-uk/filtershow_strings.xml
es/values-vi/filtershow_strings.xml
es/values-zh-rCN/filtershow_strings.xml
es/values-zh-rTW/filtershow_strings.xml
es/values-zu/filtershow_strings.xml
|
9f642eaf18e509ed938ae06e9904bcce126d7214 |
01-Feb-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I7ab5d3d4fc42800212aeb219d8dc4dfc248267f4 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
016dec0f286e473a8b151d60fcc4828bcd9631c7 |
01-Feb-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I9b7a8af6d2e6e0fe2f08119081881905a7e81c33 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
16dfce831f39b30615674291bc6c6992cd540a4a |
01-Feb-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I9b7a8af6d2e6e0fe2f08119081881905a7e81c33 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
b909f68160f1e9d344f0bfa2c4535c4ee3efd95c |
01-Feb-2013 |
The Android Automerger <android-build@android.com> |
merge in jb-mr2-release history after reset to master
|
86d36313d88fe96354f2cdd4f378e5ff8397c458 |
01-Feb-2013 |
Angus Kong <shkong@google.com> |
Make video snapshot save images in the background. bug:8114662 Change-Id: I4e96269bd7723dd9a82d2905a01f736c8982c4ed
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/CameraModule.java
rc/com/android/camera/MediaSaveService.java
rc/com/android/camera/PanoramaModule.java
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/VideoModule.java
|
52fe00244742dbae0072d15f73dab54a55271b56 |
01-Feb-2013 |
Angus Kong <shkong@google.com> |
Make video snapshot save images in the background. bug:8114662 Change-Id: I4e96269bd7723dd9a82d2905a01f736c8982c4ed
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/CameraModule.java
rc/com/android/camera/MediaSaveService.java
rc/com/android/camera/PanoramaModule.java
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/VideoModule.java
|
a0d9328c3153efa46b6e62a8dcb59e166fcbd8d0 |
01-Feb-2013 |
John Reck <jreck@google.com> |
am 346a15d3: Merge "Animate between photo modules" into gb-ub-photos-bryce # Via Android (Google) Code Review (1) and John Reck (1) * commit '346a15d3c7452927b3088a2c70410b90dfc36180': Animate between photo modules
|
346a15d3c7452927b3088a2c70410b90dfc36180 |
01-Feb-2013 |
John Reck <jreck@google.com> |
Merge "Animate between photo modules" into gb-ub-photos-bryce
|
8052651774e5a4f68f9ea3e79319e59eafd354cc |
01-Feb-2013 |
John Reck <jreck@google.com> |
Merge "Animate between photo modules" into gb-ub-photos-bryce
|
aa7397114c5ea228efb0eb4a2f8eb625b08288e3 |
07-Nov-2012 |
John Reck <jreck@google.com> |
Animate between photo modules Change-Id: I20f0d470a14bb41757788897c1c5e7ea42a7426d
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/CameraScreenNail.java
|
e319aeabdc825f221df5af8a6ec080c6f5d41a94 |
07-Nov-2012 |
John Reck <jreck@google.com> |
Animate between photo modules Change-Id: I20f0d470a14bb41757788897c1c5e7ea42a7426d
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/CameraScreenNail.java
|
2c93a700e68ff061989991c3fb13259ea65e0d09 |
01-Feb-2013 |
Angus Kong <shkong@google.com> |
am 066f0517: Merge "Make background media saving a service" into gb-ub-photos-bryce # Via Android (Google) Code Review (1) and Angus Kong (1) * commit '066f05178e8c4d8ce67b4b457b6f00ebeac9fcbe': Make background media saving a service
|
066f05178e8c4d8ce67b4b457b6f00ebeac9fcbe |
31-Jan-2013 |
Angus Kong <shkong@google.com> |
Merge "Make background media saving a service" into gb-ub-photos-bryce
|
865c12a79c5ab045d689c26be621d53586ee2a05 |
31-Jan-2013 |
Angus Kong <shkong@google.com> |
Merge "Make background media saving a service" into gb-ub-photos-bryce
|
f4bfce2f8ad78e2bafdc70e944914ff957e62c63 |
30-Jan-2013 |
Angus Kong <shkong@google.com> |
Make background media saving a service bug:8091328 Change-Id: If35c1832238e921b6582d8642fdbaa4378ea0c48
ndroidManifest.xml
|
c099398cfe60422d73281e66de209c4837284c88 |
30-Jan-2013 |
Angus Kong <shkong@google.com> |
Make background media saving a service bug:8091328 Change-Id: If35c1832238e921b6582d8642fdbaa4378ea0c48
ndroidManifest.xml
rc/com/android/camera/MediaSaveService.java
rc/com/android/camera/MediaSaver.java
rc/com/android/camera/PhotoModule.java
|
ce5480e099fda944b9e96e4b750300944c3f4a4f |
30-Jan-2013 |
Angus Kong <shkong@google.com> |
Make background media saving a service bug:8091328 Change-Id: If35c1832238e921b6582d8642fdbaa4378ea0c48
rc/com/android/camera/MediaSaveService.java
rc/com/android/camera/MediaSaver.java
rc/com/android/camera/PhotoModule.java
|
7fe650cd5acaa865cf504ac713c6cd8f82a899c6 |
31-Jan-2013 |
The Android Automerger <android-build@android.com> |
merge in jb-mr2-release history after reset to master
|
e11045a2311a2a751fe90d191f575daae347d7ee |
31-Jan-2013 |
John Hoford <google.com> |
am 915d60a3: add color selection ui to draw # Via John Hoford * commit '915d60a378b0ca7bbe3af6312ccd2f4b94eb2da1': add color selection ui to draw
|
0b1b15525e85ed9fceaa1aab2f39df620f375826 |
25-Jan-2013 |
John Hoford <google.com> |
add color selection ui to draw Change-Id: Ie2fa3522141e4f98e2b7f805c1ebe3385083bb02
es/drawable/filtershow_color_picker_circle.xml
es/drawable/filtershow_color_picker_roundrect.xml
es/layout/filtershow_color_gird.xml
es/layout/filtershow_color_picker.xml
es/layout/filtershow_cp_custom_title.xml
es/layout/filtershow_draw_button.xml
es/layout/filtershow_draw_size.xml
es/menu/filtershow_menu_draw.xml
es/values/filtershow_color.xml
es/values/filtershow_ids.xml
es/values/filtershow_strings.xml
|
915d60a378b0ca7bbe3af6312ccd2f4b94eb2da1 |
25-Jan-2013 |
John Hoford <google.com> |
add color selection ui to draw Change-Id: Ie2fa3522141e4f98e2b7f805c1ebe3385083bb02
es/drawable/filtershow_color_picker_circle.xml
es/drawable/filtershow_color_picker_roundrect.xml
es/layout/filtershow_color_gird.xml
es/layout/filtershow_color_picker.xml
es/layout/filtershow_cp_custom_title.xml
es/layout/filtershow_draw_button.xml
es/layout/filtershow_draw_size.xml
es/menu/filtershow_menu_draw.xml
es/values/filtershow_color.xml
es/values/filtershow_ids.xml
es/values/filtershow_strings.xml
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/colorpicker/ColorGridDialog.java
rc/com/android/gallery3d/filtershow/colorpicker/ColorListener.java
rc/com/android/gallery3d/filtershow/colorpicker/ColorOpacityView.java
rc/com/android/gallery3d/filtershow/colorpicker/ColorPickerDialog.java
rc/com/android/gallery3d/filtershow/colorpicker/ColorRectView.java
rc/com/android/gallery3d/filtershow/colorpicker/ColorValueView.java
rc/com/android/gallery3d/filtershow/colorpicker/RGBListener.java
rc/com/android/gallery3d/filtershow/editors/EditorDraw.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterDraw.java
rc/com/android/gallery3d/filtershow/imageshow/ImageDraw.java
rc_pd/com/android/gallery3d/filtershow/editors/EditorManager.java
|
9beac537774310fc435bc513ba25a8230b14f0e4 |
25-Jan-2013 |
John Hoford <google.com> |
add color selection ui to draw Change-Id: Ie2fa3522141e4f98e2b7f805c1ebe3385083bb02
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/colorpicker/ColorGridDialog.java
rc/com/android/gallery3d/filtershow/colorpicker/ColorListener.java
rc/com/android/gallery3d/filtershow/colorpicker/ColorOpacityView.java
rc/com/android/gallery3d/filtershow/colorpicker/ColorPickerDialog.java
rc/com/android/gallery3d/filtershow/colorpicker/ColorRectView.java
rc/com/android/gallery3d/filtershow/colorpicker/ColorValueView.java
rc/com/android/gallery3d/filtershow/colorpicker/RGBListener.java
rc/com/android/gallery3d/filtershow/editors/EditorDraw.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterDraw.java
rc/com/android/gallery3d/filtershow/imageshow/ImageDraw.java
rc_pd/com/android/gallery3d/filtershow/editors/EditorManager.java
|
a8ed2cc79dfe80fec33b258a439439a63cf05ffa |
31-Jan-2013 |
John Reck <jreck@google.com> |
am 5540a0d1: Merge "show enable sync option for canvas" into gb-ub-photos-bryce # Via Android (Google) Code Review (1) and John Reck (1) * commit '5540a0d130aa295d11e908719923faec3bce4029': show enable sync option for canvas
|
5540a0d130aa295d11e908719923faec3bce4029 |
31-Jan-2013 |
John Reck <jreck@google.com> |
Merge "show enable sync option for canvas" into gb-ub-photos-bryce
|
d08e8639ce9a0088a34d6fb9630e4fb8b4f9e035 |
31-Jan-2013 |
John Reck <jreck@google.com> |
Merge "show enable sync option for canvas" into gb-ub-photos-bryce
|
c869018975bdfb85b74991491e377d930c848f68 |
31-Jan-2013 |
John Reck <jreck@google.com> |
show enable sync option for canvas Temporary change for testing Change-Id: I46305cb3b182e0a48625bf4fcad3205334ade961
rc/com/android/gallery3d/provider/CanvasProvider.java
rc/com/android/gallery3d/provider/CanvasProviderBase.java
rc/com/google/android/canvas/provider/EnableSyncActivity.java
|
a44d376a92993839117f34743a17e27bf090b1a9 |
31-Jan-2013 |
John Reck <jreck@google.com> |
show enable sync option for canvas Temporary change for testing Change-Id: I46305cb3b182e0a48625bf4fcad3205334ade961
rc/com/android/gallery3d/provider/CanvasProvider.java
rc/com/android/gallery3d/provider/CanvasProviderBase.java
rc/com/google/android/canvas/provider/EnableSyncActivity.java
|
70f4f049bec9eeeacca84f8bc468bbcbcbdd07b7 |
31-Jan-2013 |
nicolasroard <nicolasroard@google.com> |
am 27f14ec6: Merge "Clean up invalidate / redraw loop Move the recopy to the main thread" into gb-ub-photos-bryce # Via Android (Google) Code Review (1) and nicolasroard (1) * commit '27f14ec6ff7565d96f6c838e7417a25c15beade3': Clean up invalidate / redraw loop Move the recopy to the main thread
|
8b4605633b6fedbe54020aac84f7ab042a71af7c |
31-Jan-2013 |
nicolasroard <nicolasroard@google.com> |
Merge "Clean up invalidate / redraw loop Move the recopy to the main thread" into gb-ub-photos-bryce
|
27f14ec6ff7565d96f6c838e7417a25c15beade3 |
31-Jan-2013 |
nicolasroard <nicolasroard@google.com> |
Merge "Clean up invalidate / redraw loop Move the recopy to the main thread" into gb-ub-photos-bryce
|
80af9dc06a173d09778b843c5a3067b079ce0c34 |
31-Jan-2013 |
nicolasroard <nicolasroard@google.com> |
Merge "Clean up invalidate / redraw loop Move the recopy to the main thread" into gb-ub-photos-bryce
|
90990e356bb6dcd01dd3954dd872a31c92a7be82 |
29-Jan-2013 |
nicolasroard <nicolasroard@google.com> |
Clean up invalidate / redraw loop Move the recopy to the main thread Change-Id: I8c94179e292f5679b7c817b6bd5000ee384b83ce
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
|
6205c8100d7c0ec2a2db0baf9f043ae472a8da29 |
29-Jan-2013 |
nicolasroard <nicolasroard@google.com> |
Clean up invalidate / redraw loop Move the recopy to the main thread Change-Id: I8c94179e292f5679b7c817b6bd5000ee384b83ce
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/cache/FilteringPipeline.java
rc/com/android/gallery3d/filtershow/editors/BasicEditor.java
rc/com/android/gallery3d/filtershow/filters/ImageFilter.java
rc/com/android/gallery3d/filtershow/imageshow/MasterImage.java
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
|
518d1193692fadaf91a2f5b174735d45bda2c4ab |
29-Jan-2013 |
nicolasroard <nicolasroard@google.com> |
Clean up invalidate / redraw loop Move the recopy to the main thread Change-Id: I8c94179e292f5679b7c817b6bd5000ee384b83ce
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/cache/FilteringPipeline.java
rc/com/android/gallery3d/filtershow/editors/BasicEditor.java
rc/com/android/gallery3d/filtershow/filters/ImageFilter.java
rc/com/android/gallery3d/filtershow/imageshow/MasterImage.java
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
|
a0019a81f14bc2525a67644200f2447c2085917a |
30-Jan-2013 |
The Android Automerger <android-build@android.com> |
merge in jb-mr2-release history after reset to master
|
ed5d1bba6c3897a7f85b41f67e094ba7314dcb6d |
30-Jan-2013 |
Michael Kolb <kolby@google.com> |
am 0d0ec194: Merge "Copy camera resources into Gallery2" into gb-ub-photos-bryce # Via Android (Google) Code Review (1) and Michael Kolb (1) * commit '0d0ec194f3a73267ad29fc7627b1f445bca77338': Copy camera resources into Gallery2
|
0d0ec194f3a73267ad29fc7627b1f445bca77338 |
30-Jan-2013 |
Michael Kolb <kolby@google.com> |
Merge "Copy camera resources into Gallery2" into gb-ub-photos-bryce
|
2c87db720ca1d6b76260ec86a5bbf29a19eb2c2f |
29-Jan-2013 |
Michael Kolb <kolby@google.com> |
Copy camera resources into Gallery2 Change-Id: I3be2758b2ddca31dbc2f21457a62664310c39684
ndroid.mk
|
3148b18958ea240e9ac7aac90f16ba1d3df0519f |
29-Jan-2013 |
Michael Kolb <kolby@google.com> |
Copy camera resources into Gallery2 Change-Id: I3be2758b2ddca31dbc2f21457a62664310c39684
es/anim/count_down_exit.xml
es/anim/on_screen_hint_enter.xml
es/anim/on_screen_hint_exit.xml
es/color/primary_text.xml
es/drawable-hdpi/btn_camera_shutter_holo.png
es/drawable-hdpi/btn_camera_shutter_holo_large.png
es/drawable-hdpi/btn_camera_shutter_pressed_holo.png
es/drawable-hdpi/btn_camera_shutter_pressed_holo_large.png
es/drawable-hdpi/btn_pan_shutter_pressed_holo.png
es/drawable-hdpi/btn_pan_shutter_pressed_holo_large.png
es/drawable-hdpi/btn_pan_shutter_recording_holo.png
es/drawable-hdpi/btn_pan_shutter_recording_holo_large.png
es/drawable-hdpi/btn_pan_shutter_recording_pressed_holo.png
es/drawable-hdpi/btn_pan_shutter_recording_pressed_holo_large.png
es/drawable-hdpi/btn_shutter_default.png
es/drawable-hdpi/btn_shutter_pano_pressed.png
es/drawable-hdpi/btn_shutter_pressed.png
es/drawable-hdpi/btn_shutter_recording.png
es/drawable-hdpi/btn_shutter_video_default.png
es/drawable-hdpi/btn_shutter_video_pressed.png
es/drawable-hdpi/btn_shutter_video_recording.png
es/drawable-hdpi/btn_video_shutter_holo.png
es/drawable-hdpi/btn_video_shutter_holo_large.png
es/drawable-hdpi/btn_video_shutter_pressed_holo.png
es/drawable-hdpi/btn_video_shutter_pressed_holo_large.png
es/drawable-hdpi/btn_video_shutter_recording_holo.png
es/drawable-hdpi/btn_video_shutter_recording_holo_large.png
es/drawable-hdpi/btn_video_shutter_recording_pressed_holo.png
es/drawable-hdpi/btn_video_shutter_recording_pressed_holo_large.png
es/drawable-hdpi/dialog_full_holo_dark.9.png
es/drawable-hdpi/ic_btn_shutter_retake.png
es/drawable-hdpi/ic_effects_holo_light.png
es/drawable-hdpi/ic_effects_holo_light_large.png
es/drawable-hdpi/ic_effects_holo_light_xlarge.png
es/drawable-hdpi/ic_exposure_0.png
es/drawable-hdpi/ic_exposure_holo_light.png
es/drawable-hdpi/ic_exposure_holo_light_large.png
es/drawable-hdpi/ic_exposure_holo_light_xlarge.png
es/drawable-hdpi/ic_exposure_n1.png
es/drawable-hdpi/ic_exposure_n2.png
es/drawable-hdpi/ic_exposure_n3.png
es/drawable-hdpi/ic_exposure_p1.png
es/drawable-hdpi/ic_exposure_p2.png
es/drawable-hdpi/ic_exposure_p3.png
es/drawable-hdpi/ic_flash_auto_holo_light.png
es/drawable-hdpi/ic_flash_auto_holo_light_large.png
es/drawable-hdpi/ic_flash_auto_holo_light_xlarge.png
es/drawable-hdpi/ic_flash_off_holo_light.png
es/drawable-hdpi/ic_flash_off_holo_light_large.png
es/drawable-hdpi/ic_flash_off_holo_light_xlarge.png
es/drawable-hdpi/ic_flash_on_holo_light.png
es/drawable-hdpi/ic_flash_on_holo_light_large.png
es/drawable-hdpi/ic_flash_on_holo_light_xlarge.png
es/drawable-hdpi/ic_flash_torch.png
es/drawable-hdpi/ic_gallery_play_big.png
es/drawable-hdpi/ic_hdr.png
es/drawable-hdpi/ic_indicator_ev_0.png
es/drawable-hdpi/ic_indicator_ev_n1.png
es/drawable-hdpi/ic_indicator_ev_n2.png
es/drawable-hdpi/ic_indicator_ev_n3.png
es/drawable-hdpi/ic_indicator_ev_p1.png
es/drawable-hdpi/ic_indicator_ev_p2.png
es/drawable-hdpi/ic_indicator_ev_p3.png
es/drawable-hdpi/ic_indicator_flash_auto.png
es/drawable-hdpi/ic_indicator_flash_off.png
es/drawable-hdpi/ic_indicator_flash_on.png
es/drawable-hdpi/ic_indicator_hdr_off.png
es/drawable-hdpi/ic_indicator_hdr_on.png
es/drawable-hdpi/ic_indicator_sce_off.png
es/drawable-hdpi/ic_indicator_sce_on.png
es/drawable-hdpi/ic_menu_camera_video_view.png
es/drawable-hdpi/ic_menu_cancel_holo_light.png
es/drawable-hdpi/ic_menu_done_holo_light.png
es/drawable-hdpi/ic_menuselect_camera_facing_back.png
es/drawable-hdpi/ic_menuselect_camera_facing_front.png
es/drawable-hdpi/ic_menuselect_gps_off.png
es/drawable-hdpi/ic_menuselect_gps_on.png
es/drawable-hdpi/ic_pan_border_fast.9.png
es/drawable-hdpi/ic_pan_border_fast_large.9.png
es/drawable-hdpi/ic_pan_border_fast_xlarge.9.png
es/drawable-hdpi/ic_pan_left_indicator.png
es/drawable-hdpi/ic_pan_left_indicator_fast.png
es/drawable-hdpi/ic_pan_left_indicator_fast_large.png
es/drawable-hdpi/ic_pan_left_indicator_fast_xlarge.png
es/drawable-hdpi/ic_pan_left_indicator_large.png
es/drawable-hdpi/ic_pan_left_indicator_xlarge.png
es/drawable-hdpi/ic_pan_progression.png
es/drawable-hdpi/ic_pan_progression_large.png
es/drawable-hdpi/ic_pan_progression_xlarge.png
es/drawable-hdpi/ic_pan_recording_indicator.png
es/drawable-hdpi/ic_pan_right_indicator.png
es/drawable-hdpi/ic_pan_right_indicator_fast.png
es/drawable-hdpi/ic_pan_right_indicator_fast_large.png
es/drawable-hdpi/ic_pan_right_indicator_fast_xlarge.png
es/drawable-hdpi/ic_pan_right_indicator_large.png
es/drawable-hdpi/ic_pan_right_indicator_xlarge.png
es/drawable-hdpi/ic_recording_indicator.png
es/drawable-hdpi/ic_scn_holo_light.png
es/drawable-hdpi/ic_scn_holo_light_large.png
es/drawable-hdpi/ic_scn_holo_light_xlarge.png
es/drawable-hdpi/ic_settings_holo_light.png
es/drawable-hdpi/ic_settings_holo_light_large.png
es/drawable-hdpi/ic_settings_holo_light_xlarge.png
es/drawable-hdpi/ic_snapshot_border.9.png
es/drawable-hdpi/ic_snapshot_border_large.9.png
es/drawable-hdpi/ic_snapshot_border_xlarge.9.png
es/drawable-hdpi/ic_switch_camera.png
es/drawable-hdpi/ic_switch_pan.png
es/drawable-hdpi/ic_switch_pano_active.png
es/drawable-hdpi/ic_switch_photo_facing_holo_light.png
es/drawable-hdpi/ic_switch_photo_facing_holo_light_large.png
es/drawable-hdpi/ic_switch_photo_facing_holo_light_xlarge.png
es/drawable-hdpi/ic_switch_photosphere.png
es/drawable-hdpi/ic_switch_video.png
es/drawable-hdpi/ic_switch_video_active.png
es/drawable-hdpi/ic_switch_video_facing_holo_light.png
es/drawable-hdpi/ic_switch_video_facing_holo_light_large.png
es/drawable-hdpi/ic_switch_video_facing_holo_light_xlarge.png
es/drawable-hdpi/ic_switcher_menu_indicator.png
es/drawable-hdpi/ic_timelapse_none.png
es/drawable-hdpi/ic_timelapse_none_large.png
es/drawable-hdpi/ic_timelapse_none_xlarge.png
es/drawable-hdpi/ic_video_effects_background_fields_of_wheat_holo.png
es/drawable-hdpi/ic_video_effects_background_intergalactic_holo.png
es/drawable-hdpi/ic_video_effects_background_normal_holo_dark.png
es/drawable-hdpi/ic_video_effects_faces_big_eyes_holo_dark.png
es/drawable-hdpi/ic_video_effects_faces_big_mouth_holo_dark.png
es/drawable-hdpi/ic_video_effects_faces_big_nose_holo_dark.png
es/drawable-hdpi/ic_video_effects_faces_small_eyes_holo_dark.png
es/drawable-hdpi/ic_video_effects_faces_small_mouth_holo_dark.png
es/drawable-hdpi/ic_video_effects_faces_squeeze_holo_dark.png
es/drawable-hdpi/ic_view_photosphere.png
es/drawable-hdpi/ic_viewfinder_camera_facing_back.png
es/drawable-hdpi/ic_viewfinder_camera_facing_front.png
es/drawable-hdpi/ic_viewfinder_gps_no_signal.png
es/drawable-hdpi/ic_viewfinder_gps_off.png
es/drawable-hdpi/ic_viewfinder_gps_on.png
es/drawable-hdpi/ic_wb_auto.png
es/drawable-hdpi/ic_wb_cloudy.png
es/drawable-hdpi/ic_wb_fluorescent.png
es/drawable-hdpi/ic_wb_incandescent.png
es/drawable-hdpi/ic_wb_sunlight.png
es/drawable-hdpi/list_divider.9.png
es/drawable-hdpi/list_divider_large.9.png
es/drawable-hdpi/list_pressed_holo_light.9.png
es/drawable-hdpi/on_screen_hint_frame.9.png
es/drawable-hdpi/switch_bg_focused_holo_dark.9.png
es/drawable-hdpi/switch_bg_holo_dark.9.png
es/drawable-hdpi/switch_thumb_activated_holo_dark.9.png
es/drawable-hdpi/switch_thumb_disabled_holo_dark.9.png
es/drawable-hdpi/switch_thumb_holo_dark.9.png
es/drawable-hdpi/switch_thumb_pressed_holo_dark.9.png
es/drawable-hdpi/toast_frame_holo.9.png
es/drawable-land-hdpi/btn_camera_shutter_holo_xlarge.png
es/drawable-land-hdpi/btn_camera_shutter_pressed_holo_xlarge.png
es/drawable-land-hdpi/btn_pan_shutter_pressed_holo_xlarge.png
es/drawable-land-hdpi/btn_pan_shutter_recording_holo_xlarge.png
es/drawable-land-hdpi/btn_pan_shutter_recording_pressed_holo_xlarge.png
es/drawable-land-hdpi/btn_video_shutter_holo_xlarge.png
es/drawable-land-hdpi/btn_video_shutter_pressed_holo_xlarge.png
es/drawable-land-hdpi/btn_video_shutter_recording_holo_xlarge.png
es/drawable-land-hdpi/btn_video_shutter_recording_pressed_holo_xlarge.png
es/drawable-land-hdpi/ic_zoom_big.9.png
es/drawable-land-hdpi/ic_zoom_big_dark.9.png
es/drawable-land-hdpi/ic_zoom_big_dark_large.9.png
es/drawable-land-hdpi/ic_zoom_big_large.9.png
es/drawable-land-hdpi/switcher_bg.9.png
es/drawable-land-mdpi/btn_camera_shutter_holo_xlarge.png
es/drawable-land-mdpi/btn_camera_shutter_pressed_holo_xlarge.png
es/drawable-land-mdpi/btn_pan_shutter_pressed_holo_xlarge.png
es/drawable-land-mdpi/btn_pan_shutter_recording_holo_xlarge.png
es/drawable-land-mdpi/btn_pan_shutter_recording_pressed_holo_xlarge.png
es/drawable-land-mdpi/btn_video_shutter_holo_xlarge.png
es/drawable-land-mdpi/btn_video_shutter_pressed_holo_xlarge.png
es/drawable-land-mdpi/btn_video_shutter_recording_holo_xlarge.png
es/drawable-land-mdpi/btn_video_shutter_recording_pressed_holo_xlarge.png
es/drawable-land-mdpi/ic_zoom_big.9.png
es/drawable-land-mdpi/ic_zoom_big_dark.9.png
es/drawable-land-mdpi/switcher_bg.9.png
es/drawable-land-xhdpi/btn_camera_shutter_holo_xlarge.png
es/drawable-land-xhdpi/btn_camera_shutter_pressed_holo_xlarge.png
es/drawable-land-xhdpi/btn_pan_shutter_pressed_holo_xlarge.png
es/drawable-land-xhdpi/btn_pan_shutter_recording_holo_xlarge.png
es/drawable-land-xhdpi/btn_pan_shutter_recording_pressed_holo_xlarge.png
es/drawable-land-xhdpi/btn_video_shutter_holo_xlarge.png
es/drawable-land-xhdpi/btn_video_shutter_pressed_holo_xlarge.png
es/drawable-land-xhdpi/btn_video_shutter_recording_holo_xlarge.png
es/drawable-land-xhdpi/btn_video_shutter_recording_pressed_holo_xlarge.png
es/drawable-land-xhdpi/ic_zoom_big.9.png
es/drawable-land-xhdpi/ic_zoom_big_dark.9.png
es/drawable-land-xhdpi/switcher_bg.9.png
es/drawable-mdpi/btn_camera_shutter_holo.png
es/drawable-mdpi/btn_camera_shutter_pressed_holo.png
es/drawable-mdpi/btn_pan_shutter_pressed_holo.png
es/drawable-mdpi/btn_pan_shutter_recording_holo.png
es/drawable-mdpi/btn_pan_shutter_recording_pressed_holo.png
es/drawable-mdpi/btn_shutter_default.png
es/drawable-mdpi/btn_shutter_pano_pressed.png
es/drawable-mdpi/btn_shutter_pressed.png
es/drawable-mdpi/btn_shutter_recording.png
es/drawable-mdpi/btn_shutter_video_default.png
es/drawable-mdpi/btn_shutter_video_pressed.png
es/drawable-mdpi/btn_shutter_video_recording.png
es/drawable-mdpi/btn_video_shutter_holo.png
es/drawable-mdpi/btn_video_shutter_pressed_holo.png
es/drawable-mdpi/btn_video_shutter_recording_holo.png
es/drawable-mdpi/btn_video_shutter_recording_pressed_holo.png
es/drawable-mdpi/dialog_full_holo_dark.9.png
es/drawable-mdpi/ic_btn_shutter_retake.png
es/drawable-mdpi/ic_effects_holo_light.png
es/drawable-mdpi/ic_effects_holo_light_xlarge.png
es/drawable-mdpi/ic_exposure_0.png
es/drawable-mdpi/ic_exposure_holo_light.png
es/drawable-mdpi/ic_exposure_holo_light_xlarge.png
es/drawable-mdpi/ic_exposure_n1.png
es/drawable-mdpi/ic_exposure_n2.png
es/drawable-mdpi/ic_exposure_n3.png
es/drawable-mdpi/ic_exposure_p1.png
es/drawable-mdpi/ic_exposure_p2.png
es/drawable-mdpi/ic_exposure_p3.png
es/drawable-mdpi/ic_flash_auto_holo_light.png
es/drawable-mdpi/ic_flash_auto_holo_light_xlarge.png
es/drawable-mdpi/ic_flash_off_holo_light.png
es/drawable-mdpi/ic_flash_off_holo_light_xlarge.png
es/drawable-mdpi/ic_flash_on_holo_light.png
es/drawable-mdpi/ic_flash_on_holo_light_xlarge.png
es/drawable-mdpi/ic_flash_torch.png
es/drawable-mdpi/ic_gallery_play_big.png
es/drawable-mdpi/ic_hdr.png
es/drawable-mdpi/ic_indicator_ev_0.png
es/drawable-mdpi/ic_indicator_ev_n1.png
es/drawable-mdpi/ic_indicator_ev_n2.png
es/drawable-mdpi/ic_indicator_ev_n3.png
es/drawable-mdpi/ic_indicator_ev_p1.png
es/drawable-mdpi/ic_indicator_ev_p2.png
es/drawable-mdpi/ic_indicator_ev_p3.png
es/drawable-mdpi/ic_indicator_flash_auto.png
es/drawable-mdpi/ic_indicator_flash_off.png
es/drawable-mdpi/ic_indicator_flash_on.png
es/drawable-mdpi/ic_indicator_hdr_off.png
es/drawable-mdpi/ic_indicator_hdr_on.png
es/drawable-mdpi/ic_indicator_sce_off.png
es/drawable-mdpi/ic_indicator_sce_on.png
es/drawable-mdpi/ic_menu_camera_video_view.png
es/drawable-mdpi/ic_menu_cancel_holo_light.png
es/drawable-mdpi/ic_menu_done_holo_light.png
es/drawable-mdpi/ic_menuselect_camera_facing_back.png
es/drawable-mdpi/ic_menuselect_camera_facing_front.png
es/drawable-mdpi/ic_menuselect_gps_off.png
es/drawable-mdpi/ic_menuselect_gps_on.png
es/drawable-mdpi/ic_pan_border_fast.9.png
es/drawable-mdpi/ic_pan_border_fast_xlarge.9.png
es/drawable-mdpi/ic_pan_left_indicator.png
es/drawable-mdpi/ic_pan_left_indicator_fast.png
es/drawable-mdpi/ic_pan_left_indicator_fast_xlarge.png
es/drawable-mdpi/ic_pan_left_indicator_xlarge.png
es/drawable-mdpi/ic_pan_progression.png
es/drawable-mdpi/ic_pan_progression_xlarge.png
es/drawable-mdpi/ic_pan_recording_indicator.png
es/drawable-mdpi/ic_pan_right_indicator.png
es/drawable-mdpi/ic_pan_right_indicator_fast.png
es/drawable-mdpi/ic_pan_right_indicator_fast_xlarge.png
es/drawable-mdpi/ic_pan_right_indicator_xlarge.png
es/drawable-mdpi/ic_recording_indicator.png
es/drawable-mdpi/ic_scn_holo_light.png
es/drawable-mdpi/ic_scn_holo_light_xlarge.png
es/drawable-mdpi/ic_settings_holo_light.png
es/drawable-mdpi/ic_settings_holo_light_xlarge.png
es/drawable-mdpi/ic_snapshot_border.9.png
es/drawable-mdpi/ic_snapshot_border_xlarge.9.png
es/drawable-mdpi/ic_switch_camera.png
es/drawable-mdpi/ic_switch_pan.png
es/drawable-mdpi/ic_switch_pano_active.png
es/drawable-mdpi/ic_switch_photo_facing_holo_light.png
es/drawable-mdpi/ic_switch_photo_facing_holo_light_xlarge.png
es/drawable-mdpi/ic_switch_photosphere.png
es/drawable-mdpi/ic_switch_video.png
es/drawable-mdpi/ic_switch_video_active.png
es/drawable-mdpi/ic_switch_video_facing_holo_light.png
es/drawable-mdpi/ic_switch_video_facing_holo_light_xlarge.png
es/drawable-mdpi/ic_switcher_menu_indicator.png
es/drawable-mdpi/ic_timelapse_none.png
es/drawable-mdpi/ic_timelapse_none_xlarge.png
es/drawable-mdpi/ic_video_effects_background_fields_of_wheat_holo.png
es/drawable-mdpi/ic_video_effects_background_intergalactic_holo.png
es/drawable-mdpi/ic_video_effects_background_normal_holo_dark.png
es/drawable-mdpi/ic_video_effects_faces_big_eyes_holo_dark.png
es/drawable-mdpi/ic_video_effects_faces_big_mouth_holo_dark.png
es/drawable-mdpi/ic_video_effects_faces_big_nose_holo_dark.png
es/drawable-mdpi/ic_video_effects_faces_small_eyes_holo_dark.png
es/drawable-mdpi/ic_video_effects_faces_small_mouth_holo_dark.png
es/drawable-mdpi/ic_video_effects_faces_squeeze_holo_dark.png
es/drawable-mdpi/ic_view_photosphere.png
es/drawable-mdpi/ic_viewfinder_camera_facing_back.png
es/drawable-mdpi/ic_viewfinder_camera_facing_front.png
es/drawable-mdpi/ic_viewfinder_gps_no_signal.png
es/drawable-mdpi/ic_viewfinder_gps_off.png
es/drawable-mdpi/ic_viewfinder_gps_on.png
es/drawable-mdpi/ic_wb_auto.png
es/drawable-mdpi/ic_wb_cloudy.png
es/drawable-mdpi/ic_wb_fluorescent.png
es/drawable-mdpi/ic_wb_incandescent.png
es/drawable-mdpi/ic_wb_sunlight.png
es/drawable-mdpi/list_divider.9.png
es/drawable-mdpi/list_pressed_holo_light.9.png
es/drawable-mdpi/on_screen_hint_frame.9.png
es/drawable-mdpi/switch_bg_focused_holo_dark.9.png
es/drawable-mdpi/switch_bg_holo_dark.9.png
es/drawable-mdpi/switch_thumb_activated_holo_dark.9.png
es/drawable-mdpi/switch_thumb_disabled_holo_dark.9.png
es/drawable-mdpi/switch_thumb_holo_dark.9.png
es/drawable-mdpi/switch_thumb_pressed_holo_dark.9.png
es/drawable-mdpi/toast_frame_holo.9.png
es/drawable-port-hdpi/btn_camera_shutter_holo_xlarge.png
es/drawable-port-hdpi/btn_camera_shutter_pressed_holo_xlarge.png
es/drawable-port-hdpi/btn_pan_shutter_pressed_holo_xlarge.png
es/drawable-port-hdpi/btn_pan_shutter_recording_holo_xlarge.png
es/drawable-port-hdpi/btn_pan_shutter_recording_pressed_holo_xlarge.png
es/drawable-port-hdpi/btn_video_shutter_holo_xlarge.png
es/drawable-port-hdpi/btn_video_shutter_pressed_holo_xlarge.png
es/drawable-port-hdpi/btn_video_shutter_recording_holo_xlarge.png
es/drawable-port-hdpi/btn_video_shutter_recording_pressed_holo_xlarge.png
es/drawable-port-hdpi/ic_zoom_big.9.png
es/drawable-port-hdpi/ic_zoom_big_dark.9.png
es/drawable-port-hdpi/ic_zoom_big_dark_large.9.png
es/drawable-port-hdpi/ic_zoom_big_large.9.png
es/drawable-port-hdpi/switcher_bg.9.png
es/drawable-port-mdpi/btn_camera_shutter_holo_xlarge.png
es/drawable-port-mdpi/btn_camera_shutter_pressed_holo_xlarge.png
es/drawable-port-mdpi/btn_pan_shutter_pressed_holo_xlarge.png
es/drawable-port-mdpi/btn_pan_shutter_recording_holo_xlarge.png
es/drawable-port-mdpi/btn_pan_shutter_recording_pressed_holo_xlarge.png
es/drawable-port-mdpi/btn_video_shutter_holo_xlarge.png
es/drawable-port-mdpi/btn_video_shutter_pressed_holo_xlarge.png
es/drawable-port-mdpi/btn_video_shutter_recording_holo_xlarge.png
es/drawable-port-mdpi/btn_video_shutter_recording_pressed_holo_xlarge.png
es/drawable-port-mdpi/ic_zoom_big.9.png
es/drawable-port-mdpi/ic_zoom_big_dark.9.png
es/drawable-port-mdpi/switcher_bg.9.png
es/drawable-port-xhdpi/btn_camera_shutter_holo_xlarge.png
es/drawable-port-xhdpi/btn_camera_shutter_pressed_holo_xlarge.png
es/drawable-port-xhdpi/btn_pan_shutter_pressed_holo_xlarge.png
es/drawable-port-xhdpi/btn_pan_shutter_recording_holo_xlarge.png
es/drawable-port-xhdpi/btn_pan_shutter_recording_pressed_holo_xlarge.png
es/drawable-port-xhdpi/btn_video_shutter_holo_xlarge.png
es/drawable-port-xhdpi/btn_video_shutter_pressed_holo_xlarge.png
es/drawable-port-xhdpi/btn_video_shutter_recording_holo_xlarge.png
es/drawable-port-xhdpi/btn_video_shutter_recording_pressed_holo_xlarge.png
es/drawable-port-xhdpi/ic_zoom_big.9.png
es/drawable-port-xhdpi/ic_zoom_big_dark.9.png
es/drawable-port-xhdpi/switcher_bg.9.png
es/drawable-sw600dp-hdpi/btn_shutter_default.png
es/drawable-sw600dp-hdpi/btn_shutter_pressed.png
es/drawable-sw600dp-hdpi/btn_shutter_recording.png
es/drawable-sw600dp-hdpi/btn_shutter_video_default.png
es/drawable-sw600dp-hdpi/btn_shutter_video_pressed.png
es/drawable-sw600dp-hdpi/btn_shutter_video_recording.png
es/drawable-sw600dp-land-hdpi/switcher_bg.9.png
es/drawable-sw600dp-land-mdpi/switcher_bg.9.png
es/drawable-sw600dp-land-xhdpi/switcher_bg.9.png
es/drawable-sw600dp-mdpi/btn_shutter_default.png
es/drawable-sw600dp-mdpi/btn_shutter_pressed.png
es/drawable-sw600dp-mdpi/btn_shutter_recording.png
es/drawable-sw600dp-mdpi/btn_shutter_video_default.png
es/drawable-sw600dp-mdpi/btn_shutter_video_pressed.png
es/drawable-sw600dp-mdpi/btn_shutter_video_recording.png
es/drawable-sw600dp-port-hdpi/switcher_bg.9.png
es/drawable-sw600dp-port-mdpi/switcher_bg.9.png
es/drawable-sw600dp-port-xhdpi/switcher_bg.9.png
es/drawable-sw600dp-xhdpi/btn_shutter_default.png
es/drawable-sw600dp-xhdpi/btn_shutter_pressed.png
es/drawable-sw600dp-xhdpi/btn_shutter_recording.png
es/drawable-sw600dp-xhdpi/btn_shutter_video_default.png
es/drawable-sw600dp-xhdpi/btn_shutter_video_pressed.png
es/drawable-sw600dp-xhdpi/btn_shutter_video_recording.png
es/drawable-xhdpi/btn_camera_shutter_holo.png
es/drawable-xhdpi/btn_camera_shutter_pressed_holo.png
es/drawable-xhdpi/btn_pan_shutter_pressed_holo.png
es/drawable-xhdpi/btn_pan_shutter_recording_holo.png
es/drawable-xhdpi/btn_pan_shutter_recording_pressed_holo.png
es/drawable-xhdpi/btn_shutter_default.png
es/drawable-xhdpi/btn_shutter_pano_pressed.png
es/drawable-xhdpi/btn_shutter_pressed.png
es/drawable-xhdpi/btn_shutter_recording.png
es/drawable-xhdpi/btn_shutter_video_default.png
es/drawable-xhdpi/btn_shutter_video_pressed.png
es/drawable-xhdpi/btn_shutter_video_recording.png
es/drawable-xhdpi/btn_video_shutter_holo.png
es/drawable-xhdpi/btn_video_shutter_pressed_holo.png
es/drawable-xhdpi/btn_video_shutter_recording_holo.png
es/drawable-xhdpi/btn_video_shutter_recording_pressed_holo.png
es/drawable-xhdpi/dialog_full_holo_dark.9.png
es/drawable-xhdpi/ic_btn_shutter_retake.png
es/drawable-xhdpi/ic_effects_holo_light.png
es/drawable-xhdpi/ic_effects_holo_light_xlarge.png
es/drawable-xhdpi/ic_exposure_0.png
es/drawable-xhdpi/ic_exposure_holo_light.png
es/drawable-xhdpi/ic_exposure_holo_light_xlarge.png
es/drawable-xhdpi/ic_exposure_n1.png
es/drawable-xhdpi/ic_exposure_n2.png
es/drawable-xhdpi/ic_exposure_n3.png
es/drawable-xhdpi/ic_exposure_p1.png
es/drawable-xhdpi/ic_exposure_p2.png
es/drawable-xhdpi/ic_exposure_p3.png
es/drawable-xhdpi/ic_flash_auto_holo_light.png
es/drawable-xhdpi/ic_flash_auto_holo_light_xlarge.png
es/drawable-xhdpi/ic_flash_off_holo_light.png
es/drawable-xhdpi/ic_flash_off_holo_light_xlarge.png
es/drawable-xhdpi/ic_flash_on_holo_light.png
es/drawable-xhdpi/ic_flash_on_holo_light_xlarge.png
es/drawable-xhdpi/ic_flash_torch.png
es/drawable-xhdpi/ic_gallery_play_big.png
es/drawable-xhdpi/ic_hdr.png
es/drawable-xhdpi/ic_indicator_ev_0.png
es/drawable-xhdpi/ic_indicator_ev_n1.png
es/drawable-xhdpi/ic_indicator_ev_n2.png
es/drawable-xhdpi/ic_indicator_ev_n3.png
es/drawable-xhdpi/ic_indicator_ev_p1.png
es/drawable-xhdpi/ic_indicator_ev_p2.png
es/drawable-xhdpi/ic_indicator_ev_p3.png
es/drawable-xhdpi/ic_indicator_flash_auto.png
es/drawable-xhdpi/ic_indicator_flash_off.png
es/drawable-xhdpi/ic_indicator_flash_on.png
es/drawable-xhdpi/ic_indicator_hdr_off.png
es/drawable-xhdpi/ic_indicator_hdr_on.png
es/drawable-xhdpi/ic_indicator_sce_off.png
es/drawable-xhdpi/ic_indicator_sce_on.png
es/drawable-xhdpi/ic_menu_cancel_holo_light.png
es/drawable-xhdpi/ic_menu_done_holo_light.png
es/drawable-xhdpi/ic_pan_border_fast.9.png
es/drawable-xhdpi/ic_pan_border_fast_xlarge.9.png
es/drawable-xhdpi/ic_pan_left_indicator.png
es/drawable-xhdpi/ic_pan_left_indicator_fast.png
es/drawable-xhdpi/ic_pan_left_indicator_fast_xlarge.png
es/drawable-xhdpi/ic_pan_left_indicator_xlarge.png
es/drawable-xhdpi/ic_pan_progression.png
es/drawable-xhdpi/ic_pan_progression_xlarge.png
es/drawable-xhdpi/ic_pan_recording_indicator.png
es/drawable-xhdpi/ic_pan_right_indicator.png
es/drawable-xhdpi/ic_pan_right_indicator_fast.png
es/drawable-xhdpi/ic_pan_right_indicator_fast_xlarge.png
es/drawable-xhdpi/ic_pan_right_indicator_xlarge.png
es/drawable-xhdpi/ic_recording_indicator.png
es/drawable-xhdpi/ic_scn_holo_light.png
es/drawable-xhdpi/ic_scn_holo_light_xlarge.png
es/drawable-xhdpi/ic_settings_holo_light.png
es/drawable-xhdpi/ic_settings_holo_light_xlarge.png
es/drawable-xhdpi/ic_snapshot_border.9.png
es/drawable-xhdpi/ic_snapshot_border_xlarge.9.png
es/drawable-xhdpi/ic_switch_camera.png
es/drawable-xhdpi/ic_switch_pan.png
es/drawable-xhdpi/ic_switch_pano_active.png
es/drawable-xhdpi/ic_switch_photo_facing_holo_light.png
es/drawable-xhdpi/ic_switch_photo_facing_holo_light_xlarge.png
es/drawable-xhdpi/ic_switch_photosphere.png
es/drawable-xhdpi/ic_switch_video.png
es/drawable-xhdpi/ic_switch_video_active.png
es/drawable-xhdpi/ic_switch_video_facing_holo_light.png
es/drawable-xhdpi/ic_switch_video_facing_holo_light_xlarge.png
es/drawable-xhdpi/ic_switcher_menu_indicator.png
es/drawable-xhdpi/ic_timelapse_none.png
es/drawable-xhdpi/ic_timelapse_none_xlarge.png
es/drawable-xhdpi/ic_video_effects_background_fields_of_wheat_holo.png
es/drawable-xhdpi/ic_video_effects_background_intergalactic_holo.png
es/drawable-xhdpi/ic_video_effects_background_normal_holo_dark.png
es/drawable-xhdpi/ic_video_effects_faces_big_eyes_holo_dark.png
es/drawable-xhdpi/ic_video_effects_faces_big_mouth_holo_dark.png
es/drawable-xhdpi/ic_video_effects_faces_big_nose_holo_dark.png
es/drawable-xhdpi/ic_video_effects_faces_small_eyes_holo_dark.png
es/drawable-xhdpi/ic_video_effects_faces_small_mouth_holo_dark.png
es/drawable-xhdpi/ic_video_effects_faces_squeeze_holo_dark.png
es/drawable-xhdpi/ic_view_photosphere.png
es/drawable-xhdpi/ic_wb_auto.png
es/drawable-xhdpi/ic_wb_cloudy.png
es/drawable-xhdpi/ic_wb_fluorescent.png
es/drawable-xhdpi/ic_wb_incandescent.png
es/drawable-xhdpi/ic_wb_sunlight.png
es/drawable-xhdpi/list_divider.9.png
es/drawable-xhdpi/list_pressed_holo_light.9.png
es/drawable-xhdpi/switch_bg_focused_holo_dark.9.png
es/drawable-xhdpi/switch_bg_holo_dark.9.png
es/drawable-xhdpi/switch_thumb_activated_holo_dark.9.png
es/drawable-xhdpi/switch_thumb_disabled_holo_dark.9.png
es/drawable-xhdpi/switch_thumb_holo_dark.9.png
es/drawable-xhdpi/switch_thumb_pressed_holo_dark.9.png
es/drawable-xhdpi/toast_frame_holo.9.png
es/drawable/bg_pressed.xml
es/drawable/bg_pressed_exit_fading.xml
es/drawable/bg_text_on_preview.xml
es/drawable/btn_new_shutter.xml
es/drawable/btn_new_shutter_video.xml
es/drawable/btn_shutter_video_recording.xml
es/drawable/pano_direction_left_indicator.xml
es/drawable/pano_direction_right_indicator.xml
es/drawable/setting_picker.xml
es/drawable/switch_inner_holo_dark.xml
es/drawable/switch_track_holo_dark.xml
es/interpolator/decelerate_cubic.xml
es/interpolator/decelerate_quint.xml
es/layout-land/camera_shutter_switcher.xml
es/layout-land/keyguard_widget.xml
es/layout-land/on_screen_hint.xml
es/layout-land/pano_module_capture.xml
es/layout-land/pano_review.xml
es/layout-land/photo_module_content.xml
es/layout-land/preview_frame_pano.xml
es/layout-land/review_module_control.xml
es/layout-land/switcher_popup.xml
es/layout-land/video_module.xml
es/layout-port/camera_shutter_switcher.xml
es/layout-port/keyguard_widget.xml
es/layout-port/on_screen_hint.xml
es/layout-port/pano_module_capture.xml
es/layout-port/pano_review.xml
es/layout-port/photo_module_content.xml
es/layout-port/preview_frame_pano.xml
es/layout-port/review_module_control.xml
es/layout-port/switcher_popup.xml
es/layout-port/video_module.xml
es/layout/bg_replacement_training_message.xml
es/layout/camera_main.xml
es/layout/count_down_to_capture.xml
es/layout/effect_setting_item.xml
es/layout/effect_setting_popup.xml
es/layout/face_view.xml
es/layout/in_line_setting_check_box.xml
es/layout/in_line_setting_menu.xml
es/layout/list_pref_setting_popup.xml
es/layout/menu_indicators.xml
es/layout/menu_indicators_keyguard.xml
es/layout/more_setting_popup.xml
es/layout/panorama_module.xml
es/layout/photo_module.xml
es/layout/preview_module_frame.xml
es/layout/preview_module_frame_video.xml
es/layout/preview_surface_view.xml
es/layout/rotate_dialog.xml
es/layout/rotate_text_toast.xml
es/layout/setting_item.xml
es/layout/time_interval_picker.xml
es/layout/time_interval_popup.xml
es/layout/timer_setting_popup.xml
es/layout/viewfinder_labels_video.xml
es/mipmap-hdpi/ic_launcher_camera.png
es/mipmap-hdpi/ic_launcher_video_camera.png
es/mipmap-mdpi/ic_launcher_camera.png
es/mipmap-mdpi/ic_launcher_video_camera.png
es/mipmap-xhdpi/ic_launcher_camera.png
es/mipmap-xxhdpi/ic_launcher_camera.png
es/raw/backdropper.graph
es/raw/beep_once.ogg
es/raw/beep_twice.ogg
es/raw/blank.jpg
es/raw/focus_complete.ogg
es/raw/goofy_face.graph
es/raw/video_record.ogg
es/values-af/filtershow_strings.xml
es/values-am/filtershow_strings.xml
es/values-ar/filtershow_strings.xml
es/values-be/filtershow_strings.xml
es/values-bg/filtershow_strings.xml
es/values-ca/filtershow_strings.xml
es/values-cs/filtershow_strings.xml
es/values-da/filtershow_strings.xml
es/values-de/filtershow_strings.xml
es/values-el/filtershow_strings.xml
es/values-en-rGB/filtershow_strings.xml
es/values-es-rUS/filtershow_strings.xml
es/values-es/filtershow_strings.xml
es/values-et/filtershow_strings.xml
es/values-fa/filtershow_strings.xml
es/values-fi/filtershow_strings.xml
es/values-fr/filtershow_strings.xml
es/values-hi/filtershow_strings.xml
es/values-hr/filtershow_strings.xml
es/values-hu/filtershow_strings.xml
es/values-in/filtershow_strings.xml
es/values-it/filtershow_strings.xml
es/values-iw/filtershow_strings.xml
es/values-ja/filtershow_strings.xml
es/values-ko/filtershow_strings.xml
es/values-land/styles.xml
es/values-large-hdpi/drawable.xml
es/values-large/dimens.xml
es/values-lt/filtershow_strings.xml
es/values-lv/filtershow_strings.xml
es/values-ms/filtershow_strings.xml
es/values-nb/filtershow_strings.xml
es/values-nl/filtershow_strings.xml
es/values-pl/filtershow_strings.xml
es/values-port/styles.xml
es/values-pt-rPT/filtershow_strings.xml
es/values-pt/filtershow_strings.xml
es/values-ro/filtershow_strings.xml
es/values-ru/filtershow_strings.xml
es/values-sk/filtershow_strings.xml
es/values-sl/filtershow_strings.xml
es/values-sr/filtershow_strings.xml
es/values-sv/filtershow_strings.xml
es/values-sw/filtershow_strings.xml
es/values-sw600dp-hdpi/drawable.xml
es/values-sw600dp-land/styles.xml
es/values-sw600dp-port/styles.xml
es/values-sw600dp/dimens.xml
es/values-sw640dp/dimens.xml
es/values-sw640dp/drawable.xml
es/values-sw640dp/styles.xml
es/values-sw800dp/dimens.xml
es/values-th/filtershow_strings.xml
es/values-tl/filtershow_strings.xml
es/values-tr/filtershow_strings.xml
es/values-uk/filtershow_strings.xml
es/values-v11/styles.xml
es/values-v13/styles.xml
es/values-vi/filtershow_strings.xml
es/values-xlarge-land/drawable.xml
es/values-xlarge-port/drawable.xml
es/values-xlarge/dimens.xml
es/values-xlarge/drawable.xml
es/values-xlarge/styles.xml
es/values-zh-rCN/filtershow_strings.xml
es/values-zh-rTW/filtershow_strings.xml
es/values-zu/filtershow_strings.xml
es/values/arrays.xml
es/values/attrs.xml
es/values/colors.xml
es/values/config.xml
es/values/dimens.xml
es/values/filtershow_strings.xml
es/values/strings.xml
es/values/styles.xml
es/xml/camera_preferences.xml
es/xml/video_preferences.xml
|
8af7bb6d01f499400fee371422238841eed303d9 |
29-Jan-2013 |
Michael Kolb <kolby@google.com> |
Copy camera resources into Gallery2 Change-Id: I3be2758b2ddca31dbc2f21457a62664310c39684
ndroid.mk
es/anim/count_down_exit.xml
es/anim/on_screen_hint_enter.xml
es/anim/on_screen_hint_exit.xml
es/color/primary_text.xml
es/drawable-hdpi/btn_camera_shutter_holo.png
es/drawable-hdpi/btn_camera_shutter_holo_large.png
es/drawable-hdpi/btn_camera_shutter_pressed_holo.png
es/drawable-hdpi/btn_camera_shutter_pressed_holo_large.png
es/drawable-hdpi/btn_pan_shutter_pressed_holo.png
es/drawable-hdpi/btn_pan_shutter_pressed_holo_large.png
es/drawable-hdpi/btn_pan_shutter_recording_holo.png
es/drawable-hdpi/btn_pan_shutter_recording_holo_large.png
es/drawable-hdpi/btn_pan_shutter_recording_pressed_holo.png
es/drawable-hdpi/btn_pan_shutter_recording_pressed_holo_large.png
es/drawable-hdpi/btn_shutter_default.png
es/drawable-hdpi/btn_shutter_pano_pressed.png
es/drawable-hdpi/btn_shutter_pressed.png
es/drawable-hdpi/btn_shutter_recording.png
es/drawable-hdpi/btn_shutter_video_default.png
es/drawable-hdpi/btn_shutter_video_pressed.png
es/drawable-hdpi/btn_shutter_video_recording.png
es/drawable-hdpi/btn_video_shutter_holo.png
es/drawable-hdpi/btn_video_shutter_holo_large.png
es/drawable-hdpi/btn_video_shutter_pressed_holo.png
es/drawable-hdpi/btn_video_shutter_pressed_holo_large.png
es/drawable-hdpi/btn_video_shutter_recording_holo.png
es/drawable-hdpi/btn_video_shutter_recording_holo_large.png
es/drawable-hdpi/btn_video_shutter_recording_pressed_holo.png
es/drawable-hdpi/btn_video_shutter_recording_pressed_holo_large.png
es/drawable-hdpi/dialog_full_holo_dark.9.png
es/drawable-hdpi/ic_btn_shutter_retake.png
es/drawable-hdpi/ic_effects_holo_light.png
es/drawable-hdpi/ic_effects_holo_light_large.png
es/drawable-hdpi/ic_effects_holo_light_xlarge.png
es/drawable-hdpi/ic_exposure_0.png
es/drawable-hdpi/ic_exposure_holo_light.png
es/drawable-hdpi/ic_exposure_holo_light_large.png
es/drawable-hdpi/ic_exposure_holo_light_xlarge.png
es/drawable-hdpi/ic_exposure_n1.png
es/drawable-hdpi/ic_exposure_n2.png
es/drawable-hdpi/ic_exposure_n3.png
es/drawable-hdpi/ic_exposure_p1.png
es/drawable-hdpi/ic_exposure_p2.png
es/drawable-hdpi/ic_exposure_p3.png
es/drawable-hdpi/ic_flash_auto_holo_light.png
es/drawable-hdpi/ic_flash_auto_holo_light_large.png
es/drawable-hdpi/ic_flash_auto_holo_light_xlarge.png
es/drawable-hdpi/ic_flash_off_holo_light.png
es/drawable-hdpi/ic_flash_off_holo_light_large.png
es/drawable-hdpi/ic_flash_off_holo_light_xlarge.png
es/drawable-hdpi/ic_flash_on_holo_light.png
es/drawable-hdpi/ic_flash_on_holo_light_large.png
es/drawable-hdpi/ic_flash_on_holo_light_xlarge.png
es/drawable-hdpi/ic_flash_torch.png
es/drawable-hdpi/ic_gallery_play_big.png
es/drawable-hdpi/ic_hdr.png
es/drawable-hdpi/ic_indicator_ev_0.png
es/drawable-hdpi/ic_indicator_ev_n1.png
es/drawable-hdpi/ic_indicator_ev_n2.png
es/drawable-hdpi/ic_indicator_ev_n3.png
es/drawable-hdpi/ic_indicator_ev_p1.png
es/drawable-hdpi/ic_indicator_ev_p2.png
es/drawable-hdpi/ic_indicator_ev_p3.png
es/drawable-hdpi/ic_indicator_flash_auto.png
es/drawable-hdpi/ic_indicator_flash_off.png
es/drawable-hdpi/ic_indicator_flash_on.png
es/drawable-hdpi/ic_indicator_hdr_off.png
es/drawable-hdpi/ic_indicator_hdr_on.png
es/drawable-hdpi/ic_indicator_sce_off.png
es/drawable-hdpi/ic_indicator_sce_on.png
es/drawable-hdpi/ic_menu_camera_video_view.png
es/drawable-hdpi/ic_menu_cancel_holo_light.png
es/drawable-hdpi/ic_menu_done_holo_light.png
es/drawable-hdpi/ic_menuselect_camera_facing_back.png
es/drawable-hdpi/ic_menuselect_camera_facing_front.png
es/drawable-hdpi/ic_menuselect_gps_off.png
es/drawable-hdpi/ic_menuselect_gps_on.png
es/drawable-hdpi/ic_pan_border_fast.9.png
es/drawable-hdpi/ic_pan_border_fast_large.9.png
es/drawable-hdpi/ic_pan_border_fast_xlarge.9.png
es/drawable-hdpi/ic_pan_left_indicator.png
es/drawable-hdpi/ic_pan_left_indicator_fast.png
es/drawable-hdpi/ic_pan_left_indicator_fast_large.png
es/drawable-hdpi/ic_pan_left_indicator_fast_xlarge.png
es/drawable-hdpi/ic_pan_left_indicator_large.png
es/drawable-hdpi/ic_pan_left_indicator_xlarge.png
es/drawable-hdpi/ic_pan_progression.png
es/drawable-hdpi/ic_pan_progression_large.png
es/drawable-hdpi/ic_pan_progression_xlarge.png
es/drawable-hdpi/ic_pan_recording_indicator.png
es/drawable-hdpi/ic_pan_right_indicator.png
es/drawable-hdpi/ic_pan_right_indicator_fast.png
es/drawable-hdpi/ic_pan_right_indicator_fast_large.png
es/drawable-hdpi/ic_pan_right_indicator_fast_xlarge.png
es/drawable-hdpi/ic_pan_right_indicator_large.png
es/drawable-hdpi/ic_pan_right_indicator_xlarge.png
es/drawable-hdpi/ic_recording_indicator.png
es/drawable-hdpi/ic_scn_holo_light.png
es/drawable-hdpi/ic_scn_holo_light_large.png
es/drawable-hdpi/ic_scn_holo_light_xlarge.png
es/drawable-hdpi/ic_settings_holo_light.png
es/drawable-hdpi/ic_settings_holo_light_large.png
es/drawable-hdpi/ic_settings_holo_light_xlarge.png
es/drawable-hdpi/ic_snapshot_border.9.png
es/drawable-hdpi/ic_snapshot_border_large.9.png
es/drawable-hdpi/ic_snapshot_border_xlarge.9.png
es/drawable-hdpi/ic_switch_camera.png
es/drawable-hdpi/ic_switch_pan.png
es/drawable-hdpi/ic_switch_pano_active.png
es/drawable-hdpi/ic_switch_photo_facing_holo_light.png
es/drawable-hdpi/ic_switch_photo_facing_holo_light_large.png
es/drawable-hdpi/ic_switch_photo_facing_holo_light_xlarge.png
es/drawable-hdpi/ic_switch_photosphere.png
es/drawable-hdpi/ic_switch_video.png
es/drawable-hdpi/ic_switch_video_active.png
es/drawable-hdpi/ic_switch_video_facing_holo_light.png
es/drawable-hdpi/ic_switch_video_facing_holo_light_large.png
es/drawable-hdpi/ic_switch_video_facing_holo_light_xlarge.png
es/drawable-hdpi/ic_switcher_menu_indicator.png
es/drawable-hdpi/ic_timelapse_none.png
es/drawable-hdpi/ic_timelapse_none_large.png
es/drawable-hdpi/ic_timelapse_none_xlarge.png
es/drawable-hdpi/ic_video_effects_background_fields_of_wheat_holo.png
es/drawable-hdpi/ic_video_effects_background_intergalactic_holo.png
es/drawable-hdpi/ic_video_effects_background_normal_holo_dark.png
es/drawable-hdpi/ic_video_effects_faces_big_eyes_holo_dark.png
es/drawable-hdpi/ic_video_effects_faces_big_mouth_holo_dark.png
es/drawable-hdpi/ic_video_effects_faces_big_nose_holo_dark.png
es/drawable-hdpi/ic_video_effects_faces_small_eyes_holo_dark.png
es/drawable-hdpi/ic_video_effects_faces_small_mouth_holo_dark.png
es/drawable-hdpi/ic_video_effects_faces_squeeze_holo_dark.png
es/drawable-hdpi/ic_view_photosphere.png
es/drawable-hdpi/ic_viewfinder_camera_facing_back.png
es/drawable-hdpi/ic_viewfinder_camera_facing_front.png
es/drawable-hdpi/ic_viewfinder_gps_no_signal.png
es/drawable-hdpi/ic_viewfinder_gps_off.png
es/drawable-hdpi/ic_viewfinder_gps_on.png
es/drawable-hdpi/ic_wb_auto.png
es/drawable-hdpi/ic_wb_cloudy.png
es/drawable-hdpi/ic_wb_fluorescent.png
es/drawable-hdpi/ic_wb_incandescent.png
es/drawable-hdpi/ic_wb_sunlight.png
es/drawable-hdpi/list_divider.9.png
es/drawable-hdpi/list_divider_large.9.png
es/drawable-hdpi/list_pressed_holo_light.9.png
es/drawable-hdpi/on_screen_hint_frame.9.png
es/drawable-hdpi/switch_bg_focused_holo_dark.9.png
es/drawable-hdpi/switch_bg_holo_dark.9.png
es/drawable-hdpi/switch_thumb_activated_holo_dark.9.png
es/drawable-hdpi/switch_thumb_disabled_holo_dark.9.png
es/drawable-hdpi/switch_thumb_holo_dark.9.png
es/drawable-hdpi/switch_thumb_pressed_holo_dark.9.png
es/drawable-hdpi/toast_frame_holo.9.png
es/drawable-land-hdpi/btn_camera_shutter_holo_xlarge.png
es/drawable-land-hdpi/btn_camera_shutter_pressed_holo_xlarge.png
es/drawable-land-hdpi/btn_pan_shutter_pressed_holo_xlarge.png
es/drawable-land-hdpi/btn_pan_shutter_recording_holo_xlarge.png
es/drawable-land-hdpi/btn_pan_shutter_recording_pressed_holo_xlarge.png
es/drawable-land-hdpi/btn_video_shutter_holo_xlarge.png
es/drawable-land-hdpi/btn_video_shutter_pressed_holo_xlarge.png
es/drawable-land-hdpi/btn_video_shutter_recording_holo_xlarge.png
es/drawable-land-hdpi/btn_video_shutter_recording_pressed_holo_xlarge.png
es/drawable-land-hdpi/ic_zoom_big.9.png
es/drawable-land-hdpi/ic_zoom_big_dark.9.png
es/drawable-land-hdpi/ic_zoom_big_dark_large.9.png
es/drawable-land-hdpi/ic_zoom_big_large.9.png
es/drawable-land-hdpi/switcher_bg.9.png
es/drawable-land-mdpi/btn_camera_shutter_holo_xlarge.png
es/drawable-land-mdpi/btn_camera_shutter_pressed_holo_xlarge.png
es/drawable-land-mdpi/btn_pan_shutter_pressed_holo_xlarge.png
es/drawable-land-mdpi/btn_pan_shutter_recording_holo_xlarge.png
es/drawable-land-mdpi/btn_pan_shutter_recording_pressed_holo_xlarge.png
es/drawable-land-mdpi/btn_video_shutter_holo_xlarge.png
es/drawable-land-mdpi/btn_video_shutter_pressed_holo_xlarge.png
es/drawable-land-mdpi/btn_video_shutter_recording_holo_xlarge.png
es/drawable-land-mdpi/btn_video_shutter_recording_pressed_holo_xlarge.png
es/drawable-land-mdpi/ic_zoom_big.9.png
es/drawable-land-mdpi/ic_zoom_big_dark.9.png
es/drawable-land-mdpi/switcher_bg.9.png
es/drawable-land-xhdpi/btn_camera_shutter_holo_xlarge.png
es/drawable-land-xhdpi/btn_camera_shutter_pressed_holo_xlarge.png
es/drawable-land-xhdpi/btn_pan_shutter_pressed_holo_xlarge.png
es/drawable-land-xhdpi/btn_pan_shutter_recording_holo_xlarge.png
es/drawable-land-xhdpi/btn_pan_shutter_recording_pressed_holo_xlarge.png
es/drawable-land-xhdpi/btn_video_shutter_holo_xlarge.png
es/drawable-land-xhdpi/btn_video_shutter_pressed_holo_xlarge.png
es/drawable-land-xhdpi/btn_video_shutter_recording_holo_xlarge.png
es/drawable-land-xhdpi/btn_video_shutter_recording_pressed_holo_xlarge.png
es/drawable-land-xhdpi/ic_zoom_big.9.png
es/drawable-land-xhdpi/ic_zoom_big_dark.9.png
es/drawable-land-xhdpi/switcher_bg.9.png
es/drawable-mdpi/btn_camera_shutter_holo.png
es/drawable-mdpi/btn_camera_shutter_pressed_holo.png
es/drawable-mdpi/btn_pan_shutter_pressed_holo.png
es/drawable-mdpi/btn_pan_shutter_recording_holo.png
es/drawable-mdpi/btn_pan_shutter_recording_pressed_holo.png
es/drawable-mdpi/btn_shutter_default.png
es/drawable-mdpi/btn_shutter_pano_pressed.png
es/drawable-mdpi/btn_shutter_pressed.png
es/drawable-mdpi/btn_shutter_recording.png
es/drawable-mdpi/btn_shutter_video_default.png
es/drawable-mdpi/btn_shutter_video_pressed.png
es/drawable-mdpi/btn_shutter_video_recording.png
es/drawable-mdpi/btn_video_shutter_holo.png
es/drawable-mdpi/btn_video_shutter_pressed_holo.png
es/drawable-mdpi/btn_video_shutter_recording_holo.png
es/drawable-mdpi/btn_video_shutter_recording_pressed_holo.png
es/drawable-mdpi/dialog_full_holo_dark.9.png
es/drawable-mdpi/ic_btn_shutter_retake.png
es/drawable-mdpi/ic_effects_holo_light.png
es/drawable-mdpi/ic_effects_holo_light_xlarge.png
es/drawable-mdpi/ic_exposure_0.png
es/drawable-mdpi/ic_exposure_holo_light.png
es/drawable-mdpi/ic_exposure_holo_light_xlarge.png
es/drawable-mdpi/ic_exposure_n1.png
es/drawable-mdpi/ic_exposure_n2.png
es/drawable-mdpi/ic_exposure_n3.png
es/drawable-mdpi/ic_exposure_p1.png
es/drawable-mdpi/ic_exposure_p2.png
es/drawable-mdpi/ic_exposure_p3.png
es/drawable-mdpi/ic_flash_auto_holo_light.png
es/drawable-mdpi/ic_flash_auto_holo_light_xlarge.png
es/drawable-mdpi/ic_flash_off_holo_light.png
es/drawable-mdpi/ic_flash_off_holo_light_xlarge.png
es/drawable-mdpi/ic_flash_on_holo_light.png
es/drawable-mdpi/ic_flash_on_holo_light_xlarge.png
es/drawable-mdpi/ic_flash_torch.png
es/drawable-mdpi/ic_gallery_play_big.png
es/drawable-mdpi/ic_hdr.png
es/drawable-mdpi/ic_indicator_ev_0.png
es/drawable-mdpi/ic_indicator_ev_n1.png
es/drawable-mdpi/ic_indicator_ev_n2.png
es/drawable-mdpi/ic_indicator_ev_n3.png
es/drawable-mdpi/ic_indicator_ev_p1.png
es/drawable-mdpi/ic_indicator_ev_p2.png
es/drawable-mdpi/ic_indicator_ev_p3.png
es/drawable-mdpi/ic_indicator_flash_auto.png
es/drawable-mdpi/ic_indicator_flash_off.png
es/drawable-mdpi/ic_indicator_flash_on.png
es/drawable-mdpi/ic_indicator_hdr_off.png
es/drawable-mdpi/ic_indicator_hdr_on.png
es/drawable-mdpi/ic_indicator_sce_off.png
es/drawable-mdpi/ic_indicator_sce_on.png
es/drawable-mdpi/ic_menu_camera_video_view.png
es/drawable-mdpi/ic_menu_cancel_holo_light.png
es/drawable-mdpi/ic_menu_done_holo_light.png
es/drawable-mdpi/ic_menuselect_camera_facing_back.png
es/drawable-mdpi/ic_menuselect_camera_facing_front.png
es/drawable-mdpi/ic_menuselect_gps_off.png
es/drawable-mdpi/ic_menuselect_gps_on.png
es/drawable-mdpi/ic_pan_border_fast.9.png
es/drawable-mdpi/ic_pan_border_fast_xlarge.9.png
es/drawable-mdpi/ic_pan_left_indicator.png
es/drawable-mdpi/ic_pan_left_indicator_fast.png
es/drawable-mdpi/ic_pan_left_indicator_fast_xlarge.png
es/drawable-mdpi/ic_pan_left_indicator_xlarge.png
es/drawable-mdpi/ic_pan_progression.png
es/drawable-mdpi/ic_pan_progression_xlarge.png
es/drawable-mdpi/ic_pan_recording_indicator.png
es/drawable-mdpi/ic_pan_right_indicator.png
es/drawable-mdpi/ic_pan_right_indicator_fast.png
es/drawable-mdpi/ic_pan_right_indicator_fast_xlarge.png
es/drawable-mdpi/ic_pan_right_indicator_xlarge.png
es/drawable-mdpi/ic_recording_indicator.png
es/drawable-mdpi/ic_scn_holo_light.png
es/drawable-mdpi/ic_scn_holo_light_xlarge.png
es/drawable-mdpi/ic_settings_holo_light.png
es/drawable-mdpi/ic_settings_holo_light_xlarge.png
es/drawable-mdpi/ic_snapshot_border.9.png
es/drawable-mdpi/ic_snapshot_border_xlarge.9.png
es/drawable-mdpi/ic_switch_camera.png
es/drawable-mdpi/ic_switch_pan.png
es/drawable-mdpi/ic_switch_pano_active.png
es/drawable-mdpi/ic_switch_photo_facing_holo_light.png
es/drawable-mdpi/ic_switch_photo_facing_holo_light_xlarge.png
es/drawable-mdpi/ic_switch_photosphere.png
es/drawable-mdpi/ic_switch_video.png
es/drawable-mdpi/ic_switch_video_active.png
es/drawable-mdpi/ic_switch_video_facing_holo_light.png
es/drawable-mdpi/ic_switch_video_facing_holo_light_xlarge.png
es/drawable-mdpi/ic_switcher_menu_indicator.png
es/drawable-mdpi/ic_timelapse_none.png
es/drawable-mdpi/ic_timelapse_none_xlarge.png
es/drawable-mdpi/ic_video_effects_background_fields_of_wheat_holo.png
es/drawable-mdpi/ic_video_effects_background_intergalactic_holo.png
es/drawable-mdpi/ic_video_effects_background_normal_holo_dark.png
es/drawable-mdpi/ic_video_effects_faces_big_eyes_holo_dark.png
es/drawable-mdpi/ic_video_effects_faces_big_mouth_holo_dark.png
es/drawable-mdpi/ic_video_effects_faces_big_nose_holo_dark.png
es/drawable-mdpi/ic_video_effects_faces_small_eyes_holo_dark.png
es/drawable-mdpi/ic_video_effects_faces_small_mouth_holo_dark.png
es/drawable-mdpi/ic_video_effects_faces_squeeze_holo_dark.png
es/drawable-mdpi/ic_view_photosphere.png
es/drawable-mdpi/ic_viewfinder_camera_facing_back.png
es/drawable-mdpi/ic_viewfinder_camera_facing_front.png
es/drawable-mdpi/ic_viewfinder_gps_no_signal.png
es/drawable-mdpi/ic_viewfinder_gps_off.png
es/drawable-mdpi/ic_viewfinder_gps_on.png
es/drawable-mdpi/ic_wb_auto.png
es/drawable-mdpi/ic_wb_cloudy.png
es/drawable-mdpi/ic_wb_fluorescent.png
es/drawable-mdpi/ic_wb_incandescent.png
es/drawable-mdpi/ic_wb_sunlight.png
es/drawable-mdpi/list_divider.9.png
es/drawable-mdpi/list_pressed_holo_light.9.png
es/drawable-mdpi/on_screen_hint_frame.9.png
es/drawable-mdpi/switch_bg_focused_holo_dark.9.png
es/drawable-mdpi/switch_bg_holo_dark.9.png
es/drawable-mdpi/switch_thumb_activated_holo_dark.9.png
es/drawable-mdpi/switch_thumb_disabled_holo_dark.9.png
es/drawable-mdpi/switch_thumb_holo_dark.9.png
es/drawable-mdpi/switch_thumb_pressed_holo_dark.9.png
es/drawable-mdpi/toast_frame_holo.9.png
es/drawable-port-hdpi/btn_camera_shutter_holo_xlarge.png
es/drawable-port-hdpi/btn_camera_shutter_pressed_holo_xlarge.png
es/drawable-port-hdpi/btn_pan_shutter_pressed_holo_xlarge.png
es/drawable-port-hdpi/btn_pan_shutter_recording_holo_xlarge.png
es/drawable-port-hdpi/btn_pan_shutter_recording_pressed_holo_xlarge.png
es/drawable-port-hdpi/btn_video_shutter_holo_xlarge.png
es/drawable-port-hdpi/btn_video_shutter_pressed_holo_xlarge.png
es/drawable-port-hdpi/btn_video_shutter_recording_holo_xlarge.png
es/drawable-port-hdpi/btn_video_shutter_recording_pressed_holo_xlarge.png
es/drawable-port-hdpi/ic_zoom_big.9.png
es/drawable-port-hdpi/ic_zoom_big_dark.9.png
es/drawable-port-hdpi/ic_zoom_big_dark_large.9.png
es/drawable-port-hdpi/ic_zoom_big_large.9.png
es/drawable-port-hdpi/switcher_bg.9.png
es/drawable-port-mdpi/btn_camera_shutter_holo_xlarge.png
es/drawable-port-mdpi/btn_camera_shutter_pressed_holo_xlarge.png
es/drawable-port-mdpi/btn_pan_shutter_pressed_holo_xlarge.png
es/drawable-port-mdpi/btn_pan_shutter_recording_holo_xlarge.png
es/drawable-port-mdpi/btn_pan_shutter_recording_pressed_holo_xlarge.png
es/drawable-port-mdpi/btn_video_shutter_holo_xlarge.png
es/drawable-port-mdpi/btn_video_shutter_pressed_holo_xlarge.png
es/drawable-port-mdpi/btn_video_shutter_recording_holo_xlarge.png
es/drawable-port-mdpi/btn_video_shutter_recording_pressed_holo_xlarge.png
es/drawable-port-mdpi/ic_zoom_big.9.png
es/drawable-port-mdpi/ic_zoom_big_dark.9.png
es/drawable-port-mdpi/switcher_bg.9.png
es/drawable-port-xhdpi/btn_camera_shutter_holo_xlarge.png
es/drawable-port-xhdpi/btn_camera_shutter_pressed_holo_xlarge.png
es/drawable-port-xhdpi/btn_pan_shutter_pressed_holo_xlarge.png
es/drawable-port-xhdpi/btn_pan_shutter_recording_holo_xlarge.png
es/drawable-port-xhdpi/btn_pan_shutter_recording_pressed_holo_xlarge.png
es/drawable-port-xhdpi/btn_video_shutter_holo_xlarge.png
es/drawable-port-xhdpi/btn_video_shutter_pressed_holo_xlarge.png
es/drawable-port-xhdpi/btn_video_shutter_recording_holo_xlarge.png
es/drawable-port-xhdpi/btn_video_shutter_recording_pressed_holo_xlarge.png
es/drawable-port-xhdpi/ic_zoom_big.9.png
es/drawable-port-xhdpi/ic_zoom_big_dark.9.png
es/drawable-port-xhdpi/switcher_bg.9.png
es/drawable-sw600dp-hdpi/btn_shutter_default.png
es/drawable-sw600dp-hdpi/btn_shutter_pressed.png
es/drawable-sw600dp-hdpi/btn_shutter_recording.png
es/drawable-sw600dp-hdpi/btn_shutter_video_default.png
es/drawable-sw600dp-hdpi/btn_shutter_video_pressed.png
es/drawable-sw600dp-hdpi/btn_shutter_video_recording.png
es/drawable-sw600dp-land-hdpi/switcher_bg.9.png
es/drawable-sw600dp-land-mdpi/switcher_bg.9.png
es/drawable-sw600dp-land-xhdpi/switcher_bg.9.png
es/drawable-sw600dp-mdpi/btn_shutter_default.png
es/drawable-sw600dp-mdpi/btn_shutter_pressed.png
es/drawable-sw600dp-mdpi/btn_shutter_recording.png
es/drawable-sw600dp-mdpi/btn_shutter_video_default.png
es/drawable-sw600dp-mdpi/btn_shutter_video_pressed.png
es/drawable-sw600dp-mdpi/btn_shutter_video_recording.png
es/drawable-sw600dp-port-hdpi/switcher_bg.9.png
es/drawable-sw600dp-port-mdpi/switcher_bg.9.png
es/drawable-sw600dp-port-xhdpi/switcher_bg.9.png
es/drawable-sw600dp-xhdpi/btn_shutter_default.png
es/drawable-sw600dp-xhdpi/btn_shutter_pressed.png
es/drawable-sw600dp-xhdpi/btn_shutter_recording.png
es/drawable-sw600dp-xhdpi/btn_shutter_video_default.png
es/drawable-sw600dp-xhdpi/btn_shutter_video_pressed.png
es/drawable-sw600dp-xhdpi/btn_shutter_video_recording.png
es/drawable-xhdpi/btn_camera_shutter_holo.png
es/drawable-xhdpi/btn_camera_shutter_pressed_holo.png
es/drawable-xhdpi/btn_pan_shutter_pressed_holo.png
es/drawable-xhdpi/btn_pan_shutter_recording_holo.png
es/drawable-xhdpi/btn_pan_shutter_recording_pressed_holo.png
es/drawable-xhdpi/btn_shutter_default.png
es/drawable-xhdpi/btn_shutter_pano_pressed.png
es/drawable-xhdpi/btn_shutter_pressed.png
es/drawable-xhdpi/btn_shutter_recording.png
es/drawable-xhdpi/btn_shutter_video_default.png
es/drawable-xhdpi/btn_shutter_video_pressed.png
es/drawable-xhdpi/btn_shutter_video_recording.png
es/drawable-xhdpi/btn_video_shutter_holo.png
es/drawable-xhdpi/btn_video_shutter_pressed_holo.png
es/drawable-xhdpi/btn_video_shutter_recording_holo.png
es/drawable-xhdpi/btn_video_shutter_recording_pressed_holo.png
es/drawable-xhdpi/dialog_full_holo_dark.9.png
es/drawable-xhdpi/ic_btn_shutter_retake.png
es/drawable-xhdpi/ic_effects_holo_light.png
es/drawable-xhdpi/ic_effects_holo_light_xlarge.png
es/drawable-xhdpi/ic_exposure_0.png
es/drawable-xhdpi/ic_exposure_holo_light.png
es/drawable-xhdpi/ic_exposure_holo_light_xlarge.png
es/drawable-xhdpi/ic_exposure_n1.png
es/drawable-xhdpi/ic_exposure_n2.png
es/drawable-xhdpi/ic_exposure_n3.png
es/drawable-xhdpi/ic_exposure_p1.png
es/drawable-xhdpi/ic_exposure_p2.png
es/drawable-xhdpi/ic_exposure_p3.png
es/drawable-xhdpi/ic_flash_auto_holo_light.png
es/drawable-xhdpi/ic_flash_auto_holo_light_xlarge.png
es/drawable-xhdpi/ic_flash_off_holo_light.png
es/drawable-xhdpi/ic_flash_off_holo_light_xlarge.png
es/drawable-xhdpi/ic_flash_on_holo_light.png
es/drawable-xhdpi/ic_flash_on_holo_light_xlarge.png
es/drawable-xhdpi/ic_flash_torch.png
es/drawable-xhdpi/ic_gallery_play_big.png
es/drawable-xhdpi/ic_hdr.png
es/drawable-xhdpi/ic_indicator_ev_0.png
es/drawable-xhdpi/ic_indicator_ev_n1.png
es/drawable-xhdpi/ic_indicator_ev_n2.png
es/drawable-xhdpi/ic_indicator_ev_n3.png
es/drawable-xhdpi/ic_indicator_ev_p1.png
es/drawable-xhdpi/ic_indicator_ev_p2.png
es/drawable-xhdpi/ic_indicator_ev_p3.png
es/drawable-xhdpi/ic_indicator_flash_auto.png
es/drawable-xhdpi/ic_indicator_flash_off.png
es/drawable-xhdpi/ic_indicator_flash_on.png
es/drawable-xhdpi/ic_indicator_hdr_off.png
es/drawable-xhdpi/ic_indicator_hdr_on.png
es/drawable-xhdpi/ic_indicator_sce_off.png
es/drawable-xhdpi/ic_indicator_sce_on.png
es/drawable-xhdpi/ic_menu_cancel_holo_light.png
es/drawable-xhdpi/ic_menu_done_holo_light.png
es/drawable-xhdpi/ic_pan_border_fast.9.png
es/drawable-xhdpi/ic_pan_border_fast_xlarge.9.png
es/drawable-xhdpi/ic_pan_left_indicator.png
es/drawable-xhdpi/ic_pan_left_indicator_fast.png
es/drawable-xhdpi/ic_pan_left_indicator_fast_xlarge.png
es/drawable-xhdpi/ic_pan_left_indicator_xlarge.png
es/drawable-xhdpi/ic_pan_progression.png
es/drawable-xhdpi/ic_pan_progression_xlarge.png
es/drawable-xhdpi/ic_pan_recording_indicator.png
es/drawable-xhdpi/ic_pan_right_indicator.png
es/drawable-xhdpi/ic_pan_right_indicator_fast.png
es/drawable-xhdpi/ic_pan_right_indicator_fast_xlarge.png
es/drawable-xhdpi/ic_pan_right_indicator_xlarge.png
es/drawable-xhdpi/ic_recording_indicator.png
es/drawable-xhdpi/ic_scn_holo_light.png
es/drawable-xhdpi/ic_scn_holo_light_xlarge.png
es/drawable-xhdpi/ic_settings_holo_light.png
es/drawable-xhdpi/ic_settings_holo_light_xlarge.png
es/drawable-xhdpi/ic_snapshot_border.9.png
es/drawable-xhdpi/ic_snapshot_border_xlarge.9.png
es/drawable-xhdpi/ic_switch_camera.png
es/drawable-xhdpi/ic_switch_pan.png
es/drawable-xhdpi/ic_switch_pano_active.png
es/drawable-xhdpi/ic_switch_photo_facing_holo_light.png
es/drawable-xhdpi/ic_switch_photo_facing_holo_light_xlarge.png
es/drawable-xhdpi/ic_switch_photosphere.png
es/drawable-xhdpi/ic_switch_video.png
es/drawable-xhdpi/ic_switch_video_active.png
es/drawable-xhdpi/ic_switch_video_facing_holo_light.png
es/drawable-xhdpi/ic_switch_video_facing_holo_light_xlarge.png
es/drawable-xhdpi/ic_switcher_menu_indicator.png
es/drawable-xhdpi/ic_timelapse_none.png
es/drawable-xhdpi/ic_timelapse_none_xlarge.png
es/drawable-xhdpi/ic_video_effects_background_fields_of_wheat_holo.png
es/drawable-xhdpi/ic_video_effects_background_intergalactic_holo.png
es/drawable-xhdpi/ic_video_effects_background_normal_holo_dark.png
es/drawable-xhdpi/ic_video_effects_faces_big_eyes_holo_dark.png
es/drawable-xhdpi/ic_video_effects_faces_big_mouth_holo_dark.png
es/drawable-xhdpi/ic_video_effects_faces_big_nose_holo_dark.png
es/drawable-xhdpi/ic_video_effects_faces_small_eyes_holo_dark.png
es/drawable-xhdpi/ic_video_effects_faces_small_mouth_holo_dark.png
es/drawable-xhdpi/ic_video_effects_faces_squeeze_holo_dark.png
es/drawable-xhdpi/ic_view_photosphere.png
es/drawable-xhdpi/ic_wb_auto.png
es/drawable-xhdpi/ic_wb_cloudy.png
es/drawable-xhdpi/ic_wb_fluorescent.png
es/drawable-xhdpi/ic_wb_incandescent.png
es/drawable-xhdpi/ic_wb_sunlight.png
es/drawable-xhdpi/list_divider.9.png
es/drawable-xhdpi/list_pressed_holo_light.9.png
es/drawable-xhdpi/switch_bg_focused_holo_dark.9.png
es/drawable-xhdpi/switch_bg_holo_dark.9.png
es/drawable-xhdpi/switch_thumb_activated_holo_dark.9.png
es/drawable-xhdpi/switch_thumb_disabled_holo_dark.9.png
es/drawable-xhdpi/switch_thumb_holo_dark.9.png
es/drawable-xhdpi/switch_thumb_pressed_holo_dark.9.png
es/drawable-xhdpi/toast_frame_holo.9.png
es/drawable/bg_pressed.xml
es/drawable/bg_pressed_exit_fading.xml
es/drawable/bg_text_on_preview.xml
es/drawable/btn_new_shutter.xml
es/drawable/btn_new_shutter_video.xml
es/drawable/btn_shutter_video_recording.xml
es/drawable/pano_direction_left_indicator.xml
es/drawable/pano_direction_right_indicator.xml
es/drawable/setting_picker.xml
es/drawable/switch_inner_holo_dark.xml
es/drawable/switch_track_holo_dark.xml
es/interpolator/decelerate_cubic.xml
es/interpolator/decelerate_quint.xml
es/layout-land/camera_shutter_switcher.xml
es/layout-land/keyguard_widget.xml
es/layout-land/on_screen_hint.xml
es/layout-land/pano_module_capture.xml
es/layout-land/pano_review.xml
es/layout-land/photo_module_content.xml
es/layout-land/preview_frame_pano.xml
es/layout-land/review_module_control.xml
es/layout-land/switcher_popup.xml
es/layout-land/video_module.xml
es/layout-port/camera_shutter_switcher.xml
es/layout-port/keyguard_widget.xml
es/layout-port/on_screen_hint.xml
es/layout-port/pano_module_capture.xml
es/layout-port/pano_review.xml
es/layout-port/photo_module_content.xml
es/layout-port/preview_frame_pano.xml
es/layout-port/review_module_control.xml
es/layout-port/switcher_popup.xml
es/layout-port/video_module.xml
es/layout/bg_replacement_training_message.xml
es/layout/camera_main.xml
es/layout/count_down_to_capture.xml
es/layout/effect_setting_item.xml
es/layout/effect_setting_popup.xml
es/layout/face_view.xml
es/layout/in_line_setting_check_box.xml
es/layout/in_line_setting_menu.xml
es/layout/list_pref_setting_popup.xml
es/layout/menu_indicators.xml
es/layout/menu_indicators_keyguard.xml
es/layout/more_setting_popup.xml
es/layout/panorama_module.xml
es/layout/photo_module.xml
es/layout/preview_module_frame.xml
es/layout/preview_module_frame_video.xml
es/layout/preview_surface_view.xml
es/layout/rotate_dialog.xml
es/layout/rotate_text_toast.xml
es/layout/setting_item.xml
es/layout/time_interval_picker.xml
es/layout/time_interval_popup.xml
es/layout/timer_setting_popup.xml
es/layout/viewfinder_labels_video.xml
es/mipmap-hdpi/ic_launcher_camera.png
es/mipmap-hdpi/ic_launcher_video_camera.png
es/mipmap-mdpi/ic_launcher_camera.png
es/mipmap-mdpi/ic_launcher_video_camera.png
es/mipmap-xhdpi/ic_launcher_camera.png
es/mipmap-xxhdpi/ic_launcher_camera.png
es/raw/backdropper.graph
es/raw/beep_once.ogg
es/raw/beep_twice.ogg
es/raw/blank.jpg
es/raw/focus_complete.ogg
es/raw/goofy_face.graph
es/raw/video_record.ogg
es/values-af/filtershow_strings.xml
es/values-am/filtershow_strings.xml
es/values-ar/filtershow_strings.xml
es/values-be/filtershow_strings.xml
es/values-bg/filtershow_strings.xml
es/values-ca/filtershow_strings.xml
es/values-cs/filtershow_strings.xml
es/values-da/filtershow_strings.xml
es/values-de/filtershow_strings.xml
es/values-el/filtershow_strings.xml
es/values-en-rGB/filtershow_strings.xml
es/values-es-rUS/filtershow_strings.xml
es/values-es/filtershow_strings.xml
es/values-et/filtershow_strings.xml
es/values-fa/filtershow_strings.xml
es/values-fi/filtershow_strings.xml
es/values-fr/filtershow_strings.xml
es/values-hi/filtershow_strings.xml
es/values-hr/filtershow_strings.xml
es/values-hu/filtershow_strings.xml
es/values-in/filtershow_strings.xml
es/values-it/filtershow_strings.xml
es/values-iw/filtershow_strings.xml
es/values-ja/filtershow_strings.xml
es/values-ko/filtershow_strings.xml
es/values-land/styles.xml
es/values-large-hdpi/drawable.xml
es/values-large/dimens.xml
es/values-lt/filtershow_strings.xml
es/values-lv/filtershow_strings.xml
es/values-ms/filtershow_strings.xml
es/values-nb/filtershow_strings.xml
es/values-nl/filtershow_strings.xml
es/values-pl/filtershow_strings.xml
es/values-port/styles.xml
es/values-pt-rPT/filtershow_strings.xml
es/values-pt/filtershow_strings.xml
es/values-ro/filtershow_strings.xml
es/values-ru/filtershow_strings.xml
es/values-sk/filtershow_strings.xml
es/values-sl/filtershow_strings.xml
es/values-sr/filtershow_strings.xml
es/values-sv/filtershow_strings.xml
es/values-sw/filtershow_strings.xml
es/values-sw600dp-hdpi/drawable.xml
es/values-sw600dp-land/styles.xml
es/values-sw600dp-port/styles.xml
es/values-sw600dp/dimens.xml
es/values-sw640dp/dimens.xml
es/values-sw640dp/drawable.xml
es/values-sw640dp/styles.xml
es/values-sw800dp/dimens.xml
es/values-th/filtershow_strings.xml
es/values-tl/filtershow_strings.xml
es/values-tr/filtershow_strings.xml
es/values-uk/filtershow_strings.xml
es/values-v11/styles.xml
es/values-v13/styles.xml
es/values-vi/filtershow_strings.xml
es/values-xlarge-land/drawable.xml
es/values-xlarge-port/drawable.xml
es/values-xlarge/dimens.xml
es/values-xlarge/drawable.xml
es/values-xlarge/styles.xml
es/values-zh-rCN/filtershow_strings.xml
es/values-zh-rTW/filtershow_strings.xml
es/values-zu/filtershow_strings.xml
es/values/arrays.xml
es/values/attrs.xml
es/values/colors.xml
es/values/config.xml
es/values/dimens.xml
es/values/filtershow_strings.xml
es/values/strings.xml
es/values/styles.xml
es/xml/camera_preferences.xml
es/xml/video_preferences.xml
|
b13a6ac412f709ca19132c0a6a5b1a1d16c4ffb2 |
29-Jan-2013 |
John Reck <jreck@google.com> |
am e606b862: Extract constants/boilerplate # Via John Reck * commit 'e606b862f26ba9e499db4f15940f8200841b9dc3': Extract constants/boilerplate
|
501ced9324dd97e71435e08e431a7f97cf1b8bed |
29-Jan-2013 |
John Reck <jreck@google.com> |
Extract constants/boilerplate Change-Id: I52ba51bab6ec12f2925384c1eedbba96e02bfa97
rc/com/android/gallery3d/provider/CanvasProvider.java
rc/com/android/gallery3d/provider/CanvasProviderBase.java
|
e606b862f26ba9e499db4f15940f8200841b9dc3 |
29-Jan-2013 |
John Reck <jreck@google.com> |
Extract constants/boilerplate Change-Id: I52ba51bab6ec12f2925384c1eedbba96e02bfa97
rc/com/android/gallery3d/provider/CanvasProvider.java
rc/com/android/gallery3d/provider/CanvasProviderBase.java
|
87499aff9a8f45649efbb423d9d1257dada6815a |
29-Jan-2013 |
nicolasroard <nicolasroard@google.com> |
am 4588a3cb: Merge "Fix thumbnail generation" into gb-ub-photos-bryce # Via Android (Google) Code Review (1) and nicolasroard (1) * commit '4588a3cb75457f98b6b0fd1b7dc41e9db2079b16': Fix thumbnail generation
|
4588a3cb75457f98b6b0fd1b7dc41e9db2079b16 |
29-Jan-2013 |
nicolasroard <nicolasroard@google.com> |
Merge "Fix thumbnail generation" into gb-ub-photos-bryce
|
45e42d25b8fa11f9b9615244a8f0bc68de2e4a8c |
29-Jan-2013 |
nicolasroard <nicolasroard@google.com> |
Merge "Fix thumbnail generation" into gb-ub-photos-bryce
|
f8fc2a8b84080517c099e0fc471ebe2d54285869 |
29-Jan-2013 |
Bobby Georgescu <georgescu@google.com> |
am 2da45514: Merge "Importer: when view is reused for same image, don\'t reload" into gb-ub-photos-bryce # Via Android (Google) Code Review (1) and Bobby Georgescu (1) * commit '2da455143a4cb59d289f24c23b8f93c29da14fd0': Importer: when view is reused for same image, don't reload
|
2da455143a4cb59d289f24c23b8f93c29da14fd0 |
29-Jan-2013 |
Bobby Georgescu <georgescu@google.com> |
Merge "Importer: when view is reused for same image, don't reload" into gb-ub-photos-bryce
|
a2577e066f195d6f3ec8d92c8941797976501ea2 |
29-Jan-2013 |
Bobby Georgescu <georgescu@google.com> |
Merge "Importer: when view is reused for same image, don't reload" into gb-ub-photos-bryce
|
c03c4360a10ac519b00cc75dd02794536c72182b |
29-Jan-2013 |
nicolasroard <nicolasroard@google.com> |
Fix thumbnail generation Change-Id: I03a290bf8eb80bd1687bfd37640dec29ef213cdb
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/ui/IconButton.java
|
0bb3abc58f7c921451f2870d8679af2377ad7ce9 |
29-Jan-2013 |
nicolasroard <nicolasroard@google.com> |
Fix thumbnail generation Change-Id: I03a290bf8eb80bd1687bfd37640dec29ef213cdb
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/ui/IconButton.java
|
c216dce5c35b6176147b42a041ca85fa2dcca2a4 |
29-Jan-2013 |
Bobby Georgescu <georgescu@google.com> |
Importer: when view is reused for same image, don't reload Bug: 7968780 Change-Id: I6786d140e516ff60562c5c0b1222fca0ea153216
rc/com/android/gallery3d/ingest/adapter/MtpAdapter.java
rc/com/android/gallery3d/ingest/ui/MtpThumbnailTileView.java
|
ddbff6fd78d2b3286a81fad125818443a6907ccf |
29-Jan-2013 |
Bobby Georgescu <georgescu@google.com> |
Importer: when view is reused for same image, don't reload Bug: 7968780 Change-Id: I6786d140e516ff60562c5c0b1222fca0ea153216
rc/com/android/gallery3d/ingest/adapter/MtpAdapter.java
rc/com/android/gallery3d/ingest/ui/MtpThumbnailTileView.java
|
2ead524379bdcec391fda1184c2f124410fc8748 |
29-Jan-2013 |
nicolasroard <nicolasroard@google.com> |
am 7bbdf56b: Merge "Fix scaling + quality parameters" into gb-ub-photos-bryce # Via Android (Google) Code Review (1) and nicolasroard (1) * commit '7bbdf56b74ec0ba029b1fc5f0d96cf8e8c1e7618': Fix scaling + quality parameters
|
7bbdf56b74ec0ba029b1fc5f0d96cf8e8c1e7618 |
29-Jan-2013 |
nicolasroard <nicolasroard@google.com> |
Merge "Fix scaling + quality parameters" into gb-ub-photos-bryce
|
b5317406b1f43f39e5c5847a04b21a1c38a1830e |
29-Jan-2013 |
nicolasroard <nicolasroard@google.com> |
Merge "Fix scaling + quality parameters" into gb-ub-photos-bryce
|
2efd71f989845ba9fc686b4772cdc4c9bb5c9850 |
29-Jan-2013 |
nicolasroard <nicolasroard@google.com> |
Fix scaling + quality parameters Change-Id: I92e7759282e0f3cc7be8ff95a19a4acb890d214d
rc/com/android/gallery3d/filtershow/cache/FilteringPipeline.java
rc/com/android/gallery3d/filtershow/cache/ImageLoader.java
|
4fbd974264a91357de98115d7746ab370d7f3d94 |
29-Jan-2013 |
nicolasroard <nicolasroard@google.com> |
Fix scaling + quality parameters Change-Id: I92e7759282e0f3cc7be8ff95a19a4acb890d214d
rc/com/android/gallery3d/filtershow/cache/FilteringPipeline.java
rc/com/android/gallery3d/filtershow/cache/ImageLoader.java
|
f04e90e3ec5f9e633867e71f7cc043f4826f291d |
29-Jan-2013 |
Michael Kolb <kolby@google.com> |
am b17796f3: Merge "Move Camera Java/Native source into Gallery2" into gb-ub-photos-bryce # Via Android (Google) Code Review (1) and Michael Kolb (1) * commit 'b17796f30a1b9cdde29f5b0e338c482ba447a4b1': Move Camera Java/Native source into Gallery2
|
b17796f30a1b9cdde29f5b0e338c482ba447a4b1 |
29-Jan-2013 |
Michael Kolb <kolby@google.com> |
Merge "Move Camera Java/Native source into Gallery2" into gb-ub-photos-bryce
|
9a19022b495447029c81fdcd83dc1a1c86d98b25 |
29-Jan-2013 |
Michael Kolb <kolby@google.com> |
Merge "Move Camera Java/Native source into Gallery2" into gb-ub-photos-bryce
|
48c825c594416ba68f69277de3959d316c53ebf8 |
29-Jan-2013 |
Bobby Georgescu <georgescu@google.com> |
am b380f174: Add comment about MenuExecutor assumptions in BatchService # Via Bobby Georgescu * commit 'b380f17426f419e3663da80985dc62f544d47048': Add comment about MenuExecutor assumptions in BatchService
|
b380f17426f419e3663da80985dc62f544d47048 |
29-Jan-2013 |
Bobby Georgescu <georgescu@google.com> |
Add comment about MenuExecutor assumptions in BatchService Bug: 7998915 Change-Id: Ibb73585bf2f81b4a1daadfeb814828ec7b55441d
rc/com/android/gallery3d/app/BatchService.java
|
72d510612f505d4d8439dab144d5c253346aebc2 |
29-Jan-2013 |
Bobby Georgescu <georgescu@google.com> |
Add comment about MenuExecutor assumptions in BatchService Bug: 7998915 Change-Id: Ibb73585bf2f81b4a1daadfeb814828ec7b55441d
rc/com/android/gallery3d/app/BatchService.java
|
f03a91a0f1c3b20eb73de2910391ea7575e67b54 |
29-Jan-2013 |
Michael Kolb <kolby@google.com> |
Move Camera Java/Native source into Gallery2 Change-Id: I968efe4d656e88a7760d3c0044f65b4adac2ddd1
ni_mosaic/Android.mk
ni_mosaic/NOTICE
ni_mosaic/feature_mos/doc/Readme.txt
ni_mosaic/feature_mos/doc/feature_mos_API_doxyfile
ni_mosaic/feature_mos/src/mosaic/AlignFeatures.cpp
ni_mosaic/feature_mos/src/mosaic/AlignFeatures.h
ni_mosaic/feature_mos/src/mosaic/Blend.cpp
ni_mosaic/feature_mos/src/mosaic/Blend.h
ni_mosaic/feature_mos/src/mosaic/CSite.h
ni_mosaic/feature_mos/src/mosaic/Delaunay.cpp
ni_mosaic/feature_mos/src/mosaic/Delaunay.h
ni_mosaic/feature_mos/src/mosaic/EdgePointerUtil.h
ni_mosaic/feature_mos/src/mosaic/Geometry.h
ni_mosaic/feature_mos/src/mosaic/ImageUtils.cpp
ni_mosaic/feature_mos/src/mosaic/ImageUtils.h
ni_mosaic/feature_mos/src/mosaic/Interp.h
ni_mosaic/feature_mos/src/mosaic/Log.h
ni_mosaic/feature_mos/src/mosaic/MatrixUtils.h
ni_mosaic/feature_mos/src/mosaic/Mosaic.cpp
ni_mosaic/feature_mos/src/mosaic/Mosaic.h
ni_mosaic/feature_mos/src/mosaic/MosaicTypes.h
ni_mosaic/feature_mos/src/mosaic/Pyramid.cpp
ni_mosaic/feature_mos/src/mosaic/Pyramid.h
ni_mosaic/feature_mos/src/mosaic/trsMatrix.cpp
ni_mosaic/feature_mos/src/mosaic/trsMatrix.h
ni_mosaic/feature_mos/src/mosaic_renderer/FrameBuffer.cpp
ni_mosaic/feature_mos/src/mosaic_renderer/FrameBuffer.h
ni_mosaic/feature_mos/src/mosaic_renderer/Renderer.cpp
ni_mosaic/feature_mos/src/mosaic_renderer/Renderer.h
ni_mosaic/feature_mos/src/mosaic_renderer/SurfaceTextureRenderer.cpp
ni_mosaic/feature_mos/src/mosaic_renderer/SurfaceTextureRenderer.h
ni_mosaic/feature_mos/src/mosaic_renderer/WarpRenderer.cpp
ni_mosaic/feature_mos/src/mosaic_renderer/WarpRenderer.h
ni_mosaic/feature_mos/src/mosaic_renderer/YVURenderer.cpp
ni_mosaic/feature_mos/src/mosaic_renderer/YVURenderer.h
ni_mosaic/feature_mos_jni.cpp
ni_mosaic/feature_stab/db_vlvm/db_bundle.h
ni_mosaic/feature_stab/db_vlvm/db_feature_detection.cpp
ni_mosaic/feature_stab/db_vlvm/db_feature_detection.h
ni_mosaic/feature_stab/db_vlvm/db_feature_matching.cpp
ni_mosaic/feature_stab/db_vlvm/db_feature_matching.h
ni_mosaic/feature_stab/db_vlvm/db_framestitching.cpp
ni_mosaic/feature_stab/db_vlvm/db_framestitching.h
ni_mosaic/feature_stab/db_vlvm/db_image_homography.cpp
ni_mosaic/feature_stab/db_vlvm/db_image_homography.h
ni_mosaic/feature_stab/db_vlvm/db_metrics.h
ni_mosaic/feature_stab/db_vlvm/db_rob_image_homography.cpp
ni_mosaic/feature_stab/db_vlvm/db_rob_image_homography.h
ni_mosaic/feature_stab/db_vlvm/db_robust.h
ni_mosaic/feature_stab/db_vlvm/db_utilities.cpp
ni_mosaic/feature_stab/db_vlvm/db_utilities.h
ni_mosaic/feature_stab/db_vlvm/db_utilities_algebra.h
ni_mosaic/feature_stab/db_vlvm/db_utilities_camera.cpp
ni_mosaic/feature_stab/db_vlvm/db_utilities_camera.h
ni_mosaic/feature_stab/db_vlvm/db_utilities_constants.h
ni_mosaic/feature_stab/db_vlvm/db_utilities_geometry.h
ni_mosaic/feature_stab/db_vlvm/db_utilities_indexing.cpp
ni_mosaic/feature_stab/db_vlvm/db_utilities_indexing.h
ni_mosaic/feature_stab/db_vlvm/db_utilities_linalg.cpp
ni_mosaic/feature_stab/db_vlvm/db_utilities_linalg.h
ni_mosaic/feature_stab/db_vlvm/db_utilities_poly.cpp
ni_mosaic/feature_stab/db_vlvm/db_utilities_poly.h
ni_mosaic/feature_stab/db_vlvm/db_utilities_random.h
ni_mosaic/feature_stab/db_vlvm/db_utilities_rotation.h
ni_mosaic/feature_stab/doc/Readme.txt
ni_mosaic/feature_stab/doc/dbreg_API_doxyfile
ni_mosaic/feature_stab/src/dbreg/dbreg.cpp
ni_mosaic/feature_stab/src/dbreg/dbreg.h
ni_mosaic/feature_stab/src/dbreg/dbstabsmooth.cpp
ni_mosaic/feature_stab/src/dbreg/dbstabsmooth.h
ni_mosaic/feature_stab/src/dbreg/targetver.h
ni_mosaic/feature_stab/src/dbreg/vp_motionmodel.c
ni_mosaic/feature_stab/src/dbreg/vp_motionmodel.h
ni_mosaic/feature_stab/src/dbregtest/PgmImage.cpp
ni_mosaic/feature_stab/src/dbregtest/PgmImage.h
ni_mosaic/feature_stab/src/dbregtest/dbregtest.cpp
ni_mosaic/feature_stab/src/dbregtest/stdafx.cpp
ni_mosaic/feature_stab/src/dbregtest/stdafx.h
ni_mosaic/feature_stab/src/dbregtest/targetver.h
ni_mosaic/mosaic_renderer_jni.cpp
ni_mosaic/mosaic_renderer_jni.h
|
5973d002f7fe9b79060c27980ecb77693f6994e2 |
29-Jan-2013 |
Michael Kolb <kolby@google.com> |
Move Camera Java/Native source into Gallery2 Change-Id: I968efe4d656e88a7760d3c0044f65b4adac2ddd1
ni_mosaic/feature_mos/src/mosaic/AlignFeatures.cpp
ni_mosaic/feature_mos/src/mosaic/AlignFeatures.h
rc/com/android/camera/PanoProgressBar.java
rc/com/android/camera/PreviewGestures.java
|
9f60e4709b4740a8fb616346d99d6ed8d919349d |
29-Jan-2013 |
Michael Kolb <kolby@google.com> |
Move Camera Java/Native source into Gallery2 Change-Id: I968efe4d656e88a7760d3c0044f65b4adac2ddd1
ndroid.mk
ni_mosaic/Android.mk
|
25668cd6ed661c59295cb65348a126fb245757d4 |
29-Jan-2013 |
Michael Kolb <kolby@google.com> |
Move Camera Java/Native source into Gallery2 Change-Id: I968efe4d656e88a7760d3c0044f65b4adac2ddd1
ndroid.mk
ni_mosaic/Android.mk
ni_mosaic/NOTICE
ni_mosaic/feature_mos/doc/Readme.txt
ni_mosaic/feature_mos/doc/feature_mos_API_doxyfile
ni_mosaic/feature_mos/src/mosaic/AlignFeatures.cpp
ni_mosaic/feature_mos/src/mosaic/AlignFeatures.h
ni_mosaic/feature_mos/src/mosaic/Blend.cpp
ni_mosaic/feature_mos/src/mosaic/Blend.h
ni_mosaic/feature_mos/src/mosaic/CSite.h
ni_mosaic/feature_mos/src/mosaic/Delaunay.cpp
ni_mosaic/feature_mos/src/mosaic/Delaunay.h
ni_mosaic/feature_mos/src/mosaic/EdgePointerUtil.h
ni_mosaic/feature_mos/src/mosaic/Geometry.h
ni_mosaic/feature_mos/src/mosaic/ImageUtils.cpp
ni_mosaic/feature_mos/src/mosaic/ImageUtils.h
ni_mosaic/feature_mos/src/mosaic/Interp.h
ni_mosaic/feature_mos/src/mosaic/Log.h
ni_mosaic/feature_mos/src/mosaic/MatrixUtils.h
ni_mosaic/feature_mos/src/mosaic/Mosaic.cpp
ni_mosaic/feature_mos/src/mosaic/Mosaic.h
ni_mosaic/feature_mos/src/mosaic/MosaicTypes.h
ni_mosaic/feature_mos/src/mosaic/Pyramid.cpp
ni_mosaic/feature_mos/src/mosaic/Pyramid.h
ni_mosaic/feature_mos/src/mosaic/trsMatrix.cpp
ni_mosaic/feature_mos/src/mosaic/trsMatrix.h
ni_mosaic/feature_mos/src/mosaic_renderer/FrameBuffer.cpp
ni_mosaic/feature_mos/src/mosaic_renderer/FrameBuffer.h
ni_mosaic/feature_mos/src/mosaic_renderer/Renderer.cpp
ni_mosaic/feature_mos/src/mosaic_renderer/Renderer.h
ni_mosaic/feature_mos/src/mosaic_renderer/SurfaceTextureRenderer.cpp
ni_mosaic/feature_mos/src/mosaic_renderer/SurfaceTextureRenderer.h
ni_mosaic/feature_mos/src/mosaic_renderer/WarpRenderer.cpp
ni_mosaic/feature_mos/src/mosaic_renderer/WarpRenderer.h
ni_mosaic/feature_mos/src/mosaic_renderer/YVURenderer.cpp
ni_mosaic/feature_mos/src/mosaic_renderer/YVURenderer.h
ni_mosaic/feature_mos_jni.cpp
ni_mosaic/feature_stab/db_vlvm/db_bundle.h
ni_mosaic/feature_stab/db_vlvm/db_feature_detection.cpp
ni_mosaic/feature_stab/db_vlvm/db_feature_detection.h
ni_mosaic/feature_stab/db_vlvm/db_feature_matching.cpp
ni_mosaic/feature_stab/db_vlvm/db_feature_matching.h
ni_mosaic/feature_stab/db_vlvm/db_framestitching.cpp
ni_mosaic/feature_stab/db_vlvm/db_framestitching.h
ni_mosaic/feature_stab/db_vlvm/db_image_homography.cpp
ni_mosaic/feature_stab/db_vlvm/db_image_homography.h
ni_mosaic/feature_stab/db_vlvm/db_metrics.h
ni_mosaic/feature_stab/db_vlvm/db_rob_image_homography.cpp
ni_mosaic/feature_stab/db_vlvm/db_rob_image_homography.h
ni_mosaic/feature_stab/db_vlvm/db_robust.h
ni_mosaic/feature_stab/db_vlvm/db_utilities.cpp
ni_mosaic/feature_stab/db_vlvm/db_utilities.h
ni_mosaic/feature_stab/db_vlvm/db_utilities_algebra.h
ni_mosaic/feature_stab/db_vlvm/db_utilities_camera.cpp
ni_mosaic/feature_stab/db_vlvm/db_utilities_camera.h
ni_mosaic/feature_stab/db_vlvm/db_utilities_constants.h
ni_mosaic/feature_stab/db_vlvm/db_utilities_geometry.h
ni_mosaic/feature_stab/db_vlvm/db_utilities_indexing.cpp
ni_mosaic/feature_stab/db_vlvm/db_utilities_indexing.h
ni_mosaic/feature_stab/db_vlvm/db_utilities_linalg.cpp
ni_mosaic/feature_stab/db_vlvm/db_utilities_linalg.h
ni_mosaic/feature_stab/db_vlvm/db_utilities_poly.cpp
ni_mosaic/feature_stab/db_vlvm/db_utilities_poly.h
ni_mosaic/feature_stab/db_vlvm/db_utilities_random.h
ni_mosaic/feature_stab/db_vlvm/db_utilities_rotation.h
ni_mosaic/feature_stab/doc/Readme.txt
ni_mosaic/feature_stab/doc/dbreg_API_doxyfile
ni_mosaic/feature_stab/src/dbreg/dbreg.cpp
ni_mosaic/feature_stab/src/dbreg/dbreg.h
ni_mosaic/feature_stab/src/dbreg/dbstabsmooth.cpp
ni_mosaic/feature_stab/src/dbreg/dbstabsmooth.h
ni_mosaic/feature_stab/src/dbreg/targetver.h
ni_mosaic/feature_stab/src/dbreg/vp_motionmodel.c
ni_mosaic/feature_stab/src/dbreg/vp_motionmodel.h
ni_mosaic/feature_stab/src/dbregtest/PgmImage.cpp
ni_mosaic/feature_stab/src/dbregtest/PgmImage.h
ni_mosaic/feature_stab/src/dbregtest/dbregtest.cpp
ni_mosaic/feature_stab/src/dbregtest/stdafx.cpp
ni_mosaic/feature_stab/src/dbregtest/stdafx.h
ni_mosaic/feature_stab/src/dbregtest/targetver.h
ni_mosaic/mosaic_renderer_jni.cpp
ni_mosaic/mosaic_renderer_jni.h
rc/com/android/camera/ActivityBase.java
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/CameraBackupAgent.java
rc/com/android/camera/CameraButtonIntentReceiver.java
rc/com/android/camera/CameraDisabledException.java
rc/com/android/camera/CameraErrorCallback.java
rc/com/android/camera/CameraHardwareException.java
rc/com/android/camera/CameraHolder.java
rc/com/android/camera/CameraManager.java
rc/com/android/camera/CameraModule.java
rc/com/android/camera/CameraPreference.java
rc/com/android/camera/CameraScreenNail.java
rc/com/android/camera/CameraSettings.java
rc/com/android/camera/CaptureAnimManager.java
rc/com/android/camera/ComboPreferences.java
rc/com/android/camera/CountDownTimerPreference.java
rc/com/android/camera/DisableCameraReceiver.java
rc/com/android/camera/EffectsRecorder.java
rc/com/android/camera/Exif.java
rc/com/android/camera/FocusOverlayManager.java
rc/com/android/camera/IconListPreference.java
rc/com/android/camera/IntArray.java
rc/com/android/camera/ListPreference.java
rc/com/android/camera/LocationManager.java
rc/com/android/camera/MediaSaver.java
rc/com/android/camera/Mosaic.java
rc/com/android/camera/MosaicFrameProcessor.java
rc/com/android/camera/MosaicPreviewRenderer.java
rc/com/android/camera/MosaicRenderer.java
rc/com/android/camera/OnClickAttr.java
rc/com/android/camera/OnScreenHint.java
rc/com/android/camera/PanoProgressBar.java
rc/com/android/camera/PanoUtil.java
rc/com/android/camera/PanoramaModule.java
rc/com/android/camera/PhotoController.java
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/PieController.java
rc/com/android/camera/PreferenceGroup.java
rc/com/android/camera/PreferenceInflater.java
rc/com/android/camera/PreviewFrameLayout.java
rc/com/android/camera/PreviewGestures.java
rc/com/android/camera/ProxyLauncher.java
rc/com/android/camera/RecordLocationPreference.java
rc/com/android/camera/RotateDialogController.java
rc/com/android/camera/SecureCameraActivity.java
rc/com/android/camera/ShutterButton.java
rc/com/android/camera/SoundClips.java
rc/com/android/camera/StaticBitmapScreenNail.java
rc/com/android/camera/Storage.java
rc/com/android/camera/SwitchAnimManager.java
rc/com/android/camera/Thumbnail.java
rc/com/android/camera/Util.java
rc/com/android/camera/VideoController.java
rc/com/android/camera/VideoModule.java
rc/com/android/camera/drawable/TextDrawable.java
rc/com/android/camera/ui/AbstractSettingPopup.java
rc/com/android/camera/ui/CameraSwitcher.java
rc/com/android/camera/ui/CheckedLinearLayout.java
rc/com/android/camera/ui/CountDownView.java
rc/com/android/camera/ui/EffectSettingPopup.java
rc/com/android/camera/ui/ExpandedGridView.java
rc/com/android/camera/ui/FaceView.java
rc/com/android/camera/ui/FocusIndicator.java
rc/com/android/camera/ui/InLineSettingCheckBox.java
rc/com/android/camera/ui/InLineSettingItem.java
rc/com/android/camera/ui/InLineSettingMenu.java
rc/com/android/camera/ui/LayoutChangeHelper.java
rc/com/android/camera/ui/LayoutChangeNotifier.java
rc/com/android/camera/ui/LayoutNotifyView.java
rc/com/android/camera/ui/ListPrefSettingPopup.java
rc/com/android/camera/ui/MoreSettingPopup.java
rc/com/android/camera/ui/OnIndicatorEventListener.java
rc/com/android/camera/ui/OverlayRenderer.java
rc/com/android/camera/ui/PieItem.java
rc/com/android/camera/ui/PieRenderer.java
rc/com/android/camera/ui/PopupManager.java
rc/com/android/camera/ui/PreviewSurfaceView.java
rc/com/android/camera/ui/RenderOverlay.java
rc/com/android/camera/ui/Rotatable.java
rc/com/android/camera/ui/RotateImageView.java
rc/com/android/camera/ui/RotateLayout.java
rc/com/android/camera/ui/RotateTextToast.java
rc/com/android/camera/ui/Switch.java
rc/com/android/camera/ui/TimeIntervalPopup.java
rc/com/android/camera/ui/TimerSettingPopup.java
rc/com/android/camera/ui/TwoStateImageView.java
rc/com/android/camera/ui/ZoomRenderer.java
|
8872c23e739de38d74f04a8c852ebb5199c905f6 |
29-Jan-2013 |
Michael Kolb <kolby@google.com> |
Move Camera Java/Native source into Gallery2 Change-Id: I968efe4d656e88a7760d3c0044f65b4adac2ddd1
ni_mosaic/feature_mos/src/mosaic/AlignFeatures.cpp
ni_mosaic/feature_mos/src/mosaic/AlignFeatures.h
ni_mosaic/feature_mos/src/mosaic/Blend.cpp
ni_mosaic/feature_mos/src/mosaic/Blend.h
ni_mosaic/feature_mos/src/mosaic/CSite.h
ni_mosaic/feature_mos/src/mosaic/Delaunay.cpp
ni_mosaic/feature_mos/src/mosaic/Delaunay.h
ni_mosaic/feature_mos/src/mosaic/EdgePointerUtil.h
ni_mosaic/feature_mos/src/mosaic/Geometry.h
ni_mosaic/feature_mos/src/mosaic/ImageUtils.cpp
ni_mosaic/feature_mos/src/mosaic/ImageUtils.h
ni_mosaic/feature_mos/src/mosaic/Interp.h
ni_mosaic/feature_mos/src/mosaic/Log.h
ni_mosaic/feature_mos/src/mosaic/MatrixUtils.h
ni_mosaic/feature_mos/src/mosaic/Mosaic.cpp
ni_mosaic/feature_mos/src/mosaic/Mosaic.h
ni_mosaic/feature_mos/src/mosaic/MosaicTypes.h
ni_mosaic/feature_mos/src/mosaic/Pyramid.cpp
ni_mosaic/feature_mos/src/mosaic/Pyramid.h
ni_mosaic/feature_mos/src/mosaic/trsMatrix.cpp
ni_mosaic/feature_mos/src/mosaic/trsMatrix.h
ni_mosaic/feature_mos/src/mosaic_renderer/FrameBuffer.cpp
ni_mosaic/feature_mos/src/mosaic_renderer/FrameBuffer.h
ni_mosaic/feature_mos/src/mosaic_renderer/Renderer.cpp
ni_mosaic/feature_mos/src/mosaic_renderer/Renderer.h
ni_mosaic/feature_mos/src/mosaic_renderer/SurfaceTextureRenderer.cpp
ni_mosaic/feature_mos/src/mosaic_renderer/SurfaceTextureRenderer.h
ni_mosaic/feature_mos/src/mosaic_renderer/WarpRenderer.cpp
ni_mosaic/feature_mos/src/mosaic_renderer/WarpRenderer.h
ni_mosaic/feature_mos/src/mosaic_renderer/YVURenderer.cpp
ni_mosaic/feature_mos/src/mosaic_renderer/YVURenderer.h
ni_mosaic/feature_stab/src/dbreg/dbreg.cpp
ni_mosaic/feature_stab/src/dbreg/dbreg.h
ni_mosaic/feature_stab/src/dbreg/dbstabsmooth.cpp
ni_mosaic/feature_stab/src/dbreg/dbstabsmooth.h
ni_mosaic/feature_stab/src/dbreg/targetver.h
ni_mosaic/feature_stab/src/dbreg/vp_motionmodel.c
ni_mosaic/feature_stab/src/dbreg/vp_motionmodel.h
ni_mosaic/feature_stab/src/dbregtest/PgmImage.cpp
ni_mosaic/feature_stab/src/dbregtest/PgmImage.h
ni_mosaic/feature_stab/src/dbregtest/dbregtest.cpp
ni_mosaic/feature_stab/src/dbregtest/stdafx.cpp
ni_mosaic/feature_stab/src/dbregtest/stdafx.h
ni_mosaic/feature_stab/src/dbregtest/targetver.h
rc/com/android/camera/ActivityBase.java
rc/com/android/camera/CameraActivity.java
rc/com/android/camera/CameraBackupAgent.java
rc/com/android/camera/CameraButtonIntentReceiver.java
rc/com/android/camera/CameraDisabledException.java
rc/com/android/camera/CameraErrorCallback.java
rc/com/android/camera/CameraHardwareException.java
rc/com/android/camera/CameraHolder.java
rc/com/android/camera/CameraManager.java
rc/com/android/camera/CameraModule.java
rc/com/android/camera/CameraPreference.java
rc/com/android/camera/CameraScreenNail.java
rc/com/android/camera/CameraSettings.java
rc/com/android/camera/CaptureAnimManager.java
rc/com/android/camera/ComboPreferences.java
rc/com/android/camera/CountDownTimerPreference.java
rc/com/android/camera/DisableCameraReceiver.java
rc/com/android/camera/EffectsRecorder.java
rc/com/android/camera/Exif.java
rc/com/android/camera/FocusOverlayManager.java
rc/com/android/camera/IconListPreference.java
rc/com/android/camera/IntArray.java
rc/com/android/camera/ListPreference.java
rc/com/android/camera/LocationManager.java
rc/com/android/camera/MediaSaver.java
rc/com/android/camera/Mosaic.java
rc/com/android/camera/MosaicFrameProcessor.java
rc/com/android/camera/MosaicPreviewRenderer.java
rc/com/android/camera/MosaicRenderer.java
rc/com/android/camera/OnClickAttr.java
rc/com/android/camera/OnScreenHint.java
rc/com/android/camera/PanoProgressBar.java
rc/com/android/camera/PanoUtil.java
rc/com/android/camera/PanoramaModule.java
rc/com/android/camera/PhotoController.java
rc/com/android/camera/PhotoModule.java
rc/com/android/camera/PieController.java
rc/com/android/camera/PreferenceGroup.java
rc/com/android/camera/PreferenceInflater.java
rc/com/android/camera/PreviewFrameLayout.java
rc/com/android/camera/PreviewGestures.java
rc/com/android/camera/ProxyLauncher.java
rc/com/android/camera/RecordLocationPreference.java
rc/com/android/camera/RotateDialogController.java
rc/com/android/camera/SecureCameraActivity.java
rc/com/android/camera/ShutterButton.java
rc/com/android/camera/SoundClips.java
rc/com/android/camera/StaticBitmapScreenNail.java
rc/com/android/camera/Storage.java
rc/com/android/camera/SwitchAnimManager.java
rc/com/android/camera/Thumbnail.java
rc/com/android/camera/Util.java
rc/com/android/camera/VideoController.java
rc/com/android/camera/VideoModule.java
rc/com/android/camera/drawable/TextDrawable.java
rc/com/android/camera/ui/AbstractSettingPopup.java
rc/com/android/camera/ui/CameraSwitcher.java
rc/com/android/camera/ui/CheckedLinearLayout.java
rc/com/android/camera/ui/CountDownView.java
rc/com/android/camera/ui/EffectSettingPopup.java
rc/com/android/camera/ui/ExpandedGridView.java
rc/com/android/camera/ui/FaceView.java
rc/com/android/camera/ui/FocusIndicator.java
rc/com/android/camera/ui/InLineSettingCheckBox.java
rc/com/android/camera/ui/InLineSettingItem.java
rc/com/android/camera/ui/InLineSettingMenu.java
rc/com/android/camera/ui/LayoutChangeHelper.java
rc/com/android/camera/ui/LayoutChangeNotifier.java
rc/com/android/camera/ui/LayoutNotifyView.java
rc/com/android/camera/ui/ListPrefSettingPopup.java
rc/com/android/camera/ui/MoreSettingPopup.java
rc/com/android/camera/ui/OnIndicatorEventListener.java
rc/com/android/camera/ui/OverlayRenderer.java
rc/com/android/camera/ui/PieItem.java
rc/com/android/camera/ui/PieRenderer.java
rc/com/android/camera/ui/PopupManager.java
rc/com/android/camera/ui/PreviewSurfaceView.java
rc/com/android/camera/ui/RenderOverlay.java
rc/com/android/camera/ui/Rotatable.java
rc/com/android/camera/ui/RotateImageView.java
rc/com/android/camera/ui/RotateLayout.java
rc/com/android/camera/ui/RotateTextToast.java
rc/com/android/camera/ui/Switch.java
rc/com/android/camera/ui/TimeIntervalPopup.java
rc/com/android/camera/ui/TimerSettingPopup.java
rc/com/android/camera/ui/TwoStateImageView.java
rc/com/android/camera/ui/ZoomRenderer.java
|
58929f1d7cf8bb55d0e50e53a13f32799c22d7b4 |
29-Jan-2013 |
The Android Automerger <android-build@android.com> |
merge in jb-mr2-release history after reset to master
|
70026962c4cda2d580c948227569a44795acfdac |
29-Jan-2013 |
John Reck <jreck@google.com> |
am d0f8807c: Merge "Launching gallery shows browse ui on canvas" into gb-ub-photos-bryce # Via Android (Google) Code Review (1) and John Reck (1) * commit 'd0f8807ca66b006e4049e32ad187a808c42e1f00': Launching gallery shows browse ui on canvas
|
d0f8807ca66b006e4049e32ad187a808c42e1f00 |
29-Jan-2013 |
John Reck <jreck@google.com> |
Merge "Launching gallery shows browse ui on canvas" into gb-ub-photos-bryce
|
c58d88b469fd345df9bdbff0c147d91caa9959b5 |
29-Jan-2013 |
John Reck <jreck@google.com> |
Merge "Launching gallery shows browse ui on canvas" into gb-ub-photos-bryce
|
af4fde8a83688896bdd94c58377559b7c1edda71 |
29-Jan-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 2251adcd: Merge "Fixed BasicEditor NPE." into gb-ub-photos-bryce # Via Android (Google) Code Review (1) and Ruben Brunk (1) * commit '2251adcd841d597eb6673fc6d2810979753ceb73': Fixed BasicEditor NPE.
|
2251adcd841d597eb6673fc6d2810979753ceb73 |
29-Jan-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Fixed BasicEditor NPE." into gb-ub-photos-bryce
|
407d60623860a53780a53edac81f39193da44126 |
29-Jan-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Fixed BasicEditor NPE." into gb-ub-photos-bryce
|
6abd303fd0e0f0ab83b8139b2f8ebbb8ce66e1bf |
29-Jan-2013 |
Bobby Georgescu <georgescu@google.com> |
am 7805371b: Merge "Fix ANRs due to waiting for IO on UI thread" into gb-ub-photos-bryce # Via Android (Google) Code Review (1) and Bobby Georgescu (1) * commit '7805371bbe17bca129bfd1902f23227b27312854': Fix ANRs due to waiting for IO on UI thread
|
7805371bbe17bca129bfd1902f23227b27312854 |
29-Jan-2013 |
Bobby Georgescu <georgescu@google.com> |
Merge "Fix ANRs due to waiting for IO on UI thread" into gb-ub-photos-bryce
|
5a1fcd84b353eda4c283c04cb656a51e6069bec7 |
29-Jan-2013 |
Bobby Georgescu <georgescu@google.com> |
Merge "Fix ANRs due to waiting for IO on UI thread" into gb-ub-photos-bryce
|
49bed8b56e5fba8b46ab6898b358f59f7bcf4275 |
29-Jan-2013 |
nicolasroard <nicolasroard@google.com> |
am 3a67b242: Fix apply geometry. # Via nicolasroard * commit '3a67b242889f81d3a124de7a9763a6ca72bc5194': Fix apply geometry.
|
8ede9d4ee1d5d8f06bd6a3e9790643994e5ae91e |
29-Jan-2013 |
nicolasroard <nicolasroard@google.com> |
Fix apply geometry. bug:8068166 Change-Id: I3cfa44dda1af1fbd5455db6027d793b5a44dd5d8
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
|
3a67b242889f81d3a124de7a9763a6ca72bc5194 |
29-Jan-2013 |
nicolasroard <nicolasroard@google.com> |
Fix apply geometry. bug:8068166 Change-Id: I3cfa44dda1af1fbd5455db6027d793b5a44dd5d8
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
rc/com/android/gallery3d/filtershow/tools/SaveCopyTask.java
|
18a4ceb563def1f20d2cefb7a87e2f1f9a061a82 |
29-Jan-2013 |
nicolasroard <nicolasroard@google.com> |
Fix apply geometry. bug:8068166 Change-Id: I3cfa44dda1af1fbd5455db6027d793b5a44dd5d8
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
rc/com/android/gallery3d/filtershow/tools/SaveCopyTask.java
|
10dbc7c56452f19fc3f9e54d9d060feea1e6767a |
29-Jan-2013 |
John Reck <jreck@google.com> |
Launching gallery shows browse ui on canvas Change-Id: I3a5e63ce354ac8e3f3c60e4dc86cfa4432026622
rc/com/android/gallery3d/app/Gallery.java
rc/com/android/gallery3d/provider/CanvasProvider.java
|
76778f6aa46928263df4a39bd717aada9a5cde1a |
29-Jan-2013 |
John Reck <jreck@google.com> |
Launching gallery shows browse ui on canvas Change-Id: I3a5e63ce354ac8e3f3c60e4dc86cfa4432026622
rc/com/android/gallery3d/app/Gallery.java
rc/com/android/gallery3d/provider/CanvasProvider.java
|
e30ec70e8d4064b1c2da824aae5cf3d11c86cc5e |
29-Jan-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Fixed BasicEditor NPE. Bug: 8068020 Change-Id: I81df163d9779ae3e246f4e337b64dfbc32ce7db5
rc/com/android/gallery3d/filtershow/editors/BasicEditor.java
|
4906a4d1f5167b4911627e692aef82e486eeea5a |
29-Jan-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Fixed BasicEditor NPE. Bug: 8068020 Change-Id: I81df163d9779ae3e246f4e337b64dfbc32ce7db5
rc/com/android/gallery3d/filtershow/editors/BasicEditor.java
|
d00f521a3138a8f244c91748b0277290edbf61f6 |
29-Jan-2013 |
Bobby Georgescu <georgescu@google.com> |
Fix ANRs due to waiting for IO on UI thread Bug: 7998915 Change-Id: I938145a7072170f713099a04578f98951b35cbab
rc/com/android/gallery3d/app/AbstractGalleryActivity.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/ui/MenuExecutor.java
|
248c7e912dbddaeeeec52e4602a319976d24dddb |
29-Jan-2013 |
Bobby Georgescu <georgescu@google.com> |
Fix ANRs due to waiting for IO on UI thread Bug: 7998915 Change-Id: I938145a7072170f713099a04578f98951b35cbab
rc/com/android/gallery3d/app/AbstractGalleryActivity.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/ui/MenuExecutor.java
|
2b03c56f870d6832775775613a6cd7bdcf2e0bee |
28-Jan-2013 |
John Reck <jreck@google.com> |
am ca593b02: Code drop # Via John Reck * commit 'ca593b02ab6a3054f625878621ee5117953f7385': Code drop
|
d61434151ca06924a8a0dbac0217fe8ce7101c47 |
28-Jan-2013 |
John Reck <jreck@google.com> |
Code drop Change-Id: Ibee7c3a1aed61dbe9d3d62ad7f3d3653994c8ef8
ndroidManifest.xml
|
bc4583285cc6e0975f28ba6287e20ed7cd1b6514 |
28-Jan-2013 |
John Reck <jreck@google.com> |
Code drop Change-Id: Ibee7c3a1aed61dbe9d3d62ad7f3d3653994c8ef8
es/xml/canvas_info.xml
|
ca593b02ab6a3054f625878621ee5117953f7385 |
28-Jan-2013 |
John Reck <jreck@google.com> |
Code drop Change-Id: Ibee7c3a1aed61dbe9d3d62ad7f3d3653994c8ef8
ndroidManifest.xml
es/xml/canvas_info.xml
rc/com/android/gallery3d/provider/CanvasProvider.java
rc/com/google/android/canvas/data/Cluster.java
rc/com/google/android/canvas/data/util/UriUtils.java
rc/com/google/android/canvas/provider/CanvasContract.java
|
07e9353082b6b0d41c8ec33efa9aa6e8c2633202 |
28-Jan-2013 |
John Reck <jreck@google.com> |
Code drop Change-Id: Ibee7c3a1aed61dbe9d3d62ad7f3d3653994c8ef8
rc/com/android/gallery3d/provider/CanvasProvider.java
rc/com/google/android/canvas/data/Cluster.java
rc/com/google/android/canvas/data/util/UriUtils.java
rc/com/google/android/canvas/provider/CanvasContract.java
|
a3a8d0c67e3c1873f47466ab5ed4e55a753ebe58 |
28-Jan-2013 |
Baligh Uddin <baligh@google.com> |
am c1bbc208: (-s ours) Import translations. DO NOT MERGE # Via Baligh Uddin * commit 'c1bbc208d1bc3541ca7ae6816de244fe7cec865c': Import translations. DO NOT MERGE
|
6e47cb7d552c8c5366e9cf0897548f2ba15bc63c |
28-Jan-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I9d2f2471d62cbfdd11c9d3e6d9107fbc46fad3dd Auto-generated-cl: translation import
es/values-sw/strings.xml
|
c1bbc208d1bc3541ca7ae6816de244fe7cec865c |
28-Jan-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I9d2f2471d62cbfdd11c9d3e6d9107fbc46fad3dd Auto-generated-cl: translation import
es/values-sw/strings.xml
|
299ca10b03032a4881b23e0eba8587ca7af77c96 |
24-Jan-2013 |
The Android Automerger <android-build@android.com> |
merge in jb-mr2-release history after reset to master
|
f6813d02f159f925c6b4c5ab1fb17875ab5c4f94 |
23-Jan-2013 |
Baligh Uddin <baligh@google.com> |
am 0f19e0af: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce # Via Android (Google) Code Review (1) and Baligh Uddin (1) * commit '0f19e0af5bffb88436912a1028f6dd8851f4e511': Import translations. DO NOT MERGE
|
58773d9fc9d6c2f715c8aff5317a110847220ef7 |
23-Jan-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE"
|
0f19e0af5bffb88436912a1028f6dd8851f4e511 |
23-Jan-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
|
ef91f3e32364c6cc0c397a8ce251bef885207c73 |
23-Jan-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Id21114e4e1d6fe10171bf094fe3031ccbef1cb52 Auto-generated-cl: translation import
es/values-ms/strings.xml
es/values-pt/strings.xml
es/values-zh-rCN/strings.xml
|
b88c91a09576f2ee54f431605aff8a4933a248f7 |
23-Jan-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Id76648ccbbb45ea8d7ab7a759cd07bce5feb35ca Auto-generated-cl: translation import
es/values-ms/strings.xml
es/values-pt/strings.xml
es/values-zh-rCN/strings.xml
|
a5a96ece765afafa4968cc36003ed57ff78756ce |
23-Jan-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Id76648ccbbb45ea8d7ab7a759cd07bce5feb35ca Auto-generated-cl: translation import
es/values-ms/strings.xml
es/values-pt/strings.xml
es/values-zh-rCN/strings.xml
|
7dbf8c8c722e1d62bae86989b79a5ab674c8658c |
23-Jan-2013 |
Stephen Hines <srhines@google.com> |
am 24063430: Revert "Switch Gallery over to RS compatibility library." * commit '240634303ac2368ab0faa19a8f8f4687cac5fc1e': Revert "Switch Gallery over to RS compatibility library."
|
ac416c5a2af322039b07a76f90351f584c7f380f |
23-Jan-2013 |
Stephen Hines <srhines@google.com> |
Revert "Switch Gallery over to RS compatibility library." This reverts commit 0746ce0977cde616d25ce35fee0d8d554235a21c Change-Id: Ic0fb6c60e5f40b53ad032afeafe2f9ff70c26b50
roguard.flags
|
dbbdb5c63405771a76c168ef569b7a789b3b9d73 |
23-Jan-2013 |
Stephen Hines <srhines@google.com> |
Revert "Switch Gallery over to RS compatibility library." This reverts commit 0746ce0977cde616d25ce35fee0d8d554235a21c Change-Id: Ic0fb6c60e5f40b53ad032afeafe2f9ff70c26b50
ndroid.mk
|
c2caaf8053376dbe0253dcd3d85873decce7fab6 |
23-Jan-2013 |
Stephen Hines <srhines@google.com> |
Revert "Switch Gallery over to RS compatibility library." This reverts commit 0746ce0977cde616d25ce35fee0d8d554235a21c Change-Id: Ic0fb6c60e5f40b53ad032afeafe2f9ff70c26b50
rc/com/android/gallery3d/filtershow/cache/FilteringPipeline.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterRS.java
|
240634303ac2368ab0faa19a8f8f4687cac5fc1e |
23-Jan-2013 |
Stephen Hines <srhines@google.com> |
Revert "Switch Gallery over to RS compatibility library." This reverts commit 0746ce0977cde616d25ce35fee0d8d554235a21c Change-Id: Ic0fb6c60e5f40b53ad032afeafe2f9ff70c26b50
ndroid.mk
roguard.flags
rc/com/android/gallery3d/filtershow/cache/FilteringPipeline.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterRS.java
|
9ef2786180596b2a40954ebaf7cba71b4d64215e |
23-Jan-2013 |
Stephen Hines <srhines@google.com> |
am 0746ce09: Switch Gallery over to RS compatibility library. * commit '0746ce0977cde616d25ce35fee0d8d554235a21c': Switch Gallery over to RS compatibility library.
|
b59bcd8d999180cd49c74aa0848167f3a24d3e8d |
23-Jan-2013 |
The Android Automerger <android-build@android.com> |
merge in jb-mr2-release history after reset to master
|
dc3efa9ea22dba0aef5acc9c28b4d782a8e74236 |
17-Jan-2013 |
Stephen Hines <srhines@google.com> |
Switch Gallery over to RS compatibility library. Change-Id: If6eaea15a12a1448b402fb00dfd770b3749471ad
roguard.flags
|
981d661739acfef1b55558a4b8631a144881b8d5 |
17-Jan-2013 |
Stephen Hines <srhines@google.com> |
Switch Gallery over to RS compatibility library. Change-Id: If6eaea15a12a1448b402fb00dfd770b3749471ad
ndroid.mk
|
c1a6a49b4364b5b3bd54c8c2dca377b8791a8172 |
17-Jan-2013 |
Stephen Hines <srhines@google.com> |
Switch Gallery over to RS compatibility library. Change-Id: If6eaea15a12a1448b402fb00dfd770b3749471ad
rc/com/android/gallery3d/filtershow/cache/FilteringPipeline.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterRS.java
|
0746ce0977cde616d25ce35fee0d8d554235a21c |
17-Jan-2013 |
Stephen Hines <srhines@google.com> |
Switch Gallery over to RS compatibility library. Change-Id: If6eaea15a12a1448b402fb00dfd770b3749471ad
ndroid.mk
roguard.flags
rc/com/android/gallery3d/filtershow/cache/FilteringPipeline.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterRS.java
|
6cde6b41de43ae98a89b7a8e0b4296e8c4ce116e |
23-Jan-2013 |
Baligh Uddin <baligh@google.com> |
am b49e4804: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce * commit 'b49e480479c71ed1906ee00423e8c44c7224da91': Import translations. DO NOT MERGE
|
f30a30360b89f513107f20db2de0153f152f221b |
23-Jan-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE"
|
86a37fbefa8698f24137b275d71c69383b59d92e |
23-Jan-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
|
b49e480479c71ed1906ee00423e8c44c7224da91 |
23-Jan-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
|
40f52915cf13304b99972479936f8e3471d93ba4 |
23-Jan-2013 |
nicolasroard <nicolasroard@google.com> |
am 57eedfd9: Better caching for RS filters * commit '57eedfd99676913f575b1f76e3a874026d1ddf7c': Better caching for RS filters
|
87463e150b1f52086ecf7d597636ba83e7f93b8f |
16-Jan-2013 |
nicolasroard <nicolasroard@google.com> |
Better caching for RS filters Change-Id: I78eaa90e408059cf1c59fc06920f5aef82ae2c0d
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/PanelController.java
rc/com/android/gallery3d/filtershow/cache/DelayedPresetCache.java
rc/com/android/gallery3d/filtershow/cache/DirectPresetCache.java
rc/com/android/gallery3d/filtershow/cache/FilteringPipeline.java
rc/com/android/gallery3d/filtershow/cache/ImageLoader.java
rc/com/android/gallery3d/filtershow/cache/TripleBufferBitmap.java
rc/com/android/gallery3d/filtershow/filters/ImageFilter.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterRS.java
rc/com/android/gallery3d/filtershow/imageshow/ImageGeometry.java
rc/com/android/gallery3d/filtershow/imageshow/ImageShow.java
rc/com/android/gallery3d/filtershow/imageshow/ImageZoom.java
rc/com/android/gallery3d/filtershow/imageshow/MasterImage.java
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
|
0ad0346bfcff782759aaaadfd46bd0cfd9ef9f2c |
16-Jan-2013 |
nicolasroard <nicolasroard@google.com> |
Better caching for RS filters Change-Id: I78eaa90e408059cf1c59fc06920f5aef82ae2c0d
rc/com/android/gallery3d/filtershow/cache/DelayedPresetCache.java
rc/com/android/gallery3d/filtershow/cache/DirectPresetCache.java
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
|
57eedfd99676913f575b1f76e3a874026d1ddf7c |
16-Jan-2013 |
nicolasroard <nicolasroard@google.com> |
Better caching for RS filters Change-Id: I78eaa90e408059cf1c59fc06920f5aef82ae2c0d
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/PanelController.java
rc/com/android/gallery3d/filtershow/cache/DelayedPresetCache.java
rc/com/android/gallery3d/filtershow/cache/DirectPresetCache.java
rc/com/android/gallery3d/filtershow/cache/FilteringPipeline.java
rc/com/android/gallery3d/filtershow/cache/ImageLoader.java
rc/com/android/gallery3d/filtershow/cache/TripleBufferBitmap.java
rc/com/android/gallery3d/filtershow/filters/ImageFilter.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterRS.java
rc/com/android/gallery3d/filtershow/imageshow/ImageGeometry.java
rc/com/android/gallery3d/filtershow/imageshow/ImageShow.java
rc/com/android/gallery3d/filtershow/imageshow/ImageZoom.java
rc/com/android/gallery3d/filtershow/imageshow/MasterImage.java
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
|
f6eb1a6900efcfc800567a9f3c44a59c76a0d157 |
22-Jan-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ie9461e3c4beb1404f2421bb7ce10131e9f4cb907 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
f68f3428da323442accd29baafd78a0b53b72df8 |
22-Jan-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I8a59ba2c18264af55063a5c3bf5ba6b7edec00cc Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
219b771ded8c317d314d7ede50fbe8c469e32efb |
22-Jan-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I8a59ba2c18264af55063a5c3bf5ba6b7edec00cc Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
80192b63022128fba83c7027796f6cab84c6b13d |
21-Jan-2013 |
The Android Automerger <android-build@android.com> |
merge in jb-mr2-release history after reset to master
|
302968d8d103fef6aab19f23d0dd9835766a025a |
19-Jan-2013 |
John Reck <jreck@google.com> |
am 191ed025: Merge "Tweaks for canvas" into gb-ub-photos-bryce * commit '191ed02506583bab787adb9baef60f50f7661b3a': Tweaks for canvas
|
fd2c62cbf84fcdaa3280327fd02f4372b3118338 |
19-Jan-2013 |
John Reck <jreck@google.com> |
Merge "Tweaks for canvas" into gb-ub-photos-bryce
|
c9a9b3ad3ea46d11cb367221149cc515540d6688 |
19-Jan-2013 |
John Reck <jreck@google.com> |
Merge "Tweaks for canvas" into gb-ub-photos-bryce
|
191ed02506583bab787adb9baef60f50f7661b3a |
19-Jan-2013 |
John Reck <jreck@google.com> |
Merge "Tweaks for canvas" into gb-ub-photos-bryce
|
741b5b3db422ef3a8ce58c9ae0c6d614ee508e49 |
19-Jan-2013 |
John Hoford <hoford@google.com> |
am 9c00ee21: Merge "refactor the filter/editor relationship" into gb-ub-photos-bryce * commit '9c00ee2117b103e159d5f58f8d1e31b3db5a205d': refactor the filter/editor relationship
|
76595d7ee48d63ca5c1766239f822a0c6dbcdc6f |
19-Jan-2013 |
John Reck <jreck@google.com> |
Tweaks for canvas Change-Id: I9aecf757047f93159212441e5317ef2b3b304a70
rc/com/android/gallery3d/app/Gallery.java
rc/com/android/gallery3d/app/MovieActivity.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/data/MediaSet.java
|
688e0d2ffd2f93bbe1a818fb47314eb68e9daf04 |
19-Jan-2013 |
John Reck <jreck@google.com> |
Tweaks for canvas Change-Id: I9aecf757047f93159212441e5317ef2b3b304a70
es/values-notouch-v14/styles.xml
|
4ea5c27007e38fa8583add4bacf268ba67b9f0ad |
19-Jan-2013 |
John Reck <jreck@google.com> |
Tweaks for canvas Change-Id: I9aecf757047f93159212441e5317ef2b3b304a70
es/values-notouch-v14/styles.xml
rc/com/android/gallery3d/app/Gallery.java
rc/com/android/gallery3d/app/MovieActivity.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/data/MediaSet.java
|
c3c50454ce201ffc8fdbbcf383cb5caa1255dc37 |
19-Jan-2013 |
John Hoford <hoford@google.com> |
Merge "refactor the filter/editor relationship" into gb-ub-photos-bryce
|
9c00ee2117b103e159d5f58f8d1e31b3db5a205d |
19-Jan-2013 |
John Hoford <hoford@google.com> |
Merge "refactor the filter/editor relationship" into gb-ub-photos-bryce
|
1fed636a3307d670984053777fc28d170f245d3c |
18-Jan-2013 |
John Hoford <hoford@google.com> |
refactor the filter/editor relationship Change-Id: I1f9a735166c28c65734fbb85201774fb6f664076
es/layout/filtershow_activity.xml
es/layout/filtershow_default_editor.xml
es/values/filtershow_ids.xml
|
0cd4c8706f242f7a5d625e5b88509fc646859807 |
18-Jan-2013 |
John Hoford <hoford@google.com> |
refactor the filter/editor relationship Change-Id: I1f9a735166c28c65734fbb85201774fb6f664076
rc/com/android/gallery3d/filtershow/EditorPlaceHolder.java
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/PanelController.java
rc/com/android/gallery3d/filtershow/editors/BasicEditor.java
rc/com/android/gallery3d/filtershow/editors/Editor.java
rc/com/android/gallery3d/filtershow/editors/EditorCurves.java
rc/com/android/gallery3d/filtershow/editors/EditorZoom.java
rc/com/android/gallery3d/filtershow/filters/ImageFilter.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterHue.java
rc/com/android/gallery3d/filtershow/imageshow/ImageDraw.java
rc/com/android/gallery3d/filtershow/imageshow/ImageShow.java
rc/com/android/gallery3d/filtershow/imageshow/MasterImage.java
rc_pd/com/android/gallery3d/filtershow/editors/EditorManager.java
|
5aa08941bda0cfbcfba522c53937dd66867f890d |
18-Jan-2013 |
John Hoford <hoford@google.com> |
refactor the filter/editor relationship Change-Id: I1f9a735166c28c65734fbb85201774fb6f664076
es/layout/filtershow_activity.xml
es/layout/filtershow_default_editor.xml
es/values/filtershow_ids.xml
rc/com/android/gallery3d/filtershow/EditorPlaceHolder.java
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/PanelController.java
rc/com/android/gallery3d/filtershow/editors/BasicEditor.java
rc/com/android/gallery3d/filtershow/editors/Editor.java
rc/com/android/gallery3d/filtershow/editors/EditorCurves.java
rc/com/android/gallery3d/filtershow/editors/EditorZoom.java
rc/com/android/gallery3d/filtershow/filters/ImageFilter.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterHue.java
rc/com/android/gallery3d/filtershow/imageshow/ImageDraw.java
rc/com/android/gallery3d/filtershow/imageshow/ImageShow.java
rc/com/android/gallery3d/filtershow/imageshow/MasterImage.java
rc_pd/com/android/gallery3d/filtershow/editors/EditorManager.java
|
04175b8d33a07842fff4b01e435a51b9aed2cacd |
18-Jan-2013 |
Bobby Georgescu <georgescu@google.com> |
am 5a1adfcb: Fix importer crashes on unplug during scrolling * commit '5a1adfcb2d9a6a7402989d152dd3443f48c321dd': Fix importer crashes on unplug during scrolling
|
2f557640030af99c3aaf650dc7d7957f1a18c6e7 |
18-Jan-2013 |
Bobby Georgescu <georgescu@google.com> |
Fix importer crashes on unplug during scrolling Bug: 8035040 Change-Id: If822b15f2210e2af42c8a38f6ac2acb25d535aa9
rc/com/android/gallery3d/ingest/ui/MtpBitmapCache.java
|
5a1adfcb2d9a6a7402989d152dd3443f48c321dd |
18-Jan-2013 |
Bobby Georgescu <georgescu@google.com> |
Fix importer crashes on unplug during scrolling Bug: 8035040 Change-Id: If822b15f2210e2af42c8a38f6ac2acb25d535aa9
rc/com/android/gallery3d/ingest/ui/MtpBitmapCache.java
|
ee22ee33d98dca0f482ba0e57bd7058fd2042bca |
18-Jan-2013 |
The Android Automerger <android-build@android.com> |
merge in jb-mr2-release history after reset to master
|
ff0b3edf196b03198cd7ce8c805bebf715fa7672 |
18-Jan-2013 |
Bobby Georgescu <georgescu@google.com> |
am eebf9e81: Fix importer crashes when unplugging during indexing * commit 'eebf9e81673150a6c4fec89b64e3cdb595377c83': Fix importer crashes when unplugging during indexing
|
2427d5b7957286fc99a4c6fca6b5904b4caf99d8 |
18-Jan-2013 |
Bobby Georgescu <georgescu@google.com> |
am 48e37632: Merge "Show status in importer for empty or no device" into gb-ub-photos-bryce * commit '48e376325d812fdbdcee569b48641cd4073e4973': Show status in importer for empty or no device
|
6c95a5c97615593181365d8f320e733eb2df54e0 |
17-Jan-2013 |
Bobby Georgescu <georgescu@google.com> |
Fix importer crashes when unplugging during indexing Bug: 8027984 Slightly refactored the indexing step to encapsulate all of the indexing work within the runnable that does it and to correctly handle the cases where the device is unplugged in the middle of the indexing. Change-Id: I338657bbbedd6b82d012f65cd1ea28e0afd890c2
rc/com/android/gallery3d/ingest/MtpDeviceIndex.java
|
eebf9e81673150a6c4fec89b64e3cdb595377c83 |
17-Jan-2013 |
Bobby Georgescu <georgescu@google.com> |
Fix importer crashes when unplugging during indexing Bug: 8027984 Slightly refactored the indexing step to encapsulate all of the indexing work within the runnable that does it and to correctly handle the cases where the device is unplugged in the middle of the indexing. Change-Id: I338657bbbedd6b82d012f65cd1ea28e0afd890c2
rc/com/android/gallery3d/ingest/MtpDeviceIndex.java
|
49c16ca6c335c053d923cdd8a101cef77178f307 |
18-Jan-2013 |
Bobby Georgescu <georgescu@google.com> |
Merge "Show status in importer for empty or no device" into gb-ub-photos-bryce
|
48e376325d812fdbdcee569b48641cd4073e4973 |
18-Jan-2013 |
Bobby Georgescu <georgescu@google.com> |
Merge "Show status in importer for empty or no device" into gb-ub-photos-bryce
|
188a7505a3e864fe19684ccf174978b89f42ae65 |
17-Jan-2013 |
Bobby Georgescu <georgescu@google.com> |
Show status in importer for empty or no device Bug: 8000251 Change-Id: Iefbbe6df59f432ffeb10ac9fa846a8908584ab58
rc/com/android/gallery3d/ingest/IngestActivity.java
rc/com/android/gallery3d/ingest/MtpDeviceIndex.java
rc/com/android/gallery3d/ingest/adapter/MtpAdapter.java
|
5d58a2f36675aa43ec20308f9da146506d1a8f70 |
17-Jan-2013 |
Bobby Georgescu <georgescu@google.com> |
Show status in importer for empty or no device Bug: 8000251 Change-Id: Iefbbe6df59f432ffeb10ac9fa846a8908584ab58
es/layout/ingest_activity_item_list.xml
es/values/strings.xml
|
6516d271e11f9ae9928be3bb70c99531a842c577 |
17-Jan-2013 |
Bobby Georgescu <georgescu@google.com> |
Show status in importer for empty or no device Bug: 8000251 Change-Id: Iefbbe6df59f432ffeb10ac9fa846a8908584ab58
es/layout/ingest_activity_item_list.xml
es/values/strings.xml
rc/com/android/gallery3d/ingest/IngestActivity.java
rc/com/android/gallery3d/ingest/MtpDeviceIndex.java
rc/com/android/gallery3d/ingest/adapter/MtpAdapter.java
|
210de3e34d9e1140458080e176c02e75fd573468 |
17-Jan-2013 |
Baligh Uddin <baligh@google.com> |
am bb4ae131: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce * commit 'bb4ae131edc0b1b2bedd82785a40f682e646170b': Import translations. DO NOT MERGE
|
bffd9d318fca43983bd3df59b25932b0b183208a |
17-Jan-2013 |
Baligh Uddin <baligh@google.com> |
am 497ef949: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce * commit '497ef94976db4326d7844dccf0f4a6d179a6283a': Import translations. DO NOT MERGE
|
edb4158fe6c190a102ac51ebed11c3fcd1c3ef30 |
17-Jan-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
|
bb4ae131edc0b1b2bedd82785a40f682e646170b |
17-Jan-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
|
e01c8d853bd21b7d85c620568eb977323d2fa221 |
17-Jan-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE"
|
ac7168d85a9d0027e71f264335b3acad37f17ff8 |
17-Jan-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE"
|
497ef94976db4326d7844dccf0f4a6d179a6283a |
17-Jan-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
|
c3bae86f69c15701cf319925572083785bb3cf0c |
17-Jan-2013 |
The Android Automerger <android-build@android.com> |
merge in jb-mr2-release history after reset to master
|
bc383205980979b2a2ea2d85a838a6e339154086 |
17-Jan-2013 |
John Reck <jreck@google.com> |
am b1cabf78: Merge "New loading model" into gb-ub-photos-bryce * commit 'b1cabf78e719ef8c40dad44eee38b9884e8f9258': New loading model
|
cdbd61532909eb2168c74b6a9d0e0aa5b95c0274 |
17-Jan-2013 |
John Reck <jreck@google.com> |
Merge "New loading model" into gb-ub-photos-bryce
|
b1cabf78e719ef8c40dad44eee38b9884e8f9258 |
17-Jan-2013 |
John Reck <jreck@google.com> |
Merge "New loading model" into gb-ub-photos-bryce
|
9686d9d07e344fae2f2310ca544e5401b5e11d30 |
16-Jan-2013 |
John Reck <jreck@google.com> |
New loading model Rename reload() to loadIfDirty() loadIfDirty is implemented by MediaSet and is final loadIfDirty is now blocking instead of async Subclasses must implement two protected methods, isDirtyLocked() and load() The change from async reload() to sync loadIfDirty() should be fine since all users of reload() were doing so from a background thread already, and the longest load() is PicasaAlbumSet which is still a fairly brisk 40ms or so Change-Id: If5cc596a1c13e52e5f4efff1a144bd086d37cfb7
rc/com/android/gallery3d/app/AlbumDataLoader.java
rc/com/android/gallery3d/app/AlbumSetDataLoader.java
rc/com/android/gallery3d/app/PhotoDataAdapter.java
rc/com/android/gallery3d/app/SlideshowPage.java
rc/com/android/gallery3d/data/ClusterAlbum.java
rc/com/android/gallery3d/data/ClusterAlbumSet.java
rc/com/android/gallery3d/data/ComboAlbum.java
rc/com/android/gallery3d/data/ComboAlbumSet.java
rc/com/android/gallery3d/data/FilterDeleteSet.java
rc/com/android/gallery3d/data/FilterEmptyPromptSet.java
rc/com/android/gallery3d/data/FilterTypeSet.java
rc/com/android/gallery3d/data/LocalAlbum.java
rc/com/android/gallery3d/data/LocalAlbumSet.java
rc/com/android/gallery3d/data/LocalMergeAlbum.java
rc/com/android/gallery3d/data/MediaSet.java
rc/com/android/gallery3d/data/MediaSetWrapper.java
rc/com/android/gallery3d/data/SecureAlbum.java
rc/com/android/gallery3d/data/SingleItemAlbum.java
rc/com/android/gallery3d/data/SnailAlbum.java
rc/com/android/gallery3d/gadget/MediaSetSource.java
rc_pd/com/android/gallery3d/picasasource/PicasaSource.java
ests/src/com/android/gallery3d/data/LocalDataTest.java
ests/src/com/android/gallery3d/data/MockSet.java
ests/src/com/android/gallery3d/data/RealDataTest.java
|
f4f43e7dbc85ab8b7437e8f1d6ab0317470e70b6 |
16-Jan-2013 |
John Reck <jreck@google.com> |
New loading model Rename reload() to loadIfDirty() loadIfDirty is implemented by MediaSet and is final loadIfDirty is now blocking instead of async Subclasses must implement two protected methods, isDirtyLocked() and load() The change from async reload() to sync loadIfDirty() should be fine since all users of reload() were doing so from a background thread already, and the longest load() is PicasaAlbumSet which is still a fairly brisk 40ms or so Change-Id: If5cc596a1c13e52e5f4efff1a144bd086d37cfb7
rc/com/android/gallery3d/app/AlbumDataLoader.java
rc/com/android/gallery3d/app/AlbumSetDataLoader.java
rc/com/android/gallery3d/app/PhotoDataAdapter.java
rc/com/android/gallery3d/app/SlideshowPage.java
rc/com/android/gallery3d/data/ClusterAlbum.java
rc/com/android/gallery3d/data/ClusterAlbumSet.java
rc/com/android/gallery3d/data/ComboAlbum.java
rc/com/android/gallery3d/data/ComboAlbumSet.java
rc/com/android/gallery3d/data/FilterDeleteSet.java
rc/com/android/gallery3d/data/FilterEmptyPromptSet.java
rc/com/android/gallery3d/data/FilterTypeSet.java
rc/com/android/gallery3d/data/LocalAlbum.java
rc/com/android/gallery3d/data/LocalAlbumSet.java
rc/com/android/gallery3d/data/LocalMergeAlbum.java
rc/com/android/gallery3d/data/MediaSet.java
rc/com/android/gallery3d/data/MediaSetWrapper.java
rc/com/android/gallery3d/data/SecureAlbum.java
rc/com/android/gallery3d/data/SingleItemAlbum.java
rc/com/android/gallery3d/data/SnailAlbum.java
rc/com/android/gallery3d/gadget/MediaSetSource.java
rc_pd/com/android/gallery3d/picasasource/PicasaSource.java
ests/src/com/android/gallery3d/data/LocalDataTest.java
ests/src/com/android/gallery3d/data/MockSet.java
ests/src/com/android/gallery3d/data/RealDataTest.java
|
ae10c1b98e68fee3e07f3be1865dfbb7177b1639 |
17-Jan-2013 |
Angus Kong <shkong@google.com> |
am 9874da2d: Add image/webp type to intent filter * commit '9874da2d750d7547b9bb5b1bbc6721b68133ab22': Add image/webp type to intent filter
|
eee54dd1b93b69cb01fc77f9a2676eecec9bea5d |
17-Jan-2013 |
Angus Kong <shkong@google.com> |
Add image/webp type to intent filter bug:8012543 Change-Id: I0ebd2941c5508d169855864165e93e2ea1dacf81
ndroidManifest.xml
|
9874da2d750d7547b9bb5b1bbc6721b68133ab22 |
17-Jan-2013 |
Angus Kong <shkong@google.com> |
Add image/webp type to intent filter bug:8012543 Change-Id: I0ebd2941c5508d169855864165e93e2ea1dacf81
ndroidManifest.xml
|
2a1480169c2fe936a79abe6a02d4970e9ee0a848 |
16-Jan-2013 |
Bobby Georgescu <georgescu@google.com> |
am e4130faa: Merge "Always have determinate progress in import notification" into gb-ub-photos-bryce * commit 'e4130faa8418fef36fc022891e0b215ce714f5d1': Always have determinate progress in import notification
|
01e4d3a4d112832d33409adf6f8e0c0ac09b7b1e |
16-Jan-2013 |
Bobby Georgescu <georgescu@google.com> |
Merge "Always have determinate progress in import notification" into gb-ub-photos-bryce
|
e4130faa8418fef36fc022891e0b215ce714f5d1 |
16-Jan-2013 |
Bobby Georgescu <georgescu@google.com> |
Merge "Always have determinate progress in import notification" into gb-ub-photos-bryce
|
dd8784f2a9dc18f8ce2951ef1edaf2e6e63d93b0 |
16-Jan-2013 |
Bobby Georgescu <georgescu@google.com> |
Always have determinate progress in import notification Bug: 7967520 Change-Id: Iaeb5f2e3d508d964856faaea63475cbc25e13c0d
rc/com/android/gallery3d/ingest/IngestService.java
|
a7a73f3f8ea26835c376f38e75bcef12a25cac26 |
16-Jan-2013 |
Bobby Georgescu <georgescu@google.com> |
Always have determinate progress in import notification Bug: 7967520 Change-Id: Iaeb5f2e3d508d964856faaea63475cbc25e13c0d
rc/com/android/gallery3d/ingest/IngestService.java
|
2e33d746d737136d01627df014e41d3d131a1232 |
16-Jan-2013 |
John Reck <jreck@google.com> |
am 48d4284a: Merge "Add a blocking load to MediaSet" into gb-ub-photos-bryce * commit '48d4284a9ce804ba00b22e587a8b3d27ef9928c1': Add a blocking load to MediaSet
|
9003bd581c00a31db4c8291c99a30d5e74fe2dde |
16-Jan-2013 |
John Reck <jreck@google.com> |
Merge "Add a blocking load to MediaSet" into gb-ub-photos-bryce
|
48d4284a9ce804ba00b22e587a8b3d27ef9928c1 |
16-Jan-2013 |
John Reck <jreck@google.com> |
Merge "Add a blocking load to MediaSet" into gb-ub-photos-bryce
|
e541bbbebcebc059a94bed94700f04c809b2124d |
16-Jan-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Fix exif data saving for picasa images. Bug: 7910836 Change-Id: I8ec1a1ab379c35b0602689a8f7850f5c861e0189
allerycommon/src/com/android/gallery3d/common/Utils.java
allerycommon/src/com/android/gallery3d/exif/ExifParser.java
rc/com/android/gallery3d/filtershow/cache/ImageLoader.java
rc/com/android/gallery3d/filtershow/tools/SaveCopyTask.java
|
d8559e9f0b21501113528bf21cf7c6041767d32c |
16-Jan-2013 |
Bobby Georgescu <georgescu@google.com> |
am f63e1f7a: Importer date tiles reflect language change * commit 'f63e1f7ab9a4f4a97909564cfc5975cbac66872f': Importer date tiles reflect language change
|
2c0396a28ebf8cad71d234a82add2afb763a68f4 |
16-Jan-2013 |
Bobby Georgescu <georgescu@google.com> |
Importer date tiles reflect language change Bug: 8020035 Change-Id: I1ac2a27ca7be088e6ad6f9b8c624c36e04ff03b0
rc/com/android/gallery3d/ingest/IngestActivity.java
rc/com/android/gallery3d/ingest/ui/DateTileView.java
|
f63e1f7ab9a4f4a97909564cfc5975cbac66872f |
16-Jan-2013 |
Bobby Georgescu <georgescu@google.com> |
Importer date tiles reflect language change Bug: 8020035 Change-Id: I1ac2a27ca7be088e6ad6f9b8c624c36e04ff03b0
rc/com/android/gallery3d/ingest/IngestActivity.java
rc/com/android/gallery3d/ingest/ui/DateTileView.java
|
57e9692dea4de8bd145f22090707ad898edc4a98 |
16-Jan-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I0b71c1c1470a29b67358d8998a6f41bfde12c219 Auto-generated-cl: translation import
es/values-sw/filtershow_strings.xml
|
4f5714f377e1227e623be803571f1cce826e4f13 |
16-Jan-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ic353210ead354b4da42c0f7500e7fed2a4cf174c Auto-generated-cl: translation import
es/values-sw/filtershow_strings.xml
|
d047502a9be1314b4e607d65596f247b3207e135 |
16-Jan-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ic353210ead354b4da42c0f7500e7fed2a4cf174c Auto-generated-cl: translation import
es/values-sw/filtershow_strings.xml
|
ec42951bf9456bb65b2cf520363498827b05c141 |
16-Jan-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I70a0b256ef0605ccd76731e9cb5898e27574086d Auto-generated-cl: translation import
es/values-sw/strings.xml
|
d7ef6fade35229a262dc00f9c8abdaaaf533b9a9 |
16-Jan-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Icf6bf3b0c6563577b4e33f41252f18923caed6c3 Auto-generated-cl: translation import
es/values-sw/strings.xml
|
d318ee354e5435b3bbc04665c1857b5ddbb5870e |
16-Jan-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Icf6bf3b0c6563577b4e33f41252f18923caed6c3 Auto-generated-cl: translation import
es/values-sw/strings.xml
|
8af0426fff43fee962d3c23b8885d453ad6c2f3c |
16-Jan-2013 |
John Reck <jreck@google.com> |
Add a blocking load to MediaSet Change-Id: I367975fd33f884fb7e576b7064c495bdb7a3ce7b
rc/com/android/gallery3d/data/ComboAlbumSet.java
rc/com/android/gallery3d/data/MediaSet.java
|
b0b369e84733d047419ca38c215e73ba7ea402f1 |
16-Jan-2013 |
John Reck <jreck@google.com> |
Add a blocking load to MediaSet Change-Id: I367975fd33f884fb7e576b7064c495bdb7a3ce7b
rc/com/android/gallery3d/data/ComboAlbumSet.java
rc/com/android/gallery3d/data/MediaSet.java
|
349d20eb754ac242fa2df126b0b4a04ba626ca25 |
16-Jan-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am aeb7d79d: Fix exif data saving for picasa images. * commit 'aeb7d79d2a35f534276bc6bf8128349f9768ae6b': Fix exif data saving for picasa images.
|
ec965b6ca57d3422e50bc1a476e0ff046f768ef5 |
16-Jan-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Fix exif data saving for picasa images. Bug: 7910836 Change-Id: I8ec1a1ab379c35b0602689a8f7850f5c861e0189
allerycommon/src/com/android/gallery3d/common/Utils.java
allerycommon/src/com/android/gallery3d/exif/ExifParser.java
|
29aeb6bc6ca5e750fad9ff1da351b25969513030 |
16-Jan-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Fix exif data saving for picasa images. Bug: 7910836 Change-Id: I8ec1a1ab379c35b0602689a8f7850f5c861e0189
allerycommon/src/com/android/gallery3d/common/Utils.java
allerycommon/src/com/android/gallery3d/exif/ExifParser.java
rc/com/android/gallery3d/filtershow/cache/ImageLoader.java
rc/com/android/gallery3d/filtershow/tools/SaveCopyTask.java
|
aeb7d79d2a35f534276bc6bf8128349f9768ae6b |
16-Jan-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Fix exif data saving for picasa images. Bug: 7910836 Change-Id: I8ec1a1ab379c35b0602689a8f7850f5c861e0189
allerycommon/src/com/android/gallery3d/common/Utils.java
allerycommon/src/com/android/gallery3d/exif/ExifParser.java
rc/com/android/gallery3d/filtershow/cache/ImageLoader.java
rc/com/android/gallery3d/filtershow/tools/SaveCopyTask.java
|
c690437606a9c8f736e9d0901ef17494b6b2071f |
16-Jan-2013 |
John Hoford <hoford@google.com> |
am 63a7dac0: refactoring imageshow * commit '63a7dac01d394523799939596b960cb03321798d': refactoring imageshow
|
c5209fbb8d4c691b35f5b58ea53639c070ba8c83 |
14-Jan-2013 |
John Hoford <hoford@google.com> |
refactoring imageshow Change-Id: I6d0872250b31a427ea6a3e46bd1c9ca5f3ba92ee
rc/com/android/gallery3d/filtershow/cache/DirectPresetCache.java
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
|
63a7dac01d394523799939596b960cb03321798d |
14-Jan-2013 |
John Hoford <hoford@google.com> |
refactoring imageshow Change-Id: I6d0872250b31a427ea6a3e46bd1c9ca5f3ba92ee
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/HistoryAdapter.java
rc/com/android/gallery3d/filtershow/PanelController.java
rc/com/android/gallery3d/filtershow/cache/DirectPresetCache.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterRS.java
rc/com/android/gallery3d/filtershow/imageshow/ImageDraw.java
rc/com/android/gallery3d/filtershow/imageshow/ImageGeometry.java
rc/com/android/gallery3d/filtershow/imageshow/ImageRedEyes.java
rc/com/android/gallery3d/filtershow/imageshow/ImageShow.java
rc/com/android/gallery3d/filtershow/imageshow/ImageSlave.java
rc/com/android/gallery3d/filtershow/imageshow/ImageTinyPlanet.java
rc/com/android/gallery3d/filtershow/imageshow/ImageZoom.java
rc/com/android/gallery3d/filtershow/imageshow/MasterImage.java
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
rc/com/android/gallery3d/filtershow/ui/FilterIconButton.java
rc/com/android/gallery3d/filtershow/ui/ImageCurves.java
|
de5d6c6a14c1250dc43c40f5b22cf6ff69362f17 |
14-Jan-2013 |
John Hoford <hoford@google.com> |
refactoring imageshow Change-Id: I6d0872250b31a427ea6a3e46bd1c9ca5f3ba92ee
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/HistoryAdapter.java
rc/com/android/gallery3d/filtershow/PanelController.java
rc/com/android/gallery3d/filtershow/cache/DirectPresetCache.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterRS.java
rc/com/android/gallery3d/filtershow/imageshow/ImageDraw.java
rc/com/android/gallery3d/filtershow/imageshow/ImageGeometry.java
rc/com/android/gallery3d/filtershow/imageshow/ImageRedEyes.java
rc/com/android/gallery3d/filtershow/imageshow/ImageShow.java
rc/com/android/gallery3d/filtershow/imageshow/ImageSlave.java
rc/com/android/gallery3d/filtershow/imageshow/ImageTinyPlanet.java
rc/com/android/gallery3d/filtershow/imageshow/ImageZoom.java
rc/com/android/gallery3d/filtershow/imageshow/MasterImage.java
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
rc/com/android/gallery3d/filtershow/ui/FilterIconButton.java
rc/com/android/gallery3d/filtershow/ui/ImageCurves.java
|
1215eaead6bb37fb9a1cdbb65036d22a13bdd72b |
15-Jan-2013 |
Baligh Uddin <baligh@google.com> |
am a4eee492: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce * commit 'a4eee4927777ebeb81641ad9b95719578cb5df1d': Import translations. DO NOT MERGE
|
e7a60b1a1c311ada44e95e9bdb8e46949eb40eeb |
15-Jan-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE"
|
db0150496e29a0e15ab2b6138366c2f8283f54d9 |
15-Jan-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
|
a4eee4927777ebeb81641ad9b95719578cb5df1d |
15-Jan-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
|
d24f2bcb9a0da9633517b2baae0786e964d675d6 |
15-Jan-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE"
|
e8504eee1b0da7f93cc340edba2e123d7ed5ce6f |
15-Jan-2013 |
Baligh Uddin <baligh@google.com> |
am 8a9b7eb0: (-s ours) Import translations. DO NOT MERGE * commit '8a9b7eb08d3a7bb8a48b2d555f7f565b8c6ba21c': Import translations. DO NOT MERGE
|
aa629e4664653630674393c9a863c1d75d4e0e57 |
15-Jan-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I373830f3a76a373ba1b4e01938939d53e4791c27 Auto-generated-cl: translation import
es/values-af/filtershow_strings.xml
es/values-am/filtershow_strings.xml
es/values-ar/filtershow_strings.xml
es/values-be/filtershow_strings.xml
es/values-bg/filtershow_strings.xml
es/values-ca/filtershow_strings.xml
es/values-cs/filtershow_strings.xml
es/values-da/filtershow_strings.xml
es/values-de/filtershow_strings.xml
es/values-el/filtershow_strings.xml
es/values-en-rGB/filtershow_strings.xml
es/values-es-rUS/filtershow_strings.xml
es/values-es/filtershow_strings.xml
es/values-et/filtershow_strings.xml
es/values-fa/filtershow_strings.xml
es/values-fi/filtershow_strings.xml
es/values-fr/filtershow_strings.xml
es/values-hi/filtershow_strings.xml
es/values-hr/filtershow_strings.xml
es/values-hu/filtershow_strings.xml
es/values-in/filtershow_strings.xml
es/values-it/filtershow_strings.xml
es/values-iw/filtershow_strings.xml
es/values-ja/filtershow_strings.xml
es/values-ko/filtershow_strings.xml
es/values-lt/filtershow_strings.xml
es/values-lv/filtershow_strings.xml
es/values-ms/filtershow_strings.xml
es/values-nb/filtershow_strings.xml
es/values-nl/filtershow_strings.xml
es/values-pl/filtershow_strings.xml
es/values-pt-rPT/filtershow_strings.xml
es/values-pt/filtershow_strings.xml
es/values-ro/filtershow_strings.xml
es/values-ru/filtershow_strings.xml
es/values-sk/filtershow_strings.xml
es/values-sl/filtershow_strings.xml
es/values-sr/filtershow_strings.xml
es/values-sv/filtershow_strings.xml
es/values-sw/filtershow_strings.xml
es/values-th/filtershow_strings.xml
es/values-tl/filtershow_strings.xml
es/values-tr/filtershow_strings.xml
es/values-uk/filtershow_strings.xml
es/values-vi/filtershow_strings.xml
es/values-zh-rCN/filtershow_strings.xml
es/values-zh-rTW/filtershow_strings.xml
es/values-zu/filtershow_strings.xml
|
cb3c62afa3cf4a5130df329dae4fdab315749561 |
15-Jan-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ia46ffed829d3290ad59bd4f33f20efd4810860f4 Auto-generated-cl: translation import
es/values-af/filtershow_strings.xml
es/values-am/filtershow_strings.xml
es/values-ar/filtershow_strings.xml
es/values-be/filtershow_strings.xml
es/values-bg/filtershow_strings.xml
es/values-ca/filtershow_strings.xml
es/values-cs/filtershow_strings.xml
es/values-da/filtershow_strings.xml
es/values-de/filtershow_strings.xml
es/values-el/filtershow_strings.xml
es/values-en-rGB/filtershow_strings.xml
es/values-es-rUS/filtershow_strings.xml
es/values-es/filtershow_strings.xml
es/values-et/filtershow_strings.xml
es/values-fa/filtershow_strings.xml
es/values-fi/filtershow_strings.xml
es/values-fr/filtershow_strings.xml
es/values-hi/filtershow_strings.xml
es/values-hr/filtershow_strings.xml
es/values-hu/filtershow_strings.xml
es/values-in/filtershow_strings.xml
es/values-it/filtershow_strings.xml
es/values-iw/filtershow_strings.xml
es/values-ja/filtershow_strings.xml
es/values-ko/filtershow_strings.xml
es/values-lt/filtershow_strings.xml
es/values-lv/filtershow_strings.xml
es/values-ms/filtershow_strings.xml
es/values-nb/filtershow_strings.xml
es/values-nl/filtershow_strings.xml
es/values-pl/filtershow_strings.xml
es/values-pt-rPT/filtershow_strings.xml
es/values-pt/filtershow_strings.xml
es/values-ro/filtershow_strings.xml
es/values-ru/filtershow_strings.xml
es/values-sk/filtershow_strings.xml
es/values-sl/filtershow_strings.xml
es/values-sr/filtershow_strings.xml
es/values-sv/filtershow_strings.xml
es/values-sw/filtershow_strings.xml
es/values-th/filtershow_strings.xml
es/values-tl/filtershow_strings.xml
es/values-tr/filtershow_strings.xml
es/values-uk/filtershow_strings.xml
es/values-vi/filtershow_strings.xml
es/values-zh-rCN/filtershow_strings.xml
es/values-zh-rTW/filtershow_strings.xml
es/values-zu/filtershow_strings.xml
|
98aad64193643fc400a55986c8e603068afd0e73 |
15-Jan-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ia46ffed829d3290ad59bd4f33f20efd4810860f4 Auto-generated-cl: translation import
es/values-af/filtershow_strings.xml
es/values-am/filtershow_strings.xml
es/values-ar/filtershow_strings.xml
es/values-be/filtershow_strings.xml
es/values-bg/filtershow_strings.xml
es/values-ca/filtershow_strings.xml
es/values-cs/filtershow_strings.xml
es/values-da/filtershow_strings.xml
es/values-de/filtershow_strings.xml
es/values-el/filtershow_strings.xml
es/values-en-rGB/filtershow_strings.xml
es/values-es-rUS/filtershow_strings.xml
es/values-es/filtershow_strings.xml
es/values-et/filtershow_strings.xml
es/values-fa/filtershow_strings.xml
es/values-fi/filtershow_strings.xml
es/values-fr/filtershow_strings.xml
es/values-hi/filtershow_strings.xml
es/values-hr/filtershow_strings.xml
es/values-hu/filtershow_strings.xml
es/values-in/filtershow_strings.xml
es/values-it/filtershow_strings.xml
es/values-iw/filtershow_strings.xml
es/values-ja/filtershow_strings.xml
es/values-ko/filtershow_strings.xml
es/values-lt/filtershow_strings.xml
es/values-lv/filtershow_strings.xml
es/values-ms/filtershow_strings.xml
es/values-nb/filtershow_strings.xml
es/values-nl/filtershow_strings.xml
es/values-pl/filtershow_strings.xml
es/values-pt-rPT/filtershow_strings.xml
es/values-pt/filtershow_strings.xml
es/values-ro/filtershow_strings.xml
es/values-ru/filtershow_strings.xml
es/values-sk/filtershow_strings.xml
es/values-sl/filtershow_strings.xml
es/values-sr/filtershow_strings.xml
es/values-sv/filtershow_strings.xml
es/values-sw/filtershow_strings.xml
es/values-th/filtershow_strings.xml
es/values-tl/filtershow_strings.xml
es/values-tr/filtershow_strings.xml
es/values-uk/filtershow_strings.xml
es/values-vi/filtershow_strings.xml
es/values-zh-rCN/filtershow_strings.xml
es/values-zh-rTW/filtershow_strings.xml
es/values-zu/filtershow_strings.xml
|
77978723b8eeaf4b86d1ceb10143b9e934ef7295 |
15-Jan-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I73b6c3b9242fcc96c7c9dffafd48b6508d13a1c4 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
8a9b7eb08d3a7bb8a48b2d555f7f565b8c6ba21c |
15-Jan-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I17eea6532abf3df04771e725dd16a94212b8b62f Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
695ab4b2c1f9bad9e236fc7c157e3c064bd22c50 |
15-Jan-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I17eea6532abf3df04771e725dd16a94212b8b62f Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
65475375d5574d671e8528c93bad23463969a1ba |
14-Jan-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 9313869d: Fixed ClassCastException on open crop aspect menu. * commit '9313869da345937c60363ff97ae8e8320c48082c': Fixed ClassCastException on open crop aspect menu.
|
3d49241cf309365373a1c3e98838c764f718cd3e |
14-Jan-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Fixed ClassCastException on open crop aspect menu. Bug: 7999315 Change-Id: I78bd4c12f5241215629f6eb06fdc7b101ed6ddb6
rc/com/android/gallery3d/filtershow/imageshow/ImageCrop.java
|
9313869da345937c60363ff97ae8e8320c48082c |
14-Jan-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Fixed ClassCastException on open crop aspect menu. Bug: 7999315 Change-Id: I78bd4c12f5241215629f6eb06fdc7b101ed6ddb6
rc/com/android/gallery3d/filtershow/imageshow/ImageCrop.java
|
d56493cf54bb48638baa88cf363cb295d9fd3244 |
13-Jan-2013 |
George Mount <mount@google.com> |
am c5029eaf: Merge "Fix LightCycle capture NullPointerException." into gb-ub-photos-bryce * commit 'c5029eafeebd5fccd68b07a809ce6c66009f4ca6': Fix LightCycle capture NullPointerException.
|
a9de8750056fb8bacaafd9706e9e2320cbe0cbe1 |
13-Jan-2013 |
George Mount <mount@google.com> |
Merge "Fix LightCycle capture NullPointerException." into gb-ub-photos-bryce
|
c5029eafeebd5fccd68b07a809ce6c66009f4ca6 |
13-Jan-2013 |
George Mount <mount@google.com> |
Merge "Fix LightCycle capture NullPointerException." into gb-ub-photos-bryce
|
5a4285d3ef0e05f817c45456217546f4f2f00d75 |
13-Jan-2013 |
George Mount <mount@google.com> |
Fix LightCycle capture NullPointerException. Bug 7987002 During capture animation, allow LightCycle to write the current frame to a texture, then use that texture for drawing the background image. Change-Id: I7891e5cac18ee21ff17910790397459f9d57e408
rc/com/android/gallery3d/glrenderer/BasicTexture.java
rc/com/android/gallery3d/glrenderer/GLES20Canvas.java
rc/com/android/gallery3d/glrenderer/RawTexture.java
|
44a1b22eb7098819ac0251764b9fa686d8339d66 |
13-Jan-2013 |
George Mount <mount@google.com> |
Fix LightCycle capture NullPointerException. Bug 7987002 During capture animation, allow LightCycle to write the current frame to a texture, then use that texture for drawing the background image. Change-Id: I7891e5cac18ee21ff17910790397459f9d57e408
rc/com/android/gallery3d/glrenderer/BasicTexture.java
rc/com/android/gallery3d/glrenderer/GLES20Canvas.java
rc/com/android/gallery3d/glrenderer/RawTexture.java
|
cf2537c486e8965cb80e085a7268ba19eae2a034 |
12-Jan-2013 |
Ruben Brunk <rubenbrunk@google.com> |
am 2e1a644f: Refactoring button class. Minor bug fixes. * commit '2e1a644f97a81931bf9b53d8bdf089bb7d4b1048': Refactoring button class. Minor bug fixes.
|
405feeac6565e52882f05dca46097db57b9b1133 |
19-Dec-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Refactoring button class. Minor bug fixes. Bug: 7875246 Bug: 7459118 Change-Id: Ic1099a7ae0feeeb16c8be3035f9726805149666e
es/layout/filtericonbutton.xml
es/layout/filtershow_activity.xml
es/values/iconbutton_styles.xml
|
b146af084f43e6b87ad34ac9bf94b18aa36a46aa |
19-Dec-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Refactoring button class. Minor bug fixes. Bug: 7875246 Bug: 7459118 Change-Id: Ic1099a7ae0feeeb16c8be3035f9726805149666e
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/PanelController.java
rc/com/android/gallery3d/filtershow/filters/ImageFilter.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterBorder.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterDownsample.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterFx.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterParametricBorder.java
rc/com/android/gallery3d/filtershow/imageshow/ImageBorder.java
rc/com/android/gallery3d/filtershow/imageshow/ImageSmallBorder.java
rc/com/android/gallery3d/filtershow/imageshow/ImageSmallFilter.java
rc/com/android/gallery3d/filtershow/ui/FilterIconButton.java
rc/com/android/gallery3d/filtershow/ui/IconButton.java
rc/com/android/gallery3d/filtershow/ui/ImageButtonTitle.java
|
2e1a644f97a81931bf9b53d8bdf089bb7d4b1048 |
19-Dec-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Refactoring button class. Minor bug fixes. Bug: 7875246 Bug: 7459118 Change-Id: Ic1099a7ae0feeeb16c8be3035f9726805149666e
es/layout/filtericonbutton.xml
es/layout/filtershow_activity.xml
es/values/iconbutton_styles.xml
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/PanelController.java
rc/com/android/gallery3d/filtershow/filters/ImageFilter.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterBorder.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterDownsample.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterFx.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterParametricBorder.java
rc/com/android/gallery3d/filtershow/imageshow/ImageBorder.java
rc/com/android/gallery3d/filtershow/imageshow/ImageSmallBorder.java
rc/com/android/gallery3d/filtershow/imageshow/ImageSmallFilter.java
rc/com/android/gallery3d/filtershow/ui/FilterIconButton.java
rc/com/android/gallery3d/filtershow/ui/IconButton.java
rc/com/android/gallery3d/filtershow/ui/ImageButtonTitle.java
|
515c16c333d909b33a37810e605d349b6fa4da1d |
10-Jan-2013 |
Ed Heyl <edheyl@google.com> |
reset to bryce, but keep history
|
6681d532e7f1fe9971e10ddeae52063bf4ba5e12 |
10-Jan-2013 |
George Mount <mount@google.com> |
Merge "Fix slide show animation so that cross fades work." into gb-ub-photos-bryce
|
91a2d2ff465a7a2347e5b72320216ea04aec2607 |
10-Jan-2013 |
George Mount <mount@google.com> |
Merge "Fix slide show animation so that cross fades work." into gb-ub-photos-bryce
|
dbe227cc4aa7ca09f098f371102096e71519c24a |
09-Jan-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
|
1194422477471a21c150d71e83bfeb9d1b8cef30 |
09-Jan-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
|
02b6a8d6f63bb3e8416732577da7fc3eb986533d |
09-Jan-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
|
28ecf97ec16975c8ee136f9f71d8020e87e7c986 |
09-Jan-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
|
c8cab06ea9dbf4b1d46203603bfefa0160aa8f62 |
08-Jan-2013 |
George Mount <mount@google.com> |
Fix slide show animation so that cross fades work. Bug 7961297 Removed the "Additive" blending, which didn't do anything, even in OpenGL ES 1.1 implementation. Modified the texturing to change the color of the pixels based on the supplied alpha rather than modifying the alpha. This appears to match the implementation in the OpenGL ES 1.1 pipeline. Change-Id: I52491af1a8a2d727968e4e805bc4bc61647f5cf2
rc/com/android/gallery3d/glrenderer/GLCanvas.java
rc/com/android/gallery3d/glrenderer/GLES11Canvas.java
rc/com/android/gallery3d/glrenderer/GLES20Canvas.java
rc/com/android/gallery3d/ui/SlideshowView.java
ests/src/com/android/gallery3d/ui/GLCanvasStub.java
|
bdb71cc6acbd78d5aa02d2e142b792247fb6e0bd |
08-Jan-2013 |
George Mount <mount@google.com> |
Fix slide show animation so that cross fades work. Bug 7961297 Removed the "Additive" blending, which didn't do anything, even in OpenGL ES 1.1 implementation. Modified the texturing to change the color of the pixels based on the supplied alpha rather than modifying the alpha. This appears to match the implementation in the OpenGL ES 1.1 pipeline. Change-Id: I52491af1a8a2d727968e4e805bc4bc61647f5cf2
rc/com/android/gallery3d/glrenderer/GLCanvas.java
rc/com/android/gallery3d/glrenderer/GLES11Canvas.java
rc/com/android/gallery3d/glrenderer/GLES20Canvas.java
rc/com/android/gallery3d/ui/SlideshowView.java
ests/src/com/android/gallery3d/ui/GLCanvasStub.java
|
0183c74e2889c572c9b7d28617197fedb8daefe8 |
09-Jan-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I41846830dfc7a4f4f519c5306fafdbb95de9b093 Auto-generated-cl: translation import
es/values-af/photoeditor_strings.xml
es/values-am/photoeditor_strings.xml
es/values-ar/photoeditor_strings.xml
es/values-be/photoeditor_strings.xml
es/values-bg/photoeditor_strings.xml
es/values-ca/photoeditor_strings.xml
es/values-cs/photoeditor_strings.xml
es/values-da/photoeditor_strings.xml
es/values-de/photoeditor_strings.xml
es/values-el/photoeditor_strings.xml
es/values-en-rGB/photoeditor_strings.xml
es/values-es-rUS/photoeditor_strings.xml
es/values-es/photoeditor_strings.xml
es/values-et/photoeditor_strings.xml
es/values-fa/photoeditor_strings.xml
es/values-fi/photoeditor_strings.xml
es/values-fr/photoeditor_strings.xml
es/values-hi/photoeditor_strings.xml
es/values-hr/photoeditor_strings.xml
es/values-hu/photoeditor_strings.xml
es/values-in/photoeditor_strings.xml
es/values-it/photoeditor_strings.xml
es/values-iw/photoeditor_strings.xml
es/values-ja/photoeditor_strings.xml
es/values-ko/photoeditor_strings.xml
es/values-lt/photoeditor_strings.xml
es/values-lv/photoeditor_strings.xml
es/values-ms/photoeditor_strings.xml
es/values-nb/photoeditor_strings.xml
es/values-nl/photoeditor_strings.xml
es/values-pl/photoeditor_strings.xml
es/values-pt-rPT/photoeditor_strings.xml
es/values-pt/photoeditor_strings.xml
es/values-ro/photoeditor_strings.xml
es/values-ru/photoeditor_strings.xml
es/values-sk/photoeditor_strings.xml
es/values-sl/photoeditor_strings.xml
es/values-sr/photoeditor_strings.xml
es/values-sv/photoeditor_strings.xml
es/values-sw/photoeditor_strings.xml
es/values-th/photoeditor_strings.xml
es/values-tl/photoeditor_strings.xml
es/values-tr/photoeditor_strings.xml
es/values-uk/photoeditor_strings.xml
es/values-vi/photoeditor_strings.xml
es/values-zh-rCN/photoeditor_strings.xml
es/values-zh-rTW/photoeditor_strings.xml
es/values-zu/photoeditor_strings.xml
|
c53845659a422d89f52bd6e1d6e1142b6b395b66 |
09-Jan-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: If0150dc371afd98cb5512a5f29c51d5554b99008 Auto-generated-cl: translation import
es/values-af/filtershow_strings.xml
es/values-am/filtershow_strings.xml
es/values-ar/filtershow_strings.xml
es/values-be/filtershow_strings.xml
es/values-bg/filtershow_strings.xml
es/values-ca/filtershow_strings.xml
es/values-cs/filtershow_strings.xml
es/values-da/filtershow_strings.xml
es/values-de/filtershow_strings.xml
es/values-el/filtershow_strings.xml
es/values-en-rGB/filtershow_strings.xml
es/values-es-rUS/filtershow_strings.xml
es/values-es/filtershow_strings.xml
es/values-et/filtershow_strings.xml
es/values-fa/filtershow_strings.xml
es/values-fi/filtershow_strings.xml
es/values-fr/filtershow_strings.xml
es/values-hi/filtershow_strings.xml
es/values-hr/filtershow_strings.xml
es/values-hu/filtershow_strings.xml
es/values-in/filtershow_strings.xml
es/values-it/filtershow_strings.xml
es/values-iw/filtershow_strings.xml
es/values-ja/filtershow_strings.xml
es/values-ko/filtershow_strings.xml
es/values-lt/filtershow_strings.xml
es/values-lv/filtershow_strings.xml
es/values-ms/filtershow_strings.xml
es/values-nb/filtershow_strings.xml
es/values-nl/filtershow_strings.xml
es/values-pl/filtershow_strings.xml
es/values-pt-rPT/filtershow_strings.xml
es/values-pt/filtershow_strings.xml
es/values-ro/filtershow_strings.xml
es/values-ru/filtershow_strings.xml
es/values-sk/filtershow_strings.xml
es/values-sl/filtershow_strings.xml
es/values-sr/filtershow_strings.xml
es/values-sv/filtershow_strings.xml
es/values-sw/filtershow_strings.xml
es/values-th/filtershow_strings.xml
es/values-tl/filtershow_strings.xml
es/values-tr/filtershow_strings.xml
es/values-uk/filtershow_strings.xml
es/values-vi/filtershow_strings.xml
es/values-zh-rCN/filtershow_strings.xml
es/values-zh-rTW/filtershow_strings.xml
es/values-zu/filtershow_strings.xml
|
ab12d44706fd0281612dde3cfdc2be183b5e5b2a |
09-Jan-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: If0150dc371afd98cb5512a5f29c51d5554b99008 Auto-generated-cl: translation import
es/values-af/filtershow_strings.xml
es/values-am/filtershow_strings.xml
es/values-ar/filtershow_strings.xml
es/values-be/filtershow_strings.xml
es/values-bg/filtershow_strings.xml
es/values-ca/filtershow_strings.xml
es/values-cs/filtershow_strings.xml
es/values-da/filtershow_strings.xml
es/values-de/filtershow_strings.xml
es/values-el/filtershow_strings.xml
es/values-en-rGB/filtershow_strings.xml
es/values-es-rUS/filtershow_strings.xml
es/values-es/filtershow_strings.xml
es/values-et/filtershow_strings.xml
es/values-fa/filtershow_strings.xml
es/values-fi/filtershow_strings.xml
es/values-fr/filtershow_strings.xml
es/values-hi/filtershow_strings.xml
es/values-hr/filtershow_strings.xml
es/values-hu/filtershow_strings.xml
es/values-in/filtershow_strings.xml
es/values-it/filtershow_strings.xml
es/values-iw/filtershow_strings.xml
es/values-ja/filtershow_strings.xml
es/values-ko/filtershow_strings.xml
es/values-lt/filtershow_strings.xml
es/values-lv/filtershow_strings.xml
es/values-ms/filtershow_strings.xml
es/values-nb/filtershow_strings.xml
es/values-nl/filtershow_strings.xml
es/values-pl/filtershow_strings.xml
es/values-pt-rPT/filtershow_strings.xml
es/values-pt/filtershow_strings.xml
es/values-ro/filtershow_strings.xml
es/values-ru/filtershow_strings.xml
es/values-sk/filtershow_strings.xml
es/values-sl/filtershow_strings.xml
es/values-sr/filtershow_strings.xml
es/values-sv/filtershow_strings.xml
es/values-sw/filtershow_strings.xml
es/values-th/filtershow_strings.xml
es/values-tl/filtershow_strings.xml
es/values-tr/filtershow_strings.xml
es/values-uk/filtershow_strings.xml
es/values-vi/filtershow_strings.xml
es/values-zh-rCN/filtershow_strings.xml
es/values-zh-rTW/filtershow_strings.xml
es/values-zu/filtershow_strings.xml
|
e3609aa07346b7ba595a6ecec41b361ff0d0d963 |
09-Jan-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I1a2f3a5e9c081b2e19de1188b805da3f7c1ba216 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
dd8fba53c5cd8c5a557836c4aa33469732ac645c |
09-Jan-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I1a2f3a5e9c081b2e19de1188b805da3f7c1ba216 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
a6911dc4d39a1c31fd15e6db55ce0e270a7bc94d |
09-Jan-2013 |
nicolasroard <nicolasroard@google.com> |
Refactor filters management Change-Id: I0e75ad534cf8cc74a132f97836eedd35baeebeae
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc_pd/com/android/gallery3d/filtershow/filters/FiltersManager.java
rc_pd/com/android/gallery3d/filtershow/filters/ImageFilterDrama.java
|
db73e46b4e557b4aa7e01d812a252f4b8284961a |
09-Jan-2013 |
nicolasroard <nicolasroard@google.com> |
Refactor filters management Change-Id: I0e75ad534cf8cc74a132f97836eedd35baeebeae
es/drawable/filtershow_button_colors_snapseed.png
es/values/filtershow_ids.xml
es/values/filtershow_strings.xml
|
f93e60c1b334d510940406c736559895462aac31 |
09-Jan-2013 |
nicolasroard <nicolasroard@google.com> |
Refactor filters management Change-Id: I0e75ad534cf8cc74a132f97836eedd35baeebeae
es/drawable/filtershow_button_colors_snapseed.png
es/values/filtershow_ids.xml
es/values/filtershow_strings.xml
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc_pd/com/android/gallery3d/filtershow/filters/FiltersManager.java
rc_pd/com/android/gallery3d/filtershow/filters/ImageFilterDrama.java
|
a6ce4c00033c3c8484be5f562ba5cb8d8704156a |
29-Dec-2012 |
John Hoford <hoford@google.com> |
Add the Drama filter Change-Id: I6f026f899b9d991bd6f9e74445f68114041fe781
es/drawable/filtershow_button_colors_snapseed.png
es/values/filtershow_ids.xml
es/values/filtershow_strings.xml
|
9b37253209fcbb9fe2278aec8d6b66b43808645f |
29-Dec-2012 |
John Hoford <hoford@google.com> |
Add the Drama filter Change-Id: I6f026f899b9d991bd6f9e74445f68114041fe781
es/drawable/filtershow_button_colors_snapseed.png
es/values/filtershow_ids.xml
es/values/filtershow_strings.xml
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc_pd/com/android/gallery3d/filtershow/filters/ImageFilterDrama.java
|
e984fa69f93999b7c88e24fd9aeb1360f349377d |
29-Dec-2012 |
John Hoford <hoford@google.com> |
Add the Drama filter Change-Id: I6f026f899b9d991bd6f9e74445f68114041fe781
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc_pd/com/android/gallery3d/filtershow/filters/ImageFilterDrama.java
|
4c7aa9fe20d1035fc10334a6feb2bc5bd97c28b7 |
08-Jan-2013 |
John Hoford <hoford@google.com> |
Merge "Add a Draw filter" into gb-ub-photos-bryce
|
7fc87e69cb1f8e687de6f17b41a9b6bb2acad3bb |
08-Jan-2013 |
John Hoford <hoford@google.com> |
Merge "Add a Draw filter" into gb-ub-photos-bryce
|
534fc631c98d51b186b823608a0d9e267b3c0ea8 |
08-Jan-2013 |
John Hoford <hoford@google.com> |
Merge "Add a Draw filter" into gb-ub-photos-bryce
|
155549cc1255bc43a677c2e2f5bde9ac3aaab2ba |
08-Jan-2013 |
John Hoford <hoford@google.com> |
Add a Draw filter Change-Id: I67aecc9241b4534491fb838b84d0da1a6edbbb54
es/layout/filtershow_activity.xml
es/values/filtershow_ids.xml
es/values/filtershow_strings.xml
|
db94725c415a9e16abfce05c0315bd7c1c3ecce2 |
08-Jan-2013 |
John Hoford <hoford@google.com> |
Add a Draw filter Change-Id: I67aecc9241b4534491fb838b84d0da1a6edbbb54
es/layout/filtershow_activity.xml
es/values/filtershow_ids.xml
es/values/filtershow_strings.xml
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterDraw.java
rc/com/android/gallery3d/filtershow/imageshow/ImageDraw.java
|
7b9803262e5f1ebb9464d5cf857f9cbb38f888bf |
08-Jan-2013 |
John Hoford <hoford@google.com> |
Add a Draw filter Change-Id: I67aecc9241b4534491fb838b84d0da1a6edbbb54
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterDraw.java
rc/com/android/gallery3d/filtershow/imageshow/ImageDraw.java
|
d385f6ddb35b0ed5797bf1d1c269dbcb56055b12 |
08-Jan-2013 |
nicolasroard <nicolasroard@google.com> |
Merge "Refactoring UI editors" into gb-ub-photos-bryce
|
a91969297aac4fa4572ad7c69d4d5924ce4b8de2 |
08-Jan-2013 |
nicolasroard <nicolasroard@google.com> |
Merge "Refactoring UI editors" into gb-ub-photos-bryce
|
fd775153d472ea9952a6d648bde88324c3428cc9 |
08-Jan-2013 |
nicolasroard <nicolasroard@google.com> |
Refactoring UI editors bug:7688780 Change-Id: I30f8691788332a01d591435474a84cc352b71138
es/layout/filtershow_activity.xml
es/layout/filtershow_crop_button.xml
es/layout/filtershow_curves_button.xml
|
9820e7e753b7e1977ef3d2163605431769ce9165 |
08-Jan-2013 |
nicolasroard <nicolasroard@google.com> |
Refactoring UI editors bug:7688780 Change-Id: I30f8691788332a01d591435474a84cc352b71138
es/layout/filtershow_activity.xml
es/layout/filtershow_crop_button.xml
es/layout/filtershow_curves_button.xml
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/PanelController.java
rc/com/android/gallery3d/filtershow/imageshow/ImageCrop.java
rc/com/android/gallery3d/filtershow/imageshow/ImageShow.java
rc/com/android/gallery3d/filtershow/ui/FramedTextButton.java
rc/com/android/gallery3d/filtershow/ui/ImageCurves.java
|
962f4d03e92a3aa38202950053b1557e12860624 |
08-Jan-2013 |
nicolasroard <nicolasroard@google.com> |
Refactoring UI editors bug:7688780 Change-Id: I30f8691788332a01d591435474a84cc352b71138
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/PanelController.java
rc/com/android/gallery3d/filtershow/imageshow/ImageCrop.java
rc/com/android/gallery3d/filtershow/imageshow/ImageShow.java
rc/com/android/gallery3d/filtershow/ui/FramedTextButton.java
rc/com/android/gallery3d/filtershow/ui/ImageCurves.java
|
fd091d5c1cbb635f26823efa6295bf0563a2e2a4 |
08-Jan-2013 |
George Mount <mount@google.com> |
Merge "Instantiate GLCanvas rather than reinitialize current GLCanvas." into gb-ub-photos-bryce
|
fa0678a153de28096e07522d9e4e98d345ff544a |
08-Jan-2013 |
George Mount <mount@google.com> |
Merge "Instantiate GLCanvas rather than reinitialize current GLCanvas." into gb-ub-photos-bryce
|
e4673b2650ffc642afa872458dbf51e1a24b00c8 |
07-Jan-2013 |
George Mount <mount@google.com> |
Instantiate GLCanvas rather than reinitialize current GLCanvas. GLCanvas was being used as a singleton when it really should allow separate instances for correctness. Change-Id: I650884e843a4a78997b70826f6012ae19b8df549
rc/com/android/gallery3d/glrenderer/ExtTexture.java
rc/com/android/gallery3d/glrenderer/GLCanvas.java
rc/com/android/gallery3d/glrenderer/GLES11Canvas.java
rc/com/android/gallery3d/glrenderer/GLES11IdImpl.java
rc/com/android/gallery3d/glrenderer/GLES20Canvas.java
rc/com/android/gallery3d/glrenderer/GLES20IdImpl.java
rc/com/android/gallery3d/glrenderer/GLIdImpl.java
rc/com/android/gallery3d/glrenderer/RawTexture.java
rc/com/android/gallery3d/glrenderer/UploadedTexture.java
rc/com/android/gallery3d/ui/GLRootView.java
rc/com/android/gallery3d/ui/GalleryEGLConfigChooser.java
rc/com/android/gallery3d/ui/SurfaceTextureScreenNail.java
ests/src/com/android/gallery3d/glrenderer/GLCanvasTest.java
ests/src/com/android/gallery3d/glrenderer/TextureTest.java
ests/src/com/android/gallery3d/ui/GLCanvasStub.java
|
50b33abe053ccab7be3d1bca2328e792507963d4 |
07-Jan-2013 |
George Mount <mount@google.com> |
Instantiate GLCanvas rather than reinitialize current GLCanvas. GLCanvas was being used as a singleton when it really should allow separate instances for correctness. Change-Id: I650884e843a4a78997b70826f6012ae19b8df549
rc/com/android/gallery3d/glrenderer/ExtTexture.java
rc/com/android/gallery3d/glrenderer/GLCanvas.java
rc/com/android/gallery3d/glrenderer/GLES11Canvas.java
rc/com/android/gallery3d/glrenderer/GLES11IdImpl.java
rc/com/android/gallery3d/glrenderer/GLES20Canvas.java
rc/com/android/gallery3d/glrenderer/GLES20IdImpl.java
rc/com/android/gallery3d/glrenderer/GLIdImpl.java
rc/com/android/gallery3d/glrenderer/RawTexture.java
rc/com/android/gallery3d/glrenderer/UploadedTexture.java
rc/com/android/gallery3d/ui/GLRootView.java
rc/com/android/gallery3d/ui/GalleryEGLConfigChooser.java
rc/com/android/gallery3d/ui/SurfaceTextureScreenNail.java
ests/src/com/android/gallery3d/glrenderer/GLCanvasTest.java
ests/src/com/android/gallery3d/glrenderer/TextureTest.java
ests/src/com/android/gallery3d/ui/GLCanvasStub.java
|
acdb67533db178cb6a87faf6f2bda2ec646ce0af |
26-Dec-2012 |
Bobby Georgescu <georgescu@google.com> |
Replace camera importer Change-Id: Icfeb23301bc6c9f8c8b12824bcbb0d8b41852d07
ndroidManifest.xml
|
d2f3995f22bfe02d6e927f660202bb0b2f89ac82 |
26-Dec-2012 |
Bobby Georgescu <georgescu@google.com> |
Replace camera importer Change-Id: Icfeb23301bc6c9f8c8b12824bcbb0d8b41852d07
es/drawable/ingest_item_list_selector.xml
es/layout/ingest_activity_item_list.xml
es/layout/ingest_date_tile.xml
es/layout/ingest_thumbnail.xml
es/menu/ingest_menu_item_list_selection.xml
es/values/colors.xml
es/values/strings.xml
|
d3aac52ffb88ced53413d5eef29c641dd6982267 |
26-Dec-2012 |
Bobby Georgescu <georgescu@google.com> |
Replace camera importer Change-Id: Icfeb23301bc6c9f8c8b12824bcbb0d8b41852d07
ndroidManifest.xml
es/drawable/ingest_item_list_selector.xml
es/layout/ingest_activity_item_list.xml
es/layout/ingest_date_tile.xml
es/layout/ingest_thumbnail.xml
es/menu/ingest_menu_item_list_selection.xml
es/values/colors.xml
es/values/strings.xml
rc/com/android/gallery3d/app/AlbumPage.java
rc/com/android/gallery3d/app/AlbumSetPage.java
rc/com/android/gallery3d/app/NotificationIds.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/app/UsbDeviceActivity.java
rc/com/android/gallery3d/data/DataManager.java
rc/com/android/gallery3d/data/DataSourceType.java
rc/com/android/gallery3d/data/MediaObject.java
rc/com/android/gallery3d/data/MtpContext.java
rc/com/android/gallery3d/data/MtpDevice.java
rc/com/android/gallery3d/data/MtpDeviceSet.java
rc/com/android/gallery3d/data/MtpImage.java
rc/com/android/gallery3d/data/MtpSource.java
rc/com/android/gallery3d/ingest/ImportTask.java
rc/com/android/gallery3d/ingest/IngestActivity.java
rc/com/android/gallery3d/ingest/IngestService.java
rc/com/android/gallery3d/ingest/MtpDeviceIndex.java
rc/com/android/gallery3d/ingest/SimpleDate.java
rc/com/android/gallery3d/ingest/adapter/MtpAdapter.java
rc/com/android/gallery3d/ingest/ui/DateTileView.java
rc/com/android/gallery3d/ingest/ui/MtpBitmapCache.java
rc/com/android/gallery3d/ingest/ui/MtpThumbnailTileView.java
rc/com/android/gallery3d/provider/GalleryProvider.java
rc/com/android/gallery3d/ui/ActionModeHandler.java
rc/com/android/gallery3d/ui/AlbumLabelMaker.java
rc/com/android/gallery3d/ui/ImportCompleteListener.java
rc/com/android/gallery3d/ui/MenuExecutor.java
|
a4205e4eab691b402e7a6dc1e913a611b7fdc45f |
26-Dec-2012 |
Bobby Georgescu <georgescu@google.com> |
Replace camera importer Change-Id: Icfeb23301bc6c9f8c8b12824bcbb0d8b41852d07
rc/com/android/gallery3d/app/AlbumPage.java
rc/com/android/gallery3d/app/AlbumSetPage.java
rc/com/android/gallery3d/app/NotificationIds.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/app/UsbDeviceActivity.java
rc/com/android/gallery3d/data/DataManager.java
rc/com/android/gallery3d/data/DataSourceType.java
rc/com/android/gallery3d/data/MediaObject.java
rc/com/android/gallery3d/data/MtpContext.java
rc/com/android/gallery3d/data/MtpDevice.java
rc/com/android/gallery3d/data/MtpDeviceSet.java
rc/com/android/gallery3d/data/MtpImage.java
rc/com/android/gallery3d/data/MtpSource.java
rc/com/android/gallery3d/ingest/ImportTask.java
rc/com/android/gallery3d/ingest/IngestActivity.java
rc/com/android/gallery3d/ingest/IngestService.java
rc/com/android/gallery3d/ingest/MtpDeviceIndex.java
rc/com/android/gallery3d/ingest/SimpleDate.java
rc/com/android/gallery3d/ingest/adapter/MtpAdapter.java
rc/com/android/gallery3d/ingest/ui/DateTileView.java
rc/com/android/gallery3d/ingest/ui/MtpBitmapCache.java
rc/com/android/gallery3d/ingest/ui/MtpThumbnailTileView.java
rc/com/android/gallery3d/provider/GalleryProvider.java
rc/com/android/gallery3d/ui/ActionModeHandler.java
rc/com/android/gallery3d/ui/AlbumLabelMaker.java
rc/com/android/gallery3d/ui/ImportCompleteListener.java
rc/com/android/gallery3d/ui/MenuExecutor.java
|
3114fa3a8a99be3c819d102dd1d069face13c43f |
07-Jan-2013 |
Bobby Georgescu <georgescu@google.com> |
Merge "Fix camera->gallery relaunch loop on empty camera album" into gb-ub-photos-bryce
|
bf7af1173998fe8ac9e0eb7059d2b64e75a1c417 |
07-Jan-2013 |
Bobby Georgescu <georgescu@google.com> |
Merge "Fix camera->gallery relaunch loop on empty camera album" into gb-ub-photos-bryce
|
617551e3e0016dc5ea9f3f1c4d1c9d8c0eab3f25 |
07-Jan-2013 |
Bobby Georgescu <georgescu@google.com> |
Fix camera->gallery relaunch loop on empty camera album Bug: 7952132 Change-Id: I27325abe32177195d07fe310b8c49aca81af9056
rc/com/android/gallery3d/app/PhotoPage.java
|
db3771f25a819246badc3483ebe1a35919c670b2 |
07-Jan-2013 |
Bobby Georgescu <georgescu@google.com> |
Fix camera->gallery relaunch loop on empty camera album Bug: 7952132 Change-Id: I27325abe32177195d07fe310b8c49aca81af9056
rc/com/android/gallery3d/app/PhotoPage.java
|
0047ea490f84361d30d9913214813d6428c7d39e |
07-Jan-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I4a2393818caed8415a9f7fa571d4153833b34559 Auto-generated-cl: translation import
es/values-af/photoeditor_strings.xml
es/values-am/photoeditor_strings.xml
es/values-ar/photoeditor_strings.xml
es/values-be/photoeditor_strings.xml
es/values-bg/photoeditor_strings.xml
es/values-ca/photoeditor_strings.xml
es/values-cs/photoeditor_strings.xml
es/values-da/photoeditor_strings.xml
es/values-de/photoeditor_strings.xml
es/values-el/photoeditor_strings.xml
es/values-en-rGB/photoeditor_strings.xml
es/values-es-rUS/photoeditor_strings.xml
es/values-es/photoeditor_strings.xml
es/values-et/photoeditor_strings.xml
es/values-fa/photoeditor_strings.xml
es/values-fi/photoeditor_strings.xml
es/values-fr/photoeditor_strings.xml
es/values-hi/photoeditor_strings.xml
es/values-hr/photoeditor_strings.xml
es/values-hu/photoeditor_strings.xml
es/values-in/photoeditor_strings.xml
es/values-it/photoeditor_strings.xml
es/values-iw/photoeditor_strings.xml
es/values-ja/photoeditor_strings.xml
es/values-ko/photoeditor_strings.xml
es/values-lt/photoeditor_strings.xml
es/values-lv/photoeditor_strings.xml
es/values-ms/photoeditor_strings.xml
es/values-nb/photoeditor_strings.xml
es/values-nl/photoeditor_strings.xml
es/values-pl/photoeditor_strings.xml
es/values-pt-rPT/photoeditor_strings.xml
es/values-pt/photoeditor_strings.xml
es/values-ro/photoeditor_strings.xml
es/values-ru/photoeditor_strings.xml
es/values-sk/photoeditor_strings.xml
es/values-sl/photoeditor_strings.xml
es/values-sr/photoeditor_strings.xml
es/values-sv/photoeditor_strings.xml
es/values-sw/photoeditor_strings.xml
es/values-th/photoeditor_strings.xml
es/values-tl/photoeditor_strings.xml
es/values-tr/photoeditor_strings.xml
es/values-uk/photoeditor_strings.xml
es/values-vi/photoeditor_strings.xml
es/values-zh-rCN/photoeditor_strings.xml
es/values-zh-rTW/photoeditor_strings.xml
es/values-zu/photoeditor_strings.xml
|
0e20e759549adfe6e7ea46300b2f4879b9f7d3ba |
02-Jan-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE"
|
e03c6dfb597f66735afa0c09d11ce2232c0d105b |
02-Jan-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
|
5b8f1dc697d368ec189503179f7daaf88aa12cdc |
02-Jan-2013 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
|
03d26a0d390b6231e8cb16f5fceff296995c0f61 |
02-Jan-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I65e0cb236badf30e995e38a1813e452dddb46be4 Auto-generated-cl: translation import
es/values-af/photoeditor_strings.xml
es/values-am/photoeditor_strings.xml
es/values-ar/photoeditor_strings.xml
es/values-be/photoeditor_strings.xml
es/values-bg/photoeditor_strings.xml
es/values-ca/photoeditor_strings.xml
es/values-cs/photoeditor_strings.xml
es/values-da/photoeditor_strings.xml
es/values-de/photoeditor_strings.xml
es/values-el/photoeditor_strings.xml
es/values-en-rGB/photoeditor_strings.xml
es/values-es-rUS/photoeditor_strings.xml
es/values-es/photoeditor_strings.xml
es/values-et/photoeditor_strings.xml
es/values-fa/photoeditor_strings.xml
es/values-fi/photoeditor_strings.xml
es/values-fr/photoeditor_strings.xml
es/values-hi/photoeditor_strings.xml
es/values-hr/photoeditor_strings.xml
es/values-hu/photoeditor_strings.xml
es/values-in/photoeditor_strings.xml
es/values-it/photoeditor_strings.xml
es/values-iw/photoeditor_strings.xml
es/values-ja/photoeditor_strings.xml
es/values-ko/photoeditor_strings.xml
es/values-lt/photoeditor_strings.xml
es/values-lv/photoeditor_strings.xml
es/values-ms/photoeditor_strings.xml
es/values-nb/photoeditor_strings.xml
es/values-nl/photoeditor_strings.xml
es/values-pl/photoeditor_strings.xml
es/values-pt-rPT/photoeditor_strings.xml
es/values-pt/photoeditor_strings.xml
es/values-ro/photoeditor_strings.xml
es/values-ru/photoeditor_strings.xml
es/values-sk/photoeditor_strings.xml
es/values-sl/photoeditor_strings.xml
es/values-sr/photoeditor_strings.xml
es/values-sv/photoeditor_strings.xml
es/values-sw/photoeditor_strings.xml
es/values-th/photoeditor_strings.xml
es/values-tl/photoeditor_strings.xml
es/values-tr/photoeditor_strings.xml
es/values-uk/photoeditor_strings.xml
es/values-vi/photoeditor_strings.xml
es/values-zh-rCN/photoeditor_strings.xml
es/values-zh-rTW/photoeditor_strings.xml
es/values-zu/photoeditor_strings.xml
|
e2cad3312296f34bc4801a1f82a81b0e5d742d30 |
02-Jan-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ia064f134f9ec6404207ccb9d2852681c4f5f1bbe Auto-generated-cl: translation import
es/values-af/filtershow_strings.xml
es/values-am/filtershow_strings.xml
es/values-ar/filtershow_strings.xml
es/values-be/filtershow_strings.xml
es/values-bg/filtershow_strings.xml
es/values-ca/filtershow_strings.xml
es/values-cs/filtershow_strings.xml
es/values-da/filtershow_strings.xml
es/values-de/filtershow_strings.xml
es/values-el/filtershow_strings.xml
es/values-en-rGB/filtershow_strings.xml
es/values-es-rUS/filtershow_strings.xml
es/values-es/filtershow_strings.xml
es/values-et/filtershow_strings.xml
es/values-fa/filtershow_strings.xml
es/values-fi/filtershow_strings.xml
es/values-fr/filtershow_strings.xml
es/values-hi/filtershow_strings.xml
es/values-hr/filtershow_strings.xml
es/values-hu/filtershow_strings.xml
es/values-in/filtershow_strings.xml
es/values-it/filtershow_strings.xml
es/values-iw/filtershow_strings.xml
es/values-ja/filtershow_strings.xml
es/values-ko/filtershow_strings.xml
es/values-lt/filtershow_strings.xml
es/values-lv/filtershow_strings.xml
es/values-ms/filtershow_strings.xml
es/values-nb/filtershow_strings.xml
es/values-nl/filtershow_strings.xml
es/values-pl/filtershow_strings.xml
es/values-pt-rPT/filtershow_strings.xml
es/values-pt/filtershow_strings.xml
es/values-ro/filtershow_strings.xml
es/values-ru/filtershow_strings.xml
es/values-sk/filtershow_strings.xml
es/values-sl/filtershow_strings.xml
es/values-sr/filtershow_strings.xml
es/values-sv/filtershow_strings.xml
es/values-sw/filtershow_strings.xml
es/values-th/filtershow_strings.xml
es/values-tl/filtershow_strings.xml
es/values-tr/filtershow_strings.xml
es/values-uk/filtershow_strings.xml
es/values-vi/filtershow_strings.xml
es/values-zh-rCN/filtershow_strings.xml
es/values-zh-rTW/filtershow_strings.xml
es/values-zu/filtershow_strings.xml
|
71d82d753b17187b10d368b6e1ca94cc498eb587 |
02-Jan-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ia064f134f9ec6404207ccb9d2852681c4f5f1bbe Auto-generated-cl: translation import
es/values-af/filtershow_strings.xml
es/values-am/filtershow_strings.xml
es/values-ar/filtershow_strings.xml
es/values-be/filtershow_strings.xml
es/values-bg/filtershow_strings.xml
es/values-ca/filtershow_strings.xml
es/values-cs/filtershow_strings.xml
es/values-da/filtershow_strings.xml
es/values-de/filtershow_strings.xml
es/values-el/filtershow_strings.xml
es/values-en-rGB/filtershow_strings.xml
es/values-es-rUS/filtershow_strings.xml
es/values-es/filtershow_strings.xml
es/values-et/filtershow_strings.xml
es/values-fa/filtershow_strings.xml
es/values-fi/filtershow_strings.xml
es/values-fr/filtershow_strings.xml
es/values-hi/filtershow_strings.xml
es/values-hr/filtershow_strings.xml
es/values-hu/filtershow_strings.xml
es/values-in/filtershow_strings.xml
es/values-it/filtershow_strings.xml
es/values-iw/filtershow_strings.xml
es/values-ja/filtershow_strings.xml
es/values-ko/filtershow_strings.xml
es/values-lt/filtershow_strings.xml
es/values-lv/filtershow_strings.xml
es/values-ms/filtershow_strings.xml
es/values-nb/filtershow_strings.xml
es/values-nl/filtershow_strings.xml
es/values-pl/filtershow_strings.xml
es/values-pt-rPT/filtershow_strings.xml
es/values-pt/filtershow_strings.xml
es/values-ro/filtershow_strings.xml
es/values-ru/filtershow_strings.xml
es/values-sk/filtershow_strings.xml
es/values-sl/filtershow_strings.xml
es/values-sr/filtershow_strings.xml
es/values-sv/filtershow_strings.xml
es/values-sw/filtershow_strings.xml
es/values-th/filtershow_strings.xml
es/values-tl/filtershow_strings.xml
es/values-tr/filtershow_strings.xml
es/values-uk/filtershow_strings.xml
es/values-vi/filtershow_strings.xml
es/values-zh-rCN/filtershow_strings.xml
es/values-zh-rTW/filtershow_strings.xml
es/values-zu/filtershow_strings.xml
|
fda7ccf76afac5851a0c39a462434dfe4b3aaf72 |
02-Jan-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I954ed667e8e8c28d0c41549231279de3e612d878 Auto-generated-cl: translation import
es/values-th/strings.xml
es/values-tr/strings.xml
|
cd40241b989c67c97e5609468bca5abc9ddd715f |
02-Jan-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I21443ea53d6766eb093262f61c01c145d20e9b6a Auto-generated-cl: translation import
es/values-th/strings.xml
es/values-tr/strings.xml
|
6ad36c35081f9f0ea79ee26ad528177551d0ac98 |
02-Jan-2013 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I21443ea53d6766eb093262f61c01c145d20e9b6a Auto-generated-cl: translation import
es/values-th/strings.xml
es/values-tr/strings.xml
|
44333ecb8ebb4ea172a7847731837a88719cea3f |
28-Dec-2012 |
nicolasroard <nicolasroard@google.com> |
Fix crash when using red eyes correction bug:7680079 Change-Id: Icc6728321f18d09de5676564a3640c4b414c6741
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
|
18e71eb1589f839667207414e5f5cf95ba78a183 |
28-Dec-2012 |
nicolasroard <nicolasroard@google.com> |
Fix crash when using red eyes correction bug:7680079 Change-Id: Icc6728321f18d09de5676564a3640c4b414c6741
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
|
ff6b23e655883f8f42bcf5c806f594512beaa322 |
19-Dec-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Made downsampling filter preview accurate. Bug: 7892268 Change-Id: I9ab3a7f5077b718ed54206666ef9ef289db8facc
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterDownsample.java
|
3c081799a4fff041ee7485de1dd969dcc06d562e |
19-Dec-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Made downsampling filter preview accurate. Bug: 7892268 Change-Id: I9ab3a7f5077b718ed54206666ef9ef289db8facc
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterDownsample.java
|
a2f34e66fb6733ee122b51e36300d851a801e2e2 |
19-Dec-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Change XML character limit for string." into gb-ub-photos-bryce
|
92117a72eb8a01985c4385dadeeddb7aa2ad6588 |
19-Dec-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am 5e86fd15: (-s ours) Reconcile with jb-mr1.1-release - do not merge * commit '5e86fd1570b943e02d8435b2ce27a1806b72ee2c':
|
5e86fd1570b943e02d8435b2ce27a1806b72ee2c |
19-Dec-2012 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with jb-mr1.1-release - do not merge Change-Id: I3381ba02649abcb559115d5bf1e508ca1f361a66
|
9095cf465e3dc55d26cc4f4cc45dc60442868f14 |
07-Dec-2012 |
Earl Ou <shunhsingou@google.com> |
add javadoc for ExifOutputStream Change-Id: Ib7aa3e32e0ae3af143209c0128374fc35ee8faa2
allerycommon/src/com/android/gallery3d/exif/ExifOutputStream.java
|
1ffa0bd331f329442eb8f85e381c9676f09e9673 |
07-Dec-2012 |
Earl Ou <shunhsingou@google.com> |
add javadoc for ExifOutputStream Change-Id: Ib7aa3e32e0ae3af143209c0128374fc35ee8faa2
allerycommon/src/com/android/gallery3d/exif/ExifOutputStream.java
|
3223b4c4505837f2e2347e813fca96bbbe3191aa |
07-Dec-2012 |
Earl Ou <shunhsingou@google.com> |
add javadoc for ExifOutputStream Change-Id: Ib7aa3e32e0ae3af143209c0128374fc35ee8faa2
allerycommon/src/com/android/gallery3d/exif/ExifOutputStream.java
|
428afc0b79d1fa911df89b94c6b1517688667c2d |
07-Dec-2012 |
Earl Ou <shunhsingou@google.com> |
add help function to decode user comment in ExifData Change-Id: Ida19ce45bfc8b00972e751b652d99f6b19798116
allerycommon/src/com/android/gallery3d/exif/ExifData.java
|
bd901975af58c496ea8408b7b8427a0ddab61e22 |
07-Dec-2012 |
Earl Ou <shunhsingou@google.com> |
add help function to decode user comment in ExifData Change-Id: Ida19ce45bfc8b00972e751b652d99f6b19798116
allerycommon/src/com/android/gallery3d/exif/ExifData.java
|
15438682a38ad2887426c100452a990b5e3f965d |
07-Dec-2012 |
Earl Ou <shunhsingou@google.com> |
add help function to decode user comment in ExifData Change-Id: Ida19ce45bfc8b00972e751b652d99f6b19798116
allerycommon/src/com/android/gallery3d/exif/ExifData.java
|
acc9b347ded215b08ea09263812525efafd91b13 |
07-Dec-2012 |
Earl Ou <shunhsingou@google.com> |
add javadoc for Rational and IfdId in Exif package Change-Id: Ie67dde198337e6edae2e94d5c7e97b9b6063833e
allerycommon/src/com/android/gallery3d/exif/IfdId.java
allerycommon/src/com/android/gallery3d/exif/Rational.java
|
4313f3ddeb6afa090cafd5cd4d845d0ee076c8ec |
07-Dec-2012 |
Earl Ou <shunhsingou@google.com> |
add javadoc for Rational and IfdId in Exif package Change-Id: Ie67dde198337e6edae2e94d5c7e97b9b6063833e
allerycommon/src/com/android/gallery3d/exif/IfdId.java
allerycommon/src/com/android/gallery3d/exif/Rational.java
|
1792070857f96943ae110869d66f092001ad526e |
07-Dec-2012 |
Earl Ou <shunhsingou@google.com> |
add javadoc for Rational and IfdId in Exif package Change-Id: Ie67dde198337e6edae2e94d5c7e97b9b6063833e
allerycommon/src/com/android/gallery3d/exif/IfdId.java
allerycommon/src/com/android/gallery3d/exif/Rational.java
|
cdeb78889a0a69de640fecabc40e00b106417ab8 |
07-Dec-2012 |
Earl Ou <shunhsingou@google.com> |
Replace original tags when add tags in ExifTag Change-Id: I80d1507467dcde8c8b157a120cfe9a5f5c664d0f
allerycommon/src/com/android/gallery3d/exif/ExifData.java
|
05a551fa030f0c40c0f522ecbe6f8663a04c02ee |
07-Dec-2012 |
Earl Ou <shunhsingou@google.com> |
Replace original tags when add tags in ExifTag Change-Id: I80d1507467dcde8c8b157a120cfe9a5f5c664d0f
allerycommon/src/com/android/gallery3d/exif/ExifData.java
|
07ddc8ecc8a2bcc3f16bdfb712454a91726726fe |
07-Dec-2012 |
Earl Ou <shunhsingou@google.com> |
Replace original tags when add tags in ExifTag Change-Id: I80d1507467dcde8c8b157a120cfe9a5f5c664d0f
allerycommon/src/com/android/gallery3d/exif/ExifData.java
|
6905fe1e9a08f8f18aa0919265d782c5ee83b2c6 |
06-Dec-2012 |
Earl Ou <shunhsingou@google.com> |
Use ExifOutputStream in SaveCopyTask Change-Id: Ifa68d819249d3871c4a22f6e3dadc69542b9dc28
rc/com/android/gallery3d/filtershow/tools/SaveCopyTask.java
|
2220b0e03ec1192b39d51c70cd70340b7269c3e0 |
06-Dec-2012 |
Earl Ou <shunhsingou@google.com> |
Use ExifOutputStream in SaveCopyTask Change-Id: Ifa68d819249d3871c4a22f6e3dadc69542b9dc28
rc/com/android/gallery3d/filtershow/tools/SaveCopyTask.java
|
f4491f1fee7adda5cf5e3ab71904d41cd3053cfc |
19-Dec-2012 |
Angus Kong <shkong@google.com> |
Merge "Apply ExifModifier for rotation" into gb-ub-photos-bryce
|
9ac82ea62edc0320bab52dd37294d2b52c219961 |
19-Dec-2012 |
Angus Kong <shkong@google.com> |
Merge "Apply ExifModifier for rotation" into gb-ub-photos-bryce
|
71d8735645883929164bc0f4d267808f5a9313af |
19-Dec-2012 |
Angus Kong <shkong@google.com> |
Merge "ExifModifier" into gb-ub-photos-bryce
|
74898c35335554397b0cf37a54f5786e97706186 |
19-Dec-2012 |
Angus Kong <shkong@google.com> |
Merge "ExifModifier" into gb-ub-photos-bryce
|
d81e17b5c783e5eb04c09151c8fd7f3f3aa487e9 |
19-Dec-2012 |
Angus Kong <shkong@google.com> |
Merge "ExifModifier" into gb-ub-photos-bryce
|
b297f4e2f04cbf1a44c1fb76cc87a08ce96bcda5 |
06-Dec-2012 |
Earl Ou <shunhsingou@google.com> |
Apply ExifModifier for rotation Change-Id: Ifa3cee7816ffeacab2415f479234856916acfecf
rc/com/android/gallery3d/data/LocalImage.java
rc/com/android/gallery3d/data/MediaDetails.java
|
dcb9deb9654ba141bfbf9788eab2bc3c83a8f24f |
06-Dec-2012 |
Earl Ou <shunhsingou@google.com> |
Apply ExifModifier for rotation Change-Id: Ifa3cee7816ffeacab2415f479234856916acfecf
rc/com/android/gallery3d/data/LocalImage.java
rc/com/android/gallery3d/data/MediaDetails.java
|
2df5f8e5197ef6091877a2c13217ecd823738785 |
02-Nov-2012 |
Wu-cheng Li <wuchengli@google.com> |
Lock icon in secure album should redirect to gallery after unlock. Use FLAG_DISMISS_KEYGUARD so lock screen will be brought up when launching gallery. bug:7462572 Change-Id: I345398cc6cfc09901e1ce8309ebdb65cf15088e0 The auto-merge of this CL from Arches to Bryce had a merge conflict, so I canceled the auto-merge and then did this manual cherry-pick.
rc/com/android/gallery3d/app/Gallery.java
rc/com/android/gallery3d/app/PhotoPage.java
|
6455ba954daa6dd0a8e114c7db97a8361d064e5a |
02-Nov-2012 |
Wu-cheng Li <wuchengli@google.com> |
Lock icon in secure album should redirect to gallery after unlock. Use FLAG_DISMISS_KEYGUARD so lock screen will be brought up when launching gallery. bug:7462572 Change-Id: I345398cc6cfc09901e1ce8309ebdb65cf15088e0 The auto-merge of this CL from Arches to Bryce had a merge conflict, so I canceled the auto-merge and then did this manual cherry-pick.
rc/com/android/gallery3d/app/Gallery.java
rc/com/android/gallery3d/app/PhotoPage.java
|
643443e1cc8e827ff011c5e6885e5e713c1a481f |
19-Dec-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
|
97cb71043e8dc15948c7dc663504966ff988c4d1 |
18-Dec-2012 |
Bart Sears <bsears@google.com> |
resolved conflicts for merge of 5b188c94 to gb-ub-photos-bryce Change-Id: I0b39e54323c8f2ce67816ec223acf72cfacbd191
|
86ac467628c063e6955e83df4f44e0c7aa862181 |
18-Dec-2012 |
Bart Sears <bsears@google.com> |
resolved conflicts for merge of 5b188c94 to gb-ub-photos-bryce Change-Id: I0b39e54323c8f2ce67816ec223acf72cfacbd191
|
66f20bbe1ab29b84334e7a3177e2a5517c096547 |
18-Dec-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am b4f56f00: am 11c51d45: am d4715aa2: am 5b188c94: Disabled further filters after Tiny Planet. * commit 'b4f56f00d0e69551ed1a1c3fdbe6056e7e6ac259': Disabled further filters after Tiny Planet.
|
b4f56f00d0e69551ed1a1c3fdbe6056e7e6ac259 |
18-Dec-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am 11c51d45: am d4715aa2: am 5b188c94: Disabled further filters after Tiny Planet. * commit '11c51d455514074402c92c7edb4fc6f41e81664b': Disabled further filters after Tiny Planet.
|
11c51d455514074402c92c7edb4fc6f41e81664b |
18-Dec-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am d4715aa2: am 5b188c94: Disabled further filters after Tiny Planet. * commit 'd4715aa246786ee68b93d9eaef948fa4772b8fd8': Disabled further filters after Tiny Planet.
|
d4715aa246786ee68b93d9eaef948fa4772b8fd8 |
18-Dec-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am 5b188c94: Disabled further filters after Tiny Planet. * commit '5b188c94f5895cd166fc29def1e5295498e298c9': Disabled further filters after Tiny Planet.
|
d19d7bfa9c5911f49d7adb76c1b602b3415735be |
18-Dec-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Change XML character limit for string. Bug: 7875246 Change-Id: I883fd175db85efcacfae32c6c690480c8f3c7484
es/values/filtershow_strings.xml
|
19e70bd68806c784cc856509b3eaf3da2d2e9f89 |
18-Dec-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Change XML character limit for string. Bug: 7875246 Change-Id: I883fd175db85efcacfae32c6c690480c8f3c7484
es/values/filtershow_strings.xml
|
2b5021d525229c759f0b57b8a607520d081a3084 |
18-Dec-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Disabled further filters after Tiny Planet. Bug: 7407176 Temporary fix. We need to handle filters changing the image geometry properly. Change-Id: I405b83acddec4e3b88a8a1d70dc534df15c37f1c
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/PanelController.java
|
5b188c94f5895cd166fc29def1e5295498e298c9 |
18-Dec-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Disabled further filters after Tiny Planet. Bug: 7407176 Temporary fix. We need to handle filters changing the image geometry properly. Change-Id: I405b83acddec4e3b88a8a1d70dc534df15c37f1c
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/PanelController.java
|
04359d5ddb1c69da3671ca285553d51b846c4fe2 |
17-Dec-2012 |
George Mount <mount@google.com> |
Merge "Move LightCycle to render directly to GLRootView." into gb-ub-photos-bryce
|
8b18f0379dcc9991c9596a32ce172b09d9a4aaad |
17-Dec-2012 |
George Mount <mount@google.com> |
Merge "Move LightCycle to render directly to GLRootView." into gb-ub-photos-bryce
|
86616448866336aa294b88cfd93b5603e4207f88 |
11-Dec-2012 |
George Mount <mount@google.com> |
Move LightCycle to render directly to GLRootView. Change-Id: I298ef7127d86ca37067ffa953640aad1747961f9
rc/com/android/gallery3d/glrenderer/GLCanvas.java
rc/com/android/gallery3d/glrenderer/GLES11Canvas.java
rc/com/android/gallery3d/glrenderer/GLES20Canvas.java
ests/src/com/android/gallery3d/ui/GLCanvasStub.java
|
64072a071151b55fcbf97f6204d3c2258db386fa |
11-Dec-2012 |
George Mount <mount@google.com> |
Move LightCycle to render directly to GLRootView. Change-Id: I298ef7127d86ca37067ffa953640aad1747961f9
rc/com/android/gallery3d/glrenderer/GLCanvas.java
rc/com/android/gallery3d/glrenderer/GLES11Canvas.java
rc/com/android/gallery3d/glrenderer/GLES20Canvas.java
ests/src/com/android/gallery3d/ui/GLCanvasStub.java
|
e2bade8aee27e29debfa711754dc7eca6275ec0b |
17-Dec-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Improved performance for Kmeans filter. Bug: 7739334 Change-Id: I5ab1eb429d65f84449a61deca962a47f2b6dbc8b
ni/filters/kmeans.cc
ni/filters/kmeans.h
|
7b2f1faec6055175884a5d2dbf317bea2c602b96 |
17-Dec-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Improved performance for Kmeans filter. Bug: 7739334 Change-Id: I5ab1eb429d65f84449a61deca962a47f2b6dbc8b
rc/com/android/gallery3d/filtershow/filters/ImageFilterKMeans.java
|
f83b26c24ad2e3f6c9468afe18f43d1b53162fe3 |
17-Dec-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Improved performance for Kmeans filter. Bug: 7739334 Change-Id: I5ab1eb429d65f84449a61deca962a47f2b6dbc8b
ni/filters/kmeans.cc
ni/filters/kmeans.h
rc/com/android/gallery3d/filtershow/filters/ImageFilterKMeans.java
|
fcf54601d45bfcef2fbeb911c46ff394e84d7011 |
13-Dec-2012 |
Doris Liu <tianliu@google.com> |
Add relativePath field into photo widget db Bug: 7481248 The bug is caused by the change of external storage going from JB to JBMR1. In light of this change, a new field has been added to the photo widget app database to store the relative path for the local album. With the relative paths stored, the widget app should be more resilient to future storage path changes. Change-Id: Ia2497b882ae67178fa0632f23e07673b82d3a942
rc/com/android/gallery3d/data/LocalAlbum.java
rc/com/android/gallery3d/gadget/WidgetConfigure.java
rc/com/android/gallery3d/gadget/WidgetDatabaseHelper.java
rc/com/android/gallery3d/onetimeinitializer/GalleryWidgetMigrator.java
rc/com/android/gallery3d/util/BucketNames.java
rc/com/android/gallery3d/util/GalleryUtils.java
rc/com/android/gallery3d/util/MediaSetUtils.java
|
3b0ed25fd416934fabb7003c1d2981b3a311186d |
13-Dec-2012 |
Doris Liu <tianliu@google.com> |
Add relativePath field into photo widget db Bug: 7481248 The bug is caused by the change of external storage going from JB to JBMR1. In light of this change, a new field has been added to the photo widget app database to store the relative path for the local album. With the relative paths stored, the widget app should be more resilient to future storage path changes. Change-Id: Ia2497b882ae67178fa0632f23e07673b82d3a942
rc/com/android/gallery3d/data/LocalAlbum.java
rc/com/android/gallery3d/gadget/WidgetConfigure.java
rc/com/android/gallery3d/gadget/WidgetDatabaseHelper.java
rc/com/android/gallery3d/onetimeinitializer/GalleryWidgetMigrator.java
rc/com/android/gallery3d/util/BucketNames.java
rc/com/android/gallery3d/util/GalleryUtils.java
rc/com/android/gallery3d/util/MediaSetUtils.java
|
7ea726229477e82ff121b0b5b32b4c220cb4122f |
14-Dec-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE"
|
89de9e2805033dc3d47d8494cf7a7476d293e5c9 |
14-Dec-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I5452e1e1fb7adb77481fb593bd3b4cf55bb49dba Auto-generated-cl: translation import
es/values-af/photoeditor_strings.xml
es/values-am/photoeditor_strings.xml
es/values-ar/photoeditor_strings.xml
es/values-be/photoeditor_strings.xml
es/values-bg/photoeditor_strings.xml
es/values-ca/photoeditor_strings.xml
es/values-cs/photoeditor_strings.xml
es/values-da/photoeditor_strings.xml
es/values-de/photoeditor_strings.xml
es/values-el/photoeditor_strings.xml
es/values-en-rGB/photoeditor_strings.xml
es/values-es-rUS/photoeditor_strings.xml
es/values-es/photoeditor_strings.xml
es/values-et/photoeditor_strings.xml
es/values-fa/photoeditor_strings.xml
es/values-fi/photoeditor_strings.xml
es/values-fr/photoeditor_strings.xml
es/values-hi/photoeditor_strings.xml
es/values-hr/photoeditor_strings.xml
es/values-hu/photoeditor_strings.xml
es/values-in/photoeditor_strings.xml
es/values-it/photoeditor_strings.xml
es/values-iw/photoeditor_strings.xml
es/values-ja/photoeditor_strings.xml
es/values-ko/photoeditor_strings.xml
es/values-lt/photoeditor_strings.xml
es/values-lv/photoeditor_strings.xml
es/values-ms/photoeditor_strings.xml
es/values-nb/photoeditor_strings.xml
es/values-nl/photoeditor_strings.xml
es/values-pl/photoeditor_strings.xml
es/values-pt-rPT/photoeditor_strings.xml
es/values-pt/photoeditor_strings.xml
es/values-ro/photoeditor_strings.xml
es/values-ru/photoeditor_strings.xml
es/values-sk/photoeditor_strings.xml
es/values-sl/photoeditor_strings.xml
es/values-sr/photoeditor_strings.xml
es/values-sv/photoeditor_strings.xml
es/values-sw/photoeditor_strings.xml
es/values-th/photoeditor_strings.xml
es/values-tl/photoeditor_strings.xml
es/values-tr/photoeditor_strings.xml
es/values-uk/photoeditor_strings.xml
es/values-vi/photoeditor_strings.xml
es/values-zh-rCN/photoeditor_strings.xml
es/values-zh-rTW/photoeditor_strings.xml
es/values-zu/photoeditor_strings.xml
|
eab68dbc1a344dfadcbc0ce622a4d212aaac24b1 |
14-Dec-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
|
1d9d1376e5bd34a7723a98322d9928765300cec1 |
14-Dec-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
|
d7c51fe4a63b9ce999fd024d3207cc224127ed50 |
14-Dec-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ief7fd6315479227b744f9dc8a4c93d5d1f8094bf Auto-generated-cl: translation import
es/values-af/filtershow_strings.xml
es/values-am/filtershow_strings.xml
es/values-ar/filtershow_strings.xml
es/values-be/filtershow_strings.xml
es/values-bg/filtershow_strings.xml
es/values-ca/filtershow_strings.xml
es/values-cs/filtershow_strings.xml
es/values-da/filtershow_strings.xml
es/values-de/filtershow_strings.xml
es/values-el/filtershow_strings.xml
es/values-en-rGB/filtershow_strings.xml
es/values-es-rUS/filtershow_strings.xml
es/values-es/filtershow_strings.xml
es/values-et/filtershow_strings.xml
es/values-fa/filtershow_strings.xml
es/values-fi/filtershow_strings.xml
es/values-fr/filtershow_strings.xml
es/values-hi/filtershow_strings.xml
es/values-hr/filtershow_strings.xml
es/values-hu/filtershow_strings.xml
es/values-in/filtershow_strings.xml
es/values-it/filtershow_strings.xml
es/values-iw/filtershow_strings.xml
es/values-ja/filtershow_strings.xml
es/values-ko/filtershow_strings.xml
es/values-lt/filtershow_strings.xml
es/values-lv/filtershow_strings.xml
es/values-ms/filtershow_strings.xml
es/values-nb/filtershow_strings.xml
es/values-nl/filtershow_strings.xml
es/values-pl/filtershow_strings.xml
es/values-pt-rPT/filtershow_strings.xml
es/values-pt/filtershow_strings.xml
es/values-ro/filtershow_strings.xml
es/values-ru/filtershow_strings.xml
es/values-sk/filtershow_strings.xml
es/values-sl/filtershow_strings.xml
es/values-sr/filtershow_strings.xml
es/values-sv/filtershow_strings.xml
es/values-sw/filtershow_strings.xml
es/values-th/filtershow_strings.xml
es/values-tl/filtershow_strings.xml
es/values-tr/filtershow_strings.xml
es/values-uk/filtershow_strings.xml
es/values-vi/filtershow_strings.xml
es/values-zh-rCN/filtershow_strings.xml
es/values-zh-rTW/filtershow_strings.xml
es/values-zu/filtershow_strings.xml
|
0cead645e5635a343e8a5fd4950336b48da5a5f4 |
14-Dec-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ief7fd6315479227b744f9dc8a4c93d5d1f8094bf Auto-generated-cl: translation import
es/values-af/filtershow_strings.xml
es/values-am/filtershow_strings.xml
es/values-ar/filtershow_strings.xml
es/values-be/filtershow_strings.xml
es/values-bg/filtershow_strings.xml
es/values-ca/filtershow_strings.xml
es/values-cs/filtershow_strings.xml
es/values-da/filtershow_strings.xml
es/values-de/filtershow_strings.xml
es/values-el/filtershow_strings.xml
es/values-en-rGB/filtershow_strings.xml
es/values-es-rUS/filtershow_strings.xml
es/values-es/filtershow_strings.xml
es/values-et/filtershow_strings.xml
es/values-fa/filtershow_strings.xml
es/values-fi/filtershow_strings.xml
es/values-fr/filtershow_strings.xml
es/values-hi/filtershow_strings.xml
es/values-hr/filtershow_strings.xml
es/values-hu/filtershow_strings.xml
es/values-in/filtershow_strings.xml
es/values-it/filtershow_strings.xml
es/values-iw/filtershow_strings.xml
es/values-ja/filtershow_strings.xml
es/values-ko/filtershow_strings.xml
es/values-lt/filtershow_strings.xml
es/values-lv/filtershow_strings.xml
es/values-ms/filtershow_strings.xml
es/values-nb/filtershow_strings.xml
es/values-nl/filtershow_strings.xml
es/values-pl/filtershow_strings.xml
es/values-pt-rPT/filtershow_strings.xml
es/values-pt/filtershow_strings.xml
es/values-ro/filtershow_strings.xml
es/values-ru/filtershow_strings.xml
es/values-sk/filtershow_strings.xml
es/values-sl/filtershow_strings.xml
es/values-sr/filtershow_strings.xml
es/values-sv/filtershow_strings.xml
es/values-sw/filtershow_strings.xml
es/values-th/filtershow_strings.xml
es/values-tl/filtershow_strings.xml
es/values-tr/filtershow_strings.xml
es/values-uk/filtershow_strings.xml
es/values-vi/filtershow_strings.xml
es/values-zh-rCN/filtershow_strings.xml
es/values-zh-rTW/filtershow_strings.xml
es/values-zu/filtershow_strings.xml
|
587e36a64a9dbec745e6106a4c4ac91bb542d038 |
14-Dec-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ib954a454a49bb19e99d7faa0f930ef423f4f0712 Auto-generated-cl: translation import
es/values-pt/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-zh-rTW/strings.xml
|
1d3fb72ebd27b04d68e835545bd4529916513233 |
14-Dec-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ie43a18a662cb75c76dcfb807ab9686388fd4e36c Auto-generated-cl: translation import
es/values-ca/strings.xml
es/values-pt/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sw/strings.xml
es/values-zh-rTW/strings.xml
|
cbf20621564f6ba0782625a00f371e748a41d7c3 |
14-Dec-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ie43a18a662cb75c76dcfb807ab9686388fd4e36c Auto-generated-cl: translation import
es/values-ca/strings.xml
es/values-pt/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sw/strings.xml
es/values-zh-rTW/strings.xml
|
b8378fae9f19191d2706e3579158aaf3c2ffe75e |
14-Dec-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Gallery in separate task for up button in Camera filmstrip" into gb-ub-photos-bryce
|
b2b91aa64068c482961e52a5d74fcdf93b002f51 |
14-Dec-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Gallery in separate task for up button in Camera filmstrip" into gb-ub-photos-bryce
|
f40318094c182bf2fb39e817d10bdb86782d93f0 |
14-Dec-2012 |
Bobby Georgescu <georgescu@google.com> |
Gallery in separate task for up button in Camera filmstrip Bug: 7738398 Change-Id: I297c15f0a3e537d96d79b05e1dd8d376ff59bfca
rc/com/android/gallery3d/util/GalleryUtils.java
|
a225ddd9a74b0354ee391cc52512163880754d8c |
14-Dec-2012 |
Bobby Georgescu <georgescu@google.com> |
Gallery in separate task for up button in Camera filmstrip Bug: 7738398 Change-Id: I297c15f0a3e537d96d79b05e1dd8d376ff59bfca
rc/com/android/gallery3d/util/GalleryUtils.java
|
32d5c41dfbec0b929dbecfb0a8c9c3cda22a2d30 |
14-Dec-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Removed filtershow geometry editor preview interpolating. It looks bad. Change-Id: I790ce00e85c835f73c076f79cde5e65236131f49
rc/com/android/gallery3d/filtershow/imageshow/ImageCrop.java
rc/com/android/gallery3d/filtershow/imageshow/ImageFlip.java
rc/com/android/gallery3d/filtershow/imageshow/ImageRotate.java
|
7f7357a2e11351d82e4de2c6dc5fb8aa4d22e448 |
14-Dec-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Removed filtershow geometry editor preview interpolating. It looks bad. Change-Id: I790ce00e85c835f73c076f79cde5e65236131f49
rc/com/android/gallery3d/filtershow/imageshow/ImageCrop.java
rc/com/android/gallery3d/filtershow/imageshow/ImageFlip.java
rc/com/android/gallery3d/filtershow/imageshow/ImageRotate.java
|
0ff6da23784a3bae03bcad6d97840815e70c977a |
14-Dec-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Remove preview dithering from Geometry editor in filtershow. Bug: 7739904 Change-Id: I25c3cbe8907dd921aeb68f217fa9703e703d34a8
rc/com/android/gallery3d/filtershow/imageshow/ImageCrop.java
rc/com/android/gallery3d/filtershow/imageshow/ImageFlip.java
rc/com/android/gallery3d/filtershow/imageshow/ImageRotate.java
|
531e398d68b45d3be2e131e37236bcf08552ae70 |
14-Dec-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Remove preview dithering from Geometry editor in filtershow. Bug: 7739904 Change-Id: I25c3cbe8907dd921aeb68f217fa9703e703d34a8
rc/com/android/gallery3d/filtershow/imageshow/ImageCrop.java
rc/com/android/gallery3d/filtershow/imageshow/ImageFlip.java
rc/com/android/gallery3d/filtershow/imageshow/ImageRotate.java
|
567cecf252f3942093634ce6deda95edcb90ff7e |
14-Dec-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Refactoring: removed unused presets." into gb-ub-photos-bryce
|
a0e4fb160e5e8e66f4e749933824d127d725f0aa |
14-Dec-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Refactoring: removed unused presets." into gb-ub-photos-bryce
|
af2ea50e6d635ac348fbfbf8cbafb048f04d8f67 |
14-Dec-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Refactoring: removed unused presets." into gb-ub-photos-bryce
|
ad371854c2371dcb0bdf91acdba328efc10b843d |
14-Dec-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Added downsampling filter. Bug: 7690079 Change-Id: I235524127da848b1cbcca159cec43d1e0dcb5bf2
es/values/filtershow_ids.xml
es/values/filtershow_strings.xml
|
dc5dddc441e8445f3ac22d084175942229c253cf |
14-Dec-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Added downsampling filter. Bug: 7690079 Change-Id: I235524127da848b1cbcca159cec43d1e0dcb5bf2
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterDownsample.java
|
b5abda28145e68e68a74a5aa2004361cf62edcc2 |
14-Dec-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Added downsampling filter. Bug: 7690079 Change-Id: I235524127da848b1cbcca159cec43d1e0dcb5bf2
es/values/filtershow_ids.xml
es/values/filtershow_strings.xml
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterDownsample.java
|
ecc6b7c41d86ac822a11ff794de93dd9bb4bf2dc |
14-Dec-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Refactoring: removed unused presets. Change-Id: I1390bf65048a6cbd4dee5ee9cd472dc440352860
rc/com/android/gallery3d/filtershow/presets/ImagePresetFX.java
rc/com/android/gallery3d/filtershow/presets/ImagePresetOld.java
rc/com/android/gallery3d/filtershow/presets/ImagePresetSaturated.java
rc/com/android/gallery3d/filtershow/presets/ImagePresetXProcessing.java
|
f4d3a216361375f1ad846bfb88fba66b014d2901 |
14-Dec-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Refactoring: removed unused presets. Change-Id: I1390bf65048a6cbd4dee5ee9cd472dc440352860
rc/com/android/gallery3d/filtershow/presets/ImagePresetFX.java
rc/com/android/gallery3d/filtershow/presets/ImagePresetOld.java
rc/com/android/gallery3d/filtershow/presets/ImagePresetSaturated.java
rc/com/android/gallery3d/filtershow/presets/ImagePresetXProcessing.java
|
8e55801c5a24cccde84df509b7c6b560dd744eca |
14-Dec-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Refactoring: removed unused presets. Change-Id: I1390bf65048a6cbd4dee5ee9cd472dc440352860
rc/com/android/gallery3d/filtershow/presets/ImagePresetFX.java
rc/com/android/gallery3d/filtershow/presets/ImagePresetOld.java
rc/com/android/gallery3d/filtershow/presets/ImagePresetSaturated.java
rc/com/android/gallery3d/filtershow/presets/ImagePresetXProcessing.java
|
9fc2f6cacba8079392eeaa4917d5eed3613df2be |
14-Dec-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Refactoring: removed unused filters." into gb-ub-photos-bryce
|
b15e4ecb5a8b17b9d1c871fedea3c46de11d0725 |
14-Dec-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Refactoring: removed unused filters." into gb-ub-photos-bryce
|
b2f247847838c4eeb971be06d0c241101093ae3d |
14-Dec-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Refactoring: removed old filtershow slider." into gb-ub-photos-bryce
|
4af6d6a77ad15d49605aaf9451d713eb70b6b619 |
14-Dec-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Refactoring: removed old filtershow slider." into gb-ub-photos-bryce
|
3b8066f77fba0673db8ecfc0916da27f09ee565d |
14-Dec-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Refactoring: removed unused filters. Change-Id: If6344fde16607ab9dddb25922d295b1df205df6b
ni/Android.mk
|
d89b654d50f714fdf32cb1a36c2c8860d0d6a933 |
14-Dec-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Refactoring: removed unused filters. Change-Id: If6344fde16607ab9dddb25922d295b1df205df6b
ni/Android.mk
ni/filters/bw.c
|
6be0072b65e412c84c7e7f194b42b5cbc20e85f1 |
14-Dec-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Refactoring: removed unused filters. Change-Id: If6344fde16607ab9dddb25922d295b1df205df6b
rc/com/android/gallery3d/filtershow/presets/ImagePresetBW.java
rc/com/android/gallery3d/filtershow/presets/ImagePresetBWBlue.java
rc/com/android/gallery3d/filtershow/presets/ImagePresetBWGreen.java
rc/com/android/gallery3d/filtershow/presets/ImagePresetBWRed.java
|
1e9023d8689a1167dc8890dc7306778857bc485e |
14-Dec-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Refactoring: removed unused filters. Change-Id: If6344fde16607ab9dddb25922d295b1df205df6b
rc/com/android/gallery3d/filtershow/filters/ImageFilterBW.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterBWBlue.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterBWGreen.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterBWRed.java
rc/com/android/gallery3d/filtershow/presets/ImagePresetBW.java
rc/com/android/gallery3d/filtershow/presets/ImagePresetBWBlue.java
rc/com/android/gallery3d/filtershow/presets/ImagePresetBWGreen.java
rc/com/android/gallery3d/filtershow/presets/ImagePresetBWRed.java
|
101789e44aa3effabc76da87c405ac9994678f0a |
14-Dec-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Refactoring: removed unused filters. Change-Id: If6344fde16607ab9dddb25922d295b1df205df6b
ni/Android.mk
ni/filters/bw.c
rc/com/android/gallery3d/filtershow/filters/ImageFilterBW.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterBWBlue.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterBWGreen.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterBWRed.java
rc/com/android/gallery3d/filtershow/presets/ImagePresetBW.java
rc/com/android/gallery3d/filtershow/presets/ImagePresetBWBlue.java
rc/com/android/gallery3d/filtershow/presets/ImagePresetBWGreen.java
rc/com/android/gallery3d/filtershow/presets/ImagePresetBWRed.java
|
19ce6823b6f7f3779f0695dd73b5733e5391c8be |
14-Dec-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Refactoring: removed old filtershow slider. Change-Id: Iebd2f18c0f4819e7ff32be638e96b519f3ce905c
rc/com/android/gallery3d/filtershow/imageshow/ImageShow.java
rc/com/android/gallery3d/filtershow/imageshow/ImageZoom.java
|
d2c8521454d8bebd752eacefa33adf28ed97d34f |
14-Dec-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Refactoring: removed old filtershow slider. Change-Id: Iebd2f18c0f4819e7ff32be638e96b519f3ce905c
rc/com/android/gallery3d/filtershow/imageshow/ImageShow.java
rc/com/android/gallery3d/filtershow/imageshow/ImageZoom.java
|
e5465d339fd64f7c07d776ebb3ecaf46640b2df1 |
14-Dec-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Fix Seekbar infinite recursion. Bug: 7739384 Change-Id: Ie76d6741be4d08f3f9919662f1ad558c809aa5bd
rc/com/android/gallery3d/filtershow/filters/ImageFilter.java
rc/com/android/gallery3d/filtershow/imageshow/ImageShow.java
|
49e31adb4d03ecd9a8972d61493853a96b62e7e4 |
14-Dec-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Fix Seekbar infinite recursion. Bug: 7739384 Change-Id: Ie76d6741be4d08f3f9919662f1ad558c809aa5bd
rc/com/android/gallery3d/filtershow/filters/ImageFilter.java
rc/com/android/gallery3d/filtershow/imageshow/ImageShow.java
|
dd83e926de0b41796bcb2218653e629296986e61 |
13-Dec-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Added K-Means clustering filter." into gb-ub-photos-bryce
|
35f43ff592434dd28c572a9330ea1b681c13f82f |
13-Dec-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Added K-Means clustering filter." into gb-ub-photos-bryce
|
17470492233c4940216396a4261c1d762f881a8d |
13-Dec-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE"
|
6534f09fe42e9e9efd1582ba00a5a1515a8ec591 |
13-Dec-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
|
f86a12580bdbf6538d0284bd48f9afecfc0dfdda |
13-Dec-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
|
aa0f05671167feeea2a5675aeaf15991b1618241 |
13-Dec-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I9aab4e3a22c5c771538b57def44a53a442963120 Auto-generated-cl: translation import
es/values-af/photoeditor_strings.xml
es/values-am/photoeditor_strings.xml
es/values-ar/photoeditor_strings.xml
es/values-be/photoeditor_strings.xml
es/values-bg/photoeditor_strings.xml
es/values-ca/photoeditor_strings.xml
es/values-cs/photoeditor_strings.xml
es/values-da/photoeditor_strings.xml
es/values-de/photoeditor_strings.xml
es/values-el/photoeditor_strings.xml
es/values-en-rGB/photoeditor_strings.xml
es/values-es-rUS/photoeditor_strings.xml
es/values-es/photoeditor_strings.xml
es/values-et/photoeditor_strings.xml
es/values-fa/photoeditor_strings.xml
es/values-fi/photoeditor_strings.xml
es/values-fr/photoeditor_strings.xml
es/values-hi/photoeditor_strings.xml
es/values-hr/photoeditor_strings.xml
es/values-hu/photoeditor_strings.xml
es/values-in/photoeditor_strings.xml
es/values-it/photoeditor_strings.xml
es/values-iw/photoeditor_strings.xml
es/values-ja/photoeditor_strings.xml
es/values-ko/photoeditor_strings.xml
es/values-lt/photoeditor_strings.xml
es/values-lv/photoeditor_strings.xml
es/values-ms/photoeditor_strings.xml
es/values-nb/photoeditor_strings.xml
es/values-nl/photoeditor_strings.xml
es/values-pl/photoeditor_strings.xml
es/values-pt-rPT/photoeditor_strings.xml
es/values-pt/photoeditor_strings.xml
es/values-ro/photoeditor_strings.xml
es/values-ru/photoeditor_strings.xml
es/values-sk/photoeditor_strings.xml
es/values-sl/photoeditor_strings.xml
es/values-sr/photoeditor_strings.xml
es/values-sv/photoeditor_strings.xml
es/values-sw/photoeditor_strings.xml
es/values-th/photoeditor_strings.xml
es/values-tl/photoeditor_strings.xml
es/values-tr/photoeditor_strings.xml
es/values-uk/photoeditor_strings.xml
es/values-vi/photoeditor_strings.xml
es/values-zh-rCN/photoeditor_strings.xml
es/values-zh-rTW/photoeditor_strings.xml
es/values-zu/photoeditor_strings.xml
|
08e8df4b39af37e9afebf99371483e0cd75a36db |
13-Dec-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I173975f38a7e63e4d87c56e83c24f4e81dc82c7b Auto-generated-cl: translation import
es/values-af/filtershow_strings.xml
es/values-am/filtershow_strings.xml
es/values-ar/filtershow_strings.xml
es/values-be/filtershow_strings.xml
es/values-bg/filtershow_strings.xml
es/values-ca/filtershow_strings.xml
es/values-cs/filtershow_strings.xml
es/values-da/filtershow_strings.xml
es/values-de/filtershow_strings.xml
es/values-el/filtershow_strings.xml
es/values-en-rGB/filtershow_strings.xml
es/values-es-rUS/filtershow_strings.xml
es/values-es/filtershow_strings.xml
es/values-et/filtershow_strings.xml
es/values-fa/filtershow_strings.xml
es/values-fi/filtershow_strings.xml
es/values-fr/filtershow_strings.xml
es/values-hi/filtershow_strings.xml
es/values-hr/filtershow_strings.xml
es/values-hu/filtershow_strings.xml
es/values-in/filtershow_strings.xml
es/values-it/filtershow_strings.xml
es/values-iw/filtershow_strings.xml
es/values-ja/filtershow_strings.xml
es/values-ko/filtershow_strings.xml
es/values-lt/filtershow_strings.xml
es/values-lv/filtershow_strings.xml
es/values-ms/filtershow_strings.xml
es/values-nb/filtershow_strings.xml
es/values-nl/filtershow_strings.xml
es/values-pl/filtershow_strings.xml
es/values-pt-rPT/filtershow_strings.xml
es/values-pt/filtershow_strings.xml
es/values-ro/filtershow_strings.xml
es/values-ru/filtershow_strings.xml
es/values-sk/filtershow_strings.xml
es/values-sl/filtershow_strings.xml
es/values-sr/filtershow_strings.xml
es/values-sv/filtershow_strings.xml
es/values-sw/filtershow_strings.xml
es/values-th/filtershow_strings.xml
es/values-tl/filtershow_strings.xml
es/values-tr/filtershow_strings.xml
es/values-uk/filtershow_strings.xml
es/values-vi/filtershow_strings.xml
es/values-zh-rCN/filtershow_strings.xml
es/values-zh-rTW/filtershow_strings.xml
es/values-zu/filtershow_strings.xml
|
0016030f9b03dd8a7ad29f0ba06229b84c8884d7 |
13-Dec-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I173975f38a7e63e4d87c56e83c24f4e81dc82c7b Auto-generated-cl: translation import
es/values-af/filtershow_strings.xml
es/values-am/filtershow_strings.xml
es/values-ar/filtershow_strings.xml
es/values-be/filtershow_strings.xml
es/values-bg/filtershow_strings.xml
es/values-ca/filtershow_strings.xml
es/values-cs/filtershow_strings.xml
es/values-da/filtershow_strings.xml
es/values-de/filtershow_strings.xml
es/values-el/filtershow_strings.xml
es/values-en-rGB/filtershow_strings.xml
es/values-es-rUS/filtershow_strings.xml
es/values-es/filtershow_strings.xml
es/values-et/filtershow_strings.xml
es/values-fa/filtershow_strings.xml
es/values-fi/filtershow_strings.xml
es/values-fr/filtershow_strings.xml
es/values-hi/filtershow_strings.xml
es/values-hr/filtershow_strings.xml
es/values-hu/filtershow_strings.xml
es/values-in/filtershow_strings.xml
es/values-it/filtershow_strings.xml
es/values-iw/filtershow_strings.xml
es/values-ja/filtershow_strings.xml
es/values-ko/filtershow_strings.xml
es/values-lt/filtershow_strings.xml
es/values-lv/filtershow_strings.xml
es/values-ms/filtershow_strings.xml
es/values-nb/filtershow_strings.xml
es/values-nl/filtershow_strings.xml
es/values-pl/filtershow_strings.xml
es/values-pt-rPT/filtershow_strings.xml
es/values-pt/filtershow_strings.xml
es/values-ro/filtershow_strings.xml
es/values-ru/filtershow_strings.xml
es/values-sk/filtershow_strings.xml
es/values-sl/filtershow_strings.xml
es/values-sr/filtershow_strings.xml
es/values-sv/filtershow_strings.xml
es/values-sw/filtershow_strings.xml
es/values-th/filtershow_strings.xml
es/values-tl/filtershow_strings.xml
es/values-tr/filtershow_strings.xml
es/values-uk/filtershow_strings.xml
es/values-vi/filtershow_strings.xml
es/values-zh-rCN/filtershow_strings.xml
es/values-zh-rTW/filtershow_strings.xml
es/values-zu/filtershow_strings.xml
|
10dc8270fa0c5c264dbbf1da5da7e83f6ad23c3f |
13-Dec-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I70e428ab6b8823ca6b252c709f16ea97fd1e9bdf Auto-generated-cl: translation import
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
|
c091c33edb0ebf5f5cee7d89c9159a9c8063a27c |
13-Dec-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ic21db8c05d777a50207372556d1f9a7cb6450831 Auto-generated-cl: translation import
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
|
5038d6253b92df71e7c3b14dcd3684427ca544c8 |
13-Dec-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ic21db8c05d777a50207372556d1f9a7cb6450831 Auto-generated-cl: translation import
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
|
7f7f875515cbafa91ca935748e6f9e97fa0b6b76 |
13-Dec-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Added K-Means clustering filter. Change-Id: If8961d4a21de953b754cf74aefc222b6bec902a3
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterEdge.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterKMeans.java
|
3805af7e9fe8886f5daa0463aa82e82f9b107609 |
13-Dec-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Added K-Means clustering filter. Change-Id: If8961d4a21de953b754cf74aefc222b6bec902a3
ni/Android.mk
|
38993ed6b4bf0ac767083afb443d7f791d23efce |
13-Dec-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Added K-Means clustering filter. Change-Id: If8961d4a21de953b754cf74aefc222b6bec902a3
ni/Android.mk
ni/filters/kmeans.cc
ni/filters/kmeans.h
|
27fb72ee1413871b4958ab2f24a229574de6ffa2 |
13-Dec-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Added K-Means clustering filter. Change-Id: If8961d4a21de953b754cf74aefc222b6bec902a3
ni/Android.mk
ni/filters/kmeans.cc
ni/filters/kmeans.h
es/values/filtershow_ids.xml
es/values/filtershow_strings.xml
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterEdge.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterKMeans.java
|
23c72bfb18fb8caad09456beda9f7050cf3f140c |
13-Dec-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Added K-Means clustering filter. Change-Id: If8961d4a21de953b754cf74aefc222b6bec902a3
es/values/filtershow_ids.xml
es/values/filtershow_strings.xml
|
8fd29857977e3ca763266704e2a2c35a59cb522d |
13-Dec-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Removed unused photoeditor resources. Change-Id: I415918ba5ae8a6c1a4521ec4dcfc1fab337bd3dd
es/anim/photoeditor_fade_in.xml
es/anim/photoeditor_fade_out.xml
es/drawable-hdpi/photoeditor_tab_selected_focused_holo.9.png
es/drawable-hdpi/photoeditor_tab_selected_holo.9.png
es/drawable-hdpi/photoeditor_tab_selected_pressed_holo.9.png
es/drawable-hdpi/photoeditor_tab_unselected_focused_holo.9.png
es/drawable-hdpi/photoeditor_tab_unselected_pressed_holo.9.png
es/drawable-mdpi/photoeditor_tab_selected_focused_holo.9.png
es/drawable-mdpi/photoeditor_tab_selected_holo.9.png
es/drawable-mdpi/photoeditor_tab_selected_pressed_holo.9.png
es/drawable-mdpi/photoeditor_tab_unselected_focused_holo.9.png
es/drawable-mdpi/photoeditor_tab_unselected_pressed_holo.9.png
es/drawable-sw600dp/photoeditor_scale_seekbar_color.png
es/drawable-sw600dp/photoeditor_scale_seekbar_generic.png
es/drawable-sw600dp/photoeditor_scale_seekbar_light.png
es/drawable-sw600dp/photoeditor_scale_seekbar_shadow.png
es/drawable/photoeditor_actionbar_translucent.9.png
es/drawable/photoeditor_actionbar_translucent_bottom.9.png
es/drawable/photoeditor_artistic.png
es/drawable/photoeditor_color.png
es/drawable/photoeditor_effect_autofix.png
es/drawable/photoeditor_effect_crop.png
es/drawable/photoeditor_effect_crossprocess.png
es/drawable/photoeditor_effect_documentary.png
es/drawable/photoeditor_effect_doodle.png
es/drawable/photoeditor_effect_duotone.png
es/drawable/photoeditor_effect_facelift.png
es/drawable/photoeditor_effect_facetan.png
es/drawable/photoeditor_effect_filllight.png
es/drawable/photoeditor_effect_fisheye.png
es/drawable/photoeditor_effect_flip.png
es/drawable/photoeditor_effect_grain.png
es/drawable/photoeditor_effect_grayscale.png
es/drawable/photoeditor_effect_highlight.png
es/drawable/photoeditor_effect_lomoish.png
es/drawable/photoeditor_effect_negative.png
es/drawable/photoeditor_effect_posterize.png
es/drawable/photoeditor_effect_rotate.png
es/drawable/photoeditor_effect_saturation.png
es/drawable/photoeditor_effect_sepia.png
es/drawable/photoeditor_effect_shadow.png
es/drawable/photoeditor_effect_sharpen.png
es/drawable/photoeditor_effect_straighten.png
es/drawable/photoeditor_effect_temperature.png
es/drawable/photoeditor_effect_tint.png
es/drawable/photoeditor_effect_vignette.png
es/drawable/photoeditor_exposure.png
es/drawable/photoeditor_fix.png
es/drawable/photoeditor_redo.png
es/drawable/photoeditor_scale_seekbar_color.png
es/drawable/photoeditor_scale_seekbar_generic.png
es/drawable/photoeditor_scale_seekbar_light.png
es/drawable/photoeditor_scale_seekbar_shadow.png
es/drawable/photoeditor_seekbar_thumb.png
es/drawable/photoeditor_toggle_button_background.xml
es/drawable/photoeditor_undo.png
es/values-af/photoeditor_strings.xml
es/values-am/photoeditor_strings.xml
es/values-ar/photoeditor_strings.xml
es/values-be/photoeditor_strings.xml
es/values-bg/photoeditor_strings.xml
es/values-ca/photoeditor_strings.xml
es/values-cs/photoeditor_strings.xml
es/values-da/photoeditor_strings.xml
es/values-de/photoeditor_strings.xml
es/values-el/photoeditor_strings.xml
es/values-en-rGB/photoeditor_strings.xml
es/values-es-rUS/photoeditor_strings.xml
es/values-es/photoeditor_strings.xml
es/values-et/photoeditor_strings.xml
es/values-fa/photoeditor_strings.xml
es/values-fi/photoeditor_strings.xml
es/values-fr/photoeditor_strings.xml
es/values-hi/photoeditor_strings.xml
es/values-hr/photoeditor_strings.xml
es/values-hu/photoeditor_strings.xml
es/values-in/photoeditor_strings.xml
es/values-it/photoeditor_strings.xml
es/values-iw/photoeditor_strings.xml
es/values-ja/photoeditor_strings.xml
es/values-ko/photoeditor_strings.xml
es/values-lt/photoeditor_strings.xml
es/values-lv/photoeditor_strings.xml
es/values-ms/photoeditor_strings.xml
es/values-nb/photoeditor_strings.xml
es/values-nl/photoeditor_strings.xml
es/values-pl/photoeditor_strings.xml
es/values-pt-rPT/photoeditor_strings.xml
es/values-pt/photoeditor_strings.xml
es/values-ro/photoeditor_strings.xml
es/values-ru/photoeditor_strings.xml
es/values-sk/photoeditor_strings.xml
es/values-sl/photoeditor_strings.xml
es/values-sr/photoeditor_strings.xml
es/values-sv/photoeditor_strings.xml
es/values-sw/photoeditor_strings.xml
es/values-th/photoeditor_strings.xml
es/values-tl/photoeditor_strings.xml
es/values-tr/photoeditor_strings.xml
es/values-uk/photoeditor_strings.xml
es/values-vi/photoeditor_strings.xml
es/values-zh-rCN/photoeditor_strings.xml
es/values-zh-rTW/photoeditor_strings.xml
es/values-zu/photoeditor_strings.xml
es/values/photoeditor_arrays.xml
es/values/photoeditor_colors.xml
es/values/photoeditor_strings.xml
es/values/photoeditor_styles.xml
|
b15eb8429e7fb395bd968b91505817407f00d20e |
13-Dec-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Removed unused photoeditor resources. Change-Id: I415918ba5ae8a6c1a4521ec4dcfc1fab337bd3dd
es/anim/photoeditor_fade_in.xml
es/anim/photoeditor_fade_out.xml
es/drawable-hdpi/photoeditor_tab_selected_focused_holo.9.png
es/drawable-hdpi/photoeditor_tab_selected_holo.9.png
es/drawable-hdpi/photoeditor_tab_selected_pressed_holo.9.png
es/drawable-hdpi/photoeditor_tab_unselected_focused_holo.9.png
es/drawable-hdpi/photoeditor_tab_unselected_pressed_holo.9.png
es/drawable-mdpi/photoeditor_tab_selected_focused_holo.9.png
es/drawable-mdpi/photoeditor_tab_selected_holo.9.png
es/drawable-mdpi/photoeditor_tab_selected_pressed_holo.9.png
es/drawable-mdpi/photoeditor_tab_unselected_focused_holo.9.png
es/drawable-mdpi/photoeditor_tab_unselected_pressed_holo.9.png
es/drawable-sw600dp/photoeditor_scale_seekbar_color.png
es/drawable-sw600dp/photoeditor_scale_seekbar_generic.png
es/drawable-sw600dp/photoeditor_scale_seekbar_light.png
es/drawable-sw600dp/photoeditor_scale_seekbar_shadow.png
es/drawable/photoeditor_actionbar_translucent.9.png
es/drawable/photoeditor_actionbar_translucent_bottom.9.png
es/drawable/photoeditor_artistic.png
es/drawable/photoeditor_color.png
es/drawable/photoeditor_effect_autofix.png
es/drawable/photoeditor_effect_crop.png
es/drawable/photoeditor_effect_crossprocess.png
es/drawable/photoeditor_effect_documentary.png
es/drawable/photoeditor_effect_doodle.png
es/drawable/photoeditor_effect_duotone.png
es/drawable/photoeditor_effect_facelift.png
es/drawable/photoeditor_effect_facetan.png
es/drawable/photoeditor_effect_filllight.png
es/drawable/photoeditor_effect_fisheye.png
es/drawable/photoeditor_effect_flip.png
es/drawable/photoeditor_effect_grain.png
es/drawable/photoeditor_effect_grayscale.png
es/drawable/photoeditor_effect_highlight.png
es/drawable/photoeditor_effect_lomoish.png
es/drawable/photoeditor_effect_negative.png
es/drawable/photoeditor_effect_posterize.png
es/drawable/photoeditor_effect_rotate.png
es/drawable/photoeditor_effect_saturation.png
es/drawable/photoeditor_effect_sepia.png
es/drawable/photoeditor_effect_shadow.png
es/drawable/photoeditor_effect_sharpen.png
es/drawable/photoeditor_effect_straighten.png
es/drawable/photoeditor_effect_temperature.png
es/drawable/photoeditor_effect_tint.png
es/drawable/photoeditor_effect_vignette.png
es/drawable/photoeditor_exposure.png
es/drawable/photoeditor_fix.png
es/drawable/photoeditor_redo.png
es/drawable/photoeditor_scale_seekbar_color.png
es/drawable/photoeditor_scale_seekbar_generic.png
es/drawable/photoeditor_scale_seekbar_light.png
es/drawable/photoeditor_scale_seekbar_shadow.png
es/drawable/photoeditor_seekbar_thumb.png
es/drawable/photoeditor_toggle_button_background.xml
es/drawable/photoeditor_undo.png
es/values-af/photoeditor_strings.xml
es/values-am/photoeditor_strings.xml
es/values-ar/photoeditor_strings.xml
es/values-be/photoeditor_strings.xml
es/values-bg/photoeditor_strings.xml
es/values-ca/photoeditor_strings.xml
es/values-cs/photoeditor_strings.xml
es/values-da/photoeditor_strings.xml
es/values-de/photoeditor_strings.xml
es/values-el/photoeditor_strings.xml
es/values-en-rGB/photoeditor_strings.xml
es/values-es-rUS/photoeditor_strings.xml
es/values-es/photoeditor_strings.xml
es/values-et/photoeditor_strings.xml
es/values-fa/photoeditor_strings.xml
es/values-fi/photoeditor_strings.xml
es/values-fr/photoeditor_strings.xml
es/values-hi/photoeditor_strings.xml
es/values-hr/photoeditor_strings.xml
es/values-hu/photoeditor_strings.xml
es/values-in/photoeditor_strings.xml
es/values-it/photoeditor_strings.xml
es/values-iw/photoeditor_strings.xml
es/values-ja/photoeditor_strings.xml
es/values-ko/photoeditor_strings.xml
es/values-lt/photoeditor_strings.xml
es/values-lv/photoeditor_strings.xml
es/values-ms/photoeditor_strings.xml
es/values-nb/photoeditor_strings.xml
es/values-nl/photoeditor_strings.xml
es/values-pl/photoeditor_strings.xml
es/values-pt-rPT/photoeditor_strings.xml
es/values-pt/photoeditor_strings.xml
es/values-ro/photoeditor_strings.xml
es/values-ru/photoeditor_strings.xml
es/values-sk/photoeditor_strings.xml
es/values-sl/photoeditor_strings.xml
es/values-sr/photoeditor_strings.xml
es/values-sv/photoeditor_strings.xml
es/values-sw/photoeditor_strings.xml
es/values-th/photoeditor_strings.xml
es/values-tl/photoeditor_strings.xml
es/values-tr/photoeditor_strings.xml
es/values-uk/photoeditor_strings.xml
es/values-vi/photoeditor_strings.xml
es/values-zh-rCN/photoeditor_strings.xml
es/values-zh-rTW/photoeditor_strings.xml
es/values-zu/photoeditor_strings.xml
es/values/photoeditor_arrays.xml
es/values/photoeditor_colors.xml
es/values/photoeditor_strings.xml
es/values/photoeditor_styles.xml
|
4bdd0372ca1bba02828e9343fa3cc775f8c6f6e9 |
11-Dec-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Added sobel filter for edge function. Change-Id: I4d59a96585f4902cd01d26ff68c777b542041132
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterEdge.java
|
6d76e0d2eb8aa6ae8619d379d5ac3c9f78287f12 |
11-Dec-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Added sobel filter for edge function. Change-Id: I4d59a96585f4902cd01d26ff68c777b542041132
ni/Android.mk
|
ba8175a4ab682d334aef0a2af11240ecc9e9be81 |
11-Dec-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Added sobel filter for edge function. Change-Id: I4d59a96585f4902cd01d26ff68c777b542041132
ni/Android.mk
ni/filters/edge.c
|
fc8d275313c934515b757389c1802da45b81a1a2 |
11-Dec-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Added sobel filter for edge function. Change-Id: I4d59a96585f4902cd01d26ff68c777b542041132
ni/Android.mk
ni/filters/edge.c
es/values/filtershow_ids.xml
es/values/filtershow_strings.xml
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterEdge.java
|
7ffbd3b2077ddf2a6889787c55ff084c17038343 |
11-Dec-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Added sobel filter for edge function. Change-Id: I4d59a96585f4902cd01d26ff68c777b542041132
es/values/filtershow_ids.xml
es/values/filtershow_strings.xml
|
c6e04ab48c3cd06d93ec245b6e540d89684fba0b |
11-Dec-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Added photonegative filter. Change-Id: I73594573b26873cb3fda49aca6d40761dec3707f
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/PanelController.java
rc/com/android/gallery3d/filtershow/filters/ImageFilter.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterCurves.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterNegative.java
|
6166ed62594d7ca81114844b439d858e275942d7 |
11-Dec-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Added photonegative filter. Change-Id: I73594573b26873cb3fda49aca6d40761dec3707f
ni/Android.mk
|
cd3348840467a32ae1fa1f2f1289a4bbf02bbb8e |
11-Dec-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Added photonegative filter. Change-Id: I73594573b26873cb3fda49aca6d40761dec3707f
ni/Android.mk
ni/filters/negative.c
|
ce178c1fa02362636e4992834592d6e019e4ee80 |
11-Dec-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Added photonegative filter. Change-Id: I73594573b26873cb3fda49aca6d40761dec3707f
ni/Android.mk
ni/filters/negative.c
es/values/filtershow_ids.xml
es/values/filtershow_strings.xml
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/PanelController.java
rc/com/android/gallery3d/filtershow/filters/ImageFilter.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterCurves.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterNegative.java
|
e213a3b52c0dd73bfe744abf0729de436df915d0 |
11-Dec-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Added photonegative filter. Change-Id: I73594573b26873cb3fda49aca6d40761dec3707f
es/values/filtershow_ids.xml
es/values/filtershow_strings.xml
|
2afbc152f1ac729db5f4c3d9d2f96f5fcf4129d5 |
12-Dec-2012 |
John Reck <jreck@google.com> |
Merge "remove actionbar sherlock" into gb-ub-photos-bryce
|
bf1baf80e1463dfacf4a3a486625523a76479a00 |
12-Dec-2012 |
John Reck <jreck@google.com> |
Merge "remove actionbar sherlock" into gb-ub-photos-bryce
|
20168cec33b2aec2452c487ccaa11d50fa39913e |
12-Dec-2012 |
John Reck <jreck@google.com> |
Merge "remove actionbar sherlock" into gb-ub-photos-bryce
|
107df4f47c1c370c6d3f9b90d97eaef231b7359d |
12-Dec-2012 |
John Reck <jreck@google.com> |
remove actionbar sherlock Change-Id: Idb9b63f625fd4f0b78d947421ec5b098d8e5dfd5
ndroid.mk
|
ba512ca3bb2e2b51c4be0cc7336a6a5b0fa22106 |
12-Dec-2012 |
John Reck <jreck@google.com> |
remove actionbar sherlock Change-Id: Idb9b63f625fd4f0b78d947421ec5b098d8e5dfd5
ctionbarsherlock/src/android/support/v4/app/_ActionBarSherlockTrojanHorse.java
ctionbarsherlock/src/com/actionbarsherlock/ActionBarSherlock.java
ctionbarsherlock/src/com/actionbarsherlock/app/ActionBar.java
ctionbarsherlock/src/com/actionbarsherlock/app/SherlockActivity.java
ctionbarsherlock/src/com/actionbarsherlock/app/SherlockDialogFragment.java
ctionbarsherlock/src/com/actionbarsherlock/app/SherlockExpandableListActivity.java
ctionbarsherlock/src/com/actionbarsherlock/app/SherlockFragment.java
ctionbarsherlock/src/com/actionbarsherlock/app/SherlockFragmentActivity.java
ctionbarsherlock/src/com/actionbarsherlock/app/SherlockListActivity.java
ctionbarsherlock/src/com/actionbarsherlock/app/SherlockListFragment.java
ctionbarsherlock/src/com/actionbarsherlock/app/SherlockPreferenceActivity.java
ctionbarsherlock/src/com/actionbarsherlock/internal/ActionBarSherlockCompat.java
ctionbarsherlock/src/com/actionbarsherlock/internal/ActionBarSherlockNative.java
ctionbarsherlock/src/com/actionbarsherlock/internal/ResourcesCompat.java
ctionbarsherlock/src/com/actionbarsherlock/internal/app/ActionBarImpl.java
ctionbarsherlock/src/com/actionbarsherlock/internal/app/ActionBarWrapper.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/Animator.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/AnimatorListenerAdapter.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/AnimatorSet.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/FloatEvaluator.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/FloatKeyframeSet.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/IntEvaluator.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/IntKeyframeSet.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/Keyframe.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/KeyframeSet.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/ObjectAnimator.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/PropertyValuesHolder.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/TypeEvaluator.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/ValueAnimator.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/view/NineViewGroup.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/view/animation/AnimatorProxy.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/widget/NineFrameLayout.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/widget/NineHorizontalScrollView.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/widget/NineLinearLayout.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/ActionProviderWrapper.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/StandaloneActionMode.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/View_HasStateListenerSupport.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/View_OnAttachStateChangeListener.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/ActionMenu.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/ActionMenuItem.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/ActionMenuItemView.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/ActionMenuPresenter.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/ActionMenuView.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/BaseMenuPresenter.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/ListMenuItemView.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/MenuBuilder.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/MenuItemImpl.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/MenuItemWrapper.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/MenuPopupHelper.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/MenuPresenter.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/MenuView.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/MenuWrapper.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/SubMenuBuilder.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/SubMenuWrapper.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/AbsActionBarView.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/ActionBarContainer.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/ActionBarContextView.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/ActionBarView.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/CapitalizingButton.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/CapitalizingTextView.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/FakeDialogPhoneWindow.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/IcsAbsSpinner.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/IcsAdapterView.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/IcsLinearLayout.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/IcsListPopupWindow.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/IcsProgressBar.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/IcsSpinner.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/IcsView.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/ScrollingTabContainerView.java
ctionbarsherlock/src/com/actionbarsherlock/view/ActionMode.java
ctionbarsherlock/src/com/actionbarsherlock/view/ActionProvider.java
ctionbarsherlock/src/com/actionbarsherlock/view/CollapsibleActionView.java
ctionbarsherlock/src/com/actionbarsherlock/view/Menu.java
ctionbarsherlock/src/com/actionbarsherlock/view/MenuInflater.java
ctionbarsherlock/src/com/actionbarsherlock/view/MenuItem.java
ctionbarsherlock/src/com/actionbarsherlock/view/SubMenu.java
ctionbarsherlock/src/com/actionbarsherlock/view/Window.java
ctionbarsherlock/src/com/actionbarsherlock/widget/ActivityChooserModel.java
ctionbarsherlock/src/com/actionbarsherlock/widget/ActivityChooserView.java
ctionbarsherlock/src/com/actionbarsherlock/widget/ShareActionProvider.java
rc/com/android/gallery3d/app/AbstractGalleryActivity.java
rc/com/android/gallery3d/app/ActivityState.java
rc/com/android/gallery3d/app/AlbumPage.java
rc/com/android/gallery3d/app/AlbumSetPage.java
rc/com/android/gallery3d/app/Gallery.java
rc/com/android/gallery3d/app/GalleryActionBar.java
rc/com/android/gallery3d/app/MovieActivity.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/app/PickerActivity.java
rc/com/android/gallery3d/app/SinglePhotoDataAdapter.java
rc/com/android/gallery3d/app/StateManager.java
rc/com/android/gallery3d/app/TrimVideo.java
rc/com/android/gallery3d/ui/ActionModeHandler.java
rc/com/android/gallery3d/ui/MenuExecutor.java
rc/com/android/gallery3d/ui/PopupList.java
rc/com/android/gallery3d/ui/PositionController.java
|
2abaaf7caa9a83ba1ea759868aabde7f21387184 |
12-Dec-2012 |
John Reck <jreck@google.com> |
remove actionbar sherlock Change-Id: Idb9b63f625fd4f0b78d947421ec5b098d8e5dfd5
ndroid.mk
ctionbarsherlock/res/color/abs__primary_text_disable_only_holo_dark.xml
ctionbarsherlock/res/color/abs__primary_text_disable_only_holo_light.xml
ctionbarsherlock/res/color/abs__primary_text_holo_dark.xml
ctionbarsherlock/res/color/abs__primary_text_holo_light.xml
ctionbarsherlock/res/drawable-hdpi/abs__ab_bottom_solid_dark_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_bottom_solid_inverse_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_bottom_solid_light_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_bottom_transparent_dark_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_bottom_transparent_light_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_share_pack_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_share_pack_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_solid_dark_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_solid_light_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_solid_shadow_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_stacked_solid_dark_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_stacked_solid_light_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_stacked_transparent_dark_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_stacked_transparent_light_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_transparent_dark_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_transparent_light_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__btn_cab_done_default_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__btn_cab_done_default_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__btn_cab_done_focused_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__btn_cab_done_focused_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__btn_cab_done_pressed_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__btn_cab_done_pressed_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__cab_background_bottom_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__cab_background_bottom_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__cab_background_top_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__cab_background_top_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__dialog_full_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__dialog_full_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ic_ab_back_holo_dark.png
ctionbarsherlock/res/drawable-hdpi/abs__ic_ab_back_holo_light.png
ctionbarsherlock/res/drawable-hdpi/abs__ic_cab_done_holo_dark.png
ctionbarsherlock/res/drawable-hdpi/abs__ic_cab_done_holo_light.png
ctionbarsherlock/res/drawable-hdpi/abs__ic_menu_moreoverflow_normal_holo_dark.png
ctionbarsherlock/res/drawable-hdpi/abs__ic_menu_moreoverflow_normal_holo_light.png
ctionbarsherlock/res/drawable-hdpi/abs__ic_menu_share_holo_dark.png
ctionbarsherlock/res/drawable-hdpi/abs__ic_menu_share_holo_light.png
ctionbarsherlock/res/drawable-hdpi/abs__list_activated_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__list_divider_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__list_divider_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__list_focused_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__list_longpressed_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__list_pressed_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__list_pressed_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__list_selector_disabled_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__list_selector_disabled_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__menu_dropdown_panel_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__menu_dropdown_panel_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__progress_bg_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__progress_bg_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__progress_primary_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__progress_primary_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__progress_secondary_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__progress_secondary_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__spinner_48_inner_holo.png
ctionbarsherlock/res/drawable-hdpi/abs__spinner_48_outer_holo.png
ctionbarsherlock/res/drawable-hdpi/abs__spinner_ab_default_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__spinner_ab_default_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__spinner_ab_disabled_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__spinner_ab_disabled_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__spinner_ab_focused_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__spinner_ab_focused_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__spinner_ab_pressed_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__spinner_ab_pressed_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__tab_selected_focused_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__tab_selected_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__tab_selected_pressed_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__tab_unselected_pressed_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_bottom_solid_dark_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_bottom_solid_inverse_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_bottom_solid_light_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_bottom_transparent_dark_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_bottom_transparent_light_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_share_pack_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_share_pack_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_solid_dark_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_solid_light_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_solid_shadow_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_stacked_solid_dark_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_stacked_solid_light_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_stacked_transparent_dark_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_stacked_transparent_light_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_transparent_dark_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_transparent_light_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__btn_cab_done_default_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__btn_cab_done_default_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__btn_cab_done_focused_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__btn_cab_done_focused_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__btn_cab_done_pressed_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__btn_cab_done_pressed_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__cab_background_bottom_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__cab_background_bottom_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__cab_background_top_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__cab_background_top_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__dialog_full_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__dialog_full_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ic_ab_back_holo_dark.png
ctionbarsherlock/res/drawable-mdpi/abs__ic_ab_back_holo_light.png
ctionbarsherlock/res/drawable-mdpi/abs__ic_cab_done_holo_dark.png
ctionbarsherlock/res/drawable-mdpi/abs__ic_cab_done_holo_light.png
ctionbarsherlock/res/drawable-mdpi/abs__ic_menu_moreoverflow_normal_holo_dark.png
ctionbarsherlock/res/drawable-mdpi/abs__ic_menu_moreoverflow_normal_holo_light.png
ctionbarsherlock/res/drawable-mdpi/abs__ic_menu_share_holo_dark.png
ctionbarsherlock/res/drawable-mdpi/abs__ic_menu_share_holo_light.png
ctionbarsherlock/res/drawable-mdpi/abs__list_activated_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__list_divider_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__list_divider_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__list_focused_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__list_longpressed_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__list_pressed_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__list_pressed_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__list_selector_disabled_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__list_selector_disabled_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__menu_dropdown_panel_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__menu_dropdown_panel_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__progress_bg_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__progress_bg_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__progress_primary_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__progress_primary_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__progress_secondary_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__progress_secondary_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__spinner_48_inner_holo.png
ctionbarsherlock/res/drawable-mdpi/abs__spinner_48_outer_holo.png
ctionbarsherlock/res/drawable-mdpi/abs__spinner_ab_default_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__spinner_ab_default_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__spinner_ab_disabled_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__spinner_ab_disabled_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__spinner_ab_focused_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__spinner_ab_focused_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__spinner_ab_pressed_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__spinner_ab_pressed_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__tab_selected_focused_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__tab_selected_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__tab_selected_pressed_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__tab_unselected_pressed_holo.9.png
ctionbarsherlock/res/drawable-v11/abs__progress_medium_holo.xml
ctionbarsherlock/res/drawable-xhdpi/abs__ab_bottom_solid_dark_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_bottom_solid_inverse_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_bottom_solid_light_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_bottom_transparent_dark_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_bottom_transparent_light_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_share_pack_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_share_pack_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_solid_dark_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_solid_light_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_solid_shadow_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_stacked_solid_dark_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_stacked_solid_light_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_stacked_transparent_dark_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_stacked_transparent_light_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_transparent_dark_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_transparent_light_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__btn_cab_done_default_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__btn_cab_done_default_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__btn_cab_done_focused_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__btn_cab_done_focused_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__btn_cab_done_pressed_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__btn_cab_done_pressed_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__cab_background_bottom_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__cab_background_bottom_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__cab_background_top_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__cab_background_top_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__dialog_full_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__dialog_full_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ic_ab_back_holo_dark.png
ctionbarsherlock/res/drawable-xhdpi/abs__ic_ab_back_holo_light.png
ctionbarsherlock/res/drawable-xhdpi/abs__ic_cab_done_holo_dark.png
ctionbarsherlock/res/drawable-xhdpi/abs__ic_cab_done_holo_light.png
ctionbarsherlock/res/drawable-xhdpi/abs__ic_menu_moreoverflow_normal_holo_dark.png
ctionbarsherlock/res/drawable-xhdpi/abs__ic_menu_moreoverflow_normal_holo_light.png
ctionbarsherlock/res/drawable-xhdpi/abs__ic_menu_share_holo_dark.png
ctionbarsherlock/res/drawable-xhdpi/abs__ic_menu_share_holo_light.png
ctionbarsherlock/res/drawable-xhdpi/abs__list_activated_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__list_divider_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__list_divider_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__list_focused_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__list_longpressed_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__list_pressed_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__list_pressed_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__list_selector_disabled_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__list_selector_disabled_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__menu_dropdown_panel_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__menu_dropdown_panel_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__progress_bg_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__progress_bg_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__progress_primary_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__progress_primary_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__progress_secondary_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__progress_secondary_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__spinner_48_inner_holo.png
ctionbarsherlock/res/drawable-xhdpi/abs__spinner_48_outer_holo.png
ctionbarsherlock/res/drawable-xhdpi/abs__spinner_ab_default_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__spinner_ab_default_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__spinner_ab_disabled_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__spinner_ab_disabled_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__spinner_ab_focused_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__spinner_ab_focused_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__spinner_ab_pressed_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__spinner_ab_pressed_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__tab_selected_focused_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__tab_selected_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__tab_selected_pressed_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__tab_unselected_pressed_holo.9.png
ctionbarsherlock/res/drawable/abs__activated_background_holo_dark.xml
ctionbarsherlock/res/drawable/abs__activated_background_holo_light.xml
ctionbarsherlock/res/drawable/abs__btn_cab_done_holo_dark.xml
ctionbarsherlock/res/drawable/abs__btn_cab_done_holo_light.xml
ctionbarsherlock/res/drawable/abs__ic_menu_moreoverflow_holo_dark.xml
ctionbarsherlock/res/drawable/abs__ic_menu_moreoverflow_holo_light.xml
ctionbarsherlock/res/drawable/abs__item_background_holo_dark.xml
ctionbarsherlock/res/drawable/abs__item_background_holo_light.xml
ctionbarsherlock/res/drawable/abs__list_selector_background_transition_holo_dark.xml
ctionbarsherlock/res/drawable/abs__list_selector_background_transition_holo_light.xml
ctionbarsherlock/res/drawable/abs__list_selector_holo_dark.xml
ctionbarsherlock/res/drawable/abs__list_selector_holo_light.xml
ctionbarsherlock/res/drawable/abs__progress_horizontal_holo_dark.xml
ctionbarsherlock/res/drawable/abs__progress_horizontal_holo_light.xml
ctionbarsherlock/res/drawable/abs__progress_medium_holo.xml
ctionbarsherlock/res/drawable/abs__spinner_ab_holo_dark.xml
ctionbarsherlock/res/drawable/abs__spinner_ab_holo_light.xml
ctionbarsherlock/res/drawable/abs__tab_indicator_ab_holo.xml
ctionbarsherlock/res/layout-large/abs__action_mode_close_item.xml
ctionbarsherlock/res/layout-v14/sherlock_spinner_dropdown_item.xml
ctionbarsherlock/res/layout-v14/sherlock_spinner_item.xml
ctionbarsherlock/res/layout-xlarge/abs__screen_action_bar.xml
ctionbarsherlock/res/layout-xlarge/abs__screen_action_bar_overlay.xml
ctionbarsherlock/res/layout/abs__action_bar_home.xml
ctionbarsherlock/res/layout/abs__action_bar_tab.xml
ctionbarsherlock/res/layout/abs__action_bar_tab_bar_view.xml
ctionbarsherlock/res/layout/abs__action_bar_title_item.xml
ctionbarsherlock/res/layout/abs__action_menu_item_layout.xml
ctionbarsherlock/res/layout/abs__action_menu_layout.xml
ctionbarsherlock/res/layout/abs__action_mode_bar.xml
ctionbarsherlock/res/layout/abs__action_mode_close_item.xml
ctionbarsherlock/res/layout/abs__activity_chooser_view.xml
ctionbarsherlock/res/layout/abs__activity_chooser_view_list_item.xml
ctionbarsherlock/res/layout/abs__dialog_title_holo.xml
ctionbarsherlock/res/layout/abs__list_menu_item_checkbox.xml
ctionbarsherlock/res/layout/abs__list_menu_item_icon.xml
ctionbarsherlock/res/layout/abs__list_menu_item_layout.xml
ctionbarsherlock/res/layout/abs__list_menu_item_radio.xml
ctionbarsherlock/res/layout/abs__popup_menu_item_layout.xml
ctionbarsherlock/res/layout/abs__screen_action_bar.xml
ctionbarsherlock/res/layout/abs__screen_action_bar_overlay.xml
ctionbarsherlock/res/layout/abs__screen_simple.xml
ctionbarsherlock/res/layout/abs__screen_simple_overlay_action_mode.xml
ctionbarsherlock/res/layout/sherlock_spinner_dropdown_item.xml
ctionbarsherlock/res/layout/sherlock_spinner_item.xml
ctionbarsherlock/res/values-land/abs__dimens.xml
ctionbarsherlock/res/values-large-hdpi-1024x600/abs__dimens.xml
ctionbarsherlock/res/values-large-land-hdpi-1024x600/abs__dimens.xml
ctionbarsherlock/res/values-large-land-mdpi-1024x600/abs__dimens.xml
ctionbarsherlock/res/values-large-mdpi-1024x600/abs__dimens.xml
ctionbarsherlock/res/values-large/abs__dimens.xml
ctionbarsherlock/res/values-sw600dp/abs__bools.xml
ctionbarsherlock/res/values-sw600dp/abs__dimens.xml
ctionbarsherlock/res/values-v11/abs__themes.xml
ctionbarsherlock/res/values-v14/abs__styles.xml
ctionbarsherlock/res/values-v14/abs__themes.xml
ctionbarsherlock/res/values-w360dp/abs__dimens.xml
ctionbarsherlock/res/values-w480dp/abs__bools.xml
ctionbarsherlock/res/values-w480dp/abs__config.xml
ctionbarsherlock/res/values-w500dp/abs__dimens.xml
ctionbarsherlock/res/values-w600dp/abs__dimens.xml
ctionbarsherlock/res/values-xlarge/abs__dimens.xml
ctionbarsherlock/res/values/abs__attrs.xml
ctionbarsherlock/res/values/abs__bools.xml
ctionbarsherlock/res/values/abs__colors.xml
ctionbarsherlock/res/values/abs__config.xml
ctionbarsherlock/res/values/abs__dimens.xml
ctionbarsherlock/res/values/abs__ids.xml
ctionbarsherlock/res/values/abs__strings.xml
ctionbarsherlock/res/values/abs__styles.xml
ctionbarsherlock/res/values/abs__themes.xml
ctionbarsherlock/src/android/support/v4/app/_ActionBarSherlockTrojanHorse.java
ctionbarsherlock/src/com/actionbarsherlock/ActionBarSherlock.java
ctionbarsherlock/src/com/actionbarsherlock/app/ActionBar.java
ctionbarsherlock/src/com/actionbarsherlock/app/SherlockActivity.java
ctionbarsherlock/src/com/actionbarsherlock/app/SherlockDialogFragment.java
ctionbarsherlock/src/com/actionbarsherlock/app/SherlockExpandableListActivity.java
ctionbarsherlock/src/com/actionbarsherlock/app/SherlockFragment.java
ctionbarsherlock/src/com/actionbarsherlock/app/SherlockFragmentActivity.java
ctionbarsherlock/src/com/actionbarsherlock/app/SherlockListActivity.java
ctionbarsherlock/src/com/actionbarsherlock/app/SherlockListFragment.java
ctionbarsherlock/src/com/actionbarsherlock/app/SherlockPreferenceActivity.java
ctionbarsherlock/src/com/actionbarsherlock/internal/ActionBarSherlockCompat.java
ctionbarsherlock/src/com/actionbarsherlock/internal/ActionBarSherlockNative.java
ctionbarsherlock/src/com/actionbarsherlock/internal/ResourcesCompat.java
ctionbarsherlock/src/com/actionbarsherlock/internal/app/ActionBarImpl.java
ctionbarsherlock/src/com/actionbarsherlock/internal/app/ActionBarWrapper.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/Animator.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/AnimatorListenerAdapter.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/AnimatorSet.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/FloatEvaluator.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/FloatKeyframeSet.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/IntEvaluator.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/IntKeyframeSet.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/Keyframe.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/KeyframeSet.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/ObjectAnimator.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/PropertyValuesHolder.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/TypeEvaluator.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/ValueAnimator.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/view/NineViewGroup.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/view/animation/AnimatorProxy.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/widget/NineFrameLayout.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/widget/NineHorizontalScrollView.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/widget/NineLinearLayout.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/ActionProviderWrapper.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/StandaloneActionMode.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/View_HasStateListenerSupport.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/View_OnAttachStateChangeListener.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/ActionMenu.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/ActionMenuItem.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/ActionMenuItemView.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/ActionMenuPresenter.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/ActionMenuView.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/BaseMenuPresenter.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/ListMenuItemView.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/MenuBuilder.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/MenuItemImpl.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/MenuItemWrapper.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/MenuPopupHelper.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/MenuPresenter.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/MenuView.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/MenuWrapper.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/SubMenuBuilder.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/SubMenuWrapper.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/AbsActionBarView.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/ActionBarContainer.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/ActionBarContextView.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/ActionBarView.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/CapitalizingButton.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/CapitalizingTextView.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/FakeDialogPhoneWindow.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/IcsAbsSpinner.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/IcsAdapterView.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/IcsLinearLayout.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/IcsListPopupWindow.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/IcsProgressBar.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/IcsSpinner.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/IcsView.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/ScrollingTabContainerView.java
ctionbarsherlock/src/com/actionbarsherlock/view/ActionMode.java
ctionbarsherlock/src/com/actionbarsherlock/view/ActionProvider.java
ctionbarsherlock/src/com/actionbarsherlock/view/CollapsibleActionView.java
ctionbarsherlock/src/com/actionbarsherlock/view/Menu.java
ctionbarsherlock/src/com/actionbarsherlock/view/MenuInflater.java
ctionbarsherlock/src/com/actionbarsherlock/view/MenuItem.java
ctionbarsherlock/src/com/actionbarsherlock/view/SubMenu.java
ctionbarsherlock/src/com/actionbarsherlock/view/Window.java
ctionbarsherlock/src/com/actionbarsherlock/widget/ActivityChooserModel.java
ctionbarsherlock/src/com/actionbarsherlock/widget/ActivityChooserView.java
ctionbarsherlock/src/com/actionbarsherlock/widget/ShareActionProvider.java
es/layout/action_bar_text.xml
es/layout/action_mode.xml
es/layout/popup_list_item.xml
es/menu/movie.xml
es/menu/operation.xml
es/menu/photo.xml
es/values-v14/styles.xml
es/values/styles.xml
rc/com/android/gallery3d/app/AbstractGalleryActivity.java
rc/com/android/gallery3d/app/ActivityState.java
rc/com/android/gallery3d/app/AlbumPage.java
rc/com/android/gallery3d/app/AlbumSetPage.java
rc/com/android/gallery3d/app/Gallery.java
rc/com/android/gallery3d/app/GalleryActionBar.java
rc/com/android/gallery3d/app/MovieActivity.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/app/PickerActivity.java
rc/com/android/gallery3d/app/SinglePhotoDataAdapter.java
rc/com/android/gallery3d/app/StateManager.java
rc/com/android/gallery3d/app/TrimVideo.java
rc/com/android/gallery3d/ui/ActionModeHandler.java
rc/com/android/gallery3d/ui/MenuExecutor.java
rc/com/android/gallery3d/ui/PopupList.java
rc/com/android/gallery3d/ui/PositionController.java
|
13a39068a7eb3f4bec10deb63fa1f511cbc748c7 |
12-Dec-2012 |
John Reck <jreck@google.com> |
remove actionbar sherlock Change-Id: Idb9b63f625fd4f0b78d947421ec5b098d8e5dfd5
ctionbarsherlock/res/color/abs__primary_text_disable_only_holo_dark.xml
ctionbarsherlock/res/color/abs__primary_text_disable_only_holo_light.xml
ctionbarsherlock/res/color/abs__primary_text_holo_dark.xml
ctionbarsherlock/res/color/abs__primary_text_holo_light.xml
ctionbarsherlock/res/drawable-hdpi/abs__ab_bottom_solid_dark_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_bottom_solid_inverse_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_bottom_solid_light_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_bottom_transparent_dark_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_bottom_transparent_light_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_share_pack_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_share_pack_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_solid_dark_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_solid_light_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_solid_shadow_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_stacked_solid_dark_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_stacked_solid_light_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_stacked_transparent_dark_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_stacked_transparent_light_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_transparent_dark_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_transparent_light_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__btn_cab_done_default_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__btn_cab_done_default_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__btn_cab_done_focused_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__btn_cab_done_focused_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__btn_cab_done_pressed_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__btn_cab_done_pressed_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__cab_background_bottom_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__cab_background_bottom_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__cab_background_top_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__cab_background_top_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__dialog_full_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__dialog_full_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ic_ab_back_holo_dark.png
ctionbarsherlock/res/drawable-hdpi/abs__ic_ab_back_holo_light.png
ctionbarsherlock/res/drawable-hdpi/abs__ic_cab_done_holo_dark.png
ctionbarsherlock/res/drawable-hdpi/abs__ic_cab_done_holo_light.png
ctionbarsherlock/res/drawable-hdpi/abs__ic_menu_moreoverflow_normal_holo_dark.png
ctionbarsherlock/res/drawable-hdpi/abs__ic_menu_moreoverflow_normal_holo_light.png
ctionbarsherlock/res/drawable-hdpi/abs__ic_menu_share_holo_dark.png
ctionbarsherlock/res/drawable-hdpi/abs__ic_menu_share_holo_light.png
ctionbarsherlock/res/drawable-hdpi/abs__list_activated_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__list_divider_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__list_divider_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__list_focused_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__list_longpressed_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__list_pressed_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__list_pressed_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__list_selector_disabled_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__list_selector_disabled_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__menu_dropdown_panel_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__menu_dropdown_panel_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__progress_bg_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__progress_bg_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__progress_primary_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__progress_primary_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__progress_secondary_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__progress_secondary_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__spinner_48_inner_holo.png
ctionbarsherlock/res/drawable-hdpi/abs__spinner_48_outer_holo.png
ctionbarsherlock/res/drawable-hdpi/abs__spinner_ab_default_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__spinner_ab_default_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__spinner_ab_disabled_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__spinner_ab_disabled_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__spinner_ab_focused_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__spinner_ab_focused_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__spinner_ab_pressed_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__spinner_ab_pressed_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__tab_selected_focused_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__tab_selected_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__tab_selected_pressed_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__tab_unselected_pressed_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_bottom_solid_dark_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_bottom_solid_inverse_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_bottom_solid_light_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_bottom_transparent_dark_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_bottom_transparent_light_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_share_pack_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_share_pack_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_solid_dark_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_solid_light_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_solid_shadow_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_stacked_solid_dark_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_stacked_solid_light_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_stacked_transparent_dark_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_stacked_transparent_light_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_transparent_dark_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_transparent_light_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__btn_cab_done_default_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__btn_cab_done_default_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__btn_cab_done_focused_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__btn_cab_done_focused_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__btn_cab_done_pressed_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__btn_cab_done_pressed_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__cab_background_bottom_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__cab_background_bottom_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__cab_background_top_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__cab_background_top_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__dialog_full_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__dialog_full_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ic_ab_back_holo_dark.png
ctionbarsherlock/res/drawable-mdpi/abs__ic_ab_back_holo_light.png
ctionbarsherlock/res/drawable-mdpi/abs__ic_cab_done_holo_dark.png
ctionbarsherlock/res/drawable-mdpi/abs__ic_cab_done_holo_light.png
ctionbarsherlock/res/drawable-mdpi/abs__ic_menu_moreoverflow_normal_holo_dark.png
ctionbarsherlock/res/drawable-mdpi/abs__ic_menu_moreoverflow_normal_holo_light.png
ctionbarsherlock/res/drawable-mdpi/abs__ic_menu_share_holo_dark.png
ctionbarsherlock/res/drawable-mdpi/abs__ic_menu_share_holo_light.png
ctionbarsherlock/res/drawable-mdpi/abs__list_activated_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__list_divider_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__list_divider_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__list_focused_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__list_longpressed_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__list_pressed_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__list_pressed_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__list_selector_disabled_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__list_selector_disabled_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__menu_dropdown_panel_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__menu_dropdown_panel_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__progress_bg_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__progress_bg_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__progress_primary_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__progress_primary_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__progress_secondary_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__progress_secondary_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__spinner_48_inner_holo.png
ctionbarsherlock/res/drawable-mdpi/abs__spinner_48_outer_holo.png
ctionbarsherlock/res/drawable-mdpi/abs__spinner_ab_default_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__spinner_ab_default_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__spinner_ab_disabled_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__spinner_ab_disabled_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__spinner_ab_focused_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__spinner_ab_focused_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__spinner_ab_pressed_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__spinner_ab_pressed_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__tab_selected_focused_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__tab_selected_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__tab_selected_pressed_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__tab_unselected_pressed_holo.9.png
ctionbarsherlock/res/drawable-v11/abs__progress_medium_holo.xml
ctionbarsherlock/res/drawable-xhdpi/abs__ab_bottom_solid_dark_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_bottom_solid_inverse_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_bottom_solid_light_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_bottom_transparent_dark_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_bottom_transparent_light_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_share_pack_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_share_pack_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_solid_dark_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_solid_light_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_solid_shadow_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_stacked_solid_dark_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_stacked_solid_light_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_stacked_transparent_dark_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_stacked_transparent_light_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_transparent_dark_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_transparent_light_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__btn_cab_done_default_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__btn_cab_done_default_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__btn_cab_done_focused_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__btn_cab_done_focused_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__btn_cab_done_pressed_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__btn_cab_done_pressed_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__cab_background_bottom_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__cab_background_bottom_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__cab_background_top_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__cab_background_top_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__dialog_full_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__dialog_full_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ic_ab_back_holo_dark.png
ctionbarsherlock/res/drawable-xhdpi/abs__ic_ab_back_holo_light.png
ctionbarsherlock/res/drawable-xhdpi/abs__ic_cab_done_holo_dark.png
ctionbarsherlock/res/drawable-xhdpi/abs__ic_cab_done_holo_light.png
ctionbarsherlock/res/drawable-xhdpi/abs__ic_menu_moreoverflow_normal_holo_dark.png
ctionbarsherlock/res/drawable-xhdpi/abs__ic_menu_moreoverflow_normal_holo_light.png
ctionbarsherlock/res/drawable-xhdpi/abs__ic_menu_share_holo_dark.png
ctionbarsherlock/res/drawable-xhdpi/abs__ic_menu_share_holo_light.png
ctionbarsherlock/res/drawable-xhdpi/abs__list_activated_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__list_divider_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__list_divider_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__list_focused_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__list_longpressed_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__list_pressed_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__list_pressed_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__list_selector_disabled_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__list_selector_disabled_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__menu_dropdown_panel_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__menu_dropdown_panel_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__progress_bg_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__progress_bg_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__progress_primary_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__progress_primary_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__progress_secondary_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__progress_secondary_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__spinner_48_inner_holo.png
ctionbarsherlock/res/drawable-xhdpi/abs__spinner_48_outer_holo.png
ctionbarsherlock/res/drawable-xhdpi/abs__spinner_ab_default_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__spinner_ab_default_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__spinner_ab_disabled_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__spinner_ab_disabled_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__spinner_ab_focused_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__spinner_ab_focused_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__spinner_ab_pressed_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__spinner_ab_pressed_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__tab_selected_focused_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__tab_selected_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__tab_selected_pressed_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__tab_unselected_pressed_holo.9.png
ctionbarsherlock/res/drawable/abs__activated_background_holo_dark.xml
ctionbarsherlock/res/drawable/abs__activated_background_holo_light.xml
ctionbarsherlock/res/drawable/abs__btn_cab_done_holo_dark.xml
ctionbarsherlock/res/drawable/abs__btn_cab_done_holo_light.xml
ctionbarsherlock/res/drawable/abs__ic_menu_moreoverflow_holo_dark.xml
ctionbarsherlock/res/drawable/abs__ic_menu_moreoverflow_holo_light.xml
ctionbarsherlock/res/drawable/abs__item_background_holo_dark.xml
ctionbarsherlock/res/drawable/abs__item_background_holo_light.xml
ctionbarsherlock/res/drawable/abs__list_selector_background_transition_holo_dark.xml
ctionbarsherlock/res/drawable/abs__list_selector_background_transition_holo_light.xml
ctionbarsherlock/res/drawable/abs__list_selector_holo_dark.xml
ctionbarsherlock/res/drawable/abs__list_selector_holo_light.xml
ctionbarsherlock/res/drawable/abs__progress_horizontal_holo_dark.xml
ctionbarsherlock/res/drawable/abs__progress_horizontal_holo_light.xml
ctionbarsherlock/res/drawable/abs__progress_medium_holo.xml
ctionbarsherlock/res/drawable/abs__spinner_ab_holo_dark.xml
ctionbarsherlock/res/drawable/abs__spinner_ab_holo_light.xml
ctionbarsherlock/res/drawable/abs__tab_indicator_ab_holo.xml
ctionbarsherlock/res/layout-large/abs__action_mode_close_item.xml
ctionbarsherlock/res/layout-v14/sherlock_spinner_dropdown_item.xml
ctionbarsherlock/res/layout-v14/sherlock_spinner_item.xml
ctionbarsherlock/res/layout-xlarge/abs__screen_action_bar.xml
ctionbarsherlock/res/layout-xlarge/abs__screen_action_bar_overlay.xml
ctionbarsherlock/res/layout/abs__action_bar_home.xml
ctionbarsherlock/res/layout/abs__action_bar_tab.xml
ctionbarsherlock/res/layout/abs__action_bar_tab_bar_view.xml
ctionbarsherlock/res/layout/abs__action_bar_title_item.xml
ctionbarsherlock/res/layout/abs__action_menu_item_layout.xml
ctionbarsherlock/res/layout/abs__action_menu_layout.xml
ctionbarsherlock/res/layout/abs__action_mode_bar.xml
ctionbarsherlock/res/layout/abs__action_mode_close_item.xml
ctionbarsherlock/res/layout/abs__activity_chooser_view.xml
ctionbarsherlock/res/layout/abs__activity_chooser_view_list_item.xml
ctionbarsherlock/res/layout/abs__dialog_title_holo.xml
ctionbarsherlock/res/layout/abs__list_menu_item_checkbox.xml
ctionbarsherlock/res/layout/abs__list_menu_item_icon.xml
ctionbarsherlock/res/layout/abs__list_menu_item_layout.xml
ctionbarsherlock/res/layout/abs__list_menu_item_radio.xml
ctionbarsherlock/res/layout/abs__popup_menu_item_layout.xml
ctionbarsherlock/res/layout/abs__screen_action_bar.xml
ctionbarsherlock/res/layout/abs__screen_action_bar_overlay.xml
ctionbarsherlock/res/layout/abs__screen_simple.xml
ctionbarsherlock/res/layout/abs__screen_simple_overlay_action_mode.xml
ctionbarsherlock/res/layout/sherlock_spinner_dropdown_item.xml
ctionbarsherlock/res/layout/sherlock_spinner_item.xml
ctionbarsherlock/res/values-land/abs__dimens.xml
ctionbarsherlock/res/values-large-hdpi-1024x600/abs__dimens.xml
ctionbarsherlock/res/values-large-land-hdpi-1024x600/abs__dimens.xml
ctionbarsherlock/res/values-large-land-mdpi-1024x600/abs__dimens.xml
ctionbarsherlock/res/values-large-mdpi-1024x600/abs__dimens.xml
ctionbarsherlock/res/values-large/abs__dimens.xml
ctionbarsherlock/res/values-sw600dp/abs__bools.xml
ctionbarsherlock/res/values-sw600dp/abs__dimens.xml
ctionbarsherlock/res/values-v11/abs__themes.xml
ctionbarsherlock/res/values-v14/abs__styles.xml
ctionbarsherlock/res/values-v14/abs__themes.xml
ctionbarsherlock/res/values-w360dp/abs__dimens.xml
ctionbarsherlock/res/values-w480dp/abs__bools.xml
ctionbarsherlock/res/values-w480dp/abs__config.xml
ctionbarsherlock/res/values-w500dp/abs__dimens.xml
ctionbarsherlock/res/values-w600dp/abs__dimens.xml
ctionbarsherlock/res/values-xlarge/abs__dimens.xml
ctionbarsherlock/res/values/abs__attrs.xml
ctionbarsherlock/res/values/abs__bools.xml
ctionbarsherlock/res/values/abs__colors.xml
ctionbarsherlock/res/values/abs__config.xml
ctionbarsherlock/res/values/abs__dimens.xml
ctionbarsherlock/res/values/abs__ids.xml
ctionbarsherlock/res/values/abs__strings.xml
ctionbarsherlock/res/values/abs__styles.xml
ctionbarsherlock/res/values/abs__themes.xml
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/ActionMenuPresenter.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/BaseMenuPresenter.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/MenuPresenter.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/IcsProgressBar.java
es/layout/action_bar_text.xml
es/layout/action_mode.xml
es/layout/popup_list_item.xml
es/menu/movie.xml
es/menu/operation.xml
es/menu/photo.xml
es/values-v14/styles.xml
es/values/styles.xml
|
c0f1fb74d1b12aa6fad669825f7e8c21f7cae05a |
12-Dec-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE"
|
285be388336a359e52a887791006bfb961cc4ed9 |
12-Dec-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ic7cb59b9a307183034e2f6e6dbf278afeb4fe95d Auto-generated-cl: translation import
es/values-af/photoeditor_strings.xml
es/values-am/photoeditor_strings.xml
es/values-ar/photoeditor_strings.xml
es/values-be/photoeditor_strings.xml
es/values-bg/photoeditor_strings.xml
es/values-ca/photoeditor_strings.xml
es/values-cs/photoeditor_strings.xml
es/values-da/photoeditor_strings.xml
es/values-de/photoeditor_strings.xml
es/values-el/photoeditor_strings.xml
es/values-en-rGB/photoeditor_strings.xml
es/values-es-rUS/photoeditor_strings.xml
es/values-es/photoeditor_strings.xml
es/values-et/photoeditor_strings.xml
es/values-fa/photoeditor_strings.xml
es/values-fi/photoeditor_strings.xml
es/values-fr/photoeditor_strings.xml
es/values-hi/photoeditor_strings.xml
es/values-hr/photoeditor_strings.xml
es/values-hu/photoeditor_strings.xml
es/values-in/photoeditor_strings.xml
es/values-it/photoeditor_strings.xml
es/values-iw/photoeditor_strings.xml
es/values-ja/photoeditor_strings.xml
es/values-ko/photoeditor_strings.xml
es/values-lt/photoeditor_strings.xml
es/values-lv/photoeditor_strings.xml
es/values-ms/photoeditor_strings.xml
es/values-nb/photoeditor_strings.xml
es/values-nl/photoeditor_strings.xml
es/values-pl/photoeditor_strings.xml
es/values-pt-rPT/photoeditor_strings.xml
es/values-pt/photoeditor_strings.xml
es/values-ro/photoeditor_strings.xml
es/values-ru/photoeditor_strings.xml
es/values-sk/photoeditor_strings.xml
es/values-sl/photoeditor_strings.xml
es/values-sr/photoeditor_strings.xml
es/values-sv/photoeditor_strings.xml
es/values-sw/photoeditor_strings.xml
es/values-th/photoeditor_strings.xml
es/values-tl/photoeditor_strings.xml
es/values-tr/photoeditor_strings.xml
es/values-uk/photoeditor_strings.xml
es/values-vi/photoeditor_strings.xml
es/values-zh-rCN/photoeditor_strings.xml
es/values-zh-rTW/photoeditor_strings.xml
es/values-zu/photoeditor_strings.xml
|
e41be6c421a3ea9e132ff9b0b3b596acb148769d |
12-Dec-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
|
3520995dc4362c8a682808ba6cb97ea0c96820a4 |
12-Dec-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
|
b5797965d93341e7bd546543d3ef5d7c788d4542 |
12-Dec-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ia0383aea5a4bc841b70b5fe6d769d7192731aab1 Auto-generated-cl: translation import
es/values-ms/filtershow_strings.xml
es/values-nb/filtershow_strings.xml
es/values-pt/filtershow_strings.xml
|
cc576587892a6154efe23e3f5f8e71275724fa0e |
12-Dec-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ia0383aea5a4bc841b70b5fe6d769d7192731aab1 Auto-generated-cl: translation import
es/values-ms/filtershow_strings.xml
es/values-nb/filtershow_strings.xml
es/values-pt/filtershow_strings.xml
|
c17007f097719658ad7b8a0ae05df922ca62a2ed |
12-Dec-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I18ceece16589c18ba74e4e26ed5c9b0439f01b91 Auto-generated-cl: translation import
es/values-ca/strings.xml
|
0f3a59e2fd3cfbadc8d6783b6cd764c3a1d93475 |
12-Dec-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I85840e6082a576dae720ab53920f2031d6d9a703 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
4a3b0a8918d138b3ce880f6b46103449da080d3e |
12-Dec-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I85840e6082a576dae720ab53920f2031d6d9a703 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
97d9a7cdf25c39b5a4cb92a99ec9fb21d7da1509 |
12-Dec-2012 |
Your Name <jreck@google.com> |
Merge "Remove LongSpareArray + some cleanups" into gb-ub-photos-bryce
|
d9b8887252a17464b4357e3699192d11c608233a |
12-Dec-2012 |
Your Name <jreck@google.com> |
Merge "Remove LongSpareArray + some cleanups" into gb-ub-photos-bryce
|
8e8cc05541f6c8c34c6c37aa5622e146064a1793 |
12-Dec-2012 |
John Reck <jreck@google.com> |
Merge "GL packaging refactor" into gb-ub-photos-bryce
|
7d5aeb075548256a8b11ccf06b225ac7b79770dd |
12-Dec-2012 |
John Reck <jreck@google.com> |
Merge "GL packaging refactor" into gb-ub-photos-bryce
|
7acd7415319c4de16e4deba0d40eb4099a7eaac1 |
11-Dec-2012 |
John Reck <jreck@google.com> |
GL packaging refactor Change-Id: I1d7a95c4f0b91a5ba59030d57cf6865c11b497aa
roguard.flags
|
2cc0fd3ebdd95b55abeb587aa87cbe796e6dea4d |
11-Dec-2012 |
John Reck <jreck@google.com> |
GL packaging refactor Change-Id: I1d7a95c4f0b91a5ba59030d57cf6865c11b497aa
rc/com/android/gallery3d/ui/ProgressSpinner.java
|
8cb165add72646ba57cf2f072d91351a8544fbc5 |
11-Dec-2012 |
John Reck <jreck@google.com> |
GL packaging refactor Change-Id: I1d7a95c4f0b91a5ba59030d57cf6865c11b497aa
rc/com/android/gallery3d/anim/AlphaAnimation.java
rc/com/android/gallery3d/anim/CanvasAnimation.java
rc/com/android/gallery3d/anim/StateTransitionAnimation.java
rc/com/android/gallery3d/app/ActivityState.java
rc/com/android/gallery3d/app/AlbumPage.java
rc/com/android/gallery3d/app/AlbumSetPage.java
rc/com/android/gallery3d/app/ManageCachePage.java
rc/com/android/gallery3d/app/PhotoDataAdapter.java
rc/com/android/gallery3d/app/SlideshowPage.java
rc/com/android/gallery3d/glrenderer/BasicTexture.java
rc/com/android/gallery3d/glrenderer/BitmapTexture.java
rc/com/android/gallery3d/glrenderer/CanvasTexture.java
rc/com/android/gallery3d/glrenderer/ColorTexture.java
rc/com/android/gallery3d/glrenderer/ExtTexture.java
rc/com/android/gallery3d/glrenderer/FadeInTexture.java
rc/com/android/gallery3d/glrenderer/FadeOutTexture.java
rc/com/android/gallery3d/glrenderer/FadeTexture.java
rc/com/android/gallery3d/glrenderer/GLCanvas.java
rc/com/android/gallery3d/glrenderer/GLES11Canvas.java
rc/com/android/gallery3d/glrenderer/GLES20Canvas.java
rc/com/android/gallery3d/glrenderer/GLId.java
rc/com/android/gallery3d/glrenderer/GLIdImpl.java
rc/com/android/gallery3d/glrenderer/GLPaint.java
rc/com/android/gallery3d/glrenderer/MultiLineTexture.java
rc/com/android/gallery3d/glrenderer/NinePatchChunk.java
rc/com/android/gallery3d/glrenderer/NinePatchTexture.java
rc/com/android/gallery3d/glrenderer/RawTexture.java
rc/com/android/gallery3d/glrenderer/ResourceTexture.java
rc/com/android/gallery3d/glrenderer/StringTexture.java
rc/com/android/gallery3d/glrenderer/Texture.java
rc/com/android/gallery3d/glrenderer/TextureUploader.java
rc/com/android/gallery3d/glrenderer/TiledTexture.java
rc/com/android/gallery3d/glrenderer/UploadedTexture.java
rc/com/android/gallery3d/ui/AbstractSlotRenderer.java
rc/com/android/gallery3d/ui/AlbumSetSlidingWindow.java
rc/com/android/gallery3d/ui/AlbumSetSlotRenderer.java
rc/com/android/gallery3d/ui/AlbumSlidingWindow.java
rc/com/android/gallery3d/ui/AlbumSlotRenderer.java
rc/com/android/gallery3d/ui/BasicTexture.java
rc/com/android/gallery3d/ui/BitmapScreenNail.java
rc/com/android/gallery3d/ui/BitmapTexture.java
rc/com/android/gallery3d/ui/CanvasTexture.java
rc/com/android/gallery3d/ui/ColorTexture.java
rc/com/android/gallery3d/ui/EdgeEffect.java
rc/com/android/gallery3d/ui/EdgeView.java
rc/com/android/gallery3d/ui/ExtTexture.java
rc/com/android/gallery3d/ui/FadeInTexture.java
rc/com/android/gallery3d/ui/FadeOutTexture.java
rc/com/android/gallery3d/ui/FadeTexture.java
rc/com/android/gallery3d/ui/GLCanvas.java
rc/com/android/gallery3d/ui/GLCanvasImpl.java
rc/com/android/gallery3d/ui/GLES20Canvas.java
rc/com/android/gallery3d/ui/GLId.java
rc/com/android/gallery3d/ui/GLIdImpl.java
rc/com/android/gallery3d/ui/GLPaint.java
rc/com/android/gallery3d/ui/GLRoot.java
rc/com/android/gallery3d/ui/GLRootView.java
rc/com/android/gallery3d/ui/GLView.java
rc/com/android/gallery3d/ui/GalleryEGLConfigChooser.java
rc/com/android/gallery3d/ui/Log.java
rc/com/android/gallery3d/ui/ManageCacheDrawer.java
rc/com/android/gallery3d/ui/MultiLineTexture.java
rc/com/android/gallery3d/ui/NinePatchChunk.java
rc/com/android/gallery3d/ui/NinePatchTexture.java
rc/com/android/gallery3d/ui/PhotoFallbackEffect.java
rc/com/android/gallery3d/ui/PhotoView.java
rc/com/android/gallery3d/ui/PreparePageFadeoutTexture.java
rc/com/android/gallery3d/ui/ProgressSpinner.java
rc/com/android/gallery3d/ui/RawTexture.java
rc/com/android/gallery3d/ui/ResourceTexture.java
rc/com/android/gallery3d/ui/ScreenNail.java
rc/com/android/gallery3d/ui/ScrollBarView.java
rc/com/android/gallery3d/ui/SlideshowView.java
rc/com/android/gallery3d/ui/SlotView.java
rc/com/android/gallery3d/ui/StringTexture.java
rc/com/android/gallery3d/ui/SurfaceTextureScreenNail.java
rc/com/android/gallery3d/ui/Texture.java
rc/com/android/gallery3d/ui/TextureUploader.java
rc/com/android/gallery3d/ui/TileImageView.java
rc/com/android/gallery3d/ui/TiledScreenNail.java
rc/com/android/gallery3d/ui/TiledTexture.java
rc/com/android/gallery3d/ui/UndoBarView.java
rc/com/android/gallery3d/ui/UploadedTexture.java
ests/src/com/android/gallery3d/glrenderer/GLCanvasMock.java
ests/src/com/android/gallery3d/glrenderer/GLCanvasTest.java
ests/src/com/android/gallery3d/glrenderer/GLMock.java
ests/src/com/android/gallery3d/glrenderer/GLStub.java
ests/src/com/android/gallery3d/glrenderer/TextureTest.java
ests/src/com/android/gallery3d/ui/GLCanvasMock.java
ests/src/com/android/gallery3d/ui/GLCanvasStub.java
ests/src/com/android/gallery3d/ui/GLCanvasTest.java
ests/src/com/android/gallery3d/ui/GLMock.java
ests/src/com/android/gallery3d/ui/GLStub.java
ests/src/com/android/gallery3d/ui/GLViewMock.java
ests/src/com/android/gallery3d/ui/TextureTest.java
|
a4eae1abb4f2547dfbda84301ee764ce35464881 |
11-Dec-2012 |
John Reck <jreck@google.com> |
GL packaging refactor Change-Id: I1d7a95c4f0b91a5ba59030d57cf6865c11b497aa
roguard.flags
rc/com/android/gallery3d/anim/AlphaAnimation.java
rc/com/android/gallery3d/anim/CanvasAnimation.java
rc/com/android/gallery3d/anim/StateTransitionAnimation.java
rc/com/android/gallery3d/app/ActivityState.java
rc/com/android/gallery3d/app/AlbumPage.java
rc/com/android/gallery3d/app/AlbumSetPage.java
rc/com/android/gallery3d/app/ManageCachePage.java
rc/com/android/gallery3d/app/PhotoDataAdapter.java
rc/com/android/gallery3d/app/SlideshowPage.java
rc/com/android/gallery3d/glrenderer/BasicTexture.java
rc/com/android/gallery3d/glrenderer/BitmapTexture.java
rc/com/android/gallery3d/glrenderer/CanvasTexture.java
rc/com/android/gallery3d/glrenderer/ColorTexture.java
rc/com/android/gallery3d/glrenderer/ExtTexture.java
rc/com/android/gallery3d/glrenderer/FadeInTexture.java
rc/com/android/gallery3d/glrenderer/FadeOutTexture.java
rc/com/android/gallery3d/glrenderer/FadeTexture.java
rc/com/android/gallery3d/glrenderer/GLCanvas.java
rc/com/android/gallery3d/glrenderer/GLES11Canvas.java
rc/com/android/gallery3d/glrenderer/GLES20Canvas.java
rc/com/android/gallery3d/glrenderer/GLId.java
rc/com/android/gallery3d/glrenderer/GLIdImpl.java
rc/com/android/gallery3d/glrenderer/GLPaint.java
rc/com/android/gallery3d/glrenderer/MultiLineTexture.java
rc/com/android/gallery3d/glrenderer/NinePatchChunk.java
rc/com/android/gallery3d/glrenderer/NinePatchTexture.java
rc/com/android/gallery3d/glrenderer/RawTexture.java
rc/com/android/gallery3d/glrenderer/ResourceTexture.java
rc/com/android/gallery3d/glrenderer/StringTexture.java
rc/com/android/gallery3d/glrenderer/Texture.java
rc/com/android/gallery3d/glrenderer/TextureUploader.java
rc/com/android/gallery3d/glrenderer/TiledTexture.java
rc/com/android/gallery3d/glrenderer/UploadedTexture.java
rc/com/android/gallery3d/ui/AbstractSlotRenderer.java
rc/com/android/gallery3d/ui/AlbumSetSlidingWindow.java
rc/com/android/gallery3d/ui/AlbumSetSlotRenderer.java
rc/com/android/gallery3d/ui/AlbumSlidingWindow.java
rc/com/android/gallery3d/ui/AlbumSlotRenderer.java
rc/com/android/gallery3d/ui/BasicTexture.java
rc/com/android/gallery3d/ui/BitmapScreenNail.java
rc/com/android/gallery3d/ui/BitmapTexture.java
rc/com/android/gallery3d/ui/CanvasTexture.java
rc/com/android/gallery3d/ui/ColorTexture.java
rc/com/android/gallery3d/ui/EdgeEffect.java
rc/com/android/gallery3d/ui/EdgeView.java
rc/com/android/gallery3d/ui/ExtTexture.java
rc/com/android/gallery3d/ui/FadeInTexture.java
rc/com/android/gallery3d/ui/FadeOutTexture.java
rc/com/android/gallery3d/ui/FadeTexture.java
rc/com/android/gallery3d/ui/GLCanvas.java
rc/com/android/gallery3d/ui/GLCanvasImpl.java
rc/com/android/gallery3d/ui/GLES20Canvas.java
rc/com/android/gallery3d/ui/GLId.java
rc/com/android/gallery3d/ui/GLIdImpl.java
rc/com/android/gallery3d/ui/GLPaint.java
rc/com/android/gallery3d/ui/GLRoot.java
rc/com/android/gallery3d/ui/GLRootView.java
rc/com/android/gallery3d/ui/GLView.java
rc/com/android/gallery3d/ui/GalleryEGLConfigChooser.java
rc/com/android/gallery3d/ui/Log.java
rc/com/android/gallery3d/ui/ManageCacheDrawer.java
rc/com/android/gallery3d/ui/MultiLineTexture.java
rc/com/android/gallery3d/ui/NinePatchChunk.java
rc/com/android/gallery3d/ui/NinePatchTexture.java
rc/com/android/gallery3d/ui/PhotoFallbackEffect.java
rc/com/android/gallery3d/ui/PhotoView.java
rc/com/android/gallery3d/ui/PreparePageFadeoutTexture.java
rc/com/android/gallery3d/ui/ProgressSpinner.java
rc/com/android/gallery3d/ui/RawTexture.java
rc/com/android/gallery3d/ui/ResourceTexture.java
rc/com/android/gallery3d/ui/ScreenNail.java
rc/com/android/gallery3d/ui/ScrollBarView.java
rc/com/android/gallery3d/ui/SlideshowView.java
rc/com/android/gallery3d/ui/SlotView.java
rc/com/android/gallery3d/ui/StringTexture.java
rc/com/android/gallery3d/ui/SurfaceTextureScreenNail.java
rc/com/android/gallery3d/ui/Texture.java
rc/com/android/gallery3d/ui/TextureUploader.java
rc/com/android/gallery3d/ui/TileImageView.java
rc/com/android/gallery3d/ui/TiledScreenNail.java
rc/com/android/gallery3d/ui/TiledTexture.java
rc/com/android/gallery3d/ui/UndoBarView.java
rc/com/android/gallery3d/ui/UploadedTexture.java
ests/src/com/android/gallery3d/glrenderer/GLCanvasMock.java
ests/src/com/android/gallery3d/glrenderer/GLCanvasTest.java
ests/src/com/android/gallery3d/glrenderer/GLMock.java
ests/src/com/android/gallery3d/glrenderer/GLStub.java
ests/src/com/android/gallery3d/glrenderer/TextureTest.java
ests/src/com/android/gallery3d/ui/GLCanvasMock.java
ests/src/com/android/gallery3d/ui/GLCanvasStub.java
ests/src/com/android/gallery3d/ui/GLCanvasTest.java
ests/src/com/android/gallery3d/ui/GLMock.java
ests/src/com/android/gallery3d/ui/GLStub.java
ests/src/com/android/gallery3d/ui/GLViewMock.java
ests/src/com/android/gallery3d/ui/TextureTest.java
|
51623b2bb42e054bd4b7e45de474fe27c4379a0e |
11-Dec-2012 |
nicolasroard <nicolasroard@google.com> |
Cleanup filters creation in presets bug:7688780 Change-Id: If330d02e3c0f43cffbce5327b26f0af44d2416c8
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/PanelController.java
rc/com/android/gallery3d/filtershow/filters/ImageFilter.java
|
65161214283cfb3e93b19061f9f7108462da71e4 |
11-Dec-2012 |
nicolasroard <nicolasroard@google.com> |
Cleanup filters creation in presets bug:7688780 Change-Id: If330d02e3c0f43cffbce5327b26f0af44d2416c8
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/PanelController.java
rc/com/android/gallery3d/filtershow/filters/ImageFilter.java
|
d2d957d82a4274583b78d5684a0fb8d1b0210411 |
11-Dec-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am 2b366f1e: (-s ours) Reconcile with jb-mr1.1-release - do not merge * commit '2b366f1eab4d723a9bf06c616b2d23c262164939':
|
2b366f1eab4d723a9bf06c616b2d23c262164939 |
11-Dec-2012 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with jb-mr1.1-release - do not merge Change-Id: I59ea8b8ba720db95748416f5a44e385ff05cf024
|
992307e2ca3e053230cc0ee10f2d9fdb283c4b70 |
04-Dec-2012 |
Your Name <jreck@google.com> |
Remove LongSpareArray + some cleanups Change-Id: If5bb44ebca70bd735e426aeb3d9aac2d4bac646e
allerycommon/src/com/android/gallery3d/common/LongSparseArray.java
|
6c6e2d4edeb0113376b66ac4491ce7ec023e3437 |
04-Dec-2012 |
Your Name <jreck@google.com> |
Remove LongSpareArray + some cleanups Change-Id: If5bb44ebca70bd735e426aeb3d9aac2d4bac646e
allerycommon/src/com/android/gallery3d/common/LongSparseArray.java
rc/com/android/gallery3d/app/PhotoDataAdapter.java
rc/com/android/gallery3d/ui/BitmapTileProvider.java
rc/com/android/gallery3d/ui/PhotoView.java
rc/com/android/gallery3d/ui/TileImageView.java
rc/com/android/gallery3d/ui/TileImageViewAdapter.java
rc/com/android/gallery3d/util/GalleryUtils.java
|
6dc3866ac10cc6bf38e73f098fe1988d1a6eecd4 |
04-Dec-2012 |
Your Name <jreck@google.com> |
Remove LongSpareArray + some cleanups Change-Id: If5bb44ebca70bd735e426aeb3d9aac2d4bac646e
allerycommon/src/com/android/gallery3d/common/LongSparseArray.java
rc/com/android/gallery3d/app/PhotoDataAdapter.java
rc/com/android/gallery3d/ui/BitmapTileProvider.java
rc/com/android/gallery3d/ui/PhotoView.java
rc/com/android/gallery3d/ui/TileImageView.java
rc/com/android/gallery3d/ui/TileImageViewAdapter.java
rc/com/android/gallery3d/util/GalleryUtils.java
|
f1a68580777cf0c3a9034d2b3a5e42c9a245d54c |
11-Dec-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
|
e7597ec69557e4a90c78e35f1bf23b80372b4161 |
11-Dec-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE"
|
aad361f7128abdc7e366ba9799af2f0077284b67 |
11-Dec-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
|
e27ae6ec69bfbdb78caf8c29a40140eae4f20e29 |
11-Dec-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
|
9d0f52c209176ab64d9bd21e5c99901b1764bf5e |
11-Dec-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE"
|
d23b91095e60c3ea26f6ac33f3f2ec120d173906 |
11-Dec-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
|
073a0b3e3151604b24b08d133c91dd09a99d57a6 |
11-Dec-2012 |
John Reck <jreck@google.com> |
am 9745d080: am 360ae4dd: am f6bc102c: am 695e1aa0: Force a layout pass if the display rotation changes * commit '9745d080caa572dd85f3e0bacd936c8ca4e2b7a6': Force a layout pass if the display rotation changes
|
9745d080caa572dd85f3e0bacd936c8ca4e2b7a6 |
11-Dec-2012 |
John Reck <jreck@google.com> |
am 360ae4dd: am f6bc102c: am 695e1aa0: Force a layout pass if the display rotation changes * commit '360ae4ddf31136e5a29792a212dfb9949e45be74': Force a layout pass if the display rotation changes
|
360ae4ddf31136e5a29792a212dfb9949e45be74 |
10-Dec-2012 |
John Reck <jreck@google.com> |
am f6bc102c: am 695e1aa0: Force a layout pass if the display rotation changes * commit 'f6bc102ca181ebe3064aa211b736de213a5d31e2': Force a layout pass if the display rotation changes
|
f6bc102ca181ebe3064aa211b736de213a5d31e2 |
10-Dec-2012 |
John Reck <jreck@google.com> |
am 695e1aa0: Force a layout pass if the display rotation changes * commit '695e1aa059cbc2cb2988f6beb0fee8ff7952b229': Force a layout pass if the display rotation changes
|
203b6826f9958fbafd1a92b4a99d8d9e20e8b248 |
10-Dec-2012 |
John Reck <jreck@google.com> |
am 695e1aa0: Force a layout pass if the display rotation changes * commit '695e1aa059cbc2cb2988f6beb0fee8ff7952b229': Force a layout pass if the display rotation changes
|
5c7b259812a4cea11e14b901526faf5a33c4c07c |
10-Dec-2012 |
John Reck <jreck@google.com> |
am 695e1aa0: Force a layout pass if the display rotation changes * commit '695e1aa059cbc2cb2988f6beb0fee8ff7952b229': Force a layout pass if the display rotation changes
|
fdc55e32bb4643ca7a3637045b975d94b25f3714 |
10-Dec-2012 |
John Reck <jreck@google.com> |
Force a layout pass if the display rotation changes Bug: 7687209 DisplayRotation is used to map camera orientation to the display and is updated in layoutContentPane(). However, in the case of a 180 rotate framework doesn't send an onConfigurationChanged nor does the layout dimensions change, thus layoutContentPane doesn't fire and we don't update mDisplayRotation, resulting in an upside-down preview. To handle this, check each draw whether or not the display rotation has changed and if it has force a layout pass. Change-Id: I610ea235d1bf7de2743f4cdb8e42ba1ddcb41404
rc/com/android/gallery3d/ui/GLRootView.java
|
695e1aa059cbc2cb2988f6beb0fee8ff7952b229 |
10-Dec-2012 |
John Reck <jreck@google.com> |
Force a layout pass if the display rotation changes Bug: 7687209 DisplayRotation is used to map camera orientation to the display and is updated in layoutContentPane(). However, in the case of a 180 rotate framework doesn't send an onConfigurationChanged nor does the layout dimensions change, thus layoutContentPane doesn't fire and we don't update mDisplayRotation, resulting in an upside-down preview. To handle this, check each draw whether or not the display rotation has changed and if it has force a layout pass. Change-Id: I610ea235d1bf7de2743f4cdb8e42ba1ddcb41404
rc/com/android/gallery3d/ui/GLRootView.java
|
dbe5e909f036861b35cc6d79bf3413de8cc82bbf |
10-Dec-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Id5189f3df0e625f8197eceeec6b58916e8d175fd Auto-generated-cl: translation import
es/values-af/photoeditor_strings.xml
es/values-am/photoeditor_strings.xml
es/values-ar/photoeditor_strings.xml
es/values-be/photoeditor_strings.xml
es/values-bg/photoeditor_strings.xml
es/values-ca/photoeditor_strings.xml
es/values-cs/photoeditor_strings.xml
es/values-da/photoeditor_strings.xml
es/values-de/photoeditor_strings.xml
es/values-el/photoeditor_strings.xml
es/values-en-rGB/photoeditor_strings.xml
es/values-es-rUS/photoeditor_strings.xml
es/values-es/photoeditor_strings.xml
es/values-et/photoeditor_strings.xml
es/values-fa/photoeditor_strings.xml
es/values-fi/photoeditor_strings.xml
es/values-fr/photoeditor_strings.xml
es/values-hi/photoeditor_strings.xml
es/values-hr/photoeditor_strings.xml
es/values-hu/photoeditor_strings.xml
es/values-in/photoeditor_strings.xml
es/values-it/photoeditor_strings.xml
es/values-iw/photoeditor_strings.xml
es/values-ja/photoeditor_strings.xml
es/values-ko/photoeditor_strings.xml
es/values-lt/photoeditor_strings.xml
es/values-lv/photoeditor_strings.xml
es/values-ms/photoeditor_strings.xml
es/values-nb/photoeditor_strings.xml
es/values-nl/photoeditor_strings.xml
es/values-pl/photoeditor_strings.xml
es/values-pt-rPT/photoeditor_strings.xml
es/values-pt/photoeditor_strings.xml
es/values-ro/photoeditor_strings.xml
es/values-ru/photoeditor_strings.xml
es/values-sk/photoeditor_strings.xml
es/values-sl/photoeditor_strings.xml
es/values-sr/photoeditor_strings.xml
es/values-sv/photoeditor_strings.xml
es/values-sw/photoeditor_strings.xml
es/values-th/photoeditor_strings.xml
es/values-tl/photoeditor_strings.xml
es/values-tr/photoeditor_strings.xml
es/values-uk/photoeditor_strings.xml
es/values-vi/photoeditor_strings.xml
es/values-zh-rCN/photoeditor_strings.xml
es/values-zh-rTW/photoeditor_strings.xml
es/values-zu/photoeditor_strings.xml
|
e893b637038734b9ea33e054768f1a4de8e017d1 |
10-Dec-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I8cb5c317cfa65c82435c9495c6fa0ce81a2f37ef Auto-generated-cl: translation import
es/values-af/filtershow_strings.xml
es/values-am/filtershow_strings.xml
es/values-ar/filtershow_strings.xml
es/values-be/filtershow_strings.xml
es/values-bg/filtershow_strings.xml
es/values-ca/filtershow_strings.xml
es/values-cs/filtershow_strings.xml
es/values-da/filtershow_strings.xml
es/values-de/filtershow_strings.xml
es/values-el/filtershow_strings.xml
es/values-en-rGB/filtershow_strings.xml
es/values-es-rUS/filtershow_strings.xml
es/values-es/filtershow_strings.xml
es/values-et/filtershow_strings.xml
es/values-fa/filtershow_strings.xml
es/values-fi/filtershow_strings.xml
es/values-fr/filtershow_strings.xml
es/values-hi/filtershow_strings.xml
es/values-hr/filtershow_strings.xml
es/values-hu/filtershow_strings.xml
es/values-in/filtershow_strings.xml
es/values-it/filtershow_strings.xml
es/values-iw/filtershow_strings.xml
es/values-ja/filtershow_strings.xml
es/values-ko/filtershow_strings.xml
es/values-lt/filtershow_strings.xml
es/values-lv/filtershow_strings.xml
es/values-ms/filtershow_strings.xml
es/values-nb/filtershow_strings.xml
es/values-nl/filtershow_strings.xml
es/values-pl/filtershow_strings.xml
es/values-pt-rPT/filtershow_strings.xml
es/values-pt/filtershow_strings.xml
es/values-ro/filtershow_strings.xml
es/values-ru/filtershow_strings.xml
es/values-sk/filtershow_strings.xml
es/values-sl/filtershow_strings.xml
es/values-sr/filtershow_strings.xml
es/values-sv/filtershow_strings.xml
es/values-sw/filtershow_strings.xml
es/values-th/filtershow_strings.xml
es/values-tl/filtershow_strings.xml
es/values-tr/filtershow_strings.xml
es/values-uk/filtershow_strings.xml
es/values-vi/filtershow_strings.xml
es/values-zh-rCN/filtershow_strings.xml
es/values-zh-rTW/filtershow_strings.xml
es/values-zu/filtershow_strings.xml
|
184378f445922b50b3de862f9fb47959ec978d8f |
10-Dec-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I8cb5c317cfa65c82435c9495c6fa0ce81a2f37ef Auto-generated-cl: translation import
es/values-af/filtershow_strings.xml
es/values-am/filtershow_strings.xml
es/values-ar/filtershow_strings.xml
es/values-be/filtershow_strings.xml
es/values-bg/filtershow_strings.xml
es/values-ca/filtershow_strings.xml
es/values-cs/filtershow_strings.xml
es/values-da/filtershow_strings.xml
es/values-de/filtershow_strings.xml
es/values-el/filtershow_strings.xml
es/values-en-rGB/filtershow_strings.xml
es/values-es-rUS/filtershow_strings.xml
es/values-es/filtershow_strings.xml
es/values-et/filtershow_strings.xml
es/values-fa/filtershow_strings.xml
es/values-fi/filtershow_strings.xml
es/values-fr/filtershow_strings.xml
es/values-hi/filtershow_strings.xml
es/values-hr/filtershow_strings.xml
es/values-hu/filtershow_strings.xml
es/values-in/filtershow_strings.xml
es/values-it/filtershow_strings.xml
es/values-iw/filtershow_strings.xml
es/values-ja/filtershow_strings.xml
es/values-ko/filtershow_strings.xml
es/values-lt/filtershow_strings.xml
es/values-lv/filtershow_strings.xml
es/values-ms/filtershow_strings.xml
es/values-nb/filtershow_strings.xml
es/values-nl/filtershow_strings.xml
es/values-pl/filtershow_strings.xml
es/values-pt-rPT/filtershow_strings.xml
es/values-pt/filtershow_strings.xml
es/values-ro/filtershow_strings.xml
es/values-ru/filtershow_strings.xml
es/values-sk/filtershow_strings.xml
es/values-sl/filtershow_strings.xml
es/values-sr/filtershow_strings.xml
es/values-sv/filtershow_strings.xml
es/values-sw/filtershow_strings.xml
es/values-th/filtershow_strings.xml
es/values-tl/filtershow_strings.xml
es/values-tr/filtershow_strings.xml
es/values-uk/filtershow_strings.xml
es/values-vi/filtershow_strings.xml
es/values-zh-rCN/filtershow_strings.xml
es/values-zh-rTW/filtershow_strings.xml
es/values-zu/filtershow_strings.xml
|
51e8c98ea3158db0b8633c190162127d4818dcda |
10-Dec-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I35011cce11ea674987e024b9376d6e2b76dd5684 Auto-generated-cl: translation import
es/values-ar/strings.xml
es/values-de/strings.xml
|
1c79ae6fc9fd5ef85ce583bfeaecd5680762dc72 |
10-Dec-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ia06955ba6bbb9eb0a19293a7fdf15128c4e24640 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
d215364cff4aeed1e5d02af696573cb28d2cd765 |
10-Dec-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ia06955ba6bbb9eb0a19293a7fdf15128c4e24640 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
f10a8fa2a4bd5d26d649842d9063ffe9092bff82 |
08-Dec-2012 |
nicolasroard <nicolasroard@google.com> |
More refactoring... Simplify management of filters in PanelController bug:7688780 Change-Id: I0d07711cb2be127f064d476c6e98f4363b69b06c
rc/com/android/gallery3d/filtershow/PanelController.java
rc/com/android/gallery3d/filtershow/filters/ImageFilter.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterCurves.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterRedEye.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterSharpen.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterWBalance.java
rc/com/android/gallery3d/filtershow/imageshow/ImageSmallFilter.java
|
c649360ce22f0138bfcb745eed585a32eb8570e7 |
08-Dec-2012 |
nicolasroard <nicolasroard@google.com> |
More refactoring... Simplify management of filters in PanelController bug:7688780 Change-Id: I0d07711cb2be127f064d476c6e98f4363b69b06c
rc/com/android/gallery3d/filtershow/PanelController.java
rc/com/android/gallery3d/filtershow/filters/ImageFilter.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterCurves.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterRedEye.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterSharpen.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterWBalance.java
rc/com/android/gallery3d/filtershow/imageshow/ImageSmallFilter.java
|
f7273315313afded5c91e37b9d8f0b5c30c93c71 |
07-Dec-2012 |
nicolasroard <nicolasroard@google.com> |
Merge "More refactoring. Makes it easy to specify how the button should look like (overlay img or not)." into gb-ub-photos-bryce
|
e9559a23576135fb899f30056187f6097929b8bc |
07-Dec-2012 |
nicolasroard <nicolasroard@google.com> |
Merge "More refactoring. Makes it easy to specify how the button should look like (overlay img or not)." into gb-ub-photos-bryce
|
533d88de7f0f118bebce115414078f7610e0a67c |
07-Dec-2012 |
Doris Liu <tianliu@google.com> |
Decode screenshots when they show 0x0 dimensions Bug: 7470758 Change-Id: If4012899e120ad68cdc8ca12bf6f8de8c5c96019
es/values/strings.xml
|
4e2406e2e2ba5f4dd4b5d4e75f5b9b07a64ba77f |
07-Dec-2012 |
Doris Liu <tianliu@google.com> |
Decode screenshots when they show 0x0 dimensions Bug: 7470758 Change-Id: If4012899e120ad68cdc8ca12bf6f8de8c5c96019
rc/com/android/gallery3d/ui/DetailsHelper.java
rc/com/android/gallery3d/ui/DialogDetailsView.java
|
e879326d76734277469ca2f387f436fd0e922c87 |
07-Dec-2012 |
Doris Liu <tianliu@google.com> |
Decode screenshots when they show 0x0 dimensions Bug: 7470758 Change-Id: If4012899e120ad68cdc8ca12bf6f8de8c5c96019
es/values/strings.xml
rc/com/android/gallery3d/ui/DetailsHelper.java
rc/com/android/gallery3d/ui/DialogDetailsView.java
|
85dff5a538042695a244ddd10db994c64e9e82d4 |
07-Dec-2012 |
nicolasroard <nicolasroard@google.com> |
More refactoring. Makes it easy to specify how the button should look like (overlay img or not). bug:7688780 Change-Id: If883c6886ade409dac7d72c87a514bd3fcd3ad7f
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterCurves.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterSharpen.java
rc/com/android/gallery3d/filtershow/imageshow/ImageSmallFilter.java
rc/com/android/gallery3d/filtershow/imageshow/ImageWithIcon.java
|
116fc29a3f893813b95d7f55799d2947e09e512a |
07-Dec-2012 |
nicolasroard <nicolasroard@google.com> |
More refactoring. Makes it easy to specify how the button should look like (overlay img or not). bug:7688780 Change-Id: If883c6886ade409dac7d72c87a514bd3fcd3ad7f
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterCurves.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterSharpen.java
rc/com/android/gallery3d/filtershow/imageshow/ImageSmallFilter.java
rc/com/android/gallery3d/filtershow/imageshow/ImageWithIcon.java
|
46c6bbbf57d6bf271237bcbb7192dd3ee9a79368 |
07-Dec-2012 |
nicolasroard <nicolasroard@google.com> |
Refactor filters to simplify their creation/addition Bug:7688780 Change-Id: I9e1bb860dc9150bed4a255118654f2ca7f1ec3f0
es/layout/filtershow_activity.xml
es/values/filtershow_ids.xml
|
e623dcde5ea8c572602fcbb470c439600e74b610 |
07-Dec-2012 |
nicolasroard <nicolasroard@google.com> |
Refactor filters to simplify their creation/addition Bug:7688780 Change-Id: I9e1bb860dc9150bed4a255118654f2ca7f1ec3f0
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/PanelController.java
rc/com/android/gallery3d/filtershow/filters/ImageFilter.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterBwFilter.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterContrast.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterExposure.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterHue.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterSaturated.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterShadows.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterSharpen.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterTinyPlanet.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterVibrance.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterVignette.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterWBalance.java
|
8cc3b55d615b349b4fcdff0eeeefe6907d4950ff |
07-Dec-2012 |
nicolasroard <nicolasroard@google.com> |
Refactor filters to simplify their creation/addition Bug:7688780 Change-Id: I9e1bb860dc9150bed4a255118654f2ca7f1ec3f0
es/layout/filtershow_activity.xml
es/values/filtershow_ids.xml
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/PanelController.java
rc/com/android/gallery3d/filtershow/filters/ImageFilter.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterBwFilter.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterContrast.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterExposure.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterHue.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterSaturated.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterShadows.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterSharpen.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterTinyPlanet.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterVibrance.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterVignette.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterWBalance.java
|
a3fb5bacfa6d16766a8d7718eb7817bc7f2ba5ad |
07-Dec-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Removed extra layout resources from old photoeditor." into gb-ub-photos-bryce
|
84e91dd9c1a7a51b7fc61e827a516010cae13913 |
07-Dec-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Removed extra layout resources from old photoeditor." into gb-ub-photos-bryce
|
50890518e026decdc4e6086f5ee236d1fa919b64 |
07-Dec-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Removed extra layout resources from old photoeditor. Bug: 7659953 Change-Id: I86fa9204498a36bb8c2ba190372efae95af0145a
es/layout/photoeditor_actionbar.xml
es/layout/photoeditor_color_seekbar.xml
es/layout/photoeditor_crop_view.xml
es/layout/photoeditor_doodle_view.xml
es/layout/photoeditor_effect_tool_fullscreen.xml
es/layout/photoeditor_effect_tool_panel.xml
es/layout/photoeditor_effects_artistic.xml
es/layout/photoeditor_effects_color.xml
es/layout/photoeditor_effects_exposure.xml
es/layout/photoeditor_effects_fix.xml
es/layout/photoeditor_effects_gallery.xml
es/layout/photoeditor_effects_menu.xml
es/layout/photoeditor_flip_view.xml
es/layout/photoeditor_main.xml
es/layout/photoeditor_rotate_view.xml
es/layout/photoeditor_scale_seekbar.xml
es/layout/photoeditor_touch_view.xml
|
96e6748572539784159b92b3057c3fa6424d8829 |
07-Dec-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Removed extra layout resources from old photoeditor. Bug: 7659953 Change-Id: I86fa9204498a36bb8c2ba190372efae95af0145a
es/layout/photoeditor_actionbar.xml
es/layout/photoeditor_color_seekbar.xml
es/layout/photoeditor_crop_view.xml
es/layout/photoeditor_doodle_view.xml
es/layout/photoeditor_effect_tool_fullscreen.xml
es/layout/photoeditor_effect_tool_panel.xml
es/layout/photoeditor_effects_artistic.xml
es/layout/photoeditor_effects_color.xml
es/layout/photoeditor_effects_exposure.xml
es/layout/photoeditor_effects_fix.xml
es/layout/photoeditor_effects_gallery.xml
es/layout/photoeditor_effects_menu.xml
es/layout/photoeditor_flip_view.xml
es/layout/photoeditor_main.xml
es/layout/photoeditor_rotate_view.xml
es/layout/photoeditor_scale_seekbar.xml
es/layout/photoeditor_touch_view.xml
|
cba96134afae964efe20a0fe63e50ed0534fbe24 |
06-Dec-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Improves XML language descriptions." into gb-ub-photos-bryce
|
bdd9b31d26d252fdaa138b0a8e3f7b78451d9d59 |
06-Dec-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Improves XML language descriptions. Bug: 7458383 Bug: 7459118 Change-Id: I91fd7297e4530401c0315ae4acbf7b6e425dca2b
es/values/filtershow_strings.xml
es/values/strings.xml
|
2d0566fb48fe63c00cde592160026343824de4bd |
06-Dec-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Improves XML language descriptions. Bug: 7458383 Bug: 7459118 Change-Id: I91fd7297e4530401c0315ae4acbf7b6e425dca2b
es/values/filtershow_strings.xml
es/values/strings.xml
|
4450409cc98730e9418013a186d0a79864bdc350 |
06-Dec-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Fixed Autocolor not getting saved. Bug: 7541348 Change-Id: Ie62aa8abec78441ae0e42cb4069ddbd7d2f3e199
rc/com/android/gallery3d/filtershow/filters/ImageFilterWBalance.java
|
1d38fe15005069977d5df862102564e59c23f1b4 |
06-Dec-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Fixed Autocolor not getting saved. Bug: 7541348 Change-Id: Ie62aa8abec78441ae0e42cb4069ddbd7d2f3e199
rc/com/android/gallery3d/filtershow/filters/ImageFilterWBalance.java
|
388da787acca0999a0a706ddd3778128ba255a22 |
06-Dec-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Removed old crop. Bug: 7441237 Change-Id: I29801f798a1d1ad3af81a82950edbb8a72ccae82
ndroidManifest.xml
|
795776f67fe5bca902b09c01edec630879263341 |
06-Dec-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Removed old crop. Bug: 7441237 Change-Id: I29801f798a1d1ad3af81a82950edbb8a72ccae82
ndroidManifest.xml
rc/com/android/gallery3d/app/AlbumPage.java
rc/com/android/gallery3d/app/CropImage.java
rc/com/android/gallery3d/app/Wallpaper.java
rc/com/android/gallery3d/data/CropExtras.java
rc/com/android/gallery3d/filtershow/CropExtras.java
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/cache/ImageLoader.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterGeometry.java
rc/com/android/gallery3d/filtershow/imageshow/GeometryMetadata.java
rc/com/android/gallery3d/filtershow/imageshow/ImageCrop.java
rc/com/android/gallery3d/gadget/WidgetConfigure.java
rc/com/android/gallery3d/ui/CropView.java
rc/com/android/gallery3d/ui/MenuExecutor.java
|
2ef34aafcf6957ed8bd764a5fe0921c376c0b416 |
06-Dec-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Removed old crop. Bug: 7441237 Change-Id: I29801f798a1d1ad3af81a82950edbb8a72ccae82
rc/com/android/gallery3d/app/AlbumPage.java
rc/com/android/gallery3d/app/CropImage.java
rc/com/android/gallery3d/app/Wallpaper.java
rc/com/android/gallery3d/data/CropExtras.java
rc/com/android/gallery3d/filtershow/CropExtras.java
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/cache/ImageLoader.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterGeometry.java
rc/com/android/gallery3d/filtershow/imageshow/GeometryMetadata.java
rc/com/android/gallery3d/filtershow/imageshow/ImageCrop.java
rc/com/android/gallery3d/gadget/WidgetConfigure.java
rc/com/android/gallery3d/ui/CropView.java
rc/com/android/gallery3d/ui/MenuExecutor.java
|
f6a07accd4127bab2b45cd42161f1d0b2482b830 |
28-Nov-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Added support for Crop extras. Wallpaper & Widget use editor crop. Bug: 7561976 Bug: 7441237 Change-Id: I0d6644171177650568ed911fc63c0c7e104f8d8c
es/values/filtershow_strings.xml
|
6416dd59687768d4152d5d954dd0e8c3617b9d97 |
28-Nov-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Added support for Crop extras. Wallpaper & Widget use editor crop. Bug: 7561976 Bug: 7441237 Change-Id: I0d6644171177650568ed911fc63c0c7e104f8d8c
es/values/filtershow_strings.xml
rc/com/android/gallery3d/app/Wallpaper.java
rc/com/android/gallery3d/data/CropExtras.java
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/PanelController.java
rc/com/android/gallery3d/filtershow/cache/ImageLoader.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterGeometry.java
rc/com/android/gallery3d/filtershow/imageshow/GeometryMetadata.java
rc/com/android/gallery3d/filtershow/imageshow/ImageCrop.java
rc/com/android/gallery3d/filtershow/imageshow/ImageShow.java
rc/com/android/gallery3d/filtershow/tools/BitmapTask.java
rc/com/android/gallery3d/filtershow/tools/SaveCopyTask.java
rc/com/android/gallery3d/gadget/WidgetConfigure.java
|
6425413690fccb004b52f64b23bc7e3c9cd33e7e |
28-Nov-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Added support for Crop extras. Wallpaper & Widget use editor crop. Bug: 7561976 Bug: 7441237 Change-Id: I0d6644171177650568ed911fc63c0c7e104f8d8c
rc/com/android/gallery3d/app/Wallpaper.java
rc/com/android/gallery3d/data/CropExtras.java
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/PanelController.java
rc/com/android/gallery3d/filtershow/cache/ImageLoader.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterGeometry.java
rc/com/android/gallery3d/filtershow/imageshow/GeometryMetadata.java
rc/com/android/gallery3d/filtershow/imageshow/ImageCrop.java
rc/com/android/gallery3d/filtershow/imageshow/ImageShow.java
rc/com/android/gallery3d/filtershow/tools/BitmapTask.java
rc/com/android/gallery3d/filtershow/tools/SaveCopyTask.java
rc/com/android/gallery3d/gadget/WidgetConfigure.java
|
958b1dc10258fe3334e810892005ae9210fc1f56 |
06-Dec-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I4067ad8b05431201a6ecda43789b843e2f3c7f74 Auto-generated-cl: translation import
es/values-af/photoeditor_strings.xml
es/values-am/photoeditor_strings.xml
es/values-ar/photoeditor_strings.xml
es/values-be/photoeditor_strings.xml
es/values-bg/photoeditor_strings.xml
es/values-ca/photoeditor_strings.xml
es/values-cs/photoeditor_strings.xml
es/values-da/photoeditor_strings.xml
es/values-de/photoeditor_strings.xml
es/values-el/photoeditor_strings.xml
es/values-en-rGB/photoeditor_strings.xml
es/values-es-rUS/photoeditor_strings.xml
es/values-es/photoeditor_strings.xml
es/values-et/photoeditor_strings.xml
es/values-fa/photoeditor_strings.xml
es/values-fi/photoeditor_strings.xml
es/values-fr/photoeditor_strings.xml
es/values-hi/photoeditor_strings.xml
es/values-hr/photoeditor_strings.xml
es/values-hu/photoeditor_strings.xml
es/values-in/photoeditor_strings.xml
es/values-it/photoeditor_strings.xml
es/values-iw/photoeditor_strings.xml
es/values-ja/photoeditor_strings.xml
es/values-ko/photoeditor_strings.xml
es/values-lt/photoeditor_strings.xml
es/values-lv/photoeditor_strings.xml
es/values-ms/photoeditor_strings.xml
es/values-nb/photoeditor_strings.xml
es/values-nl/photoeditor_strings.xml
es/values-pl/photoeditor_strings.xml
es/values-pt-rPT/photoeditor_strings.xml
es/values-pt/photoeditor_strings.xml
es/values-ro/photoeditor_strings.xml
es/values-ru/photoeditor_strings.xml
es/values-sk/photoeditor_strings.xml
es/values-sl/photoeditor_strings.xml
es/values-sr/photoeditor_strings.xml
es/values-sv/photoeditor_strings.xml
es/values-sw/photoeditor_strings.xml
es/values-th/photoeditor_strings.xml
es/values-tl/photoeditor_strings.xml
es/values-tr/photoeditor_strings.xml
es/values-uk/photoeditor_strings.xml
es/values-vi/photoeditor_strings.xml
es/values-zh-rCN/photoeditor_strings.xml
es/values-zh-rTW/photoeditor_strings.xml
es/values-zu/photoeditor_strings.xml
|
e148cdec8676a74b2ec77d9dfdafd473d3f22e27 |
24-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Implements Redeye fix bug:7223838 Change-Id: I21d8d2c8f858fca2e86d18b927cbf6878eb64263
es/layout/filtershow_activity.xml
|
cc93226fc364a50de3a1479c0912e9af1854b666 |
24-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Implements Redeye fix bug:7223838 Change-Id: I21d8d2c8f858fca2e86d18b927cbf6878eb64263
es/layout/filtershow_activity.xml
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/PanelController.java
rc/com/android/gallery3d/filtershow/cache/ImageLoader.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterRedEye.java
rc/com/android/gallery3d/filtershow/filters/RedEyeCandidate.java
rc/com/android/gallery3d/filtershow/imageshow/ImageRedEyes.java
rc/com/android/gallery3d/filtershow/imageshow/ImageShow.java
|
b6794369702f20871241e6bff5e6069f27c8d537 |
24-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Implements Redeye fix bug:7223838 Change-Id: I21d8d2c8f858fca2e86d18b927cbf6878eb64263
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/PanelController.java
rc/com/android/gallery3d/filtershow/cache/ImageLoader.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterRedEye.java
rc/com/android/gallery3d/filtershow/filters/RedEyeCandidate.java
rc/com/android/gallery3d/filtershow/imageshow/ImageRedEyes.java
rc/com/android/gallery3d/filtershow/imageshow/ImageShow.java
|
96761a3e29b069dd92046037c85111f0442f3099 |
05-Dec-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE"
|
eefde6d4e06ed6371b58d177e3fefa999ed2d038 |
05-Dec-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am 7eefa322: (-s ours) Reconcile with jb-mr1.1-release - do not merge * commit '7eefa3225a1fad9fdd6c133edc2dfd798df6697e':
|
fd66b1387f2db58f33a348704757c8e6991d8ebe |
05-Dec-2012 |
Bobby Georgescu <georgescu@google.com> |
am d57ddeb8: am 02a5f562: am 30c71e7c: am db99a10b: Fix NPE in PhotoPage * commit 'd57ddeb8fc4c157af8d423c92d9998abd47f6fd8': Fix NPE in PhotoPage
|
cb9c44819b1a2486eba91900118edfe721dbc7d1 |
05-Dec-2012 |
nicolasroard <nicolasroard@google.com> |
am 9047063b: am 53c024ab: am 1d84ed07: am 870e62ac: Handle the case where the orientation column is not here... * commit '9047063b0eebcf5b0048350742de2074bc6683e4': Handle the case where the orientation column is not here...
|
b8f060a7d9654e942bb0b972eda711e95dcb0cf5 |
05-Dec-2012 |
Michael Kolb <kolby@google.com> |
am b6c38277: am b23a56f9: am 527b201b: am 7a537732: Merge "Prevent Camera UI in Gallery" into gb-ub-photos-arches * commit 'b6c3827717913e877080921bd19e110cf9a2f604': Prevent Camera UI in Gallery
|
6caa0e57d436c9f80a0aa69ba2a4346a70a75e90 |
05-Dec-2012 |
nicolasroard <nicolasroard@google.com> |
am 8795f6bc: am 87884b28: am a8ecc0bf: am c6fe9f7d: Remove unneeded border asset * commit '8795f6bc959d9eee0ac47dbd02bfb2c5dc547e18': Remove unneeded border asset
|
395c9bba9dabb3a6208717dd40f42630becee5db |
05-Dec-2012 |
George Mount <mount@google.com> |
Merge "Add GLES20 canvas implementation." into gb-ub-photos-bryce
|
eaafd032b2e7eb80591ee6913e1fa296b3d954bd |
05-Dec-2012 |
George Mount <mount@google.com> |
Merge "Add GLES20 canvas implementation." into gb-ub-photos-bryce
|
80f7fdb406cb98e3029a214d86973768c9f02470 |
17-Nov-2012 |
George Mount <mount@google.com> |
Add GLES20 canvas implementation. Change-Id: I5680909f31dc097599d0e063aa1f6daba834d3e2
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
|
6eb33768a15e2b4cc647bc55474568cf710876db |
17-Nov-2012 |
George Mount <mount@google.com> |
Add GLES20 canvas implementation. Change-Id: I5680909f31dc097599d0e063aa1f6daba834d3e2
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
rc/com/android/gallery3d/ui/GLCanvas.java
rc/com/android/gallery3d/ui/GLCanvasImpl.java
rc/com/android/gallery3d/ui/GLES20Canvas.java
rc/com/android/gallery3d/ui/GLRootView.java
rc/com/android/gallery3d/ui/GalleryEGLConfigChooser.java
rc/com/android/gallery3d/ui/NinePatchTexture.java
rc/com/android/gallery3d/ui/RawTexture.java
rc/com/android/gallery3d/util/IntArray.java
ests/src/com/android/gallery3d/ui/GLCanvasStub.java
ests/src/com/android/gallery3d/ui/GLCanvasTest.java
ests/src/com/android/gallery3d/ui/TextureTest.java
|
837007c09f723dd96cd8e99476de242c633759c2 |
17-Nov-2012 |
George Mount <mount@google.com> |
Add GLES20 canvas implementation. Change-Id: I5680909f31dc097599d0e063aa1f6daba834d3e2
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
rc/com/android/gallery3d/ui/GLCanvas.java
rc/com/android/gallery3d/ui/GLCanvasImpl.java
rc/com/android/gallery3d/ui/GLES20Canvas.java
rc/com/android/gallery3d/ui/GLRootView.java
rc/com/android/gallery3d/ui/GalleryEGLConfigChooser.java
rc/com/android/gallery3d/ui/NinePatchTexture.java
rc/com/android/gallery3d/ui/RawTexture.java
rc/com/android/gallery3d/util/IntArray.java
ests/src/com/android/gallery3d/ui/GLCanvasStub.java
ests/src/com/android/gallery3d/ui/GLCanvasTest.java
ests/src/com/android/gallery3d/ui/TextureTest.java
|
7eefa3225a1fad9fdd6c133edc2dfd798df6697e |
05-Dec-2012 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with jb-mr1.1-release - do not merge Change-Id: If914c03547187deadfbb5f9c3fdff0cbe954ecba
|
2ebe99ad9a0ca51cc4df919a025f2e1b17c7890d |
05-Dec-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
|
174cf606bec846c7adce0fc3dba3af7a57130743 |
05-Dec-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I4297d800b0b653565c20463b827c18dd7cd022dc Auto-generated-cl: translation import
es/values-af/photoeditor_strings.xml
es/values-am/photoeditor_strings.xml
es/values-ar/photoeditor_strings.xml
es/values-be/photoeditor_strings.xml
es/values-bg/photoeditor_strings.xml
es/values-ca/photoeditor_strings.xml
es/values-cs/photoeditor_strings.xml
es/values-da/photoeditor_strings.xml
es/values-de/photoeditor_strings.xml
es/values-el/photoeditor_strings.xml
es/values-en-rGB/photoeditor_strings.xml
es/values-es-rUS/photoeditor_strings.xml
es/values-es/photoeditor_strings.xml
es/values-et/photoeditor_strings.xml
es/values-fa/photoeditor_strings.xml
es/values-fi/photoeditor_strings.xml
es/values-fr/photoeditor_strings.xml
es/values-hi/photoeditor_strings.xml
es/values-hr/photoeditor_strings.xml
es/values-hu/photoeditor_strings.xml
es/values-in/photoeditor_strings.xml
es/values-it/photoeditor_strings.xml
es/values-iw/photoeditor_strings.xml
es/values-ja/photoeditor_strings.xml
es/values-ko/photoeditor_strings.xml
es/values-lt/photoeditor_strings.xml
es/values-lv/photoeditor_strings.xml
es/values-ms/photoeditor_strings.xml
es/values-nb/photoeditor_strings.xml
es/values-nl/photoeditor_strings.xml
es/values-pl/photoeditor_strings.xml
es/values-pt-rPT/photoeditor_strings.xml
es/values-pt/photoeditor_strings.xml
es/values-ro/photoeditor_strings.xml
es/values-ru/photoeditor_strings.xml
es/values-sk/photoeditor_strings.xml
es/values-sl/photoeditor_strings.xml
es/values-sr/photoeditor_strings.xml
es/values-sv/photoeditor_strings.xml
es/values-sw/photoeditor_strings.xml
es/values-th/photoeditor_strings.xml
es/values-tl/photoeditor_strings.xml
es/values-tr/photoeditor_strings.xml
es/values-uk/photoeditor_strings.xml
es/values-vi/photoeditor_strings.xml
es/values-zh-rCN/photoeditor_strings.xml
es/values-zh-rTW/photoeditor_strings.xml
es/values-zu/photoeditor_strings.xml
|
d57ddeb8fc4c157af8d423c92d9998abd47f6fd8 |
05-Dec-2012 |
Bobby Georgescu <georgescu@google.com> |
am 02a5f562: am 30c71e7c: am db99a10b: Fix NPE in PhotoPage * commit '02a5f56289a9430bd70437e534ef1bb186a4fc70': Fix NPE in PhotoPage
|
02a5f56289a9430bd70437e534ef1bb186a4fc70 |
05-Dec-2012 |
Bobby Georgescu <georgescu@google.com> |
am 30c71e7c: am db99a10b: Fix NPE in PhotoPage * commit '30c71e7c7654f97c9662c7b315a6519e2a7ed1ec': Fix NPE in PhotoPage
|
90309e61fd14f4706b483e53066b47c0dccba26d |
05-Dec-2012 |
Bobby Georgescu <georgescu@google.com> |
am db99a10b: Fix NPE in PhotoPage * commit 'db99a10b6ac9296d612db8ba51e37f141fee4170': Fix NPE in PhotoPage
|
518d4a5ae0a90fc53af74d7adc35d595b7e12362 |
05-Dec-2012 |
Bobby Georgescu <georgescu@google.com> |
am db99a10b: Fix NPE in PhotoPage * commit 'db99a10b6ac9296d612db8ba51e37f141fee4170': Fix NPE in PhotoPage
|
30c71e7c7654f97c9662c7b315a6519e2a7ed1ec |
05-Dec-2012 |
Bobby Georgescu <georgescu@google.com> |
am db99a10b: Fix NPE in PhotoPage * commit 'db99a10b6ac9296d612db8ba51e37f141fee4170': Fix NPE in PhotoPage
|
6004b5721a9e3d310be4d0f5fac92e14d54231d1 |
05-Dec-2012 |
Bobby Georgescu <georgescu@google.com> |
Fix NPE in PhotoPage Bug: 7673141 Change-Id: I264f28d127f47e5f4f8c6a7c2df1c021401d03f2
rc/com/android/gallery3d/app/PhotoPage.java
|
db99a10b6ac9296d612db8ba51e37f141fee4170 |
05-Dec-2012 |
Bobby Georgescu <georgescu@google.com> |
Fix NPE in PhotoPage Bug: 7673141 Change-Id: I264f28d127f47e5f4f8c6a7c2df1c021401d03f2
rc/com/android/gallery3d/app/PhotoPage.java
|
b5f672af979171416c16f7fcd1545fdbdb19e998 |
05-Dec-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
|
fc64fe7ced14c5f61846d7e67ee8f9a69f0afc9c |
05-Dec-2012 |
nicolasroard <nicolasroard@google.com> |
am 870e62ac: Handle the case where the orientation column is not here... * commit '870e62ac801064f83bffc9095cbaee5fe46bdd80': Handle the case where the orientation column is not here...
|
e759a6839a2883603343a1f370790cad38d4bf27 |
05-Dec-2012 |
nicolasroard <nicolasroard@google.com> |
am 870e62ac: Handle the case where the orientation column is not here... * commit '870e62ac801064f83bffc9095cbaee5fe46bdd80': Handle the case where the orientation column is not here...
|
9047063b0eebcf5b0048350742de2074bc6683e4 |
05-Dec-2012 |
nicolasroard <nicolasroard@google.com> |
am 53c024ab: am 1d84ed07: am 870e62ac: Handle the case where the orientation column is not here... * commit '53c024ab0538774ede9b33d2cf5e89c71236f084': Handle the case where the orientation column is not here...
|
53c024ab0538774ede9b33d2cf5e89c71236f084 |
05-Dec-2012 |
nicolasroard <nicolasroard@google.com> |
am 1d84ed07: am 870e62ac: Handle the case where the orientation column is not here... * commit '1d84ed072e731fa447ca9fb6ca1d50e7c1f3930c': Handle the case where the orientation column is not here...
|
1d84ed072e731fa447ca9fb6ca1d50e7c1f3930c |
05-Dec-2012 |
nicolasroard <nicolasroard@google.com> |
am 870e62ac: Handle the case where the orientation column is not here... * commit '870e62ac801064f83bffc9095cbaee5fe46bdd80': Handle the case where the orientation column is not here...
|
b6c3827717913e877080921bd19e110cf9a2f604 |
05-Dec-2012 |
Michael Kolb <kolby@google.com> |
am b23a56f9: am 527b201b: am 7a537732: Merge "Prevent Camera UI in Gallery" into gb-ub-photos-arches * commit 'b23a56f98f4d04d8fa2841d79142dc626f37be8d': Prevent Camera UI in Gallery
|
8795f6bc959d9eee0ac47dbd02bfb2c5dc547e18 |
05-Dec-2012 |
nicolasroard <nicolasroard@google.com> |
am 87884b28: am a8ecc0bf: am c6fe9f7d: Remove unneeded border asset * commit '87884b2804c661a711f7db38c45ecea397d201ac': Remove unneeded border asset
|
b23a56f98f4d04d8fa2841d79142dc626f37be8d |
05-Dec-2012 |
Michael Kolb <kolby@google.com> |
am 527b201b: am 7a537732: Merge "Prevent Camera UI in Gallery" into gb-ub-photos-arches * commit '527b201b52e9136989eb1eccb7e71a25cfe8027d': Prevent Camera UI in Gallery
|
87884b2804c661a711f7db38c45ecea397d201ac |
05-Dec-2012 |
nicolasroard <nicolasroard@google.com> |
am a8ecc0bf: am c6fe9f7d: Remove unneeded border asset * commit 'a8ecc0bf1140deececc1c75dffc9243e524d02f8': Remove unneeded border asset
|
e228f8a88f0dbaeb850cdc40410e98ac962c6a50 |
05-Dec-2012 |
nicolasroard <nicolasroard@google.com> |
Handle the case where the orientation column is not here... bug:7537610 Change-Id: I4f64891a789358c20206aea3033fd17514199d62
rc/com/android/gallery3d/filtershow/cache/ImageLoader.java
|
870e62ac801064f83bffc9095cbaee5fe46bdd80 |
05-Dec-2012 |
nicolasroard <nicolasroard@google.com> |
Handle the case where the orientation column is not here... bug:7537610 Change-Id: I4f64891a789358c20206aea3033fd17514199d62
rc/com/android/gallery3d/filtershow/cache/ImageLoader.java
|
f650ee134f5b7b61cd02bd61ae9349584c61deb4 |
05-Dec-2012 |
Michael Kolb <kolby@google.com> |
am 7a537732: Merge "Prevent Camera UI in Gallery" into gb-ub-photos-arches * commit '7a5377322dcebdaad98df9a31cadc7ff0f464d8a': Prevent Camera UI in Gallery
|
b3e4cc1a4c4bf27ba605cfa2175411e9bfc4603d |
05-Dec-2012 |
Michael Kolb <kolby@google.com> |
am 7a537732: Merge "Prevent Camera UI in Gallery" into gb-ub-photos-arches * commit '7a5377322dcebdaad98df9a31cadc7ff0f464d8a': Prevent Camera UI in Gallery
|
527b201b52e9136989eb1eccb7e71a25cfe8027d |
05-Dec-2012 |
Michael Kolb <kolby@google.com> |
am 7a537732: Merge "Prevent Camera UI in Gallery" into gb-ub-photos-arches * commit '7a5377322dcebdaad98df9a31cadc7ff0f464d8a': Prevent Camera UI in Gallery
|
7a5377322dcebdaad98df9a31cadc7ff0f464d8a |
05-Dec-2012 |
Michael Kolb <kolby@google.com> |
Merge "Prevent Camera UI in Gallery" into gb-ub-photos-arches
|
3e9860b5e0e9cb93b4af3ff59aa94ea7fb83201b |
04-Dec-2012 |
Michael Kolb <kolby@google.com> |
Prevent Camera UI in Gallery Bug: 7668856 At startup, the PhotoView wouldn't execute the onFullScreenChanged callback, so the Camera UI believed it was in Camera. Change-Id: I6794c2a5a4eb06d39161a681b7a0afc27d5e4b3f
rc/com/android/gallery3d/ui/PhotoView.java
|
6bf226e45ec542eae4f766a2417bfdda625af4f0 |
04-Dec-2012 |
Michael Kolb <kolby@google.com> |
Prevent Camera UI in Gallery Bug: 7668856 At startup, the PhotoView wouldn't execute the onFullScreenChanged callback, so the Camera UI believed it was in Camera. Change-Id: I6794c2a5a4eb06d39161a681b7a0afc27d5e4b3f
rc/com/android/gallery3d/ui/PhotoView.java
|
a8ecc0bf1140deececc1c75dffc9243e524d02f8 |
04-Dec-2012 |
nicolasroard <nicolasroard@google.com> |
am c6fe9f7d: Remove unneeded border asset * commit 'c6fe9f7de5da7e5ae5bbf4d95933f9f96d018644': Remove unneeded border asset
|
b09ced123c2b5ef57bf08458fa2b9e50f21aaa38 |
04-Dec-2012 |
nicolasroard <nicolasroard@google.com> |
am c6fe9f7d: Remove unneeded border asset * commit 'c6fe9f7de5da7e5ae5bbf4d95933f9f96d018644': Remove unneeded border asset
|
161d8725901ddc4ab52e25ecbc8a4acd85c20e39 |
04-Dec-2012 |
nicolasroard <nicolasroard@google.com> |
am c6fe9f7d: Remove unneeded border asset * commit 'c6fe9f7de5da7e5ae5bbf4d95933f9f96d018644': Remove unneeded border asset
|
c6fe9f7de5da7e5ae5bbf4d95933f9f96d018644 |
04-Dec-2012 |
nicolasroard <nicolasroard@google.com> |
Remove unneeded border asset bug:7668120 Change-Id: Ib258fe12655bd33c08257975cac995bc54c7abb2
es/drawable/filtershow_border_film2.9.png
|
b136dbe837688b21e16bc93164f89e8b9ee36823 |
04-Dec-2012 |
nicolasroard <nicolasroard@google.com> |
Remove unneeded border asset bug:7668120 Change-Id: Ib258fe12655bd33c08257975cac995bc54c7abb2
es/drawable/filtershow_border_film2.9.png
|
77705fcdce38a742167c9b041de9c74342e08966 |
04-Dec-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I3559bf7b1c0d6b29c0ea7998636cf2377fbfe274 Auto-generated-cl: translation import
es/values-af/photoeditor_strings.xml
es/values-am/photoeditor_strings.xml
es/values-ar/photoeditor_strings.xml
es/values-be/photoeditor_strings.xml
es/values-bg/photoeditor_strings.xml
es/values-ca/photoeditor_strings.xml
es/values-cs/photoeditor_strings.xml
es/values-da/photoeditor_strings.xml
es/values-de/photoeditor_strings.xml
es/values-el/photoeditor_strings.xml
es/values-en-rGB/photoeditor_strings.xml
es/values-es-rUS/photoeditor_strings.xml
es/values-es/photoeditor_strings.xml
es/values-et/photoeditor_strings.xml
es/values-fa/photoeditor_strings.xml
es/values-fi/photoeditor_strings.xml
es/values-fr/photoeditor_strings.xml
es/values-hi/photoeditor_strings.xml
es/values-hr/photoeditor_strings.xml
es/values-hu/photoeditor_strings.xml
es/values-in/photoeditor_strings.xml
es/values-it/photoeditor_strings.xml
es/values-iw/photoeditor_strings.xml
es/values-ja/photoeditor_strings.xml
es/values-ko/photoeditor_strings.xml
es/values-lt/photoeditor_strings.xml
es/values-lv/photoeditor_strings.xml
es/values-ms/photoeditor_strings.xml
es/values-nb/photoeditor_strings.xml
es/values-nl/photoeditor_strings.xml
es/values-pl/photoeditor_strings.xml
es/values-pt-rPT/photoeditor_strings.xml
es/values-pt/photoeditor_strings.xml
es/values-ro/photoeditor_strings.xml
es/values-ru/photoeditor_strings.xml
es/values-sk/photoeditor_strings.xml
es/values-sl/photoeditor_strings.xml
es/values-sr/photoeditor_strings.xml
es/values-sv/photoeditor_strings.xml
es/values-sw/photoeditor_strings.xml
es/values-th/photoeditor_strings.xml
es/values-tl/photoeditor_strings.xml
es/values-tr/photoeditor_strings.xml
es/values-uk/photoeditor_strings.xml
es/values-vi/photoeditor_strings.xml
es/values-zh-rCN/photoeditor_strings.xml
es/values-zh-rTW/photoeditor_strings.xml
es/values-zu/photoeditor_strings.xml
|
06fae29f8c5549bbd162612115b57cb8bace1368 |
04-Dec-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ic8d70a5bbac2e2c2b1e6fea8e1479ca10f7753ad Auto-generated-cl: translation import
es/values-sw/strings.xml
|
9e872437b8c52a2a7321cda03a3bc1e52c594863 |
04-Dec-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ic8d70a5bbac2e2c2b1e6fea8e1479ca10f7753ad Auto-generated-cl: translation import
es/values-sw/strings.xml
|
8ad54ea6105ca40b2f21301229469f1aa168206a |
04-Dec-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Fix call to Toast outside UI thread." into gb-ub-photos-bryce
|
002b509e1ce049b001d2676781c8dc621bdc7982 |
04-Dec-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Fix call to Toast outside UI thread." into gb-ub-photos-bryce
|
f8a0888e454bca3a64c9899e43cf94dd5d58762d |
04-Dec-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Move MenuExecutor operations into Service" into gb-ub-photos-bryce
|
3e213021f4a702513ef7390253aa8f8169a4ccce |
04-Dec-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Move MenuExecutor operations into Service" into gb-ub-photos-bryce
|
66f403789d27acf869817fc128b559b83db9afcb |
04-Dec-2012 |
Your Name <jreck@google.com> |
am 46cb2dca: am 4f5fca2f: am 17290ae6: am 04df59eb: Merge "Change themes" into gb-ub-photos-arches * commit '46cb2dca0b5d98a62e560da404d984f1f9f0202c': Change themes
|
46cb2dca0b5d98a62e560da404d984f1f9f0202c |
04-Dec-2012 |
Your Name <jreck@google.com> |
am 4f5fca2f: am 17290ae6: am 04df59eb: Merge "Change themes" into gb-ub-photos-arches * commit '4f5fca2f0d8f845891b671417c2328a53c95a32e': Change themes
|
4f5fca2f0d8f845891b671417c2328a53c95a32e |
04-Dec-2012 |
Your Name <jreck@google.com> |
am 17290ae6: am 04df59eb: Merge "Change themes" into gb-ub-photos-arches * commit '17290ae6fd9d3622f4c33ff63788cd31b20acb93': Change themes
|
32f5fee98df0e2f4b30475bb2d04e5fafa969727 |
03-Dec-2012 |
Bobby Georgescu <georgescu@google.com> |
Move MenuExecutor operations into Service Bug: 6680729 Change-Id: I538bb0a8783f7c1ff467ba8d8eb0deefdc0b6ea2
rc/com/android/gallery3d/app/AbstractGalleryActivity.java
rc/com/android/gallery3d/app/AlbumPage.java
rc/com/android/gallery3d/app/AlbumSetPage.java
rc/com/android/gallery3d/app/BatchService.java
rc/com/android/gallery3d/ui/ActionModeHandler.java
rc/com/android/gallery3d/ui/MenuExecutor.java
|
4fb77424807d394a87189723a757c1721b98cf9a |
03-Dec-2012 |
Bobby Georgescu <georgescu@google.com> |
Move MenuExecutor operations into Service Bug: 6680729 Change-Id: I538bb0a8783f7c1ff467ba8d8eb0deefdc0b6ea2
ndroidManifest.xml
|
a2d0d34a90543ee19ea295e72c112fde18fb3828 |
03-Dec-2012 |
Bobby Georgescu <georgescu@google.com> |
Move MenuExecutor operations into Service Bug: 6680729 Change-Id: I538bb0a8783f7c1ff467ba8d8eb0deefdc0b6ea2
ndroidManifest.xml
rc/com/android/gallery3d/app/AbstractGalleryActivity.java
rc/com/android/gallery3d/app/AlbumPage.java
rc/com/android/gallery3d/app/AlbumSetPage.java
rc/com/android/gallery3d/app/BatchService.java
rc/com/android/gallery3d/ui/ActionModeHandler.java
rc/com/android/gallery3d/ui/MenuExecutor.java
|
f8eb7be9d9a165148401f38885a76e47c9b51641 |
04-Dec-2012 |
Your Name <jreck@google.com> |
am 04df59eb: Merge "Change themes" into gb-ub-photos-arches * commit '04df59eb082189500d360fffb95ef541073d6fe6': Change themes
|
73cc3ca5cf1ff4f9a37dba170999bbfd507616eb |
04-Dec-2012 |
Your Name <jreck@google.com> |
am 04df59eb: Merge "Change themes" into gb-ub-photos-arches * commit '04df59eb082189500d360fffb95ef541073d6fe6': Change themes
|
03b1ff602a3e1ca8b8599c821b67d36e702d24c1 |
04-Dec-2012 |
Your Name <jreck@google.com> |
am 04df59eb: Merge "Change themes" into gb-ub-photos-arches * commit '04df59eb082189500d360fffb95ef541073d6fe6': Change themes
|
17290ae6fd9d3622f4c33ff63788cd31b20acb93 |
04-Dec-2012 |
Your Name <jreck@google.com> |
am 04df59eb: Merge "Change themes" into gb-ub-photos-arches * commit '04df59eb082189500d360fffb95ef541073d6fe6': Change themes
|
04df59eb082189500d360fffb95ef541073d6fe6 |
04-Dec-2012 |
Your Name <jreck@google.com> |
Merge "Change themes" into gb-ub-photos-arches
|
72fd6fa714eac41c40ddf125d3c0fba8f4477fdc |
04-Dec-2012 |
Your Name <jreck@google.com> |
Merge "Change themes" into gb-ub-photos-arches
|
825a5258957160fd0fe3d425e323d22b254dcdb1 |
04-Dec-2012 |
Your Name <jreck@google.com> |
Merge "Change themes" into gb-ub-photos-arches
|
d10468b65396dd1fa4f20006fa8cea1221cc613c |
03-Dec-2012 |
Your Name <jreck@google.com> |
Change themes Bug: 7587841 Change-Id: Ie283c23015ae94ba6eeb69ba55a0523899718d4e
ndroidManifest.xml
es/values/styles.xml
|
e8ac54b1bee7d090063f84a9e44233675d9172c8 |
03-Dec-2012 |
Your Name <jreck@google.com> |
Change themes Bug: 7587841 Change-Id: Ie283c23015ae94ba6eeb69ba55a0523899718d4e
es/values/styles.xml
|
359fe243f57d1e84c629f219891e8c1aa07cdd20 |
03-Dec-2012 |
Your Name <jreck@google.com> |
Change themes Bug: 7587841 Change-Id: Ie283c23015ae94ba6eeb69ba55a0523899718d4e
ndroidManifest.xml
|
e05d11454e60ab15e530f2878e3db507b974b113 |
03-Dec-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Fix call to Toast outside UI thread. Bug: 7412281 Change-Id: I976ccd28f696a65a1159b6a092b8aa2f2a2d0e08
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/cache/ImageLoader.java
|
8965d1f4c2d437e0a0ad4fd225ea2cad9d2471c4 |
03-Dec-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Fix call to Toast outside UI thread. Bug: 7412281 Change-Id: I976ccd28f696a65a1159b6a092b8aa2f2a2d0e08
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/cache/ImageLoader.java
|
e83e3f769d9162223ccdd892a5c5c5a3030e76fe |
03-Dec-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I8076bade41fae7eae91742448e24ac1c3adea0a6 Auto-generated-cl: translation import
es/values-af/photoeditor_strings.xml
es/values-am/photoeditor_strings.xml
es/values-ar/photoeditor_strings.xml
es/values-be/photoeditor_strings.xml
es/values-bg/photoeditor_strings.xml
es/values-ca/photoeditor_strings.xml
es/values-cs/photoeditor_strings.xml
es/values-da/photoeditor_strings.xml
es/values-de/photoeditor_strings.xml
es/values-el/photoeditor_strings.xml
es/values-en-rGB/photoeditor_strings.xml
es/values-es-rUS/photoeditor_strings.xml
es/values-es/photoeditor_strings.xml
es/values-et/photoeditor_strings.xml
es/values-fa/photoeditor_strings.xml
es/values-fi/photoeditor_strings.xml
es/values-fr/photoeditor_strings.xml
es/values-hi/photoeditor_strings.xml
es/values-hr/photoeditor_strings.xml
es/values-hu/photoeditor_strings.xml
es/values-in/photoeditor_strings.xml
es/values-it/photoeditor_strings.xml
es/values-iw/photoeditor_strings.xml
es/values-ja/photoeditor_strings.xml
es/values-ko/photoeditor_strings.xml
es/values-lt/photoeditor_strings.xml
es/values-lv/photoeditor_strings.xml
es/values-ms/photoeditor_strings.xml
es/values-nb/photoeditor_strings.xml
es/values-nl/photoeditor_strings.xml
es/values-pl/photoeditor_strings.xml
es/values-pt-rPT/photoeditor_strings.xml
es/values-pt/photoeditor_strings.xml
es/values-ro/photoeditor_strings.xml
es/values-ru/photoeditor_strings.xml
es/values-sk/photoeditor_strings.xml
es/values-sl/photoeditor_strings.xml
es/values-sr/photoeditor_strings.xml
es/values-sv/photoeditor_strings.xml
es/values-sw/photoeditor_strings.xml
es/values-th/photoeditor_strings.xml
es/values-tl/photoeditor_strings.xml
es/values-tr/photoeditor_strings.xml
es/values-uk/photoeditor_strings.xml
es/values-vi/photoeditor_strings.xml
es/values-zh-rCN/photoeditor_strings.xml
es/values-zh-rTW/photoeditor_strings.xml
es/values-zu/photoeditor_strings.xml
|
300c2d4aa09cfca1dfe01af17c035f4fef72ac3d |
03-Dec-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I176680225a4dafb752fb5b6e901245f9e523ffb4 Auto-generated-cl: translation import
es/values-zh-rCN/strings.xml
|
2f1d93aff1f8771f62f5f3bfaf00a160b3a654c9 |
03-Dec-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I176680225a4dafb752fb5b6e901245f9e523ffb4 Auto-generated-cl: translation import
es/values-zh-rCN/strings.xml
|
8d26578f8db895dadb7e0e1d7a56c00fa18183ec |
01-Dec-2012 |
George Mount <mount@google.com> |
Merge "Separate GL calls into GLCanvas in preparation for adding GLES2." into gb-ub-photos-bryce
|
eb3948f488b38bf5e6232c1aada16115589b0b9b |
01-Dec-2012 |
George Mount <mount@google.com> |
Merge "Separate GL calls into GLCanvas in preparation for adding GLES2." into gb-ub-photos-bryce
|
85ea4b74e2c18576e2d0191eef804c6e2d2e65a7 |
30-Nov-2012 |
Bobby Georgescu <georgescu@google.com> |
Improve fling to delete gesture handling Bug: 7419862 Bug: 7301456 Allows flings to start anywhere within the width bounds of the image, even if outside the height bounds, making deletion of panoramas more feasible, and gestures are filtered by length to be able to make flinging easier while still avoiding accidental input. Change-Id: Iac933bfee85865a718ed47eadfed76683eb771d2
rc/com/android/gallery3d/ui/GestureRecognizer.java
rc/com/android/gallery3d/ui/PhotoView.java
|
137c6d060f9710f1a460326f27459e89b49820c2 |
30-Nov-2012 |
Bobby Georgescu <georgescu@google.com> |
Improve fling to delete gesture handling Bug: 7419862 Bug: 7301456 Allows flings to start anywhere within the width bounds of the image, even if outside the height bounds, making deletion of panoramas more feasible, and gestures are filtered by length to be able to make flinging easier while still avoiding accidental input. Change-Id: Iac933bfee85865a718ed47eadfed76683eb771d2
rc/com/android/gallery3d/ui/GestureRecognizer.java
rc/com/android/gallery3d/ui/PhotoView.java
|
0e9a13c135df4c1ab79912396556052d644fdd2e |
30-Nov-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Refactoring crop, made unconstrained." into gb-ub-photos-bryce
|
c06c8045b159d68f8fda051d59a0eb82215067ee |
28-Nov-2012 |
Earl Ou <shunhsingou@google.com> |
ExifModifier Change-Id: I001b24d8ba004a4080cd898f0d26d706b1839425
allerycommon/src/com/android/gallery3d/exif/ByteBufferInputStream.java
allerycommon/src/com/android/gallery3d/exif/ExifData.java
allerycommon/src/com/android/gallery3d/exif/ExifModifier.java
allerycommon/src/com/android/gallery3d/exif/ExifParser.java
allerycommon/src/com/android/gallery3d/exif/ExifTag.java
allerycommon/src/com/android/gallery3d/exif/IfdData.java
|
cf6255422bf2751d160c1384895ddae3eeea66b4 |
28-Nov-2012 |
Earl Ou <shunhsingou@google.com> |
ExifModifier Change-Id: I001b24d8ba004a4080cd898f0d26d706b1839425
allerycommon/src/com/android/gallery3d/exif/ByteBufferInputStream.java
allerycommon/src/com/android/gallery3d/exif/ExifData.java
allerycommon/src/com/android/gallery3d/exif/ExifModifier.java
allerycommon/src/com/android/gallery3d/exif/ExifParser.java
allerycommon/src/com/android/gallery3d/exif/ExifTag.java
allerycommon/src/com/android/gallery3d/exif/IfdData.java
ests/src/com/android/gallery3d/exif/ExifModifierTest.java
ests/src/com/android/gallery3d/exif/ExifOutputStreamTest.java
ests/src/com/android/gallery3d/exif/ExifTestRunner.java
|
b430b34197d3016d1659ed104abbd3cb5d6d881d |
28-Nov-2012 |
Earl Ou <shunhsingou@google.com> |
ExifModifier Change-Id: I001b24d8ba004a4080cd898f0d26d706b1839425
allerycommon/src/com/android/gallery3d/exif/ByteBufferInputStream.java
allerycommon/src/com/android/gallery3d/exif/ExifData.java
allerycommon/src/com/android/gallery3d/exif/ExifModifier.java
allerycommon/src/com/android/gallery3d/exif/ExifParser.java
allerycommon/src/com/android/gallery3d/exif/ExifTag.java
allerycommon/src/com/android/gallery3d/exif/IfdData.java
ests/src/com/android/gallery3d/exif/ExifModifierTest.java
ests/src/com/android/gallery3d/exif/ExifOutputStreamTest.java
ests/src/com/android/gallery3d/exif/ExifTestRunner.java
|
4861d9722292c24ad15943c7221192747798d557 |
30-Nov-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE"
|
c686d0c212b1af29e95b7692a994515561943bf3 |
30-Nov-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE"
|
7f072c4c99331a331d2950c11baca5426fad6643 |
31-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Refactoring crop, made unconstrained. Bug 7401363 Change-Id: I3ef10c43fd2a01216d6d6c8cc77b31ddef3fdd9b
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/imageshow/BoundedRect.java
rc/com/android/gallery3d/filtershow/imageshow/CropMath.java
rc/com/android/gallery3d/filtershow/imageshow/GeometryMath.java
rc/com/android/gallery3d/filtershow/imageshow/GeometryMetadata.java
rc/com/android/gallery3d/filtershow/imageshow/ImageCrop.java
rc/com/android/gallery3d/filtershow/imageshow/ImageGeometry.java
rc/com/android/gallery3d/filtershow/imageshow/ImageStraighten.java
|
6e2dd284681a716c55e0937ef2e15a1c7507a1b2 |
31-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Refactoring crop, made unconstrained. Bug 7401363 Change-Id: I3ef10c43fd2a01216d6d6c8cc77b31ddef3fdd9b
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/imageshow/BoundedRect.java
rc/com/android/gallery3d/filtershow/imageshow/CropMath.java
rc/com/android/gallery3d/filtershow/imageshow/GeometryMath.java
rc/com/android/gallery3d/filtershow/imageshow/GeometryMetadata.java
rc/com/android/gallery3d/filtershow/imageshow/ImageCrop.java
rc/com/android/gallery3d/filtershow/imageshow/ImageGeometry.java
rc/com/android/gallery3d/filtershow/imageshow/ImageStraighten.java
|
f33f26fae4d1ef940b3f30605d1f79d8c914b685 |
30-Nov-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am 01c11f67: (-s ours) Reconcile with jb-mr1.1-release - do not merge * commit '01c11f67fd31d693f00c9c5a961ca251699d233b':
|
01c11f67fd31d693f00c9c5a961ca251699d233b |
30-Nov-2012 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with jb-mr1.1-release - do not merge Change-Id: I86943fad736a17b095608fdd4a98411979e31694
|
609756275ceefb1b8ad7362cadb43e595efbfcf9 |
29-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am c6f60a98: am ad374359: am cad5c1af: am 599393ec: (re-)add vertical/horizontal lines when moving Curves Align histogram with Curves grid. * commit 'c6f60a98940945bbf067c2ba8eabc6184e568b02': (re-)add vertical/horizontal lines when moving Curves Align histogram with Curves grid.
|
6b22b02de3506214b5cf85726231fe5016f32506 |
29-Nov-2012 |
Nicolas Roard <nicolasroard@google.com> |
am a1d2b77d: am a66584f1: am 8c592dc8: am 65025459: Merge "Added dashed diagonal for crop." into gb-ub-photos-arches * commit 'a1d2b77dc8f9ab277e375e663e206451a8764142': Added dashed diagonal for crop.
|
ca02aa7bb4422e5019cd198d1910926963e3d398 |
29-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am cf4d5b4a: am d2a2c924: am 992d32d9: am 39d46790: Fix transparency issue under the spinner. * commit 'cf4d5b4a9653e8fa4ba1a13a09a05d2bc5009b62': Fix transparency issue under the spinner.
|
036cea94ce4f7d634df5be5c0b5b1a03e57f440a |
29-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am 69c8dd36: am 0d9b166b: am 466f3d9b: am 0a624bb8: Fix potential crash (regression introduced with fix for 7406402) * commit '69c8dd36837b1122edfbffac02d8e6bec9bed77e': Fix potential crash (regression introduced with fix for 7406402)
|
889091d3548b1eec76317045121bd023ee0a9c29 |
29-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am c29939b6: am 92b91af5: am 33a487f6: am 6d867ce0: Set crop ratio to unconstrained by default. * commit 'c29939b6160e0eb8a0b985546e22cdc1179ba768': Set crop ratio to unconstrained by default.
|
02dfdcbbfac139e86bda355b1cdf3db9e545a12b |
29-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am cf9631fb: am 39b06307: am 83705e99: am 205d0cdf: Fix overdraw the correct way... * commit 'cf9631fb37ecd24b8ea2ad33403c40a65e9dd50a': Fix overdraw the correct way...
|
8e8539659e162d77a2f7ed7cc341a3351dadfade |
29-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am 1d36bee9: am 188a0e33: am 85135c1b: am 6e9123a6: Merge "Fix flashing in geometry panel" into gb-ub-photos-arches * commit '1d36bee9bff2126014d0c540bd14f18377e448e9': Fix flashing in geometry panel
|
f2a719c553a0c091c7203f5cc588e5237887955b |
29-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am 1b411e07: am 170752be: am b25cb646: am 68e4ae64: Merge "Fix overdraw in FilterShow activity" into gb-ub-photos-arches * commit '1b411e074fd9e5c37807c9e5d4f5a9dd1f75129a': Fix overdraw in FilterShow activity
|
6af9edcbcedf3f9a784f1492f1a5142af5533a6b |
29-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am a5889b06: am df4d2631: am 69a77e9e: am 3507b925: Merge "Add new borders assets" into gb-ub-photos-arches * commit 'a5889b06b8a2a518eb1c152e15dd3b441896a819': Add new borders assets
|
6c03696b9f31e41657a04f4f4dc77625a8694ba0 |
29-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am e55c5e85: am 8abe023c: am a12b3542: am cd84d676: Fix history panel overlap * commit 'e55c5e8589f91002e08f8f7da67dd06db9ddab63': Fix history panel overlap
|
98933a04f8dd8e7875b3e2803ec0f88c9f009a8c |
29-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am 7e2a30e5: am db8647e9: am e4b3e7a8: am 987bc8aa: Fix wrong colors in Curves * commit '7e2a30e5226990b621d348680656a2b7b36ac04b': Fix wrong colors in Curves
|
a8072b742edce7526c65d65e3d24746e1a9afa25 |
29-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am c58932e8: am ae2408be: am e0a22a0b: am d24fdf6a: Merge "Fix moving points in the Curves editor" into gb-ub-photos-arches * commit 'c58932e82a12b650d65f95822bde386e68f4adf3': Fix moving points in the Curves editor
|
2c4a9f9f47be6b8995d58398a1f0c5f62ded4581 |
29-Nov-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am 4c758b41: am e88e1fac: am 17b8c517: am 7a36d427: Merge "Added locking to ImageLoader." into gb-ub-photos-arches * commit '4c758b4172e8bc4d8084dee0c62a4b54eb8c94da': Added locking to ImageLoader.
|
d3cc69471afccde2fb61e9cfc78422b27a72c63e |
29-Nov-2012 |
John Hoford <hoford@google.com> |
am e6f7e0d6: am 060060d5: am a8a9c933: am e5b979ed: Merge "reduce size of tiny planet if malloc fails" into gb-ub-photos-arches * commit 'e6f7e0d6f0a561c1192e10bf6b50cabc9256e30b': reduce size of tiny planet if malloc fails
|
4e02f79bb5df2d9ce9de5f9777877561ff067f14 |
29-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am 78fbf02a: am b6eca977: am c22c429d: am 5d2227a7: Merge "Add a triangle to the popup button view" into gb-ub-photos-arches * commit '78fbf02a187d770c1e19bdf92e5e18731007146d': Add a triangle to the popup button view
|
d15ede15d62629b5366e2ca82c00c696fbbd4638 |
29-Nov-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am cc274700: am 67109bef: am 9dd37b67: am 6a94446d: Minor fix for some FP rounding errors in crop. * commit 'cc2747005e23814c70eb3d6b4c5970498fd601bb': Minor fix for some FP rounding errors in crop.
|
c6f60a98940945bbf067c2ba8eabc6184e568b02 |
29-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am ad374359: am cad5c1af: am 599393ec: (re-)add vertical/horizontal lines when moving Curves Align histogram with Curves grid. * commit 'ad37435996c44e66a6ba2c6c05cefff55ee6a124': (re-)add vertical/horizontal lines when moving Curves Align histogram with Curves grid.
|
a1d2b77dc8f9ab277e375e663e206451a8764142 |
29-Nov-2012 |
Nicolas Roard <nicolasroard@google.com> |
am a66584f1: am 8c592dc8: am 65025459: Merge "Added dashed diagonal for crop." into gb-ub-photos-arches * commit 'a66584f16604130440c565ab9f00cf17e89171e3': Added dashed diagonal for crop.
|
cf4d5b4a9653e8fa4ba1a13a09a05d2bc5009b62 |
29-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am d2a2c924: am 992d32d9: am 39d46790: Fix transparency issue under the spinner. * commit 'd2a2c924106aa66a60d4556cc3b4879ddf28d472': Fix transparency issue under the spinner.
|
69c8dd36837b1122edfbffac02d8e6bec9bed77e |
29-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am 0d9b166b: am 466f3d9b: am 0a624bb8: Fix potential crash (regression introduced with fix for 7406402) * commit '0d9b166b93c0b61990d9743c8a44667c5de3af6a': Fix potential crash (regression introduced with fix for 7406402)
|
c29939b6160e0eb8a0b985546e22cdc1179ba768 |
29-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am 92b91af5: am 33a487f6: am 6d867ce0: Set crop ratio to unconstrained by default. * commit '92b91af579ae5e631a0428b85cc09dac0cea5712': Set crop ratio to unconstrained by default.
|
cf9631fb37ecd24b8ea2ad33403c40a65e9dd50a |
29-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am 39b06307: am 83705e99: am 205d0cdf: Fix overdraw the correct way... * commit '39b063070545e0b34d1c8ab1aa97abfd147a3bb7': Fix overdraw the correct way...
|
1d36bee9bff2126014d0c540bd14f18377e448e9 |
29-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am 188a0e33: am 85135c1b: am 6e9123a6: Merge "Fix flashing in geometry panel" into gb-ub-photos-arches * commit '188a0e336bbd6a6a60b5f687b9f68bb49c05f7aa': Fix flashing in geometry panel
|
1b411e074fd9e5c37807c9e5d4f5a9dd1f75129a |
29-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am 170752be: am b25cb646: am 68e4ae64: Merge "Fix overdraw in FilterShow activity" into gb-ub-photos-arches * commit '170752be69aebc031ccac54d20c7ca77e7c99eb1': Fix overdraw in FilterShow activity
|
a5889b06b8a2a518eb1c152e15dd3b441896a819 |
29-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am df4d2631: am 69a77e9e: am 3507b925: Merge "Add new borders assets" into gb-ub-photos-arches * commit 'df4d2631aa1570e4115ee765c023a69775c2a08e': Add new borders assets
|
e55c5e8589f91002e08f8f7da67dd06db9ddab63 |
29-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am 8abe023c: am a12b3542: am cd84d676: Fix history panel overlap * commit '8abe023c7327ef438d161556e8aaa6925b91b60b': Fix history panel overlap
|
7e2a30e5226990b621d348680656a2b7b36ac04b |
29-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am db8647e9: am e4b3e7a8: am 987bc8aa: Fix wrong colors in Curves * commit 'db8647e9d655cd620cc1f2b6a2535608867dcae2': Fix wrong colors in Curves
|
c58932e82a12b650d65f95822bde386e68f4adf3 |
29-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am ae2408be: am e0a22a0b: am d24fdf6a: Merge "Fix moving points in the Curves editor" into gb-ub-photos-arches * commit 'ae2408bedcdea7e9a8bb35e1f7a75611ac19948d': Fix moving points in the Curves editor
|
4c758b4172e8bc4d8084dee0c62a4b54eb8c94da |
29-Nov-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am e88e1fac: am 17b8c517: am 7a36d427: Merge "Added locking to ImageLoader." into gb-ub-photos-arches * commit 'e88e1fac86517a733669c5766f9cc78845978e8b': Added locking to ImageLoader.
|
e6f7e0d6f0a561c1192e10bf6b50cabc9256e30b |
29-Nov-2012 |
John Hoford <hoford@google.com> |
am 060060d5: am a8a9c933: am e5b979ed: Merge "reduce size of tiny planet if malloc fails" into gb-ub-photos-arches * commit '060060d5ead8abca617129e0a79165cda956947a': reduce size of tiny planet if malloc fails
|
78fbf02a187d770c1e19bdf92e5e18731007146d |
29-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am b6eca977: am c22c429d: am 5d2227a7: Merge "Add a triangle to the popup button view" into gb-ub-photos-arches * commit 'b6eca977059bad80044e3c2a8b44b93d9df992bb': Add a triangle to the popup button view
|
cc2747005e23814c70eb3d6b4c5970498fd601bb |
29-Nov-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am 67109bef: am 9dd37b67: am 6a94446d: Minor fix for some FP rounding errors in crop. * commit '67109befa39ad83b0e1f12cba6d393042d9a29e3': Minor fix for some FP rounding errors in crop.
|
26a3571fab9389555d4a3208df04716fd93b7513 |
29-Nov-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I50c68b01eae38eb21d9ec8696485470816951e26 Auto-generated-cl: translation import
es/values-af/photoeditor_strings.xml
es/values-am/photoeditor_strings.xml
es/values-ar/photoeditor_strings.xml
es/values-be/photoeditor_strings.xml
es/values-bg/photoeditor_strings.xml
es/values-ca/photoeditor_strings.xml
es/values-cs/photoeditor_strings.xml
es/values-da/photoeditor_strings.xml
es/values-de/photoeditor_strings.xml
es/values-el/photoeditor_strings.xml
es/values-en-rGB/photoeditor_strings.xml
es/values-es-rUS/photoeditor_strings.xml
es/values-es/photoeditor_strings.xml
es/values-et/photoeditor_strings.xml
es/values-fa/photoeditor_strings.xml
es/values-fi/photoeditor_strings.xml
es/values-fr/photoeditor_strings.xml
es/values-hi/photoeditor_strings.xml
es/values-hr/photoeditor_strings.xml
es/values-hu/photoeditor_strings.xml
es/values-in/photoeditor_strings.xml
es/values-it/photoeditor_strings.xml
es/values-iw/photoeditor_strings.xml
es/values-ja/photoeditor_strings.xml
es/values-ko/photoeditor_strings.xml
es/values-lt/photoeditor_strings.xml
es/values-lv/photoeditor_strings.xml
es/values-ms/photoeditor_strings.xml
es/values-nb/photoeditor_strings.xml
es/values-nl/photoeditor_strings.xml
es/values-pl/photoeditor_strings.xml
es/values-pt-rPT/photoeditor_strings.xml
es/values-pt/photoeditor_strings.xml
es/values-ro/photoeditor_strings.xml
es/values-ru/photoeditor_strings.xml
es/values-sk/photoeditor_strings.xml
es/values-sl/photoeditor_strings.xml
es/values-sr/photoeditor_strings.xml
es/values-sv/photoeditor_strings.xml
es/values-sw/photoeditor_strings.xml
es/values-th/photoeditor_strings.xml
es/values-tl/photoeditor_strings.xml
es/values-tr/photoeditor_strings.xml
es/values-uk/photoeditor_strings.xml
es/values-vi/photoeditor_strings.xml
es/values-zh-rCN/photoeditor_strings.xml
es/values-zh-rTW/photoeditor_strings.xml
es/values-zu/photoeditor_strings.xml
|
bf3e6ab482ab8704f5a8028b9c75e4868a048c51 |
29-Nov-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
|
76dea21339b458f6b4c356ee2548d4ac9ae1c648 |
29-Nov-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ia638d7a19b2b2f56f004fb4dc07929db76132509 Auto-generated-cl: translation import
es/values-ru/strings.xml
|
1f762651213a6530d1ea079f1b67f757f2f76e5e |
29-Nov-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I4d0394e913b49becdaf6351a82e65968fe244ee1 Auto-generated-cl: translation import
es/values-ru/strings.xml
es/values-sr/strings.xml
|
aec1c9f2da19692a4a55eef43378957ee2f5ca17 |
29-Nov-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I4d0394e913b49becdaf6351a82e65968fe244ee1 Auto-generated-cl: translation import
es/values-ru/strings.xml
es/values-sr/strings.xml
|
ad37435996c44e66a6ba2c6c05cefff55ee6a124 |
29-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am cad5c1af: am 599393ec: (re-)add vertical/horizontal lines when moving Curves Align histogram with Curves grid. * commit 'cad5c1afc1dc467f67f0b0b764785b6ae17b5e23': (re-)add vertical/horizontal lines when moving Curves Align histogram with Curves grid.
|
cad5c1afc1dc467f67f0b0b764785b6ae17b5e23 |
29-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am 599393ec: (re-)add vertical/horizontal lines when moving Curves Align histogram with Curves grid. * commit '599393ecad6803161d5e901ef625e34cfe088009': (re-)add vertical/horizontal lines when moving Curves Align histogram with Curves grid.
|
4a97d9b5cb2f5156d2322cb95bd7531efb34354a |
29-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am 599393ec: (re-)add vertical/horizontal lines when moving Curves Align histogram with Curves grid. * commit '599393ecad6803161d5e901ef625e34cfe088009': (re-)add vertical/horizontal lines when moving Curves Align histogram with Curves grid.
|
41d03cf756c3b46078e53927976d66e2898907e2 |
29-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am 599393ec: (re-)add vertical/horizontal lines when moving Curves Align histogram with Curves grid. * commit '599393ecad6803161d5e901ef625e34cfe088009': (re-)add vertical/horizontal lines when moving Curves Align histogram with Curves grid.
|
c5317f7dbd812f83ba086817d077f44ea4494f91 |
29-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
(re-)add vertical/horizontal lines when moving Curves Align histogram with Curves grid. bug:7361722 Change-Id: I327f3fb0ba844cc09f8b899e59f74d368478d30a
rc/com/android/gallery3d/filtershow/ui/ImageCurves.java
rc/com/android/gallery3d/filtershow/ui/Spline.java
|
599393ecad6803161d5e901ef625e34cfe088009 |
29-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
(re-)add vertical/horizontal lines when moving Curves Align histogram with Curves grid. bug:7361722 Change-Id: I327f3fb0ba844cc09f8b899e59f74d368478d30a
rc/com/android/gallery3d/filtershow/ui/ImageCurves.java
rc/com/android/gallery3d/filtershow/ui/Spline.java
|
a66584f16604130440c565ab9f00cf17e89171e3 |
29-Nov-2012 |
Nicolas Roard <nicolasroard@google.com> |
am 8c592dc8: am 65025459: Merge "Added dashed diagonal for crop." into gb-ub-photos-arches * commit '8c592dc805e1ed89811282d03929b6fd445b3177': Added dashed diagonal for crop.
|
8c592dc805e1ed89811282d03929b6fd445b3177 |
29-Nov-2012 |
Nicolas Roard <nicolasroard@google.com> |
am 65025459: Merge "Added dashed diagonal for crop." into gb-ub-photos-arches * commit '6502545991948769bc9ca725dafb9899c2635a01': Added dashed diagonal for crop.
|
8ca301c848acdb2b33c6a36ea83a54ac9d1837f1 |
29-Nov-2012 |
Nicolas Roard <nicolasroard@google.com> |
am 65025459: Merge "Added dashed diagonal for crop." into gb-ub-photos-arches * commit '6502545991948769bc9ca725dafb9899c2635a01': Added dashed diagonal for crop.
|
470258bfe8fd03c5b132ae49f8194e38366bb9ef |
29-Nov-2012 |
Nicolas Roard <nicolasroard@google.com> |
am 65025459: Merge "Added dashed diagonal for crop." into gb-ub-photos-arches * commit '6502545991948769bc9ca725dafb9899c2635a01': Added dashed diagonal for crop.
|
73487035ea64b59b62ee280cd73e8c1bfaf64f8f |
29-Nov-2012 |
Nicolas Roard <nicolasroard@google.com> |
Merge "Added dashed diagonal for crop." into gb-ub-photos-arches
|
6502545991948769bc9ca725dafb9899c2635a01 |
29-Nov-2012 |
Nicolas Roard <nicolasroard@google.com> |
Merge "Added dashed diagonal for crop." into gb-ub-photos-arches
|
11d586fb5564be39ebb985d5371e867fcbd8b12f |
29-Nov-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Added dashed diagonal for crop. Bug: 7634466 Change-Id: I14c778766d4b00495b2f5f6fa5f87f4877f76381
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/PanelController.java
rc/com/android/gallery3d/filtershow/imageshow/ImageCrop.java
|
5d834ce0c65f89cf3f249f586b360c1a6d7ab99b |
29-Nov-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Added dashed diagonal for crop. Bug: 7634466 Change-Id: I14c778766d4b00495b2f5f6fa5f87f4877f76381
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/PanelController.java
rc/com/android/gallery3d/filtershow/imageshow/ImageCrop.java
|
d2a2c924106aa66a60d4556cc3b4879ddf28d472 |
29-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am 992d32d9: am 39d46790: Fix transparency issue under the spinner. * commit '992d32d93526b891a8ffecce8e639e49778bb884': Fix transparency issue under the spinner.
|
992d32d93526b891a8ffecce8e639e49778bb884 |
29-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am 39d46790: Fix transparency issue under the spinner. * commit '39d4679070caf308f04542e414fc2e3c34f9cefa': Fix transparency issue under the spinner.
|
bea4b6a5f27f2ef5de35310b2270177d6ff54552 |
29-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am 39d46790: Fix transparency issue under the spinner. * commit '39d4679070caf308f04542e414fc2e3c34f9cefa': Fix transparency issue under the spinner.
|
699abc8ec4ecbd387db3edec01bbd126f609d21c |
29-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am 39d46790: Fix transparency issue under the spinner. * commit '39d4679070caf308f04542e414fc2e3c34f9cefa': Fix transparency issue under the spinner.
|
1923f2cf4b160218ba341e9ef6594da89c43b1cf |
29-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
Fix transparency issue under the spinner. bug:7634701 Change-Id: I907ebbb373958350b1b17dc86723e430441a01dd
es/layout/filtershow_activity.xml
|
39d4679070caf308f04542e414fc2e3c34f9cefa |
29-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
Fix transparency issue under the spinner. bug:7634701 Change-Id: I907ebbb373958350b1b17dc86723e430441a01dd
es/layout/filtershow_activity.xml
|
0d9b166b93c0b61990d9743c8a44667c5de3af6a |
29-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am 466f3d9b: am 0a624bb8: Fix potential crash (regression introduced with fix for 7406402) * commit '466f3d9b854b8206e0e543f187952c39ae253ce8': Fix potential crash (regression introduced with fix for 7406402)
|
466f3d9b854b8206e0e543f187952c39ae253ce8 |
29-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am 0a624bb8: Fix potential crash (regression introduced with fix for 7406402) * commit '0a624bb8db70f1e71ca511756b886c68f32fedbe': Fix potential crash (regression introduced with fix for 7406402)
|
2c5d2004ab1ba730bc1e3e4907be05872144a375 |
29-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am 0a624bb8: Fix potential crash (regression introduced with fix for 7406402) * commit '0a624bb8db70f1e71ca511756b886c68f32fedbe': Fix potential crash (regression introduced with fix for 7406402)
|
9c2ba29551101ab87cebca5f4beca87432e37cb5 |
29-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am 0a624bb8: Fix potential crash (regression introduced with fix for 7406402) * commit '0a624bb8db70f1e71ca511756b886c68f32fedbe': Fix potential crash (regression introduced with fix for 7406402)
|
8d427b8a58fabb9164738b9ed0da2809ca3d60e0 |
29-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
Fix potential crash (regression introduced with fix for 7406402) bug:7406402 Change-Id: I7ba92b4cb4fe2976583eba54a5bd25a29eae9d5c
rc/com/android/gallery3d/filtershow/filters/ImageFilterBorder.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterParametricBorder.java
|
0a624bb8db70f1e71ca511756b886c68f32fedbe |
29-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
Fix potential crash (regression introduced with fix for 7406402) bug:7406402 Change-Id: I7ba92b4cb4fe2976583eba54a5bd25a29eae9d5c
rc/com/android/gallery3d/filtershow/filters/ImageFilterBorder.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterParametricBorder.java
|
92b91af579ae5e631a0428b85cc09dac0cea5712 |
29-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am 33a487f6: am 6d867ce0: Set crop ratio to unconstrained by default. * commit '33a487f6698078a27e4a03c10f1201ee62a4dc7c': Set crop ratio to unconstrained by default.
|
33a487f6698078a27e4a03c10f1201ee62a4dc7c |
29-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am 6d867ce0: Set crop ratio to unconstrained by default. * commit '6d867ce03ea96495d531d7e3f35a21b5aab257ef': Set crop ratio to unconstrained by default.
|
683aad1779026897925cb9d007bac82567d37372 |
29-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am 6d867ce0: Set crop ratio to unconstrained by default. * commit '6d867ce03ea96495d531d7e3f35a21b5aab257ef': Set crop ratio to unconstrained by default.
|
601dd77295fcfdb873b537da5e54289c14e3df93 |
29-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am 6d867ce0: Set crop ratio to unconstrained by default. * commit '6d867ce03ea96495d531d7e3f35a21b5aab257ef': Set crop ratio to unconstrained by default.
|
1eb3c0af3d9542e68eb18d312dad87485f058378 |
29-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am 6d867ce0: Set crop ratio to unconstrained by default. * commit '6d867ce03ea96495d531d7e3f35a21b5aab257ef': Set crop ratio to unconstrained by default.
|
2aa25c488216f498b941245266d1eb3de97fe09b |
29-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
Set crop ratio to unconstrained by default. bug:7634466 Change-Id: I4b0e82ca77ab19527293334cc96e7b80f2d75535
rc/com/android/gallery3d/filtershow/PanelController.java
rc/com/android/gallery3d/filtershow/imageshow/ImageCrop.java
|
6d867ce03ea96495d531d7e3f35a21b5aab257ef |
29-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
Set crop ratio to unconstrained by default. bug:7634466 Change-Id: I4b0e82ca77ab19527293334cc96e7b80f2d75535
es/layout/filtershow_activity.xml
rc/com/android/gallery3d/filtershow/PanelController.java
rc/com/android/gallery3d/filtershow/imageshow/ImageCrop.java
|
822bf73499ab0d9a7d0095dfa7bcc049b440cfe6 |
29-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
Set crop ratio to unconstrained by default. bug:7634466 Change-Id: I4b0e82ca77ab19527293334cc96e7b80f2d75535
es/layout/filtershow_activity.xml
|
39b063070545e0b34d1c8ab1aa97abfd147a3bb7 |
29-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am 83705e99: am 205d0cdf: Fix overdraw the correct way... * commit '83705e99a84fa941ce5dcc7488b69d55df8c7105': Fix overdraw the correct way...
|
83705e99a84fa941ce5dcc7488b69d55df8c7105 |
29-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am 205d0cdf: Fix overdraw the correct way... * commit '205d0cdf0590bc1156a1d7fff1d0811d142de4a6': Fix overdraw the correct way...
|
2cd1e97bf8cdd9c2426a61994efdcaf733a4d3cf |
29-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am 205d0cdf: Fix overdraw the correct way... * commit '205d0cdf0590bc1156a1d7fff1d0811d142de4a6': Fix overdraw the correct way...
|
6bf21d89f32634e52aa3b18743585c224441b145 |
29-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am 205d0cdf: Fix overdraw the correct way... * commit '205d0cdf0590bc1156a1d7fff1d0811d142de4a6': Fix overdraw the correct way...
|
205d0cdf0590bc1156a1d7fff1d0811d142de4a6 |
29-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
Fix overdraw the correct way... bug:7634701 Change-Id: Ifa7061dac35e948120c1a481c40bcf107f7ee6e1
es/layout/filtershow_activity.xml
es/values/styles.xml
|
955500e208ca780a63c22f9048cdc734c3b99a38 |
29-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
Fix overdraw the correct way... bug:7634701 Change-Id: Ifa7061dac35e948120c1a481c40bcf107f7ee6e1
es/layout/filtershow_activity.xml
es/values/styles.xml
|
188a0e336bbd6a6a60b5f687b9f68bb49c05f7aa |
29-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am 85135c1b: am 6e9123a6: Merge "Fix flashing in geometry panel" into gb-ub-photos-arches * commit '85135c1b580c922866965c5fb069ba69f2e76b28': Fix flashing in geometry panel
|
85135c1b580c922866965c5fb069ba69f2e76b28 |
29-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am 6e9123a6: Merge "Fix flashing in geometry panel" into gb-ub-photos-arches * commit '6e9123a658d4ed0dcb80dd376c676f043e2f4baa': Fix flashing in geometry panel
|
57bb5bf7333f585f4fb4a2cf28502c649608030e |
29-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am 6e9123a6: Merge "Fix flashing in geometry panel" into gb-ub-photos-arches * commit '6e9123a658d4ed0dcb80dd376c676f043e2f4baa': Fix flashing in geometry panel
|
819390c37841fa6fa7b90b5648364c7f31281057 |
29-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am 6e9123a6: Merge "Fix flashing in geometry panel" into gb-ub-photos-arches * commit '6e9123a658d4ed0dcb80dd376c676f043e2f4baa': Fix flashing in geometry panel
|
09b1b679bc8773a89b6ce84d353f25eead7d3e3d |
29-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am 6e9123a6: Merge "Fix flashing in geometry panel" into gb-ub-photos-arches * commit '6e9123a658d4ed0dcb80dd376c676f043e2f4baa': Fix flashing in geometry panel
|
170752be69aebc031ccac54d20c7ca77e7c99eb1 |
29-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am b25cb646: am 68e4ae64: Merge "Fix overdraw in FilterShow activity" into gb-ub-photos-arches * commit 'b25cb64654eda734fef66a4706a4ee8e51e374a3': Fix overdraw in FilterShow activity
|
85d62f7e70be8aa4b7c104388f050e7022d1f8cb |
29-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
Merge "Fix flashing in geometry panel" into gb-ub-photos-arches
|
6e9123a658d4ed0dcb80dd376c676f043e2f4baa |
29-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
Merge "Fix flashing in geometry panel" into gb-ub-photos-arches
|
ad8bc48985756ba94797584eafcfb33560c08076 |
29-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
Merge "Fix flashing in geometry panel" into gb-ub-photos-arches
|
df4d2631aa1570e4115ee765c023a69775c2a08e |
29-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am 69a77e9e: am 3507b925: Merge "Add new borders assets" into gb-ub-photos-arches * commit '69a77e9e8a34806615e4a04303a65b4782473dd6': Add new borders assets
|
b25cb64654eda734fef66a4706a4ee8e51e374a3 |
29-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am 68e4ae64: Merge "Fix overdraw in FilterShow activity" into gb-ub-photos-arches * commit '68e4ae64380e2c9843faaec63b98ba51479c0f11': Fix overdraw in FilterShow activity
|
2e21360434f5a455cb6a6f430e37fd096c870a38 |
29-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am 68e4ae64: Merge "Fix overdraw in FilterShow activity" into gb-ub-photos-arches * commit '68e4ae64380e2c9843faaec63b98ba51479c0f11': Fix overdraw in FilterShow activity
|
2f1aaf7b3d7c8a0b6acd8f7355794a9244ba96e4 |
29-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am 68e4ae64: Merge "Fix overdraw in FilterShow activity" into gb-ub-photos-arches * commit '68e4ae64380e2c9843faaec63b98ba51479c0f11': Fix overdraw in FilterShow activity
|
5e388fd3f5e9e80f8a484b5ec703139cb60f685f |
29-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am 68e4ae64: Merge "Fix overdraw in FilterShow activity" into gb-ub-photos-arches * commit '68e4ae64380e2c9843faaec63b98ba51479c0f11': Fix overdraw in FilterShow activity
|
68e4ae64380e2c9843faaec63b98ba51479c0f11 |
29-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
Merge "Fix overdraw in FilterShow activity" into gb-ub-photos-arches
|
0bf262140bf8e1373be9709d49b01b8970936be2 |
29-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
Merge "Fix overdraw in FilterShow activity" into gb-ub-photos-arches
|
69a77e9e8a34806615e4a04303a65b4782473dd6 |
29-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am 3507b925: Merge "Add new borders assets" into gb-ub-photos-arches * commit '3507b925ce1edb2563c076d2d9f01bfadf9f61e5': Add new borders assets
|
17a4bad29490ec674474d08fb98838f11a2d27ab |
29-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am 3507b925: Merge "Add new borders assets" into gb-ub-photos-arches * commit '3507b925ce1edb2563c076d2d9f01bfadf9f61e5': Add new borders assets
|
cd3943350a17b48c50be3025928f71b6e1657a6b |
29-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am 3507b925: Merge "Add new borders assets" into gb-ub-photos-arches * commit '3507b925ce1edb2563c076d2d9f01bfadf9f61e5': Add new borders assets
|
e3d06c85a047bc37c2ef3bb599da07ec036a2a5d |
29-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am 3507b925: Merge "Add new borders assets" into gb-ub-photos-arches * commit '3507b925ce1edb2563c076d2d9f01bfadf9f61e5': Add new borders assets
|
0c9a1a741b4d794105755bc1554fc2b2169b8b68 |
29-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
Merge "Add new borders assets" into gb-ub-photos-arches
|
3507b925ce1edb2563c076d2d9f01bfadf9f61e5 |
29-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
Merge "Add new borders assets" into gb-ub-photos-arches
|
8abe023c7327ef438d161556e8aaa6925b91b60b |
29-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am a12b3542: am cd84d676: Fix history panel overlap * commit 'a12b35427a2b6e9d63d8c7eb8dcc04d91f47ba0b': Fix history panel overlap
|
57902d08f80074236457e55b8aede93c3f4c9ac1 |
29-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
Add new borders assets bug:7386268 Change-Id: I026c36bdad32ae6a34ce1d5ec83abff319296d30
es/drawable/filtershow_border_grunge.9.png
es/drawable/filtershow_border_sumi_e.9.png
es/drawable/filtershow_border_tape.9.png
|
62b88ea47a7b49e987e30ad39fdf82e0052a0a1b |
29-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
Add new borders assets bug:7386268 Change-Id: I026c36bdad32ae6a34ce1d5ec83abff319296d30
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
|
48b29c82472006102911f981be7025d21f5fc805 |
29-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
Add new borders assets bug:7386268 Change-Id: I026c36bdad32ae6a34ce1d5ec83abff319296d30
es/drawable/filtershow_border_grunge.9.png
es/drawable/filtershow_border_sumi_e.9.png
es/drawable/filtershow_border_tape.9.png
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
|
a12b35427a2b6e9d63d8c7eb8dcc04d91f47ba0b |
29-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am cd84d676: Fix history panel overlap * commit 'cd84d67629075795d4c5c28d980f77ff8d75c593': Fix history panel overlap
|
9e4f72f53cedfba265eee3a7c3a7545cdbe71c4a |
29-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am cd84d676: Fix history panel overlap * commit 'cd84d67629075795d4c5c28d980f77ff8d75c593': Fix history panel overlap
|
6faf2bb61a436e9581a6f67d1141a603fb195a62 |
29-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am cd84d676: Fix history panel overlap * commit 'cd84d67629075795d4c5c28d980f77ff8d75c593': Fix history panel overlap
|
f0327b5c9c9ec5ed173de0b94b9566a56540b229 |
29-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
Fix history panel overlap bug:7545507 Change-Id: I06236f3025191896c851af1d84dc48a4dde18b1d
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
|
cd84d67629075795d4c5c28d980f77ff8d75c593 |
29-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
Fix history panel overlap bug:7545507 Change-Id: I06236f3025191896c851af1d84dc48a4dde18b1d
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
|
a2220fad53bcda9da99e6ad5c788eac3126459cb |
29-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
Fix overdraw in FilterShow activity bug:7634701 Change-Id: I2da3e3fdb1ef853fa1a0340a1697e5a013ee87f2
ndroidManifest.xml
|
9cd730836cb40d66d98db893eca28e94b14500cd |
29-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
Fix overdraw in FilterShow activity bug:7634701 Change-Id: I2da3e3fdb1ef853fa1a0340a1697e5a013ee87f2
ndroidManifest.xml
es/values/styles.xml
|
7942e8765661973a452d801a0dbddc3eca264298 |
29-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
Fix overdraw in FilterShow activity bug:7634701 Change-Id: I2da3e3fdb1ef853fa1a0340a1697e5a013ee87f2
es/values/styles.xml
|
2891e97b6b918f3525e026752673acdb7bf800cb |
29-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
Fix flashing in geometry panel bug:7406402 Change-Id: If2c6156349b90dfc57c56284ad6d821731e48e1a
rc/com/android/gallery3d/filtershow/filters/ImageFilter.java
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
|
78cabea71ab108b1de80a0e63cc16aec6bd64fb2 |
29-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
Fix flashing in geometry panel bug:7406402 Change-Id: If2c6156349b90dfc57c56284ad6d821731e48e1a
rc/com/android/gallery3d/filtershow/filters/ImageFilter.java
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
|
e7e5139881dd46de4a80a4191658e6269a155467 |
29-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
Fix flashing in geometry panel bug:7406402 Change-Id: If2c6156349b90dfc57c56284ad6d821731e48e1a
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
|
db8647e9d655cd620cc1f2b6a2535608867dcae2 |
29-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am e4b3e7a8: am 987bc8aa: Fix wrong colors in Curves * commit 'e4b3e7a8240ac284e33d04eac00800d3e6e96cc8': Fix wrong colors in Curves
|
2b14b2be7bbc5dbcb616ca4c8c34022c761bf841 |
29-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am 987bc8aa: Fix wrong colors in Curves * commit '987bc8aaafa55c45451937b27d94c1d602de4d68': Fix wrong colors in Curves
|
1b1730d1f599b0b5fd52030965643a52261e0b89 |
29-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am 987bc8aa: Fix wrong colors in Curves * commit '987bc8aaafa55c45451937b27d94c1d602de4d68': Fix wrong colors in Curves
|
e4b3e7a8240ac284e33d04eac00800d3e6e96cc8 |
29-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am 987bc8aa: Fix wrong colors in Curves * commit '987bc8aaafa55c45451937b27d94c1d602de4d68': Fix wrong colors in Curves
|
ae2408bedcdea7e9a8bb35e1f7a75611ac19948d |
29-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am e0a22a0b: am d24fdf6a: Merge "Fix moving points in the Curves editor" into gb-ub-photos-arches * commit 'e0a22a0b12741680000b0570e0940d6602ddf003': Fix moving points in the Curves editor
|
e0a22a0b12741680000b0570e0940d6602ddf003 |
29-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am d24fdf6a: Merge "Fix moving points in the Curves editor" into gb-ub-photos-arches * commit 'd24fdf6ad148ffeb34a721d90e46d038f5a7b0da': Fix moving points in the Curves editor
|
da9da43c19472280257e327e51d84b83bde834ae |
29-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am d24fdf6a: Merge "Fix moving points in the Curves editor" into gb-ub-photos-arches * commit 'd24fdf6ad148ffeb34a721d90e46d038f5a7b0da': Fix moving points in the Curves editor
|
a3633df8d2334ecfd90d15f2f59c5a05cb3be1f5 |
29-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am d24fdf6a: Merge "Fix moving points in the Curves editor" into gb-ub-photos-arches * commit 'd24fdf6ad148ffeb34a721d90e46d038f5a7b0da': Fix moving points in the Curves editor
|
1bab51a0e46a70ff98cb9f761bebc148e393b5e6 |
29-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
Fix wrong colors in Curves bug:7633765 Change-Id: Ie6d0c175af6a1ade8f225107408ad03e73a289d3
rc/com/android/gallery3d/filtershow/ui/Spline.java
|
987bc8aaafa55c45451937b27d94c1d602de4d68 |
29-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
Fix wrong colors in Curves bug:7633765 Change-Id: Ie6d0c175af6a1ade8f225107408ad03e73a289d3
rc/com/android/gallery3d/filtershow/ui/Spline.java
|
d24fdf6ad148ffeb34a721d90e46d038f5a7b0da |
29-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
Merge "Fix moving points in the Curves editor" into gb-ub-photos-arches
|
91287749301c41b8ae8a827350b040384b9c0217 |
29-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
Merge "Fix moving points in the Curves editor" into gb-ub-photos-arches
|
e88e1fac86517a733669c5766f9cc78845978e8b |
29-Nov-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am 17b8c517: am 7a36d427: Merge "Added locking to ImageLoader." into gb-ub-photos-arches * commit '17b8c5174410b09ddeb4cdd0b50468a4bbab450c': Added locking to ImageLoader.
|
17b8c5174410b09ddeb4cdd0b50468a4bbab450c |
29-Nov-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am 7a36d427: Merge "Added locking to ImageLoader." into gb-ub-photos-arches * commit '7a36d4275ea0375d4e6a940cc3307dbe716cf85c': Added locking to ImageLoader.
|
f94d5c38e57d6ab563f801ea1de7ccea5cd4d94a |
29-Nov-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am 7a36d427: Merge "Added locking to ImageLoader." into gb-ub-photos-arches * commit '7a36d4275ea0375d4e6a940cc3307dbe716cf85c': Added locking to ImageLoader.
|
bf9c431d8d863f7ffb54c984ed9801079be6d0f6 |
29-Nov-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am 7a36d427: Merge "Added locking to ImageLoader." into gb-ub-photos-arches * commit '7a36d4275ea0375d4e6a940cc3307dbe716cf85c': Added locking to ImageLoader.
|
7a36d4275ea0375d4e6a940cc3307dbe716cf85c |
29-Nov-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Added locking to ImageLoader." into gb-ub-photos-arches
|
9174643f1e0004e7240ed4d49877dc207c47acf3 |
29-Nov-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Added locking to ImageLoader." into gb-ub-photos-arches
|
060060d5ead8abca617129e0a79165cda956947a |
29-Nov-2012 |
John Hoford <hoford@google.com> |
am a8a9c933: am e5b979ed: Merge "reduce size of tiny planet if malloc fails" into gb-ub-photos-arches * commit 'a8a9c93313ad8fa42b364e7661211a2483b9a957': reduce size of tiny planet if malloc fails
|
a8a9c93313ad8fa42b364e7661211a2483b9a957 |
29-Nov-2012 |
John Hoford <hoford@google.com> |
am e5b979ed: Merge "reduce size of tiny planet if malloc fails" into gb-ub-photos-arches * commit 'e5b979edb369877463e07680dddd9983bd2501cb': reduce size of tiny planet if malloc fails
|
c604eacfeaea2845b3848ac341f47bc41af6d132 |
29-Nov-2012 |
John Hoford <hoford@google.com> |
am e5b979ed: Merge "reduce size of tiny planet if malloc fails" into gb-ub-photos-arches * commit 'e5b979edb369877463e07680dddd9983bd2501cb': reduce size of tiny planet if malloc fails
|
369e4caf10e7352123a4e73b36810f2b0f865ec0 |
29-Nov-2012 |
John Hoford <hoford@google.com> |
am e5b979ed: Merge "reduce size of tiny planet if malloc fails" into gb-ub-photos-arches * commit 'e5b979edb369877463e07680dddd9983bd2501cb': reduce size of tiny planet if malloc fails
|
e5b979edb369877463e07680dddd9983bd2501cb |
29-Nov-2012 |
John Hoford <hoford@google.com> |
Merge "reduce size of tiny planet if malloc fails" into gb-ub-photos-arches
|
42d6865e0b4c674298c3bcb99c0d377c07732004 |
29-Nov-2012 |
John Hoford <hoford@google.com> |
Merge "reduce size of tiny planet if malloc fails" into gb-ub-photos-arches
|
952144dd3146a195ea4bd0be3f88275df8b31c64 |
29-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
Fix moving points in the Curves editor bug:7632994 Change-Id: Ibd0b22594ad9be52e32ea860976861e4619fb513
rc/com/android/gallery3d/filtershow/ui/ImageCurves.java
|
800cb2eb683643df5816ef5000b9cedaa8a98b88 |
29-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
Fix moving points in the Curves editor bug:7632994 Change-Id: Ibd0b22594ad9be52e32ea860976861e4619fb513
rc/com/android/gallery3d/filtershow/ui/ImageCurves.java
|
b6eca977059bad80044e3c2a8b44b93d9df992bb |
29-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am c22c429d: am 5d2227a7: Merge "Add a triangle to the popup button view" into gb-ub-photos-arches * commit 'c22c429ddebbf7f4db71ff5c0b94c7bd5f8aa63c': Add a triangle to the popup button view
|
c22c429ddebbf7f4db71ff5c0b94c7bd5f8aa63c |
29-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am 5d2227a7: Merge "Add a triangle to the popup button view" into gb-ub-photos-arches * commit '5d2227a793b51f44f664a739cc7e931c40ba4970': Add a triangle to the popup button view
|
742e97aaa0fb92d475cf922cfacea74599959a83 |
29-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am 5d2227a7: Merge "Add a triangle to the popup button view" into gb-ub-photos-arches * commit '5d2227a793b51f44f664a739cc7e931c40ba4970': Add a triangle to the popup button view
|
431651dfe26ea0d0cce2e3734feabcd12266a9a7 |
29-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am 5d2227a7: Merge "Add a triangle to the popup button view" into gb-ub-photos-arches * commit '5d2227a793b51f44f664a739cc7e931c40ba4970': Add a triangle to the popup button view
|
5d2227a793b51f44f664a739cc7e931c40ba4970 |
29-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
Merge "Add a triangle to the popup button view" into gb-ub-photos-arches
|
4f83ce2f10250e827033cdcfdb8d7f8d8697b7b3 |
29-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
Merge "Add a triangle to the popup button view" into gb-ub-photos-arches
|
2380d02e56f4239758d9a456c2f28566c37437d9 |
16-Nov-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Added locking to ImageLoader. Bug: 7471850 Change-Id: Ifbaf6e3547fad546a6faa94694bc7d3c7bb4711c
rc/com/android/gallery3d/filtershow/cache/ImageLoader.java
|
3edadae96e469686026bb729060f7619e56557ad |
16-Nov-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Added locking to ImageLoader. Bug: 7471850 Change-Id: Ifbaf6e3547fad546a6faa94694bc7d3c7bb4711c
rc/com/android/gallery3d/filtershow/cache/ImageLoader.java
|
67109befa39ad83b0e1f12cba6d393042d9a29e3 |
29-Nov-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am 9dd37b67: am 6a94446d: Minor fix for some FP rounding errors in crop. * commit '9dd37b67274b9ea68a06abfd0678d2fdcd596dab': Minor fix for some FP rounding errors in crop.
|
9dd37b67274b9ea68a06abfd0678d2fdcd596dab |
29-Nov-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am 6a94446d: Minor fix for some FP rounding errors in crop. * commit '6a94446de01e8b6b034cc537ee3e65d507d47a47': Minor fix for some FP rounding errors in crop.
|
82b73d52e12b121b24ee685e71632483533246af |
29-Nov-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am 6a94446d: Minor fix for some FP rounding errors in crop. * commit '6a94446de01e8b6b034cc537ee3e65d507d47a47': Minor fix for some FP rounding errors in crop.
|
7681f68e37fef0a7cf20de99d99e628ca5653f36 |
29-Nov-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am 6a94446d: Minor fix for some FP rounding errors in crop. * commit '6a94446de01e8b6b034cc537ee3e65d507d47a47': Minor fix for some FP rounding errors in crop.
|
0048915b4cea0196daa17dc69f7e10e9be9a4387 |
28-Nov-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "AlbumDataLoader.get returns correct value if not in cache" into gb-ub-photos-bryce
|
a5fbd5f8007acd7ae757816d6774731576a05ea6 |
28-Nov-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "AlbumDataLoader.get returns correct value if not in cache" into gb-ub-photos-bryce
|
449a0fc7da79fbec08c960a5d3cc9425bac9085c |
28-Nov-2012 |
Your Name <jreck@google.com> |
am 0e5f10eb: am 4c91e7c4: am a938efc8: am 3c6a0610: Remove orientation compensation * commit '0e5f10eb4758ce1d9d2a4fb41f73f5ddc686e8e1': Remove orientation compensation
|
6a94446de01e8b6b034cc537ee3e65d507d47a47 |
28-Nov-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Minor fix for some FP rounding errors in crop. Bug 7566505 Change-Id: Ic3b849b26e0435e0e51a3ddd80c25d8e6e9949aa
rc/com/android/gallery3d/filtershow/filters/ImageFilterGeometry.java
rc/com/android/gallery3d/filtershow/imageshow/GeometryMath.java
rc/com/android/gallery3d/filtershow/imageshow/GeometryMetadata.java
|
d830f2a1b5becddfbae68e758fe29d6eda3777d8 |
28-Nov-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Minor fix for some FP rounding errors in crop. Bug 7566505 Change-Id: Ic3b849b26e0435e0e51a3ddd80c25d8e6e9949aa
rc/com/android/gallery3d/filtershow/filters/ImageFilterGeometry.java
rc/com/android/gallery3d/filtershow/imageshow/GeometryMath.java
rc/com/android/gallery3d/filtershow/imageshow/GeometryMetadata.java
|
48ac0347df314fe845a425d7a8645ce04b8a979d |
28-Nov-2012 |
Your Name <jreck@google.com> |
resolved conflicts for merge of 3c6a0610 to gb-ub-photos-bryce Change-Id: Iac3fcc4a4b8c0295ec53edf5658169fb5fab021e
|
f12a6b9ea3932fb997d0d36605a2ba27de97beb3 |
28-Nov-2012 |
Your Name <jreck@google.com> |
resolved conflicts for merge of 3c6a0610 to gb-ub-photos-bryce Change-Id: Iac3fcc4a4b8c0295ec53edf5658169fb5fab021e
|
0e5f10eb4758ce1d9d2a4fb41f73f5ddc686e8e1 |
28-Nov-2012 |
Your Name <jreck@google.com> |
am 4c91e7c4: am a938efc8: am 3c6a0610: Remove orientation compensation * commit '4c91e7c4e9e9de211f8d0b7844eaed1d7cbe2b94': Remove orientation compensation
|
4c91e7c4e9e9de211f8d0b7844eaed1d7cbe2b94 |
28-Nov-2012 |
Your Name <jreck@google.com> |
am a938efc8: am 3c6a0610: Remove orientation compensation * commit 'a938efc8bd7ea589f74f247480db6909f2bbb835': Remove orientation compensation
|
a938efc8bd7ea589f74f247480db6909f2bbb835 |
28-Nov-2012 |
Your Name <jreck@google.com> |
am 3c6a0610: Remove orientation compensation * commit '3c6a0610d50a866e520485163011c79d9ee62457': Remove orientation compensation
|
3c6a0610d50a866e520485163011c79d9ee62457 |
27-Nov-2012 |
Your Name <jreck@google.com> |
Remove orientation compensation Bug: 7446056 Change-Id: I6f00617c890961e4d56545406bac9682356c0b15
rc/com/android/gallery3d/app/OrientationManager.java
rc/com/android/gallery3d/app/PhotoPage.java
|
a314235e093032c2d6cdd1f1d3f6b5c10c3e75a7 |
27-Nov-2012 |
Your Name <jreck@google.com> |
Remove orientation compensation Bug: 7446056 Change-Id: I6f00617c890961e4d56545406bac9682356c0b15
rc/com/android/gallery3d/app/OrientationManager.java
rc/com/android/gallery3d/app/PhotoPage.java
|
63360570aecd7dbdc7bf2a4d06a264c7eee66bb7 |
27-Nov-2012 |
Bobby Georgescu <georgescu@google.com> |
AlbumDataLoader.get returns correct value if not in cache Bug: 7621656 Change-Id: I8b73837f41bf4ac8c753a5d84f251219fde8ae75
rc/com/android/gallery3d/app/AlbumDataLoader.java
|
4f956260982ec5088c63a3d3045b83c0eaf6ea5d |
27-Nov-2012 |
Bobby Georgescu <georgescu@google.com> |
AlbumDataLoader.get returns correct value if not in cache Bug: 7621656 Change-Id: I8b73837f41bf4ac8c753a5d84f251219fde8ae75
rc/com/android/gallery3d/app/AlbumDataLoader.java
|
c6cb132d082fa441abd3b61f5e6ebf851c1b132b |
27-Nov-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE"
|
1433ec2379dffa7fe50ca09601e7da8e6afde225 |
27-Nov-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I19145f106cb1ba0ebc160e51ff82abe1655bd5c6 Auto-generated-cl: translation import
es/values-af/photoeditor_strings.xml
es/values-am/photoeditor_strings.xml
es/values-ar/photoeditor_strings.xml
es/values-be/photoeditor_strings.xml
es/values-bg/photoeditor_strings.xml
es/values-ca/photoeditor_strings.xml
es/values-cs/photoeditor_strings.xml
es/values-da/photoeditor_strings.xml
es/values-de/photoeditor_strings.xml
es/values-el/photoeditor_strings.xml
es/values-en-rGB/photoeditor_strings.xml
es/values-es-rUS/photoeditor_strings.xml
es/values-es/photoeditor_strings.xml
es/values-et/photoeditor_strings.xml
es/values-fa/photoeditor_strings.xml
es/values-fi/photoeditor_strings.xml
es/values-fr/photoeditor_strings.xml
es/values-hi/photoeditor_strings.xml
es/values-hr/photoeditor_strings.xml
es/values-hu/photoeditor_strings.xml
es/values-in/photoeditor_strings.xml
es/values-it/photoeditor_strings.xml
es/values-iw/photoeditor_strings.xml
es/values-ja/photoeditor_strings.xml
es/values-ko/photoeditor_strings.xml
es/values-lt/photoeditor_strings.xml
es/values-lv/photoeditor_strings.xml
es/values-ms/photoeditor_strings.xml
es/values-nb/photoeditor_strings.xml
es/values-nl/photoeditor_strings.xml
es/values-pl/photoeditor_strings.xml
es/values-pt-rPT/photoeditor_strings.xml
es/values-pt/photoeditor_strings.xml
es/values-ro/photoeditor_strings.xml
es/values-ru/photoeditor_strings.xml
es/values-sk/photoeditor_strings.xml
es/values-sl/photoeditor_strings.xml
es/values-sr/photoeditor_strings.xml
es/values-sv/photoeditor_strings.xml
es/values-sw/photoeditor_strings.xml
es/values-th/photoeditor_strings.xml
es/values-tl/photoeditor_strings.xml
es/values-tr/photoeditor_strings.xml
es/values-uk/photoeditor_strings.xml
es/values-vi/photoeditor_strings.xml
es/values-zh-rCN/photoeditor_strings.xml
es/values-zh-rTW/photoeditor_strings.xml
es/values-zu/photoeditor_strings.xml
|
852e1a46539f4b2ce50e5e1dd2641133227e7b81 |
27-Nov-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I3c8f04c64c0b324c360038352304275728db26fe Auto-generated-cl: translation import
es/values-am/strings.xml
|
8a21c72962183abac1e7117cf535cda16c9b853a |
27-Nov-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ice4c79596741c2594b91c34d0c2e2f3680e9cb93 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
ee9ae401500daeafa76bf9d9e0d589eace4caca2 |
27-Nov-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ice4c79596741c2594b91c34d0c2e2f3680e9cb93 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
0fa3b602db32345a0f850eb3a68331c4f2fad422 |
27-Nov-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am ff53b5b9: (-s ours) am 84c2777a: (-s ours) Merge jb-mr1-dev into aosp/master - do not merge * commit 'ff53b5b94f900d71cffe9fe9ae40ea860e1c79e7':
|
ff53b5b94f900d71cffe9fe9ae40ea860e1c79e7 |
27-Nov-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am 84c2777a: (-s ours) Merge jb-mr1-dev into aosp/master - do not merge * commit '84c2777a07f9b3d10ee7f7c4c01c97e1ec737acf':
|
84c2777a07f9b3d10ee7f7c4c01c97e1ec737acf |
27-Nov-2012 |
The Android Open Source Project <initial-contribution@android.com> |
Merge jb-mr1-dev into aosp/master - do not merge Change-Id: I9d78e7dd4f410c331a920294d9375118cc43a007
|
babe0faebe98ac4f87a7789976c958b80b797345 |
27-Nov-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am 17b0879f: (-s ours) Reconcile with jb-mr1.1-release - do not merge * commit '17b0879f5c4ea61e49dd17756786d762dd603a72':
|
17b0879f5c4ea61e49dd17756786d762dd603a72 |
27-Nov-2012 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with jb-mr1.1-release - do not merge Change-Id: I499b518412a7bd7fda77560aed8f66a798013cd1
|
79ccfbc5f31158360772263e9b3f3e4d52ca3528 |
27-Nov-2012 |
Angus Kong <shkong@google.com> |
Merge "Backup the preferences to the backup service." into gb-ub-photos-bryce
|
a9c2d7764608fe8ba3fddf08c9abb6ae9813826d |
23-Nov-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I0465a52963590018d896aec9a128d1386cf486f5 Auto-generated-cl: translation import
es/values-af/photoeditor_strings.xml
es/values-am/photoeditor_strings.xml
es/values-ar/photoeditor_strings.xml
es/values-be/photoeditor_strings.xml
es/values-bg/photoeditor_strings.xml
es/values-ca/photoeditor_strings.xml
es/values-cs/photoeditor_strings.xml
es/values-da/photoeditor_strings.xml
es/values-de/photoeditor_strings.xml
es/values-el/photoeditor_strings.xml
es/values-en-rGB/photoeditor_strings.xml
es/values-es-rUS/photoeditor_strings.xml
es/values-es/photoeditor_strings.xml
es/values-et/photoeditor_strings.xml
es/values-fa/photoeditor_strings.xml
es/values-fi/photoeditor_strings.xml
es/values-fr/photoeditor_strings.xml
es/values-hi/photoeditor_strings.xml
es/values-hr/photoeditor_strings.xml
es/values-hu/photoeditor_strings.xml
es/values-in/photoeditor_strings.xml
es/values-it/photoeditor_strings.xml
es/values-iw/photoeditor_strings.xml
es/values-ja/photoeditor_strings.xml
es/values-ko/photoeditor_strings.xml
es/values-lt/photoeditor_strings.xml
es/values-lv/photoeditor_strings.xml
es/values-ms/photoeditor_strings.xml
es/values-nb/photoeditor_strings.xml
es/values-nl/photoeditor_strings.xml
es/values-pl/photoeditor_strings.xml
es/values-pt-rPT/photoeditor_strings.xml
es/values-pt/photoeditor_strings.xml
es/values-ro/photoeditor_strings.xml
es/values-ru/photoeditor_strings.xml
es/values-sk/photoeditor_strings.xml
es/values-sl/photoeditor_strings.xml
es/values-sr/photoeditor_strings.xml
es/values-sv/photoeditor_strings.xml
es/values-sw/photoeditor_strings.xml
es/values-th/photoeditor_strings.xml
es/values-tl/photoeditor_strings.xml
es/values-tr/photoeditor_strings.xml
es/values-uk/photoeditor_strings.xml
es/values-vi/photoeditor_strings.xml
es/values-zh-rCN/photoeditor_strings.xml
es/values-zh-rTW/photoeditor_strings.xml
es/values-zu/photoeditor_strings.xml
|
455658d23e06a1dce21374a8d10fa207adc6ee24 |
21-Nov-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I05e6072f4d65c3d5240a4663880520a0c8a106ee Auto-generated-cl: translation import
es/values-af/photoeditor_strings.xml
es/values-am/photoeditor_strings.xml
es/values-ar/photoeditor_strings.xml
es/values-be/photoeditor_strings.xml
es/values-bg/photoeditor_strings.xml
es/values-ca/photoeditor_strings.xml
es/values-cs/photoeditor_strings.xml
es/values-da/photoeditor_strings.xml
es/values-de/photoeditor_strings.xml
es/values-el/photoeditor_strings.xml
es/values-en-rGB/photoeditor_strings.xml
es/values-es-rUS/photoeditor_strings.xml
es/values-es/photoeditor_strings.xml
es/values-et/photoeditor_strings.xml
es/values-fa/photoeditor_strings.xml
es/values-fi/photoeditor_strings.xml
es/values-fr/photoeditor_strings.xml
es/values-hi/photoeditor_strings.xml
es/values-hr/photoeditor_strings.xml
es/values-hu/photoeditor_strings.xml
es/values-in/photoeditor_strings.xml
es/values-it/photoeditor_strings.xml
es/values-iw/photoeditor_strings.xml
es/values-ja/photoeditor_strings.xml
es/values-ko/photoeditor_strings.xml
es/values-lt/photoeditor_strings.xml
es/values-lv/photoeditor_strings.xml
es/values-ms/photoeditor_strings.xml
es/values-nb/photoeditor_strings.xml
es/values-nl/photoeditor_strings.xml
es/values-pl/photoeditor_strings.xml
es/values-pt-rPT/photoeditor_strings.xml
es/values-pt/photoeditor_strings.xml
es/values-ro/photoeditor_strings.xml
es/values-ru/photoeditor_strings.xml
es/values-sk/photoeditor_strings.xml
es/values-sl/photoeditor_strings.xml
es/values-sr/photoeditor_strings.xml
es/values-sv/photoeditor_strings.xml
es/values-sw/photoeditor_strings.xml
es/values-th/photoeditor_strings.xml
es/values-tl/photoeditor_strings.xml
es/values-tr/photoeditor_strings.xml
es/values-uk/photoeditor_strings.xml
es/values-vi/photoeditor_strings.xml
es/values-zh-rCN/photoeditor_strings.xml
es/values-zh-rTW/photoeditor_strings.xml
es/values-zu/photoeditor_strings.xml
|
0db6ec1a2d602a48437a48ae47fbca01299fdcea |
01-Nov-2012 |
George Mount <mount@google.com> |
Separate GL calls into GLCanvas in preparation for adding GLES2. Change-Id: I2756c14294a36af7905766ee650fa08fb95e9477
rc/com/android/gallery3d/ui/BasicTexture.java
rc/com/android/gallery3d/ui/CropView.java
rc/com/android/gallery3d/ui/ExtTexture.java
rc/com/android/gallery3d/ui/GLCanvas.java
rc/com/android/gallery3d/ui/GLCanvasImpl.java
rc/com/android/gallery3d/ui/GLId.java
rc/com/android/gallery3d/ui/GLIdImpl.java
rc/com/android/gallery3d/ui/NinePatchTexture.java
rc/com/android/gallery3d/ui/RawTexture.java
rc/com/android/gallery3d/ui/SlideshowView.java
rc/com/android/gallery3d/ui/UploadedTexture.java
ests/src/com/android/gallery3d/ui/GLCanvasStub.java
ests/src/com/android/gallery3d/ui/GLCanvasTest.java
|
7da54d7e41e04ea5122009b40de19be0724e1ca4 |
01-Nov-2012 |
George Mount <mount@google.com> |
Separate GL calls into GLCanvas in preparation for adding GLES2. Change-Id: I2756c14294a36af7905766ee650fa08fb95e9477
rc/com/android/gallery3d/ui/BasicTexture.java
rc/com/android/gallery3d/ui/CropView.java
rc/com/android/gallery3d/ui/ExtTexture.java
rc/com/android/gallery3d/ui/GLCanvas.java
rc/com/android/gallery3d/ui/GLCanvasImpl.java
rc/com/android/gallery3d/ui/GLId.java
rc/com/android/gallery3d/ui/GLIdImpl.java
rc/com/android/gallery3d/ui/NinePatchTexture.java
rc/com/android/gallery3d/ui/RawTexture.java
rc/com/android/gallery3d/ui/SlideshowView.java
rc/com/android/gallery3d/ui/UploadedTexture.java
ests/src/com/android/gallery3d/ui/GLCanvasStub.java
ests/src/com/android/gallery3d/ui/GLCanvasTest.java
|
f2d922a5b21af0e6430398015dad06863ac18ae6 |
20-Nov-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
|
a79caebbb78171185f9b0e4409118544662c8e67 |
19-Nov-2012 |
Teng-Hui Zhu <ztenghui@google.com> |
Merge "Video: Fix crash in trimming/muting video in GB." into gb-ub-photos-bryce
|
75b01e2d293f621c5135bbd63fe83188f2029976 |
17-Nov-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE"
|
1dea9baabfa28cd8c20559c1cb53edd8931ce87e |
17-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am 9a9166b3: (-s ours) am 2e5c91de: am c0e0779f: am c0c7418a: Import translations. DO NOT MERGE * commit '9a9166b3df3692d928e048aa066b89a02837ed87': Import translations. DO NOT MERGE
|
64d3543e1e8e55a7b66e0cfca8b88b013a261c38 |
17-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am 77e8d042: (-s ours) am 2c109fc4: am d16c2c94: am c6e93291: (-s ours) Import translations. DO NOT MERGE * commit '77e8d0426b040234d3de227dc7f2ef2e17538c2c': Import translations. DO NOT MERGE
|
e62b6415be1a7ac5337e6ea33598a9dc901ac90c |
17-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am 351f4af2: (-s ours) am 21f4f791: am 2ccc4259: Import translations. DO NOT MERGE * commit '351f4af2647304020beade93e093bdd173659b27': Import translations. DO NOT MERGE
|
9a9166b3df3692d928e048aa066b89a02837ed87 |
17-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am 2e5c91de: am c0e0779f: am c0c7418a: Import translations. DO NOT MERGE * commit '2e5c91dedfbb31a869bff9ead9bdffa61d8cd0cd': Import translations. DO NOT MERGE
|
40cefb95b20bc459d8703489ccd7b103d118b36e |
17-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am 90d512fb: (-s ours) am 23bfa181: Import translations. DO NOT MERGE * commit '90d512fb86fe709b807b754dfdb63f0ecfabf408': Import translations. DO NOT MERGE
|
2e5c91dedfbb31a869bff9ead9bdffa61d8cd0cd |
17-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am c0e0779f: am c0c7418a: Import translations. DO NOT MERGE * commit 'c0e0779f92e2fc714e0f5627e896581b62e82ad7': Import translations. DO NOT MERGE
|
77e8d0426b040234d3de227dc7f2ef2e17538c2c |
17-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am 2c109fc4: am d16c2c94: am c6e93291: (-s ours) Import translations. DO NOT MERGE * commit '2c109fc4f196ffd7aae59f949382f99b47f43a61': Import translations. DO NOT MERGE
|
351f4af2647304020beade93e093bdd173659b27 |
17-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am 21f4f791: am 2ccc4259: Import translations. DO NOT MERGE * commit '21f4f791eb8152566aced0707bf0e585229474a6': Import translations. DO NOT MERGE
|
2c109fc4f196ffd7aae59f949382f99b47f43a61 |
17-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am d16c2c94: am c6e93291: (-s ours) Import translations. DO NOT MERGE * commit 'd16c2c94d5260250de719841fd9bc3f54a4afd82': Import translations. DO NOT MERGE
|
21f4f791eb8152566aced0707bf0e585229474a6 |
17-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am 2ccc4259: Import translations. DO NOT MERGE * commit '2ccc425996d47433ad7d0320c27f9c76a7dafd2d': Import translations. DO NOT MERGE
|
c0e0779f92e2fc714e0f5627e896581b62e82ad7 |
17-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am c0c7418a: Import translations. DO NOT MERGE * commit 'c0c7418a7275131786a296c006864fcca3b559e9': Import translations. DO NOT MERGE
|
90d512fb86fe709b807b754dfdb63f0ecfabf408 |
17-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am 23bfa181: Import translations. DO NOT MERGE * commit '23bfa181f8cafe32d5bc06a97b07049fc4b3200d': Import translations. DO NOT MERGE
|
d16c2c94d5260250de719841fd9bc3f54a4afd82 |
17-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am c6e93291: (-s ours) Import translations. DO NOT MERGE * commit 'c6e93291c33c3aeb6d9a71bf5ce3033eb980a0f4': Import translations. DO NOT MERGE
|
d9415122c7a1420906d013fcf895fd647ec1f66f |
17-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am c6e93291: (-s ours) Import translations. DO NOT MERGE * commit 'c6e93291c33c3aeb6d9a71bf5ce3033eb980a0f4': Import translations. DO NOT MERGE
|
ad3e3bc35f6a56734940b12cc143ed9841fcfd5b |
17-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am c6e93291: (-s ours) Import translations. DO NOT MERGE * commit 'c6e93291c33c3aeb6d9a71bf5ce3033eb980a0f4': Import translations. DO NOT MERGE
|
0216f546d13c00c5c380c812424dd7de026ef807 |
17-Nov-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
|
045774e8a6e0e4b163a8c9805371ac85e5f63378 |
17-Nov-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
|
9ed86e7db80fd9f78a6735894f6c82a300e03000 |
16-Nov-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I68cf8255fb19eb1147552c2d680e4e28ccf2440c Auto-generated-cl: translation import
es/values-af/photoeditor_strings.xml
es/values-am/photoeditor_strings.xml
es/values-ar/photoeditor_strings.xml
es/values-be/photoeditor_strings.xml
es/values-bg/photoeditor_strings.xml
es/values-ca/photoeditor_strings.xml
es/values-cs/photoeditor_strings.xml
es/values-da/photoeditor_strings.xml
es/values-de/photoeditor_strings.xml
es/values-el/photoeditor_strings.xml
es/values-en-rGB/photoeditor_strings.xml
es/values-es-rUS/photoeditor_strings.xml
es/values-es/photoeditor_strings.xml
es/values-et/photoeditor_strings.xml
es/values-fa/photoeditor_strings.xml
es/values-fi/photoeditor_strings.xml
es/values-fr/photoeditor_strings.xml
es/values-hi/photoeditor_strings.xml
es/values-hr/photoeditor_strings.xml
es/values-hu/photoeditor_strings.xml
es/values-in/photoeditor_strings.xml
es/values-it/photoeditor_strings.xml
es/values-iw/photoeditor_strings.xml
es/values-ja/photoeditor_strings.xml
es/values-ko/photoeditor_strings.xml
es/values-lt/photoeditor_strings.xml
es/values-lv/photoeditor_strings.xml
es/values-ms/photoeditor_strings.xml
es/values-nb/photoeditor_strings.xml
es/values-nl/photoeditor_strings.xml
es/values-pl/photoeditor_strings.xml
es/values-pt-rPT/photoeditor_strings.xml
es/values-pt/photoeditor_strings.xml
es/values-ro/photoeditor_strings.xml
es/values-ru/photoeditor_strings.xml
es/values-sk/photoeditor_strings.xml
es/values-sl/photoeditor_strings.xml
es/values-sr/photoeditor_strings.xml
es/values-sv/photoeditor_strings.xml
es/values-sw/photoeditor_strings.xml
es/values-th/photoeditor_strings.xml
es/values-tl/photoeditor_strings.xml
es/values-tr/photoeditor_strings.xml
es/values-uk/photoeditor_strings.xml
es/values-vi/photoeditor_strings.xml
es/values-zh-rCN/photoeditor_strings.xml
es/values-zh-rTW/photoeditor_strings.xml
es/values-zu/photoeditor_strings.xml
|
721812f44c78dc9cb75f5ba2e95c77e719ea5091 |
16-Nov-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I9f7450179dcbcfd95bf456f1ed79862a432baf71 Auto-generated-cl: translation import
es/values-it/filtershow_strings.xml
es/values-ru/filtershow_strings.xml
|
2ccc425996d47433ad7d0320c27f9c76a7dafd2d |
16-Nov-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I76cccdd7c79efdc991b2f5e560190588d676e36e Auto-generated-cl: translation import
es/values-it/filtershow_strings.xml
es/values-ru/filtershow_strings.xml
|
c0c7418a7275131786a296c006864fcca3b559e9 |
16-Nov-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I29a06b074154db39f5ad21cb3ddcbfb556e4fd60 Auto-generated-cl: translation import
es/values-it/filtershow_strings.xml
es/values-ru/filtershow_strings.xml
|
23bfa181f8cafe32d5bc06a97b07049fc4b3200d |
16-Nov-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ic833e12115b687b41861b9f43c91bf700af2dd66 Auto-generated-cl: translation import
es/values-it/filtershow_strings.xml
es/values-ru/filtershow_strings.xml
|
341912fb5a1d396dfb6f985e4eb095d4959332aa |
16-Nov-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I0519c4f0ed568661df63ae93ab586b7c639860b5 Auto-generated-cl: translation import
es/values-it/filtershow_strings.xml
es/values-ru/filtershow_strings.xml
|
653feeec8a315f4109846c89fc8db867a55d97ea |
16-Nov-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I0519c4f0ed568661df63ae93ab586b7c639860b5 Auto-generated-cl: translation import
es/values-it/filtershow_strings.xml
es/values-ru/filtershow_strings.xml
|
316f5ae840f88690c59df8f9d0d5c797adc6ee68 |
16-Nov-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ie207a187da4dcd2212b987ec47e1faf24542ae08 Auto-generated-cl: translation import
es/values-it/filtershow_strings.xml
es/values-ru/filtershow_strings.xml
|
c6e93291c33c3aeb6d9a71bf5ce3033eb980a0f4 |
16-Nov-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ie207a187da4dcd2212b987ec47e1faf24542ae08 Auto-generated-cl: translation import
es/values-it/filtershow_strings.xml
es/values-ru/filtershow_strings.xml
|
61c6641631d7c6735e1542411a6e92eb440ae491 |
16-Nov-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Id9ca88eb57a0765e6e16c051de418b33f5d02fce Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
73b7143e3c4392a3d8435e4519bed2de79b2cbf8 |
16-Nov-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Id9ca88eb57a0765e6e16c051de418b33f5d02fce Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
0b014761853483c04000ee36ea1cdc20da40c182 |
16-Nov-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
|
da27f02b1c1050610932f9213584bc13c5e3cf54 |
16-Nov-2012 |
Angus Kong <shkong@google.com> |
am d2b625d6: am b62968cc: am 5e88c747: am 18b38883: Guard tiles by synchronized block. * commit 'd2b625d6fd20175613a1ac246aee276665a12e03': Guard tiles by synchronized block.
|
4523405aae7df882bf579cd0257335e3ba267258 |
13-Nov-2012 |
Teng-Hui Zhu <ztenghui@google.com> |
Video: Fix crash in trimming/muting video in GB. Basically switched to use sherlock actionbar and protect various new methods with API level check. bug:7546257 Change-Id: Ic16f75126c619578a9e9c2520fa264687d89a2e6
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
|
56f214d21ea696e8b5d721b64fa4958ab1bf6686 |
13-Nov-2012 |
Teng-Hui Zhu <ztenghui@google.com> |
Video: Fix crash in trimming/muting video in GB. Basically switched to use sherlock actionbar and protect various new methods with API level check. bug:7546257 Change-Id: Ic16f75126c619578a9e9c2520fa264687d89a2e6
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
rc/com/android/gallery3d/app/MuteVideo.java
rc/com/android/gallery3d/app/TrimControllerOverlay.java
rc/com/android/gallery3d/app/TrimVideo.java
|
b5f374c30d06dc0409891f85a4bd5e1e3ddf8700 |
13-Nov-2012 |
Teng-Hui Zhu <ztenghui@google.com> |
Video: Fix crash in trimming/muting video in GB. Basically switched to use sherlock actionbar and protect various new methods with API level check. bug:7546257 Change-Id: Ic16f75126c619578a9e9c2520fa264687d89a2e6
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
rc/com/android/gallery3d/app/MuteVideo.java
rc/com/android/gallery3d/app/TrimControllerOverlay.java
rc/com/android/gallery3d/app/TrimVideo.java
|
aaba479505f53ce31fc24e1a3fd858730c3bc4c9 |
16-Nov-2012 |
Teng-Hui Zhu <ztenghui@google.com> |
Merge "Video: Add the mute functionality." into gb-ub-photos-bryce
|
44dd798c3a814ffbdecc5adbc73dc47dc4dec646 |
16-Nov-2012 |
Teng-Hui Zhu <ztenghui@google.com> |
Merge "Video: Add the mute functionality." into gb-ub-photos-bryce
|
99996e3b7d581a25d12cad8c00740221f2e1d922 |
16-Nov-2012 |
Teng-Hui Zhu <ztenghui@google.com> |
Merge "Video: Add the mute functionality." into gb-ub-photos-bryce
|
d2b625d6fd20175613a1ac246aee276665a12e03 |
16-Nov-2012 |
Angus Kong <shkong@google.com> |
am b62968cc: am 5e88c747: am 18b38883: Guard tiles by synchronized block. * commit 'b62968cc1f7637dc3392931122dcdbbdf07b75e6': Guard tiles by synchronized block.
|
b62968cc1f7637dc3392931122dcdbbdf07b75e6 |
16-Nov-2012 |
Angus Kong <shkong@google.com> |
am 5e88c747: am 18b38883: Guard tiles by synchronized block. * commit '5e88c7475c3e1eb30fe986793960d810a1748140': Guard tiles by synchronized block.
|
b4e11517f27ac77c001524e10a340971807f380d |
16-Nov-2012 |
Angus Kong <shkong@google.com> |
am 18b38883: Guard tiles by synchronized block. * commit '18b388839ed9858a3b35cec9a636e5cde58a528a': Guard tiles by synchronized block.
|
b6dda0c74eee0994b70608ce1737ed01d168ee52 |
16-Nov-2012 |
Angus Kong <shkong@google.com> |
am 18b38883: Guard tiles by synchronized block. * commit '18b388839ed9858a3b35cec9a636e5cde58a528a': Guard tiles by synchronized block.
|
c9441519c13d7b80719d76807b77098f83e39a0e |
16-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am 139efdbc: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches * commit '139efdbcd66d718b0d24d42e2ea18432469ac005': Import translations. DO NOT MERGE
|
204a38d159be578b5075cf21be9c21676b5b138f |
16-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am 139efdbc: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches * commit '139efdbcd66d718b0d24d42e2ea18432469ac005': Import translations. DO NOT MERGE
|
50c09549e8b5a645495550ffb89b6686c46d1039 |
16-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am b0aae659: (-s ours) Import translations. DO NOT MERGE * commit 'b0aae659bdc27af5dbe460541f3e9843fc815b1f': Import translations. DO NOT MERGE
|
e82e2255f631de3f32ae7aaafa24a980879941a2 |
16-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am b0aae659: (-s ours) Import translations. DO NOT MERGE * commit 'b0aae659bdc27af5dbe460541f3e9843fc815b1f': Import translations. DO NOT MERGE
|
5e88c7475c3e1eb30fe986793960d810a1748140 |
16-Nov-2012 |
Angus Kong <shkong@google.com> |
am 18b38883: Guard tiles by synchronized block. * commit '18b388839ed9858a3b35cec9a636e5cde58a528a': Guard tiles by synchronized block.
|
68089866754a57cade44229be22417efe09aae04 |
15-Nov-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE"
|
6fd2e1bd162c55682dd97f7143ff0fb298803d50 |
14-Nov-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am 133ad2a8: (-s ours) Reconcile with jb-mr1.1-release - do not merge * commit '133ad2a830cab9fd02d4f1be41350ac755ca0086':
|
133ad2a830cab9fd02d4f1be41350ac755ca0086 |
14-Nov-2012 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with jb-mr1.1-release - do not merge Change-Id: Ibc614d3e84ca8542758885e300b25263b2f9496e
|
f00d4d052fd196ab4d736e3f9e9f3605a99f0094 |
13-Nov-2012 |
Teng-Hui Zhu <ztenghui@google.com> |
Video: Add the mute functionality. 1. Enable the mute video functionality. 2. Consolidate the sharing code, especially for file handling. bug:7543943 Change-Id: Ie7ec605996bc3242b1a50385f506e6a50ee2d2fc
es/menu/photo.xml
es/values/strings.xml
|
648b339c74da2b863304ffc61c8528cc74c2afb3 |
13-Nov-2012 |
Teng-Hui Zhu <ztenghui@google.com> |
Video: Add the mute functionality. 1. Enable the mute video functionality. 2. Consolidate the sharing code, especially for file handling. bug:7543943 Change-Id: Ie7ec605996bc3242b1a50385f506e6a50ee2d2fc
es/menu/photo.xml
es/values/strings.xml
rc/com/android/gallery3d/app/MuteVideo.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/app/TrimVideo.java
rc/com/android/gallery3d/app/TrimVideoUtils.java
rc/com/android/gallery3d/app/VideoUtils.java
rc/com/android/gallery3d/data/LocalVideo.java
rc/com/android/gallery3d/data/MediaObject.java
rc/com/android/gallery3d/ui/MenuExecutor.java
rc/com/android/gallery3d/util/SaveVideoFileInfo.java
rc/com/android/gallery3d/util/SaveVideoFileUtils.java
|
46da45f76cae4b7cbcb9706cbd54b8b4b064f11d |
13-Nov-2012 |
Teng-Hui Zhu <ztenghui@google.com> |
Video: Add the mute functionality. 1. Enable the mute video functionality. 2. Consolidate the sharing code, especially for file handling. bug:7543943 Change-Id: Ie7ec605996bc3242b1a50385f506e6a50ee2d2fc
rc/com/android/gallery3d/app/MuteVideo.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/app/TrimVideo.java
rc/com/android/gallery3d/app/TrimVideoUtils.java
rc/com/android/gallery3d/app/VideoUtils.java
rc/com/android/gallery3d/data/LocalVideo.java
rc/com/android/gallery3d/data/MediaObject.java
rc/com/android/gallery3d/ui/MenuExecutor.java
rc/com/android/gallery3d/util/SaveVideoFileInfo.java
rc/com/android/gallery3d/util/SaveVideoFileUtils.java
|
e034b47d8b718403c12e09e9e160d5b2ac30729c |
14-Nov-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
|
499e4c45b30f448686daf98829938f471c54a734 |
14-Nov-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I510b6bb7b050b1fd24505b35a37859504af6b0c9 Auto-generated-cl: translation import
es/values-af/photoeditor_strings.xml
es/values-am/photoeditor_strings.xml
es/values-ar/photoeditor_strings.xml
es/values-be/photoeditor_strings.xml
es/values-bg/photoeditor_strings.xml
es/values-ca/photoeditor_strings.xml
es/values-cs/photoeditor_strings.xml
es/values-da/photoeditor_strings.xml
es/values-de/photoeditor_strings.xml
es/values-el/photoeditor_strings.xml
es/values-en-rGB/photoeditor_strings.xml
es/values-es-rUS/photoeditor_strings.xml
es/values-es/photoeditor_strings.xml
es/values-et/photoeditor_strings.xml
es/values-fa/photoeditor_strings.xml
es/values-fi/photoeditor_strings.xml
es/values-fr/photoeditor_strings.xml
es/values-hi/photoeditor_strings.xml
es/values-hr/photoeditor_strings.xml
es/values-hu/photoeditor_strings.xml
es/values-in/photoeditor_strings.xml
es/values-it/photoeditor_strings.xml
es/values-iw/photoeditor_strings.xml
es/values-ja/photoeditor_strings.xml
es/values-ko/photoeditor_strings.xml
es/values-lt/photoeditor_strings.xml
es/values-lv/photoeditor_strings.xml
es/values-ms/photoeditor_strings.xml
es/values-nb/photoeditor_strings.xml
es/values-nl/photoeditor_strings.xml
es/values-pl/photoeditor_strings.xml
es/values-pt-rPT/photoeditor_strings.xml
es/values-pt/photoeditor_strings.xml
es/values-ro/photoeditor_strings.xml
es/values-ru/photoeditor_strings.xml
es/values-sk/photoeditor_strings.xml
es/values-sl/photoeditor_strings.xml
es/values-sr/photoeditor_strings.xml
es/values-sv/photoeditor_strings.xml
es/values-sw/photoeditor_strings.xml
es/values-th/photoeditor_strings.xml
es/values-tl/photoeditor_strings.xml
es/values-tr/photoeditor_strings.xml
es/values-uk/photoeditor_strings.xml
es/values-vi/photoeditor_strings.xml
es/values-zh-rCN/photoeditor_strings.xml
es/values-zh-rTW/photoeditor_strings.xml
es/values-zu/photoeditor_strings.xml
|
93b9c1e3b6fee10b3c61ed0dc57608fe32be3d64 |
14-Nov-2012 |
Earl Ou <shunhsingou@google.com> |
Remove import exiftags Change-Id: Ifa9882a32ab788e02b1ce5f1751d8c976d67c013
rc/com/android/gallery3d/data/MediaDetails.java
|
1c1c561669710bc4222f775d8e6be629e3594ccb |
14-Nov-2012 |
Earl Ou <shunhsingou@google.com> |
Remove import exiftags Change-Id: Ifa9882a32ab788e02b1ce5f1751d8c976d67c013
rc/com/android/gallery3d/data/MediaDetails.java
|
370ec0d435e43763f3e7c4804420bf44d9a39a97 |
14-Nov-2012 |
Angus Kong <shkong@google.com> |
Guard tiles by synchronized block. Tiles might be touched in different threads. bug:7490351 Change-Id: Ie30d43db90cf63f7a6ec6438faabfcae8bca151a
rc/com/android/gallery3d/ui/TiledTexture.java
|
18b388839ed9858a3b35cec9a636e5cde58a528a |
14-Nov-2012 |
Angus Kong <shkong@google.com> |
Guard tiles by synchronized block. Tiles might be touched in different threads. bug:7490351 Change-Id: Ie30d43db90cf63f7a6ec6438faabfcae8bca151a
rc/com/android/gallery3d/ui/TiledTexture.java
|
c56ddd3de2c9571e0561b1c7295b502927d7b1d4 |
14-Nov-2012 |
Earl Ou <shunhsingou@google.com> |
use ExifReader in MediaDetails Change-Id: If8c7f32804ba55b4b0351c350e324dc1b6e508d7
allerycommon/src/com/android/gallery3d/common/ExifTags.java
allerycommon/src/com/android/gallery3d/exif/Rational.java
|
b7b93211cc4171c8758de2ccc1d27b5e36c31033 |
14-Nov-2012 |
Earl Ou <shunhsingou@google.com> |
use ExifReader in MediaDetails Change-Id: If8c7f32804ba55b4b0351c350e324dc1b6e508d7
allerycommon/src/com/android/gallery3d/common/ExifTags.java
allerycommon/src/com/android/gallery3d/exif/Rational.java
rc/com/android/gallery3d/data/MediaDetails.java
|
ca56f8e30a4d91c7b7e6f75a39a1a69801e49cbb |
14-Nov-2012 |
Earl Ou <shunhsingou@google.com> |
use ExifReader in MediaDetails Change-Id: If8c7f32804ba55b4b0351c350e324dc1b6e508d7
allerycommon/src/com/android/gallery3d/common/ExifTags.java
allerycommon/src/com/android/gallery3d/exif/Rational.java
rc/com/android/gallery3d/data/MediaDetails.java
|
b232a2caff083191ab9d24f0a164b9a83afafc1c |
14-Nov-2012 |
Earl Ou <shunhsingou@google.com> |
use ExifParser in ImageLoader Change-Id: Ibcee97c15b2cc7df3aaa6c6c65535ca00cef2ed6
rc/com/android/gallery3d/filtershow/cache/ImageLoader.java
|
90feaa549de22d45f790073bc2d351a93ccc76b6 |
14-Nov-2012 |
Earl Ou <shunhsingou@google.com> |
use ExifParser in ImageLoader Change-Id: Ibcee97c15b2cc7df3aaa6c6c65535ca00cef2ed6
rc/com/android/gallery3d/filtershow/cache/ImageLoader.java
|
994234e5b04864c9ac12a78de5ccdbe966cb8fa7 |
14-Nov-2012 |
Earl Ou <shunhsingou@google.com> |
Use getValueAt() to read different data in ExifTag Change-Id: I4d8a72523a6ad4ae34e173c4b845a462644e83c7
allerycommon/src/com/android/gallery3d/exif/ExifOutputStream.java
allerycommon/src/com/android/gallery3d/exif/ExifParser.java
allerycommon/src/com/android/gallery3d/exif/ExifTag.java
|
d6db57ca0d2b1c9ba554608fdfaabb9f2afb8ce0 |
14-Nov-2012 |
Earl Ou <shunhsingou@google.com> |
Use getValueAt() to read different data in ExifTag Change-Id: I4d8a72523a6ad4ae34e173c4b845a462644e83c7
allerycommon/src/com/android/gallery3d/exif/ExifOutputStream.java
allerycommon/src/com/android/gallery3d/exif/ExifParser.java
allerycommon/src/com/android/gallery3d/exif/ExifTag.java
rc/com/android/gallery3d/data/Exif.java
ests/src/com/android/gallery3d/exif/ExifDataTest.java
ests/src/com/android/gallery3d/exif/ExifParserTest.java
ests/src/com/android/gallery3d/exif/ExifReaderTest.java
ests/src/com/android/gallery3d/exif/Util.java
|
8592397237a3f052ac39dd7f259898a7e04fae50 |
14-Nov-2012 |
Earl Ou <shunhsingou@google.com> |
Use getValueAt() to read different data in ExifTag Change-Id: I4d8a72523a6ad4ae34e173c4b845a462644e83c7
allerycommon/src/com/android/gallery3d/exif/ExifOutputStream.java
allerycommon/src/com/android/gallery3d/exif/ExifParser.java
allerycommon/src/com/android/gallery3d/exif/ExifTag.java
rc/com/android/gallery3d/data/Exif.java
ests/src/com/android/gallery3d/exif/ExifDataTest.java
ests/src/com/android/gallery3d/exif/ExifParserTest.java
ests/src/com/android/gallery3d/exif/ExifReaderTest.java
ests/src/com/android/gallery3d/exif/Util.java
|
201c6d506889bf617010d1f8dfac6fe09a0d982a |
13-Nov-2012 |
Hung-ying Tyan <tyanh@google.com> |
Merge "use NO_VALUE when the output of exiftool is invalid" into gb-ub-photos-bryce
|
f0d2bbed7be5bcce498eee554a3809a7ce785464 |
13-Nov-2012 |
Hung-ying Tyan <tyanh@google.com> |
Merge "Do not use parentheses for Model tag in exiftool parser" into gb-ub-photos-bryce
|
a230880c0313d7e85922e72ec1640d7b34490d3f |
13-Nov-2012 |
Hung-ying Tyan <tyanh@google.com> |
Merge "Parse the layer of exiftool output" into gb-ub-photos-bryce
|
4825985f68eb05cfdddfd5e67f75e56829226e59 |
13-Nov-2012 |
Hung-ying Tyan <tyanh@google.com> |
Merge "Exiftool parser" into gb-ub-photos-bryce
|
0ce848fd66a1a55984aaf1616a0bd9da2c5bb0e7 |
13-Nov-2012 |
Doris Liu <tianliu@google.com> |
Fix UnsupportedOperationException in MediaObject Bug: 6495745 Change-Id: I770833f0c3fec6f187e961f511a7d9d2591f5f97
rc/com/android/gallery3d/app/PhotoPage.java
|
599bdd6d7de2adfc066b06e9899d860ae2697472 |
13-Nov-2012 |
Doris Liu <tianliu@google.com> |
Fix UnsupportedOperationException in MediaObject Bug: 6495745 Change-Id: I770833f0c3fec6f187e961f511a7d9d2591f5f97
rc/com/android/gallery3d/app/PhotoPage.java
|
db1ea416181253fa10e85caff3e28b0f9998d1cf |
13-Nov-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE"
|
ccf4e9e39851ae9b64212a23b7c0cb20b9abf9ad |
12-Nov-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am b9f5c914: (-s ours) am b263fd97: am 3253b263: Reconcile with jb-mr1-release - do not merge * commit 'b9f5c914a818d91c8eebc51d35672ca6ee2763db':
|
b9f5c914a818d91c8eebc51d35672ca6ee2763db |
12-Nov-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am b263fd97: am 3253b263: Reconcile with jb-mr1-release - do not merge * commit 'b263fd97087ef7aba761397246124e4fcf3a4f2f':
|
b263fd97087ef7aba761397246124e4fcf3a4f2f |
12-Nov-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am 3253b263: Reconcile with jb-mr1-release - do not merge * commit '3253b263b03d3ffd9b70224d2c59c082e6dc0c58':
|
3253b263b03d3ffd9b70224d2c59c082e6dc0c58 |
12-Nov-2012 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with jb-mr1-release - do not merge Change-Id: If2e420d2351705c4bcb89c0787951f431ebdd56d
|
138f9946a9bac1405da49e43158e8e31b5681480 |
12-Nov-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I71a7fe5a1150a6d21a318a646b19fc27b6fba130 Auto-generated-cl: translation import
es/values-af/photoeditor_strings.xml
es/values-am/photoeditor_strings.xml
es/values-ar/photoeditor_strings.xml
es/values-be/photoeditor_strings.xml
es/values-bg/photoeditor_strings.xml
es/values-ca/photoeditor_strings.xml
es/values-cs/photoeditor_strings.xml
es/values-da/photoeditor_strings.xml
es/values-de/photoeditor_strings.xml
es/values-el/photoeditor_strings.xml
es/values-en-rGB/photoeditor_strings.xml
es/values-es-rUS/photoeditor_strings.xml
es/values-es/photoeditor_strings.xml
es/values-et/photoeditor_strings.xml
es/values-fa/photoeditor_strings.xml
es/values-fi/photoeditor_strings.xml
es/values-fr/photoeditor_strings.xml
es/values-hi/photoeditor_strings.xml
es/values-hr/photoeditor_strings.xml
es/values-hu/photoeditor_strings.xml
es/values-in/photoeditor_strings.xml
es/values-it/photoeditor_strings.xml
es/values-iw/photoeditor_strings.xml
es/values-ja/photoeditor_strings.xml
es/values-ko/photoeditor_strings.xml
es/values-lt/photoeditor_strings.xml
es/values-lv/photoeditor_strings.xml
es/values-ms/photoeditor_strings.xml
es/values-nb/photoeditor_strings.xml
es/values-nl/photoeditor_strings.xml
es/values-pl/photoeditor_strings.xml
es/values-pt-rPT/photoeditor_strings.xml
es/values-pt/photoeditor_strings.xml
es/values-ro/photoeditor_strings.xml
es/values-ru/photoeditor_strings.xml
es/values-sk/photoeditor_strings.xml
es/values-sl/photoeditor_strings.xml
es/values-sr/photoeditor_strings.xml
es/values-sv/photoeditor_strings.xml
es/values-sw/photoeditor_strings.xml
es/values-th/photoeditor_strings.xml
es/values-tl/photoeditor_strings.xml
es/values-tr/photoeditor_strings.xml
es/values-uk/photoeditor_strings.xml
es/values-vi/photoeditor_strings.xml
es/values-zh-rCN/photoeditor_strings.xml
es/values-zh-rTW/photoeditor_strings.xml
es/values-zu/photoeditor_strings.xml
|
3f81bf8539e6015adedb0fe3e1e69023122a2dd1 |
10-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am 30055612: (-s ours) am ef1c3ee6: am bd203347: am 8182ed32: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev * commit '30055612a3442771b9856cbfac4dcd657c1ea857': Import translations. DO NOT MERGE
|
fc5a2fd1e3d1c4f17be00cd173c731163971b8af |
10-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am c7eab4da: (-s ours) am b59213a3: am 1b488e2d: am 46281de7: Import translations. DO NOT MERGE * commit 'c7eab4dae79a48051a2f46a166e83700963af98b': Import translations. DO NOT MERGE
|
22853c990a4c48a5c8aa5c7e2e961d47daf5e252 |
10-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am 26c7e0c0: (-s ours) am cf90e2af: am f26cba65: am 139efdbc: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches * commit '26c7e0c07d05cfe13af09f0d65938fceeee4f402': Import translations. DO NOT MERGE
|
f5669611c897d25a751ebc2d733275bae3288758 |
10-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am 2b0a3c47: (-s ours) am 015b736a: am f9121463: am b0aae659: (-s ours) Import translations. DO NOT MERGE * commit '2b0a3c47daa37bf26ac14f9d79ccf6bc0fc54e68': Import translations. DO NOT MERGE
|
4d6c89dc895a1da1a37e97c2530bc649039340cb |
10-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am 6d8ffb02: (-s ours) am e18f667c: am b8183269: Import translations. DO NOT MERGE * commit '6d8ffb023396631394a9418d9610666ea9e85b2d': Import translations. DO NOT MERGE
|
30055612a3442771b9856cbfac4dcd657c1ea857 |
10-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am ef1c3ee6: am bd203347: am 8182ed32: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev * commit 'ef1c3ee6ef666d2d802273d896cf1dd24394e4bc': Import translations. DO NOT MERGE
|
c7eab4dae79a48051a2f46a166e83700963af98b |
10-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am b59213a3: am 1b488e2d: am 46281de7: Import translations. DO NOT MERGE * commit 'b59213a3cfffe98299d2bc9a653f1a3a1239bfe9': Import translations. DO NOT MERGE
|
26c7e0c07d05cfe13af09f0d65938fceeee4f402 |
10-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am cf90e2af: am f26cba65: am 139efdbc: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches * commit 'cf90e2af87d1d76685f3825972899bc086652071': Import translations. DO NOT MERGE
|
2b0a3c47daa37bf26ac14f9d79ccf6bc0fc54e68 |
10-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am 015b736a: am f9121463: am b0aae659: (-s ours) Import translations. DO NOT MERGE * commit '015b736a58fd62d8a8a07f1a228aab29c5d42300': Import translations. DO NOT MERGE
|
6d8ffb023396631394a9418d9610666ea9e85b2d |
10-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am e18f667c: am b8183269: Import translations. DO NOT MERGE * commit 'e18f667cf96db59f30c50422fea6ea5e19d64055': Import translations. DO NOT MERGE
|
8b14621e14c0314e08e23b4861202263f8953d02 |
10-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am 3f83830a: (-s ours) am 65be5095: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev * commit '3f83830aaadbf078582d9f74fb5ebb4094a96dd2': Import translations. DO NOT MERGE
|
f2fb78aaebf7cb01e3aed8c0e960081d7779e8f0 |
10-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am 53e1f0ea: (-s ours) am 03392332: Import translations. DO NOT MERGE * commit '53e1f0eadc89ef518a556dd7ea5e66907702fec3': Import translations. DO NOT MERGE
|
ef1c3ee6ef666d2d802273d896cf1dd24394e4bc |
10-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am bd203347: am 8182ed32: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev * commit 'bd2033475fb3226fa7a6158ac4cb4ed1f7b87fc7': Import translations. DO NOT MERGE
|
b59213a3cfffe98299d2bc9a653f1a3a1239bfe9 |
10-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am 1b488e2d: am 46281de7: Import translations. DO NOT MERGE * commit '1b488e2d3051cc87715365b49713e6b15cfb1401': Import translations. DO NOT MERGE
|
cf90e2af87d1d76685f3825972899bc086652071 |
10-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am f26cba65: am 139efdbc: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches * commit 'f26cba658abed9f0bfdd37131e3b6fadcfb7bd82': Import translations. DO NOT MERGE
|
015b736a58fd62d8a8a07f1a228aab29c5d42300 |
10-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am f9121463: am b0aae659: (-s ours) Import translations. DO NOT MERGE * commit 'f9121463776a173c492bf699a130492648df63a2': Import translations. DO NOT MERGE
|
e18f667cf96db59f30c50422fea6ea5e19d64055 |
10-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am b8183269: Import translations. DO NOT MERGE * commit 'b818326915c27a3857eb77b2ad660f7b6e99fb5e': Import translations. DO NOT MERGE
|
ccddd6f97d953ec4a0cc5ef2ac7fc981f43320cd |
10-Nov-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
bd2033475fb3226fa7a6158ac4cb4ed1f7b87fc7 |
10-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am 8182ed32: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev * commit '8182ed32d7dac4209086b6f33843167291a5aa77': Import translations. DO NOT MERGE
|
1b488e2d3051cc87715365b49713e6b15cfb1401 |
10-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am 46281de7: Import translations. DO NOT MERGE * commit '46281de7f9d1fd32f20598efd31e7a8f2e7c2ac3': Import translations. DO NOT MERGE
|
3f83830aaadbf078582d9f74fb5ebb4094a96dd2 |
10-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am 65be5095: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev * commit '65be50950bde081642f9cd83fb439c2c645ae719': Import translations. DO NOT MERGE
|
53e1f0eadc89ef518a556dd7ea5e66907702fec3 |
10-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am 03392332: Import translations. DO NOT MERGE * commit '033923329a0366ccd37891ef9552d6f4f986d28d': Import translations. DO NOT MERGE
|
c0800e7aa57a60d0b1cbe5e6ddcd439efd312f86 |
09-Nov-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE"
|
f26cba658abed9f0bfdd37131e3b6fadcfb7bd82 |
09-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am 139efdbc: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches * commit '139efdbcd66d718b0d24d42e2ea18432469ac005': Import translations. DO NOT MERGE
|
f9121463776a173c492bf699a130492648df63a2 |
09-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am b0aae659: (-s ours) Import translations. DO NOT MERGE * commit 'b0aae659bdc27af5dbe460541f3e9843fc815b1f': Import translations. DO NOT MERGE
|
b818326915c27a3857eb77b2ad660f7b6e99fb5e |
09-Nov-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Iff36d4d66adea96bda6dd76700495eb744bf92b8 Auto-generated-cl: translation import
es/values-iw/strings.xml
es/values-ru/strings.xml
es/values-vi/strings.xml
|
c26af4c78cc98a89f363b40dbf45259bd4030163 |
09-Nov-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE"
|
8182ed32d7dac4209086b6f33843167291a5aa77 |
09-Nov-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
|
65be50950bde081642f9cd83fb439c2c645ae719 |
09-Nov-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
|
af1c7ae7ebe09c59c151d7efb6719e31cc13253b |
09-Nov-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
|
fa62f816126c55fe59e1d95986210cb51347376c |
09-Nov-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
|
e98da6cd9c1a288fefad3fe616825644a69aa63b |
09-Nov-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
|
139efdbcd66d718b0d24d42e2ea18432469ac005 |
09-Nov-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
|
656c29892eb7b5b19d3d7d32a10d22aaa8fd3ba5 |
09-Nov-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I9bc326bf4f065814e67bc55457217ae675bce878 Auto-generated-cl: translation import
es/values-af/photoeditor_strings.xml
es/values-am/photoeditor_strings.xml
es/values-ar/photoeditor_strings.xml
es/values-be/photoeditor_strings.xml
es/values-bg/photoeditor_strings.xml
es/values-ca/photoeditor_strings.xml
es/values-cs/photoeditor_strings.xml
es/values-da/photoeditor_strings.xml
es/values-de/photoeditor_strings.xml
es/values-el/photoeditor_strings.xml
es/values-en-rGB/photoeditor_strings.xml
es/values-es-rUS/photoeditor_strings.xml
es/values-es/photoeditor_strings.xml
es/values-et/photoeditor_strings.xml
es/values-fa/photoeditor_strings.xml
es/values-fi/photoeditor_strings.xml
es/values-fr/photoeditor_strings.xml
es/values-hi/photoeditor_strings.xml
es/values-hr/photoeditor_strings.xml
es/values-hu/photoeditor_strings.xml
es/values-in/photoeditor_strings.xml
es/values-it/photoeditor_strings.xml
es/values-iw/photoeditor_strings.xml
es/values-ja/photoeditor_strings.xml
es/values-ko/photoeditor_strings.xml
es/values-lt/photoeditor_strings.xml
es/values-lv/photoeditor_strings.xml
es/values-ms/photoeditor_strings.xml
es/values-nb/photoeditor_strings.xml
es/values-nl/photoeditor_strings.xml
es/values-pl/photoeditor_strings.xml
es/values-pt-rPT/photoeditor_strings.xml
es/values-pt/photoeditor_strings.xml
es/values-ro/photoeditor_strings.xml
es/values-ru/photoeditor_strings.xml
es/values-sk/photoeditor_strings.xml
es/values-sl/photoeditor_strings.xml
es/values-sr/photoeditor_strings.xml
es/values-sv/photoeditor_strings.xml
es/values-sw/photoeditor_strings.xml
es/values-th/photoeditor_strings.xml
es/values-tl/photoeditor_strings.xml
es/values-tr/photoeditor_strings.xml
es/values-uk/photoeditor_strings.xml
es/values-vi/photoeditor_strings.xml
es/values-zh-rCN/photoeditor_strings.xml
es/values-zh-rTW/photoeditor_strings.xml
es/values-zu/photoeditor_strings.xml
|
e7da73fb9b27a601278487a3f5d1400a1f02ef86 |
09-Nov-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Iaff187d239a7e48d1f2e8502a339842c7f516428 Auto-generated-cl: translation import
es/values-iw/filtershow_strings.xml
es/values-ru/filtershow_strings.xml
|
f5974dc82d976decffc1c5c3d02147587f53f3e5 |
09-Nov-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ib95894d56a16d3c7ec01b84d7b1ed57ea44d33aa Auto-generated-cl: translation import
es/values-iw/filtershow_strings.xml
es/values-ru/filtershow_strings.xml
|
152b745aa06557209507d4af93c11d3232d58f20 |
09-Nov-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I39f23219e3e9794e24656c944ab5b0ba2386e760 Auto-generated-cl: translation import
es/values-iw/filtershow_strings.xml
es/values-ru/filtershow_strings.xml
|
a6a4609e52a257cdc7ed11f36a0907e677f7349a |
09-Nov-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ib83d4034adb61835865c308210daeb7767128583 Auto-generated-cl: translation import
es/values-iw/filtershow_strings.xml
es/values-ru/filtershow_strings.xml
|
30e7b17f12dc9b0d55c594a5d7145b7b0a4b056f |
09-Nov-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ib83d4034adb61835865c308210daeb7767128583 Auto-generated-cl: translation import
es/values-iw/filtershow_strings.xml
es/values-ru/filtershow_strings.xml
|
0087e6a084f9c7b4e5739f2ca1819cc13db8f683 |
09-Nov-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I77990cac84f1cd8e4762bd4d5df314dc52117081 Auto-generated-cl: translation import
es/values-iw/filtershow_strings.xml
es/values-ru/filtershow_strings.xml
|
6694bb76130194706c901966c7c6c4b6438beb9c |
09-Nov-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I77990cac84f1cd8e4762bd4d5df314dc52117081 Auto-generated-cl: translation import
es/values-iw/filtershow_strings.xml
es/values-ru/filtershow_strings.xml
|
ead56dd1c2592a9cc7267acc190bca5341d31cc8 |
09-Nov-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I4d50deb84b6c7229e003e81c14111c04ff2ae0e4 Auto-generated-cl: translation import
es/values-iw/strings.xml
es/values-ru/strings.xml
es/values-vi/strings.xml
|
46281de7f9d1fd32f20598efd31e7a8f2e7c2ac3 |
09-Nov-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I4e9f92985c3e2285d1bb280560fa7fe86bee972f Auto-generated-cl: translation import
es/values-iw/strings.xml
es/values-ru/strings.xml
es/values-vi/strings.xml
|
033923329a0366ccd37891ef9552d6f4f986d28d |
09-Nov-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I839d902c45e0c149f497188d5976700afb45e1b4 Auto-generated-cl: translation import
es/values-iw/strings.xml
es/values-ru/strings.xml
es/values-vi/strings.xml
|
960322ce703826c602395be0aecf22293c823870 |
09-Nov-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I02bfb14ad6bc12c5628b9152e0720f6a65588da8 Auto-generated-cl: translation import
es/values-iw/strings.xml
es/values-ru/strings.xml
es/values-vi/strings.xml
|
9d42a4419e9012061584f7ab29937a2e95a12fe5 |
09-Nov-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I02bfb14ad6bc12c5628b9152e0720f6a65588da8 Auto-generated-cl: translation import
es/values-iw/strings.xml
es/values-ru/strings.xml
es/values-vi/strings.xml
|
ee7ea836fcd771dd3e606aa51fead60af28407f6 |
09-Nov-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Iff36d4d66adea96bda6dd76700495eb744bf92b8 Auto-generated-cl: translation import
es/values-iw/strings.xml
es/values-ru/strings.xml
es/values-vi/strings.xml
|
b0aae659bdc27af5dbe460541f3e9843fc815b1f |
09-Nov-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Iff36d4d66adea96bda6dd76700495eb744bf92b8 Auto-generated-cl: translation import
es/values-iw/strings.xml
es/values-ru/strings.xml
es/values-vi/strings.xml
|
af162c138024cb16e7b318f5e69dd14adc18db08 |
09-Nov-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am 5ae5e5e2: (-s ours) am 5a51d6a2: am b7a115c7: Reconcile with jb-mr1-release - do not merge * commit '5ae5e5e2a9f2fe2f517749b1cfb8049e1a89577d':
|
f49c589cf6f9d4bce577d7e71e7d012469ccc59b |
09-Nov-2012 |
John Hoford <hoford@google.com> |
am 75495505: (-s ours) am 0ede5c51: am 4c1614b7: am 8253c35a: reduce size of tiny planet if malloc fails - DO NOT MERGE * commit '7549550538e42a5d7e2aa791792e9818f6ed4321': reduce size of tiny planet if malloc fails - DO NOT MERGE
|
109f79a1bc2c5081ade7770507541326747ac667 |
09-Nov-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am 4afcf0fd: (-s ours) am 286e9cd8: am d7545049: Reconcile with jb-mr1-release - do not merge * commit '4afcf0fdb85a2c7fa7ffbd60312dd9569021b3fe':
|
0cd4a69a2629f7a2cee7400243ee7c0136e11e9e |
09-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am 6aea9f18: (-s ours) am 94183ec3: am 3375b227: am 2a8405d7: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev * commit '6aea9f189360b9f232f8681b48a67d0c9788ae27': Import translations. DO NOT MERGE
|
5ae5e5e2a9f2fe2f517749b1cfb8049e1a89577d |
09-Nov-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am 5a51d6a2: am b7a115c7: Reconcile with jb-mr1-release - do not merge * commit '5a51d6a23d7e2ab7fabcc88e71cd59454b692d09':
|
7549550538e42a5d7e2aa791792e9818f6ed4321 |
09-Nov-2012 |
John Hoford <hoford@google.com> |
am 0ede5c51: am 4c1614b7: am 8253c35a: reduce size of tiny planet if malloc fails - DO NOT MERGE * commit '0ede5c513d0c37c26f921b9e1ef25eb04b1f383b': reduce size of tiny planet if malloc fails - DO NOT MERGE
|
4afcf0fdb85a2c7fa7ffbd60312dd9569021b3fe |
09-Nov-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am 286e9cd8: am d7545049: Reconcile with jb-mr1-release - do not merge * commit '286e9cd80827518e75de282fd88f1352656a7a6d':
|
6aea9f189360b9f232f8681b48a67d0c9788ae27 |
09-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am 94183ec3: am 3375b227: am 2a8405d7: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev * commit '94183ec33f6a99069976236a7090d9f26e262e28': Import translations. DO NOT MERGE
|
5a51d6a23d7e2ab7fabcc88e71cd59454b692d09 |
08-Nov-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am b7a115c7: Reconcile with jb-mr1-release - do not merge * commit 'b7a115c77ad4852aae5ec2ce30ea2b05f3dd1d75':
|
b7a115c77ad4852aae5ec2ce30ea2b05f3dd1d75 |
08-Nov-2012 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with jb-mr1-release - do not merge Change-Id: Id8f361c784adbf1b22de8a82b4cbdc2ea3a15bf7
|
56a58dea9d77eaeae7d3e21fba1febb82179debf |
08-Nov-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
0ede5c513d0c37c26f921b9e1ef25eb04b1f383b |
08-Nov-2012 |
John Hoford <hoford@google.com> |
am 4c1614b7: am 8253c35a: reduce size of tiny planet if malloc fails - DO NOT MERGE * commit '4c1614b7845252209742411acd09723e2245b8f8': reduce size of tiny planet if malloc fails - DO NOT MERGE
|
4c1614b7845252209742411acd09723e2245b8f8 |
08-Nov-2012 |
John Hoford <hoford@google.com> |
am 8253c35a: reduce size of tiny planet if malloc fails - DO NOT MERGE * commit '8253c35a5d9564afbc667f7a9f42fdc0a734bcf8': reduce size of tiny planet if malloc fails - DO NOT MERGE
|
8253c35a5d9564afbc667f7a9f42fdc0a734bcf8 |
08-Nov-2012 |
John Hoford <hoford@google.com> |
reduce size of tiny planet if malloc fails - DO NOT MERGE bug:7477815 Change-Id: I03fec9246e368fb7f929769dc5e5e6266761dc34
rc/com/android/gallery3d/filtershow/filters/ImageFilterTinyPlanet.java
|
4cdb22512f322d2749aa57e07abeebf65b47c26f |
08-Nov-2012 |
John Hoford <hoford@google.com> |
reduce size of tiny planet if malloc fails bug:7477815 Change-Id: I03fec9246e368fb7f929769dc5e5e6266761dc34
rc/com/android/gallery3d/filtershow/filters/ImageFilterTinyPlanet.java
|
3c38fb244c0ec4a538c5600af16a289bd652bbe4 |
08-Nov-2012 |
John Hoford <hoford@google.com> |
reduce size of tiny planet if malloc fails bug:7477815 Change-Id: I03fec9246e368fb7f929769dc5e5e6266761dc34
rc/com/android/gallery3d/filtershow/filters/ImageFilterTinyPlanet.java
|
286e9cd80827518e75de282fd88f1352656a7a6d |
08-Nov-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am d7545049: Reconcile with jb-mr1-release - do not merge * commit 'd7545049bfe7142389eae84394d6b76ed9b68fb2':
|
d7545049bfe7142389eae84394d6b76ed9b68fb2 |
08-Nov-2012 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with jb-mr1-release - do not merge Change-Id: I8db9fb7159802c84866bdc4edd136c9a75880397
|
5558840dd94af15b4bf2c44bf504f81448ecb12e |
08-Nov-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am 5e08513d: (-s ours) am 486ac238: am 5636617c: Reconcile with jb-mr1-release - do not merge * commit '5e08513d06c0a71796efbc2910ebadf0caec8177':
|
5e08513d06c0a71796efbc2910ebadf0caec8177 |
08-Nov-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am 486ac238: am 5636617c: Reconcile with jb-mr1-release - do not merge * commit '486ac23882dcca5998a8914f3f80e2597537ffd9':
|
253e7825b2247cb898f05c568df215afa130d153 |
08-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am 2c6faf89: (-s ours) am ab003a08: am a6bb1711: am da700ab4: am 85d20a07: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches * commit '2c6faf89e2c1355cc90b8ad9570a7e0b94676f97': Import translations. DO NOT MERGE
|
76f35ad53338ff0a8066f3ea10154f0a118ee693 |
08-Nov-2012 |
Bobby Georgescu <georgescu@google.com> |
am e53060b9: am c06e9eab: am 75bf0030: am 88571794: am 9ec5de9d: Fix scenario where launching Gallery launches Camera * commit 'e53060b9e9adb5fef60b66fbd88f78868dda926a': Fix scenario where launching Gallery launches Camera
|
a77cea27436f11da3c5bd638911aa2660fc48086 |
08-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am 6a871e6e: (-s ours) am 7449dd34: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev * commit '6a871e6e1c408fe41653f4c6a14eb4d79aa22313': Import translations. DO NOT MERGE
|
2c6faf89e2c1355cc90b8ad9570a7e0b94676f97 |
08-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am ab003a08: am a6bb1711: am da700ab4: am 85d20a07: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches * commit 'ab003a084049320807f72341fa260ae133c13c73': Import translations. DO NOT MERGE
|
e53060b9e9adb5fef60b66fbd88f78868dda926a |
08-Nov-2012 |
Bobby Georgescu <georgescu@google.com> |
am c06e9eab: am 75bf0030: am 88571794: am 9ec5de9d: Fix scenario where launching Gallery launches Camera * commit 'c06e9eab7510549b87935b3c1179cfa6f3f78819': Fix scenario where launching Gallery launches Camera
|
6a871e6e1c408fe41653f4c6a14eb4d79aa22313 |
08-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am 7449dd34: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev * commit '7449dd3417c652fca4689d4db69413492abea429': Import translations. DO NOT MERGE
|
242dc65a7ee6e45bdb2046712f9bb34a7beef373 |
01-Nov-2012 |
Angus Kong <shkong@google.com> |
Backup the preferences to the backup service. bug:7259104 Change-Id: Id99f8782f0fb5b93b89930d51d38e7d1d98af11d
ndroidManifest.xml
|
6fdc875fded285183d1e468957349a1b26fd9c43 |
01-Nov-2012 |
Angus Kong <shkong@google.com> |
Backup the preferences to the backup service. bug:7259104 Change-Id: Id99f8782f0fb5b93b89930d51d38e7d1d98af11d
ndroidManifest.xml
|
7cf5542b9dcbc72fe4a235a129908bc6ea87b698 |
07-Nov-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
94183ec33f6a99069976236a7090d9f26e262e28 |
07-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am 3375b227: am 2a8405d7: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev * commit '3375b2274ce109fbe8f8d1804655a9eadaa067a0': Import translations. DO NOT MERGE
|
3375b2274ce109fbe8f8d1804655a9eadaa067a0 |
07-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am 2a8405d7: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev * commit '2a8405d7e5439e1098598f47081530c550733f12': Import translations. DO NOT MERGE
|
2a8405d7e5439e1098598f47081530c550733f12 |
07-Nov-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
|
486ac23882dcca5998a8914f3f80e2597537ffd9 |
07-Nov-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am 5636617c: Reconcile with jb-mr1-release - do not merge * commit '5636617ce28f4ce2e5bb8a5bce35dbd57b79b14a':
|
5636617ce28f4ce2e5bb8a5bce35dbd57b79b14a |
07-Nov-2012 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with jb-mr1-release - do not merge Change-Id: Id3f4eff2714ec8ba5146b23954cf3cf3e811564b
|
c7b6ecc52012fb6251d3b876c9ffa0f5aa402d0e |
07-Nov-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE"
|
cdcdf7102a49abad68a0e3b70e7870dd2787dc66 |
07-Nov-2012 |
Earl Ou <shunhsingou@google.com> |
Convenient function to add timestamp related exif tags Change-Id: I8a20c38d5fd35517d0520b29aac362eff32cbdd9
allerycommon/src/com/android/gallery3d/exif/ExifData.java
|
670baca6f198f931be76f248b3ddcac7e2211ad4 |
07-Nov-2012 |
Earl Ou <shunhsingou@google.com> |
Convenient function to add timestamp related exif tags Change-Id: I8a20c38d5fd35517d0520b29aac362eff32cbdd9
allerycommon/src/com/android/gallery3d/exif/ExifData.java
|
6c687a5fe5c5bad1c7c6aabceb7aec42eaed218a |
07-Nov-2012 |
Earl Ou <shunhsingou@google.com> |
Convenient function to add timestamp related exif tags Change-Id: I8a20c38d5fd35517d0520b29aac362eff32cbdd9
allerycommon/src/com/android/gallery3d/exif/ExifData.java
|
91833f3d909c5b01dc590289c1a8dab9e145318a |
07-Nov-2012 |
Earl Ou <shunhsingou@google.com> |
use ExifParser to parse the orientaion Change-Id: I47171c028cbc1f94b7de5d067de0636a9e241fbb
rc/com/android/gallery3d/data/Exif.java
|
1fac63b93ebdcd228b8fed62826ec8d64c6a5774 |
07-Nov-2012 |
Earl Ou <shunhsingou@google.com> |
use ExifParser to parse the orientaion Change-Id: I47171c028cbc1f94b7de5d067de0636a9e241fbb
rc/com/android/gallery3d/data/Exif.java
|
64bf9ee95443c1d14455cbdb05c392b3967e4756 |
24-Oct-2012 |
Earl Ou <shunhsingou@google.com> |
Handle wrong thumbnail tag type Change-Id: If41834f0aa86425a06aaede815f3e0c3cdd17fd9
allerycommon/src/com/android/gallery3d/exif/ExifParser.java
|
bb2a49c89d344c9cc90a19dd4900fa9d4729321c |
24-Oct-2012 |
Earl Ou <shunhsingou@google.com> |
Handle wrong thumbnail tag type Change-Id: If41834f0aa86425a06aaede815f3e0c3cdd17fd9
allerycommon/src/com/android/gallery3d/exif/ExifParser.java
ests/src/com/android/gallery3d/exif/ExifOutputStreamTest.java
ests/src/com/android/gallery3d/exif/ExifReaderTest.java
|
79a457d330a4d889ffe0a573b1e8f4a1a6287234 |
24-Oct-2012 |
Earl Ou <shunhsingou@google.com> |
Handle wrong thumbnail tag type Change-Id: If41834f0aa86425a06aaede815f3e0c3cdd17fd9
allerycommon/src/com/android/gallery3d/exif/ExifParser.java
ests/src/com/android/gallery3d/exif/ExifOutputStreamTest.java
ests/src/com/android/gallery3d/exif/ExifReaderTest.java
|
c8ea027b1c6644002a3f29c8f899db59dc22bb7a |
24-Oct-2012 |
Earl Ou <shunhsingou@google.com> |
Handle undefined tags and ignore copyright tag in exif test Change-Id: I531518555257bdaefb79b681282c6aad07542b4b
allerycommon/src/com/android/gallery3d/exif/ExifData.java
allerycommon/src/com/android/gallery3d/exif/ExifTag.java
allerycommon/src/com/android/gallery3d/exif/Util.java
|
cd42404ea4453f0a85539890be8e73c38ed7fb69 |
24-Oct-2012 |
Earl Ou <shunhsingou@google.com> |
Handle undefined tags and ignore copyright tag in exif test Change-Id: I531518555257bdaefb79b681282c6aad07542b4b
allerycommon/src/com/android/gallery3d/exif/ExifData.java
allerycommon/src/com/android/gallery3d/exif/ExifTag.java
allerycommon/src/com/android/gallery3d/exif/Util.java
ests/src/com/android/gallery3d/exif/ExifParserTest.java
ests/src/com/android/gallery3d/exif/ExifReaderTest.java
ests/src/com/android/gallery3d/exif/Util.java
|
28a814faa876e1291c3b2d5cbc0ebb78e9df5221 |
24-Oct-2012 |
Earl Ou <shunhsingou@google.com> |
Handle undefined tags and ignore copyright tag in exif test Change-Id: I531518555257bdaefb79b681282c6aad07542b4b
allerycommon/src/com/android/gallery3d/exif/ExifData.java
allerycommon/src/com/android/gallery3d/exif/ExifTag.java
allerycommon/src/com/android/gallery3d/exif/Util.java
ests/src/com/android/gallery3d/exif/ExifParserTest.java
ests/src/com/android/gallery3d/exif/ExifReaderTest.java
ests/src/com/android/gallery3d/exif/Util.java
|
0490334cba2583a3690b8c58377394689f778ec9 |
19-Oct-2012 |
Earl Ou <shunhsingou@google.com> |
Handle invalid offset value in ExifParser Change-Id: I6d4a0edec361f8359535761d7f12ab9363ff1ad1
allerycommon/src/com/android/gallery3d/exif/ExifParser.java
allerycommon/src/com/android/gallery3d/exif/ExifReader.java
|
c188a0d5d2a8cfa4237daf4a94adce31f77151e4 |
19-Oct-2012 |
Earl Ou <shunhsingou@google.com> |
Handle invalid offset value in ExifParser Change-Id: I6d4a0edec361f8359535761d7f12ab9363ff1ad1
allerycommon/src/com/android/gallery3d/exif/ExifParser.java
allerycommon/src/com/android/gallery3d/exif/ExifReader.java
ests/src/com/android/gallery3d/exif/ExifOutputStreamTest.java
|
86ad9b7a1fa1e31cbb07d972d581386bc2b13a59 |
19-Oct-2012 |
Earl Ou <shunhsingou@google.com> |
Handle invalid offset value in ExifParser Change-Id: I6d4a0edec361f8359535761d7f12ab9363ff1ad1
allerycommon/src/com/android/gallery3d/exif/ExifParser.java
allerycommon/src/com/android/gallery3d/exif/ExifReader.java
ests/src/com/android/gallery3d/exif/ExifOutputStreamTest.java
|
39758e2cf8ef3c948a57f5afff3aa26ca11eeed6 |
07-Nov-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
24bc9e24af37b2d0564a2503e32910b8ff82b96b |
19-Oct-2012 |
Earl Ou <shunhsingou@google.com> |
ignore image with invalid thumbnail type in Exif test Change-Id: I6fc3a2dde4caf881b3b63aa95f1997ee9ccd4dbc
ests/src/com/android/gallery3d/exif/ExifReaderTest.java
|
be3c601accdbe98e4ded1b501a2c9a6e118b4fc0 |
19-Oct-2012 |
Earl Ou <shunhsingou@google.com> |
ignore image with invalid thumbnail type in Exif test Change-Id: I6fc3a2dde4caf881b3b63aa95f1997ee9ccd4dbc
ests/src/com/android/gallery3d/exif/ExifReaderTest.java
|
b7dbeb1619552baed1489d8a6417e4a40873130a |
19-Oct-2012 |
Earl Ou <shunhsingou@google.com> |
Handle tag not found in ExifParserTest Change-Id: I892336ff3f73f91f5ac45ab9868f4ecfa61051ac
ests/src/com/android/gallery3d/exif/ExifParserTest.java
|
6c89e5f7f752f6e468f880189dd3267eb96f4058 |
19-Oct-2012 |
Earl Ou <shunhsingou@google.com> |
Handle tag not found in ExifParserTest Change-Id: I892336ff3f73f91f5ac45ab9868f4ecfa61051ac
ests/src/com/android/gallery3d/exif/ExifParserTest.java
|
10b90006957aaecfeba413111d883d2937f03459 |
24-Oct-2012 |
Earl Ou <shunhsingou@google.com> |
fix OOM in exif test Change-Id: I41831e5831b2081f9b6bef6e57bd914faa41385b
ests/src/com/android/gallery3d/exif/ExifXmlDataTestCase.java
|
12c9c4c8843b308bb83ebb4c13523e00269e4a77 |
24-Oct-2012 |
Earl Ou <shunhsingou@google.com> |
fix OOM in exif test Change-Id: I41831e5831b2081f9b6bef6e57bd914faa41385b
ests/src/com/android/gallery3d/exif/ExifXmlDataTestCase.java
|
ab003a084049320807f72341fa260ae133c13c73 |
07-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am a6bb1711: am da700ab4: am 85d20a07: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches * commit 'a6bb17113d7e0cc8e3299b6838afe40f88aff41d': Import translations. DO NOT MERGE
|
c06e9eab7510549b87935b3c1179cfa6f3f78819 |
07-Nov-2012 |
Bobby Georgescu <georgescu@google.com> |
am 75bf0030: am 88571794: am 9ec5de9d: Fix scenario where launching Gallery launches Camera * commit '75bf003033dc9c0131a9669e8d7d9ebc51ec2dc8': Fix scenario where launching Gallery launches Camera
|
a6bb17113d7e0cc8e3299b6838afe40f88aff41d |
07-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am da700ab4: am 85d20a07: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches * commit 'da700ab4ded11912e96606b2a0df3199bdbeb9d5': Import translations. DO NOT MERGE
|
75bf003033dc9c0131a9669e8d7d9ebc51ec2dc8 |
07-Nov-2012 |
Bobby Georgescu <georgescu@google.com> |
am 88571794: am 9ec5de9d: Fix scenario where launching Gallery launches Camera * commit '885717944569c84527a0ac9bc8a17f7c5c1f4b76': Fix scenario where launching Gallery launches Camera
|
da700ab4ded11912e96606b2a0df3199bdbeb9d5 |
07-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am 85d20a07: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches * commit '85d20a07d6412f453e7956c105ff8f8548094186': Import translations. DO NOT MERGE
|
35ca2bf9776c0195ee64014c5afe809264568303 |
07-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am 85d20a07: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches * commit '85d20a07d6412f453e7956c105ff8f8548094186': Import translations. DO NOT MERGE
|
d139fb5f2f4cbb19b233591de5085f85283e7f71 |
07-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am 85d20a07: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches * commit '85d20a07d6412f453e7956c105ff8f8548094186': Import translations. DO NOT MERGE
|
885717944569c84527a0ac9bc8a17f7c5c1f4b76 |
07-Nov-2012 |
Bobby Georgescu <georgescu@google.com> |
am 9ec5de9d: Fix scenario where launching Gallery launches Camera * commit '9ec5de9dbf46caecd2f0b38a72d31fa37ecb0466': Fix scenario where launching Gallery launches Camera
|
1be13e45ee7a6d24cf3f3ba6bb0884328e804e51 |
07-Nov-2012 |
Bobby Georgescu <georgescu@google.com> |
am 9ec5de9d: Fix scenario where launching Gallery launches Camera * commit '9ec5de9dbf46caecd2f0b38a72d31fa37ecb0466': Fix scenario where launching Gallery launches Camera
|
5e3050e11420b0d18530442166103276be26fc9b |
07-Nov-2012 |
Bobby Georgescu <georgescu@google.com> |
am 9ec5de9d: Fix scenario where launching Gallery launches Camera * commit '9ec5de9dbf46caecd2f0b38a72d31fa37ecb0466': Fix scenario where launching Gallery launches Camera
|
62fc7db4514d983541066b58c93089839769357d |
06-Nov-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE"
|
7449dd3417c652fca4689d4db69413492abea429 |
06-Nov-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
|
85d20a07d6412f453e7956c105ff8f8548094186 |
06-Nov-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
|
d1fcb0d4a1c71d0f07d7e2be0cc7d0cfd9e6b1da |
06-Nov-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I455c7048dfbcc2e8123e5f92c61cbb4edcec4873 Auto-generated-cl: translation import
es/values-af/photoeditor_strings.xml
es/values-am/photoeditor_strings.xml
es/values-ar/photoeditor_strings.xml
es/values-be/photoeditor_strings.xml
es/values-bg/photoeditor_strings.xml
es/values-ca/photoeditor_strings.xml
es/values-cs/photoeditor_strings.xml
es/values-da/photoeditor_strings.xml
es/values-de/photoeditor_strings.xml
es/values-el/photoeditor_strings.xml
es/values-en-rGB/photoeditor_strings.xml
es/values-es-rUS/photoeditor_strings.xml
es/values-es/photoeditor_strings.xml
es/values-et/photoeditor_strings.xml
es/values-fa/photoeditor_strings.xml
es/values-fi/photoeditor_strings.xml
es/values-fr/photoeditor_strings.xml
es/values-hi/photoeditor_strings.xml
es/values-hr/photoeditor_strings.xml
es/values-hu/photoeditor_strings.xml
es/values-in/photoeditor_strings.xml
es/values-it/photoeditor_strings.xml
es/values-iw/photoeditor_strings.xml
es/values-ja/photoeditor_strings.xml
es/values-ko/photoeditor_strings.xml
es/values-lt/photoeditor_strings.xml
es/values-lv/photoeditor_strings.xml
es/values-ms/photoeditor_strings.xml
es/values-nb/photoeditor_strings.xml
es/values-nl/photoeditor_strings.xml
es/values-pl/photoeditor_strings.xml
es/values-pt-rPT/photoeditor_strings.xml
es/values-pt/photoeditor_strings.xml
es/values-ro/photoeditor_strings.xml
es/values-ru/photoeditor_strings.xml
es/values-sk/photoeditor_strings.xml
es/values-sl/photoeditor_strings.xml
es/values-sr/photoeditor_strings.xml
es/values-sv/photoeditor_strings.xml
es/values-sw/photoeditor_strings.xml
es/values-th/photoeditor_strings.xml
es/values-tl/photoeditor_strings.xml
es/values-tr/photoeditor_strings.xml
es/values-uk/photoeditor_strings.xml
es/values-vi/photoeditor_strings.xml
es/values-zh-rCN/photoeditor_strings.xml
es/values-zh-rTW/photoeditor_strings.xml
es/values-zu/photoeditor_strings.xml
|
201f39ec077dbe6248ac983614ccc8e958d6e8b0 |
06-Nov-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am a6585b7e: (-s ours) Reconcile with jb-mr1.1-release - do not merge * commit 'a6585b7e7c830a6311a7678e982f02238e7eabd4':
|
a6585b7e7c830a6311a7678e982f02238e7eabd4 |
06-Nov-2012 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with jb-mr1.1-release - do not merge Change-Id: Iafda9f08a3e708cf3ea08ffb51ba693d356c64cd
|
93e0ca50f2c0d95965eaea24c3ddf9edae66622b |
06-Nov-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am c730dbc3: (-s ours) am 091ccbe8: am 4dd6c535: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge * commit 'c730dbc3968889126a3c57744d757a9fd1e363c3':
|
c730dbc3968889126a3c57744d757a9fd1e363c3 |
06-Nov-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am 091ccbe8: am 4dd6c535: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge * commit '091ccbe8cd80c974d1eaa849028a7055c6b900e9':
|
091ccbe8cd80c974d1eaa849028a7055c6b900e9 |
06-Nov-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am 4dd6c535: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge * commit '4dd6c535cef6e9c05143cb5cf066a4c71c968da9': Do not add crop into preset if in inital setup Fix conflict with other build fix Fix build Fix SRI Pano orientation Update the assets of unlock and camera icons in filmstrip. Fix NPE due to progress bar not existing. Fix share crash after closing photo editor Set the thumbnail/screennail sizes based on screensize New UI... Upscale images to fill screen for slideshow Snap back photo after swipe in y-direction in filmstrip Fix ANR in image editor Fix crash, remove logging added to diagnose bug More logs for gallery crash error, remove a potential cause Fix Monkey NPE Grid/filmstrip switching behavior improvements Reskin: Fix stability bugs introduced by reskin Fix NPE, ANRs in Gallery Fix ANRs in Gallery
|
4dd6c535cef6e9c05143cb5cf066a4c71c968da9 |
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: Ic5ee78e018bd5706185edd8b01de3cb6bf121ed4
|
f3c0c7c52fad9dfaa65178f41b329781284dd436 |
06-Nov-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Id8286a34485dfdffe0818be4d33d57c97322d603 Auto-generated-cl: translation import
es/values-it/strings.xml
|
a9c603e9a1cd968e1fbdf73ccafbbb96449512bd |
06-Nov-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ib39956c1bb4450f46f79406ccf1cf67780c63e22 Auto-generated-cl: translation import
es/values-it/strings.xml
|
b1ae1083181e12feff088a8957a776288c9ca4cf |
06-Nov-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I2b49cdd47d86ce1fece6b32e87907a8b6158ef2d Auto-generated-cl: translation import
es/values-it/strings.xml
|
0a9d88cb4ed82e75be4b5a2a08e61c1198c52272 |
06-Nov-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I2150a9c0fa87324b32fbf8139caea8d13ab57a70 Auto-generated-cl: translation import
es/values-it/strings.xml
|
4277a11ec36aab4d38a31aad47be759802b5242b |
06-Nov-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I2150a9c0fa87324b32fbf8139caea8d13ab57a70 Auto-generated-cl: translation import
es/values-it/strings.xml
|
4c40aabf27795e57f34ae1e8ee52ce74113340fc |
06-Nov-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I8d3e81b4f27c10ad7b24ada7d7bb066f45dd29c5 Auto-generated-cl: translation import
es/values-it/strings.xml
|
134e1c9b1bec750f6be8b0137ffa32f000e9db2b |
06-Nov-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I8d3e81b4f27c10ad7b24ada7d7bb066f45dd29c5 Auto-generated-cl: translation import
es/values-it/strings.xml
|
6f02f74d88efc644d244e9611b56097bf2dcbaec |
06-Nov-2012 |
Bobby Georgescu <georgescu@google.com> |
Fix scenario where launching Gallery launches Camera Bug: 7479102 Change-Id: Ib4676a7149c659897eee1dbbb92ab09861bd0ed4
rc/com/android/gallery3d/app/PhotoPage.java
|
9ec5de9dbf46caecd2f0b38a72d31fa37ecb0466 |
06-Nov-2012 |
Bobby Georgescu <georgescu@google.com> |
Fix scenario where launching Gallery launches Camera Bug: 7479102 Change-Id: Ib4676a7149c659897eee1dbbb92ab09861bd0ed4
rc/com/android/gallery3d/app/PhotoPage.java
|
530ec559f88a6ba28ce99f09fdef796d74d7c52c |
06-Nov-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
|
2a7748a916789c289646ec33ee825276b8694424 |
06-Nov-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
e7f06d60aae32611cafa8c323da980350ab17f26 |
06-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am 5843c697: (-s ours) am c08688e0: am 78b21f3b: am 954afb2e: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev * commit '5843c6971d88c2e08c2b62a2d54f148a2801206e':
|
f68f2e829e1b287fba61daf1691240eee1944c53 |
06-Nov-2012 |
John Spurlock <jspurlock@google.com> |
am 44ae89fc: am 6b839922: am 613df30f: Fix the remaining black blip in secure camera transition. * commit '44ae89fce268a4d7bb74960a88d0ba6ae6d37ed4': Fix the remaining black blip in secure camera transition.
|
2594ca5ecd69249a4dd23cb6f3db3f1f5049a766 |
06-Nov-2012 |
Bart Sears <bsears@google.com> |
am 9d7b5dd9: am 83d895be: am 5c009849: am 70fb3773: am b41864f1: Merge "Lock icon in secure album should redirect to gallery after unlock." into gb-ub-photos-arches * commit '9d7b5dd9a1bf33db22ebe3314d219465ce816237':
|
fe776ee291fed4a7b9f82c1648b7dcc953ce4824 |
06-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am 1f52a221: (-s ours) am 6e40fd65: am 5bfc65cc: am f350beb8: (-s ours) am 3252800c: (-s ours) Import translations. DO NOT MERGE * commit '1f52a2217f2d269a92ada6fa177255ab790590b4':
|
0cd664ac63106aa6b56a884d04424171d2317c2b |
06-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am 6cde5f63: (-s ours) am 64668b53: am ca6b4f81: Import translations. DO NOT MERGE * commit '6cde5f63e8de0d1b27c2a2e09b2af29f7a842cda': Import translations. DO NOT MERGE
|
292e7c7420f2c0c74b0deedb8096b3a5d5d6a13f |
06-Nov-2012 |
George Mount <mount@google.com> |
am 829dd266: am 43caccfd: am 53e69d67: am bd52f5e7: am 25fab805: Merge "Fix extra gray item in secure album." into gb-ub-photos-arches * commit '829dd266c551ff8ef5d6b5ac594c2ca840add9ad':
|
f4963d52cf81fb7987bd2c55a3ce06e9e31c9843 |
06-Nov-2012 |
Bart Sears <bsears@google.com> |
am 0eb93385: am 1001089c: am 306ec5fd: am 77262bd5: am 40bb7158: Merge "Jump to lockscreen in secure album if tap on video" into gb-ub-photos-arches * commit '0eb93385769faba3c1e49f77b1a6b26aa757749d':
|
50aed897756101faed01cb7ab14cb3e77f55f5ae |
06-Nov-2012 |
Sascha Haeberling <haeberling@google.com> |
am 1c4036c5: am 58514882: am d1dbc515: am 452ce867: am 769d38db: Fix tiny planet not using XMP metadata anymore * commit '1c4036c58ad063d6f0d5d4cb9fa47ff0eb8933c5':
|
bb975da41e7ff152115d760491f2832ad25d0353 |
06-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am 4ef62900: (-s ours) am 6d0b2f4e: am 051b6cdd: am 8405f65e: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev * commit '4ef629000fb9b823598efdd45ab45bb57e4564c7':
|
7fcec2c0e92bbc77c187b18e514ab05743fb520d |
06-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am fe0b5b4e: (-s ours) am d6627d90: am af479cb3: am f09fa2bf: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev * commit 'fe0b5b4e8d246a26dd1516ba723810e9fa0741b4':
|
225b95b2c48c18539171e8cd2d1a317bb47a0924 |
06-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am 4a3082eb: (-s ours) am 5bfbac9f: am 990cdc38: am 692a8536: (-s ours) am 262c7bd7: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches * commit '4a3082ebd09cc93afb66567ce1dea4911acdff47':
|
63efa8c767867065650adfbfabe45c74058699e3 |
06-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am 7378ffe4: (-s ours) am df794051: am c350cd25: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev * commit '7378ffe4816c6dd0c3c0c9f7c65e04a4bcb52d70': Import translations. DO NOT MERGE
|
f054496ea2e755f9e2a7de5ff980bf57bb3a5a28 |
06-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am 441b97df: (-s ours) am 963c8007: am bfd77884: am a65e41a8: (-s ours) am 8d0392d6: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches * commit '441b97df00f203cc1ec97458c4a7b8c145a8df53':
|
0865240a020932aea1a538990578bb1d65c7f0f8 |
06-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am ae060698: (-s ours) am 215ab980: am dc304a73: Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev * commit 'ae060698bfc6a1413bf7d3312029875e856ae382': Import translations. DO NOT MERGE
|
e0ac5f56dc46c50b7b6ee1c5824385bd4dde20fd |
06-Nov-2012 |
Wu-cheng Li <wuchengli@google.com> |
am 98fec38d: am f143f5d8: am 585638c0: am 88cef187: am 471d8986: Add keyguard camera widget meta-data to gallery manifest. * commit '98fec38d2ec0510909ce5a04e8d5c5a911ab5780':
|
47978c2def234c6ed413e798c5898329f16ef78b |
06-Nov-2012 |
Mangesh Ghiware <mghiware@google.com> |
am 4312614d: am 5019393a: am 04024d64: am 0514c285: am 589381bf: Change protection level for GALLERY_PROVIDER to signatureOrSystem * commit '4312614d58cfaca67e231c0e6de40ca63194d746':
|
a37b4f84d7cc89f644883b3a73578ae951bcae34 |
06-Nov-2012 |
Tenghui Zhu <ztenghui@google.com> |
am de40420c: (-s ours) am 50d82151: am 2f09f14e: am 3245b90f: (-s ours) am 310db394: (-s ours) Merge "DO NOT MERGE: Do not set the background to null for video." into gb-ub-photos-arches * commit 'de40420c1c0d3a134a9544a2270e27a4933e5b21':
|
e0fd6013cc919310c0a38cbf0e3b7ae10ec38bc4 |
06-Nov-2012 |
Bart Sears <bsears@google.com> |
am f8981654: am df8605ba: am 368127e5: am 3ac3cdd6: am c7536cfa: Merge "Show sync error toast only when both loading and syncing are done." into gb-ub-photos-arches * commit 'f8981654575b21ee7eaf153b2078db1300fdeb72':
|
44a96243286050370a27e0cf42c23cb400e4b9b4 |
06-Nov-2012 |
George Mount <mount@google.com> |
am 664c3221: am d96fb3ee: am 59e23832: am 14a53420: am aa8228a4: Merge "Don\'t use an album for UriImages." into gb-ub-photos-arches * commit '664c322186f583555c906c67ccab9773ac859d5d':
|
88a87e02459d0386779eb3afb37db2cc84d07f63 |
06-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am ee0939a9: (-s ours) am 4eb23cf3: am ff601b23: am 1a2512cf: (-s ours) am 38c5d92c: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches * commit 'ee0939a9f17404553c1f37a9e3ec46beac8d63d4':
|
9f4cade676807ee090c90b7917126ee230dd13ff |
06-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am 4ff31443: (-s ours) am 1ed82061: am 2bd00f79: am 115299f0: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev * commit '4ff31443a10bc98331d18ce63ad11a1ba3100771':
|
54c9f0a4fd1c8a65b3502ff5426f8efc92bfca8d |
06-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am 1d343402: (-s ours) am cfaea9f2: am 06e7810c: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev * commit '1d34340229ada80370719e9bf3b9884dd50bd18d': Import translations. DO NOT MERGE
|
5843c6971d88c2e08c2b62a2d54f148a2801206e |
06-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am c08688e0: am 78b21f3b: am 954afb2e: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev * commit 'c08688e04f0af1b544d368997dad1d22a5481715':
|
44ae89fce268a4d7bb74960a88d0ba6ae6d37ed4 |
06-Nov-2012 |
John Spurlock <jspurlock@google.com> |
am 6b839922: am 613df30f: Fix the remaining black blip in secure camera transition. * commit '6b8399228a172dd755cf54dde0c69e661d0778d6': Fix the remaining black blip in secure camera transition.
|
9d7b5dd9a1bf33db22ebe3314d219465ce816237 |
06-Nov-2012 |
Bart Sears <bsears@google.com> |
am 83d895be: am 5c009849: am 70fb3773: am b41864f1: Merge "Lock icon in secure album should redirect to gallery after unlock." into gb-ub-photos-arches * commit '83d895be88ea30fe919c5a404f818db092ed853c':
|
1f52a2217f2d269a92ada6fa177255ab790590b4 |
06-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am 6e40fd65: am 5bfc65cc: am f350beb8: (-s ours) am 3252800c: (-s ours) Import translations. DO NOT MERGE * commit '6e40fd65471336323a2d80967dcb5c1357d24899':
|
6cde5f63e8de0d1b27c2a2e09b2af29f7a842cda |
06-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am 64668b53: am ca6b4f81: Import translations. DO NOT MERGE * commit '64668b53cc8cbe5c6531f00490226d95e8f0d8f1': Import translations. DO NOT MERGE
|
829dd266c551ff8ef5d6b5ac594c2ca840add9ad |
06-Nov-2012 |
George Mount <mount@google.com> |
am 43caccfd: am 53e69d67: am bd52f5e7: am 25fab805: Merge "Fix extra gray item in secure album." into gb-ub-photos-arches * commit '43caccfd56f23f2d03fb74ca684ca1ecdf24c6e8':
|
0eb93385769faba3c1e49f77b1a6b26aa757749d |
06-Nov-2012 |
Bart Sears <bsears@google.com> |
am 1001089c: am 306ec5fd: am 77262bd5: am 40bb7158: Merge "Jump to lockscreen in secure album if tap on video" into gb-ub-photos-arches * commit '1001089c65137d0f6562370052034e3b5aafb553':
|
1c4036c58ad063d6f0d5d4cb9fa47ff0eb8933c5 |
06-Nov-2012 |
Sascha Haeberling <haeberling@google.com> |
am 58514882: am d1dbc515: am 452ce867: am 769d38db: Fix tiny planet not using XMP metadata anymore * commit '58514882d35b4b7be049da9acdbe72e6134d4109':
|
4ef629000fb9b823598efdd45ab45bb57e4564c7 |
06-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am 6d0b2f4e: am 051b6cdd: am 8405f65e: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev * commit '6d0b2f4e736e369e1691ab6f2e903dc056cfdde0':
|
fe0b5b4e8d246a26dd1516ba723810e9fa0741b4 |
06-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am d6627d90: am af479cb3: am f09fa2bf: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev * commit 'd6627d9021b1480a0de8e2e1b370680eb1fe6963':
|
4a3082ebd09cc93afb66567ce1dea4911acdff47 |
06-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am 5bfbac9f: am 990cdc38: am 692a8536: (-s ours) am 262c7bd7: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches * commit '5bfbac9f362b807d2ad5a93a6535c4bade10b06f':
|
7378ffe4816c6dd0c3c0c9f7c65e04a4bcb52d70 |
06-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am df794051: am c350cd25: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev * commit 'df79405147fea614f55ef5f101a9745e68b85407': Import translations. DO NOT MERGE
|
d7686f420b3c18b87ecd96069951171400035462 |
06-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am d52ad089: am abfa44cd: am ded6d0fe: am b3e7d7d8: am dc03ae14: Reset rotation flag * commit 'd52ad08995bdfa48d42963c964951fe6f09e367f':
|
576d9daec2ad0ebb1bbf7d4c3484bbebbfb96e75 |
06-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am d42bbc89: am 61529fbc: am 2147266d: am ddc54044: am 98990049: Merge "Fix zooming position" into gb-ub-photos-arches * commit 'd42bbc8971c6e7ca471215c08fe5b31a54618bad':
|
837cc181da2856e7bce935b4c5cc43d9f6a046de |
06-Nov-2012 |
John Hoford <hoford@google.com> |
am 000ce789: am 1d4ef504: am 6f444bb4: am 031a0741: am 17540e58: Do not copy XMP data if it has TinyPlanet filter * commit '000ce78987d83d2fbe33d511fcbfde6b6bf7e0a1':
|
be0ee4532bd576db02abfc96c0b218e12d91be4d |
06-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am 57018796: (-s ours) am 73e7d153: am cbf27c96: am fbab7ba5: (-s ours) am 49af06e2: (-s ours) Import translations. DO NOT MERGE * commit '5701879609f4d7f7d05d0c92b50d9b691047f16d':
|
441b97df00f203cc1ec97458c4a7b8c145a8df53 |
06-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am 963c8007: am bfd77884: am a65e41a8: (-s ours) am 8d0392d6: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches * commit '963c800786a7826df1803b85aca3b355bafd6320':
|
abb0a64e0d39e709e6a452de3c6ff41baecd2f1b |
06-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am 4ebd694a: (-s ours) am 783e171c: am 3540bf03: am b3e89cab: (-s ours) Import translations. DO NOT MERGE * commit '4ebd694ac48590dc0d23b7dea563302a540a7ef0':
|
ae060698bfc6a1413bf7d3312029875e856ae382 |
06-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am 215ab980: am dc304a73: Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev * commit '215ab980e7f880e316cb405c6d79f5a383877217': Import translations. DO NOT MERGE
|
98fec38d2ec0510909ce5a04e8d5c5a911ab5780 |
06-Nov-2012 |
Wu-cheng Li <wuchengli@google.com> |
am f143f5d8: am 585638c0: am 88cef187: am 471d8986: Add keyguard camera widget meta-data to gallery manifest. * commit 'f143f5d86826506a72b985a6e89ed53544ed1c60':
|
b633df5963152b94d6c53e915e55316ad339e952 |
06-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am 36efb7b4: (-s ours) am bddbc50f: am 68983489: (-s ours) Import translations. DO NOT MERGE * commit '36efb7b4e6a31be467b2410f130cebfca49ed7a2': Import translations. DO NOT MERGE
|
4312614d58cfaca67e231c0e6de40ca63194d746 |
06-Nov-2012 |
Mangesh Ghiware <mghiware@google.com> |
am 5019393a: am 04024d64: am 0514c285: am 589381bf: Change protection level for GALLERY_PROVIDER to signatureOrSystem * commit '5019393a4e773080add5623aa5b0b56cee0c512e':
|
41306f9ec9c747ff2d5c6688dfff4e6c82088266 |
06-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am 91e9ae50: (-s ours) am 039e80be: am 4ecaa689: am 5ac0bdab: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev * commit '91e9ae50ece01f7489f9ca20bc5373041d46ddd0':
|
de40420c1c0d3a134a9544a2270e27a4933e5b21 |
06-Nov-2012 |
Tenghui Zhu <ztenghui@google.com> |
am 50d82151: am 2f09f14e: am 3245b90f: (-s ours) am 310db394: (-s ours) Merge "DO NOT MERGE: Do not set the background to null for video." into gb-ub-photos-arches * commit '50d8215190ced5537ef477b2721cfde053cb1848':
|
c67921a54fd115ebbf03f5592e43d8a91584e61f |
06-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am 119173c7: (-s ours) am caf70588: am ebe62dc6: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev * commit '119173c74b61bd90203060a81468499c3a89bd54': Import translations. DO NOT MERGE
|
f8981654575b21ee7eaf153b2078db1300fdeb72 |
06-Nov-2012 |
Bart Sears <bsears@google.com> |
am df8605ba: am 368127e5: am 3ac3cdd6: am c7536cfa: Merge "Show sync error toast only when both loading and syncing are done." into gb-ub-photos-arches * commit 'df8605ba6ca8a3501b141f7f41ecaabc1b3a8c2b':
|
664c322186f583555c906c67ccab9773ac859d5d |
06-Nov-2012 |
George Mount <mount@google.com> |
am d96fb3ee: am 59e23832: am 14a53420: am aa8228a4: Merge "Don\'t use an album for UriImages." into gb-ub-photos-arches * commit 'd96fb3ee6a0c993e719798b368986cb68a93ceb2':
|
ee0939a9f17404553c1f37a9e3ec46beac8d63d4 |
06-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am 4eb23cf3: am ff601b23: am 1a2512cf: (-s ours) am 38c5d92c: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches * commit '4eb23cf3f3d1a4120d717dca126d70ff15c3bde2':
|
4ff31443a10bc98331d18ce63ad11a1ba3100771 |
06-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am 1ed82061: am 2bd00f79: am 115299f0: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev * commit '1ed8206143ab7e60e5b3c92cc434562797e116fe':
|
1d34340229ada80370719e9bf3b9884dd50bd18d |
06-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am cfaea9f2: am 06e7810c: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev * commit 'cfaea9f2403614b5cd45a679f57c16d10486ffeb': Import translations. DO NOT MERGE
|
c08688e04f0af1b544d368997dad1d22a5481715 |
06-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am 78b21f3b: am 954afb2e: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev * commit '78b21f3bdbcd4f333c992df5ac009f985925addb':
|
6b8399228a172dd755cf54dde0c69e661d0778d6 |
06-Nov-2012 |
John Spurlock <jspurlock@google.com> |
am 613df30f: Fix the remaining black blip in secure camera transition. * commit '613df30fff8cea9ddfd6547769d8cac6346e11f1': Fix the remaining black blip in secure camera transition.
|
83d895be88ea30fe919c5a404f818db092ed853c |
06-Nov-2012 |
Bart Sears <bsears@google.com> |
am 5c009849: am 70fb3773: am b41864f1: Merge "Lock icon in secure album should redirect to gallery after unlock." into gb-ub-photos-arches * commit '5c009849cc632750240e8d74a2a717a4ce526518':
|
6e40fd65471336323a2d80967dcb5c1357d24899 |
06-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am 5bfc65cc: am f350beb8: (-s ours) am 3252800c: (-s ours) Import translations. DO NOT MERGE * commit '5bfc65cc617e05c5a88d4038874e25ccd4018ae9':
|
64668b53cc8cbe5c6531f00490226d95e8f0d8f1 |
06-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am ca6b4f81: Import translations. DO NOT MERGE * commit 'ca6b4f813654744d5208f71463ed4adf36159d3b': Import translations. DO NOT MERGE
|
43caccfd56f23f2d03fb74ca684ca1ecdf24c6e8 |
06-Nov-2012 |
George Mount <mount@google.com> |
am 53e69d67: am bd52f5e7: am 25fab805: Merge "Fix extra gray item in secure album." into gb-ub-photos-arches * commit '53e69d67316c8ee50429d41a79061507b8bfd89f':
|
1001089c65137d0f6562370052034e3b5aafb553 |
06-Nov-2012 |
Bart Sears <bsears@google.com> |
am 306ec5fd: am 77262bd5: am 40bb7158: Merge "Jump to lockscreen in secure album if tap on video" into gb-ub-photos-arches * commit '306ec5fdd04fe8486ba048625ab0de5bf057d65a':
|
58514882d35b4b7be049da9acdbe72e6134d4109 |
06-Nov-2012 |
Sascha Haeberling <haeberling@google.com> |
am d1dbc515: am 452ce867: am 769d38db: Fix tiny planet not using XMP metadata anymore * commit 'd1dbc5151969ecc83f94a4a7dfbd79629f1870d0':
|
6d0b2f4e736e369e1691ab6f2e903dc056cfdde0 |
06-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am 051b6cdd: am 8405f65e: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev * commit '051b6cdd8faf7985490c4682af8c81bc316cfaa3':
|
d6627d9021b1480a0de8e2e1b370680eb1fe6963 |
06-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am af479cb3: am f09fa2bf: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev * commit 'af479cb3b6ca11e846e5d7e19f546776fb7a08cc':
|
5bfbac9f362b807d2ad5a93a6535c4bade10b06f |
06-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am 990cdc38: am 692a8536: (-s ours) am 262c7bd7: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches * commit '990cdc3814c7144420feff769434185e0a323f65':
|
df79405147fea614f55ef5f101a9745e68b85407 |
06-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am c350cd25: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev * commit 'c350cd25ffefdb923f57496df45c47dda628e70e': Import translations. DO NOT MERGE
|
e563ad4d814055df8518c97a16179a0e49d512bc |
06-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am 99190c78: (-s ours) am 16f8aa84: am fc8e6db7: am 10f64ff1: (-s ours) am 798ec54d: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches * commit '99190c78fa45ad42de2d0d2604bda94ab09565eb':
|
5c8f32f0e07c0583a52bbdbfb17f6eef6c7846f4 |
06-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am 2d4bdb52: (-s ours) am 82d5861e: am f2f31a63: am 8275abe7: (-s ours) am 5583758a: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches * commit '2d4bdb522769183b606d688b975555a52eb44140':
|
525f9783fbb5a5f1e257c439a6871580bfe1018f |
06-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am 2ede7f35: (-s ours) am ed035ad1: am adfcb006: am 1cf344e2: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev * commit '2ede7f35a5452deb5e2b9689c3e48313cfcece9b':
|
97ea4fd5a5102c46bf63a9e4f93628d4406703d7 |
06-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am e6405a05: (-s ours) am 1dbf0ed9: am 6d9d8e3d: Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev * commit 'e6405a0591de86807da2d6b3140abc67f839a773': Import translations. DO NOT MERGE
|
cb85b7fa10f9a73d6f869eec13dd8f21b5552b56 |
06-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am 96347d0f: am 10d9ad75: am c2931f8e: am 33d33c7e: am 2d2b69b0: Fix rounding issue affecting TinyPlanet * commit '96347d0fb655d53b7ba9002e4da7a67825cce869':
|
6aed0d5f5795bee4c4ef571f771064bcfa2579d6 |
06-Nov-2012 |
Nicolas Roard <nicolasroard@google.com> |
am 3a1d144e: am ef70f937: am 92503c9e: am 90af32fb: am a0fe81ad: Merge "Changed rotated display parameter increments to 90." into gb-ub-photos-arches * commit '3a1d144ec03d3ae2bf43a5e2883de01788405d97':
|
c8d16f7987d4f568a748f2b6640191f61499bf30 |
06-Nov-2012 |
Nicolas Roard <nicolasroard@google.com> |
am 747ba385: am 538d47a8: am e5ac5d03: am d2a1f33f: am 26cfff70: Merge "change thumbnail and reset behaviour" into gb-ub-photos-arches * commit '747ba385b81c0d9cbf55c6976f85a68a116163be':
|
3567866951b195deb76387394861d18d9ec550fd |
06-Nov-2012 |
Doris Liu <tianliu@google.com> |
am 2601ba4e: am 6ffd2096: am 4fc2db3c: am f245d2b7: am 591974bc: Merge "Show panoViewer icon after "Back" from viewer" into gb-ub-photos-arches * commit '2601ba4e2b951e450b82272f8001724a77facb12':
|
023bca5857f2d26e942f4fd7ef25ecda40e07e0d |
06-Nov-2012 |
George Mount <mount@google.com> |
am 9b670c72: am 9041daac: am 9f039e39: am 6027d763: am b6d49492: Remove black borders in Manta LightCycle capture after orientation change. * commit '9b670c7273823796a6ed88201bd09e4591b37652':
|
d7986ccdbaf46a3d433dcc19dcf794f5bd4596b1 |
06-Nov-2012 |
Bobby Georgescu <georgescu@google.com> |
am 89353d20: am 01b92c5f: am f1a99b9f: am 2c8a2468: am 88870365: Merge "Fix the black lines near edge of thumbnails" into gb-ub-photos-arches * commit '89353d20c286647a7858f0b583a0d8a94d50656a':
|
aa6cbaa6139ca518165f4fd417e3a60370e7fcf2 |
06-Nov-2012 |
John Reck <jreck@google.com> |
am 60894b84: am 8bab921b: am f1d6566a: am 38e64b25: am 10f975a6: Merge "Add proxy launcher" into gb-ub-photos-arches * commit '60894b844aa5d71abc48844bc2bc8c109d7ec5b3':
|
365f30d2282bd5436675112bd9125d0e7f4e7013 |
06-Nov-2012 |
Bobby Georgescu <georgescu@google.com> |
am cd87f4ec: am 49f0a0a9: am ef9cf18c: am d58b942a: am 798f4a91: Merge "Hold WakeLock for batch delete operation" into gb-ub-photos-arches * commit 'cd87f4ec842503547156730c7d6c928958baae45':
|
9a21824d0678157328c709a9359279703d89f76f |
06-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am c861a822: am 46d65dc0: am 149b5167: am 8fe5c754: am 8d8cdf7f: Fix colors in rotate and mirror * commit 'c861a8222485b03521fcdc26f13f672d8d19c2d0':
|
fa843865f0d75d62e100fb7032939c75fea25e2c |
06-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am b2de0d70: am 891ff2db: am c11b4c85: am 7dcaeec6: am 8b3ce9b0: Merge "Fix crash when showing history" into gb-ub-photos-arches * commit 'b2de0d70c46a07ff7f506374646b6aaf3316f310':
|
4de63c8a64f2457196f83f30f8e9aead7b73aa1f |
06-Nov-2012 |
Hung-ying Tyan <tyanh@google.com> |
am 0c213fd3: am e31b12f1: am aad5aa69: am 45dfd43e: am 635aab56: Merge "Fix tiling effect when open a photo." into gb-ub-photos-arches * commit '0c213fd3ddc2ed0f6b016877fcc4c1fadc418181':
|
9dd755c8b8625bacd174064567fe22d191b69dca |
06-Nov-2012 |
Nicolas Roard <nicolasroard@google.com> |
am a5de519f: am 86d47b9a: am 69664062: am 78497220: am 24f28850: Merge "Do not add crop into preset if in inital setup" into gb-ub-photos-arches * commit 'a5de519f32fb3e4ccd057218bb89a36bbbfe85c7':
|
48a0ffe2cf95883384caf4703fa5d356894b784c |
06-Nov-2012 |
John Reck <jreck@google.com> |
am 5580d9fa: am f065bbbc: am 62b46051: am c62b066a: am 6106c833: Merge "Add loading spinner" into gb-ub-photos-arches * commit '5580d9fac531c6224905e2bc8165fd0eff68d01c':
|
0b79eb6dd9a1506f34eb6b76b279ae43f47a68ad |
06-Nov-2012 |
Mangesh Ghiware <mghiware@google.com> |
am 2d594ca7: am 874d36e4: am 485797d7: am dd7139ba: am 5388677d: Merge "Handle 360 panorama specific MIME type." into gb-ub-photos-arches * commit '2d594ca71ad00458ccfa24ed24a4a1ea6863314b':
|
13ba57e56af46e12205a69aae1edfb11e3421963 |
06-Nov-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am 34b83236: am a1f8faeb: am 348b64a0: am bdd21912: am 4164fabf: Merge "Fix issue where aspect bounds don\'t get applied." into gb-ub-photos-arches * commit '34b83236102f503f826c87f520aa299a4fdb71e2':
|
babee1fbc4af2fede555021dbcb4daa5276bbcb8 |
06-Nov-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am c372f073: am 2f5fceb7: am eee46d78: am 812d65bd: am d72971e6: Merge "Fixed crop intent." into gb-ub-photos-arches * commit 'c372f073623a3bf6ce8e81e04a056aca625db712':
|
649960815b211c9807f84f699ff70642bca64e9d |
06-Nov-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am 7240851a: am 28f3fb0f: am dc87b334: am 1ff4d0fd: am 15aff7c3: Merge "Tagged strings in XML with translation info." into gb-ub-photos-arches * commit '7240851ab5359ea8d6a877e7550ae71911766e8d':
|
b72a17eadc06ecaacd3c80514fa9ea591576548d |
06-Nov-2012 |
Michael Jurka <mikejurka@google.com> |
am 3d64be40: am f96ce7f1: am b83e3632: am f38cb998: Fix conflict with other build fix * commit '3d64be40f66ba60bf51bbd0aee2826f075d4fe04':
|
2f6dddaa33c40793de8c6355f868b0a491af2a4d |
06-Nov-2012 |
Bobby Georgescu <georgescu@google.com> |
am b92c58c4: am 4554d9f5: am 8ee82082: am d43a8f94: am 6cfd3b8d: Merge "Get rid of black lines near edge of thumbnails" into gb-ub-photos-arches * commit 'b92c58c47b5d47d75356b68194bd2317b04b6541':
|
c72ae2c94caed33ef8134c30b54b959c43a298ed |
06-Nov-2012 |
Michael Jurka <mikejurka@google.com> |
am d50f0660: am 645a8682: am 559d76f9: am a31708cf: am 0c7e8aac: Merge "Fix build." into gb-ub-photos-arches * commit 'd50f0660fde441344fe4477f92655ff8b792f86e':
|
abb56263449a525616b7eecf79023450d396afb2 |
06-Nov-2012 |
Michael Jurka <mikejurka@google.com> |
am 4337e14e: am 12aa029d: am 1c4fafe9: am 17c550d3: Merge "Fix build" into jb-mr1-dev * commit '4337e14e56db00c0454c32a9551d479bb7836888':
|
a7b4892c016296e7e62f1070b3f522268f627a83 |
06-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am 35a20e5e: am 56edac84: am 9f4d5f1b: am a36cc0eb: am 8bc296e2: Fix crash when starting filtereditor * commit '35a20e5e8bd7bd083e674ac4b4652e19f7e4819e':
|
f170c0fca293486daa0621d6aeafbff5a4c2837e |
06-Nov-2012 |
Angus Kong <shkong@google.com> |
am dfc81934: am 659fd380: am 9b12b990: am c6b77275: am 71c17775: Force renderring request for Camera Animation. * commit 'dfc819349d80f7e3470508a1f8242eeadf511cf6':
|
0373db3980e806e285ddc4ac8ffb6c0bc876d73e |
06-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am 1d092cb3: am 3f622aae: am 9ed11664: am dff8cf82: am dffe6a6f: Fix default for tiny planet * commit '1d092cb3bdb9976ea4e8c03898acb0b07d8d10fd':
|
8873e4f75abc2ec76e72a1c5c68e704f14548ca4 |
06-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am 0d1c386a: am 11d32976: am e3642a33: am 73a2ad06: am e7a71372: Fix update view * commit '0d1c386aa3b46cc878587515436a6fad15fe2b30':
|
fe3e1adfad0f4357cbf0df5de50232f7d935acfb |
06-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am e439e8cd: am ef6d3c66: am d491af09: am d4c93190: am ea3c51ff: Merge "Remove the old photo editor" into gb-ub-photos-arches * commit 'e439e8cdd005aea361e5b2077fc0f60475ee6a96':
|
6a5bd80803c2c8fdad525749a71293fe96303998 |
06-Nov-2012 |
Sascha Haeberling <haeberling@google.com> |
am 37a623ce: am f7b7880d: am fb494479: am 2df8a18a: am b13e1788: Merge "Fixes TinyPlanet crashed due to too excessive memory usage." into gb-ub-photos-arches * commit '37a623ce5444309ebc0e9b33b28c39c97d30e7be':
|
c332f95ac7bcc4fd0e043e7e3e818f97c86ca35d |
06-Nov-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am 8487a981: am ebcccd9f: am a9bc6deb: am e1de865c: am 4a601448: Merge "Fixed blackscreen when launching crop from menu." into gb-ub-photos-arches * commit '8487a981e63c769e8dea83bd70555be09010ac60':
|
ed56ff4bb8c0cbdfd556e2183ddb14e907644974 |
06-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am fc7014b4: am 73331693: am c6b4ecf6: am dd12e5b5: am 2c6ea941: Add rotation to tinyplanet view * commit 'fc7014b4cc4e5d8ffcc045a8d8eb4f65ef755395':
|
926540ec3fd62ecca10c9d34c81704dad9a36af0 |
06-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am b6d472d0: am 61124cb3: am e8df5a6d: am 6bedee87: am 7592704e: Fixes UI stuff * commit 'b6d472d081e5d3e3a6dc84e732b0f91256642a32':
|
8ecea66d8ca36cdfd51cfea010f515642f512ac8 |
06-Nov-2012 |
Teng-Hui Zhu <ztenghui@google.com> |
am 61a0b247: am 001cef5c: am 0a82481b: am 5122c99a: am ecbdca3d: Merge "Initialize the modified date correctly." into gb-ub-photos-arches * commit '61a0b24722189927b8788136a3a0ef65ce53f804':
|
a4a153e7d8beb9fe787dca4c370a97000b507fe1 |
06-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am 592a13f8: am 4fe1c262: am a19301bb: am 6cea6759: am 0a23b42e: Change background and panel colors * commit '592a13f809b5bd21f2419e5d89e6614f18974734':
|
963c800786a7826df1803b85aca3b355bafd6320 |
06-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am bfd77884: am a65e41a8: (-s ours) am 8d0392d6: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches * commit 'bfd77884974cbd1a29028156d9af9b67e6359696':
|
fcc40ffe9c9eeba599c120adf0d95845a32e51e5 |
06-Nov-2012 |
Bobby Georgescu <georgescu@google.com> |
am 7c3db8d2: am ab923576: am f254567f: am baffd018: am 86282c88: Merge "Fix attempted uploading of recycled tiles" into gb-ub-photos-arches * commit '7c3db8d2be57ead88eb52d50ec64d8f845e28417':
|
215ab980e7f880e316cb405c6d79f5a383877217 |
06-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am dc304a73: Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev * commit 'dc304a73d63f26828fefee941a59ccf12a7802b0': Import translations. DO NOT MERGE
|
f66a82c940e724368e5baf6025e0c5c7fba5d2db |
06-Nov-2012 |
John Reck <jreck@google.com> |
am 1be2de88: am 46aff56a: am d2173fc8: am 1376c4dc: am d49d5320: Move loadBitmap to async task * commit '1be2de88bc9ed184e68ae298b08e475cff8007cd':
|
f143f5d86826506a72b985a6e89ed53544ed1c60 |
06-Nov-2012 |
Wu-cheng Li <wuchengli@google.com> |
am 585638c0: am 88cef187: am 471d8986: Add keyguard camera widget meta-data to gallery manifest. * commit '585638c08b9bb8c0a89dca412252e07b45b193d8':
|
89cd8241af6a9f767c3a3c75fe128269915367a8 |
06-Nov-2012 |
Bobby Georgescu <georgescu@google.com> |
am cf186ed9: am 90e04d85: am a8227bbe: am f77721af: am 5bd00332: Launch built-in camera app via filmstrip * commit 'cf186ed9d2bbb1a995708fe60c0bfba43ce91056':
|
5019393a4e773080add5623aa5b0b56cee0c512e |
06-Nov-2012 |
Mangesh Ghiware <mghiware@google.com> |
am 04024d64: am 0514c285: am 589381bf: Change protection level for GALLERY_PROVIDER to signatureOrSystem * commit '04024d6477cbbb60f3dabbcef34aada84672fb94':
|
50d8215190ced5537ef477b2721cfde053cb1848 |
06-Nov-2012 |
Tenghui Zhu <ztenghui@google.com> |
am 2f09f14e: am 3245b90f: (-s ours) am 310db394: (-s ours) Merge "DO NOT MERGE: Do not set the background to null for video." into gb-ub-photos-arches * commit '2f09f14ea0b9314fe3ad69a54866ddfa383c8c82':
|
4d2ee6ff0edf6855bf5c8805f0a0883b83528db6 |
06-Nov-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am ed621e41: am 0cb37459: am 0b549f61: am cc33fd6d: am eb6a24e1: Took out aspect ratio switching. * commit 'ed621e41bdee50673aad5a4456f73b7e2eec9e81':
|
6ceed32bcf29755bd4e9b9034113df37ba50976e |
06-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am 1be90a1e: am 34457449: am fbe416ad: am 2281b682: am ca05711f: Merge "Save the image when applying tiny planet" into gb-ub-photos-arches * commit '1be90a1e03b19a14a57cf243fe4c821bae1c60fc':
|
df8605ba6ca8a3501b141f7f41ecaabc1b3a8c2b |
06-Nov-2012 |
Bart Sears <bsears@google.com> |
am 368127e5: am 3ac3cdd6: am c7536cfa: Merge "Show sync error toast only when both loading and syncing are done." into gb-ub-photos-arches * commit '368127e5815811ffdc9181ca9ba4114c5b27a412':
|
8c156b8eaf662a8e9eb8bae4ccf9f0c161071d10 |
06-Nov-2012 |
John Hoford <hoford@google.com> |
am abb36742: am 27fd152d: am 9da23648: am 0b8c1459: am de00ad0d: Merge "limited the size of textures to 2048" into gb-ub-photos-arches * commit 'abb367429a626dfe11ccd64c77451dce357a780b':
|
d96fb3ee6a0c993e719798b368986cb68a93ceb2 |
06-Nov-2012 |
George Mount <mount@google.com> |
am 59e23832: am 14a53420: am aa8228a4: Merge "Don\'t use an album for UriImages." into gb-ub-photos-arches * commit '59e23832fc445d98d2843e5fcef378c8a20a6e71':
|
f9ee13e46e4d60a7bf2fc43aad052074e7a5c58c |
06-Nov-2012 |
Bobby Georgescu <georgescu@google.com> |
am 3bc158f1: am c054647b: am 624ad6d0: am a0d84367: am a1d04a4a: Merge "Do not show bottom controls when undo bar is visible" into gb-ub-photos-arches * commit '3bc158f1a2e7dd9b3a111e0df524a7ee34003bfc':
|
4eb23cf3f3d1a4120d717dca126d70ff15c3bde2 |
06-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am ff601b23: am 1a2512cf: (-s ours) am 38c5d92c: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches * commit 'ff601b2348e0740ab794a1c92f43c5d3219bd87f':
|
1ed8206143ab7e60e5b3c92cc434562797e116fe |
06-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am 2bd00f79: am 115299f0: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev * commit '2bd00f793ffe9d20ec117515812cc4e534a5d876':
|
610e8dcee184b4ee868bb41b9cde7b2c4bb778f7 |
06-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am fbd46ca3: (-s ours) am 686dea53: am 5b41962e: am b48c872e: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev * commit 'fbd46ca32d0f36cf25eeb0cf87642041542ffd7d':
|
cfaea9f2403614b5cd45a679f57c16d10486ffeb |
06-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am 06e7810c: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev * commit '06e7810cb3467ef99623826d662d18cc5ae64330': Import translations. DO NOT MERGE
|
a585fc8a45ff589cf8323646fd5d99a4ff64ee9d |
06-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am d12b1e29: (-s ours) am a6b039ac: am 5c9c8ac3: am 5116f2fd: (-s ours) am a4e538e0: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches * commit 'd12b1e2919b9d564890f5337723b5574f0536285':
|
503bb2fb4a4258bc84fe0f32899c68e989bd7dc0 |
06-Nov-2012 |
Bobby Georgescu <georgescu@google.com> |
am f78bf988: am 5da1c942: am 03470f4c: am 51881e02: am f4a73264: Merge "Do not show Camera placeholder when not appropriate" into gb-ub-photos-arches * commit 'f78bf988f98b8baefa8cfe6e96089349b3f07a62':
|
75450109a4d1cc829e59034403813b909da06749 |
06-Nov-2012 |
Owen Lin <owenlin@google.com> |
am 42151616: am 8be75158: am 2fc6e3a5: am f3958f87: am adee31f0: Use TiledTexture for thumbnails. * commit '4215161656a4756187da2a77d6da94e79e6d4a62':
|
427ea218525a688ee683341a4e838663cbb40c5f |
06-Nov-2012 |
Sascha Haeberling <haeberling@google.com> |
am 7024266d: am 0a0667cc: am a03998c9: am b682706f: am c60752b2: Use XMP meta-data for correct tiny planets. * commit '7024266d7c660227b7b33be5086978e512aa8c31':
|
d409f48e6856dfd26df0e1606dbe41852e2555b2 |
06-Nov-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am df3931fe: am 68ba0176: am b004a6f9: am 1d866031: am eb75699b: Fixed scaling factor for ImageShow and rotations. * commit 'df3931fe6ffdfb5c7f7a5768715b6b22880c9049':
|
d851493c404ee34737325355dae46a67f55454f7 |
06-Nov-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am 4ea794c8: am cf083183: am f60139ce: am 5a093c66: am 3fb20078: Merge "Fix so mirror gets applied." into gb-ub-photos-arches * commit '4ea794c861579b9b88730cda0fe72a8b006e4fe0':
|
d52ad08995bdfa48d42963c964951fe6f09e367f |
06-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am abfa44cd: am ded6d0fe: am b3e7d7d8: am dc03ae14: Reset rotation flag * commit 'abfa44cd01ef313368d86261462d9cf7de4deb7f':
|
9d520a8b29ba8aef721281debadc022dd6ecca91 |
06-Nov-2012 |
Nicolas Roard <nicolasroard@google.com> |
am 2f5e8817: am 0dc0943f: am c0c5c138: am 842257ca: am d3aebee7: Merge "Support XMP data, fixed read file on another thread" into gb-ub-photos-arches * commit '2f5e8817d175446f91d268cf6acfe86256539db5':
|
d42bbc8971c6e7ca471215c08fe5b31a54618bad |
06-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am 61529fbc: am 2147266d: am ddc54044: am 98990049: Merge "Fix zooming position" into gb-ub-photos-arches * commit '61529fbca43ab4be49c26a94c08e1f51813c675d':
|
49d4f064c0bb72c9108a190429b4b06621e361a8 |
06-Nov-2012 |
Doris Liu <tianliu@google.com> |
am ab84feb2: am 68f5000e: am c3d2b085: am 413c7109: am 5d3e6653: Merge "Stay in AlbumPage when dismissing a popup from AP" into gb-ub-photos-arches * commit 'ab84feb2aecb7c2707f1ce76da46899e46b3986f':
|
000ce78987d83d2fbe33d511fcbfde6b6bf7e0a1 |
06-Nov-2012 |
John Hoford <hoford@google.com> |
am 1d4ef504: am 6f444bb4: am 031a0741: am 17540e58: Do not copy XMP data if it has TinyPlanet filter * commit '1d4ef5045715e07bb34c8c94c00cc783502e3cb8':
|
c958fa4f386ba2212f4f7c9f02abe66a0a4df859 |
06-Nov-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am 200e37fd: am 307eecfc: am d8ddd8d8: am c3a48597: am f46da69a: Increased touch tolerance in cropping. * commit '200e37fd4664c61d04578a98104a29e5b33dd8b1':
|
5701879609f4d7f7d05d0c92b50d9b691047f16d |
06-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am 73e7d153: am cbf27c96: am fbab7ba5: (-s ours) am 49af06e2: (-s ours) Import translations. DO NOT MERGE * commit '73e7d153fb290122652062ea221a17e9a7e05712':
|
242c4aba30be7f7ce9f265a8c03b5b0010a8b7aa |
06-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am b8965012: (-s ours) am 96ea647f: am e1036a50: Import translations. DO NOT MERGE * commit 'b8965012700de2dfb3ddf4982f33ee9a22f8bcd1': Import translations. DO NOT MERGE
|
4ebd694ac48590dc0d23b7dea563302a540a7ef0 |
06-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am 783e171c: am 3540bf03: am b3e89cab: (-s ours) Import translations. DO NOT MERGE * commit '783e171c00f6dad5fad2c73489d1716ecde690cd':
|
4c10f3c58706ac35b69d1938e76467f6af508339 |
06-Nov-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am 1f52b30b: am 92ea0a90: am 2fe28fc3: am bdfccda8: am a4122499: Reworked crop/transform UI. * commit '1f52b30b5a006625caff7a35f0d05680ae170bf5':
|
36efb7b4e6a31be467b2410f130cebfca49ed7a2 |
06-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am bddbc50f: am 68983489: (-s ours) Import translations. DO NOT MERGE * commit 'bddbc50ff2494a7b6e3663a834ab2efbe22fa263': Import translations. DO NOT MERGE
|
9ac169c752334fa277b433fbb0bfb25ebdda6e24 |
06-Nov-2012 |
John Hoford <hoford@google.com> |
am 5534e7b9: am 56311a81: am ea4097c9: am 4b2c4ecb: am 67fefdb9: add support for black and white filters, add rotation API to tiny planet * commit '5534e7b90aa3d5c397aabbdbe9c4e400fd06680d':
|
e36a6c989d9aaec47b7fceaee7eb452b19ee1c8d |
06-Nov-2012 |
Bobby Georgescu <georgescu@google.com> |
am 262cea15: am d79cd799: am beda88a7: am c67bc34b: am a850a543: Fix jank when launching editor from Camera filmstrip * commit '262cea15333bb407c30cbf56c2182cbcc932b4a2':
|
071f0841e63e94bae34f1ccf9fcd160e94ec06e9 |
06-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am 8c3f8d73: am 1ce091fb: am 7c30dc01: am f22aa1a2: am 41a3a3be: Fix slider layout * commit '8c3f8d739aaa71da2940cea6e1ca05e0e2ed6709':
|
626b65f4ac62b4d5eda9f808345d3816ac4880db |
06-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am 58e93517: am aeff41bd: am 808a5869: am a482d850: am cb993ff1: Merge "Express the borders size in percentages" into gb-ub-photos-arches * commit '58e93517ddbb04b57b7150c2ffd3192e3de84ab3':
|
61562fe97eabdda5acba873fac1ef1680360e3ac |
06-Nov-2012 |
John Reck <jreck@google.com> |
am 25df492e: am e3e394a4: am 590acf86: am 94fa0565: am d6453edc: Merge "Fix NPE" into gb-ub-photos-arches * commit '25df492e4f885f6f398deeb735df1229208f0a52':
|
d93e75a77442a47ff3ab8efa0ac3e5085797e5fe |
06-Nov-2012 |
George Mount <mount@google.com> |
am 4d6c4c61: am b4bbd952: am 0827ebf0: am 71647c7a: am 7d7f91e1: Merge "Fix NPE in detecting panoramas." into gb-ub-photos-arches * commit '4d6c4c61237901c0ebb57cef1b2761107fb23b67':
|
8e0b217f8c5a6acc52dc972d0d1220b8d7d79f58 |
06-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am dcfb900a: am a41df7c2: am 30fd4b42: am bd4ea013: am ea636029: Merge "Hide the history panel on rotation" into gb-ub-photos-arches * commit 'dcfb900ad1e248b9774698798f0a5a907cff8a08':
|
39a8c12f58ec50641027c5c0d178e1272dfece29 |
06-Nov-2012 |
Sascha Haeberling <haeberling@google.com> |
am 3a493702: am 80fd6f77: am 22fae182: am 25d08e2b: am a681f36f: Merge "Make sure we use xmp_toolkit from external instead of the precompiled JAR." into gb-ub-photos-arches * commit '3a493702fa0df517b1ee5f9f66672fe5a3b50d01':
|
2fa40c84510bb138893b8f9ee48d74cb9602274e |
06-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am a7fe97bf: am d6bb72ec: am 05757033: am bc9d4ccc: am 5d7e98f7: Fix another potential crash in Curves * commit 'a7fe97bf11a17126f9ce113959b1009f572b4bf4':
|
d3a0fa6047173b02ef54f9cb13fef4157dfe0bcb |
06-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am f1644cf6: am cac3cd19: am 4626ebd1: am 0b44017c: am 361f6234: Merge "Fix flickering in geometry panel" into gb-ub-photos-arches * commit 'f1644cf629c86dfc8b5cc92793fcc71d9ece1084':
|
ee2d568e1d3d032205b965630947b2e60dc5df38 |
06-Nov-2012 |
Bobby Georgescu <georgescu@google.com> |
am 615b7db5: am e7e7059b: am 75a448eb: am f30096b4: am c162c8b7: Merge "Show Panorama viewer button in filmstrip mode" into gb-ub-photos-arches * commit '615b7db57d811c05562e15837fe2ea902b32c10e':
|
a53ac22799d1636c429467a421bb5209d440eada |
06-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am a9d22064: am 1c196316: am b8f4ea38: am e5a3ff76: am a9f280f9: Add copyright notices * commit 'a9d2206470d3202e5a376baf47a4fef69fc2e7b1':
|
1894b9a6195a1a1baf951f4dc298a412c9d58d26 |
06-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am b121e1a7: am a357260f: am c54c7839: am cdaa77d2: am ec995b6b: Fix slow / jerky tracking in Curves * commit 'b121e1a7020b54a2379f0e4f173096f686d96e1e':
|
514e509988aad5a6770f181a9f765de9f747e715 |
06-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am 80f880b8: am 0888dd02: am cd35c2fc: am 488547b0: am 2569df23: Merge "Shows filtered images in geometry modules and comparison." into gb-ub-photos-arches * commit '80f880b89bbb60f51b28f8dd4904221439b5d84f':
|
95fd2d6aba613aacafee4e15152ead8a227eab9e |
06-Nov-2012 |
George Mount <mount@google.com> |
am 783729fd: am 79a50cad: am b2fb154f: am 3bfbae1d: am 24af89b9: Merge "Ensure photo sphere icon shows for panoramas." into gb-ub-photos-arches * commit '783729fd7cc3183a206a9fc2bda7d307be4978ec':
|
9304dd17be3599434ce9dde2e29564af11935a84 |
06-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am a34b0472: (-s ours) am 4a831f74: am 0f40db8d: am 306176fb: (-s ours) am 7c08064b: (-s ours) Import translations. DO NOT MERGE * commit 'a34b0472158de0fa4108b2badb9a99c3e1fe0108':
|
9b1315d4793c31bcbb0ced8d9866de5efb313907 |
06-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am 1cef81ac: (-s ours) am d5017721: am e6319953: am caace51d: (-s ours) Import translations. DO NOT MERGE * commit '1cef81acf93c6ac3c43f8bbac45ab7048ff4c878':
|
01f065c40ab5650c797ec6bdbb79711b6de369f0 |
06-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am 263a27b9: (-s ours) am c1f46437: am 69cec707: (-s ours) Import translations. DO NOT MERGE * commit '263a27b9d6e4cd51c69de523c85d7051ff5fcf9e': Import translations. DO NOT MERGE
|
91e9ae50ece01f7489f9ca20bc5373041d46ddd0 |
06-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am 039e80be: am 4ecaa689: am 5ac0bdab: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev * commit '039e80be8d5c7fabfd8e168d5e86ce83b33fb916':
|
119173c74b61bd90203060a81468499c3a89bd54 |
06-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am caf70588: am ebe62dc6: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev * commit 'caf70588f7a97aaad805b008f91c750fe59b45b5': Import translations. DO NOT MERGE
|
abfa44cd01ef313368d86261462d9cf7de4deb7f |
06-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am ded6d0fe: am b3e7d7d8: am dc03ae14: Reset rotation flag * commit 'ded6d0fe3d87b64f30de5add511bfd24a7d0382d':
|
61529fbca43ab4be49c26a94c08e1f51813c675d |
06-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am 2147266d: am ddc54044: am 98990049: Merge "Fix zooming position" into gb-ub-photos-arches * commit '2147266dc65bd95d5603c53fe23e77e136fa68f4':
|
1d4ef5045715e07bb34c8c94c00cc783502e3cb8 |
06-Nov-2012 |
John Hoford <hoford@google.com> |
am 6f444bb4: am 031a0741: am 17540e58: Do not copy XMP data if it has TinyPlanet filter * commit '6f444bb46565e5f3142c16c2a3f7ebcdcafd90cd':
|
73e7d153fb290122652062ea221a17e9a7e05712 |
06-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am cbf27c96: am fbab7ba5: (-s ours) am 49af06e2: (-s ours) Import translations. DO NOT MERGE * commit 'cbf27c9661d34b9f334af225bee356f29ad4aa17':
|
783e171c00f6dad5fad2c73489d1716ecde690cd |
06-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am 3540bf03: am b3e89cab: (-s ours) Import translations. DO NOT MERGE * commit '3540bf03ffea7b52fe43c9029e3a07f0b3cd09a2':
|
bddbc50ff2494a7b6e3663a834ab2efbe22fa263 |
06-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am 68983489: (-s ours) Import translations. DO NOT MERGE * commit '68983489dbd8310e25339b1a7988c6ba167a3795': Import translations. DO NOT MERGE
|
99190c78fa45ad42de2d0d2604bda94ab09565eb |
06-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am 16f8aa84: am fc8e6db7: am 10f64ff1: (-s ours) am 798ec54d: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches * commit '16f8aa849ac14a2bde2f3d06deaa4db7bd368108':
|
2d4bdb522769183b606d688b975555a52eb44140 |
06-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am 82d5861e: am f2f31a63: am 8275abe7: (-s ours) am 5583758a: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches * commit '82d5861ef0874fdc02c5c151b67a96620e02b00f':
|
2ede7f35a5452deb5e2b9689c3e48313cfcece9b |
06-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am ed035ad1: am adfcb006: am 1cf344e2: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev * commit 'ed035ad14569dd55234026f816e61089a077b0c5':
|
e6405a0591de86807da2d6b3140abc67f839a773 |
06-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am 1dbf0ed9: am 6d9d8e3d: Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev * commit '1dbf0ed94c0355b6abdde6556f4bdcca317220e4': Import translations. DO NOT MERGE
|
96347d0fb655d53b7ba9002e4da7a67825cce869 |
06-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am 10d9ad75: am c2931f8e: am 33d33c7e: am 2d2b69b0: Fix rounding issue affecting TinyPlanet * commit '10d9ad75ea171d3877dd769fc548faa8d4297e36':
|
3a1d144ec03d3ae2bf43a5e2883de01788405d97 |
06-Nov-2012 |
Nicolas Roard <nicolasroard@google.com> |
am ef70f937: am 92503c9e: am 90af32fb: am a0fe81ad: Merge "Changed rotated display parameter increments to 90." into gb-ub-photos-arches * commit 'ef70f93739398cef2d2b9975f15314351e079c75':
|
747ba385b81c0d9cbf55c6976f85a68a116163be |
06-Nov-2012 |
Nicolas Roard <nicolasroard@google.com> |
am 538d47a8: am e5ac5d03: am d2a1f33f: am 26cfff70: Merge "change thumbnail and reset behaviour" into gb-ub-photos-arches * commit '538d47a8229adf6ccf3ab970fbc0905093d7532f':
|
2601ba4e2b951e450b82272f8001724a77facb12 |
06-Nov-2012 |
Doris Liu <tianliu@google.com> |
am 6ffd2096: am 4fc2db3c: am f245d2b7: am 591974bc: Merge "Show panoViewer icon after "Back" from viewer" into gb-ub-photos-arches * commit '6ffd20961377a3fe7387e44ca8e590fc8f9c23b2':
|
9b670c7273823796a6ed88201bd09e4591b37652 |
06-Nov-2012 |
George Mount <mount@google.com> |
am 9041daac: am 9f039e39: am 6027d763: am b6d49492: Remove black borders in Manta LightCycle capture after orientation change. * commit '9041daacefa2d8655fb8b717aa853d4b99574de8':
|
89353d20c286647a7858f0b583a0d8a94d50656a |
06-Nov-2012 |
Bobby Georgescu <georgescu@google.com> |
am 01b92c5f: am f1a99b9f: am 2c8a2468: am 88870365: Merge "Fix the black lines near edge of thumbnails" into gb-ub-photos-arches * commit '01b92c5fd6831b90084111893bd4bbb2ec5ba8b0':
|
60894b844aa5d71abc48844bc2bc8c109d7ec5b3 |
06-Nov-2012 |
John Reck <jreck@google.com> |
am 8bab921b: am f1d6566a: am 38e64b25: am 10f975a6: Merge "Add proxy launcher" into gb-ub-photos-arches * commit '8bab921b45e20d23a709091c8fa0a4318cba4944':
|
cd87f4ec842503547156730c7d6c928958baae45 |
06-Nov-2012 |
Bobby Georgescu <georgescu@google.com> |
am 49f0a0a9: am ef9cf18c: am d58b942a: am 798f4a91: Merge "Hold WakeLock for batch delete operation" into gb-ub-photos-arches * commit '49f0a0a9e4e0b0e93c3c9c883c9110c308596570':
|
c861a8222485b03521fcdc26f13f672d8d19c2d0 |
06-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am 46d65dc0: am 149b5167: am 8fe5c754: am 8d8cdf7f: Fix colors in rotate and mirror * commit '46d65dc0be97ed7cbf41c824fdecbb3709fc712e':
|
b2de0d70c46a07ff7f506374646b6aaf3316f310 |
06-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am 891ff2db: am c11b4c85: am 7dcaeec6: am 8b3ce9b0: Merge "Fix crash when showing history" into gb-ub-photos-arches * commit '891ff2db8d5e0115f8f234732dd4fc8ece2f01a0':
|
0c213fd3ddc2ed0f6b016877fcc4c1fadc418181 |
06-Nov-2012 |
Hung-ying Tyan <tyanh@google.com> |
am e31b12f1: am aad5aa69: am 45dfd43e: am 635aab56: Merge "Fix tiling effect when open a photo." into gb-ub-photos-arches * commit 'e31b12f172e45b447994f391eaedcaee58c0d687':
|
a5de519f32fb3e4ccd057218bb89a36bbbfe85c7 |
06-Nov-2012 |
Nicolas Roard <nicolasroard@google.com> |
am 86d47b9a: am 69664062: am 78497220: am 24f28850: Merge "Do not add crop into preset if in inital setup" into gb-ub-photos-arches * commit '86d47b9a689dac8424311628cf9ced8a639a1c8c':
|
5580d9fac531c6224905e2bc8165fd0eff68d01c |
06-Nov-2012 |
John Reck <jreck@google.com> |
am f065bbbc: am 62b46051: am c62b066a: am 6106c833: Merge "Add loading spinner" into gb-ub-photos-arches * commit 'f065bbbc7cfca42cea5f6760c82b57ac74a453ae':
|
2d594ca71ad00458ccfa24ed24a4a1ea6863314b |
06-Nov-2012 |
Mangesh Ghiware <mghiware@google.com> |
am 874d36e4: am 485797d7: am dd7139ba: am 5388677d: Merge "Handle 360 panorama specific MIME type." into gb-ub-photos-arches * commit '874d36e4269b27e9e8dcb80341b38de1d3f41070':
|
34b83236102f503f826c87f520aa299a4fdb71e2 |
06-Nov-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am a1f8faeb: am 348b64a0: am bdd21912: am 4164fabf: Merge "Fix issue where aspect bounds don\'t get applied." into gb-ub-photos-arches * commit 'a1f8faebb38d349890f7f975926d8ff16bad296f':
|
c372f073623a3bf6ce8e81e04a056aca625db712 |
06-Nov-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am 2f5fceb7: am eee46d78: am 812d65bd: am d72971e6: Merge "Fixed crop intent." into gb-ub-photos-arches * commit '2f5fceb76625e24bf07234506a5b7590a1fe821c':
|
7240851ab5359ea8d6a877e7550ae71911766e8d |
06-Nov-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am 28f3fb0f: am dc87b334: am 1ff4d0fd: am 15aff7c3: Merge "Tagged strings in XML with translation info." into gb-ub-photos-arches * commit '28f3fb0f9541d992c18c4eae26fdd261968d5cd2':
|
3d64be40f66ba60bf51bbd0aee2826f075d4fe04 |
06-Nov-2012 |
Michael Jurka <mikejurka@google.com> |
am f96ce7f1: am b83e3632: am f38cb998: Fix conflict with other build fix * commit 'f96ce7f1591060e99dd8d6d5bdb25e162dd29706':
|
b92c58c47b5d47d75356b68194bd2317b04b6541 |
06-Nov-2012 |
Bobby Georgescu <georgescu@google.com> |
am 4554d9f5: am 8ee82082: am d43a8f94: am 6cfd3b8d: Merge "Get rid of black lines near edge of thumbnails" into gb-ub-photos-arches * commit '4554d9f5196a2b39fdb31b944611f2b2d0d9fb37':
|
d50f0660fde441344fe4477f92655ff8b792f86e |
06-Nov-2012 |
Michael Jurka <mikejurka@google.com> |
am 645a8682: am 559d76f9: am a31708cf: am 0c7e8aac: Merge "Fix build." into gb-ub-photos-arches * commit '645a868259c9e7668868f6fecedc8d65853b2344':
|
4337e14e56db00c0454c32a9551d479bb7836888 |
06-Nov-2012 |
Michael Jurka <mikejurka@google.com> |
am 12aa029d: am 1c4fafe9: am 17c550d3: Merge "Fix build" into jb-mr1-dev * commit '12aa029dd90d324f30e63308329e0436408211a1':
|
35a20e5e8bd7bd083e674ac4b4652e19f7e4819e |
06-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am 56edac84: am 9f4d5f1b: am a36cc0eb: am 8bc296e2: Fix crash when starting filtereditor * commit '56edac84dccbdc97bceefa21e17ab75febfc8f6e':
|
dfc819349d80f7e3470508a1f8242eeadf511cf6 |
06-Nov-2012 |
Angus Kong <shkong@google.com> |
am 659fd380: am 9b12b990: am c6b77275: am 71c17775: Force renderring request for Camera Animation. * commit '659fd38058feb98b6ded74baf49d4ca0c11cc51a':
|
1d092cb3bdb9976ea4e8c03898acb0b07d8d10fd |
06-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am 3f622aae: am 9ed11664: am dff8cf82: am dffe6a6f: Fix default for tiny planet * commit '3f622aaec2b0af05e6ad8fef4b394a5ea9865586':
|
0d1c386aa3b46cc878587515436a6fad15fe2b30 |
06-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am 11d32976: am e3642a33: am 73a2ad06: am e7a71372: Fix update view * commit '11d329766e525b58e08f8a4fc84ad150d1eba718':
|
e439e8cdd005aea361e5b2077fc0f60475ee6a96 |
06-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am ef6d3c66: am d491af09: am d4c93190: am ea3c51ff: Merge "Remove the old photo editor" into gb-ub-photos-arches * commit 'ef6d3c66eacce78664f27ff1551b441158dd3d93':
|
37a623ce5444309ebc0e9b33b28c39c97d30e7be |
06-Nov-2012 |
Sascha Haeberling <haeberling@google.com> |
am f7b7880d: am fb494479: am 2df8a18a: am b13e1788: Merge "Fixes TinyPlanet crashed due to too excessive memory usage." into gb-ub-photos-arches * commit 'f7b7880dcbb5232486becc12ff18dc47b6bebb4c':
|
8487a981e63c769e8dea83bd70555be09010ac60 |
06-Nov-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am ebcccd9f: am a9bc6deb: am e1de865c: am 4a601448: Merge "Fixed blackscreen when launching crop from menu." into gb-ub-photos-arches * commit 'ebcccd9ff866c7746e97c78928a887f7270658b4':
|
fc7014b4cc4e5d8ffcc045a8d8eb4f65ef755395 |
06-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am 73331693: am c6b4ecf6: am dd12e5b5: am 2c6ea941: Add rotation to tinyplanet view * commit '73331693f92d076a9c2abe9a7ce471b0f8957be6':
|
b6d472d081e5d3e3a6dc84e732b0f91256642a32 |
06-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am 61124cb3: am e8df5a6d: am 6bedee87: am 7592704e: Fixes UI stuff * commit '61124cb3de442cdaa9dddecc17d5ff443ccb84ee':
|
61a0b24722189927b8788136a3a0ef65ce53f804 |
06-Nov-2012 |
Teng-Hui Zhu <ztenghui@google.com> |
am 001cef5c: am 0a82481b: am 5122c99a: am ecbdca3d: Merge "Initialize the modified date correctly." into gb-ub-photos-arches * commit '001cef5c6c5382d910cf514da166a65976559e0e':
|
592a13f809b5bd21f2419e5d89e6614f18974734 |
06-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am 4fe1c262: am a19301bb: am 6cea6759: am 0a23b42e: Change background and panel colors * commit '4fe1c2620194fd3c5e4510ed6684356f52262ab9':
|
7c3db8d2be57ead88eb52d50ec64d8f845e28417 |
06-Nov-2012 |
Bobby Georgescu <georgescu@google.com> |
am ab923576: am f254567f: am baffd018: am 86282c88: Merge "Fix attempted uploading of recycled tiles" into gb-ub-photos-arches * commit 'ab9235763354d466fd8e03ed7ef149133f61c8c9':
|
1be2de88bc9ed184e68ae298b08e475cff8007cd |
06-Nov-2012 |
John Reck <jreck@google.com> |
am 46aff56a: am d2173fc8: am 1376c4dc: am d49d5320: Move loadBitmap to async task * commit '46aff56a3d7aad48fd8d4b919450b3ad0f20438f':
|
cf186ed9d2bbb1a995708fe60c0bfba43ce91056 |
06-Nov-2012 |
Bobby Georgescu <georgescu@google.com> |
am 90e04d85: am a8227bbe: am f77721af: am 5bd00332: Launch built-in camera app via filmstrip * commit '90e04d85a3b66053162f65914948570101d4794a':
|
ed621e41bdee50673aad5a4456f73b7e2eec9e81 |
06-Nov-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am 0cb37459: am 0b549f61: am cc33fd6d: am eb6a24e1: Took out aspect ratio switching. * commit '0cb374592fa7fff59ffacf2956c86ef066e08917':
|
1be90a1e03b19a14a57cf243fe4c821bae1c60fc |
06-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am 34457449: am fbe416ad: am 2281b682: am ca05711f: Merge "Save the image when applying tiny planet" into gb-ub-photos-arches * commit '3445744996b8f525eef4d6c456fe11471ebe2acc':
|
abb367429a626dfe11ccd64c77451dce357a780b |
06-Nov-2012 |
John Hoford <hoford@google.com> |
am 27fd152d: am 9da23648: am 0b8c1459: am de00ad0d: Merge "limited the size of textures to 2048" into gb-ub-photos-arches * commit '27fd152da0547ae8f9e9d503ed544308a16df131':
|
3bc158f1a2e7dd9b3a111e0df524a7ee34003bfc |
06-Nov-2012 |
Bobby Georgescu <georgescu@google.com> |
am c054647b: am 624ad6d0: am a0d84367: am a1d04a4a: Merge "Do not show bottom controls when undo bar is visible" into gb-ub-photos-arches * commit 'c054647b815489a0c020c2b1371eeb3b508f70db':
|
fbd46ca32d0f36cf25eeb0cf87642041542ffd7d |
06-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am 686dea53: am 5b41962e: am b48c872e: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev * commit '686dea53d52c1f896aae76c09243b80dec821181':
|
d12b1e2919b9d564890f5337723b5574f0536285 |
06-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am a6b039ac: am 5c9c8ac3: am 5116f2fd: (-s ours) am a4e538e0: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches * commit 'a6b039ac51b195e8c4e0ebc152741d61c6ce1c6b':
|
f78bf988f98b8baefa8cfe6e96089349b3f07a62 |
06-Nov-2012 |
Bobby Georgescu <georgescu@google.com> |
am 5da1c942: am 03470f4c: am 51881e02: am f4a73264: Merge "Do not show Camera placeholder when not appropriate" into gb-ub-photos-arches * commit '5da1c942ad9040d00973be2c650759fbfba7e73b':
|
4215161656a4756187da2a77d6da94e79e6d4a62 |
06-Nov-2012 |
Owen Lin <owenlin@google.com> |
am 8be75158: am 2fc6e3a5: am f3958f87: am adee31f0: Use TiledTexture for thumbnails. * commit '8be75158b280033edf433b38e7f6d2a3eb7fd525':
|
7024266d7c660227b7b33be5086978e512aa8c31 |
06-Nov-2012 |
Sascha Haeberling <haeberling@google.com> |
am 0a0667cc: am a03998c9: am b682706f: am c60752b2: Use XMP meta-data for correct tiny planets. * commit '0a0667cc27cdd8c78f47f81bc46fadaad496dd75':
|
df3931fe6ffdfb5c7f7a5768715b6b22880c9049 |
06-Nov-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am 68ba0176: am b004a6f9: am 1d866031: am eb75699b: Fixed scaling factor for ImageShow and rotations. * commit '68ba01764945e4aa5d8e2caf389da0cdda53a42f':
|
4ea794c861579b9b88730cda0fe72a8b006e4fe0 |
06-Nov-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am cf083183: am f60139ce: am 5a093c66: am 3fb20078: Merge "Fix so mirror gets applied." into gb-ub-photos-arches * commit 'cf08318347c43e49658a630042c66cdc6c53b73b':
|
2f5e8817d175446f91d268cf6acfe86256539db5 |
06-Nov-2012 |
Nicolas Roard <nicolasroard@google.com> |
am 0dc0943f: am c0c5c138: am 842257ca: am d3aebee7: Merge "Support XMP data, fixed read file on another thread" into gb-ub-photos-arches * commit '0dc0943f0293d62b7d056f995fb7253847537bc1':
|
ab84feb2aecb7c2707f1ce76da46899e46b3986f |
06-Nov-2012 |
Doris Liu <tianliu@google.com> |
am 68f5000e: am c3d2b085: am 413c7109: am 5d3e6653: Merge "Stay in AlbumPage when dismissing a popup from AP" into gb-ub-photos-arches * commit '68f5000e4e76dc01174c95f9758ced1d0de842a5':
|
200e37fd4664c61d04578a98104a29e5b33dd8b1 |
06-Nov-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am 307eecfc: am d8ddd8d8: am c3a48597: am f46da69a: Increased touch tolerance in cropping. * commit '307eecfc26b85eaa9bd2d936479e0d01a7ebb173':
|
b8965012700de2dfb3ddf4982f33ee9a22f8bcd1 |
06-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am 96ea647f: am e1036a50: Import translations. DO NOT MERGE * commit '96ea647f63fa7e996adfe865df65bc6e2723bf5b': Import translations. DO NOT MERGE
|
1f52b30b5a006625caff7a35f0d05680ae170bf5 |
06-Nov-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am 92ea0a90: am 2fe28fc3: am bdfccda8: am a4122499: Reworked crop/transform UI. * commit '92ea0a9033de6b620adcdb348107aa2f7bcd0e17':
|
5534e7b90aa3d5c397aabbdbe9c4e400fd06680d |
06-Nov-2012 |
John Hoford <hoford@google.com> |
am 56311a81: am ea4097c9: am 4b2c4ecb: am 67fefdb9: add support for black and white filters, add rotation API to tiny planet * commit '56311a81651dd90b47440f8db58cb78652b38f22':
|
262cea15333bb407c30cbf56c2182cbcc932b4a2 |
06-Nov-2012 |
Bobby Georgescu <georgescu@google.com> |
am d79cd799: am beda88a7: am c67bc34b: am a850a543: Fix jank when launching editor from Camera filmstrip * commit 'd79cd799a92041d893e622a8fa831b0e0839ee6c':
|
8c3f8d739aaa71da2940cea6e1ca05e0e2ed6709 |
06-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am 1ce091fb: am 7c30dc01: am f22aa1a2: am 41a3a3be: Fix slider layout * commit '1ce091fb82de31d685e5306b3ecb1c068cfdd62d':
|
58e93517ddbb04b57b7150c2ffd3192e3de84ab3 |
06-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am aeff41bd: am 808a5869: am a482d850: am cb993ff1: Merge "Express the borders size in percentages" into gb-ub-photos-arches * commit 'aeff41bd96846a7fa61a9642387fd588020d2366':
|
25df492e4f885f6f398deeb735df1229208f0a52 |
06-Nov-2012 |
John Reck <jreck@google.com> |
am e3e394a4: am 590acf86: am 94fa0565: am d6453edc: Merge "Fix NPE" into gb-ub-photos-arches * commit 'e3e394a40f49d2431568cc1c8414de69ede238f1':
|
4d6c4c61237901c0ebb57cef1b2761107fb23b67 |
06-Nov-2012 |
George Mount <mount@google.com> |
am b4bbd952: am 0827ebf0: am 71647c7a: am 7d7f91e1: Merge "Fix NPE in detecting panoramas." into gb-ub-photos-arches * commit 'b4bbd952175778dbf65647adb9b0429dcbff27d9':
|
dcfb900ad1e248b9774698798f0a5a907cff8a08 |
06-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am a41df7c2: am 30fd4b42: am bd4ea013: am ea636029: Merge "Hide the history panel on rotation" into gb-ub-photos-arches * commit 'a41df7c2b57e8931a0d1d91d9bf1b03453938095':
|
3a493702fa0df517b1ee5f9f66672fe5a3b50d01 |
06-Nov-2012 |
Sascha Haeberling <haeberling@google.com> |
am 80fd6f77: am 22fae182: am 25d08e2b: am a681f36f: Merge "Make sure we use xmp_toolkit from external instead of the precompiled JAR." into gb-ub-photos-arches * commit '80fd6f773239bba239af22c07d519a71da6e1d0d':
|
a7fe97bf11a17126f9ce113959b1009f572b4bf4 |
06-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am d6bb72ec: am 05757033: am bc9d4ccc: am 5d7e98f7: Fix another potential crash in Curves * commit 'd6bb72ecad476fafdf05d03bbfc861335ff839a6':
|
f1644cf629c86dfc8b5cc92793fcc71d9ece1084 |
06-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am cac3cd19: am 4626ebd1: am 0b44017c: am 361f6234: Merge "Fix flickering in geometry panel" into gb-ub-photos-arches * commit 'cac3cd19bb90f7e1b9a7638dc4384d6ca0ca1544':
|
615b7db57d811c05562e15837fe2ea902b32c10e |
06-Nov-2012 |
Bobby Georgescu <georgescu@google.com> |
am e7e7059b: am 75a448eb: am f30096b4: am c162c8b7: Merge "Show Panorama viewer button in filmstrip mode" into gb-ub-photos-arches * commit 'e7e7059b820d8a2ed7d80da4a2764f67330c0eb1':
|
a9d2206470d3202e5a376baf47a4fef69fc2e7b1 |
06-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am 1c196316: am b8f4ea38: am e5a3ff76: am a9f280f9: Add copyright notices * commit '1c19631677766104773e648e9e47792331aa02ec':
|
b121e1a7020b54a2379f0e4f173096f686d96e1e |
06-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am a357260f: am c54c7839: am cdaa77d2: am ec995b6b: Fix slow / jerky tracking in Curves * commit 'a357260f8cee02f5875a01bc5f2f6eabbb221489':
|
80f880b89bbb60f51b28f8dd4904221439b5d84f |
06-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am 0888dd02: am cd35c2fc: am 488547b0: am 2569df23: Merge "Shows filtered images in geometry modules and comparison." into gb-ub-photos-arches * commit '0888dd02a6fe6d4c22c2fb16082dd9c74d75fbba':
|
783729fd7cc3183a206a9fc2bda7d307be4978ec |
06-Nov-2012 |
George Mount <mount@google.com> |
am 79a50cad: am b2fb154f: am 3bfbae1d: am 24af89b9: Merge "Ensure photo sphere icon shows for panoramas." into gb-ub-photos-arches * commit '79a50cad0ae7c228fa6ae438136f8a8fcae0eddb':
|
a34b0472158de0fa4108b2badb9a99c3e1fe0108 |
06-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am 4a831f74: am 0f40db8d: am 306176fb: (-s ours) am 7c08064b: (-s ours) Import translations. DO NOT MERGE * commit '4a831f74737ecf64d90787edc8d5321ef602bfc9':
|
1cef81acf93c6ac3c43f8bbac45ab7048ff4c878 |
06-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am d5017721: am e6319953: am caace51d: (-s ours) Import translations. DO NOT MERGE * commit 'd5017721c42a2a844e50ee04fe69a37ad3306d2c':
|
263a27b9d6e4cd51c69de523c85d7051ff5fcf9e |
06-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am c1f46437: am 69cec707: (-s ours) Import translations. DO NOT MERGE * commit 'c1f46437885bc3da1f799d3a57fdd599bcb4f3df': Import translations. DO NOT MERGE
|
039e80be8d5c7fabfd8e168d5e86ce83b33fb916 |
06-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am 4ecaa689: am 5ac0bdab: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev * commit '4ecaa6890d0be8018d8c85c6590e81601e31312b':
|
caf70588f7a97aaad805b008f91c750fe59b45b5 |
06-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am ebe62dc6: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev * commit 'ebe62dc682db5b6e1fc52c5288d74642e742aa5a': Import translations. DO NOT MERGE
|
178fdcd2f05baeaa1502ae20a77580bf8e2949b7 |
06-Nov-2012 |
John Hoford <hoford@google.com> |
am df5f199e: am c7374d5c: am 57900769: am ea7366a5: am 5fbfe6f1: on entry check if Tiny Planet if not remove UI * commit 'df5f199e81d1139441bbf321ed853d914e33695d':
|
d2009998e3e42c2f365bfeb2317c6308929684a6 |
06-Nov-2012 |
Mangesh Ghiware <mghiware@google.com> |
am d60a97b1: am d0f09548: am f7c1c580: am 4a138a84: am 63770752: Merge "Add activity-alias for video camera" into gb-ub-photos-arches * commit 'd60a97b118c9ced1be8dc4c9c2d5a43ee968f595':
|
f5853ee3b9d06a508c50a67f078b731681f4afd7 |
06-Nov-2012 |
Bobby Georgescu <georgescu@google.com> |
am a3b3ae04: am 33949fc8: am 6377a7e8: am 0df51da9: am afa5ac4c: Merge "Minor transition tweaks" into gb-ub-photos-arches * commit 'a3b3ae04b27db9f47ebe57641bf01aa14ea4eed2':
|
30c2a24aaa0ffea907bcd451057f91863f9c7f95 |
06-Nov-2012 |
Doris Liu <tianliu@google.com> |
am dd249883: am 449cd606: am 574be81d: am 7ad3eb28: am 3a64ad36: Merge "Show panorama thumbs in Gallery grid view" into gb-ub-photos-arches * commit 'dd24988323f9eb334a983df98608c2b0ebf2d9e9':
|
72609cf6bdd6a55fa8001082c398cf94575b982b |
06-Nov-2012 |
Hung-ying Tyan <tyanh@google.com> |
am dcdf6ee8: am 0033497c: am c09daea1: am 23cfddb4: am bdc0f6f2: Merge "Move new exif lib to gallerycommon." into gb-ub-photos-arches * commit 'dcdf6ee8c0755cc4ba690e9494e1e2870be697eb':
|
156f56396af275fcd59d64d68829e8df08b17916 |
06-Nov-2012 |
John Reck <jreck@google.com> |
am 3b2d7dd2: am 4e728e9f: am 38d29567: am fdfced2d: am ff4e0460: Merge "Drive GLRootView with Choreographer" into gb-ub-photos-arches * commit '3b2d7dd2ddab899c447ce7be2518597f63016858':
|
17d2e9d00a2f1b1b8ed7e8af1ebf3958a78a0e3c |
06-Nov-2012 |
Bobby Georgescu <georgescu@google.com> |
am e1e80a49: am 96487845: am 20a91815: am b21c127c: am e96e907a: Merge "Scroll to placeholder in gallery filmstrip launches camera" into gb-ub-photos-arches * commit 'e1e80a49e1ca2003caae1cbcc61c1b0a53bef01d':
|
d52ac02fcfcf251ca533eefaa0496e0a7ba58a8f |
06-Nov-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am 3f12b3db: am 5f83eeb8: am 6d9a6ff8: am 91814c2e: am 168db2f1: Merge "Fix geometry xforms & minor bug." into gb-ub-photos-arches * commit '3f12b3db03c8623a277791106c6f2c4f7902c692':
|
27794dbca92e595c7b07d9187e97aef5a67c7065 |
06-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am 3ccd8f1c: (-s ours) am 2ef3999a: am b2993d29: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev * commit '3ccd8f1c3b507aafacf7d7dde2c54ffc0c9ed519': Import translations. DO NOT MERGE
|
16f8aa849ac14a2bde2f3d06deaa4db7bd368108 |
06-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am fc8e6db7: am 10f64ff1: (-s ours) am 798ec54d: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches * commit 'fc8e6db700cadfe0ad19fb783014428877bd2b6d':
|
82d5861ef0874fdc02c5c151b67a96620e02b00f |
06-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am f2f31a63: am 8275abe7: (-s ours) am 5583758a: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches * commit 'f2f31a63fbcb97da3ba7140ab4689b5d90bdda84':
|
ed035ad14569dd55234026f816e61089a077b0c5 |
06-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am adfcb006: am 1cf344e2: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev * commit 'adfcb00669bee5797c93ca163adb40f282ec5e9b':
|
1dbf0ed94c0355b6abdde6556f4bdcca317220e4 |
06-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am 6d9d8e3d: Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev * commit '6d9d8e3d01d9ce852fd069d453850f78bda0b525': Import translations. DO NOT MERGE
|
10d9ad75ea171d3877dd769fc548faa8d4297e36 |
06-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am c2931f8e: am 33d33c7e: am 2d2b69b0: Fix rounding issue affecting TinyPlanet * commit 'c2931f8e2495c038173045de750959f8012bfc93':
|
ef70f93739398cef2d2b9975f15314351e079c75 |
06-Nov-2012 |
Nicolas Roard <nicolasroard@google.com> |
am 92503c9e: am 90af32fb: am a0fe81ad: Merge "Changed rotated display parameter increments to 90." into gb-ub-photos-arches * commit '92503c9e00e1fcf097a1c960eb74d4b9e1499252':
|
538d47a8229adf6ccf3ab970fbc0905093d7532f |
06-Nov-2012 |
Nicolas Roard <nicolasroard@google.com> |
am e5ac5d03: am d2a1f33f: am 26cfff70: Merge "change thumbnail and reset behaviour" into gb-ub-photos-arches * commit 'e5ac5d036935e0024273bc6875c2cfb57107171c':
|
6ffd20961377a3fe7387e44ca8e590fc8f9c23b2 |
06-Nov-2012 |
Doris Liu <tianliu@google.com> |
am 4fc2db3c: am f245d2b7: am 591974bc: Merge "Show panoViewer icon after "Back" from viewer" into gb-ub-photos-arches * commit '4fc2db3c010f821c7c1065ed31135c83e6d4f195':
|
9041daacefa2d8655fb8b717aa853d4b99574de8 |
06-Nov-2012 |
George Mount <mount@google.com> |
am 9f039e39: am 6027d763: am b6d49492: Remove black borders in Manta LightCycle capture after orientation change. * commit '9f039e395d80fcd14d7bfdb0b303a39baa5fa8c7':
|
01b92c5fd6831b90084111893bd4bbb2ec5ba8b0 |
06-Nov-2012 |
Bobby Georgescu <georgescu@google.com> |
am f1a99b9f: am 2c8a2468: am 88870365: Merge "Fix the black lines near edge of thumbnails" into gb-ub-photos-arches * commit 'f1a99b9f0dc504b6517c17a5a203a7d3c3c75834':
|
8bab921b45e20d23a709091c8fa0a4318cba4944 |
06-Nov-2012 |
John Reck <jreck@google.com> |
am f1d6566a: am 38e64b25: am 10f975a6: Merge "Add proxy launcher" into gb-ub-photos-arches * commit 'f1d6566a2df59e6c1402f95dab3cb51069aa880b':
|
49f0a0a9e4e0b0e93c3c9c883c9110c308596570 |
06-Nov-2012 |
Bobby Georgescu <georgescu@google.com> |
am ef9cf18c: am d58b942a: am 798f4a91: Merge "Hold WakeLock for batch delete operation" into gb-ub-photos-arches * commit 'ef9cf18c436df3c18989f53c0e2bb14b87ecb487':
|
46d65dc0be97ed7cbf41c824fdecbb3709fc712e |
06-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am 149b5167: am 8fe5c754: am 8d8cdf7f: Fix colors in rotate and mirror * commit '149b5167a71cf221c821579746dfac199ab89ee2':
|
891ff2db8d5e0115f8f234732dd4fc8ece2f01a0 |
06-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am c11b4c85: am 7dcaeec6: am 8b3ce9b0: Merge "Fix crash when showing history" into gb-ub-photos-arches * commit 'c11b4c85f80b24a0e9af089cfd96bd2af1bdf108':
|
e31b12f172e45b447994f391eaedcaee58c0d687 |
06-Nov-2012 |
Hung-ying Tyan <tyanh@google.com> |
am aad5aa69: am 45dfd43e: am 635aab56: Merge "Fix tiling effect when open a photo." into gb-ub-photos-arches * commit 'aad5aa69f8393ba1ca3a010afbe554ac84efbf79':
|
86d47b9a689dac8424311628cf9ced8a639a1c8c |
06-Nov-2012 |
Nicolas Roard <nicolasroard@google.com> |
am 69664062: am 78497220: am 24f28850: Merge "Do not add crop into preset if in inital setup" into gb-ub-photos-arches * commit '69664062bc9039a0d548a7666680a852db947c33':
|
f065bbbc7cfca42cea5f6760c82b57ac74a453ae |
06-Nov-2012 |
John Reck <jreck@google.com> |
am 62b46051: am c62b066a: am 6106c833: Merge "Add loading spinner" into gb-ub-photos-arches * commit '62b46051d75cc323332eeb4c0c79e3895647cb5a':
|
874d36e4269b27e9e8dcb80341b38de1d3f41070 |
06-Nov-2012 |
Mangesh Ghiware <mghiware@google.com> |
am 485797d7: am dd7139ba: am 5388677d: Merge "Handle 360 panorama specific MIME type." into gb-ub-photos-arches * commit '485797d7aec85f3ddf990522ee8c55a04a2c95ab':
|
a1f8faebb38d349890f7f975926d8ff16bad296f |
06-Nov-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am 348b64a0: am bdd21912: am 4164fabf: Merge "Fix issue where aspect bounds don\'t get applied." into gb-ub-photos-arches * commit '348b64a0414a1c8143e1997fe44efd4ac91a8665':
|
2f5fceb76625e24bf07234506a5b7590a1fe821c |
06-Nov-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am eee46d78: am 812d65bd: am d72971e6: Merge "Fixed crop intent." into gb-ub-photos-arches * commit 'eee46d78ba7231db50e096b1b4acff2f3937b3c4':
|
28f3fb0f9541d992c18c4eae26fdd261968d5cd2 |
06-Nov-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am dc87b334: am 1ff4d0fd: am 15aff7c3: Merge "Tagged strings in XML with translation info." into gb-ub-photos-arches * commit 'dc87b334fe834fab09c8a220500b9c1683561543':
|
f96ce7f1591060e99dd8d6d5bdb25e162dd29706 |
06-Nov-2012 |
Michael Jurka <mikejurka@google.com> |
am b83e3632: am f38cb998: Fix conflict with other build fix * commit 'b83e3632acf59c2e790f6d22f7830891db44852b':
|
4554d9f5196a2b39fdb31b944611f2b2d0d9fb37 |
06-Nov-2012 |
Bobby Georgescu <georgescu@google.com> |
am 8ee82082: am d43a8f94: am 6cfd3b8d: Merge "Get rid of black lines near edge of thumbnails" into gb-ub-photos-arches * commit '8ee820827f9087dec7e82cdf75976330a62bbd06':
|
645a868259c9e7668868f6fecedc8d65853b2344 |
06-Nov-2012 |
Michael Jurka <mikejurka@google.com> |
am 559d76f9: am a31708cf: am 0c7e8aac: Merge "Fix build." into gb-ub-photos-arches * commit '559d76f993af7a72a077427af87eb1dc655b6540':
|
12aa029dd90d324f30e63308329e0436408211a1 |
06-Nov-2012 |
Michael Jurka <mikejurka@google.com> |
am 1c4fafe9: am 17c550d3: Merge "Fix build" into jb-mr1-dev * commit '1c4fafe902ef9b527abab4be992dcf253efc1701':
|
56edac84dccbdc97bceefa21e17ab75febfc8f6e |
06-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am 9f4d5f1b: am a36cc0eb: am 8bc296e2: Fix crash when starting filtereditor * commit '9f4d5f1ba9f395092709f042cf6967c05c679c25':
|
659fd38058feb98b6ded74baf49d4ca0c11cc51a |
06-Nov-2012 |
Angus Kong <shkong@google.com> |
am 9b12b990: am c6b77275: am 71c17775: Force renderring request for Camera Animation. * commit '9b12b990cd9262dfc15c274e66681531352315e2':
|
3f622aaec2b0af05e6ad8fef4b394a5ea9865586 |
06-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am 9ed11664: am dff8cf82: am dffe6a6f: Fix default for tiny planet * commit '9ed116642f07ae6a52be132077fcdfb2790a4758':
|
11d329766e525b58e08f8a4fc84ad150d1eba718 |
06-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am e3642a33: am 73a2ad06: am e7a71372: Fix update view * commit 'e3642a3362e1e6fbdcc0b4ffb0963657f4e1caf0':
|
ef6d3c66eacce78664f27ff1551b441158dd3d93 |
06-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am d491af09: am d4c93190: am ea3c51ff: Merge "Remove the old photo editor" into gb-ub-photos-arches * commit 'd491af093d8614e33b89bccaa1db030128eaaa25':
|
f7b7880dcbb5232486becc12ff18dc47b6bebb4c |
06-Nov-2012 |
Sascha Haeberling <haeberling@google.com> |
am fb494479: am 2df8a18a: am b13e1788: Merge "Fixes TinyPlanet crashed due to too excessive memory usage." into gb-ub-photos-arches * commit 'fb49447912a3acf5bbadcfcb696a282b6765b05f':
|
ebcccd9ff866c7746e97c78928a887f7270658b4 |
06-Nov-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am a9bc6deb: am e1de865c: am 4a601448: Merge "Fixed blackscreen when launching crop from menu." into gb-ub-photos-arches * commit 'a9bc6deb8e4eb9e57b13d83a33251e62d6a87e01':
|
73331693f92d076a9c2abe9a7ce471b0f8957be6 |
06-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am c6b4ecf6: am dd12e5b5: am 2c6ea941: Add rotation to tinyplanet view * commit 'c6b4ecf682ce95e5b5a725fa8c8fdf61bad79c83':
|
61124cb3de442cdaa9dddecc17d5ff443ccb84ee |
06-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am e8df5a6d: am 6bedee87: am 7592704e: Fixes UI stuff * commit 'e8df5a6da384b8c6b7dc86ea4c880d691359422b':
|
001cef5c6c5382d910cf514da166a65976559e0e |
06-Nov-2012 |
Teng-Hui Zhu <ztenghui@google.com> |
am 0a82481b: am 5122c99a: am ecbdca3d: Merge "Initialize the modified date correctly." into gb-ub-photos-arches * commit '0a82481b7375efcbf07e677e2682be166d58a001':
|
4fe1c2620194fd3c5e4510ed6684356f52262ab9 |
06-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am a19301bb: am 6cea6759: am 0a23b42e: Change background and panel colors * commit 'a19301bba9c02be5c2b3d8d1460286d84022f610':
|
ab9235763354d466fd8e03ed7ef149133f61c8c9 |
06-Nov-2012 |
Bobby Georgescu <georgescu@google.com> |
am f254567f: am baffd018: am 86282c88: Merge "Fix attempted uploading of recycled tiles" into gb-ub-photos-arches * commit 'f254567f344826e3398a645cd0c87012653d184f':
|
46aff56a3d7aad48fd8d4b919450b3ad0f20438f |
06-Nov-2012 |
John Reck <jreck@google.com> |
am d2173fc8: am 1376c4dc: am d49d5320: Move loadBitmap to async task * commit 'd2173fc83d62caac54ec659a961a859dc18321b6':
|
90e04d85a3b66053162f65914948570101d4794a |
06-Nov-2012 |
Bobby Georgescu <georgescu@google.com> |
am a8227bbe: am f77721af: am 5bd00332: Launch built-in camera app via filmstrip * commit 'a8227bbee10f8aabff550c4baca09247985ca775':
|
0cb374592fa7fff59ffacf2956c86ef066e08917 |
06-Nov-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am 0b549f61: am cc33fd6d: am eb6a24e1: Took out aspect ratio switching. * commit '0b549f611c7d220355fb455dbff2c2d7f876cead':
|
3445744996b8f525eef4d6c456fe11471ebe2acc |
06-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am fbe416ad: am 2281b682: am ca05711f: Merge "Save the image when applying tiny planet" into gb-ub-photos-arches * commit 'fbe416ada2674df7c5488b693d88602da0d761c2':
|
27fd152da0547ae8f9e9d503ed544308a16df131 |
06-Nov-2012 |
John Hoford <hoford@google.com> |
am 9da23648: am 0b8c1459: am de00ad0d: Merge "limited the size of textures to 2048" into gb-ub-photos-arches * commit '9da23648df344bd4bcc3d4ce8243936e5353aaf3':
|
c054647b815489a0c020c2b1371eeb3b508f70db |
06-Nov-2012 |
Bobby Georgescu <georgescu@google.com> |
am 624ad6d0: am a0d84367: am a1d04a4a: Merge "Do not show bottom controls when undo bar is visible" into gb-ub-photos-arches * commit '624ad6d08fc12169a1cbdd2013496de93fdb72c7':
|
686dea53d52c1f896aae76c09243b80dec821181 |
06-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am 5b41962e: am b48c872e: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev * commit '5b41962e717d65f6b4db37300ca274fd62c6df91':
|
a6b039ac51b195e8c4e0ebc152741d61c6ce1c6b |
06-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am 5c9c8ac3: am 5116f2fd: (-s ours) am a4e538e0: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches * commit '5c9c8ac303db6f29abae6b3180a1d377d71e66fa':
|
5da1c942ad9040d00973be2c650759fbfba7e73b |
06-Nov-2012 |
Bobby Georgescu <georgescu@google.com> |
am 03470f4c: am 51881e02: am f4a73264: Merge "Do not show Camera placeholder when not appropriate" into gb-ub-photos-arches * commit '03470f4ce6b931cdf0a388f6b5174f3f53afa9a0':
|
8be75158b280033edf433b38e7f6d2a3eb7fd525 |
06-Nov-2012 |
Owen Lin <owenlin@google.com> |
am 2fc6e3a5: am f3958f87: am adee31f0: Use TiledTexture for thumbnails. * commit '2fc6e3a55c29fe214b7c975b9ba798e14dca62b4':
|
0a0667cc27cdd8c78f47f81bc46fadaad496dd75 |
06-Nov-2012 |
Sascha Haeberling <haeberling@google.com> |
am a03998c9: am b682706f: am c60752b2: Use XMP meta-data for correct tiny planets. * commit 'a03998c9adb9a0b53696d64c666fc7e39fa7292d':
|
68ba01764945e4aa5d8e2caf389da0cdda53a42f |
06-Nov-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am b004a6f9: am 1d866031: am eb75699b: Fixed scaling factor for ImageShow and rotations. * commit 'b004a6f93a883887b73e98fd5191689f9890290e':
|
cf08318347c43e49658a630042c66cdc6c53b73b |
06-Nov-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am f60139ce: am 5a093c66: am 3fb20078: Merge "Fix so mirror gets applied." into gb-ub-photos-arches * commit 'f60139cee9f3db343e378547b27dfb68377a486d':
|
0dc0943f0293d62b7d056f995fb7253847537bc1 |
06-Nov-2012 |
Nicolas Roard <nicolasroard@google.com> |
am c0c5c138: am 842257ca: am d3aebee7: Merge "Support XMP data, fixed read file on another thread" into gb-ub-photos-arches * commit 'c0c5c138068a8d5b0b5db2c7583f0bcf5074be71':
|
68f5000e4e76dc01174c95f9758ced1d0de842a5 |
06-Nov-2012 |
Doris Liu <tianliu@google.com> |
am c3d2b085: am 413c7109: am 5d3e6653: Merge "Stay in AlbumPage when dismissing a popup from AP" into gb-ub-photos-arches * commit 'c3d2b085294e28adf3f41e2e26b3261415ce8f85':
|
307eecfc26b85eaa9bd2d936479e0d01a7ebb173 |
06-Nov-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am d8ddd8d8: am c3a48597: am f46da69a: Increased touch tolerance in cropping. * commit 'd8ddd8d841da84973f451e2aca7a4f871b2861ca':
|
96ea647f63fa7e996adfe865df65bc6e2723bf5b |
06-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am e1036a50: Import translations. DO NOT MERGE * commit 'e1036a509ec62c1d9146ca72e3a39313d0310a2d': Import translations. DO NOT MERGE
|
92ea0a9033de6b620adcdb348107aa2f7bcd0e17 |
06-Nov-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am 2fe28fc3: am bdfccda8: am a4122499: Reworked crop/transform UI. * commit '2fe28fc3042ee411d46e581a24a64e073d6d4e2a':
|
56311a81651dd90b47440f8db58cb78652b38f22 |
06-Nov-2012 |
John Hoford <hoford@google.com> |
am ea4097c9: am 4b2c4ecb: am 67fefdb9: add support for black and white filters, add rotation API to tiny planet * commit 'ea4097c9ac4f3b56c065eaaf8b72bc0ee3743b0f':
|
d79cd799a92041d893e622a8fa831b0e0839ee6c |
06-Nov-2012 |
Bobby Georgescu <georgescu@google.com> |
am beda88a7: am c67bc34b: am a850a543: Fix jank when launching editor from Camera filmstrip * commit 'beda88a7038e82565011c26804940f25f3fd789a':
|
1ce091fb82de31d685e5306b3ecb1c068cfdd62d |
06-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am 7c30dc01: am f22aa1a2: am 41a3a3be: Fix slider layout * commit '7c30dc018590fc3b44fb1f208e121470ef0aac9d':
|
aeff41bd96846a7fa61a9642387fd588020d2366 |
06-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am 808a5869: am a482d850: am cb993ff1: Merge "Express the borders size in percentages" into gb-ub-photos-arches * commit '808a5869a56f8a3671f7c80c319dff6b94ea7915':
|
e3e394a40f49d2431568cc1c8414de69ede238f1 |
06-Nov-2012 |
John Reck <jreck@google.com> |
am 590acf86: am 94fa0565: am d6453edc: Merge "Fix NPE" into gb-ub-photos-arches * commit '590acf8681c11395e9b9548e4cd8a205902cbb35':
|
b4bbd952175778dbf65647adb9b0429dcbff27d9 |
06-Nov-2012 |
George Mount <mount@google.com> |
am 0827ebf0: am 71647c7a: am 7d7f91e1: Merge "Fix NPE in detecting panoramas." into gb-ub-photos-arches * commit '0827ebf079934ae9e6cb7285e785a1a179f155fa':
|
a41df7c2b57e8931a0d1d91d9bf1b03453938095 |
06-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am 30fd4b42: am bd4ea013: am ea636029: Merge "Hide the history panel on rotation" into gb-ub-photos-arches * commit '30fd4b427eb84d553dfcae3759707f9d8da75001':
|
80fd6f773239bba239af22c07d519a71da6e1d0d |
06-Nov-2012 |
Sascha Haeberling <haeberling@google.com> |
am 22fae182: am 25d08e2b: am a681f36f: Merge "Make sure we use xmp_toolkit from external instead of the precompiled JAR." into gb-ub-photos-arches * commit '22fae1820b13017c121879774b0afd522ecee676':
|
d6bb72ecad476fafdf05d03bbfc861335ff839a6 |
06-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am 05757033: am bc9d4ccc: am 5d7e98f7: Fix another potential crash in Curves * commit '05757033049bd84e44f695ca781889d44577c589':
|
cac3cd19bb90f7e1b9a7638dc4384d6ca0ca1544 |
06-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am 4626ebd1: am 0b44017c: am 361f6234: Merge "Fix flickering in geometry panel" into gb-ub-photos-arches * commit '4626ebd1e289777868f33abb5e0b3a4bc116961e':
|
e7e7059b820d8a2ed7d80da4a2764f67330c0eb1 |
06-Nov-2012 |
Bobby Georgescu <georgescu@google.com> |
am 75a448eb: am f30096b4: am c162c8b7: Merge "Show Panorama viewer button in filmstrip mode" into gb-ub-photos-arches * commit '75a448eb193308f6b9268968265895c019ae3ab2':
|
1c19631677766104773e648e9e47792331aa02ec |
06-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am b8f4ea38: am e5a3ff76: am a9f280f9: Add copyright notices * commit 'b8f4ea38c6096cb806b60986c0d11ef9761db665':
|
a357260f8cee02f5875a01bc5f2f6eabbb221489 |
06-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am c54c7839: am cdaa77d2: am ec995b6b: Fix slow / jerky tracking in Curves * commit 'c54c78392cc9007be5a9f0cd2bf7d003a883a6ff':
|
0888dd02a6fe6d4c22c2fb16082dd9c74d75fbba |
06-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am cd35c2fc: am 488547b0: am 2569df23: Merge "Shows filtered images in geometry modules and comparison." into gb-ub-photos-arches * commit 'cd35c2fc673f455de2d5853ecf1248d8ff167742':
|
79a50cad0ae7c228fa6ae438136f8a8fcae0eddb |
06-Nov-2012 |
George Mount <mount@google.com> |
am b2fb154f: am 3bfbae1d: am 24af89b9: Merge "Ensure photo sphere icon shows for panoramas." into gb-ub-photos-arches * commit 'b2fb154fa84ec663bb8e181c299a3868e9ee98aa':
|
4a831f74737ecf64d90787edc8d5321ef602bfc9 |
06-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am 0f40db8d: am 306176fb: (-s ours) am 7c08064b: (-s ours) Import translations. DO NOT MERGE * commit '0f40db8d736ab95f0a3c9b03c9b20f5bd85a34f1':
|
d5017721c42a2a844e50ee04fe69a37ad3306d2c |
06-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am e6319953: am caace51d: (-s ours) Import translations. DO NOT MERGE * commit 'e6319953a3b2d11251b57bfb6cd2a5e0ffbb552d':
|
c1f46437885bc3da1f799d3a57fdd599bcb4f3df |
06-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am 69cec707: (-s ours) Import translations. DO NOT MERGE * commit '69cec707836ae8c072da9e0015160b96a5c5c6be': Import translations. DO NOT MERGE
|
df5f199e81d1139441bbf321ed853d914e33695d |
06-Nov-2012 |
John Hoford <hoford@google.com> |
am c7374d5c: am 57900769: am ea7366a5: am 5fbfe6f1: on entry check if Tiny Planet if not remove UI * commit 'c7374d5c1a2378a685a0cf55a42331429d5b2573':
|
d60a97b118c9ced1be8dc4c9c2d5a43ee968f595 |
06-Nov-2012 |
Mangesh Ghiware <mghiware@google.com> |
am d0f09548: am f7c1c580: am 4a138a84: am 63770752: Merge "Add activity-alias for video camera" into gb-ub-photos-arches * commit 'd0f095482e9ce76ae4dd3d588aefa671b40a22c4':
|
a3b3ae04b27db9f47ebe57641bf01aa14ea4eed2 |
06-Nov-2012 |
Bobby Georgescu <georgescu@google.com> |
am 33949fc8: am 6377a7e8: am 0df51da9: am afa5ac4c: Merge "Minor transition tweaks" into gb-ub-photos-arches * commit '33949fc8394ee2601ebb4737106c04e4333551d1':
|
dd24988323f9eb334a983df98608c2b0ebf2d9e9 |
06-Nov-2012 |
Doris Liu <tianliu@google.com> |
am 449cd606: am 574be81d: am 7ad3eb28: am 3a64ad36: Merge "Show panorama thumbs in Gallery grid view" into gb-ub-photos-arches * commit '449cd6064b4035ba8e7a00e0bcfcd0a761f68c0d':
|
d33fcf391f9296c3e1f8cbc18d3bd95d76dca0c9 |
06-Nov-2012 |
Bobby Georgescu <georgescu@google.com> |
am 23ce5952: am 7b3f7fd3: am 1b73272f: am cfbbe15d: am 3536bd34: Merge "Increase album label size on high-res screens" into gb-ub-photos-arches * commit '23ce59522c304e7c837efe2dac725fcda7a97079':
|
dcdf6ee8c0755cc4ba690e9494e1e2870be697eb |
06-Nov-2012 |
Hung-ying Tyan <tyanh@google.com> |
am 0033497c: am c09daea1: am 23cfddb4: am bdc0f6f2: Merge "Move new exif lib to gallerycommon." into gb-ub-photos-arches * commit '0033497c076ea9c259f97f55a015883047a00af2':
|
abfc2350cb5ca1444564e8927d45344d5a86f619 |
06-Nov-2012 |
George Mount <mount@google.com> |
am f569f0a8: am 71aa2e84: am d5d4246f: am f2272574: am 58d326ea: Merge "Add null-check for StitchingServiceProvider." into gb-ub-photos-arches * commit 'f569f0a8872a8ef9fb9cd10b8092a3e0487056ec':
|
c4706fa402a3fbc712dcdf5fdce1ba354da431e5 |
06-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am aa49998f: (-s ours) am bbd2b8ce: am 541b5568: am 1d25a687: (-s ours) am 73c89b45: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches * commit 'aa49998fc3dc5d1a7002a922bbba661cf0b4037d':
|
3b2d7dd2ddab899c447ce7be2518597f63016858 |
06-Nov-2012 |
John Reck <jreck@google.com> |
am 4e728e9f: am 38d29567: am fdfced2d: am ff4e0460: Merge "Drive GLRootView with Choreographer" into gb-ub-photos-arches * commit '4e728e9faaab24af36e0d8becde0680d5fb5aae4':
|
e1e80a49e1ca2003caae1cbcc61c1b0a53bef01d |
06-Nov-2012 |
Bobby Georgescu <georgescu@google.com> |
am 96487845: am 20a91815: am b21c127c: am e96e907a: Merge "Scroll to placeholder in gallery filmstrip launches camera" into gb-ub-photos-arches * commit '96487845c34d3dd35f23cd35cf401a9e2c1a7b64':
|
31f5768be5b67ef68a6e26b90bd24c501848b5d1 |
06-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am 8610cc6d: (-s ours) am afa18f16: am e2dd5119: (-s ours) am 2ed15703: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev * commit '8610cc6da6a27c875a9a83b76cfb52efcccc4357':
|
3f12b3db03c8623a277791106c6f2c4f7902c692 |
06-Nov-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am 5f83eeb8: am 6d9a6ff8: am 91814c2e: am 168db2f1: Merge "Fix geometry xforms & minor bug." into gb-ub-photos-arches * commit '5f83eeb89ddcb25202b24a82fa9bfa4fef35925c':
|
3ccd8f1c3b507aafacf7d7dde2c54ffc0c9ed519 |
06-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am 2ef3999a: am b2993d29: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev * commit '2ef3999af3edcc146b9c5255c7474f3dbc4d998f': Import translations. DO NOT MERGE
|
7523f22e68f3fd1d589d92580fd4ece40e5abd40 |
06-Nov-2012 |
Bobby Georgescu <georgescu@google.com> |
am 44c66932: am aa43c5e0: am e7e4f11e: am 34347598: am 1dace572: Merge "Better transition between Gallery and editor" into gb-ub-photos-arches * commit '44c66932842f16aaacea084b2b63ea3e964b33f7':
|
988968b56107ccac16e315dc7fce3cd6f6ea5762 |
06-Nov-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am 030d67db: am 4bffa066: am 82a7226c: am 85930f99: am 0a32b7af: Fix to ensure visible history adapter strings are from xml. * commit '030d67db59b927d233ef6804795810759b8ea9bd':
|
593198cfb9d713d96facdee7a543ad6e1970b291 |
06-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am f25c3699: am 8d765a3e: am 2d61ca92: am cd801412: am 51e5b719: Merge "Fix the undo/redo/reset menu item state" into gb-ub-photos-arches * commit 'f25c3699581eccad74f028870605a1d199bda402':
|
9f517b0b086a9443e154a26f945bf31d35e8e151 |
06-Nov-2012 |
Bobby Georgescu <georgescu@google.com> |
am 774843c0: am f38acfe2: am 8374ab71: am b96be14e: am e42eca39: Merge "Tweak transition animations" into gb-ub-photos-arches * commit '774843c08bc87e3b5e1500210337d25ff9dd41a7':
|
8bdfe6a6f5048310ef1ce051f8581bf6a280ab9b |
06-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am 1c528ad8: am 40c5b8a3: am 7741a8e0: am e4614408: am c778aab1: Prevent unveil direction to change as long as no touch up * commit '1c528ad8f1049f026b442af64be64a22d9aabb62':
|
2e1f7ef8fa46edbeb36c3bebc14d04f16a95b67b |
06-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am 6a54ad86: am e9de627f: am 286af73c: am e54e5002: am 15a056e3: Fix crash in Curves module * commit '6a54ad8632077cd85061797ec7c9ae2456fe3435':
|
d11a9a11b062ad6623670f596fe3fb9ee828e0a3 |
06-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am fa5585d9: am 5ad56e6e: am 4e612a39: am 2f4ec4f1: am 104165f1: Fix several issues with crop/straighten * commit 'fa5585d98368fcdc79060156b442727a1c7be232':
|
de47ef81518bf15f585859a94237959abca52199 |
06-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am 443ece63: am e1afb724: am 1684248c: am afc8c49f: am 4d276f33: Only translate the main panel if we have to. * commit '443ece63295326b86147028a5196a57ecd81a97a':
|
7ee1837353878cb3d00b37c6b506c8b61da8989d |
06-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am 1637623a: am 2b8ef050: am 25c35df0: am b1b1b8f0: am 267c4c6a: Revert partially CL https://googleplex-android-review.googlesource.com/#/c/243614/ * commit '1637623ab5cc92079aa55c2130a6d4f2a58d68b7':
|
d0733deaf0b13fec8d0508b48d5e78bb8f1c8d29 |
06-Nov-2012 |
Doris Liu <tianliu@google.com> |
am d53c1125: am e7101a7f: am eae7682e: am 5d4ba127: am 2daced6b: Fix for active action bar in camera * commit 'd53c11255af42caf4cdfa35f6137a6dcebd425d1':
|
53e3ad9055efe791ab8fc5cdc0e1234e41641383 |
06-Nov-2012 |
Sascha Haeberling <haeberling@google.com> |
am 4a0252da: am 2a227625: am 3f8990b6: am a4c85fc1: am 2f879102: Adds a tiny planet (stereographic projection) image filter. * commit '4a0252da46b1b0642f63bc6bbcf219fb10f709d1':
|
e798ded7531576723425255ab820255066f319b0 |
06-Nov-2012 |
John Hoford <hoford@google.com> |
am 333f9c25: am e59ad376: am 172b1b6f: am e6f7fe76: am e9c55b28: Add the infrastructure to support Tiny Planet * commit '333f9c25ec076c84771d5b92831e498fccebf08d':
|
ca93255bbd9f73ab9b92cb68c9c755b20506b274 |
06-Nov-2012 |
Bobby Georgescu <georgescu@google.com> |
am 36e14657: am e07079e9: am c908d79e: am 0def633f: am 41b3cff6: Fix delete and undo behavior on filmstrip * commit '36e146572e5cbf356da5e28bf3d5613c5d1a1cf1':
|
433d6ede07a8703c275e8595dca0508d113ad464 |
06-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am acb4c616: am 2465f514: am 4ff1732d: am be532361: am 3926a685: Merge "Improves swipe gesture" into gb-ub-photos-arches * commit 'acb4c6162f009e704bfb8de6b7f9d9aee1cc06ea':
|
ad5b81cd50e3d41e4cf7590e61c63526b33377a7 |
06-Nov-2012 |
George Mount <mount@google.com> |
am acb317b8: am 57e99ca7: am 1b5a21d2: am 6e806709: am 4dd4d80a: Remove progress bar when switching to grid mode. * commit 'acb317b8e7eb3379fac6448c191388bcd93593e9':
|
d5a48e59b5a09b3be582af59ec79e169dcd880d0 |
06-Nov-2012 |
Bobby Georgescu <georgescu@google.com> |
am 78e359c5: am 5ec47d54: am 23d7dd46: am ddb30c54: am 4883dafd: Merge "Change number of album rows on large screens" into gb-ub-photos-arches * commit '78e359c5269ca5c9714087f74e6c55c6c78f1d76':
|
6b615a4972163a1a87a9bc770d898e84aab5c2f4 |
06-Nov-2012 |
Mangesh Ghiware <mghiware@google.com> |
am 16f23db8: am b7151536: am 21cb756b: am 921b0a70: am ea78390e: Re-enable crop for new panorama * commit '16f23db88e660f3f21dd2650b0131e6791e7768f':
|
c22197127300869454d0772c91c3f387dd9dbbe0 |
06-Nov-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am 1d05f583: am f793b13d: am c6381a2a: am 91491889: am b48d73db: Merge "Fix geometry xforms & minor bug." into gb-ub-photos-arches * commit '1d05f583c18eff63e1548ad7b5e980826b8f3bea':
|
5c019acb38c00318c359d7c4f2ada6ef1575bb7a |
06-Nov-2012 |
Bobby Georgescu <georgescu@google.com> |
am 78f74f80: am 632c127b: am 239bc478: am 5ae82e1e: am 08441371: Merge "Saner behavior when deleting in filmstrip mode" into gb-ub-photos-arches * commit '78f74f80061e66b62e7365c99e212cd1672dbc2f':
|
353c020c0ca4a9817d90fccb10f03363a5357d0c |
06-Nov-2012 |
Mangesh Ghiware <mghiware@google.com> |
am 6b6bc685: am f1267e78: am 5e1709a2: am f795b403: am b037754e: Fix sharing state in Gallery ActionBar * commit '6b6bc68582419bd033542973e966cc8bac305bb0':
|
3a50acb37b38888f32d3722cd43456cebe10537c |
06-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am 957bac06: am 71ee61f2: am 2f7e2992: am 0f327c32: am c5590eb1: Improves Curves & Crop UI * commit '957bac064f6748695764518af1ace82090fedce9':
|
c68a015da5a0ce939cefcd34937a1e12a4a3aa7b |
06-Nov-2012 |
Doris Liu <tianliu@google.com> |
am d6507f06: am c6b5669e: am a175392c: am c0ecc707: am 4b6c20de: Merge "Adding support for tiny planet in gallery" into gb-ub-photos-arches * commit 'd6507f0655c742e3cf0e94cf948e1b50a992d008':
|
aa47d5ad69b49b9fa0443a07d963ebb6e940ef4d |
06-Nov-2012 |
Bobby Georgescu <georgescu@google.com> |
am 6bc29310: am 1a2b00f0: am 52e44d24: am 51283054: am b42ea026: Merge "Fix Gallery crash" into gb-ub-photos-arches * commit '6bc29310c60136a0176bfda84e61c260dd70502a':
|
08e84d656630df83d9611474402db10a13481e29 |
06-Nov-2012 |
Scott Main <smain@google.com> |
am 7a886d49: (-s ours) am 53f0fa40: am b07da381: am 44adb1ee: (-s ours) am 9baf2fd5: (-s ours) DO NOT MERGE cherrypick from Change-Id: I51c6a730e8663586153750a1cda6ea65aad592e8 remove old fashioned Dream, no longer supported * commit '7a886d49e9055d7c42a969551ca7731204a4a723':
|
2bb6dba2cb5197427e78bd95d2fd5a28a397811b |
06-Nov-2012 |
Bobby Georgescu <georgescu@google.com> |
am ce48e21c: am 625bca8d: am 5fd5a8be: am 856ec7e5: am 79704855: Merge "Do not show "Filmstrip view" text when photo is fullscreen" into gb-ub-photos-arches * commit 'ce48e21c9a822a73998a9ae424f4303eea002b1c':
|
d1a507c5e42014754f7aa2d4dee2adf3303246ca |
06-Nov-2012 |
John Reck <jreck@google.com> |
am 1500dec9: am 823ba418: am d2f8bc06: am 5415b4cb: am 014a111f: Save XMP & Exif data on edited photos * commit '1500dec9cbccaf585bea6dab7a782ec60f8484ce':
|
3c5e2ad3feffbe66093830fbf2e3c1680045c8f7 |
06-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am 584d33d9: am 7b26a7df: am 1bde451f: am 8f6e1dc3: am d7899c56: Fix undo/redo/back button behaviour with effects and enable history * commit '584d33d92dbeb517a8580d1a5e915a1eecac50e3':
|
7e590cf2859876a8cbc30725a77d2d593a1d887d |
06-Nov-2012 |
George Mount <mount@google.com> |
am 0b1c9104: am 1cb1d863: am 39f548a5: am b69af65f: am 0745eba4: Merge "Remove panorama checks from supported operations." into gb-ub-photos-arches * commit '0b1c91043e30f79b38564d9edfef52f042c80896':
|
a595c2ffa3fa76942ca5e08e8b5692c66c891de4 |
06-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am fd81d117: am 3e8cd499: am e6e10e32: am f52d90a1: am 60d25279: Handle screen rotation * commit 'fd81d1173fcde9378506f8c587ed3338e8eca630':
|
0890b026341802f3e371772a02e76d2e27ca2b60 |
06-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am 4ffdba59: am 1084e8c5: am a15b5195: am 99679734: am c6ea0400: Merge "Fix broken build" into gb-ub-photos-arches * commit '4ffdba591cd2f0ac88e1ae509a0adeb8c89bf218':
|
fd88e94f85e8903d51ab166e9c9ec2b974e5df9b |
06-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am 236a2912: am e089d77a: am 5206cc56: am ff5061c8: am 4aad8963: Merge "Hide curve channel picker" into gb-ub-photos-arches * commit '236a2912f52074a898fdf41f1bd8296bd1f9efc2':
|
f9b99b4e30c73422df63ca3f4c7896e0e17fd407 |
06-Nov-2012 |
Bobby Georgescu <georgescu@google.com> |
am 1dd25953: am d17aac48: am 3234d83c: am 255dad6d: am 0136dc75: Merge "Various transition tweaks/fixes in Gallery" into gb-ub-photos-arches * commit '1dd259537cc8aa1d399d09150ca14b7327ae6356':
|
e8192dc42fb8cade1b2cc23b8fbc810f8836a007 |
06-Nov-2012 |
Sascha Haeberling <haeberling@google.com> |
am aa5f3fda: am a33c2934: am 8bbc73f4: am e3106a8c: am 2576a29c: First cut at a skeleton for the TinyPlanets filter. * commit 'aa5f3fdaebf999dca0914661426406d0eb385b94':
|
2df4a8cf70d4804c35e4e971e2c55f6668b6638d |
06-Nov-2012 |
Scott Main <smain@google.com> |
am 88a803ad: am 38cd169c: am 28c4d6bb: am aae561e7: Merge "remove old fashioned Dream, no longer supported" into jb-mr1-dev * commit '88a803ad3f5cd6607bc088a2d13cacd289b6195b':
|
8233b1808c9389e3485b16d60ed129a557e9fbeb |
06-Nov-2012 |
Doris Liu <tianliu@google.com> |
am 2ea5d8e7: am 72d55ee5: am d69d5b63: am 7b474a2a: am 08e6b865: Merge "Fix for initial edited picture is gray" into gb-ub-photos-arches * commit '2ea5d8e7ee4db7b595cc2b4731c27c7780c746f3':
|
7cb1538b0d8f4f6217f9fc20ee0c68cfdd8077fe |
06-Nov-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am 35f24825: am f38d2d2b: am 4adc279a: am bc1091bf: am eb4a9359: Fixed initial aspect button text. * commit '35f248256e035c4a4d279bd8dcbac4d893a2e04f':
|
36ff12f57c1bfae5771d8bd87e9430dfa5373733 |
06-Nov-2012 |
Jason Noguchi <jnoguchi@google.com> |
am 0c9fa18d: am 2e31c132: am 7218147e: am 7ad1b755: am ed22e436: Merge "Adding accessor methods for camera latency vars." into gb-ub-photos-arches * commit '0c9fa18d1fe66d81c44fadb5ebe21175a9cc9356':
|
ae9008f46b3cfd01be8958b450c969a68342c6e6 |
06-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am d67ee901: (-s ours) am d94b8927: am 2709de53: am ab81203d: (-s ours) am 12a6e773: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches * commit 'd67ee901ef70d6da3628cc67f50d07d26b012098':
|
dd69d123b0a2f094db9d9cf3e54ee6be6c0a2861 |
06-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am 77e5542b: (-s ours) am 0aab175e: am 19460c5e: (-s ours) am 6e64dcff: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev * commit '77e5542b6a07a05b328fed2ae10af00abec3ccf6':
|
c7374d5c1a2378a685a0cf55a42331429d5b2573 |
06-Nov-2012 |
John Hoford <hoford@google.com> |
am 57900769: am ea7366a5: am 5fbfe6f1: on entry check if Tiny Planet if not remove UI * commit '5790076999dfcd7d8cadb7ce616968a4954a5cc4':
|
d0f095482e9ce76ae4dd3d588aefa671b40a22c4 |
06-Nov-2012 |
Mangesh Ghiware <mghiware@google.com> |
am f7c1c580: am 4a138a84: am 63770752: Merge "Add activity-alias for video camera" into gb-ub-photos-arches * commit 'f7c1c580996c0fd874811871b9ca202cb191b674':
|
33949fc8394ee2601ebb4737106c04e4333551d1 |
06-Nov-2012 |
Bobby Georgescu <georgescu@google.com> |
am 6377a7e8: am 0df51da9: am afa5ac4c: Merge "Minor transition tweaks" into gb-ub-photos-arches * commit '6377a7e8d36a60e0fe5be9854f0112ab5b654e01':
|
23ce59522c304e7c837efe2dac725fcda7a97079 |
06-Nov-2012 |
Bobby Georgescu <georgescu@google.com> |
am 7b3f7fd3: am 1b73272f: am cfbbe15d: am 3536bd34: Merge "Increase album label size on high-res screens" into gb-ub-photos-arches * commit '7b3f7fd3c3848dee9a32ebf259e1fa0edee4fe6f':
|
449cd6064b4035ba8e7a00e0bcfcd0a761f68c0d |
06-Nov-2012 |
Doris Liu <tianliu@google.com> |
am 574be81d: am 7ad3eb28: am 3a64ad36: Merge "Show panorama thumbs in Gallery grid view" into gb-ub-photos-arches * commit '574be81d8b20df74f827bb4a1fba9b969a251102':
|
f569f0a8872a8ef9fb9cd10b8092a3e0487056ec |
06-Nov-2012 |
George Mount <mount@google.com> |
am 71aa2e84: am d5d4246f: am f2272574: am 58d326ea: Merge "Add null-check for StitchingServiceProvider." into gb-ub-photos-arches * commit '71aa2e847f817fbd30d39361b9b83cec1e8efdce':
|
aa49998fc3dc5d1a7002a922bbba661cf0b4037d |
06-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am bbd2b8ce: am 541b5568: am 1d25a687: (-s ours) am 73c89b45: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches * commit 'bbd2b8ce1a6e501b1bd42517b5cce4cb2f463e2a':
|
0033497c076ea9c259f97f55a015883047a00af2 |
06-Nov-2012 |
Hung-ying Tyan <tyanh@google.com> |
am c09daea1: am 23cfddb4: am bdc0f6f2: Merge "Move new exif lib to gallerycommon." into gb-ub-photos-arches * commit 'c09daea126a7f1d609908883958963a99d86e896':
|
8610cc6da6a27c875a9a83b76cfb52efcccc4357 |
06-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am afa18f16: am e2dd5119: (-s ours) am 2ed15703: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev * commit 'afa18f16b64352866f9b5bdb0d0e690827c7ff96':
|
4e728e9faaab24af36e0d8becde0680d5fb5aae4 |
06-Nov-2012 |
John Reck <jreck@google.com> |
am 38d29567: am fdfced2d: am ff4e0460: Merge "Drive GLRootView with Choreographer" into gb-ub-photos-arches * commit '38d295679f6f81313d1e2ec8d4f765255467f267':
|
96487845c34d3dd35f23cd35cf401a9e2c1a7b64 |
06-Nov-2012 |
Bobby Georgescu <georgescu@google.com> |
am 20a91815: am b21c127c: am e96e907a: Merge "Scroll to placeholder in gallery filmstrip launches camera" into gb-ub-photos-arches * commit '20a91815828f7f0a98eb4b577eb9c618b870b1d0':
|
5f83eeb89ddcb25202b24a82fa9bfa4fef35925c |
06-Nov-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am 6d9a6ff8: am 91814c2e: am 168db2f1: Merge "Fix geometry xforms & minor bug." into gb-ub-photos-arches * commit '6d9a6ff8ed24be732f98cb83180f951e871f98dd':
|
2ef3999af3edcc146b9c5255c7474f3dbc4d998f |
06-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am b2993d29: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev * commit 'b2993d29a712533610d7c4b39b31ad74f0d76c68': Import translations. DO NOT MERGE
|
44c66932842f16aaacea084b2b63ea3e964b33f7 |
06-Nov-2012 |
Bobby Georgescu <georgescu@google.com> |
am aa43c5e0: am e7e4f11e: am 34347598: am 1dace572: Merge "Better transition between Gallery and editor" into gb-ub-photos-arches * commit 'aa43c5e0d2a72050d553f9bd28ec573fd5fd254f':
|
030d67db59b927d233ef6804795810759b8ea9bd |
06-Nov-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am 4bffa066: am 82a7226c: am 85930f99: am 0a32b7af: Fix to ensure visible history adapter strings are from xml. * commit '4bffa066f23df50e72bc47a42c61765f3ed9fdc7':
|
f25c3699581eccad74f028870605a1d199bda402 |
06-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am 8d765a3e: am 2d61ca92: am cd801412: am 51e5b719: Merge "Fix the undo/redo/reset menu item state" into gb-ub-photos-arches * commit '8d765a3eaa4f8106d6151f7a86eca293795113f3':
|
774843c08bc87e3b5e1500210337d25ff9dd41a7 |
06-Nov-2012 |
Bobby Georgescu <georgescu@google.com> |
am f38acfe2: am 8374ab71: am b96be14e: am e42eca39: Merge "Tweak transition animations" into gb-ub-photos-arches * commit 'f38acfe26732a6fd4f98a6093a52cab32e630f67':
|
1c528ad8f1049f026b442af64be64a22d9aabb62 |
06-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am 40c5b8a3: am 7741a8e0: am e4614408: am c778aab1: Prevent unveil direction to change as long as no touch up * commit '40c5b8a355f8d347c9ef6f403f93404c27783f99':
|
6a54ad8632077cd85061797ec7c9ae2456fe3435 |
06-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am e9de627f: am 286af73c: am e54e5002: am 15a056e3: Fix crash in Curves module * commit 'e9de627fbc387184ffe69e39ad9fe193f242248f':
|
fa5585d98368fcdc79060156b442727a1c7be232 |
06-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am 5ad56e6e: am 4e612a39: am 2f4ec4f1: am 104165f1: Fix several issues with crop/straighten * commit '5ad56e6e313a4609780a9d4211088bb306ea3adc':
|
443ece63295326b86147028a5196a57ecd81a97a |
06-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am e1afb724: am 1684248c: am afc8c49f: am 4d276f33: Only translate the main panel if we have to. * commit 'e1afb724aa158d82aeae744ffa72d78306a6ef01':
|
1637623ab5cc92079aa55c2130a6d4f2a58d68b7 |
06-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am 2b8ef050: am 25c35df0: am b1b1b8f0: am 267c4c6a: Revert partially CL https://googleplex-android-review.googlesource.com/#/c/243614/ * commit '2b8ef05003876a79189168cbea6460670f0c32fa':
|
d53c11255af42caf4cdfa35f6137a6dcebd425d1 |
06-Nov-2012 |
Doris Liu <tianliu@google.com> |
am e7101a7f: am eae7682e: am 5d4ba127: am 2daced6b: Fix for active action bar in camera * commit 'e7101a7f016b79154ba83e3fc5092cc61cd91a25':
|
4a0252da46b1b0642f63bc6bbcf219fb10f709d1 |
06-Nov-2012 |
Sascha Haeberling <haeberling@google.com> |
am 2a227625: am 3f8990b6: am a4c85fc1: am 2f879102: Adds a tiny planet (stereographic projection) image filter. * commit '2a227625c785fd769fc0e20f7ac6efeedb4cde92':
|
7b3f7fd3c3848dee9a32ebf259e1fa0edee4fe6f |
06-Nov-2012 |
Bobby Georgescu <georgescu@google.com> |
am 1b73272f: am cfbbe15d: am 3536bd34: Merge "Increase album label size on high-res screens" into gb-ub-photos-arches * commit '1b73272f029c89541ad5e230865b50bf4532876a':
|
333f9c25ec076c84771d5b92831e498fccebf08d |
06-Nov-2012 |
John Hoford <hoford@google.com> |
am e59ad376: am 172b1b6f: am e6f7fe76: am e9c55b28: Add the infrastructure to support Tiny Planet * commit 'e59ad37603710c3cef5ff47c323234a7c6db64d9':
|
71aa2e847f817fbd30d39361b9b83cec1e8efdce |
06-Nov-2012 |
George Mount <mount@google.com> |
am d5d4246f: am f2272574: am 58d326ea: Merge "Add null-check for StitchingServiceProvider." into gb-ub-photos-arches * commit 'd5d4246ffcbdfdf491846b1a314fb59064e2f4b4':
|
36e146572e5cbf356da5e28bf3d5613c5d1a1cf1 |
06-Nov-2012 |
Bobby Georgescu <georgescu@google.com> |
am e07079e9: am c908d79e: am 0def633f: am 41b3cff6: Fix delete and undo behavior on filmstrip * commit 'e07079e9709ff9cebfe9ef999083d8fb57a91890':
|
bbd2b8ce1a6e501b1bd42517b5cce4cb2f463e2a |
06-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am 541b5568: am 1d25a687: (-s ours) am 73c89b45: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches * commit '541b5568552c09077b562a284c3b7d24549b2ea2':
|
acb4c6162f009e704bfb8de6b7f9d9aee1cc06ea |
06-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am 2465f514: am 4ff1732d: am be532361: am 3926a685: Merge "Improves swipe gesture" into gb-ub-photos-arches * commit '2465f5145625c1156e4e2edb7f0e55e17af87df7':
|
afa18f16b64352866f9b5bdb0d0e690827c7ff96 |
06-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am e2dd5119: (-s ours) am 2ed15703: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev * commit 'e2dd511925056b11ab12b782e9e80a6a4038f042':
|
acb317b8e7eb3379fac6448c191388bcd93593e9 |
06-Nov-2012 |
George Mount <mount@google.com> |
am 57e99ca7: am 1b5a21d2: am 6e806709: am 4dd4d80a: Remove progress bar when switching to grid mode. * commit '57e99ca7b2e0604b19992dc664c0dbc5ed03aac1':
|
78e359c5269ca5c9714087f74e6c55c6c78f1d76 |
06-Nov-2012 |
Bobby Georgescu <georgescu@google.com> |
am 5ec47d54: am 23d7dd46: am ddb30c54: am 4883dafd: Merge "Change number of album rows on large screens" into gb-ub-photos-arches * commit '5ec47d5448ba83ae7ee61c34a0d7618c84e76f49':
|
16f23db88e660f3f21dd2650b0131e6791e7768f |
06-Nov-2012 |
Mangesh Ghiware <mghiware@google.com> |
am b7151536: am 21cb756b: am 921b0a70: am ea78390e: Re-enable crop for new panorama * commit 'b71515365b2a01594aa6fc5e80f43ff834920b7f':
|
1d05f583c18eff63e1548ad7b5e980826b8f3bea |
06-Nov-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am f793b13d: am c6381a2a: am 91491889: am b48d73db: Merge "Fix geometry xforms & minor bug." into gb-ub-photos-arches * commit 'f793b13d037e6ef388835b74f415e0361281e8e5':
|
78f74f80061e66b62e7365c99e212cd1672dbc2f |
06-Nov-2012 |
Bobby Georgescu <georgescu@google.com> |
am 632c127b: am 239bc478: am 5ae82e1e: am 08441371: Merge "Saner behavior when deleting in filmstrip mode" into gb-ub-photos-arches * commit '632c127be174bbe9474f28f2d0add2e49fdf9208':
|
6b6bc68582419bd033542973e966cc8bac305bb0 |
06-Nov-2012 |
Mangesh Ghiware <mghiware@google.com> |
am f1267e78: am 5e1709a2: am f795b403: am b037754e: Fix sharing state in Gallery ActionBar * commit 'f1267e78cafb3ceb19050e607b3a81bc850756b7':
|
957bac064f6748695764518af1ace82090fedce9 |
06-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am 71ee61f2: am 2f7e2992: am 0f327c32: am c5590eb1: Improves Curves & Crop UI * commit '71ee61f28744c3e6f032c6ae21771d40536b7db0':
|
d6507f0655c742e3cf0e94cf948e1b50a992d008 |
06-Nov-2012 |
Doris Liu <tianliu@google.com> |
am c6b5669e: am a175392c: am c0ecc707: am 4b6c20de: Merge "Adding support for tiny planet in gallery" into gb-ub-photos-arches * commit 'c6b5669e5d281871609d110f6e1b4a30af4d6346':
|
6bc29310c60136a0176bfda84e61c260dd70502a |
06-Nov-2012 |
Bobby Georgescu <georgescu@google.com> |
am 1a2b00f0: am 52e44d24: am 51283054: am b42ea026: Merge "Fix Gallery crash" into gb-ub-photos-arches * commit '1a2b00f0460364715cbdcb5765b3fc1bf47ca1c2':
|
7a886d49e9055d7c42a969551ca7731204a4a723 |
06-Nov-2012 |
Scott Main <smain@google.com> |
am 53f0fa40: am b07da381: am 44adb1ee: (-s ours) am 9baf2fd5: (-s ours) DO NOT MERGE cherrypick from Change-Id: I51c6a730e8663586153750a1cda6ea65aad592e8 remove old fashioned Dream, no longer supported * commit '53f0fa4017f99f9ad9a539074c67003734ef0752':
|
ce48e21c9a822a73998a9ae424f4303eea002b1c |
06-Nov-2012 |
Bobby Georgescu <georgescu@google.com> |
am 625bca8d: am 5fd5a8be: am 856ec7e5: am 79704855: Merge "Do not show "Filmstrip view" text when photo is fullscreen" into gb-ub-photos-arches * commit '625bca8d66db8bf5cfeb87598fc14cafbd2bba4e':
|
1500dec9cbccaf585bea6dab7a782ec60f8484ce |
06-Nov-2012 |
John Reck <jreck@google.com> |
am 823ba418: am d2f8bc06: am 5415b4cb: am 014a111f: Save XMP & Exif data on edited photos * commit '823ba418de80ab9dc81f40faee4ac0c285d7d304':
|
584d33d92dbeb517a8580d1a5e915a1eecac50e3 |
06-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am 7b26a7df: am 1bde451f: am 8f6e1dc3: am d7899c56: Fix undo/redo/back button behaviour with effects and enable history * commit '7b26a7dfc4cb8e236463a9777f03e52209860f29':
|
0b1c91043e30f79b38564d9edfef52f042c80896 |
06-Nov-2012 |
George Mount <mount@google.com> |
am 1cb1d863: am 39f548a5: am b69af65f: am 0745eba4: Merge "Remove panorama checks from supported operations." into gb-ub-photos-arches * commit '1cb1d863456f025e85e56f5b01654a01abd66ee3':
|
fd81d1173fcde9378506f8c587ed3338e8eca630 |
06-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am 3e8cd499: am e6e10e32: am f52d90a1: am 60d25279: Handle screen rotation * commit '3e8cd49920e1bbb49fcea6b4e0fc3f86504b72ee':
|
4ffdba591cd2f0ac88e1ae509a0adeb8c89bf218 |
06-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am 1084e8c5: am a15b5195: am 99679734: am c6ea0400: Merge "Fix broken build" into gb-ub-photos-arches * commit '1084e8c5baacf91eff4aa85b59d73d9ccfd993ca':
|
236a2912f52074a898fdf41f1bd8296bd1f9efc2 |
06-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am e089d77a: am 5206cc56: am ff5061c8: am 4aad8963: Merge "Hide curve channel picker" into gb-ub-photos-arches * commit 'e089d77aa828a4d69ea97c4f185cd4dee0781ae5':
|
c0efe4ae81c1cee5379c65f5ad9fd6993df0855c |
06-Nov-2012 |
Bobby Georgescu <georgescu@google.com> |
am bccb0e67: am f8422e75: am 8cd8a93e: am cc70347d: am 737552d7: Merge "Big refactor, additions to state transition animations" into gb-ub-photos-arches * commit 'bccb0e674aced44afbc98351f8303f6063bc4f98':
|
1dd259537cc8aa1d399d09150ca14b7327ae6356 |
06-Nov-2012 |
Bobby Georgescu <georgescu@google.com> |
am d17aac48: am 3234d83c: am 255dad6d: am 0136dc75: Merge "Various transition tweaks/fixes in Gallery" into gb-ub-photos-arches * commit 'd17aac48699438d2270ed7e9405b0e0106c7c315':
|
1aa2a1b075d0522f6b9de6ae8ea273f5a89f3f6a |
06-Nov-2012 |
Doris Liu <tianliu@google.com> |
am 0c93fd45: am 7f7efb90: am 1febb98e: am 637a7f1b: am 0addfc7f: Save edited picasa to "Edited Online Photos" album * commit '0c93fd45ba54cc38e7c1082b71cac9f687e3e8ab':
|
aa5f3fdaebf999dca0914661426406d0eb385b94 |
06-Nov-2012 |
Sascha Haeberling <haeberling@google.com> |
am a33c2934: am 8bbc73f4: am e3106a8c: am 2576a29c: First cut at a skeleton for the TinyPlanets filter. * commit 'a33c2934e79778d921da2bcb923a4a9f7787c019':
|
810e041825b0e2db54b0aef948a6caf787f2cce1 |
06-Nov-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am 4005fcc5: am d0d21405: am be7c16de: am 5d596558: am ef8597fe: Fixed disappearing aspect ratio button. * commit '4005fcc531157075d69b67c2169f85f3f7429db2':
|
9379d9aee4c48fcababfc09ae2e4ff432dd7ac21 |
06-Nov-2012 |
Doris Liu <tianliu@google.com> |
am 71f42f60: am e78b1def: am 1fd563a6: am 04114762: am 6df6841f: Merge "Update video editor actionbar background assets" into gb-ub-photos-arches * commit '71f42f6012cd4d516a459567869f8983f3294fc5':
|
88a803ad3f5cd6607bc088a2d13cacd289b6195b |
06-Nov-2012 |
Scott Main <smain@google.com> |
am 38cd169c: am 28c4d6bb: am aae561e7: Merge "remove old fashioned Dream, no longer supported" into jb-mr1-dev * commit '38cd169ca5fab55ae21c400824ce42076816c6e3':
|
76f007e2863207a0f97faeede11320e06c079d9a |
06-Nov-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am 6af5340b: am 0f7814ae: am 80e62189: am 193c3f0c: am 3518ff57: Merge "Added support for crop actions. Changed overflow menu to use new editor." into gb-ub-photos-arches * commit '6af5340b8017ca13f9a54f3ee73252c0e421e1c7':
|
2ea5d8e7ee4db7b595cc2b4731c27c7780c746f3 |
06-Nov-2012 |
Doris Liu <tianliu@google.com> |
am 72d55ee5: am d69d5b63: am 7b474a2a: am 08e6b865: Merge "Fix for initial edited picture is gray" into gb-ub-photos-arches * commit '72d55ee5b46939cc7cd3c3ffc9f6c47cbd64894f':
|
68557ddebbc97e68e3512aa7b84a027dcf331517 |
06-Nov-2012 |
John Hoford <hoford@google.com> |
am cea298d1: am cb13a19a: am 5acccefe: am e12e6962: am da974d84: fix crash from configurable slider ranges * commit 'cea298d127fa25779de43947259fc20c87850dfc':
|
35f248256e035c4a4d279bd8dcbac4d893a2e04f |
06-Nov-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am f38d2d2b: am 4adc279a: am bc1091bf: am eb4a9359: Fixed initial aspect button text. * commit 'f38d2d2b14f63fb5cbbe7754dc7c4da43652327c':
|
f2b3923741178aba1b6e600a59726582931f47bb |
06-Nov-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am e5abfc17: am 745448f4: am d0b53c08: am 1056ce1a: am 43b906d8: Moved many strings to xml. Changed UI filter order. Renamed things. * commit 'e5abfc17b9cd3d92e13997f7c379cb64f49636d2':
|
0c9fa18d1fe66d81c44fadb5ebe21175a9cc9356 |
06-Nov-2012 |
Jason Noguchi <jnoguchi@google.com> |
am 2e31c132: am 7218147e: am 7ad1b755: am ed22e436: Merge "Adding accessor methods for camera latency vars." into gb-ub-photos-arches * commit '2e31c132db30d0dd23f4ea31e64b86589342a70a':
|
d67ee901ef70d6da3628cc67f50d07d26b012098 |
06-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am d94b8927: am 2709de53: am ab81203d: (-s ours) am 12a6e773: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches * commit 'd94b89274fe65de03bb18da9303bc759bfca55ed':
|
ae3c1f93a11aa1cd74cd147ad92afc986adee3d6 |
06-Nov-2012 |
John Hoford <hoford@google.com> |
am 7ed5e064: am 02b56f9c: am 272546bb: am abe96287: am de8dbdff: Merge "fix rotating normal images" into gb-ub-photos-arches * commit '7ed5e0648aa524a85e6751172c73fb4d7d6438fa':
|
77e5542b6a07a05b328fed2ae10af00abec3ccf6 |
06-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am 0aab175e: am 19460c5e: (-s ours) am 6e64dcff: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev * commit '0aab175e66e0ee29128c5c6c86931b65fea7c21b':
|
5365ed2892db5825465def9b13066a9cd64837c5 |
06-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am 10634d6c: am c5fe04b3: am 8e71835d: am 21c91bfb: am ef877094: Merge "Fix back button behaviour" into gb-ub-photos-arches * commit '10634d6ca4a7eccb9af22fc8d3dd5de360c93e35':
|
b0e69585802b0b0cb52f607f392a06e1281b1b40 |
06-Nov-2012 |
John Reck <jreck@google.com> |
am 9fd7fe55: am 8bb40f38: am d6d9db90: am d07026bf: am 57731ee2: Only fade out if texture creation succeeded * commit '9fd7fe55f6f59bfe57ed643ded8f1dde86da472a':
|
2d1ec11918d3db7cf5771841620b5f9e853b655e |
06-Nov-2012 |
Mangesh Ghiware <mghiware@google.com> |
am 58f11b73: am 38af3351: am c2c0b1b6: am 07c2c448: am 4104415e: Merge "Add read URI permission to intent returned for GET_CONTENT" into gb-ub-photos-arches * commit '58f11b739a4613f6f311ab7f4ebc6fa0113e74e5':
|
baeb806c8fd6ae7dc45c652e5bb3323f7e5a6b79 |
06-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am 6c86735e: (-s ours) am 2e9229ae: am d0ff9e6b: am 72b0fbef: (-s ours) am 77a8da71: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches * commit '6c86735edd1614e8b92e18011d78313edc1b40f4':
|
6d0dd86158dfe1f49fcb935eace461282b5a6a0f |
06-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am 850fa9cd: (-s ours) am 6e657227: am f71589e4: (-s ours) am 55ec71e7: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev * commit '850fa9cdb847bd8b80f119b43099c6e2dac99d17':
|
aa43c5e0d2a72050d553f9bd28ec573fd5fd254f |
06-Nov-2012 |
Bobby Georgescu <georgescu@google.com> |
am e7e4f11e: am 34347598: am 1dace572: Merge "Better transition between Gallery and editor" into gb-ub-photos-arches * commit 'e7e4f11e28420cc6eb673505e63d57a6467efed3':
|
4bffa066f23df50e72bc47a42c61765f3ed9fdc7 |
06-Nov-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am 82a7226c: am 85930f99: am 0a32b7af: Fix to ensure visible history adapter strings are from xml. * commit '82a7226cd5345c9397302e4951c238d95a5bc35a':
|
8d765a3eaa4f8106d6151f7a86eca293795113f3 |
06-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am 2d61ca92: am cd801412: am 51e5b719: Merge "Fix the undo/redo/reset menu item state" into gb-ub-photos-arches * commit '2d61ca92facb2120b04f589f6a40e7f15e1b6b06':
|
f38acfe26732a6fd4f98a6093a52cab32e630f67 |
06-Nov-2012 |
Bobby Georgescu <georgescu@google.com> |
am 8374ab71: am b96be14e: am e42eca39: Merge "Tweak transition animations" into gb-ub-photos-arches * commit '8374ab719341ce2a1939ebac5322360f008cedbb':
|
40c5b8a355f8d347c9ef6f403f93404c27783f99 |
06-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am 7741a8e0: am e4614408: am c778aab1: Prevent unveil direction to change as long as no touch up * commit '7741a8e07869d9eb9677fa683f0f913ccd84ecf9':
|
e9de627fbc387184ffe69e39ad9fe193f242248f |
06-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am 286af73c: am e54e5002: am 15a056e3: Fix crash in Curves module * commit '286af73cc652d7f9381c33aa303b2581f17ed053':
|
5ad56e6e313a4609780a9d4211088bb306ea3adc |
06-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am 4e612a39: am 2f4ec4f1: am 104165f1: Fix several issues with crop/straighten * commit '4e612a39112808a7978e4c0b21a66fba9091d772':
|
e1afb724aa158d82aeae744ffa72d78306a6ef01 |
06-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am 1684248c: am afc8c49f: am 4d276f33: Only translate the main panel if we have to. * commit '1684248c622f35ba486be58ba8c49919c194b6b4':
|
2b8ef05003876a79189168cbea6460670f0c32fa |
06-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am 25c35df0: am b1b1b8f0: am 267c4c6a: Revert partially CL https://googleplex-android-review.googlesource.com/#/c/243614/ * commit '25c35df06354db9e6a5ff7cacbfa1d967eecb9c1':
|
e7101a7f016b79154ba83e3fc5092cc61cd91a25 |
06-Nov-2012 |
Doris Liu <tianliu@google.com> |
am eae7682e: am 5d4ba127: am 2daced6b: Fix for active action bar in camera * commit 'eae7682e16208fc510cd3a1cd828d597bc93c531':
|
2a227625c785fd769fc0e20f7ac6efeedb4cde92 |
06-Nov-2012 |
Sascha Haeberling <haeberling@google.com> |
am 3f8990b6: am a4c85fc1: am 2f879102: Adds a tiny planet (stereographic projection) image filter. * commit '3f8990b60d4fb858aecdc0039df26ea11bb5152b':
|
e59ad37603710c3cef5ff47c323234a7c6db64d9 |
06-Nov-2012 |
John Hoford <hoford@google.com> |
am 172b1b6f: am e6f7fe76: am e9c55b28: Add the infrastructure to support Tiny Planet * commit '172b1b6f58ef3a727ef2c4ed34cb2e7c0005fe30':
|
e07079e9709ff9cebfe9ef999083d8fb57a91890 |
06-Nov-2012 |
Bobby Georgescu <georgescu@google.com> |
am c908d79e: am 0def633f: am 41b3cff6: Fix delete and undo behavior on filmstrip * commit 'c908d79e8a6b4826ba71830fe8f545c57f8942bb':
|
2465f5145625c1156e4e2edb7f0e55e17af87df7 |
06-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am 4ff1732d: am be532361: am 3926a685: Merge "Improves swipe gesture" into gb-ub-photos-arches * commit '4ff1732d2d0766a139e4a105cfaad6874982ad8a':
|
57e99ca7b2e0604b19992dc664c0dbc5ed03aac1 |
06-Nov-2012 |
George Mount <mount@google.com> |
am 1b5a21d2: am 6e806709: am 4dd4d80a: Remove progress bar when switching to grid mode. * commit '1b5a21d2286d50f1da3a3df0f40c1144c5778882':
|
5ec47d5448ba83ae7ee61c34a0d7618c84e76f49 |
06-Nov-2012 |
Bobby Georgescu <georgescu@google.com> |
am 23d7dd46: am ddb30c54: am 4883dafd: Merge "Change number of album rows on large screens" into gb-ub-photos-arches * commit '23d7dd46aff419f0994840c6a085cc089969b5d7':
|
b71515365b2a01594aa6fc5e80f43ff834920b7f |
06-Nov-2012 |
Mangesh Ghiware <mghiware@google.com> |
am 21cb756b: am 921b0a70: am ea78390e: Re-enable crop for new panorama * commit '21cb756bfa59247b6c897e3b067bed5aed13e033':
|
f793b13d037e6ef388835b74f415e0361281e8e5 |
06-Nov-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am c6381a2a: am 91491889: am b48d73db: Merge "Fix geometry xforms & minor bug." into gb-ub-photos-arches * commit 'c6381a2a6ccf0bb7fba7fa44a1e7786c20f709dd':
|
632c127be174bbe9474f28f2d0add2e49fdf9208 |
06-Nov-2012 |
Bobby Georgescu <georgescu@google.com> |
am 239bc478: am 5ae82e1e: am 08441371: Merge "Saner behavior when deleting in filmstrip mode" into gb-ub-photos-arches * commit '239bc478a7dfa9343eb8b2547fb54172f50e72aa':
|
f1267e78cafb3ceb19050e607b3a81bc850756b7 |
06-Nov-2012 |
Mangesh Ghiware <mghiware@google.com> |
am 5e1709a2: am f795b403: am b037754e: Fix sharing state in Gallery ActionBar * commit '5e1709a237e08cf12e0335796ed17ecb24d5a632':
|
71ee61f28744c3e6f032c6ae21771d40536b7db0 |
06-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am 2f7e2992: am 0f327c32: am c5590eb1: Improves Curves & Crop UI * commit '2f7e2992af1ba12484ee21f4c8d95bfe20496806':
|
bccb0e674aced44afbc98351f8303f6063bc4f98 |
06-Nov-2012 |
Bobby Georgescu <georgescu@google.com> |
am f8422e75: am 8cd8a93e: am cc70347d: am 737552d7: Merge "Big refactor, additions to state transition animations" into gb-ub-photos-arches * commit 'f8422e7526132ee17513dede6403f1aee0227406':
|
c6b5669e5d281871609d110f6e1b4a30af4d6346 |
06-Nov-2012 |
Doris Liu <tianliu@google.com> |
am a175392c: am c0ecc707: am 4b6c20de: Merge "Adding support for tiny planet in gallery" into gb-ub-photos-arches * commit 'a175392c7073819ee6711099d6ce6aa40167b8dd':
|
0c93fd45ba54cc38e7c1082b71cac9f687e3e8ab |
06-Nov-2012 |
Doris Liu <tianliu@google.com> |
am 7f7efb90: am 1febb98e: am 637a7f1b: am 0addfc7f: Save edited picasa to "Edited Online Photos" album * commit '7f7efb9080cb6739ec9d27ffee78a29359115132':
|
1a2b00f0460364715cbdcb5765b3fc1bf47ca1c2 |
06-Nov-2012 |
Bobby Georgescu <georgescu@google.com> |
am 52e44d24: am 51283054: am b42ea026: Merge "Fix Gallery crash" into gb-ub-photos-arches * commit '52e44d249893969910b241aded0f9796d5dfa03d':
|
4005fcc531157075d69b67c2169f85f3f7429db2 |
06-Nov-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am d0d21405: am be7c16de: am 5d596558: am ef8597fe: Fixed disappearing aspect ratio button. * commit 'd0d21405f3d317f06afc0f6584a7184482459a73':
|
71f42f6012cd4d516a459567869f8983f3294fc5 |
06-Nov-2012 |
Doris Liu <tianliu@google.com> |
am e78b1def: am 1fd563a6: am 04114762: am 6df6841f: Merge "Update video editor actionbar background assets" into gb-ub-photos-arches * commit 'e78b1defccc3f2b2a8d9cd2cbaef0747171c9a1a':
|
53f0fa4017f99f9ad9a539074c67003734ef0752 |
06-Nov-2012 |
Scott Main <smain@google.com> |
am b07da381: am 44adb1ee: (-s ours) am 9baf2fd5: (-s ours) DO NOT MERGE cherrypick from Change-Id: I51c6a730e8663586153750a1cda6ea65aad592e8 remove old fashioned Dream, no longer supported * commit 'b07da3812737997ecec4c4a980411b6a8d88caff':
|
625bca8d66db8bf5cfeb87598fc14cafbd2bba4e |
06-Nov-2012 |
Bobby Georgescu <georgescu@google.com> |
am 5fd5a8be: am 856ec7e5: am 79704855: Merge "Do not show "Filmstrip view" text when photo is fullscreen" into gb-ub-photos-arches * commit '5fd5a8be5f387466f2ffc1b89b2356ea2a9bdff1':
|
6af5340b8017ca13f9a54f3ee73252c0e421e1c7 |
06-Nov-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am 0f7814ae: am 80e62189: am 193c3f0c: am 3518ff57: Merge "Added support for crop actions. Changed overflow menu to use new editor." into gb-ub-photos-arches * commit '0f7814ae4c5f53eb365c2707f09845ff2a14561a':
|
cea298d127fa25779de43947259fc20c87850dfc |
06-Nov-2012 |
John Hoford <hoford@google.com> |
am cb13a19a: am 5acccefe: am e12e6962: am da974d84: fix crash from configurable slider ranges * commit 'cb13a19a6cab25e318508dc6651ddf8c77453776':
|
823ba418de80ab9dc81f40faee4ac0c285d7d304 |
06-Nov-2012 |
John Reck <jreck@google.com> |
am d2f8bc06: am 5415b4cb: am 014a111f: Save XMP & Exif data on edited photos * commit 'd2f8bc069269542936f0e21595081093b86fa474':
|
e5abfc17b9cd3d92e13997f7c379cb64f49636d2 |
06-Nov-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am 745448f4: am d0b53c08: am 1056ce1a: am 43b906d8: Moved many strings to xml. Changed UI filter order. Renamed things. * commit '745448f4683d79c6b06ff9b87054e324a05ec897':
|
7ed5e0648aa524a85e6751172c73fb4d7d6438fa |
06-Nov-2012 |
John Hoford <hoford@google.com> |
am 02b56f9c: am 272546bb: am abe96287: am de8dbdff: Merge "fix rotating normal images" into gb-ub-photos-arches * commit '02b56f9c75acd116adac8ec2489360df29b0f551':
|
7b26a7dfc4cb8e236463a9777f03e52209860f29 |
06-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am 1bde451f: am 8f6e1dc3: am d7899c56: Fix undo/redo/back button behaviour with effects and enable history * commit '1bde451f817f716c7091b36dc92f714b69c5b363':
|
10634d6ca4a7eccb9af22fc8d3dd5de360c93e35 |
06-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am c5fe04b3: am 8e71835d: am 21c91bfb: am ef877094: Merge "Fix back button behaviour" into gb-ub-photos-arches * commit 'c5fe04b3ba9621b6a3246e3b5fab12a569db32a1':
|
1cb1d863456f025e85e56f5b01654a01abd66ee3 |
06-Nov-2012 |
George Mount <mount@google.com> |
am 39f548a5: am b69af65f: am 0745eba4: Merge "Remove panorama checks from supported operations." into gb-ub-photos-arches * commit '39f548a5e9764afa105af687e4db15ed8b7c47cd':
|
9fd7fe55f6f59bfe57ed643ded8f1dde86da472a |
06-Nov-2012 |
John Reck <jreck@google.com> |
am 8bb40f38: am d6d9db90: am d07026bf: am 57731ee2: Only fade out if texture creation succeeded * commit '8bb40f38b3bd152bc246cd42133ebeb56529f920':
|
58f11b739a4613f6f311ab7f4ebc6fa0113e74e5 |
06-Nov-2012 |
Mangesh Ghiware <mghiware@google.com> |
am 38af3351: am c2c0b1b6: am 07c2c448: am 4104415e: Merge "Add read URI permission to intent returned for GET_CONTENT" into gb-ub-photos-arches * commit '38af335187bb53a746ddabbad801f8c2f6caaa61':
|
3e8cd49920e1bbb49fcea6b4e0fc3f86504b72ee |
06-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am e6e10e32: am f52d90a1: am 60d25279: Handle screen rotation * commit 'e6e10e3286724adfe24c7783ba12cfe761e36e22':
|
6c86735edd1614e8b92e18011d78313edc1b40f4 |
06-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am 2e9229ae: am d0ff9e6b: am 72b0fbef: (-s ours) am 77a8da71: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches * commit '2e9229ae7927e8bea0d5b5a4e5f1a82021ca7c2b':
|
1084e8c5baacf91eff4aa85b59d73d9ccfd993ca |
06-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am a15b5195: am 99679734: am c6ea0400: Merge "Fix broken build" into gb-ub-photos-arches * commit 'a15b51954535b1f2320a577c0a72c676775f4208':
|
850fa9cdb847bd8b80f119b43099c6e2dac99d17 |
06-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am 6e657227: am f71589e4: (-s ours) am 55ec71e7: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev * commit '6e6572275c4b810281fe261545f8c3b48cf73568':
|
e089d77aa828a4d69ea97c4f185cd4dee0781ae5 |
06-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am 5206cc56: am ff5061c8: am 4aad8963: Merge "Hide curve channel picker" into gb-ub-photos-arches * commit '5206cc568e7b7122a7b7c18ba117d19427ba0671':
|
d17aac48699438d2270ed7e9405b0e0106c7c315 |
06-Nov-2012 |
Bobby Georgescu <georgescu@google.com> |
am 3234d83c: am 255dad6d: am 0136dc75: Merge "Various transition tweaks/fixes in Gallery" into gb-ub-photos-arches * commit '3234d83c379cd65e626adb84a917bb73cb37c6a1':
|
a33c2934e79778d921da2bcb923a4a9f7787c019 |
06-Nov-2012 |
Sascha Haeberling <haeberling@google.com> |
am 8bbc73f4: am e3106a8c: am 2576a29c: First cut at a skeleton for the TinyPlanets filter. * commit '8bbc73f4cf2d29e101e9570a11cd1604460f31ac':
|
38cd169ca5fab55ae21c400824ce42076816c6e3 |
06-Nov-2012 |
Scott Main <smain@google.com> |
am 28c4d6bb: am aae561e7: Merge "remove old fashioned Dream, no longer supported" into jb-mr1-dev * commit '28c4d6bbded4b2702368cc78340e4136d0878525':
|
72d55ee5b46939cc7cd3c3ffc9f6c47cbd64894f |
06-Nov-2012 |
Doris Liu <tianliu@google.com> |
am d69d5b63: am 7b474a2a: am 08e6b865: Merge "Fix for initial edited picture is gray" into gb-ub-photos-arches * commit 'd69d5b639570688122c847898943b1a1bbfa43f0':
|
f38d2d2b14f63fb5cbbe7754dc7c4da43652327c |
06-Nov-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am 4adc279a: am bc1091bf: am eb4a9359: Fixed initial aspect button text. * commit '4adc279a57e3d2436b6861eee760f37a8df2aab9':
|
2e31c132db30d0dd23f4ea31e64b86589342a70a |
06-Nov-2012 |
Jason Noguchi <jnoguchi@google.com> |
am 7218147e: am 7ad1b755: am ed22e436: Merge "Adding accessor methods for camera latency vars." into gb-ub-photos-arches * commit '7218147e6d81315245e3a485fb954761af687b2f':
|
d94b89274fe65de03bb18da9303bc759bfca55ed |
06-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am 2709de53: am ab81203d: (-s ours) am 12a6e773: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches * commit '2709de537dd57a1ac329b35fc29a165aa1e2ae16':
|
0aab175e66e0ee29128c5c6c86931b65fea7c21b |
06-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am 19460c5e: (-s ours) am 6e64dcff: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev * commit '19460c5e8d1bfbdb43c0ec32e05a57458e5561ab':
|
f8422e7526132ee17513dede6403f1aee0227406 |
06-Nov-2012 |
Bobby Georgescu <georgescu@google.com> |
am 8cd8a93e: am cc70347d: am 737552d7: Merge "Big refactor, additions to state transition animations" into gb-ub-photos-arches * commit '8cd8a93eae3158f8469026f65e7d31819ae38fab':
|
7f7efb9080cb6739ec9d27ffee78a29359115132 |
06-Nov-2012 |
Doris Liu <tianliu@google.com> |
am 1febb98e: am 637a7f1b: am 0addfc7f: Save edited picasa to "Edited Online Photos" album * commit '1febb98e498f425935cfafdb492283b42ef61c87':
|
d0d21405f3d317f06afc0f6584a7184482459a73 |
06-Nov-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am be7c16de: am 5d596558: am ef8597fe: Fixed disappearing aspect ratio button. * commit 'be7c16de9647b449ed417ae16315b47aaa143a83':
|
e78b1defccc3f2b2a8d9cd2cbaef0747171c9a1a |
06-Nov-2012 |
Doris Liu <tianliu@google.com> |
am 1fd563a6: am 04114762: am 6df6841f: Merge "Update video editor actionbar background assets" into gb-ub-photos-arches * commit '1fd563a6bc183f573f7f44de5aaa55a4fbc1dbb7':
|
0f7814ae4c5f53eb365c2707f09845ff2a14561a |
06-Nov-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am 80e62189: am 193c3f0c: am 3518ff57: Merge "Added support for crop actions. Changed overflow menu to use new editor." into gb-ub-photos-arches * commit '80e6218918b508f6147c8cc9699df8d338e50a95':
|
cb13a19a6cab25e318508dc6651ddf8c77453776 |
06-Nov-2012 |
John Hoford <hoford@google.com> |
am 5acccefe: am e12e6962: am da974d84: fix crash from configurable slider ranges * commit '5acccefeadeff7ff09683b165ac1516d733bf75b':
|
745448f4683d79c6b06ff9b87054e324a05ec897 |
06-Nov-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am d0b53c08: am 1056ce1a: am 43b906d8: Moved many strings to xml. Changed UI filter order. Renamed things. * commit 'd0b53c08d88a696170989d6c0c72f8cbb26ac654':
|
02b56f9c75acd116adac8ec2489360df29b0f551 |
06-Nov-2012 |
John Hoford <hoford@google.com> |
am 272546bb: am abe96287: am de8dbdff: Merge "fix rotating normal images" into gb-ub-photos-arches * commit '272546bbbfa29cc0fd273003a071e735631a4766':
|
c5fe04b3ba9621b6a3246e3b5fab12a569db32a1 |
06-Nov-2012 |
nicolasroard <nicolasroard@google.com> |
am 8e71835d: am 21c91bfb: am ef877094: Merge "Fix back button behaviour" into gb-ub-photos-arches * commit '8e71835d2d34e33a1622fbf66308fc0ccfc6f876':
|
8bb40f38b3bd152bc246cd42133ebeb56529f920 |
06-Nov-2012 |
John Reck <jreck@google.com> |
am d6d9db90: am d07026bf: am 57731ee2: Only fade out if texture creation succeeded * commit 'd6d9db90be8b088f80c2023c69fbdc0f9e75b816':
|
38af335187bb53a746ddabbad801f8c2f6caaa61 |
06-Nov-2012 |
Mangesh Ghiware <mghiware@google.com> |
am c2c0b1b6: am 07c2c448: am 4104415e: Merge "Add read URI permission to intent returned for GET_CONTENT" into gb-ub-photos-arches * commit 'c2c0b1b623a2091d052362e213d7e8e81a772463':
|
2e9229ae7927e8bea0d5b5a4e5f1a82021ca7c2b |
06-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am d0ff9e6b: am 72b0fbef: (-s ours) am 77a8da71: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches * commit 'd0ff9e6b30fb44a0a9c1984a611703751d682a31':
|
6e6572275c4b810281fe261545f8c3b48cf73568 |
06-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am f71589e4: (-s ours) am 55ec71e7: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev * commit 'f71589e474392a62a41ab22da3bdd14d078611b8':
|
b0e3eba1c4d03192986b6cc240b04cd5c98f620b |
05-Nov-2012 |
Bobby Georgescu <georgescu@google.com> |
Split PhotoPage into FilmstripPage and SinglePhotoPage Bug: 7479348 Change-Id: I98f668bd00e2e09bda9d5d9965fdbdaf1b832bfa
rc/com/android/gallery3d/app/ActivityState.java
rc/com/android/gallery3d/app/AlbumPage.java
rc/com/android/gallery3d/app/AlbumSetPage.java
rc/com/android/gallery3d/app/FilmstripPage.java
rc/com/android/gallery3d/app/Gallery.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/app/SinglePhotoPage.java
|
cfa7fde1a336a3200b2ad9091b27ba7bfd8f5c9a |
05-Nov-2012 |
Bobby Georgescu <georgescu@google.com> |
Split PhotoPage into FilmstripPage and SinglePhotoPage Bug: 7479348 Change-Id: I98f668bd00e2e09bda9d5d9965fdbdaf1b832bfa
rc/com/android/gallery3d/app/ActivityState.java
rc/com/android/gallery3d/app/AlbumPage.java
rc/com/android/gallery3d/app/AlbumSetPage.java
rc/com/android/gallery3d/app/FilmstripPage.java
rc/com/android/gallery3d/app/Gallery.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/app/SinglePhotoPage.java
|
012b31781a00bd66dea9b61209f8fc9a9efc0915 |
05-Nov-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am 3f88803d: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '3f88803dc0d2aebf408dd12860ef101ef79df534':
|
3f88803dc0d2aebf408dd12860ef101ef79df534 |
05-Nov-2012 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with jb-mr1-release - do not merge Change-Id: I2e4981ca363238eaffef17b801ee9f48ce68d7a4
|
67d5821f8b97c431198644825ca9477784128332 |
05-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am 7f0caa64: (-s ours) am 2f0d749f: am 954afb2e: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev * commit '7f0caa642a83020dd2d48f8c50d14f0d3a330fe7': Import translations. DO NOT MERGE
|
7f0caa642a83020dd2d48f8c50d14f0d3a330fe7 |
05-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am 2f0d749f: am 954afb2e: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev * commit '2f0d749f0ad344f27cda2f569e328daa7784b04d': Import translations. DO NOT MERGE
|
2f0d749f0ad344f27cda2f569e328daa7784b04d |
05-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am 954afb2e: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev * commit '954afb2e42b9894676f0e7f9fb9b22d5bcf8825c': Import translations. DO NOT MERGE
|
43ab5e5519fc5a95f45c4f29553b657840989ba7 |
05-Nov-2012 |
Bobby Georgescu <georgescu@google.com> |
Load correct localized album names after language change Bug: 7459805 Change-Id: I484ffea5b07488ffdda2e265c4efa32a3333ea03
rc/com/android/gallery3d/data/LocalAlbum.java
rc/com/android/gallery3d/data/LocalMergeAlbum.java
|
ef1e404cfa1227e309786675a6026dec842b5ab1 |
05-Nov-2012 |
Bobby Georgescu <georgescu@google.com> |
Load correct localized album names after language change Bug: 7459805 Change-Id: I484ffea5b07488ffdda2e265c4efa32a3333ea03
rc/com/android/gallery3d/data/LocalAlbum.java
rc/com/android/gallery3d/data/LocalMergeAlbum.java
|
07c3ab57628b4b962b6369fdee9afe3c45a0c2ba |
05-Nov-2012 |
Doris Liu <tianliu@google.com> |
Adding AccessibilityUtils class Bug: 7434841 All the functions in this class should be backward compatible to gingerbread. Change-Id: I280a64d195b2df123607a5cdad5886e3048dbb92
rc/com/android/gallery3d/util/AccessibilityUtils.java
|
dac50ad01eee55ff85c0ca0854310a0b22b9d3b2 |
05-Nov-2012 |
Doris Liu <tianliu@google.com> |
Adding AccessibilityUtils class Bug: 7434841 All the functions in this class should be backward compatible to gingerbread. Change-Id: I280a64d195b2df123607a5cdad5886e3048dbb92
rc/com/android/gallery3d/util/AccessibilityUtils.java
|
78b21f3bdbcd4f333c992df5ac009f985925addb |
05-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am 954afb2e: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev * commit '954afb2e42b9894676f0e7f9fb9b22d5bcf8825c': Import translations. DO NOT MERGE
|
954afb2e42b9894676f0e7f9fb9b22d5bcf8825c |
05-Nov-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
|
613df30fff8cea9ddfd6547769d8cac6346e11f1 |
04-Nov-2012 |
John Spurlock <jspurlock@google.com> |
Fix the remaining black blip in secure camera transition. Bug:7452928 Change-Id: I3f8acd7304e7ff8423f8b1556ae7b0a55eb5a974
ndroidManifest.xml
|
21f52a50d6b325c9cf86bccbbc05441fb2ba4d36 |
03-Nov-2012 |
Doris Liu <tianliu@google.com> |
Add API check for method announceForAccessibility Bug: 7434841 Change-Id: Ib97a322b4cdb1e1ca81d6ffa092e40f5ae172cb4
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
|
5ea922b6372ff5f58e25e129cbc9461231f972a7 |
03-Nov-2012 |
Doris Liu <tianliu@google.com> |
Add API check for method announceForAccessibility Bug: 7434841 Change-Id: Ib97a322b4cdb1e1ca81d6ffa092e40f5ae172cb4
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
|
fdcec9b0e2583290a9b0e40f628272944d0f2c5f |
03-Nov-2012 |
Doris Liu <tianliu@google.com> |
Add API check for method announceForAccessibility Bug: 7434841 Change-Id: Ib97a322b4cdb1e1ca81d6ffa092e40f5ae172cb4
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
|
fad94797ec01073047da7d4a2aff23dbfce0ac4e |
03-Nov-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
87398a2d95bc36168bfada5318902f4f561d9b27 |
03-Nov-2012 |
Bart Sears <bsears@google.com> |
am b41864f1: (-s ours) Merge "Lock icon in secure album should redirect to gallery after unlock." into gb-ub-photos-arches * commit 'b41864f13b83a4f2d92f601b2e4381762ad1effa': Lock icon in secure album should redirect to gallery after unlock.
|
e6c187db8d5ac6c1c05761475533b151f95a5296 |
03-Nov-2012 |
Bart Sears <bsears@google.com> |
am b41864f1: (-s ours) Merge "Lock icon in secure album should redirect to gallery after unlock." into gb-ub-photos-arches * commit 'b41864f13b83a4f2d92f601b2e4381762ad1effa': Lock icon in secure album should redirect to gallery after unlock.
|
f2944ce89633fdd9934cb8faa4f1c629ba7edd69 |
02-Nov-2012 |
Bart Sears <bsears@google.com> |
am 3cf023fb: am 2ea267c5: am 70fb3773: am b41864f1: Merge "Lock icon in secure album should redirect to gallery after unlock." into gb-ub-photos-arches * commit '3cf023fb28ff7f57bc13cbaf9efdfe7831cd90af': Lock icon in secure album should redirect to gallery after unlock.
|
3cf023fb28ff7f57bc13cbaf9efdfe7831cd90af |
02-Nov-2012 |
Bart Sears <bsears@google.com> |
am 2ea267c5: am 70fb3773: am b41864f1: Merge "Lock icon in secure album should redirect to gallery after unlock." into gb-ub-photos-arches * commit '2ea267c52346e41c8431f398b0b5de5ecb0a12b2': Lock icon in secure album should redirect to gallery after unlock.
|
5c009849cc632750240e8d74a2a717a4ce526518 |
02-Nov-2012 |
Bart Sears <bsears@google.com> |
am 70fb3773: am b41864f1: Merge "Lock icon in secure album should redirect to gallery after unlock." into gb-ub-photos-arches * commit '70fb3773116bacdce3807a6ddfe386b43f4bbe80': Lock icon in secure album should redirect to gallery after unlock.
|
2ea267c52346e41c8431f398b0b5de5ecb0a12b2 |
02-Nov-2012 |
Bart Sears <bsears@google.com> |
am 70fb3773: am b41864f1: Merge "Lock icon in secure album should redirect to gallery after unlock." into gb-ub-photos-arches * commit '70fb3773116bacdce3807a6ddfe386b43f4bbe80': Lock icon in secure album should redirect to gallery after unlock.
|
70fb3773116bacdce3807a6ddfe386b43f4bbe80 |
02-Nov-2012 |
Bart Sears <bsears@google.com> |
am b41864f1: Merge "Lock icon in secure album should redirect to gallery after unlock." into gb-ub-photos-arches * commit 'b41864f13b83a4f2d92f601b2e4381762ad1effa': Lock icon in secure album should redirect to gallery after unlock.
|
b41864f13b83a4f2d92f601b2e4381762ad1effa |
02-Nov-2012 |
Bart Sears <bsears@google.com> |
Merge "Lock icon in secure album should redirect to gallery after unlock." into gb-ub-photos-arches
|
1e631f44710bed324cc1547343eb3f45055912b4 |
02-Nov-2012 |
Angus Kong <shkong@google.com> |
Merge "Don't use activatedBackgroundIndicator under API 14" into gb-ub-photos-bryce
|
08a5029078a477d2d743c6a8b23ccd21a6f2a839 |
02-Nov-2012 |
Angus Kong <shkong@google.com> |
Merge "Don't use activatedBackgroundIndicator under API 14" into gb-ub-photos-bryce
|
7320ada8cb1640b11cf517b3b36f88256cf2df26 |
02-Nov-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am 2b98d9d4: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '2b98d9d4faf91866a31bef4b6422caf950453592':
|
2b98d9d4faf91866a31bef4b6422caf950453592 |
02-Nov-2012 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with jb-mr1-release - do not merge Change-Id: I7f86b6b8a1da7f99d90a50f5ddd17b16b3f68f75
|
a113beaa3b7dfb967841f4f2d96f7998b9452ea2 |
02-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am a327531e: (-s ours) am 144b3ae0: am f350beb8: am 3252800c: (-s ours) Import translations. DO NOT MERGE * commit 'a327531e7cbc908301b809d3febba9c14e518ee5': Import translations. DO NOT MERGE
|
a327531e7cbc908301b809d3febba9c14e518ee5 |
02-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am 144b3ae0: am f350beb8: am 3252800c: (-s ours) Import translations. DO NOT MERGE * commit '144b3ae0d3db4af15c39623412720cb060a8c0aa': Import translations. DO NOT MERGE
|
e5ddbcd2aec57de3db8b56e36253c28e142e0160 |
02-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am 6d43051a: (-s ours) am c7de1cf2: Import translations. DO NOT MERGE * commit '6d43051a91b2d1e57d3b70d086c29c950de6528e': Import translations. DO NOT MERGE
|
a25d2b638427c6c6535f36ac0d5f08fac4866644 |
02-Nov-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE"
|
6d43051a91b2d1e57d3b70d086c29c950de6528e |
02-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am c7de1cf2: Import translations. DO NOT MERGE * commit 'c7de1cf20537df675c8a25e6e01e0939af20fb12': Import translations. DO NOT MERGE
|
144b3ae0d3db4af15c39623412720cb060a8c0aa |
02-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am f350beb8: am 3252800c: (-s ours) Import translations. DO NOT MERGE * commit 'f350beb8c64c38b959f27b9b917cdc58fe72868a': Import translations. DO NOT MERGE
|
5bfc65cc617e05c5a88d4038874e25ccd4018ae9 |
02-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am f350beb8: (-s ours) am 3252800c: (-s ours) Import translations. DO NOT MERGE * commit 'f350beb8c64c38b959f27b9b917cdc58fe72868a': Import translations. DO NOT MERGE
|
7aa856df90fa77cab623a4bb87edf6deb58f2c36 |
02-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am 3252800c: (-s ours) Import translations. DO NOT MERGE * commit '3252800c7fe6bdb69b066eae0db739d06cfec64d': Import translations. DO NOT MERGE
|
1f51d058c016436d46ca1993215b1b4ee5f6c9cc |
02-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am 3252800c: (-s ours) Import translations. DO NOT MERGE * commit '3252800c7fe6bdb69b066eae0db739d06cfec64d': Import translations. DO NOT MERGE
|
f350beb8c64c38b959f27b9b917cdc58fe72868a |
02-Nov-2012 |
Baligh Uddin <baligh@google.com> |
am 3252800c: (-s ours) Import translations. DO NOT MERGE * commit '3252800c7fe6bdb69b066eae0db739d06cfec64d': Import translations. DO NOT MERGE
|
789aefd44a3cb7634ea3c63e8fbe1c7619d7a9a6 |
02-Nov-2012 |
Angus Kong <shkong@google.com> |
Don't use activatedBackgroundIndicator under API 14 bug:7460473 Change-Id: I5d46302e13dfda04f72128329ecea147913ea8d8
es/drawable-hdpi/list_selector_background_selected.9.png
es/drawable-mdpi/list_selector_background_selected.9.png
es/drawable-xhdpi/list_selector_background_selected.9.png
es/drawable/action_bar_two_line_background.xml
es/layout/action_bar_two_line_text.xml
es/values-v14/styles.xml
es/values/styles.xml
|
1cfe5fa35a7f210ee73c7fa29023709c11278b7e |
02-Nov-2012 |
Angus Kong <shkong@google.com> |
Don't use activatedBackgroundIndicator under API 14 bug:7460473 Change-Id: I5d46302e13dfda04f72128329ecea147913ea8d8
es/drawable-hdpi/list_selector_background_selected.9.png
es/drawable-mdpi/list_selector_background_selected.9.png
es/drawable-xhdpi/list_selector_background_selected.9.png
es/drawable/action_bar_two_line_background.xml
es/layout/action_bar_two_line_text.xml
es/values-v14/styles.xml
es/values/styles.xml
|
d270653e91ff15d552d6c94b143e32a70f9610f1 |
02-Nov-2012 |
Wu-cheng Li <wuchengli@google.com> |
Lock icon in secure album should redirect to gallery after unlock. Use FLAG_DISMISS_KEYGUARD so lock screen will be brought up when launching gallery. bug:7462572 Change-Id: I345398cc6cfc09901e1ce8309ebdb65cf15088e0
rc/com/android/gallery3d/app/Gallery.java
rc/com/android/gallery3d/app/PhotoPage.java
|
19ded6d4283a887c579a29da3832dde286e97688 |
02-Nov-2012 |
Wu-cheng Li <wuchengli@google.com> |
Lock icon in secure album should redirect to gallery after unlock. Use FLAG_DISMISS_KEYGUARD so lock screen will be brought up when launching gallery. bug:7462572 Change-Id: I345398cc6cfc09901e1ce8309ebdb65cf15088e0
rc/com/android/gallery3d/app/Gallery.java
rc/com/android/gallery3d/app/PhotoPage.java
|
1145b33525e03ed224704a2d57937390e0c7aeb6 |
02-Nov-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: If30cfedca98dc2f48068c128d934aca84e9ae5e2 Auto-generated-cl: translation import
es/values-nb/photoeditor_strings.xml
es/values-tr/photoeditor_strings.xml
es/values-zh-rTW/photoeditor_strings.xml
|
6bbae286178c294580a0b21cdb3da88afa82473f |
02-Nov-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Idc350fdef00156046051aa3eb90e924785086859 Auto-generated-cl: translation import
es/values-ko/filtershow_strings.xml
es/values-nb/filtershow_strings.xml
es/values-zh-rTW/filtershow_strings.xml
|
ca6b4f813654744d5208f71463ed4adf36159d3b |
02-Nov-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I1a2c893513641927e8324619524c888b7eaa6738 Auto-generated-cl: translation import
es/values-ko/filtershow_strings.xml
es/values-nb/filtershow_strings.xml
es/values-zh-rTW/filtershow_strings.xml
|
ca7635588b19dea6ec9e1f11a0e49e2534e32e8f |
02-Nov-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ie49627da381e12e72468c31322d40bbc3915e7ec Auto-generated-cl: translation import
es/values-ko/filtershow_strings.xml
es/values-nb/filtershow_strings.xml
es/values-zh-rTW/filtershow_strings.xml
|
c7de1cf20537df675c8a25e6e01e0939af20fb12 |
02-Nov-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I981bbec359bbbf1414a78726bc55c20281ebda0f Auto-generated-cl: translation import
es/values-ko/filtershow_strings.xml
es/values-nb/filtershow_strings.xml
es/values-zh-rTW/filtershow_strings.xml
|
d63f4a22f81dcf19c96224a95408d264085d6967 |
02-Nov-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ie16eccac5661ad587f8edc0508b356bc1f16a11b Auto-generated-cl: translation import
es/values-ko/filtershow_strings.xml
es/values-nb/filtershow_strings.xml
es/values-zh-rTW/filtershow_strings.xml
|
4668de503fd7a2aea539c32137175b2735f97ea0 |
02-Nov-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ie16eccac5661ad587f8edc0508b356bc1f16a11b Auto-generated-cl: translation import
es/values-ko/filtershow_strings.xml
es/values-nb/filtershow_strings.xml
es/values-zh-rTW/filtershow_strings.xml
|
f5771aa04eef613960593ab5446ae01ecb4e7069 |
02-Nov-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Iee5cfc87f61245753889d1cc83f9c9a511449bbe Auto-generated-cl: translation import
es/values-ko/filtershow_strings.xml
es/values-nb/filtershow_strings.xml
es/values-zh-rTW/filtershow_strings.xml
|
3252800c7fe6bdb69b066eae0db739d06cfec64d |
02-Nov-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Iee5cfc87f61245753889d1cc83f9c9a511449bbe Auto-generated-cl: translation import
es/values-ko/filtershow_strings.xml
es/values-nb/filtershow_strings.xml
es/values-zh-rTW/filtershow_strings.xml
|
11cb57d0a7f67ec7818f17bcf176cd37fba40504 |
02-Nov-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
7137a97940dc5db445ed88ca04f1b02f2b3fdc67 |
01-Nov-2012 |
George Mount <mount@google.com> |
am cc707c8d: am e016c948: am bd52f5e7: am 25fab805: Merge "Fix extra gray item in secure album." into gb-ub-photos-arches * commit 'cc707c8dc921ff5353f8089224cdf39793297476': Fix extra gray item in secure album.
|
cc707c8dc921ff5353f8089224cdf39793297476 |
01-Nov-2012 |
George Mount <mount@google.com> |
am e016c948: am bd52f5e7: am 25fab805: Merge "Fix extra gray item in secure album." into gb-ub-photos-arches * commit 'e016c9488a36fabb1840906055654156bc7ee9ac': Fix extra gray item in secure album.
|
e016c9488a36fabb1840906055654156bc7ee9ac |
01-Nov-2012 |
George Mount <mount@google.com> |
am bd52f5e7: am 25fab805: Merge "Fix extra gray item in secure album." into gb-ub-photos-arches * commit 'bd52f5e7f8e381b8e7f7d49cd88e5ba6cb46e8b2': Fix extra gray item in secure album.
|
53e69d67316c8ee50429d41a79061507b8bfd89f |
01-Nov-2012 |
George Mount <mount@google.com> |
am bd52f5e7: am 25fab805: Merge "Fix extra gray item in secure album." into gb-ub-photos-arches * commit 'bd52f5e7f8e381b8e7f7d49cd88e5ba6cb46e8b2': Fix extra gray item in secure album.
|
310150da6405d21ebb6db64c2a3d9f7df925f17d |
01-Nov-2012 |
George Mount <mount@google.com> |
am 25fab805: Merge "Fix extra gray item in secure album." into gb-ub-photos-arches * commit '25fab8057e0db4b1ff33b8da13b270d9af8ae217': Fix extra gray item in secure album.
|
644101695e23bf682de4ac9e62569ea79cfef0bc |
01-Nov-2012 |
George Mount <mount@google.com> |
am 25fab805: Merge "Fix extra gray item in secure album." into gb-ub-photos-arches * commit '25fab8057e0db4b1ff33b8da13b270d9af8ae217': Fix extra gray item in secure album.
|
bd52f5e7f8e381b8e7f7d49cd88e5ba6cb46e8b2 |
01-Nov-2012 |
George Mount <mount@google.com> |
am 25fab805: Merge "Fix extra gray item in secure album." into gb-ub-photos-arches * commit '25fab8057e0db4b1ff33b8da13b270d9af8ae217': Fix extra gray item in secure album.
|
2e13c999e8f63296e643e9a921950f3b964b3eff |
01-Nov-2012 |
George Mount <mount@google.com> |
Merge "Fix extra gray item in secure album." into gb-ub-photos-arches
|
25fab8057e0db4b1ff33b8da13b270d9af8ae217 |
01-Nov-2012 |
George Mount <mount@google.com> |
Merge "Fix extra gray item in secure album." into gb-ub-photos-arches
|
2b27700859836fc452f777ac53ea7ed3e8849892 |
01-Nov-2012 |
Bart Sears <bsears@google.com> |
am 093822b3: am ffb98755: am 77262bd5: am 40bb7158: Merge "Jump to lockscreen in secure album if tap on video" into gb-ub-photos-arches * commit '093822b3fee2bc0e735a78293d505b1508138437': Jump to lockscreen in secure album if tap on video
|
093822b3fee2bc0e735a78293d505b1508138437 |
01-Nov-2012 |
Bart Sears <bsears@google.com> |
am ffb98755: am 77262bd5: am 40bb7158: Merge "Jump to lockscreen in secure album if tap on video" into gb-ub-photos-arches * commit 'ffb987554d8817b63c717deba450d4997ee47524': Jump to lockscreen in secure album if tap on video
|
306ec5fdd04fe8486ba048625ab0de5bf057d65a |
01-Nov-2012 |
Bart Sears <bsears@google.com> |
am 77262bd5: am 40bb7158: Merge "Jump to lockscreen in secure album if tap on video" into gb-ub-photos-arches * commit '77262bd58f4aba9bdb961c7a9be856502e120fb8': Jump to lockscreen in secure album if tap on video
|
ffb987554d8817b63c717deba450d4997ee47524 |
01-Nov-2012 |
Bart Sears <bsears@google.com> |
am 77262bd5: am 40bb7158: Merge "Jump to lockscreen in secure album if tap on video" into gb-ub-photos-arches * commit '77262bd58f4aba9bdb961c7a9be856502e120fb8': Jump to lockscreen in secure album if tap on video
|
c9912a4bf1540ce0f6f55d6997aacce494df475c |
01-Nov-2012 |
Sascha Haeberling <haeberling@google.com> |
am 804bd748: am 3084fd8f: am 452ce867: am 769d38db: Fix tiny planet not using XMP metadata anymore * commit '804bd7482f82ba23151702e03f8020ac03c5b6e4': Fix tiny planet not using XMP metadata anymore
|
ae448c720c14ded7a86e825ad5f8a3bb4194f2a6 |
01-Nov-2012 |
Bart Sears <bsears@google.com> |
am 40bb7158: Merge "Jump to lockscreen in secure album if tap on video" into gb-ub-photos-arches * commit '40bb7158b8bda53433b36b94d6efed0e3937dcf2': Jump to lockscreen in secure album if tap on video
|
22151ee069f8f4a64cd51ddbe36aac294d19e234 |
01-Nov-2012 |
Bart Sears <bsears@google.com> |
am 40bb7158: Merge "Jump to lockscreen in secure album if tap on video" into gb-ub-photos-arches * commit '40bb7158b8bda53433b36b94d6efed0e3937dcf2': Jump to lockscreen in secure album if tap on video
|
77262bd58f4aba9bdb961c7a9be856502e120fb8 |
01-Nov-2012 |
Bart Sears <bsears@google.com> |
am 40bb7158: Merge "Jump to lockscreen in secure album if tap on video" into gb-ub-photos-arches * commit '40bb7158b8bda53433b36b94d6efed0e3937dcf2': Jump to lockscreen in secure album if tap on video
|
804bd7482f82ba23151702e03f8020ac03c5b6e4 |
01-Nov-2012 |
Sascha Haeberling <haeberling@google.com> |
am 3084fd8f: am 452ce867: am 769d38db: Fix tiny planet not using XMP metadata anymore * commit '3084fd8f724d367c6b747babdf7ee11394b958fa': Fix tiny planet not using XMP metadata anymore
|
d21d2aea8015ea6234819e8e5c616421858077ca |
01-Nov-2012 |
Bart Sears <bsears@google.com> |
Merge "Jump to lockscreen in secure album if tap on video" into gb-ub-photos-arches
|
40bb7158b8bda53433b36b94d6efed0e3937dcf2 |
01-Nov-2012 |
Bart Sears <bsears@google.com> |
Merge "Jump to lockscreen in secure album if tap on video" into gb-ub-photos-arches
|
3084fd8f724d367c6b747babdf7ee11394b958fa |
01-Nov-2012 |
Sascha Haeberling <haeberling@google.com> |
am 452ce867: am 769d38db: Fix tiny planet not using XMP metadata anymore * commit '452ce867e9d5837ede2e67d75fdaf07fb8ffcd57': Fix tiny planet not using XMP metadata anymore
|
d1dbc5151969ecc83f94a4a7dfbd79629f1870d0 |
01-Nov-2012 |
Sascha Haeberling <haeberling@google.com> |
am 452ce867: am 769d38db: Fix tiny planet not using XMP metadata anymore * commit '452ce867e9d5837ede2e67d75fdaf07fb8ffcd57': Fix tiny planet not using XMP metadata anymore
|
e226d337ec69337fb35c664fda8c83ac7e54c36a |
01-Nov-2012 |
Sascha Haeberling <haeberling@google.com> |
am 769d38db: Fix tiny planet not using XMP metadata anymore * commit '769d38db5736cd690ab7837c0824572739c39184': Fix tiny planet not using XMP metadata anymore
|
74ecfe19c3b5f49b1305a496033be67bbf6d0293 |
01-Nov-2012 |
Sascha Haeberling <haeberling@google.com> |
am 769d38db: Fix tiny planet not using XMP metadata anymore * commit '769d38db5736cd690ab7837c0824572739c39184': Fix tiny planet not using XMP metadata anymore
|
452ce867e9d5837ede2e67d75fdaf07fb8ffcd57 |
01-Nov-2012 |
Sascha Haeberling <haeberling@google.com> |
am 769d38db: Fix tiny planet not using XMP metadata anymore * commit '769d38db5736cd690ab7837c0824572739c39184': Fix tiny planet not using XMP metadata anymore
|
91ee484aa3092135bf05b4d62e4fc025321ae62b |
01-Nov-2012 |
George Mount <mount@google.com> |
Fix extra gray item in secure album. Bug 7454444 Change-Id: I83f40e7e74f658a7b9ada148932a231ef8c31f73
rc/com/android/gallery3d/data/SecureAlbum.java
|
78ea143fe02847b70d8669c79de5d54fd89fdd63 |
01-Nov-2012 |
George Mount <mount@google.com> |
Fix extra gray item in secure album. Bug 7454444 Change-Id: I83f40e7e74f658a7b9ada148932a231ef8c31f73
rc/com/android/gallery3d/data/SecureAlbum.java
|
6a1d27eb31b4d1e854b44f6c6652a4cbe29eee1f |
01-Nov-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am 061f35f3: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '061f35f31e408860c8065fd637efe8ef1a14c840':
|
061f35f31e408860c8065fd637efe8ef1a14c840 |
01-Nov-2012 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with jb-mr1-release - do not merge Change-Id: I996e6bea19513302d3d40c861c364c40f84f580b
|
c57b37c608f13d35fe4000870421aebb68f10b03 |
01-Nov-2012 |
Angus Kong <shkong@google.com> |
Jump to lockscreen in secure album if tap on video bug:7454356 Change-Id: I1e7e9ed886d414d5b41abdb1cc1d00c7736ae006
rc/com/android/gallery3d/app/PhotoPage.java
|
3935ca3762344c5f8a306596d70c0d4d4a2fda4b |
01-Nov-2012 |
Angus Kong <shkong@google.com> |
Jump to lockscreen in secure album if tap on video bug:7454356 Change-Id: I1e7e9ed886d414d5b41abdb1cc1d00c7736ae006
rc/com/android/gallery3d/app/PhotoPage.java
|
d60349fc2d23779a217d44e8a319f9cfdd4d2ecf |
01-Nov-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
4f4c036e8537ab76301f7ad0faadf42a15538d7e |
01-Nov-2012 |
Sascha Haeberling <haeberling@google.com> |
Fix tiny planet not using XMP metadata anymore Bug: 7452777 Background: Semantics of isPanoramaSafe has changed and should not be called from within the TinyPlanet filter at all. Change-Id: I6bada525d30d9ff21fdff99f52c6697c3f828c7e
rc/com/android/gallery3d/filtershow/filters/ImageFilterTinyPlanet.java
|
769d38db5736cd690ab7837c0824572739c39184 |
01-Nov-2012 |
Sascha Haeberling <haeberling@google.com> |
Fix tiny planet not using XMP metadata anymore Bug: 7452777 Background: Semantics of isPanoramaSafe has changed and should not be called from within the TinyPlanet filter at all. Change-Id: I6bada525d30d9ff21fdff99f52c6697c3f828c7e
rc/com/android/gallery3d/filtershow/filters/ImageFilterTinyPlanet.java
|
37dfa8109d0147a076bdc64bca696a494dce756e |
01-Nov-2012 |
Bobby Georgescu <georgescu@google.com> |
Use the system-standard long press vibration pattern Bug: 7216819 Change-Id: I575868583777a7a953d767d0cdaa91a439d908ff
rc/com/android/gallery3d/app/ActivityState.java
rc/com/android/gallery3d/app/AlbumPage.java
rc/com/android/gallery3d/app/AlbumSetPage.java
|
bcb427870043b12d4a1a454c08a088933d0eaf23 |
01-Nov-2012 |
Bobby Georgescu <georgescu@google.com> |
Use the system-standard long press vibration pattern Bug: 7216819 Change-Id: I575868583777a7a953d767d0cdaa91a439d908ff
rc/com/android/gallery3d/app/ActivityState.java
rc/com/android/gallery3d/app/AlbumPage.java
rc/com/android/gallery3d/app/AlbumSetPage.java
|
1d0d5cbf663a76f5cb2769621d39a83256943de9 |
01-Nov-2012 |
Doris Liu <tianliu@google.com> |
Disable operations when no item is selected Bug: 7441208 Change-Id: I2f435ad8aa0b578ecfec426f7ad6287f0f210f48
rc/com/android/gallery3d/ui/ActionModeHandler.java
|
2b85f0d788b9759dad3632561896e6c5dcbd4f99 |
01-Nov-2012 |
Doris Liu <tianliu@google.com> |
Disable operations when no item is selected Bug: 7441208 Change-Id: I2f435ad8aa0b578ecfec426f7ad6287f0f210f48
rc/com/android/gallery3d/ui/ActionModeHandler.java
|
e8cd59bd5446556bfbb53cea49330388d51e5e0d |
31-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Fix jank on videoplayer auto-exit" into gb-ub-photos-bryce
|
2a11af39cfc36e182778f9373971d086e782de7a |
31-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Fix jank on videoplayer auto-exit" into gb-ub-photos-bryce
|
7c4f8a67a797195b8f4457ba167182e7fb92e7d7 |
31-Oct-2012 |
John Reck <jreck@google.com> |
Merge "Gingerbread support-ish" into gb-ub-photos-bryce
|
3b308b8764bb7e43899a34de3ff4b04f93298250 |
31-Oct-2012 |
John Reck <jreck@google.com> |
Merge "Gingerbread support-ish" into gb-ub-photos-bryce
|
f48bb61af31baf0359558351e40b2aeb11a916fa |
31-Oct-2012 |
John Reck <jreck@google.com> |
Merge "Gingerbread support-ish" into gb-ub-photos-bryce
|
e0f2b83e95f77b480d65ae6f26022663a9df7bf1 |
31-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am 65ca3a1b: (-s ours) am 13193c12: am 8405f65e: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev * commit '65ca3a1b08752a68f9a1e5ecdf920cf9cacb813d': Import translations. DO NOT MERGE
|
4bb76aba9cfce93753c85ce8c5a174611bc53236 |
31-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am 77d99553: (-s ours) am 278e1637: am f09fa2bf: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev * commit '77d99553eb50a5e6f7def872514c0d96339cb0d5': Import translations. DO NOT MERGE
|
65ca3a1b08752a68f9a1e5ecdf920cf9cacb813d |
31-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am 13193c12: am 8405f65e: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev * commit '13193c12856d2ddb8caa78fd0f9772cb8fed7b4c': Import translations. DO NOT MERGE
|
77d99553eb50a5e6f7def872514c0d96339cb0d5 |
31-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am 278e1637: am f09fa2bf: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev * commit '278e1637068e4ccbee348a67abb974cfa2c792a9': Import translations. DO NOT MERGE
|
051b6cdd8faf7985490c4682af8c81bc316cfaa3 |
31-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am 8405f65e: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev * commit '8405f65e8b3a671562ea215b06ae91512a4734d7': Import translations. DO NOT MERGE
|
af479cb3b6ca11e846e5d7e19f546776fb7a08cc |
31-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am f09fa2bf: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev * commit 'f09fa2bf45d92e0284212960d73080d825e39351': Import translations. DO NOT MERGE
|
13193c12856d2ddb8caa78fd0f9772cb8fed7b4c |
31-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am 8405f65e: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev * commit '8405f65e8b3a671562ea215b06ae91512a4734d7': Import translations. DO NOT MERGE
|
278e1637068e4ccbee348a67abb974cfa2c792a9 |
31-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am f09fa2bf: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev * commit 'f09fa2bf45d92e0284212960d73080d825e39351': Import translations. DO NOT MERGE
|
bc7949a0bb4c1d69ca7dd395f4aeecabafc1b610 |
31-Oct-2012 |
John Reck <jreck@google.com> |
Gingerbread support-ish This reverts commit 1336062985c9824d7fd796b1cebd5eaa8e4163ca. Change-Id: I718ec56315dc207a3e612abb4576bddab9afa2ee
ndroid.mk
|
50e6182c8d6b9e6eba61fa3906c0ff348764efd8 |
31-Oct-2012 |
John Reck <jreck@google.com> |
Gingerbread support-ish This reverts commit 1336062985c9824d7fd796b1cebd5eaa8e4163ca. Change-Id: I718ec56315dc207a3e612abb4576bddab9afa2ee
ctionbarsherlock/res/color/abs__primary_text_disable_only_holo_dark.xml
ctionbarsherlock/res/color/abs__primary_text_disable_only_holo_light.xml
ctionbarsherlock/res/color/abs__primary_text_holo_dark.xml
ctionbarsherlock/res/color/abs__primary_text_holo_light.xml
ctionbarsherlock/res/drawable-hdpi/abs__ab_bottom_solid_dark_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_bottom_solid_inverse_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_bottom_solid_light_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_bottom_transparent_dark_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_bottom_transparent_light_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_share_pack_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_share_pack_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_solid_dark_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_solid_light_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_solid_shadow_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_stacked_solid_dark_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_stacked_solid_light_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_stacked_transparent_dark_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_stacked_transparent_light_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_transparent_dark_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_transparent_light_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__btn_cab_done_default_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__btn_cab_done_default_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__btn_cab_done_focused_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__btn_cab_done_focused_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__btn_cab_done_pressed_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__btn_cab_done_pressed_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__cab_background_bottom_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__cab_background_bottom_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__cab_background_top_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__cab_background_top_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__dialog_full_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__dialog_full_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ic_ab_back_holo_dark.png
ctionbarsherlock/res/drawable-hdpi/abs__ic_ab_back_holo_light.png
ctionbarsherlock/res/drawable-hdpi/abs__ic_cab_done_holo_dark.png
ctionbarsherlock/res/drawable-hdpi/abs__ic_cab_done_holo_light.png
ctionbarsherlock/res/drawable-hdpi/abs__ic_menu_moreoverflow_normal_holo_dark.png
ctionbarsherlock/res/drawable-hdpi/abs__ic_menu_moreoverflow_normal_holo_light.png
ctionbarsherlock/res/drawable-hdpi/abs__ic_menu_share_holo_dark.png
ctionbarsherlock/res/drawable-hdpi/abs__ic_menu_share_holo_light.png
ctionbarsherlock/res/drawable-hdpi/abs__list_activated_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__list_divider_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__list_divider_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__list_focused_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__list_longpressed_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__list_pressed_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__list_pressed_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__list_selector_disabled_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__list_selector_disabled_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__menu_dropdown_panel_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__menu_dropdown_panel_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__progress_bg_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__progress_bg_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__progress_primary_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__progress_primary_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__progress_secondary_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__progress_secondary_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__spinner_48_inner_holo.png
ctionbarsherlock/res/drawable-hdpi/abs__spinner_48_outer_holo.png
ctionbarsherlock/res/drawable-hdpi/abs__spinner_ab_default_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__spinner_ab_default_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__spinner_ab_disabled_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__spinner_ab_disabled_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__spinner_ab_focused_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__spinner_ab_focused_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__spinner_ab_pressed_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__spinner_ab_pressed_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__tab_selected_focused_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__tab_selected_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__tab_selected_pressed_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__tab_unselected_pressed_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_bottom_solid_dark_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_bottom_solid_inverse_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_bottom_solid_light_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_bottom_transparent_dark_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_bottom_transparent_light_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_share_pack_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_share_pack_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_solid_dark_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_solid_light_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_solid_shadow_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_stacked_solid_dark_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_stacked_solid_light_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_stacked_transparent_dark_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_stacked_transparent_light_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_transparent_dark_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_transparent_light_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__btn_cab_done_default_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__btn_cab_done_default_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__btn_cab_done_focused_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__btn_cab_done_focused_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__btn_cab_done_pressed_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__btn_cab_done_pressed_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__cab_background_bottom_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__cab_background_bottom_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__cab_background_top_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__cab_background_top_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__dialog_full_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__dialog_full_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ic_ab_back_holo_dark.png
ctionbarsherlock/res/drawable-mdpi/abs__ic_ab_back_holo_light.png
ctionbarsherlock/res/drawable-mdpi/abs__ic_cab_done_holo_dark.png
ctionbarsherlock/res/drawable-mdpi/abs__ic_cab_done_holo_light.png
ctionbarsherlock/res/drawable-mdpi/abs__ic_menu_moreoverflow_normal_holo_dark.png
ctionbarsherlock/res/drawable-mdpi/abs__ic_menu_moreoverflow_normal_holo_light.png
ctionbarsherlock/res/drawable-mdpi/abs__ic_menu_share_holo_dark.png
ctionbarsherlock/res/drawable-mdpi/abs__ic_menu_share_holo_light.png
ctionbarsherlock/res/drawable-mdpi/abs__list_activated_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__list_divider_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__list_divider_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__list_focused_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__list_longpressed_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__list_pressed_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__list_pressed_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__list_selector_disabled_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__list_selector_disabled_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__menu_dropdown_panel_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__menu_dropdown_panel_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__progress_bg_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__progress_bg_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__progress_primary_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__progress_primary_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__progress_secondary_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__progress_secondary_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__spinner_48_inner_holo.png
ctionbarsherlock/res/drawable-mdpi/abs__spinner_48_outer_holo.png
ctionbarsherlock/res/drawable-mdpi/abs__spinner_ab_default_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__spinner_ab_default_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__spinner_ab_disabled_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__spinner_ab_disabled_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__spinner_ab_focused_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__spinner_ab_focused_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__spinner_ab_pressed_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__spinner_ab_pressed_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__tab_selected_focused_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__tab_selected_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__tab_selected_pressed_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__tab_unselected_pressed_holo.9.png
ctionbarsherlock/res/drawable-v11/abs__progress_medium_holo.xml
ctionbarsherlock/res/drawable-xhdpi/abs__ab_bottom_solid_dark_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_bottom_solid_inverse_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_bottom_solid_light_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_bottom_transparent_dark_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_bottom_transparent_light_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_share_pack_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_share_pack_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_solid_dark_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_solid_light_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_solid_shadow_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_stacked_solid_dark_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_stacked_solid_light_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_stacked_transparent_dark_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_stacked_transparent_light_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_transparent_dark_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_transparent_light_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__btn_cab_done_default_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__btn_cab_done_default_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__btn_cab_done_focused_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__btn_cab_done_focused_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__btn_cab_done_pressed_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__btn_cab_done_pressed_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__cab_background_bottom_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__cab_background_bottom_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__cab_background_top_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__cab_background_top_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__dialog_full_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__dialog_full_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ic_ab_back_holo_dark.png
ctionbarsherlock/res/drawable-xhdpi/abs__ic_ab_back_holo_light.png
ctionbarsherlock/res/drawable-xhdpi/abs__ic_cab_done_holo_dark.png
ctionbarsherlock/res/drawable-xhdpi/abs__ic_cab_done_holo_light.png
ctionbarsherlock/res/drawable-xhdpi/abs__ic_menu_moreoverflow_normal_holo_dark.png
ctionbarsherlock/res/drawable-xhdpi/abs__ic_menu_moreoverflow_normal_holo_light.png
ctionbarsherlock/res/drawable-xhdpi/abs__ic_menu_share_holo_dark.png
ctionbarsherlock/res/drawable-xhdpi/abs__ic_menu_share_holo_light.png
ctionbarsherlock/res/drawable-xhdpi/abs__list_activated_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__list_divider_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__list_divider_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__list_focused_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__list_longpressed_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__list_pressed_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__list_pressed_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__list_selector_disabled_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__list_selector_disabled_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__menu_dropdown_panel_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__menu_dropdown_panel_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__progress_bg_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__progress_bg_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__progress_primary_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__progress_primary_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__progress_secondary_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__progress_secondary_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__spinner_48_inner_holo.png
ctionbarsherlock/res/drawable-xhdpi/abs__spinner_48_outer_holo.png
ctionbarsherlock/res/drawable-xhdpi/abs__spinner_ab_default_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__spinner_ab_default_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__spinner_ab_disabled_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__spinner_ab_disabled_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__spinner_ab_focused_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__spinner_ab_focused_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__spinner_ab_pressed_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__spinner_ab_pressed_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__tab_selected_focused_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__tab_selected_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__tab_selected_pressed_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__tab_unselected_pressed_holo.9.png
ctionbarsherlock/res/drawable/abs__activated_background_holo_dark.xml
ctionbarsherlock/res/drawable/abs__activated_background_holo_light.xml
ctionbarsherlock/res/drawable/abs__btn_cab_done_holo_dark.xml
ctionbarsherlock/res/drawable/abs__btn_cab_done_holo_light.xml
ctionbarsherlock/res/drawable/abs__ic_menu_moreoverflow_holo_dark.xml
ctionbarsherlock/res/drawable/abs__ic_menu_moreoverflow_holo_light.xml
ctionbarsherlock/res/drawable/abs__item_background_holo_dark.xml
ctionbarsherlock/res/drawable/abs__item_background_holo_light.xml
ctionbarsherlock/res/drawable/abs__list_selector_background_transition_holo_dark.xml
ctionbarsherlock/res/drawable/abs__list_selector_background_transition_holo_light.xml
ctionbarsherlock/res/drawable/abs__list_selector_holo_dark.xml
ctionbarsherlock/res/drawable/abs__list_selector_holo_light.xml
ctionbarsherlock/res/drawable/abs__progress_horizontal_holo_dark.xml
ctionbarsherlock/res/drawable/abs__progress_horizontal_holo_light.xml
ctionbarsherlock/res/drawable/abs__progress_medium_holo.xml
ctionbarsherlock/res/drawable/abs__spinner_ab_holo_dark.xml
ctionbarsherlock/res/drawable/abs__spinner_ab_holo_light.xml
ctionbarsherlock/res/drawable/abs__tab_indicator_ab_holo.xml
ctionbarsherlock/res/layout-large/abs__action_mode_close_item.xml
ctionbarsherlock/res/layout-v14/sherlock_spinner_dropdown_item.xml
ctionbarsherlock/res/layout-v14/sherlock_spinner_item.xml
ctionbarsherlock/res/layout-xlarge/abs__screen_action_bar.xml
ctionbarsherlock/res/layout-xlarge/abs__screen_action_bar_overlay.xml
ctionbarsherlock/res/layout/abs__action_bar_home.xml
ctionbarsherlock/res/layout/abs__action_bar_tab.xml
ctionbarsherlock/res/layout/abs__action_bar_tab_bar_view.xml
ctionbarsherlock/res/layout/abs__action_bar_title_item.xml
ctionbarsherlock/res/layout/abs__action_menu_item_layout.xml
ctionbarsherlock/res/layout/abs__action_menu_layout.xml
ctionbarsherlock/res/layout/abs__action_mode_bar.xml
ctionbarsherlock/res/layout/abs__action_mode_close_item.xml
ctionbarsherlock/res/layout/abs__activity_chooser_view.xml
ctionbarsherlock/res/layout/abs__activity_chooser_view_list_item.xml
ctionbarsherlock/res/layout/abs__dialog_title_holo.xml
ctionbarsherlock/res/layout/abs__list_menu_item_checkbox.xml
ctionbarsherlock/res/layout/abs__list_menu_item_icon.xml
ctionbarsherlock/res/layout/abs__list_menu_item_layout.xml
ctionbarsherlock/res/layout/abs__list_menu_item_radio.xml
ctionbarsherlock/res/layout/abs__popup_menu_item_layout.xml
ctionbarsherlock/res/layout/abs__screen_action_bar.xml
ctionbarsherlock/res/layout/abs__screen_action_bar_overlay.xml
ctionbarsherlock/res/layout/abs__screen_simple.xml
ctionbarsherlock/res/layout/abs__screen_simple_overlay_action_mode.xml
ctionbarsherlock/res/layout/sherlock_spinner_dropdown_item.xml
ctionbarsherlock/res/layout/sherlock_spinner_item.xml
ctionbarsherlock/res/values-land/abs__dimens.xml
ctionbarsherlock/res/values-large-hdpi-1024x600/abs__dimens.xml
ctionbarsherlock/res/values-large-land-hdpi-1024x600/abs__dimens.xml
ctionbarsherlock/res/values-large-land-mdpi-1024x600/abs__dimens.xml
ctionbarsherlock/res/values-large-mdpi-1024x600/abs__dimens.xml
ctionbarsherlock/res/values-large/abs__dimens.xml
ctionbarsherlock/res/values-sw600dp/abs__bools.xml
ctionbarsherlock/res/values-sw600dp/abs__dimens.xml
ctionbarsherlock/res/values-v11/abs__themes.xml
ctionbarsherlock/res/values-v14/abs__styles.xml
ctionbarsherlock/res/values-v14/abs__themes.xml
ctionbarsherlock/res/values-w360dp/abs__dimens.xml
ctionbarsherlock/res/values-w480dp/abs__bools.xml
ctionbarsherlock/res/values-w480dp/abs__config.xml
ctionbarsherlock/res/values-w500dp/abs__dimens.xml
ctionbarsherlock/res/values-w600dp/abs__dimens.xml
ctionbarsherlock/res/values-xlarge/abs__dimens.xml
ctionbarsherlock/res/values/abs__attrs.xml
ctionbarsherlock/res/values/abs__bools.xml
ctionbarsherlock/res/values/abs__colors.xml
ctionbarsherlock/res/values/abs__config.xml
ctionbarsherlock/res/values/abs__dimens.xml
ctionbarsherlock/res/values/abs__ids.xml
ctionbarsherlock/res/values/abs__strings.xml
ctionbarsherlock/res/values/abs__styles.xml
ctionbarsherlock/res/values/abs__themes.xml
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/ActionMenuPresenter.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/BaseMenuPresenter.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/MenuPresenter.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/IcsProgressBar.java
es/layout/action_bar_text.xml
es/layout/action_mode.xml
es/layout/popup_list_item.xml
es/menu/movie.xml
es/menu/operation.xml
es/menu/photo.xml
es/values-v14/styles.xml
es/values/styles.xml
|
ce6b27fde7c95477fd6d24ea427280a5d6431bcf |
31-Oct-2012 |
John Reck <jreck@google.com> |
Gingerbread support-ish This reverts commit 1336062985c9824d7fd796b1cebd5eaa8e4163ca. Change-Id: I718ec56315dc207a3e612abb4576bddab9afa2ee
ctionbarsherlock/src/android/support/v4/app/_ActionBarSherlockTrojanHorse.java
ctionbarsherlock/src/com/actionbarsherlock/ActionBarSherlock.java
ctionbarsherlock/src/com/actionbarsherlock/app/ActionBar.java
ctionbarsherlock/src/com/actionbarsherlock/app/SherlockActivity.java
ctionbarsherlock/src/com/actionbarsherlock/app/SherlockDialogFragment.java
ctionbarsherlock/src/com/actionbarsherlock/app/SherlockExpandableListActivity.java
ctionbarsherlock/src/com/actionbarsherlock/app/SherlockFragment.java
ctionbarsherlock/src/com/actionbarsherlock/app/SherlockFragmentActivity.java
ctionbarsherlock/src/com/actionbarsherlock/app/SherlockListActivity.java
ctionbarsherlock/src/com/actionbarsherlock/app/SherlockListFragment.java
ctionbarsherlock/src/com/actionbarsherlock/app/SherlockPreferenceActivity.java
ctionbarsherlock/src/com/actionbarsherlock/internal/ActionBarSherlockCompat.java
ctionbarsherlock/src/com/actionbarsherlock/internal/ActionBarSherlockNative.java
ctionbarsherlock/src/com/actionbarsherlock/internal/ResourcesCompat.java
ctionbarsherlock/src/com/actionbarsherlock/internal/app/ActionBarImpl.java
ctionbarsherlock/src/com/actionbarsherlock/internal/app/ActionBarWrapper.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/Animator.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/AnimatorListenerAdapter.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/AnimatorSet.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/FloatEvaluator.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/FloatKeyframeSet.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/IntEvaluator.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/IntKeyframeSet.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/Keyframe.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/KeyframeSet.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/ObjectAnimator.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/PropertyValuesHolder.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/TypeEvaluator.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/ValueAnimator.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/view/NineViewGroup.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/view/animation/AnimatorProxy.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/widget/NineFrameLayout.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/widget/NineHorizontalScrollView.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/widget/NineLinearLayout.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/ActionProviderWrapper.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/StandaloneActionMode.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/View_HasStateListenerSupport.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/View_OnAttachStateChangeListener.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/ActionMenu.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/ActionMenuItem.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/ActionMenuItemView.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/ActionMenuPresenter.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/ActionMenuView.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/BaseMenuPresenter.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/ListMenuItemView.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/MenuBuilder.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/MenuItemImpl.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/MenuItemWrapper.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/MenuPopupHelper.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/MenuPresenter.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/MenuView.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/MenuWrapper.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/SubMenuBuilder.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/SubMenuWrapper.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/AbsActionBarView.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/ActionBarContainer.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/ActionBarContextView.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/ActionBarView.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/CapitalizingButton.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/CapitalizingTextView.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/FakeDialogPhoneWindow.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/IcsAbsSpinner.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/IcsAdapterView.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/IcsLinearLayout.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/IcsListPopupWindow.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/IcsProgressBar.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/IcsSpinner.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/IcsView.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/ScrollingTabContainerView.java
ctionbarsherlock/src/com/actionbarsherlock/view/ActionMode.java
ctionbarsherlock/src/com/actionbarsherlock/view/ActionProvider.java
ctionbarsherlock/src/com/actionbarsherlock/view/CollapsibleActionView.java
ctionbarsherlock/src/com/actionbarsherlock/view/Menu.java
ctionbarsherlock/src/com/actionbarsherlock/view/MenuInflater.java
ctionbarsherlock/src/com/actionbarsherlock/view/MenuItem.java
ctionbarsherlock/src/com/actionbarsherlock/view/SubMenu.java
ctionbarsherlock/src/com/actionbarsherlock/view/Window.java
ctionbarsherlock/src/com/actionbarsherlock/widget/ActivityChooserModel.java
ctionbarsherlock/src/com/actionbarsherlock/widget/ActivityChooserView.java
ctionbarsherlock/src/com/actionbarsherlock/widget/ShareActionProvider.java
rc/com/android/gallery3d/app/AbstractGalleryActivity.java
rc/com/android/gallery3d/app/ActivityState.java
rc/com/android/gallery3d/app/AlbumPage.java
rc/com/android/gallery3d/app/AlbumSetPage.java
rc/com/android/gallery3d/app/CropImage.java
rc/com/android/gallery3d/app/Gallery.java
rc/com/android/gallery3d/app/GalleryActionBar.java
rc/com/android/gallery3d/app/MovieActivity.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/app/PickerActivity.java
rc/com/android/gallery3d/app/SinglePhotoDataAdapter.java
rc/com/android/gallery3d/app/StateManager.java
rc/com/android/gallery3d/ui/ActionModeHandler.java
rc/com/android/gallery3d/ui/MenuExecutor.java
rc/com/android/gallery3d/ui/PopupList.java
rc/com/android/gallery3d/ui/PositionController.java
|
372152961edd8feada0ae6478c91ba6b2565191d |
31-Oct-2012 |
John Reck <jreck@google.com> |
Gingerbread support-ish This reverts commit 1336062985c9824d7fd796b1cebd5eaa8e4163ca. Change-Id: I718ec56315dc207a3e612abb4576bddab9afa2ee
ndroid.mk
ctionbarsherlock/res/color/abs__primary_text_disable_only_holo_dark.xml
ctionbarsherlock/res/color/abs__primary_text_disable_only_holo_light.xml
ctionbarsherlock/res/color/abs__primary_text_holo_dark.xml
ctionbarsherlock/res/color/abs__primary_text_holo_light.xml
ctionbarsherlock/res/drawable-hdpi/abs__ab_bottom_solid_dark_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_bottom_solid_inverse_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_bottom_solid_light_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_bottom_transparent_dark_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_bottom_transparent_light_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_share_pack_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_share_pack_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_solid_dark_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_solid_light_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_solid_shadow_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_stacked_solid_dark_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_stacked_solid_light_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_stacked_transparent_dark_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_stacked_transparent_light_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_transparent_dark_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_transparent_light_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__btn_cab_done_default_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__btn_cab_done_default_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__btn_cab_done_focused_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__btn_cab_done_focused_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__btn_cab_done_pressed_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__btn_cab_done_pressed_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__cab_background_bottom_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__cab_background_bottom_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__cab_background_top_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__cab_background_top_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__dialog_full_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__dialog_full_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ic_ab_back_holo_dark.png
ctionbarsherlock/res/drawable-hdpi/abs__ic_ab_back_holo_light.png
ctionbarsherlock/res/drawable-hdpi/abs__ic_cab_done_holo_dark.png
ctionbarsherlock/res/drawable-hdpi/abs__ic_cab_done_holo_light.png
ctionbarsherlock/res/drawable-hdpi/abs__ic_menu_moreoverflow_normal_holo_dark.png
ctionbarsherlock/res/drawable-hdpi/abs__ic_menu_moreoverflow_normal_holo_light.png
ctionbarsherlock/res/drawable-hdpi/abs__ic_menu_share_holo_dark.png
ctionbarsherlock/res/drawable-hdpi/abs__ic_menu_share_holo_light.png
ctionbarsherlock/res/drawable-hdpi/abs__list_activated_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__list_divider_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__list_divider_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__list_focused_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__list_longpressed_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__list_pressed_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__list_pressed_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__list_selector_disabled_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__list_selector_disabled_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__menu_dropdown_panel_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__menu_dropdown_panel_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__progress_bg_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__progress_bg_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__progress_primary_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__progress_primary_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__progress_secondary_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__progress_secondary_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__spinner_48_inner_holo.png
ctionbarsherlock/res/drawable-hdpi/abs__spinner_48_outer_holo.png
ctionbarsherlock/res/drawable-hdpi/abs__spinner_ab_default_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__spinner_ab_default_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__spinner_ab_disabled_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__spinner_ab_disabled_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__spinner_ab_focused_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__spinner_ab_focused_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__spinner_ab_pressed_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__spinner_ab_pressed_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__tab_selected_focused_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__tab_selected_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__tab_selected_pressed_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__tab_unselected_pressed_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_bottom_solid_dark_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_bottom_solid_inverse_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_bottom_solid_light_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_bottom_transparent_dark_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_bottom_transparent_light_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_share_pack_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_share_pack_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_solid_dark_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_solid_light_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_solid_shadow_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_stacked_solid_dark_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_stacked_solid_light_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_stacked_transparent_dark_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_stacked_transparent_light_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_transparent_dark_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_transparent_light_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__btn_cab_done_default_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__btn_cab_done_default_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__btn_cab_done_focused_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__btn_cab_done_focused_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__btn_cab_done_pressed_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__btn_cab_done_pressed_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__cab_background_bottom_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__cab_background_bottom_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__cab_background_top_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__cab_background_top_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__dialog_full_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__dialog_full_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ic_ab_back_holo_dark.png
ctionbarsherlock/res/drawable-mdpi/abs__ic_ab_back_holo_light.png
ctionbarsherlock/res/drawable-mdpi/abs__ic_cab_done_holo_dark.png
ctionbarsherlock/res/drawable-mdpi/abs__ic_cab_done_holo_light.png
ctionbarsherlock/res/drawable-mdpi/abs__ic_menu_moreoverflow_normal_holo_dark.png
ctionbarsherlock/res/drawable-mdpi/abs__ic_menu_moreoverflow_normal_holo_light.png
ctionbarsherlock/res/drawable-mdpi/abs__ic_menu_share_holo_dark.png
ctionbarsherlock/res/drawable-mdpi/abs__ic_menu_share_holo_light.png
ctionbarsherlock/res/drawable-mdpi/abs__list_activated_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__list_divider_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__list_divider_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__list_focused_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__list_longpressed_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__list_pressed_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__list_pressed_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__list_selector_disabled_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__list_selector_disabled_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__menu_dropdown_panel_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__menu_dropdown_panel_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__progress_bg_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__progress_bg_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__progress_primary_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__progress_primary_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__progress_secondary_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__progress_secondary_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__spinner_48_inner_holo.png
ctionbarsherlock/res/drawable-mdpi/abs__spinner_48_outer_holo.png
ctionbarsherlock/res/drawable-mdpi/abs__spinner_ab_default_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__spinner_ab_default_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__spinner_ab_disabled_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__spinner_ab_disabled_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__spinner_ab_focused_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__spinner_ab_focused_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__spinner_ab_pressed_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__spinner_ab_pressed_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__tab_selected_focused_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__tab_selected_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__tab_selected_pressed_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__tab_unselected_pressed_holo.9.png
ctionbarsherlock/res/drawable-v11/abs__progress_medium_holo.xml
ctionbarsherlock/res/drawable-xhdpi/abs__ab_bottom_solid_dark_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_bottom_solid_inverse_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_bottom_solid_light_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_bottom_transparent_dark_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_bottom_transparent_light_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_share_pack_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_share_pack_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_solid_dark_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_solid_light_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_solid_shadow_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_stacked_solid_dark_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_stacked_solid_light_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_stacked_transparent_dark_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_stacked_transparent_light_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_transparent_dark_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_transparent_light_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__btn_cab_done_default_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__btn_cab_done_default_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__btn_cab_done_focused_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__btn_cab_done_focused_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__btn_cab_done_pressed_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__btn_cab_done_pressed_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__cab_background_bottom_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__cab_background_bottom_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__cab_background_top_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__cab_background_top_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__dialog_full_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__dialog_full_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ic_ab_back_holo_dark.png
ctionbarsherlock/res/drawable-xhdpi/abs__ic_ab_back_holo_light.png
ctionbarsherlock/res/drawable-xhdpi/abs__ic_cab_done_holo_dark.png
ctionbarsherlock/res/drawable-xhdpi/abs__ic_cab_done_holo_light.png
ctionbarsherlock/res/drawable-xhdpi/abs__ic_menu_moreoverflow_normal_holo_dark.png
ctionbarsherlock/res/drawable-xhdpi/abs__ic_menu_moreoverflow_normal_holo_light.png
ctionbarsherlock/res/drawable-xhdpi/abs__ic_menu_share_holo_dark.png
ctionbarsherlock/res/drawable-xhdpi/abs__ic_menu_share_holo_light.png
ctionbarsherlock/res/drawable-xhdpi/abs__list_activated_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__list_divider_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__list_divider_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__list_focused_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__list_longpressed_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__list_pressed_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__list_pressed_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__list_selector_disabled_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__list_selector_disabled_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__menu_dropdown_panel_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__menu_dropdown_panel_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__progress_bg_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__progress_bg_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__progress_primary_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__progress_primary_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__progress_secondary_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__progress_secondary_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__spinner_48_inner_holo.png
ctionbarsherlock/res/drawable-xhdpi/abs__spinner_48_outer_holo.png
ctionbarsherlock/res/drawable-xhdpi/abs__spinner_ab_default_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__spinner_ab_default_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__spinner_ab_disabled_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__spinner_ab_disabled_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__spinner_ab_focused_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__spinner_ab_focused_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__spinner_ab_pressed_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__spinner_ab_pressed_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__tab_selected_focused_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__tab_selected_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__tab_selected_pressed_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__tab_unselected_pressed_holo.9.png
ctionbarsherlock/res/drawable/abs__activated_background_holo_dark.xml
ctionbarsherlock/res/drawable/abs__activated_background_holo_light.xml
ctionbarsherlock/res/drawable/abs__btn_cab_done_holo_dark.xml
ctionbarsherlock/res/drawable/abs__btn_cab_done_holo_light.xml
ctionbarsherlock/res/drawable/abs__ic_menu_moreoverflow_holo_dark.xml
ctionbarsherlock/res/drawable/abs__ic_menu_moreoverflow_holo_light.xml
ctionbarsherlock/res/drawable/abs__item_background_holo_dark.xml
ctionbarsherlock/res/drawable/abs__item_background_holo_light.xml
ctionbarsherlock/res/drawable/abs__list_selector_background_transition_holo_dark.xml
ctionbarsherlock/res/drawable/abs__list_selector_background_transition_holo_light.xml
ctionbarsherlock/res/drawable/abs__list_selector_holo_dark.xml
ctionbarsherlock/res/drawable/abs__list_selector_holo_light.xml
ctionbarsherlock/res/drawable/abs__progress_horizontal_holo_dark.xml
ctionbarsherlock/res/drawable/abs__progress_horizontal_holo_light.xml
ctionbarsherlock/res/drawable/abs__progress_medium_holo.xml
ctionbarsherlock/res/drawable/abs__spinner_ab_holo_dark.xml
ctionbarsherlock/res/drawable/abs__spinner_ab_holo_light.xml
ctionbarsherlock/res/drawable/abs__tab_indicator_ab_holo.xml
ctionbarsherlock/res/layout-large/abs__action_mode_close_item.xml
ctionbarsherlock/res/layout-v14/sherlock_spinner_dropdown_item.xml
ctionbarsherlock/res/layout-v14/sherlock_spinner_item.xml
ctionbarsherlock/res/layout-xlarge/abs__screen_action_bar.xml
ctionbarsherlock/res/layout-xlarge/abs__screen_action_bar_overlay.xml
ctionbarsherlock/res/layout/abs__action_bar_home.xml
ctionbarsherlock/res/layout/abs__action_bar_tab.xml
ctionbarsherlock/res/layout/abs__action_bar_tab_bar_view.xml
ctionbarsherlock/res/layout/abs__action_bar_title_item.xml
ctionbarsherlock/res/layout/abs__action_menu_item_layout.xml
ctionbarsherlock/res/layout/abs__action_menu_layout.xml
ctionbarsherlock/res/layout/abs__action_mode_bar.xml
ctionbarsherlock/res/layout/abs__action_mode_close_item.xml
ctionbarsherlock/res/layout/abs__activity_chooser_view.xml
ctionbarsherlock/res/layout/abs__activity_chooser_view_list_item.xml
ctionbarsherlock/res/layout/abs__dialog_title_holo.xml
ctionbarsherlock/res/layout/abs__list_menu_item_checkbox.xml
ctionbarsherlock/res/layout/abs__list_menu_item_icon.xml
ctionbarsherlock/res/layout/abs__list_menu_item_layout.xml
ctionbarsherlock/res/layout/abs__list_menu_item_radio.xml
ctionbarsherlock/res/layout/abs__popup_menu_item_layout.xml
ctionbarsherlock/res/layout/abs__screen_action_bar.xml
ctionbarsherlock/res/layout/abs__screen_action_bar_overlay.xml
ctionbarsherlock/res/layout/abs__screen_simple.xml
ctionbarsherlock/res/layout/abs__screen_simple_overlay_action_mode.xml
ctionbarsherlock/res/layout/sherlock_spinner_dropdown_item.xml
ctionbarsherlock/res/layout/sherlock_spinner_item.xml
ctionbarsherlock/res/values-land/abs__dimens.xml
ctionbarsherlock/res/values-large-hdpi-1024x600/abs__dimens.xml
ctionbarsherlock/res/values-large-land-hdpi-1024x600/abs__dimens.xml
ctionbarsherlock/res/values-large-land-mdpi-1024x600/abs__dimens.xml
ctionbarsherlock/res/values-large-mdpi-1024x600/abs__dimens.xml
ctionbarsherlock/res/values-large/abs__dimens.xml
ctionbarsherlock/res/values-sw600dp/abs__bools.xml
ctionbarsherlock/res/values-sw600dp/abs__dimens.xml
ctionbarsherlock/res/values-v11/abs__themes.xml
ctionbarsherlock/res/values-v14/abs__styles.xml
ctionbarsherlock/res/values-v14/abs__themes.xml
ctionbarsherlock/res/values-w360dp/abs__dimens.xml
ctionbarsherlock/res/values-w480dp/abs__bools.xml
ctionbarsherlock/res/values-w480dp/abs__config.xml
ctionbarsherlock/res/values-w500dp/abs__dimens.xml
ctionbarsherlock/res/values-w600dp/abs__dimens.xml
ctionbarsherlock/res/values-xlarge/abs__dimens.xml
ctionbarsherlock/res/values/abs__attrs.xml
ctionbarsherlock/res/values/abs__bools.xml
ctionbarsherlock/res/values/abs__colors.xml
ctionbarsherlock/res/values/abs__config.xml
ctionbarsherlock/res/values/abs__dimens.xml
ctionbarsherlock/res/values/abs__ids.xml
ctionbarsherlock/res/values/abs__strings.xml
ctionbarsherlock/res/values/abs__styles.xml
ctionbarsherlock/res/values/abs__themes.xml
ctionbarsherlock/src/android/support/v4/app/_ActionBarSherlockTrojanHorse.java
ctionbarsherlock/src/com/actionbarsherlock/ActionBarSherlock.java
ctionbarsherlock/src/com/actionbarsherlock/app/ActionBar.java
ctionbarsherlock/src/com/actionbarsherlock/app/SherlockActivity.java
ctionbarsherlock/src/com/actionbarsherlock/app/SherlockDialogFragment.java
ctionbarsherlock/src/com/actionbarsherlock/app/SherlockExpandableListActivity.java
ctionbarsherlock/src/com/actionbarsherlock/app/SherlockFragment.java
ctionbarsherlock/src/com/actionbarsherlock/app/SherlockFragmentActivity.java
ctionbarsherlock/src/com/actionbarsherlock/app/SherlockListActivity.java
ctionbarsherlock/src/com/actionbarsherlock/app/SherlockListFragment.java
ctionbarsherlock/src/com/actionbarsherlock/app/SherlockPreferenceActivity.java
ctionbarsherlock/src/com/actionbarsherlock/internal/ActionBarSherlockCompat.java
ctionbarsherlock/src/com/actionbarsherlock/internal/ActionBarSherlockNative.java
ctionbarsherlock/src/com/actionbarsherlock/internal/ResourcesCompat.java
ctionbarsherlock/src/com/actionbarsherlock/internal/app/ActionBarImpl.java
ctionbarsherlock/src/com/actionbarsherlock/internal/app/ActionBarWrapper.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/Animator.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/AnimatorListenerAdapter.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/AnimatorSet.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/FloatEvaluator.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/FloatKeyframeSet.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/IntEvaluator.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/IntKeyframeSet.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/Keyframe.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/KeyframeSet.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/ObjectAnimator.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/PropertyValuesHolder.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/TypeEvaluator.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/ValueAnimator.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/view/NineViewGroup.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/view/animation/AnimatorProxy.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/widget/NineFrameLayout.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/widget/NineHorizontalScrollView.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/widget/NineLinearLayout.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/ActionProviderWrapper.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/StandaloneActionMode.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/View_HasStateListenerSupport.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/View_OnAttachStateChangeListener.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/ActionMenu.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/ActionMenuItem.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/ActionMenuItemView.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/ActionMenuPresenter.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/ActionMenuView.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/BaseMenuPresenter.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/ListMenuItemView.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/MenuBuilder.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/MenuItemImpl.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/MenuItemWrapper.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/MenuPopupHelper.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/MenuPresenter.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/MenuView.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/MenuWrapper.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/SubMenuBuilder.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/SubMenuWrapper.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/AbsActionBarView.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/ActionBarContainer.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/ActionBarContextView.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/ActionBarView.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/CapitalizingButton.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/CapitalizingTextView.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/FakeDialogPhoneWindow.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/IcsAbsSpinner.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/IcsAdapterView.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/IcsLinearLayout.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/IcsListPopupWindow.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/IcsProgressBar.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/IcsSpinner.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/IcsView.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/ScrollingTabContainerView.java
ctionbarsherlock/src/com/actionbarsherlock/view/ActionMode.java
ctionbarsherlock/src/com/actionbarsherlock/view/ActionProvider.java
ctionbarsherlock/src/com/actionbarsherlock/view/CollapsibleActionView.java
ctionbarsherlock/src/com/actionbarsherlock/view/Menu.java
ctionbarsherlock/src/com/actionbarsherlock/view/MenuInflater.java
ctionbarsherlock/src/com/actionbarsherlock/view/MenuItem.java
ctionbarsherlock/src/com/actionbarsherlock/view/SubMenu.java
ctionbarsherlock/src/com/actionbarsherlock/view/Window.java
ctionbarsherlock/src/com/actionbarsherlock/widget/ActivityChooserModel.java
ctionbarsherlock/src/com/actionbarsherlock/widget/ActivityChooserView.java
ctionbarsherlock/src/com/actionbarsherlock/widget/ShareActionProvider.java
es/layout/action_bar_text.xml
es/layout/action_mode.xml
es/layout/popup_list_item.xml
es/menu/movie.xml
es/menu/operation.xml
es/menu/photo.xml
es/values-v14/styles.xml
es/values/styles.xml
rc/com/android/gallery3d/app/AbstractGalleryActivity.java
rc/com/android/gallery3d/app/ActivityState.java
rc/com/android/gallery3d/app/AlbumPage.java
rc/com/android/gallery3d/app/AlbumSetPage.java
rc/com/android/gallery3d/app/CropImage.java
rc/com/android/gallery3d/app/Gallery.java
rc/com/android/gallery3d/app/GalleryActionBar.java
rc/com/android/gallery3d/app/MovieActivity.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/app/PickerActivity.java
rc/com/android/gallery3d/app/SinglePhotoDataAdapter.java
rc/com/android/gallery3d/app/StateManager.java
rc/com/android/gallery3d/ui/ActionModeHandler.java
rc/com/android/gallery3d/ui/MenuExecutor.java
rc/com/android/gallery3d/ui/PopupList.java
rc/com/android/gallery3d/ui/PositionController.java
|
8405f65e8b3a671562ea215b06ae91512a4734d7 |
31-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
|
e47ca16b3941204721a6a06fa5c4ce5400b97640 |
31-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Fix jank on videoplayer auto-exit Bug: 7344292 Change-Id: I3af95d3370769a6465644fa4aabe3f2ffa2980e7
rc/com/android/gallery3d/app/CommonControllerOverlay.java
|
62e98689761a7900dd7e556d04bde8955b94ebdb |
31-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Fix jank on videoplayer auto-exit Bug: 7344292 Change-Id: I3af95d3370769a6465644fa4aabe3f2ffa2980e7
rc/com/android/gallery3d/app/CommonControllerOverlay.java
|
f09fa2bf45d92e0284212960d73080d825e39351 |
31-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
|
3e6ab68b0b2745cb5d890054caddcc74657aa5f4 |
31-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am aacfa939: (-s ours) am 5bbb9620: am 692a8536: am 262c7bd7: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches * commit 'aacfa939f4f61a02780181ff5b5779d97a4acce6': Import translations. DO NOT MERGE
|
aacfa939f4f61a02780181ff5b5779d97a4acce6 |
31-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am 5bbb9620: am 692a8536: am 262c7bd7: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches * commit '5bbb9620aa8fcc67854f28e39fe8a10d226a2f76': Import translations. DO NOT MERGE
|
fcdd63eaaa390f815e3d67e5bf37f2a8e7fce96d |
31-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am 22f45ebc: (-s ours) am 96223557: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev * commit '22f45ebc0f9474de627eff4ab47b25136c419ed5': Import translations. DO NOT MERGE
|
5bbb9620aa8fcc67854f28e39fe8a10d226a2f76 |
31-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am 692a8536: am 262c7bd7: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches * commit '692a8536b790d50c506a7fb9588301eaff5e02c6': Import translations. DO NOT MERGE
|
990cdc3814c7144420feff769434185e0a323f65 |
31-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am 692a8536: (-s ours) am 262c7bd7: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches * commit '692a8536b790d50c506a7fb9588301eaff5e02c6': Import translations. DO NOT MERGE
|
22f45ebc0f9474de627eff4ab47b25136c419ed5 |
31-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am 96223557: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev * commit '9622355760418d63c42ef71f7998c0d5d49689e7': Import translations. DO NOT MERGE
|
f55918f27e011bf64ba7149f09675ee8944b3edc |
31-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE"
|
692a8536b790d50c506a7fb9588301eaff5e02c6 |
31-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am 262c7bd7: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches * commit '262c7bd76f21d440f2da3a4118c432987fcb8cdd': Import translations. DO NOT MERGE
|
c9dece23e96074984d504ddb157fce81c5836cab |
31-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am 262c7bd7: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches * commit '262c7bd76f21d440f2da3a4118c432987fcb8cdd': Import translations. DO NOT MERGE
|
288fd6b0cb4f7a2eeb45fec9d53e19f37c66e185 |
31-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am 262c7bd7: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches * commit '262c7bd76f21d440f2da3a4118c432987fcb8cdd': Import translations. DO NOT MERGE
|
3a6a312fcfa84dab37ebad5999e8a9b3ca4361e3 |
31-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE"
|
c350cd25ffefdb923f57496df45c47dda628e70e |
31-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
|
9622355760418d63c42ef71f7998c0d5d49689e7 |
31-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
|
0bdea3097ccc0505c61b9ad7a209b762b4cee318 |
31-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
|
1b63e13963e949ed558d9e7ab21141d5d421b7dc |
31-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
|
909955e69d439a5bdb2dc1a827f4edc07a5599ab |
31-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
|
262c7bd76f21d440f2da3a4118c432987fcb8cdd |
31-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
|
3e8f05133c9ef5cb81d59b747100908cde60f7a8 |
31-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE"
|
24ef32b0e69eeb62e0b878a928833f9a761beed5 |
31-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am 0c4f6d98: (-s ours) am 3106efc4: am a65e41a8: am 8d0392d6: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches * commit '0c4f6d98f41039d6b0e5d4a98a2d518b373256df': Import translations. DO NOT MERGE
|
86e8701e37b990b7f5330c464933cd4e7e3e8763 |
31-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am a60c8488: (-s ours) am 04fb5ac3: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev * commit 'a60c8488ec5f6df55cf9af4776c213739b74c7f3': Import translations. DO NOT MERGE
|
9a20849e070919b307759788ce43d9e68d67d7dd |
31-Oct-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am 6e95bf2d: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge * commit '6e95bf2d18e26f2c1c819c7dc17beaf054f31ee8': Do not add crop into preset if in inital setup Fix conflict with other build fix Fix build Fix SRI Pano orientation Update the assets of unlock and camera icons in filmstrip.
|
0c4f6d98f41039d6b0e5d4a98a2d518b373256df |
31-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am 3106efc4: am a65e41a8: am 8d0392d6: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches * commit '3106efc409d7a1e9c73e795fcd85e92e72246fe2': Import translations. DO NOT MERGE
|
a60c8488ec5f6df55cf9af4776c213739b74c7f3 |
31-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am 04fb5ac3: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev * commit '04fb5ac38a29eb22783dbc074977512014f06af4': Import translations. DO NOT MERGE
|
bfd77884974cbd1a29028156d9af9b67e6359696 |
31-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am a65e41a8: (-s ours) am 8d0392d6: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches * commit 'a65e41a88601586f5bcdc31933bb677af4fab243': Import translations. DO NOT MERGE
|
3106efc409d7a1e9c73e795fcd85e92e72246fe2 |
31-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am a65e41a8: am 8d0392d6: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches * commit 'a65e41a88601586f5bcdc31933bb677af4fab243': Import translations. DO NOT MERGE
|
44e3129f4ffca4727ed477211a64312706afea42 |
31-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am 8d0392d6: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches * commit '8d0392d623a88ace36fc4358c0d78e00377ca97f': Import translations. DO NOT MERGE
|
8ba7fff205d702a646cf28019bb2d7cf47e2727c |
31-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am 8d0392d6: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches * commit '8d0392d623a88ace36fc4358c0d78e00377ca97f': Import translations. DO NOT MERGE
|
6e95bf2d18e26f2c1c819c7dc17beaf054f31ee8 |
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: I892c2f6e71ca05d489dc6ead9faf0e70fa023f13
|
a65e41a88601586f5bcdc31933bb677af4fab243 |
31-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am 8d0392d6: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches * commit '8d0392d623a88ace36fc4358c0d78e00377ca97f': Import translations. DO NOT MERGE
|
dc304a73d63f26828fefee941a59ccf12a7802b0 |
31-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
|
04fb5ac38a29eb22783dbc074977512014f06af4 |
31-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
|
23ca4610b1bf909def13991786ed91c71a6f87c8 |
31-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
|
8d0392d623a88ace36fc4358c0d78e00377ca97f |
31-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
|
ef0779422fc7a17a21ebef2360a429f45477626b |
31-Oct-2012 |
Hung-ying Tyan <tyanh@google.com> |
Merge "Handle invalid data type in ExifParser" into gb-ub-photos-bryce
|
b2366046f24c550c66a2ffb1c540055cb378979e |
31-Oct-2012 |
Wu-cheng Li <wuchengli@google.com> |
am ff7ce625: am 69c6be9e: am 88cef187: am 471d8986: Add keyguard camera widget meta-data to gallery manifest. * commit 'ff7ce625c651880245d0ca55e7755182fb014270': Add keyguard camera widget meta-data to gallery manifest.
|
dc226e07b80d3da475e1fedf3ac0226b08bcd900 |
31-Oct-2012 |
Hung-ying Tyan <tyanh@google.com> |
Merge "Handle images with multile APP1 in ExifParser" into gb-ub-photos-bryce
|
decc7cb20517935f2dc68e4d72b7193684ae9a98 |
31-Oct-2012 |
Hung-ying Tyan <tyanh@google.com> |
Merge "Handle the last null byte in Exif tag." into gb-ub-photos-bryce
|
ff7ce625c651880245d0ca55e7755182fb014270 |
31-Oct-2012 |
Wu-cheng Li <wuchengli@google.com> |
am 69c6be9e: am 88cef187: am 471d8986: Add keyguard camera widget meta-data to gallery manifest. * commit '69c6be9e3f3deed8d07970e423c5cd1b2fc704aa': Add keyguard camera widget meta-data to gallery manifest.
|
585638c08b9bb8c0a89dca412252e07b45b193d8 |
31-Oct-2012 |
Wu-cheng Li <wuchengli@google.com> |
am 88cef187: am 471d8986: Add keyguard camera widget meta-data to gallery manifest. * commit '88cef187405439c515fc7c41a0fefe697736521f': Add keyguard camera widget meta-data to gallery manifest.
|
69c6be9e3f3deed8d07970e423c5cd1b2fc704aa |
31-Oct-2012 |
Wu-cheng Li <wuchengli@google.com> |
am 88cef187: am 471d8986: Add keyguard camera widget meta-data to gallery manifest. * commit '88cef187405439c515fc7c41a0fefe697736521f': Add keyguard camera widget meta-data to gallery manifest.
|
c57d5a6b1e5e85c40d751b33dd868e29ccf4504e |
19-Oct-2012 |
Earl Ou <shunhsingou@google.com> |
Handle invalid data type in ExifParser Change-Id: I547021c03ec9e5d53c7452926c2ca5b6bf11dc43
allerycommon/src/com/android/gallery3d/exif/ExifParser.java
allerycommon/src/com/android/gallery3d/exif/ExifTag.java
|
74075d9b285446e2ae4ae1024653b96500b7dc68 |
19-Oct-2012 |
Earl Ou <shunhsingou@google.com> |
Handle invalid data type in ExifParser Change-Id: I547021c03ec9e5d53c7452926c2ca5b6bf11dc43
allerycommon/src/com/android/gallery3d/exif/ExifParser.java
allerycommon/src/com/android/gallery3d/exif/ExifTag.java
|
e761c182a1a0321df95f2c11aa97e4cd1377a880 |
19-Oct-2012 |
Earl Ou <shunhsingou@google.com> |
Handle invalid data type in ExifParser Change-Id: I547021c03ec9e5d53c7452926c2ca5b6bf11dc43
allerycommon/src/com/android/gallery3d/exif/ExifParser.java
allerycommon/src/com/android/gallery3d/exif/ExifTag.java
|
abb1b01a32a400433ab60358d92ebea78a64b669 |
19-Oct-2012 |
Earl Ou <shunhsingou@google.com> |
Handle images with multile APP1 in ExifParser Change-Id: If88384066b008bc6a68976b6e291cc1dbcd65914
allerycommon/src/com/android/gallery3d/exif/ExifParser.java
|
3f120e267f39712f0ae3c08557aa713faf45c210 |
19-Oct-2012 |
Earl Ou <shunhsingou@google.com> |
Handle images with multile APP1 in ExifParser Change-Id: If88384066b008bc6a68976b6e291cc1dbcd65914
allerycommon/src/com/android/gallery3d/exif/ExifParser.java
|
2c07b4484013c715641ed66f926930ab228d2b18 |
19-Oct-2012 |
Earl Ou <shunhsingou@google.com> |
Handle images with multile APP1 in ExifParser Change-Id: If88384066b008bc6a68976b6e291cc1dbcd65914
allerycommon/src/com/android/gallery3d/exif/ExifParser.java
|
3357622665ec1757b120c16584fc7b67114c69ff |
19-Oct-2012 |
Earl Ou <shunhsingou@google.com> |
Handle the last null byte in Exif tag. Change-Id: Ic802810d11518dfeb80d1338db65b2e1e1cc8476
allerycommon/src/com/android/gallery3d/exif/ExifOutputStream.java
allerycommon/src/com/android/gallery3d/exif/ExifParser.java
allerycommon/src/com/android/gallery3d/exif/ExifTag.java
|
ff0f96c07827c39df5a0b408a028e7198dc8294b |
19-Oct-2012 |
Earl Ou <shunhsingou@google.com> |
Handle the last null byte in Exif tag. Change-Id: Ic802810d11518dfeb80d1338db65b2e1e1cc8476
allerycommon/src/com/android/gallery3d/exif/ExifOutputStream.java
allerycommon/src/com/android/gallery3d/exif/ExifParser.java
allerycommon/src/com/android/gallery3d/exif/ExifTag.java
|
1ec60b41b2b45da482f9318bae82486d82486db8 |
19-Oct-2012 |
Earl Ou <shunhsingou@google.com> |
Handle the last null byte in Exif tag. Change-Id: Ic802810d11518dfeb80d1338db65b2e1e1cc8476
allerycommon/src/com/android/gallery3d/exif/ExifOutputStream.java
allerycommon/src/com/android/gallery3d/exif/ExifParser.java
allerycommon/src/com/android/gallery3d/exif/ExifTag.java
|
88cef187405439c515fc7c41a0fefe697736521f |
31-Oct-2012 |
Wu-cheng Li <wuchengli@google.com> |
am 471d8986: Add keyguard camera widget meta-data to gallery manifest. * commit '471d898606bc15878b4d1708236f60157bab08df': Add keyguard camera widget meta-data to gallery manifest.
|
352b7fec00a6645cd70b9372ef967d7a0eddd290 |
31-Oct-2012 |
Wu-cheng Li <wuchengli@google.com> |
am 471d8986: Add keyguard camera widget meta-data to gallery manifest. * commit '471d898606bc15878b4d1708236f60157bab08df': Add keyguard camera widget meta-data to gallery manifest.
|
ceee6ebacd02b22ca85a02305ac4346c4b4c0f38 |
31-Oct-2012 |
Wu-cheng Li <wuchengli@google.com> |
am 471d8986: Add keyguard camera widget meta-data to gallery manifest. * commit '471d898606bc15878b4d1708236f60157bab08df': Add keyguard camera widget meta-data to gallery manifest.
|
524dc9f19180d5f632cf594766b9b420f6ce529e |
31-Oct-2012 |
Wu-cheng Li <wuchengli@google.com> |
Add keyguard camera widget meta-data to gallery manifest. bug:7445471 Change-Id: I420ec1c44e32332d6e7f6023471f34f726fed264
ndroidManifest.xml
|
471d898606bc15878b4d1708236f60157bab08df |
31-Oct-2012 |
Wu-cheng Li <wuchengli@google.com> |
Add keyguard camera widget meta-data to gallery manifest. bug:7445471 Change-Id: I420ec1c44e32332d6e7f6023471f34f726fed264
ndroidManifest.xml
|
754f6583ce59a952469b353a1bf21f056d344b6f |
31-Oct-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
ccbd3f8a8c0e8caec948f56afd870fdce1c19bf8 |
18-Oct-2012 |
Earl Ou <shunhsingou@google.com> |
Do not use UTF-8 to decode string in ExifOutputStream Change-Id: Id0303a9e8a72db1625e8d0f7487be44227b0ce6a
allerycommon/src/com/android/gallery3d/exif/ExifOutputStream.java
|
4bc57f24b4ed268fdb5f0b67d3bc39f6a449b2f4 |
18-Oct-2012 |
Earl Ou <shunhsingou@google.com> |
Do not use UTF-8 to decode string in ExifOutputStream Change-Id: Id0303a9e8a72db1625e8d0f7487be44227b0ce6a
allerycommon/src/com/android/gallery3d/exif/ExifOutputStream.java
|
bc6773761fa669f6090b8a1f9a08d9283b94a2ed |
18-Oct-2012 |
Earl Ou <shunhsingou@google.com> |
Do not use UTF-8 to decode string in ExifOutputStream Change-Id: Id0303a9e8a72db1625e8d0f7487be44227b0ce6a
allerycommon/src/com/android/gallery3d/exif/ExifOutputStream.java
|
e7fab41c07189f55da7435542993e3276f4624b7 |
19-Oct-2012 |
Earl Ou <shunhsingou@google.com> |
print image path when setup error in Exif test Change-Id: Ia4391571695ea518eac53f2b8c6b1a2acb5159c1
ests/src/com/android/gallery3d/exif/ExifXmlDataTestCase.java
|
1927ec5dc5ae1d202f6a0e2a55a2e8d834f6ce60 |
19-Oct-2012 |
Earl Ou <shunhsingou@google.com> |
print image path when setup error in Exif test Change-Id: Ia4391571695ea518eac53f2b8c6b1a2acb5159c1
ests/src/com/android/gallery3d/exif/ExifXmlDataTestCase.java
|
d8e1319a6f89909636c2384c28dd63885907d90b |
31-Oct-2012 |
Mangesh Ghiware <mghiware@google.com> |
am d8832db0: am 4cdf50ad: am 0514c285: am 589381bf: Change protection level for GALLERY_PROVIDER to signatureOrSystem * commit 'd8832db0680cec47751a107eddb13b6a57977b03': Change protection level for GALLERY_PROVIDER to signatureOrSystem
|
d8832db0680cec47751a107eddb13b6a57977b03 |
31-Oct-2012 |
Mangesh Ghiware <mghiware@google.com> |
am 4cdf50ad: am 0514c285: am 589381bf: Change protection level for GALLERY_PROVIDER to signatureOrSystem * commit '4cdf50adfb0eff781881954339bda96f4c078180': Change protection level for GALLERY_PROVIDER to signatureOrSystem
|
04024d6477cbbb60f3dabbcef34aada84672fb94 |
31-Oct-2012 |
Mangesh Ghiware <mghiware@google.com> |
am 0514c285: am 589381bf: Change protection level for GALLERY_PROVIDER to signatureOrSystem * commit '0514c285cca2116bb8d07f657cf9c167f87e8bad': Change protection level for GALLERY_PROVIDER to signatureOrSystem
|
4cdf50adfb0eff781881954339bda96f4c078180 |
31-Oct-2012 |
Mangesh Ghiware <mghiware@google.com> |
am 0514c285: am 589381bf: Change protection level for GALLERY_PROVIDER to signatureOrSystem * commit '0514c285cca2116bb8d07f657cf9c167f87e8bad': Change protection level for GALLERY_PROVIDER to signatureOrSystem
|
9660f08aac2bcc332e8569e49ca32f2292cb638d |
31-Oct-2012 |
Mangesh Ghiware <mghiware@google.com> |
am 589381bf: Change protection level for GALLERY_PROVIDER to signatureOrSystem * commit '589381bffb30f4f4a84ebe59b9bc3a140153831c': Change protection level for GALLERY_PROVIDER to signatureOrSystem
|
361b1978c4062b6ad82af1a83395348e5fd61ec4 |
31-Oct-2012 |
Mangesh Ghiware <mghiware@google.com> |
am 589381bf: Change protection level for GALLERY_PROVIDER to signatureOrSystem * commit '589381bffb30f4f4a84ebe59b9bc3a140153831c': Change protection level for GALLERY_PROVIDER to signatureOrSystem
|
0514c285cca2116bb8d07f657cf9c167f87e8bad |
31-Oct-2012 |
Mangesh Ghiware <mghiware@google.com> |
am 589381bf: Change protection level for GALLERY_PROVIDER to signatureOrSystem * commit '589381bffb30f4f4a84ebe59b9bc3a140153831c': Change protection level for GALLERY_PROVIDER to signatureOrSystem
|
fdfda6b9105f304e94ebe9164f9f72cfd092313d |
31-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I05d990dc3ef3797dc3a51e9a4ab4abc93cfcd5d4 Auto-generated-cl: translation import
es/values-af/photoeditor_strings.xml
es/values-ar/photoeditor_strings.xml
es/values-ca/photoeditor_strings.xml
es/values-cs/photoeditor_strings.xml
es/values-da/photoeditor_strings.xml
es/values-de/photoeditor_strings.xml
es/values-el/photoeditor_strings.xml
es/values-es-rUS/photoeditor_strings.xml
es/values-et/photoeditor_strings.xml
es/values-fr/photoeditor_strings.xml
es/values-hi/photoeditor_strings.xml
es/values-hr/photoeditor_strings.xml
es/values-hu/photoeditor_strings.xml
es/values-lt/photoeditor_strings.xml
es/values-lv/photoeditor_strings.xml
es/values-ms/photoeditor_strings.xml
es/values-nb/photoeditor_strings.xml
es/values-nl/photoeditor_strings.xml
es/values-pl/photoeditor_strings.xml
es/values-pt-rPT/photoeditor_strings.xml
es/values-ro/photoeditor_strings.xml
es/values-ru/photoeditor_strings.xml
es/values-sk/photoeditor_strings.xml
es/values-sl/photoeditor_strings.xml
es/values-sr/photoeditor_strings.xml
es/values-sv/photoeditor_strings.xml
es/values-sw/photoeditor_strings.xml
es/values-th/photoeditor_strings.xml
es/values-uk/photoeditor_strings.xml
es/values-zh-rCN/photoeditor_strings.xml
es/values-zu/photoeditor_strings.xml
|
e2dfcc7892279ed2d1c12afe21daef8e349ef242 |
31-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I8c666b427153fdfb3032042f5cb2d7303a85c8b8 Auto-generated-cl: translation import
es/values-af/filtershow_strings.xml
es/values-ar/filtershow_strings.xml
es/values-ca/filtershow_strings.xml
es/values-da/filtershow_strings.xml
es/values-de/filtershow_strings.xml
es/values-el/filtershow_strings.xml
es/values-es-rUS/filtershow_strings.xml
es/values-es/filtershow_strings.xml
es/values-et/filtershow_strings.xml
es/values-hi/filtershow_strings.xml
es/values-hr/filtershow_strings.xml
es/values-hu/filtershow_strings.xml
es/values-lt/filtershow_strings.xml
es/values-lv/filtershow_strings.xml
es/values-ms/filtershow_strings.xml
es/values-nb/filtershow_strings.xml
es/values-nl/filtershow_strings.xml
es/values-pl/filtershow_strings.xml
es/values-pt-rPT/filtershow_strings.xml
es/values-ro/filtershow_strings.xml
es/values-ru/filtershow_strings.xml
es/values-sk/filtershow_strings.xml
es/values-sl/filtershow_strings.xml
es/values-sr/filtershow_strings.xml
es/values-sv/filtershow_strings.xml
es/values-sw/filtershow_strings.xml
es/values-th/filtershow_strings.xml
es/values-vi/filtershow_strings.xml
es/values-zh-rCN/filtershow_strings.xml
es/values-zu/filtershow_strings.xml
|
682eff973c3c1001e290bb8518e6d28a121b99df |
31-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I0f43283c17ede9f8ec48e6de2c9ed37e0d3e5476 Auto-generated-cl: translation import
es/values-af/filtershow_strings.xml
es/values-ar/filtershow_strings.xml
es/values-ca/filtershow_strings.xml
es/values-da/filtershow_strings.xml
es/values-de/filtershow_strings.xml
es/values-el/filtershow_strings.xml
es/values-es-rUS/filtershow_strings.xml
es/values-es/filtershow_strings.xml
es/values-et/filtershow_strings.xml
es/values-hi/filtershow_strings.xml
es/values-hr/filtershow_strings.xml
es/values-hu/filtershow_strings.xml
es/values-lt/filtershow_strings.xml
es/values-lv/filtershow_strings.xml
es/values-ms/filtershow_strings.xml
es/values-nb/filtershow_strings.xml
es/values-nl/filtershow_strings.xml
es/values-pl/filtershow_strings.xml
es/values-pt-rPT/filtershow_strings.xml
es/values-ro/filtershow_strings.xml
es/values-ru/filtershow_strings.xml
es/values-sk/filtershow_strings.xml
es/values-sl/filtershow_strings.xml
es/values-sr/filtershow_strings.xml
es/values-sv/filtershow_strings.xml
es/values-sw/filtershow_strings.xml
es/values-th/filtershow_strings.xml
es/values-vi/filtershow_strings.xml
es/values-zh-rCN/filtershow_strings.xml
es/values-zu/filtershow_strings.xml
|
7575e00bab819e765b29a0ac5b7fafe09436434d |
31-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I94a382290cc60de9ed982b1c8420cee050a4fabf Auto-generated-cl: translation import
es/values-af/filtershow_strings.xml
es/values-ar/filtershow_strings.xml
es/values-ca/filtershow_strings.xml
es/values-da/filtershow_strings.xml
es/values-de/filtershow_strings.xml
es/values-el/filtershow_strings.xml
es/values-es-rUS/filtershow_strings.xml
es/values-es/filtershow_strings.xml
es/values-et/filtershow_strings.xml
es/values-hi/filtershow_strings.xml
es/values-hr/filtershow_strings.xml
es/values-hu/filtershow_strings.xml
es/values-lt/filtershow_strings.xml
es/values-lv/filtershow_strings.xml
es/values-ms/filtershow_strings.xml
es/values-nb/filtershow_strings.xml
es/values-nl/filtershow_strings.xml
es/values-pl/filtershow_strings.xml
es/values-pt-rPT/filtershow_strings.xml
es/values-ro/filtershow_strings.xml
es/values-ru/filtershow_strings.xml
es/values-sk/filtershow_strings.xml
es/values-sl/filtershow_strings.xml
es/values-sr/filtershow_strings.xml
es/values-sv/filtershow_strings.xml
es/values-sw/filtershow_strings.xml
es/values-th/filtershow_strings.xml
es/values-vi/filtershow_strings.xml
es/values-zh-rCN/filtershow_strings.xml
es/values-zu/filtershow_strings.xml
|
557101f2b3f99d4b425ff035ba2fb74dd730ae7e |
31-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I1c49a77ba773ca74d6a2a481d811ff9083279fff Auto-generated-cl: translation import
es/values-af/filtershow_strings.xml
es/values-ar/filtershow_strings.xml
es/values-ca/filtershow_strings.xml
es/values-da/filtershow_strings.xml
es/values-de/filtershow_strings.xml
es/values-el/filtershow_strings.xml
es/values-es-rUS/filtershow_strings.xml
es/values-es/filtershow_strings.xml
es/values-et/filtershow_strings.xml
es/values-hi/filtershow_strings.xml
es/values-hr/filtershow_strings.xml
es/values-hu/filtershow_strings.xml
es/values-lt/filtershow_strings.xml
es/values-lv/filtershow_strings.xml
es/values-ms/filtershow_strings.xml
es/values-nb/filtershow_strings.xml
es/values-nl/filtershow_strings.xml
es/values-pl/filtershow_strings.xml
es/values-pt-rPT/filtershow_strings.xml
es/values-ro/filtershow_strings.xml
es/values-ru/filtershow_strings.xml
es/values-sk/filtershow_strings.xml
es/values-sl/filtershow_strings.xml
es/values-sr/filtershow_strings.xml
es/values-sv/filtershow_strings.xml
es/values-sw/filtershow_strings.xml
es/values-th/filtershow_strings.xml
es/values-vi/filtershow_strings.xml
es/values-zh-rCN/filtershow_strings.xml
es/values-zu/filtershow_strings.xml
|
427b5f435d3eb49c4a309d1a2c1693ec28ea8c62 |
31-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I781515fc164ea84a6e30d96612724b0dcb10a8f7 Auto-generated-cl: translation import
es/values-af/filtershow_strings.xml
es/values-ar/filtershow_strings.xml
es/values-ca/filtershow_strings.xml
es/values-da/filtershow_strings.xml
es/values-de/filtershow_strings.xml
es/values-el/filtershow_strings.xml
es/values-es-rUS/filtershow_strings.xml
es/values-es/filtershow_strings.xml
es/values-et/filtershow_strings.xml
es/values-hi/filtershow_strings.xml
es/values-hr/filtershow_strings.xml
es/values-hu/filtershow_strings.xml
es/values-lt/filtershow_strings.xml
es/values-lv/filtershow_strings.xml
es/values-ms/filtershow_strings.xml
es/values-nb/filtershow_strings.xml
es/values-nl/filtershow_strings.xml
es/values-pl/filtershow_strings.xml
es/values-pt-rPT/filtershow_strings.xml
es/values-ro/filtershow_strings.xml
es/values-ru/filtershow_strings.xml
es/values-sk/filtershow_strings.xml
es/values-sl/filtershow_strings.xml
es/values-sr/filtershow_strings.xml
es/values-sv/filtershow_strings.xml
es/values-sw/filtershow_strings.xml
es/values-th/filtershow_strings.xml
es/values-vi/filtershow_strings.xml
es/values-zh-rCN/filtershow_strings.xml
es/values-zu/filtershow_strings.xml
|
53417d8d45c3f10efde428dafc12f5388494c475 |
31-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I781515fc164ea84a6e30d96612724b0dcb10a8f7 Auto-generated-cl: translation import
es/values-af/filtershow_strings.xml
es/values-ar/filtershow_strings.xml
es/values-ca/filtershow_strings.xml
es/values-da/filtershow_strings.xml
es/values-de/filtershow_strings.xml
es/values-el/filtershow_strings.xml
es/values-es-rUS/filtershow_strings.xml
es/values-es/filtershow_strings.xml
es/values-et/filtershow_strings.xml
es/values-hi/filtershow_strings.xml
es/values-hr/filtershow_strings.xml
es/values-hu/filtershow_strings.xml
es/values-lt/filtershow_strings.xml
es/values-lv/filtershow_strings.xml
es/values-ms/filtershow_strings.xml
es/values-nb/filtershow_strings.xml
es/values-nl/filtershow_strings.xml
es/values-pl/filtershow_strings.xml
es/values-pt-rPT/filtershow_strings.xml
es/values-ro/filtershow_strings.xml
es/values-ru/filtershow_strings.xml
es/values-sk/filtershow_strings.xml
es/values-sl/filtershow_strings.xml
es/values-sr/filtershow_strings.xml
es/values-sv/filtershow_strings.xml
es/values-sw/filtershow_strings.xml
es/values-th/filtershow_strings.xml
es/values-vi/filtershow_strings.xml
es/values-zh-rCN/filtershow_strings.xml
es/values-zu/filtershow_strings.xml
|
398750ca794a3a8974e84ef8e477544d1608167e |
31-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I0d62900eb18a8dfe8c0618c2010c4096208df848 Auto-generated-cl: translation import
es/values-af/filtershow_strings.xml
es/values-ar/filtershow_strings.xml
es/values-ca/filtershow_strings.xml
es/values-da/filtershow_strings.xml
es/values-de/filtershow_strings.xml
es/values-el/filtershow_strings.xml
es/values-es-rUS/filtershow_strings.xml
es/values-es/filtershow_strings.xml
es/values-et/filtershow_strings.xml
es/values-hi/filtershow_strings.xml
es/values-hr/filtershow_strings.xml
es/values-hu/filtershow_strings.xml
es/values-lt/filtershow_strings.xml
es/values-lv/filtershow_strings.xml
es/values-ms/filtershow_strings.xml
es/values-nb/filtershow_strings.xml
es/values-nl/filtershow_strings.xml
es/values-pl/filtershow_strings.xml
es/values-pt-rPT/filtershow_strings.xml
es/values-ro/filtershow_strings.xml
es/values-ru/filtershow_strings.xml
es/values-sk/filtershow_strings.xml
es/values-sl/filtershow_strings.xml
es/values-sr/filtershow_strings.xml
es/values-sv/filtershow_strings.xml
es/values-sw/filtershow_strings.xml
es/values-th/filtershow_strings.xml
es/values-vi/filtershow_strings.xml
es/values-zh-rCN/filtershow_strings.xml
es/values-zu/filtershow_strings.xml
|
f4e1641e7791f3d58601950fd4491c72d569fbfd |
31-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I0d62900eb18a8dfe8c0618c2010c4096208df848 Auto-generated-cl: translation import
es/values-af/filtershow_strings.xml
es/values-ar/filtershow_strings.xml
es/values-ca/filtershow_strings.xml
es/values-da/filtershow_strings.xml
es/values-de/filtershow_strings.xml
es/values-el/filtershow_strings.xml
es/values-es-rUS/filtershow_strings.xml
es/values-es/filtershow_strings.xml
es/values-et/filtershow_strings.xml
es/values-hi/filtershow_strings.xml
es/values-hr/filtershow_strings.xml
es/values-hu/filtershow_strings.xml
es/values-lt/filtershow_strings.xml
es/values-lv/filtershow_strings.xml
es/values-ms/filtershow_strings.xml
es/values-nb/filtershow_strings.xml
es/values-nl/filtershow_strings.xml
es/values-pl/filtershow_strings.xml
es/values-pt-rPT/filtershow_strings.xml
es/values-ro/filtershow_strings.xml
es/values-ru/filtershow_strings.xml
es/values-sk/filtershow_strings.xml
es/values-sl/filtershow_strings.xml
es/values-sr/filtershow_strings.xml
es/values-sv/filtershow_strings.xml
es/values-sw/filtershow_strings.xml
es/values-th/filtershow_strings.xml
es/values-vi/filtershow_strings.xml
es/values-zh-rCN/filtershow_strings.xml
es/values-zu/filtershow_strings.xml
|
bca5b640e320da37660bf1e1321d7cf6f8d2554d |
31-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ib93e9e450a2807c8c39ee13dd0a4c3ac9473ac9c Auto-generated-cl: translation import
es/values-pt-rPT/strings.xml
|
8a99048f52cdfd11628efbbc26702b66709a1f0d |
31-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Id6447e91ba987395743e3018fe9c8574a4438874 Auto-generated-cl: translation import
es/values-pt-rPT/strings.xml
|
ca0922ac067dfe4d4ad2d75050c1f4ee9b0e76da |
31-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I5a260559e229c2b2464e07f0194eb2a60f30b4c1 Auto-generated-cl: translation import
es/values-pt-rPT/strings.xml
|
974acf68e6608b80f33ca49b2849d51d163170d6 |
31-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I35fdf78b795b6316a70ef988f3488ddd64b1a1e7 Auto-generated-cl: translation import
es/values-pt-rPT/strings.xml
|
8b07037ea04e7c483bd7d971f4fb47f37cf89370 |
31-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ibf40bc990f7f5e8d0ed266141a3fc75825f6e864 Auto-generated-cl: translation import
es/values-pt-rPT/strings.xml
|
18b569b98ff7ce3c0b2b6adfe03fd8bc910b33d1 |
31-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ibf40bc990f7f5e8d0ed266141a3fc75825f6e864 Auto-generated-cl: translation import
es/values-pt-rPT/strings.xml
|
2640642dde88000e67cfb50d33e40958704a7bc4 |
31-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I788d1bf735ea22a554941398f43c3684e3bb5a6e Auto-generated-cl: translation import
es/values-pt-rPT/strings.xml
|
6b4432988ba83970517b6b00811e4e450e3fd774 |
31-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I788d1bf735ea22a554941398f43c3684e3bb5a6e Auto-generated-cl: translation import
es/values-pt-rPT/strings.xml
|
f675cd16e8188a8d0b3a34dbc1a74c40ed36eb1e |
31-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Add a triangle to the popup button view bug:7442434 Change-Id: I7b784f2a5662ef694daef6cd926f60694b3eee4f
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/ui/FramedTextButton.java
|
e0fab93dc32c3927bfdab1233c194e4c772e57d0 |
31-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Add a triangle to the popup button view bug:7442434 Change-Id: I7b784f2a5662ef694daef6cd926f60694b3eee4f
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/ui/FramedTextButton.java
|
f9fadba0cdcf753fc518893b4ca2b761917a64d1 |
30-Oct-2012 |
Mangesh Ghiware <mghiware@google.com> |
Change protection level for GALLERY_PROVIDER to signatureOrSystem Bug: 7433498 Change-Id: I1c5f43ab8b5f5974356b0a50c2d8b643591991b5
ndroidManifest.xml
|
589381bffb30f4f4a84ebe59b9bc3a140153831c |
30-Oct-2012 |
Mangesh Ghiware <mghiware@google.com> |
Change protection level for GALLERY_PROVIDER to signatureOrSystem Bug: 7433498 Change-Id: I1c5f43ab8b5f5974356b0a50c2d8b643591991b5
ndroidManifest.xml
|
0048405698c4f5a9c86da63947f2b310e8a7b8d3 |
30-Oct-2012 |
Tenghui Zhu <ztenghui@google.com> |
am c9149271: (-s ours) am 7fff584b: am 3245b90f: am 310db394: (-s ours) Merge "DO NOT MERGE: Do not set the background to null for video." into gb-ub-photos-arches * commit 'c9149271f881ec5872717d2d0ceea3aa571c7005': DO NOT MERGE: Do not set the background to null for video.
|
c9149271f881ec5872717d2d0ceea3aa571c7005 |
30-Oct-2012 |
Tenghui Zhu <ztenghui@google.com> |
am 7fff584b: am 3245b90f: am 310db394: (-s ours) Merge "DO NOT MERGE: Do not set the background to null for video." into gb-ub-photos-arches * commit '7fff584bafa77b1ec522126cd2b88b1d72462d83': DO NOT MERGE: Do not set the background to null for video.
|
2f09f14ea0b9314fe3ad69a54866ddfa383c8c82 |
30-Oct-2012 |
Tenghui Zhu <ztenghui@google.com> |
am 3245b90f: (-s ours) am 310db394: (-s ours) Merge "DO NOT MERGE: Do not set the background to null for video." into gb-ub-photos-arches * commit '3245b90f56edac635a3bcf7963d71a125d3b4312': DO NOT MERGE: Do not set the background to null for video.
|
7fff584bafa77b1ec522126cd2b88b1d72462d83 |
30-Oct-2012 |
Tenghui Zhu <ztenghui@google.com> |
am 3245b90f: am 310db394: (-s ours) Merge "DO NOT MERGE: Do not set the background to null for video." into gb-ub-photos-arches * commit '3245b90f56edac635a3bcf7963d71a125d3b4312': DO NOT MERGE: Do not set the background to null for video.
|
e4084d2752689f01f38ad0b929acfb8a30625afb |
30-Oct-2012 |
Tenghui Zhu <ztenghui@google.com> |
am 310db394: (-s ours) Merge "DO NOT MERGE: Do not set the background to null for video." into gb-ub-photos-arches * commit '310db394adcdb8677b9a3d0f37a4abee63bdbb50': DO NOT MERGE: Do not set the background to null for video.
|
0981f2aeb30fd2c607f9b4214fe3e8e6ce9abd11 |
30-Oct-2012 |
Tenghui Zhu <ztenghui@google.com> |
am 310db394: (-s ours) Merge "DO NOT MERGE: Do not set the background to null for video." into gb-ub-photos-arches * commit '310db394adcdb8677b9a3d0f37a4abee63bdbb50': DO NOT MERGE: Do not set the background to null for video.
|
3245b90f56edac635a3bcf7963d71a125d3b4312 |
30-Oct-2012 |
Tenghui Zhu <ztenghui@google.com> |
am 310db394: (-s ours) Merge "DO NOT MERGE: Do not set the background to null for video." into gb-ub-photos-arches * commit '310db394adcdb8677b9a3d0f37a4abee63bdbb50': DO NOT MERGE: Do not set the background to null for video.
|
a3c8cf04c31af4d53bb81d161241c13656847166 |
30-Oct-2012 |
Tenghui Zhu <ztenghui@google.com> |
Merge "DO NOT MERGE: Do not set the background to null for video." into gb-ub-photos-arches
|
310db394adcdb8677b9a3d0f37a4abee63bdbb50 |
30-Oct-2012 |
Tenghui Zhu <ztenghui@google.com> |
Merge "DO NOT MERGE: Do not set the background to null for video." into gb-ub-photos-arches
|
6af05206f0b71f7a09ed7d9f8763535723796d75 |
04-Oct-2012 |
Romain Guy <romainguy@google.com> |
DO NOT MERGE: Do not set the background to null for video. Bug #7275145 Bug 7405595 Removing the window background when it's not visible is a good idea to save on performance. Removing *all* the backgrounds is just a silly idea that leads to weird looking results that drive graphics engineers mad for a day until they figure out that everything is working properly and that the app is simply asking the system to draw whatever garbage is left in the GPU's graphics buffers. Cherry pick the Romain's change from jb-mr1-dev: https://googleplex-android-review.googlesource.com/#/c/234571/ Change-Id: Ief88821319989add5fda57ae7b69cdb01f6ccdf4
rc/com/android/gallery3d/app/MoviePlayer.java
|
1f57b48b220e38f3117b497e6b92ba155fee0e00 |
04-Oct-2012 |
Romain Guy <romainguy@google.com> |
DO NOT MERGE: Do not set the background to null for video. Bug #7275145 Bug 7405595 Removing the window background when it's not visible is a good idea to save on performance. Removing *all* the backgrounds is just a silly idea that leads to weird looking results that drive graphics engineers mad for a day until they figure out that everything is working properly and that the app is simply asking the system to draw whatever garbage is left in the GPU's graphics buffers. Cherry pick the Romain's change from jb-mr1-dev: https://googleplex-android-review.googlesource.com/#/c/234571/ Change-Id: Ief88821319989add5fda57ae7b69cdb01f6ccdf4
rc/com/android/gallery3d/app/MoviePlayer.java
|
d6cbf333a658fc9294714d90429ac1c1b8131dc6 |
30-Oct-2012 |
Bart Sears <bsears@google.com> |
am 81a7084a: am fb49d02c: am 3ac3cdd6: am c7536cfa: Merge "Show sync error toast only when both loading and syncing are done." into gb-ub-photos-arches * commit '81a7084a5f316f5a99da973ac6d74a5d208cdc2b': Show sync error toast only when both loading and syncing are done.
|
81a7084a5f316f5a99da973ac6d74a5d208cdc2b |
30-Oct-2012 |
Bart Sears <bsears@google.com> |
am fb49d02c: am 3ac3cdd6: am c7536cfa: Merge "Show sync error toast only when both loading and syncing are done." into gb-ub-photos-arches * commit 'fb49d02cfef7d9dacbde4a8c028d5fbc7a9159c7': Show sync error toast only when both loading and syncing are done.
|
fb49d02cfef7d9dacbde4a8c028d5fbc7a9159c7 |
30-Oct-2012 |
Bart Sears <bsears@google.com> |
am 3ac3cdd6: am c7536cfa: Merge "Show sync error toast only when both loading and syncing are done." into gb-ub-photos-arches * commit '3ac3cdd66f291e0e7400204f7410c02cffd24183': Show sync error toast only when both loading and syncing are done.
|
368127e5815811ffdc9181ca9ba4114c5b27a412 |
30-Oct-2012 |
Bart Sears <bsears@google.com> |
am 3ac3cdd6: am c7536cfa: Merge "Show sync error toast only when both loading and syncing are done." into gb-ub-photos-arches * commit '3ac3cdd66f291e0e7400204f7410c02cffd24183': Show sync error toast only when both loading and syncing are done.
|
3ac3cdd66f291e0e7400204f7410c02cffd24183 |
30-Oct-2012 |
Bart Sears <bsears@google.com> |
am c7536cfa: Merge "Show sync error toast only when both loading and syncing are done." into gb-ub-photos-arches * commit 'c7536cfa819d10e0c556ecb30c53a58c048fa327': Show sync error toast only when both loading and syncing are done.
|
85ee46d76fb59f8550afdfe73486fff2b6bd5035 |
30-Oct-2012 |
Bart Sears <bsears@google.com> |
am c7536cfa: Merge "Show sync error toast only when both loading and syncing are done." into gb-ub-photos-arches * commit 'c7536cfa819d10e0c556ecb30c53a58c048fa327': Show sync error toast only when both loading and syncing are done.
|
40930163b90a2e73710e628c2b2c0c06aa0fd4fc |
30-Oct-2012 |
Bart Sears <bsears@google.com> |
am c7536cfa: Merge "Show sync error toast only when both loading and syncing are done." into gb-ub-photos-arches * commit 'c7536cfa819d10e0c556ecb30c53a58c048fa327': Show sync error toast only when both loading and syncing are done.
|
556347cb20e871f25560ff37d7c51f66733888f7 |
30-Oct-2012 |
Bart Sears <bsears@google.com> |
Merge "Show sync error toast only when both loading and syncing are done." into gb-ub-photos-arches
|
c7536cfa819d10e0c556ecb30c53a58c048fa327 |
30-Oct-2012 |
Bart Sears <bsears@google.com> |
Merge "Show sync error toast only when both loading and syncing are done." into gb-ub-photos-arches
|
b253a741cbbb603282ddfd99d8e6dae3c45c342e |
30-Oct-2012 |
George Mount <mount@google.com> |
am 620cfc33: am 897e240e: am 14a53420: am aa8228a4: Merge "Don\'t use an album for UriImages." into gb-ub-photos-arches * commit '620cfc33b20cad73dc787d75dcb3784b2f59f45c': Don't use an album for UriImages.
|
620cfc33b20cad73dc787d75dcb3784b2f59f45c |
30-Oct-2012 |
George Mount <mount@google.com> |
am 897e240e: am 14a53420: am aa8228a4: Merge "Don\'t use an album for UriImages." into gb-ub-photos-arches * commit '897e240ee6984e68e93e6cad2b12af8d9b746c09': Don't use an album for UriImages.
|
897e240ee6984e68e93e6cad2b12af8d9b746c09 |
30-Oct-2012 |
George Mount <mount@google.com> |
am 14a53420: am aa8228a4: Merge "Don\'t use an album for UriImages." into gb-ub-photos-arches * commit '14a53420ee67fe971455d715af324266643ba0de': Don't use an album for UriImages.
|
59e23832fc445d98d2843e5fcef378c8a20a6e71 |
30-Oct-2012 |
George Mount <mount@google.com> |
am 14a53420: am aa8228a4: Merge "Don\'t use an album for UriImages." into gb-ub-photos-arches * commit '14a53420ee67fe971455d715af324266643ba0de': Don't use an album for UriImages.
|
fffab335ac447da86e7f54211b6415b49d096f85 |
30-Oct-2012 |
George Mount <mount@google.com> |
am aa8228a4: Merge "Don\'t use an album for UriImages." into gb-ub-photos-arches * commit 'aa8228a42b25b60f0663770beea9acdce536f699': Don't use an album for UriImages.
|
8cd80c97225bfaa15a0bd58b2cc3908a889ec11d |
30-Oct-2012 |
George Mount <mount@google.com> |
am aa8228a4: Merge "Don\'t use an album for UriImages." into gb-ub-photos-arches * commit 'aa8228a42b25b60f0663770beea9acdce536f699': Don't use an album for UriImages.
|
14a53420ee67fe971455d715af324266643ba0de |
30-Oct-2012 |
George Mount <mount@google.com> |
am aa8228a4: Merge "Don\'t use an album for UriImages." into gb-ub-photos-arches * commit 'aa8228a42b25b60f0663770beea9acdce536f699': Don't use an album for UriImages.
|
9062c85907bb49a30dd7554506a607b7405c4a35 |
30-Oct-2012 |
Teng-Hui Zhu <ztenghui@google.com> |
Merge "Gallery: Do not set the background to null for video." into gb-ub-photos-bryce
|
20a4327fc7e549fc7a9a0fe9d1dcdcc097787a41 |
30-Oct-2012 |
Teng-Hui Zhu <ztenghui@google.com> |
Merge "Gallery: Do not set the background to null for video." into gb-ub-photos-bryce
|
aa8228a42b25b60f0663770beea9acdce536f699 |
30-Oct-2012 |
George Mount <mount@google.com> |
Merge "Don't use an album for UriImages." into gb-ub-photos-arches
|
bbcb023e46e4cfc905182a753a74baa43e12b076 |
27-Oct-2012 |
Teng-Hui Zhu <ztenghui@google.com> |
Gallery: Do not set the background to null for video. This will fix screen corruption when exit while video complete or rotate while video playing. bug:7405595 Change-Id: I8b559390a284e5c850bc02a76add86c4de600144
rc/com/android/gallery3d/app/MoviePlayer.java
|
4f100e5f200d24a820ed59c7bc924e18e1b17a65 |
27-Oct-2012 |
Teng-Hui Zhu <ztenghui@google.com> |
Gallery: Do not set the background to null for video. This will fix screen corruption when exit while video complete or rotate while video playing. bug:7405595 Change-Id: I8b559390a284e5c850bc02a76add86c4de600144
rc/com/android/gallery3d/app/MoviePlayer.java
|
0914f54516683ba7d647435a1c0c52096caf94a5 |
30-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am 7647d011: (-s ours) am eedac3e8: am 1a2512cf: am 38c5d92c: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches * commit '7647d0113228d1d3eb0dd355cdb90fa17121858e': Import translations. DO NOT MERGE
|
6eddd196a8633f06606f31f4e5770c5aec969e62 |
30-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am 351263b2: (-s ours) am f793d897: am 115299f0: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev * commit '351263b2766b9871f56c341e87ae2b96c90906df': Import translations. DO NOT MERGE
|
c0e6bcfc41f51a468138b9b17eb32df7f750d7fa |
30-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am 69ff4456: (-s ours) am dba7e009: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev * commit '69ff4456d358f1a4b6ec187bc7d83e7e00fa00a2': Import translations. DO NOT MERGE
|
4cbb98e79ccaffc42d66c7218d88f134a51a87cb |
30-Oct-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
db0db2d3809d377577c601689c140276ac8cf323 |
30-Oct-2012 |
Hung-ying Tyan <tyanh@google.com> |
Show sync error toast only when both loading and syncing are done. Bug: 7427597 Change-Id: Ie1fe8510e2a2225424b3c2892b2c0a8b4021324c
rc/com/android/gallery3d/app/AlbumDataLoader.java
rc/com/android/gallery3d/app/AlbumPage.java
rc/com/android/gallery3d/app/AlbumSetDataLoader.java
rc/com/android/gallery3d/app/AlbumSetPage.java
rc/com/android/gallery3d/app/LoadingListener.java
rc/com/android/gallery3d/app/PhotoDataAdapter.java
rc/com/android/gallery3d/app/PhotoPage.java
|
05da3f520eacb9219964b6ed57ef37846d889fd7 |
30-Oct-2012 |
Hung-ying Tyan <tyanh@google.com> |
Show sync error toast only when both loading and syncing are done. Bug: 7427597 Change-Id: Ie1fe8510e2a2225424b3c2892b2c0a8b4021324c
rc/com/android/gallery3d/app/AlbumDataLoader.java
rc/com/android/gallery3d/app/AlbumPage.java
rc/com/android/gallery3d/app/AlbumSetDataLoader.java
rc/com/android/gallery3d/app/AlbumSetPage.java
rc/com/android/gallery3d/app/LoadingListener.java
rc/com/android/gallery3d/app/PhotoDataAdapter.java
rc/com/android/gallery3d/app/PhotoPage.java
|
f64f2b5a57a6eb058da1f3bb3d1349d614ce17cf |
30-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am f36a47e4: am 747df265: am b3e7d7d8: am dc03ae14: Reset rotation flag * commit 'f36a47e42065c5ce6be3a3b99b8a7a48672f21de': Reset rotation flag
|
6ffa99f8c7168a48f5cec5ef57dcbb3b1894d97b |
30-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 55d2b958: am e2f7f1c5: am ddc54044: am 98990049: Merge "Fix zooming position" into gb-ub-photos-arches * commit '55d2b958e7898632a5f16423fa680804f5c8bc27': Fix zooming position
|
ebef6c15d1502aa61a8d8612de70dc083615c8d8 |
30-Oct-2012 |
John Hoford <hoford@google.com> |
am 8422d07e: am 0b74421e: am 031a0741: am 17540e58: Do not copy XMP data if it has TinyPlanet filter * commit '8422d07ef518ad36a1fbfb2c1d43de4ead760dbd': Do not copy XMP data if it has TinyPlanet filter
|
87e6b71d14093701148d42e77f098983ab416539 |
30-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am 7dc33c1a: (-s ours) am 31e9c1fc: am fbab7ba5: am 49af06e2: (-s ours) Import translations. DO NOT MERGE * commit '7dc33c1ab6d39d64d7df38686d70bfc7d29a20bc': Import translations. DO NOT MERGE
|
c78eb7050eb53a01bf8a3197a1c82f9fe7d8cac0 |
30-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am b670ec0d: (-s ours) am 0cd70dc2: am b3e89cab: Import translations. DO NOT MERGE * commit 'b670ec0dffb2eca0ac8c54180322419560d43ba7': Import translations. DO NOT MERGE
|
e5cb8a93a665fa2e15cff211f7ae3725e10c130d |
30-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am 5428f346: (-s ours) am b1b8b9d8: am 5ac0bdab: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev * commit '5428f3463dbf74873413bd2a8ed1199e78a4a0fe': Import translations. DO NOT MERGE
|
78642ee6a2fb3ad1cde295dad6ada929cc8e434b |
30-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am bd6e6281: (-s ours) am 05988a6a: am 10f64ff1: am 798ec54d: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches * commit 'bd6e62811168ed2fdf5859cf1fefbbdf90239c1a': Import translations. DO NOT MERGE
|
09a2d09a9040818e7de2b4db2b9342f2c36ee55f |
30-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am 5be1b510: (-s ours) am a6767bee: am 8275abe7: am 5583758a: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches * commit '5be1b5100e6498a3348845c92fe45c23a6921773': Import translations. DO NOT MERGE
|
0edad215fd7da19d9b8c885e932f83b327b582c9 |
30-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am af9cbc38: (-s ours) am aeee054f: am 1cf344e2: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev * commit 'af9cbc38c189022923d8cb36441e016541c980dc': Import translations. DO NOT MERGE
|
883295bc3643c5d3e0520fa317bec9919cc4ff7c |
29-Oct-2012 |
George Mount <mount@google.com> |
Don't use an album for UriImages. Bug 7422455 Change-Id: Ic9b0ae762b56f6734a1bd452c6c877431b90c0a6
rc/com/android/gallery3d/data/UriSource.java
|
7db87e52758c2819785d71e36986080542f5ab3f |
29-Oct-2012 |
George Mount <mount@google.com> |
Don't use an album for UriImages. Bug 7422455 Change-Id: Ic9b0ae762b56f6734a1bd452c6c877431b90c0a6
rc/com/android/gallery3d/data/UriSource.java
|
7647d0113228d1d3eb0dd355cdb90fa17121858e |
29-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am eedac3e8: am 1a2512cf: am 38c5d92c: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches * commit 'eedac3e8b7ac8f8b725b7069aed4a04bdc14d4a7': Import translations. DO NOT MERGE
|
351263b2766b9871f56c341e87ae2b96c90906df |
29-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am f793d897: am 115299f0: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev * commit 'f793d897fe68100e6a30e8045763a770d2f9b8b0': Import translations. DO NOT MERGE
|
eedac3e8b7ac8f8b725b7069aed4a04bdc14d4a7 |
29-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am 1a2512cf: am 38c5d92c: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches * commit '1a2512cf1adf71c8a89e18eca40bef5bcc9fc451': Import translations. DO NOT MERGE
|
f793d897fe68100e6a30e8045763a770d2f9b8b0 |
29-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am 115299f0: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev * commit '115299f04552f97b019c45f1625a24b2c49b7a17': Import translations. DO NOT MERGE
|
ff601b2348e0740ab794a1c92f43c5d3219bd87f |
29-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am 1a2512cf: (-s ours) am 38c5d92c: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches * commit '1a2512cf1adf71c8a89e18eca40bef5bcc9fc451': Import translations. DO NOT MERGE
|
2bd00f793ffe9d20ec117515812cc4e534a5d876 |
29-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am 115299f0: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev * commit '115299f04552f97b019c45f1625a24b2c49b7a17': Import translations. DO NOT MERGE
|
69ff4456d358f1a4b6ec187bc7d83e7e00fa00a2 |
29-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am dba7e009: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev * commit 'dba7e009bcd10e9f07a762495926ea5a6ebaa041': Import translations. DO NOT MERGE
|
1a2512cf1adf71c8a89e18eca40bef5bcc9fc451 |
29-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am 38c5d92c: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches * commit '38c5d92c4a3659f3ae51a3b0f61bfb9eb2ed0043': Import translations. DO NOT MERGE
|
7d4315674d8e661afd82b5ce8fcbcbcb1c0a218a |
29-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am 38c5d92c: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches * commit '38c5d92c4a3659f3ae51a3b0f61bfb9eb2ed0043': Import translations. DO NOT MERGE
|
243b0e707ff470ae247ec2f2a781f04ca1155c8e |
29-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am 38c5d92c: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches * commit '38c5d92c4a3659f3ae51a3b0f61bfb9eb2ed0043': Import translations. DO NOT MERGE
|
b7eb1cc8c5c6724a127a61ba4137172fc201fb7e |
29-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE"
|
4b3127c16b6bbe34dc73467a5792ff1ebaeee537 |
29-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE"
|
06e7810cb3467ef99623826d662d18cc5ae64330 |
29-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
|
115299f04552f97b019c45f1625a24b2c49b7a17 |
29-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
|
dba7e009bcd10e9f07a762495926ea5a6ebaa041 |
29-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
|
7462db202fb5dcbec8822ce857f7ef2161e151ac |
29-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
|
a518a4c45e5bfe6443f67f5400d49d5809fb46ad |
29-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
|
38c5d92c4a3659f3ae51a3b0f61bfb9eb2ed0043 |
29-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
|
f36a47e42065c5ce6be3a3b99b8a7a48672f21de |
29-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 747df265: am b3e7d7d8: am dc03ae14: Reset rotation flag * commit '747df265b5d4035c96e379a1c82388bbdc9b3e61': Reset rotation flag
|
55d2b958e7898632a5f16423fa680804f5c8bc27 |
29-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am e2f7f1c5: am ddc54044: am 98990049: Merge "Fix zooming position" into gb-ub-photos-arches * commit 'e2f7f1c5cbc430f279c6949edaf0d9fbec5955ba': Fix zooming position
|
8422d07ef518ad36a1fbfb2c1d43de4ead760dbd |
29-Oct-2012 |
John Hoford <hoford@google.com> |
am 0b74421e: am 031a0741: am 17540e58: Do not copy XMP data if it has TinyPlanet filter * commit '0b74421e4c4e61628e3576bcab05ada7152b654d': Do not copy XMP data if it has TinyPlanet filter
|
7dc33c1ab6d39d64d7df38686d70bfc7d29a20bc |
29-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am 31e9c1fc: am fbab7ba5: am 49af06e2: (-s ours) Import translations. DO NOT MERGE * commit '31e9c1fce6507252342d1812eaade78d962d153d': Import translations. DO NOT MERGE
|
b670ec0dffb2eca0ac8c54180322419560d43ba7 |
29-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am 0cd70dc2: am b3e89cab: Import translations. DO NOT MERGE * commit '0cd70dc22311b0899f22ec4497d86bdb02d655de': Import translations. DO NOT MERGE
|
5428f3463dbf74873413bd2a8ed1199e78a4a0fe |
29-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am b1b8b9d8: am 5ac0bdab: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev * commit 'b1b8b9d896cf423835b7bb923aee85cfac320f37': Import translations. DO NOT MERGE
|
bd6e62811168ed2fdf5859cf1fefbbdf90239c1a |
29-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am 05988a6a: am 10f64ff1: am 798ec54d: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches * commit '05988a6a5c1c5f2a3738253c170a9b273403a8b5': Import translations. DO NOT MERGE
|
5be1b5100e6498a3348845c92fe45c23a6921773 |
29-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am a6767bee: am 8275abe7: am 5583758a: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches * commit 'a6767bee1ec3f8ff704fff73b60b97957803b124': Import translations. DO NOT MERGE
|
af9cbc38c189022923d8cb36441e016541c980dc |
29-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am aeee054f: am 1cf344e2: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev * commit 'aeee054f28484363ab7806434cc10e91dbf6cfc0': Import translations. DO NOT MERGE
|
1f0a60c5aa663be59ab5c9d06626ff467b45e958 |
29-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am b004da8f: am 909b7ea8: am 33d33c7e: am 2d2b69b0: Fix rounding issue affecting TinyPlanet * commit 'b004da8fa63332335f2b098490c0263e7b749fc6': Fix rounding issue affecting TinyPlanet
|
ee215cf670163667504d917abf86a2c705fe4a00 |
29-Oct-2012 |
Nicolas Roard <nicolasroard@google.com> |
am edc5a55d: am acccd6bf: am 90af32fb: am a0fe81ad: Merge "Changed rotated display parameter increments to 90." into gb-ub-photos-arches * commit 'edc5a55d207e14951ffc82572cb02d840eb8648a': Changed rotated display parameter increments to 90.
|
661aba86eb59410090f6542d3950372c19056590 |
29-Oct-2012 |
Nicolas Roard <nicolasroard@google.com> |
am 9e351096: am 06c6584c: am d2a1f33f: am 26cfff70: Merge "change thumbnail and reset behaviour" into gb-ub-photos-arches * commit '9e35109611a4bf0b86f76da63b69816e2574953f': change thumbnail and reset behaviour
|
f6f4d2b73835a3840e369b1b9486baddfc86b3d6 |
29-Oct-2012 |
Doris Liu <tianliu@google.com> |
am 6ae656f0: am 503f78f7: am f245d2b7: am 591974bc: Merge "Show panoViewer icon after "Back" from viewer" into gb-ub-photos-arches * commit '6ae656f01923a572714728d501474e6214d6482b': Show panoViewer icon after "Back" from viewer
|
3b11bd3f229928868a453b0aa49ac8f86d7cd92a |
29-Oct-2012 |
George Mount <mount@google.com> |
am 6b0287ae: am bcce61c1: am 6027d763: am b6d49492: Remove black borders in Manta LightCycle capture after orientation change. * commit '6b0287aedc62fd8d365734e7f027de493b3a8bac': Remove black borders in Manta LightCycle capture after orientation change.
|
02b5986003b65d7ce371a6921faa97800b11a50f |
29-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 67df44a7: am e8156332: am 2c8a2468: am 88870365: Merge "Fix the black lines near edge of thumbnails" into gb-ub-photos-arches * commit '67df44a7d9872a4bf4db42d24483f23e6f110ddd': Fix the black lines near edge of thumbnails
|
747df265b5d4035c96e379a1c82388bbdc9b3e61 |
29-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am b3e7d7d8: am dc03ae14: Reset rotation flag * commit 'b3e7d7d8abdb6ebb069cdc9a7206411ea53a8497': Reset rotation flag
|
e2f7f1c5cbc430f279c6949edaf0d9fbec5955ba |
29-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am ddc54044: am 98990049: Merge "Fix zooming position" into gb-ub-photos-arches * commit 'ddc54044bfa994db4160442ff74b4ddf2e228681': Fix zooming position
|
0b74421e4c4e61628e3576bcab05ada7152b654d |
29-Oct-2012 |
John Hoford <hoford@google.com> |
am 031a0741: am 17540e58: Do not copy XMP data if it has TinyPlanet filter * commit '031a07411e4ad53fe76c4ef6ed39d62dd429e406': Do not copy XMP data if it has TinyPlanet filter
|
31e9c1fce6507252342d1812eaade78d962d153d |
29-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am fbab7ba5: am 49af06e2: (-s ours) Import translations. DO NOT MERGE * commit 'fbab7ba54617493dc47082b0bb16496eeedc1560': Import translations. DO NOT MERGE
|
0cd70dc22311b0899f22ec4497d86bdb02d655de |
29-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am b3e89cab: Import translations. DO NOT MERGE * commit 'b3e89cab1ee57cb1cef8a69b295ad4c15a7f3ebc': Import translations. DO NOT MERGE
|
b1b8b9d896cf423835b7bb923aee85cfac320f37 |
29-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am 5ac0bdab: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev * commit '5ac0bdabc6be6b411b001aeabcc5ae6702251925': Import translations. DO NOT MERGE
|
05988a6a5c1c5f2a3738253c170a9b273403a8b5 |
29-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am 10f64ff1: am 798ec54d: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches * commit '10f64ff122ed917a19776256eb995637d00881c0': Import translations. DO NOT MERGE
|
a6767bee1ec3f8ff704fff73b60b97957803b124 |
29-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am 8275abe7: am 5583758a: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches * commit '8275abe7a2d71107087a111b527336068ed28f7e': Import translations. DO NOT MERGE
|
aeee054f28484363ab7806434cc10e91dbf6cfc0 |
29-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am 1cf344e2: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev * commit '1cf344e2719c75f0590fd3ed13ec42820f97e29a': Import translations. DO NOT MERGE
|
b004da8fa63332335f2b098490c0263e7b749fc6 |
29-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 909b7ea8: am 33d33c7e: am 2d2b69b0: Fix rounding issue affecting TinyPlanet * commit '909b7ea89330392cc1003ad29ae451d24d13af07': Fix rounding issue affecting TinyPlanet
|
edc5a55d207e14951ffc82572cb02d840eb8648a |
29-Oct-2012 |
Nicolas Roard <nicolasroard@google.com> |
am acccd6bf: am 90af32fb: am a0fe81ad: Merge "Changed rotated display parameter increments to 90." into gb-ub-photos-arches * commit 'acccd6bfb6c3abeb15c120df0432549ad96a111b': Changed rotated display parameter increments to 90.
|
9e35109611a4bf0b86f76da63b69816e2574953f |
29-Oct-2012 |
Nicolas Roard <nicolasroard@google.com> |
am 06c6584c: am d2a1f33f: am 26cfff70: Merge "change thumbnail and reset behaviour" into gb-ub-photos-arches * commit '06c6584c540005392185e9f968333bcc226b9dc4': change thumbnail and reset behaviour
|
6ae656f01923a572714728d501474e6214d6482b |
29-Oct-2012 |
Doris Liu <tianliu@google.com> |
am 503f78f7: am f245d2b7: am 591974bc: Merge "Show panoViewer icon after "Back" from viewer" into gb-ub-photos-arches * commit '503f78f786de82e1e8a719b39436a822b844dc78': Show panoViewer icon after "Back" from viewer
|
6b0287aedc62fd8d365734e7f027de493b3a8bac |
29-Oct-2012 |
George Mount <mount@google.com> |
am bcce61c1: am 6027d763: am b6d49492: Remove black borders in Manta LightCycle capture after orientation change. * commit 'bcce61c1ef3f3f2c2a49dfb64c480bcc891c6318': Remove black borders in Manta LightCycle capture after orientation change.
|
67df44a7d9872a4bf4db42d24483f23e6f110ddd |
29-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am e8156332: am 2c8a2468: am 88870365: Merge "Fix the black lines near edge of thumbnails" into gb-ub-photos-arches * commit 'e8156332fafb63df42c3cfc44dce8fc80f22ca2b': Fix the black lines near edge of thumbnails
|
909b7ea89330392cc1003ad29ae451d24d13af07 |
29-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 33d33c7e: am 2d2b69b0: Fix rounding issue affecting TinyPlanet * commit '33d33c7ee22b02dc87085014fc178e0a80b946bb': Fix rounding issue affecting TinyPlanet
|
acccd6bfb6c3abeb15c120df0432549ad96a111b |
29-Oct-2012 |
Nicolas Roard <nicolasroard@google.com> |
am 90af32fb: am a0fe81ad: Merge "Changed rotated display parameter increments to 90." into gb-ub-photos-arches * commit '90af32fb05b7c2be9807d6b53bd61b4093ed0e00': Changed rotated display parameter increments to 90.
|
06c6584c540005392185e9f968333bcc226b9dc4 |
29-Oct-2012 |
Nicolas Roard <nicolasroard@google.com> |
am d2a1f33f: am 26cfff70: Merge "change thumbnail and reset behaviour" into gb-ub-photos-arches * commit 'd2a1f33fdcf77073f80c144eaaed24f4d28ab373': change thumbnail and reset behaviour
|
503f78f786de82e1e8a719b39436a822b844dc78 |
29-Oct-2012 |
Doris Liu <tianliu@google.com> |
am f245d2b7: am 591974bc: Merge "Show panoViewer icon after "Back" from viewer" into gb-ub-photos-arches * commit 'f245d2b716fdc26b59f1251bf55707cdc06c331a': Show panoViewer icon after "Back" from viewer
|
bcce61c1ef3f3f2c2a49dfb64c480bcc891c6318 |
29-Oct-2012 |
George Mount <mount@google.com> |
am 6027d763: am b6d49492: Remove black borders in Manta LightCycle capture after orientation change. * commit '6027d7638a2a9445a2a4bbef364d9c02982ffd0b': Remove black borders in Manta LightCycle capture after orientation change.
|
e8156332fafb63df42c3cfc44dce8fc80f22ca2b |
29-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 2c8a2468: am 88870365: Merge "Fix the black lines near edge of thumbnails" into gb-ub-photos-arches * commit '2c8a24680ad88ab0028451716bff215aa6e91576': Fix the black lines near edge of thumbnails
|
59e1fc0f37be14fa8290a5be734dc5819a7e6484 |
29-Oct-2012 |
Doris Liu <tianliu@google.com> |
Disable save button when there's no modification Bug: 7353884 Change-Id: I1b88e8b8ab3a92aad1226c60062a17a2f4badfb9
rc/com/android/gallery3d/app/TrimVideo.java
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/imageshow/ImageShow.java
|
87f2a4daff6a472051326e9488cce589d7960a40 |
29-Oct-2012 |
Doris Liu <tianliu@google.com> |
Disable save button when there's no modification Bug: 7353884 Change-Id: I1b88e8b8ab3a92aad1226c60062a17a2f4badfb9
es/drawable-hdpi/ic_menu_savephoto_disabled.png
es/drawable-mdpi/ic_menu_savephoto_disabled.png
es/drawable-xhdpi/ic_menu_savephoto_disabled.png
es/drawable/menu_save_photo.xml
es/layout/filtershow_actionbar.xml
es/layout/trim_menu.xml
|
bf1677a434760fcb7389a30c18e05cc3e7926d40 |
29-Oct-2012 |
Doris Liu <tianliu@google.com> |
Disable save button when there's no modification Bug: 7353884 Change-Id: I1b88e8b8ab3a92aad1226c60062a17a2f4badfb9
es/drawable-hdpi/ic_menu_savephoto_disabled.png
es/drawable-mdpi/ic_menu_savephoto_disabled.png
es/drawable-xhdpi/ic_menu_savephoto_disabled.png
es/drawable/menu_save_photo.xml
es/layout/filtershow_actionbar.xml
es/layout/trim_menu.xml
rc/com/android/gallery3d/app/TrimVideo.java
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/imageshow/ImageShow.java
|
8d6f9c6a403eb7ba96fbd96c82fcaa6dc0f2fa66 |
29-Oct-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
ded6d0fe3d87b64f30de5add511bfd24a7d0382d |
29-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am b3e7d7d8: am dc03ae14: Reset rotation flag * commit 'b3e7d7d8abdb6ebb069cdc9a7206411ea53a8497': Reset rotation flag
|
4939eccb3c458b2308c99e494355afcc17bc1cb8 |
29-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am dc03ae14: Reset rotation flag * commit 'dc03ae144d838714446b239f2b0c519d956af6ff': Reset rotation flag
|
be8f8878f7941bcb6b86523ed3c0ecc21761c104 |
29-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am dc03ae14: Reset rotation flag * commit 'dc03ae144d838714446b239f2b0c519d956af6ff': Reset rotation flag
|
b3e7d7d8abdb6ebb069cdc9a7206411ea53a8497 |
29-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am dc03ae14: Reset rotation flag * commit 'dc03ae144d838714446b239f2b0c519d956af6ff': Reset rotation flag
|
dc03ae144d838714446b239f2b0c519d956af6ff |
29-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Reset rotation flag bug:7386221 Change-Id: I45a615a880a96d54bbde0a5ce648e02ff86db1de
rc/com/android/gallery3d/filtershow/cache/ImageLoader.java
|
373fe6a155425c6488ab610157184633637314b4 |
29-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Reset rotation flag bug:7386221 Change-Id: I45a615a880a96d54bbde0a5ce648e02ff86db1de
rc/com/android/gallery3d/filtershow/cache/ImageLoader.java
|
2147266dc65bd95d5603c53fe23e77e136fa68f4 |
29-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am ddc54044: am 98990049: Merge "Fix zooming position" into gb-ub-photos-arches * commit 'ddc54044bfa994db4160442ff74b4ddf2e228681': Fix zooming position
|
ddc54044bfa994db4160442ff74b4ddf2e228681 |
29-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 98990049: Merge "Fix zooming position" into gb-ub-photos-arches * commit '98990049451cda3540f6cff1ae8065c3675ed3d8': Fix zooming position
|
d75dffab97b8d589be5a79a7ee0c05a06de0ee3c |
29-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 98990049: Merge "Fix zooming position" into gb-ub-photos-arches * commit '98990049451cda3540f6cff1ae8065c3675ed3d8': Fix zooming position
|
10eeff5c5ea9ff7028532055ce64085223c5f0f7 |
29-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 98990049: Merge "Fix zooming position" into gb-ub-photos-arches * commit '98990049451cda3540f6cff1ae8065c3675ed3d8': Fix zooming position
|
98990049451cda3540f6cff1ae8065c3675ed3d8 |
29-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Merge "Fix zooming position" into gb-ub-photos-arches
|
17b9bd8f1baed2f788d179d90b775a9c16087b50 |
29-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Merge "Fix zooming position" into gb-ub-photos-arches
|
d98ece88315f747bef1d3d826002fb075e0d18fa |
29-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: If7c33262b2bbff97dc6d0f96e6f2b6b453b0198b Auto-generated-cl: translation import
es/values-af/photoeditor_strings.xml
es/values-am/photoeditor_strings.xml
es/values-ar/photoeditor_strings.xml
es/values-be/photoeditor_strings.xml
es/values-bg/photoeditor_strings.xml
es/values-ca/photoeditor_strings.xml
es/values-cs/photoeditor_strings.xml
es/values-da/photoeditor_strings.xml
es/values-de/photoeditor_strings.xml
es/values-el/photoeditor_strings.xml
es/values-en-rGB/photoeditor_strings.xml
es/values-es-rUS/photoeditor_strings.xml
es/values-es/photoeditor_strings.xml
es/values-et/photoeditor_strings.xml
es/values-fa/photoeditor_strings.xml
es/values-fi/photoeditor_strings.xml
es/values-fr/photoeditor_strings.xml
es/values-hi/photoeditor_strings.xml
es/values-hr/photoeditor_strings.xml
es/values-hu/photoeditor_strings.xml
es/values-in/photoeditor_strings.xml
es/values-it/photoeditor_strings.xml
es/values-iw/photoeditor_strings.xml
es/values-ja/photoeditor_strings.xml
es/values-ko/photoeditor_strings.xml
es/values-lt/photoeditor_strings.xml
es/values-lv/photoeditor_strings.xml
es/values-ms/photoeditor_strings.xml
es/values-nb/photoeditor_strings.xml
es/values-nl/photoeditor_strings.xml
es/values-pl/photoeditor_strings.xml
es/values-pt-rPT/photoeditor_strings.xml
es/values-pt/photoeditor_strings.xml
es/values-ro/photoeditor_strings.xml
es/values-ru/photoeditor_strings.xml
es/values-sk/photoeditor_strings.xml
es/values-sl/photoeditor_strings.xml
es/values-sr/photoeditor_strings.xml
es/values-sv/photoeditor_strings.xml
es/values-sw/photoeditor_strings.xml
es/values-th/photoeditor_strings.xml
es/values-tl/photoeditor_strings.xml
es/values-tr/photoeditor_strings.xml
es/values-uk/photoeditor_strings.xml
es/values-vi/photoeditor_strings.xml
es/values-zh-rCN/photoeditor_strings.xml
es/values-zh-rTW/photoeditor_strings.xml
es/values-zu/photoeditor_strings.xml
|
a423bc80d5e8ffef80b476d1fb650749494521b0 |
29-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ie52bcd01da2cc0d6928135217f5e0f69aa0f2cc2 Auto-generated-cl: translation import
es/values-be/filtershow_strings.xml
es/values-de/filtershow_strings.xml
es/values-es/filtershow_strings.xml
es/values-fa/filtershow_strings.xml
es/values-fi/filtershow_strings.xml
es/values-in/filtershow_strings.xml
es/values-iw/filtershow_strings.xml
es/values-ja/filtershow_strings.xml
es/values-ko/filtershow_strings.xml
es/values-ms/filtershow_strings.xml
es/values-pt/filtershow_strings.xml
es/values-sv/filtershow_strings.xml
es/values-th/filtershow_strings.xml
es/values-tl/filtershow_strings.xml
es/values-tr/filtershow_strings.xml
es/values-uk/filtershow_strings.xml
es/values-vi/filtershow_strings.xml
es/values-zh-rTW/filtershow_strings.xml
|
d80728fff99e408e9297964cf02d24fbcae065c4 |
29-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Iaf4585b3410dde61ed413bf4aaa59d3b6366be2b Auto-generated-cl: translation import
es/values-be/filtershow_strings.xml
es/values-de/filtershow_strings.xml
es/values-es/filtershow_strings.xml
es/values-fa/filtershow_strings.xml
es/values-fi/filtershow_strings.xml
es/values-in/filtershow_strings.xml
es/values-iw/filtershow_strings.xml
es/values-ja/filtershow_strings.xml
es/values-ko/filtershow_strings.xml
es/values-ms/filtershow_strings.xml
es/values-pt/filtershow_strings.xml
es/values-sv/filtershow_strings.xml
es/values-th/filtershow_strings.xml
es/values-tl/filtershow_strings.xml
es/values-tr/filtershow_strings.xml
es/values-uk/filtershow_strings.xml
es/values-vi/filtershow_strings.xml
es/values-zh-rTW/filtershow_strings.xml
|
6c9a80495360d196df18cd2c0b44c45acb5bb83e |
29-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I2bd22a0696bdcca4685ef89650155b4e4ebd33fa Auto-generated-cl: translation import
es/values-be/filtershow_strings.xml
es/values-de/filtershow_strings.xml
es/values-es/filtershow_strings.xml
es/values-fa/filtershow_strings.xml
es/values-fi/filtershow_strings.xml
es/values-in/filtershow_strings.xml
es/values-iw/filtershow_strings.xml
es/values-ja/filtershow_strings.xml
es/values-ko/filtershow_strings.xml
es/values-ms/filtershow_strings.xml
es/values-pt/filtershow_strings.xml
es/values-sv/filtershow_strings.xml
es/values-th/filtershow_strings.xml
es/values-tl/filtershow_strings.xml
es/values-tr/filtershow_strings.xml
es/values-uk/filtershow_strings.xml
es/values-vi/filtershow_strings.xml
es/values-zh-rTW/filtershow_strings.xml
|
398c8fc33a1d50dba05da90be888f76a6cecb136 |
29-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Iaaba78c952e5c8b0c4e37c38abe135a0831f563f Auto-generated-cl: translation import
es/values-be/filtershow_strings.xml
es/values-de/filtershow_strings.xml
es/values-es/filtershow_strings.xml
es/values-fa/filtershow_strings.xml
es/values-fi/filtershow_strings.xml
es/values-in/filtershow_strings.xml
es/values-iw/filtershow_strings.xml
es/values-ja/filtershow_strings.xml
es/values-ko/filtershow_strings.xml
es/values-ms/filtershow_strings.xml
es/values-pt/filtershow_strings.xml
es/values-sv/filtershow_strings.xml
es/values-th/filtershow_strings.xml
es/values-tl/filtershow_strings.xml
es/values-tr/filtershow_strings.xml
es/values-uk/filtershow_strings.xml
es/values-vi/filtershow_strings.xml
es/values-zh-rTW/filtershow_strings.xml
|
13429c056f39cd9edec957f3ca934c1b98819bec |
29-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Icc56fac50486b6af23e8ea9f44e015849fa16c84 Auto-generated-cl: translation import
es/values-be/filtershow_strings.xml
es/values-de/filtershow_strings.xml
es/values-es/filtershow_strings.xml
es/values-fa/filtershow_strings.xml
es/values-fi/filtershow_strings.xml
es/values-in/filtershow_strings.xml
es/values-iw/filtershow_strings.xml
es/values-ja/filtershow_strings.xml
es/values-ko/filtershow_strings.xml
es/values-ms/filtershow_strings.xml
es/values-pt/filtershow_strings.xml
es/values-sv/filtershow_strings.xml
es/values-th/filtershow_strings.xml
es/values-tl/filtershow_strings.xml
es/values-tr/filtershow_strings.xml
es/values-uk/filtershow_strings.xml
es/values-vi/filtershow_strings.xml
es/values-zh-rTW/filtershow_strings.xml
|
191316564357e2f29883eba25fc96efcee093645 |
29-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Icc56fac50486b6af23e8ea9f44e015849fa16c84 Auto-generated-cl: translation import
es/values-be/filtershow_strings.xml
es/values-de/filtershow_strings.xml
es/values-es/filtershow_strings.xml
es/values-fa/filtershow_strings.xml
es/values-fi/filtershow_strings.xml
es/values-in/filtershow_strings.xml
es/values-iw/filtershow_strings.xml
es/values-ja/filtershow_strings.xml
es/values-ko/filtershow_strings.xml
es/values-ms/filtershow_strings.xml
es/values-pt/filtershow_strings.xml
es/values-sv/filtershow_strings.xml
es/values-th/filtershow_strings.xml
es/values-tl/filtershow_strings.xml
es/values-tr/filtershow_strings.xml
es/values-uk/filtershow_strings.xml
es/values-vi/filtershow_strings.xml
es/values-zh-rTW/filtershow_strings.xml
|
8f9169d841fa7b28a036228a1efd1add455d7db0 |
29-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I4c74eeda009683c4866e6d409d88c761fd3cd78c Auto-generated-cl: translation import
es/values-be/filtershow_strings.xml
es/values-de/filtershow_strings.xml
es/values-es/filtershow_strings.xml
es/values-fa/filtershow_strings.xml
es/values-fi/filtershow_strings.xml
es/values-in/filtershow_strings.xml
es/values-iw/filtershow_strings.xml
es/values-ja/filtershow_strings.xml
es/values-ko/filtershow_strings.xml
es/values-ms/filtershow_strings.xml
es/values-pt/filtershow_strings.xml
es/values-sv/filtershow_strings.xml
es/values-th/filtershow_strings.xml
es/values-tl/filtershow_strings.xml
es/values-tr/filtershow_strings.xml
es/values-uk/filtershow_strings.xml
es/values-vi/filtershow_strings.xml
es/values-zh-rTW/filtershow_strings.xml
|
1087c47ef073251cef570f3747c9f33d14a2966e |
29-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I4c74eeda009683c4866e6d409d88c761fd3cd78c Auto-generated-cl: translation import
es/values-be/filtershow_strings.xml
es/values-de/filtershow_strings.xml
es/values-es/filtershow_strings.xml
es/values-fa/filtershow_strings.xml
es/values-fi/filtershow_strings.xml
es/values-in/filtershow_strings.xml
es/values-iw/filtershow_strings.xml
es/values-ja/filtershow_strings.xml
es/values-ko/filtershow_strings.xml
es/values-ms/filtershow_strings.xml
es/values-pt/filtershow_strings.xml
es/values-sv/filtershow_strings.xml
es/values-th/filtershow_strings.xml
es/values-tl/filtershow_strings.xml
es/values-tr/filtershow_strings.xml
es/values-uk/filtershow_strings.xml
es/values-vi/filtershow_strings.xml
es/values-zh-rTW/filtershow_strings.xml
|
6f444bb46565e5f3142c16c2a3f7ebcdcafd90cd |
29-Oct-2012 |
John Hoford <hoford@google.com> |
am 031a0741: am 17540e58: Do not copy XMP data if it has TinyPlanet filter * commit '031a07411e4ad53fe76c4ef6ed39d62dd429e406': Do not copy XMP data if it has TinyPlanet filter
|
031a07411e4ad53fe76c4ef6ed39d62dd429e406 |
29-Oct-2012 |
John Hoford <hoford@google.com> |
am 17540e58: Do not copy XMP data if it has TinyPlanet filter * commit '17540e58b8454e820a6273365cee94742d9b9900': Do not copy XMP data if it has TinyPlanet filter
|
7cd69693797fc83ebd4f13607aac72c27bbe49ee |
29-Oct-2012 |
John Hoford <hoford@google.com> |
am 17540e58: Do not copy XMP data if it has TinyPlanet filter * commit '17540e58b8454e820a6273365cee94742d9b9900': Do not copy XMP data if it has TinyPlanet filter
|
98f62053abe7cd461408ff7c0b48e3cf14d07068 |
29-Oct-2012 |
John Hoford <hoford@google.com> |
am 17540e58: Do not copy XMP data if it has TinyPlanet filter * commit '17540e58b8454e820a6273365cee94742d9b9900': Do not copy XMP data if it has TinyPlanet filter
|
aeac24cea8a50f1b7394841f674525b120f717ff |
29-Oct-2012 |
John Hoford <hoford@google.com> |
am 17540e58: Do not copy XMP data if it has TinyPlanet filter * commit '17540e58b8454e820a6273365cee94742d9b9900': Do not copy XMP data if it has TinyPlanet filter
|
17540e58b8454e820a6273365cee94742d9b9900 |
29-Oct-2012 |
John Hoford <hoford@google.com> |
Do not copy XMP data if it has TinyPlanet filter bug:7429072 Change-Id: I791db8ae8157741eb4cd74e9b6f749275b6b6cc3
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
|
7fcf15ec7f1dc20d211c6211bb3a464d12449ffa |
29-Oct-2012 |
John Hoford <hoford@google.com> |
Do not copy XMP data if it has TinyPlanet filter bug:7429072 Change-Id: I791db8ae8157741eb4cd74e9b6f749275b6b6cc3
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
|
6c8ccb0f98a4cd10c5987f492f9a94f650c89b1b |
29-Oct-2012 |
John Hoford <hoford@google.com> |
Do not copy XMP data if it has TinyPlanet filter bug:7429072 Change-Id: I791db8ae8157741eb4cd74e9b6f749275b6b6cc3
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
|
5bd4e9865c469c7f253194676de7943d2784d5a2 |
29-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am b1132531: (-s ours) am eebfff4b: Import translations. DO NOT MERGE * commit 'b1132531146d1aff6a86426a9fe66c925657616a': Import translations. DO NOT MERGE
|
cbf27c9661d34b9f334af225bee356f29ad4aa17 |
29-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am fbab7ba5: (-s ours) am 49af06e2: (-s ours) Import translations. DO NOT MERGE * commit 'fbab7ba54617493dc47082b0bb16496eeedc1560': Import translations. DO NOT MERGE
|
3540bf03ffea7b52fe43c9029e3a07f0b3cd09a2 |
29-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am b3e89cab: (-s ours) Import translations. DO NOT MERGE * commit 'b3e89cab1ee57cb1cef8a69b295ad4c15a7f3ebc': Import translations. DO NOT MERGE
|
b1132531146d1aff6a86426a9fe66c925657616a |
29-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am eebfff4b: Import translations. DO NOT MERGE * commit 'eebfff4b926876d75d0ada7d804c00680fae978d': Import translations. DO NOT MERGE
|
2f8301760867dc269c90bbeb338495f80e841c08 |
26-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Fix zooming position bug:7386221 Change-Id: I70215d3c3e12d08eee40a3cc848e3fc50f7dda75
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/cache/ImageLoader.java
rc/com/android/gallery3d/filtershow/imageshow/GeometryMetadata.java
rc/com/android/gallery3d/filtershow/imageshow/ImageZoom.java
|
180282b9c90e2b387e6c65f1b35bb637c170aacf |
26-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Fix zooming position bug:7386221 Change-Id: I70215d3c3e12d08eee40a3cc848e3fc50f7dda75
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/cache/ImageLoader.java
rc/com/android/gallery3d/filtershow/imageshow/GeometryMetadata.java
rc/com/android/gallery3d/filtershow/imageshow/ImageZoom.java
|
fbab7ba54617493dc47082b0bb16496eeedc1560 |
29-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am 49af06e2: (-s ours) Import translations. DO NOT MERGE * commit '49af06e229cdb52c4318dd6fd71d3c469fb5779a': Import translations. DO NOT MERGE
|
ae31775219bcfaf4e800cdd94525590a7cb64fc1 |
29-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am 49af06e2: (-s ours) Import translations. DO NOT MERGE * commit '49af06e229cdb52c4318dd6fd71d3c469fb5779a': Import translations. DO NOT MERGE
|
192ef307d4971040d3e2e9bb9dbd5381efb20cee |
29-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am 49af06e2: (-s ours) Import translations. DO NOT MERGE * commit '49af06e229cdb52c4318dd6fd71d3c469fb5779a': Import translations. DO NOT MERGE
|
c5f352af71c144cf3dafc8949718e95e6be9e7b6 |
28-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Iec21fadc4ebe20c2c7b88234b45f2b2bca81c52f Auto-generated-cl: translation import
es/values-af/filtershow_strings.xml
es/values-am/filtershow_strings.xml
es/values-bg/filtershow_strings.xml
es/values-cs/filtershow_strings.xml
es/values-el/filtershow_strings.xml
es/values-en-rGB/filtershow_strings.xml
es/values-fr/filtershow_strings.xml
es/values-it/filtershow_strings.xml
es/values-sw/filtershow_strings.xml
es/values-zu/filtershow_strings.xml
|
68983489dbd8310e25339b1a7988c6ba167a3795 |
28-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I9993528e3b5b8b787499ddf730f84548884ba182 Auto-generated-cl: translation import
es/values-af/filtershow_strings.xml
es/values-am/filtershow_strings.xml
es/values-bg/filtershow_strings.xml
es/values-cs/filtershow_strings.xml
es/values-el/filtershow_strings.xml
es/values-en-rGB/filtershow_strings.xml
es/values-fr/filtershow_strings.xml
es/values-it/filtershow_strings.xml
es/values-sw/filtershow_strings.xml
es/values-zu/filtershow_strings.xml
|
b3e89cab1ee57cb1cef8a69b295ad4c15a7f3ebc |
28-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: If68f5b73d5e9f60c1ffbd07be3ca47314211dd6d Auto-generated-cl: translation import
es/values-af/filtershow_strings.xml
es/values-am/filtershow_strings.xml
es/values-bg/filtershow_strings.xml
es/values-cs/filtershow_strings.xml
es/values-el/filtershow_strings.xml
es/values-en-rGB/filtershow_strings.xml
es/values-fr/filtershow_strings.xml
es/values-it/filtershow_strings.xml
es/values-sw/filtershow_strings.xml
es/values-zu/filtershow_strings.xml
|
eebfff4b926876d75d0ada7d804c00680fae978d |
28-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I3a1e2e5fad9b859af0fb555394db3faccf0a07e7 Auto-generated-cl: translation import
es/values-af/filtershow_strings.xml
es/values-am/filtershow_strings.xml
es/values-bg/filtershow_strings.xml
es/values-cs/filtershow_strings.xml
es/values-el/filtershow_strings.xml
es/values-en-rGB/filtershow_strings.xml
es/values-fr/filtershow_strings.xml
es/values-it/filtershow_strings.xml
es/values-sw/filtershow_strings.xml
es/values-zu/filtershow_strings.xml
|
1b9c5b9fed92bed956e45527ede4e46825b8916e |
28-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I0511f6ab875fed7dd83db188a74993bd57131c6f Auto-generated-cl: translation import
es/values-af/filtershow_strings.xml
es/values-am/filtershow_strings.xml
es/values-bg/filtershow_strings.xml
es/values-cs/filtershow_strings.xml
es/values-el/filtershow_strings.xml
es/values-en-rGB/filtershow_strings.xml
es/values-fr/filtershow_strings.xml
es/values-it/filtershow_strings.xml
es/values-sw/filtershow_strings.xml
es/values-zu/filtershow_strings.xml
|
a76607a76621e8d629e1d8fa6639b8b029ec322d |
28-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I0511f6ab875fed7dd83db188a74993bd57131c6f Auto-generated-cl: translation import
es/values-af/filtershow_strings.xml
es/values-am/filtershow_strings.xml
es/values-bg/filtershow_strings.xml
es/values-cs/filtershow_strings.xml
es/values-el/filtershow_strings.xml
es/values-en-rGB/filtershow_strings.xml
es/values-fr/filtershow_strings.xml
es/values-it/filtershow_strings.xml
es/values-sw/filtershow_strings.xml
es/values-zu/filtershow_strings.xml
|
49af06e229cdb52c4318dd6fd71d3c469fb5779a |
28-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I6a988a9b70abe1fff8bd37eb377900aee6e8625e Auto-generated-cl: translation import
es/values-af/filtershow_strings.xml
es/values-am/filtershow_strings.xml
es/values-bg/filtershow_strings.xml
es/values-cs/filtershow_strings.xml
es/values-el/filtershow_strings.xml
es/values-en-rGB/filtershow_strings.xml
es/values-fr/filtershow_strings.xml
es/values-it/filtershow_strings.xml
es/values-sw/filtershow_strings.xml
es/values-zu/filtershow_strings.xml
|
42efcaee079e35e6764886aa2dfb142b137b751b |
28-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I6a988a9b70abe1fff8bd37eb377900aee6e8625e Auto-generated-cl: translation import
es/values-af/filtershow_strings.xml
es/values-am/filtershow_strings.xml
es/values-bg/filtershow_strings.xml
es/values-cs/filtershow_strings.xml
es/values-el/filtershow_strings.xml
es/values-en-rGB/filtershow_strings.xml
es/values-fr/filtershow_strings.xml
es/values-it/filtershow_strings.xml
es/values-sw/filtershow_strings.xml
es/values-zu/filtershow_strings.xml
|
4ecaa6890d0be8018d8c85c6590e81601e31312b |
28-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am 5ac0bdab: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev * commit '5ac0bdabc6be6b411b001aeabcc5ae6702251925': Import translations. DO NOT MERGE
|
a1655432d60259fd2ac7f93d0df30f1d326b6c46 |
28-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE"
|
ebe62dc682db5b6e1fc52c5288d74642e742aa5a |
28-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
|
5ac0bdabc6be6b411b001aeabcc5ae6702251925 |
28-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
|
acfd38e1d1f8b0b566f3d484d559a27080b93604 |
28-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am 89ebd1d7: (-s ours) am 170497d3: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev * commit '89ebd1d773b0c654e24a17ea0ae2d2a989f299c4': Import translations. DO NOT MERGE
|
fc8e6db700cadfe0ad19fb783014428877bd2b6d |
28-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am 10f64ff1: (-s ours) am 798ec54d: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches * commit '10f64ff122ed917a19776256eb995637d00881c0': Import translations. DO NOT MERGE
|
7228f8d44a780dc96bacde68a963e7f9843686ae |
28-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am d67c0f46: (-s ours) am da7e6d2b: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev * commit 'd67c0f46ec2d358d48edcc5110039df8e1904824': Import translations. DO NOT MERGE
|
10f64ff122ed917a19776256eb995637d00881c0 |
28-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am 798ec54d: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches * commit '798ec54d6fbb9c847c3fa9f58129a9e7e57d82e3': Import translations. DO NOT MERGE
|
89ebd1d773b0c654e24a17ea0ae2d2a989f299c4 |
28-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am 170497d3: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev * commit '170497d375ae49ac131428ad21809e30fd113b4d': Import translations. DO NOT MERGE
|
aeb6fcb4562e9f3033363ed78e3eb700879865e3 |
28-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am 798ec54d: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches * commit '798ec54d6fbb9c847c3fa9f58129a9e7e57d82e3': Import translations. DO NOT MERGE
|
e6ba6d2c5a5620b8c4689faa2cf8fe4f61a668a1 |
28-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am 798ec54d: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches * commit '798ec54d6fbb9c847c3fa9f58129a9e7e57d82e3': Import translations. DO NOT MERGE
|
170497d375ae49ac131428ad21809e30fd113b4d |
28-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
|
d362e43102f40fef0b50ee477c553b5dd76209dd |
28-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
|
ff7caa5eade47cd4d629209f3cded0173f8bbf84 |
28-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
|
798ec54d6fbb9c847c3fa9f58129a9e7e57d82e3 |
28-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
|
b597dc8a7076225335e9ea82a00510608392651f |
28-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
|
d67c0f46ec2d358d48edcc5110039df8e1904824 |
28-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am da7e6d2b: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev * commit 'da7e6d2ba8e948da90b8451bf6d0c2f2661b6035': Import translations. DO NOT MERGE
|
f2f31a63fbcb97da3ba7140ab4689b5d90bdda84 |
28-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am 8275abe7: (-s ours) am 5583758a: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches * commit '8275abe7a2d71107087a111b527336068ed28f7e': Import translations. DO NOT MERGE
|
adfcb00669bee5797c93ca163adb40f282ec5e9b |
28-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am 1cf344e2: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev * commit '1cf344e2719c75f0590fd3ed13ec42820f97e29a': Import translations. DO NOT MERGE
|
0053b08e82d1cacd8f253c1cbe6334ffa8c1db13 |
28-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE"
|
8fd48ff0037fb9987994fc3113e34e36d9283a5c |
28-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am 5583758a: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches * commit '5583758af4174a627c35358218b61bf039cf5e74': Import translations. DO NOT MERGE
|
a6554370639f5fd715c0242c42ed4c2512cc5927 |
28-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am 5583758a: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches * commit '5583758af4174a627c35358218b61bf039cf5e74': Import translations. DO NOT MERGE
|
6d9d8e3d01d9ce852fd069d453850f78bda0b525 |
28-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
|
8275abe7a2d71107087a111b527336068ed28f7e |
28-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am 5583758a: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches * commit '5583758af4174a627c35358218b61bf039cf5e74': Import translations. DO NOT MERGE
|
1cf344e2719c75f0590fd3ed13ec42820f97e29a |
28-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
|
da7e6d2ba8e948da90b8451bf6d0c2f2661b6035 |
28-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
|
17b0ce27d83c5621ece4072dfa6315c80cb83632 |
28-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
|
937181684b76d4ed876df14907c5337ae08ae0fb |
28-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
|
5583758af4174a627c35358218b61bf039cf5e74 |
28-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
|
ee6480e2d8290a030cc2dedbeb1d852719ef2505 |
28-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
|
c2931f8e2495c038173045de750959f8012bfc93 |
27-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 33d33c7e: am 2d2b69b0: Fix rounding issue affecting TinyPlanet * commit '33d33c7ee22b02dc87085014fc178e0a80b946bb': Fix rounding issue affecting TinyPlanet
|
33d33c7ee22b02dc87085014fc178e0a80b946bb |
27-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 2d2b69b0: Fix rounding issue affecting TinyPlanet * commit '2d2b69b0d86ad3131faf83164253a5255ff941ed': Fix rounding issue affecting TinyPlanet
|
f8146ef8913e28cd895b6aa528f91615ed0d4c6c |
27-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 2d2b69b0: Fix rounding issue affecting TinyPlanet * commit '2d2b69b0d86ad3131faf83164253a5255ff941ed': Fix rounding issue affecting TinyPlanet
|
eac071eb989e3a121b2d81ab30fd3a28d4fd5754 |
27-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 2d2b69b0: Fix rounding issue affecting TinyPlanet * commit '2d2b69b0d86ad3131faf83164253a5255ff941ed': Fix rounding issue affecting TinyPlanet
|
6a96acff4169070a82be05d0eed3ec27bc02420d |
27-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Fix rounding issue affecting TinyPlanet bug:7428061 Change-Id: Ieeb4c27d4c426d7052c49ca88ca61ff0785000a3
rc/com/android/gallery3d/filtershow/imageshow/GeometryMetadata.java
|
2d2b69b0d86ad3131faf83164253a5255ff941ed |
27-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Fix rounding issue affecting TinyPlanet bug:7428061 Change-Id: Ieeb4c27d4c426d7052c49ca88ca61ff0785000a3
rc/com/android/gallery3d/filtershow/imageshow/GeometryMetadata.java
|
92503c9e00e1fcf097a1c960eb74d4b9e1499252 |
27-Oct-2012 |
Nicolas Roard <nicolasroard@google.com> |
am 90af32fb: am a0fe81ad: Merge "Changed rotated display parameter increments to 90." into gb-ub-photos-arches * commit '90af32fb05b7c2be9807d6b53bd61b4093ed0e00': Changed rotated display parameter increments to 90.
|
e5ac5d036935e0024273bc6875c2cfb57107171c |
27-Oct-2012 |
Nicolas Roard <nicolasroard@google.com> |
am d2a1f33f: am 26cfff70: Merge "change thumbnail and reset behaviour" into gb-ub-photos-arches * commit 'd2a1f33fdcf77073f80c144eaaed24f4d28ab373': change thumbnail and reset behaviour
|
4fc2db3c010f821c7c1065ed31135c83e6d4f195 |
27-Oct-2012 |
Doris Liu <tianliu@google.com> |
am f245d2b7: am 591974bc: Merge "Show panoViewer icon after "Back" from viewer" into gb-ub-photos-arches * commit 'f245d2b716fdc26b59f1251bf55707cdc06c331a': Show panoViewer icon after "Back" from viewer
|
d40d73e37fa9859b966c9037a88c0a592a11879e |
27-Oct-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
90af32fb05b7c2be9807d6b53bd61b4093ed0e00 |
27-Oct-2012 |
Nicolas Roard <nicolasroard@google.com> |
am a0fe81ad: Merge "Changed rotated display parameter increments to 90." into gb-ub-photos-arches * commit 'a0fe81ade88cb631d068094bb8ec37a91810f45e': Changed rotated display parameter increments to 90.
|
0927998b52b08c334761d4a4cb219ef8ba3f0f8c |
27-Oct-2012 |
Nicolas Roard <nicolasroard@google.com> |
am a0fe81ad: Merge "Changed rotated display parameter increments to 90." into gb-ub-photos-arches * commit 'a0fe81ade88cb631d068094bb8ec37a91810f45e': Changed rotated display parameter increments to 90.
|
9a343ecb4444ee0c22b570a50e1bc943fdb88c45 |
27-Oct-2012 |
Nicolas Roard <nicolasroard@google.com> |
am a0fe81ad: Merge "Changed rotated display parameter increments to 90." into gb-ub-photos-arches * commit 'a0fe81ade88cb631d068094bb8ec37a91810f45e': Changed rotated display parameter increments to 90.
|
d2a1f33fdcf77073f80c144eaaed24f4d28ab373 |
27-Oct-2012 |
Nicolas Roard <nicolasroard@google.com> |
am 26cfff70: Merge "change thumbnail and reset behaviour" into gb-ub-photos-arches * commit '26cfff70e559bcaf91c50def54f2a4e94d3dd50c': change thumbnail and reset behaviour
|
1fb466467dc28bccd0613e868ea309800127115c |
27-Oct-2012 |
Nicolas Roard <nicolasroard@google.com> |
am 26cfff70: Merge "change thumbnail and reset behaviour" into gb-ub-photos-arches * commit '26cfff70e559bcaf91c50def54f2a4e94d3dd50c': change thumbnail and reset behaviour
|
d92f0f9c2fc9b8a60429554bfc3298ba0e1d1a89 |
27-Oct-2012 |
Nicolas Roard <nicolasroard@google.com> |
am 26cfff70: Merge "change thumbnail and reset behaviour" into gb-ub-photos-arches * commit '26cfff70e559bcaf91c50def54f2a4e94d3dd50c': change thumbnail and reset behaviour
|
a0fe81ade88cb631d068094bb8ec37a91810f45e |
27-Oct-2012 |
Nicolas Roard <nicolasroard@google.com> |
Merge "Changed rotated display parameter increments to 90." into gb-ub-photos-arches
|
38f91275d6762029269c02bcd73f0cbd6a63cc6b |
27-Oct-2012 |
Nicolas Roard <nicolasroard@google.com> |
Merge "Changed rotated display parameter increments to 90." into gb-ub-photos-arches
|
26cfff70e559bcaf91c50def54f2a4e94d3dd50c |
27-Oct-2012 |
Nicolas Roard <nicolasroard@google.com> |
Merge "change thumbnail and reset behaviour" into gb-ub-photos-arches
|
e3a16c0f6f6f24681a5b5d7fe4cd923ca0731463 |
27-Oct-2012 |
Nicolas Roard <nicolasroard@google.com> |
Merge "change thumbnail and reset behaviour" into gb-ub-photos-arches
|
f245d2b716fdc26b59f1251bf55707cdc06c331a |
27-Oct-2012 |
Doris Liu <tianliu@google.com> |
am 591974bc: Merge "Show panoViewer icon after "Back" from viewer" into gb-ub-photos-arches * commit '591974bceb89bccf3376a7c424017e847eca61df': Show panoViewer icon after "Back" from viewer
|
64c89d738dae9b6b05b116861c40cf36fada477c |
27-Oct-2012 |
Doris Liu <tianliu@google.com> |
am 591974bc: Merge "Show panoViewer icon after "Back" from viewer" into gb-ub-photos-arches * commit '591974bceb89bccf3376a7c424017e847eca61df': Show panoViewer icon after "Back" from viewer
|
93533395fb6722ef9feb317661f144c9c32290bc |
27-Oct-2012 |
Doris Liu <tianliu@google.com> |
am 591974bc: Merge "Show panoViewer icon after "Back" from viewer" into gb-ub-photos-arches * commit '591974bceb89bccf3376a7c424017e847eca61df': Show panoViewer icon after "Back" from viewer
|
591974bceb89bccf3376a7c424017e847eca61df |
27-Oct-2012 |
Doris Liu <tianliu@google.com> |
Merge "Show panoViewer icon after "Back" from viewer" into gb-ub-photos-arches
|
3b74d96d94cc8d3c89cd0f61824bda63e8b0ac94 |
27-Oct-2012 |
Doris Liu <tianliu@google.com> |
Merge "Show panoViewer icon after "Back" from viewer" into gb-ub-photos-arches
|
c4384338502ed85618095f0672b5926659acab20 |
27-Oct-2012 |
Doris Liu <tianliu@google.com> |
Show panoViewer icon after "Back" from viewer Bug: 7407942 Change-Id: I00da3c73a558e412e106f089034e83f2e75616e4
rc/com/android/gallery3d/app/PhotoPageBottomControls.java
|
4e11131e1e8408e5a8803d6289a2bc55a150b3c7 |
27-Oct-2012 |
Doris Liu <tianliu@google.com> |
Show panoViewer icon after "Back" from viewer Bug: 7407942 Change-Id: I00da3c73a558e412e106f089034e83f2e75616e4
rc/com/android/gallery3d/app/PhotoPageBottomControls.java
|
9f039e395d80fcd14d7bfdb0b303a39baa5fa8c7 |
27-Oct-2012 |
George Mount <mount@google.com> |
am 6027d763: am b6d49492: Remove black borders in Manta LightCycle capture after orientation change. * commit '6027d7638a2a9445a2a4bbef364d9c02982ffd0b': Remove black borders in Manta LightCycle capture after orientation change.
|
6027d7638a2a9445a2a4bbef364d9c02982ffd0b |
27-Oct-2012 |
George Mount <mount@google.com> |
am b6d49492: Remove black borders in Manta LightCycle capture after orientation change. * commit 'b6d494925ea14a02ef75f58d5d969d7586914ef7': Remove black borders in Manta LightCycle capture after orientation change.
|
ddb06d2f9df30e6ee966a4741781ff7ea6872568 |
27-Oct-2012 |
George Mount <mount@google.com> |
am b6d49492: Remove black borders in Manta LightCycle capture after orientation change. * commit 'b6d494925ea14a02ef75f58d5d969d7586914ef7': Remove black borders in Manta LightCycle capture after orientation change.
|
7bfed8531040e2718476d023b6a6ac825c03277a |
27-Oct-2012 |
George Mount <mount@google.com> |
am b6d49492: Remove black borders in Manta LightCycle capture after orientation change. * commit 'b6d494925ea14a02ef75f58d5d969d7586914ef7': Remove black borders in Manta LightCycle capture after orientation change.
|
178bb7a5dc928b457a3446f8b1f8d95684c34e02 |
27-Oct-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
af0dc7f486553fd96b33b15e5380cb1928462d69 |
27-Oct-2012 |
John Hoford <hoford@google.com> |
change thumbnail and reset behaviour bug:7386757 bug:7343047 Change-Id: I0b44309f047b790025fb806ce041e2265489f027
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/imageshow/ImageSmallFilter.java
|
4de422b670d1aa9e2878d89c9d84ef3b7294ff85 |
27-Oct-2012 |
John Hoford <hoford@google.com> |
change thumbnail and reset behaviour bug:7386757 bug:7343047 Change-Id: I0b44309f047b790025fb806ce041e2265489f027
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/imageshow/ImageSmallFilter.java
|
b6d494925ea14a02ef75f58d5d969d7586914ef7 |
25-Oct-2012 |
George Mount <mount@google.com> |
Remove black borders in Manta LightCycle capture after orientation change. Bug 7344906 Change-Id: I70017e4479962d49aedb06ea7b050f638e00fc06
rc/com/android/gallery3d/ui/SurfaceTextureScreenNail.java
|
3bf329fbf1d314f3e1f219cff60b098e7c81452f |
25-Oct-2012 |
George Mount <mount@google.com> |
Remove black borders in Manta LightCycle capture after orientation change. Bug 7344906 Change-Id: I70017e4479962d49aedb06ea7b050f638e00fc06
rc/com/android/gallery3d/ui/SurfaceTextureScreenNail.java
|
f1a99b9f0dc504b6517c17a5a203a7d3c3c75834 |
27-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 2c8a2468: am 88870365: Merge "Fix the black lines near edge of thumbnails" into gb-ub-photos-arches * commit '2c8a24680ad88ab0028451716bff215aa6e91576': Fix the black lines near edge of thumbnails
|
2c8a24680ad88ab0028451716bff215aa6e91576 |
27-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 88870365: Merge "Fix the black lines near edge of thumbnails" into gb-ub-photos-arches * commit '88870365af146d05162742c5f613fc92483b0a93': Fix the black lines near edge of thumbnails
|
fb960cea164c92d024bdb97de28a18fcbc3a75da |
27-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 88870365: Merge "Fix the black lines near edge of thumbnails" into gb-ub-photos-arches * commit '88870365af146d05162742c5f613fc92483b0a93': Fix the black lines near edge of thumbnails
|
e9bc9dc1ce40813c270ccb3db8fb95374435ac5b |
27-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 88870365: Merge "Fix the black lines near edge of thumbnails" into gb-ub-photos-arches * commit '88870365af146d05162742c5f613fc92483b0a93': Fix the black lines near edge of thumbnails
|
88870365af146d05162742c5f613fc92483b0a93 |
27-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Fix the black lines near edge of thumbnails" into gb-ub-photos-arches
|
3b6743cb518f090d7c3ac427122e54122ad85ce6 |
27-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Fix the black lines near edge of thumbnails" into gb-ub-photos-arches
|
d9f4bd8f81f83c93005d55d42157dd7cec754ac3 |
26-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Changed rotated display parameter increments to 90. Bug: 7393432 Change-Id: Id94a28c88cc06a7d99aab0d01dae4fc59cefbab2
rc/com/android/gallery3d/filtershow/imageshow/ImageRotate.java
|
f69c65b415a420cb9658aa0dbf4bb5f0d04b2693 |
26-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Changed rotated display parameter increments to 90. Bug: 7393432 Change-Id: Id94a28c88cc06a7d99aab0d01dae4fc59cefbab2
rc/com/android/gallery3d/filtershow/imageshow/ImageRotate.java
|
5fbd7f127e5eed9e15b7f975f48242a97c97a8dd |
26-Oct-2012 |
John Reck <jreck@google.com> |
am 0b0786bc: am 536ab17a: am 38e64b25: am 10f975a6: Merge "Add proxy launcher" into gb-ub-photos-arches * commit '0b0786bc4dc6ed571706288c7278b76a3879944f': Add proxy launcher
|
0b0786bc4dc6ed571706288c7278b76a3879944f |
26-Oct-2012 |
John Reck <jreck@google.com> |
am 536ab17a: am 38e64b25: am 10f975a6: Merge "Add proxy launcher" into gb-ub-photos-arches * commit '536ab17ac220a429b39376a3f2a71c4792acb23c': Add proxy launcher
|
536ab17ac220a429b39376a3f2a71c4792acb23c |
26-Oct-2012 |
John Reck <jreck@google.com> |
am 38e64b25: am 10f975a6: Merge "Add proxy launcher" into gb-ub-photos-arches * commit '38e64b25801cbec5004cd67ce22ebb6ca822bef1': Add proxy launcher
|
f1d6566a2df59e6c1402f95dab3cb51069aa880b |
26-Oct-2012 |
John Reck <jreck@google.com> |
am 38e64b25: am 10f975a6: Merge "Add proxy launcher" into gb-ub-photos-arches * commit '38e64b25801cbec5004cd67ce22ebb6ca822bef1': Add proxy launcher
|
cbfdcb65b1774db7dd8754fee9b6b94f2b8a9009 |
26-Oct-2012 |
John Reck <jreck@google.com> |
am 10f975a6: Merge "Add proxy launcher" into gb-ub-photos-arches * commit '10f975a628badbb400a97872c6704740ef936e46': Add proxy launcher
|
38e64b25801cbec5004cd67ce22ebb6ca822bef1 |
26-Oct-2012 |
John Reck <jreck@google.com> |
am 10f975a6: Merge "Add proxy launcher" into gb-ub-photos-arches * commit '10f975a628badbb400a97872c6704740ef936e46': Add proxy launcher
|
c2c7a5cc8b917dc52f80ccf3d244e1f7b67d84f8 |
26-Oct-2012 |
John Reck <jreck@google.com> |
am 10f975a6: Merge "Add proxy launcher" into gb-ub-photos-arches * commit '10f975a628badbb400a97872c6704740ef936e46': Add proxy launcher
|
9c2b76c80a3800afbd0e118b4623b209bc6651cd |
26-Oct-2012 |
John Reck <jreck@google.com> |
am 10f975a6: Merge "Add proxy launcher" into gb-ub-photos-arches * commit '10f975a628badbb400a97872c6704740ef936e46': Add proxy launcher
|
10f975a628badbb400a97872c6704740ef936e46 |
26-Oct-2012 |
John Reck <jreck@google.com> |
Merge "Add proxy launcher" into gb-ub-photos-arches
|
6e0655f27f5263f67caa6c48f15a36a63a6cce04 |
26-Oct-2012 |
John Reck <jreck@google.com> |
Merge "Add proxy launcher" into gb-ub-photos-arches
|
59dff8220283dce25ae9af552138bf54902061d7 |
26-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 53e2f29a: am 381a08bc: am d58b942a: am 798f4a91: Merge "Hold WakeLock for batch delete operation" into gb-ub-photos-arches * commit '53e2f29aa1bb55c16894e05a65e1da7e3f36f173': Hold WakeLock for batch delete operation
|
53e2f29aa1bb55c16894e05a65e1da7e3f36f173 |
26-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 381a08bc: am d58b942a: am 798f4a91: Merge "Hold WakeLock for batch delete operation" into gb-ub-photos-arches * commit '381a08bc32e5b39b3f5dfc16c2a33adad5bf9113': Hold WakeLock for batch delete operation
|
381a08bc32e5b39b3f5dfc16c2a33adad5bf9113 |
26-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am d58b942a: am 798f4a91: Merge "Hold WakeLock for batch delete operation" into gb-ub-photos-arches * commit 'd58b942aaa15a8c1a3663329f8a4d2d275aed4a6': Hold WakeLock for batch delete operation
|
ef9cf18c436df3c18989f53c0e2bb14b87ecb487 |
26-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am d58b942a: am 798f4a91: Merge "Hold WakeLock for batch delete operation" into gb-ub-photos-arches * commit 'd58b942aaa15a8c1a3663329f8a4d2d275aed4a6': Hold WakeLock for batch delete operation
|
d58b942aaa15a8c1a3663329f8a4d2d275aed4a6 |
26-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 798f4a91: Merge "Hold WakeLock for batch delete operation" into gb-ub-photos-arches * commit '798f4a914d47e69496374051fab386a3536c9698': Hold WakeLock for batch delete operation
|
9adb156a8cfa5e74bf2d6fc940cc5ed3a47c5b7f |
26-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 798f4a91: Merge "Hold WakeLock for batch delete operation" into gb-ub-photos-arches * commit '798f4a914d47e69496374051fab386a3536c9698': Hold WakeLock for batch delete operation
|
9ca7b412cb321cd64f360829779abde0bba5584a |
26-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 798f4a91: Merge "Hold WakeLock for batch delete operation" into gb-ub-photos-arches * commit '798f4a914d47e69496374051fab386a3536c9698': Hold WakeLock for batch delete operation
|
59806ecbbc43869bdc452e6d5913f1f4bbc0a2ce |
26-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 798f4a91: Merge "Hold WakeLock for batch delete operation" into gb-ub-photos-arches * commit '798f4a914d47e69496374051fab386a3536c9698': Hold WakeLock for batch delete operation
|
ef9f3f111ca658ffc1ae6b6718892889a7038f7a |
26-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Hold WakeLock for batch delete operation" into gb-ub-photos-arches
|
798f4a914d47e69496374051fab386a3536c9698 |
26-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Hold WakeLock for batch delete operation" into gb-ub-photos-arches
|
f9f56e5d0e7d0662da26f15d609a601cef5d0fb2 |
26-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Hold WakeLock for batch delete operation" into gb-ub-photos-arches
|
04d324e313b8ee36ce878f5e8c92949b32de33c0 |
26-Oct-2012 |
Owen Lin <owenlin@google.com> |
Fix the black lines near edge of thumbnails 1. Correct the positions of right and bottom borders 2. Turn off blending by using PoterDuffMode.SRC bug: 7414307 Change-Id: Icc6fd765c2b1e904308c53aa66b55600e0016471
rc/com/android/gallery3d/ui/TiledTexture.java
|
4663598408ac2ca40c9d2009de1a74c5adbbe85f |
26-Oct-2012 |
Owen Lin <owenlin@google.com> |
Fix the black lines near edge of thumbnails 1. Correct the positions of right and bottom borders 2. Turn off blending by using PoterDuffMode.SRC bug: 7414307 Change-Id: Icc6fd765c2b1e904308c53aa66b55600e0016471
rc/com/android/gallery3d/ui/TiledTexture.java
|
a19ac7b211fcea419a9010b7dcbcbe8f77645ba5 |
26-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I2b427da37b63a0253779eb816d943af66e6858a6 Auto-generated-cl: translation import
es/values-af/filtershow_strings.xml
es/values-am/filtershow_strings.xml
es/values-ar/filtershow_strings.xml
es/values-be/filtershow_strings.xml
es/values-bg/filtershow_strings.xml
es/values-ca/filtershow_strings.xml
es/values-cs/filtershow_strings.xml
es/values-da/filtershow_strings.xml
es/values-de/filtershow_strings.xml
es/values-el/filtershow_strings.xml
es/values-en-rGB/filtershow_strings.xml
es/values-es-rUS/filtershow_strings.xml
es/values-es/filtershow_strings.xml
es/values-et/filtershow_strings.xml
es/values-fa/filtershow_strings.xml
es/values-fi/filtershow_strings.xml
es/values-fr/filtershow_strings.xml
es/values-hi/filtershow_strings.xml
es/values-hr/filtershow_strings.xml
es/values-hu/filtershow_strings.xml
es/values-in/filtershow_strings.xml
es/values-it/filtershow_strings.xml
es/values-iw/filtershow_strings.xml
es/values-ja/filtershow_strings.xml
es/values-ko/filtershow_strings.xml
es/values-lt/filtershow_strings.xml
es/values-lv/filtershow_strings.xml
es/values-ms/filtershow_strings.xml
es/values-nb/filtershow_strings.xml
es/values-nl/filtershow_strings.xml
es/values-pl/filtershow_strings.xml
es/values-pt-rPT/filtershow_strings.xml
es/values-pt/filtershow_strings.xml
es/values-ro/filtershow_strings.xml
es/values-ru/filtershow_strings.xml
es/values-sk/filtershow_strings.xml
es/values-sl/filtershow_strings.xml
es/values-sr/filtershow_strings.xml
es/values-sv/filtershow_strings.xml
es/values-sw/filtershow_strings.xml
es/values-th/filtershow_strings.xml
es/values-tl/filtershow_strings.xml
es/values-tr/filtershow_strings.xml
es/values-uk/filtershow_strings.xml
es/values-vi/filtershow_strings.xml
es/values-zh-rCN/filtershow_strings.xml
es/values-zh-rTW/filtershow_strings.xml
es/values-zu/filtershow_strings.xml
|
56553ceaaaf6e9e8718a76a624101ab296dda6f9 |
26-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I67e969ade37fe1d3ff3b613fd9895b7c02e74532 Auto-generated-cl: translation import
es/values-af/filtershow_strings.xml
es/values-am/filtershow_strings.xml
es/values-ar/filtershow_strings.xml
es/values-be/filtershow_strings.xml
es/values-bg/filtershow_strings.xml
es/values-ca/filtershow_strings.xml
es/values-cs/filtershow_strings.xml
es/values-da/filtershow_strings.xml
es/values-de/filtershow_strings.xml
es/values-el/filtershow_strings.xml
es/values-en-rGB/filtershow_strings.xml
es/values-es-rUS/filtershow_strings.xml
es/values-es/filtershow_strings.xml
es/values-et/filtershow_strings.xml
es/values-fa/filtershow_strings.xml
es/values-fi/filtershow_strings.xml
es/values-fr/filtershow_strings.xml
es/values-hi/filtershow_strings.xml
es/values-hr/filtershow_strings.xml
es/values-hu/filtershow_strings.xml
es/values-in/filtershow_strings.xml
es/values-it/filtershow_strings.xml
es/values-iw/filtershow_strings.xml
es/values-ja/filtershow_strings.xml
es/values-ko/filtershow_strings.xml
es/values-lt/filtershow_strings.xml
es/values-lv/filtershow_strings.xml
es/values-ms/filtershow_strings.xml
es/values-nb/filtershow_strings.xml
es/values-nl/filtershow_strings.xml
es/values-pl/filtershow_strings.xml
es/values-pt-rPT/filtershow_strings.xml
es/values-pt/filtershow_strings.xml
es/values-ro/filtershow_strings.xml
es/values-ru/filtershow_strings.xml
es/values-sk/filtershow_strings.xml
es/values-sl/filtershow_strings.xml
es/values-sr/filtershow_strings.xml
es/values-sv/filtershow_strings.xml
es/values-sw/filtershow_strings.xml
es/values-th/filtershow_strings.xml
es/values-tl/filtershow_strings.xml
es/values-tr/filtershow_strings.xml
es/values-uk/filtershow_strings.xml
es/values-vi/filtershow_strings.xml
es/values-zh-rCN/filtershow_strings.xml
es/values-zh-rTW/filtershow_strings.xml
es/values-zu/filtershow_strings.xml
|
e3efc862195538887d2ad0486020b58bda5a358f |
26-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I2bafd4427f86c8ceec724e5f6752c95a50bf2380 Auto-generated-cl: translation import
es/values-af/filtershow_strings.xml
es/values-am/filtershow_strings.xml
es/values-ar/filtershow_strings.xml
es/values-be/filtershow_strings.xml
es/values-bg/filtershow_strings.xml
es/values-ca/filtershow_strings.xml
es/values-cs/filtershow_strings.xml
es/values-da/filtershow_strings.xml
es/values-de/filtershow_strings.xml
es/values-el/filtershow_strings.xml
es/values-en-rGB/filtershow_strings.xml
es/values-es-rUS/filtershow_strings.xml
es/values-es/filtershow_strings.xml
es/values-et/filtershow_strings.xml
es/values-fa/filtershow_strings.xml
es/values-fi/filtershow_strings.xml
es/values-fr/filtershow_strings.xml
es/values-hi/filtershow_strings.xml
es/values-hr/filtershow_strings.xml
es/values-hu/filtershow_strings.xml
es/values-in/filtershow_strings.xml
es/values-it/filtershow_strings.xml
es/values-iw/filtershow_strings.xml
es/values-ja/filtershow_strings.xml
es/values-ko/filtershow_strings.xml
es/values-lt/filtershow_strings.xml
es/values-lv/filtershow_strings.xml
es/values-ms/filtershow_strings.xml
es/values-nb/filtershow_strings.xml
es/values-nl/filtershow_strings.xml
es/values-pl/filtershow_strings.xml
es/values-pt-rPT/filtershow_strings.xml
es/values-pt/filtershow_strings.xml
es/values-ro/filtershow_strings.xml
es/values-ru/filtershow_strings.xml
es/values-sk/filtershow_strings.xml
es/values-sl/filtershow_strings.xml
es/values-sr/filtershow_strings.xml
es/values-sv/filtershow_strings.xml
es/values-sw/filtershow_strings.xml
es/values-th/filtershow_strings.xml
es/values-tl/filtershow_strings.xml
es/values-tr/filtershow_strings.xml
es/values-uk/filtershow_strings.xml
es/values-vi/filtershow_strings.xml
es/values-zh-rCN/filtershow_strings.xml
es/values-zh-rTW/filtershow_strings.xml
es/values-zu/filtershow_strings.xml
|
077f6a80385a51df66bec3ea66773eedb0db55ab |
26-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ic4c7b276accd539a483c51be8a85705306dc4c4f Auto-generated-cl: translation import
es/values-af/filtershow_strings.xml
es/values-am/filtershow_strings.xml
es/values-ar/filtershow_strings.xml
es/values-be/filtershow_strings.xml
es/values-bg/filtershow_strings.xml
es/values-ca/filtershow_strings.xml
es/values-cs/filtershow_strings.xml
es/values-da/filtershow_strings.xml
es/values-de/filtershow_strings.xml
es/values-el/filtershow_strings.xml
es/values-en-rGB/filtershow_strings.xml
es/values-es-rUS/filtershow_strings.xml
es/values-es/filtershow_strings.xml
es/values-et/filtershow_strings.xml
es/values-fa/filtershow_strings.xml
es/values-fi/filtershow_strings.xml
es/values-fr/filtershow_strings.xml
es/values-hi/filtershow_strings.xml
es/values-hr/filtershow_strings.xml
es/values-hu/filtershow_strings.xml
es/values-in/filtershow_strings.xml
es/values-it/filtershow_strings.xml
es/values-iw/filtershow_strings.xml
es/values-ja/filtershow_strings.xml
es/values-ko/filtershow_strings.xml
es/values-lt/filtershow_strings.xml
es/values-lv/filtershow_strings.xml
es/values-ms/filtershow_strings.xml
es/values-nb/filtershow_strings.xml
es/values-nl/filtershow_strings.xml
es/values-pl/filtershow_strings.xml
es/values-pt-rPT/filtershow_strings.xml
es/values-pt/filtershow_strings.xml
es/values-ro/filtershow_strings.xml
es/values-ru/filtershow_strings.xml
es/values-sk/filtershow_strings.xml
es/values-sl/filtershow_strings.xml
es/values-sr/filtershow_strings.xml
es/values-sv/filtershow_strings.xml
es/values-sw/filtershow_strings.xml
es/values-th/filtershow_strings.xml
es/values-tl/filtershow_strings.xml
es/values-tr/filtershow_strings.xml
es/values-uk/filtershow_strings.xml
es/values-vi/filtershow_strings.xml
es/values-zh-rCN/filtershow_strings.xml
es/values-zh-rTW/filtershow_strings.xml
es/values-zu/filtershow_strings.xml
|
a41e8b4f087351f69347de562880d5230dc23907 |
26-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I4c3d96d0643711ab9e1c5a11f5eaf0d48f541dd6 Auto-generated-cl: translation import
es/values-af/filtershow_strings.xml
es/values-am/filtershow_strings.xml
es/values-ar/filtershow_strings.xml
es/values-be/filtershow_strings.xml
es/values-bg/filtershow_strings.xml
es/values-ca/filtershow_strings.xml
es/values-cs/filtershow_strings.xml
es/values-da/filtershow_strings.xml
es/values-de/filtershow_strings.xml
es/values-el/filtershow_strings.xml
es/values-en-rGB/filtershow_strings.xml
es/values-es-rUS/filtershow_strings.xml
es/values-es/filtershow_strings.xml
es/values-et/filtershow_strings.xml
es/values-fa/filtershow_strings.xml
es/values-fi/filtershow_strings.xml
es/values-fr/filtershow_strings.xml
es/values-hi/filtershow_strings.xml
es/values-hr/filtershow_strings.xml
es/values-hu/filtershow_strings.xml
es/values-in/filtershow_strings.xml
es/values-it/filtershow_strings.xml
es/values-iw/filtershow_strings.xml
es/values-ja/filtershow_strings.xml
es/values-ko/filtershow_strings.xml
es/values-lt/filtershow_strings.xml
es/values-lv/filtershow_strings.xml
es/values-ms/filtershow_strings.xml
es/values-nb/filtershow_strings.xml
es/values-nl/filtershow_strings.xml
es/values-pl/filtershow_strings.xml
es/values-pt-rPT/filtershow_strings.xml
es/values-pt/filtershow_strings.xml
es/values-ro/filtershow_strings.xml
es/values-ru/filtershow_strings.xml
es/values-sk/filtershow_strings.xml
es/values-sl/filtershow_strings.xml
es/values-sr/filtershow_strings.xml
es/values-sv/filtershow_strings.xml
es/values-sw/filtershow_strings.xml
es/values-th/filtershow_strings.xml
es/values-tl/filtershow_strings.xml
es/values-tr/filtershow_strings.xml
es/values-uk/filtershow_strings.xml
es/values-vi/filtershow_strings.xml
es/values-zh-rCN/filtershow_strings.xml
es/values-zh-rTW/filtershow_strings.xml
es/values-zu/filtershow_strings.xml
|
c17c27ed9a2590810c4ca90d85106c6bada745f8 |
26-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I4c3d96d0643711ab9e1c5a11f5eaf0d48f541dd6 Auto-generated-cl: translation import
es/values-af/filtershow_strings.xml
es/values-am/filtershow_strings.xml
es/values-ar/filtershow_strings.xml
es/values-be/filtershow_strings.xml
es/values-bg/filtershow_strings.xml
es/values-ca/filtershow_strings.xml
es/values-cs/filtershow_strings.xml
es/values-da/filtershow_strings.xml
es/values-de/filtershow_strings.xml
es/values-el/filtershow_strings.xml
es/values-en-rGB/filtershow_strings.xml
es/values-es-rUS/filtershow_strings.xml
es/values-es/filtershow_strings.xml
es/values-et/filtershow_strings.xml
es/values-fa/filtershow_strings.xml
es/values-fi/filtershow_strings.xml
es/values-fr/filtershow_strings.xml
es/values-hi/filtershow_strings.xml
es/values-hr/filtershow_strings.xml
es/values-hu/filtershow_strings.xml
es/values-in/filtershow_strings.xml
es/values-it/filtershow_strings.xml
es/values-iw/filtershow_strings.xml
es/values-ja/filtershow_strings.xml
es/values-ko/filtershow_strings.xml
es/values-lt/filtershow_strings.xml
es/values-lv/filtershow_strings.xml
es/values-ms/filtershow_strings.xml
es/values-nb/filtershow_strings.xml
es/values-nl/filtershow_strings.xml
es/values-pl/filtershow_strings.xml
es/values-pt-rPT/filtershow_strings.xml
es/values-pt/filtershow_strings.xml
es/values-ro/filtershow_strings.xml
es/values-ru/filtershow_strings.xml
es/values-sk/filtershow_strings.xml
es/values-sl/filtershow_strings.xml
es/values-sr/filtershow_strings.xml
es/values-sv/filtershow_strings.xml
es/values-sw/filtershow_strings.xml
es/values-th/filtershow_strings.xml
es/values-tl/filtershow_strings.xml
es/values-tr/filtershow_strings.xml
es/values-uk/filtershow_strings.xml
es/values-vi/filtershow_strings.xml
es/values-zh-rCN/filtershow_strings.xml
es/values-zh-rTW/filtershow_strings.xml
es/values-zu/filtershow_strings.xml
|
2be09a9cf48aad4f11c4f293a9db0b493be8a927 |
26-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I310c1025f3ef9b3c69fe070f7ed022850d6764dc Auto-generated-cl: translation import
es/values-af/filtershow_strings.xml
es/values-am/filtershow_strings.xml
es/values-ar/filtershow_strings.xml
es/values-be/filtershow_strings.xml
es/values-bg/filtershow_strings.xml
es/values-ca/filtershow_strings.xml
es/values-cs/filtershow_strings.xml
es/values-da/filtershow_strings.xml
es/values-de/filtershow_strings.xml
es/values-el/filtershow_strings.xml
es/values-en-rGB/filtershow_strings.xml
es/values-es-rUS/filtershow_strings.xml
es/values-es/filtershow_strings.xml
es/values-et/filtershow_strings.xml
es/values-fa/filtershow_strings.xml
es/values-fi/filtershow_strings.xml
es/values-fr/filtershow_strings.xml
es/values-hi/filtershow_strings.xml
es/values-hr/filtershow_strings.xml
es/values-hu/filtershow_strings.xml
es/values-in/filtershow_strings.xml
es/values-it/filtershow_strings.xml
es/values-iw/filtershow_strings.xml
es/values-ja/filtershow_strings.xml
es/values-ko/filtershow_strings.xml
es/values-lt/filtershow_strings.xml
es/values-lv/filtershow_strings.xml
es/values-ms/filtershow_strings.xml
es/values-nb/filtershow_strings.xml
es/values-nl/filtershow_strings.xml
es/values-pl/filtershow_strings.xml
es/values-pt-rPT/filtershow_strings.xml
es/values-pt/filtershow_strings.xml
es/values-ro/filtershow_strings.xml
es/values-ru/filtershow_strings.xml
es/values-sk/filtershow_strings.xml
es/values-sl/filtershow_strings.xml
es/values-sr/filtershow_strings.xml
es/values-sv/filtershow_strings.xml
es/values-sw/filtershow_strings.xml
es/values-th/filtershow_strings.xml
es/values-tl/filtershow_strings.xml
es/values-tr/filtershow_strings.xml
es/values-uk/filtershow_strings.xml
es/values-vi/filtershow_strings.xml
es/values-zh-rCN/filtershow_strings.xml
es/values-zh-rTW/filtershow_strings.xml
es/values-zu/filtershow_strings.xml
|
c0668c8ef11783c9aafca0ea0c5eb63fc9063d96 |
26-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I310c1025f3ef9b3c69fe070f7ed022850d6764dc Auto-generated-cl: translation import
es/values-af/filtershow_strings.xml
es/values-am/filtershow_strings.xml
es/values-ar/filtershow_strings.xml
es/values-be/filtershow_strings.xml
es/values-bg/filtershow_strings.xml
es/values-ca/filtershow_strings.xml
es/values-cs/filtershow_strings.xml
es/values-da/filtershow_strings.xml
es/values-de/filtershow_strings.xml
es/values-el/filtershow_strings.xml
es/values-en-rGB/filtershow_strings.xml
es/values-es-rUS/filtershow_strings.xml
es/values-es/filtershow_strings.xml
es/values-et/filtershow_strings.xml
es/values-fa/filtershow_strings.xml
es/values-fi/filtershow_strings.xml
es/values-fr/filtershow_strings.xml
es/values-hi/filtershow_strings.xml
es/values-hr/filtershow_strings.xml
es/values-hu/filtershow_strings.xml
es/values-in/filtershow_strings.xml
es/values-it/filtershow_strings.xml
es/values-iw/filtershow_strings.xml
es/values-ja/filtershow_strings.xml
es/values-ko/filtershow_strings.xml
es/values-lt/filtershow_strings.xml
es/values-lv/filtershow_strings.xml
es/values-ms/filtershow_strings.xml
es/values-nb/filtershow_strings.xml
es/values-nl/filtershow_strings.xml
es/values-pl/filtershow_strings.xml
es/values-pt-rPT/filtershow_strings.xml
es/values-pt/filtershow_strings.xml
es/values-ro/filtershow_strings.xml
es/values-ru/filtershow_strings.xml
es/values-sk/filtershow_strings.xml
es/values-sl/filtershow_strings.xml
es/values-sr/filtershow_strings.xml
es/values-sv/filtershow_strings.xml
es/values-sw/filtershow_strings.xml
es/values-th/filtershow_strings.xml
es/values-tl/filtershow_strings.xml
es/values-tr/filtershow_strings.xml
es/values-uk/filtershow_strings.xml
es/values-vi/filtershow_strings.xml
es/values-zh-rCN/filtershow_strings.xml
es/values-zh-rTW/filtershow_strings.xml
es/values-zu/filtershow_strings.xml
|
b42b1310bfbe5e8d62eaa17fb3a771b0854809bf |
26-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I37f4b10c9cc8253e53dfcc631a56c9e9b8a208b9 Auto-generated-cl: translation import
es/values-sw/strings.xml
|
c964e758821e94cfc29b9b9619cc668eab447a87 |
26-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ic1e1a9e66eefba8e4225a73b92c1b44ecb079699 Auto-generated-cl: translation import
es/values-sw/strings.xml
|
dcf4473acf8ba5d83e7e7975cf5c318cd96382fe |
26-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I8771039e735893f4aa0fab53074fa093d7cd21c1 Auto-generated-cl: translation import
es/values-sw/strings.xml
|
805287ee9374000f35c09b051420c726f6265395 |
26-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ice0268c230b80ec172c5de1da1784ab04e6f5155 Auto-generated-cl: translation import
es/values-sw/strings.xml
|
c0dc0c7bae58c4f3b4b9a645bf9740543a5e1a17 |
26-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Iad4d74410c8c8441632cbd97191085cc1f1192b6 Auto-generated-cl: translation import
es/values-sw/strings.xml
|
df730746a3d4c8926db367e3a645ce9738f77756 |
26-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Iad4d74410c8c8441632cbd97191085cc1f1192b6 Auto-generated-cl: translation import
es/values-sw/strings.xml
|
3d4bfbc0f0489f9139f838486c08456ff9587d48 |
26-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I3a988dd5df9fc1251d3df571f37742ed6b4ad345 Auto-generated-cl: translation import
es/values-sw/strings.xml
|
7392eadd46d2a0421ee7193d6ee886c64769b690 |
26-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I3a988dd5df9fc1251d3df571f37742ed6b4ad345 Auto-generated-cl: translation import
es/values-sw/strings.xml
|
e8408a63b037df91b3dbf2a53f74eaa6f8b69427 |
26-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am a3e02b83: am 0079c4b8: am 8fe5c754: am 8d8cdf7f: Fix colors in rotate and mirror * commit 'a3e02b8380edbae9b998da7e3691ec2d1b860a23': Fix colors in rotate and mirror
|
a3e02b8380edbae9b998da7e3691ec2d1b860a23 |
26-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 0079c4b8: am 8fe5c754: am 8d8cdf7f: Fix colors in rotate and mirror * commit '0079c4b8b335ae9d1dfe1267ba1d045e5629f61b': Fix colors in rotate and mirror
|
149b5167a71cf221c821579746dfac199ab89ee2 |
26-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 8fe5c754: am 8d8cdf7f: Fix colors in rotate and mirror * commit '8fe5c7542d1de4e02c027318866ab2a2b020b94d': Fix colors in rotate and mirror
|
0079c4b8b335ae9d1dfe1267ba1d045e5629f61b |
26-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 8fe5c754: am 8d8cdf7f: Fix colors in rotate and mirror * commit '8fe5c7542d1de4e02c027318866ab2a2b020b94d': Fix colors in rotate and mirror
|
ea550290cf71d8f54cfd86163c463be436600a50 |
26-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 8d8cdf7f: Fix colors in rotate and mirror * commit '8d8cdf7f67db69309fd740ca301fbeaadac8a9f0': Fix colors in rotate and mirror
|
aaedeb27e1922a2e5828ceaea7d18944ea347458 |
26-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 8d8cdf7f: Fix colors in rotate and mirror * commit '8d8cdf7f67db69309fd740ca301fbeaadac8a9f0': Fix colors in rotate and mirror
|
8fe5c7542d1de4e02c027318866ab2a2b020b94d |
26-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 8d8cdf7f: Fix colors in rotate and mirror * commit '8d8cdf7f67db69309fd740ca301fbeaadac8a9f0': Fix colors in rotate and mirror
|
8d8cdf7f67db69309fd740ca301fbeaadac8a9f0 |
26-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Fix colors in rotate and mirror bug:7419025 Change-Id: Icf92de032f62f93a3ac57e042ea582c760d9f600
rc/com/android/gallery3d/filtershow/imageshow/ImageGeometry.java
rc/com/android/gallery3d/filtershow/imageshow/ImageShow.java
|
a4f31025a49ef4a8e1ebf8ab6d1e7134f37556d5 |
26-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Fix colors in rotate and mirror bug:7419025 Change-Id: Icf92de032f62f93a3ac57e042ea582c760d9f600
rc/com/android/gallery3d/filtershow/imageshow/ImageGeometry.java
rc/com/android/gallery3d/filtershow/imageshow/ImageShow.java
|
95c36531f02833ad127ea9f9ab3cb9dcae541dd3 |
26-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 0e4c36b8: am 64120dc9: am 7dcaeec6: am 8b3ce9b0: Merge "Fix crash when showing history" into gb-ub-photos-arches * commit '0e4c36b86b0efe132eacf0bb25812795fe7aa110': Fix crash when showing history
|
0e4c36b86b0efe132eacf0bb25812795fe7aa110 |
26-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 64120dc9: am 7dcaeec6: am 8b3ce9b0: Merge "Fix crash when showing history" into gb-ub-photos-arches * commit '64120dc926a2011f9fa2243d0add7cb27a88a633': Fix crash when showing history
|
64120dc926a2011f9fa2243d0add7cb27a88a633 |
26-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 7dcaeec6: am 8b3ce9b0: Merge "Fix crash when showing history" into gb-ub-photos-arches * commit '7dcaeec6ef5841107f5b42990c5d9d56ddbb251f': Fix crash when showing history
|
c11b4c85f80b24a0e9af089cfd96bd2af1bdf108 |
26-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 7dcaeec6: am 8b3ce9b0: Merge "Fix crash when showing history" into gb-ub-photos-arches * commit '7dcaeec6ef5841107f5b42990c5d9d56ddbb251f': Fix crash when showing history
|
8e0c2fd78fb35252db8f87fbfc883f769e568d99 |
26-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 8b3ce9b0: Merge "Fix crash when showing history" into gb-ub-photos-arches * commit '8b3ce9b01275151b653ea138324e47eb66a7b47e': Fix crash when showing history
|
68971bbccc85866ea5d4194daa045d01edb8ae14 |
26-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 8b3ce9b0: Merge "Fix crash when showing history" into gb-ub-photos-arches * commit '8b3ce9b01275151b653ea138324e47eb66a7b47e': Fix crash when showing history
|
7dcaeec6ef5841107f5b42990c5d9d56ddbb251f |
26-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 8b3ce9b0: Merge "Fix crash when showing history" into gb-ub-photos-arches * commit '8b3ce9b01275151b653ea138324e47eb66a7b47e': Fix crash when showing history
|
8b3ce9b01275151b653ea138324e47eb66a7b47e |
26-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Merge "Fix crash when showing history" into gb-ub-photos-arches
|
8ff6b11f168ab131c87df6be56208f60dc5df15b |
26-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Merge "Fix crash when showing history" into gb-ub-photos-arches
|
f0eb72eab7be3183417deff6dadb4937b90b9e59 |
26-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Fix crash when showing history bug:7418823 Change-Id: I0a84bb4d8fc8b42fc953f8301bb2b24cf64edce7
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/imageshow/ImageShow.java
|
32cd4fad9f8866d10f2bb68e1b1ded209b08d676 |
26-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Fix crash when showing history bug:7418823 Change-Id: I0a84bb4d8fc8b42fc953f8301bb2b24cf64edce7
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/imageshow/ImageShow.java
|
f4651c6fc61a50c4136b7d6312b90189f20d87e7 |
26-Oct-2012 |
John Hoford <hoford@google.com> |
Do not add crop into preset if in inital setup bug:7417545 Change-Id: I355936645e555e3d6b950923af301b437570dd93
rc/com/android/gallery3d/filtershow/imageshow/ImageGeometry.java
|
7e6155f9d1e1e4e0006fc4a52f4fb2aba53b5430 |
26-Oct-2012 |
Hung-ying Tyan <tyanh@google.com> |
am 2e9a3aeb: am 6fba1c9f: am 45dfd43e: am 635aab56: Merge "Fix tiling effect when open a photo." into gb-ub-photos-arches * commit '2e9a3aebd8e362a5cbcb17faebc7f5482ab24fff': Fix tiling effect when open a photo.
|
2e9a3aebd8e362a5cbcb17faebc7f5482ab24fff |
26-Oct-2012 |
Hung-ying Tyan <tyanh@google.com> |
am 6fba1c9f: am 45dfd43e: am 635aab56: Merge "Fix tiling effect when open a photo." into gb-ub-photos-arches * commit '6fba1c9fc8085d7d7bb05a8052851f7a02d2bc7c': Fix tiling effect when open a photo.
|
6fba1c9fc8085d7d7bb05a8052851f7a02d2bc7c |
26-Oct-2012 |
Hung-ying Tyan <tyanh@google.com> |
am 45dfd43e: am 635aab56: Merge "Fix tiling effect when open a photo." into gb-ub-photos-arches * commit '45dfd43eb36bad916cee573e8822008d12d2fdc6': Fix tiling effect when open a photo.
|
aad5aa69f8393ba1ca3a010afbe554ac84efbf79 |
26-Oct-2012 |
Hung-ying Tyan <tyanh@google.com> |
am 45dfd43e: am 635aab56: Merge "Fix tiling effect when open a photo." into gb-ub-photos-arches * commit '45dfd43eb36bad916cee573e8822008d12d2fdc6': Fix tiling effect when open a photo.
|
43c7fd47754840e254463aaddafeef9e55229dda |
26-Oct-2012 |
Hung-ying Tyan <tyanh@google.com> |
am 635aab56: Merge "Fix tiling effect when open a photo." into gb-ub-photos-arches * commit '635aab5631e25488610ff5546c51ea2895dda2f0': Fix tiling effect when open a photo.
|
8ca21874dd06cbaddf4a6ed5522d3612e88a6a6d |
26-Oct-2012 |
Hung-ying Tyan <tyanh@google.com> |
am 635aab56: Merge "Fix tiling effect when open a photo." into gb-ub-photos-arches * commit '635aab5631e25488610ff5546c51ea2895dda2f0': Fix tiling effect when open a photo.
|
45dfd43eb36bad916cee573e8822008d12d2fdc6 |
26-Oct-2012 |
Hung-ying Tyan <tyanh@google.com> |
am 635aab56: Merge "Fix tiling effect when open a photo." into gb-ub-photos-arches * commit '635aab5631e25488610ff5546c51ea2895dda2f0': Fix tiling effect when open a photo.
|
635aab5631e25488610ff5546c51ea2895dda2f0 |
26-Oct-2012 |
Hung-ying Tyan <tyanh@google.com> |
Merge "Fix tiling effect when open a photo." into gb-ub-photos-arches
|
5b006bf51a130b7e7a2fa486e99615f33efcb956 |
26-Oct-2012 |
Hung-ying Tyan <tyanh@google.com> |
Merge "Fix tiling effect when open a photo." into gb-ub-photos-arches
|
da6a518525d06bdd838812ef5076e341245f008d |
26-Oct-2012 |
Nicolas Roard <nicolasroard@google.com> |
am 9d842fc3: am 6cc4c630: am 78497220: am 24f28850: Merge "Do not add crop into preset if in inital setup" into gb-ub-photos-arches * commit '9d842fc3476a7efb5508477c1c1e645a036eb351': Do not add crop into preset if in inital setup
|
9d842fc3476a7efb5508477c1c1e645a036eb351 |
26-Oct-2012 |
Nicolas Roard <nicolasroard@google.com> |
am 6cc4c630: am 78497220: am 24f28850: Merge "Do not add crop into preset if in inital setup" into gb-ub-photos-arches * commit '6cc4c63047305a9bf0f82f804d18d161cc3c45e8': Do not add crop into preset if in inital setup
|
6cc4c63047305a9bf0f82f804d18d161cc3c45e8 |
26-Oct-2012 |
Nicolas Roard <nicolasroard@google.com> |
am 78497220: am 24f28850: Merge "Do not add crop into preset if in inital setup" into gb-ub-photos-arches * commit '7849722053ed8f154a83f41b7fec067b4e2a9864': Do not add crop into preset if in inital setup
|
69664062bc9039a0d548a7666680a852db947c33 |
26-Oct-2012 |
Nicolas Roard <nicolasroard@google.com> |
am 78497220: am 24f28850: Merge "Do not add crop into preset if in inital setup" into gb-ub-photos-arches * commit '7849722053ed8f154a83f41b7fec067b4e2a9864': Do not add crop into preset if in inital setup
|
0765803461d2527171d2d50e001ded0bb9e410c7 |
26-Oct-2012 |
Nicolas Roard <nicolasroard@google.com> |
am 24f28850: Merge "Do not add crop into preset if in inital setup" into gb-ub-photos-arches * commit '24f28850adcb14a1de87e538f60f3bb309bed284': Do not add crop into preset if in inital setup
|
a706a4b2e62a53006aa9c269df874bb50fc39a9f |
26-Oct-2012 |
Nicolas Roard <nicolasroard@google.com> |
am 24f28850: Merge "Do not add crop into preset if in inital setup" into gb-ub-photos-arches * commit '24f28850adcb14a1de87e538f60f3bb309bed284': Do not add crop into preset if in inital setup
|
7849722053ed8f154a83f41b7fec067b4e2a9864 |
26-Oct-2012 |
Nicolas Roard <nicolasroard@google.com> |
am 24f28850: Merge "Do not add crop into preset if in inital setup" into gb-ub-photos-arches * commit '24f28850adcb14a1de87e538f60f3bb309bed284': Do not add crop into preset if in inital setup
|
24f28850adcb14a1de87e538f60f3bb309bed284 |
26-Oct-2012 |
Nicolas Roard <nicolasroard@google.com> |
Merge "Do not add crop into preset if in inital setup" into gb-ub-photos-arches
|
6a03661ca41acfd5f4cc804338d930a024955e4e |
26-Oct-2012 |
Nicolas Roard <nicolasroard@google.com> |
Merge "Do not add crop into preset if in inital setup" into gb-ub-photos-arches
|
268f6ff3d67a11d54b3cb93ff5c0a3304c1b4362 |
25-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Hold WakeLock for batch delete operation Bug: 6680729 Change-Id: I0bdd59edb60c746c8c9e3c3608be980247f0d91a
rc/com/android/gallery3d/ui/WakeLockHoldingProgressListener.java
|
0385a1abb62a11fff5dddee17325d1cb00cee0ab |
25-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Hold WakeLock for batch delete operation Bug: 6680729 Change-Id: I0bdd59edb60c746c8c9e3c3608be980247f0d91a
rc/com/android/gallery3d/ui/ActionModeHandler.java
rc/com/android/gallery3d/ui/ImportCompleteListener.java
rc/com/android/gallery3d/ui/WakeLockHoldingProgressListener.java
|
f33af70636db6496747b905ccc81f6511894c039 |
25-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Hold WakeLock for batch delete operation Bug: 6680729 Change-Id: I0bdd59edb60c746c8c9e3c3608be980247f0d91a
rc/com/android/gallery3d/ui/ActionModeHandler.java
rc/com/android/gallery3d/ui/ImportCompleteListener.java
rc/com/android/gallery3d/ui/WakeLockHoldingProgressListener.java
|
a2a4c9a985d789e853211f21cd265460f16d2de1 |
26-Oct-2012 |
John Hoford <hoford@google.com> |
Do not add crop into preset if in inital setup bug:7417545 Change-Id: I355936645e555e3d6b950923af301b437570dd93
rc/com/android/gallery3d/filtershow/imageshow/ImageGeometry.java
|
4684dda756ec425ab1d0058d6294581efeb35ffc |
26-Oct-2012 |
John Hoford <hoford@google.com> |
Do not add crop into preset if in inital setup bug:7417545 Change-Id: I355936645e555e3d6b950923af301b437570dd93
rc/com/android/gallery3d/filtershow/imageshow/ImageGeometry.java
|
3e0b2a8a253e94924f302e69aefe9fa9f87f1500 |
24-Oct-2012 |
John Reck <jreck@google.com> |
Add proxy launcher Bug: 7394901 Change-Id: I667a6e6fbd11d4c02dc536067bb6f3813775db9c
ndroidManifest.xml
|
f85d974363a40b8ce588ba3fe902eec38de603d9 |
24-Oct-2012 |
John Reck <jreck@google.com> |
Add proxy launcher Bug: 7394901 Change-Id: I667a6e6fbd11d4c02dc536067bb6f3813775db9c
ndroidManifest.xml
rc/com/android/gallery3d/app/PhotoPage.java
|
806ab25465c3bc874136d89db8d42f27270e76bf |
24-Oct-2012 |
John Reck <jreck@google.com> |
Add proxy launcher Bug: 7394901 Change-Id: I667a6e6fbd11d4c02dc536067bb6f3813775db9c
rc/com/android/gallery3d/app/PhotoPage.java
|
89c2d6765746feee3f405a1040b621929faafe19 |
26-Oct-2012 |
John Reck <jreck@google.com> |
am d8e3390e: am 27b90f39: am c62b066a: am 6106c833: Merge "Add loading spinner" into gb-ub-photos-arches * commit 'd8e3390eb7cfefa45beaad78e012f143e0806adb': Add loading spinner
|
f3b08bd805c07545e7d46da262825d7d05ae7737 |
26-Oct-2012 |
Mangesh Ghiware <mghiware@google.com> |
am 5a6e827d: am 0ee1a63c: am dd7139ba: am 5388677d: Merge "Handle 360 panorama specific MIME type." into gb-ub-photos-arches * commit '5a6e827d66f94af06c02c77e2db1a1c3973da5e2': Handle 360 panorama specific MIME type.
|
d8e3390eb7cfefa45beaad78e012f143e0806adb |
26-Oct-2012 |
John Reck <jreck@google.com> |
am 27b90f39: am c62b066a: am 6106c833: Merge "Add loading spinner" into gb-ub-photos-arches * commit '27b90f39ccd01f1b9f6b6debb6c3a3ed583b35bc': Add loading spinner
|
27b90f39ccd01f1b9f6b6debb6c3a3ed583b35bc |
26-Oct-2012 |
John Reck <jreck@google.com> |
am c62b066a: am 6106c833: Merge "Add loading spinner" into gb-ub-photos-arches * commit 'c62b066a240a17f0b99a65bfb9eb8210f8407e6e': Add loading spinner
|
5a6e827d66f94af06c02c77e2db1a1c3973da5e2 |
26-Oct-2012 |
Mangesh Ghiware <mghiware@google.com> |
am 0ee1a63c: am dd7139ba: am 5388677d: Merge "Handle 360 panorama specific MIME type." into gb-ub-photos-arches * commit '0ee1a63cd88de09a868d084de4a64c01a88c4772': Handle 360 panorama specific MIME type.
|
62b46051d75cc323332eeb4c0c79e3895647cb5a |
26-Oct-2012 |
John Reck <jreck@google.com> |
am c62b066a: am 6106c833: Merge "Add loading spinner" into gb-ub-photos-arches * commit 'c62b066a240a17f0b99a65bfb9eb8210f8407e6e': Add loading spinner
|
cb4daa8699520600441423694bc61e870ec62d18 |
26-Oct-2012 |
John Reck <jreck@google.com> |
am 6106c833: Merge "Add loading spinner" into gb-ub-photos-arches * commit '6106c833161cf8e64fc6a9580116f11f4a02d98b': Add loading spinner
|
b00c874023d95b7988549c5697fa53cd37aec08e |
26-Oct-2012 |
John Reck <jreck@google.com> |
am 6106c833: Merge "Add loading spinner" into gb-ub-photos-arches * commit '6106c833161cf8e64fc6a9580116f11f4a02d98b': Add loading spinner
|
cde247a7584657a112538ab5058e2d593c957a30 |
26-Oct-2012 |
John Reck <jreck@google.com> |
am 6106c833: Merge "Add loading spinner" into gb-ub-photos-arches * commit '6106c833161cf8e64fc6a9580116f11f4a02d98b': Add loading spinner
|
c62b066a240a17f0b99a65bfb9eb8210f8407e6e |
26-Oct-2012 |
John Reck <jreck@google.com> |
am 6106c833: Merge "Add loading spinner" into gb-ub-photos-arches * commit '6106c833161cf8e64fc6a9580116f11f4a02d98b': Add loading spinner
|
485797d7aec85f3ddf990522ee8c55a04a2c95ab |
26-Oct-2012 |
Mangesh Ghiware <mghiware@google.com> |
am dd7139ba: am 5388677d: Merge "Handle 360 panorama specific MIME type." into gb-ub-photos-arches * commit 'dd7139babe7b1ae3893d329652f3efcab77652f0': Handle 360 panorama specific MIME type.
|
0ee1a63cd88de09a868d084de4a64c01a88c4772 |
26-Oct-2012 |
Mangesh Ghiware <mghiware@google.com> |
am dd7139ba: am 5388677d: Merge "Handle 360 panorama specific MIME type." into gb-ub-photos-arches * commit 'dd7139babe7b1ae3893d329652f3efcab77652f0': Handle 360 panorama specific MIME type.
|
407ae8fab03292c52f747fdedaef4520288243cf |
26-Oct-2012 |
John Reck <jreck@google.com> |
Merge "Add loading spinner" into gb-ub-photos-arches
|
6106c833161cf8e64fc6a9580116f11f4a02d98b |
26-Oct-2012 |
John Reck <jreck@google.com> |
Merge "Add loading spinner" into gb-ub-photos-arches
|
73c4d73f5042087d6258ced03124957045567fd7 |
26-Oct-2012 |
John Reck <jreck@google.com> |
Merge "Add loading spinner" into gb-ub-photos-arches
|
dd7139babe7b1ae3893d329652f3efcab77652f0 |
26-Oct-2012 |
Mangesh Ghiware <mghiware@google.com> |
am 5388677d: Merge "Handle 360 panorama specific MIME type." into gb-ub-photos-arches * commit '5388677d3078f2c218d22465c955e3df6b2ffbed': Handle 360 panorama specific MIME type.
|
0e42a99095d479c43e1d7b0997a616dbfa0d8174 |
26-Oct-2012 |
Mangesh Ghiware <mghiware@google.com> |
am 5388677d: Merge "Handle 360 panorama specific MIME type." into gb-ub-photos-arches * commit '5388677d3078f2c218d22465c955e3df6b2ffbed': Handle 360 panorama specific MIME type.
|
b0c02467dee178f3c78dafabe2cb77f212339b4b |
26-Oct-2012 |
Mangesh Ghiware <mghiware@google.com> |
am 5388677d: Merge "Handle 360 panorama specific MIME type." into gb-ub-photos-arches * commit '5388677d3078f2c218d22465c955e3df6b2ffbed': Handle 360 panorama specific MIME type.
|
c87d09ff7289f58d5937411851b2e377fe162dc9 |
26-Oct-2012 |
Mangesh Ghiware <mghiware@google.com> |
am 5388677d: Merge "Handle 360 panorama specific MIME type." into gb-ub-photos-arches * commit '5388677d3078f2c218d22465c955e3df6b2ffbed': Handle 360 panorama specific MIME type.
|
be6454a7f45cb4ed491e05cf885faf79cc89334f |
26-Oct-2012 |
Mangesh Ghiware <mghiware@google.com> |
Merge "Handle 360 panorama specific MIME type." into gb-ub-photos-arches
|
5388677d3078f2c218d22465c955e3df6b2ffbed |
26-Oct-2012 |
Mangesh Ghiware <mghiware@google.com> |
Merge "Handle 360 panorama specific MIME type." into gb-ub-photos-arches
|
95a0734d7996db52ecbc128223e17b69a6663684 |
26-Oct-2012 |
Mangesh Ghiware <mghiware@google.com> |
Merge "Handle 360 panorama specific MIME type." into gb-ub-photos-arches
|
16cdb44a82a22ac2a28bc06b4b09dbf9c80bd14e |
25-Oct-2012 |
John Reck <jreck@google.com> |
Add loading spinner Bug: 7408575 Change-Id: Ia737b36abb88d75381f41c25474e3cc03448dbb9
es/layout/filtershow_activity.xml
|
00914f56c3390caa224b1c9fc07624665de40113 |
25-Oct-2012 |
John Reck <jreck@google.com> |
Add loading spinner Bug: 7408575 Change-Id: Ia737b36abb88d75381f41c25474e3cc03448dbb9
es/layout/filtershow_activity.xml
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
|
24c6b09c392983efc772fce3e5973e68461db760 |
25-Oct-2012 |
John Reck <jreck@google.com> |
Add loading spinner Bug: 7408575 Change-Id: Ia737b36abb88d75381f41c25474e3cc03448dbb9
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
|
0f54ab911cf38646abfb12b28a1f5510de6ed611 |
11-Oct-2012 |
Mangesh Ghiware <mghiware@google.com> |
Handle 360 panorama specific MIME type. Bug: 7407448 Change-Id: I939a061e2100c2cdc17279982de98f1d446d8aef
ndroidManifest.xml
|
07b70a524d4188120153eee5da31b079ecb135ed |
11-Oct-2012 |
Mangesh Ghiware <mghiware@google.com> |
Handle 360 panorama specific MIME type. Bug: 7407448 Change-Id: I939a061e2100c2cdc17279982de98f1d446d8aef
ndroidManifest.xml
rc/com/android/gallery3d/app/Gallery.java
|
5dbcddd9298fc85be0ab178fbb71b97c0495b1bb |
11-Oct-2012 |
Mangesh Ghiware <mghiware@google.com> |
Handle 360 panorama specific MIME type. Bug: 7407448 Change-Id: I939a061e2100c2cdc17279982de98f1d446d8aef
rc/com/android/gallery3d/app/Gallery.java
|
c785651272cabc8416432c007bb6b1383c59bc72 |
26-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am 9f76ef8e: am 7d57a849: am bdd21912: am 4164fabf: Merge "Fix issue where aspect bounds don\'t get applied." into gb-ub-photos-arches * commit '9f76ef8ef51eb613469025d1ce56138a009f1218': Fix issue where aspect bounds don't get applied.
|
092402480055087fe2785f85ba70e2cd65217de7 |
26-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am 1c8d7872: am 7cb01a93: am 812d65bd: am d72971e6: Merge "Fixed crop intent." into gb-ub-photos-arches * commit '1c8d78723133b8b675376101f1a11552ff99dd60': Fixed crop intent.
|
9f76ef8ef51eb613469025d1ce56138a009f1218 |
26-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am 7d57a849: am bdd21912: am 4164fabf: Merge "Fix issue where aspect bounds don\'t get applied." into gb-ub-photos-arches * commit '7d57a8497fff6ba97eb9cc1152a740e5c273f37d': Fix issue where aspect bounds don't get applied.
|
1c8d78723133b8b675376101f1a11552ff99dd60 |
26-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am 7cb01a93: am 812d65bd: am d72971e6: Merge "Fixed crop intent." into gb-ub-photos-arches * commit '7cb01a93871c496fed94f86bc9ea8582884fcad2': Fixed crop intent.
|
7d57a8497fff6ba97eb9cc1152a740e5c273f37d |
26-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am bdd21912: am 4164fabf: Merge "Fix issue where aspect bounds don\'t get applied." into gb-ub-photos-arches * commit 'bdd21912a4365a703716b16a636832f71c4c0d0c': Fix issue where aspect bounds don't get applied.
|
7cb01a93871c496fed94f86bc9ea8582884fcad2 |
26-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am 812d65bd: am d72971e6: Merge "Fixed crop intent." into gb-ub-photos-arches * commit '812d65bd1d8c30bdb0f174d2503e0042ac59b13c': Fixed crop intent.
|
348b64a0414a1c8143e1997fe44efd4ac91a8665 |
26-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am bdd21912: am 4164fabf: Merge "Fix issue where aspect bounds don\'t get applied." into gb-ub-photos-arches * commit 'bdd21912a4365a703716b16a636832f71c4c0d0c': Fix issue where aspect bounds don't get applied.
|
eee46d78ba7231db50e096b1b4acff2f3937b3c4 |
26-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am 812d65bd: am d72971e6: Merge "Fixed crop intent." into gb-ub-photos-arches * commit '812d65bd1d8c30bdb0f174d2503e0042ac59b13c': Fixed crop intent.
|
df6aa0fdf2be4349d4f9e3e9f4d9eea3165b23ad |
26-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am 4164fabf: Merge "Fix issue where aspect bounds don\'t get applied." into gb-ub-photos-arches * commit '4164fabf5f9324adde9954130aad13c2f72aa24a': Fix issue where aspect bounds don't get applied.
|
f8c4706f713258777b48fbb2434d3aa884ddf323 |
26-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am 4164fabf: Merge "Fix issue where aspect bounds don\'t get applied." into gb-ub-photos-arches * commit '4164fabf5f9324adde9954130aad13c2f72aa24a': Fix issue where aspect bounds don't get applied.
|
6630f4e8513342c0a8ee5d8b4363f9c3dc9a6c58 |
26-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am d72971e6: Merge "Fixed crop intent." into gb-ub-photos-arches * commit 'd72971e683069d463c78117037414e5286689549': Fixed crop intent.
|
6cbbc23583d3aefef565ffafd095cdfb24095635 |
26-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am d72971e6: Merge "Fixed crop intent." into gb-ub-photos-arches * commit 'd72971e683069d463c78117037414e5286689549': Fixed crop intent.
|
651ca500daf7334d42d699d8f923a2e2538fc2c0 |
26-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am d72971e6: Merge "Fixed crop intent." into gb-ub-photos-arches * commit 'd72971e683069d463c78117037414e5286689549': Fixed crop intent.
|
71904e589b67489d4d6f13d3c3854dda4d463a5c |
26-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am d72971e6: Merge "Fixed crop intent." into gb-ub-photos-arches * commit 'd72971e683069d463c78117037414e5286689549': Fixed crop intent.
|
bdd21912a4365a703716b16a636832f71c4c0d0c |
26-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am 4164fabf: Merge "Fix issue where aspect bounds don\'t get applied." into gb-ub-photos-arches * commit '4164fabf5f9324adde9954130aad13c2f72aa24a': Fix issue where aspect bounds don't get applied.
|
812d65bd1d8c30bdb0f174d2503e0042ac59b13c |
26-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am d72971e6: Merge "Fixed crop intent." into gb-ub-photos-arches * commit 'd72971e683069d463c78117037414e5286689549': Fixed crop intent.
|
4164fabf5f9324adde9954130aad13c2f72aa24a |
26-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Fix issue where aspect bounds don't get applied." into gb-ub-photos-arches
|
7993e1f8392e8c1c84fc4efc9c79996eb85a9122 |
26-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Fix issue where aspect bounds don't get applied." into gb-ub-photos-arches
|
ef2407a7ba954c3853ac9c69a3017de7a768c8ac |
26-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Fixed crop intent." into gb-ub-photos-arches
|
817e1edb66e0b0b75494f46d4a509e4f48730a7f |
26-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Fixed crop intent." into gb-ub-photos-arches
|
d72971e683069d463c78117037414e5286689549 |
26-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Fixed crop intent." into gb-ub-photos-arches
|
7f999551167ce313e36ba35e3682593f8cf80e52 |
25-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Fix issue where aspect bounds don't get applied. Bug: 7407937 Change-Id: Ie6484d6458657d6284e04de755a8cc1a912dfb6c
rc/com/android/gallery3d/filtershow/PanelController.java
rc/com/android/gallery3d/filtershow/imageshow/ImageGeometry.java
|
21a7aa3a269dfb68a771e010c0554b68f88a1466 |
25-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Fix issue where aspect bounds don't get applied. Bug: 7407937 Change-Id: Ie6484d6458657d6284e04de755a8cc1a912dfb6c
rc/com/android/gallery3d/filtershow/PanelController.java
rc/com/android/gallery3d/filtershow/imageshow/ImageGeometry.java
|
ebe494f81e685a1d69c1221f019320ed6ee34759 |
26-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Fixed crop intent. Bug: 7415140 Bug: 7403813 Change-Id: I545162544f845d210d21185cddaca09b219fb091
ndroidManifest.xml
|
f9b650d1957c7b6c79e7cee55afdb38db34c970e |
26-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Fixed crop intent. Bug: 7415140 Bug: 7403813 Change-Id: I545162544f845d210d21185cddaca09b219fb091
es/values/filtershow_strings.xml
|
eb3dd15fd820ee4242d0b0799e834fbeeb5f7005 |
26-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Fixed crop intent. Bug: 7415140 Bug: 7403813 Change-Id: I545162544f845d210d21185cddaca09b219fb091
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/ui/MenuExecutor.java
|
5aa454b3bde8b2162eb2b91400973113e2c63070 |
26-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Fixed crop intent. Bug: 7415140 Bug: 7403813 Change-Id: I545162544f845d210d21185cddaca09b219fb091
ndroidManifest.xml
es/values/filtershow_strings.xml
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/ui/MenuExecutor.java
|
c336b806410148924c752e73dab4bcd17fe99ff6 |
26-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am 3e649504: am 2bc4a492: am 1ff4d0fd: am 15aff7c3: Merge "Tagged strings in XML with translation info." into gb-ub-photos-arches * commit '3e649504f4f31f5496f35bf542f47cf7b59ef351': Tagged strings in XML with translation info.
|
3e649504f4f31f5496f35bf542f47cf7b59ef351 |
26-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am 2bc4a492: am 1ff4d0fd: am 15aff7c3: Merge "Tagged strings in XML with translation info." into gb-ub-photos-arches * commit '2bc4a492cfd975f75c0d1b32021b42ac4db2934d': Tagged strings in XML with translation info.
|
2bc4a492cfd975f75c0d1b32021b42ac4db2934d |
26-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am 1ff4d0fd: am 15aff7c3: Merge "Tagged strings in XML with translation info." into gb-ub-photos-arches * commit '1ff4d0fd3d6ca600a92ca939aab34a3ff11dc414': Tagged strings in XML with translation info.
|
dc87b334fe834fab09c8a220500b9c1683561543 |
26-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am 1ff4d0fd: am 15aff7c3: Merge "Tagged strings in XML with translation info." into gb-ub-photos-arches * commit '1ff4d0fd3d6ca600a92ca939aab34a3ff11dc414': Tagged strings in XML with translation info.
|
55b2981de8bbdd183ab411e95f5e6664e9016f94 |
26-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am 15aff7c3: Merge "Tagged strings in XML with translation info." into gb-ub-photos-arches * commit '15aff7c3b27e2938cea3734cb350671386d210c7': Tagged strings in XML with translation info.
|
be7a6f65e210a2de10899f74f97a648803cdbe34 |
26-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am 15aff7c3: Merge "Tagged strings in XML with translation info." into gb-ub-photos-arches * commit '15aff7c3b27e2938cea3734cb350671386d210c7': Tagged strings in XML with translation info.
|
1ff4d0fd3d6ca600a92ca939aab34a3ff11dc414 |
26-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am 15aff7c3: Merge "Tagged strings in XML with translation info." into gb-ub-photos-arches * commit '15aff7c3b27e2938cea3734cb350671386d210c7': Tagged strings in XML with translation info.
|
15aff7c3b27e2938cea3734cb350671386d210c7 |
26-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Tagged strings in XML with translation info." into gb-ub-photos-arches
|
8c133b8e52046b1f5501c8b9857d8662516c0336 |
26-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Tagged strings in XML with translation info." into gb-ub-photos-arches
|
22e804402e0f3bea3eb67fc6565a184e50bf6619 |
25-Oct-2012 |
Michael Jurka <mikejurka@google.com> |
Fix conflict with other build fix Change-Id: Id5286ee8d335b6307f6602e933364f462f19bff2
ests/src/com/android/gallery3d/ui/GLRootStub.java
|
9b4925feb00f488c0abca11c88ec348351bff5e1 |
18-Oct-2012 |
Scott Main <smain@google.com> |
Cherry-pick from Change-Id: I51c6a730e8663586153750a1cda6ea65aad592e8 remove old fashioned Dream, no longer supported Conflicts: AndroidManifest.xml Change-Id: I4e680d771596c07652610b95e055c1317e048fb8
ndroidManifest.xml
|
ba3a22acc2b0052a762955a20f8eb8df8d9e3bc4 |
18-Oct-2012 |
Scott Main <smain@google.com> |
Cherry-pick from Change-Id: I51c6a730e8663586153750a1cda6ea65aad592e8 remove old fashioned Dream, no longer supported Conflicts: AndroidManifest.xml Change-Id: I4e680d771596c07652610b95e055c1317e048fb8
rc/com/android/gallery3d/app/SlideshowDream.java
|
024b459aad2e9c05fea0bfa0c22645fd152c9753 |
18-Oct-2012 |
Scott Main <smain@google.com> |
Cherry-pick from Change-Id: I51c6a730e8663586153750a1cda6ea65aad592e8 remove old fashioned Dream, no longer supported Conflicts: AndroidManifest.xml Change-Id: I4e680d771596c07652610b95e055c1317e048fb8
ndroidManifest.xml
rc/com/android/gallery3d/app/SlideshowDream.java
|
38e5082853af6de5fd31bc53303cc97c3df39007 |
25-Oct-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
8962b2cc458367d5001366026630ff7ce2c10dbc |
25-Oct-2012 |
Michael Jurka <mikejurka@google.com> |
am 676eff69: am ef8fe3cd: am f38cb998: Fix conflict with other build fix * commit '676eff693b75c9eaaed08ffbf60954a3b2c53366': Fix conflict with other build fix
|
676eff693b75c9eaaed08ffbf60954a3b2c53366 |
25-Oct-2012 |
Michael Jurka <mikejurka@google.com> |
am ef8fe3cd: am f38cb998: Fix conflict with other build fix * commit 'ef8fe3cd6329e98622d0b82591e60e64d150ffbd': Fix conflict with other build fix
|
b83e3632acf59c2e790f6d22f7830891db44852b |
25-Oct-2012 |
Michael Jurka <mikejurka@google.com> |
am f38cb998: Fix conflict with other build fix * commit 'f38cb998d6d35ce31a7aa446073e8488305812c2': Fix conflict with other build fix
|
ef8fe3cd6329e98622d0b82591e60e64d150ffbd |
25-Oct-2012 |
Michael Jurka <mikejurka@google.com> |
am f38cb998: Fix conflict with other build fix * commit 'f38cb998d6d35ce31a7aa446073e8488305812c2': Fix conflict with other build fix
|
35ebca76311f97e460cbb43df1d092b86c43f7cf |
25-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 8565749d: am b6c8b627: am d43a8f94: am 6cfd3b8d: Merge "Get rid of black lines near edge of thumbnails" into gb-ub-photos-arches * commit '8565749db26f7abf1ebc7d6254dee0eb69412d94': Get rid of black lines near edge of thumbnails
|
8565749db26f7abf1ebc7d6254dee0eb69412d94 |
25-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am b6c8b627: am d43a8f94: am 6cfd3b8d: Merge "Get rid of black lines near edge of thumbnails" into gb-ub-photos-arches * commit 'b6c8b6272dead4a199f8a110aa892c91dce4276e': Get rid of black lines near edge of thumbnails
|
b6c8b6272dead4a199f8a110aa892c91dce4276e |
25-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am d43a8f94: am 6cfd3b8d: Merge "Get rid of black lines near edge of thumbnails" into gb-ub-photos-arches * commit 'd43a8f94375e899a4b2a544552875c1b0d8b48f4': Get rid of black lines near edge of thumbnails
|
8ee820827f9087dec7e82cdf75976330a62bbd06 |
25-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am d43a8f94: am 6cfd3b8d: Merge "Get rid of black lines near edge of thumbnails" into gb-ub-photos-arches * commit 'd43a8f94375e899a4b2a544552875c1b0d8b48f4': Get rid of black lines near edge of thumbnails
|
f38cb998d6d35ce31a7aa446073e8488305812c2 |
25-Oct-2012 |
Michael Jurka <mikejurka@google.com> |
Fix conflict with other build fix Change-Id: Id5286ee8d335b6307f6602e933364f462f19bff2
ests/src/com/android/gallery3d/ui/GLRootStub.java
|
c1c346dce415dc48d4a60ad4760b9f80d4da807c |
25-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 6cfd3b8d: Merge "Get rid of black lines near edge of thumbnails" into gb-ub-photos-arches * commit '6cfd3b8d34cf627b3b41bf53e9ceb70f9d0ed17f': Get rid of black lines near edge of thumbnails
|
e083d9d59f5070288446328fc134586a0340a0a4 |
25-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 6cfd3b8d: Merge "Get rid of black lines near edge of thumbnails" into gb-ub-photos-arches * commit '6cfd3b8d34cf627b3b41bf53e9ceb70f9d0ed17f': Get rid of black lines near edge of thumbnails
|
d43a8f94375e899a4b2a544552875c1b0d8b48f4 |
25-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 6cfd3b8d: Merge "Get rid of black lines near edge of thumbnails" into gb-ub-photos-arches * commit '6cfd3b8d34cf627b3b41bf53e9ceb70f9d0ed17f': Get rid of black lines near edge of thumbnails
|
6cfd3b8d34cf627b3b41bf53e9ceb70f9d0ed17f |
25-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Get rid of black lines near edge of thumbnails" into gb-ub-photos-arches
|
f6ac061eb455fff6e8d08410f70db2dffbaa9213 |
25-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Get rid of black lines near edge of thumbnails" into gb-ub-photos-arches
|
8dc30f9d95277648e746cfea6faec06aa913395c |
25-Oct-2012 |
Michael Jurka <mikejurka@google.com> |
am 329a9491: am dd5cecf4: am a31708cf: am 0c7e8aac: Merge "Fix build." into gb-ub-photos-arches * commit '329a9491c97fe7eb3bc089e07b2d8a6947728ce7': Fix build.
|
329a9491c97fe7eb3bc089e07b2d8a6947728ce7 |
25-Oct-2012 |
Michael Jurka <mikejurka@google.com> |
am dd5cecf4: am a31708cf: am 0c7e8aac: Merge "Fix build." into gb-ub-photos-arches * commit 'dd5cecf4677fa5f20d0888828b55643f15f545fd': Fix build.
|
a5e9f5300b1ec54c80ebfcc0f91b999927364b12 |
25-Oct-2012 |
Michael Jurka <mikejurka@google.com> |
am e45c243c: am 8eb2680f: am 17c550d3: Merge "Fix build" into jb-mr1-dev * commit 'e45c243ce915d3000440abc9051cbeb5849ee5d1': Fix build
|
559d76f993af7a72a077427af87eb1dc655b6540 |
25-Oct-2012 |
Michael Jurka <mikejurka@google.com> |
am a31708cf: am 0c7e8aac: Merge "Fix build." into gb-ub-photos-arches * commit 'a31708cf4587c607162c9b22e13792cbe354a777': Fix build.
|
dd5cecf4677fa5f20d0888828b55643f15f545fd |
25-Oct-2012 |
Michael Jurka <mikejurka@google.com> |
am a31708cf: am 0c7e8aac: Merge "Fix build." into gb-ub-photos-arches * commit 'a31708cf4587c607162c9b22e13792cbe354a777': Fix build.
|
a31708cf4587c607162c9b22e13792cbe354a777 |
25-Oct-2012 |
Michael Jurka <mikejurka@google.com> |
am 0c7e8aac: Merge "Fix build." into gb-ub-photos-arches * commit '0c7e8aac441c18117b8daf3255d2658b83a37bde': Fix build.
|
e45c243ce915d3000440abc9051cbeb5849ee5d1 |
25-Oct-2012 |
Michael Jurka <mikejurka@google.com> |
am 8eb2680f: am 17c550d3: Merge "Fix build" into jb-mr1-dev * commit '8eb2680fbf19bc62f631872955e7df177be37b7e': Fix build
|
665a3a652befb40268b2b644004a0deac750f34e |
25-Oct-2012 |
Michael Jurka <mikejurka@google.com> |
am 0c7e8aac: Merge "Fix build." into gb-ub-photos-arches * commit '0c7e8aac441c18117b8daf3255d2658b83a37bde': Fix build.
|
219b556ed0024f7ffed2f19379fb4f060aa96535 |
25-Oct-2012 |
Michael Jurka <mikejurka@google.com> |
am 0c7e8aac: Merge "Fix build." into gb-ub-photos-arches * commit '0c7e8aac441c18117b8daf3255d2658b83a37bde': Fix build.
|
0c7e8aac441c18117b8daf3255d2658b83a37bde |
25-Oct-2012 |
Michael Jurka <mikejurka@google.com> |
Merge "Fix build." into gb-ub-photos-arches
|
78266e0e11cd939fb813565e8736282cad83771b |
25-Oct-2012 |
Michael Jurka <mikejurka@google.com> |
Merge "Fix build." into gb-ub-photos-arches
|
1c4fafe902ef9b527abab4be992dcf253efc1701 |
25-Oct-2012 |
Michael Jurka <mikejurka@google.com> |
am 17c550d3: Merge "Fix build" into jb-mr1-dev * commit '17c550d3dddafa0b501dbce294db3e1c18de26df': Fix build
|
8eb2680fbf19bc62f631872955e7df177be37b7e |
25-Oct-2012 |
Michael Jurka <mikejurka@google.com> |
am 17c550d3: Merge "Fix build" into jb-mr1-dev * commit '17c550d3dddafa0b501dbce294db3e1c18de26df': Fix build
|
aea79258dea3d8de123df36539935d89ccd70287 |
25-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am fae94047: am fd4d010f: am a36cc0eb: am 8bc296e2: Fix crash when starting filtereditor * commit 'fae94047489872c0d80ea098ba35e1f974355179': Fix crash when starting filtereditor
|
17c550d3dddafa0b501dbce294db3e1c18de26df |
25-Oct-2012 |
Michael Jurka <mikejurka@google.com> |
Merge "Fix build" into jb-mr1-dev
|
fae94047489872c0d80ea098ba35e1f974355179 |
25-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am fd4d010f: am a36cc0eb: am 8bc296e2: Fix crash when starting filtereditor * commit 'fd4d010f1ed5d6b6b0ce0b8827ce577155c2e695': Fix crash when starting filtereditor
|
9f4d5f1ba9f395092709f042cf6967c05c679c25 |
25-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am a36cc0eb: am 8bc296e2: Fix crash when starting filtereditor * commit 'a36cc0eb13e14b02bb7df53c7343d73ba33e3c8e': Fix crash when starting filtereditor
|
fd4d010f1ed5d6b6b0ce0b8827ce577155c2e695 |
25-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am a36cc0eb: am 8bc296e2: Fix crash when starting filtereditor * commit 'a36cc0eb13e14b02bb7df53c7343d73ba33e3c8e': Fix crash when starting filtereditor
|
6585f080423369d7cbd68b50c4f2c513a6a8e5b6 |
25-Oct-2012 |
Angus Kong <shkong@google.com> |
Fix build. Change-Id: Ia7b581eba32f98d695117526d25876e7a8a398c0
ests/src/com/android/gallery3d/ui/GLRootMock.java
ests/src/com/android/gallery3d/ui/GLRootStub.java
|
6a06e72a32ed4197a9804e78b7eef084aa7d08f0 |
25-Oct-2012 |
Angus Kong <shkong@google.com> |
Fix build. Change-Id: Ia7b581eba32f98d695117526d25876e7a8a398c0
ests/src/com/android/gallery3d/ui/GLRootMock.java
ests/src/com/android/gallery3d/ui/GLRootStub.java
|
e2b07feed85022952bd5fe3c73e93f2ac62cf38b |
25-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 8bc296e2: Fix crash when starting filtereditor * commit '8bc296e233298dbc76da22f01aaffec11e539d19': Fix crash when starting filtereditor
|
79be54c7f80dc373eaf5392629e8d3e74ac316de |
25-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 8bc296e2: Fix crash when starting filtereditor * commit '8bc296e233298dbc76da22f01aaffec11e539d19': Fix crash when starting filtereditor
|
ed0aa545dd75f8c4f72fc636f48dc1e5bc3045c8 |
25-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 8bc296e2: Fix crash when starting filtereditor * commit '8bc296e233298dbc76da22f01aaffec11e539d19': Fix crash when starting filtereditor
|
a36cc0eb13e14b02bb7df53c7343d73ba33e3c8e |
25-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 8bc296e2: Fix crash when starting filtereditor * commit '8bc296e233298dbc76da22f01aaffec11e539d19': Fix crash when starting filtereditor
|
c7a8d8165b12a581e689d1058c9862f215b3d8b9 |
25-Oct-2012 |
Michael Jurka <mikejurka@google.com> |
Fix build Change-Id: Ic8ff27ff1bc0953a81deab631c268c74324e6415
ests/src/com/android/gallery3d/ui/GLRootStub.java
|
1d45da5aee8fbd3c63988e7b8adc004b0097a4f4 |
25-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Tagged strings in XML with translation info. Bug: 7403813 Change-Id: Iff1ec505c2c6fbfc11f7f472cc2e67430cf3715d
es/values/filtershow_strings.xml
|
905947af04edc9f6818a0413c28b13834731b7d8 |
25-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Tagged strings in XML with translation info. Bug: 7403813 Change-Id: Iff1ec505c2c6fbfc11f7f472cc2e67430cf3715d
es/values/filtershow_strings.xml
|
b62e40f77f7c2acf5ada4013a5556f9c7c4c0518 |
25-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Fix crash when starting filtereditor bug:7415170 Change-Id: I9d54b1179f343aa089bfd9a065ecddaa8a4283b8
rc/com/android/gallery3d/filtershow/cache/DirectPresetCache.java
|
bd0219cd5e45d98118993e355776f2bf20538e83 |
25-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Fix crash when starting filtereditor bug:7415170 Change-Id: I9d54b1179f343aa089bfd9a065ecddaa8a4283b8
rc/com/android/gallery3d/filtershow/cache/DirectPresetCache.java
rc/com/android/gallery3d/filtershow/cache/ImageLoader.java
|
8bc296e233298dbc76da22f01aaffec11e539d19 |
25-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Fix crash when starting filtereditor bug:7415170 Change-Id: I9d54b1179f343aa089bfd9a065ecddaa8a4283b8
rc/com/android/gallery3d/filtershow/cache/DirectPresetCache.java
rc/com/android/gallery3d/filtershow/cache/ImageLoader.java
|
d5346b37cc2417e068ae64f3db081f51df2bd68b |
25-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Get rid of black lines near edge of thumbnails Bug: 7414307 Change-Id: If77e04945ff6df65301a6802dd40fabc8c329bfa
rc/com/android/gallery3d/ui/TiledTexture.java
|
b64131fc5443eeb208178dd5e1cadd93d36bbdfd |
25-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Get rid of black lines near edge of thumbnails Bug: 7414307 Change-Id: If77e04945ff6df65301a6802dd40fabc8c329bfa
rc/com/android/gallery3d/ui/TiledTexture.java
|
69cbd7b37b05aa5fa45f810831d825463986ca87 |
25-Oct-2012 |
Angus Kong <shkong@google.com> |
am 16254ade: am 4e2e726a: am c6b77275: am 71c17775: Force renderring request for Camera Animation. * commit '16254ade12d2d4d1e796784d75b1e5574d3715f1': Force renderring request for Camera Animation.
|
16254ade12d2d4d1e796784d75b1e5574d3715f1 |
25-Oct-2012 |
Angus Kong <shkong@google.com> |
am 4e2e726a: am c6b77275: am 71c17775: Force renderring request for Camera Animation. * commit '4e2e726a8e79a6634b0f7e0677a332e4fabbddcf': Force renderring request for Camera Animation.
|
4e2e726a8e79a6634b0f7e0677a332e4fabbddcf |
25-Oct-2012 |
Angus Kong <shkong@google.com> |
am c6b77275: am 71c17775: Force renderring request for Camera Animation. * commit 'c6b77275bde572b8ecd47449e6b1b7c4d4c516ab': Force renderring request for Camera Animation.
|
9b12b990cd9262dfc15c274e66681531352315e2 |
25-Oct-2012 |
Angus Kong <shkong@google.com> |
am c6b77275: am 71c17775: Force renderring request for Camera Animation. * commit 'c6b77275bde572b8ecd47449e6b1b7c4d4c516ab': Force renderring request for Camera Animation.
|
d0842099177b411a52b4cfb07566be1c47fc1f9a |
25-Oct-2012 |
Angus Kong <shkong@google.com> |
am 71c17775: Force renderring request for Camera Animation. * commit '71c177759c7aa10082c8fdf909b701cf0047bead': Force renderring request for Camera Animation.
|
bf2c109c0913954d726f042e9b72bee41347cc57 |
25-Oct-2012 |
Angus Kong <shkong@google.com> |
am 71c17775: Force renderring request for Camera Animation. * commit '71c177759c7aa10082c8fdf909b701cf0047bead': Force renderring request for Camera Animation.
|
c6b77275bde572b8ecd47449e6b1b7c4d4c516ab |
25-Oct-2012 |
Angus Kong <shkong@google.com> |
am 71c17775: Force renderring request for Camera Animation. * commit '71c177759c7aa10082c8fdf909b701cf0047bead': Force renderring request for Camera Animation.
|
71c177759c7aa10082c8fdf909b701cf0047bead |
25-Oct-2012 |
Angus Kong <shkong@google.com> |
Force renderring request for Camera Animation. bug:7410862 Change-Id: I439186f2fea5ee0939ddcfcb9d77a49d0047727b
rc/com/android/gallery3d/ui/GLRoot.java
rc/com/android/gallery3d/ui/GLRootView.java
|
30e7406db27fc4f0dbd3dd0ee3a0b04f40439231 |
25-Oct-2012 |
Angus Kong <shkong@google.com> |
Force renderring request for Camera Animation. bug:7410862 Change-Id: I439186f2fea5ee0939ddcfcb9d77a49d0047727b
rc/com/android/gallery3d/ui/GLRoot.java
rc/com/android/gallery3d/ui/GLRootView.java
|
3bc9655415ba3cd8f886d999ce0d8a057f4137ec |
25-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 7169f8b6: am 7252534e: am dff8cf82: am dffe6a6f: Fix default for tiny planet * commit '7169f8b6f75d3d3cfbe34a5c6779398fc761452e': Fix default for tiny planet
|
7169f8b6f75d3d3cfbe34a5c6779398fc761452e |
25-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 7252534e: am dff8cf82: am dffe6a6f: Fix default for tiny planet * commit '7252534ea9b41112538e38ad704952561eea6786': Fix default for tiny planet
|
9ed116642f07ae6a52be132077fcdfb2790a4758 |
25-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am dff8cf82: am dffe6a6f: Fix default for tiny planet * commit 'dff8cf82d1156f38bf7338ac37b1571597ae3f68': Fix default for tiny planet
|
7252534ea9b41112538e38ad704952561eea6786 |
25-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am dff8cf82: am dffe6a6f: Fix default for tiny planet * commit 'dff8cf82d1156f38bf7338ac37b1571597ae3f68': Fix default for tiny planet
|
dff8cf82d1156f38bf7338ac37b1571597ae3f68 |
25-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am dffe6a6f: Fix default for tiny planet * commit 'dffe6a6f8bbf4565df211b07bcfc23d6864a48b6': Fix default for tiny planet
|
8c228f9a28c04275f30edc6008af49ed3f3931d9 |
25-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am dffe6a6f: Fix default for tiny planet * commit 'dffe6a6f8bbf4565df211b07bcfc23d6864a48b6': Fix default for tiny planet
|
accaab0f90d9a139a6d0c0d9965be58dc02bbfb2 |
25-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am dffe6a6f: Fix default for tiny planet * commit 'dffe6a6f8bbf4565df211b07bcfc23d6864a48b6': Fix default for tiny planet
|
d89556b68831dd332cbc9802a3d8bf54dd1e780d |
25-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 31fd745c: am d10ca2b3: am 73a2ad06: am e7a71372: Fix update view * commit '31fd745ceea0027708fe18b49f12c5a9988fee32': Fix update view
|
31fd745ceea0027708fe18b49f12c5a9988fee32 |
25-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am d10ca2b3: am 73a2ad06: am e7a71372: Fix update view * commit 'd10ca2b33968adc43b0403b365028d44407574b6': Fix update view
|
e3642a3362e1e6fbdcc0b4ffb0963657f4e1caf0 |
25-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 73a2ad06: am e7a71372: Fix update view * commit '73a2ad06d3ac5456f0ada8f913dabf505d26fb8d': Fix update view
|
d10ca2b33968adc43b0403b365028d44407574b6 |
25-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 73a2ad06: am e7a71372: Fix update view * commit '73a2ad06d3ac5456f0ada8f913dabf505d26fb8d': Fix update view
|
73a2ad06d3ac5456f0ada8f913dabf505d26fb8d |
25-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am e7a71372: Fix update view * commit 'e7a71372747af0ef03f9d953c28ed62de58315d3': Fix update view
|
799b7759ed1092ae7f83c4e9138eb57d63475ba6 |
25-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am e7a71372: Fix update view * commit 'e7a71372747af0ef03f9d953c28ed62de58315d3': Fix update view
|
7aa8974d1cbe5090c3cf94086e4099ab32adab51 |
25-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am e7a71372: Fix update view * commit 'e7a71372747af0ef03f9d953c28ed62de58315d3': Fix update view
|
dffe6a6f8bbf4565df211b07bcfc23d6864a48b6 |
25-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Fix default for tiny planet bug:7410938 Change-Id: If43317c2ad1e22ca1a3d3de1eef91ea2556252dd
rc/com/android/gallery3d/filtershow/filters/ImageFilterTinyPlanet.java
|
31c9a0ff9b2a732e76e03dd38c511b22b4e8c0f1 |
25-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Fix default for tiny planet bug:7410938 Change-Id: If43317c2ad1e22ca1a3d3de1eef91ea2556252dd
rc/com/android/gallery3d/filtershow/filters/ImageFilterTinyPlanet.java
|
e7a71372747af0ef03f9d953c28ed62de58315d3 |
25-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Fix update view bug:7410583 Change-Id: I8e773bc4ba550c2a362b46e5a6488ad7b3c29646
rc/com/android/gallery3d/filtershow/cache/ImageLoader.java
|
1aa5f5b7c8a44cd7f002fd7838b95a6297e4e46b |
25-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Fix update view bug:7410583 Change-Id: I8e773bc4ba550c2a362b46e5a6488ad7b3c29646
rc/com/android/gallery3d/filtershow/cache/ImageLoader.java
|
d71a718afe02282153d86b78f6a44c4783203d54 |
24-Oct-2012 |
Owen Lin <owenlin@google.com> |
Fix tiling effect when open a photo. 1. Don't draw the tiles of full image before screen nail is ready. 2. Upload multiple tiles in each frame in order to show photo quickly. bug: 7403409 Change-Id: Ic5a88a29fe302068e97ab81ab260d0cc572dd7ff
rc/com/android/gallery3d/ui/TiledScreenNail.java
rc/com/android/gallery3d/ui/TiledTexture.java
|
9ed5587681d216168ab000ae254da4bdbdcf7a34 |
24-Oct-2012 |
Owen Lin <owenlin@google.com> |
Fix tiling effect when open a photo. 1. Don't draw the tiles of full image before screen nail is ready. 2. Upload multiple tiles in each frame in order to show photo quickly. bug: 7403409 Change-Id: Ic5a88a29fe302068e97ab81ab260d0cc572dd7ff
rc/com/android/gallery3d/ui/TiledScreenNail.java
rc/com/android/gallery3d/ui/TiledTexture.java
|
759b7b67aa7a82e7397b39faf17094bfbf1b6eb2 |
25-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am beac3366: am 0df9c08d: am d4c93190: am ea3c51ff: Merge "Remove the old photo editor" into gb-ub-photos-arches * commit 'beac3366448d5462dcba79d69f7764d4fcc75217': Remove the old photo editor
|
beac3366448d5462dcba79d69f7764d4fcc75217 |
25-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 0df9c08d: am d4c93190: am ea3c51ff: Merge "Remove the old photo editor" into gb-ub-photos-arches * commit '0df9c08dcf8aa18bcc7add0e9714120a64303b05': Remove the old photo editor
|
d491af093d8614e33b89bccaa1db030128eaaa25 |
25-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am d4c93190: am ea3c51ff: Merge "Remove the old photo editor" into gb-ub-photos-arches * commit 'd4c93190e5aab69cfee9cfa8218bc4c126f7f48d': Remove the old photo editor
|
0df9c08dcf8aa18bcc7add0e9714120a64303b05 |
25-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am d4c93190: am ea3c51ff: Merge "Remove the old photo editor" into gb-ub-photos-arches * commit 'd4c93190e5aab69cfee9cfa8218bc4c126f7f48d': Remove the old photo editor
|
d4c93190e5aab69cfee9cfa8218bc4c126f7f48d |
25-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am ea3c51ff: Merge "Remove the old photo editor" into gb-ub-photos-arches * commit 'ea3c51ff451f2e5efc00912ff993e232e5f07cd7': Remove the old photo editor
|
37e4984da5c2930dc6f67f98f6f6d60fabc5991e |
25-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am ea3c51ff: Merge "Remove the old photo editor" into gb-ub-photos-arches * commit 'ea3c51ff451f2e5efc00912ff993e232e5f07cd7': Remove the old photo editor
|
32e7c361d67c2a09d36ce275ae1adc17cf468cad |
25-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am ea3c51ff: Merge "Remove the old photo editor" into gb-ub-photos-arches * commit 'ea3c51ff451f2e5efc00912ff993e232e5f07cd7': Remove the old photo editor
|
d09d0c6ca2d6990aea99d728dfb15bfcc5d0c42a |
25-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am ea3c51ff: Merge "Remove the old photo editor" into gb-ub-photos-arches * commit 'ea3c51ff451f2e5efc00912ff993e232e5f07cd7': Remove the old photo editor
|
58727a09acd088e39b567de8f7f97311228b2b04 |
25-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am ea3c51ff: Merge "Remove the old photo editor" into gb-ub-photos-arches * commit 'ea3c51ff451f2e5efc00912ff993e232e5f07cd7': Remove the old photo editor
|
a6a76db3c29938a933e41c377edd98c9c2bfa38b |
25-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Merge "Remove the old photo editor" into gb-ub-photos-arches
|
ea3c51ff451f2e5efc00912ff993e232e5f07cd7 |
25-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Merge "Remove the old photo editor" into gb-ub-photos-arches
|
2189502d1ea176fa8aec207ad8fa57965dc6ae33 |
25-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Merge "Remove the old photo editor" into gb-ub-photos-arches
|
796669525b56145feb8f77e9c2d3556ebd09ac61 |
25-Oct-2012 |
Hung-ying Tyan <tyanh@google.com> |
Merge "Handle invalid offset size in ExifParser" into gb-ub-photos-bryce
|
c16999c1f70aae8e82a135f0d1edca44690a4f85 |
25-Oct-2012 |
Hung-ying Tyan <tyanh@google.com> |
Merge "Handle invalid offset size in ExifParser" into gb-ub-photos-bryce
|
fc12fde980667bb92827dd455d6e78010565004d |
25-Oct-2012 |
Sascha Haeberling <haeberling@google.com> |
am 78a366b3: am b85c6d2c: am 2df8a18a: am b13e1788: Merge "Fixes TinyPlanet crashed due to too excessive memory usage." into gb-ub-photos-arches * commit '78a366b30320b23b8d853bb589188cb721fe0910': Fixes TinyPlanet crashed due to too excessive memory usage.
|
78a366b30320b23b8d853bb589188cb721fe0910 |
25-Oct-2012 |
Sascha Haeberling <haeberling@google.com> |
am b85c6d2c: am 2df8a18a: am b13e1788: Merge "Fixes TinyPlanet crashed due to too excessive memory usage." into gb-ub-photos-arches * commit 'b85c6d2c8a428e24d1c90b685e3910deb5cbe773': Fixes TinyPlanet crashed due to too excessive memory usage.
|
b85c6d2c8a428e24d1c90b685e3910deb5cbe773 |
25-Oct-2012 |
Sascha Haeberling <haeberling@google.com> |
am 2df8a18a: am b13e1788: Merge "Fixes TinyPlanet crashed due to too excessive memory usage." into gb-ub-photos-arches * commit '2df8a18abd1b23728052527d765a57e03abf093d': Fixes TinyPlanet crashed due to too excessive memory usage.
|
fb49447912a3acf5bbadcfcb696a282b6765b05f |
25-Oct-2012 |
Sascha Haeberling <haeberling@google.com> |
am 2df8a18a: am b13e1788: Merge "Fixes TinyPlanet crashed due to too excessive memory usage." into gb-ub-photos-arches * commit '2df8a18abd1b23728052527d765a57e03abf093d': Fixes TinyPlanet crashed due to too excessive memory usage.
|
2df8a18abd1b23728052527d765a57e03abf093d |
25-Oct-2012 |
Sascha Haeberling <haeberling@google.com> |
am b13e1788: Merge "Fixes TinyPlanet crashed due to too excessive memory usage." into gb-ub-photos-arches * commit 'b13e1788ddf886fcdfd1ec837a59ec242bb33dae': Fixes TinyPlanet crashed due to too excessive memory usage.
|
55a873fc6160d6451d4acb7f7fa968ff5e2a3bde |
25-Oct-2012 |
Sascha Haeberling <haeberling@google.com> |
am b13e1788: Merge "Fixes TinyPlanet crashed due to too excessive memory usage." into gb-ub-photos-arches * commit 'b13e1788ddf886fcdfd1ec837a59ec242bb33dae': Fixes TinyPlanet crashed due to too excessive memory usage.
|
e00da70eea7ae06efe7671cd8b6e5deeca29b891 |
25-Oct-2012 |
Sascha Haeberling <haeberling@google.com> |
am b13e1788: Merge "Fixes TinyPlanet crashed due to too excessive memory usage." into gb-ub-photos-arches * commit 'b13e1788ddf886fcdfd1ec837a59ec242bb33dae': Fixes TinyPlanet crashed due to too excessive memory usage.
|
b13e1788ddf886fcdfd1ec837a59ec242bb33dae |
25-Oct-2012 |
Sascha Haeberling <haeberling@google.com> |
Merge "Fixes TinyPlanet crashed due to too excessive memory usage." into gb-ub-photos-arches
|
2696d692dcf04c36f92455bdd9dc662487689707 |
25-Oct-2012 |
Sascha Haeberling <haeberling@google.com> |
Merge "Fixes TinyPlanet crashed due to too excessive memory usage." into gb-ub-photos-arches
|
2f78535c7d360398a365f8ad67110a86d8144c6e |
25-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am 90ceb11e: am e1b539cd: am e1de865c: am 4a601448: Merge "Fixed blackscreen when launching crop from menu." into gb-ub-photos-arches * commit '90ceb11e542c325f1dcef37a5d9fe8061a1d7943': Fixed blackscreen when launching crop from menu.
|
90ceb11e542c325f1dcef37a5d9fe8061a1d7943 |
25-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am e1b539cd: am e1de865c: am 4a601448: Merge "Fixed blackscreen when launching crop from menu." into gb-ub-photos-arches * commit 'e1b539cd0ba234ecd5f35219dba7e314c80620d2': Fixed blackscreen when launching crop from menu.
|
e1b539cd0ba234ecd5f35219dba7e314c80620d2 |
25-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am e1de865c: am 4a601448: Merge "Fixed blackscreen when launching crop from menu." into gb-ub-photos-arches * commit 'e1de865ca29bd178024a952efb2e1b9b54185336': Fixed blackscreen when launching crop from menu.
|
a9bc6deb8e4eb9e57b13d83a33251e62d6a87e01 |
25-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am e1de865c: am 4a601448: Merge "Fixed blackscreen when launching crop from menu." into gb-ub-photos-arches * commit 'e1de865ca29bd178024a952efb2e1b9b54185336': Fixed blackscreen when launching crop from menu.
|
9d7b73069ea157ff4ac356fefc000672f135d5a6 |
25-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am 4a601448: Merge "Fixed blackscreen when launching crop from menu." into gb-ub-photos-arches * commit '4a601448dff06711df2d08e75d4b0c43aa57600e': Fixed blackscreen when launching crop from menu.
|
ad62ce917a2d30c0c681386219a72d9dc846f998 |
25-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am 4a601448: Merge "Fixed blackscreen when launching crop from menu." into gb-ub-photos-arches * commit '4a601448dff06711df2d08e75d4b0c43aa57600e': Fixed blackscreen when launching crop from menu.
|
e1de865ca29bd178024a952efb2e1b9b54185336 |
25-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am 4a601448: Merge "Fixed blackscreen when launching crop from menu." into gb-ub-photos-arches * commit '4a601448dff06711df2d08e75d4b0c43aa57600e': Fixed blackscreen when launching crop from menu.
|
4a601448dff06711df2d08e75d4b0c43aa57600e |
25-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Fixed blackscreen when launching crop from menu." into gb-ub-photos-arches
|
0817895a0de7f0295ed06fa7ac4cff624479797a |
25-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Fixed blackscreen when launching crop from menu." into gb-ub-photos-arches
|
13b2fd3ab7ff65ac5c18b4c9de69062f3a549669 |
25-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Fixed blackscreen when launching crop from menu. Bug: 7410287 Change-Id: I60ae95cff82c789df37ce1b45fbaaaffa1aa552b
rc/com/android/gallery3d/filtershow/cache/ImageLoader.java
rc/com/android/gallery3d/filtershow/imageshow/ImageCrop.java
rc/com/android/gallery3d/filtershow/imageshow/ImageShow.java
|
644aa2529f24d7750cff0b448765933675c3afdb |
25-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Fixed blackscreen when launching crop from menu. Bug: 7410287 Change-Id: I60ae95cff82c789df37ce1b45fbaaaffa1aa552b
rc/com/android/gallery3d/filtershow/cache/ImageLoader.java
rc/com/android/gallery3d/filtershow/imageshow/ImageCrop.java
rc/com/android/gallery3d/filtershow/imageshow/ImageShow.java
|
9faed84639a6358086e66b59808aca36f937db11 |
25-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 6d951c1c: am 86062fc7: am dd12e5b5: am 2c6ea941: Add rotation to tinyplanet view * commit '6d951c1c68124517f14580af7006978798dc9a80': Add rotation to tinyplanet view
|
6d951c1c68124517f14580af7006978798dc9a80 |
25-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 86062fc7: am dd12e5b5: am 2c6ea941: Add rotation to tinyplanet view * commit '86062fc79e3ed74870bc1a98787635347c027d69': Add rotation to tinyplanet view
|
c6b4ecf682ce95e5b5a725fa8c8fdf61bad79c83 |
25-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am dd12e5b5: am 2c6ea941: Add rotation to tinyplanet view * commit 'dd12e5b57cef40711cb2c5201589a2a48e521080': Add rotation to tinyplanet view
|
044513931d31a4b86f622b1af36e9ce947672be7 |
25-Oct-2012 |
Sascha Haeberling <haeberling@google.com> |
Fixes TinyPlanet crashed due to too excessive memory usage. Bug: 7409664 Change-Id: If82882ce7186500f5a3af769d490275233a6191c
rc/com/android/gallery3d/filtershow/filters/ImageFilterTinyPlanet.java
|
6ebc5501d1e577f243beb306c3493f77b25c4794 |
25-Oct-2012 |
Sascha Haeberling <haeberling@google.com> |
Fixes TinyPlanet crashed due to too excessive memory usage. Bug: 7409664 Change-Id: If82882ce7186500f5a3af769d490275233a6191c
rc/com/android/gallery3d/filtershow/filters/ImageFilterTinyPlanet.java
|
86062fc79e3ed74870bc1a98787635347c027d69 |
25-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am dd12e5b5: am 2c6ea941: Add rotation to tinyplanet view * commit 'dd12e5b57cef40711cb2c5201589a2a48e521080': Add rotation to tinyplanet view
|
c260dc584e5a24e89f9e6112b94da35d13cda053 |
25-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 2c6ea941: Add rotation to tinyplanet view * commit '2c6ea941a80ea22317d664e329aed51f5f7417b9': Add rotation to tinyplanet view
|
d69469f7d26df88fae987f5a9112938939544926 |
25-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 2c6ea941: Add rotation to tinyplanet view * commit '2c6ea941a80ea22317d664e329aed51f5f7417b9': Add rotation to tinyplanet view
|
6e571b524c5a02632f38276d6d3fe11b5087b504 |
25-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 2c6ea941: Add rotation to tinyplanet view * commit '2c6ea941a80ea22317d664e329aed51f5f7417b9': Add rotation to tinyplanet view
|
dd12e5b57cef40711cb2c5201589a2a48e521080 |
25-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 2c6ea941: Add rotation to tinyplanet view * commit '2c6ea941a80ea22317d664e329aed51f5f7417b9': Add rotation to tinyplanet view
|
55614a48ca5ce4304c3bef3ca4372f5548dbfd40 |
25-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Remove the old photo editor bug:7407573 Change-Id: Ifac6d3d7cec02c9cb8ef8bbd390f0512e6cdb66c (cherry picked from commit a96c8e9c9aac509ba074b340c66e31e20ec05823)
ndroidManifest.xml
|
da5c9c921d155b0729677de8a89c6ee08c434b8e |
25-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Remove the old photo editor bug:7407573 Change-Id: Ifac6d3d7cec02c9cb8ef8bbd390f0512e6cdb66c (cherry picked from commit a96c8e9c9aac509ba074b340c66e31e20ec05823)
rc/com/android/gallery3d/photoeditor/SpinnerProgressDialog.java
|
50116ffb044f6566ef5e36aaa8e41dcb7522076e |
25-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Remove the old photo editor bug:7407573 Change-Id: Ifac6d3d7cec02c9cb8ef8bbd390f0512e6cdb66c (cherry picked from commit a96c8e9c9aac509ba074b340c66e31e20ec05823)
ndroidManifest.xml
rc/com/android/gallery3d/app/GalleryAppImpl.java
rc/com/android/gallery3d/photoeditor/ActionBar.java
rc/com/android/gallery3d/photoeditor/BitmapUtils.java
rc/com/android/gallery3d/photoeditor/EffectsBar.java
rc/com/android/gallery3d/photoeditor/EffectsMenu.java
rc/com/android/gallery3d/photoeditor/FilterStack.java
rc/com/android/gallery3d/photoeditor/ImageActionButton.java
rc/com/android/gallery3d/photoeditor/LoadScreennailTask.java
rc/com/android/gallery3d/photoeditor/OnDoneBitmapCallback.java
rc/com/android/gallery3d/photoeditor/OnDoneCallback.java
rc/com/android/gallery3d/photoeditor/Photo.java
rc/com/android/gallery3d/photoeditor/PhotoEditor.java
rc/com/android/gallery3d/photoeditor/PhotoView.java
rc/com/android/gallery3d/photoeditor/RendererUtils.java
rc/com/android/gallery3d/photoeditor/RestorableView.java
rc/com/android/gallery3d/photoeditor/SaveCopyTask.java
rc/com/android/gallery3d/photoeditor/SpinnerProgressDialog.java
rc/com/android/gallery3d/photoeditor/Toolbar.java
rc/com/android/gallery3d/photoeditor/YesCancelDialogBuilder.java
rc/com/android/gallery3d/photoeditor/actions/AbstractSeekBar.java
rc/com/android/gallery3d/photoeditor/actions/AutoFixAction.java
rc/com/android/gallery3d/photoeditor/actions/ColorSeekBar.java
rc/com/android/gallery3d/photoeditor/actions/ColorTemperatureAction.java
rc/com/android/gallery3d/photoeditor/actions/CropAction.java
rc/com/android/gallery3d/photoeditor/actions/CropView.java
rc/com/android/gallery3d/photoeditor/actions/CrossProcessAction.java
rc/com/android/gallery3d/photoeditor/actions/DocumentaryAction.java
rc/com/android/gallery3d/photoeditor/actions/Doodle.java
rc/com/android/gallery3d/photoeditor/actions/DoodleAction.java
rc/com/android/gallery3d/photoeditor/actions/DoodleView.java
rc/com/android/gallery3d/photoeditor/actions/DuotoneAction.java
rc/com/android/gallery3d/photoeditor/actions/EffectAction.java
rc/com/android/gallery3d/photoeditor/actions/EffectToolKit.java
rc/com/android/gallery3d/photoeditor/actions/FaceTanAction.java
rc/com/android/gallery3d/photoeditor/actions/FaceliftAction.java
rc/com/android/gallery3d/photoeditor/actions/FillLightAction.java
rc/com/android/gallery3d/photoeditor/actions/FisheyeAction.java
rc/com/android/gallery3d/photoeditor/actions/FlipAction.java
rc/com/android/gallery3d/photoeditor/actions/FlipView.java
rc/com/android/gallery3d/photoeditor/actions/FullscreenToolView.java
rc/com/android/gallery3d/photoeditor/actions/GrainAction.java
rc/com/android/gallery3d/photoeditor/actions/GrayscaleAction.java
rc/com/android/gallery3d/photoeditor/actions/HighlightAction.java
rc/com/android/gallery3d/photoeditor/actions/LomoishAction.java
rc/com/android/gallery3d/photoeditor/actions/NegativeAction.java
rc/com/android/gallery3d/photoeditor/actions/PosterizeAction.java
rc/com/android/gallery3d/photoeditor/actions/RedEyeAction.java
rc/com/android/gallery3d/photoeditor/actions/RotateAction.java
rc/com/android/gallery3d/photoeditor/actions/RotateView.java
rc/com/android/gallery3d/photoeditor/actions/SaturationAction.java
rc/com/android/gallery3d/photoeditor/actions/ScaleSeekBar.java
rc/com/android/gallery3d/photoeditor/actions/SepiaAction.java
rc/com/android/gallery3d/photoeditor/actions/ShadowAction.java
rc/com/android/gallery3d/photoeditor/actions/SharpenAction.java
rc/com/android/gallery3d/photoeditor/actions/StraightenAction.java
rc/com/android/gallery3d/photoeditor/actions/TintAction.java
rc/com/android/gallery3d/photoeditor/actions/TouchView.java
rc/com/android/gallery3d/photoeditor/actions/VignetteAction.java
rc/com/android/gallery3d/photoeditor/filters/AbstractScaleFilter.java
rc/com/android/gallery3d/photoeditor/filters/AutoFixFilter.java
rc/com/android/gallery3d/photoeditor/filters/ColorTemperatureFilter.java
rc/com/android/gallery3d/photoeditor/filters/CropFilter.java
rc/com/android/gallery3d/photoeditor/filters/CrossProcessFilter.java
rc/com/android/gallery3d/photoeditor/filters/DocumentaryFilter.java
rc/com/android/gallery3d/photoeditor/filters/DoodleFilter.java
rc/com/android/gallery3d/photoeditor/filters/DuotoneFilter.java
rc/com/android/gallery3d/photoeditor/filters/FaceTanFilter.java
rc/com/android/gallery3d/photoeditor/filters/FaceliftFilter.java
rc/com/android/gallery3d/photoeditor/filters/FillLightFilter.java
rc/com/android/gallery3d/photoeditor/filters/Filter.java
rc/com/android/gallery3d/photoeditor/filters/FilterCreator.java
rc/com/android/gallery3d/photoeditor/filters/FisheyeFilter.java
rc/com/android/gallery3d/photoeditor/filters/FlipFilter.java
rc/com/android/gallery3d/photoeditor/filters/GrainFilter.java
rc/com/android/gallery3d/photoeditor/filters/GrayscaleFilter.java
rc/com/android/gallery3d/photoeditor/filters/HighlightFilter.java
rc/com/android/gallery3d/photoeditor/filters/LomoishFilter.java
rc/com/android/gallery3d/photoeditor/filters/NegativeFilter.java
rc/com/android/gallery3d/photoeditor/filters/PosterizeFilter.java
rc/com/android/gallery3d/photoeditor/filters/RedEyeFilter.java
rc/com/android/gallery3d/photoeditor/filters/RotateFilter.java
rc/com/android/gallery3d/photoeditor/filters/SaturationFilter.java
rc/com/android/gallery3d/photoeditor/filters/SepiaFilter.java
rc/com/android/gallery3d/photoeditor/filters/ShadowFilter.java
rc/com/android/gallery3d/photoeditor/filters/SharpenFilter.java
rc/com/android/gallery3d/photoeditor/filters/StraightenFilter.java
rc/com/android/gallery3d/photoeditor/filters/TintFilter.java
rc/com/android/gallery3d/photoeditor/filters/VignetteFilter.java
|
b9cded8b42f032e453ae016027cb2b8e7097f575 |
25-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Remove the old photo editor bug:7407573 Change-Id: Ifac6d3d7cec02c9cb8ef8bbd390f0512e6cdb66c (cherry picked from commit a96c8e9c9aac509ba074b340c66e31e20ec05823)
rc/com/android/gallery3d/app/GalleryAppImpl.java
rc/com/android/gallery3d/photoeditor/ActionBar.java
rc/com/android/gallery3d/photoeditor/BitmapUtils.java
rc/com/android/gallery3d/photoeditor/EffectsBar.java
rc/com/android/gallery3d/photoeditor/EffectsMenu.java
rc/com/android/gallery3d/photoeditor/FilterStack.java
rc/com/android/gallery3d/photoeditor/ImageActionButton.java
rc/com/android/gallery3d/photoeditor/LoadScreennailTask.java
rc/com/android/gallery3d/photoeditor/OnDoneBitmapCallback.java
rc/com/android/gallery3d/photoeditor/OnDoneCallback.java
rc/com/android/gallery3d/photoeditor/Photo.java
rc/com/android/gallery3d/photoeditor/PhotoEditor.java
rc/com/android/gallery3d/photoeditor/PhotoView.java
rc/com/android/gallery3d/photoeditor/RendererUtils.java
rc/com/android/gallery3d/photoeditor/RestorableView.java
rc/com/android/gallery3d/photoeditor/SaveCopyTask.java
rc/com/android/gallery3d/photoeditor/SpinnerProgressDialog.java
rc/com/android/gallery3d/photoeditor/Toolbar.java
rc/com/android/gallery3d/photoeditor/YesCancelDialogBuilder.java
rc/com/android/gallery3d/photoeditor/actions/AbstractSeekBar.java
rc/com/android/gallery3d/photoeditor/actions/AutoFixAction.java
rc/com/android/gallery3d/photoeditor/actions/ColorSeekBar.java
rc/com/android/gallery3d/photoeditor/actions/ColorTemperatureAction.java
rc/com/android/gallery3d/photoeditor/actions/CropAction.java
rc/com/android/gallery3d/photoeditor/actions/CropView.java
rc/com/android/gallery3d/photoeditor/actions/CrossProcessAction.java
rc/com/android/gallery3d/photoeditor/actions/DocumentaryAction.java
rc/com/android/gallery3d/photoeditor/actions/Doodle.java
rc/com/android/gallery3d/photoeditor/actions/DoodleAction.java
rc/com/android/gallery3d/photoeditor/actions/DoodleView.java
rc/com/android/gallery3d/photoeditor/actions/DuotoneAction.java
rc/com/android/gallery3d/photoeditor/actions/EffectAction.java
rc/com/android/gallery3d/photoeditor/actions/EffectToolKit.java
rc/com/android/gallery3d/photoeditor/actions/FaceTanAction.java
rc/com/android/gallery3d/photoeditor/actions/FaceliftAction.java
rc/com/android/gallery3d/photoeditor/actions/FillLightAction.java
rc/com/android/gallery3d/photoeditor/actions/FisheyeAction.java
rc/com/android/gallery3d/photoeditor/actions/FlipAction.java
rc/com/android/gallery3d/photoeditor/actions/FlipView.java
rc/com/android/gallery3d/photoeditor/actions/FullscreenToolView.java
rc/com/android/gallery3d/photoeditor/actions/GrainAction.java
rc/com/android/gallery3d/photoeditor/actions/GrayscaleAction.java
rc/com/android/gallery3d/photoeditor/actions/HighlightAction.java
rc/com/android/gallery3d/photoeditor/actions/LomoishAction.java
rc/com/android/gallery3d/photoeditor/actions/NegativeAction.java
rc/com/android/gallery3d/photoeditor/actions/PosterizeAction.java
rc/com/android/gallery3d/photoeditor/actions/RedEyeAction.java
rc/com/android/gallery3d/photoeditor/actions/RotateAction.java
rc/com/android/gallery3d/photoeditor/actions/RotateView.java
rc/com/android/gallery3d/photoeditor/actions/SaturationAction.java
rc/com/android/gallery3d/photoeditor/actions/ScaleSeekBar.java
rc/com/android/gallery3d/photoeditor/actions/SepiaAction.java
rc/com/android/gallery3d/photoeditor/actions/ShadowAction.java
rc/com/android/gallery3d/photoeditor/actions/SharpenAction.java
rc/com/android/gallery3d/photoeditor/actions/StraightenAction.java
rc/com/android/gallery3d/photoeditor/actions/TintAction.java
rc/com/android/gallery3d/photoeditor/actions/TouchView.java
rc/com/android/gallery3d/photoeditor/actions/VignetteAction.java
rc/com/android/gallery3d/photoeditor/filters/AbstractScaleFilter.java
rc/com/android/gallery3d/photoeditor/filters/AutoFixFilter.java
rc/com/android/gallery3d/photoeditor/filters/ColorTemperatureFilter.java
rc/com/android/gallery3d/photoeditor/filters/CropFilter.java
rc/com/android/gallery3d/photoeditor/filters/CrossProcessFilter.java
rc/com/android/gallery3d/photoeditor/filters/DocumentaryFilter.java
rc/com/android/gallery3d/photoeditor/filters/DoodleFilter.java
rc/com/android/gallery3d/photoeditor/filters/DuotoneFilter.java
rc/com/android/gallery3d/photoeditor/filters/FaceTanFilter.java
rc/com/android/gallery3d/photoeditor/filters/FaceliftFilter.java
rc/com/android/gallery3d/photoeditor/filters/FillLightFilter.java
rc/com/android/gallery3d/photoeditor/filters/Filter.java
rc/com/android/gallery3d/photoeditor/filters/FilterCreator.java
rc/com/android/gallery3d/photoeditor/filters/FisheyeFilter.java
rc/com/android/gallery3d/photoeditor/filters/FlipFilter.java
rc/com/android/gallery3d/photoeditor/filters/GrainFilter.java
rc/com/android/gallery3d/photoeditor/filters/GrayscaleFilter.java
rc/com/android/gallery3d/photoeditor/filters/HighlightFilter.java
rc/com/android/gallery3d/photoeditor/filters/LomoishFilter.java
rc/com/android/gallery3d/photoeditor/filters/NegativeFilter.java
rc/com/android/gallery3d/photoeditor/filters/PosterizeFilter.java
rc/com/android/gallery3d/photoeditor/filters/RedEyeFilter.java
rc/com/android/gallery3d/photoeditor/filters/RotateFilter.java
rc/com/android/gallery3d/photoeditor/filters/SaturationFilter.java
rc/com/android/gallery3d/photoeditor/filters/SepiaFilter.java
rc/com/android/gallery3d/photoeditor/filters/ShadowFilter.java
rc/com/android/gallery3d/photoeditor/filters/SharpenFilter.java
rc/com/android/gallery3d/photoeditor/filters/StraightenFilter.java
rc/com/android/gallery3d/photoeditor/filters/TintFilter.java
rc/com/android/gallery3d/photoeditor/filters/VignetteFilter.java
|
cd7a760369f50ae9424a68fa903351cc54314115 |
25-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Add rotation to tinyplanet view bug:7389189 Change-Id: Ib072879190bcd96c552581bf9240876b10ca362d
es/layout/filtershow_activity.xml
|
2c6ea941a80ea22317d664e329aed51f5f7417b9 |
25-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Add rotation to tinyplanet view bug:7389189 Change-Id: Ib072879190bcd96c552581bf9240876b10ca362d
es/layout/filtershow_activity.xml
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/PanelController.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterTinyPlanet.java
rc/com/android/gallery3d/filtershow/imageshow/ImageTinyPlanet.java
|
e7647cf87c7303c4f9b7a2dd57d6c70563a63655 |
25-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Add rotation to tinyplanet view bug:7389189 Change-Id: Ib072879190bcd96c552581bf9240876b10ca362d
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/PanelController.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterTinyPlanet.java
rc/com/android/gallery3d/filtershow/imageshow/ImageTinyPlanet.java
|
780883fc6efec96fbe2d1f9bd11351af1e3675e7 |
25-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 479407bd: am d5f91c6f: am 6bedee87: am 7592704e: Fixes UI stuff * commit '479407bd13f29004cf06fcae578b5a26fe152327': Fixes UI stuff
|
479407bd13f29004cf06fcae578b5a26fe152327 |
25-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am d5f91c6f: am 6bedee87: am 7592704e: Fixes UI stuff * commit 'd5f91c6f10fb3c6d0684ba70e538aee8b39ecbdd': Fixes UI stuff
|
d5f91c6f10fb3c6d0684ba70e538aee8b39ecbdd |
25-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 6bedee87: am 7592704e: Fixes UI stuff * commit '6bedee874b8be3a3d121c8cd555d0fda9d6eea98': Fixes UI stuff
|
e8df5a6da384b8c6b7dc86ea4c880d691359422b |
25-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 6bedee87: am 7592704e: Fixes UI stuff * commit '6bedee874b8be3a3d121c8cd555d0fda9d6eea98': Fixes UI stuff
|
5688dc11c8857921e4da3701a31b2f4d7316a935 |
25-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 7592704e: Fixes UI stuff * commit '7592704e662e49e4bbf3ba86a43d790774829bb0': Fixes UI stuff
|
3d1327109b6d804b5b6f4af90d9002eaf3a9b4e4 |
25-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 7592704e: Fixes UI stuff * commit '7592704e662e49e4bbf3ba86a43d790774829bb0': Fixes UI stuff
|
f526b638ceb3fc569d3348ae55c5536c383e4446 |
25-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 7592704e: Fixes UI stuff * commit '7592704e662e49e4bbf3ba86a43d790774829bb0': Fixes UI stuff
|
6bedee874b8be3a3d121c8cd555d0fda9d6eea98 |
25-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 7592704e: Fixes UI stuff * commit '7592704e662e49e4bbf3ba86a43d790774829bb0': Fixes UI stuff
|
6f5713e49da74ce0e372c67301a68c3324971c1c |
25-Oct-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
6a751a797419ff51abbd67d2af5bf3a452a099bc |
25-Oct-2012 |
Teng-Hui Zhu <ztenghui@google.com> |
am 659909e7: am 4ab02882: am 5122c99a: am ecbdca3d: Merge "Initialize the modified date correctly." into gb-ub-photos-arches * commit '659909e7db5f0cdf3de83a7cfa84e74f9af0484d': Initialize the modified date correctly.
|
659909e7db5f0cdf3de83a7cfa84e74f9af0484d |
25-Oct-2012 |
Teng-Hui Zhu <ztenghui@google.com> |
am 4ab02882: am 5122c99a: am ecbdca3d: Merge "Initialize the modified date correctly." into gb-ub-photos-arches * commit '4ab0288260c19f46a084691a55bc61943a15a7c7': Initialize the modified date correctly.
|
7592704e662e49e4bbf3ba86a43d790774829bb0 |
25-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Fixes UI stuff bug:7393871 bug:7387596 Change-Id: I833c6f713ab71c4dce896f66e191a2a1a42b3e2f
es/layout/filtershow_activity.xml
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/ui/FramedTextButton.java
|
028c39fdda797ea6cd5a507a1164c656f3c73b97 |
25-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Fixes UI stuff bug:7393871 bug:7387596 Change-Id: I833c6f713ab71c4dce896f66e191a2a1a42b3e2f
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/ui/FramedTextButton.java
|
02c02cdfbf5e075cdcc9953badbb5ee1ae4278f4 |
25-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Fixes UI stuff bug:7393871 bug:7387596 Change-Id: I833c6f713ab71c4dce896f66e191a2a1a42b3e2f
es/layout/filtershow_activity.xml
|
0a82481b7375efcbf07e677e2682be166d58a001 |
25-Oct-2012 |
Teng-Hui Zhu <ztenghui@google.com> |
am 5122c99a: am ecbdca3d: Merge "Initialize the modified date correctly." into gb-ub-photos-arches * commit '5122c99a4af38167c58e0059c4dbe947a64536bf': Initialize the modified date correctly.
|
4ab0288260c19f46a084691a55bc61943a15a7c7 |
25-Oct-2012 |
Teng-Hui Zhu <ztenghui@google.com> |
am 5122c99a: am ecbdca3d: Merge "Initialize the modified date correctly." into gb-ub-photos-arches * commit '5122c99a4af38167c58e0059c4dbe947a64536bf': Initialize the modified date correctly.
|
adb9210efb71044f72611e2bd35d7cbc8a13f51d |
25-Oct-2012 |
Teng-Hui Zhu <ztenghui@google.com> |
am ecbdca3d: Merge "Initialize the modified date correctly." into gb-ub-photos-arches * commit 'ecbdca3de8ada82d3d6f723d9ba509a3b1b1b290': Initialize the modified date correctly.
|
9edc0e216d4c6c955520ad84959088deabe5a1c9 |
25-Oct-2012 |
Teng-Hui Zhu <ztenghui@google.com> |
am ecbdca3d: Merge "Initialize the modified date correctly." into gb-ub-photos-arches * commit 'ecbdca3de8ada82d3d6f723d9ba509a3b1b1b290': Initialize the modified date correctly.
|
5122c99a4af38167c58e0059c4dbe947a64536bf |
25-Oct-2012 |
Teng-Hui Zhu <ztenghui@google.com> |
am ecbdca3d: Merge "Initialize the modified date correctly." into gb-ub-photos-arches * commit 'ecbdca3de8ada82d3d6f723d9ba509a3b1b1b290': Initialize the modified date correctly.
|
ecbdca3de8ada82d3d6f723d9ba509a3b1b1b290 |
25-Oct-2012 |
Teng-Hui Zhu <ztenghui@google.com> |
Merge "Initialize the modified date correctly." into gb-ub-photos-arches
|
fbc5472790ad2f6e142a6814d812a52b0e4e3328 |
25-Oct-2012 |
Teng-Hui Zhu <ztenghui@google.com> |
Merge "Initialize the modified date correctly." into gb-ub-photos-arches
|
31019fe1ddd8e8a14dcf66fc53274c356957aa45 |
25-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am ea9e61ca: am 774376c8: am 6cea6759: am 0a23b42e: Change background and panel colors * commit 'ea9e61cab07e7f516308c349cb3c70f5a73fdd9e': Change background and panel colors
|
ea9e61cab07e7f516308c349cb3c70f5a73fdd9e |
25-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 774376c8: am 6cea6759: am 0a23b42e: Change background and panel colors * commit '774376c814b264539d202e042f6f6d38103c427a': Change background and panel colors
|
a19301bba9c02be5c2b3d8d1460286d84022f610 |
25-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 6cea6759: am 0a23b42e: Change background and panel colors * commit '6cea6759d2919b8491aeb9105e6d1484b1b0006b': Change background and panel colors
|
774376c814b264539d202e042f6f6d38103c427a |
25-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 6cea6759: am 0a23b42e: Change background and panel colors * commit '6cea6759d2919b8491aeb9105e6d1484b1b0006b': Change background and panel colors
|
1635baddae6d4346f056c8ff67b1ff405cf1d481 |
25-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 0a23b42e: Change background and panel colors * commit '0a23b42e4a3e3a93ce7389bfb7352944f644add6': Change background and panel colors
|
929e7bcba5fbdd5648e8edc626218d490366d9fd |
25-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 0a23b42e: Change background and panel colors * commit '0a23b42e4a3e3a93ce7389bfb7352944f644add6': Change background and panel colors
|
e239adea22ed129bd7c8f7664ec31890fba62567 |
25-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 0a23b42e: Change background and panel colors * commit '0a23b42e4a3e3a93ce7389bfb7352944f644add6': Change background and panel colors
|
6cea6759d2919b8491aeb9105e6d1484b1b0006b |
25-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 0a23b42e: Change background and panel colors * commit '0a23b42e4a3e3a93ce7389bfb7352944f644add6': Change background and panel colors
|
25c86179d68ab0d16a5800123447edfaf842709d |
25-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Change background and panel colors bug:7385980 Change-Id: I67edeeda0df311203e4cedc140d42a3d9d41a7b4
es/values/filtershow_color.xml
|
0a23b42e4a3e3a93ce7389bfb7352944f644add6 |
25-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Change background and panel colors bug:7385980 Change-Id: I67edeeda0df311203e4cedc140d42a3d9d41a7b4
es/values/filtershow_color.xml
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/imageshow/ImageSmallFilter.java
|
48541c58a9ee455e14bdc1a7dd4ed8e866055fd1 |
25-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Change background and panel colors bug:7385980 Change-Id: I67edeeda0df311203e4cedc140d42a3d9d41a7b4
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/imageshow/ImageSmallFilter.java
|
89c755cbe16f5fe6f57be429a850331cc67a46d5 |
25-Oct-2012 |
Teng-Hui Zhu <ztenghui@google.com> |
Initialize the modified date correctly. On top of that, the date_taken is in units of seconds, while others are in units of milliseconds. bug:7307090 Change-Id: I3f14a6354fa72a20d228d49a92d5c2007ca29df1
rc/com/android/gallery3d/app/TrimVideo.java
rc/com/android/gallery3d/data/LocalVideo.java
|
19a8eac2eb19c02e62d0881b8b6fd9cface43b4d |
25-Oct-2012 |
Teng-Hui Zhu <ztenghui@google.com> |
Initialize the modified date correctly. On top of that, the date_taken is in units of seconds, while others are in units of milliseconds. bug:7307090 Change-Id: I3f14a6354fa72a20d228d49a92d5c2007ca29df1
rc/com/android/gallery3d/app/TrimVideo.java
rc/com/android/gallery3d/data/LocalVideo.java
|
3bb760725f0b4be3b25665d130d2ffa08bf2a25b |
24-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 15ce080e: am be78fa4e: am baffd018: am 86282c88: Merge "Fix attempted uploading of recycled tiles" into gb-ub-photos-arches * commit '15ce080e8323589f896eeebbaf94b22f931f95e5': Fix attempted uploading of recycled tiles
|
15ce080e8323589f896eeebbaf94b22f931f95e5 |
24-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am be78fa4e: am baffd018: am 86282c88: Merge "Fix attempted uploading of recycled tiles" into gb-ub-photos-arches * commit 'be78fa4e69045384be2a5bddc0a4460527bbd4c5': Fix attempted uploading of recycled tiles
|
0c627a3d4b208d36dda276747ebf276bd22f5b0f |
24-Oct-2012 |
John Reck <jreck@google.com> |
am c471b3a7: am 165e5c18: am 1376c4dc: am d49d5320: Move loadBitmap to async task * commit 'c471b3a7962aedb7e51971954e00e2d777aba9f3': Move loadBitmap to async task
|
be78fa4e69045384be2a5bddc0a4460527bbd4c5 |
24-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am baffd018: am 86282c88: Merge "Fix attempted uploading of recycled tiles" into gb-ub-photos-arches * commit 'baffd018fcd262c2cda1fa275c0d0236826be681': Fix attempted uploading of recycled tiles
|
f254567f344826e3398a645cd0c87012653d184f |
24-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am baffd018: am 86282c88: Merge "Fix attempted uploading of recycled tiles" into gb-ub-photos-arches * commit 'baffd018fcd262c2cda1fa275c0d0236826be681': Fix attempted uploading of recycled tiles
|
baffd018fcd262c2cda1fa275c0d0236826be681 |
24-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 86282c88: Merge "Fix attempted uploading of recycled tiles" into gb-ub-photos-arches * commit '86282c8860edfec0df5c28d22d52aa4b59112d55': Fix attempted uploading of recycled tiles
|
9b9d03f46cde341c7761b1e7dfd20dcbf8f8b860 |
24-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 86282c88: Merge "Fix attempted uploading of recycled tiles" into gb-ub-photos-arches * commit '86282c8860edfec0df5c28d22d52aa4b59112d55': Fix attempted uploading of recycled tiles
|
c1fe26ca45e47021508cabdad51f11c85161ec84 |
24-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 86282c88: Merge "Fix attempted uploading of recycled tiles" into gb-ub-photos-arches * commit '86282c8860edfec0df5c28d22d52aa4b59112d55': Fix attempted uploading of recycled tiles
|
c471b3a7962aedb7e51971954e00e2d777aba9f3 |
24-Oct-2012 |
John Reck <jreck@google.com> |
am 165e5c18: am 1376c4dc: am d49d5320: Move loadBitmap to async task * commit '165e5c18de94ce63027d67c509eca78c69c5e033': Move loadBitmap to async task
|
86282c8860edfec0df5c28d22d52aa4b59112d55 |
24-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Fix attempted uploading of recycled tiles" into gb-ub-photos-arches
|
68a664431ea1ffdfca53411e8c70ced00bf8dcbc |
24-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Fix attempted uploading of recycled tiles" into gb-ub-photos-arches
|
165e5c18de94ce63027d67c509eca78c69c5e033 |
24-Oct-2012 |
John Reck <jreck@google.com> |
am 1376c4dc: am d49d5320: Move loadBitmap to async task * commit '1376c4dc718548d724bc0dafdae8c9d1524118d6': Move loadBitmap to async task
|
d2173fc83d62caac54ec659a961a859dc18321b6 |
24-Oct-2012 |
John Reck <jreck@google.com> |
am 1376c4dc: am d49d5320: Move loadBitmap to async task * commit '1376c4dc718548d724bc0dafdae8c9d1524118d6': Move loadBitmap to async task
|
1376c4dc718548d724bc0dafdae8c9d1524118d6 |
24-Oct-2012 |
John Reck <jreck@google.com> |
am d49d5320: Move loadBitmap to async task * commit 'd49d53206a197b08ec4754d8751b6860e33d9f48': Move loadBitmap to async task
|
90e36d9546a4050c4fbccfae442312037b1d70a7 |
24-Oct-2012 |
John Reck <jreck@google.com> |
am d49d5320: Move loadBitmap to async task * commit 'd49d53206a197b08ec4754d8751b6860e33d9f48': Move loadBitmap to async task
|
96a1d90b0e8d05d096799675337591295ba30e6f |
24-Oct-2012 |
John Reck <jreck@google.com> |
am d49d5320: Move loadBitmap to async task * commit 'd49d53206a197b08ec4754d8751b6860e33d9f48': Move loadBitmap to async task
|
d54825d1cad2ab586b6d32853acc09dc6df5945f |
24-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Fix attempted uploading of recycled tiles Bug: 7405398 Change-Id: I17711f9c724af216aa22cee6a86d9feba84c1548
rc/com/android/gallery3d/ui/TiledTexture.java
|
eab224a54a9b8d1a87ce23036402a234518c1109 |
24-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Fix attempted uploading of recycled tiles Bug: 7405398 Change-Id: I17711f9c724af216aa22cee6a86d9feba84c1548
rc/com/android/gallery3d/ui/TiledTexture.java
|
d49d53206a197b08ec4754d8751b6860e33d9f48 |
24-Oct-2012 |
John Reck <jreck@google.com> |
Move loadBitmap to async task Bug: 7406705 Change-Id: I4e540e08d239d2e57f0ae6be5d70c8777cdbab2a
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/cache/ImageLoader.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterTinyPlanet.java
|
80a35b17989ee57b706cd18cfe8c5d928f08eeda |
24-Oct-2012 |
John Reck <jreck@google.com> |
Move loadBitmap to async task Bug: 7406705 Change-Id: I4e540e08d239d2e57f0ae6be5d70c8777cdbab2a
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/cache/ImageLoader.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterTinyPlanet.java
|
5de17aeaa02bc7cac257df98d9e3c647a4512deb |
24-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am e5c3366b: am 08b17521: am f77721af: am 5bd00332: Launch built-in camera app via filmstrip * commit 'e5c3366be16a83c07b4ed698dd0c3ac7b2f7a2d6': Launch built-in camera app via filmstrip
|
e5c3366be16a83c07b4ed698dd0c3ac7b2f7a2d6 |
24-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 08b17521: am f77721af: am 5bd00332: Launch built-in camera app via filmstrip * commit '08b1752189d4387f4eb6fb515f901cbd1188419b': Launch built-in camera app via filmstrip
|
08b1752189d4387f4eb6fb515f901cbd1188419b |
24-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am f77721af: am 5bd00332: Launch built-in camera app via filmstrip * commit 'f77721afef7b839df36f151604e014130c1971f8': Launch built-in camera app via filmstrip
|
a8227bbee10f8aabff550c4baca09247985ca775 |
24-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am f77721af: am 5bd00332: Launch built-in camera app via filmstrip * commit 'f77721afef7b839df36f151604e014130c1971f8': Launch built-in camera app via filmstrip
|
9055bd7cf62d47320dd9fc570fda2f8970e30e95 |
24-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 5bd00332: Launch built-in camera app via filmstrip * commit '5bd00332556b20c141b5c7f16433d55b1bc7fe0f': Launch built-in camera app via filmstrip
|
b23bd0b12215f3c947878c6434ca84d5a632058c |
24-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 5bd00332: Launch built-in camera app via filmstrip * commit '5bd00332556b20c141b5c7f16433d55b1bc7fe0f': Launch built-in camera app via filmstrip
|
f77721afef7b839df36f151604e014130c1971f8 |
24-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 5bd00332: Launch built-in camera app via filmstrip * commit '5bd00332556b20c141b5c7f16433d55b1bc7fe0f': Launch built-in camera app via filmstrip
|
5bd00332556b20c141b5c7f16433d55b1bc7fe0f |
24-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Launch built-in camera app via filmstrip Bug: 7407182 Change-Id: I25e0028dd5f3889f7837494e0bf25c54edbb4405
rc/com/android/gallery3d/app/PhotoPage.java
|
474cf37aca1a88f909cc272ab5f7936726c011ab |
24-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Launch built-in camera app via filmstrip Bug: 7407182 Change-Id: I25e0028dd5f3889f7837494e0bf25c54edbb4405
rc/com/android/gallery3d/app/PhotoPage.java
|
ed340b7b308bca6819e9819d062bb345229607aa |
24-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am 09499520: am 441461aa: am cc33fd6d: am eb6a24e1: Took out aspect ratio switching. * commit '09499520178ba68d7d8042a71e414b540665c746': Took out aspect ratio switching.
|
09499520178ba68d7d8042a71e414b540665c746 |
24-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am 441461aa: am cc33fd6d: am eb6a24e1: Took out aspect ratio switching. * commit '441461aa0261fa76e3c0b4872653e49405373318': Took out aspect ratio switching.
|
441461aa0261fa76e3c0b4872653e49405373318 |
24-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am cc33fd6d: am eb6a24e1: Took out aspect ratio switching. * commit 'cc33fd6dac2e58707f13ff66ee04cf3489bd50a9': Took out aspect ratio switching.
|
0b549f611c7d220355fb455dbff2c2d7f876cead |
24-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am cc33fd6d: am eb6a24e1: Took out aspect ratio switching. * commit 'cc33fd6dac2e58707f13ff66ee04cf3489bd50a9': Took out aspect ratio switching.
|
5a21d673169a86078c8ce76c4ca4d20987af0d96 |
24-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am eb6a24e1: Took out aspect ratio switching. * commit 'eb6a24e13ab8bc6f2a70bf5e8cc70f469809acb9': Took out aspect ratio switching.
|
4198aca9bb778210ca30c0defe96c03b9942b73c |
24-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am eb6a24e1: Took out aspect ratio switching. * commit 'eb6a24e13ab8bc6f2a70bf5e8cc70f469809acb9': Took out aspect ratio switching.
|
9de8eb0afe287d6d9f8326d985fd48e9eda269b5 |
24-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am eb6a24e1: Took out aspect ratio switching. * commit 'eb6a24e13ab8bc6f2a70bf5e8cc70f469809acb9': Took out aspect ratio switching.
|
cc33fd6dac2e58707f13ff66ee04cf3489bd50a9 |
24-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am eb6a24e1: Took out aspect ratio switching. * commit 'eb6a24e13ab8bc6f2a70bf5e8cc70f469809acb9': Took out aspect ratio switching.
|
b6ba4304eb958bf96f1ee3dd6a0cd9767c331dcd |
24-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am cbe293d9: am 2c87bfeb: am 2281b682: am ca05711f: Merge "Save the image when applying tiny planet" into gb-ub-photos-arches * commit 'cbe293d912b975ec7247855c713b5d932972334e': Save the image when applying tiny planet
|
2161971cef7b2f20e47815c34f79a0ea7c4b6bf4 |
24-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Took out aspect ratio switching. Bug: 7406414 Change-Id: Iba6e59d728d6f1ce81ea62b01a86dfaa355383b9
es/menu/filtershow_menu_crop.xml
es/values/filtershow_strings.xml
|
eb6a24e13ab8bc6f2a70bf5e8cc70f469809acb9 |
24-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Took out aspect ratio switching. Bug: 7406414 Change-Id: Iba6e59d728d6f1ce81ea62b01a86dfaa355383b9
es/menu/filtershow_menu_crop.xml
es/values/filtershow_strings.xml
rc/com/android/gallery3d/filtershow/PanelController.java
rc/com/android/gallery3d/filtershow/imageshow/ImageCrop.java
|
354998d14f170e278339c1a8c0639298c970440c |
24-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Took out aspect ratio switching. Bug: 7406414 Change-Id: Iba6e59d728d6f1ce81ea62b01a86dfaa355383b9
rc/com/android/gallery3d/filtershow/PanelController.java
rc/com/android/gallery3d/filtershow/imageshow/ImageCrop.java
|
cbe293d912b975ec7247855c713b5d932972334e |
24-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 2c87bfeb: am 2281b682: am ca05711f: Merge "Save the image when applying tiny planet" into gb-ub-photos-arches * commit '2c87bfebd5db07cf902b6cec52ced938cb78d92d': Save the image when applying tiny planet
|
2c87bfebd5db07cf902b6cec52ced938cb78d92d |
24-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 2281b682: am ca05711f: Merge "Save the image when applying tiny planet" into gb-ub-photos-arches * commit '2281b682c459a978391a8cbf54e8944ea4937f40': Save the image when applying tiny planet
|
fbe416ada2674df7c5488b693d88602da0d761c2 |
24-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 2281b682: am ca05711f: Merge "Save the image when applying tiny planet" into gb-ub-photos-arches * commit '2281b682c459a978391a8cbf54e8944ea4937f40': Save the image when applying tiny planet
|
a3734e4dd638cd5d4b5d00e589aabade63251621 |
24-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am ca05711f: Merge "Save the image when applying tiny planet" into gb-ub-photos-arches * commit 'ca05711f0e6f788f0e2937fef04599d612911ca6': Save the image when applying tiny planet
|
54a700e7675f085b2cbb32bfd1a2362c7213ee95 |
24-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am ca05711f: Merge "Save the image when applying tiny planet" into gb-ub-photos-arches * commit 'ca05711f0e6f788f0e2937fef04599d612911ca6': Save the image when applying tiny planet
|
2281b682c459a978391a8cbf54e8944ea4937f40 |
24-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am ca05711f: Merge "Save the image when applying tiny planet" into gb-ub-photos-arches * commit 'ca05711f0e6f788f0e2937fef04599d612911ca6': Save the image when applying tiny planet
|
ca05711f0e6f788f0e2937fef04599d612911ca6 |
24-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Merge "Save the image when applying tiny planet" into gb-ub-photos-arches
|
c50ba9db0366810bbe10e36ab61206ef51536ece |
24-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Merge "Save the image when applying tiny planet" into gb-ub-photos-arches
|
98ba1a5eb757bb358d75b2f2e5d6fc4c11d805d9 |
24-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Save the image when applying tiny planet bug:7403622 Change-Id: Ic199b163d6418b6d45c2da10b915f2088dd52e16
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/PanelController.java
|
b1eeb6ca05d1b1e59e64680b14c8d5b341e22582 |
24-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Save the image when applying tiny planet bug:7403622 Change-Id: Ic199b163d6418b6d45c2da10b915f2088dd52e16
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/PanelController.java
|
7307ba16ecbbd2ce46628311e7779b4838ad6d43 |
24-Oct-2012 |
John Hoford <hoford@google.com> |
am 3d793ef2: am d1856f7e: am 0b8c1459: am de00ad0d: Merge "limited the size of textures to 2048" into gb-ub-photos-arches * commit '3d793ef225358d359c052f3c1efb91f354d79c45': limited the size of textures to 2048
|
3d793ef225358d359c052f3c1efb91f354d79c45 |
24-Oct-2012 |
John Hoford <hoford@google.com> |
am d1856f7e: am 0b8c1459: am de00ad0d: Merge "limited the size of textures to 2048" into gb-ub-photos-arches * commit 'd1856f7ec38c8c848697f776ad977c2ef55fa331': limited the size of textures to 2048
|
d1856f7ec38c8c848697f776ad977c2ef55fa331 |
24-Oct-2012 |
John Hoford <hoford@google.com> |
am 0b8c1459: am de00ad0d: Merge "limited the size of textures to 2048" into gb-ub-photos-arches * commit '0b8c14595e65bfbd62be49af2ea631308a10d2d7': limited the size of textures to 2048
|
9da23648df344bd4bcc3d4ce8243936e5353aaf3 |
24-Oct-2012 |
John Hoford <hoford@google.com> |
am 0b8c1459: am de00ad0d: Merge "limited the size of textures to 2048" into gb-ub-photos-arches * commit '0b8c14595e65bfbd62be49af2ea631308a10d2d7': limited the size of textures to 2048
|
da37ee0736e1231ae0da1481efb9794ecde81035 |
24-Oct-2012 |
John Hoford <hoford@google.com> |
am de00ad0d: Merge "limited the size of textures to 2048" into gb-ub-photos-arches * commit 'de00ad0d02f4e328b93a1f5aa393dadf6e685033': limited the size of textures to 2048
|
3a3b1c86d514294c0ee038a1b28b18a27e3d5f0f |
24-Oct-2012 |
John Hoford <hoford@google.com> |
am de00ad0d: Merge "limited the size of textures to 2048" into gb-ub-photos-arches * commit 'de00ad0d02f4e328b93a1f5aa393dadf6e685033': limited the size of textures to 2048
|
0b8c14595e65bfbd62be49af2ea631308a10d2d7 |
24-Oct-2012 |
John Hoford <hoford@google.com> |
am de00ad0d: Merge "limited the size of textures to 2048" into gb-ub-photos-arches * commit 'de00ad0d02f4e328b93a1f5aa393dadf6e685033': limited the size of textures to 2048
|
de00ad0d02f4e328b93a1f5aa393dadf6e685033 |
24-Oct-2012 |
John Hoford <hoford@google.com> |
Merge "limited the size of textures to 2048" into gb-ub-photos-arches
|
d62540b5ce2017d7f8045a648a1f04f7017891db |
24-Oct-2012 |
John Hoford <hoford@google.com> |
Merge "limited the size of textures to 2048" into gb-ub-photos-arches
|
20ae55ef793f8a307fd0fc03a6010c36e7cbc56b |
24-Oct-2012 |
John Hoford <hoford@google.com> |
limited the size of textures to 2048 bug:7404007 Change-Id: I77fac900e213ca16c2accfa8f59d0cd300559836
rc/com/android/gallery3d/filtershow/cache/ImageLoader.java
|
e8410e06481f76a314724d010035aef729000b6a |
24-Oct-2012 |
John Hoford <hoford@google.com> |
limited the size of textures to 2048 bug:7404007 Change-Id: I77fac900e213ca16c2accfa8f59d0cd300559836
rc/com/android/gallery3d/filtershow/cache/ImageLoader.java
|
624ad6d08fc12169a1cbdd2013496de93fdb72c7 |
24-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am a0d84367: am a1d04a4a: Merge "Do not show bottom controls when undo bar is visible" into gb-ub-photos-arches * commit 'a0d8436738e4d13b4fdbbe245c126ff33e410857': Do not show bottom controls when undo bar is visible
|
5b41962e717d65f6b4db37300ca274fd62c6df91 |
24-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am b48c872e: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev * commit 'b48c872ee2f274031f5e6e7132ad9ee661458c05': Import translations. DO NOT MERGE
|
5c9c8ac303db6f29abae6b3180a1d377d71e66fa |
24-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am 5116f2fd: (-s ours) am a4e538e0: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches * commit '5116f2fd5ae9182e76231dab90a4f116f6d9bcf7': Import translations. DO NOT MERGE
|
03470f4ce6b931cdf0a388f6b5174f3f53afa9a0 |
24-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 51881e02: am f4a73264: Merge "Do not show Camera placeholder when not appropriate" into gb-ub-photos-arches * commit '51881e022f428a061188ecb33cc853d31dfb48d1': Do not show Camera placeholder when not appropriate
|
2fc6e3a55c29fe214b7c975b9ba798e14dca62b4 |
24-Oct-2012 |
Owen Lin <owenlin@google.com> |
am f3958f87: am adee31f0: Use TiledTexture for thumbnails. * commit 'f3958f87ddd1bd040ab50dea72280df95a4811f1': Use TiledTexture for thumbnails.
|
a03998c9adb9a0b53696d64c666fc7e39fa7292d |
24-Oct-2012 |
Sascha Haeberling <haeberling@google.com> |
am b682706f: am c60752b2: Use XMP meta-data for correct tiny planets. * commit 'b682706f542e7f43e189a1e608446d5440dea860': Use XMP meta-data for correct tiny planets.
|
b004a6f93a883887b73e98fd5191689f9890290e |
24-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am 1d866031: am eb75699b: Fixed scaling factor for ImageShow and rotations. * commit '1d86603133491fcc0e96eaa38b14da18161857dc': Fixed scaling factor for ImageShow and rotations.
|
f60139cee9f3db343e378547b27dfb68377a486d |
24-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am 5a093c66: am 3fb20078: Merge "Fix so mirror gets applied." into gb-ub-photos-arches * commit '5a093c66b71b00a2a70da104d94667a8080e9464': Fix so mirror gets applied.
|
c0c5c138068a8d5b0b5db2c7583f0bcf5074be71 |
24-Oct-2012 |
Nicolas Roard <nicolasroard@google.com> |
am 842257ca: am d3aebee7: Merge "Support XMP data, fixed read file on another thread" into gb-ub-photos-arches * commit '842257ca6aa393a1674d6a88674a28336c6ac63c': Support XMP data, fixed read file on another thread
|
c3d2b085294e28adf3f41e2e26b3261415ce8f85 |
24-Oct-2012 |
Doris Liu <tianliu@google.com> |
am 413c7109: am 5d3e6653: Merge "Stay in AlbumPage when dismissing a popup from AP" into gb-ub-photos-arches * commit '413c7109c24b7db173032872c5b2e4cd2347d387': Stay in AlbumPage when dismissing a popup from AP
|
d8ddd8d841da84973f451e2aca7a4f871b2861ca |
24-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am c3a48597: am f46da69a: Increased touch tolerance in cropping. * commit 'c3a485975fbcf3e1dd81016830a7fa209acb1d7d': Increased touch tolerance in cropping.
|
53fa5555b952134eed6cd548df66ca51b7aa5933 |
24-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am f39fce42: am 334c5b44: am a0d84367: am a1d04a4a: Merge "Do not show bottom controls when undo bar is visible" into gb-ub-photos-arches * commit 'f39fce4215bc97ffb70ceb9b68b0799f8f7bee7f': Do not show bottom controls when undo bar is visible
|
f39fce4215bc97ffb70ceb9b68b0799f8f7bee7f |
24-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 334c5b44: am a0d84367: am a1d04a4a: Merge "Do not show bottom controls when undo bar is visible" into gb-ub-photos-arches * commit '334c5b44f5f839c34376145bf779640ad2984c30': Do not show bottom controls when undo bar is visible
|
334c5b44f5f839c34376145bf779640ad2984c30 |
24-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am a0d84367: am a1d04a4a: Merge "Do not show bottom controls when undo bar is visible" into gb-ub-photos-arches * commit 'a0d8436738e4d13b4fdbbe245c126ff33e410857': Do not show bottom controls when undo bar is visible
|
ca4e493f06847f416043e1ec3e351d2c49a86b14 |
24-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am a1d04a4a: Merge "Do not show bottom controls when undo bar is visible" into gb-ub-photos-arches * commit 'a1d04a4aef8117fa0c98b34a931a18a7b46073e3': Do not show bottom controls when undo bar is visible
|
c338f24c8297680c49fb1f78b9299d161d6f00a5 |
24-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am a1d04a4a: Merge "Do not show bottom controls when undo bar is visible" into gb-ub-photos-arches * commit 'a1d04a4aef8117fa0c98b34a931a18a7b46073e3': Do not show bottom controls when undo bar is visible
|
a0d8436738e4d13b4fdbbe245c126ff33e410857 |
24-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am a1d04a4a: Merge "Do not show bottom controls when undo bar is visible" into gb-ub-photos-arches * commit 'a1d04a4aef8117fa0c98b34a931a18a7b46073e3': Do not show bottom controls when undo bar is visible
|
a1d04a4aef8117fa0c98b34a931a18a7b46073e3 |
24-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Do not show bottom controls when undo bar is visible" into gb-ub-photos-arches
|
3af7b11010aed10bd29803482bf6b0c07d714e44 |
24-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am e96f6de5: (-s ours) am 7278d091: am b48c872e: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev * commit 'e96f6de5bf78d0f299667b69e3a9ee90f8a05d44': Import translations. DO NOT MERGE
|
b9fd610a52827cb8a313af8e2c1ee865391eb8a0 |
24-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am f89797bf: (-s ours) am b239f1fd: am 5116f2fd: am a4e538e0: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches * commit 'f89797bffbff40687b0eadf77daa71c434a95dc1': Import translations. DO NOT MERGE
|
e96f6de5bf78d0f299667b69e3a9ee90f8a05d44 |
24-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am 7278d091: am b48c872e: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev * commit '7278d091e82ae761e2299adbb73436245db6e20a': Import translations. DO NOT MERGE
|
f89797bffbff40687b0eadf77daa71c434a95dc1 |
24-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am b239f1fd: am 5116f2fd: am a4e538e0: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches * commit 'b239f1fd7234c00f83a4f5b034a2c095f743a78a': Import translations. DO NOT MERGE
|
3ae47fa6e53686f474e7a6457894b0b102d84c6f |
24-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE"
|
7278d091e82ae761e2299adbb73436245db6e20a |
24-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am b48c872e: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev * commit 'b48c872ee2f274031f5e6e7132ad9ee661458c05': Import translations. DO NOT MERGE
|
423af0b891a5ec788f352ce25e994d72ece95fc7 |
24-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am 1341373a: (-s ours) am 24178a53: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev * commit '1341373a5d8191653a50329b07ff4181ec86ef7a': Import translations. DO NOT MERGE
|
b239f1fd7234c00f83a4f5b034a2c095f743a78a |
24-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am 5116f2fd: am a4e538e0: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches * commit '5116f2fd5ae9182e76231dab90a4f116f6d9bcf7': Import translations. DO NOT MERGE
|
b48c872ee2f274031f5e6e7132ad9ee661458c05 |
24-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
|
1341373a5d8191653a50329b07ff4181ec86ef7a |
24-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am 24178a53: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev * commit '24178a53e5f4367ed9381c2614f27d08993f96b2': Import translations. DO NOT MERGE
|
c1d4fe44ff36d8d32973797079b5034eec5f7184 |
24-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am a4e538e0: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches * commit 'a4e538e06ec0d3be8747babb1cc78ceb61fe1b10': Import translations. DO NOT MERGE
|
661970f0f379ce6757e666a38d41f31ea0a557e4 |
24-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am a4e538e0: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches * commit 'a4e538e06ec0d3be8747babb1cc78ceb61fe1b10': Import translations. DO NOT MERGE
|
5116f2fd5ae9182e76231dab90a4f116f6d9bcf7 |
24-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am a4e538e0: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches * commit 'a4e538e06ec0d3be8747babb1cc78ceb61fe1b10': Import translations. DO NOT MERGE
|
24178a53e5f4367ed9381c2614f27d08993f96b2 |
24-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
|
75039953ffd9e3bde4fe588c2ab030017cc22d82 |
24-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
|
a4e538e06ec0d3be8747babb1cc78ceb61fe1b10 |
24-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
|
64c7a8f5260875d4a5b6bdb18a0e8a2b65bca62a |
24-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 409c8179: am 7906d158: am 51881e02: am f4a73264: Merge "Do not show Camera placeholder when not appropriate" into gb-ub-photos-arches * commit '409c8179d4244f72bbc361ec43a49648e42ad8b2': Do not show Camera placeholder when not appropriate
|
409c8179d4244f72bbc361ec43a49648e42ad8b2 |
24-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 7906d158: am 51881e02: am f4a73264: Merge "Do not show Camera placeholder when not appropriate" into gb-ub-photos-arches * commit '7906d15865bc3dc4efd27a47ab836c309aa87060': Do not show Camera placeholder when not appropriate
|
30cea9fd7d02cffe4a15c58a61fa823fee29db42 |
24-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Do not show bottom controls when undo bar is visible Bug: 7403458 Change-Id: I1e789ebd7f08256a1ccbdb2ac9f2f9f97d0859c6
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/ui/PhotoView.java
|
949584340c9f5f41a6133ba06058af280490f0c8 |
24-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Do not show bottom controls when undo bar is visible Bug: 7403458 Change-Id: I1e789ebd7f08256a1ccbdb2ac9f2f9f97d0859c6
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/ui/PhotoView.java
|
7906d15865bc3dc4efd27a47ab836c309aa87060 |
24-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 51881e02: am f4a73264: Merge "Do not show Camera placeholder when not appropriate" into gb-ub-photos-arches * commit '51881e022f428a061188ecb33cc853d31dfb48d1': Do not show Camera placeholder when not appropriate
|
62a9ededa00a4d7e88684e2995e7a3d2564b6cdd |
24-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am f4a73264: Merge "Do not show Camera placeholder when not appropriate" into gb-ub-photos-arches * commit 'f4a732646e9a4bf6f1f02b4eac0147adca4287c9': Do not show Camera placeholder when not appropriate
|
274c59993a9517b644a7c217c6f3bdc31fba91e6 |
24-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am f4a73264: Merge "Do not show Camera placeholder when not appropriate" into gb-ub-photos-arches * commit 'f4a732646e9a4bf6f1f02b4eac0147adca4287c9': Do not show Camera placeholder when not appropriate
|
51881e022f428a061188ecb33cc853d31dfb48d1 |
24-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am f4a73264: Merge "Do not show Camera placeholder when not appropriate" into gb-ub-photos-arches * commit 'f4a732646e9a4bf6f1f02b4eac0147adca4287c9': Do not show Camera placeholder when not appropriate
|
f4a732646e9a4bf6f1f02b4eac0147adca4287c9 |
24-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Do not show Camera placeholder when not appropriate" into gb-ub-photos-arches
|
b89ad7cf365087de7ca11166bcfbfecbe4584b98 |
24-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Do not show Camera placeholder when not appropriate" into gb-ub-photos-arches
|
5732a9c7157fa32a80048752b5767bb407f2faa0 |
24-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I193291f503c56dc4b4ec348486565009aa94b05a Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-bg/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-el/strings.xml
es/values-es-rUS/strings.xml
es/values-fa/strings.xml
es/values-fr/strings.xml
es/values-ja/strings.xml
es/values-lt/strings.xml
es/values-nb/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sr/strings.xml
es/values-tr/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
|
e1036a509ec62c1d9146ca72e3a39313d0310a2d |
24-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ie1036d0f81dccdc5eaaaa7d48ff8f84d8fb56d4c Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-bg/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-el/strings.xml
es/values-es-rUS/strings.xml
es/values-fa/strings.xml
es/values-fr/strings.xml
es/values-ja/strings.xml
es/values-lt/strings.xml
es/values-nb/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sr/strings.xml
es/values-tr/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
|
924589acd3841fd408dcd36c4e1fb4ce1a686703 |
24-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Iea10dde43aa1a898cd822284d4256f3dfc80a3a4 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-bg/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-el/strings.xml
es/values-es-rUS/strings.xml
es/values-fa/strings.xml
es/values-fr/strings.xml
es/values-ja/strings.xml
es/values-lt/strings.xml
es/values-nb/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sr/strings.xml
es/values-tr/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
|
f77c9acf7156a5249da4104ee7389f3df31a08f3 |
24-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: If16bf19a100874f92d9e532c2551efbe7c837078 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-bg/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-el/strings.xml
es/values-es-rUS/strings.xml
es/values-fa/strings.xml
es/values-fr/strings.xml
es/values-ja/strings.xml
es/values-lt/strings.xml
es/values-nb/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sr/strings.xml
es/values-tr/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
|
b09849a85b000fa1c9b7f333e2fb1f47b3496481 |
24-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I0160ad253cb63f8e5076d69bb13a90f1137d4d49 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-bg/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-el/strings.xml
es/values-es-rUS/strings.xml
es/values-fa/strings.xml
es/values-fr/strings.xml
es/values-ja/strings.xml
es/values-lt/strings.xml
es/values-nb/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sr/strings.xml
es/values-tr/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
|
d9f754ad70905e422a513957bf56f204c81055de |
24-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I0160ad253cb63f8e5076d69bb13a90f1137d4d49 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-bg/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-el/strings.xml
es/values-es-rUS/strings.xml
es/values-fa/strings.xml
es/values-fr/strings.xml
es/values-ja/strings.xml
es/values-lt/strings.xml
es/values-nb/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sr/strings.xml
es/values-tr/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
|
98d0976d1ea3cf1cdf3f93f694fb64aa9211423c |
24-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I3411341031dc267cb2ee4ccc665e5598504d69c4 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-bg/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-el/strings.xml
es/values-es-rUS/strings.xml
es/values-fa/strings.xml
es/values-fr/strings.xml
es/values-ja/strings.xml
es/values-lt/strings.xml
es/values-nb/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sr/strings.xml
es/values-tr/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
|
a141bf775447da98d41b87cb0bf39f9812cc5ca4 |
24-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I3411341031dc267cb2ee4ccc665e5598504d69c4 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-bg/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-el/strings.xml
es/values-es-rUS/strings.xml
es/values-fa/strings.xml
es/values-fr/strings.xml
es/values-ja/strings.xml
es/values-lt/strings.xml
es/values-nb/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sr/strings.xml
es/values-tr/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
|
213e9a21417508d66312e7ad4d2cd19ad70ad754 |
24-Oct-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
345132fc77a39832ff95d2307c3a890b3c0d26b3 |
24-Oct-2012 |
Owen Lin <owenlin@google.com> |
am f0b8439c: am 9bd558b2: am f3958f87: am adee31f0: Use TiledTexture for thumbnails. * commit 'f0b8439c459c34e344e17a8aa4d915cfb5f6bfe0': Use TiledTexture for thumbnails.
|
f0b8439c459c34e344e17a8aa4d915cfb5f6bfe0 |
24-Oct-2012 |
Owen Lin <owenlin@google.com> |
am 9bd558b2: am f3958f87: am adee31f0: Use TiledTexture for thumbnails. * commit '9bd558b251e5aa7cc74499d85f37a6b2224b3777': Use TiledTexture for thumbnails.
|
9bd558b251e5aa7cc74499d85f37a6b2224b3777 |
24-Oct-2012 |
Owen Lin <owenlin@google.com> |
am f3958f87: am adee31f0: Use TiledTexture for thumbnails. * commit 'f3958f87ddd1bd040ab50dea72280df95a4811f1': Use TiledTexture for thumbnails.
|
f3958f87ddd1bd040ab50dea72280df95a4811f1 |
24-Oct-2012 |
Owen Lin <owenlin@google.com> |
am adee31f0: Use TiledTexture for thumbnails. * commit 'adee31f028d839e7baa8f9e052dc4e4d60b137da': Use TiledTexture for thumbnails.
|
c4cca98acc3fd4a78cd33ffe68135ab5f7e963eb |
24-Oct-2012 |
Owen Lin <owenlin@google.com> |
am adee31f0: Use TiledTexture for thumbnails. * commit 'adee31f028d839e7baa8f9e052dc4e4d60b137da': Use TiledTexture for thumbnails.
|
72de98f14f6e605268d0f06c896780b1682ce8ae |
24-Oct-2012 |
Owen Lin <owenlin@google.com> |
am adee31f0: Use TiledTexture for thumbnails. * commit 'adee31f028d839e7baa8f9e052dc4e4d60b137da': Use TiledTexture for thumbnails.
|
e8400e13e551862459328609afd2b170acb3381e |
24-Oct-2012 |
Hung-ying Tyan <tyanh@google.com> |
Merge "Use List to store duplicated exif tag" into gb-ub-photos-bryce
|
5eb52318bad531fd1441a6728210093922868e64 |
24-Oct-2012 |
Hung-ying Tyan <tyanh@google.com> |
Merge "Use List to store duplicated exif tag" into gb-ub-photos-bryce
|
080eca835fe6271dcd13c9470867274a04285a54 |
24-Oct-2012 |
Hung-ying Tyan <tyanh@google.com> |
Merge "Use NO_VALUE in ground truth of exif test when no valid value from exiftool" into gb-ub-photos-bryce
|
5aa83a4d70128a274d6e0e2f169d0fe16e9cb3fb |
24-Oct-2012 |
Hung-ying Tyan <tyanh@google.com> |
Merge "Use NO_VALUE in ground truth of exif test when no valid value from exiftool" into gb-ub-photos-bryce
|
1d821eac6cc202838d9f337ece0fe1168f13bf9e |
24-Oct-2012 |
Hung-ying Tyan <tyanh@google.com> |
Merge "Change the print format TYPE_BYTE of exifTag" into gb-ub-photos-bryce
|
b09266d1d9aafab90ff57869842bb9c76e98b479 |
24-Oct-2012 |
Hung-ying Tyan <tyanh@google.com> |
Merge "Change the print format TYPE_BYTE of exifTag" into gb-ub-photos-bryce
|
98b7f7e1242306bda2f7ecafefee0b434693610e |
24-Oct-2012 |
Hung-ying Tyan <tyanh@google.com> |
Merge "Use 'US-ASCII' as the default charset for ExifParser" into gb-ub-photos-bryce
|
b2dfb0da93bf069ecb450cc95611d55f6d7a2f86 |
24-Oct-2012 |
Hung-ying Tyan <tyanh@google.com> |
Merge "Use 'US-ASCII' as the default charset for ExifParser" into gb-ub-photos-bryce
|
adee31f028d839e7baa8f9e052dc4e4d60b137da |
22-Oct-2012 |
Owen Lin <owenlin@google.com> |
Use TiledTexture for thumbnails. 1. Use TiledTexture for thumbnails to prevent jank in uploading big thumbnails. (e.g., 512 * 512) 2. Use larger thumbnails (DISPLAY_LONG_SIDE / 5). bug: 7381302 Change-Id: I7661d648373e893b40b2a0304037171760091e00
rc/com/android/gallery3d/data/ImageCacheService.java
rc/com/android/gallery3d/ui/AlbumSetSlidingWindow.java
rc/com/android/gallery3d/ui/AlbumSetSlotRenderer.java
rc/com/android/gallery3d/ui/AlbumSlidingWindow.java
rc/com/android/gallery3d/ui/AlbumSlotRenderer.java
rc/com/android/gallery3d/ui/FadeInTexture.java
rc/com/android/gallery3d/ui/FadeOutTexture.java
rc/com/android/gallery3d/ui/FadeTexture.java
rc/com/android/gallery3d/ui/TiledTexture.java
rc/com/android/gallery3d/util/GalleryUtils.java
|
26e7a71df39c4b6923c0d36e32cc7ae0ebd72a05 |
22-Oct-2012 |
Owen Lin <owenlin@google.com> |
Use TiledTexture for thumbnails. 1. Use TiledTexture for thumbnails to prevent jank in uploading big thumbnails. (e.g., 512 * 512) 2. Use larger thumbnails (DISPLAY_LONG_SIDE / 5). bug: 7381302 Change-Id: I7661d648373e893b40b2a0304037171760091e00
rc/com/android/gallery3d/data/ImageCacheService.java
rc/com/android/gallery3d/ui/AlbumSetSlidingWindow.java
rc/com/android/gallery3d/ui/AlbumSetSlotRenderer.java
rc/com/android/gallery3d/ui/AlbumSlidingWindow.java
rc/com/android/gallery3d/ui/AlbumSlotRenderer.java
rc/com/android/gallery3d/ui/FadeInTexture.java
rc/com/android/gallery3d/ui/FadeOutTexture.java
rc/com/android/gallery3d/ui/FadeTexture.java
rc/com/android/gallery3d/ui/TiledTexture.java
rc/com/android/gallery3d/util/GalleryUtils.java
|
c2a8d0aa95ae45f451d7a442bd5b09fa8a8b497f |
24-Oct-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
334626092406be4f815d4aabb407b948782c4371 |
24-Oct-2012 |
Sascha Haeberling <haeberling@google.com> |
am fefca4dd: am cb23133b: am b682706f: am c60752b2: Use XMP meta-data for correct tiny planets. * commit 'fefca4dd880ab49ac9b66a1c4ea038ff4c24d508': Use XMP meta-data for correct tiny planets.
|
fefca4dd880ab49ac9b66a1c4ea038ff4c24d508 |
24-Oct-2012 |
Sascha Haeberling <haeberling@google.com> |
am cb23133b: am b682706f: am c60752b2: Use XMP meta-data for correct tiny planets. * commit 'cb23133b0cf7a6786c3f4f29497e61f31b56bd07': Use XMP meta-data for correct tiny planets.
|
cb23133b0cf7a6786c3f4f29497e61f31b56bd07 |
24-Oct-2012 |
Sascha Haeberling <haeberling@google.com> |
am b682706f: am c60752b2: Use XMP meta-data for correct tiny planets. * commit 'b682706f542e7f43e189a1e608446d5440dea860': Use XMP meta-data for correct tiny planets.
|
b682706f542e7f43e189a1e608446d5440dea860 |
24-Oct-2012 |
Sascha Haeberling <haeberling@google.com> |
am c60752b2: Use XMP meta-data for correct tiny planets. * commit 'c60752b28bcdc859b24040f77883568e0838ed74': Use XMP meta-data for correct tiny planets.
|
05ccf827baa98104286ac6c5dfa30d66dd7c47ce |
24-Oct-2012 |
Sascha Haeberling <haeberling@google.com> |
am c60752b2: Use XMP meta-data for correct tiny planets. * commit 'c60752b28bcdc859b24040f77883568e0838ed74': Use XMP meta-data for correct tiny planets.
|
b5f7fa0b6c897ba2b64c42136b2eacf42ad6ea50 |
24-Oct-2012 |
Sascha Haeberling <haeberling@google.com> |
am c60752b2: Use XMP meta-data for correct tiny planets. * commit 'c60752b28bcdc859b24040f77883568e0838ed74': Use XMP meta-data for correct tiny planets.
|
c60752b28bcdc859b24040f77883568e0838ed74 |
24-Oct-2012 |
Sascha Haeberling <haeberling@google.com> |
Use XMP meta-data for correct tiny planets. Bug: 7403766 Change-Id: Ie03d40d0396d352d6fe48c91b995a2f872c98a06
rc/com/android/gallery3d/filtershow/cache/ImageLoader.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterTinyPlanet.java
|
bbd30e0aab09feba5d3e038433895561ab255640 |
24-Oct-2012 |
Sascha Haeberling <haeberling@google.com> |
Use XMP meta-data for correct tiny planets. Bug: 7403766 Change-Id: Ie03d40d0396d352d6fe48c91b995a2f872c98a06
rc/com/android/gallery3d/filtershow/cache/ImageLoader.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterTinyPlanet.java
|
06760a6b0a39a2010e396a10e202baf8952438eb |
24-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am d3423161: am 56bfe91b: am 1d866031: am eb75699b: Fixed scaling factor for ImageShow and rotations. * commit 'd3423161a667dc8136d227d767dfabac0d949a21': Fixed scaling factor for ImageShow and rotations.
|
d3423161a667dc8136d227d767dfabac0d949a21 |
24-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am 56bfe91b: am 1d866031: am eb75699b: Fixed scaling factor for ImageShow and rotations. * commit '56bfe91b8a27aaddf0145331ececf0b4e45dccae': Fixed scaling factor for ImageShow and rotations.
|
56bfe91b8a27aaddf0145331ececf0b4e45dccae |
24-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am 1d866031: am eb75699b: Fixed scaling factor for ImageShow and rotations. * commit '1d86603133491fcc0e96eaa38b14da18161857dc': Fixed scaling factor for ImageShow and rotations.
|
4dc72990c9c03f4046ea3936177f1a4b57dc50b1 |
24-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am eb75699b: Fixed scaling factor for ImageShow and rotations. * commit 'eb75699bcd5762a9ffd7ee0d4d14a4e5eb2e2389': Fixed scaling factor for ImageShow and rotations.
|
cf01ceb3d244a09f48e88d8cbb8c824ef3e89111 |
24-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am eb75699b: Fixed scaling factor for ImageShow and rotations. * commit 'eb75699bcd5762a9ffd7ee0d4d14a4e5eb2e2389': Fixed scaling factor for ImageShow and rotations.
|
1d86603133491fcc0e96eaa38b14da18161857dc |
24-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am eb75699b: Fixed scaling factor for ImageShow and rotations. * commit 'eb75699bcd5762a9ffd7ee0d4d14a4e5eb2e2389': Fixed scaling factor for ImageShow and rotations.
|
784047bf10c3ad72bf15c921672e547ffcf71c77 |
24-Oct-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
eb75699bcd5762a9ffd7ee0d4d14a4e5eb2e2389 |
24-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Fixed scaling factor for ImageShow and rotations. Bug: 7392240 Bug: 7386048 Change-Id: I156c52acbd041604df2f7ccacca3a80f1b9fdb3b
rc/com/android/gallery3d/filtershow/imageshow/GeometryMath.java
rc/com/android/gallery3d/filtershow/imageshow/GeometryMetadata.java
rc/com/android/gallery3d/filtershow/imageshow/ImageGeometry.java
rc/com/android/gallery3d/filtershow/imageshow/ImageShow.java
|
026dabdcb13bd0095a970af8e1a05741f801db50 |
24-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Fixed scaling factor for ImageShow and rotations. Bug: 7392240 Bug: 7386048 Change-Id: I156c52acbd041604df2f7ccacca3a80f1b9fdb3b
rc/com/android/gallery3d/filtershow/imageshow/GeometryMath.java
rc/com/android/gallery3d/filtershow/imageshow/GeometryMetadata.java
rc/com/android/gallery3d/filtershow/imageshow/ImageGeometry.java
rc/com/android/gallery3d/filtershow/imageshow/ImageShow.java
|
3ad7bbc55d7aaa0f36a7242fdd0f612d877adc19 |
24-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Do not show Camera placeholder when not appropriate Bug: 7403454 Change-Id: I5cc0227f068da0ca596e6259314b9d2ade62de07
rc/com/android/gallery3d/app/PhotoPage.java
|
5a3f6e371d4efc5ca4f2ec80f21d787bbb14efc9 |
24-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Do not show Camera placeholder when not appropriate Bug: 7403454 Change-Id: I5cc0227f068da0ca596e6259314b9d2ade62de07
rc/com/android/gallery3d/app/PhotoPage.java
|
7e92ec75da5e2eb06e659e2226f64749b80ea3d9 |
18-Oct-2012 |
Earl Ou <shunhsingou@google.com> |
Handle invalid offset size in ExifParser Change-Id: I9036f8ea9d7a956a74f4d0cd15ef210dbd9f1de3
allerycommon/src/com/android/gallery3d/exif/ExifParser.java
|
8c90c11b41e1450f86f8ed4b91a2a49f618a76c6 |
18-Oct-2012 |
Earl Ou <shunhsingou@google.com> |
Handle invalid offset size in ExifParser Change-Id: I9036f8ea9d7a956a74f4d0cd15ef210dbd9f1de3
allerycommon/src/com/android/gallery3d/exif/ExifParser.java
|
c83dab412a3babdc6012c95fe1f335cdf3102d7e |
18-Oct-2012 |
Earl Ou <shunhsingou@google.com> |
Handle invalid offset size in ExifParser Change-Id: I9036f8ea9d7a956a74f4d0cd15ef210dbd9f1de3
allerycommon/src/com/android/gallery3d/exif/ExifParser.java
|
943fd56e7476569272b2916e476eafdc5e12f678 |
18-Oct-2012 |
Earl Ou <shunhsingou@google.com> |
Use NO_VALUE in ground truth of exif test when no valid value from exiftool Change-Id: Ia33edf0aba8562eb2dbd61b5753657f245bf7310
ests/res/xml/galaxy_nexus.xml
|
9cf0bba7e618f9a4831c3b02e255997191a50b5d |
18-Oct-2012 |
Earl Ou <shunhsingou@google.com> |
Use List to store duplicated exif tag Use List so the number of tags can be calculated. Change-Id: I5dfb085fccadab4f0febf2944b64d4dfe9ecbd63
ests/src/com/android/gallery3d/exif/ExifParserTest.java
ests/src/com/android/gallery3d/exif/ExifReaderTest.java
ests/src/com/android/gallery3d/exif/ExifXmlReader.java
|
08b5e19052a9e5ee7c53ebf5911f86ffbe8f1f4c |
18-Oct-2012 |
Earl Ou <shunhsingou@google.com> |
Use List to store duplicated exif tag Use List so the number of tags can be calculated. Change-Id: I5dfb085fccadab4f0febf2944b64d4dfe9ecbd63
ests/src/com/android/gallery3d/exif/ExifParserTest.java
ests/src/com/android/gallery3d/exif/ExifReaderTest.java
ests/src/com/android/gallery3d/exif/ExifXmlReader.java
|
120cdf4530bb3dc61643ab700caeefd4f9190793 |
18-Oct-2012 |
Earl Ou <shunhsingou@google.com> |
Use NO_VALUE in ground truth of exif test when no valid value from exiftool Change-Id: Ia33edf0aba8562eb2dbd61b5753657f245bf7310
ests/src/com/android/gallery3d/exif/ExifParserTest.java
ests/src/com/android/gallery3d/exif/ExifReaderTest.java
ests/src/com/android/gallery3d/exif/ExifXmlReader.java
|
b44cda6719c265fc9108090efe2b4f7b302c7874 |
18-Oct-2012 |
Earl Ou <shunhsingou@google.com> |
Use NO_VALUE in ground truth of exif test when no valid value from exiftool Change-Id: Ia33edf0aba8562eb2dbd61b5753657f245bf7310
ests/res/xml/galaxy_nexus.xml
ests/src/com/android/gallery3d/exif/ExifParserTest.java
ests/src/com/android/gallery3d/exif/ExifReaderTest.java
ests/src/com/android/gallery3d/exif/ExifXmlReader.java
|
8a7732ae1850c69ba4225836df07aae3823818dd |
18-Oct-2012 |
Earl Ou <shunhsingou@google.com> |
Change the print format TYPE_BYTE of exifTag Change-Id: I812832bc4007c1bbdac509b7a94ae27f9ad83300
allerycommon/src/com/android/gallery3d/exif/ExifTag.java
|
57411aee27f198fcb3cd0d87f3dc01be1bf9096e |
18-Oct-2012 |
Earl Ou <shunhsingou@google.com> |
Change the print format TYPE_BYTE of exifTag Change-Id: I812832bc4007c1bbdac509b7a94ae27f9ad83300
allerycommon/src/com/android/gallery3d/exif/ExifTag.java
|
d260c45b728462f5d3f1b6a4489a767022f39a9e |
18-Oct-2012 |
Earl Ou <shunhsingou@google.com> |
Use 'US-ASCII' as the default charset for ExifParser Change-Id: I775c84e601f8d33010080b189efd8c2de00d6959
allerycommon/src/com/android/gallery3d/exif/ExifParser.java
|
c92c10c66883869f99bfe599e9b52f4d0b6e1e50 |
18-Oct-2012 |
Earl Ou <shunhsingou@google.com> |
Use 'US-ASCII' as the default charset for ExifParser Change-Id: I775c84e601f8d33010080b189efd8c2de00d6959
allerycommon/src/com/android/gallery3d/exif/ExifParser.java
|
4aed764cce8fe7a7d8a22895d23c1ffe6e5b3357 |
18-Oct-2012 |
Earl Ou <shunhsingou@google.com> |
Change the print format TYPE_BYTE of exifTag Change-Id: I812832bc4007c1bbdac509b7a94ae27f9ad83300
allerycommon/src/com/android/gallery3d/exif/ExifTag.java
|
c3b7cd2aea4c91d986a31cfb31d2f2d9dcb87eba |
18-Oct-2012 |
Earl Ou <shunhsingou@google.com> |
Use 'US-ASCII' as the default charset for ExifParser Change-Id: I775c84e601f8d33010080b189efd8c2de00d6959
allerycommon/src/com/android/gallery3d/exif/ExifParser.java
|
254dc38190493aba3feb9359bf5e5987d40d4a67 |
24-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am c11c7be8: am e1af9618: am 5a093c66: am 3fb20078: Merge "Fix so mirror gets applied." into gb-ub-photos-arches * commit 'c11c7be83c77c5b5e5c8e805f64f97b71823ec99': Fix so mirror gets applied.
|
25abce79119f64d74cf8b59a3d9f02f625b68c06 |
24-Oct-2012 |
Nicolas Roard <nicolasroard@google.com> |
am ed1ff87f: am c0fa9bf7: am 842257ca: am d3aebee7: Merge "Support XMP data, fixed read file on another thread" into gb-ub-photos-arches * commit 'ed1ff87f277f117fb1d015b184f33de945ba4e3c': Support XMP data, fixed read file on another thread
|
c11c7be83c77c5b5e5c8e805f64f97b71823ec99 |
24-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am e1af9618: am 5a093c66: am 3fb20078: Merge "Fix so mirror gets applied." into gb-ub-photos-arches * commit 'e1af9618395d1622de60c63997293cddbf5cc977': Fix so mirror gets applied.
|
ed1ff87f277f117fb1d015b184f33de945ba4e3c |
24-Oct-2012 |
Nicolas Roard <nicolasroard@google.com> |
am c0fa9bf7: am 842257ca: am d3aebee7: Merge "Support XMP data, fixed read file on another thread" into gb-ub-photos-arches * commit 'c0fa9bf7a292a3e530255f7db9196e1a719026b2': Support XMP data, fixed read file on another thread
|
e1af9618395d1622de60c63997293cddbf5cc977 |
24-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am 5a093c66: am 3fb20078: Merge "Fix so mirror gets applied." into gb-ub-photos-arches * commit '5a093c66b71b00a2a70da104d94667a8080e9464': Fix so mirror gets applied.
|
c0fa9bf7a292a3e530255f7db9196e1a719026b2 |
24-Oct-2012 |
Nicolas Roard <nicolasroard@google.com> |
am 842257ca: am d3aebee7: Merge "Support XMP data, fixed read file on another thread" into gb-ub-photos-arches * commit '842257ca6aa393a1674d6a88674a28336c6ac63c': Support XMP data, fixed read file on another thread
|
c83287e4524fa1c9d562e5aab48d57b3a198d52d |
24-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am 3fb20078: Merge "Fix so mirror gets applied." into gb-ub-photos-arches * commit '3fb2007892a436f704dc168c0549a6c8ee201e4a': Fix so mirror gets applied.
|
c7985127b9fd8cada98ea75cb5d3897493dc07a7 |
24-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am 3fb20078: Merge "Fix so mirror gets applied." into gb-ub-photos-arches * commit '3fb2007892a436f704dc168c0549a6c8ee201e4a': Fix so mirror gets applied.
|
8c1c1fca54b3949c945f66980426b21f6173a155 |
24-Oct-2012 |
Nicolas Roard <nicolasroard@google.com> |
am d3aebee7: Merge "Support XMP data, fixed read file on another thread" into gb-ub-photos-arches * commit 'd3aebee7b35ff969fce3607a5c051d607ca42ec7': Support XMP data, fixed read file on another thread
|
67682f3abd74a38692b2718603c27528b8db5329 |
24-Oct-2012 |
Nicolas Roard <nicolasroard@google.com> |
am d3aebee7: Merge "Support XMP data, fixed read file on another thread" into gb-ub-photos-arches * commit 'd3aebee7b35ff969fce3607a5c051d607ca42ec7': Support XMP data, fixed read file on another thread
|
5a093c66b71b00a2a70da104d94667a8080e9464 |
24-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am 3fb20078: Merge "Fix so mirror gets applied." into gb-ub-photos-arches * commit '3fb2007892a436f704dc168c0549a6c8ee201e4a': Fix so mirror gets applied.
|
842257ca6aa393a1674d6a88674a28336c6ac63c |
24-Oct-2012 |
Nicolas Roard <nicolasroard@google.com> |
am d3aebee7: Merge "Support XMP data, fixed read file on another thread" into gb-ub-photos-arches * commit 'd3aebee7b35ff969fce3607a5c051d607ca42ec7': Support XMP data, fixed read file on another thread
|
3fb2007892a436f704dc168c0549a6c8ee201e4a |
24-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Fix so mirror gets applied." into gb-ub-photos-arches
|
57cc382afb777db41002619da6f4762f4251bb59 |
24-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Fix so mirror gets applied." into gb-ub-photos-arches
|
63bf92dd121514abdaca9f8cac106bcbcfeb010d |
24-Oct-2012 |
Nicolas Roard <nicolasroard@google.com> |
Merge "Support XMP data, fixed read file on another thread" into gb-ub-photos-arches
|
d3aebee7b35ff969fce3607a5c051d607ca42ec7 |
24-Oct-2012 |
Nicolas Roard <nicolasroard@google.com> |
Merge "Support XMP data, fixed read file on another thread" into gb-ub-photos-arches
|
75bfc6824f213d9fe65abb74bd17b31c9b63cc9d |
24-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Fix so mirror gets applied. Bug: 7402773 Change-Id: I531b795c2f43379e9eaf1ad3b9292e62c867ec3c
rc/com/android/gallery3d/filtershow/imageshow/GeometryMetadata.java
|
fa4bb6de2db465a2ceb4deab0ebf60060f06ab36 |
24-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Fix so mirror gets applied. Bug: 7402773 Change-Id: I531b795c2f43379e9eaf1ad3b9292e62c867ec3c
rc/com/android/gallery3d/filtershow/imageshow/GeometryMetadata.java
|
7d2f130be58535ff9a3e78cc79cb96e016e80a82 |
24-Oct-2012 |
Doris Liu <tianliu@google.com> |
am d14af197: am 9e7f06db: am 413c7109: am 5d3e6653: Merge "Stay in AlbumPage when dismissing a popup from AP" into gb-ub-photos-arches * commit 'd14af19728ca279ff536af584b33057361041bd6': Stay in AlbumPage when dismissing a popup from AP
|
d14af19728ca279ff536af584b33057361041bd6 |
24-Oct-2012 |
Doris Liu <tianliu@google.com> |
am 9e7f06db: am 413c7109: am 5d3e6653: Merge "Stay in AlbumPage when dismissing a popup from AP" into gb-ub-photos-arches * commit '9e7f06dbd7fd91bdb6f664c0254994aaceac3f69': Stay in AlbumPage when dismissing a popup from AP
|
9e7f06dbd7fd91bdb6f664c0254994aaceac3f69 |
24-Oct-2012 |
Doris Liu <tianliu@google.com> |
am 413c7109: am 5d3e6653: Merge "Stay in AlbumPage when dismissing a popup from AP" into gb-ub-photos-arches * commit '413c7109c24b7db173032872c5b2e4cd2347d387': Stay in AlbumPage when dismissing a popup from AP
|
413c7109c24b7db173032872c5b2e4cd2347d387 |
24-Oct-2012 |
Doris Liu <tianliu@google.com> |
am 5d3e6653: Merge "Stay in AlbumPage when dismissing a popup from AP" into gb-ub-photos-arches * commit '5d3e665359272f8b7b379461ede24918d6b4537e': Stay in AlbumPage when dismissing a popup from AP
|
ebef2f0ad3d49849040f2c23ff9e69753791258e |
24-Oct-2012 |
Doris Liu <tianliu@google.com> |
am 5d3e6653: Merge "Stay in AlbumPage when dismissing a popup from AP" into gb-ub-photos-arches * commit '5d3e665359272f8b7b379461ede24918d6b4537e': Stay in AlbumPage when dismissing a popup from AP
|
0bb8d008a22ba31f771446650f18cf24707ed9b6 |
24-Oct-2012 |
Doris Liu <tianliu@google.com> |
am 5d3e6653: Merge "Stay in AlbumPage when dismissing a popup from AP" into gb-ub-photos-arches * commit '5d3e665359272f8b7b379461ede24918d6b4537e': Stay in AlbumPage when dismissing a popup from AP
|
5d3e665359272f8b7b379461ede24918d6b4537e |
24-Oct-2012 |
Doris Liu <tianliu@google.com> |
Merge "Stay in AlbumPage when dismissing a popup from AP" into gb-ub-photos-arches
|
3e23efc9cd3db42561f6b241c79c6d80aae53507 |
24-Oct-2012 |
Doris Liu <tianliu@google.com> |
Merge "Stay in AlbumPage when dismissing a popup from AP" into gb-ub-photos-arches
|
bc219f73dd60001c5ad035fab917cb5e2243093d |
24-Oct-2012 |
John Hoford <hoford@google.com> |
Support XMP data, fixed read file on another thread bug:7293391 Change-Id: I634857dea3c4d0d204c3fb40f0eec9dc1a9af263
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/cache/ImageLoader.java
|
3d4f2c7443f6f6015efab769bfaad19263137c67 |
24-Oct-2012 |
John Hoford <hoford@google.com> |
Support XMP data, fixed read file on another thread bug:7293391 Change-Id: I634857dea3c4d0d204c3fb40f0eec9dc1a9af263
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/cache/ImageLoader.java
|
25510b2c239585a6f0cf6755f422aa875385f5d4 |
24-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am 4cc5e76d: am 431a58ec: am c3a48597: am f46da69a: Increased touch tolerance in cropping. * commit '4cc5e76d363bad3a8b17304a944e49308a52b378': Increased touch tolerance in cropping.
|
4cc5e76d363bad3a8b17304a944e49308a52b378 |
24-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am 431a58ec: am c3a48597: am f46da69a: Increased touch tolerance in cropping. * commit '431a58ec1aaaa96504f9f2677c745f08029333cf': Increased touch tolerance in cropping.
|
431a58ec1aaaa96504f9f2677c745f08029333cf |
24-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am c3a48597: am f46da69a: Increased touch tolerance in cropping. * commit 'c3a485975fbcf3e1dd81016830a7fa209acb1d7d': Increased touch tolerance in cropping.
|
0763e4e0cc7d5495b703e813f21c7e6982a9ed9e |
24-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am f46da69a: Increased touch tolerance in cropping. * commit 'f46da69aefd9afe0b4326a2fcea8e33c294136bb': Increased touch tolerance in cropping.
|
250441d46620484d6d3432c98dc816b2225340e6 |
24-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am f46da69a: Increased touch tolerance in cropping. * commit 'f46da69aefd9afe0b4326a2fcea8e33c294136bb': Increased touch tolerance in cropping.
|
c3a485975fbcf3e1dd81016830a7fa209acb1d7d |
24-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am f46da69a: Increased touch tolerance in cropping. * commit 'f46da69aefd9afe0b4326a2fcea8e33c294136bb': Increased touch tolerance in cropping.
|
f46da69aefd9afe0b4326a2fcea8e33c294136bb |
23-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Increased touch tolerance in cropping. Bug: 7342281 Change-Id: Ice2ba5f07074b1518e4064bbda489aae7ba17b22
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/imageshow/ImageCrop.java
|
ba18d1eceecddfe16e938c77878a56cf0dbadced |
23-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Increased touch tolerance in cropping. Bug: 7342281 Change-Id: Ice2ba5f07074b1518e4064bbda489aae7ba17b22
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/imageshow/ImageCrop.java
|
09182119d3ef3d93a1f0f0c8eb58b87e043b432f |
24-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am cc93f9b0: am de327285: am bdfccda8: am a4122499: Reworked crop/transform UI. * commit 'cc93f9b092dfaf81e1a7809ccbef2b443112a5de': Reworked crop/transform UI.
|
5b1e444b4b6544b04c58be3b9b9a9a64ca4b572d |
24-Oct-2012 |
Doris Liu <tianliu@google.com> |
Stay in AlbumPage when dismissing a popup from AP Bug: 7384972 Change-Id: Ie2434ecc203a98610f1954b73a3d6916940eb812
rc/com/android/gallery3d/app/AlbumPage.java
rc/com/android/gallery3d/app/StateManager.java
|
76cb915b10a84732809ee634f723befe5e2604ac |
24-Oct-2012 |
Doris Liu <tianliu@google.com> |
Stay in AlbumPage when dismissing a popup from AP Bug: 7384972 Change-Id: Ie2434ecc203a98610f1954b73a3d6916940eb812
rc/com/android/gallery3d/app/AlbumPage.java
rc/com/android/gallery3d/app/StateManager.java
|
cc93f9b092dfaf81e1a7809ccbef2b443112a5de |
24-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am de327285: am bdfccda8: am a4122499: Reworked crop/transform UI. * commit 'de327285c7874bfac0ac18289af746706f2eb87c': Reworked crop/transform UI.
|
de327285c7874bfac0ac18289af746706f2eb87c |
24-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am bdfccda8: am a4122499: Reworked crop/transform UI. * commit 'bdfccda88176023597fc1867e77411b28ffff63f': Reworked crop/transform UI.
|
2fe28fc3042ee411d46e581a24a64e073d6d4e2a |
24-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am bdfccda8: am a4122499: Reworked crop/transform UI. * commit 'bdfccda88176023597fc1867e77411b28ffff63f': Reworked crop/transform UI.
|
bdfccda88176023597fc1867e77411b28ffff63f |
24-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am a4122499: Reworked crop/transform UI. * commit 'a41224997ef9be9c0d04534f7b6b9c6b933bfe05': Reworked crop/transform UI.
|
2f6d6bd2e608bda63879cbeff376ebeb862d99bb |
24-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am a4122499: Reworked crop/transform UI. * commit 'a41224997ef9be9c0d04534f7b6b9c6b933bfe05': Reworked crop/transform UI.
|
94cc6ff9d072194196759cb5267f78394fd307a2 |
24-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am a4122499: Reworked crop/transform UI. * commit 'a41224997ef9be9c0d04534f7b6b9c6b933bfe05': Reworked crop/transform UI.
|
522ea1817110566d1566c229c8ae873be52c8bae |
24-Oct-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
a41224997ef9be9c0d04534f7b6b9c6b933bfe05 |
22-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Reworked crop/transform UI. Bug: 7385644 Bug: 7378335 Bug: 7366075 Change-Id: Iee7e0a0741b69269b08726bad45e29d86834054e
rc/com/android/gallery3d/filtershow/PanelController.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterGeometry.java
rc/com/android/gallery3d/filtershow/imageshow/GeometryMath.java
rc/com/android/gallery3d/filtershow/imageshow/GeometryMetadata.java
rc/com/android/gallery3d/filtershow/imageshow/ImageCrop.java
rc/com/android/gallery3d/filtershow/imageshow/ImageFlip.java
rc/com/android/gallery3d/filtershow/imageshow/ImageGeometry.java
rc/com/android/gallery3d/filtershow/imageshow/ImageRotate.java
rc/com/android/gallery3d/filtershow/imageshow/ImageShow.java
rc/com/android/gallery3d/filtershow/imageshow/ImageStraighten.java
|
95a94afb783be6f01dac6c6c99ab3716cc456ca7 |
22-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Reworked crop/transform UI. Bug: 7385644 Bug: 7378335 Bug: 7366075 Change-Id: Iee7e0a0741b69269b08726bad45e29d86834054e
rc/com/android/gallery3d/filtershow/PanelController.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterGeometry.java
rc/com/android/gallery3d/filtershow/imageshow/GeometryMath.java
rc/com/android/gallery3d/filtershow/imageshow/GeometryMetadata.java
rc/com/android/gallery3d/filtershow/imageshow/ImageCrop.java
rc/com/android/gallery3d/filtershow/imageshow/ImageFlip.java
rc/com/android/gallery3d/filtershow/imageshow/ImageGeometry.java
rc/com/android/gallery3d/filtershow/imageshow/ImageRotate.java
rc/com/android/gallery3d/filtershow/imageshow/ImageShow.java
rc/com/android/gallery3d/filtershow/imageshow/ImageStraighten.java
|
49f17f00163b1d1b4742e03d3bbd35039b2bee69 |
24-Oct-2012 |
John Hoford <hoford@google.com> |
am b22c90c0: am 5f5710d6: am 4b2c4ecb: am 67fefdb9: add support for black and white filters, add rotation API to tiny planet * commit 'b22c90c065bf3a53d4a44c2aa2cb12941b4fdc55': add support for black and white filters, add rotation API to tiny planet
|
cb7a0926b5702a8ceec115f44817af2468aed5d9 |
24-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am d3858385: am af79e5a1: am c67bc34b: am a850a543: Fix jank when launching editor from Camera filmstrip * commit 'd3858385ab7c1ab6ba7663384d16e29ec5eb6361': Fix jank when launching editor from Camera filmstrip
|
b22c90c065bf3a53d4a44c2aa2cb12941b4fdc55 |
24-Oct-2012 |
John Hoford <hoford@google.com> |
am 5f5710d6: am 4b2c4ecb: am 67fefdb9: add support for black and white filters, add rotation API to tiny planet * commit '5f5710d6de54d19274e60f69653d1053e498c9cb': add support for black and white filters, add rotation API to tiny planet
|
5f5710d6de54d19274e60f69653d1053e498c9cb |
24-Oct-2012 |
John Hoford <hoford@google.com> |
am 4b2c4ecb: am 67fefdb9: add support for black and white filters, add rotation API to tiny planet * commit '4b2c4ecbadda7d2f15f4eb933bfe917dfc63fbc8': add support for black and white filters, add rotation API to tiny planet
|
d3858385ab7c1ab6ba7663384d16e29ec5eb6361 |
24-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am af79e5a1: am c67bc34b: am a850a543: Fix jank when launching editor from Camera filmstrip * commit 'af79e5a18bf7cbd39d82646c09a1e9aa33315ec3': Fix jank when launching editor from Camera filmstrip
|
ea4097c9ac4f3b56c065eaaf8b72bc0ee3743b0f |
24-Oct-2012 |
John Hoford <hoford@google.com> |
am 4b2c4ecb: am 67fefdb9: add support for black and white filters, add rotation API to tiny planet * commit '4b2c4ecbadda7d2f15f4eb933bfe917dfc63fbc8': add support for black and white filters, add rotation API to tiny planet
|
beda88a7038e82565011c26804940f25f3fd789a |
24-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am c67bc34b: am a850a543: Fix jank when launching editor from Camera filmstrip * commit 'c67bc34b5466298ce972b9c1b8949d47f0e2cea0': Fix jank when launching editor from Camera filmstrip
|
05032520adb2905a73e7719fc88bceedb77cc05c |
24-Oct-2012 |
John Hoford <hoford@google.com> |
am 67fefdb9: add support for black and white filters, add rotation API to tiny planet * commit '67fefdb9b77644c955e1c0c5b1fcd51e2374f212': add support for black and white filters, add rotation API to tiny planet
|
ce361aa11974765b0ef386f170fb5599318205bc |
24-Oct-2012 |
John Hoford <hoford@google.com> |
am 67fefdb9: add support for black and white filters, add rotation API to tiny planet * commit '67fefdb9b77644c955e1c0c5b1fcd51e2374f212': add support for black and white filters, add rotation API to tiny planet
|
55149df99d4dc6510eac1996071ed3f8db4b8aef |
24-Oct-2012 |
John Hoford <hoford@google.com> |
am 67fefdb9: add support for black and white filters, add rotation API to tiny planet * commit '67fefdb9b77644c955e1c0c5b1fcd51e2374f212': add support for black and white filters, add rotation API to tiny planet
|
af79e5a18bf7cbd39d82646c09a1e9aa33315ec3 |
24-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am c67bc34b: am a850a543: Fix jank when launching editor from Camera filmstrip * commit 'c67bc34b5466298ce972b9c1b8949d47f0e2cea0': Fix jank when launching editor from Camera filmstrip
|
4b2c4ecbadda7d2f15f4eb933bfe917dfc63fbc8 |
24-Oct-2012 |
John Hoford <hoford@google.com> |
am 67fefdb9: add support for black and white filters, add rotation API to tiny planet * commit '67fefdb9b77644c955e1c0c5b1fcd51e2374f212': add support for black and white filters, add rotation API to tiny planet
|
a705e1c2ed8619e721f39c623bae94c44f1505fa |
24-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am a850a543: Fix jank when launching editor from Camera filmstrip * commit 'a850a543225e9f7a72c5a49bb6099573c7efda13': Fix jank when launching editor from Camera filmstrip
|
552d05a90f36d274f859cbe94a30811ee2ad62c5 |
24-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am a850a543: Fix jank when launching editor from Camera filmstrip * commit 'a850a543225e9f7a72c5a49bb6099573c7efda13': Fix jank when launching editor from Camera filmstrip
|
c67bc34b5466298ce972b9c1b8949d47f0e2cea0 |
24-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am a850a543: Fix jank when launching editor from Camera filmstrip * commit 'a850a543225e9f7a72c5a49bb6099573c7efda13': Fix jank when launching editor from Camera filmstrip
|
2dda1f980adc33d6bf9057a1a486920d2a2379df |
24-Oct-2012 |
John Hoford <hoford@google.com> |
add support for black and white filters, add rotation API to tiny planet bug:7386370 bug:7389189 Change-Id: I1720893000c39edf28a356fb7b56634f004ef120
ni/Android.mk
ni/filters/bwfilter.c
ni/filters/tinyplanet.cc
|
4e524038faeda08e9d1ded6500ef543c61c2f4e5 |
24-Oct-2012 |
John Hoford <hoford@google.com> |
add support for black and white filters, add rotation API to tiny planet bug:7386370 bug:7389189 Change-Id: I1720893000c39edf28a356fb7b56634f004ef120
ni/Android.mk
|
b502f7fa8250ba1cb2c74726808155a9f347e606 |
24-Oct-2012 |
John Hoford <hoford@google.com> |
add support for black and white filters, add rotation API to tiny planet bug:7386370 bug:7389189 Change-Id: I1720893000c39edf28a356fb7b56634f004ef120
es/layout/filtershow_activity.xml
es/values/filtershow_strings.xml
|
67fefdb9b77644c955e1c0c5b1fcd51e2374f212 |
24-Oct-2012 |
John Hoford <hoford@google.com> |
add support for black and white filters, add rotation API to tiny planet bug:7386370 bug:7389189 Change-Id: I1720893000c39edf28a356fb7b56634f004ef120
ni/Android.mk
ni/filters/bwfilter.c
ni/filters/tinyplanet.cc
es/layout/filtershow_activity.xml
es/values/filtershow_strings.xml
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/PanelController.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterBwFilter.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterTinyPlanet.java
|
70d8bce63b966a00447f8dbd1736fe26a62b07ac |
24-Oct-2012 |
John Hoford <hoford@google.com> |
add support for black and white filters, add rotation API to tiny planet bug:7386370 bug:7389189 Change-Id: I1720893000c39edf28a356fb7b56634f004ef120
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/PanelController.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterBwFilter.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterTinyPlanet.java
|
1e09027a2cc43960eca65404381d791e2d243cab |
24-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Fix jank when launching editor from Camera filmstrip Bug: 7301182 Status bar visibility in FilterShow will now match the one in Camera/Gallery so that there isn't weird jank when launching. Change-Id: I3e942633b351264d2cd38cc5b587de32e38521ed
rc/com/android/gallery3d/app/AbstractGalleryActivity.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
|
a850a543225e9f7a72c5a49bb6099573c7efda13 |
24-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Fix jank when launching editor from Camera filmstrip Bug: 7301182 Status bar visibility in FilterShow will now match the one in Camera/Gallery so that there isn't weird jank when launching. Change-Id: I3e942633b351264d2cd38cc5b587de32e38521ed
rc/com/android/gallery3d/app/AbstractGalleryActivity.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
|
4dcfaf6806249b65ecfa70f95d35949839ea41d1 |
24-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am c18f48d1: am cd025e80: am f22aa1a2: am 41a3a3be: Fix slider layout * commit 'c18f48d121a59ab50f67eb17aa64c50cf4055262': Fix slider layout
|
c18f48d121a59ab50f67eb17aa64c50cf4055262 |
24-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am cd025e80: am f22aa1a2: am 41a3a3be: Fix slider layout * commit 'cd025e8054576667838bed64287319b84c038aa4': Fix slider layout
|
cd025e8054576667838bed64287319b84c038aa4 |
24-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am f22aa1a2: am 41a3a3be: Fix slider layout * commit 'f22aa1a292d6b69b1f1307cd59e578c3e99e1e60': Fix slider layout
|
7c30dc018590fc3b44fb1f208e121470ef0aac9d |
24-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am f22aa1a2: am 41a3a3be: Fix slider layout * commit 'f22aa1a292d6b69b1f1307cd59e578c3e99e1e60': Fix slider layout
|
f22aa1a292d6b69b1f1307cd59e578c3e99e1e60 |
24-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 41a3a3be: Fix slider layout * commit '41a3a3be3f263a3b9c902fbec3124a7ea296d525': Fix slider layout
|
ff4abb9e160ee9cf2b98c2f9fbb4af903ce869c7 |
24-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 41a3a3be: Fix slider layout * commit '41a3a3be3f263a3b9c902fbec3124a7ea296d525': Fix slider layout
|
a90bedee16fbe0f38a11ea9ee7a9defa6079e20c |
24-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 41a3a3be: Fix slider layout * commit '41a3a3be3f263a3b9c902fbec3124a7ea296d525': Fix slider layout
|
ae215b531ee64ffec0e3a7b003843360102d5c11 |
24-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Fix slider layout bug:7383094 Change-Id: I271728577e5a9fa4e1dbff354b37aee5d2aefb5c
es/layout/filtershow_activity.xml
|
41a3a3be3f263a3b9c902fbec3124a7ea296d525 |
24-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Fix slider layout bug:7383094 Change-Id: I271728577e5a9fa4e1dbff354b37aee5d2aefb5c
es/layout/filtershow_activity.xml
|
e8b65f354f6fe0801183021dd48aaef20cb5c9a0 |
24-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 8a6827c3: am ff073e37: am a482d850: am cb993ff1: Merge "Express the borders size in percentages" into gb-ub-photos-arches * commit '8a6827c3e56b11b7f69e4b10c09a432f8ab5edc6': Express the borders size in percentages
|
33bc154f1e3fc54280036a4461ff80c69c037c73 |
24-Oct-2012 |
John Reck <jreck@google.com> |
am cf04e260: am b335ff9d: am 94fa0565: am d6453edc: Merge "Fix NPE" into gb-ub-photos-arches * commit 'cf04e260979e9ca7073b33201872cc740ba6e07c': Fix NPE
|
8a6827c3e56b11b7f69e4b10c09a432f8ab5edc6 |
24-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am ff073e37: am a482d850: am cb993ff1: Merge "Express the borders size in percentages" into gb-ub-photos-arches * commit 'ff073e37d3d1ca9fcebce580c4a355eb7bdd69a3': Express the borders size in percentages
|
cf04e260979e9ca7073b33201872cc740ba6e07c |
24-Oct-2012 |
John Reck <jreck@google.com> |
am b335ff9d: am 94fa0565: am d6453edc: Merge "Fix NPE" into gb-ub-photos-arches * commit 'b335ff9dd37b7eaf498e2df999eec19acbc5f9b8': Fix NPE
|
d53bbcfb6cca74d3d1030b8dc47947086aff9775 |
24-Oct-2012 |
George Mount <mount@google.com> |
am 28166ecc: am 26b364d8: am 71647c7a: am 7d7f91e1: Merge "Fix NPE in detecting panoramas." into gb-ub-photos-arches * commit '28166ecc33f3151ccb0b4ceeab7a55ebbb4938be': Fix NPE in detecting panoramas.
|
ff073e37d3d1ca9fcebce580c4a355eb7bdd69a3 |
24-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am a482d850: am cb993ff1: Merge "Express the borders size in percentages" into gb-ub-photos-arches * commit 'a482d85068e39eb28cb854bc142d882b95b3b10c': Express the borders size in percentages
|
b335ff9dd37b7eaf498e2df999eec19acbc5f9b8 |
24-Oct-2012 |
John Reck <jreck@google.com> |
am 94fa0565: am d6453edc: Merge "Fix NPE" into gb-ub-photos-arches * commit '94fa0565844a6095d52d45cfe366425110666b42': Fix NPE
|
808a5869a56f8a3671f7c80c319dff6b94ea7915 |
24-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am a482d850: am cb993ff1: Merge "Express the borders size in percentages" into gb-ub-photos-arches * commit 'a482d85068e39eb28cb854bc142d882b95b3b10c': Express the borders size in percentages
|
590acf8681c11395e9b9548e4cd8a205902cbb35 |
24-Oct-2012 |
John Reck <jreck@google.com> |
am 94fa0565: am d6453edc: Merge "Fix NPE" into gb-ub-photos-arches * commit '94fa0565844a6095d52d45cfe366425110666b42': Fix NPE
|
28166ecc33f3151ccb0b4ceeab7a55ebbb4938be |
24-Oct-2012 |
George Mount <mount@google.com> |
am 26b364d8: am 71647c7a: am 7d7f91e1: Merge "Fix NPE in detecting panoramas." into gb-ub-photos-arches * commit '26b364d8c15f60a697dd70e0ad5244d00cdd62c3': Fix NPE in detecting panoramas.
|
a482d85068e39eb28cb854bc142d882b95b3b10c |
24-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am cb993ff1: Merge "Express the borders size in percentages" into gb-ub-photos-arches * commit 'cb993ff18944a7ba1981406c3c8adf3fe36755c0': Express the borders size in percentages
|
94fa0565844a6095d52d45cfe366425110666b42 |
24-Oct-2012 |
John Reck <jreck@google.com> |
am d6453edc: Merge "Fix NPE" into gb-ub-photos-arches * commit 'd6453edcdbdad2706d8ce4a4fddd8f7df347b78c': Fix NPE
|
6d11b1dbc13df616528283037d6d9fcd62919dfc |
24-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am cb993ff1: Merge "Express the borders size in percentages" into gb-ub-photos-arches * commit 'cb993ff18944a7ba1981406c3c8adf3fe36755c0': Express the borders size in percentages
|
d4dee90b0e5f58ba3ca51b2367088d96cafd6f6f |
24-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am cb993ff1: Merge "Express the borders size in percentages" into gb-ub-photos-arches * commit 'cb993ff18944a7ba1981406c3c8adf3fe36755c0': Express the borders size in percentages
|
c29cd805fb9f955029e86c1283c6b2d17ec0cf19 |
24-Oct-2012 |
John Reck <jreck@google.com> |
am d6453edc: Merge "Fix NPE" into gb-ub-photos-arches * commit 'd6453edcdbdad2706d8ce4a4fddd8f7df347b78c': Fix NPE
|
13ab3c05a467bacb0dbf0e070b4f8b70a543c6fe |
24-Oct-2012 |
John Reck <jreck@google.com> |
am d6453edc: Merge "Fix NPE" into gb-ub-photos-arches * commit 'd6453edcdbdad2706d8ce4a4fddd8f7df347b78c': Fix NPE
|
02ed57d123ba96cca284f78df8c6eba776e710ee |
24-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Merge "Express the borders size in percentages" into gb-ub-photos-arches
|
cb993ff18944a7ba1981406c3c8adf3fe36755c0 |
24-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Merge "Express the borders size in percentages" into gb-ub-photos-arches
|
d6453edcdbdad2706d8ce4a4fddd8f7df347b78c |
24-Oct-2012 |
John Reck <jreck@google.com> |
Merge "Fix NPE" into gb-ub-photos-arches
|
5894a6b55271727695d7a489dfc06d12fa49c788 |
24-Oct-2012 |
John Reck <jreck@google.com> |
Merge "Fix NPE" into gb-ub-photos-arches
|
0827ebf079934ae9e6cb7285e785a1a179f155fa |
24-Oct-2012 |
George Mount <mount@google.com> |
am 71647c7a: am 7d7f91e1: Merge "Fix NPE in detecting panoramas." into gb-ub-photos-arches * commit '71647c7af135e397035398aee3d7be7a0ebad670': Fix NPE in detecting panoramas.
|
26b364d8c15f60a697dd70e0ad5244d00cdd62c3 |
24-Oct-2012 |
George Mount <mount@google.com> |
am 71647c7a: am 7d7f91e1: Merge "Fix NPE in detecting panoramas." into gb-ub-photos-arches * commit '71647c7af135e397035398aee3d7be7a0ebad670': Fix NPE in detecting panoramas.
|
71647c7af135e397035398aee3d7be7a0ebad670 |
24-Oct-2012 |
George Mount <mount@google.com> |
am 7d7f91e1: Merge "Fix NPE in detecting panoramas." into gb-ub-photos-arches * commit '7d7f91e1771e67af1fca5f2b3f221968df3de077': Fix NPE in detecting panoramas.
|
80e4d5e36d3d3c8da550b7200a5359c9ff468809 |
24-Oct-2012 |
George Mount <mount@google.com> |
am 7d7f91e1: Merge "Fix NPE in detecting panoramas." into gb-ub-photos-arches * commit '7d7f91e1771e67af1fca5f2b3f221968df3de077': Fix NPE in detecting panoramas.
|
44f710917834c8253c6d0bb96dd0f18fe35ed99b |
24-Oct-2012 |
George Mount <mount@google.com> |
am 7d7f91e1: Merge "Fix NPE in detecting panoramas." into gb-ub-photos-arches * commit '7d7f91e1771e67af1fca5f2b3f221968df3de077': Fix NPE in detecting panoramas.
|
7d7f91e1771e67af1fca5f2b3f221968df3de077 |
24-Oct-2012 |
George Mount <mount@google.com> |
Merge "Fix NPE in detecting panoramas." into gb-ub-photos-arches
|
52863a17f1e0aab3d47a6b98b72812187620ee84 |
24-Oct-2012 |
George Mount <mount@google.com> |
Merge "Fix NPE in detecting panoramas." into gb-ub-photos-arches
|
e6c566e7e25b7f961f501c878e98d3ca640e63d8 |
23-Oct-2012 |
John Reck <jreck@google.com> |
Fix NPE Bug: 7399438 Change-Id: Ida0bcc0689d5a797e3c60c3ee51542512fbadf1e
rc/com/android/gallery3d/ui/PhotoView.java
|
03e18995f4a2c71381048b2e264bcac11cd17950 |
23-Oct-2012 |
John Reck <jreck@google.com> |
Fix NPE Bug: 7399438 Change-Id: Ida0bcc0689d5a797e3c60c3ee51542512fbadf1e
rc/com/android/gallery3d/ui/PhotoView.java
|
248bd6ea32bfdff1a3e08130f6b8de7d443674a1 |
23-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 3d923131: am bf339ee8: am bd4ea013: am ea636029: Merge "Hide the history panel on rotation" into gb-ub-photos-arches * commit '3d9231310c45e0fb218d66cb9308753be8ddf35d': Hide the history panel on rotation
|
bc65ad48769d09b0e6df253473dd5ceab23933eb |
23-Oct-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
3d9231310c45e0fb218d66cb9308753be8ddf35d |
23-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am bf339ee8: am bd4ea013: am ea636029: Merge "Hide the history panel on rotation" into gb-ub-photos-arches * commit 'bf339ee894fbfc2992aca68bab461132ae76ac3f': Hide the history panel on rotation
|
30fd4b427eb84d553dfcae3759707f9d8da75001 |
23-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am bd4ea013: am ea636029: Merge "Hide the history panel on rotation" into gb-ub-photos-arches * commit 'bd4ea013d97d896b7865993dc9917313a7040259': Hide the history panel on rotation
|
bf339ee894fbfc2992aca68bab461132ae76ac3f |
23-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am bd4ea013: am ea636029: Merge "Hide the history panel on rotation" into gb-ub-photos-arches * commit 'bd4ea013d97d896b7865993dc9917313a7040259': Hide the history panel on rotation
|
e77c489a1922e52b115e0901bce0cb069c7b46d3 |
23-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am ea636029: Merge "Hide the history panel on rotation" into gb-ub-photos-arches * commit 'ea6360298ca823634c9f2ee8990546f753288da9': Hide the history panel on rotation
|
fcb3ebb054dedd3df66de9ebceafbfd916ab8558 |
23-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am ea636029: Merge "Hide the history panel on rotation" into gb-ub-photos-arches * commit 'ea6360298ca823634c9f2ee8990546f753288da9': Hide the history panel on rotation
|
bd4ea013d97d896b7865993dc9917313a7040259 |
23-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am ea636029: Merge "Hide the history panel on rotation" into gb-ub-photos-arches * commit 'ea6360298ca823634c9f2ee8990546f753288da9': Hide the history panel on rotation
|
9a9c3b582a407f632aaaa8e704113262796757f4 |
23-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Express the borders size in percentages bug:7379459 Change-Id: I14c91dbee0480a3880a11b166fcce3673c2ff3eb
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterParametricBorder.java
|
f129cb70f4d2b43a147b399d91650414defa6dd9 |
23-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Express the borders size in percentages bug:7379459 Change-Id: I14c91dbee0480a3880a11b166fcce3673c2ff3eb
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterParametricBorder.java
|
ea6360298ca823634c9f2ee8990546f753288da9 |
23-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Merge "Hide the history panel on rotation" into gb-ub-photos-arches
|
231fe15ddb1cb4788b1b02ce5512587e45e3b249 |
23-Oct-2012 |
George Mount <mount@google.com> |
Fix NPE in detecting panoramas. Bug 7398022 Change-Id: Iae646c424ffbe552d014f563c8f4e5e4385b4724
rc/com/android/gallery3d/app/PanoramaMetadataSupport.java
rc_pd/com/android/gallery3d/util/LightCycleHelper.java
|
4588b65ebb1aacef2a991d5da6659d69f791e571 |
23-Oct-2012 |
George Mount <mount@google.com> |
Fix NPE in detecting panoramas. Bug 7398022 Change-Id: Iae646c424ffbe552d014f563c8f4e5e4385b4724
rc/com/android/gallery3d/app/PanoramaMetadataSupport.java
rc_pd/com/android/gallery3d/util/LightCycleHelper.java
|
777da4db73a697169cfa95120d9bda70b0fc8480 |
23-Oct-2012 |
Sascha Haeberling <haeberling@google.com> |
am 93c83ef8: am 1400e6a8: am 25d08e2b: am a681f36f: Merge "Make sure we use xmp_toolkit from external instead of the precompiled JAR." into gb-ub-photos-arches * commit '93c83ef896d6e621c8b09ac4ecdcd24c067cafa3': Make sure we use xmp_toolkit from external instead of the precompiled JAR.
|
1b5ec22976ca5182a16228bc5ca1b12130923856 |
23-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Hide the history panel on rotation bug:7386882 Change-Id: Id68fa1680318b85b4b5b5e54221377d504687d93
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
|
a9bc8ef5774557a66bcb9bb6d38cb16f7ef56e2e |
23-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Hide the history panel on rotation bug:7386882 Change-Id: Id68fa1680318b85b4b5b5e54221377d504687d93
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
|
93c83ef896d6e621c8b09ac4ecdcd24c067cafa3 |
23-Oct-2012 |
Sascha Haeberling <haeberling@google.com> |
am 1400e6a8: am 25d08e2b: am a681f36f: Merge "Make sure we use xmp_toolkit from external instead of the precompiled JAR." into gb-ub-photos-arches * commit '1400e6a8ad9fc9d46bd5fde22e05683f75804ccb': Make sure we use xmp_toolkit from external instead of the precompiled JAR.
|
22fae1820b13017c121879774b0afd522ecee676 |
23-Oct-2012 |
Sascha Haeberling <haeberling@google.com> |
am 25d08e2b: am a681f36f: Merge "Make sure we use xmp_toolkit from external instead of the precompiled JAR." into gb-ub-photos-arches * commit '25d08e2bba04fbf88ca138653f7adabc306f1a43': Make sure we use xmp_toolkit from external instead of the precompiled JAR.
|
1400e6a8ad9fc9d46bd5fde22e05683f75804ccb |
23-Oct-2012 |
Sascha Haeberling <haeberling@google.com> |
am 25d08e2b: am a681f36f: Merge "Make sure we use xmp_toolkit from external instead of the precompiled JAR." into gb-ub-photos-arches * commit '25d08e2bba04fbf88ca138653f7adabc306f1a43': Make sure we use xmp_toolkit from external instead of the precompiled JAR.
|
27df51337a9e1610b12d1c725a7b4395c5f61aa7 |
23-Oct-2012 |
Sascha Haeberling <haeberling@google.com> |
am a681f36f: Merge "Make sure we use xmp_toolkit from external instead of the precompiled JAR." into gb-ub-photos-arches * commit 'a681f36f3c0642135a3ad4dcd529cbff08798d53': Make sure we use xmp_toolkit from external instead of the precompiled JAR.
|
25d08e2bba04fbf88ca138653f7adabc306f1a43 |
23-Oct-2012 |
Sascha Haeberling <haeberling@google.com> |
am a681f36f: Merge "Make sure we use xmp_toolkit from external instead of the precompiled JAR." into gb-ub-photos-arches * commit 'a681f36f3c0642135a3ad4dcd529cbff08798d53': Make sure we use xmp_toolkit from external instead of the precompiled JAR.
|
a681f36f3c0642135a3ad4dcd529cbff08798d53 |
23-Oct-2012 |
Sascha Haeberling <haeberling@google.com> |
Merge "Make sure we use xmp_toolkit from external instead of the precompiled JAR." into gb-ub-photos-arches
|
5c3e14563f3a72ff90e49d901ce8c9ca238db634 |
23-Oct-2012 |
Sascha Haeberling <haeberling@google.com> |
Make sure we use xmp_toolkit from external instead of the precompiled JAR. Bug: 7400527 Change-Id: Ib9428af28c2c436485358dc4e07fe659ed961155
ndroid.mk
|
7a5dedff28c2376908979a793b342e355868339d |
23-Oct-2012 |
Sascha Haeberling <haeberling@google.com> |
Make sure we use xmp_toolkit from external instead of the precompiled JAR. Bug: 7400527 Change-Id: Ib9428af28c2c436485358dc4e07fe659ed961155
ndroid.mk
|
68fa7e67bd0832942d3a1bce5caf7d79424f5453 |
23-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 67b7077e: am fe23fb64: am bc9d4ccc: am 5d7e98f7: Fix another potential crash in Curves * commit '67b7077ef02d7f25f25de0155fd2cd315c2daa5b': Fix another potential crash in Curves
|
67b7077ef02d7f25f25de0155fd2cd315c2daa5b |
23-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am fe23fb64: am bc9d4ccc: am 5d7e98f7: Fix another potential crash in Curves * commit 'fe23fb64bd0d75af837d357f69b99c0fc88c85da': Fix another potential crash in Curves
|
05757033049bd84e44f695ca781889d44577c589 |
23-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am bc9d4ccc: am 5d7e98f7: Fix another potential crash in Curves * commit 'bc9d4ccc65df9acd1d3a152bd78bb4c041f1281c': Fix another potential crash in Curves
|
fe23fb64bd0d75af837d357f69b99c0fc88c85da |
23-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am bc9d4ccc: am 5d7e98f7: Fix another potential crash in Curves * commit 'bc9d4ccc65df9acd1d3a152bd78bb4c041f1281c': Fix another potential crash in Curves
|
bc9d4ccc65df9acd1d3a152bd78bb4c041f1281c |
23-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 5d7e98f7: Fix another potential crash in Curves * commit '5d7e98f781fbd450295850d00adfb50540d53b3f': Fix another potential crash in Curves
|
23c9238a22714cd520460a409ef426ef038aadda |
23-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 5d7e98f7: Fix another potential crash in Curves * commit '5d7e98f781fbd450295850d00adfb50540d53b3f': Fix another potential crash in Curves
|
59d3c076007f30e5ff6d1ca7158880b02e7db4fb |
23-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 5d7e98f7: Fix another potential crash in Curves * commit '5d7e98f781fbd450295850d00adfb50540d53b3f': Fix another potential crash in Curves
|
5aad4e99baf4dc0c31468e51cbe4ce738ee7d49e |
23-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Fix another potential crash in Curves bug:7379140 Change-Id: I5f2f21b56595799c0e46e13bf5278b44803f4080
rc/com/android/gallery3d/filtershow/ui/ImageCurves.java
rc/com/android/gallery3d/filtershow/ui/Spline.java
|
5d7e98f781fbd450295850d00adfb50540d53b3f |
23-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Fix another potential crash in Curves bug:7379140 Change-Id: I5f2f21b56595799c0e46e13bf5278b44803f4080
rc/com/android/gallery3d/filtershow/ui/ImageCurves.java
rc/com/android/gallery3d/filtershow/ui/Spline.java
|
45b5f62180cbd30a38bf3af5a9ee5bacc340b8f3 |
23-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 363421bc: am 20a2ca2e: am 0b44017c: am 361f6234: Merge "Fix flickering in geometry panel" into gb-ub-photos-arches * commit '363421bc26753efc352a483b5a10fe71bbdcd8a1': Fix flickering in geometry panel
|
363421bc26753efc352a483b5a10fe71bbdcd8a1 |
23-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 20a2ca2e: am 0b44017c: am 361f6234: Merge "Fix flickering in geometry panel" into gb-ub-photos-arches * commit '20a2ca2ef08fda5554976b67fb50480c607898a1': Fix flickering in geometry panel
|
4626ebd1e289777868f33abb5e0b3a4bc116961e |
23-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 0b44017c: am 361f6234: Merge "Fix flickering in geometry panel" into gb-ub-photos-arches * commit '0b44017c53fabaa7a9434bf21708a94b48a5db52': Fix flickering in geometry panel
|
20a2ca2ef08fda5554976b67fb50480c607898a1 |
23-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 0b44017c: am 361f6234: Merge "Fix flickering in geometry panel" into gb-ub-photos-arches * commit '0b44017c53fabaa7a9434bf21708a94b48a5db52': Fix flickering in geometry panel
|
db6ab797de3855c251273a2bc9cc7950ea849183 |
23-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 361f6234: Merge "Fix flickering in geometry panel" into gb-ub-photos-arches * commit '361f6234c02207b2d812db0b2aeed267013c9a1f': Fix flickering in geometry panel
|
f279b8575c7ac32db87ca926002022ae072a5a9b |
23-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 361f6234: Merge "Fix flickering in geometry panel" into gb-ub-photos-arches * commit '361f6234c02207b2d812db0b2aeed267013c9a1f': Fix flickering in geometry panel
|
5582ab6c81c48146e646a84556144e29360db9fd |
23-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 361f6234: Merge "Fix flickering in geometry panel" into gb-ub-photos-arches * commit '361f6234c02207b2d812db0b2aeed267013c9a1f': Fix flickering in geometry panel
|
0b44017c53fabaa7a9434bf21708a94b48a5db52 |
23-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 361f6234: Merge "Fix flickering in geometry panel" into gb-ub-photos-arches * commit '361f6234c02207b2d812db0b2aeed267013c9a1f': Fix flickering in geometry panel
|
f2b827b5461160f96a0b6c497452d8bab73957cc |
23-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Merge "Fix flickering in geometry panel" into gb-ub-photos-arches
|
361f6234c02207b2d812db0b2aeed267013c9a1f |
23-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Merge "Fix flickering in geometry panel" into gb-ub-photos-arches
|
a7291ecf1ac70a4b687ca1429ff7231f83cc5577 |
23-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Fix flickering in geometry panel bug:7344214 Change-Id: I34c980061c2d51e7b97ec95fc77e3331cffdf8d5
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
|
f2b2d94a8d2e8273563244c85a75656cd9e37b83 |
23-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Fix flickering in geometry panel bug:7344214 Change-Id: I34c980061c2d51e7b97ec95fc77e3331cffdf8d5
rc/com/android/gallery3d/filtershow/imageshow/ImageShow.java
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
|
fb90fd60f155f6fef0334a0739be55a2717c17f5 |
23-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Fix flickering in geometry panel bug:7344214 Change-Id: I34c980061c2d51e7b97ec95fc77e3331cffdf8d5
rc/com/android/gallery3d/filtershow/imageshow/ImageShow.java
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
|
670f8566172fa554dbff7dca7610076051ad7421 |
23-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 3bb8a694: am 301531ef: am f30096b4: am c162c8b7: Merge "Show Panorama viewer button in filmstrip mode" into gb-ub-photos-arches * commit '3bb8a694be5b37dfa664c90fe75a4b66fce30792': Show Panorama viewer button in filmstrip mode
|
3bb8a694be5b37dfa664c90fe75a4b66fce30792 |
23-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 301531ef: am f30096b4: am c162c8b7: Merge "Show Panorama viewer button in filmstrip mode" into gb-ub-photos-arches * commit '301531ef59957971bb99ae4be0c60a896e850770': Show Panorama viewer button in filmstrip mode
|
75a448eb193308f6b9268968265895c019ae3ab2 |
23-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am f30096b4: am c162c8b7: Merge "Show Panorama viewer button in filmstrip mode" into gb-ub-photos-arches * commit 'f30096b4f1f3de6fd4c95e706c10cdfd72a5db3b': Show Panorama viewer button in filmstrip mode
|
301531ef59957971bb99ae4be0c60a896e850770 |
23-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am f30096b4: am c162c8b7: Merge "Show Panorama viewer button in filmstrip mode" into gb-ub-photos-arches * commit 'f30096b4f1f3de6fd4c95e706c10cdfd72a5db3b': Show Panorama viewer button in filmstrip mode
|
8ad95f9f9031f7c96f3793bf2850b8a516fcca6d |
23-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am c162c8b7: Merge "Show Panorama viewer button in filmstrip mode" into gb-ub-photos-arches * commit 'c162c8b70b795e95ebe53154ddb86ecf188eade0': Show Panorama viewer button in filmstrip mode
|
015d0b2aecfa7bce40ac0a2b993e362d2bdb5dbc |
23-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am c162c8b7: Merge "Show Panorama viewer button in filmstrip mode" into gb-ub-photos-arches * commit 'c162c8b70b795e95ebe53154ddb86ecf188eade0': Show Panorama viewer button in filmstrip mode
|
f30096b4f1f3de6fd4c95e706c10cdfd72a5db3b |
23-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am c162c8b7: Merge "Show Panorama viewer button in filmstrip mode" into gb-ub-photos-arches * commit 'c162c8b70b795e95ebe53154ddb86ecf188eade0': Show Panorama viewer button in filmstrip mode
|
b818cbe38468eb79f5d85f6738b8264451cf4356 |
23-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Show Panorama viewer button in filmstrip mode" into gb-ub-photos-arches
|
c162c8b70b795e95ebe53154ddb86ecf188eade0 |
23-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Show Panorama viewer button in filmstrip mode" into gb-ub-photos-arches
|
662bfd242438f16845dbf58b1b7aeadcbdbf433e |
23-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 61ddc0d6: am 5ba40c19: am e5a3ff76: am a9f280f9: Add copyright notices * commit '61ddc0d6c2fcad798a50672e2d869fe56292181f': Add copyright notices
|
61ddc0d6c2fcad798a50672e2d869fe56292181f |
23-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 5ba40c19: am e5a3ff76: am a9f280f9: Add copyright notices * commit '5ba40c19929438e1eb64c16a8ef07247e79fc43b': Add copyright notices
|
5ba40c19929438e1eb64c16a8ef07247e79fc43b |
23-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am e5a3ff76: am a9f280f9: Add copyright notices * commit 'e5a3ff7692de92739645d97d72b5bdc599fd6fbf': Add copyright notices
|
b8f4ea38c6096cb806b60986c0d11ef9761db665 |
23-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am e5a3ff76: am a9f280f9: Add copyright notices * commit 'e5a3ff7692de92739645d97d72b5bdc599fd6fbf': Add copyright notices
|
9218b26a9332bd2b8adafeb908cc2157a69a25bb |
23-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am a9f280f9: Add copyright notices * commit 'a9f280f938b5fd5891c5cfe0999f8f1d4945d7a1': Add copyright notices
|
1371fc6c86fdc0faa44f276386565c3325e3c280 |
23-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am a9f280f9: Add copyright notices * commit 'a9f280f938b5fd5891c5cfe0999f8f1d4945d7a1': Add copyright notices
|
364e101596e22165ae414e445f95d11d2d53043d |
23-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am a9f280f9: Add copyright notices * commit 'a9f280f938b5fd5891c5cfe0999f8f1d4945d7a1': Add copyright notices
|
e5a3ff7692de92739645d97d72b5bdc599fd6fbf |
23-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am a9f280f9: Add copyright notices * commit 'a9f280f938b5fd5891c5cfe0999f8f1d4945d7a1': Add copyright notices
|
90fa4a1d0ec72dd412c0dd37eb7ec23cfa1d47c6 |
23-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Show Panorama viewer button in filmstrip mode Bug: 7393346 Change-Id: I555ef6cfee0ac3992f0a84c69a1eafc19718ce4c
rc/com/android/gallery3d/app/PhotoPage.java
|
c02be7d6224c0b4e81c86e19c3d101ea070c7e1d |
23-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Show Panorama viewer button in filmstrip mode Bug: 7393346 Change-Id: I555ef6cfee0ac3992f0a84c69a1eafc19718ce4c
rc/com/android/gallery3d/app/PhotoPage.java
|
a9f280f938b5fd5891c5cfe0999f8f1d4945d7a1 |
23-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Add copyright notices bug:7387634 Change-Id: Iaac0b55c9857f609312b78a613d074d323174ea1
rc/com/android/gallery3d/filtershow/CenteredLinearLayout.java
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/HistoryAdapter.java
rc/com/android/gallery3d/filtershow/ImageStateAdapter.java
rc/com/android/gallery3d/filtershow/PanelController.java
rc/com/android/gallery3d/filtershow/cache/BitmapCache.java
rc/com/android/gallery3d/filtershow/cache/Cache.java
rc/com/android/gallery3d/filtershow/cache/DelayedPresetCache.java
rc/com/android/gallery3d/filtershow/cache/DirectPresetCache.java
rc/com/android/gallery3d/filtershow/cache/ZoomCache.java
rc/com/android/gallery3d/filtershow/filters/ColorSpaceMatrix.java
rc/com/android/gallery3d/filtershow/filters/ImageFilter.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterBW.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterBWBlue.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterBWGreen.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterBWRed.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterBorder.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterContrast.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterCurves.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterExposure.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterFx.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterGradient.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterHue.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterParametricBorder.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterRS.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterRedEye.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterSaturated.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterShadows.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterSharpen.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterStraighten.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterTinyPlanet.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterVibrance.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterVignette.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterWBalance.java
rc/com/android/gallery3d/filtershow/imageshow/GeometryMath.java
rc/com/android/gallery3d/filtershow/imageshow/ImageBorder.java
rc/com/android/gallery3d/filtershow/imageshow/ImageSmallBorder.java
rc/com/android/gallery3d/filtershow/imageshow/ImageSmallFilter.java
rc/com/android/gallery3d/filtershow/imageshow/ImageWithIcon.java
rc/com/android/gallery3d/filtershow/imageshow/ImageZoom.java
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
rc/com/android/gallery3d/filtershow/presets/ImagePresetBW.java
rc/com/android/gallery3d/filtershow/presets/ImagePresetBWBlue.java
rc/com/android/gallery3d/filtershow/presets/ImagePresetBWGreen.java
rc/com/android/gallery3d/filtershow/presets/ImagePresetBWRed.java
rc/com/android/gallery3d/filtershow/presets/ImagePresetFX.java
rc/com/android/gallery3d/filtershow/presets/ImagePresetOld.java
rc/com/android/gallery3d/filtershow/presets/ImagePresetSaturated.java
rc/com/android/gallery3d/filtershow/presets/ImagePresetXProcessing.java
rc/com/android/gallery3d/filtershow/provider/SharedImageProvider.java
rc/com/android/gallery3d/filtershow/ui/ControlPoint.java
rc/com/android/gallery3d/filtershow/ui/FramedTextButton.java
rc/com/android/gallery3d/filtershow/ui/ImageButtonTitle.java
rc/com/android/gallery3d/filtershow/ui/ImageCurves.java
rc/com/android/gallery3d/filtershow/ui/SliderController.java
rc/com/android/gallery3d/filtershow/ui/SliderListener.java
rc/com/android/gallery3d/filtershow/ui/Spline.java
|
8d18082a0938aaa64ac9d98993d1092cb5846c05 |
23-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Add copyright notices bug:7387634 Change-Id: Iaac0b55c9857f609312b78a613d074d323174ea1
rc/com/android/gallery3d/filtershow/cache/DelayedPresetCache.java
rc/com/android/gallery3d/filtershow/cache/DirectPresetCache.java
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
rc/com/android/gallery3d/filtershow/presets/ImagePresetBW.java
rc/com/android/gallery3d/filtershow/presets/ImagePresetBWBlue.java
rc/com/android/gallery3d/filtershow/presets/ImagePresetBWGreen.java
rc/com/android/gallery3d/filtershow/presets/ImagePresetBWRed.java
rc/com/android/gallery3d/filtershow/presets/ImagePresetFX.java
rc/com/android/gallery3d/filtershow/presets/ImagePresetOld.java
rc/com/android/gallery3d/filtershow/presets/ImagePresetSaturated.java
rc/com/android/gallery3d/filtershow/presets/ImagePresetXProcessing.java
|
983f612476c394dffcd2b73869ed3c92f531e5e1 |
23-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Add copyright notices bug:7387634 Change-Id: Iaac0b55c9857f609312b78a613d074d323174ea1
rc/com/android/gallery3d/filtershow/CenteredLinearLayout.java
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/HistoryAdapter.java
rc/com/android/gallery3d/filtershow/ImageStateAdapter.java
rc/com/android/gallery3d/filtershow/PanelController.java
rc/com/android/gallery3d/filtershow/cache/BitmapCache.java
rc/com/android/gallery3d/filtershow/cache/Cache.java
rc/com/android/gallery3d/filtershow/cache/DelayedPresetCache.java
rc/com/android/gallery3d/filtershow/cache/DirectPresetCache.java
rc/com/android/gallery3d/filtershow/cache/ZoomCache.java
rc/com/android/gallery3d/filtershow/filters/ColorSpaceMatrix.java
rc/com/android/gallery3d/filtershow/filters/ImageFilter.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterBW.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterBWBlue.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterBWGreen.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterBWRed.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterBorder.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterContrast.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterCurves.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterExposure.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterFx.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterGradient.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterHue.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterParametricBorder.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterRS.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterRedEye.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterSaturated.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterShadows.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterSharpen.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterStraighten.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterTinyPlanet.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterVibrance.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterVignette.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterWBalance.java
rc/com/android/gallery3d/filtershow/imageshow/GeometryMath.java
rc/com/android/gallery3d/filtershow/imageshow/ImageBorder.java
rc/com/android/gallery3d/filtershow/imageshow/ImageSmallBorder.java
rc/com/android/gallery3d/filtershow/imageshow/ImageSmallFilter.java
rc/com/android/gallery3d/filtershow/imageshow/ImageWithIcon.java
rc/com/android/gallery3d/filtershow/imageshow/ImageZoom.java
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
rc/com/android/gallery3d/filtershow/presets/ImagePresetBW.java
rc/com/android/gallery3d/filtershow/presets/ImagePresetBWBlue.java
rc/com/android/gallery3d/filtershow/presets/ImagePresetBWGreen.java
rc/com/android/gallery3d/filtershow/presets/ImagePresetBWRed.java
rc/com/android/gallery3d/filtershow/presets/ImagePresetFX.java
rc/com/android/gallery3d/filtershow/presets/ImagePresetOld.java
rc/com/android/gallery3d/filtershow/presets/ImagePresetSaturated.java
rc/com/android/gallery3d/filtershow/presets/ImagePresetXProcessing.java
rc/com/android/gallery3d/filtershow/provider/SharedImageProvider.java
rc/com/android/gallery3d/filtershow/ui/ControlPoint.java
rc/com/android/gallery3d/filtershow/ui/FramedTextButton.java
rc/com/android/gallery3d/filtershow/ui/ImageButtonTitle.java
rc/com/android/gallery3d/filtershow/ui/ImageCurves.java
rc/com/android/gallery3d/filtershow/ui/SliderController.java
rc/com/android/gallery3d/filtershow/ui/SliderListener.java
rc/com/android/gallery3d/filtershow/ui/Spline.java
|
134364ac9a50f36745ed145adf0dbaa7aecd23dd |
23-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am c5a7b8c4: am 20da13c5: am cdaa77d2: am ec995b6b: Fix slow / jerky tracking in Curves * commit 'c5a7b8c43039d9098ca26696abd89e824a36300f': Fix slow / jerky tracking in Curves
|
c5a7b8c43039d9098ca26696abd89e824a36300f |
23-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 20da13c5: am cdaa77d2: am ec995b6b: Fix slow / jerky tracking in Curves * commit '20da13c584b0997562fd75ae352f769acf8aa278': Fix slow / jerky tracking in Curves
|
20da13c584b0997562fd75ae352f769acf8aa278 |
23-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am cdaa77d2: am ec995b6b: Fix slow / jerky tracking in Curves * commit 'cdaa77d200c27a7fa2ba5be03bfcd24487cdcb58': Fix slow / jerky tracking in Curves
|
c54c78392cc9007be5a9f0cd2bf7d003a883a6ff |
23-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am cdaa77d2: am ec995b6b: Fix slow / jerky tracking in Curves * commit 'cdaa77d200c27a7fa2ba5be03bfcd24487cdcb58': Fix slow / jerky tracking in Curves
|
f3b39dd8427e68b5321b1cb3409b0bb01d6c4af2 |
23-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am ec995b6b: Fix slow / jerky tracking in Curves * commit 'ec995b6bf6e2476e820b1e02d0d3a567b1ecb2fc': Fix slow / jerky tracking in Curves
|
40cdf5cda524dfc0c8ae3a6a5f19aab992d928de |
23-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am ec995b6b: Fix slow / jerky tracking in Curves * commit 'ec995b6bf6e2476e820b1e02d0d3a567b1ecb2fc': Fix slow / jerky tracking in Curves
|
cdaa77d200c27a7fa2ba5be03bfcd24487cdcb58 |
23-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am ec995b6b: Fix slow / jerky tracking in Curves * commit 'ec995b6bf6e2476e820b1e02d0d3a567b1ecb2fc': Fix slow / jerky tracking in Curves
|
ec995b6bf6e2476e820b1e02d0d3a567b1ecb2fc |
23-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Fix slow / jerky tracking in Curves bug:7394837 Change-Id: I70758b463601faa19d05da58d0163b31df7b4b91
rc/com/android/gallery3d/filtershow/ui/ImageCurves.java
rc/com/android/gallery3d/filtershow/ui/Spline.java
|
3a6614628f8d33f8ce881d85355cebf2b9523252 |
23-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Fix slow / jerky tracking in Curves bug:7394837 Change-Id: I70758b463601faa19d05da58d0163b31df7b4b91
rc/com/android/gallery3d/filtershow/ui/ImageCurves.java
rc/com/android/gallery3d/filtershow/ui/Spline.java
|
c37c955d718284e5a3bf2cea099312a8323c355c |
23-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 4357a0a6: am 1ecc749b: am 488547b0: am 2569df23: Merge "Shows filtered images in geometry modules and comparison." into gb-ub-photos-arches * commit '4357a0a6e04d233204225c21642f7488bbd3c21c': Shows filtered images in geometry modules and comparison.
|
4357a0a6e04d233204225c21642f7488bbd3c21c |
23-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 1ecc749b: am 488547b0: am 2569df23: Merge "Shows filtered images in geometry modules and comparison." into gb-ub-photos-arches * commit '1ecc749b57a5dbde443ae9baf008653829f7c3e7': Shows filtered images in geometry modules and comparison.
|
1ecc749b57a5dbde443ae9baf008653829f7c3e7 |
23-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 488547b0: am 2569df23: Merge "Shows filtered images in geometry modules and comparison." into gb-ub-photos-arches * commit '488547b08f909a2f35433764fc97a5f8c7c990df': Shows filtered images in geometry modules and comparison.
|
cd35c2fc673f455de2d5853ecf1248d8ff167742 |
23-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 488547b0: am 2569df23: Merge "Shows filtered images in geometry modules and comparison." into gb-ub-photos-arches * commit '488547b08f909a2f35433764fc97a5f8c7c990df': Shows filtered images in geometry modules and comparison.
|
488547b08f909a2f35433764fc97a5f8c7c990df |
23-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 2569df23: Merge "Shows filtered images in geometry modules and comparison." into gb-ub-photos-arches * commit '2569df233987d1f43400a813ceb2ce72c738a4c3': Shows filtered images in geometry modules and comparison.
|
e3a1046cd0529b3cf70f27d7c2a0ff36a1de6ac2 |
23-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 2569df23: Merge "Shows filtered images in geometry modules and comparison." into gb-ub-photos-arches * commit '2569df233987d1f43400a813ceb2ce72c738a4c3': Shows filtered images in geometry modules and comparison.
|
0d6449b62b94c9a35a24dff093c4fe9d303f6ccd |
23-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 2569df23: Merge "Shows filtered images in geometry modules and comparison." into gb-ub-photos-arches * commit '2569df233987d1f43400a813ceb2ce72c738a4c3': Shows filtered images in geometry modules and comparison.
|
82aa1ba152cca26ee579d46abd7093044b1f9728 |
23-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 2569df23: Merge "Shows filtered images in geometry modules and comparison." into gb-ub-photos-arches * commit '2569df233987d1f43400a813ceb2ce72c738a4c3': Shows filtered images in geometry modules and comparison.
|
aa6efa7a6705da5c6451abbe7829af9695475a07 |
23-Oct-2012 |
George Mount <mount@google.com> |
am a2455518: am 76b4bea4: am 3bfbae1d: am 24af89b9: Merge "Ensure photo sphere icon shows for panoramas." into gb-ub-photos-arches * commit 'a2455518d7de975da3e6e645e68759b1d8edc932': Ensure photo sphere icon shows for panoramas.
|
cd0a788658ae61e215a677635779a3313e483d96 |
23-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Merge "Shows filtered images in geometry modules and comparison." into gb-ub-photos-arches
|
2569df233987d1f43400a813ceb2ce72c738a4c3 |
23-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Merge "Shows filtered images in geometry modules and comparison." into gb-ub-photos-arches
|
ba4f4df45ab6d53777373cbcd458d8f39bb965a2 |
23-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Merge "Shows filtered images in geometry modules and comparison." into gb-ub-photos-arches
|
a2455518d7de975da3e6e645e68759b1d8edc932 |
23-Oct-2012 |
George Mount <mount@google.com> |
am 76b4bea4: am 3bfbae1d: am 24af89b9: Merge "Ensure photo sphere icon shows for panoramas." into gb-ub-photos-arches * commit '76b4bea4e2cb77546df37bc8b674c0154c64af82': Ensure photo sphere icon shows for panoramas.
|
76b4bea4e2cb77546df37bc8b674c0154c64af82 |
23-Oct-2012 |
George Mount <mount@google.com> |
am 3bfbae1d: am 24af89b9: Merge "Ensure photo sphere icon shows for panoramas." into gb-ub-photos-arches * commit '3bfbae1d63fc755b8fef3b200912b03a1f3ec3a9': Ensure photo sphere icon shows for panoramas.
|
b2fb154fa84ec663bb8e181c299a3868e9ee98aa |
23-Oct-2012 |
George Mount <mount@google.com> |
am 3bfbae1d: am 24af89b9: Merge "Ensure photo sphere icon shows for panoramas." into gb-ub-photos-arches * commit '3bfbae1d63fc755b8fef3b200912b03a1f3ec3a9': Ensure photo sphere icon shows for panoramas.
|
3bfbae1d63fc755b8fef3b200912b03a1f3ec3a9 |
23-Oct-2012 |
George Mount <mount@google.com> |
am 24af89b9: Merge "Ensure photo sphere icon shows for panoramas." into gb-ub-photos-arches * commit '24af89b96e824e4a5f9053c2024f507087117c22': Ensure photo sphere icon shows for panoramas.
|
6aa0d8228186d967d9b92af505daffeb93911f2c |
23-Oct-2012 |
George Mount <mount@google.com> |
am 24af89b9: Merge "Ensure photo sphere icon shows for panoramas." into gb-ub-photos-arches * commit '24af89b96e824e4a5f9053c2024f507087117c22': Ensure photo sphere icon shows for panoramas.
|
b3b2ce5a939a82089f8c06ec0eab50d0530407d5 |
23-Oct-2012 |
George Mount <mount@google.com> |
am 24af89b9: Merge "Ensure photo sphere icon shows for panoramas." into gb-ub-photos-arches * commit '24af89b96e824e4a5f9053c2024f507087117c22': Ensure photo sphere icon shows for panoramas.
|
0107c1ee0b0815bdc1cbf383e776d17365f67530 |
23-Oct-2012 |
George Mount <mount@google.com> |
Merge "Ensure photo sphere icon shows for panoramas." into gb-ub-photos-arches
|
24af89b96e824e4a5f9053c2024f507087117c22 |
23-Oct-2012 |
George Mount <mount@google.com> |
Merge "Ensure photo sphere icon shows for panoramas." into gb-ub-photos-arches
|
8fa78323ff1b14c4eebb2cfa1e67f8259811b76c |
20-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Shows filtered images in geometry modules and comparison. bug:7279469 bug:7379286 bug:7344214 bug:7379140 Also: - cache multiple version (with/without geometry or filters applied) - doesn't show the original image anymore when waiting for a filtered version (shows nothing instead for now) - fix potential crash in Curves Change-Id: I4eabd42c30f6d370571f177d5efe92550798aed8
rc/com/android/gallery3d/filtershow/cache/DirectPresetCache.java
rc/com/android/gallery3d/filtershow/cache/ImageLoader.java
rc/com/android/gallery3d/filtershow/imageshow/ImageGeometry.java
rc/com/android/gallery3d/filtershow/imageshow/ImageShow.java
rc/com/android/gallery3d/filtershow/imageshow/ImageSlave.java
rc/com/android/gallery3d/filtershow/imageshow/ImageSmallBorder.java
rc/com/android/gallery3d/filtershow/imageshow/ImageSmallFilter.java
rc/com/android/gallery3d/filtershow/imageshow/ImageZoom.java
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
rc/com/android/gallery3d/filtershow/ui/ImageCurves.java
|
31529940021b9a18611b1a3fb4a0317ab8c89618 |
20-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Shows filtered images in geometry modules and comparison. bug:7279469 bug:7379286 bug:7344214 bug:7379140 Also: - cache multiple version (with/without geometry or filters applied) - doesn't show the original image anymore when waiting for a filtered version (shows nothing instead for now) - fix potential crash in Curves Change-Id: I4eabd42c30f6d370571f177d5efe92550798aed8
rc/com/android/gallery3d/filtershow/cache/DirectPresetCache.java
rc/com/android/gallery3d/filtershow/cache/ImageLoader.java
rc/com/android/gallery3d/filtershow/imageshow/ImageGeometry.java
rc/com/android/gallery3d/filtershow/imageshow/ImageShow.java
rc/com/android/gallery3d/filtershow/imageshow/ImageSlave.java
rc/com/android/gallery3d/filtershow/imageshow/ImageSmallBorder.java
rc/com/android/gallery3d/filtershow/imageshow/ImageSmallFilter.java
rc/com/android/gallery3d/filtershow/imageshow/ImageZoom.java
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
rc/com/android/gallery3d/filtershow/ui/ImageCurves.java
|
0584b3ec2ccd241b2b921eb5852bd421f14fe737 |
20-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Shows filtered images in geometry modules and comparison. bug:7279469 bug:7379286 bug:7344214 bug:7379140 Also: - cache multiple version (with/without geometry or filters applied) - doesn't show the original image anymore when waiting for a filtered version (shows nothing instead for now) - fix potential crash in Curves Change-Id: I4eabd42c30f6d370571f177d5efe92550798aed8
rc/com/android/gallery3d/filtershow/cache/DirectPresetCache.java
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
|
1d5fda98a8d6bb28ef3eafb1fc0f24152a91560e |
23-Oct-2012 |
George Mount <mount@google.com> |
Ensure photo sphere icon shows for panoramas. Bug 7393844 Change-Id: Id3b0d15606ec6e5d41558cbfc5089c4b1b229c63
rc/com/android/gallery3d/app/PhotoPageBottomControls.java
|
a11d5c16384cbe2445966af5d7cb0f9d1d66cf17 |
23-Oct-2012 |
George Mount <mount@google.com> |
Ensure photo sphere icon shows for panoramas. Bug 7393844 Change-Id: Id3b0d15606ec6e5d41558cbfc5089c4b1b229c63
rc/com/android/gallery3d/app/PhotoPageBottomControls.java
|
89a8599f438158bd4298e2c8d26b01147c705e34 |
23-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am 3f4e897c: (-s ours) am add322b8: am 306176fb: am 7c08064b: (-s ours) Import translations. DO NOT MERGE * commit '3f4e897c697b3524e503bed0d88dd440a307fb8a': Import translations. DO NOT MERGE
|
a70331e1ec09224a8321dc66857d0081cc81279f |
23-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am 290934bb: (-s ours) am f924cac6: am caace51d: Import translations. DO NOT MERGE * commit '290934bb245ea63ca1fb581ffd7dcb55b9ff945f': Import translations. DO NOT MERGE
|
3f4e897c697b3524e503bed0d88dd440a307fb8a |
23-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am add322b8: am 306176fb: am 7c08064b: (-s ours) Import translations. DO NOT MERGE * commit 'add322b83c852e090edd21be917b2680e98b3ba3': Import translations. DO NOT MERGE
|
290934bb245ea63ca1fb581ffd7dcb55b9ff945f |
23-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am f924cac6: am caace51d: Import translations. DO NOT MERGE * commit 'f924cac66bd4a39247ebe641bbd0c09ea7ef318f': Import translations. DO NOT MERGE
|
43b195c381e6f1267d0b7cf3e27b1ec7d2ffdae5 |
23-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am 992ac111: (-s ours) am 822c182e: Import translations. DO NOT MERGE * commit '992ac11125170d1ef849d5088d19f4939ef2e05c': Import translations. DO NOT MERGE
|
add322b83c852e090edd21be917b2680e98b3ba3 |
23-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am 306176fb: am 7c08064b: (-s ours) Import translations. DO NOT MERGE * commit '306176fbd21ece931ccff21bbe6cfa04a1cc751d': Import translations. DO NOT MERGE
|
f924cac66bd4a39247ebe641bbd0c09ea7ef318f |
23-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am caace51d: Import translations. DO NOT MERGE * commit 'caace51d7168d1cb2467268379c0883c4cb69853': Import translations. DO NOT MERGE
|
992ac11125170d1ef849d5088d19f4939ef2e05c |
23-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am 822c182e: Import translations. DO NOT MERGE * commit '822c182e8a76e5e9fcbfdce5f4e1f65f2828d511': Import translations. DO NOT MERGE
|
0f40db8d736ab95f0a3c9b03c9b20f5bd85a34f1 |
23-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am 306176fb: (-s ours) am 7c08064b: (-s ours) Import translations. DO NOT MERGE * commit '306176fbd21ece931ccff21bbe6cfa04a1cc751d': Import translations. DO NOT MERGE
|
e6319953a3b2d11251b57bfb6cd2a5e0ffbb552d |
23-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am caace51d: (-s ours) Import translations. DO NOT MERGE * commit 'caace51d7168d1cb2467268379c0883c4cb69853': Import translations. DO NOT MERGE
|
8bef00557ef7a797e6da6d3c6ee3bba6d227b1d4 |
23-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am 7c08064b: (-s ours) Import translations. DO NOT MERGE * commit '7c08064bc790dff6ab9da24d8aa07a96c9185b6a': Import translations. DO NOT MERGE
|
2b124e437ed7d6b1df726ba6ab5c4937241454fc |
23-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am 7c08064b: (-s ours) Import translations. DO NOT MERGE * commit '7c08064bc790dff6ab9da24d8aa07a96c9185b6a': Import translations. DO NOT MERGE
|
306176fbd21ece931ccff21bbe6cfa04a1cc751d |
23-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am 7c08064b: (-s ours) Import translations. DO NOT MERGE * commit '7c08064bc790dff6ab9da24d8aa07a96c9185b6a': Import translations. DO NOT MERGE
|
63e6d3c27398a9de74168bd49543ac44c43c3706 |
23-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I7f3677411b0885d85f210a58862d6a7726c54b2b Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-be/strings.xml
es/values-ca/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-uk/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
69cec707836ae8c072da9e0015160b96a5c5c6be |
23-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I64f71b4a576e4dca36d423471e0c8cbc7f399964 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-be/strings.xml
es/values-ca/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-uk/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
caace51d7168d1cb2467268379c0883c4cb69853 |
23-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ib62a767f559495732f3471c59e8017dbef5f950f Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-be/strings.xml
es/values-ca/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-uk/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
822c182e8a76e5e9fcbfdce5f4e1f65f2828d511 |
23-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I5edbde59607dc91ce39defa40a4a588666094cd7 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-be/strings.xml
es/values-ca/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-uk/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
f7de53cd651623ea8044638d7bf5ea9c1fbeeee9 |
23-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: If15c45ec7bcecd33d0b452c9b2ffcbe6a8d75cb1 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-be/strings.xml
es/values-ca/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-uk/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
325ea80c433100f2948829772e8ac3ee3dabb171 |
23-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: If15c45ec7bcecd33d0b452c9b2ffcbe6a8d75cb1 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-be/strings.xml
es/values-ca/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-uk/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
7c08064bc790dff6ab9da24d8aa07a96c9185b6a |
23-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I9a98e5d6a8117c370a3b3bb955f6196311efce79 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-be/strings.xml
es/values-ca/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-uk/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
b68d829c73b43e3584522fdf86a8d39a7d1df523 |
23-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I9a98e5d6a8117c370a3b3bb955f6196311efce79 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-be/strings.xml
es/values-ca/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-uk/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
7c2e0b823a320804c68fb75d7e9c138a9fe9f195 |
23-Oct-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
77c2d3bd9af48485e87ac5944cee4d034240348e |
23-Oct-2012 |
John Hoford <hoford@google.com> |
am cb010223: am 190c2285: am ea7366a5: am 5fbfe6f1: on entry check if Tiny Planet if not remove UI * commit 'cb010223f89d1772c48015b97d8aa71123f8e0be': on entry check if Tiny Planet if not remove UI
|
cb010223f89d1772c48015b97d8aa71123f8e0be |
23-Oct-2012 |
John Hoford <hoford@google.com> |
am 190c2285: am ea7366a5: am 5fbfe6f1: on entry check if Tiny Planet if not remove UI * commit '190c22855d5aaaf3485e22d1752a9ee799d9c048': on entry check if Tiny Planet if not remove UI
|
190c22855d5aaaf3485e22d1752a9ee799d9c048 |
23-Oct-2012 |
John Hoford <hoford@google.com> |
am ea7366a5: am 5fbfe6f1: on entry check if Tiny Planet if not remove UI * commit 'ea7366a517c9142a8e35d19a64e9964bb96ad2a8': on entry check if Tiny Planet if not remove UI
|
5790076999dfcd7d8cadb7ce616968a4954a5cc4 |
23-Oct-2012 |
John Hoford <hoford@google.com> |
am ea7366a5: am 5fbfe6f1: on entry check if Tiny Planet if not remove UI * commit 'ea7366a517c9142a8e35d19a64e9964bb96ad2a8': on entry check if Tiny Planet if not remove UI
|
b1494159c9a61b04d73dc1b4eeccf22d8444a8e6 |
23-Oct-2012 |
John Hoford <hoford@google.com> |
am 5fbfe6f1: on entry check if Tiny Planet if not remove UI * commit '5fbfe6f1d1f407e68b7334c6a5988f20bcf16d79': on entry check if Tiny Planet if not remove UI
|
ea7366a517c9142a8e35d19a64e9964bb96ad2a8 |
23-Oct-2012 |
John Hoford <hoford@google.com> |
am 5fbfe6f1: on entry check if Tiny Planet if not remove UI * commit '5fbfe6f1d1f407e68b7334c6a5988f20bcf16d79': on entry check if Tiny Planet if not remove UI
|
c5b6d66efef611193eafd2a3fe52b2db6582ca4d |
23-Oct-2012 |
John Hoford <hoford@google.com> |
am 5fbfe6f1: on entry check if Tiny Planet if not remove UI * commit '5fbfe6f1d1f407e68b7334c6a5988f20bcf16d79': on entry check if Tiny Planet if not remove UI
|
072e41e2c00abdc8f7e780679b5a943d41c6f1e6 |
23-Oct-2012 |
John Hoford <hoford@google.com> |
on entry check if Tiny Planet if not remove UI bug:7391885 Change-Id: Ic2bffa9f9fbaa2d437ce231a1478a1b63a0eed83
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/cache/ImageLoader.java
rc_pd/com/android/gallery3d/util/XmpUtilHelper.java
|
76ca2776b11c915ad75e0962e713f66289a98ed5 |
23-Oct-2012 |
John Hoford <hoford@google.com> |
on entry check if Tiny Planet if not remove UI bug:7391885 Change-Id: Ic2bffa9f9fbaa2d437ce231a1478a1b63a0eed83
ndroid.mk
|
5fbfe6f1d1f407e68b7334c6a5988f20bcf16d79 |
23-Oct-2012 |
John Hoford <hoford@google.com> |
on entry check if Tiny Planet if not remove UI bug:7391885 Change-Id: Ic2bffa9f9fbaa2d437ce231a1478a1b63a0eed83
ndroid.mk
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/cache/ImageLoader.java
rc_pd/com/android/gallery3d/util/XmpUtilHelper.java
|
b758eb0940de682455973eb1f191ca333c42c60f |
23-Oct-2012 |
Mangesh Ghiware <mghiware@google.com> |
am 1d1cccf7: am 87091dd2: am 4a138a84: am 63770752: Merge "Add activity-alias for video camera" into gb-ub-photos-arches * commit '1d1cccf7c95dea6b24b0f3d96fa3784a8159da4e': Add activity-alias for video camera
|
1d1cccf7c95dea6b24b0f3d96fa3784a8159da4e |
23-Oct-2012 |
Mangesh Ghiware <mghiware@google.com> |
am 87091dd2: am 4a138a84: am 63770752: Merge "Add activity-alias for video camera" into gb-ub-photos-arches * commit '87091dd2421773aa4a0ac0676b16785256041151': Add activity-alias for video camera
|
87091dd2421773aa4a0ac0676b16785256041151 |
23-Oct-2012 |
Mangesh Ghiware <mghiware@google.com> |
am 4a138a84: am 63770752: Merge "Add activity-alias for video camera" into gb-ub-photos-arches * commit '4a138a84682c3554d553a4909dbf12d48c7ea144': Add activity-alias for video camera
|
f7c1c580996c0fd874811871b9ca202cb191b674 |
23-Oct-2012 |
Mangesh Ghiware <mghiware@google.com> |
am 4a138a84: am 63770752: Merge "Add activity-alias for video camera" into gb-ub-photos-arches * commit '4a138a84682c3554d553a4909dbf12d48c7ea144': Add activity-alias for video camera
|
a75e17f28f5e0bbd4bace2939e82d016e90c7b87 |
23-Oct-2012 |
Mangesh Ghiware <mghiware@google.com> |
am 63770752: Merge "Add activity-alias for video camera" into gb-ub-photos-arches * commit '6377075221ef5b31c7f87e7f0103124e5177c2c3': Add activity-alias for video camera
|
4a138a84682c3554d553a4909dbf12d48c7ea144 |
23-Oct-2012 |
Mangesh Ghiware <mghiware@google.com> |
am 63770752: Merge "Add activity-alias for video camera" into gb-ub-photos-arches * commit '6377075221ef5b31c7f87e7f0103124e5177c2c3': Add activity-alias for video camera
|
57e8e2a122aa29820ae1a13ec81ec5f51e4fd1a0 |
23-Oct-2012 |
Mangesh Ghiware <mghiware@google.com> |
am 63770752: Merge "Add activity-alias for video camera" into gb-ub-photos-arches * commit '6377075221ef5b31c7f87e7f0103124e5177c2c3': Add activity-alias for video camera
|
6377075221ef5b31c7f87e7f0103124e5177c2c3 |
23-Oct-2012 |
Mangesh Ghiware <mghiware@google.com> |
Merge "Add activity-alias for video camera" into gb-ub-photos-arches
|
5203e171861ef59c0501b62ed4875a5b872b85f4 |
23-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 10c979ea: am 7f887b96: am 0df51da9: am afa5ac4c: Merge "Minor transition tweaks" into gb-ub-photos-arches * commit '10c979eab944f1cbb335e72346329b89245bbc12': Minor transition tweaks
|
10c979eab944f1cbb335e72346329b89245bbc12 |
23-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 7f887b96: am 0df51da9: am afa5ac4c: Merge "Minor transition tweaks" into gb-ub-photos-arches * commit '7f887b9680ac1c190f47e31e59781c7b4f7080d3': Minor transition tweaks
|
6377a7e8d36a60e0fe5be9854f0112ab5b654e01 |
23-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 0df51da9: am afa5ac4c: Merge "Minor transition tweaks" into gb-ub-photos-arches * commit '0df51da9b67e1c66f0a85a475ce567c11b8d4aa1': Minor transition tweaks
|
78c47a824a8e844c49f7cb0eb1773e4d42c8cecc |
23-Oct-2012 |
Doris Liu <tianliu@google.com> |
am 9ea2e181: am ee46cb04: am 7ad3eb28: am 3a64ad36: Merge "Show panorama thumbs in Gallery grid view" into gb-ub-photos-arches * commit '9ea2e181d591cba73dd15385c3b11d5f11764be3': Show panorama thumbs in Gallery grid view
|
7f887b9680ac1c190f47e31e59781c7b4f7080d3 |
23-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 0df51da9: am afa5ac4c: Merge "Minor transition tweaks" into gb-ub-photos-arches * commit '0df51da9b67e1c66f0a85a475ce567c11b8d4aa1': Minor transition tweaks
|
3f8c855cc55329b27796d6df5f7861184cea4e1c |
23-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am afa5ac4c: Merge "Minor transition tweaks" into gb-ub-photos-arches * commit 'afa5ac4c6f81f0fe8faf072ba84bfa8fd9083a6c': Minor transition tweaks
|
0df51da9b67e1c66f0a85a475ce567c11b8d4aa1 |
23-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am afa5ac4c: Merge "Minor transition tweaks" into gb-ub-photos-arches * commit 'afa5ac4c6f81f0fe8faf072ba84bfa8fd9083a6c': Minor transition tweaks
|
59be52525f790d007d0a6afaf303f22bea088d9a |
23-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am afa5ac4c: Merge "Minor transition tweaks" into gb-ub-photos-arches * commit 'afa5ac4c6f81f0fe8faf072ba84bfa8fd9083a6c': Minor transition tweaks
|
9ea2e181d591cba73dd15385c3b11d5f11764be3 |
23-Oct-2012 |
Doris Liu <tianliu@google.com> |
am ee46cb04: am 7ad3eb28: am 3a64ad36: Merge "Show panorama thumbs in Gallery grid view" into gb-ub-photos-arches * commit 'ee46cb0465b385adf3602aff25636bbe036d68b6': Show panorama thumbs in Gallery grid view
|
a1988ea0257872c07900a125a056427bb27258fe |
23-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Minor transition tweaks" into gb-ub-photos-arches
|
afa5ac4c6f81f0fe8faf072ba84bfa8fd9083a6c |
23-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Minor transition tweaks" into gb-ub-photos-arches
|
574be81d8b20df74f827bb4a1fba9b969a251102 |
23-Oct-2012 |
Doris Liu <tianliu@google.com> |
am 7ad3eb28: am 3a64ad36: Merge "Show panorama thumbs in Gallery grid view" into gb-ub-photos-arches * commit '7ad3eb28f0ab85669841c1b5589982834b465c1b': Show panorama thumbs in Gallery grid view
|
ee46cb0465b385adf3602aff25636bbe036d68b6 |
23-Oct-2012 |
Doris Liu <tianliu@google.com> |
am 7ad3eb28: am 3a64ad36: Merge "Show panorama thumbs in Gallery grid view" into gb-ub-photos-arches * commit '7ad3eb28f0ab85669841c1b5589982834b465c1b': Show panorama thumbs in Gallery grid view
|
b627ec4649645789e5dd799d429bf1017d60b37f |
23-Oct-2012 |
Doris Liu <tianliu@google.com> |
am 3a64ad36: Merge "Show panorama thumbs in Gallery grid view" into gb-ub-photos-arches * commit '3a64ad361b9d48407abd902b26949d3c6b34af66': Show panorama thumbs in Gallery grid view
|
764541efbcae01955fe1826e7fd58c17ad53c40b |
23-Oct-2012 |
Doris Liu <tianliu@google.com> |
am 3a64ad36: Merge "Show panorama thumbs in Gallery grid view" into gb-ub-photos-arches * commit '3a64ad361b9d48407abd902b26949d3c6b34af66': Show panorama thumbs in Gallery grid view
|
d0fd68e41891506bccb28a28f2dac5f4a4859984 |
23-Oct-2012 |
Doris Liu <tianliu@google.com> |
am 3a64ad36: Merge "Show panorama thumbs in Gallery grid view" into gb-ub-photos-arches * commit '3a64ad361b9d48407abd902b26949d3c6b34af66': Show panorama thumbs in Gallery grid view
|
7ad3eb28f0ab85669841c1b5589982834b465c1b |
23-Oct-2012 |
Doris Liu <tianliu@google.com> |
am 3a64ad36: Merge "Show panorama thumbs in Gallery grid view" into gb-ub-photos-arches * commit '3a64ad361b9d48407abd902b26949d3c6b34af66': Show panorama thumbs in Gallery grid view
|
57028113bd8ed41c136e5254d184e828ddd9ded1 |
23-Oct-2012 |
Doris Liu <tianliu@google.com> |
Merge "Show panorama thumbs in Gallery grid view" into gb-ub-photos-arches
|
3a64ad361b9d48407abd902b26949d3c6b34af66 |
23-Oct-2012 |
Doris Liu <tianliu@google.com> |
Merge "Show panorama thumbs in Gallery grid view" into gb-ub-photos-arches
|
3fefe69b92437c0ad9aa4eeae31f7b63cd9270e9 |
23-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Minor transition tweaks Bug: 7376109 Change-Id: Id4a761c3d601e453ac1ad2edbbea986af14bb21c
rc/com/android/gallery3d/anim/StateTransitionAnimation.java
|
b1b0ab99bebae3629a55c634cdf842d0d2f212d9 |
23-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Minor transition tweaks Bug: 7376109 Change-Id: Id4a761c3d601e453ac1ad2edbbea986af14bb21c
rc/com/android/gallery3d/anim/StateTransitionAnimation.java
|
bc537e5a4268739e05d2f7924123b6c3a0ad89f8 |
20-Oct-2012 |
Doris Liu <tianliu@google.com> |
Show panorama thumbs in Gallery grid view Bug: 7362229 Bug: 7378208 In addition to showing pano thumbs, this CL also removes the video play icon on the top-level album view thumbnails. Change-Id: I950bc66c38575036d5ad7464a2fd9a5dea9fae4b
es/drawable-hdpi/ic_360pano_holo_light.png
es/drawable-mdpi/ic_360pano_holo_light.png
es/drawable-xhdpi/ic_360pano_holo_light.png
|
691c9edf71c4c886b0cb8a3adc29e27b8eb65531 |
20-Oct-2012 |
Doris Liu <tianliu@google.com> |
Show panorama thumbs in Gallery grid view Bug: 7362229 Bug: 7378208 In addition to showing pano thumbs, this CL also removes the video play icon on the top-level album view thumbnails. Change-Id: I950bc66c38575036d5ad7464a2fd9a5dea9fae4b
rc/com/android/gallery3d/ui/AbstractSlotRenderer.java
rc/com/android/gallery3d/ui/AlbumSetSlidingWindow.java
rc/com/android/gallery3d/ui/AlbumSetSlotRenderer.java
rc/com/android/gallery3d/ui/AlbumSlidingWindow.java
rc/com/android/gallery3d/ui/AlbumSlotRenderer.java
|
2f060cc74ab6be5e5dd39e53dc99941b368ffb60 |
20-Oct-2012 |
Doris Liu <tianliu@google.com> |
Show panorama thumbs in Gallery grid view Bug: 7362229 Bug: 7378208 In addition to showing pano thumbs, this CL also removes the video play icon on the top-level album view thumbnails. Change-Id: I950bc66c38575036d5ad7464a2fd9a5dea9fae4b
es/drawable-hdpi/ic_360pano_holo_light.png
es/drawable-mdpi/ic_360pano_holo_light.png
es/drawable-xhdpi/ic_360pano_holo_light.png
rc/com/android/gallery3d/ui/AbstractSlotRenderer.java
rc/com/android/gallery3d/ui/AlbumSetSlidingWindow.java
rc/com/android/gallery3d/ui/AlbumSetSlotRenderer.java
rc/com/android/gallery3d/ui/AlbumSlidingWindow.java
rc/com/android/gallery3d/ui/AlbumSlotRenderer.java
|
6afba64fb6177e1ed481cf706ef5d4f1cf4cdd6c |
23-Oct-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
7f378acfc2230257cbc6e01e5697939711e384ae |
23-Oct-2012 |
Hung-ying Tyan <tyanh@google.com> |
am d3396cf2: am f39fa25d: am 23cfddb4: am bdc0f6f2: Merge "Move new exif lib to gallerycommon." into gb-ub-photos-arches * commit 'd3396cf26d7b03bcd86d6f15ae5738f7cb07e9b6': Move new exif lib to gallerycommon.
|
d3396cf26d7b03bcd86d6f15ae5738f7cb07e9b6 |
23-Oct-2012 |
Hung-ying Tyan <tyanh@google.com> |
am f39fa25d: am 23cfddb4: am bdc0f6f2: Merge "Move new exif lib to gallerycommon." into gb-ub-photos-arches * commit 'f39fa25d0f659048de00ce56364cf5900c3892af': Move new exif lib to gallerycommon.
|
1927d2e6fb66ced567c44a8898ea01541c3718a2 |
23-Oct-2012 |
John Reck <jreck@google.com> |
am ee44bea9: am 31457215: am fdfced2d: am ff4e0460: Merge "Drive GLRootView with Choreographer" into gb-ub-photos-arches * commit 'ee44bea9f4711851357d8d5f76239689758a2c40': Drive GLRootView with Choreographer
|
c09daea126a7f1d609908883958963a99d86e896 |
23-Oct-2012 |
Hung-ying Tyan <tyanh@google.com> |
am 23cfddb4: am bdc0f6f2: Merge "Move new exif lib to gallerycommon." into gb-ub-photos-arches * commit '23cfddb44a19683b1f5a61200875048d7b916dd4': Move new exif lib to gallerycommon.
|
f39fa25d0f659048de00ce56364cf5900c3892af |
23-Oct-2012 |
Hung-ying Tyan <tyanh@google.com> |
am 23cfddb4: am bdc0f6f2: Merge "Move new exif lib to gallerycommon." into gb-ub-photos-arches * commit '23cfddb44a19683b1f5a61200875048d7b916dd4': Move new exif lib to gallerycommon.
|
ee44bea9f4711851357d8d5f76239689758a2c40 |
23-Oct-2012 |
John Reck <jreck@google.com> |
am 31457215: am fdfced2d: am ff4e0460: Merge "Drive GLRootView with Choreographer" into gb-ub-photos-arches * commit '3145721500471079def676491547c0acb12b3e9c': Drive GLRootView with Choreographer
|
23cfddb44a19683b1f5a61200875048d7b916dd4 |
23-Oct-2012 |
Hung-ying Tyan <tyanh@google.com> |
am bdc0f6f2: Merge "Move new exif lib to gallerycommon." into gb-ub-photos-arches * commit 'bdc0f6f2784b46ebe5d33d5e7e85bc347f07c468': Move new exif lib to gallerycommon.
|
1c515f1aed514638cc030cd5cba5258231e74bb5 |
23-Oct-2012 |
Hung-ying Tyan <tyanh@google.com> |
am bdc0f6f2: Merge "Move new exif lib to gallerycommon." into gb-ub-photos-arches * commit 'bdc0f6f2784b46ebe5d33d5e7e85bc347f07c468': Move new exif lib to gallerycommon.
allerycommon/src/com/android/gallery3d/exif/ExifData.java
allerycommon/src/com/android/gallery3d/exif/ExifTag.java
|
f9b86094984f2ca74538267c6e71e8381422642e |
23-Oct-2012 |
Hung-ying Tyan <tyanh@google.com> |
am bdc0f6f2: Merge "Move new exif lib to gallerycommon." into gb-ub-photos-arches * commit 'bdc0f6f2784b46ebe5d33d5e7e85bc347f07c468': Move new exif lib to gallerycommon.
|
cc5567a874a90a324a414a199334582864a9478c |
23-Oct-2012 |
Hung-ying Tyan <tyanh@google.com> |
am bdc0f6f2: Merge "Move new exif lib to gallerycommon." into gb-ub-photos-arches * commit 'bdc0f6f2784b46ebe5d33d5e7e85bc347f07c468': Move new exif lib to gallerycommon.
|
38d295679f6f81313d1e2ec8d4f765255467f267 |
23-Oct-2012 |
John Reck <jreck@google.com> |
am fdfced2d: am ff4e0460: Merge "Drive GLRootView with Choreographer" into gb-ub-photos-arches * commit 'fdfced2d4eb28e510926aa704921cfe2d6e170b5': Drive GLRootView with Choreographer
|
3145721500471079def676491547c0acb12b3e9c |
23-Oct-2012 |
John Reck <jreck@google.com> |
am fdfced2d: am ff4e0460: Merge "Drive GLRootView with Choreographer" into gb-ub-photos-arches * commit 'fdfced2d4eb28e510926aa704921cfe2d6e170b5': Drive GLRootView with Choreographer
|
4e791ba2c3992d948c0ac4c70c2dafd289386c21 |
23-Oct-2012 |
Hung-ying Tyan <tyanh@google.com> |
Merge "Move new exif lib to gallerycommon." into gb-ub-photos-arches
|
bdc0f6f2784b46ebe5d33d5e7e85bc347f07c468 |
23-Oct-2012 |
Hung-ying Tyan <tyanh@google.com> |
Merge "Move new exif lib to gallerycommon." into gb-ub-photos-arches
|
c47eddaea5b7d7b56a0c0c623a3f2affc014ca3b |
23-Oct-2012 |
Hung-ying Tyan <tyanh@google.com> |
Merge "Move new exif lib to gallerycommon." into gb-ub-photos-arches
|
fdfced2d4eb28e510926aa704921cfe2d6e170b5 |
23-Oct-2012 |
John Reck <jreck@google.com> |
am ff4e0460: Merge "Drive GLRootView with Choreographer" into gb-ub-photos-arches * commit 'ff4e0460b4cdeb329e37cb5f41eedc45717a17c4': Drive GLRootView with Choreographer
|
8c18fb9269c4fdd72a48ec76851e293950190b29 |
23-Oct-2012 |
John Reck <jreck@google.com> |
am ff4e0460: Merge "Drive GLRootView with Choreographer" into gb-ub-photos-arches * commit 'ff4e0460b4cdeb329e37cb5f41eedc45717a17c4': Drive GLRootView with Choreographer
|
1c8c1caf73cb01f1ba3652fcc8e3f7408e47438f |
23-Oct-2012 |
John Reck <jreck@google.com> |
am ff4e0460: Merge "Drive GLRootView with Choreographer" into gb-ub-photos-arches * commit 'ff4e0460b4cdeb329e37cb5f41eedc45717a17c4': Drive GLRootView with Choreographer
|
d4f9359d64b447e78c5101d11e71b628fc82ef2c |
23-Oct-2012 |
John Reck <jreck@google.com> |
Merge "Drive GLRootView with Choreographer" into gb-ub-photos-arches
|
ff4e0460b4cdeb329e37cb5f41eedc45717a17c4 |
23-Oct-2012 |
John Reck <jreck@google.com> |
Merge "Drive GLRootView with Choreographer" into gb-ub-photos-arches
|
bf30e7dfdd17b59894014d0c081a59e444f92b39 |
23-Oct-2012 |
John Reck <jreck@google.com> |
Drive GLRootView with Choreographer Bug: 7332724 By routing requestRender through postOnAnimation we can drive the GLRootView's rendering with the UI thread's coreographer, which ensures that touch events are processed before drawing Change-Id: Iac2b3229e9a09ee0319c64c5fc7cb906512a379c
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
|
ccd5750055f6b692f4d5bb9fd1a1a8428966cbed |
23-Oct-2012 |
John Reck <jreck@google.com> |
Drive GLRootView with Choreographer Bug: 7332724 By routing requestRender through postOnAnimation we can drive the GLRootView's rendering with the UI thread's coreographer, which ensures that touch events are processed before drawing Change-Id: Iac2b3229e9a09ee0319c64c5fc7cb906512a379c
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
rc/com/android/gallery3d/ui/GLRootView.java
|
b75f5defe8ace12b8b563e713f7175863ab5713d |
23-Oct-2012 |
John Reck <jreck@google.com> |
Drive GLRootView with Choreographer Bug: 7332724 By routing requestRender through postOnAnimation we can drive the GLRootView's rendering with the UI thread's coreographer, which ensures that touch events are processed before drawing Change-Id: Iac2b3229e9a09ee0319c64c5fc7cb906512a379c
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
rc/com/android/gallery3d/ui/GLRootView.java
|
1bb404b6d4db93c5968f773cba9f144f96f91ba9 |
23-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am ab7a4e05: am 5fcadf44: am b21c127c: am e96e907a: Merge "Scroll to placeholder in gallery filmstrip launches camera" into gb-ub-photos-arches * commit 'ab7a4e056843e935b8e320310ec81c3531e5c515': Scroll to placeholder in gallery filmstrip launches camera
|
ab7a4e056843e935b8e320310ec81c3531e5c515 |
23-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 5fcadf44: am b21c127c: am e96e907a: Merge "Scroll to placeholder in gallery filmstrip launches camera" into gb-ub-photos-arches * commit '5fcadf4460dce65aada82afb101ebd98d2f1985a': Scroll to placeholder in gallery filmstrip launches camera
|
5fcadf4460dce65aada82afb101ebd98d2f1985a |
23-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am b21c127c: am e96e907a: Merge "Scroll to placeholder in gallery filmstrip launches camera" into gb-ub-photos-arches * commit 'b21c127cf83ccc1bd86deb3fb35fea974e69957c': Scroll to placeholder in gallery filmstrip launches camera
|
20a91815828f7f0a98eb4b577eb9c618b870b1d0 |
23-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am b21c127c: am e96e907a: Merge "Scroll to placeholder in gallery filmstrip launches camera" into gb-ub-photos-arches * commit 'b21c127cf83ccc1bd86deb3fb35fea974e69957c': Scroll to placeholder in gallery filmstrip launches camera
|
b21c127cf83ccc1bd86deb3fb35fea974e69957c |
23-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am e96e907a: Merge "Scroll to placeholder in gallery filmstrip launches camera" into gb-ub-photos-arches * commit 'e96e907a01c0d633828dade014f07a5b93b07356': Scroll to placeholder in gallery filmstrip launches camera
|
d49f3bb068bf4fd78480cf9de04d28c9ae70388f |
23-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am e96e907a: Merge "Scroll to placeholder in gallery filmstrip launches camera" into gb-ub-photos-arches * commit 'e96e907a01c0d633828dade014f07a5b93b07356': Scroll to placeholder in gallery filmstrip launches camera
|
4e5e4dce7403b1335b6d22f085d0e0faf329cf83 |
23-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am e96e907a: Merge "Scroll to placeholder in gallery filmstrip launches camera" into gb-ub-photos-arches * commit 'e96e907a01c0d633828dade014f07a5b93b07356': Scroll to placeholder in gallery filmstrip launches camera
|
e49d4f91b60b33c8f2f59e217916ffe4507f1714 |
23-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Scroll to placeholder in gallery filmstrip launches camera" into gb-ub-photos-arches
|
e96e907a01c0d633828dade014f07a5b93b07356 |
23-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Scroll to placeholder in gallery filmstrip launches camera" into gb-ub-photos-arches
|
2892a1cf0ccff8dae72b8820771529b672d61de2 |
23-Oct-2012 |
Mangesh Ghiware <mghiware@google.com> |
Add activity-alias for video camera Bug: 7390076 Change-Id: I4827f1b5412476075f89d714fe3f1bbe2576c357
ndroidManifest.xml
|
2bb9b8cfd2605d913d277a41b37e22696a424193 |
23-Oct-2012 |
Mangesh Ghiware <mghiware@google.com> |
Add activity-alias for video camera Bug: 7390076 Change-Id: I4827f1b5412476075f89d714fe3f1bbe2576c357
ndroidManifest.xml
|
998b051d6e7e5cdd664903fc6694bbb0f9618b87 |
23-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am b36448c4: am d1472ac4: am 91814c2e: am 168db2f1: Merge "Fix geometry xforms & minor bug." into gb-ub-photos-arches * commit 'b36448c4e0089ad1a03e54c030dc9d898d3c2255': Fix geometry xforms & minor bug.
|
b36448c4e0089ad1a03e54c030dc9d898d3c2255 |
23-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am d1472ac4: am 91814c2e: am 168db2f1: Merge "Fix geometry xforms & minor bug." into gb-ub-photos-arches * commit 'd1472ac4a61cfd46d2eeafb6daaf04ed78633721': Fix geometry xforms & minor bug.
|
6d9a6ff8ed24be732f98cb83180f951e871f98dd |
23-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am 91814c2e: am 168db2f1: Merge "Fix geometry xforms & minor bug." into gb-ub-photos-arches * commit '91814c2e343b9a0b602e38816047bfd7cb58007c': Fix geometry xforms & minor bug.
|
d1472ac4a61cfd46d2eeafb6daaf04ed78633721 |
23-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am 91814c2e: am 168db2f1: Merge "Fix geometry xforms & minor bug." into gb-ub-photos-arches * commit '91814c2e343b9a0b602e38816047bfd7cb58007c': Fix geometry xforms & minor bug.
|
91814c2e343b9a0b602e38816047bfd7cb58007c |
23-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am 168db2f1: Merge "Fix geometry xforms & minor bug." into gb-ub-photos-arches * commit '168db2f10069c3a15a9c3b9d0325cac0ae779b99': Fix geometry xforms & minor bug.
|
817f83be3d4b7baedf73aee2ebc100452b615630 |
23-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am 168db2f1: Merge "Fix geometry xforms & minor bug." into gb-ub-photos-arches * commit '168db2f10069c3a15a9c3b9d0325cac0ae779b99': Fix geometry xforms & minor bug.
|
588ac202f994d97b54ee3650ff3e61dd133107f5 |
23-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am 168db2f1: Merge "Fix geometry xforms & minor bug." into gb-ub-photos-arches * commit '168db2f10069c3a15a9c3b9d0325cac0ae779b99': Fix geometry xforms & minor bug.
|
bc912f9e17b55ab815bd12081e1ceb71a2c9f424 |
23-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Fix geometry xforms & minor bug." into gb-ub-photos-arches
|
168db2f10069c3a15a9c3b9d0325cac0ae779b99 |
23-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Fix geometry xforms & minor bug." into gb-ub-photos-arches
|
fe092f6b5b63c128536bd54c9860ef2f2a7ba91c |
23-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE"
|
b2993d29a712533610d7c4b39b31ad74f0d76c68 |
23-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
|
1426b538b0df7653b77b05243c422b2e155c5d14 |
22-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Scroll to placeholder in gallery filmstrip launches camera Bug: 7368079 Change-Id: I50323b6b4d64672486cdca785b9f1e1ae2f02a97
rc/com/android/gallery3d/app/PhotoPage.java
|
cc6ad8217cb09b778d400c9c5e5928170ca53737 |
22-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Scroll to placeholder in gallery filmstrip launches camera Bug: 7368079 Change-Id: I50323b6b4d64672486cdca785b9f1e1ae2f02a97
rc/com/android/gallery3d/app/PhotoPage.java
|
e9be9ab32dd91432d41958a6e2cdabe16409b35c |
22-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 9c9981d2: am 631ce787: am cfbbe15d: am 3536bd34: Merge "Increase album label size on high-res screens" into gb-ub-photos-arches * commit '9c9981d26cf3cfd749651dc6b1cae7ac08720c5f': Increase album label size on high-res screens
|
9c9981d26cf3cfd749651dc6b1cae7ac08720c5f |
22-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 631ce787: am cfbbe15d: am 3536bd34: Merge "Increase album label size on high-res screens" into gb-ub-photos-arches * commit '631ce7871e13dae09723d463cd4af71558fa0cb2': Increase album label size on high-res screens
|
1b73272f029c89541ad5e230865b50bf4532876a |
22-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am cfbbe15d: am 3536bd34: Merge "Increase album label size on high-res screens" into gb-ub-photos-arches * commit 'cfbbe15d8b927d3be388340c62cee5e5b3af850f': Increase album label size on high-res screens
|
631ce7871e13dae09723d463cd4af71558fa0cb2 |
22-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am cfbbe15d: am 3536bd34: Merge "Increase album label size on high-res screens" into gb-ub-photos-arches * commit 'cfbbe15d8b927d3be388340c62cee5e5b3af850f': Increase album label size on high-res screens
|
5bc16d5b8d769797e7a0192e1787e627afda8378 |
22-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 3536bd34: Merge "Increase album label size on high-res screens" into gb-ub-photos-arches * commit '3536bd340f43edfc9f318df5f49e9319e62d0cc4': Increase album label size on high-res screens
|
d6a2d0867648e94621eeeb97c7a1c5cc95050a12 |
22-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 3536bd34: Merge "Increase album label size on high-res screens" into gb-ub-photos-arches * commit '3536bd340f43edfc9f318df5f49e9319e62d0cc4': Increase album label size on high-res screens
|
cfbbe15d8b927d3be388340c62cee5e5b3af850f |
22-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 3536bd34: Merge "Increase album label size on high-res screens" into gb-ub-photos-arches * commit '3536bd340f43edfc9f318df5f49e9319e62d0cc4': Increase album label size on high-res screens
|
fcce3a88791c8419c2190a5f8e2bf571447fa2c3 |
22-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Increase album label size on high-res screens" into gb-ub-photos-arches
|
3536bd340f43edfc9f318df5f49e9319e62d0cc4 |
22-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Increase album label size on high-res screens" into gb-ub-photos-arches
|
ebedbd490611549951524429e8f9d15fc14c2671 |
22-Oct-2012 |
George Mount <mount@google.com> |
am 45de473d: am 7ab58ca5: am f2272574: am 58d326ea: Merge "Add null-check for StitchingServiceProvider." into gb-ub-photos-arches * commit '45de473de20d13fd33ace18f0b0d848788fe7943': Add null-check for StitchingServiceProvider.
|
45de473de20d13fd33ace18f0b0d848788fe7943 |
22-Oct-2012 |
George Mount <mount@google.com> |
am 7ab58ca5: am f2272574: am 58d326ea: Merge "Add null-check for StitchingServiceProvider." into gb-ub-photos-arches * commit '7ab58ca5e8a13d3bdaf614bf37eaef42efb2aef1': Add null-check for StitchingServiceProvider.
|
7ab58ca5e8a13d3bdaf614bf37eaef42efb2aef1 |
22-Oct-2012 |
George Mount <mount@google.com> |
am f2272574: am 58d326ea: Merge "Add null-check for StitchingServiceProvider." into gb-ub-photos-arches * commit 'f2272574dcefc4e1f369fbf0de55559d1548c741': Add null-check for StitchingServiceProvider.
|
d5d4246ffcbdfdf491846b1a314fb59064e2f4b4 |
22-Oct-2012 |
George Mount <mount@google.com> |
am f2272574: am 58d326ea: Merge "Add null-check for StitchingServiceProvider." into gb-ub-photos-arches * commit 'f2272574dcefc4e1f369fbf0de55559d1548c741': Add null-check for StitchingServiceProvider.
|
b915875de3bf5f80be9d670bbfadd03763129c2f |
22-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am a43b51a5: (-s ours) am 359155c5: am 1d25a687: am 73c89b45: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches * commit 'a43b51a54f9ffb9555150bab1bd36dcc05b89337': Import translations. DO NOT MERGE
|
d41414cc34d6800b3926a83be267160c481802a0 |
22-Oct-2012 |
George Mount <mount@google.com> |
am 58d326ea: Merge "Add null-check for StitchingServiceProvider." into gb-ub-photos-arches * commit '58d326ea368ae275f03ec158a9ec5f9d2965593a': Add null-check for StitchingServiceProvider.
|
385c3773e9018d1f452c00b1e440bf20d5b01cc0 |
22-Oct-2012 |
George Mount <mount@google.com> |
am 58d326ea: Merge "Add null-check for StitchingServiceProvider." into gb-ub-photos-arches * commit '58d326ea368ae275f03ec158a9ec5f9d2965593a': Add null-check for StitchingServiceProvider.
|
f2272574dcefc4e1f369fbf0de55559d1548c741 |
22-Oct-2012 |
George Mount <mount@google.com> |
am 58d326ea: Merge "Add null-check for StitchingServiceProvider." into gb-ub-photos-arches * commit '58d326ea368ae275f03ec158a9ec5f9d2965593a': Add null-check for StitchingServiceProvider.
|
3651c39f614e37cbf35896838bf56bacd6423266 |
22-Oct-2012 |
George Mount <mount@google.com> |
Merge "Add null-check for StitchingServiceProvider." into gb-ub-photos-arches
|
58d326ea368ae275f03ec158a9ec5f9d2965593a |
22-Oct-2012 |
George Mount <mount@google.com> |
Merge "Add null-check for StitchingServiceProvider." into gb-ub-photos-arches
|
a43b51a54f9ffb9555150bab1bd36dcc05b89337 |
22-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am 359155c5: am 1d25a687: am 73c89b45: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches * commit '359155c578c0a1ec6c5653ec8a01b36c6141fd98': Import translations. DO NOT MERGE
|
eebf6d5699907c79437b0c21cf1d9f16fb6a84b0 |
22-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am 1b1adeb7: (-s ours) am de825fc8: am 2ed15703: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev * commit '1b1adeb77c0fded2fcbc6279536bdaa1e74ce05a': Import translations. DO NOT MERGE
|
bf03e733c65947846d2919f33a2a0527a25d7c7e |
22-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am 91dfa53b: (-s ours) am 2bdf77dc: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev * commit '91dfa53b7008a4802a74d786973c354e6f3f3612': Import translations. DO NOT MERGE
|
359155c578c0a1ec6c5653ec8a01b36c6141fd98 |
22-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am 1d25a687: am 73c89b45: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches * commit '1d25a68700185f2126dc387a28c0d966853e8776': Import translations. DO NOT MERGE
|
541b5568552c09077b562a284c3b7d24549b2ea2 |
22-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am 1d25a687: (-s ours) am 73c89b45: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches * commit '1d25a68700185f2126dc387a28c0d966853e8776': Import translations. DO NOT MERGE
|
1b1adeb77c0fded2fcbc6279536bdaa1e74ce05a |
22-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am de825fc8: am 2ed15703: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev * commit 'de825fc8f112c15a3b876555ff6b46d98614ba39': Import translations. DO NOT MERGE
|
91dfa53b7008a4802a74d786973c354e6f3f3612 |
22-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am 2bdf77dc: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev * commit '2bdf77dc44cc34d02eae54e467d10fdfdd7ed1a6': Import translations. DO NOT MERGE
|
de825fc8f112c15a3b876555ff6b46d98614ba39 |
22-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am 2ed15703: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev * commit '2ed15703c06d1b4691737475f127eecbffa056e9': Import translations. DO NOT MERGE
|
1d25a68700185f2126dc387a28c0d966853e8776 |
22-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am 73c89b45: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches * commit '73c89b45b122cbdcbcffa618f0fa2386829d710a': Import translations. DO NOT MERGE
|
e2dd511925056b11ab12b782e9e80a6a4038f042 |
22-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am 2ed15703: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev * commit '2ed15703c06d1b4691737475f127eecbffa056e9': Import translations. DO NOT MERGE
|
2bdf77dc44cc34d02eae54e467d10fdfdd7ed1a6 |
22-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
|
d5bc1a048db30cbe1c6666711ad47293d3147b69 |
22-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am 73c89b45: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches * commit '73c89b45b122cbdcbcffa618f0fa2386829d710a': Import translations. DO NOT MERGE
|
1552e09f1a3783c89e6b6353bf65d919633e72cd |
22-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am 73c89b45: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches * commit '73c89b45b122cbdcbcffa618f0fa2386829d710a': Import translations. DO NOT MERGE
|
5b69a25dceaf8d8c344e9644b7599f26cff7836e |
22-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
|
70195916dab80ee6b4502db16b7d20487505f1fd |
22-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
|
7928e61bf7fb735f5bd285419d8ded1dd79186bb |
22-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
|
73c89b45b122cbdcbcffa618f0fa2386829d710a |
22-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
|
2ed15703c06d1b4691737475f127eecbffa056e9 |
22-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
|
e6aa70ab5b8f94ac53306c12db38702249cb93e1 |
22-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Increase album label size on high-res screens Bug: 7382498 Change-Id: I50f5f7c6006fed493918c05f2eb7d2cf3ade3947
es/values-xlarge/dimensions.xml
|
5eeb17fdba02adbe95397e840b7f429db2220b2d |
22-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Increase album label size on high-res screens Bug: 7382498 Change-Id: I50f5f7c6006fed493918c05f2eb7d2cf3ade3947
es/values-xlarge/dimensions.xml
|
e1c830b5b51ad4760d2730227d89b9326dfc48b6 |
19-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Fix geometry xforms & minor bug. Bug: 7376048 Fixed geometry transform. Fixed minor bug where the foldername for saved edited images was incorrect. Change-Id: I901df11cf71cd987b354dd7821fef7a484b0cbd3
rc/com/android/gallery3d/filtershow/filters/ImageFilterGeometry.java
rc/com/android/gallery3d/filtershow/imageshow/GeometryMetadata.java
|
4ed09a1d07d7a0cb8bb966b9c68e3ac5cc5fa889 |
19-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Fix geometry xforms & minor bug. Bug: 7376048 Fixed geometry transform. Fixed minor bug where the foldername for saved edited images was incorrect. Change-Id: I901df11cf71cd987b354dd7821fef7a484b0cbd3
rc/com/android/gallery3d/filtershow/filters/ImageFilterGeometry.java
rc/com/android/gallery3d/filtershow/imageshow/GeometryMetadata.java
|
3d7829c71c27a14e671017b46228c5d684bd349e |
22-Oct-2012 |
George Mount <mount@google.com> |
Add null-check for StitchingServiceProvider. Bug 7386827 Change-Id: Id1ec7399202c6e67bb215f1309697b2f718a3c03
rc/com/android/gallery3d/app/GalleryAppImpl.java
|
cb3a3da9a11dbebbdc77ff91ea5b18358295a43e |
22-Oct-2012 |
George Mount <mount@google.com> |
Add null-check for StitchingServiceProvider. Bug 7386827 Change-Id: Id1ec7399202c6e67bb215f1309697b2f718a3c03
rc/com/android/gallery3d/app/GalleryAppImpl.java
|
11402c9297f8122d4e02e9d8fc82c7810ee0734e |
22-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 9853b0a0: am c7c829c5: am 34347598: am 1dace572: Merge "Better transition between Gallery and editor" into gb-ub-photos-arches * commit '9853b0a0c901177466cce11b0c4fe5374592f569': Better transition between Gallery and editor
|
3f68600cf76e565b728da1b8a122d193de638155 |
22-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am f4c5c381: am 8fbca580: am 85930f99: am 0a32b7af: Fix to ensure visible history adapter strings are from xml. * commit 'f4c5c38123afd4d9a3f49f37e3daf5275a10ae44': Fix to ensure visible history adapter strings are from xml.
|
9853b0a0c901177466cce11b0c4fe5374592f569 |
22-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am c7c829c5: am 34347598: am 1dace572: Merge "Better transition between Gallery and editor" into gb-ub-photos-arches * commit 'c7c829c5dc1208984ff0e5953e9a02a9162efc17': Better transition between Gallery and editor
|
f4c5c38123afd4d9a3f49f37e3daf5275a10ae44 |
22-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am 8fbca580: am 85930f99: am 0a32b7af: Fix to ensure visible history adapter strings are from xml. * commit '8fbca580f219eb88afb263936ea78e38ec93d416': Fix to ensure visible history adapter strings are from xml.
|
e7e4f11e28420cc6eb673505e63d57a6467efed3 |
22-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 34347598: am 1dace572: Merge "Better transition between Gallery and editor" into gb-ub-photos-arches * commit '3434759816cea392a78df62a1ad3d0151163510a': Better transition between Gallery and editor
|
c7c829c5dc1208984ff0e5953e9a02a9162efc17 |
22-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 34347598: am 1dace572: Merge "Better transition between Gallery and editor" into gb-ub-photos-arches * commit '3434759816cea392a78df62a1ad3d0151163510a': Better transition between Gallery and editor
|
82a7226cd5345c9397302e4951c238d95a5bc35a |
22-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am 85930f99: am 0a32b7af: Fix to ensure visible history adapter strings are from xml. * commit '85930f99d020b9b8bac7bd29cf77434c034d152a': Fix to ensure visible history adapter strings are from xml.
|
8fbca580f219eb88afb263936ea78e38ec93d416 |
22-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am 85930f99: am 0a32b7af: Fix to ensure visible history adapter strings are from xml. * commit '85930f99d020b9b8bac7bd29cf77434c034d152a': Fix to ensure visible history adapter strings are from xml.
|
3434759816cea392a78df62a1ad3d0151163510a |
22-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 1dace572: Merge "Better transition between Gallery and editor" into gb-ub-photos-arches * commit '1dace572562075e755823bbb7b02d09bb6ca1259': Better transition between Gallery and editor
|
9ff582c0df1212d1e616ddffbc109759a921f7d9 |
22-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 1dace572: Merge "Better transition between Gallery and editor" into gb-ub-photos-arches * commit '1dace572562075e755823bbb7b02d09bb6ca1259': Better transition between Gallery and editor
|
987c0aee92ba5e1bd784d636eefc593f8b2e1274 |
22-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 1dace572: Merge "Better transition between Gallery and editor" into gb-ub-photos-arches * commit '1dace572562075e755823bbb7b02d09bb6ca1259': Better transition between Gallery and editor
|
f2fc539025f9d8b7389936e3b83b5d2d28ad7ff8 |
22-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am 0a32b7af: Fix to ensure visible history adapter strings are from xml. * commit '0a32b7afc5286a5c7aa334b9338591d61a49731f': Fix to ensure visible history adapter strings are from xml.
|
85930f99d020b9b8bac7bd29cf77434c034d152a |
22-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am 0a32b7af: Fix to ensure visible history adapter strings are from xml. * commit '0a32b7afc5286a5c7aa334b9338591d61a49731f': Fix to ensure visible history adapter strings are from xml.
|
99233894a95701caeab689e266f04ea43b12e914 |
22-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am 0a32b7af: Fix to ensure visible history adapter strings are from xml. * commit '0a32b7afc5286a5c7aa334b9338591d61a49731f': Fix to ensure visible history adapter strings are from xml.
|
8f391958bed34c652c3a868386052a7c770fed97 |
22-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am 0a32b7af: Fix to ensure visible history adapter strings are from xml. * commit '0a32b7afc5286a5c7aa334b9338591d61a49731f': Fix to ensure visible history adapter strings are from xml.
|
2f7d7b23ff41800d01edad9d30ddd9517b309e18 |
22-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Better transition between Gallery and editor" into gb-ub-photos-arches
|
1dace572562075e755823bbb7b02d09bb6ca1259 |
22-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Better transition between Gallery and editor" into gb-ub-photos-arches
|
d21977196891881e46fb40d3179cebcf24031db1 |
20-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Fix to ensure visible history adapter strings are from xml. Bug: 7379327 Change-Id: I5fcb6fec1e9abe05689dd3b9f4e70e518a9e09d1
es/values/filtershow_strings.xml
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
|
7ccf0111d388bbaf963ace2ea9eeb37903bffb0a |
20-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Fix to ensure visible history adapter strings are from xml. Bug: 7379327 Change-Id: I5fcb6fec1e9abe05689dd3b9f4e70e518a9e09d1
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/HistoryAdapter.java
rc/com/android/gallery3d/filtershow/PanelController.java
rc/com/android/gallery3d/filtershow/imageshow/ImageCrop.java
rc/com/android/gallery3d/filtershow/imageshow/ImageFlip.java
rc/com/android/gallery3d/filtershow/imageshow/ImageRotate.java
rc/com/android/gallery3d/filtershow/imageshow/ImageStraighten.java
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
|
0a32b7afc5286a5c7aa334b9338591d61a49731f |
20-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Fix to ensure visible history adapter strings are from xml. Bug: 7379327 Change-Id: I5fcb6fec1e9abe05689dd3b9f4e70e518a9e09d1
es/values/filtershow_strings.xml
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/HistoryAdapter.java
rc/com/android/gallery3d/filtershow/PanelController.java
rc/com/android/gallery3d/filtershow/imageshow/ImageCrop.java
rc/com/android/gallery3d/filtershow/imageshow/ImageFlip.java
rc/com/android/gallery3d/filtershow/imageshow/ImageRotate.java
rc/com/android/gallery3d/filtershow/imageshow/ImageStraighten.java
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
|
f5d3a0e494703f2ea749ff836c6b00a4fdb239bc |
22-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Better transition between Gallery and editor Bug: 7346155 Change-Id: I5f6b0901df4aa37d1657c13917aeae7ad77ac9bf
rc/com/android/gallery3d/app/PhotoPage.java
|
48129f36b96928b34e657cdc976c1ac19f7b5ad2 |
22-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Better transition between Gallery and editor Bug: 7346155 Change-Id: I5f6b0901df4aa37d1657c13917aeae7ad77ac9bf
rc/com/android/gallery3d/app/PhotoPage.java
|
0ec01a9736434a2d834efc198b19909eee29f640 |
22-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am d78ffbc3: am 006b03cd: am cd801412: am 51e5b719: Merge "Fix the undo/redo/reset menu item state" into gb-ub-photos-arches * commit 'd78ffbc3bfefea7a236f6c1c2b59c5df221563c0': Fix the undo/redo/reset menu item state
|
d78ffbc3bfefea7a236f6c1c2b59c5df221563c0 |
22-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 006b03cd: am cd801412: am 51e5b719: Merge "Fix the undo/redo/reset menu item state" into gb-ub-photos-arches * commit '006b03cdaebbe7c57cd34bf2c9b24ae9fd8d9896': Fix the undo/redo/reset menu item state
|
2d61ca92facb2120b04f589f6a40e7f15e1b6b06 |
22-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am cd801412: am 51e5b719: Merge "Fix the undo/redo/reset menu item state" into gb-ub-photos-arches * commit 'cd8014124cb3b9354155d84cfc45811280e7d24b': Fix the undo/redo/reset menu item state
|
006b03cdaebbe7c57cd34bf2c9b24ae9fd8d9896 |
22-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am cd801412: am 51e5b719: Merge "Fix the undo/redo/reset menu item state" into gb-ub-photos-arches * commit 'cd8014124cb3b9354155d84cfc45811280e7d24b': Fix the undo/redo/reset menu item state
|
cd8014124cb3b9354155d84cfc45811280e7d24b |
22-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 51e5b719: Merge "Fix the undo/redo/reset menu item state" into gb-ub-photos-arches * commit '51e5b7198dbf31bdfaefc7d01517050359571eb8': Fix the undo/redo/reset menu item state
|
fec4e110fa2045e34fe4dc808e6310e5ea74e79d |
22-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 51e5b719: Merge "Fix the undo/redo/reset menu item state" into gb-ub-photos-arches * commit '51e5b7198dbf31bdfaefc7d01517050359571eb8': Fix the undo/redo/reset menu item state
|
a97b994296d4e793d130c8e9268fb44c9cae71c0 |
22-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 51e5b719: Merge "Fix the undo/redo/reset menu item state" into gb-ub-photos-arches * commit '51e5b7198dbf31bdfaefc7d01517050359571eb8': Fix the undo/redo/reset menu item state
|
82da3e8e16187b8c13c1382b487b4735b7f1d94a |
22-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Merge "Fix the undo/redo/reset menu item state" into gb-ub-photos-arches
|
51e5b7198dbf31bdfaefc7d01517050359571eb8 |
22-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Merge "Fix the undo/redo/reset menu item state" into gb-ub-photos-arches
|
5373bc4aef9940bddce92eee7d20c1c3d387e00b |
22-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ia9393117bf6eab697cf225a3cb3cb75d9ba45935 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
e24330a6d74c94ad657f390915c0ba119c38ddec |
22-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I330e6753a26acb909bbb72bf9d1c6c5f7ef8e9be Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
fdcb71ae36259d47aab1c77cc49261db72262ed2 |
22-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I59932bfe8d8a0082a077c9d7100fcaa861d02d15 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
dd665a5ac63366a76ea26609f20bca1f5130e92b |
22-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I7441ee02d5b6c8e69dd8a3ff9abc023b417c6553 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
73140934d085602b0a66e55f74cd78815229bf96 |
22-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I03a600c459c7af2e06140aeb4c7c8ecfb2c37f1d Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
5bd81714581601c90c85f017c4f5d2257f35d3de |
22-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I03a600c459c7af2e06140aeb4c7c8ecfb2c37f1d Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
3198cc884aa603308210f3779087646a2ff90752 |
22-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I0ff70b2e7123f5013834cc5ba819fad8e190e4e0 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
e6cacd19580f4ffac6b2489c2ee3647e24425772 |
22-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I0ff70b2e7123f5013834cc5ba819fad8e190e4e0 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
8ff2dd706c29d925c4fbe507df9bdf1b4b74bd50 |
22-Oct-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
aae1166a90017081ea24cb0be95780710a5b3a5a |
22-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 8f211aa4: am 277c9061: am b96be14e: am e42eca39: Merge "Tweak transition animations" into gb-ub-photos-arches * commit '8f211aa425c2c96f685c87a8219d16d01c66deb2': Tweak transition animations
|
8f211aa425c2c96f685c87a8219d16d01c66deb2 |
22-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 277c9061: am b96be14e: am e42eca39: Merge "Tweak transition animations" into gb-ub-photos-arches * commit '277c9061a926706142310e5ede41010f31e13c43': Tweak transition animations
|
8374ab719341ce2a1939ebac5322360f008cedbb |
22-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am b96be14e: am e42eca39: Merge "Tweak transition animations" into gb-ub-photos-arches * commit 'b96be14eb71884e086df66d20c2a02768958565f': Tweak transition animations
|
277c9061a926706142310e5ede41010f31e13c43 |
22-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am b96be14e: am e42eca39: Merge "Tweak transition animations" into gb-ub-photos-arches * commit 'b96be14eb71884e086df66d20c2a02768958565f': Tweak transition animations
|
b96be14eb71884e086df66d20c2a02768958565f |
22-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am e42eca39: Merge "Tweak transition animations" into gb-ub-photos-arches * commit 'e42eca39c726bce2452ee9d9a1c4d4cb042031ba': Tweak transition animations
|
cd316a947a3fb09f4073eef75c252f001542773a |
22-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am e42eca39: Merge "Tweak transition animations" into gb-ub-photos-arches * commit 'e42eca39c726bce2452ee9d9a1c4d4cb042031ba': Tweak transition animations
|
9556e015200f55047d66a86cf7c1608c67a926cd |
22-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am e42eca39: Merge "Tweak transition animations" into gb-ub-photos-arches * commit 'e42eca39c726bce2452ee9d9a1c4d4cb042031ba': Tweak transition animations
|
6e8f37db441228ffb7c1165f36a1289e0cc48896 |
22-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Tweak transition animations" into gb-ub-photos-arches
|
e42eca39c726bce2452ee9d9a1c4d4cb042031ba |
22-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Tweak transition animations" into gb-ub-photos-arches
|
331e2bffdbbbfe4f2d22fcc7a2464c0bb7491efe |
22-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Tweak transition animations Bug: 7376109 Change-Id: I28cc8413bda31ff945e8e48dd75b86b2e9d071a8
rc/com/android/gallery3d/anim/StateTransitionAnimation.java
|
a41c877619656e2a8f07efc1efcf9dcecffd5f9d |
22-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Tweak transition animations Bug: 7376109 Change-Id: I28cc8413bda31ff945e8e48dd75b86b2e9d071a8
rc/com/android/gallery3d/anim/StateTransitionAnimation.java
|
2c6c9f9d75d03174b446ff218ac66cf81bba5109 |
19-Oct-2012 |
Hung-ying Tyan <tyanh@google.com> |
Move new exif lib to gallerycommon. https://googleplex-android-review.googlesource.com/#/c/242047 depends on this. Bug: 6667860 Change-Id: Iac937e2eea94f0f5ffde876235b1c2ee748e7570
allerycommon/src/com/android/gallery3d/exif/CountedDataInputStream.java
allerycommon/src/com/android/gallery3d/exif/ExifData.java
allerycommon/src/com/android/gallery3d/exif/ExifInvalidFormatException.java
allerycommon/src/com/android/gallery3d/exif/ExifOutputStream.java
allerycommon/src/com/android/gallery3d/exif/ExifParser.java
allerycommon/src/com/android/gallery3d/exif/ExifReader.java
allerycommon/src/com/android/gallery3d/exif/ExifTag.java
allerycommon/src/com/android/gallery3d/exif/IfdData.java
allerycommon/src/com/android/gallery3d/exif/IfdId.java
allerycommon/src/com/android/gallery3d/exif/JpegHeader.java
allerycommon/src/com/android/gallery3d/exif/OrderedDataOutputStream.java
allerycommon/src/com/android/gallery3d/exif/Rational.java
allerycommon/src/com/android/gallery3d/exif/Util.java
rc/com/android/gallery3d/exif/CountedDataInputStream.java
rc/com/android/gallery3d/exif/ExifData.java
rc/com/android/gallery3d/exif/ExifInvalidFormatException.java
rc/com/android/gallery3d/exif/ExifOutputStream.java
rc/com/android/gallery3d/exif/ExifParser.java
rc/com/android/gallery3d/exif/ExifReader.java
rc/com/android/gallery3d/exif/ExifTag.java
rc/com/android/gallery3d/exif/IfdData.java
rc/com/android/gallery3d/exif/IfdId.java
rc/com/android/gallery3d/exif/JpegHeader.java
rc/com/android/gallery3d/exif/OrderedDataOutputStream.java
rc/com/android/gallery3d/exif/Rational.java
rc/com/android/gallery3d/exif/Util.java
|
e686a42b89aaa6e4286833a361066e7d372522ce |
19-Oct-2012 |
Hung-ying Tyan <tyanh@google.com> |
Move new exif lib to gallerycommon. https://googleplex-android-review.googlesource.com/#/c/242047 depends on this. Bug: 6667860 Change-Id: Iac937e2eea94f0f5ffde876235b1c2ee748e7570
allerycommon/src/com/android/gallery3d/exif/CountedDataInputStream.java
allerycommon/src/com/android/gallery3d/exif/ExifData.java
allerycommon/src/com/android/gallery3d/exif/ExifInvalidFormatException.java
allerycommon/src/com/android/gallery3d/exif/ExifOutputStream.java
allerycommon/src/com/android/gallery3d/exif/ExifParser.java
allerycommon/src/com/android/gallery3d/exif/ExifReader.java
allerycommon/src/com/android/gallery3d/exif/ExifTag.java
allerycommon/src/com/android/gallery3d/exif/IfdData.java
allerycommon/src/com/android/gallery3d/exif/IfdId.java
allerycommon/src/com/android/gallery3d/exif/JpegHeader.java
allerycommon/src/com/android/gallery3d/exif/OrderedDataOutputStream.java
allerycommon/src/com/android/gallery3d/exif/Rational.java
allerycommon/src/com/android/gallery3d/exif/Util.java
rc/com/android/gallery3d/exif/CountedDataInputStream.java
rc/com/android/gallery3d/exif/ExifData.java
rc/com/android/gallery3d/exif/ExifInvalidFormatException.java
rc/com/android/gallery3d/exif/ExifOutputStream.java
rc/com/android/gallery3d/exif/ExifParser.java
rc/com/android/gallery3d/exif/ExifReader.java
rc/com/android/gallery3d/exif/ExifTag.java
rc/com/android/gallery3d/exif/IfdData.java
rc/com/android/gallery3d/exif/IfdId.java
rc/com/android/gallery3d/exif/JpegHeader.java
rc/com/android/gallery3d/exif/OrderedDataOutputStream.java
rc/com/android/gallery3d/exif/Rational.java
rc/com/android/gallery3d/exif/Util.java
|
2523f4344661b1e6a734d1ba20e92308c87a7c54 |
19-Oct-2012 |
Hung-ying Tyan <tyanh@google.com> |
Move new exif lib to gallerycommon. https://googleplex-android-review.googlesource.com/#/c/242047 depends on this. Bug: 6667860 Change-Id: Iac937e2eea94f0f5ffde876235b1c2ee748e7570
allerycommon/src/com/android/gallery3d/exif/CountedDataInputStream.java
allerycommon/src/com/android/gallery3d/exif/ExifData.java
allerycommon/src/com/android/gallery3d/exif/ExifInvalidFormatException.java
allerycommon/src/com/android/gallery3d/exif/ExifOutputStream.java
allerycommon/src/com/android/gallery3d/exif/ExifParser.java
allerycommon/src/com/android/gallery3d/exif/ExifReader.java
allerycommon/src/com/android/gallery3d/exif/ExifTag.java
allerycommon/src/com/android/gallery3d/exif/IfdData.java
allerycommon/src/com/android/gallery3d/exif/IfdId.java
allerycommon/src/com/android/gallery3d/exif/JpegHeader.java
allerycommon/src/com/android/gallery3d/exif/OrderedDataOutputStream.java
allerycommon/src/com/android/gallery3d/exif/Rational.java
allerycommon/src/com/android/gallery3d/exif/Util.java
|
eaf93ae9970f34ed2d69fbd8b66beddaa82d37f6 |
22-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Fix the undo/redo/reset menu item state bug:7357734 - enable/disable the undo/redo/reset menu item depending on the history. Change-Id: I633008bc9a99eef2e7289b290fc96120f09b3825
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/HistoryAdapter.java
|
23e58b3595de28bc8f899f3fba1ca9734533213c |
22-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Fix the undo/redo/reset menu item state bug:7357734 - enable/disable the undo/redo/reset menu item depending on the history. Change-Id: I633008bc9a99eef2e7289b290fc96120f09b3825
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/HistoryAdapter.java
|
adcc531efc12854b31ec018dc711e90c2f80f54f |
22-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am f594eb41: am abe399a8: am e4614408: am c778aab1: Prevent unveil direction to change as long as no touch up * commit 'f594eb4176e34d281b21eae0770bbc29731190f1': Prevent unveil direction to change as long as no touch up
|
f594eb4176e34d281b21eae0770bbc29731190f1 |
22-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am abe399a8: am e4614408: am c778aab1: Prevent unveil direction to change as long as no touch up * commit 'abe399a833c9ffe73e14059960c953522b2a993a': Prevent unveil direction to change as long as no touch up
|
7741a8e07869d9eb9677fa683f0f913ccd84ecf9 |
22-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am e4614408: am c778aab1: Prevent unveil direction to change as long as no touch up * commit 'e4614408716f933d5d99247f57d61949e6201fae': Prevent unveil direction to change as long as no touch up
|
abe399a833c9ffe73e14059960c953522b2a993a |
22-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am e4614408: am c778aab1: Prevent unveil direction to change as long as no touch up * commit 'e4614408716f933d5d99247f57d61949e6201fae': Prevent unveil direction to change as long as no touch up
|
e4614408716f933d5d99247f57d61949e6201fae |
22-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am c778aab1: Prevent unveil direction to change as long as no touch up * commit 'c778aab129fb001fdff1ccf167867fc40fbf7523': Prevent unveil direction to change as long as no touch up
|
05fbb32555ddbca8e09f32e29964329d946591e9 |
22-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am c778aab1: Prevent unveil direction to change as long as no touch up * commit 'c778aab129fb001fdff1ccf167867fc40fbf7523': Prevent unveil direction to change as long as no touch up
|
3973b2db14b3ea6a9f82ef54cd1e16443076bc01 |
22-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am c778aab1: Prevent unveil direction to change as long as no touch up * commit 'c778aab129fb001fdff1ccf167867fc40fbf7523': Prevent unveil direction to change as long as no touch up
|
08999d276db9b07c2fdd28d11ea6a20ca05aaa2e |
22-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Prevent unveil direction to change as long as no touch up bug:7385925 Change-Id: I16f17e6de1624f7a40b16641122103edc0f5bb64
rc/com/android/gallery3d/filtershow/imageshow/ImageShow.java
|
c778aab129fb001fdff1ccf167867fc40fbf7523 |
22-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Prevent unveil direction to change as long as no touch up bug:7385925 Change-Id: I16f17e6de1624f7a40b16641122103edc0f5bb64
rc/com/android/gallery3d/filtershow/imageshow/ImageShow.java
|
19a352b18fa5fd6b5fcd215794d374d035317200 |
22-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 0bd23403: am 9f4ea05a: am e54e5002: am 15a056e3: Fix crash in Curves module * commit '0bd2340351d457686986b97234ab0429e554c440': Fix crash in Curves module
|
0bd2340351d457686986b97234ab0429e554c440 |
22-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 9f4ea05a: am e54e5002: am 15a056e3: Fix crash in Curves module * commit '9f4ea05a50bb0f0fd55e7cc9e0e05989f1a5eab8': Fix crash in Curves module
|
286af73cc652d7f9381c33aa303b2581f17ed053 |
22-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am e54e5002: am 15a056e3: Fix crash in Curves module * commit 'e54e5002ed50aa66de70d6ccc7ba33c283b92434': Fix crash in Curves module
|
9f4ea05a50bb0f0fd55e7cc9e0e05989f1a5eab8 |
22-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am e54e5002: am 15a056e3: Fix crash in Curves module * commit 'e54e5002ed50aa66de70d6ccc7ba33c283b92434': Fix crash in Curves module
|
7a515913449e89f7028898125e22c0aa1a676413 |
22-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 15a056e3: Fix crash in Curves module * commit '15a056e3cc1970bc0b99dba71df8222ba0345859': Fix crash in Curves module
|
612239e785584e63252bef00e507e7c6ff285fa1 |
22-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 15a056e3: Fix crash in Curves module * commit '15a056e3cc1970bc0b99dba71df8222ba0345859': Fix crash in Curves module
|
e54e5002ed50aa66de70d6ccc7ba33c283b92434 |
22-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 15a056e3: Fix crash in Curves module * commit '15a056e3cc1970bc0b99dba71df8222ba0345859': Fix crash in Curves module
|
24acbf244481c7daa73016cccefbe12b9236238b |
22-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 28d28284: am a45c2a95: am 2f4ec4f1: am 104165f1: Fix several issues with crop/straighten * commit '28d2828494172ac4322f09890cbed65d4975f700': Fix several issues with crop/straighten
|
28d2828494172ac4322f09890cbed65d4975f700 |
22-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am a45c2a95: am 2f4ec4f1: am 104165f1: Fix several issues with crop/straighten * commit 'a45c2a95b6bfe770c800771ba56bf79e382072d6': Fix several issues with crop/straighten
|
74bf1dc76f451e71b64ee8d7e61d56a5680e3ea1 |
22-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Fix crash in Curves module bug:7379140 Change-Id: I26f30d24eb8cf2db9248f29549d8b435d941a325
rc/com/android/gallery3d/filtershow/ui/ImageCurves.java
|
15a056e3cc1970bc0b99dba71df8222ba0345859 |
22-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Fix crash in Curves module bug:7379140 Change-Id: I26f30d24eb8cf2db9248f29549d8b435d941a325
rc/com/android/gallery3d/filtershow/ui/ImageCurves.java
|
a45c2a95b6bfe770c800771ba56bf79e382072d6 |
22-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 2f4ec4f1: am 104165f1: Fix several issues with crop/straighten * commit '2f4ec4f1e283a5ba92d9986db2e39d6b7e235aa9': Fix several issues with crop/straighten
|
4e612a39112808a7978e4c0b21a66fba9091d772 |
22-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 2f4ec4f1: am 104165f1: Fix several issues with crop/straighten * commit '2f4ec4f1e283a5ba92d9986db2e39d6b7e235aa9': Fix several issues with crop/straighten
|
56fbfd01042e266140e2398ab90f2701774833c2 |
22-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 104165f1: Fix several issues with crop/straighten * commit '104165f1f9858bdebb2d219b077f5227203f7c02': Fix several issues with crop/straighten
|
4c6996f4644c98d39f76c9ac8f527901183c515e |
22-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 104165f1: Fix several issues with crop/straighten * commit '104165f1f9858bdebb2d219b077f5227203f7c02': Fix several issues with crop/straighten
|
2f4ec4f1e283a5ba92d9986db2e39d6b7e235aa9 |
22-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 104165f1: Fix several issues with crop/straighten * commit '104165f1f9858bdebb2d219b077f5227203f7c02': Fix several issues with crop/straighten
|
589211113909726cd97e2dca7326ac1bb9e5a552 |
22-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Fix several issues with crop/straighten bug:7386266 bug:7386270 bug:7385727 - use a transparent white for the bounds instead of green - add "rule of third" lines to the crop tool - improves preview image quality for geometric operations Change-Id: I94c233e7ea89d67451e7808fb71537d03a1c183d
rc/com/android/gallery3d/filtershow/filters/ImageFilterGeometry.java
rc/com/android/gallery3d/filtershow/imageshow/ImageCrop.java
|
104165f1f9858bdebb2d219b077f5227203f7c02 |
22-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Fix several issues with crop/straighten bug:7386266 bug:7386270 bug:7385727 - use a transparent white for the bounds instead of green - add "rule of third" lines to the crop tool - improves preview image quality for geometric operations Change-Id: I94c233e7ea89d67451e7808fb71537d03a1c183d
rc/com/android/gallery3d/filtershow/filters/ImageFilterGeometry.java
rc/com/android/gallery3d/filtershow/imageshow/ImageCrop.java
|
d7dd6648c78b1c5d064f17c9370a9d726210ebba |
22-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am d734c005: am 75b2cab9: am afc8c49f: am 4d276f33: Only translate the main panel if we have to. * commit 'd734c005c698355718c1f5f5a480903b04dd07ce': Only translate the main panel if we have to.
|
d734c005c698355718c1f5f5a480903b04dd07ce |
22-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 75b2cab9: am afc8c49f: am 4d276f33: Only translate the main panel if we have to. * commit '75b2cab9d564f982835171276e003faec497656a': Only translate the main panel if we have to.
|
75b2cab9d564f982835171276e003faec497656a |
22-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am afc8c49f: am 4d276f33: Only translate the main panel if we have to. * commit 'afc8c49fb1d0a806f4a07d2d62729388326ee8bf': Only translate the main panel if we have to.
|
1684248c622f35ba486be58ba8c49919c194b6b4 |
22-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am afc8c49f: am 4d276f33: Only translate the main panel if we have to. * commit 'afc8c49fb1d0a806f4a07d2d62729388326ee8bf': Only translate the main panel if we have to.
|
173c6609ad041f63126847bec241145513348a94 |
22-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 4d276f33: Only translate the main panel if we have to. * commit '4d276f338bbdc53f8a3b4806265bc26c7fe0ea7c': Only translate the main panel if we have to.
|
7ba4250e366f7990f9726dc00a3771a8dbe3dbe3 |
22-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 4d276f33: Only translate the main panel if we have to. * commit '4d276f338bbdc53f8a3b4806265bc26c7fe0ea7c': Only translate the main panel if we have to.
|
3a40625bfcd2aa7709159d83ab0b1b253aed7401 |
22-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 4d276f33: Only translate the main panel if we have to. * commit '4d276f338bbdc53f8a3b4806265bc26c7fe0ea7c': Only translate the main panel if we have to.
|
afc8c49fb1d0a806f4a07d2d62729388326ee8bf |
22-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 4d276f33: Only translate the main panel if we have to. * commit '4d276f338bbdc53f8a3b4806265bc26c7fe0ea7c': Only translate the main panel if we have to.
|
c4e553b141580b919125de12266db1b7b2926fad |
21-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Only translate the main panel if we have to. bug:7386882 Change-Id: Ib670eb4e513f0bbebd3ecca052fe27180dcf5fdc
es/layout/filtershow_activity.xml
|
1cb4edc0153dec88b8f6150a64637eaad2c7694e |
21-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Only translate the main panel if we have to. bug:7386882 Change-Id: Ib670eb4e513f0bbebd3ecca052fe27180dcf5fdc
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/imageshow/ImageShow.java
rc/com/android/gallery3d/filtershow/imageshow/ImageSlave.java
|
4d276f338bbdc53f8a3b4806265bc26c7fe0ea7c |
21-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Only translate the main panel if we have to. bug:7386882 Change-Id: Ib670eb4e513f0bbebd3ecca052fe27180dcf5fdc
es/layout/filtershow_activity.xml
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/imageshow/ImageShow.java
rc/com/android/gallery3d/filtershow/imageshow/ImageSlave.java
|
7bcc6fd2dff7b929af198b308ed76ef83f5705e4 |
21-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 7b872778: am 028f0884: am b1b1b8f0: am 267c4c6a: Revert partially CL https://googleplex-android-review.googlesource.com/#/c/243614/ * commit '7b8727788850e43da7f7c3781359bc16e5616670': Revert partially CL https://googleplex-android-review.googlesource.com/#/c/243614/
|
7b8727788850e43da7f7c3781359bc16e5616670 |
21-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 028f0884: am b1b1b8f0: am 267c4c6a: Revert partially CL https://googleplex-android-review.googlesource.com/#/c/243614/ * commit '028f08844e6357289c28469fd514bbbd554f5a9a': Revert partially CL https://googleplex-android-review.googlesource.com/#/c/243614/
|
25c35df06354db9e6a5ff7cacbfa1d967eecb9c1 |
21-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am b1b1b8f0: am 267c4c6a: Revert partially CL https://googleplex-android-review.googlesource.com/#/c/243614/ * commit 'b1b1b8f029f460439ad98c16fece08c85af6e5da': Revert partially CL https://googleplex-android-review.googlesource.com/#/c/243614/
|
028f08844e6357289c28469fd514bbbd554f5a9a |
21-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am b1b1b8f0: am 267c4c6a: Revert partially CL https://googleplex-android-review.googlesource.com/#/c/243614/ * commit 'b1b1b8f029f460439ad98c16fece08c85af6e5da': Revert partially CL https://googleplex-android-review.googlesource.com/#/c/243614/
|
ae356b776cd497d92c917b8c0a6a020ba242fa33 |
21-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 267c4c6a: Revert partially CL https://googleplex-android-review.googlesource.com/#/c/243614/ * commit '267c4c6a513671441031a9c21839995aecc4fc52': Revert partially CL https://googleplex-android-review.googlesource.com/#/c/243614/
|
d83f6a0a9a668e47ccf83dffae0b547d6940fe0a |
21-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 267c4c6a: Revert partially CL https://googleplex-android-review.googlesource.com/#/c/243614/ * commit '267c4c6a513671441031a9c21839995aecc4fc52': Revert partially CL https://googleplex-android-review.googlesource.com/#/c/243614/
|
b1b1b8f029f460439ad98c16fece08c85af6e5da |
21-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 267c4c6a: Revert partially CL https://googleplex-android-review.googlesource.com/#/c/243614/ * commit '267c4c6a513671441031a9c21839995aecc4fc52': Revert partially CL https://googleplex-android-review.googlesource.com/#/c/243614/
|
74711ae65afa48c44f5da250bf4f4ef0291ab09c |
21-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Revert partially CL https://googleplex-android-review.googlesource.com/#/c/243614/ bug:7384984 Change-Id: Id10c7ac08cc7aab4d2f4b19c88b20d0f3369807a
rc/com/android/gallery3d/filtershow/filters/ImageFilterGeometry.java
|
267c4c6a513671441031a9c21839995aecc4fc52 |
21-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Revert partially CL https://googleplex-android-review.googlesource.com/#/c/243614/ bug:7384984 Change-Id: Id10c7ac08cc7aab4d2f4b19c88b20d0f3369807a
rc/com/android/gallery3d/filtershow/filters/ImageFilterGeometry.java
|
0c0e97e7717a7cc72c59f26fe67d93c58dc8bc10 |
21-Oct-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
075fe9e85e7049d5c487cabbd7680cb24f111900 |
20-Oct-2012 |
Doris Liu <tianliu@google.com> |
am 7077413d: am 146a0570: am 5d4ba127: am 2daced6b: Fix for active action bar in camera * commit '7077413dc58b04463931933ac8062a15971ad448': Fix for active action bar in camera
|
7077413dc58b04463931933ac8062a15971ad448 |
20-Oct-2012 |
Doris Liu <tianliu@google.com> |
am 146a0570: am 5d4ba127: am 2daced6b: Fix for active action bar in camera * commit '146a057004a5e806605169ae25c630cfd362e56d': Fix for active action bar in camera
|
146a057004a5e806605169ae25c630cfd362e56d |
20-Oct-2012 |
Doris Liu <tianliu@google.com> |
am 5d4ba127: am 2daced6b: Fix for active action bar in camera * commit '5d4ba12701ebb090168437fcf39c286a006362a0': Fix for active action bar in camera
|
eae7682e16208fc510cd3a1cd828d597bc93c531 |
20-Oct-2012 |
Doris Liu <tianliu@google.com> |
am 5d4ba127: am 2daced6b: Fix for active action bar in camera * commit '5d4ba12701ebb090168437fcf39c286a006362a0': Fix for active action bar in camera
|
5d4ba12701ebb090168437fcf39c286a006362a0 |
20-Oct-2012 |
Doris Liu <tianliu@google.com> |
am 2daced6b: Fix for active action bar in camera * commit '2daced6baacd59850e7c64ea02f2479530654ed8': Fix for active action bar in camera
|
748787fbe9455bb1aeab3670e8e5711eaf97aa1e |
20-Oct-2012 |
Doris Liu <tianliu@google.com> |
am 2daced6b: Fix for active action bar in camera * commit '2daced6baacd59850e7c64ea02f2479530654ed8': Fix for active action bar in camera
|
16608d5618462020a2ef41668163fde0890d72c9 |
20-Oct-2012 |
Doris Liu <tianliu@google.com> |
am 2daced6b: Fix for active action bar in camera * commit '2daced6baacd59850e7c64ea02f2479530654ed8': Fix for active action bar in camera
|
be536c2f7882c587a2ad7fcb566b04521fe8604b |
20-Oct-2012 |
Doris Liu <tianliu@google.com> |
Fix for active action bar in camera Bug: 7377404 Bug: 7384972 Change-Id: Ic54a7501ed3e2a61fab272461dee474b693c8f3a
rc/com/android/gallery3d/app/AlbumPage.java
|
2daced6baacd59850e7c64ea02f2479530654ed8 |
20-Oct-2012 |
Doris Liu <tianliu@google.com> |
Fix for active action bar in camera Bug: 7377404 Bug: 7384972 Change-Id: Ic54a7501ed3e2a61fab272461dee474b693c8f3a
rc/com/android/gallery3d/app/AlbumPage.java
|
9da29278ceeebb1ef9216763da0b213149c26eb0 |
20-Oct-2012 |
Sascha Haeberling <haeberling@google.com> |
am 1ad87fc9: am 1da23f09: am a4c85fc1: am 2f879102: Adds a tiny planet (stereographic projection) image filter. * commit '1ad87fc9691d2c58a9fec66657f92dd5c3b234a2': Adds a tiny planet (stereographic projection) image filter.
|
1ad87fc9691d2c58a9fec66657f92dd5c3b234a2 |
20-Oct-2012 |
Sascha Haeberling <haeberling@google.com> |
am 1da23f09: am a4c85fc1: am 2f879102: Adds a tiny planet (stereographic projection) image filter. * commit '1da23f091e5bfa4027cd31b40195968597f81b4b': Adds a tiny planet (stereographic projection) image filter.
|
3f8990b60d4fb858aecdc0039df26ea11bb5152b |
20-Oct-2012 |
Sascha Haeberling <haeberling@google.com> |
am a4c85fc1: am 2f879102: Adds a tiny planet (stereographic projection) image filter. * commit 'a4c85fc1f2b35bacb5ef1269fdc999fe98bbf7f4': Adds a tiny planet (stereographic projection) image filter.
|
1da23f091e5bfa4027cd31b40195968597f81b4b |
20-Oct-2012 |
Sascha Haeberling <haeberling@google.com> |
am a4c85fc1: am 2f879102: Adds a tiny planet (stereographic projection) image filter. * commit 'a4c85fc1f2b35bacb5ef1269fdc999fe98bbf7f4': Adds a tiny planet (stereographic projection) image filter.
|
9c69205301ac2e14d980b4d328ac7c02977ba3ab |
20-Oct-2012 |
Sascha Haeberling <haeberling@google.com> |
am 2f879102: Adds a tiny planet (stereographic projection) image filter. * commit '2f879102d630815df64636b8d37e3a7eea8e8b65': Adds a tiny planet (stereographic projection) image filter.
|
ba468e98ea4dd98c7aef84a986146f53d6f31766 |
20-Oct-2012 |
Sascha Haeberling <haeberling@google.com> |
am 2f879102: Adds a tiny planet (stereographic projection) image filter. * commit '2f879102d630815df64636b8d37e3a7eea8e8b65': Adds a tiny planet (stereographic projection) image filter.
|
a4c85fc1f2b35bacb5ef1269fdc999fe98bbf7f4 |
20-Oct-2012 |
Sascha Haeberling <haeberling@google.com> |
am 2f879102: Adds a tiny planet (stereographic projection) image filter. * commit '2f879102d630815df64636b8d37e3a7eea8e8b65': Adds a tiny planet (stereographic projection) image filter.
|
a6f29e1b7ac87c930b6dbbd1f6e73fefa08bd8fa |
20-Oct-2012 |
Sascha Haeberling <haeberling@google.com> |
Adds a tiny planet (stereographic projection) image filter. Bug: 7293391 Also fixes an issue where the preview value was statically set to 100. This adds a preview parameter value that can be set for this purpose. Change-Id: I68c4ec04e86ab8a29ef7f561e5f21a298003677e
ni/Android.mk
ni/filters/filters.h
ni/filters/tinyplanet.cc
|
d10e97d4f9ad49c219663bcff77823e5d27f1fe6 |
20-Oct-2012 |
Sascha Haeberling <haeberling@google.com> |
Adds a tiny planet (stereographic projection) image filter. Bug: 7293391 Also fixes an issue where the preview value was statically set to 100. This adds a preview parameter value that can be set for this purpose. Change-Id: I68c4ec04e86ab8a29ef7f561e5f21a298003677e
ni/Android.mk
|
ed9c2b629cc43e5c61c1d016a5bcf21e086720c9 |
20-Oct-2012 |
Sascha Haeberling <haeberling@google.com> |
Adds a tiny planet (stereographic projection) image filter. Bug: 7293391 Also fixes an issue where the preview value was statically set to 100. This adds a preview parameter value that can be set for this purpose. Change-Id: I68c4ec04e86ab8a29ef7f561e5f21a298003677e
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/filters/ImageFilter.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterTinyPlanet.java
|
2f879102d630815df64636b8d37e3a7eea8e8b65 |
20-Oct-2012 |
Sascha Haeberling <haeberling@google.com> |
Adds a tiny planet (stereographic projection) image filter. Bug: 7293391 Also fixes an issue where the preview value was statically set to 100. This adds a preview parameter value that can be set for this purpose. Change-Id: I68c4ec04e86ab8a29ef7f561e5f21a298003677e
ni/Android.mk
ni/filters/filters.h
ni/filters/tinyplanet.cc
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/filters/ImageFilter.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterTinyPlanet.java
|
164808487a667639e661ca010e793fd5f497570e |
20-Oct-2012 |
John Hoford <hoford@google.com> |
am fa50b529: am 320114c3: am e6f7fe76: am e9c55b28: Add the infrastructure to support Tiny Planet * commit 'fa50b529c88af9c2dc76418e9d44d260fe3e726e': Add the infrastructure to support Tiny Planet
|
fa50b529c88af9c2dc76418e9d44d260fe3e726e |
20-Oct-2012 |
John Hoford <hoford@google.com> |
am 320114c3: am e6f7fe76: am e9c55b28: Add the infrastructure to support Tiny Planet * commit '320114c334f3f8015c21748c12b595fdcdb6d09e': Add the infrastructure to support Tiny Planet
|
172b1b6f58ef3a727ef2c4ed34cb2e7c0005fe30 |
20-Oct-2012 |
John Hoford <hoford@google.com> |
am e6f7fe76: am e9c55b28: Add the infrastructure to support Tiny Planet * commit 'e6f7fe76f5d4af7384da81301323b1c92891b804': Add the infrastructure to support Tiny Planet
|
320114c334f3f8015c21748c12b595fdcdb6d09e |
20-Oct-2012 |
John Hoford <hoford@google.com> |
am e6f7fe76: am e9c55b28: Add the infrastructure to support Tiny Planet * commit 'e6f7fe76f5d4af7384da81301323b1c92891b804': Add the infrastructure to support Tiny Planet
|
800e5aaa4cb08ebfb3360c028b2b86ae8a4107ba |
20-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 68b78990: am 83217db1: am 0def633f: am 41b3cff6: Fix delete and undo behavior on filmstrip * commit '68b78990c1ec7d3a5f9603f0e990b1a14ab7b154': Fix delete and undo behavior on filmstrip
|
bde4fbd2270354122f610a5601cacebf493d8314 |
20-Oct-2012 |
John Hoford <hoford@google.com> |
am e9c55b28: Add the infrastructure to support Tiny Planet * commit 'e9c55b28a4a155c2e1c1f5aec615a0c56e38ade4': Add the infrastructure to support Tiny Planet
|
c174217272576bcd085ca95f7b0d9958a9d3a125 |
20-Oct-2012 |
John Hoford <hoford@google.com> |
am e9c55b28: Add the infrastructure to support Tiny Planet * commit 'e9c55b28a4a155c2e1c1f5aec615a0c56e38ade4': Add the infrastructure to support Tiny Planet
|
63e8f6247bf32139e40ec6f1efe31732e577a71b |
20-Oct-2012 |
John Hoford <hoford@google.com> |
am e9c55b28: Add the infrastructure to support Tiny Planet * commit 'e9c55b28a4a155c2e1c1f5aec615a0c56e38ade4': Add the infrastructure to support Tiny Planet
|
68b78990c1ec7d3a5f9603f0e990b1a14ab7b154 |
20-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 83217db1: am 0def633f: am 41b3cff6: Fix delete and undo behavior on filmstrip * commit '83217db1b614c1208dffe4b7da69c7b162e917cb': Fix delete and undo behavior on filmstrip
|
e6f7fe76f5d4af7384da81301323b1c92891b804 |
20-Oct-2012 |
John Hoford <hoford@google.com> |
am e9c55b28: Add the infrastructure to support Tiny Planet * commit 'e9c55b28a4a155c2e1c1f5aec615a0c56e38ade4': Add the infrastructure to support Tiny Planet
|
83217db1b614c1208dffe4b7da69c7b162e917cb |
20-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 0def633f: am 41b3cff6: Fix delete and undo behavior on filmstrip * commit '0def633fe16795629930ae9fbe58b91a46603634': Fix delete and undo behavior on filmstrip
|
c908d79e8a6b4826ba71830fe8f545c57f8942bb |
20-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 0def633f: am 41b3cff6: Fix delete and undo behavior on filmstrip * commit '0def633fe16795629930ae9fbe58b91a46603634': Fix delete and undo behavior on filmstrip
|
5ec7da1a2bd0af33c6afb6a70372fafbefa9cdf8 |
20-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 41b3cff6: Fix delete and undo behavior on filmstrip * commit '41b3cff60905a96ab5b6f8e5f42bcc3bab1eb605': Fix delete and undo behavior on filmstrip
|
be856826e1e5b08924e38daec2ccbc1e97c2628e |
20-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 41b3cff6: Fix delete and undo behavior on filmstrip * commit '41b3cff60905a96ab5b6f8e5f42bcc3bab1eb605': Fix delete and undo behavior on filmstrip
|
0def633fe16795629930ae9fbe58b91a46603634 |
20-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 41b3cff6: Fix delete and undo behavior on filmstrip * commit '41b3cff60905a96ab5b6f8e5f42bcc3bab1eb605': Fix delete and undo behavior on filmstrip
|
cdb0abb4e1e47c7bb5f278885f337013ed5af3d7 |
20-Oct-2012 |
John Hoford <hoford@google.com> |
Add the infrastructure to support Tiny Planet bug:7293391 Change-Id: I25d95b78a832fa5f20b661e13c4028041517da19
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
|
ea4609e63cc3721912bc0381eaaa6b1800062bd5 |
20-Oct-2012 |
John Hoford <hoford@google.com> |
Add the infrastructure to support Tiny Planet bug:7293391 Change-Id: I25d95b78a832fa5f20b661e13c4028041517da19
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/cache/ImageLoader.java
rc/com/android/gallery3d/filtershow/filters/ImageFilter.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterTinyPlanet.java
rc/com/android/gallery3d/filtershow/imageshow/ImageShow.java
rc/com/android/gallery3d/filtershow/imageshow/ImageSmallFilter.java
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
|
e9c55b28a4a155c2e1c1f5aec615a0c56e38ade4 |
20-Oct-2012 |
John Hoford <hoford@google.com> |
Add the infrastructure to support Tiny Planet bug:7293391 Change-Id: I25d95b78a832fa5f20b661e13c4028041517da19
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/cache/ImageLoader.java
rc/com/android/gallery3d/filtershow/filters/ImageFilter.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterTinyPlanet.java
rc/com/android/gallery3d/filtershow/imageshow/ImageShow.java
rc/com/android/gallery3d/filtershow/imageshow/ImageSmallFilter.java
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
|
7eeb00e767afa7761c28fc96007505043c69c7f5 |
20-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Fix delete and undo behavior on filmstrip Bug: 7353749 Change-Id: Ib0abd3f71783c01b1df418dd76e674bf05e65ce7
rc/com/android/gallery3d/app/PhotoDataAdapter.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/ui/PhotoView.java
|
41b3cff60905a96ab5b6f8e5f42bcc3bab1eb605 |
20-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Fix delete and undo behavior on filmstrip Bug: 7353749 Change-Id: Ib0abd3f71783c01b1df418dd76e674bf05e65ce7
rc/com/android/gallery3d/app/PhotoDataAdapter.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/ui/PhotoView.java
|
985fca6cc9a71babfee5ca4b5b2691a53e29407e |
20-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 0d8b507e: am 073b5894: am be532361: am 3926a685: Merge "Improves swipe gesture" into gb-ub-photos-arches * commit '0d8b507e14655182289c599324a9eb0958fbfa9a': Improves swipe gesture
|
0d8b507e14655182289c599324a9eb0958fbfa9a |
20-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 073b5894: am be532361: am 3926a685: Merge "Improves swipe gesture" into gb-ub-photos-arches * commit '073b58946845f2463ae2bf711cbcf397648dc8ef': Improves swipe gesture
|
4ff1732d2d0766a139e4a105cfaad6874982ad8a |
20-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am be532361: am 3926a685: Merge "Improves swipe gesture" into gb-ub-photos-arches * commit 'be532361141af610e5fbc1270fb3bc467e5f7533': Improves swipe gesture
|
073b58946845f2463ae2bf711cbcf397648dc8ef |
20-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am be532361: am 3926a685: Merge "Improves swipe gesture" into gb-ub-photos-arches * commit 'be532361141af610e5fbc1270fb3bc467e5f7533': Improves swipe gesture
|
61c03f370032c2b696fed946ce0080ebc22e712b |
20-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 3926a685: Merge "Improves swipe gesture" into gb-ub-photos-arches * commit '3926a685eb08ee2bb5e6cf9dc03d070462f19f64': Improves swipe gesture
|
1f8d3d735d14f7e22a860e7ec8e12a4dae0c8835 |
20-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 3926a685: Merge "Improves swipe gesture" into gb-ub-photos-arches * commit '3926a685eb08ee2bb5e6cf9dc03d070462f19f64': Improves swipe gesture
|
3d719fb3b2ab113c8fa73948864528b2ff24ce2b |
20-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 3926a685: Merge "Improves swipe gesture" into gb-ub-photos-arches * commit '3926a685eb08ee2bb5e6cf9dc03d070462f19f64': Improves swipe gesture
|
be532361141af610e5fbc1270fb3bc467e5f7533 |
20-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 3926a685: Merge "Improves swipe gesture" into gb-ub-photos-arches * commit '3926a685eb08ee2bb5e6cf9dc03d070462f19f64': Improves swipe gesture
|
b9c58019d580f2f662329dae26f24ac879923d67 |
20-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Merge "Improves swipe gesture" into gb-ub-photos-arches
|
1d3823a2fde62fbc5e2763ace81ac003271f970f |
20-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Merge "Improves swipe gesture" into gb-ub-photos-arches
|
3926a685eb08ee2bb5e6cf9dc03d070462f19f64 |
20-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Merge "Improves swipe gesture" into gb-ub-photos-arches
|
6e5127c9d992e109fc527a2d956362bcde50a287 |
20-Oct-2012 |
George Mount <mount@google.com> |
am 68ce907d: am eefa2dc7: am 6e806709: am 4dd4d80a: Remove progress bar when switching to grid mode. * commit '68ce907d507c70535632c30029d9216a874d6a20': Remove progress bar when switching to grid mode.
|
68ce907d507c70535632c30029d9216a874d6a20 |
20-Oct-2012 |
George Mount <mount@google.com> |
am eefa2dc7: am 6e806709: am 4dd4d80a: Remove progress bar when switching to grid mode. * commit 'eefa2dc79fbd3d700e1faa5e6bd12b8fda6a16d4': Remove progress bar when switching to grid mode.
|
f70aaf11714f9c63f10566cbfbe6c5fa0d78ef6e |
20-Oct-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
eefa2dc79fbd3d700e1faa5e6bd12b8fda6a16d4 |
20-Oct-2012 |
George Mount <mount@google.com> |
am 6e806709: am 4dd4d80a: Remove progress bar when switching to grid mode. * commit '6e806709dbfec21b7cdfc2d8186e53568de073b8': Remove progress bar when switching to grid mode.
|
1b5a21d2286d50f1da3a3df0f40c1144c5778882 |
20-Oct-2012 |
George Mount <mount@google.com> |
am 6e806709: am 4dd4d80a: Remove progress bar when switching to grid mode. * commit '6e806709dbfec21b7cdfc2d8186e53568de073b8': Remove progress bar when switching to grid mode.
|
d2311284fe1c6cbe69a4771cc5837db02cca183b |
19-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Improves swipe gesture bug:7379463 - better timings - add original label - remove the gesture detector from ImageZoom (use the parent's one) Change-Id: Ib6879e471dfc21cb3a112aa36a61cd304516cf7f
es/values/filtershow_strings.xml
|
eb45a40ee1e2c1f541dbfc9316a116c861a3bf7b |
19-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Improves swipe gesture bug:7379463 - better timings - add original label - remove the gesture detector from ImageZoom (use the parent's one) Change-Id: Ib6879e471dfc21cb3a112aa36a61cd304516cf7f
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/imageshow/ImageShow.java
rc/com/android/gallery3d/filtershow/imageshow/ImageZoom.java
|
f7403a58d17e56de6e3bebd9ac08bc77f3cd43e4 |
19-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Improves swipe gesture bug:7379463 - better timings - add original label - remove the gesture detector from ImageZoom (use the parent's one) Change-Id: Ib6879e471dfc21cb3a112aa36a61cd304516cf7f
es/values/filtershow_strings.xml
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/imageshow/ImageShow.java
rc/com/android/gallery3d/filtershow/imageshow/ImageZoom.java
|
c5f764d30d87f4e3f61193df9df7f6c50b7f0ff3 |
20-Oct-2012 |
George Mount <mount@google.com> |
am 4dd4d80a: Remove progress bar when switching to grid mode. * commit '4dd4d80af4cd3ba7555c12d1c1ba775e048b6c57': Remove progress bar when switching to grid mode.
|
1d349030616e06dc5a6005d318084e45136cc947 |
20-Oct-2012 |
George Mount <mount@google.com> |
am 4dd4d80a: Remove progress bar when switching to grid mode. * commit '4dd4d80af4cd3ba7555c12d1c1ba775e048b6c57': Remove progress bar when switching to grid mode.
|
6e806709dbfec21b7cdfc2d8186e53568de073b8 |
20-Oct-2012 |
George Mount <mount@google.com> |
am 4dd4d80a: Remove progress bar when switching to grid mode. * commit '4dd4d80af4cd3ba7555c12d1c1ba775e048b6c57': Remove progress bar when switching to grid mode.
|
63ec6cf86b5ff11bd4af50cf8422b64818ec9806 |
19-Oct-2012 |
George Mount <mount@google.com> |
Remove progress bar when switching to grid mode. Bug 7377975 Change-Id: I388fdf6c6c9a5ffa64e10f864806a8131e53a009
rc/com/android/gallery3d/app/PhotoPage.java
|
4dd4d80af4cd3ba7555c12d1c1ba775e048b6c57 |
19-Oct-2012 |
George Mount <mount@google.com> |
Remove progress bar when switching to grid mode. Bug 7377975 Change-Id: I388fdf6c6c9a5ffa64e10f864806a8131e53a009
rc/com/android/gallery3d/app/PhotoPage.java
|
624989cd955e3f6ff4bd6ae303c79a31abd4dbfa |
19-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 2eab95b2: am e461601e: am ddb30c54: am 4883dafd: Merge "Change number of album rows on large screens" into gb-ub-photos-arches * commit '2eab95b2224b6373b905a829690acfc6b1b200e8': Change number of album rows on large screens
|
2eab95b2224b6373b905a829690acfc6b1b200e8 |
19-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am e461601e: am ddb30c54: am 4883dafd: Merge "Change number of album rows on large screens" into gb-ub-photos-arches * commit 'e461601e1844b22e2365c7c203992a70bd0a4b53': Change number of album rows on large screens
|
e461601e1844b22e2365c7c203992a70bd0a4b53 |
19-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am ddb30c54: am 4883dafd: Merge "Change number of album rows on large screens" into gb-ub-photos-arches * commit 'ddb30c54ce1f831271ba64c9c69092753e0fd7fd': Change number of album rows on large screens
|
23d7dd46aff419f0994840c6a085cc089969b5d7 |
19-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am ddb30c54: am 4883dafd: Merge "Change number of album rows on large screens" into gb-ub-photos-arches * commit 'ddb30c54ce1f831271ba64c9c69092753e0fd7fd': Change number of album rows on large screens
|
dc4beb45f57b5a8966a93a3f480709b61c979901 |
19-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 4883dafd: Merge "Change number of album rows on large screens" into gb-ub-photos-arches * commit '4883dafd9fc7e242f3cc3dd4155a7b90ee3975a8': Change number of album rows on large screens
|
b2a3894d4626adaa8b6637c45413c3b5bd8b409f |
19-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 4883dafd: Merge "Change number of album rows on large screens" into gb-ub-photos-arches * commit '4883dafd9fc7e242f3cc3dd4155a7b90ee3975a8': Change number of album rows on large screens
|
ddb30c54ce1f831271ba64c9c69092753e0fd7fd |
19-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 4883dafd: Merge "Change number of album rows on large screens" into gb-ub-photos-arches * commit '4883dafd9fc7e242f3cc3dd4155a7b90ee3975a8': Change number of album rows on large screens
|
4883dafd9fc7e242f3cc3dd4155a7b90ee3975a8 |
19-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Change number of album rows on large screens" into gb-ub-photos-arches
|
c19d06825d58f530e909d8ecbc26649ef9a244e9 |
19-Oct-2012 |
Mangesh Ghiware <mghiware@google.com> |
am fce915b3: am 2d9ec84a: am 921b0a70: am ea78390e: Re-enable crop for new panorama * commit 'fce915b3776a2415e6c3bda1b31e4688e74cdb6a': Re-enable crop for new panorama
|
fce915b3776a2415e6c3bda1b31e4688e74cdb6a |
19-Oct-2012 |
Mangesh Ghiware <mghiware@google.com> |
am 2d9ec84a: am 921b0a70: am ea78390e: Re-enable crop for new panorama * commit '2d9ec84aa74baa9f79233c8dd353cc8628a37ec4': Re-enable crop for new panorama
|
2d9ec84aa74baa9f79233c8dd353cc8628a37ec4 |
19-Oct-2012 |
Mangesh Ghiware <mghiware@google.com> |
am 921b0a70: am ea78390e: Re-enable crop for new panorama * commit '921b0a70ee6af2553361b66d10439f6a72316b4f': Re-enable crop for new panorama
|
21cb756bfa59247b6c897e3b067bed5aed13e033 |
19-Oct-2012 |
Mangesh Ghiware <mghiware@google.com> |
am 921b0a70: am ea78390e: Re-enable crop for new panorama * commit '921b0a70ee6af2553361b66d10439f6a72316b4f': Re-enable crop for new panorama
|
921b0a70ee6af2553361b66d10439f6a72316b4f |
19-Oct-2012 |
Mangesh Ghiware <mghiware@google.com> |
am ea78390e: Re-enable crop for new panorama * commit 'ea78390e87642b4bc3860ba6cbdfa655db3c9e46': Re-enable crop for new panorama
|
3d5a42614f4e84234414cc9fac081ce4fc946c9b |
19-Oct-2012 |
Mangesh Ghiware <mghiware@google.com> |
am ea78390e: Re-enable crop for new panorama * commit 'ea78390e87642b4bc3860ba6cbdfa655db3c9e46': Re-enable crop for new panorama
|
18ef6ed95a4d1b75b65a2e811e298eec9c6c7193 |
19-Oct-2012 |
Mangesh Ghiware <mghiware@google.com> |
am ea78390e: Re-enable crop for new panorama * commit 'ea78390e87642b4bc3860ba6cbdfa655db3c9e46': Re-enable crop for new panorama
|
7cad82f61c1d56865fa30ce5cf36b197badd87c6 |
19-Oct-2012 |
Mangesh Ghiware <mghiware@google.com> |
Re-enable crop for new panorama Bug: 7326215 Change-Id: Ic7a87baceb8aff6247d40b91d4c60cd47c86c377
rc/com/android/gallery3d/ui/MenuExecutor.java
|
ea78390e87642b4bc3860ba6cbdfa655db3c9e46 |
19-Oct-2012 |
Mangesh Ghiware <mghiware@google.com> |
Re-enable crop for new panorama Bug: 7326215 Change-Id: Ic7a87baceb8aff6247d40b91d4c60cd47c86c377
rc/com/android/gallery3d/ui/MenuExecutor.java
|
95109e40a908ff6f2496bae3fcc0ce4476f0baa4 |
19-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am 60ef9162: am f75b34eb: am 91491889: am b48d73db: Merge "Fix geometry xforms & minor bug." into gb-ub-photos-arches * commit '60ef91623140c4e6e59b9fca433431109f82b145': Fix geometry xforms & minor bug.
|
43380e1464dcf4d9f1d99a677bb1561a3ee8b410 |
19-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 996e79b0: am 9ca5f0a1: am 5ae82e1e: am 08441371: Merge "Saner behavior when deleting in filmstrip mode" into gb-ub-photos-arches * commit '996e79b0158fa0c34b9755bd5e85f208a37e2b5a': Saner behavior when deleting in filmstrip mode
|
4b4932abe7e04f18368972b7d1d59f0de8fba3bd |
19-Oct-2012 |
Mangesh Ghiware <mghiware@google.com> |
am 78f30ccd: am 99dd83e1: am f795b403: am b037754e: Fix sharing state in Gallery ActionBar * commit '78f30ccd7dd93ad890a2c702c6bfcf209f4fd0ef': Fix sharing state in Gallery ActionBar
|
60ef91623140c4e6e59b9fca433431109f82b145 |
19-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am f75b34eb: am 91491889: am b48d73db: Merge "Fix geometry xforms & minor bug." into gb-ub-photos-arches * commit 'f75b34eb78ae81c37a69cb3a743bc1c3e3a38037': Fix geometry xforms & minor bug.
|
f75b34eb78ae81c37a69cb3a743bc1c3e3a38037 |
19-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am 91491889: am b48d73db: Merge "Fix geometry xforms & minor bug." into gb-ub-photos-arches * commit '91491889df7410dbd177c4cb708a6d10100c39a2': Fix geometry xforms & minor bug.
|
c6381a2a6ccf0bb7fba7fa44a1e7786c20f709dd |
19-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am 91491889: am b48d73db: Merge "Fix geometry xforms & minor bug." into gb-ub-photos-arches * commit '91491889df7410dbd177c4cb708a6d10100c39a2': Fix geometry xforms & minor bug.
|
98f03c96d2bef6cd4f34af65f9aeada118dd56e9 |
19-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am b48d73db: Merge "Fix geometry xforms & minor bug." into gb-ub-photos-arches * commit 'b48d73db3381718bcf86d1d919f6de9125f4f8a2': Fix geometry xforms & minor bug.
|
4fd77f38ddd6ddf83a2d51594b6025223f4e292c |
19-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am b48d73db: Merge "Fix geometry xforms & minor bug." into gb-ub-photos-arches * commit 'b48d73db3381718bcf86d1d919f6de9125f4f8a2': Fix geometry xforms & minor bug.
|
91491889df7410dbd177c4cb708a6d10100c39a2 |
19-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am b48d73db: Merge "Fix geometry xforms & minor bug." into gb-ub-photos-arches * commit 'b48d73db3381718bcf86d1d919f6de9125f4f8a2': Fix geometry xforms & minor bug.
|
b48d73db3381718bcf86d1d919f6de9125f4f8a2 |
19-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Fix geometry xforms & minor bug." into gb-ub-photos-arches
|
a02be444d5bbaf71ee4629e6cd0443679e2385b4 |
19-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Fix geometry xforms & minor bug." into gb-ub-photos-arches
|
996e79b0158fa0c34b9755bd5e85f208a37e2b5a |
19-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 9ca5f0a1: am 5ae82e1e: am 08441371: Merge "Saner behavior when deleting in filmstrip mode" into gb-ub-photos-arches * commit '9ca5f0a1a238289c190ebd697effa97c30237f02': Saner behavior when deleting in filmstrip mode
|
239bc478a7dfa9343eb8b2547fb54172f50e72aa |
19-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 5ae82e1e: am 08441371: Merge "Saner behavior when deleting in filmstrip mode" into gb-ub-photos-arches * commit '5ae82e1e0ce26b7a7a2652df15f9c22dbdd3ff21': Saner behavior when deleting in filmstrip mode
|
9ca5f0a1a238289c190ebd697effa97c30237f02 |
19-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 5ae82e1e: am 08441371: Merge "Saner behavior when deleting in filmstrip mode" into gb-ub-photos-arches * commit '5ae82e1e0ce26b7a7a2652df15f9c22dbdd3ff21': Saner behavior when deleting in filmstrip mode
|
a9cb57a26da791a4ee19f1954f14fa4056cc38df |
19-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Change number of album rows on large screens Bug: 7382498 Change-Id: Iec5b0a8491a5b4a6968da9008eab90ddd5d5bcf9
es/values-xlarge/dimensions.xml
|
ea57ad473ea73ee9aa65af4fa28de8dbfeba1123 |
19-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Change number of album rows on large screens Bug: 7382498 Change-Id: Iec5b0a8491a5b4a6968da9008eab90ddd5d5bcf9
es/values-xlarge/dimensions.xml
|
4f33d860271459dfcff7308fd7b4bd9395f48383 |
19-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 08441371: Merge "Saner behavior when deleting in filmstrip mode" into gb-ub-photos-arches * commit '084413718180f286edc94320c593bbb75dbec40b': Saner behavior when deleting in filmstrip mode
|
ad0b6f4202a2d45a0fd80b962a229da44c5e7f28 |
19-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 08441371: Merge "Saner behavior when deleting in filmstrip mode" into gb-ub-photos-arches * commit '084413718180f286edc94320c593bbb75dbec40b': Saner behavior when deleting in filmstrip mode
|
5ae82e1e0ce26b7a7a2652df15f9c22dbdd3ff21 |
19-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 08441371: Merge "Saner behavior when deleting in filmstrip mode" into gb-ub-photos-arches * commit '084413718180f286edc94320c593bbb75dbec40b': Saner behavior when deleting in filmstrip mode
|
78f30ccd7dd93ad890a2c702c6bfcf209f4fd0ef |
19-Oct-2012 |
Mangesh Ghiware <mghiware@google.com> |
am 99dd83e1: am f795b403: am b037754e: Fix sharing state in Gallery ActionBar * commit '99dd83e12d399b0828720597be2cf96d6ed1743c': Fix sharing state in Gallery ActionBar
|
5e1709a237e08cf12e0335796ed17ecb24d5a632 |
19-Oct-2012 |
Mangesh Ghiware <mghiware@google.com> |
am f795b403: am b037754e: Fix sharing state in Gallery ActionBar * commit 'f795b403ccaf9e1a012ee48f3de14afe4459d9d7': Fix sharing state in Gallery ActionBar
|
99dd83e12d399b0828720597be2cf96d6ed1743c |
19-Oct-2012 |
Mangesh Ghiware <mghiware@google.com> |
am f795b403: am b037754e: Fix sharing state in Gallery ActionBar * commit 'f795b403ccaf9e1a012ee48f3de14afe4459d9d7': Fix sharing state in Gallery ActionBar
|
084413718180f286edc94320c593bbb75dbec40b |
19-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Saner behavior when deleting in filmstrip mode" into gb-ub-photos-arches
|
bf77f1387ab6b5e9cf027b37a42357192149e233 |
19-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Saner behavior when deleting in filmstrip mode" into gb-ub-photos-arches
|
14af61dd188dfb354e7391cb50c18b705b28baaf |
19-Oct-2012 |
Mangesh Ghiware <mghiware@google.com> |
am b037754e: Fix sharing state in Gallery ActionBar * commit 'b037754eac0a4f99747edd3135776dc471d566f8': Fix sharing state in Gallery ActionBar
|
a4f2c9590822c83fc7340c2a026a90810157fc1a |
19-Oct-2012 |
Mangesh Ghiware <mghiware@google.com> |
am b037754e: Fix sharing state in Gallery ActionBar * commit 'b037754eac0a4f99747edd3135776dc471d566f8': Fix sharing state in Gallery ActionBar
|
f795b403ccaf9e1a012ee48f3de14afe4459d9d7 |
19-Oct-2012 |
Mangesh Ghiware <mghiware@google.com> |
am b037754e: Fix sharing state in Gallery ActionBar * commit 'b037754eac0a4f99747edd3135776dc471d566f8': Fix sharing state in Gallery ActionBar
|
e3ac74402443fb94d86054052dcaad99713bed10 |
19-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Saner behavior when deleting in filmstrip mode Bug: 7353749 Change-Id: Ic9854d205fe5ab76dd1cfe78fee314e93e1ace55
rc/com/android/gallery3d/ui/PhotoView.java
|
55146e261be8104860e484d5bcb93f635814b825 |
19-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Saner behavior when deleting in filmstrip mode Bug: 7353749 Change-Id: Ic9854d205fe5ab76dd1cfe78fee314e93e1ace55
rc/com/android/gallery3d/ui/PhotoView.java
|
b037754eac0a4f99747edd3135776dc471d566f8 |
19-Oct-2012 |
Mangesh Ghiware <mghiware@google.com> |
Fix sharing state in Gallery ActionBar Bug: 7340067 Change-Id: I4ff9577315fc743f6b9fef0d325b0743546f108e
rc/com/android/gallery3d/app/GalleryActionBar.java
|
09d1602f2e14bf9d9f22739afb4a95ae3282a762 |
19-Oct-2012 |
Mangesh Ghiware <mghiware@google.com> |
Fix sharing state in Gallery ActionBar Bug: 7340067 Change-Id: I4ff9577315fc743f6b9fef0d325b0743546f108e
rc/com/android/gallery3d/app/GalleryActionBar.java
|
11dd76333ccbbdfbee204f6c014cc4a055d7ee5d |
19-Oct-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
00d64dd584c6d08310a32a28e75aebc6eb8238ea |
19-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Fix geometry xforms & minor bug. Bug: 7376048 Fixed geometry transform. Fixed minor bug where the foldername for saved edited images was incorrect. Change-Id: Icb3156f02b7db7b50a455aaa31ee70832e3fdca8
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterGeometry.java
rc/com/android/gallery3d/filtershow/imageshow/GeometryMetadata.java
rc/com/android/gallery3d/filtershow/imageshow/ImageFlip.java
|
bc4f2ffb15b34dac8bb68112e25889dac90c8bc1 |
19-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Fix geometry xforms & minor bug. Bug: 7376048 Fixed geometry transform. Fixed minor bug where the foldername for saved edited images was incorrect. Change-Id: Icb3156f02b7db7b50a455aaa31ee70832e3fdca8
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterGeometry.java
rc/com/android/gallery3d/filtershow/imageshow/GeometryMetadata.java
rc/com/android/gallery3d/filtershow/imageshow/ImageFlip.java
|
da3724fe014ea7faa456ab302ff0bafadb66d80a |
19-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am fd0160d0: am f2c63869: am 0f327c32: am c5590eb1: Improves Curves & Crop UI * commit 'fd0160d0f3691169de8195f2bcf82974545c4a05': Improves Curves & Crop UI
|
fd0160d0f3691169de8195f2bcf82974545c4a05 |
19-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am f2c63869: am 0f327c32: am c5590eb1: Improves Curves & Crop UI * commit 'f2c63869e3a347d5c86d1bdd2b759695a98bfaa0': Improves Curves & Crop UI
|
f2c63869e3a347d5c86d1bdd2b759695a98bfaa0 |
19-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 0f327c32: am c5590eb1: Improves Curves & Crop UI * commit '0f327c3297253c2ea67ec7ae32c0e6ba4917e648': Improves Curves & Crop UI
|
2f7e2992af1ba12484ee21f4c8d95bfe20496806 |
19-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 0f327c32: am c5590eb1: Improves Curves & Crop UI * commit '0f327c3297253c2ea67ec7ae32c0e6ba4917e648': Improves Curves & Crop UI
|
760c814f545a01c6e53d7e7da8040f98b5d87af0 |
19-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am c5590eb1: Improves Curves & Crop UI * commit 'c5590eb1a20b112e67e4c43684790587f844fc6b': Improves Curves & Crop UI
|
c6931c56f1d97e1ed6ebd115754db5bd8352d7d9 |
19-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am c5590eb1: Improves Curves & Crop UI * commit 'c5590eb1a20b112e67e4c43684790587f844fc6b': Improves Curves & Crop UI
|
8c751160821db47e15c91d30e98f321faf34fd96 |
19-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am c5590eb1: Improves Curves & Crop UI * commit 'c5590eb1a20b112e67e4c43684790587f844fc6b': Improves Curves & Crop UI
|
0f327c3297253c2ea67ec7ae32c0e6ba4917e648 |
19-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am c5590eb1: Improves Curves & Crop UI * commit 'c5590eb1a20b112e67e4c43684790587f844fc6b': Improves Curves & Crop UI
|
701526a962647cff3bd8b5360c10fd79636926cc |
19-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Improves Curves & Crop UI bug:7361722 - Use new assets - Add a margin - Add a popup menu - Add a new button showing the current channel - Add popup menu, new assets, new button for Crop as well Change-Id: I0e09098e3135d2213f7f4cd64cd75a3a518a07da
es/layout/filtershow_activity.xml
es/menu/filtershow_menu_crop.xml
es/menu/filtershow_menu_curves.xml
|
b184f83254e8a930112c4db9364669a936f295d8 |
19-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Improves Curves & Crop UI bug:7361722 - Use new assets - Add a margin - Add a popup menu - Add a new button showing the current channel - Add popup menu, new assets, new button for Crop as well Change-Id: I0e09098e3135d2213f7f4cd64cd75a3a518a07da
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/PanelController.java
rc/com/android/gallery3d/filtershow/imageshow/ImageCrop.java
rc/com/android/gallery3d/filtershow/imageshow/ImageShow.java
rc/com/android/gallery3d/filtershow/ui/FramedTextButton.java
rc/com/android/gallery3d/filtershow/ui/ImageCurves.java
rc/com/android/gallery3d/filtershow/ui/Spline.java
|
c5590eb1a20b112e67e4c43684790587f844fc6b |
19-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Improves Curves & Crop UI bug:7361722 - Use new assets - Add a margin - Add a popup menu - Add a new button showing the current channel - Add popup menu, new assets, new button for Crop as well Change-Id: I0e09098e3135d2213f7f4cd64cd75a3a518a07da
es/layout/filtershow_activity.xml
es/menu/filtershow_menu_crop.xml
es/menu/filtershow_menu_curves.xml
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/PanelController.java
rc/com/android/gallery3d/filtershow/imageshow/ImageCrop.java
rc/com/android/gallery3d/filtershow/imageshow/ImageShow.java
rc/com/android/gallery3d/filtershow/ui/FramedTextButton.java
rc/com/android/gallery3d/filtershow/ui/ImageCurves.java
rc/com/android/gallery3d/filtershow/ui/Spline.java
|
cffb68eba684a7da0a5a613c0ceb54817b7fd8d3 |
19-Oct-2012 |
Doris Liu <tianliu@google.com> |
am 8d2cf47a: am 14800413: am c0ecc707: am 4b6c20de: Merge "Adding support for tiny planet in gallery" into gb-ub-photos-arches * commit '8d2cf47a5a658d075c41648ea6769a4379cf33c6': Adding support for tiny planet in gallery
|
8d2cf47a5a658d075c41648ea6769a4379cf33c6 |
19-Oct-2012 |
Doris Liu <tianliu@google.com> |
am 14800413: am c0ecc707: am 4b6c20de: Merge "Adding support for tiny planet in gallery" into gb-ub-photos-arches * commit '1480041324f1fc788258a197236c8e100d1ae4f6': Adding support for tiny planet in gallery
|
1480041324f1fc788258a197236c8e100d1ae4f6 |
19-Oct-2012 |
Doris Liu <tianliu@google.com> |
am c0ecc707: am 4b6c20de: Merge "Adding support for tiny planet in gallery" into gb-ub-photos-arches * commit 'c0ecc7076a32b184fb4f730996990e0345be804b': Adding support for tiny planet in gallery
|
a175392c7073819ee6711099d6ce6aa40167b8dd |
19-Oct-2012 |
Doris Liu <tianliu@google.com> |
am c0ecc707: am 4b6c20de: Merge "Adding support for tiny planet in gallery" into gb-ub-photos-arches * commit 'c0ecc7076a32b184fb4f730996990e0345be804b': Adding support for tiny planet in gallery
|
8fdbe2967f510c87eb28bb088a54ebd63c6768e7 |
19-Oct-2012 |
Doris Liu <tianliu@google.com> |
am 4b6c20de: Merge "Adding support for tiny planet in gallery" into gb-ub-photos-arches * commit '4b6c20de6fef0aacb464398f2a6bf4b7959f4726': Adding support for tiny planet in gallery
|
f634fe6a7ed4daaa85ad77a03653a81d9c8b6e2d |
19-Oct-2012 |
Doris Liu <tianliu@google.com> |
am 4b6c20de: Merge "Adding support for tiny planet in gallery" into gb-ub-photos-arches * commit '4b6c20de6fef0aacb464398f2a6bf4b7959f4726': Adding support for tiny planet in gallery
|
b9f0203a760662cb7b9ba5c20b82c3269847ea8c |
19-Oct-2012 |
Doris Liu <tianliu@google.com> |
am 4b6c20de: Merge "Adding support for tiny planet in gallery" into gb-ub-photos-arches * commit '4b6c20de6fef0aacb464398f2a6bf4b7959f4726': Adding support for tiny planet in gallery
|
c0ecc7076a32b184fb4f730996990e0345be804b |
19-Oct-2012 |
Doris Liu <tianliu@google.com> |
am 4b6c20de: Merge "Adding support for tiny planet in gallery" into gb-ub-photos-arches * commit '4b6c20de6fef0aacb464398f2a6bf4b7959f4726': Adding support for tiny planet in gallery
|
3b50e7b4baceebfea3fb3ccc7aca2966a20d02b9 |
19-Oct-2012 |
Doris Liu <tianliu@google.com> |
Merge "Adding support for tiny planet in gallery" into gb-ub-photos-arches
|
4b6c20de6fef0aacb464398f2a6bf4b7959f4726 |
19-Oct-2012 |
Doris Liu <tianliu@google.com> |
Merge "Adding support for tiny planet in gallery" into gb-ub-photos-arches
|
63d2623cb7078b3b16ce7cffb766164359c252a7 |
19-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 5eb26a49: am 0be9d911: am 51283054: am b42ea026: Merge "Fix Gallery crash" into gb-ub-photos-arches * commit '5eb26a49befb259cadd9e2ee2a992e205699a759': Fix Gallery crash
|
5eb26a49befb259cadd9e2ee2a992e205699a759 |
19-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 0be9d911: am 51283054: am b42ea026: Merge "Fix Gallery crash" into gb-ub-photos-arches * commit '0be9d9116c4a016cda95b8847c7c91a34d12b55c': Fix Gallery crash
|
52e44d249893969910b241aded0f9796d5dfa03d |
19-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 51283054: am b42ea026: Merge "Fix Gallery crash" into gb-ub-photos-arches * commit '51283054901d747c8e2db4609aa28590913b4ee7': Fix Gallery crash
|
0be9d9116c4a016cda95b8847c7c91a34d12b55c |
19-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 51283054: am b42ea026: Merge "Fix Gallery crash" into gb-ub-photos-arches * commit '51283054901d747c8e2db4609aa28590913b4ee7': Fix Gallery crash
|
8840750eed6a8983c0f97fefbe3c9c290cf3e7e3 |
19-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am b42ea026: Merge "Fix Gallery crash" into gb-ub-photos-arches * commit 'b42ea0266c3b10e0b40119ec5c0adf6e9bb8973b': Fix Gallery crash
|
b97cd16624b5609214b8b68e7ab9861098673dcc |
19-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am b42ea026: Merge "Fix Gallery crash" into gb-ub-photos-arches * commit 'b42ea0266c3b10e0b40119ec5c0adf6e9bb8973b': Fix Gallery crash
|
51283054901d747c8e2db4609aa28590913b4ee7 |
19-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am b42ea026: Merge "Fix Gallery crash" into gb-ub-photos-arches * commit 'b42ea0266c3b10e0b40119ec5c0adf6e9bb8973b': Fix Gallery crash
|
5530e2979762541936a2087df57a5fbaab8cc53a |
19-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Fix Gallery crash" into gb-ub-photos-arches
|
b42ea0266c3b10e0b40119ec5c0adf6e9bb8973b |
19-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Fix Gallery crash" into gb-ub-photos-arches
|
0326cb76300fd2187cb742868668722f5651c30c |
19-Oct-2012 |
Scott Main <smain@google.com> |
am ad96fe21: (-s ours) am 587e7a62: am 44adb1ee: am 9baf2fd5: (-s ours) DO NOT MERGE cherrypick from Change-Id: I51c6a730e8663586153750a1cda6ea65aad592e8 remove old fashioned Dream, no longer supported * commit 'ad96fe2195f19623e8030bd469ffa6ae5c1554d9': DO NOT MERGE cherrypick from Change-Id: I51c6a730e8663586153750a1cda6ea65aad592e8 remove old fashioned Dream, no longer supported
|
ad96fe2195f19623e8030bd469ffa6ae5c1554d9 |
19-Oct-2012 |
Scott Main <smain@google.com> |
am 587e7a62: am 44adb1ee: am 9baf2fd5: (-s ours) DO NOT MERGE cherrypick from Change-Id: I51c6a730e8663586153750a1cda6ea65aad592e8 remove old fashioned Dream, no longer supported * commit '587e7a62fd32cdd6d2260088dd474ac08fcf0b8f': DO NOT MERGE cherrypick from Change-Id: I51c6a730e8663586153750a1cda6ea65aad592e8 remove old fashioned Dream, no longer supported
|
587e7a62fd32cdd6d2260088dd474ac08fcf0b8f |
19-Oct-2012 |
Scott Main <smain@google.com> |
am 44adb1ee: am 9baf2fd5: (-s ours) DO NOT MERGE cherrypick from Change-Id: I51c6a730e8663586153750a1cda6ea65aad592e8 remove old fashioned Dream, no longer supported * commit '44adb1ee0826b82ca9e25cd8fc7577663f237b83': DO NOT MERGE cherrypick from Change-Id: I51c6a730e8663586153750a1cda6ea65aad592e8 remove old fashioned Dream, no longer supported
|
b07da3812737997ecec4c4a980411b6a8d88caff |
19-Oct-2012 |
Scott Main <smain@google.com> |
am 44adb1ee: (-s ours) am 9baf2fd5: (-s ours) DO NOT MERGE cherrypick from Change-Id: I51c6a730e8663586153750a1cda6ea65aad592e8 remove old fashioned Dream, no longer supported * commit '44adb1ee0826b82ca9e25cd8fc7577663f237b83': DO NOT MERGE cherrypick from Change-Id: I51c6a730e8663586153750a1cda6ea65aad592e8 remove old fashioned Dream, no longer supported
|
44adb1ee0826b82ca9e25cd8fc7577663f237b83 |
19-Oct-2012 |
Scott Main <smain@google.com> |
am 9baf2fd5: (-s ours) DO NOT MERGE cherrypick from Change-Id: I51c6a730e8663586153750a1cda6ea65aad592e8 remove old fashioned Dream, no longer supported * commit '9baf2fd55613ce3f545da2d341c8e8a36b82ee78': DO NOT MERGE cherrypick from Change-Id: I51c6a730e8663586153750a1cda6ea65aad592e8 remove old fashioned Dream, no longer supported
|
807179eafbc9428e647bcfde9062eb4e1c84cab2 |
19-Oct-2012 |
Scott Main <smain@google.com> |
am 9baf2fd5: (-s ours) DO NOT MERGE cherrypick from Change-Id: I51c6a730e8663586153750a1cda6ea65aad592e8 remove old fashioned Dream, no longer supported * commit '9baf2fd55613ce3f545da2d341c8e8a36b82ee78': DO NOT MERGE cherrypick from Change-Id: I51c6a730e8663586153750a1cda6ea65aad592e8 remove old fashioned Dream, no longer supported
ndroidManifest.xml
|
52dd8204bfcfdc63fd21674285e66a43fc3ea9cf |
19-Oct-2012 |
Scott Main <smain@google.com> |
am 9baf2fd5: (-s ours) DO NOT MERGE cherrypick from Change-Id: I51c6a730e8663586153750a1cda6ea65aad592e8 remove old fashioned Dream, no longer supported * commit '9baf2fd55613ce3f545da2d341c8e8a36b82ee78': DO NOT MERGE cherrypick from Change-Id: I51c6a730e8663586153750a1cda6ea65aad592e8 remove old fashioned Dream, no longer supported
|
3ceecac2dc1db8f8dff244a5bfad7765d24bdcf0 |
19-Oct-2012 |
Scott Main <smain@google.com> |
am 9baf2fd5: (-s ours) DO NOT MERGE cherrypick from Change-Id: I51c6a730e8663586153750a1cda6ea65aad592e8 remove old fashioned Dream, no longer supported * commit '9baf2fd55613ce3f545da2d341c8e8a36b82ee78': DO NOT MERGE cherrypick from Change-Id: I51c6a730e8663586153750a1cda6ea65aad592e8 remove old fashioned Dream, no longer supported
|
e32571ad419e5cf38c0568fd60a0cc640837819c |
19-Oct-2012 |
Doris Liu <tianliu@google.com> |
Adding support for tiny planet in gallery Bug: 7344427 Change-Id: I6fad734b28022f45cc551d81212ee4d3a0c867b2
es/drawable-hdpi/ic_menu_tiny_planet.png
es/drawable-mdpi/ic_menu_tiny_planet.png
es/drawable-xhdpi/ic_menu_tiny_planet.png
es/layout/photopage_bottom_controls.xml
|
d672d083d1af3e42e0f87c5b0757d714270dcd9e |
19-Oct-2012 |
Doris Liu <tianliu@google.com> |
Adding support for tiny planet in gallery Bug: 7344427 Change-Id: I6fad734b28022f45cc551d81212ee4d3a0c867b2
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/app/PhotoPageBottomControls.java
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
|
a680a0c32ae3321c632288b36083f2782af2c55b |
19-Oct-2012 |
Doris Liu <tianliu@google.com> |
Adding support for tiny planet in gallery Bug: 7344427 Change-Id: I6fad734b28022f45cc551d81212ee4d3a0c867b2
es/drawable-hdpi/ic_menu_tiny_planet.png
es/drawable-mdpi/ic_menu_tiny_planet.png
es/drawable-xhdpi/ic_menu_tiny_planet.png
es/layout/photopage_bottom_controls.xml
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/app/PhotoPageBottomControls.java
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
|
3045c0c57f5d0850a181ced58df657725afa96fb |
19-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Fix Gallery crash Bug: 7268985 Change-Id: I88c823d3270cb74d6e2bd7df5b6b6ed9e28f16a6
rc/com/android/gallery3d/app/AlbumPage.java
|
35e7b4ae727394aace466ebcf33d89adf01b690c |
19-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Fix Gallery crash Bug: 7268985 Change-Id: I88c823d3270cb74d6e2bd7df5b6b6ed9e28f16a6
rc/com/android/gallery3d/app/AlbumPage.java
|
2551de952f76901d9d942197458bbd7d1efecdbd |
18-Oct-2012 |
Scott Main <smain@google.com> |
DO NOT MERGE cherrypick from Change-Id: I51c6a730e8663586153750a1cda6ea65aad592e8 remove old fashioned Dream, no longer supported Change-Id: I51c6a730e8663586153750a1cda6ea65aad592e8 Conflicts: AndroidManifest.xml
ndroidManifest.xml
|
8c6181a363fad6f37bc780e3f4c109009a7646e5 |
18-Oct-2012 |
Scott Main <smain@google.com> |
DO NOT MERGE cherrypick from Change-Id: I51c6a730e8663586153750a1cda6ea65aad592e8 remove old fashioned Dream, no longer supported Change-Id: I51c6a730e8663586153750a1cda6ea65aad592e8 Conflicts: AndroidManifest.xml
rc/com/android/gallery3d/app/SlideshowDream.java
|
9baf2fd55613ce3f545da2d341c8e8a36b82ee78 |
18-Oct-2012 |
Scott Main <smain@google.com> |
DO NOT MERGE cherrypick from Change-Id: I51c6a730e8663586153750a1cda6ea65aad592e8 remove old fashioned Dream, no longer supported Change-Id: I51c6a730e8663586153750a1cda6ea65aad592e8 Conflicts: AndroidManifest.xml
ndroidManifest.xml
rc/com/android/gallery3d/app/SlideshowDream.java
|
f8711b46f4cb51363034e46cda4438c6b425db42 |
19-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 9386b24b: am 6cef17ee: am 856ec7e5: am 79704855: Merge "Do not show "Filmstrip view" text when photo is fullscreen" into gb-ub-photos-arches * commit '9386b24bae159ff6a7a7204099a9e350ee1ceaab': Do not show "Filmstrip view" text when photo is fullscreen
|
9386b24bae159ff6a7a7204099a9e350ee1ceaab |
19-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 6cef17ee: am 856ec7e5: am 79704855: Merge "Do not show "Filmstrip view" text when photo is fullscreen" into gb-ub-photos-arches * commit '6cef17ee61523b7bc6dee1009596eb5fdafa9c72': Do not show "Filmstrip view" text when photo is fullscreen
|
5fd5a8be5f387466f2ffc1b89b2356ea2a9bdff1 |
19-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 856ec7e5: am 79704855: Merge "Do not show "Filmstrip view" text when photo is fullscreen" into gb-ub-photos-arches * commit '856ec7e57f8e02617dab5fdeb43604fd86f9d95c': Do not show "Filmstrip view" text when photo is fullscreen
|
6cef17ee61523b7bc6dee1009596eb5fdafa9c72 |
19-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 856ec7e5: am 79704855: Merge "Do not show "Filmstrip view" text when photo is fullscreen" into gb-ub-photos-arches * commit '856ec7e57f8e02617dab5fdeb43604fd86f9d95c': Do not show "Filmstrip view" text when photo is fullscreen
|
58f54b70d25e3dbf03c094be10a8cfb497cf0a6a |
19-Oct-2012 |
John Reck <jreck@google.com> |
am 456cc1d4: am a7b6bb99: am 5415b4cb: am 014a111f: Save XMP & Exif data on edited photos * commit '456cc1d47eb19fc1aa6277450bc21806f29fc8a6': Save XMP & Exif data on edited photos
|
79f5e00a40791c562ad68e4e43d6483ef0aabf6d |
19-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 79704855: Merge "Do not show "Filmstrip view" text when photo is fullscreen" into gb-ub-photos-arches * commit '79704855fb9b83acf9dc505f9ab1989ec1c770bc': Do not show "Filmstrip view" text when photo is fullscreen
|
b83ede3db91964d3676a8e6a3747763020feaf85 |
19-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 79704855: Merge "Do not show "Filmstrip view" text when photo is fullscreen" into gb-ub-photos-arches * commit '79704855fb9b83acf9dc505f9ab1989ec1c770bc': Do not show "Filmstrip view" text when photo is fullscreen
|
856ec7e57f8e02617dab5fdeb43604fd86f9d95c |
19-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 79704855: Merge "Do not show "Filmstrip view" text when photo is fullscreen" into gb-ub-photos-arches * commit '79704855fb9b83acf9dc505f9ab1989ec1c770bc': Do not show "Filmstrip view" text when photo is fullscreen
|
99cb9cd2816c5fa8cfddb34e5ef84ec3d9b2a330 |
19-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Do not show "Filmstrip view" text when photo is fullscreen" into gb-ub-photos-arches
|
79704855fb9b83acf9dc505f9ab1989ec1c770bc |
19-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Do not show "Filmstrip view" text when photo is fullscreen" into gb-ub-photos-arches
|
456cc1d47eb19fc1aa6277450bc21806f29fc8a6 |
19-Oct-2012 |
John Reck <jreck@google.com> |
am a7b6bb99: am 5415b4cb: am 014a111f: Save XMP & Exif data on edited photos * commit 'a7b6bb996cae7e27babf2fc6e1d7ee3f0077fd13': Save XMP & Exif data on edited photos
|
d2f8bc069269542936f0e21595081093b86fa474 |
19-Oct-2012 |
John Reck <jreck@google.com> |
am 5415b4cb: am 014a111f: Save XMP & Exif data on edited photos * commit '5415b4cbeb106f090f25a9913fea5d56d6e07d4f': Save XMP & Exif data on edited photos
|
a7b6bb996cae7e27babf2fc6e1d7ee3f0077fd13 |
19-Oct-2012 |
John Reck <jreck@google.com> |
am 5415b4cb: am 014a111f: Save XMP & Exif data on edited photos * commit '5415b4cbeb106f090f25a9913fea5d56d6e07d4f': Save XMP & Exif data on edited photos
|
e9d5454cfd081bdfc438412f26d22ecf70489056 |
19-Oct-2012 |
John Reck <jreck@google.com> |
am 014a111f: Save XMP & Exif data on edited photos * commit '014a111f10a7523415ca210bc6fe1e4f00183d31': Save XMP & Exif data on edited photos
|
4c81eba762910d11d8cf58af86a937d869af768a |
19-Oct-2012 |
John Reck <jreck@google.com> |
am 014a111f: Save XMP & Exif data on edited photos * commit '014a111f10a7523415ca210bc6fe1e4f00183d31': Save XMP & Exif data on edited photos
|
ea28ad465eb20dd3455f2d69d38af65d4f77eb68 |
19-Oct-2012 |
John Reck <jreck@google.com> |
am 014a111f: Save XMP & Exif data on edited photos * commit '014a111f10a7523415ca210bc6fe1e4f00183d31': Save XMP & Exif data on edited photos
|
5415b4cbeb106f090f25a9913fea5d56d6e07d4f |
19-Oct-2012 |
John Reck <jreck@google.com> |
am 014a111f: Save XMP & Exif data on edited photos * commit '014a111f10a7523415ca210bc6fe1e4f00183d31': Save XMP & Exif data on edited photos
|
e9d14aae2c3281f9bf703564c256a828cb28c415 |
19-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 81e30573: am 8d48e27c: am 8f6e1dc3: am d7899c56: Fix undo/redo/back button behaviour with effects and enable history * commit '81e3057341164f276482a2470a9058cc928ae7de': Fix undo/redo/back button behaviour with effects and enable history
|
81e3057341164f276482a2470a9058cc928ae7de |
19-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 8d48e27c: am 8f6e1dc3: am d7899c56: Fix undo/redo/back button behaviour with effects and enable history * commit '8d48e27c64e7d0dd907813967903219bc4b623c2': Fix undo/redo/back button behaviour with effects and enable history
|
1bde451f817f716c7091b36dc92f714b69c5b363 |
19-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 8f6e1dc3: am d7899c56: Fix undo/redo/back button behaviour with effects and enable history * commit '8f6e1dc361d57e8cabb6dcce3d06edaa1c25f21c': Fix undo/redo/back button behaviour with effects and enable history
|
8d48e27c64e7d0dd907813967903219bc4b623c2 |
19-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 8f6e1dc3: am d7899c56: Fix undo/redo/back button behaviour with effects and enable history * commit '8f6e1dc361d57e8cabb6dcce3d06edaa1c25f21c': Fix undo/redo/back button behaviour with effects and enable history
|
a56928b10753735fa95976200de4e7389f95e240 |
19-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am d7899c56: Fix undo/redo/back button behaviour with effects and enable history * commit 'd7899c56b8df278dfd6720ae11eadc2f89fe8094': Fix undo/redo/back button behaviour with effects and enable history
|
a0663a1d3085f7016d54df8ccf983c50196548d3 |
19-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am d7899c56: Fix undo/redo/back button behaviour with effects and enable history * commit 'd7899c56b8df278dfd6720ae11eadc2f89fe8094': Fix undo/redo/back button behaviour with effects and enable history
|
a122a930e1549eae91ede0da227a3d8ec2aaa219 |
19-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am d7899c56: Fix undo/redo/back button behaviour with effects and enable history * commit 'd7899c56b8df278dfd6720ae11eadc2f89fe8094': Fix undo/redo/back button behaviour with effects and enable history
|
8f6e1dc361d57e8cabb6dcce3d06edaa1c25f21c |
19-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am d7899c56: Fix undo/redo/back button behaviour with effects and enable history * commit 'd7899c56b8df278dfd6720ae11eadc2f89fe8094': Fix undo/redo/back button behaviour with effects and enable history
|
b7b8504e805fd1ffe6205aea6d4dbc112372fbf5 |
18-Oct-2012 |
John Reck <jreck@google.com> |
Save XMP & Exif data on edited photos Bug: 7293391 Bug: 7329199 Bug: 7376660 Change-Id: I23b1637a9a494c1dc43b1fc1359cdaf3e75bc23f
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
|
f1135ad929aadaf873314cc14216c4a8b0ab5b7c |
18-Oct-2012 |
John Reck <jreck@google.com> |
Save XMP & Exif data on edited photos Bug: 7293391 Bug: 7329199 Bug: 7376660 Change-Id: I23b1637a9a494c1dc43b1fc1359cdaf3e75bc23f
rc/com/android/gallery3d/filtershow/cache/ImageLoader.java
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
rc/com/android/gallery3d/filtershow/tools/ProcessedBitmap.java
rc/com/android/gallery3d/filtershow/tools/SaveCopyTask.java
rc_pd/com/android/gallery3d/util/XmpUtilHelper.java
|
014a111f10a7523415ca210bc6fe1e4f00183d31 |
18-Oct-2012 |
John Reck <jreck@google.com> |
Save XMP & Exif data on edited photos Bug: 7293391 Bug: 7329199 Bug: 7376660 Change-Id: I23b1637a9a494c1dc43b1fc1359cdaf3e75bc23f
rc/com/android/gallery3d/filtershow/cache/ImageLoader.java
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
rc/com/android/gallery3d/filtershow/tools/ProcessedBitmap.java
rc/com/android/gallery3d/filtershow/tools/SaveCopyTask.java
rc_pd/com/android/gallery3d/util/XmpUtilHelper.java
|
ee5ec4eb100800d680be961395a04566f561ee41 |
18-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Fix undo/redo/back button behaviour with effects and enable history bug:7332980 bug:7357734 bug:7325872 Change-Id: Ie952a410c218c91ac927095ddcf542209fe7b90c
es/drawable-hdpi/camera_crop.png
es/drawable-mdpi/camera_crop.png
es/drawable-xhdpi/camera_crop.png
es/layout/filtershow_history_operation_row.xml
es/menu/filtershow_activity_menu.xml
|
e1fb53368803126d6f128b16799f1875705d3562 |
18-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Fix undo/redo/back button behaviour with effects and enable history bug:7332980 bug:7357734 bug:7325872 Change-Id: Ie952a410c218c91ac927095ddcf542209fe7b90c
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/HistoryAdapter.java
rc/com/android/gallery3d/filtershow/PanelController.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterCurves.java
rc/com/android/gallery3d/filtershow/imageshow/ImageCrop.java
rc/com/android/gallery3d/filtershow/imageshow/ImageFlip.java
rc/com/android/gallery3d/filtershow/imageshow/ImageGeometry.java
rc/com/android/gallery3d/filtershow/imageshow/ImageRotate.java
rc/com/android/gallery3d/filtershow/imageshow/ImageShow.java
rc/com/android/gallery3d/filtershow/imageshow/ImageSlave.java
rc/com/android/gallery3d/filtershow/imageshow/ImageStraighten.java
rc/com/android/gallery3d/filtershow/ui/ImageCurves.java
rc/com/android/gallery3d/filtershow/ui/Spline.java
|
d7899c56b8df278dfd6720ae11eadc2f89fe8094 |
18-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Fix undo/redo/back button behaviour with effects and enable history bug:7332980 bug:7357734 bug:7325872 Change-Id: Ie952a410c218c91ac927095ddcf542209fe7b90c
es/drawable-hdpi/camera_crop.png
es/drawable-mdpi/camera_crop.png
es/drawable-xhdpi/camera_crop.png
es/layout/filtershow_history_operation_row.xml
es/menu/filtershow_activity_menu.xml
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/HistoryAdapter.java
rc/com/android/gallery3d/filtershow/PanelController.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterCurves.java
rc/com/android/gallery3d/filtershow/imageshow/ImageCrop.java
rc/com/android/gallery3d/filtershow/imageshow/ImageFlip.java
rc/com/android/gallery3d/filtershow/imageshow/ImageGeometry.java
rc/com/android/gallery3d/filtershow/imageshow/ImageRotate.java
rc/com/android/gallery3d/filtershow/imageshow/ImageShow.java
rc/com/android/gallery3d/filtershow/imageshow/ImageSlave.java
rc/com/android/gallery3d/filtershow/imageshow/ImageStraighten.java
rc/com/android/gallery3d/filtershow/ui/ImageCurves.java
rc/com/android/gallery3d/filtershow/ui/Spline.java
|
983bfb27ad7b64bce2817d778f6a1069f512ade8 |
19-Oct-2012 |
George Mount <mount@google.com> |
am 5c966337: am 79bb3b6b: am b69af65f: am 0745eba4: Merge "Remove panorama checks from supported operations." into gb-ub-photos-arches * commit '5c966337dd2d9c4c6861697ae85ce2dcbd20fbb5': Remove panorama checks from supported operations.
|
0a6f33e3d3ec9c566e94e954d36d7e34cb096724 |
19-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am ddd1a077: am 73483c52: am f52d90a1: am 60d25279: Handle screen rotation * commit 'ddd1a0771ec163ef4a3e0732a50b33852014af9b': Handle screen rotation
|
5c966337dd2d9c4c6861697ae85ce2dcbd20fbb5 |
19-Oct-2012 |
George Mount <mount@google.com> |
am 79bb3b6b: am b69af65f: am 0745eba4: Merge "Remove panorama checks from supported operations." into gb-ub-photos-arches * commit '79bb3b6b2af943fc40163a79645eb79768164593': Remove panorama checks from supported operations.
|
ddd1a0771ec163ef4a3e0732a50b33852014af9b |
19-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 73483c52: am f52d90a1: am 60d25279: Handle screen rotation * commit '73483c52364faa3dac45f812754f531417bb9a24': Handle screen rotation
|
816f5f93572c728a80e7d0d32199b72b91f3b37d |
19-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Do not show "Filmstrip view" text when photo is fullscreen Bug: 243374 Change-Id: I2d0a1d56e6c2d833d9d75041b30afcb988635c49
rc/com/android/gallery3d/app/PhotoPage.java
|
c29588d7cc9fc3d2eef61af433fc0a8859e16ef4 |
19-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Do not show "Filmstrip view" text when photo is fullscreen Bug: 243374 Change-Id: I2d0a1d56e6c2d833d9d75041b30afcb988635c49
rc/com/android/gallery3d/app/PhotoPage.java
|
39f548a5e9764afa105af687e4db15ed8b7c47cd |
19-Oct-2012 |
George Mount <mount@google.com> |
am b69af65f: am 0745eba4: Merge "Remove panorama checks from supported operations." into gb-ub-photos-arches * commit 'b69af65f5c1e957f4b5b39c7c381c7a28eb409ce': Remove panorama checks from supported operations.
|
e6e10e3286724adfe24c7783ba12cfe761e36e22 |
19-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am f52d90a1: am 60d25279: Handle screen rotation * commit 'f52d90a1610469dfa195ee89cee7a72ac2333400': Handle screen rotation
|
79bb3b6b2af943fc40163a79645eb79768164593 |
19-Oct-2012 |
George Mount <mount@google.com> |
am b69af65f: am 0745eba4: Merge "Remove panorama checks from supported operations." into gb-ub-photos-arches * commit 'b69af65f5c1e957f4b5b39c7c381c7a28eb409ce': Remove panorama checks from supported operations.
|
73483c52364faa3dac45f812754f531417bb9a24 |
19-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am f52d90a1: am 60d25279: Handle screen rotation * commit 'f52d90a1610469dfa195ee89cee7a72ac2333400': Handle screen rotation
|
b69af65f5c1e957f4b5b39c7c381c7a28eb409ce |
19-Oct-2012 |
George Mount <mount@google.com> |
am 0745eba4: Merge "Remove panorama checks from supported operations." into gb-ub-photos-arches * commit '0745eba4898419aad2b6e79be137a2a1edf4d0fc': Remove panorama checks from supported operations.
|
8ddb7f70474a26eac09d79be5c135cbe27096061 |
19-Oct-2012 |
George Mount <mount@google.com> |
am 0745eba4: Merge "Remove panorama checks from supported operations." into gb-ub-photos-arches * commit '0745eba4898419aad2b6e79be137a2a1edf4d0fc': Remove panorama checks from supported operations.
|
f2dc8dbbc559a55e7b0ff4016ab55e9dcd0f4c36 |
19-Oct-2012 |
George Mount <mount@google.com> |
am 0745eba4: Merge "Remove panorama checks from supported operations." into gb-ub-photos-arches * commit '0745eba4898419aad2b6e79be137a2a1edf4d0fc': Remove panorama checks from supported operations.
|
f52d90a1610469dfa195ee89cee7a72ac2333400 |
19-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 60d25279: Handle screen rotation * commit '60d252795f41d0cfe4d0e11b4d1e32d4547368c9': Handle screen rotation
|
ada60e06830c4537d36fde127d23f606011aeb0c |
19-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 60d25279: Handle screen rotation * commit '60d252795f41d0cfe4d0e11b4d1e32d4547368c9': Handle screen rotation
|
f99b57bd4ed4f186af0f860a5f0702255c06f7f6 |
19-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 60d25279: Handle screen rotation * commit '60d252795f41d0cfe4d0e11b4d1e32d4547368c9': Handle screen rotation
|
10ed0fbdb5619d0972aa3cc6fd8c05201a992e39 |
19-Oct-2012 |
George Mount <mount@google.com> |
Merge "Remove panorama checks from supported operations." into gb-ub-photos-arches
|
0745eba4898419aad2b6e79be137a2a1edf4d0fc |
19-Oct-2012 |
George Mount <mount@google.com> |
Merge "Remove panorama checks from supported operations." into gb-ub-photos-arches
|
16b3bfbbd2a6447684ac406554f862b29c873751 |
18-Oct-2012 |
George Mount <mount@google.com> |
Remove panorama checks from supported operations. Bug 7351383 Bug 7349438 Move panorama support checks from getSupportedOperations so that calls to getSupportedOperations are consistent. Panorama checks are moved to only based on callbacks. Change-Id: Id9ff138204df84c6fb0a4c971dcea59f1220aee2
rc/com/android/gallery3d/app/GalleryAppImpl.java
rc/com/android/gallery3d/app/PanoramaMetadataSupport.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/app/PhotoPageBottomControls.java
rc/com/android/gallery3d/data/DataManager.java
rc/com/android/gallery3d/data/LocalImage.java
rc/com/android/gallery3d/data/MediaObject.java
rc/com/android/gallery3d/data/PanoramaMetadataJob.java
rc/com/android/gallery3d/data/UriImage.java
rc/com/android/gallery3d/ui/ActionModeHandler.java
rc/com/android/gallery3d/ui/MenuExecutor.java
rc_pd/com/android/gallery3d/util/LightCycleHelper.java
|
4b4dbd225685502f4249c2bf25bf74f7ce526645 |
18-Oct-2012 |
George Mount <mount@google.com> |
Remove panorama checks from supported operations. Bug 7351383 Bug 7349438 Move panorama support checks from getSupportedOperations so that calls to getSupportedOperations are consistent. Panorama checks are moved to only based on callbacks. Change-Id: Id9ff138204df84c6fb0a4c971dcea59f1220aee2
rc/com/android/gallery3d/app/GalleryAppImpl.java
rc/com/android/gallery3d/app/PanoramaMetadataSupport.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/app/PhotoPageBottomControls.java
rc/com/android/gallery3d/data/DataManager.java
rc/com/android/gallery3d/data/LocalImage.java
rc/com/android/gallery3d/data/MediaObject.java
rc/com/android/gallery3d/data/PanoramaMetadataJob.java
rc/com/android/gallery3d/data/UriImage.java
rc/com/android/gallery3d/ui/ActionModeHandler.java
rc/com/android/gallery3d/ui/MenuExecutor.java
rc_pd/com/android/gallery3d/util/LightCycleHelper.java
|
f4ad265e47cf2fcbb1dff1561135aec32c319356 |
19-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Handle screen rotation bug:7328773 Change-Id: I3c03c233a5b5a883963c8fd124c760655fd12bc7
ndroidManifest.xml
|
60d252795f41d0cfe4d0e11b4d1e32d4547368c9 |
19-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Handle screen rotation bug:7328773 Change-Id: I3c03c233a5b5a883963c8fd124c760655fd12bc7
ndroidManifest.xml
rc/com/android/gallery3d/filtershow/imageshow/ImageShow.java
|
6fae731dfab7861a878a853358a06db71399b3e8 |
19-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Handle screen rotation bug:7328773 Change-Id: I3c03c233a5b5a883963c8fd124c760655fd12bc7
rc/com/android/gallery3d/filtershow/imageshow/ImageShow.java
|
bddcaef65be387d7a711cbe4306fd41a14fb2f3b |
19-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 78e7cce1: am 246456be: am 99679734: am c6ea0400: Merge "Fix broken build" into gb-ub-photos-arches * commit '78e7cce1324c887ca59f76cf0d5709425a977fbb': Fix broken build
|
78e7cce1324c887ca59f76cf0d5709425a977fbb |
19-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 246456be: am 99679734: am c6ea0400: Merge "Fix broken build" into gb-ub-photos-arches * commit '246456be144200b5cd8e08dae7659cc5562a3e35': Fix broken build
|
246456be144200b5cd8e08dae7659cc5562a3e35 |
19-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 99679734: am c6ea0400: Merge "Fix broken build" into gb-ub-photos-arches * commit '99679734ef9b1665ae306fbecaa7e3ebf16d1b8e': Fix broken build
|
a15b51954535b1f2320a577c0a72c676775f4208 |
19-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 99679734: am c6ea0400: Merge "Fix broken build" into gb-ub-photos-arches * commit '99679734ef9b1665ae306fbecaa7e3ebf16d1b8e': Fix broken build
|
c8c90ab7531b8174b23488825972538ea6b61f0d |
19-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am c6ea0400: Merge "Fix broken build" into gb-ub-photos-arches * commit 'c6ea040010a0794bc78a43c4522cfb03d9e488e2': Fix broken build
|
472a7fbf81c5a10c744632c4abcd3420cd513c96 |
19-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am c6ea0400: Merge "Fix broken build" into gb-ub-photos-arches * commit 'c6ea040010a0794bc78a43c4522cfb03d9e488e2': Fix broken build
|
99679734ef9b1665ae306fbecaa7e3ebf16d1b8e |
19-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am c6ea0400: Merge "Fix broken build" into gb-ub-photos-arches * commit 'c6ea040010a0794bc78a43c4522cfb03d9e488e2': Fix broken build
|
79b74e0fd52cd2ba92130c5131474d52170d6f7e |
19-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Merge "Fix broken build" into gb-ub-photos-arches
|
c6ea040010a0794bc78a43c4522cfb03d9e488e2 |
19-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Merge "Fix broken build" into gb-ub-photos-arches
|
484bf5d6018a8e5563d765cea5b0cb89cd147f97 |
19-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Fix broken build Change-Id: I088926bd7fad32017861027d7786a4c178aca122
rc/com/android/gallery3d/filtershow/PanelController.java
|
d2594385ace41da27d50f38eadf72831acd48175 |
19-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Fix broken build Change-Id: I088926bd7fad32017861027d7786a4c178aca122
rc/com/android/gallery3d/filtershow/PanelController.java
|
32899c1325741e795b1b0921c842f3ede24e9b81 |
19-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am e54d674d: am cb10b317: am ff5061c8: am 4aad8963: Merge "Hide curve channel picker" into gb-ub-photos-arches * commit 'e54d674dd24649d9a08cdd15c90e53dc7623707c': Hide curve channel picker
|
fd62646e75f6353455d9f0d2c47d1026f25c3d06 |
19-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am c0e212e5: am 92cbe770: am 255dad6d: am 0136dc75: Merge "Various transition tweaks/fixes in Gallery" into gb-ub-photos-arches * commit 'c0e212e550e91c7d630729512e8453dbca85dba7': Various transition tweaks/fixes in Gallery
|
e54d674dd24649d9a08cdd15c90e53dc7623707c |
19-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am cb10b317: am ff5061c8: am 4aad8963: Merge "Hide curve channel picker" into gb-ub-photos-arches * commit 'cb10b317069ca5aeba0febeac55e265bb5b3afc0': Hide curve channel picker
|
c0e212e550e91c7d630729512e8453dbca85dba7 |
19-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 92cbe770: am 255dad6d: am 0136dc75: Merge "Various transition tweaks/fixes in Gallery" into gb-ub-photos-arches * commit '92cbe770821fcdbe07f970614e41a202ca72d04e': Various transition tweaks/fixes in Gallery
|
cb10b317069ca5aeba0febeac55e265bb5b3afc0 |
19-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am ff5061c8: am 4aad8963: Merge "Hide curve channel picker" into gb-ub-photos-arches * commit 'ff5061c84f6dd9914387fdd226ce44780f83407c': Hide curve channel picker
|
5206cc568e7b7122a7b7c18ba117d19427ba0671 |
19-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am ff5061c8: am 4aad8963: Merge "Hide curve channel picker" into gb-ub-photos-arches * commit 'ff5061c84f6dd9914387fdd226ce44780f83407c': Hide curve channel picker
|
92cbe770821fcdbe07f970614e41a202ca72d04e |
19-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 255dad6d: am 0136dc75: Merge "Various transition tweaks/fixes in Gallery" into gb-ub-photos-arches * commit '255dad6d5265b5cae74c34e3af68d86aeb313370': Various transition tweaks/fixes in Gallery
|
3234d83c379cd65e626adb84a917bb73cb37c6a1 |
19-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 255dad6d: am 0136dc75: Merge "Various transition tweaks/fixes in Gallery" into gb-ub-photos-arches * commit '255dad6d5265b5cae74c34e3af68d86aeb313370': Various transition tweaks/fixes in Gallery
|
ff5061c84f6dd9914387fdd226ce44780f83407c |
19-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 4aad8963: Merge "Hide curve channel picker" into gb-ub-photos-arches * commit '4aad8963b583d812d61cbaa920b914876c5fa7d2': Hide curve channel picker
|
255dad6d5265b5cae74c34e3af68d86aeb313370 |
19-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 0136dc75: Merge "Various transition tweaks/fixes in Gallery" into gb-ub-photos-arches * commit '0136dc75dc4069ca36c077a8a078db64f0fc35c6': Various transition tweaks/fixes in Gallery
|
2640da3d242c734684582fa3949b26dee5320100 |
19-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 4aad8963: Merge "Hide curve channel picker" into gb-ub-photos-arches * commit '4aad8963b583d812d61cbaa920b914876c5fa7d2': Hide curve channel picker
|
5a20f11b1e5ccd537fa26d6cf66648fa7d46b90e |
19-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 4aad8963: Merge "Hide curve channel picker" into gb-ub-photos-arches * commit '4aad8963b583d812d61cbaa920b914876c5fa7d2': Hide curve channel picker
|
12bec72ba9caa9f5607fc37ea02a3be25ce6c6bc |
19-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 0136dc75: Merge "Various transition tweaks/fixes in Gallery" into gb-ub-photos-arches * commit '0136dc75dc4069ca36c077a8a078db64f0fc35c6': Various transition tweaks/fixes in Gallery
|
fe1e53c555285a79898408c59085d658cec90086 |
19-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 0136dc75: Merge "Various transition tweaks/fixes in Gallery" into gb-ub-photos-arches * commit '0136dc75dc4069ca36c077a8a078db64f0fc35c6': Various transition tweaks/fixes in Gallery
|
5353fe78ea6c70e855285574cf43e557f9753e1d |
19-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Merge "Hide curve channel picker" into gb-ub-photos-arches
|
4aad8963b583d812d61cbaa920b914876c5fa7d2 |
19-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Merge "Hide curve channel picker" into gb-ub-photos-arches
|
0136dc75dc4069ca36c077a8a078db64f0fc35c6 |
19-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Various transition tweaks/fixes in Gallery" into gb-ub-photos-arches
|
25fbd8e2660350684b2f8bae5fbcabdfd432e800 |
19-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Various transition tweaks/fixes in Gallery" into gb-ub-photos-arches
|
51c30125189936313604d1111becef8565e76120 |
19-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Hide curve channel picker bug:7375053 Change-Id: I7aa5f9db44dc657b0f4282a1bb2ea41bde322d36
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/PanelController.java
|
33e58a68ee1d4866169d41b7d88c6eff0c70dae0 |
19-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Hide curve channel picker bug:7375053 Change-Id: I7aa5f9db44dc657b0f4282a1bb2ea41bde322d36
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/PanelController.java
|
26e119cebe732582df086ff56ec564d2989042fd |
18-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Various transition tweaks/fixes in Gallery Bug: 7376109 -Add new animation preset for photos based on UX feedback -Fix showing of highlight when tapping album grid photo -Move StateTransition enum to StateTransitionAnimation.State Change-Id: I2ce57580fa6c5f34d9545561515031899eb41eb2
rc/com/android/gallery3d/anim/StateTransitionAnimation.java
rc/com/android/gallery3d/app/ActivityState.java
rc/com/android/gallery3d/app/AlbumPage.java
rc/com/android/gallery3d/app/StateManager.java
|
548038a155d94f674e7afc622f2a5b356a6f5328 |
18-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Various transition tweaks/fixes in Gallery Bug: 7376109 -Add new animation preset for photos based on UX feedback -Fix showing of highlight when tapping album grid photo -Move StateTransition enum to StateTransitionAnimation.State Change-Id: I2ce57580fa6c5f34d9545561515031899eb41eb2
rc/com/android/gallery3d/anim/StateTransitionAnimation.java
rc/com/android/gallery3d/app/ActivityState.java
rc/com/android/gallery3d/app/AlbumPage.java
rc/com/android/gallery3d/app/StateManager.java
|
7785b486a1bf81eb2d6b0c7cb45ead407b1b5d54 |
18-Oct-2012 |
Sascha Haeberling <haeberling@google.com> |
am 8a4bf39b: am a90e5aad: am e3106a8c: am 2576a29c: First cut at a skeleton for the TinyPlanets filter. * commit '8a4bf39bc7605a82be31da1a377bfdf7b706c7e8': First cut at a skeleton for the TinyPlanets filter.
|
8a4bf39bc7605a82be31da1a377bfdf7b706c7e8 |
18-Oct-2012 |
Sascha Haeberling <haeberling@google.com> |
am a90e5aad: am e3106a8c: am 2576a29c: First cut at a skeleton for the TinyPlanets filter. * commit 'a90e5aad36fc14582d99577cede5b74f9f940b3a': First cut at a skeleton for the TinyPlanets filter.
|
a90e5aad36fc14582d99577cede5b74f9f940b3a |
18-Oct-2012 |
Sascha Haeberling <haeberling@google.com> |
am e3106a8c: am 2576a29c: First cut at a skeleton for the TinyPlanets filter. * commit 'e3106a8c7fa64faaa0446a5ca94255ae0183b660': First cut at a skeleton for the TinyPlanets filter.
|
8bbc73f4cf2d29e101e9570a11cd1604460f31ac |
18-Oct-2012 |
Sascha Haeberling <haeberling@google.com> |
am e3106a8c: am 2576a29c: First cut at a skeleton for the TinyPlanets filter. * commit 'e3106a8c7fa64faaa0446a5ca94255ae0183b660': First cut at a skeleton for the TinyPlanets filter.
|
04093230e9e3d82a9da10498fbd240e4bf2214f3 |
18-Oct-2012 |
Sascha Haeberling <haeberling@google.com> |
am 2576a29c: First cut at a skeleton for the TinyPlanets filter. * commit '2576a29cccf1d96edeef071914e8b775c230e8e8': First cut at a skeleton for the TinyPlanets filter.
|
e3106a8c7fa64faaa0446a5ca94255ae0183b660 |
18-Oct-2012 |
Sascha Haeberling <haeberling@google.com> |
am 2576a29c: First cut at a skeleton for the TinyPlanets filter. * commit '2576a29cccf1d96edeef071914e8b775c230e8e8': First cut at a skeleton for the TinyPlanets filter.
|
526bac919938fbed693974e2034cc7c1e4cc24fd |
18-Oct-2012 |
Sascha Haeberling <haeberling@google.com> |
am 2576a29c: First cut at a skeleton for the TinyPlanets filter. * commit '2576a29cccf1d96edeef071914e8b775c230e8e8': First cut at a skeleton for the TinyPlanets filter.
|
0f60960f5ec49e01a436463cc417629b1060ed3c |
18-Oct-2012 |
Sascha Haeberling <haeberling@google.com> |
am 2576a29c: First cut at a skeleton for the TinyPlanets filter. * commit '2576a29cccf1d96edeef071914e8b775c230e8e8': First cut at a skeleton for the TinyPlanets filter.
|
f8c304e074b9d2ed246a0eea74ae5b17eba3125e |
18-Oct-2012 |
Scott Main <smain@google.com> |
am 6393952e: am ad9f380f: am aae561e7: Merge "remove old fashioned Dream, no longer supported" into jb-mr1-dev * commit '6393952e0e36db1f5373bf7107be5af2fc8e205c': remove old fashioned Dream, no longer supported
|
6393952e0e36db1f5373bf7107be5af2fc8e205c |
18-Oct-2012 |
Scott Main <smain@google.com> |
am ad9f380f: am aae561e7: Merge "remove old fashioned Dream, no longer supported" into jb-mr1-dev * commit 'ad9f380f94e91fa1df8d6e628d26b9747925da4a': remove old fashioned Dream, no longer supported
|
ad9f380f94e91fa1df8d6e628d26b9747925da4a |
18-Oct-2012 |
Scott Main <smain@google.com> |
am aae561e7: Merge "remove old fashioned Dream, no longer supported" into jb-mr1-dev * commit 'aae561e748ec9d87c7724f4acd390736eedb782c': remove old fashioned Dream, no longer supported
|
28c4d6bbded4b2702368cc78340e4136d0878525 |
18-Oct-2012 |
Scott Main <smain@google.com> |
am aae561e7: Merge "remove old fashioned Dream, no longer supported" into jb-mr1-dev * commit 'aae561e748ec9d87c7724f4acd390736eedb782c': remove old fashioned Dream, no longer supported
|
aae561e748ec9d87c7724f4acd390736eedb782c |
18-Oct-2012 |
Scott Main <smain@google.com> |
Merge "remove old fashioned Dream, no longer supported" into jb-mr1-dev
|
5181cd2335c3ea1998933a94e318ec68b0aa3f12 |
18-Oct-2012 |
Sascha Haeberling <haeberling@google.com> |
First cut at a skeleton for the TinyPlanets filter. Bug: 7344426 This is not hooking up the real algorithm yet, but unblocks Doris so she can add the button while we rewrite the algorithm. Change-Id: I685b6c189e8ac124670db53c37565c4f1ff1f606
es/layout/filtershow_activity.xml
es/values/filtershow_strings.xml
|
2576a29cccf1d96edeef071914e8b775c230e8e8 |
18-Oct-2012 |
Sascha Haeberling <haeberling@google.com> |
First cut at a skeleton for the TinyPlanets filter. Bug: 7344426 This is not hooking up the real algorithm yet, but unblocks Doris so she can add the button while we rewrite the algorithm. Change-Id: I685b6c189e8ac124670db53c37565c4f1ff1f606
es/layout/filtershow_activity.xml
es/values/filtershow_strings.xml
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/PanelController.java
rc/com/android/gallery3d/filtershow/filters/ImageFilter.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterTinyPlanet.java
|
079ee7776fb81d1f38ea22bf553d2c7c9ba45103 |
18-Oct-2012 |
Sascha Haeberling <haeberling@google.com> |
First cut at a skeleton for the TinyPlanets filter. Bug: 7344426 This is not hooking up the real algorithm yet, but unblocks Doris so she can add the button while we rewrite the algorithm. Change-Id: I685b6c189e8ac124670db53c37565c4f1ff1f606
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/PanelController.java
rc/com/android/gallery3d/filtershow/filters/ImageFilter.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterTinyPlanet.java
|
8e5dbf956cb6fbe2fbb617908bd393e9f5ad1d06 |
18-Oct-2012 |
Doris Liu <tianliu@google.com> |
am 95a9eebf: am 6b370a9d: am 7b474a2a: am 08e6b865: Merge "Fix for initial edited picture is gray" into gb-ub-photos-arches * commit '95a9eebfd4692da0606950a658a2a2421e768631': Fix for initial edited picture is gray
|
95a9eebfd4692da0606950a658a2a2421e768631 |
18-Oct-2012 |
Doris Liu <tianliu@google.com> |
am 6b370a9d: am 7b474a2a: am 08e6b865: Merge "Fix for initial edited picture is gray" into gb-ub-photos-arches * commit '6b370a9d4f7ab98ade985b7d81944dd3e45da941': Fix for initial edited picture is gray
|
d69d5b639570688122c847898943b1a1bbfa43f0 |
18-Oct-2012 |
Doris Liu <tianliu@google.com> |
am 7b474a2a: am 08e6b865: Merge "Fix for initial edited picture is gray" into gb-ub-photos-arches * commit '7b474a2ab38789e1f80ce60a62b4752c2a3cfe0b': Fix for initial edited picture is gray
|
6b370a9d4f7ab98ade985b7d81944dd3e45da941 |
18-Oct-2012 |
Doris Liu <tianliu@google.com> |
am 7b474a2a: am 08e6b865: Merge "Fix for initial edited picture is gray" into gb-ub-photos-arches * commit '7b474a2ab38789e1f80ce60a62b4752c2a3cfe0b': Fix for initial edited picture is gray
|
e6c5ec7e99fa8eb61fbc08c9506124b8d684a8c5 |
18-Oct-2012 |
Doris Liu <tianliu@google.com> |
am 08e6b865: Merge "Fix for initial edited picture is gray" into gb-ub-photos-arches * commit '08e6b8650dfb11e282cca22da71750bcb2e5e478': Fix for initial edited picture is gray
|
c86dc725106181c9f915058a6e9db82fa1d349c9 |
18-Oct-2012 |
Doris Liu <tianliu@google.com> |
am 08e6b865: Merge "Fix for initial edited picture is gray" into gb-ub-photos-arches * commit '08e6b8650dfb11e282cca22da71750bcb2e5e478': Fix for initial edited picture is gray
|
7b474a2ab38789e1f80ce60a62b4752c2a3cfe0b |
18-Oct-2012 |
Doris Liu <tianliu@google.com> |
am 08e6b865: Merge "Fix for initial edited picture is gray" into gb-ub-photos-arches * commit '08e6b8650dfb11e282cca22da71750bcb2e5e478': Fix for initial edited picture is gray
|
08e6b8650dfb11e282cca22da71750bcb2e5e478 |
18-Oct-2012 |
Doris Liu <tianliu@google.com> |
Merge "Fix for initial edited picture is gray" into gb-ub-photos-arches
|
f6c31e476d940a8306a7e14ad47215a87540dbf0 |
18-Oct-2012 |
Doris Liu <tianliu@google.com> |
Merge "Fix for initial edited picture is gray" into gb-ub-photos-arches
|
41a99ab167b83fc41d604c82ceda33a875883e98 |
18-Oct-2012 |
Doris Liu <tianliu@google.com> |
Fix for initial edited picture is gray Bug: 7373880 Change-Id: I0aa18ba850608437ae6327b3f3d676b218bcc75e
rc/com/android/gallery3d/filtershow/tools/SaveCopyTask.java
|
f81b8bdc1230d42d6850dc682451854abd007547 |
18-Oct-2012 |
Doris Liu <tianliu@google.com> |
Fix for initial edited picture is gray Bug: 7373880 Change-Id: I0aa18ba850608437ae6327b3f3d676b218bcc75e
rc/com/android/gallery3d/filtershow/tools/SaveCopyTask.java
|
22225ef0fb9ac0e0b82b8190bf9d0f8c2513eb2b |
18-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am 06927dbd: am 1901df72: am bc1091bf: am eb4a9359: Fixed initial aspect button text. * commit '06927dbd98404d878fca166237149bba300261d5': Fixed initial aspect button text.
|
06927dbd98404d878fca166237149bba300261d5 |
18-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am 1901df72: am bc1091bf: am eb4a9359: Fixed initial aspect button text. * commit '1901df726282fe0bf773b6e486c3d494d4f57356': Fixed initial aspect button text.
|
4adc279a57e3d2436b6861eee760f37a8df2aab9 |
18-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am bc1091bf: am eb4a9359: Fixed initial aspect button text. * commit 'bc1091bffc812117d360746fae240032bcbad531': Fixed initial aspect button text.
|
1901df726282fe0bf773b6e486c3d494d4f57356 |
18-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am bc1091bf: am eb4a9359: Fixed initial aspect button text. * commit 'bc1091bffc812117d360746fae240032bcbad531': Fixed initial aspect button text.
|
84d036cb9a61622baa6f2831b5c253ab783f1283 |
18-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am eb4a9359: Fixed initial aspect button text. * commit 'eb4a9359eaf8a717d6bda5df3d1831cf8f547423': Fixed initial aspect button text.
|
084219a4f08f33dc626ee7346a9b394563c96cd9 |
18-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am eb4a9359: Fixed initial aspect button text. * commit 'eb4a9359eaf8a717d6bda5df3d1831cf8f547423': Fixed initial aspect button text.
|
ff9f6b6fd95a96de4d7c3803254d165ed2ae3772 |
18-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am eb4a9359: Fixed initial aspect button text. * commit 'eb4a9359eaf8a717d6bda5df3d1831cf8f547423': Fixed initial aspect button text.
|
bc1091bffc812117d360746fae240032bcbad531 |
18-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am eb4a9359: Fixed initial aspect button text. * commit 'eb4a9359eaf8a717d6bda5df3d1831cf8f547423': Fixed initial aspect button text.
|
eb4a9359eaf8a717d6bda5df3d1831cf8f547423 |
18-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Fixed initial aspect button text. Bug: 7374910 Change-Id: I2c86b7c5b242f930692e2e6feda8a85533c509d8
es/layout/filtershow_activity.xml
es/values/filtershow_strings.xml
rc/com/android/gallery3d/filtershow/PanelController.java
|
155195bb5fa12d4f16872af3c30fc26701785414 |
18-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Fixed initial aspect button text. Bug: 7374910 Change-Id: I2c86b7c5b242f930692e2e6feda8a85533c509d8
rc/com/android/gallery3d/filtershow/PanelController.java
|
dbe1085854dcead520f327306c1d4b78880eec9d |
18-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Fixed initial aspect button text. Bug: 7374910 Change-Id: I2c86b7c5b242f930692e2e6feda8a85533c509d8
es/layout/filtershow_activity.xml
es/values/filtershow_strings.xml
|
453ec002e652c0125ec09e31348d6b73f89607ee |
18-Oct-2012 |
Scott Main <smain@google.com> |
remove old fashioned Dream, no longer supported Change-Id: I51c6a730e8663586153750a1cda6ea65aad592e8
ndroidManifest.xml
rc/com/android/gallery3d/app/SlideshowDream.java
|
6e60481ddfb45a9f8b18612ed32e782830cf84b2 |
18-Oct-2012 |
Jason Noguchi <jnoguchi@google.com> |
am aba4eaf1: am 81db4a76: am 7ad1b755: am ed22e436: Merge "Adding accessor methods for camera latency vars." into gb-ub-photos-arches * commit 'aba4eaf111a74c4a6daea3ab74175062519864c8': Adding accessor methods for camera latency vars.
|
aba4eaf111a74c4a6daea3ab74175062519864c8 |
18-Oct-2012 |
Jason Noguchi <jnoguchi@google.com> |
am 81db4a76: am 7ad1b755: am ed22e436: Merge "Adding accessor methods for camera latency vars." into gb-ub-photos-arches * commit '81db4a76babdd51c13977683c28194d6d538fe5e': Adding accessor methods for camera latency vars.
|
7218147e6d81315245e3a485fb954761af687b2f |
18-Oct-2012 |
Jason Noguchi <jnoguchi@google.com> |
am 7ad1b755: am ed22e436: Merge "Adding accessor methods for camera latency vars." into gb-ub-photos-arches * commit '7ad1b755720eb9f699b0074397841c32a6148790': Adding accessor methods for camera latency vars.
|
81db4a76babdd51c13977683c28194d6d538fe5e |
18-Oct-2012 |
Jason Noguchi <jnoguchi@google.com> |
am 7ad1b755: am ed22e436: Merge "Adding accessor methods for camera latency vars." into gb-ub-photos-arches * commit '7ad1b755720eb9f699b0074397841c32a6148790': Adding accessor methods for camera latency vars.
|
7ad1b755720eb9f699b0074397841c32a6148790 |
18-Oct-2012 |
Jason Noguchi <jnoguchi@google.com> |
am ed22e436: Merge "Adding accessor methods for camera latency vars." into gb-ub-photos-arches * commit 'ed22e4362ace6b031d826493cf9caea3a2c16a96': Adding accessor methods for camera latency vars.
|
549210d3bb44b10ef28bc3e2659209570b805abc |
18-Oct-2012 |
Jason Noguchi <jnoguchi@google.com> |
am ed22e436: Merge "Adding accessor methods for camera latency vars." into gb-ub-photos-arches * commit 'ed22e4362ace6b031d826493cf9caea3a2c16a96': Adding accessor methods for camera latency vars.
|
ed22e4362ace6b031d826493cf9caea3a2c16a96 |
18-Oct-2012 |
Jason Noguchi <jnoguchi@google.com> |
Merge "Adding accessor methods for camera latency vars." into gb-ub-photos-arches
|
01609bcdcd6ef7091c8666f140a5b9a62f424d7c |
18-Oct-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
5be98ed60daac27a7d99fe89b9ed4709bfb218aa |
18-Oct-2012 |
Earl Ou <shunhsingou@google.com> |
use NO_VALUE when the output of exiftool is invalid Change-Id: I85c0054d70ff1639e643a30658ca59f1803f7d13
ests/exiftool_parser/parser.py
|
0ffdd632e3739db5c0389840d410fa95afd59f88 |
18-Oct-2012 |
Earl Ou <shunhsingou@google.com> |
use NO_VALUE when the output of exiftool is invalid Change-Id: I85c0054d70ff1639e643a30658ca59f1803f7d13
ests/exiftool_parser/parser.py
|
05bb0d6144a4e16c6c15cdd2bc93e57d339c010d |
18-Oct-2012 |
Earl Ou <shunhsingou@google.com> |
Print '.' for unprintable ascii code in Exif test Change-Id: Ie74d53c021044fdb7261c7558f5247119bf7dcc2
rc/com/android/gallery3d/exif/ExifTag.java
|
aca1aadf00f0d57c8a562f02a03b72f55ac2e357 |
18-Oct-2012 |
Earl Ou <shunhsingou@google.com> |
Print '.' for unprintable ascii code in Exif test Change-Id: Ie74d53c021044fdb7261c7558f5247119bf7dcc2
rc/com/android/gallery3d/exif/ExifTag.java
|
3c9c7dc34721aaf7d83f037dd1af974bc064929f |
18-Oct-2012 |
Earl Ou <shunhsingou@google.com> |
Handle duplicated tags in the Exif test Change-Id: If9bd9712de1eaa71c8e355c5268f9cc29247bd2e
ests/src/com/android/gallery3d/exif/ExifParserTest.java
ests/src/com/android/gallery3d/exif/ExifReaderTest.java
ests/src/com/android/gallery3d/exif/ExifXmlReader.java
|
35762ce15b61296e6ca02a2d08a9991f0a99fa96 |
18-Oct-2012 |
Earl Ou <shunhsingou@google.com> |
Handle duplicated tags in the Exif test Change-Id: If9bd9712de1eaa71c8e355c5268f9cc29247bd2e
ests/src/com/android/gallery3d/exif/ExifParserTest.java
ests/src/com/android/gallery3d/exif/ExifReaderTest.java
ests/src/com/android/gallery3d/exif/ExifXmlReader.java
|
b677dc86dd209b1a7632f934892a635d495d329d |
18-Oct-2012 |
Earl Ou <shunhsingou@google.com> |
Print image path for exception in Exif test Change-Id: Ib5b502ea91c9fb14dbd9e0ede664136943e50401
ests/src/com/android/gallery3d/exif/ExifOutputStreamTest.java
ests/src/com/android/gallery3d/exif/ExifParserTest.java
ests/src/com/android/gallery3d/exif/ExifReaderTest.java
|
aa5243cb89759efee3ea1050d9417f986b70c07f |
18-Oct-2012 |
Earl Ou <shunhsingou@google.com> |
Print image path for exception in Exif test Change-Id: Ib5b502ea91c9fb14dbd9e0ede664136943e50401
ests/src/com/android/gallery3d/exif/ExifOutputStreamTest.java
ests/src/com/android/gallery3d/exif/ExifParserTest.java
ests/src/com/android/gallery3d/exif/ExifReaderTest.java
|
aa8ef6ace8f8a42682be1f71a4d1c631e8ebf22f |
18-Oct-2012 |
Hung-ying Tyan <tyanh@google.com> |
Merge "Make original exif test pass with the exiftool ground truth" into gb-ub-photos-bryce
|
0445a64ba10bd50a85c9cd5c137bc521fcdd6795 |
18-Oct-2012 |
Hung-ying Tyan <tyanh@google.com> |
Merge "Make original exif test pass with the exiftool ground truth" into gb-ub-photos-bryce
|
4f4b4dd559bc530213fc63d21fe5ba49bb4b8700 |
18-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am 2fd5b635: (-s ours) am 48f9547b: am ab81203d: am 12a6e773: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches * commit '2fd5b635586cf31515345aece977e7082b488bf0': Import translations. DO NOT MERGE
|
2fd5b635586cf31515345aece977e7082b488bf0 |
18-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am 48f9547b: am ab81203d: am 12a6e773: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches * commit '48f9547b001586234a783a5d4bf67681d1fc78be': Import translations. DO NOT MERGE
|
b508928f6dd5551a7c03c92b85bf7e89a53ac885 |
18-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am 47888156: (-s ours) am 5463d379: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev * commit '478881563d3c4573dd450d5b56617dab06515fe6': Import translations. DO NOT MERGE
|
48f9547b001586234a783a5d4bf67681d1fc78be |
18-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am ab81203d: am 12a6e773: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches * commit 'ab81203d5682d74fff8e8921c3a61783bf8af3ce': Import translations. DO NOT MERGE
|
2709de537dd57a1ac329b35fc29a165aa1e2ae16 |
18-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am ab81203d: (-s ours) am 12a6e773: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches * commit 'ab81203d5682d74fff8e8921c3a61783bf8af3ce': Import translations. DO NOT MERGE
|
478881563d3c4573dd450d5b56617dab06515fe6 |
18-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am 5463d379: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev * commit '5463d3795077c4554e6af5bf6a32393710dd3061': Import translations. DO NOT MERGE
|
d045f30f4c5343abffde7e4c950dbe12c52501b9 |
18-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am 12a6e773: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches * commit '12a6e773a9d35e425ddfaeaa29d68221b6c9d14e': Import translations. DO NOT MERGE
|
ab81203d5682d74fff8e8921c3a61783bf8af3ce |
18-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am 12a6e773: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches * commit '12a6e773a9d35e425ddfaeaa29d68221b6c9d14e': Import translations. DO NOT MERGE
|
b4ff735e6133a1d9be905aec545980b3c01d25dd |
18-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am 12a6e773: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches * commit '12a6e773a9d35e425ddfaeaa29d68221b6c9d14e': Import translations. DO NOT MERGE
|
f3f7aeaf472291b7a95d13c33812927a1d721ce6 |
18-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am 2ac309ad: (-s ours) am 1c43f09d: am 6e64dcff: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev * commit '2ac309ade479a22aaaad0f7319850357dc85a603': Import translations. DO NOT MERGE
|
2ba8e3785bb6acce7d4ea6347d69fb3c0a04f02c |
18-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE"
|
5463d3795077c4554e6af5bf6a32393710dd3061 |
18-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
|
5412d64e94e561071ac0e9473a4ea21dbc400a9b |
18-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
|
e592cd5dbc43ae41bde86f412f70d7ab856c06ec |
18-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
|
12a6e773a9d35e425ddfaeaa29d68221b6c9d14e |
18-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
|
cecd9a6e7dadb95aaa2cb58d4e8c8fddf4abaf0a |
18-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
|
2ac309ade479a22aaaad0f7319850357dc85a603 |
18-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am 1c43f09d: am 6e64dcff: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev * commit '1c43f09d73b2e9311b7704e43c11df7dea39e2fd': Import translations. DO NOT MERGE
|
19460c5e8d1bfbdb43c0ec32e05a57458e5561ab |
18-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am 6e64dcff: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev * commit '6e64dcffd9729fdde86f693b647b0a7235330923': Import translations. DO NOT MERGE
|
1c43f09d73b2e9311b7704e43c11df7dea39e2fd |
18-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am 6e64dcff: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev * commit '6e64dcffd9729fdde86f693b647b0a7235330923': Import translations. DO NOT MERGE
|
6e64dcffd9729fdde86f693b647b0a7235330923 |
18-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
|
c1ceb80741fe7f50af4d03e6996d12b28220d090 |
17-Oct-2012 |
Earl Ou <shunhsingou@google.com> |
Make original exif test pass with the exiftool ground truth Also add assertion message for debugging Change-Id: I4287afde01a2ad334b3d181d17863b1fa763950b
rc/com/android/gallery3d/exif/ExifTag.java
ests/src/com/android/gallery3d/exif/ExifParserTest.java
ests/src/com/android/gallery3d/exif/ExifReaderTest.java
ests/src/com/android/gallery3d/exif/ExifXmlDataTestCase.java
|
85e5509f15e2826db346273cda23921b3dc65111 |
17-Oct-2012 |
Earl Ou <shunhsingou@google.com> |
Make original exif test pass with the exiftool ground truth Also add assertion message for debugging Change-Id: I4287afde01a2ad334b3d181d17863b1fa763950b
rc/com/android/gallery3d/exif/ExifTag.java
ests/src/com/android/gallery3d/exif/ExifParserTest.java
ests/src/com/android/gallery3d/exif/ExifReaderTest.java
ests/src/com/android/gallery3d/exif/ExifXmlDataTestCase.java
|
01724da9e86e684c675777c5a6fa3d2b60b83b74 |
18-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am bc171b64: am 1169a23b: am cc70347d: am 737552d7: Merge "Big refactor, additions to state transition animations" into gb-ub-photos-arches * commit 'bc171b6431fca30d8f98effdb682c813b0031b44': Big refactor, additions to state transition animations
|
bc171b6431fca30d8f98effdb682c813b0031b44 |
18-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 1169a23b: am cc70347d: am 737552d7: Merge "Big refactor, additions to state transition animations" into gb-ub-photos-arches * commit '1169a23b315f8b8fa9aed424b5cb46cda5afe4a8': Big refactor, additions to state transition animations
|
8cd8a93eae3158f8469026f65e7d31819ae38fab |
18-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am cc70347d: am 737552d7: Merge "Big refactor, additions to state transition animations" into gb-ub-photos-arches * commit 'cc70347d279eb55bb941fa5669ee2eae1b220702': Big refactor, additions to state transition animations
|
1169a23b315f8b8fa9aed424b5cb46cda5afe4a8 |
18-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am cc70347d: am 737552d7: Merge "Big refactor, additions to state transition animations" into gb-ub-photos-arches * commit 'cc70347d279eb55bb941fa5669ee2eae1b220702': Big refactor, additions to state transition animations
|
1976cb5c1a86d1162c4bcaa8224a1cc0f1adf776 |
18-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 737552d7: Merge "Big refactor, additions to state transition animations" into gb-ub-photos-arches * commit '737552d7925366c58067d622e1b8df06786c51cc': Big refactor, additions to state transition animations
|
b772b58a6b6082b7baf6f50279760702755aa470 |
18-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 737552d7: Merge "Big refactor, additions to state transition animations" into gb-ub-photos-arches * commit '737552d7925366c58067d622e1b8df06786c51cc': Big refactor, additions to state transition animations
|
cc70347d279eb55bb941fa5669ee2eae1b220702 |
18-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 737552d7: Merge "Big refactor, additions to state transition animations" into gb-ub-photos-arches * commit '737552d7925366c58067d622e1b8df06786c51cc': Big refactor, additions to state transition animations
|
da994b21184f6e3af94e1da66cd26532b172847a |
18-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Big refactor, additions to state transition animations" into gb-ub-photos-arches
|
737552d7925366c58067d622e1b8df06786c51cc |
18-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Big refactor, additions to state transition animations" into gb-ub-photos-arches
|
0a96b72c13334314e2167c5f379b773ff4cd3088 |
18-Oct-2012 |
Doris Liu <tianliu@google.com> |
am 803631e4: am 0530eb05: am 637a7f1b: am 0addfc7f: Save edited picasa to "Edited Online Photos" album * commit '803631e48d9c576c871b863c57cba7f7ab2344e9': Save edited picasa to "Edited Online Photos" album
|
803631e48d9c576c871b863c57cba7f7ab2344e9 |
18-Oct-2012 |
Doris Liu <tianliu@google.com> |
am 0530eb05: am 637a7f1b: am 0addfc7f: Save edited picasa to "Edited Online Photos" album * commit '0530eb05cb6782ad1234b02cecf2926d7972b240': Save edited picasa to "Edited Online Photos" album
|
1febb98e498f425935cfafdb492283b42ef61c87 |
18-Oct-2012 |
Doris Liu <tianliu@google.com> |
am 637a7f1b: am 0addfc7f: Save edited picasa to "Edited Online Photos" album * commit '637a7f1bba2c1096eab7f178c8b29c399b318f91': Save edited picasa to "Edited Online Photos" album
|
0530eb05cb6782ad1234b02cecf2926d7972b240 |
18-Oct-2012 |
Doris Liu <tianliu@google.com> |
am 637a7f1b: am 0addfc7f: Save edited picasa to "Edited Online Photos" album * commit '637a7f1bba2c1096eab7f178c8b29c399b318f91': Save edited picasa to "Edited Online Photos" album
|
637a7f1bba2c1096eab7f178c8b29c399b318f91 |
18-Oct-2012 |
Doris Liu <tianliu@google.com> |
am 0addfc7f: Save edited picasa to "Edited Online Photos" album * commit '0addfc7f6342184a67cdd8b5cc3872c6a5c87e55': Save edited picasa to "Edited Online Photos" album
|
d1c73e4d00445f709af695e562983e4581549dfb |
18-Oct-2012 |
Doris Liu <tianliu@google.com> |
am 0addfc7f: Save edited picasa to "Edited Online Photos" album * commit '0addfc7f6342184a67cdd8b5cc3872c6a5c87e55': Save edited picasa to "Edited Online Photos" album
|
3132215439932b69c7359936024c268cb4cf6bc5 |
18-Oct-2012 |
Doris Liu <tianliu@google.com> |
am 0addfc7f: Save edited picasa to "Edited Online Photos" album * commit '0addfc7f6342184a67cdd8b5cc3872c6a5c87e55': Save edited picasa to "Edited Online Photos" album
|
05858e219f28feb58028ddef3c24b04414916199 |
18-Oct-2012 |
Doris Liu <tianliu@google.com> |
am 0addfc7f: Save edited picasa to "Edited Online Photos" album * commit '0addfc7f6342184a67cdd8b5cc3872c6a5c87e55': Save edited picasa to "Edited Online Photos" album
|
d7c133df72679b370b182cc033a054eec7c41d63 |
18-Oct-2012 |
Doris Liu <tianliu@google.com> |
Save edited picasa to "Edited Online Photos" album Bug: 7346157 This CL includes the following changes: 1) Save the new image to a new folder named "Edited Online Photos" 2) After the picture is saved, the user will be in the "Edited Online Photos" folder 3) Change the toast during saving to "Saving to" + new folder name Change-Id: Ic505925425419ba9e3c7dac31fd403bf73d6887d
es/values/strings.xml
|
9726d8bed6fa6b0403466be4aceb860dffa57b80 |
18-Oct-2012 |
Doris Liu <tianliu@google.com> |
Save edited picasa to "Edited Online Photos" album Bug: 7346157 This CL includes the following changes: 1) Save the new image to a new folder named "Edited Online Photos" 2) After the picture is saved, the user will be in the "Edited Online Photos" folder 3) Change the toast during saving to "Saving to" + new folder name Change-Id: Ic505925425419ba9e3c7dac31fd403bf73d6887d
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/data/LocalAlbum.java
rc/com/android/gallery3d/data/Path.java
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/tools/SaveCopyTask.java
rc/com/android/gallery3d/util/BucketNames.java
rc/com/android/gallery3d/util/MediaSetUtils.java
|
0addfc7f6342184a67cdd8b5cc3872c6a5c87e55 |
18-Oct-2012 |
Doris Liu <tianliu@google.com> |
Save edited picasa to "Edited Online Photos" album Bug: 7346157 This CL includes the following changes: 1) Save the new image to a new folder named "Edited Online Photos" 2) After the picture is saved, the user will be in the "Edited Online Photos" folder 3) Change the toast during saving to "Saving to" + new folder name Change-Id: Ic505925425419ba9e3c7dac31fd403bf73d6887d
es/values/strings.xml
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/data/LocalAlbum.java
rc/com/android/gallery3d/data/Path.java
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/tools/SaveCopyTask.java
rc/com/android/gallery3d/util/BucketNames.java
rc/com/android/gallery3d/util/MediaSetUtils.java
|
152fd9e35a429249ba348a162394dd202fac91ab |
18-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am 8f25a00f: am d94f3ca8: am 5d596558: am ef8597fe: Fixed disappearing aspect ratio button. * commit '8f25a00fb7daa5185c86ec76f687c18f59bd005c': Fixed disappearing aspect ratio button.
|
8f25a00fb7daa5185c86ec76f687c18f59bd005c |
18-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am d94f3ca8: am 5d596558: am ef8597fe: Fixed disappearing aspect ratio button. * commit 'd94f3ca82b673c44c4633df543963e8de93dbe7d': Fixed disappearing aspect ratio button.
|
d94f3ca82b673c44c4633df543963e8de93dbe7d |
18-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am 5d596558: am ef8597fe: Fixed disappearing aspect ratio button. * commit '5d596558ce319f5207991b25d38ca3470005f933': Fixed disappearing aspect ratio button.
|
be7c16de9647b449ed417ae16315b47aaa143a83 |
18-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am 5d596558: am ef8597fe: Fixed disappearing aspect ratio button. * commit '5d596558ce319f5207991b25d38ca3470005f933': Fixed disappearing aspect ratio button.
|
5d596558ce319f5207991b25d38ca3470005f933 |
18-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am ef8597fe: Fixed disappearing aspect ratio button. * commit 'ef8597fe38f9808096cc2f68921a54a6fc01e3f0': Fixed disappearing aspect ratio button.
|
6ecd2a7a8a9ffe2251263a9476cbb0d7494955ab |
18-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am ef8597fe: Fixed disappearing aspect ratio button. * commit 'ef8597fe38f9808096cc2f68921a54a6fc01e3f0': Fixed disappearing aspect ratio button.
|
f96a911ed0a0323eaa3b61dc8a6dc59454881d38 |
18-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am ef8597fe: Fixed disappearing aspect ratio button. * commit 'ef8597fe38f9808096cc2f68921a54a6fc01e3f0': Fixed disappearing aspect ratio button.
|
82a5fe8fb0d44c497dcb419b6693ef3d28de3e8e |
18-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Fixed disappearing aspect ratio button. Bug: 7369518 Change-Id: I5342339fa5a6e42d38b1ec7a8e6398bbb6901526
rc/com/android/gallery3d/filtershow/PanelController.java
|
ef8597fe38f9808096cc2f68921a54a6fc01e3f0 |
18-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Fixed disappearing aspect ratio button. Bug: 7369518 Change-Id: I5342339fa5a6e42d38b1ec7a8e6398bbb6901526
rc/com/android/gallery3d/filtershow/PanelController.java
|
2ba8604e8f1a8faf0e692706c3103cc889142583 |
17-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Big refactor, additions to state transition animations Bug: 7362944 Refactored a lot of the state transitions code, adding support for definable transition animations and defining distinct outgoing and incoming animations. Change-Id: I31a69057ea1b72dd3185cec656e59b11fdb528c1
rc/com/android/gallery3d/anim/StateTransitionAnimation.java
rc/com/android/gallery3d/app/ActivityState.java
rc/com/android/gallery3d/app/StateManager.java
rc/com/android/gallery3d/ui/GLView.java
rc/com/android/gallery3d/ui/PositionController.java
rc/com/android/gallery3d/ui/PreparePageFadeoutTexture.java
|
4831c7494373c360062a7becac820eba3bc39287 |
17-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Big refactor, additions to state transition animations Bug: 7362944 Refactored a lot of the state transitions code, adding support for definable transition animations and defining distinct outgoing and incoming animations. Change-Id: I31a69057ea1b72dd3185cec656e59b11fdb528c1
rc/com/android/gallery3d/anim/StateTransitionAnimation.java
rc/com/android/gallery3d/app/ActivityState.java
rc/com/android/gallery3d/app/StateManager.java
rc/com/android/gallery3d/ui/GLView.java
rc/com/android/gallery3d/ui/PositionController.java
rc/com/android/gallery3d/ui/PreparePageFadeoutTexture.java
|
509f76786843254a755b08e8222f912d2f4fb611 |
18-Oct-2012 |
Doris Liu <tianliu@google.com> |
am 6feb1a1b: am 52bf0c42: am 04114762: am 6df6841f: Merge "Update video editor actionbar background assets" into gb-ub-photos-arches * commit '6feb1a1bc7d0781750d031708dd1025157e51882': Update video editor actionbar background assets
|
c074bb524373bdba4006818d8fbd431e7cc60ee3 |
18-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am 48bc53c8: am 0c30c6f5: am 193c3f0c: am 3518ff57: Merge "Added support for crop actions. Changed overflow menu to use new editor." into gb-ub-photos-arches * commit '48bc53c81d34e79c0759bf26176a37ce7fe9a13f': Added support for crop actions. Changed overflow menu to use new editor.
|
50160dfaf1e1dac4bba21a21cd42a0b15d36bfaa |
18-Oct-2012 |
John Hoford <hoford@google.com> |
am 62c75cb8: am b6686673: am e12e6962: am da974d84: fix crash from configurable slider ranges * commit '62c75cb85545d091f5a0378a401593a11667126e': fix crash from configurable slider ranges
|
6feb1a1bc7d0781750d031708dd1025157e51882 |
18-Oct-2012 |
Doris Liu <tianliu@google.com> |
am 52bf0c42: am 04114762: am 6df6841f: Merge "Update video editor actionbar background assets" into gb-ub-photos-arches * commit '52bf0c422e5b4a4103368c28e6a1e6c066ebf91a': Update video editor actionbar background assets
|
48bc53c81d34e79c0759bf26176a37ce7fe9a13f |
18-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am 0c30c6f5: am 193c3f0c: am 3518ff57: Merge "Added support for crop actions. Changed overflow menu to use new editor." into gb-ub-photos-arches * commit '0c30c6f5cfc166e57f2e51c14dc9d7a79fe53d9d': Added support for crop actions. Changed overflow menu to use new editor.
|
1fd563a6bc183f573f7f44de5aaa55a4fbc1dbb7 |
18-Oct-2012 |
Doris Liu <tianliu@google.com> |
am 04114762: am 6df6841f: Merge "Update video editor actionbar background assets" into gb-ub-photos-arches * commit '0411476253111699a9861ec9130bcb90b15464b3': Update video editor actionbar background assets
|
80e6218918b508f6147c8cc9699df8d338e50a95 |
18-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am 193c3f0c: am 3518ff57: Merge "Added support for crop actions. Changed overflow menu to use new editor." into gb-ub-photos-arches * commit '193c3f0cbac09b69926217ac8c227860eeccd737': Added support for crop actions. Changed overflow menu to use new editor.
|
52bf0c422e5b4a4103368c28e6a1e6c066ebf91a |
18-Oct-2012 |
Doris Liu <tianliu@google.com> |
am 04114762: am 6df6841f: Merge "Update video editor actionbar background assets" into gb-ub-photos-arches * commit '0411476253111699a9861ec9130bcb90b15464b3': Update video editor actionbar background assets
|
0c30c6f5cfc166e57f2e51c14dc9d7a79fe53d9d |
18-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am 193c3f0c: am 3518ff57: Merge "Added support for crop actions. Changed overflow menu to use new editor." into gb-ub-photos-arches * commit '193c3f0cbac09b69926217ac8c227860eeccd737': Added support for crop actions. Changed overflow menu to use new editor.
|
62c75cb85545d091f5a0378a401593a11667126e |
18-Oct-2012 |
John Hoford <hoford@google.com> |
am b6686673: am e12e6962: am da974d84: fix crash from configurable slider ranges * commit 'b6686673c3ca1a3711269cd391137087910c4d5b': fix crash from configurable slider ranges
|
0411476253111699a9861ec9130bcb90b15464b3 |
18-Oct-2012 |
Doris Liu <tianliu@google.com> |
am 6df6841f: Merge "Update video editor actionbar background assets" into gb-ub-photos-arches * commit '6df6841fa79d77153e0f20c73ec0bfb8c142df23': Update video editor actionbar background assets
|
25c1094c09718c4b2f6986efa6ce8c1d0b1e9a7a |
18-Oct-2012 |
Doris Liu <tianliu@google.com> |
am 6df6841f: Merge "Update video editor actionbar background assets" into gb-ub-photos-arches * commit '6df6841fa79d77153e0f20c73ec0bfb8c142df23': Update video editor actionbar background assets
|
f5b7e719902c007fc34023c2df93771de9e4436e |
18-Oct-2012 |
Doris Liu <tianliu@google.com> |
am 6df6841f: Merge "Update video editor actionbar background assets" into gb-ub-photos-arches * commit '6df6841fa79d77153e0f20c73ec0bfb8c142df23': Update video editor actionbar background assets
|
193c3f0cbac09b69926217ac8c227860eeccd737 |
18-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am 3518ff57: Merge "Added support for crop actions. Changed overflow menu to use new editor." into gb-ub-photos-arches * commit '3518ff575247a5ce923a0cd65fc82e046f8eaeae': Added support for crop actions. Changed overflow menu to use new editor.
|
02368abac6855f978b488a573e818bd378f7a8fa |
18-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am 3518ff57: Merge "Added support for crop actions. Changed overflow menu to use new editor." into gb-ub-photos-arches * commit '3518ff575247a5ce923a0cd65fc82e046f8eaeae': Added support for crop actions. Changed overflow menu to use new editor.
|
c3a44419b13b99a16c59ae2512ac2b6d63b5027e |
18-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am 3518ff57: Merge "Added support for crop actions. Changed overflow menu to use new editor." into gb-ub-photos-arches * commit '3518ff575247a5ce923a0cd65fc82e046f8eaeae': Added support for crop actions. Changed overflow menu to use new editor.
|
6df6841fa79d77153e0f20c73ec0bfb8c142df23 |
18-Oct-2012 |
Doris Liu <tianliu@google.com> |
Merge "Update video editor actionbar background assets" into gb-ub-photos-arches
|
c4ddadd5171771e25deee9707fee802823addc1e |
18-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Added support for crop actions. Changed overflow menu to use new editor." into gb-ub-photos-arches
|
3518ff575247a5ce923a0cd65fc82e046f8eaeae |
18-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Added support for crop actions. Changed overflow menu to use new editor." into gb-ub-photos-arches
|
5acccefeadeff7ff09683b165ac1516d733bf75b |
18-Oct-2012 |
John Hoford <hoford@google.com> |
am e12e6962: am da974d84: fix crash from configurable slider ranges * commit 'e12e6962fb1151799f0737238212fd5856d1b7ea': fix crash from configurable slider ranges
|
b6686673c3ca1a3711269cd391137087910c4d5b |
18-Oct-2012 |
John Hoford <hoford@google.com> |
am e12e6962: am da974d84: fix crash from configurable slider ranges * commit 'e12e6962fb1151799f0737238212fd5856d1b7ea': fix crash from configurable slider ranges
|
e12e6962fb1151799f0737238212fd5856d1b7ea |
18-Oct-2012 |
John Hoford <hoford@google.com> |
am da974d84: fix crash from configurable slider ranges * commit 'da974d84c8aa0758afe2dc7382657ff5efc80157': fix crash from configurable slider ranges
|
813f347d2d2dd5061c0fb537ff43d5da5608faf4 |
18-Oct-2012 |
John Hoford <hoford@google.com> |
am da974d84: fix crash from configurable slider ranges * commit 'da974d84c8aa0758afe2dc7382657ff5efc80157': fix crash from configurable slider ranges
|
c63232242ca5bd4a0423b79b5097118328553600 |
18-Oct-2012 |
John Hoford <hoford@google.com> |
am da974d84: fix crash from configurable slider ranges * commit 'da974d84c8aa0758afe2dc7382657ff5efc80157': fix crash from configurable slider ranges
|
146c53701271330ba892118782afdc2bef518434 |
18-Oct-2012 |
Doris Liu <tianliu@google.com> |
Update video editor actionbar background assets Bug: 7354155 Change-Id: Ia2336623c0777a7f6eca105f6b4af14faa25a006
es/drawable-hdpi/actionbar_translucent.9.png
es/drawable-mdpi/actionbar_translucent.9.png
es/drawable-xhdpi/actionbar_translucent.9.png
|
4f767e151c58ddcd62d6674e9c86cc0f2ab58be3 |
18-Oct-2012 |
Doris Liu <tianliu@google.com> |
Update video editor actionbar background assets Bug: 7354155 Change-Id: Ia2336623c0777a7f6eca105f6b4af14faa25a006
es/drawable-hdpi/actionbar_translucent.9.png
es/drawable-mdpi/actionbar_translucent.9.png
es/drawable-xhdpi/actionbar_translucent.9.png
|
c9bf00b7aeb1389c57b68049d3d06f2ecf9fca5c |
17-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Added support for crop actions. Changed overflow menu to use new editor. Bug: 7281479 Bug: 7337191 Change-Id: I91055c972666e4c2d605903646b55d8c67ae87f3
ndroidManifest.xml
|
caf46711c033bb2de4649080e723b5cca81549c9 |
17-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Added support for crop actions. Changed overflow menu to use new editor. Bug: 7281479 Bug: 7337191 Change-Id: I91055c972666e4c2d605903646b55d8c67ae87f3
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
|
63926d2ed2ca2921de8dca9b3a52c1d64d8afc46 |
17-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Added support for crop actions. Changed overflow menu to use new editor. Bug: 7281479 Bug: 7337191 Change-Id: I91055c972666e4c2d605903646b55d8c67ae87f3
ndroidManifest.xml
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
|
409f1de83183a2f9fa475f255db5c30b5abdb32d |
18-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am bbbf3506: am cee0db25: am 1056ce1a: am 43b906d8: Moved many strings to xml. Changed UI filter order. Renamed things. * commit 'bbbf350644b121495110c39b77fef9da145e88f5': Moved many strings to xml. Changed UI filter order. Renamed things.
|
0a331aeb7386b73e693528b0b26beba693ed6c10 |
18-Oct-2012 |
John Hoford <hoford@google.com> |
fix crash from configurable slider ranges bug:7293391 Change-Id: I17498a2066acdb5c53763610980fe2f6532f2f34
rc/com/android/gallery3d/filtershow/imageshow/ImageShow.java
|
da974d84c8aa0758afe2dc7382657ff5efc80157 |
18-Oct-2012 |
John Hoford <hoford@google.com> |
fix crash from configurable slider ranges bug:7293391 Change-Id: I17498a2066acdb5c53763610980fe2f6532f2f34
rc/com/android/gallery3d/filtershow/imageshow/ImageShow.java
|
bbbf350644b121495110c39b77fef9da145e88f5 |
18-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am cee0db25: am 1056ce1a: am 43b906d8: Moved many strings to xml. Changed UI filter order. Renamed things. * commit 'cee0db255fc0af9f8f705001309cf5444e48a647': Moved many strings to xml. Changed UI filter order. Renamed things.
|
d0b53c08d88a696170989d6c0c72f8cbb26ac654 |
18-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am 1056ce1a: am 43b906d8: Moved many strings to xml. Changed UI filter order. Renamed things. * commit '1056ce1a7df84defcbff470a40d68d5e3e7759eb': Moved many strings to xml. Changed UI filter order. Renamed things.
|
cee0db255fc0af9f8f705001309cf5444e48a647 |
18-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am 1056ce1a: am 43b906d8: Moved many strings to xml. Changed UI filter order. Renamed things. * commit '1056ce1a7df84defcbff470a40d68d5e3e7759eb': Moved many strings to xml. Changed UI filter order. Renamed things.
|
1056ce1a7df84defcbff470a40d68d5e3e7759eb |
18-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am 43b906d8: Moved many strings to xml. Changed UI filter order. Renamed things. * commit '43b906d81caa4379eae1a1643194c8b3d34b1ad5': Moved many strings to xml. Changed UI filter order. Renamed things.
|
92f761c31cad59b58890398c4c7f3fc3b91d4496 |
18-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am 43b906d8: Moved many strings to xml. Changed UI filter order. Renamed things. * commit '43b906d81caa4379eae1a1643194c8b3d34b1ad5': Moved many strings to xml. Changed UI filter order. Renamed things.
|
3e83c3328277b802f0eb3e3e3c18857747be9539 |
18-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am 43b906d8: Moved many strings to xml. Changed UI filter order. Renamed things. * commit '43b906d81caa4379eae1a1643194c8b3d34b1ad5': Moved many strings to xml. Changed UI filter order. Renamed things.
|
92d37dee3834f9c1b2cc8a5c9663b96b9cf64bb3 |
18-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am 43b906d8: Moved many strings to xml. Changed UI filter order. Renamed things. * commit '43b906d81caa4379eae1a1643194c8b3d34b1ad5': Moved many strings to xml. Changed UI filter order. Renamed things.
|
6e0c44e0e81bc72db7d2b822537d91e39d71ffe5 |
18-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ie813b6d30da05298a561b9ff2edf6298c4f7f9f3 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
87ad37b184f22103fef0aa6f24fadf87a9efdf76 |
18-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I36f42e97a5e024f76f7c4856c528dc1f3a5047a9 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
689e809a2d009ff34bb92d7f1f39049271697076 |
18-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I6dab2da3cda77beeac8a8396d7d69f9df81b344e Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
db792a75399b1007ae37b7c022c870a382b19203 |
18-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ic5166da21bb2611a235ab164c883759371c456f6 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
948855bb5512aec8be9893f138dd7acfa66a2c9f |
18-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ic5166da21bb2611a235ab164c883759371c456f6 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
569b468c464a75533cd994276fefe50c68b0b532 |
18-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I4f6d35d632de25090e1cf1749157b9da81f1b1e4 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
180050385aa66ff6ab757eef80f018347562a661 |
18-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I4f6d35d632de25090e1cf1749157b9da81f1b1e4 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
591ba8d027d574f1e9fedaf878d3b7b41ebe4861 |
17-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Moved many strings to xml. Changed UI filter order. Renamed things. Bug: 7344749 Bug: 7322949 Change-Id: Ia9ebc45fb2c743a458af270be429f07198ea3c1b
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/PanelController.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterFx.java
rc/com/android/gallery3d/filtershow/imageshow/ImageSmallFilter.java
rc/com/android/gallery3d/filtershow/ui/ImageButtonTitle.java
|
43b906d81caa4379eae1a1643194c8b3d34b1ad5 |
17-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Moved many strings to xml. Changed UI filter order. Renamed things. Bug: 7344749 Bug: 7322949 Change-Id: Ia9ebc45fb2c743a458af270be429f07198ea3c1b
es/layout/filtershow_activity.xml
es/values/filtershow_strings.xml
es/values/strings.xml
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/PanelController.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterFx.java
rc/com/android/gallery3d/filtershow/imageshow/ImageSmallFilter.java
rc/com/android/gallery3d/filtershow/ui/ImageButtonTitle.java
|
ced4d2716a1346271d5a91bc675d0d3ee4dca2f9 |
17-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Moved many strings to xml. Changed UI filter order. Renamed things. Bug: 7344749 Bug: 7322949 Change-Id: Ia9ebc45fb2c743a458af270be429f07198ea3c1b
es/layout/filtershow_activity.xml
es/values/filtershow_strings.xml
es/values/strings.xml
|
9d8e7dad93243eb1688683cdf4bf63d4b8cbfb6a |
18-Oct-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
852e4cf8344d68df3653e61f21f70f47d4f82be6 |
18-Oct-2012 |
John Hoford <hoford@google.com> |
am a975ede4: am 53dddeb1: am abe96287: am de8dbdff: Merge "fix rotating normal images" into gb-ub-photos-arches * commit 'a975ede4049f8c5f0de19b3cb92dc75b033c367c': fix rotating normal images
|
a975ede4049f8c5f0de19b3cb92dc75b033c367c |
18-Oct-2012 |
John Hoford <hoford@google.com> |
am 53dddeb1: am abe96287: am de8dbdff: Merge "fix rotating normal images" into gb-ub-photos-arches * commit '53dddeb1c9fd5a5b68e1cbde411aab98cfaba459': fix rotating normal images
|
53dddeb1c9fd5a5b68e1cbde411aab98cfaba459 |
18-Oct-2012 |
John Hoford <hoford@google.com> |
am abe96287: am de8dbdff: Merge "fix rotating normal images" into gb-ub-photos-arches * commit 'abe96287075b529d4c557b22c208ca5c7e6d318f': fix rotating normal images
|
272546bbbfa29cc0fd273003a071e735631a4766 |
18-Oct-2012 |
John Hoford <hoford@google.com> |
am abe96287: am de8dbdff: Merge "fix rotating normal images" into gb-ub-photos-arches * commit 'abe96287075b529d4c557b22c208ca5c7e6d318f': fix rotating normal images
|
187cee8701b62ea9b3df8a23da2a44787154d0c9 |
18-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 52e7f0f2: am c913a357: am 21c91bfb: am ef877094: Merge "Fix back button behaviour" into gb-ub-photos-arches * commit '52e7f0f26fef055289be92f8d6af2ae3ab8021ff': Fix back button behaviour
|
abe96287075b529d4c557b22c208ca5c7e6d318f |
18-Oct-2012 |
John Hoford <hoford@google.com> |
am de8dbdff: Merge "fix rotating normal images" into gb-ub-photos-arches * commit 'de8dbdff27e4b5c1626024e20fae9fb535238453': fix rotating normal images
|
18bc679082ca0c660bbd8a3d846a036ff7bbd243 |
18-Oct-2012 |
John Hoford <hoford@google.com> |
am de8dbdff: Merge "fix rotating normal images" into gb-ub-photos-arches * commit 'de8dbdff27e4b5c1626024e20fae9fb535238453': fix rotating normal images
|
87bcbf65a9e601d601aff81125668727d832466d |
18-Oct-2012 |
John Hoford <hoford@google.com> |
am de8dbdff: Merge "fix rotating normal images" into gb-ub-photos-arches * commit 'de8dbdff27e4b5c1626024e20fae9fb535238453': fix rotating normal images
|
52e7f0f26fef055289be92f8d6af2ae3ab8021ff |
18-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am c913a357: am 21c91bfb: am ef877094: Merge "Fix back button behaviour" into gb-ub-photos-arches * commit 'c913a35769e20a63e68ae23262e116d2c6c2a772': Fix back button behaviour
|
2aec35785f8265f7711e281dcbd56ccebcba9cf7 |
18-Oct-2012 |
John Hoford <hoford@google.com> |
Merge "fix rotating normal images" into gb-ub-photos-arches
|
de8dbdff27e4b5c1626024e20fae9fb535238453 |
18-Oct-2012 |
John Hoford <hoford@google.com> |
Merge "fix rotating normal images" into gb-ub-photos-arches
|
8e71835d2d34e33a1622fbf66308fc0ccfc6f876 |
18-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 21c91bfb: am ef877094: Merge "Fix back button behaviour" into gb-ub-photos-arches * commit '21c91bfbb1bce4c1b2a0da85cb42d489f11b1e07': Fix back button behaviour
|
c913a35769e20a63e68ae23262e116d2c6c2a772 |
18-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 21c91bfb: am ef877094: Merge "Fix back button behaviour" into gb-ub-photos-arches * commit '21c91bfbb1bce4c1b2a0da85cb42d489f11b1e07': Fix back button behaviour
|
80555dfd07c241f8697e9318980593aed9423dbc |
18-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am ef877094: Merge "Fix back button behaviour" into gb-ub-photos-arches * commit 'ef8770944c5701f8c07ca87f939d7759622eaaa7': Fix back button behaviour
|
db8c9e26cfca877deb5e588603c01e444988f435 |
18-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am ef877094: Merge "Fix back button behaviour" into gb-ub-photos-arches * commit 'ef8770944c5701f8c07ca87f939d7759622eaaa7': Fix back button behaviour
|
4b0f96374d3040b55f474662806f3f47278d6d79 |
18-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am ef877094: Merge "Fix back button behaviour" into gb-ub-photos-arches * commit 'ef8770944c5701f8c07ca87f939d7759622eaaa7': Fix back button behaviour
|
21c91bfbb1bce4c1b2a0da85cb42d489f11b1e07 |
18-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am ef877094: Merge "Fix back button behaviour" into gb-ub-photos-arches * commit 'ef8770944c5701f8c07ca87f939d7759622eaaa7': Fix back button behaviour
|
ef8770944c5701f8c07ca87f939d7759622eaaa7 |
18-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Merge "Fix back button behaviour" into gb-ub-photos-arches
|
bb81280524bffa7511dc8a7af0aaaaa1cd4a2c1c |
18-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Merge "Fix back button behaviour" into gb-ub-photos-arches
|
c88132a36220324abb326e452c865ea9a4964da0 |
18-Oct-2012 |
John Reck <jreck@google.com> |
am 70c18a80: am 7b6f2c6d: am d07026bf: am 57731ee2: Only fade out if texture creation succeeded * commit '70c18a807a5bda72501d81332fa4cbad0a732ba7': Only fade out if texture creation succeeded
|
70c18a807a5bda72501d81332fa4cbad0a732ba7 |
18-Oct-2012 |
John Reck <jreck@google.com> |
am 7b6f2c6d: am d07026bf: am 57731ee2: Only fade out if texture creation succeeded * commit '7b6f2c6d378a8b932053c036af452368d712592c': Only fade out if texture creation succeeded
|
d6d9db90be8b088f80c2023c69fbdc0f9e75b816 |
18-Oct-2012 |
John Reck <jreck@google.com> |
am d07026bf: am 57731ee2: Only fade out if texture creation succeeded * commit 'd07026bf48a457bc082516b0e93625a57b90da89': Only fade out if texture creation succeeded
|
7b6f2c6d378a8b932053c036af452368d712592c |
18-Oct-2012 |
John Reck <jreck@google.com> |
am d07026bf: am 57731ee2: Only fade out if texture creation succeeded * commit 'd07026bf48a457bc082516b0e93625a57b90da89': Only fade out if texture creation succeeded
|
aa9567d8f377fee9dbbcd8bb23a9cc3a2989ca48 |
18-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Fix back button behaviour bug:7290000 bug:7256201 Change-Id: Ia6f5726b0602c45e98566bcb5e027686e7f2fe57
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
|
55550694a3f40fbf5dfc95c35a8e253aedab931e |
18-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Fix back button behaviour bug:7290000 bug:7256201 Change-Id: Ia6f5726b0602c45e98566bcb5e027686e7f2fe57
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/filters/ImageFilter.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterBorder.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterCurves.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterFx.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterParametricBorder.java
rc/com/android/gallery3d/filtershow/imageshow/GeometryMetadata.java
rc/com/android/gallery3d/filtershow/imageshow/ImageShow.java
rc/com/android/gallery3d/filtershow/imageshow/ImageSmallBorder.java
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
|
24fc5f1dd7a3a99e04e1e7f0d54d9ec1e777145d |
18-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Fix back button behaviour bug:7290000 bug:7256201 Change-Id: Ia6f5726b0602c45e98566bcb5e027686e7f2fe57
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/filters/ImageFilter.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterBorder.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterCurves.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterFx.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterParametricBorder.java
rc/com/android/gallery3d/filtershow/imageshow/GeometryMetadata.java
rc/com/android/gallery3d/filtershow/imageshow/ImageShow.java
rc/com/android/gallery3d/filtershow/imageshow/ImageSmallBorder.java
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
|
dc3cfc412e663611fbea65a89f73ad68d614b72e |
18-Oct-2012 |
John Reck <jreck@google.com> |
am 57731ee2: Only fade out if texture creation succeeded * commit '57731ee210c22382d33f6f562f9e7e66fce651de': Only fade out if texture creation succeeded
|
685bce209cfc8c97abaa00a3e889f141b5a3c971 |
18-Oct-2012 |
John Reck <jreck@google.com> |
am 57731ee2: Only fade out if texture creation succeeded * commit '57731ee210c22382d33f6f562f9e7e66fce651de': Only fade out if texture creation succeeded
|
d07026bf48a457bc082516b0e93625a57b90da89 |
18-Oct-2012 |
John Reck <jreck@google.com> |
am 57731ee2: Only fade out if texture creation succeeded * commit '57731ee210c22382d33f6f562f9e7e66fce651de': Only fade out if texture creation succeeded
|
af3f91a929984eca8c572342851752bbb28b23dd |
18-Oct-2012 |
Mangesh Ghiware <mghiware@google.com> |
am 62433f51: am f2f9b21f: am 07c2c448: am 4104415e: Merge "Add read URI permission to intent returned for GET_CONTENT" into gb-ub-photos-arches * commit '62433f51796a85c1cafd0ae63d776ea2a84ae404': Add read URI permission to intent returned for GET_CONTENT
|
b949c73bf203e3995889745731bc8645d6af8356 |
18-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am c6ec194e: (-s ours) am 02d6f5dd: am 72b0fbef: am 77a8da71: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches * commit 'c6ec194e7e65c2610ff29a947d7b1efdcfa957e0': Import translations. DO NOT MERGE
|
4caee7b9039095eccc756262470b980093c03085 |
18-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am a06e8fae: (-s ours) am 629562b5: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev * commit 'a06e8faeabc8e9c23e12320527f5c6f25b982539': Import translations. DO NOT MERGE
|
bceb71c0b366fcae53ce43e2548c2043d39405eb |
18-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am 10b3add6: (-s ours) am 1d286a59: am 55ec71e7: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev * commit '10b3add6514b3018b3bda5a5741ad71b4b165b67': Import translations. DO NOT MERGE
|
57731ee210c22382d33f6f562f9e7e66fce651de |
18-Oct-2012 |
John Reck <jreck@google.com> |
Only fade out if texture creation succeeded Bug: 7366597 Change-Id: Id28970fe263d975dcd48e45fd716199bc40f64d3
rc/com/android/gallery3d/app/ActivityState.java
rc/com/android/gallery3d/ui/PreparePageFadeoutTexture.java
|
fb0051a8d4bdc027e3b5fdf895718199ca24e133 |
18-Oct-2012 |
John Reck <jreck@google.com> |
Only fade out if texture creation succeeded Bug: 7366597 Change-Id: Id28970fe263d975dcd48e45fd716199bc40f64d3
rc/com/android/gallery3d/app/ActivityState.java
rc/com/android/gallery3d/ui/PreparePageFadeoutTexture.java
|
62433f51796a85c1cafd0ae63d776ea2a84ae404 |
18-Oct-2012 |
Mangesh Ghiware <mghiware@google.com> |
am f2f9b21f: am 07c2c448: am 4104415e: Merge "Add read URI permission to intent returned for GET_CONTENT" into gb-ub-photos-arches * commit 'f2f9b21f6bb28a6f7368f8f1f41194436025296e': Add read URI permission to intent returned for GET_CONTENT
|
c6ec194e7e65c2610ff29a947d7b1efdcfa957e0 |
18-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am 02d6f5dd: am 72b0fbef: am 77a8da71: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches * commit '02d6f5ddd69393128e77185cfd3d581fc122bd59': Import translations. DO NOT MERGE
|
a06e8faeabc8e9c23e12320527f5c6f25b982539 |
18-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am 629562b5: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev * commit '629562b594d3680947235f8a075f24460e8354a1': Import translations. DO NOT MERGE
|
10b3add6514b3018b3bda5a5741ad71b4b165b67 |
17-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am 1d286a59: am 55ec71e7: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev * commit '1d286a5999b33daefbc3d78b269a5eee6013cd81': Import translations. DO NOT MERGE
|
4226d3e4ddbdefe7c772fb3080ba92e50acffcd1 |
17-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE"
|
f2f9b21f6bb28a6f7368f8f1f41194436025296e |
17-Oct-2012 |
Mangesh Ghiware <mghiware@google.com> |
am 07c2c448: am 4104415e: Merge "Add read URI permission to intent returned for GET_CONTENT" into gb-ub-photos-arches * commit '07c2c448bd5b043e6aeebfd9ed3a347851bb14fe': Add read URI permission to intent returned for GET_CONTENT
|
02d6f5ddd69393128e77185cfd3d581fc122bd59 |
17-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am 72b0fbef: am 77a8da71: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches * commit '72b0fbef391ee2fda15f951ca19912292844827e': Import translations. DO NOT MERGE
|
c2c0b1b623a2091d052362e213d7e8e81a772463 |
17-Oct-2012 |
Mangesh Ghiware <mghiware@google.com> |
am 07c2c448: am 4104415e: Merge "Add read URI permission to intent returned for GET_CONTENT" into gb-ub-photos-arches * commit '07c2c448bd5b043e6aeebfd9ed3a347851bb14fe': Add read URI permission to intent returned for GET_CONTENT
|
d0ff9e6b30fb44a0a9c1984a611703751d682a31 |
17-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am 72b0fbef: (-s ours) am 77a8da71: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches * commit '72b0fbef391ee2fda15f951ca19912292844827e': Import translations. DO NOT MERGE
|
629562b594d3680947235f8a075f24460e8354a1 |
17-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
|
bfec9e13340248fe3ab8251683b4a351be87c5f5 |
17-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
|
de9ba531df4ca5da204cde34416cdc5af10a471c |
17-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
|
f71589e474392a62a41ab22da3bdd14d078611b8 |
17-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am 55ec71e7: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev * commit '55ec71e7ed9297135b09114ed198240954106a0e': Import translations. DO NOT MERGE
|
1d286a5999b33daefbc3d78b269a5eee6013cd81 |
17-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am 55ec71e7: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev * commit '55ec71e7ed9297135b09114ed198240954106a0e': Import translations. DO NOT MERGE
|
07c2c448bd5b043e6aeebfd9ed3a347851bb14fe |
17-Oct-2012 |
Mangesh Ghiware <mghiware@google.com> |
am 4104415e: Merge "Add read URI permission to intent returned for GET_CONTENT" into gb-ub-photos-arches * commit '4104415e00090cdcac4a2f7408cc7ddc7d11c711': Add read URI permission to intent returned for GET_CONTENT
|
72b0fbef391ee2fda15f951ca19912292844827e |
17-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am 77a8da71: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches * commit '77a8da71dc3a2e12266e229d2687069f68d9fe59': Import translations. DO NOT MERGE
|
65e9599cffe6f44cd1f7824f838312d41e9473ef |
17-Oct-2012 |
Mangesh Ghiware <mghiware@google.com> |
am 4104415e: Merge "Add read URI permission to intent returned for GET_CONTENT" into gb-ub-photos-arches * commit '4104415e00090cdcac4a2f7408cc7ddc7d11c711': Add read URI permission to intent returned for GET_CONTENT
|
1f823b326cb4651f08d8d1b7e0e18f9ea5e706f8 |
17-Oct-2012 |
Mangesh Ghiware <mghiware@google.com> |
am 4104415e: Merge "Add read URI permission to intent returned for GET_CONTENT" into gb-ub-photos-arches * commit '4104415e00090cdcac4a2f7408cc7ddc7d11c711': Add read URI permission to intent returned for GET_CONTENT
|
659432ae6323d21600dde816a831f63fd2210350 |
17-Oct-2012 |
John Hoford <hoford@google.com> |
fix rotating normal images bug:7353416 Change-Id: I86875286ea81982bdb55e9df22e44827b521d257
rc/com/android/gallery3d/filtershow/cache/ImageLoader.java
|
e5da585e6cb73cff8775b21a69a01f8bf513d2ab |
17-Oct-2012 |
John Hoford <hoford@google.com> |
fix rotating normal images bug:7353416 Change-Id: I86875286ea81982bdb55e9df22e44827b521d257
rc/com/android/gallery3d/filtershow/cache/ImageLoader.java
|
01ac8c91e0db61a325c8b7d757ef2a05cf4ee514 |
17-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am 77a8da71: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches * commit '77a8da71dc3a2e12266e229d2687069f68d9fe59': Import translations. DO NOT MERGE
|
9e2b98404643fc0a082c081b676ba2dccd211722 |
17-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am 77a8da71: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches * commit '77a8da71dc3a2e12266e229d2687069f68d9fe59': Import translations. DO NOT MERGE
|
4104415e00090cdcac4a2f7408cc7ddc7d11c711 |
17-Oct-2012 |
Mangesh Ghiware <mghiware@google.com> |
Merge "Add read URI permission to intent returned for GET_CONTENT" into gb-ub-photos-arches
|
d4f457e0133bac5e3b172a1261a36ff62c39953c |
17-Oct-2012 |
Mangesh Ghiware <mghiware@google.com> |
Merge "Add read URI permission to intent returned for GET_CONTENT" into gb-ub-photos-arches
|
4146bf9a4cf38798bc65276a8e1c93c29ad56487 |
17-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
|
77a8da71dc3a2e12266e229d2687069f68d9fe59 |
17-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
|
55ec71e7ed9297135b09114ed198240954106a0e |
17-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
|
78bc160a69d284cac677d58b5c5759b4e0ead159 |
17-Oct-2012 |
John Reck <jreck@google.com> |
am 37530da7: am 740dd9d9: am 3ad462d0: am 24958c5d: Change double tap scale from 1.5 to 1.0 * commit '37530da7205ce0304c54d2b8c7c3297c84f363ba': Change double tap scale from 1.5 to 1.0
|
37530da7205ce0304c54d2b8c7c3297c84f363ba |
17-Oct-2012 |
John Reck <jreck@google.com> |
am 740dd9d9: am 3ad462d0: am 24958c5d: Change double tap scale from 1.5 to 1.0 * commit '740dd9d90f62c6a660fc25676e47c24eaf61bc69': Change double tap scale from 1.5 to 1.0
|
740dd9d90f62c6a660fc25676e47c24eaf61bc69 |
17-Oct-2012 |
John Reck <jreck@google.com> |
am 3ad462d0: am 24958c5d: Change double tap scale from 1.5 to 1.0 * commit '3ad462d015baee9ca7b436ec7b688ebff1f92d04': Change double tap scale from 1.5 to 1.0
|
3ad462d015baee9ca7b436ec7b688ebff1f92d04 |
17-Oct-2012 |
John Reck <jreck@google.com> |
am 24958c5d: Change double tap scale from 1.5 to 1.0 * commit '24958c5d4a63e1d7c49d9e7007ee10958ad23e8f': Change double tap scale from 1.5 to 1.0
|
3ef60c6413ce5dd0bdda7f58fdcf4c4854a967b8 |
17-Oct-2012 |
John Reck <jreck@google.com> |
am 24958c5d: Change double tap scale from 1.5 to 1.0 * commit '24958c5d4a63e1d7c49d9e7007ee10958ad23e8f': Change double tap scale from 1.5 to 1.0
|
726a8399f3417feb7623044722c06198b640939a |
17-Oct-2012 |
John Reck <jreck@google.com> |
am 24958c5d: Change double tap scale from 1.5 to 1.0 * commit '24958c5d4a63e1d7c49d9e7007ee10958ad23e8f': Change double tap scale from 1.5 to 1.0
|
cdb0f9217c9bbda9e31b501b175accc1599c3fd1 |
17-Oct-2012 |
Jason Noguchi <jnoguchi@google.com> |
Adding accessor methods for camera latency vars. Change-Id: I21cb401aa12f116abd384efee021d2738b28793c
roguard.flags
|
1098a184fe15ca0d655c701648292dc3f56a5587 |
17-Oct-2012 |
Jason Noguchi <jnoguchi@google.com> |
Adding accessor methods for camera latency vars. Change-Id: I21cb401aa12f116abd384efee021d2738b28793c
roguard.flags
|
903c190fc10e7cf5c95bccc7cf0220375e25ea00 |
17-Oct-2012 |
John Reck <jreck@google.com> |
Change double tap scale from 1.5 to 1.0 Bug: 7287834 Change-Id: I43312825c1494e385a36a3783765de33d2b691e2
rc/com/android/gallery3d/ui/PhotoView.java
|
24958c5d4a63e1d7c49d9e7007ee10958ad23e8f |
17-Oct-2012 |
John Reck <jreck@google.com> |
Change double tap scale from 1.5 to 1.0 Bug: 7287834 Change-Id: I43312825c1494e385a36a3783765de33d2b691e2
rc/com/android/gallery3d/ui/PhotoView.java
|
65e3fc98029106a3e617ba112bacf709558160da |
17-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 3171f77d: am ffc1fcf9: am f38a686f: am 95404c66: Fix UI stuff * commit '3171f77dfae5a923f18861a1762de0c4a82e7ce5': Fix UI stuff
|
3171f77dfae5a923f18861a1762de0c4a82e7ce5 |
17-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am ffc1fcf9: am f38a686f: am 95404c66: Fix UI stuff * commit 'ffc1fcf995aa230ce359425f95e0dde0904694a3': Fix UI stuff
|
ffc1fcf995aa230ce359425f95e0dde0904694a3 |
17-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am f38a686f: am 95404c66: Fix UI stuff * commit 'f38a686f7eb25a6338184d9882fdf0f95b917c69': Fix UI stuff
|
c0bee66c25aa44a26d3c93eacb3ccb0c38b97660 |
17-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 95404c66: Fix UI stuff * commit '95404c666640177abf72ca2278585a16f30cf390': Fix UI stuff
|
e8439739e58cadd9d6e776fcb9b56f4ce9e1ff7b |
17-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 95404c66: Fix UI stuff * commit '95404c666640177abf72ca2278585a16f30cf390': Fix UI stuff
|
bfea2db57cc6cccc89dcfca2dc26fc1a2c803925 |
17-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 95404c66: Fix UI stuff * commit '95404c666640177abf72ca2278585a16f30cf390': Fix UI stuff
|
f38a686f7eb25a6338184d9882fdf0f95b917c69 |
17-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 95404c66: Fix UI stuff * commit '95404c666640177abf72ca2278585a16f30cf390': Fix UI stuff
|
0f1bb9fa161abd4279428e6d1b8e3a41ac554eb4 |
17-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Fix UI stuff bug:7354368 bug:7362027 bug:7344915 Change-Id: I2efd5de0971e5dfbc989d60860348280c03b3db4
es/layout/filtershow_activity.xml
es/values-sw600dp/dimensions.xml
es/values-sw800dp/dimensions.xml
es/values/dimensions.xml
es/values/filtershow_color.xml
|
95404c666640177abf72ca2278585a16f30cf390 |
17-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Fix UI stuff bug:7354368 bug:7362027 bug:7344915 Change-Id: I2efd5de0971e5dfbc989d60860348280c03b3db4
es/layout/filtershow_activity.xml
es/values-sw600dp/dimensions.xml
es/values-sw800dp/dimensions.xml
es/values/dimensions.xml
es/values/filtershow_color.xml
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/imageshow/ImageShow.java
rc/com/android/gallery3d/filtershow/imageshow/ImageSmallBorder.java
rc/com/android/gallery3d/filtershow/imageshow/ImageSmallFilter.java
|
25b4822bdf644054ee8871b5f091065075351510 |
17-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Fix UI stuff bug:7354368 bug:7362027 bug:7344915 Change-Id: I2efd5de0971e5dfbc989d60860348280c03b3db4
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/imageshow/ImageShow.java
rc/com/android/gallery3d/filtershow/imageshow/ImageSmallBorder.java
rc/com/android/gallery3d/filtershow/imageshow/ImageSmallFilter.java
|
8c156b9c018390991d7124405576aedd9fcfd913 |
17-Oct-2012 |
John Hoford <hoford@google.com> |
am aa312f87: am 9696bc26: am 47c98b30: am eb321f77: Merge "rotate images before saving" into gb-ub-photos-arches * commit 'aa312f87b4db11965ccea10f2e1aed3f1e3d1e4b': rotate images before saving
|
aa312f87b4db11965ccea10f2e1aed3f1e3d1e4b |
17-Oct-2012 |
John Hoford <hoford@google.com> |
am 9696bc26: am 47c98b30: am eb321f77: Merge "rotate images before saving" into gb-ub-photos-arches * commit '9696bc26a663d4cb6d952afd662c6f6ed0be1e21': rotate images before saving
|
9696bc26a663d4cb6d952afd662c6f6ed0be1e21 |
17-Oct-2012 |
John Hoford <hoford@google.com> |
am 47c98b30: am eb321f77: Merge "rotate images before saving" into gb-ub-photos-arches * commit '47c98b30363d52d563df9f494291d9a1ab1edc7c': rotate images before saving
|
47c98b30363d52d563df9f494291d9a1ab1edc7c |
17-Oct-2012 |
John Hoford <hoford@google.com> |
am eb321f77: Merge "rotate images before saving" into gb-ub-photos-arches * commit 'eb321f77e97b22acab15d60eeacf8a65dc8cceb1': rotate images before saving
|
5c62b4391842af458a504a0ef50d5c62723ffaec |
17-Oct-2012 |
John Hoford <hoford@google.com> |
am eb321f77: Merge "rotate images before saving" into gb-ub-photos-arches * commit 'eb321f77e97b22acab15d60eeacf8a65dc8cceb1': rotate images before saving
|
a2a44cfa68f03f698a25fcb670e8283ce3a909e2 |
17-Oct-2012 |
John Hoford <hoford@google.com> |
am eb321f77: Merge "rotate images before saving" into gb-ub-photos-arches * commit 'eb321f77e97b22acab15d60eeacf8a65dc8cceb1': rotate images before saving
|
0c4d19852885760e7fcfafbc8305e3533af35316 |
17-Oct-2012 |
John Hoford <hoford@google.com> |
Merge "rotate images before saving" into gb-ub-photos-arches
|
eb321f77e97b22acab15d60eeacf8a65dc8cceb1 |
17-Oct-2012 |
John Hoford <hoford@google.com> |
Merge "rotate images before saving" into gb-ub-photos-arches
|
1c38d440b454698093f3f5c867b4bad5bf74716f |
17-Oct-2012 |
Mangesh Ghiware <mghiware@google.com> |
Add read URI permission to intent returned for GET_CONTENT Bug: 7366308 Bug: 7202384 GalleryProvider now requires a permission to access content. See CL ca181a6 for more details. Change-Id: I4bdf61e19c9e2b6e2da0837a8f633a27c49441d7
rc/com/android/gallery3d/app/AlbumPage.java
|
dfbb1f436b6020bbc5c14794ef0e8f571adc2167 |
17-Oct-2012 |
Mangesh Ghiware <mghiware@google.com> |
Add read URI permission to intent returned for GET_CONTENT Bug: 7366308 Bug: 7202384 GalleryProvider now requires a permission to access content. See CL ca181a6 for more details. Change-Id: I4bdf61e19c9e2b6e2da0837a8f633a27c49441d7
rc/com/android/gallery3d/app/AlbumPage.java
|
211209cc8a756358336983cc82d16885f82bf3c0 |
17-Oct-2012 |
Sascha Haeberling <haeberling@google.com> |
am efaf3fce: am e1f3b256: am 72e6392c: am e3b50f1b: Adds GMS Core PanoramaClient to Gallery * commit 'efaf3fcea9e3ad977b48801b01c12ddc32ced6ed': Adds GMS Core PanoramaClient to Gallery
|
efaf3fcea9e3ad977b48801b01c12ddc32ced6ed |
17-Oct-2012 |
Sascha Haeberling <haeberling@google.com> |
am e1f3b256: am 72e6392c: am e3b50f1b: Adds GMS Core PanoramaClient to Gallery * commit 'e1f3b256d5a88989c7e723b0368177d166506822': Adds GMS Core PanoramaClient to Gallery
|
e1f3b256d5a88989c7e723b0368177d166506822 |
17-Oct-2012 |
Sascha Haeberling <haeberling@google.com> |
am 72e6392c: am e3b50f1b: Adds GMS Core PanoramaClient to Gallery * commit '72e6392ca2eafc53739934f1a4d8e6cd869cce8c': Adds GMS Core PanoramaClient to Gallery
|
72e6392ca2eafc53739934f1a4d8e6cd869cce8c |
17-Oct-2012 |
Sascha Haeberling <haeberling@google.com> |
am e3b50f1b: Adds GMS Core PanoramaClient to Gallery * commit 'e3b50f1bfcfa5c8729f31788eac1a6109a88988b': Adds GMS Core PanoramaClient to Gallery
|
2cf43cfb0c2ee15f406fcbe3fe7b42efe56bd35f |
17-Oct-2012 |
Sascha Haeberling <haeberling@google.com> |
am e3b50f1b: Adds GMS Core PanoramaClient to Gallery * commit 'e3b50f1bfcfa5c8729f31788eac1a6109a88988b': Adds GMS Core PanoramaClient to Gallery
|
1f995baa828edb6a88bd7a48d7e7ddcfb63fe782 |
17-Oct-2012 |
Sascha Haeberling <haeberling@google.com> |
am e3b50f1b: Adds GMS Core PanoramaClient to Gallery * commit 'e3b50f1bfcfa5c8729f31788eac1a6109a88988b': Adds GMS Core PanoramaClient to Gallery
|
b3f4f83e6d997f70d4ec762fb0bbe3cacd15613e |
17-Oct-2012 |
John Hoford <hoford@google.com> |
rotate images before saving bug:7353416 Change-Id: I113de1fa16725c9483a447a64ab1a41a3bbe679f
rc/com/android/gallery3d/filtershow/cache/ImageLoader.java
|
d53bfbff620c1e9878effa13f083ff0e6c4ee96c |
17-Oct-2012 |
John Hoford <hoford@google.com> |
rotate images before saving bug:7353416 Change-Id: I113de1fa16725c9483a447a64ab1a41a3bbe679f
rc/com/android/gallery3d/filtershow/cache/ImageLoader.java
|
c635f76f2155525b2bcca5cfdd1320d16a865876 |
16-Oct-2012 |
Sascha Haeberling <haeberling@google.com> |
Adds GMS Core PanoramaClient to Gallery Bug: 7319099 Also updates the API call to LightCycleHelper. This depends on http://go/ag/#/c/239523/ Change-Id: Ie951e44e3a474599d1da6fea52609fbb9f8dc9bc
rc/com/android/gallery3d/app/AbstractGalleryActivity.java
rc/com/android/gallery3d/app/PhotoPage.java
rc_pd/com/android/gallery3d/util/LightCycleHelper.java
|
e3b50f1bfcfa5c8729f31788eac1a6109a88988b |
16-Oct-2012 |
Sascha Haeberling <haeberling@google.com> |
Adds GMS Core PanoramaClient to Gallery Bug: 7319099 Also updates the API call to LightCycleHelper. This depends on http://go/ag/#/c/239523/ Change-Id: Ie951e44e3a474599d1da6fea52609fbb9f8dc9bc
rc/com/android/gallery3d/app/AbstractGalleryActivity.java
rc/com/android/gallery3d/app/PhotoPage.java
rc_pd/com/android/gallery3d/util/LightCycleHelper.java
|
fdeffeee6bf96526fd3c024c595763840ed6b505 |
17-Oct-2012 |
John Hoford <hoford@google.com> |
am b290e724: am b24a86bf: am 7bc0a525: am 3038d014: add support for configurable slider ranges * commit 'b290e72474b64d2ac7e2b8e5ee18dfcaf9264455': add support for configurable slider ranges
|
b290e72474b64d2ac7e2b8e5ee18dfcaf9264455 |
17-Oct-2012 |
John Hoford <hoford@google.com> |
am b24a86bf: am 7bc0a525: am 3038d014: add support for configurable slider ranges * commit 'b24a86bfe40a4e9df5a29273d1398709b1a8135c': add support for configurable slider ranges
|
b24a86bfe40a4e9df5a29273d1398709b1a8135c |
17-Oct-2012 |
John Hoford <hoford@google.com> |
am 7bc0a525: am 3038d014: add support for configurable slider ranges * commit '7bc0a525eb2f7049a265bbf861090bd55fc7de95': add support for configurable slider ranges
|
b723daa1e4adb1fd64cd5655fc71c6c32d42daa1 |
17-Oct-2012 |
John Hoford <hoford@google.com> |
am 3038d014: add support for configurable slider ranges * commit '3038d014b7ade998d1820c997242b9d9d8bc7ccf': add support for configurable slider ranges
|
4d53ca3531b5f2345b4bba38863e18b8eaa1c791 |
17-Oct-2012 |
John Hoford <hoford@google.com> |
am 3038d014: add support for configurable slider ranges * commit '3038d014b7ade998d1820c997242b9d9d8bc7ccf': add support for configurable slider ranges
|
38b7bf4718f7fccc6fa4cc0cc67125fe976c028e |
17-Oct-2012 |
John Hoford <hoford@google.com> |
am 3038d014: add support for configurable slider ranges * commit '3038d014b7ade998d1820c997242b9d9d8bc7ccf': add support for configurable slider ranges
|
7bc0a525eb2f7049a265bbf861090bd55fc7de95 |
17-Oct-2012 |
John Hoford <hoford@google.com> |
am 3038d014: add support for configurable slider ranges * commit '3038d014b7ade998d1820c997242b9d9d8bc7ccf': add support for configurable slider ranges
|
82d8fd24ee1ca7ebf13711a620bf09cc8089dda8 |
17-Oct-2012 |
John Hoford <hoford@google.com> |
add support for configurable slider ranges bug:7293391 Change-Id: Ie4984ce85387bf4d7a0a38e318eb20f6802ffc96
es/values/strings.xml
|
3038d014b7ade998d1820c997242b9d9d8bc7ccf |
17-Oct-2012 |
John Hoford <hoford@google.com> |
add support for configurable slider ranges bug:7293391 Change-Id: Ie4984ce85387bf4d7a0a38e318eb20f6802ffc96
es/values/strings.xml
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/filters/ImageFilter.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterFx.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterHue.java
rc/com/android/gallery3d/filtershow/imageshow/ImageShow.java
|
7fc37252be8d12de906a9c68224f553f80c8ef52 |
17-Oct-2012 |
John Hoford <hoford@google.com> |
add support for configurable slider ranges bug:7293391 Change-Id: Ie4984ce85387bf4d7a0a38e318eb20f6802ffc96
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/filters/ImageFilter.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterFx.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterHue.java
rc/com/android/gallery3d/filtershow/imageshow/ImageShow.java
|
24dccdf90d2a7dc3d853229a55880af784ebdae6 |
17-Oct-2012 |
Nicolas Roard <nicolasroard@google.com> |
am 9e65e034: am 509d69b4: am ad3f626c: am 34c807c8: Merge "Added fixed aspect ratio support for cropping." into gb-ub-photos-arches * commit '9e65e034b2230e985a744d1ee2627dab6f43ae86': Added fixed aspect ratio support for cropping.
|
d61602e79b0753fb56b8b2b9151b2db32b161ba0 |
17-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am 643655aa: am de210758: am 2f54ad4c: am 178a1c11: Fixed flip (mirror) orientation. * commit '643655aaf947f119aced2f59d31faca02003576f': Fixed flip (mirror) orientation.
|
9e65e034b2230e985a744d1ee2627dab6f43ae86 |
17-Oct-2012 |
Nicolas Roard <nicolasroard@google.com> |
am 509d69b4: am ad3f626c: am 34c807c8: Merge "Added fixed aspect ratio support for cropping." into gb-ub-photos-arches * commit '509d69b48e64af933c609ca666257e39c3718d75': Added fixed aspect ratio support for cropping.
|
643655aaf947f119aced2f59d31faca02003576f |
17-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am de210758: am 2f54ad4c: am 178a1c11: Fixed flip (mirror) orientation. * commit 'de210758c7f22b81927dc2c48b0c71a07f0bd5b2': Fixed flip (mirror) orientation.
|
509d69b48e64af933c609ca666257e39c3718d75 |
17-Oct-2012 |
Nicolas Roard <nicolasroard@google.com> |
am ad3f626c: am 34c807c8: Merge "Added fixed aspect ratio support for cropping." into gb-ub-photos-arches * commit 'ad3f626c5e58a5555efa78f15f820d7fc598b893': Added fixed aspect ratio support for cropping.
|
de210758c7f22b81927dc2c48b0c71a07f0bd5b2 |
17-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am 2f54ad4c: am 178a1c11: Fixed flip (mirror) orientation. * commit '2f54ad4cc5c7cf04c708aa249a3147ea154132fa': Fixed flip (mirror) orientation.
|
6ed14aa947d3048ba08d9c2c72a8a221a9efa004 |
17-Oct-2012 |
Nicolas Roard <nicolasroard@google.com> |
am 34c807c8: Merge "Added fixed aspect ratio support for cropping." into gb-ub-photos-arches * commit '34c807c8d89f9bfa9565ab52746d845acfb714fd': Added fixed aspect ratio support for cropping.
|
3df689e3ccd218a0e8c4d518f6b7b5edf78dfe0c |
17-Oct-2012 |
Nicolas Roard <nicolasroard@google.com> |
am 34c807c8: Merge "Added fixed aspect ratio support for cropping." into gb-ub-photos-arches * commit '34c807c8d89f9bfa9565ab52746d845acfb714fd': Added fixed aspect ratio support for cropping.
|
7ee5becf50b7b3816a0de72c59b22d3a7e92f4d4 |
17-Oct-2012 |
Nicolas Roard <nicolasroard@google.com> |
am 34c807c8: Merge "Added fixed aspect ratio support for cropping." into gb-ub-photos-arches * commit '34c807c8d89f9bfa9565ab52746d845acfb714fd': Added fixed aspect ratio support for cropping.
|
767d79faf2b52d885b1ea9c4672ee0fa4a01dc76 |
17-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am 178a1c11: Fixed flip (mirror) orientation. * commit '178a1c115552a22526fb3a263a01c3cc66300328': Fixed flip (mirror) orientation.
|
36e2c62408eb9529e7c0db086508cd37efab3a3f |
17-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am 178a1c11: Fixed flip (mirror) orientation. * commit '178a1c115552a22526fb3a263a01c3cc66300328': Fixed flip (mirror) orientation.
|
ad3f626c5e58a5555efa78f15f820d7fc598b893 |
17-Oct-2012 |
Nicolas Roard <nicolasroard@google.com> |
am 34c807c8: Merge "Added fixed aspect ratio support for cropping." into gb-ub-photos-arches * commit '34c807c8d89f9bfa9565ab52746d845acfb714fd': Added fixed aspect ratio support for cropping.
|
2f54ad4cc5c7cf04c708aa249a3147ea154132fa |
17-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am 178a1c11: Fixed flip (mirror) orientation. * commit '178a1c115552a22526fb3a263a01c3cc66300328': Fixed flip (mirror) orientation.
|
d19b431d6d374ad981f7a3bd076e82eb155c41e6 |
17-Oct-2012 |
Nicolas Roard <nicolasroard@google.com> |
Merge "Added fixed aspect ratio support for cropping." into gb-ub-photos-arches
|
34c807c8d89f9bfa9565ab52746d845acfb714fd |
17-Oct-2012 |
Nicolas Roard <nicolasroard@google.com> |
Merge "Added fixed aspect ratio support for cropping." into gb-ub-photos-arches
|
482038206b6677816b7030c3dbbc2a61ad2c9a84 |
17-Oct-2012 |
Nicolas Roard <nicolasroard@google.com> |
Merge "Added fixed aspect ratio support for cropping." into gb-ub-photos-arches
|
18dc039c56adf971beb29147eef6af37cef3b327 |
17-Oct-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
924146128735eab43340c293fdd77d1af3efe436 |
17-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Fixed flip (mirror) orientation. Bug: 7342859 Change-Id: Ic9508927738f64e82e1bd078461b6ee1e1892300
rc/com/android/gallery3d/filtershow/imageshow/ImageFlip.java
|
178a1c115552a22526fb3a263a01c3cc66300328 |
17-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Fixed flip (mirror) orientation. Bug: 7342859 Change-Id: Ic9508927738f64e82e1bd078461b6ee1e1892300
rc/com/android/gallery3d/filtershow/imageshow/ImageFlip.java
|
bfe83feadfdc9d1419639d412a777d5d41614da7 |
17-Oct-2012 |
Hung-ying Tyan <tyanh@google.com> |
am 95fff17e: am 1a477cf5: am 8a3a0003: am a69a86d5: Merge "Add permission to GalleryProvider." into gb-ub-photos-arches * commit '95fff17e8729e89c419384627041bbfef96ac8f4': Add permission to GalleryProvider.
|
95fff17e8729e89c419384627041bbfef96ac8f4 |
17-Oct-2012 |
Hung-ying Tyan <tyanh@google.com> |
am 1a477cf5: am 8a3a0003: am a69a86d5: Merge "Add permission to GalleryProvider." into gb-ub-photos-arches * commit '1a477cf5f40d85799f13437e65d0d95cb117be35': Add permission to GalleryProvider.
|
1a477cf5f40d85799f13437e65d0d95cb117be35 |
17-Oct-2012 |
Hung-ying Tyan <tyanh@google.com> |
am 8a3a0003: am a69a86d5: Merge "Add permission to GalleryProvider." into gb-ub-photos-arches * commit '8a3a0003b76ded1f0e9430a9c9029b82bca39528': Add permission to GalleryProvider.
|
ab1e15497b8e74086aa285e65722647f36b583ea |
17-Oct-2012 |
Hung-ying Tyan <tyanh@google.com> |
am a69a86d5: Merge "Add permission to GalleryProvider." into gb-ub-photos-arches * commit 'a69a86d5541a9e10e23f0a034cdf6e4416495221': Add permission to GalleryProvider.
|
786b545019145ff4e4bafc45e281ced11c3d0960 |
17-Oct-2012 |
Hung-ying Tyan <tyanh@google.com> |
am a69a86d5: Merge "Add permission to GalleryProvider." into gb-ub-photos-arches * commit 'a69a86d5541a9e10e23f0a034cdf6e4416495221': Add permission to GalleryProvider.
|
8a3a0003b76ded1f0e9430a9c9029b82bca39528 |
17-Oct-2012 |
Hung-ying Tyan <tyanh@google.com> |
am a69a86d5: Merge "Add permission to GalleryProvider." into gb-ub-photos-arches * commit 'a69a86d5541a9e10e23f0a034cdf6e4416495221': Add permission to GalleryProvider.
|
f52c1e102bb6510399509e0df335fcc13a98b9ae |
17-Oct-2012 |
Hung-ying Tyan <tyanh@google.com> |
Merge "Add permission to GalleryProvider." into gb-ub-photos-arches
|
a69a86d5541a9e10e23f0a034cdf6e4416495221 |
17-Oct-2012 |
Hung-ying Tyan <tyanh@google.com> |
Merge "Add permission to GalleryProvider." into gb-ub-photos-arches
|
58fb8e9280d4446451108270fd78b0afa81e1089 |
17-Oct-2012 |
Hung-ying Tyan <tyanh@google.com> |
Merge "Read exif test images from the external storage of the test package" into gb-ub-photos-bryce
|
89e81e68bd8d5db2feaae833b5c7c20a7480ab48 |
17-Oct-2012 |
Hung-ying Tyan <tyanh@google.com> |
Merge "Read exif test images from the external storage of the test package" into gb-ub-photos-bryce
|
cdd116de25c9a9cc14704cb7348077ed99c7ade9 |
10-Oct-2012 |
Earl Ou <shunhsingou@google.com> |
Read exif test images from the external storage of the test package We can now add more exif test images under the application's private Pictures directory, and put their corresponding xml files under Xml directory. The tests will try to load them and use them as a testcase. Change-Id: I2bc82bb7703e3a4516d1bc433ac5fabed2080987
ests/src/com/android/gallery3d/exif/ExifOutputStreamTest.java
ests/src/com/android/gallery3d/exif/ExifParserTest.java
ests/src/com/android/gallery3d/exif/ExifReaderTest.java
ests/src/com/android/gallery3d/exif/ExifTestRunner.java
ests/src/com/android/gallery3d/exif/ExifXmlDataTestCase.java
ests/src/com/android/gallery3d/exif/ExifXmlReader.java
|
1bea7baf6e5fd483a75e00d75d25a82c8adb39d9 |
10-Oct-2012 |
Earl Ou <shunhsingou@google.com> |
Read exif test images from the external storage of the test package We can now add more exif test images under the application's private Pictures directory, and put their corresponding xml files under Xml directory. The tests will try to load them and use them as a testcase. Change-Id: I2bc82bb7703e3a4516d1bc433ac5fabed2080987
ests/src/com/android/gallery3d/exif/ExifOutputStreamTest.java
ests/src/com/android/gallery3d/exif/ExifParserTest.java
ests/src/com/android/gallery3d/exif/ExifReaderTest.java
ests/src/com/android/gallery3d/exif/ExifTestRunner.java
ests/src/com/android/gallery3d/exif/ExifXmlDataTestCase.java
ests/src/com/android/gallery3d/exif/ExifXmlReader.java
|
67dbfedc1ecb6e978bacddb0dde67beff5510c5a |
17-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 1ef417cc: am 4b41aacd: am ac351f47: am a88bd1ca: Merge "Update empty placeholder asset" into gb-ub-photos-arches * commit '1ef417ccf6a643c30f1e075a0c23ac6126a50695': Update empty placeholder asset
|
1ef417ccf6a643c30f1e075a0c23ac6126a50695 |
17-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 4b41aacd: am ac351f47: am a88bd1ca: Merge "Update empty placeholder asset" into gb-ub-photos-arches * commit '4b41aacdffc17877f742195ff6203ae6c4ef50d1': Update empty placeholder asset
|
4b41aacdffc17877f742195ff6203ae6c4ef50d1 |
17-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am ac351f47: am a88bd1ca: Merge "Update empty placeholder asset" into gb-ub-photos-arches * commit 'ac351f4797d4c64cb8a06bb148cde328543d328c': Update empty placeholder asset
|
5c2842bfb7b26afc4637277ff0aa3e0c7827cc41 |
17-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am a88bd1ca: Merge "Update empty placeholder asset" into gb-ub-photos-arches * commit 'a88bd1ca15dd7eafe4b018ef385097eabca18872': Update empty placeholder asset
|
ac351f4797d4c64cb8a06bb148cde328543d328c |
17-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am a88bd1ca: Merge "Update empty placeholder asset" into gb-ub-photos-arches * commit 'a88bd1ca15dd7eafe4b018ef385097eabca18872': Update empty placeholder asset
|
decf20d88726b828fe1d41c65913485623d716f7 |
17-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am a88bd1ca: Merge "Update empty placeholder asset" into gb-ub-photos-arches * commit 'a88bd1ca15dd7eafe4b018ef385097eabca18872': Update empty placeholder asset
|
09fc5abdd1da2632d0e2969f79b89009cf13ac3e |
17-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am a88bd1ca: Merge "Update empty placeholder asset" into gb-ub-photos-arches * commit 'a88bd1ca15dd7eafe4b018ef385097eabca18872': Update empty placeholder asset
|
63209dcb6bd21d6c1bf3936bc4a3f04302ec9f42 |
17-Oct-2012 |
Earl Ou <shunhsingou@google.com> |
Do not use parentheses for Model tag in exiftool parser Change-Id: Idc45cd389976f0c474dceb550790a6814cb380b8
ests/exiftool_parser/parser.py
|
144dc616219e088680c267ae6a0463364b33c41d |
17-Oct-2012 |
Earl Ou <shunhsingou@google.com> |
Do not use parentheses for Model tag in exiftool parser Change-Id: Idc45cd389976f0c474dceb550790a6814cb380b8
ests/exiftool_parser/parser.py
|
d171d51ea1c84f3e3ac3e781a78174cc92e180cf |
17-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Update empty placeholder asset" into gb-ub-photos-arches
|
85ff828f443f176c3ae3d6677cd6433e8abf59e5 |
17-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Update empty placeholder asset" into gb-ub-photos-arches
|
a88bd1ca15dd7eafe4b018ef385097eabca18872 |
17-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Update empty placeholder asset" into gb-ub-photos-arches
|
fe625335e1639731c49c9b957d10652b3cb83556 |
17-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Update empty placeholder asset Bug: 7362100 Change-Id: I521c1c481a00959bb50d17fee3be6981be84a269
es/drawable-hdpi/placeholder_empty.png
es/drawable-mdpi/placeholder_empty.png
es/drawable-xhdpi/placeholder_empty.png
|
dfd18bf09fcc3b6a7d06a8752641244e1a26ac84 |
17-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Update empty placeholder asset Bug: 7362100 Change-Id: I521c1c481a00959bb50d17fee3be6981be84a269
rc/com/android/gallery3d/data/EmptyAlbumImage.java
|
856ab5b77b39e4acf454a957f08eba7cc86ae0fc |
17-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Update empty placeholder asset Bug: 7362100 Change-Id: I521c1c481a00959bb50d17fee3be6981be84a269
es/drawable-hdpi/placeholder_empty.png
es/drawable-mdpi/placeholder_empty.png
es/drawable-xhdpi/placeholder_empty.png
rc/com/android/gallery3d/data/EmptyAlbumImage.java
|
9eeed0cdd447b878fca2e34d8dfc76aec5f342f6 |
17-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am b35c7177: am 79c67db9: am c57afc77: am a05bf471: Merge "Update Camera album overlay icon asset" into gb-ub-photos-arches * commit 'b35c717797bfe9d055f96d841991f3afd50aa29b': Update Camera album overlay icon asset
|
b35c717797bfe9d055f96d841991f3afd50aa29b |
17-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 79c67db9: am c57afc77: am a05bf471: Merge "Update Camera album overlay icon asset" into gb-ub-photos-arches * commit '79c67db97635f948a0ef816886b6749cb9810de4': Update Camera album overlay icon asset
|
79c67db97635f948a0ef816886b6749cb9810de4 |
17-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am c57afc77: am a05bf471: Merge "Update Camera album overlay icon asset" into gb-ub-photos-arches * commit 'c57afc77217dda77c6024ae7892a8e736219b2e5': Update Camera album overlay icon asset
|
c57afc77217dda77c6024ae7892a8e736219b2e5 |
17-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am a05bf471: Merge "Update Camera album overlay icon asset" into gb-ub-photos-arches * commit 'a05bf4719abc1b16c997b2012b14fc3d4d4d0c20': Update Camera album overlay icon asset
|
a65cc934d371bc2ddb30e85b23be92e60e17180a |
17-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am a05bf471: Merge "Update Camera album overlay icon asset" into gb-ub-photos-arches * commit 'a05bf4719abc1b16c997b2012b14fc3d4d4d0c20': Update Camera album overlay icon asset
|
b3e7f5fd17a4b0f5db2f7e7578b1ee2ce4333008 |
17-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am a05bf471: Merge "Update Camera album overlay icon asset" into gb-ub-photos-arches * commit 'a05bf4719abc1b16c997b2012b14fc3d4d4d0c20': Update Camera album overlay icon asset
|
5b083ee2cd16740f16ef0345d30aa1b697801c58 |
17-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am a05bf471: Merge "Update Camera album overlay icon asset" into gb-ub-photos-arches * commit 'a05bf4719abc1b16c997b2012b14fc3d4d4d0c20': Update Camera album overlay icon asset
|
389b170bb058f2c014aeee08b23aae5ce69c7eeb |
17-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Update Camera album overlay icon asset" into gb-ub-photos-arches
|
a05bf4719abc1b16c997b2012b14fc3d4d4d0c20 |
17-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Update Camera album overlay icon asset" into gb-ub-photos-arches
|
ed3566c74cf67f45f4384e13e8973fe197ef3548 |
17-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Update Camera album overlay icon asset Bug: 7332688 Change-Id: Id7ada222551187787c4e3b50f52dcdc5c6c70929
rc/com/android/gallery3d/ui/AlbumSetSlotRenderer.java
|
52d322b61070d149cedbff07960807f26478c954 |
17-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Update Camera album overlay icon asset Bug: 7332688 Change-Id: Id7ada222551187787c4e3b50f52dcdc5c6c70929
es/drawable-hdpi/ic_cameraalbum_overlay.png
es/drawable-mdpi/ic_cameraalbum_overlay.png
es/drawable-xhdpi/ic_cameraalbum_overlay.png
|
1f7c5d1e683b369225ec812ed0c45c7fa3d42b96 |
17-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Update Camera album overlay icon asset Bug: 7332688 Change-Id: Id7ada222551187787c4e3b50f52dcdc5c6c70929
es/drawable-hdpi/ic_cameraalbum_overlay.png
es/drawable-mdpi/ic_cameraalbum_overlay.png
es/drawable-xhdpi/ic_cameraalbum_overlay.png
rc/com/android/gallery3d/ui/AlbumSetSlotRenderer.java
|
174cdf284d8e9114473599f5277fdc90b8a4b047 |
17-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am fb24ec1c: am e712c77c: am f99791bf: am e20cc0cb: Add blue highlight when tapping 360 panorama button * commit 'fb24ec1c57267427e48bd659bcc105850d00ada1': Add blue highlight when tapping 360 panorama button
|
fb24ec1c57267427e48bd659bcc105850d00ada1 |
17-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am e712c77c: am f99791bf: am e20cc0cb: Add blue highlight when tapping 360 panorama button * commit 'e712c77cac61d1ce1b436ba67194fbb7c8c6b2c5': Add blue highlight when tapping 360 panorama button
|
e712c77cac61d1ce1b436ba67194fbb7c8c6b2c5 |
17-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am f99791bf: am e20cc0cb: Add blue highlight when tapping 360 panorama button * commit 'f99791bfd95784c97f00d61aea4cfc0e98a779a8': Add blue highlight when tapping 360 panorama button
|
f99791bfd95784c97f00d61aea4cfc0e98a779a8 |
17-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am e20cc0cb: Add blue highlight when tapping 360 panorama button * commit 'e20cc0cb9f21236342c7bdfa2ffbf66ea8036b1d': Add blue highlight when tapping 360 panorama button
|
291d5fe7c9b262a5e0c83ca9d164d1ed85b2e44e |
17-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am e20cc0cb: Add blue highlight when tapping 360 panorama button * commit 'e20cc0cb9f21236342c7bdfa2ffbf66ea8036b1d': Add blue highlight when tapping 360 panorama button
|
6587971c34fc4aa552c854673a51354d16d4d746 |
17-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am e20cc0cb: Add blue highlight when tapping 360 panorama button * commit 'e20cc0cb9f21236342c7bdfa2ffbf66ea8036b1d': Add blue highlight when tapping 360 panorama button
|
5d64c7d02736aaff280f77b090775576f39c0342 |
16-Oct-2012 |
Owen Lin <owenlin@google.com> |
Add permission to GalleryProvider. bug: 7202384 Change-Id: I1a13ed7e480163c898cf376219953b321290d4d4
ndroidManifest.xml
|
f36e53f7c59380670327a600b2766b3b42edbc2c |
16-Oct-2012 |
Owen Lin <owenlin@google.com> |
Add permission to GalleryProvider. bug: 7202384 Change-Id: I1a13ed7e480163c898cf376219953b321290d4d4
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/ui/ActionModeHandler.java
|
ca181a68a30ad830d55eb8886f62a323c64e1ba3 |
16-Oct-2012 |
Owen Lin <owenlin@google.com> |
Add permission to GalleryProvider. bug: 7202384 Change-Id: I1a13ed7e480163c898cf376219953b321290d4d4
ndroidManifest.xml
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/ui/ActionModeHandler.java
|
097b6014918a2ebf6f92241ac0d08f760883d90b |
16-Oct-2012 |
Earl Ou <shunhsingou@google.com> |
Parse the layer of exiftool output Change-Id: I0ee45608126d49913a96790f2c2e99ec66ccbca4
ests/exiftool_parser/parser.py
|
030bf17cb3792e9f9e0492e0d0e24f6cb819c7e0 |
16-Oct-2012 |
Earl Ou <shunhsingou@google.com> |
Parse the layer of exiftool output Change-Id: I0ee45608126d49913a96790f2c2e99ec66ccbca4
ests/exiftool_parser/parser.py
|
8f8cf32a98e24082935419744fffbe88cfec4ac6 |
17-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Add blue highlight when tapping 360 panorama button Bug: 7336676 Change-Id: If16e5aacf1102d0bd7de7ce5d6c90efae4c786f7
es/drawable/transparent_button_background.xml
es/layout/photopage_bottom_controls.xml
|
e20cc0cb9f21236342c7bdfa2ffbf66ea8036b1d |
17-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Add blue highlight when tapping 360 panorama button Bug: 7336676 Change-Id: If16e5aacf1102d0bd7de7ce5d6c90efae4c786f7
es/drawable/transparent_button_background.xml
es/layout/photopage_bottom_controls.xml
|
6e4851078c4a8f6afe03d18ae4d0bee776a42c6b |
17-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am a647f926: am 02ccea8f: am 46720ce0: am 74d5dfd6: Merge "Consistent animations & up button behavior in Gallery" into gb-ub-photos-arches * commit 'a647f926cc3c9c56a6ec9dfb5684a0088d63ff1b': Consistent animations & up button behavior in Gallery
|
b3e3014a4eeb3cc447a28b212c1dcc538e79eef9 |
15-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Added fixed aspect ratio support for cropping. Bug: 7350377 Change-Id: I8110ea999c764de675fe11f586ab9bc7af205f46
es/layout/filtershow_activity.xml
es/values/filtershow_strings.xml
|
0f7dc6ef6e736c0993240450b50b91721c79c43e |
15-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Added fixed aspect ratio support for cropping. Bug: 7350377 Change-Id: I8110ea999c764de675fe11f586ab9bc7af205f46
es/layout/filtershow_activity.xml
es/values/filtershow_strings.xml
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/PanelController.java
rc/com/android/gallery3d/filtershow/imageshow/GeometryMath.java
rc/com/android/gallery3d/filtershow/imageshow/ImageCrop.java
rc/com/android/gallery3d/filtershow/imageshow/ImageGeometry.java
rc/com/android/gallery3d/filtershow/imageshow/ImageRotate.java
rc/com/android/gallery3d/filtershow/imageshow/ImageStraighten.java
rc/com/android/gallery3d/filtershow/ui/ImageButtonTitle.java
|
0225fcd8513803711a3d5647e4927e2d8a9cfe34 |
15-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Added fixed aspect ratio support for cropping. Bug: 7350377 Change-Id: I8110ea999c764de675fe11f586ab9bc7af205f46
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/PanelController.java
rc/com/android/gallery3d/filtershow/imageshow/GeometryMath.java
rc/com/android/gallery3d/filtershow/imageshow/ImageCrop.java
rc/com/android/gallery3d/filtershow/imageshow/ImageGeometry.java
rc/com/android/gallery3d/filtershow/imageshow/ImageRotate.java
rc/com/android/gallery3d/filtershow/imageshow/ImageStraighten.java
rc/com/android/gallery3d/filtershow/ui/ImageButtonTitle.java
|
a647f926cc3c9c56a6ec9dfb5684a0088d63ff1b |
17-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 02ccea8f: am 46720ce0: am 74d5dfd6: Merge "Consistent animations & up button behavior in Gallery" into gb-ub-photos-arches * commit '02ccea8f2047b8e13b88e0db8e95f6286e55513c': Consistent animations & up button behavior in Gallery
|
02ccea8f2047b8e13b88e0db8e95f6286e55513c |
17-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 46720ce0: am 74d5dfd6: Merge "Consistent animations & up button behavior in Gallery" into gb-ub-photos-arches * commit '46720ce03f12b3e168d6da6b9ba2fcaa8cea51b4': Consistent animations & up button behavior in Gallery
|
46720ce03f12b3e168d6da6b9ba2fcaa8cea51b4 |
17-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 74d5dfd6: Merge "Consistent animations & up button behavior in Gallery" into gb-ub-photos-arches * commit '74d5dfd662b92c9ce1aee225291b9d1775cfb49e': Consistent animations & up button behavior in Gallery
|
baeb7e45c948543f75fc5bf5b3c31a190b471a99 |
17-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 74d5dfd6: Merge "Consistent animations & up button behavior in Gallery" into gb-ub-photos-arches * commit '74d5dfd662b92c9ce1aee225291b9d1775cfb49e': Consistent animations & up button behavior in Gallery
|
12ee953925d67ad2f7ffe19af7358f82ce144bee |
17-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 74d5dfd6: Merge "Consistent animations & up button behavior in Gallery" into gb-ub-photos-arches * commit '74d5dfd662b92c9ce1aee225291b9d1775cfb49e': Consistent animations & up button behavior in Gallery
|
2ad7b55cb31487fbfdbd50d60eb3e929cad0b42f |
17-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Consistent animations & up button behavior in Gallery" into gb-ub-photos-arches
|
74d5dfd662b92c9ce1aee225291b9d1775cfb49e |
17-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Consistent animations & up button behavior in Gallery" into gb-ub-photos-arches
|
ad94b4f53173324700345f8037a5cb645c102151 |
17-Oct-2012 |
John Reck <jreck@google.com> |
am 6b8ad786: am 529dceec: am 324a7804: am 2b543897: Merge "Add hook to manipulate SurfaceTexture transform" into gb-ub-photos-arches * commit '6b8ad7863aef17283430f3e2d5b89dca13891524': Add hook to manipulate SurfaceTexture transform
|
6b8ad7863aef17283430f3e2d5b89dca13891524 |
17-Oct-2012 |
John Reck <jreck@google.com> |
am 529dceec: am 324a7804: am 2b543897: Merge "Add hook to manipulate SurfaceTexture transform" into gb-ub-photos-arches * commit '529dceecdbdd8bdd71f8e131c6e61f6f30330a93': Add hook to manipulate SurfaceTexture transform
|
529dceecdbdd8bdd71f8e131c6e61f6f30330a93 |
17-Oct-2012 |
John Reck <jreck@google.com> |
am 324a7804: am 2b543897: Merge "Add hook to manipulate SurfaceTexture transform" into gb-ub-photos-arches * commit '324a7804267c1e7ee34b59bba9f0a6df2354d4c5': Add hook to manipulate SurfaceTexture transform
|
324a7804267c1e7ee34b59bba9f0a6df2354d4c5 |
17-Oct-2012 |
John Reck <jreck@google.com> |
am 2b543897: Merge "Add hook to manipulate SurfaceTexture transform" into gb-ub-photos-arches * commit '2b543897e077ee4803fa60b6fd7a6a604835b0b3': Add hook to manipulate SurfaceTexture transform
|
2d902cd89495d8a874595a448f95cf2d9039084f |
17-Oct-2012 |
John Reck <jreck@google.com> |
am 2b543897: Merge "Add hook to manipulate SurfaceTexture transform" into gb-ub-photos-arches * commit '2b543897e077ee4803fa60b6fd7a6a604835b0b3': Add hook to manipulate SurfaceTexture transform
|
cd6751777186c359d6a3b7175f06979a158d1bd6 |
17-Oct-2012 |
John Reck <jreck@google.com> |
am 2b543897: Merge "Add hook to manipulate SurfaceTexture transform" into gb-ub-photos-arches * commit '2b543897e077ee4803fa60b6fd7a6a604835b0b3': Add hook to manipulate SurfaceTexture transform
|
488ef8a9eb4d6ac7efd070956058d5ce6a1c3f89 |
17-Oct-2012 |
John Reck <jreck@google.com> |
Merge "Add hook to manipulate SurfaceTexture transform" into gb-ub-photos-arches
|
2b543897e077ee4803fa60b6fd7a6a604835b0b3 |
17-Oct-2012 |
John Reck <jreck@google.com> |
Merge "Add hook to manipulate SurfaceTexture transform" into gb-ub-photos-arches
|
4d16deb140c0a09c3099e3676553c5dc9a2f12d5 |
17-Oct-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
1aa9974c1fa79ffa587fb53756a886aab6aa08e2 |
17-Oct-2012 |
John Reck <jreck@google.com> |
Add hook to manipulate SurfaceTexture transform Bug: 7302956 Change-Id: I32bdeb22630dbeba9f028e1c68167d10a5288a28
allerycommon/src/com/android/gallery3d/common/Utils.java
|
2a9a6b53fb4a07b27773ee31171f441bc8aa08b3 |
17-Oct-2012 |
John Reck <jreck@google.com> |
Add hook to manipulate SurfaceTexture transform Bug: 7302956 Change-Id: I32bdeb22630dbeba9f028e1c68167d10a5288a28
allerycommon/src/com/android/gallery3d/common/Utils.java
rc/com/android/gallery3d/ui/SurfaceTextureScreenNail.java
|
4ce48412b86ac28042bf70e4cbe051ffc3dd489d |
17-Oct-2012 |
John Reck <jreck@google.com> |
Add hook to manipulate SurfaceTexture transform Bug: 7302956 Change-Id: I32bdeb22630dbeba9f028e1c68167d10a5288a28
allerycommon/src/com/android/gallery3d/common/Utils.java
rc/com/android/gallery3d/ui/SurfaceTextureScreenNail.java
|
641b838e49a445592b17e56b11374d92f99789f2 |
15-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Consistent animations & up button behavior in Gallery Bug: 7302857 Bug: 7295464 This CL makes all of the transition animations throughout the Gallery app consistent. The animation is the previous view shrinking and fading out while the new view starts out bigger than the view port and is coming in to the viewport size as it fades in. Having consistent animations allows us to not keep PhotoPage/AlbumPage instances around in certain cases, making it possible to have consistent up button behavior when switching between the grid and filmstrip. Finally, this also makes the transitions in the camera app filmstrip/grid switching consistent with those in the gallery app. Change-Id: I77bac6a0cde1e439738c78f9e16ab15ed5910cfb
rc/com/android/gallery3d/anim/StateTransitionAnimation.java
rc/com/android/gallery3d/app/ActivityState.java
rc/com/android/gallery3d/app/AlbumPage.java
rc/com/android/gallery3d/app/AlbumSetPage.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/app/StateManager.java
rc/com/android/gallery3d/ui/GLView.java
rc/com/android/gallery3d/ui/PositionController.java
rc/com/android/gallery3d/ui/PreparePageFadeoutTexture.java
|
5585826e68c62c3719fb346d40fd1999438c6c6b |
15-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Consistent animations & up button behavior in Gallery Bug: 7302857 Bug: 7295464 This CL makes all of the transition animations throughout the Gallery app consistent. The animation is the previous view shrinking and fading out while the new view starts out bigger than the view port and is coming in to the viewport size as it fades in. Having consistent animations allows us to not keep PhotoPage/AlbumPage instances around in certain cases, making it possible to have consistent up button behavior when switching between the grid and filmstrip. Finally, this also makes the transitions in the camera app filmstrip/grid switching consistent with those in the gallery app. Change-Id: I77bac6a0cde1e439738c78f9e16ab15ed5910cfb
rc/com/android/gallery3d/anim/StateTransitionAnimation.java
rc/com/android/gallery3d/app/ActivityState.java
rc/com/android/gallery3d/app/AlbumPage.java
rc/com/android/gallery3d/app/AlbumSetPage.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/app/StateManager.java
rc/com/android/gallery3d/ui/GLView.java
rc/com/android/gallery3d/ui/PositionController.java
rc/com/android/gallery3d/ui/PreparePageFadeoutTexture.java
|
f475fdf05c055f87f9fe5efdbd925eb47af9356c |
17-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 9b718eff: am 3bdbe5ce: am 3dccbdd9: am e34a5a5e: Fix when we cannot load an image * commit '9b718eff312244789500c0e7155a3bbd03381321': Fix when we cannot load an image
|
9b718eff312244789500c0e7155a3bbd03381321 |
17-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 3bdbe5ce: am 3dccbdd9: am e34a5a5e: Fix when we cannot load an image * commit '3bdbe5ce6e1bd16da285a51630ba81778fd4648a': Fix when we cannot load an image
|
3bdbe5ce6e1bd16da285a51630ba81778fd4648a |
17-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 3dccbdd9: am e34a5a5e: Fix when we cannot load an image * commit '3dccbdd985521f3cf02403923373eb3d384f984b': Fix when we cannot load an image
|
4417ca4738d5ef96a7818647ce1e90dc7ec55e85 |
16-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am e34a5a5e: Fix when we cannot load an image * commit 'e34a5a5eaedb870798a5cc7415079d04a6ca42e0': Fix when we cannot load an image
|
08128e2a323a8d222ead74fa3865197f3c09a155 |
16-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am e34a5a5e: Fix when we cannot load an image * commit 'e34a5a5eaedb870798a5cc7415079d04a6ca42e0': Fix when we cannot load an image
|
aa1f6d4714af22d4603cd49ae9397a12b14e9cc5 |
16-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am e34a5a5e: Fix when we cannot load an image * commit 'e34a5a5eaedb870798a5cc7415079d04a6ca42e0': Fix when we cannot load an image
|
3dccbdd985521f3cf02403923373eb3d384f984b |
16-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am e34a5a5e: Fix when we cannot load an image * commit 'e34a5a5eaedb870798a5cc7415079d04a6ca42e0': Fix when we cannot load an image
|
38cf4e044957f7ea45bcd51672eff85650560ed4 |
16-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Fix when we cannot load an image bug:7321636 Change-Id: I82cd603d531a1b743737a7c5b65005d370f2cdb1
es/values/filtershow_strings.xml
|
e34a5a5eaedb870798a5cc7415079d04a6ca42e0 |
16-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Fix when we cannot load an image bug:7321636 Change-Id: I82cd603d531a1b743737a7c5b65005d370f2cdb1
es/values/filtershow_strings.xml
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/cache/ImageLoader.java
|
c057d64b701fc2de9f0d5fec7dbd34779647a442 |
16-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Fix when we cannot load an image bug:7321636 Change-Id: I82cd603d531a1b743737a7c5b65005d370f2cdb1
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/cache/ImageLoader.java
|
0bf8fededee55396bf297d244327eeb5031de72b |
16-Oct-2012 |
John Hoford <hoford@google.com> |
am eb8db6c3: am 56277b25: am 3f89f750: am 20fb632c: prevent original now acts like any other FX filter * commit 'eb8db6c30140b56f039fa80d88e71c154d64dd4a': prevent original now acts like any other FX filter
|
eb8db6c30140b56f039fa80d88e71c154d64dd4a |
16-Oct-2012 |
John Hoford <hoford@google.com> |
am 56277b25: am 3f89f750: am 20fb632c: prevent original now acts like any other FX filter * commit '56277b254ff73d895ae2604b828f88d8d46dd6bf': prevent original now acts like any other FX filter
|
56277b254ff73d895ae2604b828f88d8d46dd6bf |
16-Oct-2012 |
John Hoford <hoford@google.com> |
am 3f89f750: am 20fb632c: prevent original now acts like any other FX filter * commit '3f89f750a76d52fc31544cd693b083293983aebc': prevent original now acts like any other FX filter
|
33570b724f3c8a6f3bd50265831bc32e8254a126 |
16-Oct-2012 |
John Hoford <hoford@google.com> |
am 20fb632c: prevent original now acts like any other FX filter * commit '20fb632c407a2dfb5ec769560c61deacc77b8764': prevent original now acts like any other FX filter
|
4859d567fdd240d5aded9005c0c45fc148b57ecf |
16-Oct-2012 |
John Hoford <hoford@google.com> |
am 20fb632c: prevent original now acts like any other FX filter * commit '20fb632c407a2dfb5ec769560c61deacc77b8764': prevent original now acts like any other FX filter
|
3f89f750a76d52fc31544cd693b083293983aebc |
16-Oct-2012 |
John Hoford <hoford@google.com> |
am 20fb632c: prevent original now acts like any other FX filter * commit '20fb632c407a2dfb5ec769560c61deacc77b8764': prevent original now acts like any other FX filter
|
20fb632c407a2dfb5ec769560c61deacc77b8764 |
16-Oct-2012 |
John Hoford <hoford@google.com> |
prevent original now acts like any other FX filter bug:7353358 Change-Id: Id4efa45ddb8a8a0ca6d201ffc0b45fdd2f3caabf
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterFx.java
|
5a69dcc8de22788cf57425e317337d5017c3673c |
16-Oct-2012 |
John Hoford <hoford@google.com> |
prevent original now acts like any other FX filter bug:7353358 Change-Id: Id4efa45ddb8a8a0ca6d201ffc0b45fdd2f3caabf
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterFx.java
|
51f69c0a3404d259be27637420923f8afeb565e2 |
16-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 75f1a2ea: am aaed1215: am 62f1fa3a: am 374c3c8b: Merge "Fix curves tool" into gb-ub-photos-arches * commit '75f1a2ea12b49446eb89d4f3e626f754303dbe84': Fix curves tool
|
75f1a2ea12b49446eb89d4f3e626f754303dbe84 |
16-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am aaed1215: am 62f1fa3a: am 374c3c8b: Merge "Fix curves tool" into gb-ub-photos-arches * commit 'aaed12153bcd55e78ccbf0eddb898802e667555c': Fix curves tool
|
aaed12153bcd55e78ccbf0eddb898802e667555c |
16-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 62f1fa3a: am 374c3c8b: Merge "Fix curves tool" into gb-ub-photos-arches * commit '62f1fa3a8d1364179acb9216d8c1c4211b2c897d': Fix curves tool
|
43d07fed93a59c565b66b5d123af2bb8dbb86a61 |
16-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 374c3c8b: Merge "Fix curves tool" into gb-ub-photos-arches * commit '374c3c8bac97c149cdfd185b9fd76fbe069ae6db': Fix curves tool
|
fdaf67152225559c8ffb3600b6615600bba1d3f4 |
16-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 374c3c8b: Merge "Fix curves tool" into gb-ub-photos-arches * commit '374c3c8bac97c149cdfd185b9fd76fbe069ae6db': Fix curves tool
|
3015523f705c021997bc41a13ec1279ea4edcf69 |
16-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 374c3c8b: Merge "Fix curves tool" into gb-ub-photos-arches * commit '374c3c8bac97c149cdfd185b9fd76fbe069ae6db': Fix curves tool
|
62f1fa3a8d1364179acb9216d8c1c4211b2c897d |
16-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 374c3c8b: Merge "Fix curves tool" into gb-ub-photos-arches * commit '374c3c8bac97c149cdfd185b9fd76fbe069ae6db': Fix curves tool
|
3ed84942ccf4204769a5e0c4db941f90eb209133 |
16-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Merge "Fix curves tool" into gb-ub-photos-arches
|
374c3c8bac97c149cdfd185b9fd76fbe069ae6db |
16-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Merge "Fix curves tool" into gb-ub-photos-arches
|
9c64bdafa7efaef9eaa7eb9fe7b6207be483bef7 |
16-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Merge "Fix curves tool" into gb-ub-photos-arches
|
ca51847ff110310067cfd964ec7d642c74ba1615 |
16-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Fix curves tool bug:7344301 bug:7328680 bug:7289525 bug:7234239 Change-Id: I78d09dc2b38b11ccb2aac38ceef3acd8041f245e
es/layout/filtershow_activity.xml
|
3992ae6cf1cbb7b57a22d8287c40451558408335 |
16-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Fix curves tool bug:7344301 bug:7328680 bug:7289525 bug:7234239 Change-Id: I78d09dc2b38b11ccb2aac38ceef3acd8041f245e
es/layout/filtershow_activity.xml
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/PanelController.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterCurves.java
rc/com/android/gallery3d/filtershow/ui/ControlPoint.java
rc/com/android/gallery3d/filtershow/ui/ImageCurves.java
rc/com/android/gallery3d/filtershow/ui/Spline.java
|
52186ac38ef5f10babf0f933066294958a28ae26 |
16-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Fix curves tool bug:7344301 bug:7328680 bug:7289525 bug:7234239 Change-Id: I78d09dc2b38b11ccb2aac38ceef3acd8041f245e
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/PanelController.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterCurves.java
rc/com/android/gallery3d/filtershow/ui/ControlPoint.java
rc/com/android/gallery3d/filtershow/ui/ImageCurves.java
rc/com/android/gallery3d/filtershow/ui/Spline.java
|
6b647c616f0b572c2158b6725a304a460d82ba36 |
16-Oct-2012 |
Doris Liu <tianliu@google.com> |
am c032a9fe: am ff685bf3: am 119ea224: am b7a0b092: Make save button in video trimming consistent * commit 'c032a9fe65c4099ccd355c9f5f1a46438b852aab': Make save button in video trimming consistent
|
c032a9fe65c4099ccd355c9f5f1a46438b852aab |
16-Oct-2012 |
Doris Liu <tianliu@google.com> |
am ff685bf3: am 119ea224: am b7a0b092: Make save button in video trimming consistent * commit 'ff685bf38c7af7aa77c69304224fa3f2765ac461': Make save button in video trimming consistent
|
ff685bf38c7af7aa77c69304224fa3f2765ac461 |
16-Oct-2012 |
Doris Liu <tianliu@google.com> |
am 119ea224: am b7a0b092: Make save button in video trimming consistent * commit '119ea224980ebd304ed211c0e65724a7b29fc037': Make save button in video trimming consistent
|
119ea224980ebd304ed211c0e65724a7b29fc037 |
16-Oct-2012 |
Doris Liu <tianliu@google.com> |
am b7a0b092: Make save button in video trimming consistent * commit 'b7a0b0926258acc67c9d447c880b9ae8be96333d': Make save button in video trimming consistent
|
6a3afd1e6de56605e74eaea8c9c069d180a1abdd |
16-Oct-2012 |
Doris Liu <tianliu@google.com> |
am b7a0b092: Make save button in video trimming consistent * commit 'b7a0b0926258acc67c9d447c880b9ae8be96333d': Make save button in video trimming consistent
|
655a8001a89a2399cd28fe05d6080752de9f2678 |
16-Oct-2012 |
Doris Liu <tianliu@google.com> |
am b7a0b092: Make save button in video trimming consistent * commit 'b7a0b0926258acc67c9d447c880b9ae8be96333d': Make save button in video trimming consistent
|
a21d3a9c4f6e69894830c445a2c967456580840d |
16-Oct-2012 |
Doris Liu <tianliu@google.com> |
am b7a0b092: Make save button in video trimming consistent * commit 'b7a0b0926258acc67c9d447c880b9ae8be96333d': Make save button in video trimming consistent
|
533763a705f315a9a58c42caccba1dc92afedcaa |
16-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I3ce7caa0daea9e4847853f8e3c934fba9310c7a4 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
2acc5dc0bfac2c30d2bbe25d657dc55c3f9057e1 |
16-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ib290013dc1dd9b78f91367c34b3dfad5468b7b5c Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
16f117fad6e93c533b4fd9255bf207a50b305981 |
16-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Id3604ffde1307c1b3a10f1fdf97d530cdd398999 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
60d16cce6bafd07bfd18e8e3eab70b15feade329 |
16-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I211ecc3a8acdc701586d292e3514fc8f16447a16 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
d132dfec3d69b1bc592ae935e66ace4ad6191ac7 |
16-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I211ecc3a8acdc701586d292e3514fc8f16447a16 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
1b37bfd87b049a025fa6aa5b785d1631bc75fc60 |
16-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Iadc128bed94569d815e6071a74fc35493a6525bb Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
be7bd19b78ac78b139df68e1ad9d5c36af4fa4c4 |
16-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Iadc128bed94569d815e6071a74fc35493a6525bb Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
7af9fac4296da9e93a730671425cf55ff2232bbc |
16-Oct-2012 |
Doris Liu <tianliu@google.com> |
Make save button in video trimming consistent Bug: 7353884 Updated save button icon and text Save button in video trimming now acts like back button when no change has been made. Change-Id: Iec29315222d3f3ffac9b96a89cad2821d7f86c4f
es/layout/trim_menu.xml
es/values/strings.xml
|
b7a0b0926258acc67c9d447c880b9ae8be96333d |
16-Oct-2012 |
Doris Liu <tianliu@google.com> |
Make save button in video trimming consistent Bug: 7353884 Updated save button icon and text Save button in video trimming now acts like back button when no change has been made. Change-Id: Iec29315222d3f3ffac9b96a89cad2821d7f86c4f
es/layout/trim_menu.xml
es/values/strings.xml
rc/com/android/gallery3d/app/TrimVideo.java
|
f142ca3c6beee3fa69007431a1fe87e665207377 |
16-Oct-2012 |
Doris Liu <tianliu@google.com> |
Make save button in video trimming consistent Bug: 7353884 Updated save button icon and text Save button in video trimming now acts like back button when no change has been made. Change-Id: Iec29315222d3f3ffac9b96a89cad2821d7f86c4f
rc/com/android/gallery3d/app/TrimVideo.java
|
4d5d38262c315b97a884e9232f1c8d1ed054c715 |
16-Oct-2012 |
Doris Liu <tianliu@google.com> |
am 90641fc4: am d591e618: am 48bb7c06: am ea3c037a: Merge "Update save button in photo editor" into gb-ub-photos-arches * commit '90641fc4fb4596ff7b555c43fa7af40fe5c2f1b2': Update save button in photo editor
|
90641fc4fb4596ff7b555c43fa7af40fe5c2f1b2 |
16-Oct-2012 |
Doris Liu <tianliu@google.com> |
am d591e618: am 48bb7c06: am ea3c037a: Merge "Update save button in photo editor" into gb-ub-photos-arches * commit 'd591e618511288c6fbaca6f702bd93c768b2a0db': Update save button in photo editor
|
d591e618511288c6fbaca6f702bd93c768b2a0db |
16-Oct-2012 |
Doris Liu <tianliu@google.com> |
am 48bb7c06: am ea3c037a: Merge "Update save button in photo editor" into gb-ub-photos-arches * commit '48bb7c06f4289a83870cb81e5290dafd8b4a1c90': Update save button in photo editor
|
e56b51b0605d693cc69e57df79859f2b5bc18eae |
16-Oct-2012 |
John Reck <jreck@google.com> |
Fix build Change-Id: Ic7bb61c463d237f9ee5fabc8e7f7325ecf1da43c
ests/src/com/android/gallery3d/ui/GLRootMock.java
ests/src/com/android/gallery3d/ui/GLRootStub.java
|
48bb7c06f4289a83870cb81e5290dafd8b4a1c90 |
16-Oct-2012 |
Doris Liu <tianliu@google.com> |
am ea3c037a: Merge "Update save button in photo editor" into gb-ub-photos-arches * commit 'ea3c037a82c31734bcea1f5c74da5904882df193': Update save button in photo editor
|
d7af323fe32145c4a57cb495b393e09f497949d9 |
16-Oct-2012 |
Doris Liu <tianliu@google.com> |
am ea3c037a: Merge "Update save button in photo editor" into gb-ub-photos-arches * commit 'ea3c037a82c31734bcea1f5c74da5904882df193': Update save button in photo editor
|
f475a507955cf36e1d22380679dd31e306e878b6 |
16-Oct-2012 |
Doris Liu <tianliu@google.com> |
am ea3c037a: Merge "Update save button in photo editor" into gb-ub-photos-arches * commit 'ea3c037a82c31734bcea1f5c74da5904882df193': Update save button in photo editor
|
d95752a0405adef64b627c07ec7fb3e52689c7c7 |
16-Oct-2012 |
John Reck <jreck@google.com> |
Fix SRI Pano orientation Bug: 7345511 Change-Id: I9a06f03b67ba820b86520588415ff3ab16f05829
rc/com/android/gallery3d/ui/GLRoot.java
rc/com/android/gallery3d/ui/PhotoView.java
|
cc9ab9977f01651bbfc7a43e39c3f950f4722982 |
16-Oct-2012 |
Doris Liu <tianliu@google.com> |
Merge "Update save button in photo editor" into gb-ub-photos-arches
|
ea3c037a82c31734bcea1f5c74da5904882df193 |
16-Oct-2012 |
Doris Liu <tianliu@google.com> |
Merge "Update save button in photo editor" into gb-ub-photos-arches
|
f4b33414832386cb0f8afcded431c31b7c2e8691 |
16-Oct-2012 |
Doris Liu <tianliu@google.com> |
Update save button in photo editor Bug: 7346315 Change-Id: I64e663b3a12c19db280855282722883f6866176e
es/layout/filtershow_actionbar.xml
|
a13bb24158a536b5825a7681c05e6fb419295967 |
16-Oct-2012 |
Doris Liu <tianliu@google.com> |
Update save button in photo editor Bug: 7346315 Change-Id: I64e663b3a12c19db280855282722883f6866176e
es/layout/filtershow_actionbar.xml
|
c5a175128e6b722bc829863ccb0f9a169a3d7df9 |
16-Oct-2012 |
John Hoford <hoford@google.com> |
am 068b2eb2: am cc8a4ca8: am 85f2f5ee: am b9c316af: Merge "filters now support orientation" into gb-ub-photos-arches * commit '068b2eb221ae077d12da5d92324f391efea12199': filters now support orientation
|
068b2eb221ae077d12da5d92324f391efea12199 |
16-Oct-2012 |
John Hoford <hoford@google.com> |
am cc8a4ca8: am 85f2f5ee: am b9c316af: Merge "filters now support orientation" into gb-ub-photos-arches * commit 'cc8a4ca82421318f6d288b89788aa1c61c154d61': filters now support orientation
|
cc8a4ca82421318f6d288b89788aa1c61c154d61 |
16-Oct-2012 |
John Hoford <hoford@google.com> |
am 85f2f5ee: am b9c316af: Merge "filters now support orientation" into gb-ub-photos-arches * commit '85f2f5ee226a5fb83373229be2589e2cd8841ed8': filters now support orientation
|
85f2f5ee226a5fb83373229be2589e2cd8841ed8 |
16-Oct-2012 |
John Hoford <hoford@google.com> |
am b9c316af: Merge "filters now support orientation" into gb-ub-photos-arches * commit 'b9c316af94f66bd708d40306e4920ae009795d4b': filters now support orientation
|
1147d56687bfb26f750a048912777c4c35c0a884 |
16-Oct-2012 |
John Hoford <hoford@google.com> |
am b9c316af: Merge "filters now support orientation" into gb-ub-photos-arches * commit 'b9c316af94f66bd708d40306e4920ae009795d4b': filters now support orientation
|
faf4e202483e47f1304f98d4fd5b2d2546240090 |
16-Oct-2012 |
John Hoford <hoford@google.com> |
am b9c316af: Merge "filters now support orientation" into gb-ub-photos-arches * commit 'b9c316af94f66bd708d40306e4920ae009795d4b': filters now support orientation
|
b9c316af94f66bd708d40306e4920ae009795d4b |
16-Oct-2012 |
John Hoford <hoford@google.com> |
Merge "filters now support orientation" into gb-ub-photos-arches
|
d113262a45813f1d77c8b17e61c79727b2d037bd |
16-Oct-2012 |
John Hoford <hoford@google.com> |
filters now support orientation bug:7353416 Change-Id: Ie6f01f37428dc86d338c5cb5a80630aa3a879eaa
rc/com/android/gallery3d/filtershow/cache/ImageLoader.java
|
b894202fbb21b237c48e24b2f65b1ca297c61332 |
16-Oct-2012 |
John Hoford <hoford@google.com> |
filters now support orientation bug:7353416 Change-Id: Ie6f01f37428dc86d338c5cb5a80630aa3a879eaa
rc/com/android/gallery3d/filtershow/cache/ImageLoader.java
|
d6880558e9f44daf9d35ca4fed6986ae18658f1e |
16-Oct-2012 |
Chris Craik <ccraik@google.com> |
am e8df2628: am e43672c0: am 8a4a4cdc: am c7d90032: Merge "Correct toast text for clarity" into gb-ub-photos-arches * commit 'e8df262823eebef026f7f423ef6af565b6774cdf': Correct toast text for clarity
|
e8df262823eebef026f7f423ef6af565b6774cdf |
16-Oct-2012 |
Chris Craik <ccraik@google.com> |
am e43672c0: am 8a4a4cdc: am c7d90032: Merge "Correct toast text for clarity" into gb-ub-photos-arches * commit 'e43672c0757c7f7b8a5f4cc8e728af3feeb04e18': Correct toast text for clarity
|
e43672c0757c7f7b8a5f4cc8e728af3feeb04e18 |
16-Oct-2012 |
Chris Craik <ccraik@google.com> |
am 8a4a4cdc: am c7d90032: Merge "Correct toast text for clarity" into gb-ub-photos-arches * commit '8a4a4cdc4ff7e004f260d8ce333567a12151763c': Correct toast text for clarity
|
8a4a4cdc4ff7e004f260d8ce333567a12151763c |
16-Oct-2012 |
Chris Craik <ccraik@google.com> |
am c7d90032: Merge "Correct toast text for clarity" into gb-ub-photos-arches * commit 'c7d90032c8ea9fd73634c311ed0ba9d5128fe861': Correct toast text for clarity
|
11fdb2e8a8ee0915330a6c62e17eb43594640991 |
16-Oct-2012 |
Chris Craik <ccraik@google.com> |
am c7d90032: Merge "Correct toast text for clarity" into gb-ub-photos-arches * commit 'c7d90032c8ea9fd73634c311ed0ba9d5128fe861': Correct toast text for clarity
|
8aff8103f518f379ec8b5d3e27282b1b2ac99781 |
16-Oct-2012 |
Chris Craik <ccraik@google.com> |
am c7d90032: Merge "Correct toast text for clarity" into gb-ub-photos-arches * commit 'c7d90032c8ea9fd73634c311ed0ba9d5128fe861': Correct toast text for clarity
|
c7d90032c8ea9fd73634c311ed0ba9d5128fe861 |
16-Oct-2012 |
Chris Craik <ccraik@google.com> |
Merge "Correct toast text for clarity" into gb-ub-photos-arches
|
2d0bf4d9ce464a97f370c73c839421de8397a5b1 |
16-Oct-2012 |
Chris Craik <ccraik@google.com> |
Correct toast text for clarity bug:7353760 Makes the English string better, but should still be a format string. Change-Id: If998aab71d8f859911df6c7b332e908dcb43afc2
es/values/strings.xml
|
0a85e59cd26cfd28880b4e15fdece4293262632a |
16-Oct-2012 |
Chris Craik <ccraik@google.com> |
Correct toast text for clarity bug:7353760 Makes the English string better, but should still be a format string. Change-Id: If998aab71d8f859911df6c7b332e908dcb43afc2
es/values/strings.xml
|
33cde20dac4d220b0ff9e7f3c83762eca74d303b |
16-Oct-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
e417abb6b050d95965dbcc280a217af7e6d4a44e |
16-Oct-2012 |
Wu-cheng Li <wuchengli@google.com> |
am 70f2739c: am d14d4dc1: am c07b9374: am 84440670: Remove old camera classes. * commit '70f2739c6330b01caca3b5369b4b7e35d5fb5fce': Remove old camera classes.
|
70f2739c6330b01caca3b5369b4b7e35d5fb5fce |
16-Oct-2012 |
Wu-cheng Li <wuchengli@google.com> |
am d14d4dc1: am c07b9374: am 84440670: Remove old camera classes. * commit 'd14d4dc110489c90b7b14ea1e7291468e8134e31': Remove old camera classes.
|
d14d4dc110489c90b7b14ea1e7291468e8134e31 |
16-Oct-2012 |
Wu-cheng Li <wuchengli@google.com> |
am c07b9374: am 84440670: Remove old camera classes. * commit 'c07b9374d265bdd79b4898c8a882b7a8ed06c1ba': Remove old camera classes.
|
c07b9374d265bdd79b4898c8a882b7a8ed06c1ba |
16-Oct-2012 |
Wu-cheng Li <wuchengli@google.com> |
am 84440670: Remove old camera classes. * commit '84440670da46866867ace3be2c358a54db984a6d': Remove old camera classes.
|
dcf5f38e17168ac743a179f87a4f1b201cc84616 |
16-Oct-2012 |
Wu-cheng Li <wuchengli@google.com> |
am 84440670: Remove old camera classes. * commit '84440670da46866867ace3be2c358a54db984a6d': Remove old camera classes.
|
5039dfe29849fede4a4eec1df2d221b24efd85e1 |
16-Oct-2012 |
Wu-cheng Li <wuchengli@google.com> |
am 84440670: Remove old camera classes. * commit '84440670da46866867ace3be2c358a54db984a6d': Remove old camera classes.
|
44f476dc149a587c06e752987d0f1d00c57ca076 |
14-Oct-2012 |
Wu-cheng Li <wuchengli@google.com> |
Remove old camera classes. bug:7201108 Change-Id: I539d02c411c654238d7e5e0c34e9ec3e6e6d4d90
roguard.flags
|
8f295266ea45e95bd896642d48011076360adcbe |
14-Oct-2012 |
Wu-cheng Li <wuchengli@google.com> |
Remove old camera classes. bug:7201108 Change-Id: I539d02c411c654238d7e5e0c34e9ec3e6e6d4d90
ndroidManifest.xml
|
306d7745b13ed3e489556e1e0019130e434499b7 |
14-Oct-2012 |
Wu-cheng Li <wuchengli@google.com> |
Remove old camera classes. bug:7201108 Change-Id: I539d02c411c654238d7e5e0c34e9ec3e6e6d4d90
rc/com/android/gallery3d/data/DataManager.java
rc/com/android/gallery3d/data/LocalAlbum.java
rc/com/android/gallery3d/data/LocalImage.java
rc/com/android/gallery3d/data/LocalVideo.java
|
84440670da46866867ace3be2c358a54db984a6d |
14-Oct-2012 |
Wu-cheng Li <wuchengli@google.com> |
Remove old camera classes. bug:7201108 Change-Id: I539d02c411c654238d7e5e0c34e9ec3e6e6d4d90
ndroidManifest.xml
roguard.flags
rc/com/android/gallery3d/data/DataManager.java
rc/com/android/gallery3d/data/LocalAlbum.java
rc/com/android/gallery3d/data/LocalImage.java
rc/com/android/gallery3d/data/LocalVideo.java
|
1d964ff3067f72b5483673739032e73883b4ae35 |
16-Oct-2012 |
Owen Lin <owenlin@google.com> |
am 3101febf: am 36c46796: am 4a03e18f: am 030f8dad: Fixes bugs in TiledTexture. * commit '3101febf5abce030f28f7496e47e68e610986aa7': Fixes bugs in TiledTexture.
|
5de1e410e89967940e82c1aee5cd8be8a7e8fa01 |
16-Oct-2012 |
Owen Lin <owenlin@google.com> |
am 61d96679: am 2380da24: am 4e13f7b0: am ff025412: Merge "Revert "Revert "Upload screennails in tiles to prevent jank""" into gb-ub-photos-arches * commit '61d96679eb31261d0c01768d2dd8d03dd7a184e1': Revert "Revert "Upload screennails in tiles to prevent jank""
|
918aefe177a66ebd922c0723562ea0186a374789 |
16-Oct-2012 |
John Reck <jreck@google.com> |
am d2abf50e: am b9a4bd22: am 94dbd96d: am a38801ed: Merge "Fix build" into gb-ub-photos-arches * commit 'd2abf50eeefa3476477dea72eb08590abf65cfc1': Fix build
|
c59d3d510b59d9d9216b74cd7d5f39fafe58d07e |
16-Oct-2012 |
John Hoford <hoford@google.com> |
am a17c1824: am e4a3a434: am c80b4f8f: am 80789c08: Merge "fix for the cache" into gb-ub-photos-arches * commit 'a17c182423e6213ee47cb3c8ff76c9b9abb629f5': fix for the cache
|
e594dd5e21a81fb6b4ddc5f0bec93da5fdecdae3 |
16-Oct-2012 |
Mangesh Ghiware <mghiware@google.com> |
am 260bcee5: am 1db393b5: am cc7731ac: am c42bb220: Merge "Cherry-pick of 092fd92 to fix bug 7344730 also." into gb-ub-photos-arches * commit '260bcee54b21f34320aa500923b12c590c612243': Cherry-pick of 092fd92 to fix bug 7344730 also.
|
c84241e226912959fede8831a27eb2d768206029 |
16-Oct-2012 |
John Reck <jreck@google.com> |
am 2e1f4ccb: am d36b534d: am 2f17145b: am b1a28418: Fix SRI Pano orientation * commit '2e1f4ccb0bf8ac2b8695adb4bcfd0de54bd923f4': Fix SRI Pano orientation
|
3101febf5abce030f28f7496e47e68e610986aa7 |
16-Oct-2012 |
Owen Lin <owenlin@google.com> |
am 36c46796: am 4a03e18f: am 030f8dad: Fixes bugs in TiledTexture. * commit '36c467968196502d86b40e0802c24da377658e3c': Fixes bugs in TiledTexture.
|
61d96679eb31261d0c01768d2dd8d03dd7a184e1 |
16-Oct-2012 |
Owen Lin <owenlin@google.com> |
am 2380da24: am 4e13f7b0: am ff025412: Merge "Revert "Revert "Upload screennails in tiles to prevent jank""" into gb-ub-photos-arches * commit '2380da248380582bd9c6714091678ceb236391be': Revert "Revert "Upload screennails in tiles to prevent jank""
|
d2abf50eeefa3476477dea72eb08590abf65cfc1 |
16-Oct-2012 |
John Reck <jreck@google.com> |
am b9a4bd22: am 94dbd96d: am a38801ed: Merge "Fix build" into gb-ub-photos-arches * commit 'b9a4bd22de1a6ae236722d9155798fcded37d58b': Fix build
|
a17c182423e6213ee47cb3c8ff76c9b9abb629f5 |
16-Oct-2012 |
John Hoford <hoford@google.com> |
am e4a3a434: am c80b4f8f: am 80789c08: Merge "fix for the cache" into gb-ub-photos-arches * commit 'e4a3a4340fa65b4e0eab28e2677d914944561571': fix for the cache
|
260bcee54b21f34320aa500923b12c590c612243 |
16-Oct-2012 |
Mangesh Ghiware <mghiware@google.com> |
am 1db393b5: am cc7731ac: am c42bb220: Merge "Cherry-pick of 092fd92 to fix bug 7344730 also." into gb-ub-photos-arches * commit '1db393b595edd2b138c29e69cc47a154533befb3': Cherry-pick of 092fd92 to fix bug 7344730 also.
|
2e1f4ccb0bf8ac2b8695adb4bcfd0de54bd923f4 |
16-Oct-2012 |
John Reck <jreck@google.com> |
am d36b534d: am 2f17145b: am b1a28418: Fix SRI Pano orientation * commit 'd36b534dc6c90f713624b90283188510188708cc': Fix SRI Pano orientation
|
36c467968196502d86b40e0802c24da377658e3c |
16-Oct-2012 |
Owen Lin <owenlin@google.com> |
am 4a03e18f: am 030f8dad: Fixes bugs in TiledTexture. * commit '4a03e18f7e8f1acf36f54dba7906a72927c9fb01': Fixes bugs in TiledTexture.
|
4a03e18f7e8f1acf36f54dba7906a72927c9fb01 |
16-Oct-2012 |
Owen Lin <owenlin@google.com> |
am 030f8dad: Fixes bugs in TiledTexture. * commit '030f8dad6aefc42d0af39bc1b93f370937d3e2ab': Fixes bugs in TiledTexture.
|
78752a0cd3c6e6c0bf7a1ed3abe925824c2e6595 |
16-Oct-2012 |
Owen Lin <owenlin@google.com> |
am 030f8dad: Fixes bugs in TiledTexture. * commit '030f8dad6aefc42d0af39bc1b93f370937d3e2ab': Fixes bugs in TiledTexture.
|
3c4f192ffb457097c6102d095024dd88e781a271 |
16-Oct-2012 |
Owen Lin <owenlin@google.com> |
am 030f8dad: Fixes bugs in TiledTexture. * commit '030f8dad6aefc42d0af39bc1b93f370937d3e2ab': Fixes bugs in TiledTexture.
|
d3cd5c499ce58f3ad69d58acafd4f251a149fdbb |
11-Oct-2012 |
Owen Lin <owenlin@google.com> |
Fixes bugs in TiledTexture. 1. Upload tiles in SinglePhotoDataAdapter 2. Rebuild the upload queue after the screen nails being recycled bug: 6399444 Change-Id: I57e756f8d1d84742bf82dd34c83baf8df89ae4cc
rc/com/android/gallery3d/app/CropImage.java
rc/com/android/gallery3d/app/PhotoDataAdapter.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/app/SinglePhotoDataAdapter.java
rc/com/android/gallery3d/ui/BitmapScreenNail.java
rc/com/android/gallery3d/ui/PhotoView.java
rc/com/android/gallery3d/ui/TileImageView.java
rc/com/android/gallery3d/ui/TileImageViewAdapter.java
rc/com/android/gallery3d/ui/TiledScreenNail.java
rc/com/android/gallery3d/util/GalleryUtils.java
|
030f8dad6aefc42d0af39bc1b93f370937d3e2ab |
11-Oct-2012 |
Owen Lin <owenlin@google.com> |
Fixes bugs in TiledTexture. 1. Upload tiles in SinglePhotoDataAdapter 2. Rebuild the upload queue after the screen nails being recycled bug: 6399444 Change-Id: I57e756f8d1d84742bf82dd34c83baf8df89ae4cc
rc/com/android/gallery3d/app/CropImage.java
rc/com/android/gallery3d/app/PhotoDataAdapter.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/app/SinglePhotoDataAdapter.java
rc/com/android/gallery3d/ui/BitmapScreenNail.java
rc/com/android/gallery3d/ui/PhotoView.java
rc/com/android/gallery3d/ui/TileImageView.java
rc/com/android/gallery3d/ui/TileImageViewAdapter.java
rc/com/android/gallery3d/ui/TiledScreenNail.java
rc/com/android/gallery3d/util/GalleryUtils.java
|
2380da248380582bd9c6714091678ceb236391be |
16-Oct-2012 |
Owen Lin <owenlin@google.com> |
am 4e13f7b0: am ff025412: Merge "Revert "Revert "Upload screennails in tiles to prevent jank""" into gb-ub-photos-arches * commit '4e13f7b0f1344e1d02d4746786a1fbc1d031fafd': Revert "Revert "Upload screennails in tiles to prevent jank""
|
4e13f7b0f1344e1d02d4746786a1fbc1d031fafd |
16-Oct-2012 |
Owen Lin <owenlin@google.com> |
am ff025412: Merge "Revert "Revert "Upload screennails in tiles to prevent jank""" into gb-ub-photos-arches * commit 'ff025412e2cacedd8cbb7901140e580f76634ee6': Revert "Revert "Upload screennails in tiles to prevent jank""
|
66bfc06e875129df7b76c7aa56151efa2da111d6 |
16-Oct-2012 |
Owen Lin <owenlin@google.com> |
am ff025412: Merge "Revert "Revert "Upload screennails in tiles to prevent jank""" into gb-ub-photos-arches * commit 'ff025412e2cacedd8cbb7901140e580f76634ee6': Revert "Revert "Upload screennails in tiles to prevent jank""
|
3fdbde7b4201314bf95ac8a3ada4d513016f764d |
16-Oct-2012 |
Owen Lin <owenlin@google.com> |
am ff025412: Merge "Revert "Revert "Upload screennails in tiles to prevent jank""" into gb-ub-photos-arches * commit 'ff025412e2cacedd8cbb7901140e580f76634ee6': Revert "Revert "Upload screennails in tiles to prevent jank""
|
a942400efc37c5dd05b3c615092ae8d0f2ca7e2c |
16-Oct-2012 |
Owen Lin <owenlin@google.com> |
Merge "Revert "Revert "Upload screennails in tiles to prevent jank""" into gb-ub-photos-arches
|
ff025412e2cacedd8cbb7901140e580f76634ee6 |
16-Oct-2012 |
Owen Lin <owenlin@google.com> |
Merge "Revert "Revert "Upload screennails in tiles to prevent jank""" into gb-ub-photos-arches
|
b9a4bd22de1a6ae236722d9155798fcded37d58b |
16-Oct-2012 |
John Reck <jreck@google.com> |
am 94dbd96d: am a38801ed: Merge "Fix build" into gb-ub-photos-arches * commit '94dbd96dea60224e2c3bc7c148af147fe3f83bcb': Fix build
|
94dbd96dea60224e2c3bc7c148af147fe3f83bcb |
16-Oct-2012 |
John Reck <jreck@google.com> |
am a38801ed: Merge "Fix build" into gb-ub-photos-arches * commit 'a38801edd3a39d888bf36607b567171f8b9527ad': Fix build
|
e2d056e507c776b4b5dbdb42547ad166669d44f2 |
16-Oct-2012 |
John Reck <jreck@google.com> |
am a38801ed: Merge "Fix build" into gb-ub-photos-arches * commit 'a38801edd3a39d888bf36607b567171f8b9527ad': Fix build
|
4d6ea9c8f31bfa6fdfb9029c6bb1781efd307a93 |
16-Oct-2012 |
John Reck <jreck@google.com> |
am a38801ed: Merge "Fix build" into gb-ub-photos-arches * commit 'a38801edd3a39d888bf36607b567171f8b9527ad': Fix build
|
a38801edd3a39d888bf36607b567171f8b9527ad |
16-Oct-2012 |
John Reck <jreck@google.com> |
Merge "Fix build" into gb-ub-photos-arches
|
5ca0ae63021d987c777f0221d134ddc4b7247f0e |
16-Oct-2012 |
John Reck <jreck@google.com> |
Merge "Fix build" into gb-ub-photos-arches
|
ea9e8814ecbd8d43227f1c7c3c96228c709ebd2f |
16-Oct-2012 |
John Reck <jreck@google.com> |
Fix build Change-Id: Ic7bb61c463d237f9ee5fabc8e7f7325ecf1da43c
ests/src/com/android/gallery3d/ui/GLRootMock.java
ests/src/com/android/gallery3d/ui/GLRootStub.java
|
778aebdeedfe0a0d6938c50aeb06d7fac5f1d424 |
16-Oct-2012 |
John Reck <jreck@google.com> |
Fix build Change-Id: Ic7bb61c463d237f9ee5fabc8e7f7325ecf1da43c
ests/src/com/android/gallery3d/ui/GLRootMock.java
ests/src/com/android/gallery3d/ui/GLRootStub.java
|
e4a3a4340fa65b4e0eab28e2677d914944561571 |
16-Oct-2012 |
John Hoford <hoford@google.com> |
am c80b4f8f: am 80789c08: Merge "fix for the cache" into gb-ub-photos-arches * commit 'c80b4f8f61ce08d674cdb632a91c22648833eab9': fix for the cache
|
a42628ffe1be896225c7bad996f965345c37eeba |
16-Oct-2012 |
John Hoford <hoford@google.com> |
am 80789c08: Merge "fix for the cache" into gb-ub-photos-arches * commit '80789c089e8795968426838ff9c1e71c84cfee6f': fix for the cache
|
2d4b782a5e1289e736771cd01566858fd0a20dd1 |
16-Oct-2012 |
John Hoford <hoford@google.com> |
am 80789c08: Merge "fix for the cache" into gb-ub-photos-arches * commit '80789c089e8795968426838ff9c1e71c84cfee6f': fix for the cache
|
e0a0d99efe6a4eb94393157066526ef5ad031b57 |
16-Oct-2012 |
John Hoford <hoford@google.com> |
am 80789c08: Merge "fix for the cache" into gb-ub-photos-arches * commit '80789c089e8795968426838ff9c1e71c84cfee6f': fix for the cache
|
c80b4f8f61ce08d674cdb632a91c22648833eab9 |
16-Oct-2012 |
John Hoford <hoford@google.com> |
am 80789c08: Merge "fix for the cache" into gb-ub-photos-arches * commit '80789c089e8795968426838ff9c1e71c84cfee6f': fix for the cache
|
80789c089e8795968426838ff9c1e71c84cfee6f |
16-Oct-2012 |
John Hoford <hoford@google.com> |
Merge "fix for the cache" into gb-ub-photos-arches
|
2ef2d71edf822f0462fb312342f89f80ff271564 |
16-Oct-2012 |
John Hoford <hoford@google.com> |
Merge "fix for the cache" into gb-ub-photos-arches
|
92cd5e6cdb366322733dacd7b6d36d9f0ca43eac |
16-Oct-2012 |
John Hoford <hoford@google.com> |
fix for the cache Change-Id: Ib5c82aa602df961d15064e732b3701c8d6cd66ff bug:7345592
rc/com/android/gallery3d/filtershow/cache/DirectPresetCache.java
|
f2bc13fc959dbb272abaaf50251540fab5c5d093 |
16-Oct-2012 |
John Hoford <hoford@google.com> |
fix for the cache Change-Id: Ib5c82aa602df961d15064e732b3701c8d6cd66ff bug:7345592
rc/com/android/gallery3d/filtershow/cache/DirectPresetCache.java
|
4035d297191bd43377714a2fd70c12f375d9a6b2 |
16-Oct-2012 |
John Hoford <hoford@google.com> |
fix for the cache Change-Id: Ib5c82aa602df961d15064e732b3701c8d6cd66ff bug:7345592
rc/com/android/gallery3d/filtershow/cache/DirectPresetCache.java
|
1db393b595edd2b138c29e69cc47a154533befb3 |
16-Oct-2012 |
Mangesh Ghiware <mghiware@google.com> |
am cc7731ac: am c42bb220: Merge "Cherry-pick of 092fd92 to fix bug 7344730 also." into gb-ub-photos-arches * commit 'cc7731acd44f98ef35da82904caf4a015a7b427a': Cherry-pick of 092fd92 to fix bug 7344730 also.
|
0cd81d768c23d9499209994571138d4f62892aa8 |
16-Oct-2012 |
Mangesh Ghiware <mghiware@google.com> |
am c42bb220: Merge "Cherry-pick of 092fd92 to fix bug 7344730 also." into gb-ub-photos-arches * commit 'c42bb220434926c23332c0f93baad4ca2c6b7588': Cherry-pick of 092fd92 to fix bug 7344730 also.
|
5d82c590f99f49d19612476178e065e79f6be56e |
16-Oct-2012 |
Mangesh Ghiware <mghiware@google.com> |
am c42bb220: Merge "Cherry-pick of 092fd92 to fix bug 7344730 also." into gb-ub-photos-arches * commit 'c42bb220434926c23332c0f93baad4ca2c6b7588': Cherry-pick of 092fd92 to fix bug 7344730 also.
|
cc7731acd44f98ef35da82904caf4a015a7b427a |
16-Oct-2012 |
Mangesh Ghiware <mghiware@google.com> |
am c42bb220: Merge "Cherry-pick of 092fd92 to fix bug 7344730 also." into gb-ub-photos-arches * commit 'c42bb220434926c23332c0f93baad4ca2c6b7588': Cherry-pick of 092fd92 to fix bug 7344730 also.
|
d36b534dc6c90f713624b90283188510188708cc |
16-Oct-2012 |
John Reck <jreck@google.com> |
am 2f17145b: am b1a28418: Fix SRI Pano orientation * commit '2f17145b0c82fff64f2f1667889ce2fe2920d83e': Fix SRI Pano orientation
|
c42bb220434926c23332c0f93baad4ca2c6b7588 |
16-Oct-2012 |
Mangesh Ghiware <mghiware@google.com> |
Merge "Cherry-pick of 092fd92 to fix bug 7344730 also." into gb-ub-photos-arches
|
06c349afaff1957f7bc7550f30b8b27ad05730df |
16-Oct-2012 |
Mangesh Ghiware <mghiware@google.com> |
Merge "Cherry-pick of 092fd92 to fix bug 7344730 also." into gb-ub-photos-arches
|
5431fa9123df65fc476a3666134c431a79349d7d |
16-Oct-2012 |
John Reck <jreck@google.com> |
am b1a28418: Fix SRI Pano orientation * commit 'b1a28418848ce0adeb8a845a78e246b01913d176': Fix SRI Pano orientation
|
680a369a3f8937d33c4c5a98367937668ae65750 |
16-Oct-2012 |
John Reck <jreck@google.com> |
am b1a28418: Fix SRI Pano orientation * commit 'b1a28418848ce0adeb8a845a78e246b01913d176': Fix SRI Pano orientation
|
2f17145b0c82fff64f2f1667889ce2fe2920d83e |
16-Oct-2012 |
John Reck <jreck@google.com> |
am b1a28418: Fix SRI Pano orientation * commit 'b1a28418848ce0adeb8a845a78e246b01913d176': Fix SRI Pano orientation
|
b1a28418848ce0adeb8a845a78e246b01913d176 |
16-Oct-2012 |
John Reck <jreck@google.com> |
Fix SRI Pano orientation Bug: 7345511 Change-Id: I9a06f03b67ba820b86520588415ff3ab16f05829
rc/com/android/gallery3d/ui/GLRoot.java
rc/com/android/gallery3d/ui/PhotoView.java
|
6d3d603b15ec260b70223460fd92db31394e112e |
16-Oct-2012 |
John Reck <jreck@google.com> |
Fix SRI Pano orientation Bug: 7345511 Change-Id: I9a06f03b67ba820b86520588415ff3ab16f05829
rc/com/android/gallery3d/ui/GLRoot.java
rc/com/android/gallery3d/ui/PhotoView.java
|
710c18b99e48ec7a2c5cbe358c22d91103ed3740 |
15-Oct-2012 |
Wu-cheng Li <wuchengli@google.com> |
Update the assets of unlock and camera icons in filmstrip. bug:7318891 Change-Id: Ia74e8a78aa712432cd8a87b061c609cce223cf37
es/drawable-hdpi/placeholder_camera.9.png
es/drawable-hdpi/placeholder_camera.png
es/drawable-hdpi/placeholder_locked.9.png
es/drawable-hdpi/placeholder_locked.png
es/drawable-mdpi/placeholder_camera.9.png
es/drawable-mdpi/placeholder_camera.png
es/drawable-mdpi/placeholder_locked.9.png
es/drawable-mdpi/placeholder_locked.png
es/drawable-xhdpi/placeholder_camera.9.png
es/drawable-xhdpi/placeholder_camera.png
es/drawable-xhdpi/placeholder_locked.9.png
es/drawable-xhdpi/placeholder_locked.png
|
9121776557d0fdacb3cb85cce7e1326c4ea90628 |
12-Oct-2012 |
Chih-Chung Chang <chihchung@google.com> |
Cherry-pick of 092fd92 to fix bug 7344730 also. Make getSupportedOperations() call getSupportedOperations(boolean) by default. So things will work for MediaObject who doesn't override the new method. Bug: 7336562 Change-Id: Ic9ed6211981bb91c56702eafa7b21e83ed071cef
rc/com/android/gallery3d/data/MediaObject.java
|
8a112b0473278959e84002bc03e25af542a77e84 |
12-Oct-2012 |
Chih-Chung Chang <chihchung@google.com> |
Cherry-pick of 092fd92 to fix bug 7344730 also. Make getSupportedOperations() call getSupportedOperations(boolean) by default. So things will work for MediaObject who doesn't override the new method. Bug: 7336562 Change-Id: Ic9ed6211981bb91c56702eafa7b21e83ed071cef
rc/com/android/gallery3d/data/MediaObject.java
|
1413a6e99900a2c7b37e17a1afc95c473bcb3900 |
15-Oct-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-factory-release history after reset to jb-mr1-dev
|
f041409f8bf28e64af87c1b316382655bd107909 |
15-Oct-2012 |
Wu-cheng Li <wuchengli@google.com> |
am 4c0875cf: am 0ecfd51a: am 3105cbbf: am f034e3d9: Update the assets of unlock and camera icons in filmstrip. * commit '4c0875cf2c29473abbc6eb97b605bed0ac8d8871': Update the assets of unlock and camera icons in filmstrip.
|
4c0875cf2c29473abbc6eb97b605bed0ac8d8871 |
15-Oct-2012 |
Wu-cheng Li <wuchengli@google.com> |
am 0ecfd51a: am 3105cbbf: am f034e3d9: Update the assets of unlock and camera icons in filmstrip. * commit '0ecfd51ac9bc6bfb85715074d68a9e3fc7035fb9': Update the assets of unlock and camera icons in filmstrip.
|
0ecfd51ac9bc6bfb85715074d68a9e3fc7035fb9 |
15-Oct-2012 |
Wu-cheng Li <wuchengli@google.com> |
am 3105cbbf: am f034e3d9: Update the assets of unlock and camera icons in filmstrip. * commit '3105cbbf72122263294b2446eca724138b33ae94': Update the assets of unlock and camera icons in filmstrip.
|
3105cbbf72122263294b2446eca724138b33ae94 |
15-Oct-2012 |
Wu-cheng Li <wuchengli@google.com> |
am f034e3d9: Update the assets of unlock and camera icons in filmstrip. * commit 'f034e3d9b5d72ebea44d4928fb449a4cf239c3e1': Update the assets of unlock and camera icons in filmstrip.
|
220cde0d3fb84009bdaf8111c58d62a117064f2f |
15-Oct-2012 |
Wu-cheng Li <wuchengli@google.com> |
am f034e3d9: Update the assets of unlock and camera icons in filmstrip. * commit 'f034e3d9b5d72ebea44d4928fb449a4cf239c3e1': Update the assets of unlock and camera icons in filmstrip.
|
370af62cfff7a4d3be6074eb1939468e04b4b103 |
15-Oct-2012 |
Wu-cheng Li <wuchengli@google.com> |
am f034e3d9: Update the assets of unlock and camera icons in filmstrip. * commit 'f034e3d9b5d72ebea44d4928fb449a4cf239c3e1': Update the assets of unlock and camera icons in filmstrip.
|
14a3a3d0a8d003cbe70aa2ef971c478eaa05a35f |
15-Oct-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am 62d93e76: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge * commit '62d93e7675b62f5302858904bf3e72f37b8985dc':
|
62d93e7675b62f5302858904bf3e72f37b8985dc |
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: I79f06be720b91834009bc78383223aa98a0c1de5
|
c71b1930fdd81e519ab5aa9ad5064d75045f869c |
15-Oct-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
7ef3d2d5af9ff5230f7275a835255907d4977303 |
15-Oct-2012 |
Wu-cheng Li <wuchengli@google.com> |
Update the assets of unlock and camera icons in filmstrip. bug:7318891 Change-Id: Ia74e8a78aa712432cd8a87b061c609cce223cf37
es/drawable-hdpi/placeholder_camera.9.png
es/drawable-hdpi/placeholder_camera.png
es/drawable-hdpi/placeholder_locked.9.png
es/drawable-hdpi/placeholder_locked.png
es/drawable-mdpi/placeholder_camera.9.png
es/drawable-mdpi/placeholder_camera.png
es/drawable-mdpi/placeholder_locked.9.png
es/drawable-mdpi/placeholder_locked.png
es/drawable-xhdpi/placeholder_camera.9.png
es/drawable-xhdpi/placeholder_camera.png
es/drawable-xhdpi/placeholder_locked.9.png
es/drawable-xhdpi/placeholder_locked.png
|
f034e3d9b5d72ebea44d4928fb449a4cf239c3e1 |
15-Oct-2012 |
Wu-cheng Li <wuchengli@google.com> |
Update the assets of unlock and camera icons in filmstrip. bug:7318891 Change-Id: Ia74e8a78aa712432cd8a87b061c609cce223cf37
es/drawable-hdpi/placeholder_camera.9.png
es/drawable-hdpi/placeholder_camera.png
es/drawable-hdpi/placeholder_locked.9.png
es/drawable-hdpi/placeholder_locked.png
es/drawable-mdpi/placeholder_camera.9.png
es/drawable-mdpi/placeholder_camera.png
es/drawable-mdpi/placeholder_locked.9.png
es/drawable-mdpi/placeholder_locked.png
es/drawable-xhdpi/placeholder_camera.9.png
es/drawable-xhdpi/placeholder_camera.png
es/drawable-xhdpi/placeholder_locked.9.png
es/drawable-xhdpi/placeholder_locked.png
|
d4613c3f1a0db791635e4661f77c6366d15b5382 |
15-Oct-2012 |
Jason Chen <jasonchen@google.com> |
am edd2f273: am 49e5ba70: am 8a5b667d: Merge "Let\'s enhance." into jb-mr1-dev * commit 'edd2f27388d1ecf2465a07a89a4735e1ce50ea70': Let's enhance.
|
edd2f27388d1ecf2465a07a89a4735e1ce50ea70 |
15-Oct-2012 |
Jason Chen <jasonchen@google.com> |
am 49e5ba70: am 8a5b667d: Merge "Let\'s enhance." into jb-mr1-dev * commit '49e5ba706740998e9255ae8316af4ebb35a3372b': Let's enhance.
|
49e5ba706740998e9255ae8316af4ebb35a3372b |
15-Oct-2012 |
Jason Chen <jasonchen@google.com> |
am 8a5b667d: Merge "Let\'s enhance." into jb-mr1-dev * commit '8a5b667d0f9a07ae29aefe7e50fed89a57578e57': Let's enhance.
|
8a5b667d0f9a07ae29aefe7e50fed89a57578e57 |
15-Oct-2012 |
Jason Chen <jasonchen@google.com> |
Merge "Let's enhance." into jb-mr1-dev
|
548152e2f6d1df189716328299d322dd18e40757 |
15-Oct-2012 |
Wu-cheng Li <wuchengli@google.com> |
am fdacb93b: am d86d7c03: am 504d7c83: am 7f1ad54d: Merge "Add stitching panorama image to secure album." into gb-ub-photos-arches * commit 'fdacb93b8f77763b39fe4266b214a6c47adc02ce': Add stitching panorama image to secure album.
|
fdacb93b8f77763b39fe4266b214a6c47adc02ce |
15-Oct-2012 |
Wu-cheng Li <wuchengli@google.com> |
am d86d7c03: am 504d7c83: am 7f1ad54d: Merge "Add stitching panorama image to secure album." into gb-ub-photos-arches * commit 'd86d7c03a024d2be365f740679d6d73544276a07': Add stitching panorama image to secure album.
|
d86d7c03a024d2be365f740679d6d73544276a07 |
15-Oct-2012 |
Wu-cheng Li <wuchengli@google.com> |
am 504d7c83: am 7f1ad54d: Merge "Add stitching panorama image to secure album." into gb-ub-photos-arches * commit '504d7c832aa66773b9bea262a69c609195506ae8': Add stitching panorama image to secure album.
|
20d1fd5174e05f31032956bea6b5e3fe559b5747 |
15-Oct-2012 |
Wu-cheng Li <wuchengli@google.com> |
am 7f1ad54d: Merge "Add stitching panorama image to secure album." into gb-ub-photos-arches * commit '7f1ad54dc6516d7b5cd7d5cabc6b96346186fce8': Add stitching panorama image to secure album.
|
fa683c5c946f789d09a2bebcd086bdabd2688517 |
15-Oct-2012 |
Wu-cheng Li <wuchengli@google.com> |
am 7f1ad54d: Merge "Add stitching panorama image to secure album." into gb-ub-photos-arches * commit '7f1ad54dc6516d7b5cd7d5cabc6b96346186fce8': Add stitching panorama image to secure album.
|
504d7c832aa66773b9bea262a69c609195506ae8 |
15-Oct-2012 |
Wu-cheng Li <wuchengli@google.com> |
am 7f1ad54d: Merge "Add stitching panorama image to secure album." into gb-ub-photos-arches * commit '7f1ad54dc6516d7b5cd7d5cabc6b96346186fce8': Add stitching panorama image to secure album.
|
bb9b933ce04eb50c85c0c592ebbc85d00dcbf47f |
15-Oct-2012 |
Wu-cheng Li <wuchengli@google.com> |
Merge "Add stitching panorama image to secure album." into gb-ub-photos-arches
|
7f1ad54dc6516d7b5cd7d5cabc6b96346186fce8 |
15-Oct-2012 |
Wu-cheng Li <wuchengli@google.com> |
Merge "Add stitching panorama image to secure album." into gb-ub-photos-arches
|
9dee437df17d8bfedecd4526b9435451a1ac7277 |
14-Oct-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
5f14eb0447e36bcb1fd857105a92684e926f0b06 |
14-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 035df371: am 2938a545: am 1aff8e6f: am 5ec40a6b: Fix dimensions to use dips instead of pixels * commit '035df371573a75a83bdbd09d028c27ba652e2272': Fix dimensions to use dips instead of pixels
|
035df371573a75a83bdbd09d028c27ba652e2272 |
14-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 2938a545: am 1aff8e6f: am 5ec40a6b: Fix dimensions to use dips instead of pixels * commit '2938a54505894da06daebab893581f17d903c01e': Fix dimensions to use dips instead of pixels
|
2938a54505894da06daebab893581f17d903c01e |
14-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 1aff8e6f: am 5ec40a6b: Fix dimensions to use dips instead of pixels * commit '1aff8e6f3090ccae53bcb6b3a1f35fb58c3705ee': Fix dimensions to use dips instead of pixels
|
1aff8e6f3090ccae53bcb6b3a1f35fb58c3705ee |
14-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 5ec40a6b: Fix dimensions to use dips instead of pixels * commit '5ec40a6ba587fa8bd50958d263bb6fc6280de4c1': Fix dimensions to use dips instead of pixels
|
d0a0adeaf520d8ce2d635a646faeeff68f75d790 |
14-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 5ec40a6b: Fix dimensions to use dips instead of pixels * commit '5ec40a6ba587fa8bd50958d263bb6fc6280de4c1': Fix dimensions to use dips instead of pixels
|
e86af45de240385b394ccf01c986679bd1d06bfe |
14-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 5ec40a6b: Fix dimensions to use dips instead of pixels * commit '5ec40a6ba587fa8bd50958d263bb6fc6280de4c1': Fix dimensions to use dips instead of pixels
|
03cf9e04d820aff33a776a3b4b8744598f0cc365 |
14-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Fix dimensions to use dips instead of pixels bug:7343798 Change-Id: I3d576ae334e580ad9da5b56d4ae84f749004ec21
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/imageshow/ImageShow.java
rc/com/android/gallery3d/filtershow/imageshow/ImageSmallFilter.java
rc/com/android/gallery3d/filtershow/ui/ImageButtonTitle.java
|
5ec40a6ba587fa8bd50958d263bb6fc6280de4c1 |
14-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Fix dimensions to use dips instead of pixels bug:7343798 Change-Id: I3d576ae334e580ad9da5b56d4ae84f749004ec21
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/imageshow/ImageShow.java
rc/com/android/gallery3d/filtershow/imageshow/ImageSmallFilter.java
rc/com/android/gallery3d/filtershow/ui/ImageButtonTitle.java
|
3c5ee25f01299563fe62a6f6106146509ede4f77 |
14-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am b6ddee8a: am 4857dae6: am cd3803c2: am b470b229: Fix cropping and saving issues * commit 'b6ddee8aff1e3b90076b480e74b9bc897281d3fb': Fix cropping and saving issues
|
b6ddee8aff1e3b90076b480e74b9bc897281d3fb |
14-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 4857dae6: am cd3803c2: am b470b229: Fix cropping and saving issues * commit '4857dae60e15d4453eb9638c623f3abb02295bf2': Fix cropping and saving issues
|
4857dae60e15d4453eb9638c623f3abb02295bf2 |
14-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am cd3803c2: am b470b229: Fix cropping and saving issues * commit 'cd3803c20d25dce03a8cd0450dc97b5b8e7d07c6': Fix cropping and saving issues
|
17a417908e6c5514f117f37c6762d5aaab720ebd |
14-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am b470b229: Fix cropping and saving issues * commit 'b470b229fbfd782db6758f331e4a6f918e305b02': Fix cropping and saving issues
|
f647565de1cd5d77fef60e025c95ff74d92f3fa1 |
14-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am b470b229: Fix cropping and saving issues * commit 'b470b229fbfd782db6758f331e4a6f918e305b02': Fix cropping and saving issues
|
cd3803c20d25dce03a8cd0450dc97b5b8e7d07c6 |
14-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am b470b229: Fix cropping and saving issues * commit 'b470b229fbfd782db6758f331e4a6f918e305b02': Fix cropping and saving issues
|
1c44be4899c454e359cdde0b62f7678c59e0a8fa |
14-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Fix cropping and saving issues bug:7342359 Change-Id: Ia59eb3f423b8c4f420b7b6f120735856a84cd854
rc/com/android/gallery3d/filtershow/filters/ImageFilterGeometry.java
rc/com/android/gallery3d/filtershow/imageshow/GeometryMetadata.java
rc/com/android/gallery3d/filtershow/imageshow/ImageGeometry.java
|
b470b229fbfd782db6758f331e4a6f918e305b02 |
14-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Fix cropping and saving issues bug:7342359 Change-Id: Ia59eb3f423b8c4f420b7b6f120735856a84cd854
rc/com/android/gallery3d/filtershow/filters/ImageFilterGeometry.java
rc/com/android/gallery3d/filtershow/imageshow/GeometryMetadata.java
rc/com/android/gallery3d/filtershow/imageshow/ImageGeometry.java
|
2f8f930daaf62bd934287700f615745d4b6c3840 |
13-Oct-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
ef1a61cb5470decd3ddf3729217ff1549eaeed43 |
13-Oct-2012 |
Wu-cheng Li <wuchengli@google.com> |
Add stitching panorama image to secure album. bug:7285105 Change-Id: I9f609f30d817f10a6c9c94fc6eadb58bc1bdd580
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/data/SecureAlbum.java
|
294b9945e01ec41c1e9e58dfcd5d6e106ee2d538 |
13-Oct-2012 |
Wu-cheng Li <wuchengli@google.com> |
Add stitching panorama image to secure album. bug:7285105 Change-Id: I9f609f30d817f10a6c9c94fc6eadb58bc1bdd580
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/data/SecureAlbum.java
|
23e30e7cfa44e7b5c47383c8752b80c5ed81bbff |
13-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am f0792564: am 297f25f7: am 367707d4: am 48b63eec: Merge "Hide Camera button on empty gallery when not available" into gb-ub-photos-arches * commit 'f0792564da921e88a74a5ac2d40b2776f0ab7598': Hide Camera button on empty gallery when not available
|
f0792564da921e88a74a5ac2d40b2776f0ab7598 |
13-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 297f25f7: am 367707d4: am 48b63eec: Merge "Hide Camera button on empty gallery when not available" into gb-ub-photos-arches * commit '297f25f7fcc362d6771c30318e58bdcae4533d58': Hide Camera button on empty gallery when not available
|
297f25f7fcc362d6771c30318e58bdcae4533d58 |
13-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 367707d4: am 48b63eec: Merge "Hide Camera button on empty gallery when not available" into gb-ub-photos-arches * commit '367707d4186d0d79401184a9db5b1ffe83374337': Hide Camera button on empty gallery when not available
|
367707d4186d0d79401184a9db5b1ffe83374337 |
13-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 48b63eec: Merge "Hide Camera button on empty gallery when not available" into gb-ub-photos-arches * commit '48b63eecbc15ff6ec7e152076262c7dab26e5a6f': Hide Camera button on empty gallery when not available
|
2983058be80e068b07ddca0c069b4068b1d966a5 |
13-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 48b63eec: Merge "Hide Camera button on empty gallery when not available" into gb-ub-photos-arches * commit '48b63eecbc15ff6ec7e152076262c7dab26e5a6f': Hide Camera button on empty gallery when not available
|
1d083faca56c90ddffd991ea718955b5e3f1b9aa |
13-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 48b63eec: Merge "Hide Camera button on empty gallery when not available" into gb-ub-photos-arches * commit '48b63eecbc15ff6ec7e152076262c7dab26e5a6f': Hide Camera button on empty gallery when not available
|
b3e8fc2def7b3995c3b558d8594eb573defedf82 |
13-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Hide Camera button on empty gallery when not available" into gb-ub-photos-arches
|
48b63eecbc15ff6ec7e152076262c7dab26e5a6f |
13-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Hide Camera button on empty gallery when not available" into gb-ub-photos-arches
|
76c14acf3255303cc72308d938fa05bfa0d3dc3d |
13-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Hide Camera button on empty gallery when not available Bug: 7342583 Change-Id: I545b6902f994f7ed0245ec486e78693aea197a4a
rc/com/android/gallery3d/app/AlbumSetPage.java
|
4f69a058a77f741235a35e85ede78f3b2301861f |
13-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Hide Camera button on empty gallery when not available Bug: 7342583 Change-Id: I545b6902f994f7ed0245ec486e78693aea197a4a
rc/com/android/gallery3d/app/AlbumSetPage.java
|
800482037b0852be62c23c848aa08f78780d27ae |
13-Oct-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-factory-release history after reset to jb-mr1-dev
|
3d4d9b360c9675ffad7643f08acd952ede9a10ba |
13-Oct-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
50f691d0e7d04cdd1bd4a8a6bb66f58403abb3c2 |
12-Oct-2012 |
Jason Chen <jasonchen@google.com> |
Let's enhance. Add mipmap-xxhdpi launcher icon asset. Bug: 6718166 Change-Id: Iedb9a380fc6b1e7045bed84164792f8a51ddcd01
es/mipmap-xxhdpi/ic_launcher_gallery.png
|
31cdba9357dc80989a2df4ed373a22603d0856ea |
13-Oct-2012 |
John Hoford <hoford@google.com> |
am ee40e118: am c9938264: am 1e89d463: am 9b302e31: Icon fix * commit 'ee40e1188609780deefa677aaaaf3c5722166201': Icon fix
|
ee40e1188609780deefa677aaaaf3c5722166201 |
13-Oct-2012 |
John Hoford <hoford@google.com> |
am c9938264: am 1e89d463: am 9b302e31: Icon fix * commit 'c9938264f5e596d0040fab90e29055b9b86ceb0e': Icon fix
|
c9938264f5e596d0040fab90e29055b9b86ceb0e |
13-Oct-2012 |
John Hoford <hoford@google.com> |
am 1e89d463: am 9b302e31: Icon fix * commit '1e89d46332ef6fbe78864abada8d77da2be9504c': Icon fix
|
1e89d46332ef6fbe78864abada8d77da2be9504c |
13-Oct-2012 |
John Hoford <hoford@google.com> |
am 9b302e31: Icon fix * commit '9b302e31fb92408e1b631988320981910edb8c37': Icon fix
|
bb2975020e8e621074cbdb26671603b6806964a7 |
13-Oct-2012 |
John Hoford <hoford@google.com> |
am 9b302e31: Icon fix * commit '9b302e31fb92408e1b631988320981910edb8c37': Icon fix
|
23df90551d1edf16b6f8db43552751ee9e8b08a0 |
13-Oct-2012 |
John Hoford <hoford@google.com> |
am 9b302e31: Icon fix * commit '9b302e31fb92408e1b631988320981910edb8c37': Icon fix
|
ad87c8bbbfeede3e0a370ce3253a1be9b612eb05 |
13-Oct-2012 |
John Hoford <hoford@google.com> |
Icon fix bug:7328726 Change-Id: I9042c1de718b316e92bcc44700a514542af6dd65
es/drawable-hdpi/filtershow_button_colors_curve.png
es/drawable-mdpi/filtershow_button_colors_curve.png
es/drawable-xhdpi/filtershow_button_colors_curve.png
|
9b302e31fb92408e1b631988320981910edb8c37 |
13-Oct-2012 |
John Hoford <hoford@google.com> |
Icon fix bug:7328726 Change-Id: I9042c1de718b316e92bcc44700a514542af6dd65
es/drawable-hdpi/filtershow_button_colors_curve.png
es/drawable-mdpi/filtershow_button_colors_curve.png
es/drawable-xhdpi/filtershow_button_colors_curve.png
|
4c1d6fb4d7d2f1b11c7b416359351de7be8b72fd |
12-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am ebaf3118: am 17d8b846: am 2b652421: am 1d2e9903: Merge "Improve performance of filmstrip" into gb-ub-photos-arches * commit 'ebaf3118100263254612327405e558d83c28b312': Improve performance of filmstrip
|
ebaf3118100263254612327405e558d83c28b312 |
12-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 17d8b846: am 2b652421: am 1d2e9903: Merge "Improve performance of filmstrip" into gb-ub-photos-arches * commit '17d8b8469a80fee24487ef6b0419c3f784b6b928': Improve performance of filmstrip
|
17d8b8469a80fee24487ef6b0419c3f784b6b928 |
12-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 2b652421: am 1d2e9903: Merge "Improve performance of filmstrip" into gb-ub-photos-arches * commit '2b652421321fa6b5ac119be3512d0dbba2bbaa18': Improve performance of filmstrip
|
775c52775e021949171e8569cbfb6440d981048c |
12-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am 4ceeeb98: am b1bb424c: am eea31d9a: am 7776408c: Merge "Adding crop UI. Fixes a number of other UI bugs." into gb-ub-photos-arches * commit '4ceeeb980eb42d4e4dd15522c10b231c7693026a': Adding crop UI. Fixes a number of other UI bugs.
|
2b652421321fa6b5ac119be3512d0dbba2bbaa18 |
12-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 1d2e9903: Merge "Improve performance of filmstrip" into gb-ub-photos-arches * commit '1d2e9903ab31dd88a8a7370d6e1faf4e9ed204bb': Improve performance of filmstrip
|
4ceeeb980eb42d4e4dd15522c10b231c7693026a |
12-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am b1bb424c: am eea31d9a: am 7776408c: Merge "Adding crop UI. Fixes a number of other UI bugs." into gb-ub-photos-arches * commit 'b1bb424cc01e2970a2aaec671e76de20f95756e6': Adding crop UI. Fixes a number of other UI bugs.
|
a3c8da944663cdd493a7a8dea5db7de7702b29b0 |
12-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 1d2e9903: Merge "Improve performance of filmstrip" into gb-ub-photos-arches * commit '1d2e9903ab31dd88a8a7370d6e1faf4e9ed204bb': Improve performance of filmstrip
|
e660493a86118d601c5d1d400d3219c505996333 |
12-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 1d2e9903: Merge "Improve performance of filmstrip" into gb-ub-photos-arches * commit '1d2e9903ab31dd88a8a7370d6e1faf4e9ed204bb': Improve performance of filmstrip
|
2061ddca51d6cc4816073c857836c9283f7853b5 |
12-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Improve performance of filmstrip" into gb-ub-photos-arches
|
1d2e9903ab31dd88a8a7370d6e1faf4e9ed204bb |
12-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Improve performance of filmstrip" into gb-ub-photos-arches
|
b1bb424cc01e2970a2aaec671e76de20f95756e6 |
12-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am eea31d9a: am 7776408c: Merge "Adding crop UI. Fixes a number of other UI bugs." into gb-ub-photos-arches * commit 'eea31d9ac9890128ca0ab9529cfc6eb22a3756bf': Adding crop UI. Fixes a number of other UI bugs.
|
eea31d9ac9890128ca0ab9529cfc6eb22a3756bf |
12-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am 7776408c: Merge "Adding crop UI. Fixes a number of other UI bugs." into gb-ub-photos-arches * commit '7776408c5bbd4bb2669b7a577d157dc1967e434e': Adding crop UI. Fixes a number of other UI bugs.
|
dee4a349cbfd9cb8fd3999d8dc2c4726fe6ae549 |
12-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am 7776408c: Merge "Adding crop UI. Fixes a number of other UI bugs." into gb-ub-photos-arches * commit '7776408c5bbd4bb2669b7a577d157dc1967e434e': Adding crop UI. Fixes a number of other UI bugs.
|
a1389bd3ea0016313b1585881bf3d5a29e9f1a65 |
12-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am 7776408c: Merge "Adding crop UI. Fixes a number of other UI bugs." into gb-ub-photos-arches * commit '7776408c5bbd4bb2669b7a577d157dc1967e434e': Adding crop UI. Fixes a number of other UI bugs.
|
dc2ffc6829bddefebe5bf8a077b77d750f9d02f0 |
12-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am 7776408c: Merge "Adding crop UI. Fixes a number of other UI bugs." into gb-ub-photos-arches * commit '7776408c5bbd4bb2669b7a577d157dc1967e434e': Adding crop UI. Fixes a number of other UI bugs.
|
8ee8811cf7d14d6d92d6dc34b6811c8cfa251083 |
12-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Adding crop UI. Fixes a number of other UI bugs." into gb-ub-photos-arches
|
7776408c5bbd4bb2669b7a577d157dc1967e434e |
12-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Adding crop UI. Fixes a number of other UI bugs." into gb-ub-photos-arches
|
99abd47222e829493b0757fe332bb83926c5d85d |
12-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Adding crop UI. Fixes a number of other UI bugs. Bug:7337191 Change-Id: If63dbdac6722ad4fc6c30c165d6c2eeb7011c240
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/PanelController.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterGeometry.java
rc/com/android/gallery3d/filtershow/imageshow/GeometryMetadata.java
rc/com/android/gallery3d/filtershow/imageshow/ImageCrop.java
rc/com/android/gallery3d/filtershow/imageshow/ImageGeometry.java
rc/com/android/gallery3d/filtershow/imageshow/ImageStraighten.java
|
92bf8707f67fe2a07fe2f8d0bcd48c975637af1e |
12-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Adding crop UI. Fixes a number of other UI bugs. Bug:7337191 Change-Id: If63dbdac6722ad4fc6c30c165d6c2eeb7011c240
es/layout/filtershow_activity.xml
|
62e962bcb9fc03f3cfeac5ece8d3e95fc2dd0718 |
12-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Adding crop UI. Fixes a number of other UI bugs. Bug:7337191 Change-Id: If63dbdac6722ad4fc6c30c165d6c2eeb7011c240
es/layout/filtershow_activity.xml
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/PanelController.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterGeometry.java
rc/com/android/gallery3d/filtershow/imageshow/GeometryMetadata.java
rc/com/android/gallery3d/filtershow/imageshow/ImageCrop.java
rc/com/android/gallery3d/filtershow/imageshow/ImageGeometry.java
rc/com/android/gallery3d/filtershow/imageshow/ImageStraighten.java
|
a538ea2bd78b6475d2e2f1a5c7de44fc2e39e836 |
12-Oct-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
834a5e0da57fc92aeb79fd9c3b8fc44662415c9e |
12-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Improve performance of filmstrip Bug: 7336758 Change-Id: I22dbf2e75bc069341a9bbc2c4dcdf7750f23be7f
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/data/LocalImage.java
rc/com/android/gallery3d/data/MediaObject.java
rc/com/android/gallery3d/data/UriImage.java
|
5273e8306410d19e2e2cf6234bfe0a05097be874 |
12-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Improve performance of filmstrip Bug: 7336758 Change-Id: I22dbf2e75bc069341a9bbc2c4dcdf7750f23be7f
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/data/LocalImage.java
rc/com/android/gallery3d/data/MediaObject.java
rc/com/android/gallery3d/data/UriImage.java
|
7d35ec6b1825aef22ab3d2c21959a29dc507e637 |
12-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am c1afe725: (-s ours) am 64d28ec4: am a1a4eb63: am 43b6cf3a: (-s ours) Import translations. DO NOT MERGE * commit 'c1afe7258199d371000292d537b42b3657e43328': Import translations. DO NOT MERGE
|
5d8e0ed1b16f8d2ee7a4c4785e6bc5f65294ed9a |
12-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am 95faa897: (-s ours) am b2152cd4: am 664b8541: Import translations. DO NOT MERGE * commit '95faa8972f4a421c875d1180b12ff4b2c348cc75': Import translations. DO NOT MERGE
|
c1afe7258199d371000292d537b42b3657e43328 |
12-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am 64d28ec4: am a1a4eb63: am 43b6cf3a: (-s ours) Import translations. DO NOT MERGE * commit '64d28ec48b0d17dc713a6a3f1118f3c9bcc5d471': Import translations. DO NOT MERGE
|
95faa8972f4a421c875d1180b12ff4b2c348cc75 |
12-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am b2152cd4: am 664b8541: Import translations. DO NOT MERGE * commit 'b2152cd435666e9f6be54fd2b9939b172f83eaa1': Import translations. DO NOT MERGE
|
3ab29fb2b9bb93f071253a438bf12aeae10e0702 |
12-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am 0ed91f2b: (-s ours) am 8d7f607d: Import translations. DO NOT MERGE * commit '0ed91f2ba099b640ea854de940fc673bb13a1bfa': Import translations. DO NOT MERGE
|
ee4c57fdc172ba47c5b1fb8c4e2468305e491cb4 |
12-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am 71f5a423: am b27631ba: am add0373f: am 4247c232: Merge "Moves matrix function to GeometryMetadata. Fixes scaling issues." into gb-ub-photos-arches * commit '71f5a4239bbd6c86d57eccba132516b2da8cd9ff': Moves matrix function to GeometryMetadata. Fixes scaling issues.
|
fc14d43295de22cfbb22abb5126b142d92e28329 |
12-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 910e4286: am 9f252960: am 4b2aad53: am 143a4eb4: Fix XML layout * commit '910e4286f7cb82f7a5fc41768f3d8f44a5b1673a': Fix XML layout
|
64d28ec48b0d17dc713a6a3f1118f3c9bcc5d471 |
12-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am a1a4eb63: am 43b6cf3a: (-s ours) Import translations. DO NOT MERGE * commit 'a1a4eb635173b187e26e02f37ad764a9d1c50a9b': Import translations. DO NOT MERGE
|
b2152cd435666e9f6be54fd2b9939b172f83eaa1 |
12-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am 664b8541: Import translations. DO NOT MERGE * commit '664b8541ffb24b77085a3dd0edac1ecc5b36d277': Import translations. DO NOT MERGE
|
0ed91f2ba099b640ea854de940fc673bb13a1bfa |
12-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am 8d7f607d: Import translations. DO NOT MERGE * commit '8d7f607d1473624ba0ff13e2234e49d9f18dd58d': Import translations. DO NOT MERGE
|
71f5a4239bbd6c86d57eccba132516b2da8cd9ff |
12-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am b27631ba: am add0373f: am 4247c232: Merge "Moves matrix function to GeometryMetadata. Fixes scaling issues." into gb-ub-photos-arches * commit 'b27631ba57f39d902fafd7c7ea15dca6ffa09d38': Moves matrix function to GeometryMetadata. Fixes scaling issues.
|
900bf9b177a5f8faae853b3cbe1ce818d96c6e8a |
12-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am 43b6cf3a: (-s ours) Import translations. DO NOT MERGE * commit '43b6cf3abce288ee5f26ebe4a904e0ef2b5041c6': Import translations. DO NOT MERGE
|
235d206a5eb4bd97e864f25760b8f571258297e8 |
12-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am 43b6cf3a: (-s ours) Import translations. DO NOT MERGE * commit '43b6cf3abce288ee5f26ebe4a904e0ef2b5041c6': Import translations. DO NOT MERGE
|
910e4286f7cb82f7a5fc41768f3d8f44a5b1673a |
12-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 9f252960: am 4b2aad53: am 143a4eb4: Fix XML layout * commit '9f252960ba55262cbdf8f5be03d4650821c0384b': Fix XML layout
|
a1a4eb635173b187e26e02f37ad764a9d1c50a9b |
12-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am 43b6cf3a: (-s ours) Import translations. DO NOT MERGE * commit '43b6cf3abce288ee5f26ebe4a904e0ef2b5041c6': Import translations. DO NOT MERGE
|
48ff040ccea091f399f275b4a7ec411c0a458aa1 |
12-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE"
|
73418037dd95ee1ee4ee17d101ac73749565ddb4 |
12-Oct-2012 |
Chih-Chung Chang <chihchung@google.com> |
am 29838768: am 2c4fc37c: am 9a635f78: Merge "Make getSupportedOperations() call getSupportedOperations(boolean) by default." into jb-mr1-dev * commit '29838768af9dc8e31f4cba601a28e1c164c4694f': Make getSupportedOperations() call getSupportedOperations(boolean) by default.
|
8ef81cf537afa479a7642f73e76ba9b2a45f88aa |
12-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 46219e0d: am 29bf0766: am a3c04479: am 808dbe19: Merge "Add back button handling" into gb-ub-photos-arches * commit '46219e0d680957fdacff8e9189e1b76930556b5c': Add back button handling
|
cf5b4da2532d2a806d9e33da38a6eb6181d83eb1 |
12-Oct-2012 |
Mangesh Ghiware <mghiware@google.com> |
am 30b5d57e: am eeb2fe8a: am e4474775: am 423e45e4: Refresh panorama image after stitching completion * commit '30b5d57e0ec3af38ade42730a01fe7d450380b97': Refresh panorama image after stitching completion
|
5c118e83adb85dce7fc0935dd76e35590e2161a2 |
12-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 0e4ef078: am f2ad7a4b: am 0bb15527: am 6111c54d: Fix UI * commit '0e4ef07806a15ea9bdba49e3769daad59f3b2c1f': Fix UI
|
a6912af48af38a7c0da08240d2f979cf80dcd2a4 |
12-Oct-2012 |
John Hoford <hoford@google.com> |
am bb1bbff9: am e199b012: am 756fb491: am ea5df36a: layouts, image icons, and layer behavour * commit 'bb1bbff9602016d393d195a9eff3b0afa2c72e15': layouts, image icons, and layer behavour
|
2d1236d3b35de825f0c16fa201ad870443c7af65 |
12-Oct-2012 |
Bart Sears <bsears@google.com> |
am 7646fa12: am 1a56cfc0: am f8500e40: am 7d161351: Adjust text on Apply button * commit '7646fa129d0c78e4a36d1d03f30a1606c9f5061a': Adjust text on Apply button
|
165fcd77cd80a9044e96f4b998fb27d9de2482b3 |
12-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am f44a1f8a: am d5554dc1: am 0acba30e: am 8985e064: Hide history panel for now * commit 'f44a1f8a8ceed7481e275b91ca9b7065b7abe02f': Hide history panel for now
|
d65b50d675242c9aea17ec11434861e4f8f7348a |
12-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am abb0d8d4: am b01dfa56: am 90d68928: am 8e1536da: Add new borders * commit 'abb0d8d48dea278d3242256dc4ef2843fb6fcfb2': Add new borders
|
faa09fc4366e08d21d247562ed18ce77c81905cb |
12-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 6c2c0863: am 8d60ba1b: am 5a1b150c: am e533f659: Fixes Rotate, Flip, Straighten tools. * commit '6c2c0863f21b1d790fad28d16f1258b5090b9dca': Fixes Rotate, Flip, Straighten tools.
|
cdf3b1a0b5830cf5b6433d3992b4a06ba9bc00e2 |
12-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am a58c5cd2: (-s ours) am fc06f187: am f18fa41a: am ecaa3f54: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches * commit 'a58c5cd24603cf18b21022a4671c9c7d44202b10': Import translations. DO NOT MERGE
|
0909bc81fe911106c86ed238f050927171741ea0 |
12-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am 9a1b7d88: (-s ours) am 9d5dbc2b: am fe812448: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev * commit '9a1b7d88e39f2463293db410a3870aaf91f64e93': Import translations. DO NOT MERGE
|
262d2afb9dfdfbf4e79c18592e12d9eac8b18d92 |
12-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am 016b12bf: am 871f505f: am 3d6fd0b2: am 11a21df4: Merge "Fixed apply bar text. Moved strings to xml." into gb-ub-photos-arches * commit '016b12bf46339d2082215557abfb2f9b939befac': Fixed apply bar text. Moved strings to xml.
|
368faa0b4a18fb31a6e40164abb4f1ea1a55862b |
12-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am 528e63cb: (-s ours) am 44a4d00c: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev * commit '528e63cb244b9b18224469a948d862b9f78cdddb': Import translations. DO NOT MERGE
|
29838768af9dc8e31f4cba601a28e1c164c4694f |
12-Oct-2012 |
Chih-Chung Chang <chihchung@google.com> |
am 2c4fc37c: am 9a635f78: Merge "Make getSupportedOperations() call getSupportedOperations(boolean) by default." into jb-mr1-dev * commit '2c4fc37cd86be5ca74d250e056ac466d758a93a1': Make getSupportedOperations() call getSupportedOperations(boolean) by default.
|
46219e0d680957fdacff8e9189e1b76930556b5c |
12-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 29bf0766: am a3c04479: am 808dbe19: Merge "Add back button handling" into gb-ub-photos-arches * commit '29bf0766a16654e71e8e02095a07d2590d5720e1': Add back button handling
|
30b5d57e0ec3af38ade42730a01fe7d450380b97 |
12-Oct-2012 |
Mangesh Ghiware <mghiware@google.com> |
am eeb2fe8a: am e4474775: am 423e45e4: Refresh panorama image after stitching completion * commit 'eeb2fe8ace1a932149e50886ba21fb3b89012d27': Refresh panorama image after stitching completion
|
0e4ef07806a15ea9bdba49e3769daad59f3b2c1f |
12-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am f2ad7a4b: am 0bb15527: am 6111c54d: Fix UI * commit 'f2ad7a4b82c3b0790b63b70f241824d10d3b74c3': Fix UI
|
bb1bbff9602016d393d195a9eff3b0afa2c72e15 |
12-Oct-2012 |
John Hoford <hoford@google.com> |
am e199b012: am 756fb491: am ea5df36a: layouts, image icons, and layer behavour * commit 'e199b012e8a550c5d90fdd4ece1dae57a66c9c49': layouts, image icons, and layer behavour
|
7646fa129d0c78e4a36d1d03f30a1606c9f5061a |
12-Oct-2012 |
Bart Sears <bsears@google.com> |
am 1a56cfc0: am f8500e40: am 7d161351: Adjust text on Apply button * commit '1a56cfc03e051d6d657ed56cb7434d86d552a17e': Adjust text on Apply button
|
f44a1f8a8ceed7481e275b91ca9b7065b7abe02f |
12-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am d5554dc1: am 0acba30e: am 8985e064: Hide history panel for now * commit 'd5554dc186648f53dc8b3408ac2e9d8be34526bb': Hide history panel for now
|
abb0d8d48dea278d3242256dc4ef2843fb6fcfb2 |
12-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am b01dfa56: am 90d68928: am 8e1536da: Add new borders * commit 'b01dfa56f9f5f9f4fd74d491ecd338064dc166fd': Add new borders
|
6c2c0863f21b1d790fad28d16f1258b5090b9dca |
12-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 8d60ba1b: am 5a1b150c: am e533f659: Fixes Rotate, Flip, Straighten tools. * commit '8d60ba1bc980915a6ad61280908143eb73a1e795': Fixes Rotate, Flip, Straighten tools.
|
a58c5cd24603cf18b21022a4671c9c7d44202b10 |
12-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am fc06f187: am f18fa41a: am ecaa3f54: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches * commit 'fc06f1871b9694746a482fb77cbdcde644053c9b': Import translations. DO NOT MERGE
|
9a1b7d88e39f2463293db410a3870aaf91f64e93 |
12-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am 9d5dbc2b: am fe812448: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev * commit '9d5dbc2b89d512b8c5860f31a4a1f1ccd26a4b71': Import translations. DO NOT MERGE
|
016b12bf46339d2082215557abfb2f9b939befac |
12-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am 871f505f: am 3d6fd0b2: am 11a21df4: Merge "Fixed apply bar text. Moved strings to xml." into gb-ub-photos-arches * commit '871f505f2891a50203adeb962decc589343a5f5b': Fixed apply bar text. Moved strings to xml.
|
528e63cb244b9b18224469a948d862b9f78cdddb |
12-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am 44a4d00c: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev * commit '44a4d00c5cdc0bdbf29699496fa513e890be7444': Import translations. DO NOT MERGE
|
70a96ce78b7110f3f2b940a6e06a35aa4e4030b0 |
12-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I0f2501e72eecd03a05fe6a34bb651e694c3b4c6f Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ca/strings.xml
es/values-da/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-it/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pt-rPT/strings.xml
es/values-sw/strings.xml
es/values-zu/strings.xml
|
664b8541ffb24b77085a3dd0edac1ecc5b36d277 |
12-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: If09e8be1fb2f230b36982826c27e61dc5a26924f Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ca/strings.xml
es/values-da/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-it/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pt-rPT/strings.xml
es/values-sw/strings.xml
es/values-zu/strings.xml
|
8d7f607d1473624ba0ff13e2234e49d9f18dd58d |
12-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I1275d2d1790213b060c823548671ab760bbf0021 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ca/strings.xml
es/values-da/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-it/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pt-rPT/strings.xml
es/values-sw/strings.xml
es/values-zu/strings.xml
|
5733dcce9b93fcf52fcfa0d27f559c3b25eb1bc7 |
12-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I8156611841adfcbfce2f04ac8f3fa4db6ce613f6 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ca/strings.xml
es/values-da/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-it/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pt-rPT/strings.xml
es/values-sw/strings.xml
es/values-zu/strings.xml
|
a2f523568123f3d3f6874e620c074ef1c90a1ab4 |
12-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I8156611841adfcbfce2f04ac8f3fa4db6ce613f6 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ca/strings.xml
es/values-da/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-it/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pt-rPT/strings.xml
es/values-sw/strings.xml
es/values-zu/strings.xml
|
43b6cf3abce288ee5f26ebe4a904e0ef2b5041c6 |
12-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I130961bb83f07b45368b3d77f99c9cb6f84fe96e Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ca/strings.xml
es/values-da/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-it/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pt-rPT/strings.xml
es/values-sw/strings.xml
es/values-zu/strings.xml
|
079a21c927b3d10284658e4f4fb93ab71eb727f3 |
12-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I130961bb83f07b45368b3d77f99c9cb6f84fe96e Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ca/strings.xml
es/values-da/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-it/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pt-rPT/strings.xml
es/values-sw/strings.xml
es/values-zu/strings.xml
|
b27631ba57f39d902fafd7c7ea15dca6ffa09d38 |
12-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am add0373f: am 4247c232: Merge "Moves matrix function to GeometryMetadata. Fixes scaling issues." into gb-ub-photos-arches * commit 'add0373f800459853ef4a88e16d73bd2ce1ffb6b': Moves matrix function to GeometryMetadata. Fixes scaling issues.
|
f0e1b146b028590464f6413be65baf30432c881f |
12-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am 4247c232: Merge "Moves matrix function to GeometryMetadata. Fixes scaling issues." into gb-ub-photos-arches * commit '4247c2325851501cb7f4b72ea4a4b84abc0e6da7': Moves matrix function to GeometryMetadata. Fixes scaling issues.
|
08387fede3f64454e4765746037c263d076a54b0 |
12-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am 4247c232: Merge "Moves matrix function to GeometryMetadata. Fixes scaling issues." into gb-ub-photos-arches * commit '4247c2325851501cb7f4b72ea4a4b84abc0e6da7': Moves matrix function to GeometryMetadata. Fixes scaling issues.
|
add0373f800459853ef4a88e16d73bd2ce1ffb6b |
12-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am 4247c232: Merge "Moves matrix function to GeometryMetadata. Fixes scaling issues." into gb-ub-photos-arches * commit '4247c2325851501cb7f4b72ea4a4b84abc0e6da7': Moves matrix function to GeometryMetadata. Fixes scaling issues.
|
4247c2325851501cb7f4b72ea4a4b84abc0e6da7 |
12-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Moves matrix function to GeometryMetadata. Fixes scaling issues." into gb-ub-photos-arches
|
65bd10158d16fd65da55a7b0c5451a73f17394ac |
12-Oct-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-factory-release history after reset to jb-mr1-dev
|
98de2e2ff9ab7959ee7d6035a9f87ed39ebc7537 |
12-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Moves matrix function to GeometryMetadata. Fixes scaling issues. Bug:7337191 Change-Id: Icfd50c8a07ef02f2346a8ab7b57303de3866d74d
rc/com/android/gallery3d/filtershow/filters/ImageFilterGeometry.java
rc/com/android/gallery3d/filtershow/imageshow/GeometryMetadata.java
rc/com/android/gallery3d/filtershow/imageshow/ImageGeometry.java
|
46163a396828fa000b4a53cf87811e4111e3cb88 |
12-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Moves matrix function to GeometryMetadata. Fixes scaling issues. Bug:7337191 Change-Id: Icfd50c8a07ef02f2346a8ab7b57303de3866d74d
rc/com/android/gallery3d/filtershow/filters/ImageFilterGeometry.java
rc/com/android/gallery3d/filtershow/imageshow/GeometryMetadata.java
rc/com/android/gallery3d/filtershow/imageshow/ImageGeometry.java
|
9f252960ba55262cbdf8f5be03d4650821c0384b |
12-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 4b2aad53: am 143a4eb4: Fix XML layout * commit '4b2aad53905a52ad25a6fa6a42c34e9fd8554bd5': Fix XML layout
|
4b2aad53905a52ad25a6fa6a42c34e9fd8554bd5 |
12-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 143a4eb4: Fix XML layout * commit '143a4eb4578abd5b319516a68a1b63ab27cf6ee3': Fix XML layout
|
5e7c1c10c88251a5057e73417b7694774e1f1acb |
12-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 143a4eb4: Fix XML layout * commit '143a4eb4578abd5b319516a68a1b63ab27cf6ee3': Fix XML layout
|
20c93b5a59c8947a0192a7b23cf41d95b5c33943 |
12-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 143a4eb4: Fix XML layout * commit '143a4eb4578abd5b319516a68a1b63ab27cf6ee3': Fix XML layout
|
81d573898cce793e35b4f6fea5fa1cde429e85c2 |
12-Oct-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
2c4fc37cd86be5ca74d250e056ac466d758a93a1 |
12-Oct-2012 |
Chih-Chung Chang <chihchung@google.com> |
am 9a635f78: Merge "Make getSupportedOperations() call getSupportedOperations(boolean) by default." into jb-mr1-dev * commit '9a635f78d6e10996a1ef0179989850b9e5a49e58': Make getSupportedOperations() call getSupportedOperations(boolean) by default.
|
9a635f78d6e10996a1ef0179989850b9e5a49e58 |
12-Oct-2012 |
Chih-Chung Chang <chihchung@google.com> |
Merge "Make getSupportedOperations() call getSupportedOperations(boolean) by default." into jb-mr1-dev
|
d2466773db3d0d756557b94b16eca3dd09e58f5a |
12-Oct-2012 |
Chih-Chung Chang <chihchung@google.com> |
Make getSupportedOperations() call getSupportedOperations(boolean) by default. So things will work for MediaObject who doesn't override the new method. Bug: 7336562 Change-Id: Ic9ed6211981bb91c56702eafa7b21e83ed071cef
rc/com/android/gallery3d/data/MediaObject.java
|
3cc77a66defaa84c8c26a6f5fe319fcc287520a9 |
12-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Fix XML layout bug:7302553 Change-Id: Id889c9c4ac083b85f5d85e316aee6a10bb4bbbd0
es/layout/filtershow_activity.xml
|
143a4eb4578abd5b319516a68a1b63ab27cf6ee3 |
12-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Fix XML layout bug:7302553 Change-Id: Id889c9c4ac083b85f5d85e316aee6a10bb4bbbd0
es/layout/filtershow_activity.xml
|
29bf0766a16654e71e8e02095a07d2590d5720e1 |
12-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am a3c04479: am 808dbe19: Merge "Add back button handling" into gb-ub-photos-arches * commit 'a3c0447910522b91a546c616ab0df6a3e10e6804': Add back button handling
|
a3c0447910522b91a546c616ab0df6a3e10e6804 |
12-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 808dbe19: Merge "Add back button handling" into gb-ub-photos-arches * commit '808dbe19752361ad171b58836df7f195deee8019': Add back button handling
|
d8a0b7fe4ee756fc2576cd6adf8be4484cb93bb7 |
12-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 808dbe19: Merge "Add back button handling" into gb-ub-photos-arches * commit '808dbe19752361ad171b58836df7f195deee8019': Add back button handling
|
87ac213f478feaff1c5fbcad977f62b4107ea21d |
12-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 808dbe19: Merge "Add back button handling" into gb-ub-photos-arches * commit '808dbe19752361ad171b58836df7f195deee8019': Add back button handling
|
f392c6598fd98d3e79583c827809f227071c8269 |
12-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Merge "Add back button handling" into gb-ub-photos-arches
|
808dbe19752361ad171b58836df7f195deee8019 |
12-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Merge "Add back button handling" into gb-ub-photos-arches
|
a7d7d05c8357049eb2accd75d35203c4be10cdbc |
12-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Add back button handling bug:7332980 - fix crash as well. Change-Id: Id93ee7c194df6ac5e38def2e5f0fb3c5ecc0c2e4
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/PanelController.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterWBalance.java
|
75608166f54891972ebad3d8fd958fed9a5300e6 |
12-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Add back button handling bug:7332980 - fix crash as well. Change-Id: Id93ee7c194df6ac5e38def2e5f0fb3c5ecc0c2e4
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/PanelController.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterWBalance.java
|
eeb2fe8ace1a932149e50886ba21fb3b89012d27 |
12-Oct-2012 |
Mangesh Ghiware <mghiware@google.com> |
am e4474775: am 423e45e4: Refresh panorama image after stitching completion * commit 'e4474775479cb327dfb078d6b84b586628cd9ddb': Refresh panorama image after stitching completion
|
e4474775479cb327dfb078d6b84b586628cd9ddb |
12-Oct-2012 |
Mangesh Ghiware <mghiware@google.com> |
am 423e45e4: Refresh panorama image after stitching completion * commit '423e45e492d4ebdc41ecfeba73299de23b1463c4': Refresh panorama image after stitching completion
|
a9e08bb7861ffa6e75c41cfe9156154d727b3ca4 |
12-Oct-2012 |
Mangesh Ghiware <mghiware@google.com> |
am 423e45e4: Refresh panorama image after stitching completion * commit '423e45e492d4ebdc41ecfeba73299de23b1463c4': Refresh panorama image after stitching completion
|
0af0fa99a5468baa64bc729173c63979f982def3 |
12-Oct-2012 |
Mangesh Ghiware <mghiware@google.com> |
am 423e45e4: Refresh panorama image after stitching completion * commit '423e45e492d4ebdc41ecfeba73299de23b1463c4': Refresh panorama image after stitching completion
|
c0d65a25b154985ea008decf48249d933e6996ac |
12-Oct-2012 |
Mangesh Ghiware <mghiware@google.com> |
Refresh panorama image after stitching completion Bug: 7336784 Updating photo refreshes the supported operations which indiate if said MediaItem is a panorama or not. Change-Id: If3a169c9256b3f898594a30740930b5dfd96dba0
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/data/LocalImage.java
rc/com/android/gallery3d/data/UriImage.java
|
423e45e492d4ebdc41ecfeba73299de23b1463c4 |
12-Oct-2012 |
Mangesh Ghiware <mghiware@google.com> |
Refresh panorama image after stitching completion Bug: 7336784 Updating photo refreshes the supported operations which indiate if said MediaItem is a panorama or not. Change-Id: If3a169c9256b3f898594a30740930b5dfd96dba0
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/data/LocalImage.java
rc/com/android/gallery3d/data/UriImage.java
|
46819269ee04b3443fa56bc86f018f94241703d0 |
12-Oct-2012 |
Earl Ou <shunhsingou@google.com> |
Exiftool parser This parser parse the output from Phil Harvey's 'exiftool' with -v2 flag and convert it input xml format Change-Id: Iffdb235780697f8c37738937fd4ecaeb1d1127bb
ests/exiftool_parser/parser.py
|
f579ab7314ada4d49163ebeb58861c04194dc2d4 |
12-Oct-2012 |
Earl Ou <shunhsingou@google.com> |
Exiftool parser This parser parse the output from Phil Harvey's 'exiftool' with -v2 flag and convert it input xml format Change-Id: Iffdb235780697f8c37738937fd4ecaeb1d1127bb
ests/exiftool_parser/parser.py
|
f2ad7a4b82c3b0790b63b70f241824d10d3b74c3 |
12-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 0bb15527: am 6111c54d: Fix UI * commit '0bb155271ebeb595ccb1bfce7ae6ff355007f7b0': Fix UI
|
0bb155271ebeb595ccb1bfce7ae6ff355007f7b0 |
12-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 6111c54d: Fix UI * commit '6111c54dea4d16fce6f4981d9d5bb8ed81f31af9': Fix UI
|
79d4015c2edf92c6510bea0d5a7ce9002e5bc4fa |
12-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 6111c54d: Fix UI * commit '6111c54dea4d16fce6f4981d9d5bb8ed81f31af9': Fix UI
|
dce3f1b83953b4a9fb1d863f8138b05fc72a1a7d |
12-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 6111c54d: Fix UI * commit '6111c54dea4d16fce6f4981d9d5bb8ed81f31af9': Fix UI
|
4cd9895471fd19ca4f35d70bc2df894089fe6aa7 |
12-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 6111c54d: Fix UI * commit '6111c54dea4d16fce6f4981d9d5bb8ed81f31af9': Fix UI
|
c47b09cb04b6aaae1e8acab3b2c6f9bd5dff2aee |
12-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Fix UI bug:7328726 - add one pixel border - hide parameter value on certain effects - increase scale for border icons Change-Id: Iffacec18477895701cba069500ee617bf3f9f2b7
es/layout/filtershow_activity.xml
es/values/filtershow_color.xml
|
9c53ef91923931f0d8d079760777e6f4507ae48f |
12-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Fix UI bug:7328726 - add one pixel border - hide parameter value on certain effects - increase scale for border icons Change-Id: Iffacec18477895701cba069500ee617bf3f9f2b7
rc/com/android/gallery3d/filtershow/PanelController.java
rc/com/android/gallery3d/filtershow/imageshow/ImageSmallBorder.java
|
6111c54dea4d16fce6f4981d9d5bb8ed81f31af9 |
12-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Fix UI bug:7328726 - add one pixel border - hide parameter value on certain effects - increase scale for border icons Change-Id: Iffacec18477895701cba069500ee617bf3f9f2b7
es/layout/filtershow_activity.xml
es/values/filtershow_color.xml
rc/com/android/gallery3d/filtershow/PanelController.java
rc/com/android/gallery3d/filtershow/imageshow/ImageSmallBorder.java
|
e199b012e8a550c5d90fdd4ece1dae57a66c9c49 |
12-Oct-2012 |
John Hoford <hoford@google.com> |
am 756fb491: am ea5df36a: layouts, image icons, and layer behavour * commit '756fb491bcdba5bf5d4a94f3207679830a29ea84': layouts, image icons, and layer behavour
|
756fb491bcdba5bf5d4a94f3207679830a29ea84 |
12-Oct-2012 |
John Hoford <hoford@google.com> |
am ea5df36a: layouts, image icons, and layer behavour * commit 'ea5df36ac1cdfbb569e6ba725c2df433d614d0f5': layouts, image icons, and layer behavour
|
e541b11c637d84d44943ee89ab4a0da9f3061ab7 |
12-Oct-2012 |
John Hoford <hoford@google.com> |
am ea5df36a: layouts, image icons, and layer behavour * commit 'ea5df36ac1cdfbb569e6ba725c2df433d614d0f5': layouts, image icons, and layer behavour
|
d0fa497e9d7b848691df3a3a9f708bf847cd3007 |
12-Oct-2012 |
John Hoford <hoford@google.com> |
am ea5df36a: layouts, image icons, and layer behavour * commit 'ea5df36ac1cdfbb569e6ba725c2df433d614d0f5': layouts, image icons, and layer behavour
|
8086db108d4eb62d64dd210b0b69f8a0f2ada370 |
12-Oct-2012 |
John Hoford <hoford@google.com> |
am ea5df36a: layouts, image icons, and layer behavour * commit 'ea5df36ac1cdfbb569e6ba725c2df433d614d0f5': layouts, image icons, and layer behavour
|
9091fa91be360ba04fccda1eab2b7a5f676c3a82 |
12-Oct-2012 |
John Hoford <hoford@google.com> |
layouts, image icons, and layer behavour bug:7328726 Change-Id: I94300771dd7b6ff5b4196365f13320fbc4bdde92
es/layout/filtershow_activity.xml
es/values/attrs.xml
|
1684f14224b7590a4e78b79a367ab2b481152baa |
12-Oct-2012 |
John Hoford <hoford@google.com> |
layouts, image icons, and layer behavour bug:7328726 Change-Id: I94300771dd7b6ff5b4196365f13320fbc4bdde92
rc/com/android/gallery3d/filtershow/CenteredLinearLayout.java
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/imageshow/ImageWithIcon.java
|
ea5df36ac1cdfbb569e6ba725c2df433d614d0f5 |
12-Oct-2012 |
John Hoford <hoford@google.com> |
layouts, image icons, and layer behavour bug:7328726 Change-Id: I94300771dd7b6ff5b4196365f13320fbc4bdde92
es/layout/filtershow_activity.xml
es/values/attrs.xml
rc/com/android/gallery3d/filtershow/CenteredLinearLayout.java
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/imageshow/ImageWithIcon.java
|
1a56cfc03e051d6d657ed56cb7434d86d552a17e |
12-Oct-2012 |
Bart Sears <bsears@google.com> |
am f8500e40: am 7d161351: Adjust text on Apply button * commit 'f8500e40e4d8c4b092c09162076f9c13933c5d60': Adjust text on Apply button
|
f8500e40e4d8c4b092c09162076f9c13933c5d60 |
12-Oct-2012 |
Bart Sears <bsears@google.com> |
am 7d161351: Adjust text on Apply button * commit '7d161351c5aac3f88eb61003d56f30275ad4a180': Adjust text on Apply button
|
4d662a02079937ef557e176265d7e9c94c599e44 |
12-Oct-2012 |
Bart Sears <bsears@google.com> |
am 7d161351: Adjust text on Apply button * commit '7d161351c5aac3f88eb61003d56f30275ad4a180': Adjust text on Apply button
|
017065fa1e05885146cbb044fcd1f3de3f3f69e0 |
12-Oct-2012 |
Bart Sears <bsears@google.com> |
am 7d161351: Adjust text on Apply button * commit '7d161351c5aac3f88eb61003d56f30275ad4a180': Adjust text on Apply button
|
ae050f71e01a6f686f068ca3af9250a9b5a7eda5 |
12-Oct-2012 |
Bart Sears <bsears@google.com> |
am 7d161351: Adjust text on Apply button * commit '7d161351c5aac3f88eb61003d56f30275ad4a180': Adjust text on Apply button
|
d5554dc186648f53dc8b3408ac2e9d8be34526bb |
12-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 0acba30e: am 8985e064: Hide history panel for now * commit '0acba30ebb360eeac89cf5acd51d72db88840645': Hide history panel for now
|
e63a412af626681fd7a0acf8f537abdb75e700c0 |
12-Oct-2012 |
Bart Sears <bsears@google.com> |
Adjust text on Apply button ALL CAPS was a bit loud, so go back to mixed case, lower font size to 18dip, and remove ":". Bug: 7333492 Change-Id: I18885808437e6328ec94c40df25ea0678d381825
es/layout/filtershow_activity.xml
|
bba955a6b6a6134c192c8379a4ce7913b12a8670 |
12-Oct-2012 |
Bart Sears <bsears@google.com> |
Adjust text on Apply button ALL CAPS was a bit loud, so go back to mixed case, lower font size to 18dip, and remove ":". Bug: 7333492 Change-Id: I18885808437e6328ec94c40df25ea0678d381825
rc/com/android/gallery3d/filtershow/PanelController.java
|
7d161351c5aac3f88eb61003d56f30275ad4a180 |
12-Oct-2012 |
Bart Sears <bsears@google.com> |
Adjust text on Apply button ALL CAPS was a bit loud, so go back to mixed case, lower font size to 18dip, and remove ":". Bug: 7333492 Change-Id: I18885808437e6328ec94c40df25ea0678d381825
es/layout/filtershow_activity.xml
rc/com/android/gallery3d/filtershow/PanelController.java
|
0acba30ebb360eeac89cf5acd51d72db88840645 |
12-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 8985e064: Hide history panel for now * commit '8985e0647b6a2966e710a51d4f6001faf44b5ddc': Hide history panel for now
|
fcb0f67b0e07eee4e6c45f8a68815930b5cdd584 |
12-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 8985e064: Hide history panel for now * commit '8985e0647b6a2966e710a51d4f6001faf44b5ddc': Hide history panel for now
|
5b4847ef07012a47be98e92f551526d54a2b9f03 |
12-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 8985e064: Hide history panel for now * commit '8985e0647b6a2966e710a51d4f6001faf44b5ddc': Hide history panel for now
|
b01dfa56f9f5f9f4fd74d491ecd338064dc166fd |
12-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 90d68928: am 8e1536da: Add new borders * commit '90d68928387a5d38a69cb918be5f162415b53132': Add new borders
|
fdfea9f35b93442e55889372be33e4621b8f4b2c |
12-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Hide history panel for now bug:7325872 Change-Id: Ica442d50e797a8ae73f1ddf94daee02d907583d2
es/menu/filtershow_activity_menu.xml
|
8985e0647b6a2966e710a51d4f6001faf44b5ddc |
12-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Hide history panel for now bug:7325872 Change-Id: Ica442d50e797a8ae73f1ddf94daee02d907583d2
es/menu/filtershow_activity_menu.xml
|
ba1624a581085a79da133fb18ce1296546c21511 |
12-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 8e1536da: Add new borders * commit '8e1536da92f155731d5fd729ec5b2bf00709091a': Add new borders
|
e0a46760e4819404c1d0092af64ad75a64414096 |
12-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 8e1536da: Add new borders * commit '8e1536da92f155731d5fd729ec5b2bf00709091a': Add new borders
|
b3b9dd16379b61648e86b65550bf9a6398e6941e |
12-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 8e1536da: Add new borders * commit '8e1536da92f155731d5fd729ec5b2bf00709091a': Add new borders
|
90d68928387a5d38a69cb918be5f162415b53132 |
12-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 8e1536da: Add new borders * commit '8e1536da92f155731d5fd729ec5b2bf00709091a': Add new borders
|
968fbe04d088de427646e3ea3ca53026ff8b3514 |
12-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Add new borders bug:7233749 Change-Id: I34afe40f85c72491dac7b26ea4433ede96e09a0a
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterParametricBorder.java
|
7810b5b293afd99e1da3bce238d7e09fa26fbaff |
12-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Add new borders bug:7233749 Change-Id: I34afe40f85c72491dac7b26ea4433ede96e09a0a
es/drawable/filtershow_border_4x5.9.png
es/drawable/filtershow_border_brush.9.png
es/drawable/filtershow_border_film3.9.png
es/drawable/filtershow_border_scratch3.9.png
|
8e1536da92f155731d5fd729ec5b2bf00709091a |
12-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Add new borders bug:7233749 Change-Id: I34afe40f85c72491dac7b26ea4433ede96e09a0a
es/drawable/filtershow_border_4x5.9.png
es/drawable/filtershow_border_brush.9.png
es/drawable/filtershow_border_film3.9.png
es/drawable/filtershow_border_scratch3.9.png
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterParametricBorder.java
|
8d60ba1bc980915a6ad61280908143eb73a1e795 |
12-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 5a1b150c: am e533f659: Fixes Rotate, Flip, Straighten tools. * commit '5a1b150c965a68403c77bfe6e94036bd7535b745': Fixes Rotate, Flip, Straighten tools.
|
fc06f1871b9694746a482fb77cbdcde644053c9b |
12-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am f18fa41a: am ecaa3f54: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches * commit 'f18fa41a47709f2343b209273c40d21f852502f0': Import translations. DO NOT MERGE
|
5a1b150c965a68403c77bfe6e94036bd7535b745 |
12-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am e533f659: Fixes Rotate, Flip, Straighten tools. * commit 'e533f65961ed601ded1803caeab6cef0a778d2f2': Fixes Rotate, Flip, Straighten tools.
|
f18fa41a47709f2343b209273c40d21f852502f0 |
12-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am ecaa3f54: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches * commit 'ecaa3f5474782f8333328fb312f464c56b3b73dc': Import translations. DO NOT MERGE
|
1c0da82e36f25dad052e9af8d4058d6ff417cc60 |
12-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am e533f659: Fixes Rotate, Flip, Straighten tools. * commit 'e533f65961ed601ded1803caeab6cef0a778d2f2': Fixes Rotate, Flip, Straighten tools.
|
9d467fe5a37092e2808e222efba44825a01a2cdc |
12-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am e533f659: Fixes Rotate, Flip, Straighten tools. * commit 'e533f65961ed601ded1803caeab6cef0a778d2f2': Fixes Rotate, Flip, Straighten tools.
|
691878248d58e39196b4eb089f1baf53f10d65ef |
12-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am e533f659: Fixes Rotate, Flip, Straighten tools. * commit 'e533f65961ed601ded1803caeab6cef0a778d2f2': Fixes Rotate, Flip, Straighten tools.
|
bcea53b010546ef1fe948ea7d9667e635496d55e |
12-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Fixes Rotate, Flip, Straighten tools. bug:7314849 Bug:7224232 Bug:7218935 Change-Id: I418287ff1f81c25f8e089821d823dc29ee62ff0e
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/PanelController.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterGeometry.java
rc/com/android/gallery3d/filtershow/imageshow/GeometryMetadata.java
rc/com/android/gallery3d/filtershow/imageshow/ImageCrop.java
rc/com/android/gallery3d/filtershow/imageshow/ImageFlip.java
rc/com/android/gallery3d/filtershow/imageshow/ImageGeometry.java
rc/com/android/gallery3d/filtershow/imageshow/ImageRotate.java
rc/com/android/gallery3d/filtershow/imageshow/ImageShow.java
rc/com/android/gallery3d/filtershow/imageshow/ImageSmallFilter.java
rc/com/android/gallery3d/filtershow/imageshow/ImageStraighten.java
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
|
25844e7574949fd6f5cd9f35f1e1e6697c274b20 |
12-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Fixes Rotate, Flip, Straighten tools. bug:7314849 Bug:7224232 Bug:7218935 Change-Id: I418287ff1f81c25f8e089821d823dc29ee62ff0e
es/layout/filtershow_activity.xml
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
|
e533f65961ed601ded1803caeab6cef0a778d2f2 |
12-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Fixes Rotate, Flip, Straighten tools. bug:7314849 Bug:7224232 Bug:7218935 Change-Id: I418287ff1f81c25f8e089821d823dc29ee62ff0e
es/layout/filtershow_activity.xml
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/PanelController.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterGeometry.java
rc/com/android/gallery3d/filtershow/imageshow/GeometryMetadata.java
rc/com/android/gallery3d/filtershow/imageshow/ImageCrop.java
rc/com/android/gallery3d/filtershow/imageshow/ImageFlip.java
rc/com/android/gallery3d/filtershow/imageshow/ImageGeometry.java
rc/com/android/gallery3d/filtershow/imageshow/ImageRotate.java
rc/com/android/gallery3d/filtershow/imageshow/ImageShow.java
rc/com/android/gallery3d/filtershow/imageshow/ImageSmallFilter.java
rc/com/android/gallery3d/filtershow/imageshow/ImageStraighten.java
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
|
5742617986d31d7bbd7d5e69cc33927a0a6dcb5f |
12-Oct-2012 |
Hung-ying Tyan <tyanh@google.com> |
Merge "Use exiftool as ground truth for Exif API test" into gb-ub-photos-bryce
|
ca6120a9c10be180605d4392edd231bb2304021c |
12-Oct-2012 |
Hung-ying Tyan <tyanh@google.com> |
Merge "Use exiftool as ground truth for Exif API test" into gb-ub-photos-bryce
|
cfac7925ccbc6330b6773bb0aeb2ababe9ec6941 |
12-Oct-2012 |
Hung-ying Tyan <tyanh@google.com> |
Merge "Use exiftool as ground truth for Exif API test" into gb-ub-photos-bryce
|
6a83c7e23339c04556a7c5299a3a5b9912211876 |
12-Oct-2012 |
Chris Craik <ccraik@google.com> |
am 89e30fa3: am 53cb08e1: am 20286576: am 8e9072b0: Merge "Alias com.android.camera.Camera to point at CameraActivity" into gb-ub-photos-arches * commit '89e30fa39865b357f96e15de00a9a0a7779bfce2': Alias com.android.camera.Camera to point at CameraActivity
|
dca910cf3e0f0ff18e7d0a86d16fe809e4d90963 |
12-Oct-2012 |
John Hoford <hoford@google.com> |
am 879c3950: am 9fcd67cf: am f685a36c: am a4ccb4af: Merge "fixed manta image size and double FX issue" into gb-ub-photos-arches * commit '879c3950b836a905020c071baaf1a916231abba9': fixed manta image size and double FX issue
|
9d5dbc2b89d512b8c5860f31a4a1f1ccd26a4b71 |
12-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am fe812448: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev * commit 'fe8124488e542fe41b3cb3f53edb13c65b745ee1': Import translations. DO NOT MERGE
|
a4f00eef043b869721eb1d3f56941d1900ed158d |
12-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE"
|
871f505f2891a50203adeb962decc589343a5f5b |
12-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am 3d6fd0b2: am 11a21df4: Merge "Fixed apply bar text. Moved strings to xml." into gb-ub-photos-arches * commit '3d6fd0b237fccafb3331a5f8a3505a07928f6f3d': Fixed apply bar text. Moved strings to xml.
|
8091129d920dd5cba19695eecc21b8a13c80eb66 |
12-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am ecaa3f54: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches * commit 'ecaa3f5474782f8333328fb312f464c56b3b73dc': Import translations. DO NOT MERGE
|
5c2c68e7e6f820d44541372189084713d5f5aa47 |
12-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am ecaa3f54: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches * commit 'ecaa3f5474782f8333328fb312f464c56b3b73dc': Import translations. DO NOT MERGE
|
fe8124488e542fe41b3cb3f53edb13c65b745ee1 |
12-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
|
44a4d00c5cdc0bdbf29699496fa513e890be7444 |
12-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
|
30bc1e10b4efb302eab1f9eb2069b3bad334eda0 |
12-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
|
f82f6146de47d15fbfc2454e9f47725e3ce016f0 |
12-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
|
ecaa3f5474782f8333328fb312f464c56b3b73dc |
12-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
|
6616c28733e84ff883b5b6a9852713380bf84769 |
12-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
|
3d6fd0b237fccafb3331a5f8a3505a07928f6f3d |
12-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am 11a21df4: Merge "Fixed apply bar text. Moved strings to xml." into gb-ub-photos-arches * commit '11a21df4be6984a180e27b9915a9d6af7e7ef359': Fixed apply bar text. Moved strings to xml.
|
5087f82c09d4ffa874b462007c7102fff1349033 |
12-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am 11a21df4: Merge "Fixed apply bar text. Moved strings to xml." into gb-ub-photos-arches * commit '11a21df4be6984a180e27b9915a9d6af7e7ef359': Fixed apply bar text. Moved strings to xml.
|
f58d2abc09b7f949acacf1e0d3e7ee3a54a2c925 |
12-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am 11a21df4: Merge "Fixed apply bar text. Moved strings to xml." into gb-ub-photos-arches * commit '11a21df4be6984a180e27b9915a9d6af7e7ef359': Fixed apply bar text. Moved strings to xml.
|
368ef6b8e2c38d0b0537c15338d26907764a3fc8 |
12-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am 11a21df4: Merge "Fixed apply bar text. Moved strings to xml." into gb-ub-photos-arches * commit '11a21df4be6984a180e27b9915a9d6af7e7ef359': Fixed apply bar text. Moved strings to xml.
|
faa46e509993bdba852f6ce03add6022a0e21b6e |
12-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Fixed apply bar text. Moved strings to xml." into gb-ub-photos-arches
|
11a21df4be6984a180e27b9915a9d6af7e7ef359 |
12-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Fixed apply bar text. Moved strings to xml." into gb-ub-photos-arches
|
ce3f980f08ceed504224becbceba6f647d6dfbf9 |
12-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Fixed apply bar text. Moved strings to xml." into gb-ub-photos-arches
|
89e30fa39865b357f96e15de00a9a0a7779bfce2 |
12-Oct-2012 |
Chris Craik <ccraik@google.com> |
am 53cb08e1: am 20286576: am 8e9072b0: Merge "Alias com.android.camera.Camera to point at CameraActivity" into gb-ub-photos-arches * commit '53cb08e160e30f5f2cd3eb6d98bc94773cc25adc': Alias com.android.camera.Camera to point at CameraActivity
|
53cb08e160e30f5f2cd3eb6d98bc94773cc25adc |
12-Oct-2012 |
Chris Craik <ccraik@google.com> |
am 20286576: am 8e9072b0: Merge "Alias com.android.camera.Camera to point at CameraActivity" into gb-ub-photos-arches * commit '2028657604c9a41aa3d88f09715206cf81b54bab': Alias com.android.camera.Camera to point at CameraActivity
|
879c3950b836a905020c071baaf1a916231abba9 |
12-Oct-2012 |
John Hoford <hoford@google.com> |
am 9fcd67cf: am f685a36c: am a4ccb4af: Merge "fixed manta image size and double FX issue" into gb-ub-photos-arches * commit '9fcd67cfbf8b083be865d0ba2c85a50ff0c4b780': fixed manta image size and double FX issue
|
8670386c4bbe9c392379d8173d7ab78443e26b33 |
12-Oct-2012 |
Michael Kolb <kolby@google.com> |
am db5059b6: am b600b434: am 468e33b2: am 310a93dc: Merge "Remove old 360 icons" into gb-ub-photos-arches * commit 'db5059b6159846b823fdeb1d3a0f3596eae50170': Remove old 360 icons
|
d8e51a1b67b5f4ab5e6faf6445cf533fac0dd047 |
12-Oct-2012 |
Sascha Haeberling <haeberling@google.com> |
am e3f9132e: am 23236203: am 60c536e0: am 93f074e4: Merge "Removing the disabled undo button." into gb-ub-photos-arches * commit 'e3f9132eb052abfaa0d24ab8bc5560db765969ce': Removing the disabled undo button.
|
1e00698168f58add9843bab56b97b712a8fa4c6e |
12-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am a424c48b: am e37de750: am 87da4055: am dd158691: Merge "Change ActionBar spinner text size on rotate" into gb-ub-photos-arches * commit 'a424c48b47d2d73620aab3c2172b28076fc4acb1': Change ActionBar spinner text size on rotate
|
51dec4ac93f10a588db4fc3689e8a862b1b76597 |
12-Oct-2012 |
Mangesh Ghiware <mghiware@google.com> |
am dca45faa: am d35afdce: am e7b51ae0: am 825afb1b: Move calls to LightCycleHelper off the UI thread. * commit 'dca45faa7f4361943df35492db7b401ec8d99028': Move calls to LightCycleHelper off the UI thread.
|
cdda77f357ae1d1d15b10e060c77bd6241eb1a1c |
12-Oct-2012 |
Doris Liu <tianliu@google.com> |
am 43fed005: am 2bbffd74: am abe40160: am 47df0d2f: Add more space between save icon and text * commit '43fed0051090ca6ee1c5b15dfaaedd3e99c9fd18': Add more space between save icon and text
|
41b93927316ebc6844c805badba6d76fe46ce11a |
12-Oct-2012 |
George Mount <mount@google.com> |
am c13f2b3c: am 814bef58: am b4ac748d: am 37a93336: Merge "Clear cached stitching preview thumbnails." into gb-ub-photos-arches * commit 'c13f2b3c2a685d4d43cbdc2e5e79ae516d1c03cd': Clear cached stitching preview thumbnails.
|
63b6faa64fb2f4dceced9838ac561e57c299c049 |
12-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 3fad74d5: am 4fac10d0: am ea058692: am bebc94be: Merge "Fix size of peripheral items when first opening filmstrip" into gb-ub-photos-arches * commit '3fad74d56ebd32deee267a1734254ff581f4e011': Fix size of peripheral items when first opening filmstrip
|
b5f0c87aba3d546f96b989b6cb2817e291bef1d9 |
12-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am 35c1756c: (-s ours) am eebbf294: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev * commit '35c1756c5a7882ef1d2ba828c5400fc753571af6': Import translations. DO NOT MERGE
|
4b491a37969d489bcbfdf66d45dde1f0131cbbed |
12-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am 62fe2d8f: (-s ours) am 38cacaa0: am 62e34dfe: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev * commit '62fe2d8f21745eefc3f9bcbacb305b79e667fbd7': Import translations. DO NOT MERGE
|
66829a04e46b3b3eed04ca530d47fcea76fd9fd7 |
12-Oct-2012 |
John Hoford <hoford@google.com> |
am 50716cf6: am 0ff263c5: am 11065123: am 7f34a6a5: Merge "Fix application of FX to not wipe out borders etc." into gb-ub-photos-arches * commit '50716cf6abebaa3de5b63c31dbd882a9770225c7': Fix application of FX to not wipe out borders etc.
|
5695ee8ddda6c1de8275c92da9a1ae343becd14c |
12-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am a63499a1: (-s ours) am 8bd7ff68: am e8124973: am f3dd4ce8: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches * commit 'a63499a1aeeefd96b14bc1ef8376a4b6074e925d': Import translations. DO NOT MERGE
|
6a3ac711eff27bdf6048726decf905dc2fa5f65f |
12-Oct-2012 |
John Reck <jreck@google.com> |
am f64a3a4d: am 261109bf: am 075b593a: am 5cca8b99: Fix portrait orientation on landscape devices * commit 'f64a3a4dcd4aaa39c14fdd7e66b3fdfd2f90caf8': Fix portrait orientation on landscape devices
|
52fc44a1f78918bc8f2a87a10d85ab49e2cb07e8 |
12-Oct-2012 |
Chris Craik <ccraik@google.com> |
am 8e9072b0: Merge "Alias com.android.camera.Camera to point at CameraActivity" into gb-ub-photos-arches * commit '8e9072b0a95d48caa8b1d9cdb9b385e92c33e292': Alias com.android.camera.Camera to point at CameraActivity
|
2028657604c9a41aa3d88f09715206cf81b54bab |
12-Oct-2012 |
Chris Craik <ccraik@google.com> |
am 8e9072b0: Merge "Alias com.android.camera.Camera to point at CameraActivity" into gb-ub-photos-arches * commit '8e9072b0a95d48caa8b1d9cdb9b385e92c33e292': Alias com.android.camera.Camera to point at CameraActivity
|
57d3b07018874ae67fd0a07fd84302b764763727 |
12-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ib765ec849bbe4d2d94c18b30f9195be59adfb5df Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
2a39753e75de9294f575f71675701f01888eaece |
12-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I05c99d9083d905ee1045c715a3e12389e1029f06 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
513f1f52d5c99617e13d129e67204f2fc1098978 |
12-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Iac26add0f2724c7a910f045e481400cb9cb193b2 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
d6fc101c2853196ae2bacaa8ac3f21528b21deb8 |
12-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Idcc79828efe60c1a5abd2a2c5a9b022498eb7920 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
2a9cf0d6fb972c6fa538f330bd5a7c9ed4bce5a6 |
12-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Idcc79828efe60c1a5abd2a2c5a9b022498eb7920 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
db5059b6159846b823fdeb1d3a0f3596eae50170 |
12-Oct-2012 |
Michael Kolb <kolby@google.com> |
am b600b434: am 468e33b2: am 310a93dc: Merge "Remove old 360 icons" into gb-ub-photos-arches * commit 'b600b43492afef5837052496434f2847d503637b': Remove old 360 icons
|
2b8da2b9da2b1c0e64cc922aabf8a2734ad110f3 |
12-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I8a906b470bbc7e5d15958962b6818732a85d37fb Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
4e43e2a18537f926969c4ad7e4cb8f2a87d81e16 |
12-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I8a906b470bbc7e5d15958962b6818732a85d37fb Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
8e9072b0a95d48caa8b1d9cdb9b385e92c33e292 |
12-Oct-2012 |
Chris Craik <ccraik@google.com> |
Merge "Alias com.android.camera.Camera to point at CameraActivity" into gb-ub-photos-arches
|
e3f9132eb052abfaa0d24ab8bc5560db765969ce |
12-Oct-2012 |
Sascha Haeberling <haeberling@google.com> |
am 23236203: am 60c536e0: am 93f074e4: Merge "Removing the disabled undo button." into gb-ub-photos-arches * commit '23236203371bc90821d8e9c2f7641c0003d26ac7': Removing the disabled undo button.
|
a424c48b47d2d73620aab3c2172b28076fc4acb1 |
12-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am e37de750: am 87da4055: am dd158691: Merge "Change ActionBar spinner text size on rotate" into gb-ub-photos-arches * commit 'e37de750bdc78e522ed44570e6aeaff06ab66bec': Change ActionBar spinner text size on rotate
|
dca45faa7f4361943df35492db7b401ec8d99028 |
12-Oct-2012 |
Mangesh Ghiware <mghiware@google.com> |
am d35afdce: am e7b51ae0: am 825afb1b: Move calls to LightCycleHelper off the UI thread. * commit 'd35afdce4a6735391fae7e68256f624601c6893b': Move calls to LightCycleHelper off the UI thread.
|
43fed0051090ca6ee1c5b15dfaaedd3e99c9fd18 |
12-Oct-2012 |
Doris Liu <tianliu@google.com> |
am 2bbffd74: am abe40160: am 47df0d2f: Add more space between save icon and text * commit '2bbffd7417e091ad1806e4ab0d197d20d44d500e': Add more space between save icon and text
|
9fcd67cfbf8b083be865d0ba2c85a50ff0c4b780 |
12-Oct-2012 |
John Hoford <hoford@google.com> |
am f685a36c: am a4ccb4af: Merge "fixed manta image size and double FX issue" into gb-ub-photos-arches * commit 'f685a36c85c9b8182f9afdcd98df3338a9b5b3ed': fixed manta image size and double FX issue
|
5aeb472a4fdcd0a01cca92ff2b50a19c644b5983 |
12-Oct-2012 |
John Hoford <hoford@google.com> |
am a4ccb4af: Merge "fixed manta image size and double FX issue" into gb-ub-photos-arches * commit 'a4ccb4af475fbabf637dd48bf68db449ea7c8197': fixed manta image size and double FX issue
|
da2d1c4c1b5951f417936d6b951d66edc43a6ac9 |
12-Oct-2012 |
John Hoford <hoford@google.com> |
am a4ccb4af: Merge "fixed manta image size and double FX issue" into gb-ub-photos-arches * commit 'a4ccb4af475fbabf637dd48bf68db449ea7c8197': fixed manta image size and double FX issue
|
e119d2e0b79f6b110bbdf2bfa88ae6455be843ef |
12-Oct-2012 |
John Hoford <hoford@google.com> |
am a4ccb4af: Merge "fixed manta image size and double FX issue" into gb-ub-photos-arches * commit 'a4ccb4af475fbabf637dd48bf68db449ea7c8197': fixed manta image size and double FX issue
|
c13f2b3c2a685d4d43cbdc2e5e79ae516d1c03cd |
12-Oct-2012 |
George Mount <mount@google.com> |
am 814bef58: am b4ac748d: am 37a93336: Merge "Clear cached stitching preview thumbnails." into gb-ub-photos-arches * commit '814bef58c622cc8f86a68a88de47affddee584b3': Clear cached stitching preview thumbnails.
|
f685a36c85c9b8182f9afdcd98df3338a9b5b3ed |
12-Oct-2012 |
John Hoford <hoford@google.com> |
am a4ccb4af: Merge "fixed manta image size and double FX issue" into gb-ub-photos-arches * commit 'a4ccb4af475fbabf637dd48bf68db449ea7c8197': fixed manta image size and double FX issue
|
3fad74d56ebd32deee267a1734254ff581f4e011 |
12-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 4fac10d0: am ea058692: am bebc94be: Merge "Fix size of peripheral items when first opening filmstrip" into gb-ub-photos-arches * commit '4fac10d003fd27ccfa83f28d4e218ac9f6cec39e': Fix size of peripheral items when first opening filmstrip
|
35c1756c5a7882ef1d2ba828c5400fc753571af6 |
12-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am eebbf294: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev * commit 'eebbf294f97c46061490cce0d664926204683df7': Import translations. DO NOT MERGE
|
62fe2d8f21745eefc3f9bcbacb305b79e667fbd7 |
12-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am 38cacaa0: am 62e34dfe: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev * commit '38cacaa012058eb0912f051a838b21876fa91a92': Import translations. DO NOT MERGE
|
50716cf6abebaa3de5b63c31dbd882a9770225c7 |
12-Oct-2012 |
John Hoford <hoford@google.com> |
am 0ff263c5: am 11065123: am 7f34a6a5: Merge "Fix application of FX to not wipe out borders etc." into gb-ub-photos-arches * commit '0ff263c54b34df4cb418d12b35e31adab8444fc3': Fix application of FX to not wipe out borders etc.
|
a63499a1aeeefd96b14bc1ef8376a4b6074e925d |
12-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am 8bd7ff68: am e8124973: am f3dd4ce8: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches * commit '8bd7ff68a14acc362b8bd8aad024da874eb6b31a': Import translations. DO NOT MERGE
|
f64a3a4dcd4aaa39c14fdd7e66b3fdfd2f90caf8 |
12-Oct-2012 |
John Reck <jreck@google.com> |
am 261109bf: am 075b593a: am 5cca8b99: Fix portrait orientation on landscape devices * commit '261109bf4527197f4118f9886aa3951655767dec': Fix portrait orientation on landscape devices
|
ab7c2af9e2bad52c27329dd7fa47a1780794ff8e |
12-Oct-2012 |
John Hoford <hoford@google.com> |
Merge "fixed manta image size and double FX issue" into gb-ub-photos-arches
|
4b186225c685bca13dbfee641f9939a004294d37 |
12-Oct-2012 |
John Hoford <hoford@google.com> |
Merge "fixed manta image size and double FX issue" into gb-ub-photos-arches
|
a4ccb4af475fbabf637dd48bf68db449ea7c8197 |
12-Oct-2012 |
John Hoford <hoford@google.com> |
Merge "fixed manta image size and double FX issue" into gb-ub-photos-arches
|
b600b43492afef5837052496434f2847d503637b |
12-Oct-2012 |
Michael Kolb <kolby@google.com> |
am 468e33b2: am 310a93dc: Merge "Remove old 360 icons" into gb-ub-photos-arches * commit '468e33b2475be63accd296dad51251cf1714494d': Remove old 360 icons
|
e04a2e291cfae63f52243547468c3ca11e2b902b |
12-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Fixed apply bar text. Moved strings to xml. Bug: 7333492 Change-Id: I650a7178e5351c98d0bf5808ccdf6c597a88dada
rc/com/android/gallery3d/filtershow/PanelController.java
|
8d3c2837cf91a7fca7782b82950471d4656d15a8 |
12-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Fixed apply bar text. Moved strings to xml. Bug: 7333492 Change-Id: I650a7178e5351c98d0bf5808ccdf6c597a88dada
es/layout/filtershow_activity.xml
es/values/filtershow_strings.xml
rc/com/android/gallery3d/filtershow/PanelController.java
|
7909f39d809f8f9ecbb2519fda94ad948c24722d |
12-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Fixed apply bar text. Moved strings to xml. Bug: 7333492 Change-Id: I650a7178e5351c98d0bf5808ccdf6c597a88dada
es/layout/filtershow_activity.xml
es/values/filtershow_strings.xml
|
a91a1d5ec5aaad6b68f74ba485f7470956e2865f |
12-Oct-2012 |
Michael Kolb <kolby@google.com> |
am 310a93dc: Merge "Remove old 360 icons" into gb-ub-photos-arches * commit '310a93dc17574f3595b03da6988a2fbf3b382f51': Remove old 360 icons
|
63d46d02018979802733dde735a8ea5fca36ed05 |
12-Oct-2012 |
Michael Kolb <kolby@google.com> |
am 310a93dc: Merge "Remove old 360 icons" into gb-ub-photos-arches * commit '310a93dc17574f3595b03da6988a2fbf3b382f51': Remove old 360 icons
|
468e33b2475be63accd296dad51251cf1714494d |
12-Oct-2012 |
Michael Kolb <kolby@google.com> |
am 310a93dc: Merge "Remove old 360 icons" into gb-ub-photos-arches * commit '310a93dc17574f3595b03da6988a2fbf3b382f51': Remove old 360 icons
|
310a93dc17574f3595b03da6988a2fbf3b382f51 |
12-Oct-2012 |
Michael Kolb <kolby@google.com> |
Merge "Remove old 360 icons" into gb-ub-photos-arches
|
3a987f7beef8d193050ad78ef8bff93ab85173b8 |
12-Oct-2012 |
Michael Kolb <kolby@google.com> |
Merge "Remove old 360 icons" into gb-ub-photos-arches
|
23236203371bc90821d8e9c2f7641c0003d26ac7 |
12-Oct-2012 |
Sascha Haeberling <haeberling@google.com> |
am 60c536e0: am 93f074e4: Merge "Removing the disabled undo button." into gb-ub-photos-arches * commit '60c536e0cb27b085c14c78f421ed3cd5517b36be': Removing the disabled undo button.
|
a58261a13c1c5a4c4ba48f797463511c87d6aede |
12-Oct-2012 |
Sascha Haeberling <haeberling@google.com> |
am 93f074e4: Merge "Removing the disabled undo button." into gb-ub-photos-arches * commit '93f074e4672b81a5a4e38ea7ddebe3c916ccddfd': Removing the disabled undo button.
|
d7755fd684f5861ff1a7c159683806f0ed23ce35 |
12-Oct-2012 |
Sascha Haeberling <haeberling@google.com> |
am 93f074e4: Merge "Removing the disabled undo button." into gb-ub-photos-arches * commit '93f074e4672b81a5a4e38ea7ddebe3c916ccddfd': Removing the disabled undo button.
|
60c536e0cb27b085c14c78f421ed3cd5517b36be |
12-Oct-2012 |
Sascha Haeberling <haeberling@google.com> |
am 93f074e4: Merge "Removing the disabled undo button." into gb-ub-photos-arches * commit '93f074e4672b81a5a4e38ea7ddebe3c916ccddfd': Removing the disabled undo button.
|
93f074e4672b81a5a4e38ea7ddebe3c916ccddfd |
12-Oct-2012 |
Sascha Haeberling <haeberling@google.com> |
Merge "Removing the disabled undo button." into gb-ub-photos-arches
|
b1aed9bcb451b3d513b75ac41d08cb4f0565c245 |
12-Oct-2012 |
Sascha Haeberling <haeberling@google.com> |
Merge "Removing the disabled undo button." into gb-ub-photos-arches
|
52b9206d159ba44e9caddb66865261d9930ba2b1 |
11-Oct-2012 |
Chris Craik <ccraik@google.com> |
Alias com.android.camera.Camera to point at CameraActivity bug:7291128 Change-Id: Id6649024516ba79fa042284db95d29a37552eef4
ndroidManifest.xml
|
09473aa0a53d451c791ca402a343e49cce2c31c5 |
11-Oct-2012 |
Chris Craik <ccraik@google.com> |
Alias com.android.camera.Camera to point at CameraActivity bug:7291128 Change-Id: Id6649024516ba79fa042284db95d29a37552eef4
ndroidManifest.xml
|
76ae4397699935090a6f61d237240b0054c2661b |
12-Oct-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
e3350bd872a5ff4b1ba2de251643b80d31e9d5b5 |
12-Oct-2012 |
Michael Kolb <kolby@google.com> |
Remove old 360 icons Bug: 7331839 Change-Id: Ie2de6336cd1c485ddacf51b6092c29f6feb9e4da
es/drawable-hdpi/ic_menu_photosphere.png
es/drawable-hdpi/ic_menu_photosphere_active.png
es/drawable-mdpi/ic_menu_photosphere.png
es/drawable-mdpi/ic_menu_photosphere_active.png
es/drawable-xhdpi/ic_menu_photosphere.png
es/drawable-xhdpi/ic_menu_photosphere_active.png
es/layout/photopage_bottom_controls.xml
|
d3cc4b0c68bfe6677f9f3b1028a179b27bb5df7f |
12-Oct-2012 |
Michael Kolb <kolby@google.com> |
Remove old 360 icons Bug: 7331839 Change-Id: Ie2de6336cd1c485ddacf51b6092c29f6feb9e4da
es/drawable-hdpi/ic_menu_photosphere.png
es/drawable-hdpi/ic_menu_photosphere_active.png
es/drawable-mdpi/ic_menu_photosphere.png
es/drawable-mdpi/ic_menu_photosphere_active.png
es/drawable-xhdpi/ic_menu_photosphere.png
es/drawable-xhdpi/ic_menu_photosphere_active.png
es/layout/photopage_bottom_controls.xml
|
d3a5231ab09ff2ddca3776107a8a7fac292703f0 |
12-Oct-2012 |
Sascha Haeberling <haeberling@google.com> |
Removing the disabled undo button. Bug: 7333546 Addendum to http://go/ag//#/c/238167/ Change-Id: If39d93ffa9367ecd6b731c2c32ed0cab055000f4
es/drawable/btn_undo.xml
es/drawable/filtershow_button_undo_disabled.png
|
f0ff0e35a5a95937a2038668dce64274a232f73d |
12-Oct-2012 |
Sascha Haeberling <haeberling@google.com> |
Removing the disabled undo button. Bug: 7333546 Addendum to http://go/ag//#/c/238167/ Change-Id: If39d93ffa9367ecd6b731c2c32ed0cab055000f4
es/drawable/btn_undo.xml
es/drawable/filtershow_button_undo_disabled.png
|
e37de750bdc78e522ed44570e6aeaff06ab66bec |
12-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 87da4055: am dd158691: Merge "Change ActionBar spinner text size on rotate" into gb-ub-photos-arches * commit '87da4055bb066419e0d41114e4ac160730532dff': Change ActionBar spinner text size on rotate
|
9191bd974dd8920cdf6b1efecdb09153b667e2d7 |
12-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am dd158691: Merge "Change ActionBar spinner text size on rotate" into gb-ub-photos-arches * commit 'dd1586912b5da958b33a0d9f07312160d1cb103b': Change ActionBar spinner text size on rotate
|
af1f4d2a500fdc191c7e987a7e1596c2ac2581d6 |
12-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am dd158691: Merge "Change ActionBar spinner text size on rotate" into gb-ub-photos-arches * commit 'dd1586912b5da958b33a0d9f07312160d1cb103b': Change ActionBar spinner text size on rotate
|
14581255659bb12fc5fabadcd7d0fa4e35b59a5e |
12-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am dd158691: Merge "Change ActionBar spinner text size on rotate" into gb-ub-photos-arches * commit 'dd1586912b5da958b33a0d9f07312160d1cb103b': Change ActionBar spinner text size on rotate
|
87da4055bb066419e0d41114e4ac160730532dff |
12-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am dd158691: Merge "Change ActionBar spinner text size on rotate" into gb-ub-photos-arches * commit 'dd1586912b5da958b33a0d9f07312160d1cb103b': Change ActionBar spinner text size on rotate
|
41e5ba847a36925e78f76c5b59898ae907e42d95 |
12-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Change ActionBar spinner text size on rotate" into gb-ub-photos-arches
|
dd1586912b5da958b33a0d9f07312160d1cb103b |
12-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Change ActionBar spinner text size on rotate" into gb-ub-photos-arches
|
1f142b2e508b44d1692425f04060ff8d880fb310 |
12-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Change ActionBar spinner text size on rotate" into gb-ub-photos-arches
|
d35afdce4a6735391fae7e68256f624601c6893b |
12-Oct-2012 |
Mangesh Ghiware <mghiware@google.com> |
am e7b51ae0: am 825afb1b: Move calls to LightCycleHelper off the UI thread. * commit 'e7b51ae035063faf4da2544db8452442cf36df59': Move calls to LightCycleHelper off the UI thread.
|
59b7ded957cd0b49589ad711dd8105d74a0a23ab |
12-Oct-2012 |
Mangesh Ghiware <mghiware@google.com> |
am 825afb1b: Move calls to LightCycleHelper off the UI thread. * commit '825afb1b3e7d15b5c258d664ee008dc68da1c407': Move calls to LightCycleHelper off the UI thread.
|
6ede9665e8dce7fa984cbd4fc3459a6d80358c5e |
12-Oct-2012 |
Mangesh Ghiware <mghiware@google.com> |
am 825afb1b: Move calls to LightCycleHelper off the UI thread. * commit '825afb1b3e7d15b5c258d664ee008dc68da1c407': Move calls to LightCycleHelper off the UI thread.
|
e7b51ae035063faf4da2544db8452442cf36df59 |
12-Oct-2012 |
Mangesh Ghiware <mghiware@google.com> |
am 825afb1b: Move calls to LightCycleHelper off the UI thread. * commit '825afb1b3e7d15b5c258d664ee008dc68da1c407': Move calls to LightCycleHelper off the UI thread.
|
e2473e774b6cd144069d77ef27927a89ca9d5113 |
11-Oct-2012 |
Mangesh Ghiware <mghiware@google.com> |
Move calls to LightCycleHelper off the UI thread. Bug: 7320303 Replace multiple methods in LightCycleHelper with a single one that returns relevant metadata. Change-Id: Iaa75b3c1ccc8a5b724b253cec654b5b5acb4878e
allerycommon/src/com/android/gallery3d/util/ThreadPool.java
|
83e7d70bccd93c348d70048e1add3cc1c4ac33c6 |
11-Oct-2012 |
Mangesh Ghiware <mghiware@google.com> |
Move calls to LightCycleHelper off the UI thread. Bug: 7320303 Replace multiple methods in LightCycleHelper with a single one that returns relevant metadata. Change-Id: Iaa75b3c1ccc8a5b724b253cec654b5b5acb4878e
allerycommon/src/com/android/gallery3d/util/ThreadPool.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/data/DataManager.java
rc/com/android/gallery3d/data/LocalImage.java
rc/com/android/gallery3d/data/MediaItem.java
rc/com/android/gallery3d/data/MediaObject.java
rc/com/android/gallery3d/data/PanoramaMetadataJob.java
rc/com/android/gallery3d/data/UriImage.java
rc/com/android/gallery3d/ui/ActionModeHandler.java
rc_pd/com/android/gallery3d/util/LightCycleHelper.java
|
825afb1b3e7d15b5c258d664ee008dc68da1c407 |
11-Oct-2012 |
Mangesh Ghiware <mghiware@google.com> |
Move calls to LightCycleHelper off the UI thread. Bug: 7320303 Replace multiple methods in LightCycleHelper with a single one that returns relevant metadata. Change-Id: Iaa75b3c1ccc8a5b724b253cec654b5b5acb4878e
allerycommon/src/com/android/gallery3d/util/ThreadPool.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/data/DataManager.java
rc/com/android/gallery3d/data/LocalImage.java
rc/com/android/gallery3d/data/MediaItem.java
rc/com/android/gallery3d/data/MediaObject.java
rc/com/android/gallery3d/data/PanoramaMetadataJob.java
rc/com/android/gallery3d/data/UriImage.java
rc/com/android/gallery3d/ui/ActionModeHandler.java
rc_pd/com/android/gallery3d/util/LightCycleHelper.java
|
e6db54f80fafd755121a02ff1e0460bbc1cbfde8 |
11-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Change ActionBar spinner text size on rotate Bug: 7333151 Update the grid/filmstrip spinner switch text to look and behave like the text in the Gmail app, as requested by UX. Change-Id: If822b21899172a35402477868d4f146a8e00cfea
rc/com/android/gallery3d/app/AbstractGalleryActivity.java
rc/com/android/gallery3d/app/GalleryActionBar.java
|
5d4b8fd9fd2e601b780c027ef912c8fabfe3ee1e |
11-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Change ActionBar spinner text size on rotate Bug: 7333151 Update the grid/filmstrip spinner switch text to look and behave like the text in the Gmail app, as requested by UX. Change-Id: If822b21899172a35402477868d4f146a8e00cfea
es/layout/action_bar_two_line_text.xml
es/values-land/styles.xml
es/values/styles.xml
rc/com/android/gallery3d/app/AbstractGalleryActivity.java
rc/com/android/gallery3d/app/GalleryActionBar.java
|
40d60a4162f863380f228cd53d47eeb156114b2a |
11-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Change ActionBar spinner text size on rotate Bug: 7333151 Update the grid/filmstrip spinner switch text to look and behave like the text in the Gmail app, as requested by UX. Change-Id: If822b21899172a35402477868d4f146a8e00cfea
es/layout/action_bar_two_line_text.xml
es/values-land/styles.xml
es/values/styles.xml
|
2bbffd7417e091ad1806e4ab0d197d20d44d500e |
12-Oct-2012 |
Doris Liu <tianliu@google.com> |
am abe40160: am 47df0d2f: Add more space between save icon and text * commit 'abe4016010184a230a45b5ae8fdca88a0ef21672': Add more space between save icon and text
|
cdd48d97dc7c198eed08433d1e436acda5ca753f |
12-Oct-2012 |
Doris Liu <tianliu@google.com> |
am 47df0d2f: Add more space between save icon and text * commit '47df0d2ffb68ae01ee7732b890c4510b8a167616': Add more space between save icon and text
|
76abf8ad8e3faaf91e4e666977df9d41a2be874e |
12-Oct-2012 |
Doris Liu <tianliu@google.com> |
am 47df0d2f: Add more space between save icon and text * commit '47df0d2ffb68ae01ee7732b890c4510b8a167616': Add more space between save icon and text
|
abe4016010184a230a45b5ae8fdca88a0ef21672 |
12-Oct-2012 |
Doris Liu <tianliu@google.com> |
am 47df0d2f: Add more space between save icon and text * commit '47df0d2ffb68ae01ee7732b890c4510b8a167616': Add more space between save icon and text
|
47df0d2ffb68ae01ee7732b890c4510b8a167616 |
11-Oct-2012 |
Doris Liu <tianliu@google.com> |
Add more space between save icon and text Bug: 7333278 Change-Id: Ief263b9cecc3448b85d00c0e5fc05e8b80cc9bdd
es/layout/filtershow_actionbar.xml
|
55e26859a9255d617b6b9b2e72fb2c077831ca0e |
11-Oct-2012 |
Doris Liu <tianliu@google.com> |
Add more space between save icon and text Bug: 7333278 Change-Id: Ief263b9cecc3448b85d00c0e5fc05e8b80cc9bdd
es/layout/filtershow_actionbar.xml
|
5bb3102e71bb3b9954bc710b0e81f5a60f7b5784 |
11-Oct-2012 |
John Hoford <hoford@google.com> |
fixed manta image size and double FX issue bug:7328636 Change-Id: I572255c65fb2d461dce6f52d056be6b3c4d987f6
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/cache/ImageLoader.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterParametricBorder.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterVignette.java
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
|
4006377c78dfa97a973cfd985dae99f5de06b838 |
11-Oct-2012 |
John Hoford <hoford@google.com> |
fixed manta image size and double FX issue bug:7328636 Change-Id: I572255c65fb2d461dce6f52d056be6b3c4d987f6
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
|
fafb2edbb9928039b887f59685d82593bd79e06a |
11-Oct-2012 |
John Hoford <hoford@google.com> |
fixed manta image size and double FX issue bug:7328636 Change-Id: I572255c65fb2d461dce6f52d056be6b3c4d987f6
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/cache/ImageLoader.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterParametricBorder.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterVignette.java
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
|
fdff8bc8658c541d00aefdfa74ac9d61b1853eed |
05-Oct-2012 |
Earl Ou <shunhsingou@google.com> |
Use exiftool as ground truth for Exif API test The ground truth XML file was generated by parsing the output from Phil Harvey's exiftool. Then we can test photos from 5000+ different camera provided by exiftool's website. Change-Id: Ida2c0409929be450a3cbb4331504aadb41138bea
rc/com/android/gallery3d/exif/ExifTag.java
ests/src/com/android/gallery3d/exif/ExifParserTest.java
ests/src/com/android/gallery3d/exif/ExifReaderTest.java
ests/src/com/android/gallery3d/exif/ExifXmlReader.java
|
e031a282d67ea1f05ca716be1d80693a480af266 |
05-Oct-2012 |
Earl Ou <shunhsingou@google.com> |
Use exiftool as ground truth for Exif API test The ground truth XML file was generated by parsing the output from Phil Harvey's exiftool. Then we can test photos from 5000+ different camera provided by exiftool's website. Change-Id: Ida2c0409929be450a3cbb4331504aadb41138bea
rc/com/android/gallery3d/exif/ExifTag.java
ests/res/xml/galaxy_nexus.xml
ests/src/com/android/gallery3d/exif/ExifParserTest.java
ests/src/com/android/gallery3d/exif/ExifReaderTest.java
ests/src/com/android/gallery3d/exif/ExifXmlReader.java
|
74054c450aa39eee11743bef68b9d55531dbd3b1 |
05-Oct-2012 |
Earl Ou <shunhsingou@google.com> |
Use exiftool as ground truth for Exif API test The ground truth XML file was generated by parsing the output from Phil Harvey's exiftool. Then we can test photos from 5000+ different camera provided by exiftool's website. Change-Id: Ida2c0409929be450a3cbb4331504aadb41138bea
ests/res/xml/galaxy_nexus.xml
|
814bef58c622cc8f86a68a88de47affddee584b3 |
11-Oct-2012 |
George Mount <mount@google.com> |
am b4ac748d: am 37a93336: Merge "Clear cached stitching preview thumbnails." into gb-ub-photos-arches * commit 'b4ac748ddeb297b8f87e71182ef93c3b57fe2049': Clear cached stitching preview thumbnails.
|
968e68d546ca9c8943afe1e179d6c2174390c39e |
11-Oct-2012 |
George Mount <mount@google.com> |
am 37a93336: Merge "Clear cached stitching preview thumbnails." into gb-ub-photos-arches * commit '37a9333651cead185d982d9b809cb3425a24d3d8': Clear cached stitching preview thumbnails.
|
055128707a91e963483fb7bc6fcf51864141c393 |
11-Oct-2012 |
George Mount <mount@google.com> |
am 37a93336: Merge "Clear cached stitching preview thumbnails." into gb-ub-photos-arches * commit '37a9333651cead185d982d9b809cb3425a24d3d8': Clear cached stitching preview thumbnails.
|
b4ac748ddeb297b8f87e71182ef93c3b57fe2049 |
11-Oct-2012 |
George Mount <mount@google.com> |
am 37a93336: Merge "Clear cached stitching preview thumbnails." into gb-ub-photos-arches * commit '37a9333651cead185d982d9b809cb3425a24d3d8': Clear cached stitching preview thumbnails.
|
1ac23d436d226a926adc5685b8cf30a32a0afea7 |
11-Oct-2012 |
George Mount <mount@google.com> |
Merge "Clear cached stitching preview thumbnails." into gb-ub-photos-arches
|
37a9333651cead185d982d9b809cb3425a24d3d8 |
11-Oct-2012 |
George Mount <mount@google.com> |
Merge "Clear cached stitching preview thumbnails." into gb-ub-photos-arches
|
4fac10d003fd27ccfa83f28d4e218ac9f6cec39e |
11-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am ea058692: am bebc94be: Merge "Fix size of peripheral items when first opening filmstrip" into gb-ub-photos-arches * commit 'ea058692b6be37e9abb6f3b002428dfd4abd6e70': Fix size of peripheral items when first opening filmstrip
|
98cc24e5356e36053e82ffb3188b0b3e464a4b17 |
11-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am bebc94be: Merge "Fix size of peripheral items when first opening filmstrip" into gb-ub-photos-arches * commit 'bebc94be08667b474587592169155e6cb9855e77': Fix size of peripheral items when first opening filmstrip
|
b5cff603db486ee2bf48d92a8aba4593629a6243 |
11-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am bebc94be: Merge "Fix size of peripheral items when first opening filmstrip" into gb-ub-photos-arches * commit 'bebc94be08667b474587592169155e6cb9855e77': Fix size of peripheral items when first opening filmstrip
|
ea058692b6be37e9abb6f3b002428dfd4abd6e70 |
11-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am bebc94be: Merge "Fix size of peripheral items when first opening filmstrip" into gb-ub-photos-arches * commit 'bebc94be08667b474587592169155e6cb9855e77': Fix size of peripheral items when first opening filmstrip
|
eebbf294f97c46061490cce0d664926204683df7 |
11-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
|
90745850829f264d2111b9dc0694b5f865807a2c |
11-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE"
|
44ee4e0a23c2b15c9377b190e27a8243c221a921 |
11-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Fix size of peripheral items when first opening filmstrip" into gb-ub-photos-arches
|
bebc94be08667b474587592169155e6cb9855e77 |
11-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Fix size of peripheral items when first opening filmstrip" into gb-ub-photos-arches
|
38cacaa012058eb0912f051a838b21876fa91a92 |
11-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am 62e34dfe: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev * commit '62e34dfe4d0ab148595b7b0a7172b150e8a25601': Import translations. DO NOT MERGE
|
0ff263c54b34df4cb418d12b35e31adab8444fc3 |
11-Oct-2012 |
John Hoford <hoford@google.com> |
am 11065123: am 7f34a6a5: Merge "Fix application of FX to not wipe out borders etc." into gb-ub-photos-arches * commit '110651236a1ce10c360de0b0ed761514281d61d8': Fix application of FX to not wipe out borders etc.
|
62e34dfe4d0ab148595b7b0a7172b150e8a25601 |
11-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
|
f5bab021272fb7b0a1da5d3b796d6631cb059def |
11-Oct-2012 |
John Hoford <hoford@google.com> |
am 7f34a6a5: Merge "Fix application of FX to not wipe out borders etc." into gb-ub-photos-arches * commit '7f34a6a5f21209c22584680f280723584e2c28e7': Fix application of FX to not wipe out borders etc.
|
039533359d63574fa098e1076dfa4ce7c1d0b17d |
11-Oct-2012 |
John Hoford <hoford@google.com> |
am 7f34a6a5: Merge "Fix application of FX to not wipe out borders etc." into gb-ub-photos-arches * commit '7f34a6a5f21209c22584680f280723584e2c28e7': Fix application of FX to not wipe out borders etc.
|
490480bc2cf8f1fb9a18aa845552f65b08a7b672 |
11-Oct-2012 |
John Hoford <hoford@google.com> |
am 7f34a6a5: Merge "Fix application of FX to not wipe out borders etc." into gb-ub-photos-arches * commit '7f34a6a5f21209c22584680f280723584e2c28e7': Fix application of FX to not wipe out borders etc.
|
110651236a1ce10c360de0b0ed761514281d61d8 |
11-Oct-2012 |
John Hoford <hoford@google.com> |
am 7f34a6a5: Merge "Fix application of FX to not wipe out borders etc." into gb-ub-photos-arches * commit '7f34a6a5f21209c22584680f280723584e2c28e7': Fix application of FX to not wipe out borders etc.
|
8bd7ff68a14acc362b8bd8aad024da874eb6b31a |
11-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am e8124973: am f3dd4ce8: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches * commit 'e8124973c4e78652df05a21a1ce69e8624d45390': Import translations. DO NOT MERGE
|
353cdcead467a6d5ab57f1d86501239abe11a25a |
11-Oct-2012 |
John Hoford <hoford@google.com> |
Merge "Fix application of FX to not wipe out borders etc." into gb-ub-photos-arches
|
fa1df1cdba23fa7bbc2c2d9203f6f9c300e3ef30 |
11-Oct-2012 |
John Hoford <hoford@google.com> |
Merge "Fix application of FX to not wipe out borders etc." into gb-ub-photos-arches
|
7f34a6a5f21209c22584680f280723584e2c28e7 |
11-Oct-2012 |
John Hoford <hoford@google.com> |
Merge "Fix application of FX to not wipe out borders etc." into gb-ub-photos-arches
|
386647a07f077d8472e4b884d85002ed5d44ee8a |
11-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am f3dd4ce8: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches * commit 'f3dd4ce8620390b8a041afbc045fc789b6e17ad1': Import translations. DO NOT MERGE
|
fc0e789252916ffb0ee43f7c586fa16f32f7c3e9 |
11-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am f3dd4ce8: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches * commit 'f3dd4ce8620390b8a041afbc045fc789b6e17ad1': Import translations. DO NOT MERGE
|
e8124973c4e78652df05a21a1ce69e8624d45390 |
11-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am f3dd4ce8: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches * commit 'f3dd4ce8620390b8a041afbc045fc789b6e17ad1': Import translations. DO NOT MERGE
|
46ab8d6410c13d4688134727a28630cdc1ad4c0d |
11-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
|
cfefd777646fe6bac44e4e443e745cf5142f47e1 |
11-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
|
261109bf4527197f4118f9886aa3951655767dec |
11-Oct-2012 |
John Reck <jreck@google.com> |
am 075b593a: am 5cca8b99: Fix portrait orientation on landscape devices * commit '075b593a4fe8a0613cc1edf43ee93ba525ccdc41': Fix portrait orientation on landscape devices
|
92c3de91d591489990a4471bde0a9cb256f3dee6 |
11-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
|
f3dd4ce8620390b8a041afbc045fc789b6e17ad1 |
11-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
|
1cd69ac342b927d254af2e4ddaa7e7c71a41855e |
11-Oct-2012 |
John Reck <jreck@google.com> |
am 5cca8b99: Fix portrait orientation on landscape devices * commit '5cca8b99bebe6a9fbb191a8e1364b81e309a1390': Fix portrait orientation on landscape devices
|
c0236ee78393cd9053e8cb1ea97c1166055e9477 |
11-Oct-2012 |
John Reck <jreck@google.com> |
am 5cca8b99: Fix portrait orientation on landscape devices * commit '5cca8b99bebe6a9fbb191a8e1364b81e309a1390': Fix portrait orientation on landscape devices
|
075b593a4fe8a0613cc1edf43ee93ba525ccdc41 |
11-Oct-2012 |
John Reck <jreck@google.com> |
am 5cca8b99: Fix portrait orientation on landscape devices * commit '5cca8b99bebe6a9fbb191a8e1364b81e309a1390': Fix portrait orientation on landscape devices
|
56167dd2d97641d45c2e2a967a7629710c41bd32 |
11-Oct-2012 |
George Mount <mount@google.com> |
Clear cached stitching preview thumbnails. Bug 7328408 Change-Id: Ifbc469dc9eef95025cd8e828a0df80e76d2ff064
allerycommon/src/com/android/gallery3d/common/BlobCache.java
|
c33eee56b585929499dd34435f07257db4f5c245 |
11-Oct-2012 |
George Mount <mount@google.com> |
Clear cached stitching preview thumbnails. Bug 7328408 Change-Id: Ifbc469dc9eef95025cd8e828a0df80e76d2ff064
allerycommon/src/com/android/gallery3d/common/BlobCache.java
rc/com/android/gallery3d/data/ImageCacheService.java
|
1c35ad56a274a8c1b6a60197855c0b838c4e1022 |
11-Oct-2012 |
George Mount <mount@google.com> |
Clear cached stitching preview thumbnails. Bug 7328408 Change-Id: Ifbc469dc9eef95025cd8e828a0df80e76d2ff064
allerycommon/src/com/android/gallery3d/common/BlobCache.java
rc/com/android/gallery3d/data/ImageCacheService.java
|
031055b7841a8c886c55860597fb3f426067b5a2 |
11-Oct-2012 |
John Reck <jreck@google.com> |
Fix portrait orientation on landscape devices Bug: 7328349 Change-Id: I0f871ea56e6afb5ba0b54cac15c18f79db07f4f9
rc/com/android/gallery3d/app/OrientationManager.java
|
5cca8b99bebe6a9fbb191a8e1364b81e309a1390 |
11-Oct-2012 |
John Reck <jreck@google.com> |
Fix portrait orientation on landscape devices Bug: 7328349 Change-Id: I0f871ea56e6afb5ba0b54cac15c18f79db07f4f9
rc/com/android/gallery3d/app/OrientationManager.java
|
6f1dfae8dff9114b59d4ae4e44a6cec68d791950 |
11-Oct-2012 |
John Hoford <hoford@google.com> |
Fix application of FX to not wipe out borders etc. bug:7289442 Change-Id: I9efdfdc1d8a8c02a718e91a089b531ff26fd582d
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/PanelController.java
rc/com/android/gallery3d/filtershow/filters/ImageFilter.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterBorder.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterFx.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterWBalance.java
rc/com/android/gallery3d/filtershow/imageshow/ImageSmallFilter.java
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
rc/com/android/gallery3d/filtershow/presets/ImagePresetFX.java
rc/com/android/gallery3d/filtershow/ui/ImageCurves.java
|
f6bd896c681524675dfe2514cf86cc74bbb13b30 |
11-Oct-2012 |
John Hoford <hoford@google.com> |
Fix application of FX to not wipe out borders etc. bug:7289442 Change-Id: I9efdfdc1d8a8c02a718e91a089b531ff26fd582d
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
rc/com/android/gallery3d/filtershow/presets/ImagePresetFX.java
|
a19830b4fd9050b48386cd904d99cfd2566cc515 |
11-Oct-2012 |
John Hoford <hoford@google.com> |
Fix application of FX to not wipe out borders etc. bug:7289442 Change-Id: I9efdfdc1d8a8c02a718e91a089b531ff26fd582d
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/PanelController.java
rc/com/android/gallery3d/filtershow/filters/ImageFilter.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterBorder.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterFx.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterWBalance.java
rc/com/android/gallery3d/filtershow/imageshow/ImageSmallFilter.java
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
rc/com/android/gallery3d/filtershow/presets/ImagePresetFX.java
rc/com/android/gallery3d/filtershow/ui/ImageCurves.java
|
ebe163886bfb458481bad6e3f5f2d25123c2c21a |
11-Oct-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-factory-release history after reset to jb-mr1-dev
|
a3c9121598d45abff58ec6f778a32c1f3c2fc13c |
11-Oct-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am 07c338b2: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '07c338b273ded37774997409771eb9f51dd0ff71':
|
07c338b273ded37774997409771eb9f51dd0ff71 |
11-Oct-2012 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with jb-mr1-release - do not merge Change-Id: I3b25f3be4ac925e05cc72ff901944db93a6707af
|
9d395ac90add21c6959064ac3f718728b4973b5d |
11-Oct-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
77a49459dcd75d7174b88d51886be16909f2672e |
11-Oct-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am 62bb3720: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '62bb3720dc21d015b634ac879b44e4c425330375': Fix NPE due to progress bar not existing.
|
62bb3720dc21d015b634ac879b44e4c425330375 |
11-Oct-2012 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with jb-mr1-release - do not merge Change-Id: Ib71f045b334b0f3548a6fda74f7e2ce2253d4bda
|
584907300993449f2ef0e27f4ace320817c667b8 |
11-Oct-2012 |
Owen Lin <owenlin@google.com> |
Revert "Revert "Upload screennails in tiles to prevent jank"" This reverts commit ad7cf187bf0c11b05aa3eab7085148e0353f2af5. bug: 6399444 Change-Id: I94b286ab3e0db21c582cbfa9183489613da30edb
rc/com/android/gallery3d/app/PhotoDataAdapter.java
rc/com/android/gallery3d/ui/BasicTexture.java
rc/com/android/gallery3d/ui/BitmapScreenNail.java
rc/com/android/gallery3d/ui/GLCanvas.java
rc/com/android/gallery3d/ui/GLCanvasImpl.java
rc/com/android/gallery3d/ui/TileImageView.java
rc/com/android/gallery3d/ui/TiledTexture.java
ests/src/com/android/gallery3d/ui/GLCanvasStub.java
|
a8f3473271cb4bfc5b47f520402bad7cddb5d3e8 |
11-Oct-2012 |
Owen Lin <owenlin@google.com> |
Revert "Revert "Upload screennails in tiles to prevent jank"" This reverts commit ad7cf187bf0c11b05aa3eab7085148e0353f2af5. bug: 6399444 Change-Id: I94b286ab3e0db21c582cbfa9183489613da30edb
rc/com/android/gallery3d/app/PhotoDataAdapter.java
rc/com/android/gallery3d/ui/BasicTexture.java
rc/com/android/gallery3d/ui/BitmapScreenNail.java
rc/com/android/gallery3d/ui/GLCanvas.java
rc/com/android/gallery3d/ui/GLCanvasImpl.java
rc/com/android/gallery3d/ui/TileImageView.java
rc/com/android/gallery3d/ui/TiledTexture.java
ests/src/com/android/gallery3d/ui/GLCanvasStub.java
|
63ef8cd536315a7a4d26d8bfb093a5ed9e095f2b |
11-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am 1bcdf7da: am 6c4ace2a: am b6adfcf8: am fb6edb42: Remove compare and reset from apply bar and fix text. * commit '1bcdf7dac72ad060266997047102a051d28184a0': Remove compare and reset from apply bar and fix text.
|
1bcdf7dac72ad060266997047102a051d28184a0 |
11-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am 6c4ace2a: am b6adfcf8: am fb6edb42: Remove compare and reset from apply bar and fix text. * commit '6c4ace2a8d1299ff6f840212b4bff841a1571fda': Remove compare and reset from apply bar and fix text.
|
6c4ace2a8d1299ff6f840212b4bff841a1571fda |
11-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am b6adfcf8: am fb6edb42: Remove compare and reset from apply bar and fix text. * commit 'b6adfcf8a485da464378bb8907698a08852a68ed': Remove compare and reset from apply bar and fix text.
|
b34b0a32078676e01d9413ba3aa299cc1aeee9a6 |
11-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am fb6edb42: Remove compare and reset from apply bar and fix text. * commit 'fb6edb42e7e0b132844d4e87c2a76c758f48b684': Remove compare and reset from apply bar and fix text.
|
97d570264c56dc7eaf50ce30d4a948e12b14b7f2 |
11-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am fb6edb42: Remove compare and reset from apply bar and fix text. * commit 'fb6edb42e7e0b132844d4e87c2a76c758f48b684': Remove compare and reset from apply bar and fix text.
|
a8ebd11b2e462e411521b5c4475a3efcdf98cffe |
11-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am fb6edb42: Remove compare and reset from apply bar and fix text. * commit 'fb6edb42e7e0b132844d4e87c2a76c758f48b684': Remove compare and reset from apply bar and fix text.
|
b6adfcf8a485da464378bb8907698a08852a68ed |
11-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am fb6edb42: Remove compare and reset from apply bar and fix text. * commit 'fb6edb42e7e0b132844d4e87c2a76c758f48b684': Remove compare and reset from apply bar and fix text.
|
fb6edb42e7e0b132844d4e87c2a76c758f48b684 |
11-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Remove compare and reset from apply bar and fix text. Bug: 7326079 Change-Id: Ifb4d42ec9f30b9c2c6d46e943ca36c915a15c024
es/layout/filtershow_activity.xml
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/PanelController.java
|
83e27e04f86e933824b3ac944462ed88c508037c |
11-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Remove compare and reset from apply bar and fix text. Bug: 7326079 Change-Id: Ifb4d42ec9f30b9c2c6d46e943ca36c915a15c024
es/layout/filtershow_activity.xml
|
823824122d04c9b0073f3bd13c292abdec210de9 |
11-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Remove compare and reset from apply bar and fix text. Bug: 7326079 Change-Id: Ifb4d42ec9f30b9c2c6d46e943ca36c915a15c024
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/PanelController.java
|
bb0f0f36ade854f4608913897c05520d5f94e1b0 |
11-Oct-2012 |
Bart Sears <bsears@google.com> |
am 8fad2640: am 7836cef9: am 6190cbd6: am 73c60cee: Merge "Hide unwanted scrollbars in editor" into gb-ub-photos-arches * commit '8fad2640bfbfdf2d8377dfdcf6a47190f3ba7e4b': Hide unwanted scrollbars in editor
|
07b99cf3c57eedd975c6a88e3c0cf244ee4a5161 |
11-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 3e7c93e0: am 38a8ee6d: am 23c1f701: am 7761357f: Behavior of camera filmstrip in gallery closer to camera * commit '3e7c93e0e794ac6c6535847f1afe088902858aab': Behavior of camera filmstrip in gallery closer to camera
|
8fad2640bfbfdf2d8377dfdcf6a47190f3ba7e4b |
11-Oct-2012 |
Bart Sears <bsears@google.com> |
am 7836cef9: am 6190cbd6: am 73c60cee: Merge "Hide unwanted scrollbars in editor" into gb-ub-photos-arches * commit '7836cef9596d365655387d587e36e4db7b0ab988': Hide unwanted scrollbars in editor
|
3e7c93e0e794ac6c6535847f1afe088902858aab |
11-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 38a8ee6d: am 23c1f701: am 7761357f: Behavior of camera filmstrip in gallery closer to camera * commit '38a8ee6d63497308dd185deddd1d0db2efe50c35': Behavior of camera filmstrip in gallery closer to camera
|
7836cef9596d365655387d587e36e4db7b0ab988 |
11-Oct-2012 |
Bart Sears <bsears@google.com> |
am 6190cbd6: am 73c60cee: Merge "Hide unwanted scrollbars in editor" into gb-ub-photos-arches * commit '6190cbd657b98f3ba74548f2d883c84cbc290af5': Hide unwanted scrollbars in editor
|
38a8ee6d63497308dd185deddd1d0db2efe50c35 |
11-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 23c1f701: am 7761357f: Behavior of camera filmstrip in gallery closer to camera * commit '23c1f701d84b2e006afa8f3c9a073fc5a34922cb': Behavior of camera filmstrip in gallery closer to camera
|
6190cbd657b98f3ba74548f2d883c84cbc290af5 |
11-Oct-2012 |
Bart Sears <bsears@google.com> |
am 73c60cee: Merge "Hide unwanted scrollbars in editor" into gb-ub-photos-arches * commit '73c60ceed9a8df0907cee52d804100f65771f3b6': Hide unwanted scrollbars in editor
|
a15e953cdb2fb0a3a3aff9b23a69afb98758583a |
11-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 537e1771: am 0e74d473: am a261467e: am 4d302b8a: Fix NPE in PhotoPage.updateMenuOperations * commit '537e17718f78b003f3c0de41b55495e12a7db590': Fix NPE in PhotoPage.updateMenuOperations
|
20a8e3cfd42c633f7054ef376396916300ea9071 |
11-Oct-2012 |
Bart Sears <bsears@google.com> |
am 73c60cee: Merge "Hide unwanted scrollbars in editor" into gb-ub-photos-arches * commit '73c60ceed9a8df0907cee52d804100f65771f3b6': Hide unwanted scrollbars in editor
|
a16b9e84cfb2a2dd7cc99699d26a64dd15ca8636 |
11-Oct-2012 |
Bart Sears <bsears@google.com> |
am 73c60cee: Merge "Hide unwanted scrollbars in editor" into gb-ub-photos-arches * commit '73c60ceed9a8df0907cee52d804100f65771f3b6': Hide unwanted scrollbars in editor
|
23c1f701d84b2e006afa8f3c9a073fc5a34922cb |
11-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 7761357f: Behavior of camera filmstrip in gallery closer to camera * commit '7761357f4a55de6745ac5172355d1a09a9a37492': Behavior of camera filmstrip in gallery closer to camera
|
73c60ceed9a8df0907cee52d804100f65771f3b6 |
11-Oct-2012 |
Bart Sears <bsears@google.com> |
Merge "Hide unwanted scrollbars in editor" into gb-ub-photos-arches
|
537e17718f78b003f3c0de41b55495e12a7db590 |
11-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 0e74d473: am a261467e: am 4d302b8a: Fix NPE in PhotoPage.updateMenuOperations * commit '0e74d473b3be1ef365f254496919a2610b8e90ed': Fix NPE in PhotoPage.updateMenuOperations
|
b9882366934e060efc77c07a830bc09bab5df6aa |
11-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 7761357f: Behavior of camera filmstrip in gallery closer to camera * commit '7761357f4a55de6745ac5172355d1a09a9a37492': Behavior of camera filmstrip in gallery closer to camera
|
4151e93a0d15928b99d8c1952ba0b0df84c4f95b |
11-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 7761357f: Behavior of camera filmstrip in gallery closer to camera * commit '7761357f4a55de6745ac5172355d1a09a9a37492': Behavior of camera filmstrip in gallery closer to camera
|
0e74d473b3be1ef365f254496919a2610b8e90ed |
11-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am a261467e: am 4d302b8a: Fix NPE in PhotoPage.updateMenuOperations * commit 'a261467ecd5cc8433728185b31e3660c279a3be0': Fix NPE in PhotoPage.updateMenuOperations
|
039966884a3ff7eae251fb4d92dd08d9710384c4 |
11-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Behavior of camera filmstrip in gallery closer to camera Bug: 7329118 Change-Id: I0a5753db301cc53050251455439555aa7ae414c4
rc/com/android/gallery3d/app/PhotoPage.java
|
7761357f4a55de6745ac5172355d1a09a9a37492 |
11-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Behavior of camera filmstrip in gallery closer to camera Bug: 7329118 Change-Id: I0a5753db301cc53050251455439555aa7ae414c4
rc/com/android/gallery3d/app/PhotoPage.java
|
06cb0326c05545e1cbd01991504213972868186c |
11-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 4d302b8a: Fix NPE in PhotoPage.updateMenuOperations * commit '4d302b8a826ece492c2abefd56b780a65899663e': Fix NPE in PhotoPage.updateMenuOperations
|
032a5a866ab99c5429f6d6537107bfd9700f1bf5 |
11-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 4d302b8a: Fix NPE in PhotoPage.updateMenuOperations * commit '4d302b8a826ece492c2abefd56b780a65899663e': Fix NPE in PhotoPage.updateMenuOperations
|
a261467ecd5cc8433728185b31e3660c279a3be0 |
11-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 4d302b8a: Fix NPE in PhotoPage.updateMenuOperations * commit '4d302b8a826ece492c2abefd56b780a65899663e': Fix NPE in PhotoPage.updateMenuOperations
|
29cb7d2b2f03d72a9f3cb67097cf753cb2e2d6eb |
11-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Fix size of peripheral items when first opening filmstrip Bug: 7327570 Change-Id: I168a0297e9ac65786dbb05c02228665a67f80dff
rc/com/android/gallery3d/ui/PhotoView.java
|
3ed6ae23e43be73c83b6be3dcaafe7400a7b3355 |
11-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Fix size of peripheral items when first opening filmstrip Bug: 7327570 Change-Id: I168a0297e9ac65786dbb05c02228665a67f80dff
rc/com/android/gallery3d/ui/PhotoView.java
|
67ca0a789b0f9765990f90f4ff030ae08e44ac17 |
11-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Hide unwanted scrollbars in editor Bug: 7327321 Change-Id: I445ea9e223698da2ee587c3f63f1dd0d9b9c692a
es/layout/filtershow_activity.xml
|
91e5e893c1728f887ea461523f1d8960417a4a55 |
11-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Hide unwanted scrollbars in editor Bug: 7327321 Change-Id: I445ea9e223698da2ee587c3f63f1dd0d9b9c692a
es/layout/filtershow_activity.xml
|
4efd36382462f902e916d89da461ec15eac5fe52 |
11-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Fix NPE in PhotoPage.updateMenuOperations Bug: 7324012 Change-Id: If09d20b7ab64abe9020f7f6301356ed9a4155d5b
rc/com/android/gallery3d/app/PhotoPage.java
|
4d302b8a826ece492c2abefd56b780a65899663e |
11-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Fix NPE in PhotoPage.updateMenuOperations Bug: 7324012 Change-Id: If09d20b7ab64abe9020f7f6301356ed9a4155d5b
rc/com/android/gallery3d/app/PhotoPage.java
|
abf99a0c2cd9779557c377ac4880df2a72b5f9fb |
11-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 32f01266: am 4205f17d: am bba49368: am c735669f: Merge "Make album set grid view reflect latest UI mocks" into gb-ub-photos-arches * commit '32f012668bf5ef546983129310dfa71996eebfed': Make album set grid view reflect latest UI mocks
|
ddc3c6eaabb4641a432b636ac4889b40da452e41 |
11-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 51c84ced: am 4bd978f3: am 3def40b3: am f8a46874: Merge "Defer expensive UI updates in filmstrip" into gb-ub-photos-arches * commit '51c84ced942c7dc4986881418968032a6c6f62d1': Defer expensive UI updates in filmstrip
|
32f012668bf5ef546983129310dfa71996eebfed |
11-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 4205f17d: am bba49368: am c735669f: Merge "Make album set grid view reflect latest UI mocks" into gb-ub-photos-arches * commit '4205f17dbc5a50d04bd7c15ffca95e8946d27dd2': Make album set grid view reflect latest UI mocks
|
51c84ced942c7dc4986881418968032a6c6f62d1 |
11-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 4bd978f3: am 3def40b3: am f8a46874: Merge "Defer expensive UI updates in filmstrip" into gb-ub-photos-arches * commit '4bd978f3d661b8696755ecbd7733310f8caac1f0': Defer expensive UI updates in filmstrip
|
4205f17dbc5a50d04bd7c15ffca95e8946d27dd2 |
11-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am bba49368: am c735669f: Merge "Make album set grid view reflect latest UI mocks" into gb-ub-photos-arches * commit 'bba49368f54aa24d85b701fbd12a82da8b9e0ea8': Make album set grid view reflect latest UI mocks
|
4bd978f3d661b8696755ecbd7733310f8caac1f0 |
11-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 3def40b3: am f8a46874: Merge "Defer expensive UI updates in filmstrip" into gb-ub-photos-arches * commit '3def40b34a4712fd54fef397e81d4a1b802d37c5': Defer expensive UI updates in filmstrip
|
bba49368f54aa24d85b701fbd12a82da8b9e0ea8 |
11-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am c735669f: Merge "Make album set grid view reflect latest UI mocks" into gb-ub-photos-arches * commit 'c735669fdbd1aec674412f43e64b956e8c10b643': Make album set grid view reflect latest UI mocks
|
d223b7f02fcfe520d3f53eaec97f6cd08bd09296 |
11-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am c735669f: Merge "Make album set grid view reflect latest UI mocks" into gb-ub-photos-arches * commit 'c735669fdbd1aec674412f43e64b956e8c10b643': Make album set grid view reflect latest UI mocks
|
198ed0e8be56f93b44a9eae860bb705fc9823dbb |
11-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am c735669f: Merge "Make album set grid view reflect latest UI mocks" into gb-ub-photos-arches * commit 'c735669fdbd1aec674412f43e64b956e8c10b643': Make album set grid view reflect latest UI mocks
|
f2316dd7da5f5b0e4f5bc6fce899ca6fe4f63651 |
11-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am c735669f: Merge "Make album set grid view reflect latest UI mocks" into gb-ub-photos-arches * commit 'c735669fdbd1aec674412f43e64b956e8c10b643': Make album set grid view reflect latest UI mocks
|
96442bc44c18160583867ad464509c74644a927a |
11-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Make album set grid view reflect latest UI mocks" into gb-ub-photos-arches
|
c735669fdbd1aec674412f43e64b956e8c10b643 |
11-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Make album set grid view reflect latest UI mocks" into gb-ub-photos-arches
|
1eea7d4ceb5622d210121a24514f7536e66c0f90 |
11-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Make album set grid view reflect latest UI mocks" into gb-ub-photos-arches
|
3def40b34a4712fd54fef397e81d4a1b802d37c5 |
11-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am f8a46874: Merge "Defer expensive UI updates in filmstrip" into gb-ub-photos-arches * commit 'f8a46874235b3169a68f8bd6566c81b44de34e7a': Defer expensive UI updates in filmstrip
|
a3917bb0f70d998201ed3d72ad58dbc02cc85a2c |
11-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am f8a46874: Merge "Defer expensive UI updates in filmstrip" into gb-ub-photos-arches * commit 'f8a46874235b3169a68f8bd6566c81b44de34e7a': Defer expensive UI updates in filmstrip
|
1a52a6af5c42c3e3cbfdf001cb5175f4bed8c9d6 |
11-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am f8a46874: Merge "Defer expensive UI updates in filmstrip" into gb-ub-photos-arches * commit 'f8a46874235b3169a68f8bd6566c81b44de34e7a': Defer expensive UI updates in filmstrip
|
f8a46874235b3169a68f8bd6566c81b44de34e7a |
11-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Defer expensive UI updates in filmstrip" into gb-ub-photos-arches
|
0e0499519c8dd419f463b9f5c25b63e0de4c6648 |
11-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE"
|
3442fc631fe7026d42d77bd7f6cc718320d3e6f3 |
11-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am 89945c51: am 84680ee4: am d4bf5947: am f984e5cf: Merge "Removed "Show Image State" and "Settings" from overflow menu." into gb-ub-photos-arches * commit '89945c5159dcb6490e492e0acb13874617610da4': Removed "Show Image State" and "Settings" from overflow menu.
|
89945c5159dcb6490e492e0acb13874617610da4 |
11-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am 84680ee4: am d4bf5947: am f984e5cf: Merge "Removed "Show Image State" and "Settings" from overflow menu." into gb-ub-photos-arches * commit '84680ee480c36ef0585a10ef26a30dc557013494': Removed "Show Image State" and "Settings" from overflow menu.
|
84680ee480c36ef0585a10ef26a30dc557013494 |
11-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am d4bf5947: am f984e5cf: Merge "Removed "Show Image State" and "Settings" from overflow menu." into gb-ub-photos-arches * commit 'd4bf5947fc8ac24660812ba4bdaddce6d05e301f': Removed "Show Image State" and "Settings" from overflow menu.
|
da9ad13d16c4c9ad30ace08a02e54e4603cd37af |
11-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am f984e5cf: Merge "Removed "Show Image State" and "Settings" from overflow menu." into gb-ub-photos-arches * commit 'f984e5cfd19e4f6ba7256a7d3dc9a51df0a1abc3': Removed "Show Image State" and "Settings" from overflow menu.
|
d4bf5947fc8ac24660812ba4bdaddce6d05e301f |
11-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am f984e5cf: Merge "Removed "Show Image State" and "Settings" from overflow menu." into gb-ub-photos-arches * commit 'f984e5cfd19e4f6ba7256a7d3dc9a51df0a1abc3': Removed "Show Image State" and "Settings" from overflow menu.
|
e565422f03f1a1c19407a15bf50703397ab54177 |
11-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am f984e5cf: Merge "Removed "Show Image State" and "Settings" from overflow menu." into gb-ub-photos-arches * commit 'f984e5cfd19e4f6ba7256a7d3dc9a51df0a1abc3': Removed "Show Image State" and "Settings" from overflow menu.
|
f3cecb3022070dd9fb36a4ffd8f3daaa16c746b4 |
11-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Removed "Show Image State" and "Settings" from overflow menu." into gb-ub-photos-arches
|
f984e5cfd19e4f6ba7256a7d3dc9a51df0a1abc3 |
11-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Removed "Show Image State" and "Settings" from overflow menu." into gb-ub-photos-arches
|
be3f53079c8b4368bd06fd8a567d0dd3a9645995 |
11-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am f80d39b5: am 23424708: am 836489b8: am 4e0ca74a: Change "Save" button in editor * commit 'f80d39b543c00622c6485a9f7391937a4f3b8cb8': Change "Save" button in editor
|
f80d39b543c00622c6485a9f7391937a4f3b8cb8 |
11-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 23424708: am 836489b8: am 4e0ca74a: Change "Save" button in editor * commit '234247087a197a93b0684a5b5b2ceb8c0b753acb': Change "Save" button in editor
|
234247087a197a93b0684a5b5b2ceb8c0b753acb |
11-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 836489b8: am 4e0ca74a: Change "Save" button in editor * commit '836489b8e12df6a720adf3149f55aa7da1b2397b': Change "Save" button in editor
|
cbdfb49962a03689519b93f057bd0e2a3a65c925 |
11-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 4e0ca74a: Change "Save" button in editor * commit '4e0ca74a064737b8f90c4f29b29ac17be596a68f': Change "Save" button in editor
|
836489b8e12df6a720adf3149f55aa7da1b2397b |
11-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 4e0ca74a: Change "Save" button in editor * commit '4e0ca74a064737b8f90c4f29b29ac17be596a68f': Change "Save" button in editor
|
c02f7a232d3bb27b9380d2de3f27a5cb57178b9c |
11-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 4e0ca74a: Change "Save" button in editor * commit '4e0ca74a064737b8f90c4f29b29ac17be596a68f': Change "Save" button in editor
|
2539fd7f95568bdd97034c9099ab3020f4e96c43 |
11-Oct-2012 |
George Mount <mount@google.com> |
Fix NPE due to progress bar not existing. Bug 7325685 Change-Id: I5e24b4f8a0ee4016c122e14702e3ae575f5bb56f
rc/com/android/gallery3d/app/PhotoPage.java
|
ad07e7d984e8d29bd9999b96d2673236b2c9a3ff |
11-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Make album set grid view reflect latest UI mocks Bug: 7300836 Change-Id: I3024b8ffbba7ee08642012c80509992335bbd5bf
rc/com/android/gallery3d/app/Config.java
rc/com/android/gallery3d/ui/AlbumSetSlotRenderer.java
|
8a8b9cfdd15bf36ccd068563451d98a011a5eeab |
11-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Make album set grid view reflect latest UI mocks Bug: 7300836 Change-Id: I3024b8ffbba7ee08642012c80509992335bbd5bf
es/values/colors.xml
es/values/dimensions.xml
rc/com/android/gallery3d/app/Config.java
rc/com/android/gallery3d/ui/AlbumSetSlotRenderer.java
|
49bb98386468759453b3ad9f420739dca477f5d4 |
11-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Make album set grid view reflect latest UI mocks Bug: 7300836 Change-Id: I3024b8ffbba7ee08642012c80509992335bbd5bf
es/values/colors.xml
es/values/dimensions.xml
|
76cb9887eeb99e52939f2b031d4cad29f7560fe0 |
11-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Removed "Show Image State" and "Settings" from overflow menu. Bug: 7324739 Change-Id: I0830b70552da76c798d046c8471e7c1fe8fc57df
es/menu/filtershow_activity_menu.xml
|
66a3c4b7767bee92de525cfe3496348eadcf0ac8 |
11-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Removed "Show Image State" and "Settings" from overflow menu. Bug: 7324739 Change-Id: I0830b70552da76c798d046c8471e7c1fe8fc57df
es/menu/filtershow_activity_menu.xml
|
25c949fc3219f17ad403383e3db8a6a4d75b454e |
11-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Change "Save" button in editor Bug: Change-Id: Ib395812e0eeb83f6d6089142ba8474bf43cd186a
es/drawable-hdpi/ic_menu_savephoto.png
es/drawable-mdpi/ic_menu_savephoto.png
es/drawable-xhdpi/ic_menu_savephoto.png
es/layout/filtershow_actionbar.xml
|
4e0ca74a064737b8f90c4f29b29ac17be596a68f |
11-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Change "Save" button in editor Bug: Change-Id: Ib395812e0eeb83f6d6089142ba8474bf43cd186a
es/drawable-hdpi/ic_menu_savephoto.png
es/drawable-mdpi/ic_menu_savephoto.png
es/drawable-xhdpi/ic_menu_savephoto.png
es/layout/filtershow_actionbar.xml
|
ed2205d0c091f090ef2476e6e58ac29da7768f54 |
10-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Defer expensive UI updates in filmstrip Bug: 7322925 When using the filmstrip, delay expensive updates to the action bar and share menus, some of which may require disk accesses, until the rate of change of photos slows down, instead of doing this work for every single image that flies by. Change-Id: Ie82adb4d54c96fec837d5954a91e1d4a17f548dd
rc/com/android/gallery3d/app/PhotoPage.java
|
e23a9d412cba5a202405e1c99c0cf080949db2c7 |
10-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Defer expensive UI updates in filmstrip Bug: 7322925 When using the filmstrip, delay expensive updates to the action bar and share menus, some of which may require disk accesses, until the rate of change of photos slows down, instead of doing this work for every single image that flies by. Change-Id: Ie82adb4d54c96fec837d5954a91e1d4a17f548dd
rc/com/android/gallery3d/app/PhotoPage.java
|
62a9126e262204f56ac35761cac5bd6d261a74cb |
11-Oct-2012 |
George Mount <mount@google.com> |
am 685d5348: am b5e1683c: am 2306d785: am 2cb4269e: Merge "Fix NPE due to progress bar not existing." into gb-ub-photos-arches * commit '685d53486bba32ecf85a13c7e69464c4c3dcdb48': Fix NPE due to progress bar not existing.
|
56b0c1b69053ead12a15dcac0ea0a0aa181ab8d9 |
11-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 680e6dde: am f8017799: am 2ebc18fb: am df2aecb6: Merge "Change "Done" to "Save" in editor" into gb-ub-photos-arches * commit '680e6ddee0f8c0631baa96cebdc8963d98d69afd': Change "Done" to "Save" in editor
|
f829f02deaca92d2fd3e797533b42f6144b441c7 |
11-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 1e3c1518: am d7e5b700: am cceb7244: am b4a3f476: Merge "Change FilterShow theme and extra remove gray line" into gb-ub-photos-arches * commit '1e3c15180199e3b6caf0b0fa87bd231bf23c8904': Change FilterShow theme and extra remove gray line
|
f7609dacfc8557b56817611927dce6a75c8b2fec |
11-Oct-2012 |
John Hoford <hoford@google.com> |
am ec9f3f89: am 91d8084a: am 810f8dff: am 53f24f0f: forced fx bitmaps to load unscaled * commit 'ec9f3f891afadc9ae91f9f6de174ebc02011ac0a': forced fx bitmaps to load unscaled
|
685d53486bba32ecf85a13c7e69464c4c3dcdb48 |
11-Oct-2012 |
George Mount <mount@google.com> |
am b5e1683c: am 2306d785: am 2cb4269e: Merge "Fix NPE due to progress bar not existing." into gb-ub-photos-arches * commit 'b5e1683c509d6a58dc3e9ef8b208cc980f791b34': Fix NPE due to progress bar not existing.
|
680e6ddee0f8c0631baa96cebdc8963d98d69afd |
11-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am f8017799: am 2ebc18fb: am df2aecb6: Merge "Change "Done" to "Save" in editor" into gb-ub-photos-arches * commit 'f8017799cee3908d61a6d5fc8a10efcf010c9fe3': Change "Done" to "Save" in editor
|
b5e1683c509d6a58dc3e9ef8b208cc980f791b34 |
11-Oct-2012 |
George Mount <mount@google.com> |
am 2306d785: am 2cb4269e: Merge "Fix NPE due to progress bar not existing." into gb-ub-photos-arches * commit '2306d785b8a6e965c93b13f7d21da17669af3681': Fix NPE due to progress bar not existing.
|
f8017799cee3908d61a6d5fc8a10efcf010c9fe3 |
11-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 2ebc18fb: am df2aecb6: Merge "Change "Done" to "Save" in editor" into gb-ub-photos-arches * commit '2ebc18fbbce184339a7d6e472b3965117335008f': Change "Done" to "Save" in editor
|
1e3c15180199e3b6caf0b0fa87bd231bf23c8904 |
11-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am d7e5b700: am cceb7244: am b4a3f476: Merge "Change FilterShow theme and extra remove gray line" into gb-ub-photos-arches * commit 'd7e5b700fa8904bb547ddb568ff97243c9a07c5e': Change FilterShow theme and extra remove gray line
|
50150ace712bb4a70301fc4b6c24a1728024098c |
11-Oct-2012 |
George Mount <mount@google.com> |
am 2cb4269e: Merge "Fix NPE due to progress bar not existing." into gb-ub-photos-arches * commit '2cb4269ebc665c2f2786a8a81794d15b36e3a38c': Fix NPE due to progress bar not existing.
|
6c89003a0ff968146b66c30b542981068ea18d97 |
11-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am df2aecb6: Merge "Change "Done" to "Save" in editor" into gb-ub-photos-arches * commit 'df2aecb6944f1244fa6e3d35a135c8bea6d16ab0': Change "Done" to "Save" in editor
|
08952849da3ffd3304c9486fdde8c330eee6630c |
11-Oct-2012 |
George Mount <mount@google.com> |
am 2cb4269e: Merge "Fix NPE due to progress bar not existing." into gb-ub-photos-arches * commit '2cb4269ebc665c2f2786a8a81794d15b36e3a38c': Fix NPE due to progress bar not existing.
|
1812fcff0067e6ac34100feaa145d07beb3dd0ca |
11-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am df2aecb6: Merge "Change "Done" to "Save" in editor" into gb-ub-photos-arches * commit 'df2aecb6944f1244fa6e3d35a135c8bea6d16ab0': Change "Done" to "Save" in editor
|
2306d785b8a6e965c93b13f7d21da17669af3681 |
11-Oct-2012 |
George Mount <mount@google.com> |
am 2cb4269e: Merge "Fix NPE due to progress bar not existing." into gb-ub-photos-arches * commit '2cb4269ebc665c2f2786a8a81794d15b36e3a38c': Fix NPE due to progress bar not existing.
|
2ebc18fbbce184339a7d6e472b3965117335008f |
11-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am df2aecb6: Merge "Change "Done" to "Save" in editor" into gb-ub-photos-arches * commit 'df2aecb6944f1244fa6e3d35a135c8bea6d16ab0': Change "Done" to "Save" in editor
|
d7e5b700fa8904bb547ddb568ff97243c9a07c5e |
11-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am cceb7244: am b4a3f476: Merge "Change FilterShow theme and extra remove gray line" into gb-ub-photos-arches * commit 'cceb72446be42bb7546222f2871005d9f9b0042f': Change FilterShow theme and extra remove gray line
|
38701573fefe46f7a5af8cdf2c6c7002ef2bcaa5 |
11-Oct-2012 |
George Mount <mount@google.com> |
Merge "Fix NPE due to progress bar not existing." into gb-ub-photos-arches
|
2cb4269ebc665c2f2786a8a81794d15b36e3a38c |
11-Oct-2012 |
George Mount <mount@google.com> |
Merge "Fix NPE due to progress bar not existing." into gb-ub-photos-arches
|
36590d50b0c2377df553ed16e37dc9d2224433b3 |
11-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Change "Done" to "Save" in editor" into gb-ub-photos-arches
|
df2aecb6944f1244fa6e3d35a135c8bea6d16ab0 |
11-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Change "Done" to "Save" in editor" into gb-ub-photos-arches
|
ea4065d75f362219c2b52c9ed54838ac0020d970 |
11-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am b4a3f476: Merge "Change FilterShow theme and extra remove gray line" into gb-ub-photos-arches * commit 'b4a3f4764a58d6d918d96399e1b05db887b9f9ad': Change FilterShow theme and extra remove gray line
|
9ba6cf9b026c46be7103a9b61f75d1c952ac702e |
11-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am b4a3f476: Merge "Change FilterShow theme and extra remove gray line" into gb-ub-photos-arches * commit 'b4a3f4764a58d6d918d96399e1b05db887b9f9ad': Change FilterShow theme and extra remove gray line
|
cceb72446be42bb7546222f2871005d9f9b0042f |
11-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am b4a3f476: Merge "Change FilterShow theme and extra remove gray line" into gb-ub-photos-arches * commit 'b4a3f4764a58d6d918d96399e1b05db887b9f9ad': Change FilterShow theme and extra remove gray line
|
abbcbb11dbd5314780fa81ea80ed1caeb416f0fb |
11-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Change FilterShow theme and extra remove gray line" into gb-ub-photos-arches
|
b4a3f4764a58d6d918d96399e1b05db887b9f9ad |
11-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Change FilterShow theme and extra remove gray line" into gb-ub-photos-arches
|
7148ec4b900fcf3cd9c1f148992313d584557f72 |
11-Oct-2012 |
George Mount <mount@google.com> |
Fix NPE due to progress bar not existing. Bug 7325685 Change-Id: I5e24b4f8a0ee4016c122e14702e3ae575f5bb56f
rc/com/android/gallery3d/app/PhotoPage.java
|
785a1f8a5856b199f6553a92020e77621516c608 |
11-Oct-2012 |
George Mount <mount@google.com> |
Fix NPE due to progress bar not existing. Bug 7325685 Change-Id: I5e24b4f8a0ee4016c122e14702e3ae575f5bb56f
rc/com/android/gallery3d/app/PhotoPage.java
|
9317bf8b6a1bab6ab7631d9077d698adb7a556a1 |
11-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Change "Done" to "Save" in editor Bug: 7325784 Change-Id: I82732252ae6047f1bf50ccde2ede22a9f9bc8e31
es/layout/filtershow_actionbar.xml
es/values/strings.xml
|
688274a465eedf35eee2ba8d9b9270c1c0728ab8 |
11-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Change "Done" to "Save" in editor Bug: 7325784 Change-Id: I82732252ae6047f1bf50ccde2ede22a9f9bc8e31
es/layout/filtershow_actionbar.xml
es/values/strings.xml
|
ec9f3f891afadc9ae91f9f6de174ebc02011ac0a |
11-Oct-2012 |
John Hoford <hoford@google.com> |
am 91d8084a: am 810f8dff: am 53f24f0f: forced fx bitmaps to load unscaled * commit '91d8084a67e341bc3a8a981e084574645ae3d34c': forced fx bitmaps to load unscaled
|
91d8084a67e341bc3a8a981e084574645ae3d34c |
11-Oct-2012 |
John Hoford <hoford@google.com> |
am 810f8dff: am 53f24f0f: forced fx bitmaps to load unscaled * commit '810f8dffd37b4225b4fc0ad09f2a4d55cb103f3e': forced fx bitmaps to load unscaled
|
c0624df2f67d9593d2c73751cdc4941913e7217d |
11-Oct-2012 |
John Hoford <hoford@google.com> |
am 53f24f0f: forced fx bitmaps to load unscaled * commit '53f24f0fbfd787a4ab2f129499d2c7ef240a517f': forced fx bitmaps to load unscaled
|
de60c072c772d6e3b945d15afcaf5176ff5faadc |
11-Oct-2012 |
John Hoford <hoford@google.com> |
am 53f24f0f: forced fx bitmaps to load unscaled * commit '53f24f0fbfd787a4ab2f129499d2c7ef240a517f': forced fx bitmaps to load unscaled
|
810f8dffd37b4225b4fc0ad09f2a4d55cb103f3e |
11-Oct-2012 |
John Hoford <hoford@google.com> |
am 53f24f0f: forced fx bitmaps to load unscaled * commit '53f24f0fbfd787a4ab2f129499d2c7ef240a517f': forced fx bitmaps to load unscaled
|
3ebf4fd62f8b97ea5e593fa2720e366b887175ff |
11-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Change FilterShow theme and extra remove gray line Bug: 7326326 Change-Id: Ie2286e36da77fb22907f21d084177268f919d10e
ndroidManifest.xml
|
6700d1591e4d7ff77e2eb5a50fe97ebab8d49447 |
11-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Change FilterShow theme and extra remove gray line Bug: 7326326 Change-Id: Ie2286e36da77fb22907f21d084177268f919d10e
rc/com/android/gallery3d/filtershow/imageshow/ImageShow.java
|
fea98f55311b39977969dc071296bacd48813e0b |
11-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Change FilterShow theme and extra remove gray line Bug: 7326326 Change-Id: Ie2286e36da77fb22907f21d084177268f919d10e
ndroidManifest.xml
rc/com/android/gallery3d/filtershow/imageshow/ImageShow.java
|
3d78e6dbf22b91b536a5fd14b97244e3e05f9c15 |
11-Oct-2012 |
John Hoford <hoford@google.com> |
forced fx bitmaps to load unscaled bug:7327105 Change-Id: I780638f6919e89ae957993732fdbe123e8d8e866
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
|
53f24f0fbfd787a4ab2f129499d2c7ef240a517f |
11-Oct-2012 |
John Hoford <hoford@google.com> |
forced fx bitmaps to load unscaled bug:7327105 Change-Id: I780638f6919e89ae957993732fdbe123e8d8e866
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
|
92bed23a6181fe3cd4fc7f7ad3624d01df77eafa |
11-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 9be3899f: am 84d62042: am 073e787f: am f0bec555: Merge "Change text size in spinner to avoid overlap" into gb-ub-photos-arches * commit '9be3899f0e2e6321ab8cab1f5d1b407d8f81427e': Change text size in spinner to avoid overlap
|
9be3899f0e2e6321ab8cab1f5d1b407d8f81427e |
11-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 84d62042: am 073e787f: am f0bec555: Merge "Change text size in spinner to avoid overlap" into gb-ub-photos-arches * commit '84d62042e255a309eaa146a76206bce1c6ae9b7b': Change text size in spinner to avoid overlap
|
cceefc78da9fbc2726f0e36369f21a55c58af460 |
11-Oct-2012 |
John Hoford <hoford@google.com> |
am 7568e968: am bb23f14f: am 14b42fc1: am f8044659: Merge "add White balance & disable UI elements" into gb-ub-photos-arches * commit '7568e9688d50a3d39d41f5dc82701230728df476': add White balance & disable UI elements
|
84d62042e255a309eaa146a76206bce1c6ae9b7b |
11-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 073e787f: am f0bec555: Merge "Change text size in spinner to avoid overlap" into gb-ub-photos-arches * commit '073e787f16ead7f0f9220b88cab6239cb37ca178': Change text size in spinner to avoid overlap
|
7568e9688d50a3d39d41f5dc82701230728df476 |
11-Oct-2012 |
John Hoford <hoford@google.com> |
am bb23f14f: am 14b42fc1: am f8044659: Merge "add White balance & disable UI elements" into gb-ub-photos-arches * commit 'bb23f14f04ada88f6e233b3fac69f46780c6136f': add White balance & disable UI elements
|
073e787f16ead7f0f9220b88cab6239cb37ca178 |
11-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am f0bec555: Merge "Change text size in spinner to avoid overlap" into gb-ub-photos-arches * commit 'f0bec555548429f59a798806fb5cb47f9dcc034c': Change text size in spinner to avoid overlap
|
9f6eac599d67174a847cbce835d84149ab6bf778 |
11-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am f0bec555: Merge "Change text size in spinner to avoid overlap" into gb-ub-photos-arches * commit 'f0bec555548429f59a798806fb5cb47f9dcc034c': Change text size in spinner to avoid overlap
|
f068ecf5772a339f2f64524ea8a977218b04a0ad |
11-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am f0bec555: Merge "Change text size in spinner to avoid overlap" into gb-ub-photos-arches * commit 'f0bec555548429f59a798806fb5cb47f9dcc034c': Change text size in spinner to avoid overlap
|
bb23f14f04ada88f6e233b3fac69f46780c6136f |
11-Oct-2012 |
John Hoford <hoford@google.com> |
am 14b42fc1: am f8044659: Merge "add White balance & disable UI elements" into gb-ub-photos-arches * commit '14b42fc1c0dcf6ffd629facfada872d2d30d5d44': add White balance & disable UI elements
|
148caa033321a1b48c55b67fe1b55a5a84d87dd1 |
11-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Change text size in spinner to avoid overlap" into gb-ub-photos-arches
|
f0bec555548429f59a798806fb5cb47f9dcc034c |
11-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Change text size in spinner to avoid overlap" into gb-ub-photos-arches
|
14b42fc1c0dcf6ffd629facfada872d2d30d5d44 |
11-Oct-2012 |
John Hoford <hoford@google.com> |
am f8044659: Merge "add White balance & disable UI elements" into gb-ub-photos-arches * commit 'f8044659db592f49e6e77c8a1d595955f9d206cb': add White balance & disable UI elements
|
dc3e519b570c752d76dc136d7d2e87877372de6b |
11-Oct-2012 |
John Hoford <hoford@google.com> |
am f8044659: Merge "add White balance & disable UI elements" into gb-ub-photos-arches * commit 'f8044659db592f49e6e77c8a1d595955f9d206cb': add White balance & disable UI elements
|
60789ea09adece967e566f1ff8026eb05c87a2b7 |
11-Oct-2012 |
John Hoford <hoford@google.com> |
am f8044659: Merge "add White balance & disable UI elements" into gb-ub-photos-arches * commit 'f8044659db592f49e6e77c8a1d595955f9d206cb': add White balance & disable UI elements
|
495715a49dc25e6001d09eddaf5d2fbdf51e06db |
11-Oct-2012 |
John Hoford <hoford@google.com> |
am f8044659: Merge "add White balance & disable UI elements" into gb-ub-photos-arches * commit 'f8044659db592f49e6e77c8a1d595955f9d206cb': add White balance & disable UI elements
|
f8044659db592f49e6e77c8a1d595955f9d206cb |
11-Oct-2012 |
John Hoford <hoford@google.com> |
Merge "add White balance & disable UI elements" into gb-ub-photos-arches
|
35b33ce66ae3fe0abe628da20b1b03242c98e914 |
11-Oct-2012 |
John Hoford <hoford@google.com> |
Merge "add White balance & disable UI elements" into gb-ub-photos-arches
|
7bb23cf35efa36212af6c00c59ddd0aad7cd5537 |
11-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Change text size in spinner to avoid overlap Bug: 7321747 Change-Id: Ibc58bff8710f974813d4beb89e971bdfab6acfb7
es/layout/action_bar_two_line_text.xml
|
419a804120934a765265d529aef65f0275a0eaec |
11-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Change text size in spinner to avoid overlap Bug: 7321747 Change-Id: Ibc58bff8710f974813d4beb89e971bdfab6acfb7
es/layout/action_bar_two_line_text.xml
|
ebaa0825065c5d045ad8bee5fb68a6b4283fc811 |
11-Oct-2012 |
Mangesh Ghiware <mghiware@google.com> |
am d1ac7a72: am d40057d8: am 0d77d6db: am 9b900e0d: Merge "Disable in-place crop for 360 panorama" into gb-ub-photos-arches * commit 'd1ac7a7213d757d02b41cdd61eea63c7c0048d78': Disable in-place crop for 360 panorama
|
d1ac7a7213d757d02b41cdd61eea63c7c0048d78 |
11-Oct-2012 |
Mangesh Ghiware <mghiware@google.com> |
am d40057d8: am 0d77d6db: am 9b900e0d: Merge "Disable in-place crop for 360 panorama" into gb-ub-photos-arches * commit 'd40057d892f85551a525c60d12b2cb116ef76b4e': Disable in-place crop for 360 panorama
|
d40057d892f85551a525c60d12b2cb116ef76b4e |
11-Oct-2012 |
Mangesh Ghiware <mghiware@google.com> |
am 0d77d6db: am 9b900e0d: Merge "Disable in-place crop for 360 panorama" into gb-ub-photos-arches * commit '0d77d6dbedb2887312bf96198086824c279b6465': Disable in-place crop for 360 panorama
|
4a44ff7cf3965bbf61875e4b894d782f1279d7d3 |
11-Oct-2012 |
Mangesh Ghiware <mghiware@google.com> |
am 9b900e0d: Merge "Disable in-place crop for 360 panorama" into gb-ub-photos-arches * commit '9b900e0d23a1a9c5b708424efe1a01b107bf774f': Disable in-place crop for 360 panorama
|
4398b06c6b4b45ea74bedf21c01112006a984924 |
11-Oct-2012 |
Mangesh Ghiware <mghiware@google.com> |
am 9b900e0d: Merge "Disable in-place crop for 360 panorama" into gb-ub-photos-arches * commit '9b900e0d23a1a9c5b708424efe1a01b107bf774f': Disable in-place crop for 360 panorama
|
0d77d6dbedb2887312bf96198086824c279b6465 |
11-Oct-2012 |
Mangesh Ghiware <mghiware@google.com> |
am 9b900e0d: Merge "Disable in-place crop for 360 panorama" into gb-ub-photos-arches * commit '9b900e0d23a1a9c5b708424efe1a01b107bf774f': Disable in-place crop for 360 panorama
|
9b900e0d23a1a9c5b708424efe1a01b107bf774f |
11-Oct-2012 |
Mangesh Ghiware <mghiware@google.com> |
Merge "Disable in-place crop for 360 panorama" into gb-ub-photos-arches
|
9d5c9d1c6642ad2e583737fe4d1f66e3a0489027 |
11-Oct-2012 |
Mangesh Ghiware <mghiware@google.com> |
Merge "Disable in-place crop for 360 panorama" into gb-ub-photos-arches
|
d0fc0f5fd56f2f2aedcf7ea6583f59a405eea103 |
10-Oct-2012 |
John Hoford <hoford@google.com> |
add White balance & disable UI elements bug:7234321 Change-Id: Ic44bfe30b5d25e7d4442c4e6d4fd9e0e8410c7af
ni/Android.mk
ni/filters/wbalance.c
|
e2e1b123f189014fd55e9414e2ed03baac38ceb0 |
10-Oct-2012 |
John Hoford <hoford@google.com> |
add White balance & disable UI elements bug:7234321 Change-Id: Ic44bfe30b5d25e7d4442c4e6d4fd9e0e8410c7af
ni/Android.mk
|
ad4889c795c754b3e43da2ea744df20ed845ac85 |
10-Oct-2012 |
John Hoford <hoford@google.com> |
add White balance & disable UI elements bug:7234321 Change-Id: Ic44bfe30b5d25e7d4442c4e6d4fd9e0e8410c7af
es/layout/filtershow_activity.xml
es/values/filtershow_strings.xml
|
4988eff4c8eda325a616337d1aaa0666cc301a7c |
10-Oct-2012 |
John Hoford <hoford@google.com> |
add White balance & disable UI elements bug:7234321 Change-Id: Ic44bfe30b5d25e7d4442c4e6d4fd9e0e8410c7af
ni/Android.mk
ni/filters/wbalance.c
es/layout/filtershow_activity.xml
es/values/filtershow_strings.xml
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/PanelController.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterWBalance.java
|
f19e1870a01aab99529fc28a586f5190556d302c |
10-Oct-2012 |
John Hoford <hoford@google.com> |
add White balance & disable UI elements bug:7234321 Change-Id: Ic44bfe30b5d25e7d4442c4e6d4fd9e0e8410c7af
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/PanelController.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterWBalance.java
|
682163e115a8e679b3038f4cb9886851e12a4035 |
10-Oct-2012 |
Mangesh Ghiware <mghiware@google.com> |
Disable in-place crop for 360 panorama Bug: 7281479 Change-Id: Id89e25a883a5eab8a91604ebfeab4f178ba1066f
rc/com/android/gallery3d/data/LocalImage.java
rc/com/android/gallery3d/data/UriImage.java
|
b34ee65fcc58f2729acd63f4a9e051a467565f4b |
10-Oct-2012 |
Mangesh Ghiware <mghiware@google.com> |
Disable in-place crop for 360 panorama Bug: 7281479 Change-Id: Id89e25a883a5eab8a91604ebfeab4f178ba1066f
rc/com/android/gallery3d/data/LocalImage.java
rc/com/android/gallery3d/data/UriImage.java
|
658cf453bc9f3c98baf91d32bb8c0dcb9e4e6a5e |
10-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 174b5aef: am e5c95a93: am 977382f8: am db3b0d4c: Merge "Fix missing camera thumbnail in filmstrip" into gb-ub-photos-arches * commit '174b5aef75177f60d521986a8bc355b1f18717c4': Fix missing camera thumbnail in filmstrip
|
174b5aef75177f60d521986a8bc355b1f18717c4 |
10-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am e5c95a93: am 977382f8: am db3b0d4c: Merge "Fix missing camera thumbnail in filmstrip" into gb-ub-photos-arches * commit 'e5c95a93039728b69f3f471278290611b98f18e5': Fix missing camera thumbnail in filmstrip
|
e5c95a93039728b69f3f471278290611b98f18e5 |
10-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 977382f8: am db3b0d4c: Merge "Fix missing camera thumbnail in filmstrip" into gb-ub-photos-arches * commit '977382f8f1e9399b14f15f8e4d636dfda55b6db3': Fix missing camera thumbnail in filmstrip
|
b4e1fc1b25c564d3e145e8205f7b9d96e0c70bb3 |
10-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 2647b8db: am 176126dc: am 45d7d0a2: am ce81f255: Set width of filmstrip/grid spinner to wrap content * commit '2647b8db1e35f4c75743754905054358c7418b56': Set width of filmstrip/grid spinner to wrap content
|
0d351ad2b2c6d32f98efeaddf99d76931ce144ed |
10-Oct-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
2647b8db1e35f4c75743754905054358c7418b56 |
10-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 176126dc: am 45d7d0a2: am ce81f255: Set width of filmstrip/grid spinner to wrap content * commit '176126dcce34ba356aa2b5cbc6935058e15f3c62': Set width of filmstrip/grid spinner to wrap content
|
9c394897104d53335e912f50b7d805655c86a0c6 |
10-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am db3b0d4c: Merge "Fix missing camera thumbnail in filmstrip" into gb-ub-photos-arches * commit 'db3b0d4cd1dc66d71f547fb4eb1c8d88b319185b': Fix missing camera thumbnail in filmstrip
|
e25bdd0214e092a3bd6a763faf2f52cdaa687d65 |
10-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am db3b0d4c: Merge "Fix missing camera thumbnail in filmstrip" into gb-ub-photos-arches * commit 'db3b0d4cd1dc66d71f547fb4eb1c8d88b319185b': Fix missing camera thumbnail in filmstrip
|
977382f8f1e9399b14f15f8e4d636dfda55b6db3 |
10-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am db3b0d4c: Merge "Fix missing camera thumbnail in filmstrip" into gb-ub-photos-arches * commit 'db3b0d4cd1dc66d71f547fb4eb1c8d88b319185b': Fix missing camera thumbnail in filmstrip
|
176126dcce34ba356aa2b5cbc6935058e15f3c62 |
10-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 45d7d0a2: am ce81f255: Set width of filmstrip/grid spinner to wrap content * commit '45d7d0a2de490378e8c913c69fe5973ac2805b62': Set width of filmstrip/grid spinner to wrap content
|
db3b0d4cd1dc66d71f547fb4eb1c8d88b319185b |
10-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Fix missing camera thumbnail in filmstrip" into gb-ub-photos-arches
|
9418fdb419199c162158c5370b5f5454a98acd32 |
10-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am ce81f255: Set width of filmstrip/grid spinner to wrap content * commit 'ce81f2553dbcacc46c1540bf2a01da8557ba0b40': Set width of filmstrip/grid spinner to wrap content
|
7d0096cf08e74fd1b8dca201f66c362a15bb1980 |
10-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am ce81f255: Set width of filmstrip/grid spinner to wrap content * commit 'ce81f2553dbcacc46c1540bf2a01da8557ba0b40': Set width of filmstrip/grid spinner to wrap content
|
45d7d0a2de490378e8c913c69fe5973ac2805b62 |
10-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am ce81f255: Set width of filmstrip/grid spinner to wrap content * commit 'ce81f2553dbcacc46c1540bf2a01da8557ba0b40': Set width of filmstrip/grid spinner to wrap content
|
aef384c77c316afd4e99946a3cf38c25e200544b |
10-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Fix missing camera thumbnail in filmstrip Bug: 7319894 Change-Id: Id1cf4f4bf718853aec73c0765732ac59e448c5d6
rc/com/android/gallery3d/app/AlbumPage.java
|
2aec8488aebe3d28a0a32c67d6629dfa4db4acae |
10-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Fix missing camera thumbnail in filmstrip Bug: 7319894 Change-Id: Id1cf4f4bf718853aec73c0765732ac59e448c5d6
rc/com/android/gallery3d/app/AlbumPage.java
|
e58787fe5eb85682998b8060f6dd7e6f1105c99a |
10-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I43a429778758438254aafa20a5db3dd2b4dca1a5 Auto-generated-cl: translation import
es/values-ru/photoeditor_strings.xml
|
aa59db46f5d5023e25f66cfa3b2d6689d899b05d |
10-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I48da3d513460e9b3c8e8eab9cf95191232dfeb5c Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
2939ccdb6d8c5e7cc7c462dd082c9da893cc7e63 |
10-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ic60a17693cbf0c2ae9a3eb1ae1bf2633b29d718e Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
01670348fe7a9f110ec8c3ff49204e76da4cc8f3 |
10-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Iad3ea6a288d6eac9135350b533ab9f1d56c69988 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
8b293b918f399283715abdba8b029f4bbb3bb924 |
10-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I3f6de089600ae1931dd97c965072d51f364313e6 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
33cabfdd9186e36e7691f2dd252e2a819db84da6 |
10-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I3f6de089600ae1931dd97c965072d51f364313e6 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
7afd41ae4d2353f2d0c676fc62bfc31b956eeb09 |
10-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Iaa59cf4124259f5c4b66848ee17b751b8420f5a2 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
83106f782d936f84ade5b4d5ff324f5cf0d57da9 |
10-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Iaa59cf4124259f5c4b66848ee17b751b8420f5a2 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
bc0be035a873a6cc4a99d2259ade5688af67bd9d |
10-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Set width of filmstrip/grid spinner to wrap content Bug: 7322464 Change-Id: I273370a212a2b63e195cae11b48b96191672e996
es/layout/action_bar_two_line_text.xml
|
ce81f2553dbcacc46c1540bf2a01da8557ba0b40 |
10-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Set width of filmstrip/grid spinner to wrap content Bug: 7322464 Change-Id: I273370a212a2b63e195cae11b48b96191672e996
es/layout/action_bar_two_line_text.xml
|
9ace1a72eef180a379ef6bb6bc1954713654aa71 |
10-Oct-2012 |
George Mount <mount@google.com> |
am d0474e08: am 779cfe9d: am fcdc86ed: am 21832eb7: Merge changes Ic62822a4,Ie6505c8e into gb-ub-photos-arches * commit 'd0474e08c89a30e809cad568c86897065769bd40': Change how stitched images are inserted into Gallery. Move panorama stitch progress outside the image.
|
d0474e08c89a30e809cad568c86897065769bd40 |
10-Oct-2012 |
George Mount <mount@google.com> |
am 779cfe9d: am fcdc86ed: am 21832eb7: Merge changes Ic62822a4,Ie6505c8e into gb-ub-photos-arches * commit '779cfe9dcd55871b21f48cbf96bdeaf2e4187e2b': Change how stitched images are inserted into Gallery. Move panorama stitch progress outside the image.
|
779cfe9dcd55871b21f48cbf96bdeaf2e4187e2b |
10-Oct-2012 |
George Mount <mount@google.com> |
am fcdc86ed: am 21832eb7: Merge changes Ic62822a4,Ie6505c8e into gb-ub-photos-arches * commit 'fcdc86edd4fdadeec5d4bac1f64c432ad000663a': Change how stitched images are inserted into Gallery. Move panorama stitch progress outside the image.
|
fcdc86edd4fdadeec5d4bac1f64c432ad000663a |
10-Oct-2012 |
George Mount <mount@google.com> |
am 21832eb7: Merge changes Ic62822a4,Ie6505c8e into gb-ub-photos-arches * commit '21832eb7fba76cd101ad5ef7b131292aa24f3864': Change how stitched images are inserted into Gallery. Move panorama stitch progress outside the image.
|
b736d8a35967bcf81a7ee80080343ff6e497ca11 |
10-Oct-2012 |
George Mount <mount@google.com> |
am 21832eb7: Merge changes Ic62822a4,Ie6505c8e into gb-ub-photos-arches * commit '21832eb7fba76cd101ad5ef7b131292aa24f3864': Change how stitched images are inserted into Gallery. Move panorama stitch progress outside the image.
|
1bc511b04e64bde7fd0ae87f737a3f70efb9443c |
10-Oct-2012 |
George Mount <mount@google.com> |
am 21832eb7: Merge changes Ic62822a4,Ie6505c8e into gb-ub-photos-arches * commit '21832eb7fba76cd101ad5ef7b131292aa24f3864': Change how stitched images are inserted into Gallery. Move panorama stitch progress outside the image.
|
0c2f803f28cdece5fb630124174a1de8fb3921d8 |
10-Oct-2012 |
George Mount <mount@google.com> |
am 21832eb7: Merge changes Ic62822a4,Ie6505c8e into gb-ub-photos-arches * commit '21832eb7fba76cd101ad5ef7b131292aa24f3864': Change how stitched images are inserted into Gallery. Move panorama stitch progress outside the image.
|
21832eb7fba76cd101ad5ef7b131292aa24f3864 |
10-Oct-2012 |
George Mount <mount@google.com> |
Merge changes Ic62822a4,Ie6505c8e into gb-ub-photos-arches * changes: Change how stitched images are inserted into Gallery. Move panorama stitch progress outside the image.
|
4de9c3e83ad2c5ea8b5277c7a002520d2bbcd608 |
10-Oct-2012 |
George Mount <mount@google.com> |
Merge changes Ic62822a4,Ie6505c8e into gb-ub-photos-arches * changes: Change how stitched images are inserted into Gallery. Move panorama stitch progress outside the image.
|
adb12c599fbe3e70834abcac08a2d8116c859b24 |
10-Oct-2012 |
George Mount <mount@google.com> |
Change how stitched images are inserted into Gallery. Bug 7299396 Stitching images now use normal LocalImages for their MediaItem instead of LightCycleItems. They are no longer part of a special album. Change-Id: Ic62822a44b9743829dee50bcfa6f455cd538afa7
rc_pd/com/android/gallery3d/app/StitchingProgressManager.java
|
4e091eb758a3ac1016b373419cea1ada1b977bc5 |
10-Oct-2012 |
George Mount <mount@google.com> |
Change how stitched images are inserted into Gallery. Bug 7299396 Stitching images now use normal LocalImages for their MediaItem instead of LightCycleItems. They are no longer part of a special album. Change-Id: Ic62822a44b9743829dee50bcfa6f455cd538afa7
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/app/StitchingChangeListener.java
rc/com/android/gallery3d/data/DataManager.java
rc/com/android/gallery3d/data/LocalAlbumSet.java
rc/com/android/gallery3d/data/LocalImage.java
rc/com/android/gallery3d/data/SecureAlbum.java
rc_pd/com/android/gallery3d/app/StitchingProgressManager.java
rc_pd/com/android/gallery3d/util/LightCycleHelper.java
|
fffc28dcab3ae031c41c5aa290861ab4c4303550 |
10-Oct-2012 |
George Mount <mount@google.com> |
Change how stitched images are inserted into Gallery. Bug 7299396 Stitching images now use normal LocalImages for their MediaItem instead of LightCycleItems. They are no longer part of a special album. Change-Id: Ic62822a44b9743829dee50bcfa6f455cd538afa7
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/app/StitchingChangeListener.java
rc/com/android/gallery3d/data/DataManager.java
rc/com/android/gallery3d/data/LocalAlbumSet.java
rc/com/android/gallery3d/data/LocalImage.java
rc/com/android/gallery3d/data/SecureAlbum.java
rc_pd/com/android/gallery3d/app/StitchingProgressManager.java
rc_pd/com/android/gallery3d/util/LightCycleHelper.java
|
b316f4967d26a093a76a746a145c33f977e2e0e1 |
10-Oct-2012 |
George Mount <mount@google.com> |
Move panorama stitch progress outside the image. Bug 7302513 Change-Id: Ie6505c8ed2125b878e54a93c4b8c0f51d80a1385
es/layout/photopage_progress_bar.xml
es/values/strings.xml
rc/com/android/gallery3d/app/PhotoPageProgressBar.java
|
f122d56e15e00928d731751796b0509ae47c6799 |
10-Oct-2012 |
George Mount <mount@google.com> |
Move panorama stitch progress outside the image. Bug 7302513 Change-Id: Ie6505c8ed2125b878e54a93c4b8c0f51d80a1385
es/layout/photopage_progress_bar.xml
es/values/strings.xml
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/app/PhotoPageProgressBar.java
|
895e9fad2bbe6031c30b34e44caedaa1f77ca617 |
10-Oct-2012 |
George Mount <mount@google.com> |
Move panorama stitch progress outside the image. Bug 7302513 Change-Id: Ie6505c8ed2125b878e54a93c4b8c0f51d80a1385
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/app/PhotoPageProgressBar.java
|
9d397672af78dd06982ff9676982a4fbd24f821c |
10-Oct-2012 |
John Reck <jreck@google.com> |
am c6cd898b: am f59f52e9: am 194b77c1: am eece6da4: Support REVERSE in lockOrientation * commit 'c6cd898b7c63b434d9d3641a688ba1f0294a373b': Support REVERSE in lockOrientation
|
c6cd898b7c63b434d9d3641a688ba1f0294a373b |
10-Oct-2012 |
John Reck <jreck@google.com> |
am f59f52e9: am 194b77c1: am eece6da4: Support REVERSE in lockOrientation * commit 'f59f52e93882d1268e6b056603bf7fe983681c85': Support REVERSE in lockOrientation
|
f59f52e93882d1268e6b056603bf7fe983681c85 |
10-Oct-2012 |
John Reck <jreck@google.com> |
am 194b77c1: am eece6da4: Support REVERSE in lockOrientation * commit '194b77c1b09c65ff52ed24fafe3af6e4d33519a8': Support REVERSE in lockOrientation
|
194b77c1b09c65ff52ed24fafe3af6e4d33519a8 |
10-Oct-2012 |
John Reck <jreck@google.com> |
am eece6da4: Support REVERSE in lockOrientation * commit 'eece6da4d344f7e1e937130c0d36cef8ef9dbe0c': Support REVERSE in lockOrientation
|
f3cb78405bd304ec9062a66dfb615c049ff71caa |
10-Oct-2012 |
John Reck <jreck@google.com> |
am eece6da4: Support REVERSE in lockOrientation * commit 'eece6da4d344f7e1e937130c0d36cef8ef9dbe0c': Support REVERSE in lockOrientation
|
a1cd45bb2dd1c0099a17f8d9ac195f0ca4a1aad5 |
10-Oct-2012 |
John Reck <jreck@google.com> |
am eece6da4: Support REVERSE in lockOrientation * commit 'eece6da4d344f7e1e937130c0d36cef8ef9dbe0c': Support REVERSE in lockOrientation
|
3ad97aa9dc4a197c0c321d9fa493f922be15db4c |
10-Oct-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
232df065d21b7799a93314c49ccb7b24fdc35ead |
10-Oct-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am e87061a6: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge * commit 'e87061a646aafcf498a56b1669a2243f074d6919': Fix share crash after closing photo editor
|
e87061a646aafcf498a56b1669a2243f074d6919 |
10-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: I265c658777e6c18ecd86cd57e00d6102dbec034a
|
eece6da4d344f7e1e937130c0d36cef8ef9dbe0c |
10-Oct-2012 |
John Reck <jreck@google.com> |
Support REVERSE in lockOrientation Bug: 7314703 Change-Id: Id459e49496f562e75c1485d9d717daa28020a587
rc/com/android/gallery3d/app/OrientationManager.java
|
8ebbec16fe3de9a08fb7d761b9ce123ce5b9b03d |
10-Oct-2012 |
John Reck <jreck@google.com> |
Support REVERSE in lockOrientation Bug: 7314703 Change-Id: Id459e49496f562e75c1485d9d717daa28020a587
rc/com/android/gallery3d/app/OrientationManager.java
|
a6cd70f57fdf32263afcfe24724a3e5b0838d667 |
10-Oct-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-factory-release history after reset to jb-mr1-dev
|
a9466bf5c8d8550b7e80c0fc57b95c47d5e8cd05 |
10-Oct-2012 |
John Reck <jreck@google.com> |
am 34dc4359: am b5e6418e: am ca41df84: am 866ed7ab: Fix inverted panorama preview * commit '34dc4359d486557d2795b53967d1b98389a8fe9f': Fix inverted panorama preview
|
34dc4359d486557d2795b53967d1b98389a8fe9f |
10-Oct-2012 |
John Reck <jreck@google.com> |
am b5e6418e: am ca41df84: am 866ed7ab: Fix inverted panorama preview * commit 'b5e6418e7c577c01efb4e3b35726d4962211a86e': Fix inverted panorama preview
|
b5e6418e7c577c01efb4e3b35726d4962211a86e |
10-Oct-2012 |
John Reck <jreck@google.com> |
am ca41df84: am 866ed7ab: Fix inverted panorama preview * commit 'ca41df84f8cc8f63d7856c904ceef67adb0b5207': Fix inverted panorama preview
|
ca41df84f8cc8f63d7856c904ceef67adb0b5207 |
10-Oct-2012 |
John Reck <jreck@google.com> |
am 866ed7ab: Fix inverted panorama preview * commit '866ed7abd7960efc7986a3624414a730e17f33a6': Fix inverted panorama preview
|
5d5e7ca7921542eadbb4d1a123125a2676efddca |
10-Oct-2012 |
John Reck <jreck@google.com> |
am 866ed7ab: Fix inverted panorama preview * commit '866ed7abd7960efc7986a3624414a730e17f33a6': Fix inverted panorama preview
|
511d35ead04340790f4305bdc7adead748a72d32 |
10-Oct-2012 |
John Reck <jreck@google.com> |
am 866ed7ab: Fix inverted panorama preview * commit '866ed7abd7960efc7986a3624414a730e17f33a6': Fix inverted panorama preview
|
3bc38f093362de4966344265f8c7be6d184fc36d |
10-Oct-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
866ed7abd7960efc7986a3624414a730e17f33a6 |
10-Oct-2012 |
John Reck <jreck@google.com> |
Fix inverted panorama preview Bug: 7314703 Panorama only support rotations of 0 and 90, so if it is greater than that flip the output surface texture Change-Id: I9885feb88d2d1c3e0dabaa7ecd8db66c2ddfb93b
rc/com/android/gallery3d/ui/PhotoView.java
|
51eaa991537849bbe8e757cd4d1724ab72beffb1 |
10-Oct-2012 |
John Reck <jreck@google.com> |
Fix inverted panorama preview Bug: 7314703 Panorama only support rotations of 0 and 90, so if it is greater than that flip the output surface texture Change-Id: I9885feb88d2d1c3e0dabaa7ecd8db66c2ddfb93b
rc/com/android/gallery3d/ui/PhotoView.java
|
51207c43c115ce356a8a9ec10a82d56e8858f4c3 |
10-Oct-2012 |
John Hoford <hoford@google.com> |
am 7af3a27d: am 1d1ba1a5: am efce987c: am 1b72a2f1: small fix to red eye code * commit '7af3a27d96bba73cd8def0158ada7e3a251fb96e': small fix to red eye code
|
7af3a27d96bba73cd8def0158ada7e3a251fb96e |
10-Oct-2012 |
John Hoford <hoford@google.com> |
am 1d1ba1a5: am efce987c: am 1b72a2f1: small fix to red eye code * commit '1d1ba1a56e040d58175e1490f3bb026b192e8008': small fix to red eye code
|
1d1ba1a56e040d58175e1490f3bb026b192e8008 |
10-Oct-2012 |
John Hoford <hoford@google.com> |
am efce987c: am 1b72a2f1: small fix to red eye code * commit 'efce987c5da9f8a33a1e03508853b900879f5338': small fix to red eye code
|
f1e5ae54ec658440fe3df7fa480a253d3bbb2643 |
10-Oct-2012 |
John Hoford <hoford@google.com> |
am 1b72a2f1: small fix to red eye code * commit '1b72a2f1124610b8050dbbdff9f1bb548199fd2e': small fix to red eye code
|
5a51e6475ca31bfca317fa5add6829a31fbcae27 |
10-Oct-2012 |
John Hoford <hoford@google.com> |
am 1b72a2f1: small fix to red eye code * commit '1b72a2f1124610b8050dbbdff9f1bb548199fd2e': small fix to red eye code
|
efce987c5da9f8a33a1e03508853b900879f5338 |
10-Oct-2012 |
John Hoford <hoford@google.com> |
am 1b72a2f1: small fix to red eye code * commit '1b72a2f1124610b8050dbbdff9f1bb548199fd2e': small fix to red eye code
|
1b72a2f1124610b8050dbbdff9f1bb548199fd2e |
10-Oct-2012 |
John Hoford <hoford@google.com> |
small fix to red eye code bug:7234321 Change-Id: I796b11fd3050bf3582749e02f7d8173bc78ea292
rc/com/android/gallery3d/filtershow/filters/ImageFilterRedEye.java
|
945a768725130741205b2ae949facce2de64c568 |
10-Oct-2012 |
John Hoford <hoford@google.com> |
small fix to red eye code bug:7234321 Change-Id: I796b11fd3050bf3582749e02f7d8173bc78ea292
rc/com/android/gallery3d/filtershow/filters/ImageFilterRedEye.java
|
3b32e653173202dc37180d1248f2083071ddbfd9 |
10-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 920f1d9a: am 7aa44d08: am b3d3079b: am 08458dc6: Latest UI * commit '920f1d9af7b51ba47dd5d953045c63a1fba42e4f': Latest UI
|
920f1d9af7b51ba47dd5d953045c63a1fba42e4f |
10-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 7aa44d08: am b3d3079b: am 08458dc6: Latest UI * commit '7aa44d08e0b64c686c6f0ce987917380b0de26d6': Latest UI
|
7aa44d08e0b64c686c6f0ce987917380b0de26d6 |
10-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am b3d3079b: am 08458dc6: Latest UI * commit 'b3d3079b0f8ddda9f524d8fbe1ba11cef17b40cc': Latest UI
|
a5d84ae0e6fa42460a9d3f66991c73fa1949dbaa |
10-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 08458dc6: Latest UI * commit '08458dc637d92ee5f12e34d49c34cc10f4e19c7d': Latest UI
|
e903e0b39d311c3691561804599dfc189c97f8e0 |
10-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 08458dc6: Latest UI * commit '08458dc637d92ee5f12e34d49c34cc10f4e19c7d': Latest UI
|
b58869022e614cdc74bd7222e194717104eafc59 |
10-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 08458dc6: Latest UI * commit '08458dc637d92ee5f12e34d49c34cc10f4e19c7d': Latest UI
|
b3d3079b0f8ddda9f524d8fbe1ba11cef17b40cc |
10-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 08458dc6: Latest UI * commit '08458dc637d92ee5f12e34d49c34cc10f4e19c7d': Latest UI
|
87373109b5bf23c2b714542dbcb25717fb4cd479 |
10-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Latest UI bug:7233983 bug:7233980 Also fixes border scaling issues. Change-Id: Ia9365800e057f481936ffdd13a5d8c5a9dab14b5
es/layout/filtershow_activity.xml
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
rc/com/android/gallery3d/filtershow/presets/ImagePresetBW.java
rc/com/android/gallery3d/filtershow/presets/ImagePresetBWBlue.java
rc/com/android/gallery3d/filtershow/presets/ImagePresetBWGreen.java
rc/com/android/gallery3d/filtershow/presets/ImagePresetBWRed.java
rc/com/android/gallery3d/filtershow/presets/ImagePresetSaturated.java
|
08458dc637d92ee5f12e34d49c34cc10f4e19c7d |
10-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Latest UI bug:7233983 bug:7233980 Also fixes border scaling issues. Change-Id: Ia9365800e057f481936ffdd13a5d8c5a9dab14b5
es/layout/filtershow_activity.xml
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterBWBlue.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterBWGreen.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterBWRed.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterBorder.java
rc/com/android/gallery3d/filtershow/imageshow/ImageShow.java
rc/com/android/gallery3d/filtershow/imageshow/ImageSmallBorder.java
rc/com/android/gallery3d/filtershow/imageshow/ImageSmallFilter.java
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
rc/com/android/gallery3d/filtershow/presets/ImagePresetBW.java
rc/com/android/gallery3d/filtershow/presets/ImagePresetBWBlue.java
rc/com/android/gallery3d/filtershow/presets/ImagePresetBWGreen.java
rc/com/android/gallery3d/filtershow/presets/ImagePresetBWRed.java
rc/com/android/gallery3d/filtershow/presets/ImagePresetSaturated.java
|
ce41d9869c7f4d747ccc85a6a2e8f285be0197c2 |
10-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Latest UI bug:7233983 bug:7233980 Also fixes border scaling issues. Change-Id: Ia9365800e057f481936ffdd13a5d8c5a9dab14b5
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterBWBlue.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterBWGreen.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterBWRed.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterBorder.java
rc/com/android/gallery3d/filtershow/imageshow/ImageShow.java
rc/com/android/gallery3d/filtershow/imageshow/ImageSmallBorder.java
rc/com/android/gallery3d/filtershow/imageshow/ImageSmallFilter.java
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
rc/com/android/gallery3d/filtershow/presets/ImagePresetBW.java
rc/com/android/gallery3d/filtershow/presets/ImagePresetBWBlue.java
rc/com/android/gallery3d/filtershow/presets/ImagePresetBWGreen.java
rc/com/android/gallery3d/filtershow/presets/ImagePresetBWRed.java
rc/com/android/gallery3d/filtershow/presets/ImagePresetSaturated.java
|
e51fa5398f9f487bc493759eb4fac04b0f5aaf50 |
10-Oct-2012 |
John Hoford <hoford@google.com> |
am 6756e54c: am ed7848bb: am a83c9beb: am 457e88cd: add filters * commit '6756e54c37e51b3ec14b94c9ebcc24f5105e30be': add filters
|
6756e54c37e51b3ec14b94c9ebcc24f5105e30be |
10-Oct-2012 |
John Hoford <hoford@google.com> |
am ed7848bb: am a83c9beb: am 457e88cd: add filters * commit 'ed7848bb444a72a71d66e52844b5d4c19f948e0d': add filters
|
ed7848bb444a72a71d66e52844b5d4c19f948e0d |
10-Oct-2012 |
John Hoford <hoford@google.com> |
am a83c9beb: am 457e88cd: add filters * commit 'a83c9beb952f68622757ac73ccab6a47f7a6e516': add filters
|
04059b565662f29fbbb9d48c5faf0be60f5d9d80 |
10-Oct-2012 |
John Hoford <hoford@google.com> |
am 457e88cd: add filters * commit '457e88cd2ba6a8a93b1643a3fb3d50ee758671ad': add filters
|
174d568840b1e214df53a7df0acd9c20fc814e41 |
10-Oct-2012 |
John Hoford <hoford@google.com> |
am 457e88cd: add filters * commit '457e88cd2ba6a8a93b1643a3fb3d50ee758671ad': add filters
|
01b4f07a7e387b21170db7c4df8cf46370638c15 |
10-Oct-2012 |
John Hoford <hoford@google.com> |
am 457e88cd: add filters * commit '457e88cd2ba6a8a93b1643a3fb3d50ee758671ad': add filters
|
a83c9beb952f68622757ac73ccab6a47f7a6e516 |
10-Oct-2012 |
John Hoford <hoford@google.com> |
am 457e88cd: add filters * commit '457e88cd2ba6a8a93b1643a3fb3d50ee758671ad': add filters
|
c416ebc249825239a920c88793d63820af1eef49 |
10-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 01008978: am 44cfd731: am 41fda3d3: am d78c5734: Merge "Correct stale background on completely empty gallery" into gb-ub-photos-arches * commit '010089788fc8c56aa3ff0abdb778cbaca41a98b2': Correct stale background on completely empty gallery
|
d959622d0d1b86e4e43c450d2d00f650e3a0c2a5 |
10-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 62b7945d: am 17f943ce: am 08e51088: am 501bd1bf: Merge "Update design for grid/filmstrip switcher" into gb-ub-photos-arches * commit '62b7945df3b9a73281913e27313d9d9e4f0890fe': Update design for grid/filmstrip switcher
|
a6d5c79682f130fd8b351e5a2cd8d9b7cf41cc0b |
10-Oct-2012 |
John Hoford <hoford@google.com> |
add filters bug:7234321 Change-Id: I4c9695c3ad90fcb7f4d67d40faa0a7da85f99030
ni/Android.mk
ni/filters/fx.c
|
c2d240c4862a05b68f195b7743e1f7a5ba2b5490 |
10-Oct-2012 |
John Hoford <hoford@google.com> |
add filters bug:7234321 Change-Id: I4c9695c3ad90fcb7f4d67d40faa0a7da85f99030
ni/Android.mk
|
ba41b7c49e943d272c7637197f723b713d048059 |
10-Oct-2012 |
John Hoford <hoford@google.com> |
add filters bug:7234321 Change-Id: I4c9695c3ad90fcb7f4d67d40faa0a7da85f99030
es/drawable/filtershow_fx_0000_vintage.png
es/drawable/filtershow_fx_0001_instant.png
es/drawable/filtershow_fx_0002_bleach.png
es/drawable/filtershow_fx_0003_blue_crush.png
es/drawable/filtershow_fx_0004_bw_contrast.png
es/drawable/filtershow_fx_0005_punch.png
es/drawable/filtershow_fx_0006_x_process.png
es/drawable/filtershow_fx_0007_washout.png
es/drawable/filtershow_fx_0008_washout_color.png
es/values/strings.xml
rc/com/android/gallery3d/filtershow/presets/ImagePresetFX.java
|
457e88cd2ba6a8a93b1643a3fb3d50ee758671ad |
10-Oct-2012 |
John Hoford <hoford@google.com> |
add filters bug:7234321 Change-Id: I4c9695c3ad90fcb7f4d67d40faa0a7da85f99030
ni/Android.mk
ni/filters/fx.c
es/drawable/filtershow_fx_0000_vintage.png
es/drawable/filtershow_fx_0001_instant.png
es/drawable/filtershow_fx_0002_bleach.png
es/drawable/filtershow_fx_0003_blue_crush.png
es/drawable/filtershow_fx_0004_bw_contrast.png
es/drawable/filtershow_fx_0005_punch.png
es/drawable/filtershow_fx_0006_x_process.png
es/drawable/filtershow_fx_0007_washout.png
es/drawable/filtershow_fx_0008_washout_color.png
es/values/strings.xml
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterFx.java
rc/com/android/gallery3d/filtershow/presets/ImagePresetFX.java
|
9ea20852baf8a2eeae2e4fc19f12a9f35b106b0c |
10-Oct-2012 |
John Hoford <hoford@google.com> |
add filters bug:7234321 Change-Id: I4c9695c3ad90fcb7f4d67d40faa0a7da85f99030
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterFx.java
rc/com/android/gallery3d/filtershow/presets/ImagePresetFX.java
|
010089788fc8c56aa3ff0abdb778cbaca41a98b2 |
10-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 44cfd731: am 41fda3d3: am d78c5734: Merge "Correct stale background on completely empty gallery" into gb-ub-photos-arches * commit '44cfd7311111cda6d440ac251d284b4550ae577c': Correct stale background on completely empty gallery
|
62b7945df3b9a73281913e27313d9d9e4f0890fe |
10-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 17f943ce: am 08e51088: am 501bd1bf: Merge "Update design for grid/filmstrip switcher" into gb-ub-photos-arches * commit '17f943ce220ce933514e5ed69d3e733cb74b30d1': Update design for grid/filmstrip switcher
|
61f7dc780d93dfb2d77e4c8d523c84ce242f730a |
10-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 3965d154: am 037c1a7f: am 07f340a9: am 3d81fdfd: Merge "Fix lack of snapback on very short scroll" into gb-ub-photos-arches * commit '3965d154253ece253ad0cd8a814ac606b338ea6b': Fix lack of snapback on very short scroll
|
44cfd7311111cda6d440ac251d284b4550ae577c |
10-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 41fda3d3: am d78c5734: Merge "Correct stale background on completely empty gallery" into gb-ub-photos-arches * commit '41fda3d39b60be35760a27619e0c755f5025ccb9': Correct stale background on completely empty gallery
|
17f943ce220ce933514e5ed69d3e733cb74b30d1 |
10-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 08e51088: am 501bd1bf: Merge "Update design for grid/filmstrip switcher" into gb-ub-photos-arches * commit '08e510887119516ac8031fe276df7e0f8e223a8c': Update design for grid/filmstrip switcher
|
3965d154253ece253ad0cd8a814ac606b338ea6b |
10-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 037c1a7f: am 07f340a9: am 3d81fdfd: Merge "Fix lack of snapback on very short scroll" into gb-ub-photos-arches * commit '037c1a7faba9695f98a6754552b599517f7dbb4a': Fix lack of snapback on very short scroll
|
41fda3d39b60be35760a27619e0c755f5025ccb9 |
10-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am d78c5734: Merge "Correct stale background on completely empty gallery" into gb-ub-photos-arches * commit 'd78c5734346cabc2577a5b9100f0f943c381ee47': Correct stale background on completely empty gallery
|
41fb26a185bb6f1b5c11f4afe30c898bbe3b5511 |
10-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am d78c5734: Merge "Correct stale background on completely empty gallery" into gb-ub-photos-arches * commit 'd78c5734346cabc2577a5b9100f0f943c381ee47': Correct stale background on completely empty gallery
|
47419c79259940950ac66f0aae1067cd3922da18 |
10-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am d78c5734: Merge "Correct stale background on completely empty gallery" into gb-ub-photos-arches * commit 'd78c5734346cabc2577a5b9100f0f943c381ee47': Correct stale background on completely empty gallery
|
08e510887119516ac8031fe276df7e0f8e223a8c |
10-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 501bd1bf: Merge "Update design for grid/filmstrip switcher" into gb-ub-photos-arches * commit '501bd1bff5189542612929b2428b7a69abc575a6': Update design for grid/filmstrip switcher
|
3f384346d12afed34fba577f7f63e56f160d318b |
10-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 501bd1bf: Merge "Update design for grid/filmstrip switcher" into gb-ub-photos-arches * commit '501bd1bff5189542612929b2428b7a69abc575a6': Update design for grid/filmstrip switcher
|
fba6d87b4a947353af610265e317b83053a7f1f1 |
10-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 501bd1bf: Merge "Update design for grid/filmstrip switcher" into gb-ub-photos-arches * commit '501bd1bff5189542612929b2428b7a69abc575a6': Update design for grid/filmstrip switcher
|
0a561c94f02bb3b39f4b9b163f5f35f2de64762d |
10-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 501bd1bf: Merge "Update design for grid/filmstrip switcher" into gb-ub-photos-arches * commit '501bd1bff5189542612929b2428b7a69abc575a6': Update design for grid/filmstrip switcher
|
037c1a7faba9695f98a6754552b599517f7dbb4a |
10-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 07f340a9: am 3d81fdfd: Merge "Fix lack of snapback on very short scroll" into gb-ub-photos-arches * commit '07f340a9a1b0a63aaf73bb1eb1fdf284d5847dcb': Fix lack of snapback on very short scroll
|
d78c5734346cabc2577a5b9100f0f943c381ee47 |
10-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Correct stale background on completely empty gallery" into gb-ub-photos-arches
|
23c296213a05f5263451c644dad6fce23a15fe0c |
10-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Correct stale background on completely empty gallery" into gb-ub-photos-arches
|
501bd1bff5189542612929b2428b7a69abc575a6 |
10-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Update design for grid/filmstrip switcher" into gb-ub-photos-arches
|
bcdf1be3081cc4ff5f438033e3300bb1f9494dd8 |
10-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Update design for grid/filmstrip switcher" into gb-ub-photos-arches
|
07f340a9a1b0a63aaf73bb1eb1fdf284d5847dcb |
10-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 3d81fdfd: Merge "Fix lack of snapback on very short scroll" into gb-ub-photos-arches * commit '3d81fdfd5916747b237229a2515152daf639447a': Fix lack of snapback on very short scroll
|
52cb523e386cda894ef3076dd0ff4c36c7ced11f |
10-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 3d81fdfd: Merge "Fix lack of snapback on very short scroll" into gb-ub-photos-arches * commit '3d81fdfd5916747b237229a2515152daf639447a': Fix lack of snapback on very short scroll
|
5e78f80d2189a244e6bb59712f987a491dc5ad25 |
10-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 3d81fdfd: Merge "Fix lack of snapback on very short scroll" into gb-ub-photos-arches * commit '3d81fdfd5916747b237229a2515152daf639447a': Fix lack of snapback on very short scroll
|
3d81fdfd5916747b237229a2515152daf639447a |
10-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Fix lack of snapback on very short scroll" into gb-ub-photos-arches
|
04d0dbc40b7b6a2bc6f05698c6b97b89f665d002 |
10-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Fix lack of snapback on very short scroll" into gb-ub-photos-arches
|
77fa1d232c1a804d17f3b1ceeaa6ab6c6555b047 |
10-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Correct stale background on completely empty gallery Bug: 7314560 When the last album is delete by long pressing and pressing the delete icon, and the gallery is left completely empty, the slotview was not being correctly invalidated. Change-Id: I2d5ec7ac7fb9604fd74ca8fa4fa6df09d6dec49d
rc/com/android/gallery3d/app/AlbumSetPage.java
|
25b203e716efd63bc0c354344b6c55c9aee9faac |
10-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Correct stale background on completely empty gallery Bug: 7314560 When the last album is delete by long pressing and pressing the delete icon, and the gallery is left completely empty, the slotview was not being correctly invalidated. Change-Id: I2d5ec7ac7fb9604fd74ca8fa4fa6df09d6dec49d
rc/com/android/gallery3d/app/AlbumSetPage.java
|
a9c3ad030666fabecff142af1734f19bfa8c249a |
09-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Fix share crash after closing photo editor Bug: 7306707 Change-Id: If589e1d84bc05c4d68a02feed7aaed05a568359d
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
|
b54b72d1e25b23725012dd575bcd908497361edc |
10-Oct-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
dc55d3b1a614b95a36aab60c06f7961a800ec85a |
10-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Fix lack of snapback on very short scroll Bug: 7318609 snapToNeighborImage returns false if it didn't actually need to move to a neighboring image, so use this information to correctly snapback if needed. Change-Id: I28bbcb5ea224957fefa3838891c4343a1d9b8aff
rc/com/android/gallery3d/ui/PhotoView.java
|
9452a829641ce51438b508d4884b28f72ecd63ae |
10-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Fix lack of snapback on very short scroll Bug: 7318609 snapToNeighborImage returns false if it didn't actually need to move to a neighboring image, so use this information to correctly snapback if needed. Change-Id: I28bbcb5ea224957fefa3838891c4343a1d9b8aff
rc/com/android/gallery3d/ui/PhotoView.java
|
8363c467c0f59ce95981b288f8ee27dfa870da5e |
10-Oct-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
1025c6b82118ced7742e611113e1397fa0914149 |
09-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Update design for grid/filmstrip switcher Bug: 7317501 Change-Id: I8975071b2a6d8b9f03c54c4bd3a6aa157fc6dc2e
es/layout/action_bar_two_line_text.xml
es/values/strings.xml
|
a2ce811cb505d579112f5e3c4ecb030d8252371e |
09-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Update design for grid/filmstrip switcher Bug: 7317501 Change-Id: I8975071b2a6d8b9f03c54c4bd3a6aa157fc6dc2e
es/layout/action_bar_two_line_text.xml
es/values/strings.xml
rc/com/android/gallery3d/app/GalleryActionBar.java
|
0ba2aa48cb31d835642bb15e15a66eb3a8a8c352 |
09-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Update design for grid/filmstrip switcher Bug: 7317501 Change-Id: I8975071b2a6d8b9f03c54c4bd3a6aa157fc6dc2e
rc/com/android/gallery3d/app/GalleryActionBar.java
|
7875684bb5050ed6343a10a454c57449336be8cb |
09-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am da823a72: am 1db811c5: am bc56bd0b: am bd14e827: Merge "Implementing Geometry save operations." into gb-ub-photos-arches * commit 'da823a72f9b41aad9e268cdd69d412091ae7babb': Implementing Geometry save operations.
|
da823a72f9b41aad9e268cdd69d412091ae7babb |
09-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am 1db811c5: am bc56bd0b: am bd14e827: Merge "Implementing Geometry save operations." into gb-ub-photos-arches * commit '1db811c5a009e32e5bbc9e1a8aed62887b0e5de8': Implementing Geometry save operations.
|
1db811c5a009e32e5bbc9e1a8aed62887b0e5de8 |
09-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am bc56bd0b: am bd14e827: Merge "Implementing Geometry save operations." into gb-ub-photos-arches * commit 'bc56bd0b83e52ed9ca3b17d5b41d4b03e33a17f8': Implementing Geometry save operations.
|
bc56bd0b83e52ed9ca3b17d5b41d4b03e33a17f8 |
09-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am bd14e827: Merge "Implementing Geometry save operations." into gb-ub-photos-arches * commit 'bd14e82756742a67f3a6dfe5d1f93d7ae5cadef0': Implementing Geometry save operations.
|
893fd5f78cd3cfd5801835145f2456693a6d4230 |
09-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am bd14e827: Merge "Implementing Geometry save operations." into gb-ub-photos-arches * commit 'bd14e82756742a67f3a6dfe5d1f93d7ae5cadef0': Implementing Geometry save operations.
|
7f7c2866f7d45d73b9f9f400c3758690018b32db |
09-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am bd14e827: Merge "Implementing Geometry save operations." into gb-ub-photos-arches * commit 'bd14e82756742a67f3a6dfe5d1f93d7ae5cadef0': Implementing Geometry save operations.
|
bd14e82756742a67f3a6dfe5d1f93d7ae5cadef0 |
09-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Implementing Geometry save operations." into gb-ub-photos-arches
|
c7bf12b9d336b73ea7885294da1029147c6e67a6 |
09-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Implementing Geometry save operations." into gb-ub-photos-arches
|
623d653312d7163caf16a92bb421df56ffb3cda2 |
09-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am a4991efc: am d13d1e21: am 1f6a2d89: am d490f1aa: Merge "Dejank camera roll scrolling in grid view." into gb-ub-photos-arches * commit 'a4991efce593c0a07669c0f5cc3ef9ff0cce9f6f': Dejank camera roll scrolling in grid view.
|
a4991efce593c0a07669c0f5cc3ef9ff0cce9f6f |
09-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am d13d1e21: am 1f6a2d89: am d490f1aa: Merge "Dejank camera roll scrolling in grid view." into gb-ub-photos-arches * commit 'd13d1e21642068417ea386c0cf328fc12fc93b82': Dejank camera roll scrolling in grid view.
|
d13d1e21642068417ea386c0cf328fc12fc93b82 |
09-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 1f6a2d89: am d490f1aa: Merge "Dejank camera roll scrolling in grid view." into gb-ub-photos-arches * commit '1f6a2d898092d87734e41080b55fecf84d12ec0a': Dejank camera roll scrolling in grid view.
|
1f6a2d898092d87734e41080b55fecf84d12ec0a |
09-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am d490f1aa: Merge "Dejank camera roll scrolling in grid view." into gb-ub-photos-arches * commit 'd490f1aa851db853b9865a380abd01c67605d58b': Dejank camera roll scrolling in grid view.
|
85cc1e4230c53bd33e12f2dc87ee396c6aa03733 |
09-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am d490f1aa: Merge "Dejank camera roll scrolling in grid view." into gb-ub-photos-arches * commit 'd490f1aa851db853b9865a380abd01c67605d58b': Dejank camera roll scrolling in grid view.
|
8fddf6083b0771cb4490e7120ee5dfd6058998c7 |
09-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am d490f1aa: Merge "Dejank camera roll scrolling in grid view." into gb-ub-photos-arches * commit 'd490f1aa851db853b9865a380abd01c67605d58b': Dejank camera roll scrolling in grid view.
|
d490f1aa851db853b9865a380abd01c67605d58b |
09-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Dejank camera roll scrolling in grid view." into gb-ub-photos-arches
|
8a3f6f388a1d15ec12ebfe1c1dcfb52597cb92c7 |
09-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Dejank camera roll scrolling in grid view." into gb-ub-photos-arches
|
6b27de32f878de922898dc1159f49fcc2b6234e3 |
09-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Implementing Geometry save operations. Bug: 7224232 Bug: 7218935 Change-Id: I83e5f8a5dc29c5b6be0bb69f10eadf823122bb97
ni/filters/geometry.c
|
18fc4c1c247897db0dc74e4598a512827af816e9 |
09-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Implementing Geometry save operations. Bug: 7224232 Bug: 7218935 Change-Id: I83e5f8a5dc29c5b6be0bb69f10eadf823122bb97
ni/filters/geometry.c
rc/com/android/gallery3d/filtershow/filters/ImageFilterGeometry.java
|
0310f3a4a196ac660657746ae03bb789a0835e71 |
09-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Implementing Geometry save operations. Bug: 7224232 Bug: 7218935 Change-Id: I83e5f8a5dc29c5b6be0bb69f10eadf823122bb97
rc/com/android/gallery3d/filtershow/filters/ImageFilterGeometry.java
|
293b3d3489576fdd0948ac8140303523738149ae |
09-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 1de03b3f: am 34e934ce: am a90d5d2d: am 6e733b74: Fix share crash after closing photo editor * commit '1de03b3f81527a99b3e7a4db1e37395e12cec2ba': Fix share crash after closing photo editor
|
1de03b3f81527a99b3e7a4db1e37395e12cec2ba |
09-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 34e934ce: am a90d5d2d: am 6e733b74: Fix share crash after closing photo editor * commit '34e934ce82867339e3c82bde713c9cd531291128': Fix share crash after closing photo editor
|
34e934ce82867339e3c82bde713c9cd531291128 |
09-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am a90d5d2d: am 6e733b74: Fix share crash after closing photo editor * commit 'a90d5d2d3d50ff07406c3e60bab23de1df288891': Fix share crash after closing photo editor
|
8c521cd949f730d05d7e85ce8032a62e710c0145 |
09-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 6e733b74: Fix share crash after closing photo editor * commit '6e733b74465ad6994c23d624fd8ee9b7c249e7b3': Fix share crash after closing photo editor
|
3bcb12c4847044c7179489f7ad4ae0b1342e313a |
09-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 6e733b74: Fix share crash after closing photo editor * commit '6e733b74465ad6994c23d624fd8ee9b7c249e7b3': Fix share crash after closing photo editor
|
a90d5d2d3d50ff07406c3e60bab23de1df288891 |
09-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 6e733b74: Fix share crash after closing photo editor * commit '6e733b74465ad6994c23d624fd8ee9b7c249e7b3': Fix share crash after closing photo editor
|
6e733b74465ad6994c23d624fd8ee9b7c249e7b3 |
09-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Fix share crash after closing photo editor Bug: 7306707 Change-Id: If589e1d84bc05c4d68a02feed7aaed05a568359d
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
|
e1060376749a38dfffcdc9175553097fe13aa027 |
09-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Fix share crash after closing photo editor Bug: 7306707 Change-Id: If589e1d84bc05c4d68a02feed7aaed05a568359d
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
|
504993a4655905ea9442e796ea5e4847be936f3a |
09-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am d7fc8875: am 6f1f877c: am e5c57987: am ee7c1e01: Merge "Add procedural borders" into gb-ub-photos-arches * commit 'd7fc887508adafa6e9f8e0ba6856573bf0ecb4be': Add procedural borders
|
10c1587e7bddc009d3b75c7052b9fd83d2ff7a18 |
09-Oct-2012 |
Wu-cheng Li <wuchengli@google.com> |
am de1ad20c: am 93f4df7b: am 59aefb08: am 5635aa9f: Merge "Change versionCode to 40001 and versionName to 1.1.40001." into gb-ub-photos-arches * commit 'de1ad20ca075b4d40202358c1c730df5ed72a6cf': Change versionCode to 40001 and versionName to 1.1.40001.
|
437798622c0f5cefa26aef8aed451e1412dba0eb |
09-Oct-2012 |
Wu-cheng Li <wuchengli@google.com> |
am 3510f0c8: am bb4490d1: am 6ddbf0db: am 2c83c5f0: Handle stitching progress in secure album. * commit '3510f0c8076782ce3ac92450634808b446d7d936': Handle stitching progress in secure album.
|
6f5f58ab9216a1c748bbc63cdeb047f71352b174 |
09-Oct-2012 |
Mangesh Ghiware <mghiware@google.com> |
am d0b76349: am 69c5efcf: am fcc92a7e: am 71ce96fc: Fix sharing as photo option for 360 degree panorama * commit 'd0b763496418c3ba0fb4e68d2d5a87f6eca95f93': Fix sharing as photo option for 360 degree panorama
|
d7fc887508adafa6e9f8e0ba6856573bf0ecb4be |
09-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 6f1f877c: am e5c57987: am ee7c1e01: Merge "Add procedural borders" into gb-ub-photos-arches * commit '6f1f877c43e199fcf3f59534ad478a69dbe8c978': Add procedural borders
|
6f1f877c43e199fcf3f59534ad478a69dbe8c978 |
09-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am e5c57987: am ee7c1e01: Merge "Add procedural borders" into gb-ub-photos-arches * commit 'e5c579872b254489f85b396055607ecbc4a5a664': Add procedural borders
|
e5c579872b254489f85b396055607ecbc4a5a664 |
09-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am ee7c1e01: Merge "Add procedural borders" into gb-ub-photos-arches * commit 'ee7c1e011ddf4c54d5eb6104796e113d17d29e72': Add procedural borders
|
e208f92200975bfe65731eb099de1032a31b6a46 |
09-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am ee7c1e01: Merge "Add procedural borders" into gb-ub-photos-arches * commit 'ee7c1e011ddf4c54d5eb6104796e113d17d29e72': Add procedural borders
|
1ee4521cae87c79a3ff8711591f317203ca82c66 |
09-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am ee7c1e01: Merge "Add procedural borders" into gb-ub-photos-arches * commit 'ee7c1e011ddf4c54d5eb6104796e113d17d29e72': Add procedural borders
|
505a3de7308f82c29da740972919f7822177b656 |
09-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am ee7c1e01: Merge "Add procedural borders" into gb-ub-photos-arches * commit 'ee7c1e011ddf4c54d5eb6104796e113d17d29e72': Add procedural borders
|
ee7c1e011ddf4c54d5eb6104796e113d17d29e72 |
09-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Merge "Add procedural borders" into gb-ub-photos-arches
|
d69035a67e0c650e2aa076ee678a6f9a82dffa77 |
09-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Merge "Add procedural borders" into gb-ub-photos-arches
|
de1ad20ca075b4d40202358c1c730df5ed72a6cf |
09-Oct-2012 |
Wu-cheng Li <wuchengli@google.com> |
am 93f4df7b: am 59aefb08: am 5635aa9f: Merge "Change versionCode to 40001 and versionName to 1.1.40001." into gb-ub-photos-arches * commit '93f4df7bb9ad61c344be5702d7126bc2254e4cf3': Change versionCode to 40001 and versionName to 1.1.40001.
|
93f4df7bb9ad61c344be5702d7126bc2254e4cf3 |
09-Oct-2012 |
Wu-cheng Li <wuchengli@google.com> |
am 59aefb08: am 5635aa9f: Merge "Change versionCode to 40001 and versionName to 1.1.40001." into gb-ub-photos-arches * commit '59aefb08fbd6d4b95409f25190c6004664eceb15': Change versionCode to 40001 and versionName to 1.1.40001.
|
8425a732b5bc68f990e5cada5dac812cdb78a4fe |
09-Oct-2012 |
Wu-cheng Li <wuchengli@google.com> |
am 5635aa9f: Merge "Change versionCode to 40001 and versionName to 1.1.40001." into gb-ub-photos-arches * commit '5635aa9f99c4f364019b37298cc09f0e696a4c1b': Change versionCode to 40001 and versionName to 1.1.40001.
|
59aefb08fbd6d4b95409f25190c6004664eceb15 |
09-Oct-2012 |
Wu-cheng Li <wuchengli@google.com> |
am 5635aa9f: Merge "Change versionCode to 40001 and versionName to 1.1.40001." into gb-ub-photos-arches * commit '5635aa9f99c4f364019b37298cc09f0e696a4c1b': Change versionCode to 40001 and versionName to 1.1.40001.
|
5635aa9f99c4f364019b37298cc09f0e696a4c1b |
09-Oct-2012 |
Wu-cheng Li <wuchengli@google.com> |
Merge "Change versionCode to 40001 and versionName to 1.1.40001." into gb-ub-photos-arches
|
3510f0c8076782ce3ac92450634808b446d7d936 |
09-Oct-2012 |
Wu-cheng Li <wuchengli@google.com> |
am bb4490d1: am 6ddbf0db: am 2c83c5f0: Handle stitching progress in secure album. * commit 'bb4490d16f25de31e22b5e923fc2e77fdc3bcc60': Handle stitching progress in secure album.
|
bb4490d16f25de31e22b5e923fc2e77fdc3bcc60 |
09-Oct-2012 |
Wu-cheng Li <wuchengli@google.com> |
am 6ddbf0db: am 2c83c5f0: Handle stitching progress in secure album. * commit '6ddbf0db026fbf8b8d3e21a7fa1351764a095359': Handle stitching progress in secure album.
|
902f9df2d82ae637b1a2c05202e6fa3ca65516ea |
09-Oct-2012 |
Wu-cheng Li <wuchengli@google.com> |
am 2c83c5f0: Handle stitching progress in secure album. * commit '2c83c5f09aa79d81ee11da517fd62222f8c3337d': Handle stitching progress in secure album.
|
2c48ec69724dea3052d54e568360a98441bd04b3 |
09-Oct-2012 |
Wu-cheng Li <wuchengli@google.com> |
am 2c83c5f0: Handle stitching progress in secure album. * commit '2c83c5f09aa79d81ee11da517fd62222f8c3337d': Handle stitching progress in secure album.
|
6ddbf0db026fbf8b8d3e21a7fa1351764a095359 |
09-Oct-2012 |
Wu-cheng Li <wuchengli@google.com> |
am 2c83c5f0: Handle stitching progress in secure album. * commit '2c83c5f09aa79d81ee11da517fd62222f8c3337d': Handle stitching progress in secure album.
|
d0b763496418c3ba0fb4e68d2d5a87f6eca95f93 |
09-Oct-2012 |
Mangesh Ghiware <mghiware@google.com> |
am 69c5efcf: am fcc92a7e: am 71ce96fc: Fix sharing as photo option for 360 degree panorama * commit '69c5efcfe4db097d5f52afd8734c7647abaaaea7': Fix sharing as photo option for 360 degree panorama
|
ef9ff4b41f483c9c10ff7557bc7ffd7907449213 |
09-Oct-2012 |
Wu-cheng Li <wuchengli@google.com> |
Handle stitching progress in secure album. - In secure album, show stitching progress only if it is captured after the device is locked. - Make sure image capture intent does not show stitching progress. bug:7285105 Change-Id: I0b3ba60fe3c03f488bea25e2f09843dd84ab6dfb
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/app/StitchingChangeListener.java
rc/com/android/gallery3d/data/SecureAlbum.java
|
2c83c5f09aa79d81ee11da517fd62222f8c3337d |
09-Oct-2012 |
Wu-cheng Li <wuchengli@google.com> |
Handle stitching progress in secure album. - In secure album, show stitching progress only if it is captured after the device is locked. - Make sure image capture intent does not show stitching progress. bug:7285105 Change-Id: I0b3ba60fe3c03f488bea25e2f09843dd84ab6dfb
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/app/StitchingChangeListener.java
rc/com/android/gallery3d/data/SecureAlbum.java
|
69c5efcfe4db097d5f52afd8734c7647abaaaea7 |
09-Oct-2012 |
Mangesh Ghiware <mghiware@google.com> |
am fcc92a7e: am 71ce96fc: Fix sharing as photo option for 360 degree panorama * commit 'fcc92a7e74f0e10458dfada217c286ac08d0eec1': Fix sharing as photo option for 360 degree panorama
|
d7ecf1d100270b691f909abf804f996e257e04f6 |
09-Oct-2012 |
Mangesh Ghiware <mghiware@google.com> |
am 71ce96fc: Fix sharing as photo option for 360 degree panorama * commit '71ce96fc79787dedac56af75385dc227d52be3af': Fix sharing as photo option for 360 degree panorama
|
37612530f9cec05fbd3473ef1859c38a56897014 |
09-Oct-2012 |
Mangesh Ghiware <mghiware@google.com> |
am 71ce96fc: Fix sharing as photo option for 360 degree panorama * commit '71ce96fc79787dedac56af75385dc227d52be3af': Fix sharing as photo option for 360 degree panorama
|
fcc92a7e74f0e10458dfada217c286ac08d0eec1 |
09-Oct-2012 |
Mangesh Ghiware <mghiware@google.com> |
am 71ce96fc: Fix sharing as photo option for 360 degree panorama * commit '71ce96fc79787dedac56af75385dc227d52be3af': Fix sharing as photo option for 360 degree panorama
|
91af43b868a77560bbb43d2714d5685caa179fc7 |
09-Oct-2012 |
Mangesh Ghiware <mghiware@google.com> |
Fix sharing as photo option for 360 degree panorama Bug: 7310190 Bug: 7302023 Also, fix disappearing sharing menu item in action bar. Change-Id: Id555426cce5f25d21405c885b6f7331d238cdd07
rc/com/android/gallery3d/app/GalleryActionBar.java
rc/com/android/gallery3d/app/PhotoPage.java
|
71ce96fc79787dedac56af75385dc227d52be3af |
09-Oct-2012 |
Mangesh Ghiware <mghiware@google.com> |
Fix sharing as photo option for 360 degree panorama Bug: 7310190 Bug: 7302023 Also, fix disappearing sharing menu item in action bar. Change-Id: Id555426cce5f25d21405c885b6f7331d238cdd07
rc/com/android/gallery3d/app/GalleryActionBar.java
rc/com/android/gallery3d/app/PhotoPage.java
|
296f6651c883ea6892aa41954d528d1407654f4c |
09-Oct-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am 09ec53ed: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '09ec53ed4ac50d88c923c1f9ea1ea01c3daa0c32': Set the thumbnail/screennail sizes based on screensize New UI...
|
09ec53ed4ac50d88c923c1f9ea1ea01c3daa0c32 |
09-Oct-2012 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with jb-mr1-release - do not merge Change-Id: I75b38f828159385c8a29c20a2050433bce8049ca
|
4b6f4fc5557a716c2b7db9d71c0cd2ea98248383 |
09-Oct-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
3985d73416065001058ea6f38ac4ca26206ed314 |
09-Oct-2012 |
Pin Ting <pinting@google.com> |
Dejank camera roll scrolling in grid view. Bug:7302644 Change-Id: I280be430101f57dde5a5a6f427cf48e725e39b45
rc/com/android/gallery3d/data/ImageCacheService.java
rc/com/android/gallery3d/util/GalleryUtils.java
|
6cd102dd389b9dc51d6cc3d5f67e36494565a363 |
09-Oct-2012 |
Pin Ting <pinting@google.com> |
Dejank camera roll scrolling in grid view. Bug:7302644 Change-Id: I280be430101f57dde5a5a6f427cf48e725e39b45
rc/com/android/gallery3d/data/ImageCacheService.java
rc/com/android/gallery3d/util/GalleryUtils.java
|
fc95a65c6e6f2fc302bf2bea0a5a0e1c4bfad73a |
09-Oct-2012 |
Wu-cheng Li <wuchengli@google.com> |
Change versionCode to 40001 and versionName to 1.1.40001. bug:7310127 Change-Id: Id2648c3eab0b6e3a64c6013530551af40a1cdced
ndroidManifest.xml
|
0eaafe8a5d9c7bcc19a61fdc90a4c5635a56f4da |
09-Oct-2012 |
Wu-cheng Li <wuchengli@google.com> |
Change versionCode to 40001 and versionName to 1.1.40001. bug:7310127 Change-Id: Id2648c3eab0b6e3a64c6013530551af40a1cdced
ndroidManifest.xml
|
4d57c2e6589b9e16001764412afce02949004a02 |
09-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Add procedural borders bug:7233980 Change-Id: I81008efa3d256061ec27d1ca2333debfb0ab6dd5
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
|
93dfe7a1df07a64701369b480578410efb740a27 |
09-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Add procedural borders bug:7233980 Change-Id: I81008efa3d256061ec27d1ca2333debfb0ab6dd5
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterParametricBorder.java
rc/com/android/gallery3d/filtershow/imageshow/ImageSmallFilter.java
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
|
d0aa2279d8e014b742609805cdb3407daaec2b11 |
09-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Add procedural borders bug:7233980 Change-Id: I81008efa3d256061ec27d1ca2333debfb0ab6dd5
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterParametricBorder.java
rc/com/android/gallery3d/filtershow/imageshow/ImageSmallFilter.java
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
|
2b28252daa0175ea6290d6b4ce02582283e2e1dd |
09-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am a1061018: am 1887ea76: am e28986dd: am 3a1279f1: Merge "Start Camera album in grid mode" into gb-ub-photos-arches * commit 'a106101809ff0130d5a900349798776fb96664d0': Start Camera album in grid mode
|
17336f60134f72de377d2193c3385c0e880b7f3d |
09-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 81f024d9: am fea902aa: am a74f1f4c: am 895e13e8: Fix crash when starting the editor * commit '81f024d966646ded04e187d99e51815eee9ec7fd': Fix crash when starting the editor
|
a106101809ff0130d5a900349798776fb96664d0 |
09-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 1887ea76: am e28986dd: am 3a1279f1: Merge "Start Camera album in grid mode" into gb-ub-photos-arches * commit '1887ea76f28ebe938f811cb379117e9c2d6a0396': Start Camera album in grid mode
|
81f024d966646ded04e187d99e51815eee9ec7fd |
09-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am fea902aa: am a74f1f4c: am 895e13e8: Fix crash when starting the editor * commit 'fea902aa6a8035cb6ccd1c89e002c722ccc5c8df': Fix crash when starting the editor
|
1887ea76f28ebe938f811cb379117e9c2d6a0396 |
09-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am e28986dd: am 3a1279f1: Merge "Start Camera album in grid mode" into gb-ub-photos-arches * commit 'e28986dda9d58c834fd10b179f4e2b0131260f9d': Start Camera album in grid mode
|
fea902aa6a8035cb6ccd1c89e002c722ccc5c8df |
09-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am a74f1f4c: am 895e13e8: Fix crash when starting the editor * commit 'a74f1f4c2228ad43de5385682656cf780d84d3dd': Fix crash when starting the editor
|
56eaf6ddce08bb2819d582c1dc5e81934291099f |
09-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 3a1279f1: Merge "Start Camera album in grid mode" into gb-ub-photos-arches * commit '3a1279f11ec88e62a75303469b886f1cb9d50c30': Start Camera album in grid mode
|
67d4b2f9e8e9415bc861c771ef0e2d83f39b59b5 |
09-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 3a1279f1: Merge "Start Camera album in grid mode" into gb-ub-photos-arches * commit '3a1279f11ec88e62a75303469b886f1cb9d50c30': Start Camera album in grid mode
|
7ae9cec4a10f7aaaa369a651e4af79ef1d59b90b |
09-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 895e13e8: Fix crash when starting the editor * commit '895e13e85dcb156cdc4eff882e10c4497a56de1e': Fix crash when starting the editor
|
1d84474a7132f9117263dd85e7a4d02cbcd577e5 |
09-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 895e13e8: Fix crash when starting the editor * commit '895e13e85dcb156cdc4eff882e10c4497a56de1e': Fix crash when starting the editor
|
e28986dda9d58c834fd10b179f4e2b0131260f9d |
09-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 3a1279f1: Merge "Start Camera album in grid mode" into gb-ub-photos-arches * commit '3a1279f11ec88e62a75303469b886f1cb9d50c30': Start Camera album in grid mode
|
a74f1f4c2228ad43de5385682656cf780d84d3dd |
09-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 895e13e8: Fix crash when starting the editor * commit '895e13e85dcb156cdc4eff882e10c4497a56de1e': Fix crash when starting the editor
|
3a1279f11ec88e62a75303469b886f1cb9d50c30 |
09-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Start Camera album in grid mode" into gb-ub-photos-arches
|
0f9ebfc80f2db3bcb0ecee9b77418d7d81c5956e |
09-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Start Camera album in grid mode" into gb-ub-photos-arches
|
feaca8e412e0db58fbcc74f680d8a72e9b29f6d6 |
09-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Fix crash when starting the editor Bug: 7224232 CL 236429 readded offending lines after the merge... Change-Id: I670c60ba366d2c8ec343b26c65580e8900c67819
rc/com/android/gallery3d/filtershow/imageshow/ImageShow.java
|
895e13e85dcb156cdc4eff882e10c4497a56de1e |
09-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Fix crash when starting the editor Bug: 7224232 CL 236429 readded offending lines after the merge... Change-Id: I670c60ba366d2c8ec343b26c65580e8900c67819
rc/com/android/gallery3d/filtershow/imageshow/ImageShow.java
|
7a84c578a4b3bea9eebb0b21ac161c18aad49346 |
09-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Start Camera album in grid mode Bug: 7304603 Change-Id: I537f74cd0d34b4b095c031572f8d817dd49b6388
rc/com/android/gallery3d/app/AlbumSetPage.java
|
76cf1a48c4d6c55da052ee5ec006241ffe77ffa6 |
09-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Start Camera album in grid mode Bug: 7304603 Change-Id: I537f74cd0d34b4b095c031572f8d817dd49b6388
rc/com/android/gallery3d/app/AlbumSetPage.java
|
91afd82915583b1a9c1d8ddc05c76a0791194374 |
09-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am 948bfea5: am 6940d823: am cf66c414: am a66df0c9: Added the rest of the Geometryfilter stubs. * commit '948bfea5b9dcd55720ba53b39898ebd77bc271a5': Added the rest of the Geometryfilter stubs.
|
948bfea5b9dcd55720ba53b39898ebd77bc271a5 |
09-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am 6940d823: am cf66c414: am a66df0c9: Added the rest of the Geometryfilter stubs. * commit '6940d823c31db4baf27012600c5763f6b80deaa0': Added the rest of the Geometryfilter stubs.
|
6940d823c31db4baf27012600c5763f6b80deaa0 |
09-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am cf66c414: am a66df0c9: Added the rest of the Geometryfilter stubs. * commit 'cf66c41401af64b2b3446602302cc94fff8fbfe4': Added the rest of the Geometryfilter stubs.
|
915c3eaf77ab7ef479c44d5d44879dd7a6e9c858 |
09-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am a66df0c9: Added the rest of the Geometryfilter stubs. * commit 'a66df0c9e8106ef6a275e20ab2a47286e054fe7c': Added the rest of the Geometryfilter stubs.
|
1d20eefeafe79c3c13b08fc06acd222a9c2bee2a |
09-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am a66df0c9: Added the rest of the Geometryfilter stubs. * commit 'a66df0c9e8106ef6a275e20ab2a47286e054fe7c': Added the rest of the Geometryfilter stubs.
|
cf66c41401af64b2b3446602302cc94fff8fbfe4 |
09-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am a66df0c9: Added the rest of the Geometryfilter stubs. * commit 'a66df0c9e8106ef6a275e20ab2a47286e054fe7c': Added the rest of the Geometryfilter stubs.
|
006f580da4867ca3bd4d2ce47b9b2b47c4a0d3a3 |
09-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Added the rest of the Geometryfilter stubs. Bug: 7224232 Bug: 7218935 Change-Id: I9ebbc4a98b5696e1514995e465aa4e145fdfa4f8
ni/filters/geometry.c
|
7b484b4f3a12c73a0105fb4fe817aa73bb2db6b8 |
09-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Added the rest of the Geometryfilter stubs. Bug: 7224232 Bug: 7218935 Change-Id: I9ebbc4a98b5696e1514995e465aa4e145fdfa4f8
rc/com/android/gallery3d/filtershow/filters/ImageFilterGeometry.java
rc/com/android/gallery3d/filtershow/imageshow/GeometryMetadata.java
rc/com/android/gallery3d/filtershow/imageshow/ImageGeometry.java
rc/com/android/gallery3d/filtershow/imageshow/ImageShow.java
|
a66df0c9e8106ef6a275e20ab2a47286e054fe7c |
09-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Added the rest of the Geometryfilter stubs. Bug: 7224232 Bug: 7218935 Change-Id: I9ebbc4a98b5696e1514995e465aa4e145fdfa4f8
ni/filters/geometry.c
rc/com/android/gallery3d/filtershow/filters/ImageFilterGeometry.java
rc/com/android/gallery3d/filtershow/imageshow/GeometryMetadata.java
rc/com/android/gallery3d/filtershow/imageshow/ImageGeometry.java
rc/com/android/gallery3d/filtershow/imageshow/ImageShow.java
|
e2858b175f08efed459ae54d362a1fa5aecda6f9 |
09-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am dbce4ab8: am cf07db76: am 8e5ccb21: am f70a3568: Merge "Fix crash introduced with the GeometryMetadata" into gb-ub-photos-arches * commit 'dbce4ab8b38cb11c122248f0d96e3c9786c18fb3': Fix crash introduced with the GeometryMetadata
|
dbce4ab8b38cb11c122248f0d96e3c9786c18fb3 |
09-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am cf07db76: am 8e5ccb21: am f70a3568: Merge "Fix crash introduced with the GeometryMetadata" into gb-ub-photos-arches * commit 'cf07db761fa9086f69ec4ab72571b2fc76b712d9': Fix crash introduced with the GeometryMetadata
|
cf07db761fa9086f69ec4ab72571b2fc76b712d9 |
09-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 8e5ccb21: am f70a3568: Merge "Fix crash introduced with the GeometryMetadata" into gb-ub-photos-arches * commit '8e5ccb2197b2322ecffa5c6b4195f7ac85d3119c': Fix crash introduced with the GeometryMetadata
|
8e5ccb2197b2322ecffa5c6b4195f7ac85d3119c |
09-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am f70a3568: Merge "Fix crash introduced with the GeometryMetadata" into gb-ub-photos-arches * commit 'f70a356842a14fee9e2ba9ab3aa31195841715f1': Fix crash introduced with the GeometryMetadata
|
582f1985a5b19306bc5f830f91a1045a8571b9b0 |
09-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am f70a3568: Merge "Fix crash introduced with the GeometryMetadata" into gb-ub-photos-arches * commit 'f70a356842a14fee9e2ba9ab3aa31195841715f1': Fix crash introduced with the GeometryMetadata
|
0514f575c837fcf4822ba09b5b328e0cd1208d24 |
09-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am f70a3568: Merge "Fix crash introduced with the GeometryMetadata" into gb-ub-photos-arches * commit 'f70a356842a14fee9e2ba9ab3aa31195841715f1': Fix crash introduced with the GeometryMetadata
|
b2bdbcebe91aa268ab827dd0ae2f4b638ee39b77 |
09-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Merge "Fix crash introduced with the GeometryMetadata" into gb-ub-photos-arches
|
f70a356842a14fee9e2ba9ab3aa31195841715f1 |
09-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Merge "Fix crash introduced with the GeometryMetadata" into gb-ub-photos-arches
|
8d5ad180a4f70626fe3eca0c380540f98ed24b5b |
09-Oct-2012 |
Doris Liu <tianliu@google.com> |
am 07aa0a7e: am 476563d3: am fe02f8c1: am 4438a7cc: Fix details dialog not being dismissed * commit '07aa0a7e2ae2b2f1c4af60fc9fbf92184cbbeb8a': Fix details dialog not being dismissed
|
07aa0a7e2ae2b2f1c4af60fc9fbf92184cbbeb8a |
09-Oct-2012 |
Doris Liu <tianliu@google.com> |
am 476563d3: am fe02f8c1: am 4438a7cc: Fix details dialog not being dismissed * commit '476563d31de1b8742c08a9150ffb4b7e65368d45': Fix details dialog not being dismissed
|
476563d31de1b8742c08a9150ffb4b7e65368d45 |
09-Oct-2012 |
Doris Liu <tianliu@google.com> |
am fe02f8c1: am 4438a7cc: Fix details dialog not being dismissed * commit 'fe02f8c1dee70f766828444e820b5766fd16147e': Fix details dialog not being dismissed
|
fe02f8c1dee70f766828444e820b5766fd16147e |
09-Oct-2012 |
Doris Liu <tianliu@google.com> |
am 4438a7cc: Fix details dialog not being dismissed * commit '4438a7cce00cb19cb35cfc3cc149533f40043c00': Fix details dialog not being dismissed
|
93ae870f1e8400b79b786daa88c7e17ad8065fcc |
09-Oct-2012 |
Doris Liu <tianliu@google.com> |
am 4438a7cc: Fix details dialog not being dismissed * commit '4438a7cce00cb19cb35cfc3cc149533f40043c00': Fix details dialog not being dismissed
|
ccf7fd0f708d15c5117db1f0693597fa6a260547 |
09-Oct-2012 |
Doris Liu <tianliu@google.com> |
am 4438a7cc: Fix details dialog not being dismissed * commit '4438a7cce00cb19cb35cfc3cc149533f40043c00': Fix details dialog not being dismissed
|
adc9c57eb6cbab40bb8a8d58379ebbeb08fe077a |
09-Oct-2012 |
Doris Liu <tianliu@google.com> |
Fix details dialog not being dismissed Bug: 7300997 Change-Id: I0d0dad50a9777f8ea49889a4517b8704a03021c5
rc/com/android/gallery3d/app/PhotoPage.java
|
4438a7cce00cb19cb35cfc3cc149533f40043c00 |
09-Oct-2012 |
Doris Liu <tianliu@google.com> |
Fix details dialog not being dismissed Bug: 7300997 Change-Id: I0d0dad50a9777f8ea49889a4517b8704a03021c5
rc/com/android/gallery3d/app/PhotoPage.java
|
18ec21bd07b2f9ccf5a76c407303b3dacbb845fd |
09-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Fix crash introduced with the GeometryMetadata bug:7224232 bug:7279964 bug:7298708 - Also remove the slide gesture (only use the slider widget) - use scaleFactor to apply sharpen proportionally Change-Id: Icce786cb53f2d3d6feada76c63108a563aaab7a3
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/cache/ImageLoader.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterRS.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterSharpen.java
rc/com/android/gallery3d/filtershow/imageshow/ImageShow.java
rc/com/android/gallery3d/filtershow/imageshow/ImageZoom.java
|
de154778c8f94121cb2117fcf6224c40c01b6132 |
09-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Fix crash introduced with the GeometryMetadata bug:7224232 bug:7279964 bug:7298708 - Also remove the slide gesture (only use the slider widget) - use scaleFactor to apply sharpen proportionally Change-Id: Icce786cb53f2d3d6feada76c63108a563aaab7a3
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/cache/ImageLoader.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterRS.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterSharpen.java
rc/com/android/gallery3d/filtershow/imageshow/ImageShow.java
rc/com/android/gallery3d/filtershow/imageshow/ImageZoom.java
|
6d4601c07304f92ff240a5dd4e60c42b7f540ae7 |
09-Oct-2012 |
John Reck <jreck@google.com> |
am 2175d23f: am c7b7c342: am 73d3785c: am a29eeac8: Use framework orientation * commit '2175d23f85003cc3a3f212821382401da7c565ec': Use framework orientation
|
a1b92169cf0927cb0c9880a4cbdeb8b780d9f6ac |
09-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 39f698df: am fe9c82cf: am 821b775d: am 8eb8c39a: Merge "Fix the filtershow activity to portrait" into gb-ub-photos-arches * commit '39f698df3ec41e31a26dd2d12e89bda1479ec6da': Fix the filtershow activity to portrait
|
9ec026bb78d2868fda6c43d623fb2a20ec1aaad0 |
09-Oct-2012 |
John Hoford <hoford@google.com> |
am fca8cff2: am 932f3da6: am 3122f4d1: am 1a291db0: Merge "add redeye and improve shadow removal" into gb-ub-photos-arches * commit 'fca8cff29d0daa80694648196b9aaad75a0f5f86': add redeye and improve shadow removal
|
69f2b4a46011ace397c306ce28ad0f904d2c08c8 |
09-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am ee7646d4: am 341335c1: am 05ae0806: am 639095c6: Correct undo behavior * commit 'ee7646d4f150c3090f7b1a805957c275f8df655a': Correct undo behavior
|
f19ff2910f84617ee9b78d8bbdda3b24ded079cd |
09-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am 4c6bb634: am 8fd2a1e8: am 0efc1133: am 7bd60250: Added stub for applying geometry flip. * commit '4c6bb634926327c78f46c3bd36bfe6d5544e6a46': Added stub for applying geometry flip.
|
2175d23f85003cc3a3f212821382401da7c565ec |
09-Oct-2012 |
John Reck <jreck@google.com> |
am c7b7c342: am 73d3785c: am a29eeac8: Use framework orientation * commit 'c7b7c342a26452d89747d92dd7a847a4f2a67aa4': Use framework orientation
|
c7b7c342a26452d89747d92dd7a847a4f2a67aa4 |
09-Oct-2012 |
John Reck <jreck@google.com> |
am 73d3785c: am a29eeac8: Use framework orientation * commit '73d3785cf92da3cc81ea75f44ab1eb34294655fd': Use framework orientation
|
39f698df3ec41e31a26dd2d12e89bda1479ec6da |
09-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am fe9c82cf: am 821b775d: am 8eb8c39a: Merge "Fix the filtershow activity to portrait" into gb-ub-photos-arches * commit 'fe9c82cff36c778ab8f853cd8b303519458ded78': Fix the filtershow activity to portrait
|
1d1cfad2665af92b6db79dcc3795f453bd321316 |
09-Oct-2012 |
John Reck <jreck@google.com> |
am a29eeac8: Use framework orientation * commit 'a29eeac8993b221d98cffbec5583b5cba1921c89': Use framework orientation
|
26edf4154b9fe982e86b4c3d1cc7fbb66b514f99 |
09-Oct-2012 |
John Reck <jreck@google.com> |
am a29eeac8: Use framework orientation * commit 'a29eeac8993b221d98cffbec5583b5cba1921c89': Use framework orientation
|
73d3785cf92da3cc81ea75f44ab1eb34294655fd |
09-Oct-2012 |
John Reck <jreck@google.com> |
am a29eeac8: Use framework orientation * commit 'a29eeac8993b221d98cffbec5583b5cba1921c89': Use framework orientation
|
fe9c82cff36c778ab8f853cd8b303519458ded78 |
09-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 821b775d: am 8eb8c39a: Merge "Fix the filtershow activity to portrait" into gb-ub-photos-arches * commit '821b775d7790fd3c9bc2a098294a9ac3a49af0f9': Fix the filtershow activity to portrait
|
a29eeac8993b221d98cffbec5583b5cba1921c89 |
08-Oct-2012 |
John Reck <jreck@google.com> |
Use framework orientation Bug: 7292373 Change-Id: I66e0c3a3b43a5d544ecc3fc9a4a04fa5521d36b2
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/ui/PhotoView.java
|
23c83737da80ba0b186440a8e649dfc8c5272eb0 |
08-Oct-2012 |
John Reck <jreck@google.com> |
Use framework orientation Bug: 7292373 Change-Id: I66e0c3a3b43a5d544ecc3fc9a4a04fa5521d36b2
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/ui/PhotoView.java
|
640c8eb48f255d841b5b58a96572150a6723bff6 |
09-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 8eb8c39a: Merge "Fix the filtershow activity to portrait" into gb-ub-photos-arches * commit '8eb8c39a4820f04f9fc5f1edcea73670ee0b913c': Fix the filtershow activity to portrait
|
821b775d7790fd3c9bc2a098294a9ac3a49af0f9 |
09-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 8eb8c39a: Merge "Fix the filtershow activity to portrait" into gb-ub-photos-arches * commit '8eb8c39a4820f04f9fc5f1edcea73670ee0b913c': Fix the filtershow activity to portrait
|
fca8cff29d0daa80694648196b9aaad75a0f5f86 |
09-Oct-2012 |
John Hoford <hoford@google.com> |
am 932f3da6: am 3122f4d1: am 1a291db0: Merge "add redeye and improve shadow removal" into gb-ub-photos-arches * commit '932f3da67a204bdb8371ebeae588176d56be9279': add redeye and improve shadow removal
|
932f3da67a204bdb8371ebeae588176d56be9279 |
09-Oct-2012 |
John Hoford <hoford@google.com> |
am 3122f4d1: am 1a291db0: Merge "add redeye and improve shadow removal" into gb-ub-photos-arches * commit '3122f4d1eba587749a790f28cf3a91694bbf6307': add redeye and improve shadow removal
|
8eb8c39a4820f04f9fc5f1edcea73670ee0b913c |
09-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Merge "Fix the filtershow activity to portrait" into gb-ub-photos-arches
|
31e0666b270faa4574995541cfe4523adb82d41e |
09-Oct-2012 |
John Hoford <hoford@google.com> |
am 1a291db0: Merge "add redeye and improve shadow removal" into gb-ub-photos-arches * commit '1a291db030b2f3f7752026dd347ec34b82f8891e': add redeye and improve shadow removal
|
a3ecbd9cac6f92b40081d148ba49156cefefbc4b |
09-Oct-2012 |
John Hoford <hoford@google.com> |
am 1a291db0: Merge "add redeye and improve shadow removal" into gb-ub-photos-arches * commit '1a291db030b2f3f7752026dd347ec34b82f8891e': add redeye and improve shadow removal
|
53decbdc0d7ce4b747c0c5155fe986f17f1bfe2b |
09-Oct-2012 |
John Hoford <hoford@google.com> |
am 1a291db0: Merge "add redeye and improve shadow removal" into gb-ub-photos-arches * commit '1a291db030b2f3f7752026dd347ec34b82f8891e': add redeye and improve shadow removal
|
3122f4d1eba587749a790f28cf3a91694bbf6307 |
09-Oct-2012 |
John Hoford <hoford@google.com> |
am 1a291db0: Merge "add redeye and improve shadow removal" into gb-ub-photos-arches * commit '1a291db030b2f3f7752026dd347ec34b82f8891e': add redeye and improve shadow removal
|
685bc7b98b1528ee177a277dfad4f5da8563fe25 |
09-Oct-2012 |
John Hoford <hoford@google.com> |
Merge "add redeye and improve shadow removal" into gb-ub-photos-arches
|
1a291db030b2f3f7752026dd347ec34b82f8891e |
09-Oct-2012 |
John Hoford <hoford@google.com> |
Merge "add redeye and improve shadow removal" into gb-ub-photos-arches
|
ee7646d4f150c3090f7b1a805957c275f8df655a |
09-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 341335c1: am 05ae0806: am 639095c6: Correct undo behavior * commit '341335c1afd14dac36c4c74297da16e41b033c39': Correct undo behavior
|
341335c1afd14dac36c4c74297da16e41b033c39 |
09-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 05ae0806: am 639095c6: Correct undo behavior * commit '05ae08060173934dcd180b6de2a1d7c5b1d0d7ca': Correct undo behavior
|
3e441d86f224923498cf040bcf7b4581e1f10314 |
08-Oct-2012 |
John Hoford <hoford@google.com> |
add redeye and improve shadow removal bug:7234321 Change-Id: I12c2eb28555d7594fddf86dfa224219b70137681
ni/Android.mk
|
b1ae4b1483e3c64a7e22ec54dfe01ed7d412a393 |
08-Oct-2012 |
John Hoford <hoford@google.com> |
add redeye and improve shadow removal bug:7234321 Change-Id: I12c2eb28555d7594fddf86dfa224219b70137681
es/layout/filtershow_activity.xml
es/values/filtershow_strings.xml
|
7586ddacf5d40538fd2029785eb8c53e6197eb24 |
08-Oct-2012 |
John Hoford <hoford@google.com> |
add redeye and improve shadow removal bug:7234321 Change-Id: I12c2eb28555d7594fddf86dfa224219b70137681
ni/Android.mk
ni/filters/filters.h
ni/filters/hsv.c
ni/filters/redEyeMath.c
ni/filters/redeye.c
ni/filters/shadows.c
|
86aa80d008745a3717666d6773f563865aa6029c |
08-Oct-2012 |
John Hoford <hoford@google.com> |
add redeye and improve shadow removal bug:7234321 Change-Id: I12c2eb28555d7594fddf86dfa224219b70137681
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/PanelController.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterRedEye.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterShadows.java
|
90b1d251973bfa748d435896fc277cb4024451ad |
08-Oct-2012 |
John Hoford <hoford@google.com> |
add redeye and improve shadow removal bug:7234321 Change-Id: I12c2eb28555d7594fddf86dfa224219b70137681
ni/Android.mk
ni/filters/filters.h
ni/filters/hsv.c
ni/filters/redEyeMath.c
ni/filters/redeye.c
ni/filters/shadows.c
es/layout/filtershow_activity.xml
es/values/filtershow_strings.xml
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/PanelController.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterRedEye.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterShadows.java
|
86a39f04ab1672b7d9a882aa6c81bbd3f055cbe6 |
09-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Fix the filtershow activity to portrait bug:7279214 Stop-gap for factory rom. Change-Id: I6073d148dff1016577244cf26c7048ca00d58a54
ndroidManifest.xml
|
ab7596d8851ec8b1d12caf6834fe35e9d10bbafe |
09-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Fix the filtershow activity to portrait bug:7279214 Stop-gap for factory rom. Change-Id: I6073d148dff1016577244cf26c7048ca00d58a54
ndroidManifest.xml
|
174187340a7f68ff083c60b392d65a0b5e9eb64a |
09-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 639095c6: Correct undo behavior * commit '639095c6bed84ab0bf9ebc7c4f8b8c944df285a1': Correct undo behavior
|
c3dbb8b69617ccff552d0676791c0258eee4d6e6 |
09-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 639095c6: Correct undo behavior * commit '639095c6bed84ab0bf9ebc7c4f8b8c944df285a1': Correct undo behavior
|
05ae08060173934dcd180b6de2a1d7c5b1d0d7ca |
09-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 639095c6: Correct undo behavior * commit '639095c6bed84ab0bf9ebc7c4f8b8c944df285a1': Correct undo behavior
|
65de4b056f718c1f286ecd74ede24ec9b19514fa |
08-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Correct undo behavior Bug: 7307293 Change-Id: I72f814acd3625024f1e2aeccec4abfd28ad3319b
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/ui/PhotoView.java
|
639095c6bed84ab0bf9ebc7c4f8b8c944df285a1 |
08-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Correct undo behavior Bug: 7307293 Change-Id: I72f814acd3625024f1e2aeccec4abfd28ad3319b
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/ui/PhotoView.java
|
4c6bb634926327c78f46c3bd36bfe6d5544e6a46 |
08-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am 8fd2a1e8: am 0efc1133: am 7bd60250: Added stub for applying geometry flip. * commit '8fd2a1e873305e8a74a2a08fff235d4ec580869a': Added stub for applying geometry flip.
|
8fd2a1e873305e8a74a2a08fff235d4ec580869a |
08-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am 0efc1133: am 7bd60250: Added stub for applying geometry flip. * commit '0efc1133fa3c8f512ef6adccf0fefc291ebe36f1': Added stub for applying geometry flip.
|
126029bf484b8af233aae44c0c5c9551bd6a3cab |
08-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am 7bd60250: Added stub for applying geometry flip. * commit '7bd602506fee36f3ef0a68bfa1ba5dd1e74ca5dd': Added stub for applying geometry flip.
|
72d6c3a0e9989f6c89d9cb5867349dcee31c354c |
08-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am 7bd60250: Added stub for applying geometry flip. * commit '7bd602506fee36f3ef0a68bfa1ba5dd1e74ca5dd': Added stub for applying geometry flip.
|
3e8feaa04611fb2b71f0ddf4022ed4def631ed19 |
08-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am 7bd60250: Added stub for applying geometry flip. * commit '7bd602506fee36f3ef0a68bfa1ba5dd1e74ca5dd': Added stub for applying geometry flip.
|
0efc1133fa3c8f512ef6adccf0fefc291ebe36f1 |
08-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am 7bd60250: Added stub for applying geometry flip. * commit '7bd602506fee36f3ef0a68bfa1ba5dd1e74ca5dd': Added stub for applying geometry flip.
|
3ee1d4e1aefc8f12925c850f6a56e4134d2a58ec |
08-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Added stub for applying geometry flip. Bug: 7224232 Bug: 7218935 Change-Id: Iaeea6a94f4fea44a8046f09a0fce72fe32ed7cc0
ni/Android.mk
|
2345ee4d00f6f24cbb73084402e6c084e00dbae6 |
08-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Added stub for applying geometry flip. Bug: 7224232 Bug: 7218935 Change-Id: Iaeea6a94f4fea44a8046f09a0fce72fe32ed7cc0
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
|
d2e42364083f1ceff58c43660db66a82b5e2fe48 |
08-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Added stub for applying geometry flip. Bug: 7224232 Bug: 7218935 Change-Id: Iaeea6a94f4fea44a8046f09a0fce72fe32ed7cc0
ni/Android.mk
ni/filters/geometry.c
|
d922690a19edb8afbb103381f3a9c329ee2f9681 |
08-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Added stub for applying geometry flip. Bug: 7224232 Bug: 7218935 Change-Id: Iaeea6a94f4fea44a8046f09a0fce72fe32ed7cc0
rc/com/android/gallery3d/filtershow/filters/ImageFilterGeometry.java
rc/com/android/gallery3d/filtershow/imageshow/GeometryMetadata.java
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
|
7bd602506fee36f3ef0a68bfa1ba5dd1e74ca5dd |
08-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Added stub for applying geometry flip. Bug: 7224232 Bug: 7218935 Change-Id: Iaeea6a94f4fea44a8046f09a0fce72fe32ed7cc0
ni/Android.mk
ni/filters/geometry.c
rc/com/android/gallery3d/filtershow/filters/ImageFilterGeometry.java
rc/com/android/gallery3d/filtershow/imageshow/GeometryMetadata.java
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
|
68191351084c1e7af9a1bf320601259737338df4 |
08-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am b25f7950: am be4d0574: am 3f496bb0: am 8e7b5094: Merge "Adding Crop, Rotate, Flip." into gb-ub-photos-arches * commit 'b25f7950b9fe54a1c42b00662b79639ce1844108': Adding Crop, Rotate, Flip.
|
b25f7950b9fe54a1c42b00662b79639ce1844108 |
08-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am be4d0574: am 3f496bb0: am 8e7b5094: Merge "Adding Crop, Rotate, Flip." into gb-ub-photos-arches * commit 'be4d0574388a91f5bf0e70c2a8383ec08ff39cc7': Adding Crop, Rotate, Flip.
|
be4d0574388a91f5bf0e70c2a8383ec08ff39cc7 |
08-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am 3f496bb0: am 8e7b5094: Merge "Adding Crop, Rotate, Flip." into gb-ub-photos-arches * commit '3f496bb02f11067b4b66d9a1dce74262dcb80c3f': Adding Crop, Rotate, Flip.
|
bc18165e309805eed7c709933f2dbbced185fff5 |
08-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am 8e7b5094: Merge "Adding Crop, Rotate, Flip." into gb-ub-photos-arches * commit '8e7b50948261570ec1d75ba451236b971dc5dc0f': Adding Crop, Rotate, Flip.
|
25ecac5b6ebc76719ae78bb9eb431cc290fedbc6 |
08-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am 8e7b5094: Merge "Adding Crop, Rotate, Flip." into gb-ub-photos-arches * commit '8e7b50948261570ec1d75ba451236b971dc5dc0f': Adding Crop, Rotate, Flip.
|
7ba701dd4be70acfb984dab273208cb931330e16 |
08-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am 8e7b5094: Merge "Adding Crop, Rotate, Flip." into gb-ub-photos-arches * commit '8e7b50948261570ec1d75ba451236b971dc5dc0f': Adding Crop, Rotate, Flip.
|
3f496bb02f11067b4b66d9a1dce74262dcb80c3f |
08-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am 8e7b5094: Merge "Adding Crop, Rotate, Flip." into gb-ub-photos-arches * commit '8e7b50948261570ec1d75ba451236b971dc5dc0f': Adding Crop, Rotate, Flip.
|
25a9ae276acdde21c5f647a170cc19f04be8e62e |
08-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Adding Crop, Rotate, Flip." into gb-ub-photos-arches
|
8e7b50948261570ec1d75ba451236b971dc5dc0f |
08-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Adding Crop, Rotate, Flip." into gb-ub-photos-arches
|
95a6e3103c062e7c7ee8766a37904e9a0826b273 |
08-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am 5141d44f: (-s ours) am 7d134308: am 9e733e81: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev * commit '5141d44f03d2e00e40f02853643d56cd70581186': Import translations. DO NOT MERGE
|
5751f4089f007af50b95bdcae667411c597605fc |
08-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am 877fb1b4: (-s ours) am 785bfd56: am cbc3109e: am d199202e: (-s ours) Import translations. DO NOT MERGE * commit '877fb1b41a4f541e29a09b80c5e00ed71183ea19': Import translations. DO NOT MERGE
|
5141d44f03d2e00e40f02853643d56cd70581186 |
08-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am 7d134308: am 9e733e81: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev * commit '7d1343088c1b8f924b3df9f6a2c0d779274367d1': Import translations. DO NOT MERGE
|
877fb1b41a4f541e29a09b80c5e00ed71183ea19 |
08-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am 785bfd56: am cbc3109e: am d199202e: (-s ours) Import translations. DO NOT MERGE * commit '785bfd5617f4b47e0c1830bef081985e6a4f402a': Import translations. DO NOT MERGE
|
09ec6998cdf73f78b3700871d8db53b73e362378 |
08-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am 6fcdffea: (-s ours) am 3ee2aec5: Import translations. DO NOT MERGE * commit '6fcdffea5e2e7e76a80a988faaf838040f43f2ba': Import translations. DO NOT MERGE
|
7d1343088c1b8f924b3df9f6a2c0d779274367d1 |
08-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am 9e733e81: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev * commit '9e733e81a279d5dfdeddad91879b2fff0fa514f4': Import translations. DO NOT MERGE
|
785bfd5617f4b47e0c1830bef081985e6a4f402a |
08-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am cbc3109e: am d199202e: (-s ours) Import translations. DO NOT MERGE * commit 'cbc3109e1d03c267df564690a159f598c3e9ac5b': Import translations. DO NOT MERGE
|
6fcdffea5e2e7e76a80a988faaf838040f43f2ba |
08-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am 3ee2aec5: Import translations. DO NOT MERGE * commit '3ee2aec5e532cf95c9eb19c109e27c6171752bfa': Import translations. DO NOT MERGE
|
9e733e81a279d5dfdeddad91879b2fff0fa514f4 |
08-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
|
cbc3109e1d03c267df564690a159f598c3e9ac5b |
08-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am d199202e: (-s ours) Import translations. DO NOT MERGE * commit 'd199202e267d14d8fe307ccae8521191e84d32a5': Import translations. DO NOT MERGE
|
ede4d9804e048f2742254203431c1d6813ab3a99 |
08-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am d199202e: (-s ours) Import translations. DO NOT MERGE * commit 'd199202e267d14d8fe307ccae8521191e84d32a5': Import translations. DO NOT MERGE
|
7f0c5fa4720ef29b325b8da4879437a34e6e6bf1 |
08-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am d199202e: (-s ours) Import translations. DO NOT MERGE * commit 'd199202e267d14d8fe307ccae8521191e84d32a5': Import translations. DO NOT MERGE
|
98c69b734e8c1e2a3c3d8c180cfcfdc4bbac0182 |
27-Sep-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Adding Crop, Rotate, Flip. Bug: 7224232 Bug: 7218935 Adding geometry manipulation UI features. Change-Id: If924313c18121e6d192a1934e76691bd578d8eb0
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/PanelController.java
rc/com/android/gallery3d/filtershow/imageshow/GeometryMetadata.java
rc/com/android/gallery3d/filtershow/imageshow/ImageCrop.java
rc/com/android/gallery3d/filtershow/imageshow/ImageFlip.java
rc/com/android/gallery3d/filtershow/imageshow/ImageGeometry.java
rc/com/android/gallery3d/filtershow/imageshow/ImageRotate.java
rc/com/android/gallery3d/filtershow/imageshow/ImageShow.java
rc/com/android/gallery3d/filtershow/imageshow/ImageSlave.java
rc/com/android/gallery3d/filtershow/imageshow/ImageStraighten.java
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
|
16f709d45ab563cb53d28fce7efb1afda60f01ab |
27-Sep-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Adding Crop, Rotate, Flip. Bug: 7224232 Bug: 7218935 Adding geometry manipulation UI features. Change-Id: If924313c18121e6d192a1934e76691bd578d8eb0
es/layout/filtershow_activity.xml
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
|
8537d097f8827caedc8c39564de54d36eae8b16f |
27-Sep-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Adding Crop, Rotate, Flip. Bug: 7224232 Bug: 7218935 Adding geometry manipulation UI features. Change-Id: If924313c18121e6d192a1934e76691bd578d8eb0
es/layout/filtershow_activity.xml
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/PanelController.java
rc/com/android/gallery3d/filtershow/imageshow/GeometryMetadata.java
rc/com/android/gallery3d/filtershow/imageshow/ImageCrop.java
rc/com/android/gallery3d/filtershow/imageshow/ImageFlip.java
rc/com/android/gallery3d/filtershow/imageshow/ImageGeometry.java
rc/com/android/gallery3d/filtershow/imageshow/ImageRotate.java
rc/com/android/gallery3d/filtershow/imageshow/ImageShow.java
rc/com/android/gallery3d/filtershow/imageshow/ImageSlave.java
rc/com/android/gallery3d/filtershow/imageshow/ImageStraighten.java
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
|
51309fc4bd9677b9f83acd68eac42e3ab6b8edba |
08-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ia89d0ceab8100f459e10f443350da7fb9610030e Auto-generated-cl: translation import
es/values-ar/strings.xml
es/values-nb/strings.xml
es/values-sk/strings.xml
es/values-sw/strings.xml
es/values-tr/strings.xml
|
5563353cfe02607e59ffe8b603c34e72dd59fc7f |
08-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I68176186a2943b1ac6e6a66ef3a69d381904774c Auto-generated-cl: translation import
es/values-ar/strings.xml
es/values-nb/strings.xml
es/values-sk/strings.xml
es/values-sw/strings.xml
es/values-tr/strings.xml
|
3ee2aec5e532cf95c9eb19c109e27c6171752bfa |
08-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ib10195e4950980b7f97664a2950aad60b35da7c1 Auto-generated-cl: translation import
es/values-ar/strings.xml
es/values-nb/strings.xml
es/values-sk/strings.xml
es/values-sw/strings.xml
es/values-tr/strings.xml
|
ec32ad06a0623c7d45354eb6140529c083cab769 |
08-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ib81a301f1766134e238b4280a19ad9dfb4ea54e7 Auto-generated-cl: translation import
es/values-ar/strings.xml
es/values-nb/strings.xml
es/values-sk/strings.xml
es/values-sw/strings.xml
es/values-tr/strings.xml
|
5828a57e6114f051ea4797be4b4d2c4b507d06f5 |
08-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ib81a301f1766134e238b4280a19ad9dfb4ea54e7 Auto-generated-cl: translation import
es/values-ar/strings.xml
es/values-nb/strings.xml
es/values-sk/strings.xml
es/values-sw/strings.xml
es/values-tr/strings.xml
|
4b6150f4242f1850d83a08b6662f5da3a35b26f8 |
08-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I5f9734095da2a7369cfbd5eb49526d8a0a925466 Auto-generated-cl: translation import
es/values-ar/strings.xml
es/values-nb/strings.xml
es/values-sk/strings.xml
es/values-sw/strings.xml
es/values-tr/strings.xml
|
d199202e267d14d8fe307ccae8521191e84d32a5 |
08-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I5f9734095da2a7369cfbd5eb49526d8a0a925466 Auto-generated-cl: translation import
es/values-ar/strings.xml
es/values-nb/strings.xml
es/values-sk/strings.xml
es/values-sw/strings.xml
es/values-tr/strings.xml
|
d061ad6b70b2fa5cd45bb7ce629d1c0d75c93ea0 |
08-Oct-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
7e4b4df8d6a30257df154b6f11657355bfb4b5ca |
08-Oct-2012 |
Mangesh Ghiware <mghiware@google.com> |
am c94894dd: am 856b49ac: am e0ad4914: am 51ebe5f7: Share only 360-degree panoramas with new MIME type * commit 'c94894dd7fd17022537c7a9ff84b37e3d27de2d8': Share only 360-degree panoramas with new MIME type
|
c94894dd7fd17022537c7a9ff84b37e3d27de2d8 |
08-Oct-2012 |
Mangesh Ghiware <mghiware@google.com> |
am 856b49ac: am e0ad4914: am 51ebe5f7: Share only 360-degree panoramas with new MIME type * commit '856b49ac5c1af7bd025905e275599deff0c55bab': Share only 360-degree panoramas with new MIME type
|
856b49ac5c1af7bd025905e275599deff0c55bab |
08-Oct-2012 |
Mangesh Ghiware <mghiware@google.com> |
am e0ad4914: am 51ebe5f7: Share only 360-degree panoramas with new MIME type * commit 'e0ad4914d533f9dab3b0e0f21808a3c6dd4aa5d4': Share only 360-degree panoramas with new MIME type
|
0b722722955f105fa295bd9db7ac57fc534b41a3 |
08-Oct-2012 |
Mangesh Ghiware <mghiware@google.com> |
am 51ebe5f7: Share only 360-degree panoramas with new MIME type * commit '51ebe5f71b9f00af95c8d64f1ff895fc7b9aa018': Share only 360-degree panoramas with new MIME type
|
89526c561ea56c8ab452d488cee1f7edb392a2ce |
08-Oct-2012 |
Mangesh Ghiware <mghiware@google.com> |
am 51ebe5f7: Share only 360-degree panoramas with new MIME type * commit '51ebe5f71b9f00af95c8d64f1ff895fc7b9aa018': Share only 360-degree panoramas with new MIME type
|
e0ad4914d533f9dab3b0e0f21808a3c6dd4aa5d4 |
08-Oct-2012 |
Mangesh Ghiware <mghiware@google.com> |
am 51ebe5f7: Share only 360-degree panoramas with new MIME type * commit '51ebe5f71b9f00af95c8d64f1ff895fc7b9aa018': Share only 360-degree panoramas with new MIME type
|
96e48d0946d3b3178a784f92fb40f21307cdd518 |
08-Oct-2012 |
Mangesh Ghiware <mghiware@google.com> |
Share only 360-degree panoramas with new MIME type Bug: 7302972 Instead of using the UsePanoramaViewer attribute in XMP metadata, ensure that the panorama is full 360 degree by checking if the cropped width is same as the full panorama width. Change-Id: I66d864df96052f96db5fa19fb02b3abe214b4dec
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/data/LocalImage.java
rc/com/android/gallery3d/data/MediaItem.java
rc/com/android/gallery3d/data/MediaObject.java
rc/com/android/gallery3d/data/UriImage.java
rc/com/android/gallery3d/ui/ActionModeHandler.java
rc/com/android/gallery3d/ui/MenuExecutor.java
rc/com/android/gallery3d/util/GalleryUtils.java
rc_pd/com/android/gallery3d/util/LightCycleHelper.java
|
51ebe5f71b9f00af95c8d64f1ff895fc7b9aa018 |
08-Oct-2012 |
Mangesh Ghiware <mghiware@google.com> |
Share only 360-degree panoramas with new MIME type Bug: 7302972 Instead of using the UsePanoramaViewer attribute in XMP metadata, ensure that the panorama is full 360 degree by checking if the cropped width is same as the full panorama width. Change-Id: I66d864df96052f96db5fa19fb02b3abe214b4dec
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/data/LocalImage.java
rc/com/android/gallery3d/data/MediaItem.java
rc/com/android/gallery3d/data/MediaObject.java
rc/com/android/gallery3d/data/UriImage.java
rc/com/android/gallery3d/ui/ActionModeHandler.java
rc/com/android/gallery3d/ui/MenuExecutor.java
rc/com/android/gallery3d/util/GalleryUtils.java
rc_pd/com/android/gallery3d/util/LightCycleHelper.java
|
4aa38771e3742123b8c43cfd58a3b0f4e23d864c |
08-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 7d20f9c3: am a2a8ca9a: am a255a554: am 76f18810: Launch correct photo when tapping grid item in Camera roll * commit '7d20f9c3ad4c498e6046f4c1d80be11a76f190d8': Launch correct photo when tapping grid item in Camera roll
|
0b98cf59222f7eae194e62804f173ab4e49f3a56 |
08-Oct-2012 |
Owen Lin <owenlin@google.com> |
am ee8d3328: am 859af62c: am 1414391d: am ed8c8810: Merge "Fix ANR in creating the fallback animation." into gb-ub-photos-arches * commit 'ee8d332866be560fa8ff828e133c7b8d636ce55d': Fix ANR in creating the fallback animation.
|
8ab65261335fa8aadfc3cbd53600154b6c792ab2 |
08-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am c2179578: am 8bfae8fa: am 96cc8960: am d81b2649: No Camera recenter on resume after editing or viewing items * commit 'c217957843d94045c59ee79a4f83aa1c337b19de': No Camera recenter on resume after editing or viewing items
|
28f93f35ac5fb3f284cd00e1a3937ae74a3258fe |
08-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am a3019b73: am 28e83581: am 60309301: am 4b39551d: Merge "Show progress indicator dialog when saving edited image" into gb-ub-photos-arches * commit 'a3019b7396eaba3def09cedfc5689e61a8591c0a': Show progress indicator dialog when saving edited image
|
7d20f9c3ad4c498e6046f4c1d80be11a76f190d8 |
08-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am a2a8ca9a: am a255a554: am 76f18810: Launch correct photo when tapping grid item in Camera roll * commit 'a2a8ca9a42017bb600b711007d3698673901c857': Launch correct photo when tapping grid item in Camera roll
|
ee8d332866be560fa8ff828e133c7b8d636ce55d |
08-Oct-2012 |
Owen Lin <owenlin@google.com> |
am 859af62c: am 1414391d: am ed8c8810: Merge "Fix ANR in creating the fallback animation." into gb-ub-photos-arches * commit '859af62c8e1cc8367b9edc14292bc2d557cca6ad': Fix ANR in creating the fallback animation.
|
c217957843d94045c59ee79a4f83aa1c337b19de |
08-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 8bfae8fa: am 96cc8960: am d81b2649: No Camera recenter on resume after editing or viewing items * commit '8bfae8fa30a34f862a45eebc57253adf60352b70': No Camera recenter on resume after editing or viewing items
|
a3019b7396eaba3def09cedfc5689e61a8591c0a |
08-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 28e83581: am 60309301: am 4b39551d: Merge "Show progress indicator dialog when saving edited image" into gb-ub-photos-arches * commit '28e835818c8d503998b67ab605d1fec6ef4c9fcf': Show progress indicator dialog when saving edited image
|
a2a8ca9a42017bb600b711007d3698673901c857 |
08-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am a255a554: am 76f18810: Launch correct photo when tapping grid item in Camera roll * commit 'a255a55433a01ec0c713d970f2ca88ee951014c0': Launch correct photo when tapping grid item in Camera roll
|
859af62c8e1cc8367b9edc14292bc2d557cca6ad |
08-Oct-2012 |
Owen Lin <owenlin@google.com> |
am 1414391d: am ed8c8810: Merge "Fix ANR in creating the fallback animation." into gb-ub-photos-arches * commit '1414391d9143ef8ea9e88b8b0efa5cd467f50251': Fix ANR in creating the fallback animation.
|
8bfae8fa30a34f862a45eebc57253adf60352b70 |
08-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 96cc8960: am d81b2649: No Camera recenter on resume after editing or viewing items * commit '96cc89604c8129ef5cea23639f0e3f81f69e8040': No Camera recenter on resume after editing or viewing items
|
28e835818c8d503998b67ab605d1fec6ef4c9fcf |
08-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 60309301: am 4b39551d: Merge "Show progress indicator dialog when saving edited image" into gb-ub-photos-arches * commit '60309301ba9c6e59d49babb96f048034ad610e53': Show progress indicator dialog when saving edited image
|
d0b2dce0dcd955cfbb67e23a943126c9e549c40b |
08-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 76f18810: Launch correct photo when tapping grid item in Camera roll * commit '76f1881067d7ca4eda6d3e398567473d2913c5d1': Launch correct photo when tapping grid item in Camera roll
|
cddd2c42c89937edf4110cf024ab206072d0ac22 |
08-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 76f18810: Launch correct photo when tapping grid item in Camera roll * commit '76f1881067d7ca4eda6d3e398567473d2913c5d1': Launch correct photo when tapping grid item in Camera roll
|
c1fc8765083b569719c3d4f8766c2de7b2210d6f |
08-Oct-2012 |
Owen Lin <owenlin@google.com> |
am ed8c8810: Merge "Fix ANR in creating the fallback animation." into gb-ub-photos-arches * commit 'ed8c88102153dd7dca8458d7f0a9b81937c58023': Fix ANR in creating the fallback animation.
|
1675984ca963e40a914f39718d47c6246361f319 |
08-Oct-2012 |
Owen Lin <owenlin@google.com> |
am ed8c8810: Merge "Fix ANR in creating the fallback animation." into gb-ub-photos-arches * commit 'ed8c88102153dd7dca8458d7f0a9b81937c58023': Fix ANR in creating the fallback animation.
|
fe4b9b715577aa4c9515f03407bf04cd2af0df2d |
08-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am d81b2649: No Camera recenter on resume after editing or viewing items * commit 'd81b264931cfa3b34096efd46659b81f9a628fb5': No Camera recenter on resume after editing or viewing items
|
4ffccfd908d05307fdccefdf8923ee438c824410 |
08-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am d81b2649: No Camera recenter on resume after editing or viewing items * commit 'd81b264931cfa3b34096efd46659b81f9a628fb5': No Camera recenter on resume after editing or viewing items
|
36947033574433dfa38f0427343e4c90c1d062ee |
08-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 4b39551d: Merge "Show progress indicator dialog when saving edited image" into gb-ub-photos-arches * commit '4b39551d67b9868c289fd2c31f62d3326fc6f697': Show progress indicator dialog when saving edited image
|
212fe291f6766dbb928fb8413d34e40ebc6ad639 |
08-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 4b39551d: Merge "Show progress indicator dialog when saving edited image" into gb-ub-photos-arches * commit '4b39551d67b9868c289fd2c31f62d3326fc6f697': Show progress indicator dialog when saving edited image
|
a255a55433a01ec0c713d970f2ca88ee951014c0 |
08-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 76f18810: Launch correct photo when tapping grid item in Camera roll * commit '76f1881067d7ca4eda6d3e398567473d2913c5d1': Launch correct photo when tapping grid item in Camera roll
|
1414391d9143ef8ea9e88b8b0efa5cd467f50251 |
08-Oct-2012 |
Owen Lin <owenlin@google.com> |
am ed8c8810: Merge "Fix ANR in creating the fallback animation." into gb-ub-photos-arches * commit 'ed8c88102153dd7dca8458d7f0a9b81937c58023': Fix ANR in creating the fallback animation.
|
96cc89604c8129ef5cea23639f0e3f81f69e8040 |
08-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am d81b2649: No Camera recenter on resume after editing or viewing items * commit 'd81b264931cfa3b34096efd46659b81f9a628fb5': No Camera recenter on resume after editing or viewing items
|
60309301ba9c6e59d49babb96f048034ad610e53 |
08-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 4b39551d: Merge "Show progress indicator dialog when saving edited image" into gb-ub-photos-arches * commit '4b39551d67b9868c289fd2c31f62d3326fc6f697': Show progress indicator dialog when saving edited image
|
6f51ef0ceeac577e983a95a93eb79b42be8f4eaa |
08-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Launch correct photo when tapping grid item in Camera roll Bug: 7303049 Change-Id: Ie3dd2b010d60669cd000a2ed9b52e0611b0977bd
rc/com/android/gallery3d/app/PhotoPage.java
|
76f1881067d7ca4eda6d3e398567473d2913c5d1 |
08-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Launch correct photo when tapping grid item in Camera roll Bug: 7303049 Change-Id: Ie3dd2b010d60669cd000a2ed9b52e0611b0977bd
rc/com/android/gallery3d/app/PhotoPage.java
|
4e82fcb4fecd90087b322f4ad0a40b99d83160ad |
08-Oct-2012 |
Owen Lin <owenlin@google.com> |
Merge "Fix ANR in creating the fallback animation." into gb-ub-photos-arches
|
ed8c88102153dd7dca8458d7f0a9b81937c58023 |
08-Oct-2012 |
Owen Lin <owenlin@google.com> |
Merge "Fix ANR in creating the fallback animation." into gb-ub-photos-arches
|
86350720d916bd26faadfead5ef91f7f11f8e8e4 |
08-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
No Camera recenter on resume after editing or viewing items Bug: 7302361 Change-Id: I7420f89a766dc86d873166789b1875539541825c
rc/com/android/gallery3d/app/PhotoPage.java
|
d81b264931cfa3b34096efd46659b81f9a628fb5 |
08-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
No Camera recenter on resume after editing or viewing items Bug: 7302361 Change-Id: I7420f89a766dc86d873166789b1875539541825c
rc/com/android/gallery3d/app/PhotoPage.java
|
3dc62b6c99a2e34e49a86ae651353bb41129588d |
08-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Show progress indicator dialog when saving edited image" into gb-ub-photos-arches
|
4b39551d67b9868c289fd2c31f62d3326fc6f697 |
08-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Show progress indicator dialog when saving edited image" into gb-ub-photos-arches
|
4e73c8fd7e04ce42814ac9ee304d79f2ff5160a2 |
08-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Show progress indicator dialog when saving edited image Bug: 7301277 Change-Id: Ied4f9abeeaa950a0c78c0a652b3be4634dd96ce3
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
|
ec29b73d77a8ff2f000eb04d662d85d63d8f8d09 |
08-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Show progress indicator dialog when saving edited image Bug: 7301277 Change-Id: Ied4f9abeeaa950a0c78c0a652b3be4634dd96ce3
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
|
a2700421852763177fac7383de0df93140ba0762 |
08-Oct-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
da324b314258aee1a17475b3c1765cc4608a37ca |
07-Oct-2012 |
George Mount <mount@google.com> |
am ff5462f3: am 2b27c5ef: am 28fa6384: am f5017c40: Merge "Show stitched panorama in secure album." into gb-ub-photos-arches * commit 'ff5462f3ec2e35875176aa0a0356750703563439': Show stitched panorama in secure album.
|
ff5462f3ec2e35875176aa0a0356750703563439 |
07-Oct-2012 |
George Mount <mount@google.com> |
am 2b27c5ef: am 28fa6384: am f5017c40: Merge "Show stitched panorama in secure album." into gb-ub-photos-arches * commit '2b27c5ef83e2d4350133ea1ee0fed1094c9f0c4c': Show stitched panorama in secure album.
|
2b27c5ef83e2d4350133ea1ee0fed1094c9f0c4c |
07-Oct-2012 |
George Mount <mount@google.com> |
am 28fa6384: am f5017c40: Merge "Show stitched panorama in secure album." into gb-ub-photos-arches * commit '28fa6384f41d182dde403bc5c156cb23b248898f': Show stitched panorama in secure album.
|
28fa6384f41d182dde403bc5c156cb23b248898f |
07-Oct-2012 |
George Mount <mount@google.com> |
am f5017c40: Merge "Show stitched panorama in secure album." into gb-ub-photos-arches * commit 'f5017c407c969da88017a697aae7462b552e65ee': Show stitched panorama in secure album.
|
2c1ce451575d59f65707356b1f01c63818bc3f0b |
07-Oct-2012 |
George Mount <mount@google.com> |
am f5017c40: Merge "Show stitched panorama in secure album." into gb-ub-photos-arches * commit 'f5017c407c969da88017a697aae7462b552e65ee': Show stitched panorama in secure album.
|
c73511f95746650e6aaadfb7a34e61083e08db56 |
07-Oct-2012 |
George Mount <mount@google.com> |
am f5017c40: Merge "Show stitched panorama in secure album." into gb-ub-photos-arches * commit 'f5017c407c969da88017a697aae7462b552e65ee': Show stitched panorama in secure album.
|
a9265e4245c25124b0bf4d05fdbe1b6646c420cf |
07-Oct-2012 |
George Mount <mount@google.com> |
Merge "Show stitched panorama in secure album." into gb-ub-photos-arches
|
f5017c407c969da88017a697aae7462b552e65ee |
07-Oct-2012 |
George Mount <mount@google.com> |
Merge "Show stitched panorama in secure album." into gb-ub-photos-arches
|
a0ddb4661cf329cb5bd252d0e3ac697b833d725b |
07-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 46c744b0: am 0d7f0850: am d7b3cb87: am bbc99316: Fix orientation locking issues when going back to Camera * commit '46c744b033119d933f72cb2fc3a234f53bd00520': Fix orientation locking issues when going back to Camera
|
46c744b033119d933f72cb2fc3a234f53bd00520 |
07-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 0d7f0850: am d7b3cb87: am bbc99316: Fix orientation locking issues when going back to Camera * commit '0d7f0850954f6878c98ef44bff4642252a3bb60f': Fix orientation locking issues when going back to Camera
|
0d7f0850954f6878c98ef44bff4642252a3bb60f |
07-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am d7b3cb87: am bbc99316: Fix orientation locking issues when going back to Camera * commit 'd7b3cb87ddd85bd6e361b0dabe0dd02d0bb53f7a': Fix orientation locking issues when going back to Camera
|
cce063a24f78e797dc81307fa03c9059bd50a9c3 |
07-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am bbc99316: Fix orientation locking issues when going back to Camera * commit 'bbc993162d687df20e2ff9a329bb9b6e04926ba8': Fix orientation locking issues when going back to Camera
|
984c37d0bb96c3f6e1aa8d3dbcdc9cd0e24b7262 |
07-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am bbc99316: Fix orientation locking issues when going back to Camera * commit 'bbc993162d687df20e2ff9a329bb9b6e04926ba8': Fix orientation locking issues when going back to Camera
|
d7b3cb87ddd85bd6e361b0dabe0dd02d0bb53f7a |
07-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am bbc99316: Fix orientation locking issues when going back to Camera * commit 'bbc993162d687df20e2ff9a329bb9b6e04926ba8': Fix orientation locking issues when going back to Camera
|
e6e562300a0968e22eda1ed413b4922b628c70ed |
07-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Fix orientation locking issues when going back to Camera Bug: 7287039 Change-Id: Ib993266706b24269fd759f1ded1b6a85c2c5c7ba
rc/com/android/gallery3d/app/PhotoPage.java
|
bbc993162d687df20e2ff9a329bb9b6e04926ba8 |
07-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Fix orientation locking issues when going back to Camera Bug: 7287039 Change-Id: Ib993266706b24269fd759f1ded1b6a85c2c5c7ba
rc/com/android/gallery3d/app/PhotoPage.java
|
a33b6a30ad68936428e765a3807f56a491b621be |
07-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 7c33965b: am 80a387c7: am 9333917b: am 4de36129: Merge "Change display of 360 panorama button" into gb-ub-photos-arches * commit '7c33965bb0b8e198e7ba9df3c9993d13ce1b68f9': Change display of 360 panorama button
|
74304d3406123c0782865361671394812193785e |
07-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 83103326: am 7261d8b1: am e55e0485: am 43ba9f66: Implement new grid layout in Gallery * commit '831033260f7624799d0435f1e8ef1437d0bd5b56': Implement new grid layout in Gallery
|
e1e23940f69f4b4f7ea046bc14704e1c1c8bfb99 |
07-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am f976cc3e: am b521475b: am 4cd1ceee: am 3711d3ea: Tune swipe to delete in filmstrip * commit 'f976cc3e4ba429970d0e27f009861c71c8045405': Tune swipe to delete in filmstrip
|
bd8fadb8aa508c60d23cd82589457935c78afa1b |
07-Oct-2012 |
John Reck <jreck@google.com> |
am d39af7d0: am 948a613e: am 04f97ab4: am 278e4fe0: Merge "Animation support" into gb-ub-photos-arches * commit 'd39af7d04be5b9bc22bcd00ff9019e65d398e996': Animation support
|
f56158d63ed8f3e0d7d7264052a3cffd66f696d2 |
07-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 5e9ddc51: am 963ee8d2: am 9fe7d852: am 701f83f0: Merge "Fix display of spinner and SQL exception for view intent" into gb-ub-photos-arches * commit '5e9ddc51007da757331346af1996bee4416c8216': Fix display of spinner and SQL exception for view intent
|
ae4e7670ed5163ee533ba449aa796ca08444fad9 |
07-Oct-2012 |
Wu-cheng Li <wuchengli@google.com> |
am 0f692104: am 46471161: am ed1ab4c5: am 9b672371: Change LOCAL_SDK_VERSION to current. * commit '0f692104dedaa297d7074b2c946c498bc04accee': Change LOCAL_SDK_VERSION to current.
|
3fea34bf0b000982966ba3f630310776b4e4bc23 |
07-Oct-2012 |
George Mount <mount@google.com> |
am 33b8f0ed: am ffe1a290: am 75b984c0: am 87b226cd: Merge "Move LightCycle undo to settings area." into gb-ub-photos-arches * commit '33b8f0ed1377515c64ca7ac82513b2fd1803e6e7': Move LightCycle undo to settings area.
|
8609433cd7b81cc68f8f682e881c37fdea70471b |
07-Oct-2012 |
Bart Sears <bsears@google.com> |
am cc089940: am d289df8e: am ec147fde: am ad7cf187: Revert "Upload screennails in tiles to prevent jank" * commit 'cc08994062ab6f5db841031ffba4c92b60d48e85': Revert "Upload screennails in tiles to prevent jank"
|
7c33965bb0b8e198e7ba9df3c9993d13ce1b68f9 |
07-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 80a387c7: am 9333917b: am 4de36129: Merge "Change display of 360 panorama button" into gb-ub-photos-arches * commit '80a387c708704e9ffd15d33c860a46e0658211dd': Change display of 360 panorama button
|
831033260f7624799d0435f1e8ef1437d0bd5b56 |
07-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 7261d8b1: am e55e0485: am 43ba9f66: Implement new grid layout in Gallery * commit '7261d8b1ecbfb83d22a13867bee8a2efc380ea39': Implement new grid layout in Gallery
|
f976cc3e4ba429970d0e27f009861c71c8045405 |
07-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am b521475b: am 4cd1ceee: am 3711d3ea: Tune swipe to delete in filmstrip * commit 'b521475b9d3a8c78f698b1444bce2dfb9068ec5f': Tune swipe to delete in filmstrip
|
d39af7d04be5b9bc22bcd00ff9019e65d398e996 |
07-Oct-2012 |
John Reck <jreck@google.com> |
am 948a613e: am 04f97ab4: am 278e4fe0: Merge "Animation support" into gb-ub-photos-arches * commit '948a613eeed911c4e7f5f83aec86935cb9ec526d': Animation support
|
5e9ddc51007da757331346af1996bee4416c8216 |
07-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 963ee8d2: am 9fe7d852: am 701f83f0: Merge "Fix display of spinner and SQL exception for view intent" into gb-ub-photos-arches * commit '963ee8d209cd60a07614d1a7600e4a86791f3286': Fix display of spinner and SQL exception for view intent
|
0f692104dedaa297d7074b2c946c498bc04accee |
07-Oct-2012 |
Wu-cheng Li <wuchengli@google.com> |
am 46471161: am ed1ab4c5: am 9b672371: Change LOCAL_SDK_VERSION to current. * commit '46471161f751285e6f4725ec087387bbfe7a441b': Change LOCAL_SDK_VERSION to current.
|
33b8f0ed1377515c64ca7ac82513b2fd1803e6e7 |
07-Oct-2012 |
George Mount <mount@google.com> |
am ffe1a290: am 75b984c0: am 87b226cd: Merge "Move LightCycle undo to settings area." into gb-ub-photos-arches * commit 'ffe1a290c8788cfedfcea2e193c2a4a79ad71d9c': Move LightCycle undo to settings area.
|
cc08994062ab6f5db841031ffba4c92b60d48e85 |
07-Oct-2012 |
Bart Sears <bsears@google.com> |
am d289df8e: am ec147fde: am ad7cf187: Revert "Upload screennails in tiles to prevent jank" * commit 'd289df8ef649de216f9a39ca7a0fca21cf78ae63': Revert "Upload screennails in tiles to prevent jank"
|
80a387c708704e9ffd15d33c860a46e0658211dd |
07-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 9333917b: am 4de36129: Merge "Change display of 360 panorama button" into gb-ub-photos-arches * commit '9333917b0c31c4bdfd76593849f55d9e1e1988e9': Change display of 360 panorama button
|
7261d8b1ecbfb83d22a13867bee8a2efc380ea39 |
07-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am e55e0485: am 43ba9f66: Implement new grid layout in Gallery * commit 'e55e04857bb2bfe46cedc0c9888c3a065e868efd': Implement new grid layout in Gallery
|
b521475b9d3a8c78f698b1444bce2dfb9068ec5f |
07-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 4cd1ceee: am 3711d3ea: Tune swipe to delete in filmstrip * commit '4cd1ceeebe17b6accc63e09400e737f38a8374f6': Tune swipe to delete in filmstrip
|
948a613eeed911c4e7f5f83aec86935cb9ec526d |
07-Oct-2012 |
John Reck <jreck@google.com> |
am 04f97ab4: am 278e4fe0: Merge "Animation support" into gb-ub-photos-arches * commit '04f97ab482b56cdf9fd23388838164dccc6c29c9': Animation support
|
963ee8d209cd60a07614d1a7600e4a86791f3286 |
07-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 9fe7d852: am 701f83f0: Merge "Fix display of spinner and SQL exception for view intent" into gb-ub-photos-arches * commit '9fe7d852f12fece9350a1c1c653edd66d543e9df': Fix display of spinner and SQL exception for view intent
|
46471161f751285e6f4725ec087387bbfe7a441b |
07-Oct-2012 |
Wu-cheng Li <wuchengli@google.com> |
am ed1ab4c5: am 9b672371: Change LOCAL_SDK_VERSION to current. * commit 'ed1ab4c567b470158d54aae1d407de3b863f2c0f': Change LOCAL_SDK_VERSION to current.
|
ffe1a290c8788cfedfcea2e193c2a4a79ad71d9c |
07-Oct-2012 |
George Mount <mount@google.com> |
am 75b984c0: am 87b226cd: Merge "Move LightCycle undo to settings area." into gb-ub-photos-arches * commit '75b984c012293889d14988681511a162ccff255e': Move LightCycle undo to settings area.
|
d289df8ef649de216f9a39ca7a0fca21cf78ae63 |
07-Oct-2012 |
Bart Sears <bsears@google.com> |
am ec147fde: am ad7cf187: Revert "Upload screennails in tiles to prevent jank" * commit 'ec147fde392f8c74be7c65abdf6f6916ee96f3e0': Revert "Upload screennails in tiles to prevent jank"
|
9333917b0c31c4bdfd76593849f55d9e1e1988e9 |
07-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 4de36129: Merge "Change display of 360 panorama button" into gb-ub-photos-arches * commit '4de36129b57e3a5308c109a407ea17b4fa103fe4': Change display of 360 panorama button
|
c89602c4ce427317ea6cdbe9db3b0776b15c8e07 |
07-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 4de36129: Merge "Change display of 360 panorama button" into gb-ub-photos-arches * commit '4de36129b57e3a5308c109a407ea17b4fa103fe4': Change display of 360 panorama button
|
d0d9b1af38931f18cd68e713b047b9700965e75f |
07-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 4de36129: Merge "Change display of 360 panorama button" into gb-ub-photos-arches * commit '4de36129b57e3a5308c109a407ea17b4fa103fe4': Change display of 360 panorama button
|
2ef8ad4261d7568b29eff5dad372910111a5a5d8 |
07-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 4de36129: Merge "Change display of 360 panorama button" into gb-ub-photos-arches * commit '4de36129b57e3a5308c109a407ea17b4fa103fe4': Change display of 360 panorama button
|
adc40553a8f4a109b668ef605cc306906e78f30a |
07-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Change display of 360 panorama button" into gb-ub-photos-arches
|
4de36129b57e3a5308c109a407ea17b4fa103fe4 |
07-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Change display of 360 panorama button" into gb-ub-photos-arches
|
e55e04857bb2bfe46cedc0c9888c3a065e868efd |
07-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 43ba9f66: Implement new grid layout in Gallery * commit '43ba9f6644e4183b8ee27f96de3dda703d136c52': Implement new grid layout in Gallery
|
7ee14971f9ae67369f475470a56f03762be8706e |
07-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 43ba9f66: Implement new grid layout in Gallery * commit '43ba9f6644e4183b8ee27f96de3dda703d136c52': Implement new grid layout in Gallery
|
85a50b2b7c49e2cbfcd575be5420ecb456c19fea |
07-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 43ba9f66: Implement new grid layout in Gallery * commit '43ba9f6644e4183b8ee27f96de3dda703d136c52': Implement new grid layout in Gallery
|
4cd1ceeebe17b6accc63e09400e737f38a8374f6 |
07-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 3711d3ea: Tune swipe to delete in filmstrip * commit '3711d3ea870acba8ad83d0c51b0d03b0082ef0f0': Tune swipe to delete in filmstrip
|
04f97ab482b56cdf9fd23388838164dccc6c29c9 |
07-Oct-2012 |
John Reck <jreck@google.com> |
am 278e4fe0: Merge "Animation support" into gb-ub-photos-arches * commit '278e4fe02f9754bc84a646988aa6ff31109b22e0': Animation support
|
9fe7d852f12fece9350a1c1c653edd66d543e9df |
07-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 701f83f0: Merge "Fix display of spinner and SQL exception for view intent" into gb-ub-photos-arches * commit '701f83f0c7fd26ad0633b6c1dd01e5145086f6c5': Fix display of spinner and SQL exception for view intent
|
ed1ab4c567b470158d54aae1d407de3b863f2c0f |
07-Oct-2012 |
Wu-cheng Li <wuchengli@google.com> |
am 9b672371: Change LOCAL_SDK_VERSION to current. * commit '9b672371b88dddce1b56f31503ac01c730768d06': Change LOCAL_SDK_VERSION to current.
|
75b984c012293889d14988681511a162ccff255e |
07-Oct-2012 |
George Mount <mount@google.com> |
am 87b226cd: Merge "Move LightCycle undo to settings area." into gb-ub-photos-arches * commit '87b226cd6777431be09d3c1fcb01453e386256b2': Move LightCycle undo to settings area.
|
ec147fde392f8c74be7c65abdf6f6916ee96f3e0 |
07-Oct-2012 |
Bart Sears <bsears@google.com> |
am ad7cf187: Revert "Upload screennails in tiles to prevent jank" * commit 'ad7cf187bf0c11b05aa3eab7085148e0353f2af5': Revert "Upload screennails in tiles to prevent jank"
|
c97e3217dec97b52511ef9985be246e7f722a825 |
07-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 3711d3ea: Tune swipe to delete in filmstrip * commit '3711d3ea870acba8ad83d0c51b0d03b0082ef0f0': Tune swipe to delete in filmstrip
|
68bc1964cc9de8633bede0c5dcdf82bc88f38b3d |
07-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 3711d3ea: Tune swipe to delete in filmstrip * commit '3711d3ea870acba8ad83d0c51b0d03b0082ef0f0': Tune swipe to delete in filmstrip
|
24be60f9648c5d9b3c0225640982e19fedde7451 |
07-Oct-2012 |
John Reck <jreck@google.com> |
am 278e4fe0: Merge "Animation support" into gb-ub-photos-arches * commit '278e4fe02f9754bc84a646988aa6ff31109b22e0': Animation support
|
65ecdd72dcb21591293d0b16b109938fc570f2ec |
07-Oct-2012 |
John Reck <jreck@google.com> |
am 278e4fe0: Merge "Animation support" into gb-ub-photos-arches * commit '278e4fe02f9754bc84a646988aa6ff31109b22e0': Animation support
|
f61f01be1c4e2af777420cd0c89306565c84b78f |
07-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 701f83f0: Merge "Fix display of spinner and SQL exception for view intent" into gb-ub-photos-arches * commit '701f83f0c7fd26ad0633b6c1dd01e5145086f6c5': Fix display of spinner and SQL exception for view intent
|
e4b56625968d59613df11a6a487c313577ec75e5 |
07-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 701f83f0: Merge "Fix display of spinner and SQL exception for view intent" into gb-ub-photos-arches * commit '701f83f0c7fd26ad0633b6c1dd01e5145086f6c5': Fix display of spinner and SQL exception for view intent
|
cbf1116461bfb1d00a31743fc3909414ebdb4b71 |
07-Oct-2012 |
Wu-cheng Li <wuchengli@google.com> |
am 9b672371: Change LOCAL_SDK_VERSION to current. * commit '9b672371b88dddce1b56f31503ac01c730768d06': Change LOCAL_SDK_VERSION to current.
|
a447a0212ac9f00c2c0e7a05a26fb6064081742c |
07-Oct-2012 |
George Mount <mount@google.com> |
am 87b226cd: Merge "Move LightCycle undo to settings area." into gb-ub-photos-arches * commit '87b226cd6777431be09d3c1fcb01453e386256b2': Move LightCycle undo to settings area.
|
86e6d5add29891dca98be17d7731e8f05bedcddc |
07-Oct-2012 |
George Mount <mount@google.com> |
am 87b226cd: Merge "Move LightCycle undo to settings area." into gb-ub-photos-arches * commit '87b226cd6777431be09d3c1fcb01453e386256b2': Move LightCycle undo to settings area.
|
e20cafef0dc374561f7e5021c0ef6c1e065f2e8e |
07-Oct-2012 |
Bart Sears <bsears@google.com> |
am ad7cf187: Revert "Upload screennails in tiles to prevent jank" * commit 'ad7cf187bf0c11b05aa3eab7085148e0353f2af5': Revert "Upload screennails in tiles to prevent jank"
|
e0d6e949dd4901d052a9711bb419773786125994 |
07-Oct-2012 |
Bart Sears <bsears@google.com> |
am ad7cf187: Revert "Upload screennails in tiles to prevent jank" * commit 'ad7cf187bf0c11b05aa3eab7085148e0353f2af5': Revert "Upload screennails in tiles to prevent jank"
|
11bc06cb67f12b35c38945355c3094eb37d13c48 |
07-Oct-2012 |
Wu-cheng Li <wuchengli@google.com> |
Show stitched panorama in secure album. bug:7285105 Change-Id: I36801d4e5b19cceb10600d41a3a3c78244c5ee4a
rc/com/android/gallery3d/app/StitchingChangeListener.java
rc/com/android/gallery3d/data/SecureAlbum.java
|
2c848b26619de242a96ba4b20c252416a39506d6 |
07-Oct-2012 |
Wu-cheng Li <wuchengli@google.com> |
Show stitched panorama in secure album. bug:7285105 Change-Id: I36801d4e5b19cceb10600d41a3a3c78244c5ee4a
rc/com/android/gallery3d/app/StitchingChangeListener.java
rc/com/android/gallery3d/data/SecureAlbum.java
|
8bda2294fa927af2b2a0a3a6637138c662864c38 |
07-Oct-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
b484a205122769220709a4783d563a2022f5ccf5 |
07-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Implement new grid layout in Gallery Bug: 7300836 Change-Id: Iab2b4f1caa52c5aa7638983fec194b3f81cc4c31
rc/com/android/gallery3d/ui/AlbumSetSlotRenderer.java
|
43ba9f6644e4183b8ee27f96de3dda703d136c52 |
07-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Implement new grid layout in Gallery Bug: 7300836 Change-Id: Iab2b4f1caa52c5aa7638983fec194b3f81cc4c31
rc/com/android/gallery3d/ui/AlbumSetSlotRenderer.java
|
f1c701f86f779bc3d09bd23315da19124c62e97e |
07-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Change display of 360 panorama button Bug: 7300866 -Move pano button to center and make larger -Pano button visible even when in full-screen mode -Show edit button only when image editor is available -Correctly hide bottom controls when switching from filmstrip mode to grid mode Change-Id: I485b1988733bedd0c03e89a261a6ce80be46b9bc
es/layout/photopage_bottom_controls.xml
|
ce1c4052595995ccd7efe87fcff4d2c7c503f7ac |
07-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Change display of 360 panorama button Bug: 7300866 -Move pano button to center and make larger -Pano button visible even when in full-screen mode -Show edit button only when image editor is available -Correctly hide bottom controls when switching from filmstrip mode to grid mode Change-Id: I485b1988733bedd0c03e89a261a6ce80be46b9bc
rc/com/android/gallery3d/app/PhotoPage.java
|
d2724f69edf39cf2019eac1b49f316d22ab70d0a |
07-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Change display of 360 panorama button Bug: 7300866 -Move pano button to center and make larger -Pano button visible even when in full-screen mode -Show edit button only when image editor is available -Correctly hide bottom controls when switching from filmstrip mode to grid mode Change-Id: I485b1988733bedd0c03e89a261a6ce80be46b9bc
es/layout/photopage_bottom_controls.xml
rc/com/android/gallery3d/app/PhotoPage.java
|
3711d3ea870acba8ad83d0c51b0d03b0082ef0f0 |
07-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Tune swipe to delete in filmstrip Bug: 7277872 Change-Id: I01da98f4528b92308984e6ec7f1bc68e3e55697d
rc/com/android/gallery3d/ui/PhotoView.java
|
86bc3a20a94d744e44a53bc5b277dbb5cbca0073 |
07-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Tune swipe to delete in filmstrip Bug: 7277872 Change-Id: I01da98f4528b92308984e6ec7f1bc68e3e55697d
rc/com/android/gallery3d/ui/PhotoView.java
|
278e4fe02f9754bc84a646988aa6ff31109b22e0 |
07-Oct-2012 |
John Reck <jreck@google.com> |
Merge "Animation support" into gb-ub-photos-arches
|
e174379379bbabe0cd32a4551dd85ec0e283b03a |
07-Oct-2012 |
John Reck <jreck@google.com> |
Merge "Animation support" into gb-ub-photos-arches
|
96c707bda5a3bebafacba1f813eded88d787c73a |
07-Oct-2012 |
John Reck <jreck@google.com> |
Animation support Bug: 7300696 Change-Id: I80bfb27114a06dfc6f0f1aa866224cd547cc929d
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
|
38ff40dbd2103bf189b536a27194091e966d7b50 |
07-Oct-2012 |
John Reck <jreck@google.com> |
Animation support Bug: 7300696 Change-Id: I80bfb27114a06dfc6f0f1aa866224cd547cc929d
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
|
94ccecc9ad65dcb9c0810cc3d1b0d1b9276df511 |
07-Oct-2012 |
John Reck <jreck@google.com> |
Animation support Bug: 7300696 Change-Id: I80bfb27114a06dfc6f0f1aa866224cd547cc929d
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
|
701f83f0c7fd26ad0633b6c1dd01e5145086f6c5 |
07-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Fix display of spinner and SQL exception for view intent" into gb-ub-photos-arches
|
35aa69da52dd78e20f06cd5120bf196f93cb0ccf |
06-Oct-2012 |
Wu-cheng Li <wuchengli@google.com> |
Change LOCAL_SDK_VERSION to current. bug:7208909 Change-Id: Ifa03d6eea219115a03da6f8138c6fcb2922e4c57
ndroid.mk
|
9b672371b88dddce1b56f31503ac01c730768d06 |
06-Oct-2012 |
Wu-cheng Li <wuchengli@google.com> |
Change LOCAL_SDK_VERSION to current. bug:7208909 Change-Id: Ifa03d6eea219115a03da6f8138c6fcb2922e4c57
ndroid.mk
|
87b226cd6777431be09d3c1fcb01453e386256b2 |
06-Oct-2012 |
George Mount <mount@google.com> |
Merge "Move LightCycle undo to settings area." into gb-ub-photos-arches
|
9b260f35807df213959b1e8f7c74fb44be8206e5 |
06-Oct-2012 |
George Mount <mount@google.com> |
Merge "Move LightCycle undo to settings area." into gb-ub-photos-arches
|
3eb0a21071f7acae42077d11773f872ffd9628d3 |
06-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Fix display of spinner and SQL exception for view intent Bug: 7288544 Bug: 7219163 Remove the query for photo DISPLAY_NAME in view intent since it is no longer used, and hide the spinner when launching PhotoPage via this intent. Change-Id: Id41ff3d623e7fd2e708b1042782333b48e8ba4a7
rc/com/android/gallery3d/app/Gallery.java
rc/com/android/gallery3d/app/PhotoPage.java
|
ba65c373f244f6de0b45afa6b7cd711866f1bfe4 |
06-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Fix display of spinner and SQL exception for view intent Bug: 7288544 Bug: 7219163 Remove the query for photo DISPLAY_NAME in view intent since it is no longer used, and hide the spinner when launching PhotoPage via this intent. Change-Id: Id41ff3d623e7fd2e708b1042782333b48e8ba4a7
rc/com/android/gallery3d/app/Gallery.java
rc/com/android/gallery3d/app/PhotoPage.java
|
ad7cf187bf0c11b05aa3eab7085148e0353f2af5 |
06-Oct-2012 |
Bart Sears <bsears@google.com> |
Revert "Upload screennails in tiles to prevent jank" This CL is reported to cause images to not be displayed correctly when opened via the view intent. Bug: 7299123 This reverts commit e29fc4a51b99f12f7fae13fae272858df2e1af36 Change-Id: I5052548a826c275cb4559eeb4721c19f06861b3d
rc/com/android/gallery3d/app/PhotoDataAdapter.java
rc/com/android/gallery3d/ui/BasicTexture.java
rc/com/android/gallery3d/ui/BitmapScreenNail.java
rc/com/android/gallery3d/ui/GLCanvas.java
rc/com/android/gallery3d/ui/GLCanvasImpl.java
rc/com/android/gallery3d/ui/TileImageView.java
rc/com/android/gallery3d/ui/TiledTexture.java
ests/src/com/android/gallery3d/ui/GLCanvasStub.java
|
82da69ff867e4e19f0adb970933a42eb65d973ed |
06-Oct-2012 |
Bart Sears <bsears@google.com> |
Revert "Upload screennails in tiles to prevent jank" This CL is reported to cause images to not be displayed correctly when opened via the view intent. Bug: 7299123 This reverts commit e29fc4a51b99f12f7fae13fae272858df2e1af36 Change-Id: I5052548a826c275cb4559eeb4721c19f06861b3d
rc/com/android/gallery3d/app/PhotoDataAdapter.java
rc/com/android/gallery3d/ui/BasicTexture.java
rc/com/android/gallery3d/ui/BitmapScreenNail.java
rc/com/android/gallery3d/ui/GLCanvas.java
rc/com/android/gallery3d/ui/GLCanvasImpl.java
rc/com/android/gallery3d/ui/TileImageView.java
rc/com/android/gallery3d/ui/TiledTexture.java
ests/src/com/android/gallery3d/ui/GLCanvasStub.java
|
f11910dccf261bfd79cfc0acb3888b053bdefc1d |
06-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am 8e62e49f: (-s ours) am b29151ff: am 32088502: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev * commit '8e62e49f9f9cff5c84dffd76155b974c88089a1c': Import translations. DO NOT MERGE
|
f1b240f4fe78f86e751940bcdca1b7dc736e8fd7 |
06-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am b226f003: (-s ours) am ebfd8b1e: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev * commit 'b226f003c51b129e4e3f880ce6fde0050afc0998': Import translations. DO NOT MERGE
|
8e62e49f9f9cff5c84dffd76155b974c88089a1c |
06-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am b29151ff: am 32088502: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev * commit 'b29151ff4a043d8cff2f96fa342c4d34af8c09cb': Import translations. DO NOT MERGE
|
b29151ff4a043d8cff2f96fa342c4d34af8c09cb |
06-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am 32088502: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev * commit '3208850256822bf63b5aa868af616bc9d129a632': Import translations. DO NOT MERGE
|
802fe16332cb26a154a9e274ea19d79d4fed416f |
06-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE"
|
b226f003c51b129e4e3f880ce6fde0050afc0998 |
06-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am ebfd8b1e: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev * commit 'ebfd8b1e6efd026d335fc3f842542e938d5645c9': Import translations. DO NOT MERGE
|
3208850256822bf63b5aa868af616bc9d129a632 |
06-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
|
ebfd8b1e6efd026d335fc3f842542e938d5645c9 |
06-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
|
6b84da41bc9f2192709a3be8d508a6b26604e70d |
04-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Set the thumbnail/screennail sizes based on screensize Bug: 7232758 Prior to this CL, the thumbnail and screennail sizes were hardcoded which resulted in mediocre image quality when using the Gallery in general and the camera filmstrip. Now, we set the size of these items based on the resolution of the display. Because high-resolution devices tend to have higher-performance graphics to drive their large displays, we expect that this will not introduce any significant performance impact. Change-Id: I90e08f7aca670e275c913fd9e21e4459c8bf9fcf
rc/com/android/gallery3d/data/ImageCacheService.java
rc/com/android/gallery3d/data/MediaItem.java
rc/com/android/gallery3d/ui/BitmapScreenNail.java
rc/com/android/gallery3d/util/GalleryUtils.java
|
aeae1502fba8ea6d26dd10d0a111ea965ce37931 |
06-Oct-2012 |
George Mount <mount@google.com> |
Move LightCycle undo to settings area. Bug 7294328 Change-Id: I7bfbcf030f9c4e70b58b47ddab328a9063af007e
es/drawable/btn_undo.xml
es/drawable/filtershow_button_undo_disabled.png
|
c1627906db42b824cb76953d373cd33120d19db9 |
06-Oct-2012 |
George Mount <mount@google.com> |
Move LightCycle undo to settings area. Bug 7294328 Change-Id: I7bfbcf030f9c4e70b58b47ddab328a9063af007e
es/drawable/btn_undo.xml
es/drawable/filtershow_button_undo_disabled.png
|
151240f5681e4e9f351ff62d68e7098492949eb1 |
06-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 24853bbb: am 73ae3bbd: am bdcc92ef: am df479dde: Merge "Add scale factor / quality parameters in filters" into gb-ub-photos-arches * commit '24853bbb21b665159181da097b75876ab4087f1b': Add scale factor / quality parameters in filters
|
24853bbb21b665159181da097b75876ab4087f1b |
06-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 73ae3bbd: am bdcc92ef: am df479dde: Merge "Add scale factor / quality parameters in filters" into gb-ub-photos-arches * commit '73ae3bbd0dcc0fad138fc3e55cbc654d515fa2c4': Add scale factor / quality parameters in filters
|
73ae3bbd0dcc0fad138fc3e55cbc654d515fa2c4 |
06-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am bdcc92ef: am df479dde: Merge "Add scale factor / quality parameters in filters" into gb-ub-photos-arches * commit 'bdcc92ef09560e26b561af0bf71563cd2ae71086': Add scale factor / quality parameters in filters
|
1adf21704041ebcb9af681752b8a16beb8958f5d |
06-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am df479dde: Merge "Add scale factor / quality parameters in filters" into gb-ub-photos-arches * commit 'df479ddec29551216a9344e4bae925f60185210a': Add scale factor / quality parameters in filters
|
33308e525d8f7a91d06ffede36904d27ea70c87c |
06-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am df479dde: Merge "Add scale factor / quality parameters in filters" into gb-ub-photos-arches * commit 'df479ddec29551216a9344e4bae925f60185210a': Add scale factor / quality parameters in filters
|
efd98eee2a96a002ea4d25f73f230dcbc1b7ecda |
06-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am df479dde: Merge "Add scale factor / quality parameters in filters" into gb-ub-photos-arches * commit 'df479ddec29551216a9344e4bae925f60185210a': Add scale factor / quality parameters in filters
|
bdcc92ef09560e26b561af0bf71563cd2ae71086 |
06-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am df479dde: Merge "Add scale factor / quality parameters in filters" into gb-ub-photos-arches * commit 'df479ddec29551216a9344e4bae925f60185210a': Add scale factor / quality parameters in filters
|
f9a9d96dc6795dd7a0c04a9c3bfe3fb5ec18b8df |
06-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am b30f4025: (-s ours) am af92cf32: am d3ef8b1e: am e6b2212a: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches * commit 'b30f4025596e743144e94c9f186236868cdba64d': Import translations. DO NOT MERGE
|
e8fa03680a2499f76db38a3701cf287b050a0a5f |
06-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Merge "Add scale factor / quality parameters in filters" into gb-ub-photos-arches
|
df479ddec29551216a9344e4bae925f60185210a |
06-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Merge "Add scale factor / quality parameters in filters" into gb-ub-photos-arches
|
3da91380c6c8f701a9632a8da53ee551fa62063a |
06-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Merge "Add scale factor / quality parameters in filters" into gb-ub-photos-arches
|
b30f4025596e743144e94c9f186236868cdba64d |
06-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am af92cf32: am d3ef8b1e: am e6b2212a: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches * commit 'af92cf3293938b5ac7acd2bfbc66ea6b5a984440': Import translations. DO NOT MERGE
|
af92cf3293938b5ac7acd2bfbc66ea6b5a984440 |
06-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am d3ef8b1e: am e6b2212a: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches * commit 'd3ef8b1e2b9536927d943a7e1421712557b98db5': Import translations. DO NOT MERGE
|
282df12021af99cede6c747c4af0a13aba6a9915 |
06-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am e6b2212a: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches * commit 'e6b2212a98fcd175343d63d2772afe963dc6d64e': Import translations. DO NOT MERGE
|
3f77ab098bccccab26d91b5549b61315b9365ded |
06-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am e6b2212a: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches * commit 'e6b2212a98fcd175343d63d2772afe963dc6d64e': Import translations. DO NOT MERGE
|
d3ef8b1e2b9536927d943a7e1421712557b98db5 |
06-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am e6b2212a: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches * commit 'e6b2212a98fcd175343d63d2772afe963dc6d64e': Import translations. DO NOT MERGE
|
642dffeccf8590b670e456a2033c530683a277d0 |
06-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
|
18a1b4db82ffbf6075cd8a61efae942c57b82545 |
06-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
|
e6b2212a98fcd175343d63d2772afe963dc6d64e |
06-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
|
dd4921bd0fc8a1650e8ad266c9c62a533751cfe7 |
06-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
|
10455d031ac898abf1367b3e2f69675c988374e0 |
06-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Add scale factor / quality parameters in filters bug:7248352 Change-Id: I2e4ca86d681eba2e97ddc550f88d9f702ecba65d
rc/com/android/gallery3d/filtershow/cache/DelayedPresetCache.java
rc/com/android/gallery3d/filtershow/cache/DirectPresetCache.java
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
|
81eb9976f967d9b3faa1749a8ab29d1743cf347d |
06-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Add scale factor / quality parameters in filters bug:7248352 Change-Id: I2e4ca86d681eba2e97ddc550f88d9f702ecba65d
rc/com/android/gallery3d/filtershow/cache/BitmapCache.java
rc/com/android/gallery3d/filtershow/cache/DelayedPresetCache.java
rc/com/android/gallery3d/filtershow/cache/DirectPresetCache.java
rc/com/android/gallery3d/filtershow/cache/ImageLoader.java
rc/com/android/gallery3d/filtershow/filters/ImageFilter.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterBW.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterBWBlue.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterBWGreen.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterBWRed.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterBorder.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterContrast.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterCurves.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterExposure.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterGradient.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterHue.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterRS.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterSaturated.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterShadows.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterStraighten.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterVibrance.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterVignette.java
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
rc/com/android/gallery3d/filtershow/tools/ProcessedBitmap.java
|
175aab9db892120554f4c160c0aee732d309f75a |
06-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Add scale factor / quality parameters in filters bug:7248352 Change-Id: I2e4ca86d681eba2e97ddc550f88d9f702ecba65d
rc/com/android/gallery3d/filtershow/cache/BitmapCache.java
rc/com/android/gallery3d/filtershow/cache/DelayedPresetCache.java
rc/com/android/gallery3d/filtershow/cache/DirectPresetCache.java
rc/com/android/gallery3d/filtershow/cache/ImageLoader.java
rc/com/android/gallery3d/filtershow/filters/ImageFilter.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterBW.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterBWBlue.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterBWGreen.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterBWRed.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterBorder.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterContrast.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterCurves.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterExposure.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterGradient.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterHue.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterRS.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterSaturated.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterShadows.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterStraighten.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterVibrance.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterVignette.java
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
rc/com/android/gallery3d/filtershow/tools/ProcessedBitmap.java
|
940dfcfaab7abfa45a87f4b5b9f48bf9c0a26270 |
06-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 451f38ee: am 7fc9fbf2: am 4a48f373: am 39e5dfdd: Merge "Set the thumbnail/screennail sizes based on screensize" into gb-ub-photos-arches * commit '451f38eeb2241fa13aaa672fc8e585d85ce281f7': Set the thumbnail/screennail sizes based on screensize
|
0f412f0dd53dcd1d80f6897b2433579e10468ce1 |
06-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am 4804a963: (-s ours) am dd7c476e: am 46a02a89: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev * commit '4804a9631c200f0d82faec025a6d84b486c6a401': Import translations. DO NOT MERGE
|
451f38eeb2241fa13aaa672fc8e585d85ce281f7 |
06-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 7fc9fbf2: am 4a48f373: am 39e5dfdd: Merge "Set the thumbnail/screennail sizes based on screensize" into gb-ub-photos-arches * commit '7fc9fbf2a40a8565a324e7d64171df14bdfa8ba1': Set the thumbnail/screennail sizes based on screensize
|
4804a9631c200f0d82faec025a6d84b486c6a401 |
06-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am dd7c476e: am 46a02a89: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev * commit 'dd7c476efe3863a525db90dceba9ff835073bbb6': Import translations. DO NOT MERGE
|
7fc9fbf2a40a8565a324e7d64171df14bdfa8ba1 |
06-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 4a48f373: am 39e5dfdd: Merge "Set the thumbnail/screennail sizes based on screensize" into gb-ub-photos-arches * commit '4a48f3736b693b3be9fe714b63d2bcb4f00dae33': Set the thumbnail/screennail sizes based on screensize
|
dd7c476efe3863a525db90dceba9ff835073bbb6 |
06-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am 46a02a89: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev * commit '46a02a89c99c8819a21a952f9c8d9496222f6d42': Import translations. DO NOT MERGE
|
919de200904c96651d9344b5e36e10881b22ec07 |
06-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 39e5dfdd: Merge "Set the thumbnail/screennail sizes based on screensize" into gb-ub-photos-arches * commit '39e5dfdd15055f2f96f45b1afd9c705f27a6d911': Set the thumbnail/screennail sizes based on screensize
|
faaf6d1505c4b8829a33af37c69dae4e0fd9bf05 |
06-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 39e5dfdd: Merge "Set the thumbnail/screennail sizes based on screensize" into gb-ub-photos-arches * commit '39e5dfdd15055f2f96f45b1afd9c705f27a6d911': Set the thumbnail/screennail sizes based on screensize
|
4a48f3736b693b3be9fe714b63d2bcb4f00dae33 |
06-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 39e5dfdd: Merge "Set the thumbnail/screennail sizes based on screensize" into gb-ub-photos-arches * commit '39e5dfdd15055f2f96f45b1afd9c705f27a6d911': Set the thumbnail/screennail sizes based on screensize
|
10e960f7d6c940cf6db327d2f68effc441e60ddb |
06-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Set the thumbnail/screennail sizes based on screensize" into gb-ub-photos-arches
|
39e5dfdd15055f2f96f45b1afd9c705f27a6d911 |
06-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Set the thumbnail/screennail sizes based on screensize" into gb-ub-photos-arches
|
1ca433288021d551c7d085f37512e847d1862ba9 |
06-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE"
|
46a02a89c99c8819a21a952f9c8d9496222f6d42 |
06-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
|
c7807bee04abbe7c37ed2c90f11b6170f13dd8a5 |
06-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am b41a803b: (-s ours) am 93319523: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev * commit 'b41a803bb378cd0f6ff246ae02e7fdc5ca492f0d': Import translations. DO NOT MERGE
|
7cbd0d98c83d9023ec00bca70014326d859a1423 |
04-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Set the thumbnail/screennail sizes based on screensize Bug: 7232758 Prior to this CL, the thumbnail and screennail sizes were hardcoded which resulted in mediocre image quality when using the Gallery in general and the camera filmstrip. Now, we set the size of these items based on the resolution of the display. Because high-resolution devices tend to have higher-performance graphics to drive their large displays, we expect that this will not introduce any significant performance impact. Change-Id: I90e08f7aca670e275c913fd9e21e4459c8bf9fcf
rc/com/android/gallery3d/data/ImageCacheService.java
rc/com/android/gallery3d/data/MediaItem.java
rc/com/android/gallery3d/ui/BitmapScreenNail.java
rc/com/android/gallery3d/util/GalleryUtils.java
|
3ea0bfbcbea64276595029878d37f25bf4fbb881 |
04-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Set the thumbnail/screennail sizes based on screensize Bug: 7232758 Prior to this CL, the thumbnail and screennail sizes were hardcoded which resulted in mediocre image quality when using the Gallery in general and the camera filmstrip. Now, we set the size of these items based on the resolution of the display. Because high-resolution devices tend to have higher-performance graphics to drive their large displays, we expect that this will not introduce any significant performance impact. Change-Id: I90e08f7aca670e275c913fd9e21e4459c8bf9fcf
rc/com/android/gallery3d/data/ImageCacheService.java
rc/com/android/gallery3d/data/MediaItem.java
rc/com/android/gallery3d/ui/BitmapScreenNail.java
rc/com/android/gallery3d/util/GalleryUtils.java
|
b41a803bb378cd0f6ff246ae02e7fdc5ca492f0d |
06-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am 93319523: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev * commit '933195236d0e85a03469435ce1b1a374cfc77566': Import translations. DO NOT MERGE
|
933195236d0e85a03469435ce1b1a374cfc77566 |
06-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
|
4c759a3271c570e4aba1a99e3282fe30679853bf |
06-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
|
7a966c8b5849f2b4081da1fe82cf64a473af1d4c |
06-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
|
d46427777fc4689f7253c6aec35604e9d4f3ddac |
05-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
New UI... bug:7289525 bug:7289361 Change-Id: Ifde15d57f0d307417a1c7a7ae9b1122be873558f
es/layout/filtershow_activity.xml
es/values/filtershow_strings.xml
es/values/filtershow_styles.xml
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/PanelController.java
rc/com/android/gallery3d/filtershow/imageshow/ImageShow.java
rc/com/android/gallery3d/filtershow/imageshow/ImageSlave.java
rc/com/android/gallery3d/filtershow/imageshow/ImageStraighten.java
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
rc/com/android/gallery3d/filtershow/ui/ImageCurves.java
rc/com/android/gallery3d/filtershow/ui/SliderController.java
|
164ad941922d8c9bf05a56224888bea30f2c27c8 |
06-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am 062aa4cb: (-s ours) am ddc8db87: am b25a3a49: am d3fe19b8: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches * commit '062aa4cb15f8219d2514cb6676006739cb735fc3': Import translations. DO NOT MERGE
|
062aa4cb15f8219d2514cb6676006739cb735fc3 |
06-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am ddc8db87: am b25a3a49: am d3fe19b8: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches * commit 'ddc8db87421cf9fac753bb133e0eb285a38b0ce2': Import translations. DO NOT MERGE
|
ddc8db87421cf9fac753bb133e0eb285a38b0ce2 |
05-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am b25a3a49: am d3fe19b8: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches * commit 'b25a3a49d978f2c7c44644f8fce05b15023e8664': Import translations. DO NOT MERGE
|
b25a3a49d978f2c7c44644f8fce05b15023e8664 |
05-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am d3fe19b8: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches * commit 'd3fe19b8f25efb13508e5749f5ec8cc2c6100c8e': Import translations. DO NOT MERGE
|
4c6456ceffd07646244b23a4d673f6175a8bb411 |
05-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am d3fe19b8: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches * commit 'd3fe19b8f25efb13508e5749f5ec8cc2c6100c8e': Import translations. DO NOT MERGE
|
cdbb740609dfd84ee4066cfcc7bc9c5900a44476 |
05-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am d3fe19b8: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches * commit 'd3fe19b8f25efb13508e5749f5ec8cc2c6100c8e': Import translations. DO NOT MERGE
|
b1a80b0bcade0ebc385c32045fe5fcf1ed75ab27 |
05-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
|
d3fe19b8f25efb13508e5749f5ec8cc2c6100c8e |
05-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
|
c21906b10f38bb643599991eec2a68085ab50125 |
05-Oct-2012 |
John Reck <jreck@google.com> |
am d629ad63: am afe8275c: am 6cf05936: am a6591448: Don\'t film strip animate when switching cameras * commit 'd629ad631b77075bc4c5a0fdd91f68c71f0dd816': Don't film strip animate when switching cameras
|
d629ad631b77075bc4c5a0fdd91f68c71f0dd816 |
05-Oct-2012 |
John Reck <jreck@google.com> |
am afe8275c: am 6cf05936: am a6591448: Don\'t film strip animate when switching cameras * commit 'afe8275c4a0d2d8d3517b14203dbfa49a4004470': Don't film strip animate when switching cameras
|
afe8275c4a0d2d8d3517b14203dbfa49a4004470 |
05-Oct-2012 |
John Reck <jreck@google.com> |
am 6cf05936: am a6591448: Don\'t film strip animate when switching cameras * commit '6cf059364b3c84e51b19cf335c708ecd107e0d25': Don't film strip animate when switching cameras
|
5fc324141a5bb10c8691a297278d16e81ffb04e6 |
05-Oct-2012 |
John Reck <jreck@google.com> |
am a6591448: Don\'t film strip animate when switching cameras * commit 'a65914485de7b82b96b616c7be738ab952e09c83': Don't film strip animate when switching cameras
|
f5172402cd185adf0df93e8aa0fc1116e976fb10 |
05-Oct-2012 |
John Reck <jreck@google.com> |
am a6591448: Don\'t film strip animate when switching cameras * commit 'a65914485de7b82b96b616c7be738ab952e09c83': Don't film strip animate when switching cameras
|
6cf059364b3c84e51b19cf335c708ecd107e0d25 |
05-Oct-2012 |
John Reck <jreck@google.com> |
am a6591448: Don\'t film strip animate when switching cameras * commit 'a65914485de7b82b96b616c7be738ab952e09c83': Don't film strip animate when switching cameras
|
a65914485de7b82b96b616c7be738ab952e09c83 |
05-Oct-2012 |
John Reck <jreck@google.com> |
Don't film strip animate when switching cameras Bug: 7265781 Change-Id: Ibdef7d804923094f3b26471726a642a1b68e9540
rc/com/android/gallery3d/ui/PositionController.java
|
41a6aca3e0c6ef899f020673939d2a936d954fa1 |
05-Oct-2012 |
John Reck <jreck@google.com> |
Don't film strip animate when switching cameras Bug: 7265781 Change-Id: Ibdef7d804923094f3b26471726a642a1b68e9540
rc/com/android/gallery3d/ui/PositionController.java
|
1dd218efcd122b82aa436f2ce3fe74dc306bb34a |
05-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I9dcbec1dffd73e0042673d7b097fea1eaf4b47e5 Auto-generated-cl: translation import
es/values-cs/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-ro/strings.xml
|
56d420a0192454f50bf0cef9f30b57b418fb99f6 |
05-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I9dc2e5af2cd640d1f43ed24140db8d305fc87211 Auto-generated-cl: translation import
es/values-cs/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-ro/strings.xml
|
d0c66fa91568e625eae5519baebbb40ff8a8a398 |
05-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I735a0ac6f769130e8927c5307bf4bb0589cf1f80 Auto-generated-cl: translation import
es/values-cs/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-ro/strings.xml
|
e1e20122ac26e1df289565a640325254c637bfe1 |
05-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: If09261ed041f8b93162a0aefd00d0169f74ff959 Auto-generated-cl: translation import
es/values-cs/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-ro/strings.xml
|
c0739edbba8be9a4ee3c48d909262d83232c01c5 |
05-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: If09261ed041f8b93162a0aefd00d0169f74ff959 Auto-generated-cl: translation import
es/values-cs/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-ro/strings.xml
|
4927076ab179440a0703cdc4ddf750273b76270d |
05-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I7237801c7893cf45ae7eee0a8a93b11fd05da031 Auto-generated-cl: translation import
es/values-cs/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-ro/strings.xml
|
3121650931923e7308a53c5a559955efee2d433a |
05-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I7237801c7893cf45ae7eee0a8a93b11fd05da031 Auto-generated-cl: translation import
es/values-cs/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-ro/strings.xml
|
ccf1a3c1a0a8d8ff757ad75cec9ffa5e00ca53ff |
05-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 2d1ae48f: am 57bc6d71: am 3c336202: am 7ca5aedd: Merge "New UI..." into gb-ub-photos-arches * commit '2d1ae48fe6630fe4e1a94c1e6601199f2ed1b5b4': New UI...
|
2d1ae48fe6630fe4e1a94c1e6601199f2ed1b5b4 |
05-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 57bc6d71: am 3c336202: am 7ca5aedd: Merge "New UI..." into gb-ub-photos-arches * commit '57bc6d71e83c78cc3ca804a4cb7863ba454e7042': New UI...
|
57bc6d71e83c78cc3ca804a4cb7863ba454e7042 |
05-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 3c336202: am 7ca5aedd: Merge "New UI..." into gb-ub-photos-arches * commit '3c336202bb1f9afec7d16ae6877f6d49c92a6f2a': New UI...
|
edc22e70c5ab8275d59c496a01fd4c197ecc0369 |
05-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 7ca5aedd: Merge "New UI..." into gb-ub-photos-arches * commit '7ca5aedd8249a642e3755f3614fc0a43225b4b58': New UI...
|
c7dc41ebae30419b13573475775a246e2bcf4ff8 |
05-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 7ca5aedd: Merge "New UI..." into gb-ub-photos-arches * commit '7ca5aedd8249a642e3755f3614fc0a43225b4b58': New UI...
|
04b62c7d0b3436e949808d09f963343daff3196d |
05-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 7ca5aedd: Merge "New UI..." into gb-ub-photos-arches * commit '7ca5aedd8249a642e3755f3614fc0a43225b4b58': New UI...
|
3c336202bb1f9afec7d16ae6877f6d49c92a6f2a |
05-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 7ca5aedd: Merge "New UI..." into gb-ub-photos-arches * commit '7ca5aedd8249a642e3755f3614fc0a43225b4b58': New UI...
|
7ca5aedd8249a642e3755f3614fc0a43225b4b58 |
05-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Merge "New UI..." into gb-ub-photos-arches
|
9fd6c3e2ef4dbe5d245404f24f1585bf358d2635 |
05-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Merge "New UI..." into gb-ub-photos-arches
|
14dafd63b69f3908b7374a8c0c49762813a454f5 |
05-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
New UI... bug:7289525 bug:7289361 Change-Id: Ifde15d57f0d307417a1c7a7ae9b1122be873558f
es/layout/filtershow_activity.xml
es/values/filtershow_strings.xml
es/values/filtershow_styles.xml
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
|
92e2341248e99c691f38820503984bc5e2f18811 |
05-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
New UI... bug:7289525 bug:7289361 Change-Id: Ifde15d57f0d307417a1c7a7ae9b1122be873558f
es/layout/filtershow_activity.xml
es/values/filtershow_strings.xml
es/values/filtershow_styles.xml
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/PanelController.java
rc/com/android/gallery3d/filtershow/imageshow/ImageShow.java
rc/com/android/gallery3d/filtershow/imageshow/ImageSlave.java
rc/com/android/gallery3d/filtershow/imageshow/ImageStraighten.java
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
rc/com/android/gallery3d/filtershow/ui/ImageCurves.java
rc/com/android/gallery3d/filtershow/ui/SliderController.java
|
3eb4f642da18e1d4510b251fb136344595456372 |
05-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
New UI... bug:7289525 bug:7289361 Change-Id: Ifde15d57f0d307417a1c7a7ae9b1122be873558f
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/PanelController.java
rc/com/android/gallery3d/filtershow/imageshow/ImageShow.java
rc/com/android/gallery3d/filtershow/imageshow/ImageSlave.java
rc/com/android/gallery3d/filtershow/imageshow/ImageStraighten.java
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
rc/com/android/gallery3d/filtershow/ui/ImageCurves.java
rc/com/android/gallery3d/filtershow/ui/SliderController.java
|
37557f15e618fd67d91c451026273d78dda94f51 |
05-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I98ad711ab44a7ba7e06926b91d1f690578ea1bc8 Auto-generated-cl: translation import
es/values-cs/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-ro/strings.xml
|
e68a7c17ba71ea4f8bad9c7a5ec48725baf5df38 |
05-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I742baa2a8696d9dc99879c5a5d15f550679257c3 Auto-generated-cl: translation import
es/values-cs/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-ro/strings.xml
|
be3ff2c7a4afbd46ae015a73f84b7d5ae610a4fa |
05-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I61d6b5a4bf528dc3c46373ce9a11afe92f6789ad Auto-generated-cl: translation import
es/values-cs/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-ro/strings.xml
|
f1fe3ba5b6ec98a1cbaa396c66d304b48b016cbc |
05-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: If0b7a533e907297be6f63a690ee2552fed95bda4 Auto-generated-cl: translation import
es/values-cs/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-ro/strings.xml
|
f130d85f09337dc08a54f9f7eb64a8b849df584c |
05-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: If0b7a533e907297be6f63a690ee2552fed95bda4 Auto-generated-cl: translation import
es/values-cs/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-ro/strings.xml
|
0b2520c6c9875160225a9bb4e6d5f29b7ac03d45 |
05-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I293a482aa77faf942e10d6b896e49bb9f5d14c29 Auto-generated-cl: translation import
es/values-cs/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-ro/strings.xml
|
aae12eef495014e50f7105af40359ed553cc0178 |
05-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I293a482aa77faf942e10d6b896e49bb9f5d14c29 Auto-generated-cl: translation import
es/values-cs/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-ro/strings.xml
|
f042981ad6c010bbab01b1ab5a86f7910e43e57a |
05-Oct-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am 9dfdd288: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '9dfdd288e8528f453a2abad9e2982bb2c326fe47': Upscale images to fill screen for slideshow Snap back photo after swipe in y-direction in filmstrip
|
9dfdd288e8528f453a2abad9e2982bb2c326fe47 |
05-Oct-2012 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with jb-mr1-release - do not merge Change-Id: I912fa9388d69152f0b15a06ec8cea548e47684e0
|
e89052b975604efb052872cdf02908286ff2817b |
05-Oct-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
e32915d3ad832b7245e64a5df08dedf99474def4 |
05-Oct-2012 |
Owen Lin <owenlin@google.com> |
Fix ANR in creating the fallback animation. bug: 6620501 Change-Id: Ibb798cce5dd49bb5083de6f29225bae512d589f8
rc/com/android/gallery3d/ui/GLRootView.java
|
5515801ddea6953e95b2c41a9434bb1fe489e08a |
05-Oct-2012 |
Owen Lin <owenlin@google.com> |
Fix ANR in creating the fallback animation. bug: 6620501 Change-Id: Ibb798cce5dd49bb5083de6f29225bae512d589f8
rc/com/android/gallery3d/ui/GLRootView.java
|
3d8c7829f0cdaa452cf9aaf0e68538ccc8dcde2f |
26-Sep-2012 |
Earl Ou <shunhsingou@google.com> |
Do not replace existed tag in addTag() of ExifTag Change-Id: I4136ed018db1ccf5801b2a151e65703cf97d3289
rc/com/android/gallery3d/exif/ExifData.java
|
0873bf164e1bcc2cd3d0b5eb1a3728dd6b9cf4d6 |
26-Sep-2012 |
Earl Ou <shunhsingou@google.com> |
Do not replace existed tag in addTag() of ExifTag Change-Id: I4136ed018db1ccf5801b2a151e65703cf97d3289
rc/com/android/gallery3d/exif/ExifData.java
|
43a84c32788ba2fe0109eade275b905c8e767207 |
05-Oct-2012 |
Owen Lin <owenlin@google.com> |
am 45816067: am d6120d06: am a556c058: am e29fc4a5: Upload screennails in tiles to prevent jank * commit '458160670418167f645a7451b79b18b2a8646319': Upload screennails in tiles to prevent jank
|
458160670418167f645a7451b79b18b2a8646319 |
05-Oct-2012 |
Owen Lin <owenlin@google.com> |
am d6120d06: am a556c058: am e29fc4a5: Upload screennails in tiles to prevent jank * commit 'd6120d06df5e9e9931568e2f1336047c03d9a918': Upload screennails in tiles to prevent jank
|
d6120d06df5e9e9931568e2f1336047c03d9a918 |
05-Oct-2012 |
Owen Lin <owenlin@google.com> |
am a556c058: am e29fc4a5: Upload screennails in tiles to prevent jank * commit 'a556c0581fcb4323146df5e1f7c28bbf35a0e8e5': Upload screennails in tiles to prevent jank
|
9159875253b329b129cd589b1cda777290109b6e |
05-Oct-2012 |
Owen Lin <owenlin@google.com> |
am e29fc4a5: Upload screennails in tiles to prevent jank * commit 'e29fc4a51b99f12f7fae13fae272858df2e1af36': Upload screennails in tiles to prevent jank
|
a556c0581fcb4323146df5e1f7c28bbf35a0e8e5 |
05-Oct-2012 |
Owen Lin <owenlin@google.com> |
am e29fc4a5: Upload screennails in tiles to prevent jank * commit 'e29fc4a51b99f12f7fae13fae272858df2e1af36': Upload screennails in tiles to prevent jank
|
7e64ee9eb727c20bc306a0bdda5b2009d0a0bfc5 |
24-Sep-2012 |
Owen Lin <owenlin@google.com> |
Upload screennails in tiles to prevent jank bug: 6399444 Change-Id: Id2338db34d7f87fbabd7861f78b42f2a81d9794b
rc/com/android/gallery3d/app/PhotoDataAdapter.java
rc/com/android/gallery3d/ui/BasicTexture.java
rc/com/android/gallery3d/ui/BitmapScreenNail.java
rc/com/android/gallery3d/ui/GLCanvas.java
rc/com/android/gallery3d/ui/GLCanvasImpl.java
rc/com/android/gallery3d/ui/TileImageView.java
rc/com/android/gallery3d/ui/TiledTexture.java
ests/src/com/android/gallery3d/ui/GLCanvasStub.java
|
e29fc4a51b99f12f7fae13fae272858df2e1af36 |
24-Sep-2012 |
Owen Lin <owenlin@google.com> |
Upload screennails in tiles to prevent jank bug: 6399444 Change-Id: Id2338db34d7f87fbabd7861f78b42f2a81d9794b
rc/com/android/gallery3d/app/PhotoDataAdapter.java
rc/com/android/gallery3d/ui/BasicTexture.java
rc/com/android/gallery3d/ui/BitmapScreenNail.java
rc/com/android/gallery3d/ui/GLCanvas.java
rc/com/android/gallery3d/ui/GLCanvasImpl.java
rc/com/android/gallery3d/ui/TileImageView.java
rc/com/android/gallery3d/ui/TiledTexture.java
ests/src/com/android/gallery3d/ui/GLCanvasStub.java
|
5c027582f6686df578d5897352f92947ac4f94ef |
05-Oct-2012 |
Hung-ying Tyan <tyanh@google.com> |
am 03ca9914: am 996ec48f: am 002e90bf: am 9bcba5b0: Merge "Open album in filmstrip only if the item exists." into gb-ub-photos-arches * commit '03ca99145af298e430e83ba6b9d07d91f53f48bd': Open album in filmstrip only if the item exists.
|
03ca99145af298e430e83ba6b9d07d91f53f48bd |
05-Oct-2012 |
Hung-ying Tyan <tyanh@google.com> |
am 996ec48f: am 002e90bf: am 9bcba5b0: Merge "Open album in filmstrip only if the item exists." into gb-ub-photos-arches * commit '996ec48f6f87a34c2be256ab27cdbcc1fbd94281': Open album in filmstrip only if the item exists.
|
996ec48f6f87a34c2be256ab27cdbcc1fbd94281 |
05-Oct-2012 |
Hung-ying Tyan <tyanh@google.com> |
am 002e90bf: am 9bcba5b0: Merge "Open album in filmstrip only if the item exists." into gb-ub-photos-arches * commit '002e90bf111c3eb5847f92e4d3ede899dfc8ba0f': Open album in filmstrip only if the item exists.
|
71ec14b71cf2c63a7dc2104f6e421596fba1ceaf |
05-Oct-2012 |
Hung-ying Tyan <tyanh@google.com> |
am 9bcba5b0: Merge "Open album in filmstrip only if the item exists." into gb-ub-photos-arches * commit '9bcba5b049f199ad78051c2ad27897cad389679d': Open album in filmstrip only if the item exists.
|
002e90bf111c3eb5847f92e4d3ede899dfc8ba0f |
05-Oct-2012 |
Hung-ying Tyan <tyanh@google.com> |
am 9bcba5b0: Merge "Open album in filmstrip only if the item exists." into gb-ub-photos-arches * commit '9bcba5b049f199ad78051c2ad27897cad389679d': Open album in filmstrip only if the item exists.
|
4303e30017d4a90ee095347106053beaa88895c0 |
05-Oct-2012 |
Hung-ying Tyan <tyanh@google.com> |
Merge "Open album in filmstrip only if the item exists." into gb-ub-photos-arches
|
9bcba5b049f199ad78051c2ad27897cad389679d |
05-Oct-2012 |
Hung-ying Tyan <tyanh@google.com> |
Merge "Open album in filmstrip only if the item exists." into gb-ub-photos-arches
|
a1cdf078a82ee3e8413bef79d0389d43a0b7c114 |
05-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am b3b0f8f6: am f038d2d2: am ca3c75ff: am f47e790e: Add a reset item menu * commit 'b3b0f8f61eae322a844d6184e0e59a85562148dd': Add a reset item menu
|
b3b0f8f61eae322a844d6184e0e59a85562148dd |
05-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am f038d2d2: am ca3c75ff: am f47e790e: Add a reset item menu * commit 'f038d2d2556a79fe8988f06cac0ad9e402527bef': Add a reset item menu
|
f038d2d2556a79fe8988f06cac0ad9e402527bef |
05-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am ca3c75ff: am f47e790e: Add a reset item menu * commit 'ca3c75ffbf1863a3e4bd827f74a61cc7657d6679': Add a reset item menu
|
8e8f3ca03dc1fe315172f576630425f8faad8d4a |
05-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am f47e790e: Add a reset item menu * commit 'f47e790e3f3553f69abe054eec20bd7585118843': Add a reset item menu
|
b2b820f0f39593954881bd17a05b8f921a0a24f0 |
05-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am f47e790e: Add a reset item menu * commit 'f47e790e3f3553f69abe054eec20bd7585118843': Add a reset item menu
|
ca3c75ffbf1863a3e4bd827f74a61cc7657d6679 |
05-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am f47e790e: Add a reset item menu * commit 'f47e790e3f3553f69abe054eec20bd7585118843': Add a reset item menu
|
a592c2961eae0d5712cb7c05a249e19a267d79d3 |
05-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Add a reset item menu bug:7234317 Change-Id: I3129b16f83981ab22ce17341d8401822369686eb
es/menu/filtershow_activity_menu.xml
|
f47e790e3f3553f69abe054eec20bd7585118843 |
05-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Add a reset item menu bug:7234317 Change-Id: I3129b16f83981ab22ce17341d8401822369686eb
es/menu/filtershow_activity_menu.xml
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
|
7f905f7a79968a713c4da7c80646d92a9b87dcc6 |
05-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Add a reset item menu bug:7234317 Change-Id: I3129b16f83981ab22ce17341d8401822369686eb
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
|
fe02b6288b572a41291c26fb596672701253ff89 |
05-Oct-2012 |
John Hoford <hoford@google.com> |
am 5e7eff7d: am e8a105c4: am 02b24ed2: am b559b2dd: add vibrance fix a free in shadows * commit '5e7eff7d9c1a1fd4098cfbee26262df5c90b48e9': add vibrance fix a free in shadows
|
5e7eff7d9c1a1fd4098cfbee26262df5c90b48e9 |
05-Oct-2012 |
John Hoford <hoford@google.com> |
am e8a105c4: am 02b24ed2: am b559b2dd: add vibrance fix a free in shadows * commit 'e8a105c4b6e8b3b762feda4f6d487360312f30ea': add vibrance fix a free in shadows
|
e8a105c4b6e8b3b762feda4f6d487360312f30ea |
05-Oct-2012 |
John Hoford <hoford@google.com> |
am 02b24ed2: am b559b2dd: add vibrance fix a free in shadows * commit '02b24ed2e858d1dbef0d85bc485d4090dac47e17': add vibrance fix a free in shadows
|
fc98aa545f300977b03ffba89ac3e95213b2d370 |
05-Oct-2012 |
John Hoford <hoford@google.com> |
am b559b2dd: add vibrance fix a free in shadows * commit 'b559b2dd6637660ddbbdbae79a742c9f0fb1180b': add vibrance fix a free in shadows
|
02b24ed2e858d1dbef0d85bc485d4090dac47e17 |
05-Oct-2012 |
John Hoford <hoford@google.com> |
am b559b2dd: add vibrance fix a free in shadows * commit 'b559b2dd6637660ddbbdbae79a742c9f0fb1180b': add vibrance fix a free in shadows
|
005887a93bf91aecd9b68b7bb6bcd74db6cfb9bb |
04-Oct-2012 |
John Hoford <hoford@google.com> |
add vibrance fix a free in shadows bug:7234321 Change-Id: I52b1b952fcdc34c23464793621df60aa7e8e00b2
ni/Android.mk
ni/filters/shadows.c
ni/filters/vibrance.c
|
a52903cdf02a3963e71529d2bbcfaa7a0a5f84bb |
04-Oct-2012 |
John Hoford <hoford@google.com> |
add vibrance fix a free in shadows bug:7234321 Change-Id: I52b1b952fcdc34c23464793621df60aa7e8e00b2
ni/Android.mk
|
b559b2dd6637660ddbbdbae79a742c9f0fb1180b |
04-Oct-2012 |
John Hoford <hoford@google.com> |
add vibrance fix a free in shadows bug:7234321 Change-Id: I52b1b952fcdc34c23464793621df60aa7e8e00b2
ni/Android.mk
ni/filters/shadows.c
ni/filters/vibrance.c
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterVibrance.java
|
8d92db225ef508b2fa883adedeab986a90803b56 |
04-Oct-2012 |
John Hoford <hoford@google.com> |
add vibrance fix a free in shadows bug:7234321 Change-Id: I52b1b952fcdc34c23464793621df60aa7e8e00b2
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterVibrance.java
|
7e27490ea11db22bbccff61b6f3d35fab4a6ed3d |
05-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 4fd2f189: am ddb50063: am f8d0367e: am 5448bf80: Implement sharpen * commit '4fd2f18933afc2fa03c354c6c18f1f4024d0b90c': Implement sharpen
|
4fd2f18933afc2fa03c354c6c18f1f4024d0b90c |
05-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am ddb50063: am f8d0367e: am 5448bf80: Implement sharpen * commit 'ddb5006365d096a82cc73ce24b56b18b27aee8e8': Implement sharpen
|
ddb5006365d096a82cc73ce24b56b18b27aee8e8 |
05-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am f8d0367e: am 5448bf80: Implement sharpen * commit 'f8d0367ea29515689c58ac821434947a888d1ca4': Implement sharpen
|
f8d0367ea29515689c58ac821434947a888d1ca4 |
05-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 5448bf80: Implement sharpen * commit '5448bf8095483574649afcc2add7f153670c7450': Implement sharpen
|
2a31e1fd5f56155e06315437b62315fa88e4ed08 |
05-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 5448bf80: Implement sharpen * commit '5448bf8095483574649afcc2add7f153670c7450': Implement sharpen
|
30e58141d9103ce540867d176b47afd815f65db5 |
05-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 5448bf80: Implement sharpen * commit '5448bf8095483574649afcc2add7f153670c7450': Implement sharpen
|
b6d989e1d75fd8c2a5aeafe846a99aae33bd7355 |
03-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Implement sharpen bug:7279964 bug:7247494 bug:7234321 - add a sharpen filter - add infrastructure to use RenderScript - some refactoring (add an ImageSlave class) - add new zoom UI Change-Id: Id94dc94d32866c7107b6818adf4db35d0c6c0b01
es/layout/filtershow_activity.xml
|
dbd3568d399070f0adcdda5fbf0f8995f07cd2bb |
03-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Implement sharpen bug:7279964 bug:7247494 bug:7234321 - add a sharpen filter - add infrastructure to use RenderScript - some refactoring (add an ImageSlave class) - add new zoom UI Change-Id: Id94dc94d32866c7107b6818adf4db35d0c6c0b01
ndroid.mk
|
5448bf8095483574649afcc2add7f153670c7450 |
03-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Implement sharpen bug:7279964 bug:7247494 bug:7234321 - add a sharpen filter - add infrastructure to use RenderScript - some refactoring (add an ImageSlave class) - add new zoom UI Change-Id: Id94dc94d32866c7107b6818adf4db35d0c6c0b01
ndroid.mk
es/layout/filtershow_activity.xml
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/cache/ImageLoader.java
rc/com/android/gallery3d/filtershow/cache/ZoomCache.java
rc/com/android/gallery3d/filtershow/filters/ImageFilter.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterRS.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterSharpen.java
rc/com/android/gallery3d/filtershow/filters/convolve3x3.rs
rc/com/android/gallery3d/filtershow/imageshow/ImageBorder.java
rc/com/android/gallery3d/filtershow/imageshow/ImageShow.java
rc/com/android/gallery3d/filtershow/imageshow/ImageSlave.java
rc/com/android/gallery3d/filtershow/imageshow/ImageStraighten.java
rc/com/android/gallery3d/filtershow/imageshow/ImageZoom.java
rc/com/android/gallery3d/filtershow/ui/ImageCurves.java
rc/com/android/gallery3d/filtershow/ui/SliderController.java
rc/com/android/gallery3d/filtershow/ui/SliderListener.java
|
a0f822613dba5c5b140cc34202574e24c59461a2 |
03-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Implement sharpen bug:7279964 bug:7247494 bug:7234321 - add a sharpen filter - add infrastructure to use RenderScript - some refactoring (add an ImageSlave class) - add new zoom UI Change-Id: Id94dc94d32866c7107b6818adf4db35d0c6c0b01
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/cache/ImageLoader.java
rc/com/android/gallery3d/filtershow/cache/ZoomCache.java
rc/com/android/gallery3d/filtershow/filters/ImageFilter.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterRS.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterSharpen.java
rc/com/android/gallery3d/filtershow/filters/convolve3x3.rs
rc/com/android/gallery3d/filtershow/imageshow/ImageBorder.java
rc/com/android/gallery3d/filtershow/imageshow/ImageShow.java
rc/com/android/gallery3d/filtershow/imageshow/ImageSlave.java
rc/com/android/gallery3d/filtershow/imageshow/ImageStraighten.java
rc/com/android/gallery3d/filtershow/imageshow/ImageZoom.java
rc/com/android/gallery3d/filtershow/ui/ImageCurves.java
rc/com/android/gallery3d/filtershow/ui/SliderController.java
rc/com/android/gallery3d/filtershow/ui/SliderListener.java
|
d15e9b925c15fb86e6b028533f4a0eb01b9b983d |
05-Oct-2012 |
George Mount <mount@google.com> |
am 098ab9e6: am 4b427d4e: am 9edd1a64: am 94805da0: Merge "Fix build break in tests" into gb-ub-photos-arches * commit '098ab9e631116494f3d0ee9deb6c78baa9dd9558': Fix build break in tests
|
098ab9e631116494f3d0ee9deb6c78baa9dd9558 |
05-Oct-2012 |
George Mount <mount@google.com> |
am 4b427d4e: am 9edd1a64: am 94805da0: Merge "Fix build break in tests" into gb-ub-photos-arches * commit '4b427d4e835f661e3b8070d2f9a82f3fc5c1cc4b': Fix build break in tests
|
4b427d4e835f661e3b8070d2f9a82f3fc5c1cc4b |
05-Oct-2012 |
George Mount <mount@google.com> |
am 9edd1a64: am 94805da0: Merge "Fix build break in tests" into gb-ub-photos-arches * commit '9edd1a647f92ed1216c44ac85135eb4f732a7442': Fix build break in tests
|
50ef0db6eb7d90386ff41f3bd5a565ede09b2b52 |
05-Oct-2012 |
George Mount <mount@google.com> |
am 94805da0: Merge "Fix build break in tests" into gb-ub-photos-arches * commit '94805da05624e939ff402a9586cddacaf622a716': Fix build break in tests
|
9edd1a647f92ed1216c44ac85135eb4f732a7442 |
05-Oct-2012 |
George Mount <mount@google.com> |
am 94805da0: Merge "Fix build break in tests" into gb-ub-photos-arches * commit '94805da05624e939ff402a9586cddacaf622a716': Fix build break in tests
|
94805da05624e939ff402a9586cddacaf622a716 |
05-Oct-2012 |
George Mount <mount@google.com> |
Merge "Fix build break in tests" into gb-ub-photos-arches
|
fd87d97665952360ac045507f06f9bf35a17c9fb |
05-Oct-2012 |
George Mount <mount@google.com> |
Merge "Fix build break in tests" into gb-ub-photos-arches
|
1953a1c06388dd043dd0168af117a4ca751586bb |
05-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am 3e7a4285: (-s ours) am 6df10160: am 731bd8aa: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev * commit '3e7a42857cba633a896e0ba92ee44ab979a2b320': Import translations. DO NOT MERGE
|
3e7a42857cba633a896e0ba92ee44ab979a2b320 |
05-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am 6df10160: am 731bd8aa: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev * commit '6df101606aa482431ac1902ba5f590749df8c74a': Import translations. DO NOT MERGE
|
6df101606aa482431ac1902ba5f590749df8c74a |
05-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am 731bd8aa: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev * commit '731bd8aac8794bbfc53a863d6004ef761ae98bf0': Import translations. DO NOT MERGE
|
6e9ac6aebc446c9320ca1e492e8d6695cd200065 |
05-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE"
|
731bd8aac8794bbfc53a863d6004ef761ae98bf0 |
05-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
|
49c0ce9fd739a330d14400ba659f5b742f7649e9 |
05-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am a19b783f: (-s ours) am 6309dabf: am 38192a53: am d21ad73e: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches * commit 'a19b783f27b9ff3522de0c0bde25e084ca83d398': Import translations. DO NOT MERGE
|
bdd935b7b533972a3896ec8a1b7902be40153a23 |
05-Oct-2012 |
George Mount <mount@google.com> |
Fix build break in tests Bug 7259843 Change-Id: If40a7da72261039e3d6fcd3a00669ed7c900c658
ests/src/com/android/gallery3d/data/GalleryAppStub.java
|
85feecbfe401db6dd3a68b9bf21e95e3a0ac7508 |
05-Oct-2012 |
George Mount <mount@google.com> |
Fix build break in tests Bug 7259843 Change-Id: If40a7da72261039e3d6fcd3a00669ed7c900c658
ests/src/com/android/gallery3d/data/GalleryAppStub.java
|
a19b783f27b9ff3522de0c0bde25e084ca83d398 |
05-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am 6309dabf: am 38192a53: am d21ad73e: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches * commit '6309dabff899b070bdb0674708eed47df9343ada': Import translations. DO NOT MERGE
|
eb9f37f7f898583ebdc8ccad28bb0374fcf76b13 |
05-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am 3eae05ea: (-s ours) am 73eb2b23: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev * commit '3eae05ea57f73559be504a9f5b4f08abb17388d4': Import translations. DO NOT MERGE
|
3eae05ea57f73559be504a9f5b4f08abb17388d4 |
05-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am 73eb2b23: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev * commit '73eb2b23d84cf956459265b00f4de8860aaf8ac0': Import translations. DO NOT MERGE
|
6309dabff899b070bdb0674708eed47df9343ada |
05-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am 38192a53: am d21ad73e: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches * commit '38192a53e82e7e1cce99c79c37b352578936e3e2': Import translations. DO NOT MERGE
|
9a1e6f5ef8b6edd3f3c7ab733db91e65f6145286 |
05-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am d21ad73e: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches * commit 'd21ad73e2c209d54dea4d924eaba18df8b9bfb12': Import translations. DO NOT MERGE
|
697b9ce9207962678ad3c315b95f5641c312a6db |
05-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am d21ad73e: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches * commit 'd21ad73e2c209d54dea4d924eaba18df8b9bfb12': Import translations. DO NOT MERGE
|
38192a53e82e7e1cce99c79c37b352578936e3e2 |
05-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am d21ad73e: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches * commit 'd21ad73e2c209d54dea4d924eaba18df8b9bfb12': Import translations. DO NOT MERGE
|
73eb2b23d84cf956459265b00f4de8860aaf8ac0 |
05-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
|
bb60c590568b25e1b19ac429531a97c17a003cdf |
05-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
|
e4c257e86e009a325bd2a5a9028d860531be48be |
05-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
|
c001e0e4ea5566a5520925c94a34d4a795b0b070 |
05-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
|
d21ad73e2c209d54dea4d924eaba18df8b9bfb12 |
05-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
|
e40db82693f0aeb613cd1c5ba85f2931e417e32c |
05-Oct-2012 |
George Mount <mount@google.com> |
am 67799f1e: am 5c2f9e70: am b0057409: am 9c6c01dd: Fix build. Missing dummy class for Gallery2. * commit '67799f1eebb7dba9221c46269e66143ade6443d1': Fix build. Missing dummy class for Gallery2.
|
67799f1eebb7dba9221c46269e66143ade6443d1 |
05-Oct-2012 |
George Mount <mount@google.com> |
am 5c2f9e70: am b0057409: am 9c6c01dd: Fix build. Missing dummy class for Gallery2. * commit '5c2f9e708eccccac4f740888556376013f741162': Fix build. Missing dummy class for Gallery2.
|
5c2f9e708eccccac4f740888556376013f741162 |
05-Oct-2012 |
George Mount <mount@google.com> |
am b0057409: am 9c6c01dd: Fix build. Missing dummy class for Gallery2. * commit 'b005740953ac9e6a0a0d1014b4acfa9c9980e111': Fix build. Missing dummy class for Gallery2.
|
66893ee368d89a45f8414fa7e39d5ae5a24c0786 |
05-Oct-2012 |
George Mount <mount@google.com> |
am 9c6c01dd: Fix build. Missing dummy class for Gallery2. * commit '9c6c01ddd5b7fce725bf4b3cec317820b16963b8': Fix build. Missing dummy class for Gallery2.
|
3e5b4c9f7d05693c430c44f0200afa295a7575f1 |
05-Oct-2012 |
George Mount <mount@google.com> |
am 9c6c01dd: Fix build. Missing dummy class for Gallery2. * commit '9c6c01ddd5b7fce725bf4b3cec317820b16963b8': Fix build. Missing dummy class for Gallery2.
|
b005740953ac9e6a0a0d1014b4acfa9c9980e111 |
05-Oct-2012 |
George Mount <mount@google.com> |
am 9c6c01dd: Fix build. Missing dummy class for Gallery2. * commit '9c6c01ddd5b7fce725bf4b3cec317820b16963b8': Fix build. Missing dummy class for Gallery2.
|
28bd2b7f84f05a503338f016ed45be18ab5ed1d6 |
05-Oct-2012 |
George Mount <mount@google.com> |
Fix build. Missing dummy class for Gallery2. Bug 7259843 Change-Id: I65e6ea64fa996798146efd20cafae78b7f4a0614
rc_pd/com/android/gallery3d/app/StitchingProgressManager.java
|
1ca9aaf57169fbfeeb4c0ccd063d5cc38f4a434f |
05-Oct-2012 |
George Mount <mount@google.com> |
Fix build. Missing dummy class for Gallery2. Bug 7259843 Change-Id: I65e6ea64fa996798146efd20cafae78b7f4a0614
rc_pd/com/android/gallery3d/app/StitchingProgressManager.java
|
9c6c01ddd5b7fce725bf4b3cec317820b16963b8 |
05-Oct-2012 |
George Mount <mount@google.com> |
Fix build. Missing dummy class for Gallery2. Bug 7259843 Change-Id: I65e6ea64fa996798146efd20cafae78b7f4a0614
rc_pd/com/android/gallery3d/app/StitchingProgressManager.java
|
f7073db36a3a6313cf74b621f0e04fe0f105129f |
04-Oct-2012 |
George Mount <mount@google.com> |
am 007c36f9: am 5b8fc893: am d5e9f02d: am 29b553a5: Merge "Support panorama progress items in Gallery." into gb-ub-photos-arches * commit '007c36f9a4b809f65ed66a20da0b8b744b474e8e': Support panorama progress items in Gallery.
|
007c36f9a4b809f65ed66a20da0b8b744b474e8e |
04-Oct-2012 |
George Mount <mount@google.com> |
am 5b8fc893: am d5e9f02d: am 29b553a5: Merge "Support panorama progress items in Gallery." into gb-ub-photos-arches * commit '5b8fc893c160b5c0c9713663e76f4fc1dbe7c970': Support panorama progress items in Gallery.
|
22d6dfc9163ca221092019cfe173f55844b28d96 |
04-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Upscale images to fill screen for slideshow Bug: 7110382 This fixes the slideshow mode on high-resolution displays. Note that this will scale up screennails to fill the screen even if they are fairly low quality. The resolution to 7232758 will set the size of the screennails appropriately based on screen size. Change-Id: I7b5367c2fce1d10f6d5e70c1239d893f54236b10
rc/com/android/gallery3d/ui/SlideshowView.java
|
d29584d4d0529f1a34b23ef8493b2be20511ee07 |
04-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Snap back photo after swipe in y-direction in filmstrip Bug: 7283537 Change-Id: Ifee561a978d418f7a1e96f1a3ddb7cc8df53752c
rc/com/android/gallery3d/ui/PhotoView.java
|
5b8fc893c160b5c0c9713663e76f4fc1dbe7c970 |
04-Oct-2012 |
George Mount <mount@google.com> |
am d5e9f02d: am 29b553a5: Merge "Support panorama progress items in Gallery." into gb-ub-photos-arches * commit 'd5e9f02de0de89f4a04091e00a76fbd915ea7e2b': Support panorama progress items in Gallery.
|
c4c70cbc7801ad3e53e1d4658a394d3afefab2d7 |
04-Oct-2012 |
George Mount <mount@google.com> |
am 29b553a5: Merge "Support panorama progress items in Gallery." into gb-ub-photos-arches * commit '29b553a54cbe4d95c174121e4f956a74117a4fc9': Support panorama progress items in Gallery.
|
d5e9f02de0de89f4a04091e00a76fbd915ea7e2b |
04-Oct-2012 |
George Mount <mount@google.com> |
am 29b553a5: Merge "Support panorama progress items in Gallery." into gb-ub-photos-arches * commit '29b553a54cbe4d95c174121e4f956a74117a4fc9': Support panorama progress items in Gallery.
|
29b553a54cbe4d95c174121e4f956a74117a4fc9 |
04-Oct-2012 |
George Mount <mount@google.com> |
Merge "Support panorama progress items in Gallery." into gb-ub-photos-arches
|
22ac4de64a2917a5e2b5449b208553a42bd46e6b |
04-Oct-2012 |
George Mount <mount@google.com> |
Merge "Support panorama progress items in Gallery." into gb-ub-photos-arches
|
32dd7333cc6a9711f1aed6c1b454854fbeab3b1c |
04-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am e0283b7e: am b22f165f: am 41190e10: am 8a415f45: Merge "Don\'t allow switching to filmstrip in get content intent" into gb-ub-photos-arches * commit 'e0283b7ec963e0e9a947c45fd2ea167fae4c6af2': Don't allow switching to filmstrip in get content intent
|
e0283b7ec963e0e9a947c45fd2ea167fae4c6af2 |
04-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am b22f165f: am 41190e10: am 8a415f45: Merge "Don\'t allow switching to filmstrip in get content intent" into gb-ub-photos-arches * commit 'b22f165f770b8ce629f1c19d453e097c91913df0': Don't allow switching to filmstrip in get content intent
|
b22f165f770b8ce629f1c19d453e097c91913df0 |
04-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 41190e10: am 8a415f45: Merge "Don\'t allow switching to filmstrip in get content intent" into gb-ub-photos-arches * commit '41190e100f3dd3e895d378f752c7f4661c690f88': Don't allow switching to filmstrip in get content intent
|
0ee7fd1547f3b1a062ef14d2ee10acd0c80f8f00 |
04-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 8a415f45: Merge "Don\'t allow switching to filmstrip in get content intent" into gb-ub-photos-arches * commit '8a415f457fe9fd18b369ac4ec354a33e3affcb94': Don't allow switching to filmstrip in get content intent
|
41190e100f3dd3e895d378f752c7f4661c690f88 |
04-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 8a415f45: Merge "Don\'t allow switching to filmstrip in get content intent" into gb-ub-photos-arches * commit '8a415f457fe9fd18b369ac4ec354a33e3affcb94': Don't allow switching to filmstrip in get content intent
|
8a415f457fe9fd18b369ac4ec354a33e3affcb94 |
04-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Don't allow switching to filmstrip in get content intent" into gb-ub-photos-arches
|
c422bd02c4063513e9974dfead3eb12f329bacb8 |
04-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Don't allow switching to filmstrip in get content intent" into gb-ub-photos-arches
|
aaba918cd63a085139947165c70587f126754175 |
04-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am a21931de: am b5f150b4: am 3158c0f2: am 0eefb173: Merge "Upscale images to fill screen for slideshow" into gb-ub-photos-arches * commit 'a21931dee23d3adfd57fb244a062003fb350bd29': Upscale images to fill screen for slideshow
|
a21931dee23d3adfd57fb244a062003fb350bd29 |
04-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am b5f150b4: am 3158c0f2: am 0eefb173: Merge "Upscale images to fill screen for slideshow" into gb-ub-photos-arches * commit 'b5f150b49df309d2ab197fb245a87304a36cdd98': Upscale images to fill screen for slideshow
|
b5f150b49df309d2ab197fb245a87304a36cdd98 |
04-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 3158c0f2: am 0eefb173: Merge "Upscale images to fill screen for slideshow" into gb-ub-photos-arches * commit '3158c0f214169dd7e1dc7ff50368f840cdcd148f': Upscale images to fill screen for slideshow
|
3158c0f214169dd7e1dc7ff50368f840cdcd148f |
04-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 0eefb173: Merge "Upscale images to fill screen for slideshow" into gb-ub-photos-arches * commit '0eefb1733f5ff2e2f6f4846bdbd8873639b4d085': Upscale images to fill screen for slideshow
|
775cbe6bd9f80db0d609b0bf5cafe4fe2ebd3011 |
04-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 0eefb173: Merge "Upscale images to fill screen for slideshow" into gb-ub-photos-arches * commit '0eefb1733f5ff2e2f6f4846bdbd8873639b4d085': Upscale images to fill screen for slideshow
|
0eefb1733f5ff2e2f6f4846bdbd8873639b4d085 |
04-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Upscale images to fill screen for slideshow" into gb-ub-photos-arches
|
e2fc40fb3b1103a0c3e8eec48e92d2e989f01dfa |
04-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Upscale images to fill screen for slideshow" into gb-ub-photos-arches
|
7e6537ca106a80aeb4a52182b31ddc9aa642abe5 |
04-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Upscale images to fill screen for slideshow Bug: 7110382 This fixes the slideshow mode on high-resolution displays. Note that this will scale up screennails to fill the screen even if they are fairly low quality. The resolution to 7232758 will set the size of the screennails appropriately based on screen size. Change-Id: I7b5367c2fce1d10f6d5e70c1239d893f54236b10
rc/com/android/gallery3d/ui/SlideshowView.java
|
dc0954ec2aa11564fa1fcc665368c266a966d4bf |
04-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Upscale images to fill screen for slideshow Bug: 7110382 This fixes the slideshow mode on high-resolution displays. Note that this will scale up screennails to fill the screen even if they are fairly low quality. The resolution to 7232758 will set the size of the screennails appropriately based on screen size. Change-Id: I7b5367c2fce1d10f6d5e70c1239d893f54236b10
rc/com/android/gallery3d/ui/SlideshowView.java
|
cde4bfb8715657127069a9ae4373d277c5a00dbb |
04-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 530c5eb2: am 83a23870: am ca4241c8: am b1a51397: Snap back photo after swipe in y-direction in filmstrip * commit '530c5eb26d12889ef35d42184e6da0aaaca92b67': Snap back photo after swipe in y-direction in filmstrip
|
4c9e3e1d7a5af64ddc946297db9d07dc394d861e |
04-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Don't allow switching to filmstrip in get content intent Bug: 7288252 Change-Id: I247e7c22ed3e90de0222ac82a55ed027c9f252c1
rc/com/android/gallery3d/app/AlbumPage.java
|
dbf60d199b4bc8fce3ace348e54308880b5eb599 |
04-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Don't allow switching to filmstrip in get content intent Bug: 7288252 Change-Id: I247e7c22ed3e90de0222ac82a55ed027c9f252c1
rc/com/android/gallery3d/app/AlbumPage.java
|
530c5eb26d12889ef35d42184e6da0aaaca92b67 |
04-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 83a23870: am ca4241c8: am b1a51397: Snap back photo after swipe in y-direction in filmstrip * commit '83a238707a694c114af852b104b79d9681de13e5': Snap back photo after swipe in y-direction in filmstrip
|
83a238707a694c114af852b104b79d9681de13e5 |
04-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am ca4241c8: am b1a51397: Snap back photo after swipe in y-direction in filmstrip * commit 'ca4241c8e87434636ccc29468f700e83ecd83a46': Snap back photo after swipe in y-direction in filmstrip
|
ca4241c8e87434636ccc29468f700e83ecd83a46 |
04-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am b1a51397: Snap back photo after swipe in y-direction in filmstrip * commit 'b1a513974d59c1dc14e004338b6795d6c3c5e5e8': Snap back photo after swipe in y-direction in filmstrip
|
3a1c3a4ad5f6138599d376685613eed8eb26bb3d |
04-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am b1a51397: Snap back photo after swipe in y-direction in filmstrip * commit 'b1a513974d59c1dc14e004338b6795d6c3c5e5e8': Snap back photo after swipe in y-direction in filmstrip
|
c64d127c976f8ef647552063ff14ead4388ce699 |
19-Sep-2012 |
Angus Kong <shkong@google.com> |
Support panorama progress items in Gallery. Bug 7259843 Add dummy files for showing panorama progress in filmstrip. Change-Id: I7ae92b90bbbd992fde00cfcfc68af69b34d34d74
rc/com/android/gallery3d/app/GalleryApp.java
rc/com/android/gallery3d/app/GalleryAppImpl.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/app/StitchingChangeListener.java
rc/com/android/gallery3d/data/DataManager.java
rc/com/android/gallery3d/data/LocalAlbumSet.java
rc_pd/com/android/gallery3d/util/LightCycleHelper.java
|
356ffa04adff94a09fe60849b40397aa8ee018b8 |
19-Sep-2012 |
Angus Kong <shkong@google.com> |
Support panorama progress items in Gallery. Bug 7259843 Add dummy files for showing panorama progress in filmstrip. Change-Id: I7ae92b90bbbd992fde00cfcfc68af69b34d34d74
rc/com/android/gallery3d/app/GalleryApp.java
rc/com/android/gallery3d/app/GalleryAppImpl.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/app/StitchingChangeListener.java
rc/com/android/gallery3d/data/DataManager.java
rc/com/android/gallery3d/data/LocalAlbumSet.java
rc_pd/com/android/gallery3d/util/LightCycleHelper.java
|
8af72b54c287ed4b46859e4e0dd9a8b588ca286c |
04-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Icfca5ad7f33b0a4411bf9911a5bac1edf1483b2e Auto-generated-cl: translation import
es/values-bg/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-es-rUS/strings.xml
es/values-fa/strings.xml
es/values-in/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-pt/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-tr/strings.xml
es/values-vi/strings.xml
|
de1903c1a3777f3652ca50b32b578d3c98c72553 |
04-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I3617a67379099fca54cf0a4978f46b449e40e288 Auto-generated-cl: translation import
es/values-bg/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-es-rUS/strings.xml
es/values-fa/strings.xml
es/values-in/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-pt/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-tr/strings.xml
es/values-vi/strings.xml
|
9420db8fc4cb7b5850e8b88c4dae079fa6ded918 |
04-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I5e9d06aa3203358693ddca94f21c238853d5d17a Auto-generated-cl: translation import
es/values-bg/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-es-rUS/strings.xml
es/values-fa/strings.xml
es/values-in/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-pt/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-tr/strings.xml
es/values-vi/strings.xml
|
b7af0a760068920a8bee98c711d9dc870d8b7b53 |
04-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I25b758732297cd86a8782bedaeb96bfbd4b46674 Auto-generated-cl: translation import
es/values-bg/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-es-rUS/strings.xml
es/values-fa/strings.xml
es/values-in/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-pt/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-tr/strings.xml
es/values-vi/strings.xml
|
86190d76acbb3445bf9ebcb0e6aee6f618fe91c0 |
04-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I25b758732297cd86a8782bedaeb96bfbd4b46674 Auto-generated-cl: translation import
es/values-bg/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-es-rUS/strings.xml
es/values-fa/strings.xml
es/values-in/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-pt/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-tr/strings.xml
es/values-vi/strings.xml
|
14257cd9abd8507af648b8dd2de51d1241bd2148 |
04-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I22d72c397ef2202c44673b5c5cc1b602e45600d8 Auto-generated-cl: translation import
es/values-bg/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-es-rUS/strings.xml
es/values-fa/strings.xml
es/values-in/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-pt/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-tr/strings.xml
es/values-vi/strings.xml
|
6c928365cf1e1459945aba649f41498d7b492a20 |
04-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I22d72c397ef2202c44673b5c5cc1b602e45600d8 Auto-generated-cl: translation import
es/values-bg/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-es-rUS/strings.xml
es/values-fa/strings.xml
es/values-in/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-pt/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-tr/strings.xml
es/values-vi/strings.xml
|
b1a513974d59c1dc14e004338b6795d6c3c5e5e8 |
04-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Snap back photo after swipe in y-direction in filmstrip Bug: 7283537 Change-Id: Ifee561a978d418f7a1e96f1a3ddb7cc8df53752c
rc/com/android/gallery3d/ui/PhotoView.java
|
c36b54f76cbad39c9f27faccbe3d596258ca572f |
04-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Snap back photo after swipe in y-direction in filmstrip Bug: 7283537 Change-Id: Ifee561a978d418f7a1e96f1a3ddb7cc8df53752c
rc/com/android/gallery3d/ui/PhotoView.java
|
39e9ebc787a39658dac0b73dd56e326f075e2cd8 |
04-Oct-2012 |
Romain Guy <romainguy@google.com> |
am 329e68fc: am 37f6da81: am a4ca12ee: Merge "@#!0 Bug #7275145" into jb-mr1-dev * commit '329e68fcb40e732b852d2ba10dacdefff4877673': @#!$# Bug #7275145
|
329e68fcb40e732b852d2ba10dacdefff4877673 |
04-Oct-2012 |
Romain Guy <romainguy@google.com> |
am 37f6da81: am a4ca12ee: Merge "@#!0 Bug #7275145" into jb-mr1-dev * commit '37f6da8128bee7d44a8d40c8d8b5bca8fd4fb614': @#!$# Bug #7275145
|
37f6da8128bee7d44a8d40c8d8b5bca8fd4fb614 |
04-Oct-2012 |
Romain Guy <romainguy@google.com> |
am a4ca12ee: Merge "@#!0 Bug #7275145" into jb-mr1-dev * commit 'a4ca12ee030fa79403b5e2cde20238a99c6e8673': @#!$# Bug #7275145
|
a4ca12ee030fa79403b5e2cde20238a99c6e8673 |
04-Oct-2012 |
Romain Guy <romainguy@google.com> |
Merge "@#!$# Bug #7275145" into jb-mr1-dev
|
ed3ddf1d477178d22079cf5803866b0d800030b1 |
04-Oct-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am 30c0e8ad: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '30c0e8adbcc4a7be4d52332425344273b79335ec': Fix ANR in image editor
|
30c0e8adbcc4a7be4d52332425344273b79335ec |
04-Oct-2012 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with jb-mr1-release - do not merge Change-Id: Id46d9e98b81fc5767e484afbca9660350932059d
|
d4fed975a090880bd6785d898bab642e543b8097 |
04-Oct-2012 |
Pin Ting <pinting@google.com> |
am 123f9904: am 19dddb99: am 31bf2be0: am 2abc1350: Merge "Accelerate PNG image rendering." into gb-ub-photos-arches * commit '123f99045ff10815b2e0ff6b07cb8cf27e78a692': Accelerate PNG image rendering.
|
123f99045ff10815b2e0ff6b07cb8cf27e78a692 |
04-Oct-2012 |
Pin Ting <pinting@google.com> |
am 19dddb99: am 31bf2be0: am 2abc1350: Merge "Accelerate PNG image rendering." into gb-ub-photos-arches * commit '19dddb99eaf6c5587e209f8a9a5e41e17755a2e4': Accelerate PNG image rendering.
|
eeaac711dc14584c62ff253af9af684144e6c95e |
04-Oct-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
19dddb99eaf6c5587e209f8a9a5e41e17755a2e4 |
04-Oct-2012 |
Pin Ting <pinting@google.com> |
am 31bf2be0: am 2abc1350: Merge "Accelerate PNG image rendering." into gb-ub-photos-arches * commit '31bf2be07efdecc91f0e72e5fd2d3750fa1755c8': Accelerate PNG image rendering.
|
31bf2be07efdecc91f0e72e5fd2d3750fa1755c8 |
04-Oct-2012 |
Pin Ting <pinting@google.com> |
am 2abc1350: Merge "Accelerate PNG image rendering." into gb-ub-photos-arches * commit '2abc1350cde24e810f6437592f099c149ce19ada': Accelerate PNG image rendering.
|
398bb47e662c38bba974cb2c95493655c3f440ca |
04-Oct-2012 |
Pin Ting <pinting@google.com> |
am 2abc1350: Merge "Accelerate PNG image rendering." into gb-ub-photos-arches * commit '2abc1350cde24e810f6437592f099c149ce19ada': Accelerate PNG image rendering.
|
2abc1350cde24e810f6437592f099c149ce19ada |
04-Oct-2012 |
Pin Ting <pinting@google.com> |
Merge "Accelerate PNG image rendering." into gb-ub-photos-arches
|
25ab25343c04ed845717b7d25d67be66c247e48d |
04-Oct-2012 |
Pin Ting <pinting@google.com> |
Merge "Accelerate PNG image rendering." into gb-ub-photos-arches
|
a70201c33d3a8796ac30fd8ec86e2bec41f9820a |
04-Oct-2012 |
Hung-ying Tyan <tyanh@google.com> |
Open album in filmstrip only if the item exists. Metadata of picasa photos may not be available when user taps to view a picasa album. Cannot enter PhotoPage directly in such a case. Bug: 7213464 Change-Id: Ife2e8768fc9b8d8757235610a02f029f40205b5b
rc/com/android/gallery3d/app/AlbumSetPage.java
|
27565de3ab86e81a20c9804ebc7f8d3f737031a0 |
04-Oct-2012 |
Hung-ying Tyan <tyanh@google.com> |
Open album in filmstrip only if the item exists. Metadata of picasa photos may not be available when user taps to view a picasa album. Cannot enter PhotoPage directly in such a case. Bug: 7213464 Change-Id: Ife2e8768fc9b8d8757235610a02f029f40205b5b
rc/com/android/gallery3d/app/AlbumSetPage.java
|
8c377351cfbc425f7eb6dbe94af0a96d71560a4b |
04-Oct-2012 |
Pin Ting <pinting@google.com> |
Accelerate PNG image rendering. Bug:7137662 Change-Id: I050a228a6c8031c6a2d068eb4ba1b39be86e9f4a
rc/com/android/gallery3d/ui/TileImageView.java
rc/com/android/gallery3d/ui/TileImageViewAdapter.java
rc/com/android/gallery3d/util/GalleryUtils.java
|
82d95838d891057b56fd43780e2424e04f1e291b |
04-Oct-2012 |
Pin Ting <pinting@google.com> |
Accelerate PNG image rendering. Bug:7137662 Change-Id: I050a228a6c8031c6a2d068eb4ba1b39be86e9f4a
rc/com/android/gallery3d/ui/TileImageView.java
rc/com/android/gallery3d/ui/TileImageViewAdapter.java
rc/com/android/gallery3d/util/GalleryUtils.java
|
70b2b261f438d912b1bfcb10c97ed790e3245235 |
04-Oct-2012 |
Owen Lin <owenlin@google.com> |
am 2dfaa4bb: am bd607718: am 7a44c6a6: am accef756: Fix NPE in ImageLoader. * commit '2dfaa4bb459e6b7178305b4cb2c09b734543ab46': Fix NPE in ImageLoader.
|
2dfaa4bb459e6b7178305b4cb2c09b734543ab46 |
04-Oct-2012 |
Owen Lin <owenlin@google.com> |
am bd607718: am 7a44c6a6: am accef756: Fix NPE in ImageLoader. * commit 'bd607718672bc1322baa7a32f2d098ffa47879af': Fix NPE in ImageLoader.
|
bd607718672bc1322baa7a32f2d098ffa47879af |
04-Oct-2012 |
Owen Lin <owenlin@google.com> |
am 7a44c6a6: am accef756: Fix NPE in ImageLoader. * commit '7a44c6a6430da1fe68a44139a49db581d51086b0': Fix NPE in ImageLoader.
|
7a44c6a6430da1fe68a44139a49db581d51086b0 |
04-Oct-2012 |
Owen Lin <owenlin@google.com> |
am accef756: Fix NPE in ImageLoader. * commit 'accef756f100d5c27a4d13d6a6bfa5c75714e5bc': Fix NPE in ImageLoader.
|
e86c6ea12f417a343d2f4ae42aacdeb785e7edd2 |
04-Oct-2012 |
Owen Lin <owenlin@google.com> |
am accef756: Fix NPE in ImageLoader. * commit 'accef756f100d5c27a4d13d6a6bfa5c75714e5bc': Fix NPE in ImageLoader.
|
accef756f100d5c27a4d13d6a6bfa5c75714e5bc |
04-Oct-2012 |
Owen Lin <owenlin@google.com> |
Fix NPE in ImageLoader. bug: 7275805 Change-Id: Ied04553a97efe5b4996418f20d834d6bd0893976
rc/com/android/gallery3d/filtershow/cache/ImageLoader.java
|
5a7157733bb2229642866a3bb4cbc6850c995a9d |
04-Oct-2012 |
Owen Lin <owenlin@google.com> |
Fix NPE in ImageLoader. bug: 7275805 Change-Id: Ied04553a97efe5b4996418f20d834d6bd0893976
rc/com/android/gallery3d/filtershow/cache/ImageLoader.java
|
07b2318f58c21e65564424c5b0afd71df4cac38b |
04-Oct-2012 |
Owen Lin <owenlin@google.com> |
am b0f79606: am 81346fd9: am 2d4c11a4: am fab36399: Merge "Set type as well while launching editor." into gb-ub-photos-arches * commit 'b0f7960698b5daf213ebf70eb175d26e815b2c6c': Set type as well while launching editor.
|
b0f7960698b5daf213ebf70eb175d26e815b2c6c |
04-Oct-2012 |
Owen Lin <owenlin@google.com> |
am 81346fd9: am 2d4c11a4: am fab36399: Merge "Set type as well while launching editor." into gb-ub-photos-arches * commit '81346fd9b4f8f637b5ee05cc9a66bf16b40d79c6': Set type as well while launching editor.
|
81346fd9b4f8f637b5ee05cc9a66bf16b40d79c6 |
04-Oct-2012 |
Owen Lin <owenlin@google.com> |
am 2d4c11a4: am fab36399: Merge "Set type as well while launching editor." into gb-ub-photos-arches * commit '2d4c11a4ecaf70ad2f25f0cb3bc529b42b68f36c': Set type as well while launching editor.
|
2d4c11a4ecaf70ad2f25f0cb3bc529b42b68f36c |
04-Oct-2012 |
Owen Lin <owenlin@google.com> |
am fab36399: Merge "Set type as well while launching editor." into gb-ub-photos-arches * commit 'fab36399a0fa455377854d65fab012ee6ee55868': Set type as well while launching editor.
|
691cbdd52c140808ede83b70e596f145598dd73a |
04-Oct-2012 |
Owen Lin <owenlin@google.com> |
am fab36399: Merge "Set type as well while launching editor." into gb-ub-photos-arches * commit 'fab36399a0fa455377854d65fab012ee6ee55868': Set type as well while launching editor.
|
fab36399a0fa455377854d65fab012ee6ee55868 |
04-Oct-2012 |
Owen Lin <owenlin@google.com> |
Merge "Set type as well while launching editor." into gb-ub-photos-arches
|
5995e335058d234e89d55ee4ab56385e7a373cae |
04-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am 9ac50fb3: (-s ours) am a30ad279: am 4c39c881: am 9778705a: (-s ours) Import translations. DO NOT MERGE * commit '9ac50fb3695100e15a737d42f26ab48b9285bd50': Import translations. DO NOT MERGE
|
fbde3e57169ac4607545c327f5da94838caba65f |
04-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am 9a44c16a: (-s ours) am a33a6549: am 967a065c: Import translations. DO NOT MERGE * commit '9a44c16a6a1aaaf792d93b880d837b6199c19b49': Import translations. DO NOT MERGE
|
9ac50fb3695100e15a737d42f26ab48b9285bd50 |
04-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am a30ad279: am 4c39c881: am 9778705a: (-s ours) Import translations. DO NOT MERGE * commit 'a30ad2790e24a022db450e103e507513e2a02fa0': Import translations. DO NOT MERGE
|
9a44c16a6a1aaaf792d93b880d837b6199c19b49 |
04-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am a33a6549: am 967a065c: Import translations. DO NOT MERGE * commit 'a33a6549100f62075f571f8c68681d24b640725e': Import translations. DO NOT MERGE
|
a30ad2790e24a022db450e103e507513e2a02fa0 |
04-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am 4c39c881: am 9778705a: (-s ours) Import translations. DO NOT MERGE * commit '4c39c881bcc5e786c6c8d318545ff9421b2071c4': Import translations. DO NOT MERGE
|
b1f9ff3d352a39d395394c22660e14af904914d4 |
04-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am 6d9f6625: (-s ours) am 3fb29827: Import translations. DO NOT MERGE * commit '6d9f66259bda6cad48caa8f71240b79da7ad403f': Import translations. DO NOT MERGE
|
a33a6549100f62075f571f8c68681d24b640725e |
04-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am 967a065c: Import translations. DO NOT MERGE * commit '967a065c8c6d3ce4a03835e1344795b13db65a8b': Import translations. DO NOT MERGE
|
6d9f66259bda6cad48caa8f71240b79da7ad403f |
04-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am 3fb29827: Import translations. DO NOT MERGE * commit '3fb298276d2bf95ba2ce6e4244adc5de78d50a8d': Import translations. DO NOT MERGE
|
4c39c881bcc5e786c6c8d318545ff9421b2071c4 |
04-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am 9778705a: (-s ours) Import translations. DO NOT MERGE * commit '9778705aa8ea34a9bff27f9d77ac46d35514278a': Import translations. DO NOT MERGE
|
124c05c572472f7eb6830848c5a749e03025e394 |
04-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am 9778705a: (-s ours) Import translations. DO NOT MERGE * commit '9778705aa8ea34a9bff27f9d77ac46d35514278a': Import translations. DO NOT MERGE
|
97f3e6ad4815d30e439a4bbed51fd627b0dbb409 |
04-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am 9778705a: (-s ours) Import translations. DO NOT MERGE * commit '9778705aa8ea34a9bff27f9d77ac46d35514278a': Import translations. DO NOT MERGE
|
46a19abfb337f168ed3d6694ea812dcf05d4a1ba |
04-Oct-2012 |
Owen Lin <owenlin@google.com> |
Set type as well while launching editor. bug: 7275805 Change-Id: I6b86dd03d92b2cf453947bd84a0247e1626c81db
rc/com/android/gallery3d/app/PhotoPage.java
|
b6692653af5dbce477f33df721aa6177fabeda4b |
04-Oct-2012 |
Owen Lin <owenlin@google.com> |
Set type as well while launching editor. bug: 7275805 Change-Id: I6b86dd03d92b2cf453947bd84a0247e1626c81db
rc/com/android/gallery3d/app/PhotoPage.java
|
1c44dc1ca6bffcff87a3470a51064ffbd95c0251 |
04-Oct-2012 |
Romain Guy <romainguy@google.com> |
@#!$# Bug #7275145 Removing the window background when it's not visible is a good idea to save on performance. Removing *all* the backgrounds is just a silly idea that leads to weird looking results that drive graphics engineers mad for a day until they figure out that everything is working properly and that the app is simply asking the system to draw whatever garbage is left in the GPU's graphics buffers. Change-Id: Icd12cd4ec6fc313f80acfd8deb7133a17ea11302
rc/com/android/gallery3d/app/MoviePlayer.java
|
bd8d09efb3ba32ff5d001c899ea6ec2f99a4f5a9 |
04-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I35bc10767820f11c99658d51cf6b123d387fdebd Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-de/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-it/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-uk/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
967a065c8c6d3ce4a03835e1344795b13db65a8b |
04-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I9f95654510b47dff7b6155afaa053f237895c5d7 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-de/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-it/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-uk/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
3fb298276d2bf95ba2ce6e4244adc5de78d50a8d |
04-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I0f379a6360bf63f6339c6a9ffa3621990f48ac0c Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-de/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-it/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-uk/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
81d32e7b5677246f7845b106a419b69496dfb73e |
04-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I4d9b7d0fe8d4d6a47ee4caec8567570bb2aa374d Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-de/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-it/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-uk/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
4ef08917eb5d6d676fc00c5f6c8959ed07a9eabe |
04-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I4d9b7d0fe8d4d6a47ee4caec8567570bb2aa374d Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-de/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-it/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-uk/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
0e2e9d6dc00a5a37493ea0b96193e1aed1899a75 |
04-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I07074d563d0ab8ef237ca7f27fb15d2c768c310d Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-de/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-it/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-uk/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
9778705aa8ea34a9bff27f9d77ac46d35514278a |
04-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I07074d563d0ab8ef237ca7f27fb15d2c768c310d Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-de/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-it/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-uk/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
bcf5c966d31d1a80c734921d9e81a35c28e27264 |
03-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Fix ANR in image editor bug:7275425 Change-Id: I01a89579e17a0e4fc0817b61c7fda48ca54d0afa
rc/com/android/gallery3d/filtershow/filters/ImageFilterGradient.java
rc/com/android/gallery3d/filtershow/imageshow/ImageStraighten.java
|
904fbb3b3342ce4db58fd2f53ec97f3546f6ac67 |
04-Oct-2012 |
Mangesh Ghiware <mghiware@google.com> |
am 2fd1ae3e: am a1a87f91: am ce561010: am 6090237f: Merge "Revert "Add a overflow menu item to view 360-degree panorama."" into gb-ub-photos-arches * commit '2fd1ae3eb15412fccf8727e13f899a794f010671': Revert "Add a overflow menu item to view 360-degree panorama."
|
2fd1ae3eb15412fccf8727e13f899a794f010671 |
04-Oct-2012 |
Mangesh Ghiware <mghiware@google.com> |
am a1a87f91: am ce561010: am 6090237f: Merge "Revert "Add a overflow menu item to view 360-degree panorama."" into gb-ub-photos-arches * commit 'a1a87f911c6fda17e0b6eaf496be715fe08bf794': Revert "Add a overflow menu item to view 360-degree panorama."
|
a1a87f911c6fda17e0b6eaf496be715fe08bf794 |
04-Oct-2012 |
Mangesh Ghiware <mghiware@google.com> |
am ce561010: am 6090237f: Merge "Revert "Add a overflow menu item to view 360-degree panorama."" into gb-ub-photos-arches * commit 'ce5610100513fd73c4e67c4112ceeb3121287343': Revert "Add a overflow menu item to view 360-degree panorama."
|
ce5610100513fd73c4e67c4112ceeb3121287343 |
04-Oct-2012 |
Mangesh Ghiware <mghiware@google.com> |
am 6090237f: Merge "Revert "Add a overflow menu item to view 360-degree panorama."" into gb-ub-photos-arches * commit '6090237f178914fa7d7eef514c2e2512d4c27847': Revert "Add a overflow menu item to view 360-degree panorama."
|
74b936f50a2539a3cfc578118f57f8063d0a8ae4 |
04-Oct-2012 |
Mangesh Ghiware <mghiware@google.com> |
am 6090237f: Merge "Revert "Add a overflow menu item to view 360-degree panorama."" into gb-ub-photos-arches * commit '6090237f178914fa7d7eef514c2e2512d4c27847': Revert "Add a overflow menu item to view 360-degree panorama."
|
a6566888edf430ea2bd9d9ad411224d4d05848db |
04-Oct-2012 |
Mangesh Ghiware <mghiware@google.com> |
am 6090237f: Merge "Revert "Add a overflow menu item to view 360-degree panorama."" into gb-ub-photos-arches * commit '6090237f178914fa7d7eef514c2e2512d4c27847': Revert "Add a overflow menu item to view 360-degree panorama."
|
d37dc7f6660d2d01768f93113cbe6efba2448ad0 |
04-Oct-2012 |
Mangesh Ghiware <mghiware@google.com> |
Merge "Revert "Add a overflow menu item to view 360-degree panorama."" into gb-ub-photos-arches
|
6090237f178914fa7d7eef514c2e2512d4c27847 |
04-Oct-2012 |
Mangesh Ghiware <mghiware@google.com> |
Merge "Revert "Add a overflow menu item to view 360-degree panorama."" into gb-ub-photos-arches
|
3c227133913b07c054cbd60607cf9a97c4d30a7c |
04-Oct-2012 |
Mangesh Ghiware <mghiware@google.com> |
Revert "Add a overflow menu item to view 360-degree panorama." This reverts commit d84ae72adb147c0e8517a438b3dea3e87d319bb7 Change-Id: I5921cbb476034da2798480534e9084e287312f04
es/menu/operation.xml
es/menu/photo.xml
es/values/strings.xml
|
10f94c1c42aea7df1c66a91f427f8f831718cc32 |
04-Oct-2012 |
Mangesh Ghiware <mghiware@google.com> |
Revert "Add a overflow menu item to view 360-degree panorama." This reverts commit d84ae72adb147c0e8517a438b3dea3e87d319bb7 Change-Id: I5921cbb476034da2798480534e9084e287312f04
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/ui/MenuExecutor.java
|
541315cda58bfdb30b3acab14af6944f83908103 |
04-Oct-2012 |
Mangesh Ghiware <mghiware@google.com> |
Revert "Add a overflow menu item to view 360-degree panorama." This reverts commit d84ae72adb147c0e8517a438b3dea3e87d319bb7 Change-Id: I5921cbb476034da2798480534e9084e287312f04
es/menu/operation.xml
es/menu/photo.xml
es/values/strings.xml
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/ui/MenuExecutor.java
|
d678eb2b9224d407f60e1f82f364abf528bc68e9 |
04-Oct-2012 |
Jean-Baptiste Queru <jbq@google.com> |
am 16c4b882: (-s ours) am 7a447b30: (-s ours) Reconcile with jb-dev - do not merge * commit '16c4b882fa2a9de1397500e07580d4a0c3e31e91':
|
16c4b882fa2a9de1397500e07580d4a0c3e31e91 |
04-Oct-2012 |
Jean-Baptiste Queru <jbq@google.com> |
am 7a447b30: (-s ours) Reconcile with jb-dev - do not merge * commit '7a447b30f6f58445bfa040958a9fa5f392296aaa':
|
7a447b30f6f58445bfa040958a9fa5f392296aaa |
04-Oct-2012 |
Jean-Baptiste Queru <jbq@google.com> |
Reconcile with jb-dev - do not merge Change-Id: Icd05cc41786c59d592e51e5e0b7a4296a4a1cf57
|
d1e620995ce8b2f5f679a3349f0f058322d0dc99 |
03-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am b4b7f8f4: am 9e158602: am 32ffa821: am 124a9d3f: Merge "Fix ANR in image editor" into gb-ub-photos-arches * commit 'b4b7f8f48526ed0a5a176c713183fb3133a446c7': Fix ANR in image editor
|
b4b7f8f48526ed0a5a176c713183fb3133a446c7 |
03-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 9e158602: am 32ffa821: am 124a9d3f: Merge "Fix ANR in image editor" into gb-ub-photos-arches * commit '9e1586022cb6a903486701e85da904ab8a0ea397': Fix ANR in image editor
|
9e1586022cb6a903486701e85da904ab8a0ea397 |
03-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 32ffa821: am 124a9d3f: Merge "Fix ANR in image editor" into gb-ub-photos-arches * commit '32ffa82178358194cfbbcb479594648af8a24c46': Fix ANR in image editor
|
39c6a442f1fb0acfcdf604c5347c42bc95a620d2 |
03-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 124a9d3f: Merge "Fix ANR in image editor" into gb-ub-photos-arches * commit '124a9d3f2adc08fdef179e1922762d024d27fd69': Fix ANR in image editor
|
32ffa82178358194cfbbcb479594648af8a24c46 |
03-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 124a9d3f: Merge "Fix ANR in image editor" into gb-ub-photos-arches * commit '124a9d3f2adc08fdef179e1922762d024d27fd69': Fix ANR in image editor
|
619471756d8e82ca3b6ba69b2c2d0e81b6031284 |
03-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Merge "Fix ANR in image editor" into gb-ub-photos-arches
|
124a9d3f2adc08fdef179e1922762d024d27fd69 |
03-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Merge "Fix ANR in image editor" into gb-ub-photos-arches
|
b1de2584974b152a166e98d7f865945e4e911517 |
03-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Fix ANR in image editor bug:7275425 Change-Id: I01a89579e17a0e4fc0817b61c7fda48ca54d0afa
rc/com/android/gallery3d/filtershow/filters/ImageFilterGradient.java
rc/com/android/gallery3d/filtershow/imageshow/ImageStraighten.java
|
1046a23a15aa2aa291b490ce7c0781141f4c2f20 |
03-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Fix ANR in image editor bug:7275425 Change-Id: I01a89579e17a0e4fc0817b61c7fda48ca54d0afa
rc/com/android/gallery3d/filtershow/filters/ImageFilterGradient.java
rc/com/android/gallery3d/filtershow/imageshow/ImageStraighten.java
|
7604865123e81b73f1635646a30aba6240906717 |
03-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am edcfb434: am 61c4ed6d: am 711c498f: am 56bc8b74: Merge "Fix snapping behavior in filmstrip" into gb-ub-photos-arches * commit 'edcfb4348a0a0cf83049facc11ada0d64f9c6122': Fix snapping behavior in filmstrip
|
edcfb4348a0a0cf83049facc11ada0d64f9c6122 |
03-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 61c4ed6d: am 711c498f: am 56bc8b74: Merge "Fix snapping behavior in filmstrip" into gb-ub-photos-arches * commit '61c4ed6dd2fca715d2f5408fc71a88883f0d42e6': Fix snapping behavior in filmstrip
|
61c4ed6dd2fca715d2f5408fc71a88883f0d42e6 |
03-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 711c498f: am 56bc8b74: Merge "Fix snapping behavior in filmstrip" into gb-ub-photos-arches * commit '711c498f36d63f542b7cc45ca9acbb719e83171f': Fix snapping behavior in filmstrip
|
711c498f36d63f542b7cc45ca9acbb719e83171f |
03-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 56bc8b74: Merge "Fix snapping behavior in filmstrip" into gb-ub-photos-arches * commit '56bc8b742d750f2fff9d3a30e6cc96e1850c782d': Fix snapping behavior in filmstrip
|
408ecbea95392f248230dece450189fedf46cbcc |
03-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 56bc8b74: Merge "Fix snapping behavior in filmstrip" into gb-ub-photos-arches * commit '56bc8b742d750f2fff9d3a30e6cc96e1850c782d': Fix snapping behavior in filmstrip
|
7411e79a0396d3c78bb3a55bc82c741840d85605 |
03-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Fix snapping behavior in filmstrip" into gb-ub-photos-arches
|
56bc8b742d750f2fff9d3a30e6cc96e1850c782d |
03-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Fix snapping behavior in filmstrip" into gb-ub-photos-arches
|
a743fe720d00101cc27bc6bcadd031a33a25094d |
03-Oct-2012 |
Mangesh Ghiware <mghiware@google.com> |
am e48da4f3: am 6fd38894: am 81912a44: am b57e72bb: Disable destructive rotate for lightcycle panorama * commit 'e48da4f30b4addbb482fd98976f745b727a78d30': Disable destructive rotate for lightcycle panorama
|
8603fd8edf5cebf46be8807868ec74b5304fe87d |
03-Oct-2012 |
Mangesh Ghiware <mghiware@google.com> |
am 713b8ca9: am b2750ed2: am d0bd885b: am d84ae72a: Add a overflow menu item to view 360-degree panorama. * commit '713b8ca93e994b50833522da7380a52f0249584c': Add a overflow menu item to view 360-degree panorama.
|
e48da4f30b4addbb482fd98976f745b727a78d30 |
03-Oct-2012 |
Mangesh Ghiware <mghiware@google.com> |
am 6fd38894: am 81912a44: am b57e72bb: Disable destructive rotate for lightcycle panorama * commit '6fd38894d69725568a9a63fce627713fb267ec36': Disable destructive rotate for lightcycle panorama
|
713b8ca93e994b50833522da7380a52f0249584c |
03-Oct-2012 |
Mangesh Ghiware <mghiware@google.com> |
am b2750ed2: am d0bd885b: am d84ae72a: Add a overflow menu item to view 360-degree panorama. * commit 'b2750ed28241ecc714124fbf12aeb40361739dcd': Add a overflow menu item to view 360-degree panorama.
|
91227ee2d83cf8d4ca353d442777567293808eb5 |
03-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Fix snapping behavior in filmstrip Bug: 7277936 Change-Id: I57569eaac0b9e633d249754dcb3613c6c4f7ad3a
rc/com/android/gallery3d/ui/PhotoView.java
|
499ac9eae0eb26eaf7ebf79fb88ba929b71c8145 |
03-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Fix snapping behavior in filmstrip Bug: 7277936 Change-Id: I57569eaac0b9e633d249754dcb3613c6c4f7ad3a
rc/com/android/gallery3d/ui/PhotoView.java
|
6fd38894d69725568a9a63fce627713fb267ec36 |
03-Oct-2012 |
Mangesh Ghiware <mghiware@google.com> |
am 81912a44: am b57e72bb: Disable destructive rotate for lightcycle panorama * commit '81912a44c7e7d2519a7f89d9860e698959b8fe9e': Disable destructive rotate for lightcycle panorama
|
81912a44c7e7d2519a7f89d9860e698959b8fe9e |
03-Oct-2012 |
Mangesh Ghiware <mghiware@google.com> |
am b57e72bb: Disable destructive rotate for lightcycle panorama * commit 'b57e72bb1a093afc5aee276855656c8b285c73b3': Disable destructive rotate for lightcycle panorama
|
f54adb30cdedf77f55237100785852fdad552358 |
03-Oct-2012 |
Mangesh Ghiware <mghiware@google.com> |
am b57e72bb: Disable destructive rotate for lightcycle panorama * commit 'b57e72bb1a093afc5aee276855656c8b285c73b3': Disable destructive rotate for lightcycle panorama
|
ac28e0055388e1d3fab2d6f00e47696e4797c0cb |
03-Oct-2012 |
Mangesh Ghiware <mghiware@google.com> |
Disable destructive rotate for lightcycle panorama Bug: 7276024 Change-Id: I2b223d3928517b083cc982db8142770da02dd5b9
rc/com/android/gallery3d/data/LocalImage.java
|
b57e72bb1a093afc5aee276855656c8b285c73b3 |
03-Oct-2012 |
Mangesh Ghiware <mghiware@google.com> |
Disable destructive rotate for lightcycle panorama Bug: 7276024 Change-Id: I2b223d3928517b083cc982db8142770da02dd5b9
rc/com/android/gallery3d/data/LocalImage.java
|
b2750ed28241ecc714124fbf12aeb40361739dcd |
03-Oct-2012 |
Mangesh Ghiware <mghiware@google.com> |
am d0bd885b: am d84ae72a: Add a overflow menu item to view 360-degree panorama. * commit 'd0bd885b90576cf0ff1317c236adc805c0d0d2f4': Add a overflow menu item to view 360-degree panorama.
|
d0bd885b90576cf0ff1317c236adc805c0d0d2f4 |
03-Oct-2012 |
Mangesh Ghiware <mghiware@google.com> |
am d84ae72a: Add a overflow menu item to view 360-degree panorama. * commit 'd84ae72adb147c0e8517a438b3dea3e87d319bb7': Add a overflow menu item to view 360-degree panorama.
|
dbb5f1c1d63cf5804990518d938a629cced8bc0e |
03-Oct-2012 |
Mangesh Ghiware <mghiware@google.com> |
am d84ae72a: Add a overflow menu item to view 360-degree panorama. * commit 'd84ae72adb147c0e8517a438b3dea3e87d319bb7': Add a overflow menu item to view 360-degree panorama.
|
748a4257e09f4c9895ddca789acd8535c581915c |
03-Oct-2012 |
Mangesh Ghiware <mghiware@google.com> |
am d84ae72a: Add a overflow menu item to view 360-degree panorama. * commit 'd84ae72adb147c0e8517a438b3dea3e87d319bb7': Add a overflow menu item to view 360-degree panorama.
|
a0106450928912a76146a9ef5a424d2a102e67ce |
03-Oct-2012 |
Mangesh Ghiware <mghiware@google.com> |
Add a overflow menu item to view 360-degree panorama. Bug: 7276026 Change-Id: Ib4979e45867e22267b34fb77342ca625337c7ee4
es/menu/operation.xml
es/menu/photo.xml
es/values/strings.xml
|
c0e7a6b8115968736129582d614052a87b21539c |
03-Oct-2012 |
Mangesh Ghiware <mghiware@google.com> |
Add a overflow menu item to view 360-degree panorama. Bug: 7276026 Change-Id: Ib4979e45867e22267b34fb77342ca625337c7ee4
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/ui/MenuExecutor.java
|
d84ae72adb147c0e8517a438b3dea3e87d319bb7 |
03-Oct-2012 |
Mangesh Ghiware <mghiware@google.com> |
Add a overflow menu item to view 360-degree panorama. Bug: 7276026 Change-Id: Ib4979e45867e22267b34fb77342ca625337c7ee4
es/menu/operation.xml
es/menu/photo.xml
es/values/strings.xml
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/ui/MenuExecutor.java
|
b5b7021fcd83abc7b1efa61b7c4ef7fd17df2275 |
03-Oct-2012 |
George Mount <mount@google.com> |
am 75b1d331: am 02c570fd: am fc1edb40: am 217acd7c: Change LightCycle assets. * commit '75b1d331eb2e08ba93d8b1aa4a70851e7cbc5345': Change LightCycle assets.
|
75b1d331eb2e08ba93d8b1aa4a70851e7cbc5345 |
03-Oct-2012 |
George Mount <mount@google.com> |
am 02c570fd: am fc1edb40: am 217acd7c: Change LightCycle assets. * commit '02c570fda0c8cb6266bd1195552c4dbf6ba65543': Change LightCycle assets.
|
02c570fda0c8cb6266bd1195552c4dbf6ba65543 |
03-Oct-2012 |
George Mount <mount@google.com> |
am fc1edb40: am 217acd7c: Change LightCycle assets. * commit 'fc1edb405ec8c7d4553d860b0adae5c6c4703433': Change LightCycle assets.
|
fc1edb405ec8c7d4553d860b0adae5c6c4703433 |
03-Oct-2012 |
George Mount <mount@google.com> |
am 217acd7c: Change LightCycle assets. * commit '217acd7c338871f426f4c975a8f9b889275cd321': Change LightCycle assets.
|
bb8a96aa93c7ac1608233477c867848f134bdeba |
03-Oct-2012 |
George Mount <mount@google.com> |
am 217acd7c: Change LightCycle assets. * commit '217acd7c338871f426f4c975a8f9b889275cd321': Change LightCycle assets.
|
54f43e433509c9618d38bfba860ffbdcae607962 |
03-Oct-2012 |
George Mount <mount@google.com> |
am 217acd7c: Change LightCycle assets. * commit '217acd7c338871f426f4c975a8f9b889275cd321': Change LightCycle assets.
|
b8d52cf066a771d1858979c754d66b146fa37927 |
03-Oct-2012 |
George Mount <mount@google.com> |
Change LightCycle assets. Bug 7279463 Change-Id: Ic0253875b5554649004beeaf6b73795c304b5369
es/drawable-hdpi/ic_menu_photosphere_active.png
es/drawable-mdpi/ic_menu_photosphere_active.png
es/drawable-xhdpi/ic_menu_photosphere_active.png
|
217acd7c338871f426f4c975a8f9b889275cd321 |
03-Oct-2012 |
George Mount <mount@google.com> |
Change LightCycle assets. Bug 7279463 Change-Id: Ic0253875b5554649004beeaf6b73795c304b5369
es/drawable-hdpi/ic_menu_photosphere_active.png
es/drawable-mdpi/ic_menu_photosphere_active.png
es/drawable-xhdpi/ic_menu_photosphere_active.png
|
b5dd6805707f4912bad20e6417bc818d962d97d6 |
03-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am 9489b383: (-s ours) am 8cc98356: am 042b3ad6: am e0d9d42c: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches * commit '9489b383ebbac9c8e566497d22f5e11628dc7c8d': Import translations. DO NOT MERGE
|
7c6ee357d1c204d2bceb7338370f9e1a62279be4 |
03-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am 42315bc0: (-s ours) am ceb9b738: am b93fa454: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev * commit '42315bc0f91d3caf57b4bbd7c1f4e7ed9bcaffd4': Import translations. DO NOT MERGE
|
9489b383ebbac9c8e566497d22f5e11628dc7c8d |
03-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am 8cc98356: am 042b3ad6: am e0d9d42c: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches * commit '8cc9835671c2b0e752bc3c87e896188bb56ae5e3': Import translations. DO NOT MERGE
|
42315bc0f91d3caf57b4bbd7c1f4e7ed9bcaffd4 |
03-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am ceb9b738: am b93fa454: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev * commit 'ceb9b73827f3d268ffc85f97db8d7f73175e437a': Import translations. DO NOT MERGE
|
69d705073382fe7872b26acf2b9f39e7baec181c |
03-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am fa9994a2: (-s ours) am 6df57045: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev * commit 'fa9994a2270731e9b1d4d85e1dedcc531dab6a62': Import translations. DO NOT MERGE
|
8cc9835671c2b0e752bc3c87e896188bb56ae5e3 |
03-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am 042b3ad6: am e0d9d42c: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches * commit '042b3ad6d2e08ea25a9ee8ee209a2fc1e1efa43e': Import translations. DO NOT MERGE
|
ceb9b73827f3d268ffc85f97db8d7f73175e437a |
03-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am b93fa454: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev * commit 'b93fa4543423a5171f47f4659c4838b4a23cfee9': Import translations. DO NOT MERGE
|
fa9994a2270731e9b1d4d85e1dedcc531dab6a62 |
03-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am 6df57045: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev * commit '6df57045b240438dac859a643563548cdc3ba3e4': Import translations. DO NOT MERGE
|
27281ae52ad54aba9d58f9a3c8060a3cff0afefe |
03-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE"
|
44dd9c5c848ce917222e6590a8a2dffc94195397 |
03-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am e0d9d42c: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches * commit 'e0d9d42cf564c70df489542145493a15e5b8dc15': Import translations. DO NOT MERGE
|
e782b7d45fdf1df06ce9d750bdec0b3f524febcb |
03-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am e0d9d42c: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches * commit 'e0d9d42cf564c70df489542145493a15e5b8dc15': Import translations. DO NOT MERGE
|
042b3ad6d2e08ea25a9ee8ee209a2fc1e1efa43e |
03-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am e0d9d42c: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches * commit 'e0d9d42cf564c70df489542145493a15e5b8dc15': Import translations. DO NOT MERGE
|
b93fa4543423a5171f47f4659c4838b4a23cfee9 |
03-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
|
6df57045b240438dac859a643563548cdc3ba3e4 |
03-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
|
171bb1c3476e9d261f79c88096062f63cb8d6a17 |
03-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
|
e0d9d42cf564c70df489542145493a15e5b8dc15 |
03-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
|
bb94e475ad94bade7c04d02409b3c058a3a68eaf |
03-Oct-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am b4a12c2e: (-s ours) Reconcile with jb-mr1-release - do not merge * commit 'b4a12c2e5d40d342af208ce9235e3a8400baafc6': Fix crash, remove logging added to diagnose bug
|
b4a12c2e5d40d342af208ce9235e3a8400baafc6 |
03-Oct-2012 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with jb-mr1-release - do not merge Change-Id: Ic18f0603db7cc019c6e3f2831204f79f19ad9587
|
318f0048cf40de52b2844db01baeebd352838fe1 |
03-Oct-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
fbfeb2680841ceaad524a84bb380fa81003554a2 |
03-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am b10b2436: am e4c1e0c2: am b80ac7f5: am f4e22eb4: Correct behavior when swiping to placeholder item in PhotoPage * commit 'b10b2436cf971bcd33443e9efa6f31672ff5f6c8': Correct behavior when swiping to placeholder item in PhotoPage
|
b10b2436cf971bcd33443e9efa6f31672ff5f6c8 |
03-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am e4c1e0c2: am b80ac7f5: am f4e22eb4: Correct behavior when swiping to placeholder item in PhotoPage * commit 'e4c1e0c259a343b09507a397e7f01df79faa24da': Correct behavior when swiping to placeholder item in PhotoPage
|
e4c1e0c259a343b09507a397e7f01df79faa24da |
03-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am b80ac7f5: am f4e22eb4: Correct behavior when swiping to placeholder item in PhotoPage * commit 'b80ac7f5bbaff18103465eb313e86b9fe573f5e3': Correct behavior when swiping to placeholder item in PhotoPage
|
b80ac7f5bbaff18103465eb313e86b9fe573f5e3 |
03-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am f4e22eb4: Correct behavior when swiping to placeholder item in PhotoPage * commit 'f4e22eb44bfae0c2a3b6570f19480c8c3535d808': Correct behavior when swiping to placeholder item in PhotoPage
|
5d7899d2b30d0aac29aeb384493e8478e3939e7e |
03-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am f4e22eb4: Correct behavior when swiping to placeholder item in PhotoPage * commit 'f4e22eb44bfae0c2a3b6570f19480c8c3535d808': Correct behavior when swiping to placeholder item in PhotoPage
|
f4e22eb44bfae0c2a3b6570f19480c8c3535d808 |
03-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Correct behavior when swiping to placeholder item in PhotoPage Bug: 7261641 Change-Id: I54deed0f20a4673cb5470ffc128c73cddc071772
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/ui/PhotoView.java
|
4216866c697760da809b6912fb40c146905ce5a3 |
03-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Correct behavior when swiping to placeholder item in PhotoPage Bug: 7261641 Change-Id: I54deed0f20a4673cb5470ffc128c73cddc071772
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/ui/PhotoView.java
|
4b4577de5954401c2f05e56ddbd63e8c4abb4631 |
03-Oct-2012 |
Mangesh Ghiware <mghiware@google.com> |
am 88d446b2: am d3fdba7c: am f6af2a32: am 847587b5: Remove redundant handling of share action. * commit '88d446b24ed81b8608d8c29258204601033b5b7b': Remove redundant handling of share action.
|
88d446b24ed81b8608d8c29258204601033b5b7b |
03-Oct-2012 |
Mangesh Ghiware <mghiware@google.com> |
am d3fdba7c: am f6af2a32: am 847587b5: Remove redundant handling of share action. * commit 'd3fdba7cf105f98bdfd5a6f0a80983c95838b1dc': Remove redundant handling of share action.
|
d3fdba7cf105f98bdfd5a6f0a80983c95838b1dc |
03-Oct-2012 |
Mangesh Ghiware <mghiware@google.com> |
am f6af2a32: am 847587b5: Remove redundant handling of share action. * commit 'f6af2a3240cbd6de44e51049e8f5c5a87cab09f8': Remove redundant handling of share action.
|
f6af2a3240cbd6de44e51049e8f5c5a87cab09f8 |
03-Oct-2012 |
Mangesh Ghiware <mghiware@google.com> |
am 847587b5: Remove redundant handling of share action. * commit '847587b51800d4b2d241cd1b7c8b589be2c24133': Remove redundant handling of share action.
|
81ddea5e3c035a36b5d1516a0842c057acca2867 |
03-Oct-2012 |
Mangesh Ghiware <mghiware@google.com> |
am 847587b5: Remove redundant handling of share action. * commit '847587b51800d4b2d241cd1b7c8b589be2c24133': Remove redundant handling of share action.
|
847587b51800d4b2d241cd1b7c8b589be2c24133 |
03-Oct-2012 |
Mangesh Ghiware <mghiware@google.com> |
Remove redundant handling of share action. Bug: 7256214 Gallery PhotoPage was handling the menu item selection for the share action, in addition to the ShareActionProvider. Removing this leftover code from pre-ActionBar implementation. Change-Id: I0c91b9a7c05b38758ad1b76dd657225daaab1922
rc/com/android/gallery3d/app/PhotoPage.java
|
66fdb16ff418043db62b240a156aac27bbc0a7ee |
03-Oct-2012 |
Mangesh Ghiware <mghiware@google.com> |
Remove redundant handling of share action. Bug: 7256214 Gallery PhotoPage was handling the menu item selection for the share action, in addition to the ShareActionProvider. Removing this leftover code from pre-ActionBar implementation. Change-Id: I0c91b9a7c05b38758ad1b76dd657225daaab1922
rc/com/android/gallery3d/app/PhotoPage.java
|
2580202ce739bbfceaab98e9272a242e463bad04 |
03-Oct-2012 |
John Hoford <hoford@google.com> |
am ea64bb28: am 4b072fac: am edceb4d0: am c7b2c287: Add Shadow feature * commit 'ea64bb286ab8e3894539760f63934f265e7f2e00': Add Shadow feature
|
ea64bb286ab8e3894539760f63934f265e7f2e00 |
03-Oct-2012 |
John Hoford <hoford@google.com> |
am 4b072fac: am edceb4d0: am c7b2c287: Add Shadow feature * commit '4b072fac96ca61bef6a4180a56d7e162d97a9985': Add Shadow feature
|
4b072fac96ca61bef6a4180a56d7e162d97a9985 |
03-Oct-2012 |
John Hoford <hoford@google.com> |
am edceb4d0: am c7b2c287: Add Shadow feature * commit 'edceb4d0b3974931c2f83a8d67b3fd8b14f65036': Add Shadow feature
|
edceb4d0b3974931c2f83a8d67b3fd8b14f65036 |
03-Oct-2012 |
John Hoford <hoford@google.com> |
am c7b2c287: Add Shadow feature * commit 'c7b2c287bfbe3f53a4d65800c3884b0082ad683c': Add Shadow feature
|
dfb1da3ca984b0f9053215aa02ee547d0e416d90 |
03-Oct-2012 |
John Hoford <hoford@google.com> |
am c7b2c287: Add Shadow feature * commit 'c7b2c287bfbe3f53a4d65800c3884b0082ad683c': Add Shadow feature
|
7c46d38c4a1df9712f808260ec56995cb77aa4a2 |
03-Oct-2012 |
John Hoford <hoford@google.com> |
Add Shadow feature bug:7234321 Change-Id: Ib0d4db773486e469ed818385b68b7b907070c297
ni/Android.mk
ni/filters/filters.h
ni/filters/hsv.c
ni/filters/shadows.c
|
fd901f5e0c9472260d3956056b323caa75ed52a4 |
03-Oct-2012 |
John Hoford <hoford@google.com> |
Add Shadow feature bug:7234321 Change-Id: Ib0d4db773486e469ed818385b68b7b907070c297
ni/Android.mk
|
c7b2c287bfbe3f53a4d65800c3884b0082ad683c |
03-Oct-2012 |
John Hoford <hoford@google.com> |
Add Shadow feature bug:7234321 Change-Id: Ib0d4db773486e469ed818385b68b7b907070c297
ni/Android.mk
ni/filters/filters.h
ni/filters/hsv.c
ni/filters/shadows.c
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterShadows.java
rc/com/android/gallery3d/filtershow/ui/ControlPoint.java
|
3cac6dd4d4c28ee7b0833715fae77ca5ddf4d77d |
03-Oct-2012 |
John Hoford <hoford@google.com> |
Add Shadow feature bug:7234321 Change-Id: Ib0d4db773486e469ed818385b68b7b907070c297
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterShadows.java
rc/com/android/gallery3d/filtershow/ui/ControlPoint.java
|
7a13f4deb9e3c64c6dc754ea0b0d6a19d446872a |
03-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am fd6f5020: am e1d11904: am 75a946ff: am 45e666c6: Merge "Implements image sharing" into gb-ub-photos-arches * commit 'fd6f50201e0aca6b2e9ecd4d2cd6d26ca2c2cedd': Implements image sharing
|
fd6f50201e0aca6b2e9ecd4d2cd6d26ca2c2cedd |
03-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am e1d11904: am 75a946ff: am 45e666c6: Merge "Implements image sharing" into gb-ub-photos-arches * commit 'e1d119049874118cbb2bf105ffa311cf7f401dc5': Implements image sharing
|
e1d119049874118cbb2bf105ffa311cf7f401dc5 |
03-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 75a946ff: am 45e666c6: Merge "Implements image sharing" into gb-ub-photos-arches * commit '75a946ff012f966601d1098aac761a8ff69789f6': Implements image sharing
|
4b85befc2dbd89430160bd27971a2fdff6fbedff |
03-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 45e666c6: Merge "Implements image sharing" into gb-ub-photos-arches * commit '45e666c65b75d36327c3491fb8e1245ba5cf4c77': Implements image sharing
|
75a946ff012f966601d1098aac761a8ff69789f6 |
03-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 45e666c6: Merge "Implements image sharing" into gb-ub-photos-arches * commit '45e666c65b75d36327c3491fb8e1245ba5cf4c77': Implements image sharing
|
7325d6115b91be94e84503c578c5fe40a1ee99b4 |
03-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Merge "Implements image sharing" into gb-ub-photos-arches
|
45e666c65b75d36327c3491fb8e1245ba5cf4c77 |
03-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Merge "Implements image sharing" into gb-ub-photos-arches
|
4ee7bf458b2b7c869009ff0e7960d5874ec94199 |
01-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Implements image sharing bug:7233986 Change-Id: I8feb94d77facf8dbb8da5fab89b49ed7c224116e
ndroidManifest.xml
|
e091f88847d6c1a142f3503a1d0d42f5ad0ba188 |
01-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Implements image sharing bug:7233986 Change-Id: I8feb94d77facf8dbb8da5fab89b49ed7c224116e
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/cache/ImageLoader.java
rc/com/android/gallery3d/filtershow/imageshow/ImageShow.java
rc/com/android/gallery3d/filtershow/provider/SharedImageProvider.java
rc/com/android/gallery3d/filtershow/tools/ProcessedBitmap.java
rc/com/android/gallery3d/filtershow/tools/SaveCopyTask.java
|
0ee91a2b74808fa3f51d370daaddf99f588d72ef |
01-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Implements image sharing bug:7233986 Change-Id: I8feb94d77facf8dbb8da5fab89b49ed7c224116e
ndroidManifest.xml
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/cache/ImageLoader.java
rc/com/android/gallery3d/filtershow/imageshow/ImageShow.java
rc/com/android/gallery3d/filtershow/provider/SharedImageProvider.java
rc/com/android/gallery3d/filtershow/tools/ProcessedBitmap.java
rc/com/android/gallery3d/filtershow/tools/SaveCopyTask.java
|
cf59770a87d427391dfc192b01e90e20adc5f052 |
03-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 936ff8ad: am f7c83d64: am 11a41ac9: am 9481d05b: Do not show grid/filmstrip spinner in secure camera mode * commit '936ff8adcc824814fce8f33cb54602daef762700': Do not show grid/filmstrip spinner in secure camera mode
|
936ff8adcc824814fce8f33cb54602daef762700 |
03-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am f7c83d64: am 11a41ac9: am 9481d05b: Do not show grid/filmstrip spinner in secure camera mode * commit 'f7c83d64d7949ca289900a8c7e8a3be5a48271a5': Do not show grid/filmstrip spinner in secure camera mode
|
f7c83d64d7949ca289900a8c7e8a3be5a48271a5 |
03-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 11a41ac9: am 9481d05b: Do not show grid/filmstrip spinner in secure camera mode * commit '11a41ac916415bd4fab16d7e1a8f2b61fe97231f': Do not show grid/filmstrip spinner in secure camera mode
|
11a41ac916415bd4fab16d7e1a8f2b61fe97231f |
03-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 9481d05b: Do not show grid/filmstrip spinner in secure camera mode * commit '9481d05b0782dccd495c66d2e3240cd7448bbd4a': Do not show grid/filmstrip spinner in secure camera mode
|
3444cb1d020b15f9273010dce17d8b4dc384abcf |
03-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 9481d05b: Do not show grid/filmstrip spinner in secure camera mode * commit '9481d05b0782dccd495c66d2e3240cd7448bbd4a': Do not show grid/filmstrip spinner in secure camera mode
|
d176eaab45af7b13d70f0bf5fbfc9c307591134d |
03-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Do not show grid/filmstrip spinner in secure camera mode Bug: 7274284 Change-Id: I74ede883fe726bd05e95b30d3f91da2856543123
rc/com/android/gallery3d/app/PhotoPage.java
|
9481d05b0782dccd495c66d2e3240cd7448bbd4a |
03-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Do not show grid/filmstrip spinner in secure camera mode Bug: 7274284 Change-Id: I74ede883fe726bd05e95b30d3f91da2856543123
rc/com/android/gallery3d/app/PhotoPage.java
|
f4bde1897ca154117df155c8b1728615997e9a2d |
02-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Fix crash, remove logging added to diagnose bug Bug: 7216012 LocalMergeAlbum index was not being initialized in constructor so it was possible to access the index before it was populated with information. Change-Id: I7025839b0f3953b827f06c717cff6dc47a15b06c
rc/com/android/gallery3d/data/LocalMergeAlbum.java
|
65253bf96de8b176c578879abacc0688cf30ff4f |
03-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am a1925e52: am 01f24d76: am 4b759a13: am 45f089d6: Show Camera placeholder as first filmstrip item in roll * commit 'a1925e52d4191b45658f26d44138895b4b953a47': Show Camera placeholder as first filmstrip item in roll
|
a1925e52d4191b45658f26d44138895b4b953a47 |
03-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 01f24d76: am 4b759a13: am 45f089d6: Show Camera placeholder as first filmstrip item in roll * commit '01f24d76a4a20613b3ff938aca370562079b92fa': Show Camera placeholder as first filmstrip item in roll
|
01f24d76a4a20613b3ff938aca370562079b92fa |
03-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 4b759a13: am 45f089d6: Show Camera placeholder as first filmstrip item in roll * commit '4b759a1341313fa4aeaaf8293202eb2aaabadec5': Show Camera placeholder as first filmstrip item in roll
|
4b759a1341313fa4aeaaf8293202eb2aaabadec5 |
03-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 45f089d6: Show Camera placeholder as first filmstrip item in roll * commit '45f089d69141e3fb0dfaad9bc34d275b61eb2aee': Show Camera placeholder as first filmstrip item in roll
|
da9441307044c12837c1f6ad3682296d5402e78d |
03-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 45f089d6: Show Camera placeholder as first filmstrip item in roll * commit '45f089d69141e3fb0dfaad9bc34d275b61eb2aee': Show Camera placeholder as first filmstrip item in roll
|
7067fa61419d004d4f7d016556ca40512a26a118 |
02-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Show Camera placeholder as first filmstrip item in roll Bug: 7272674 The camera roll filmstrip view now shows a shortcut to launch the camera when opened from the Gallery app. Note: the edits to SnailAlbum and SnailSource were made to allow sharing code between SingleItemAlbum and SnailAlbum Change-Id: I1bd2f3db99138c4b79a41c9c5baee46704cd18e0
rc/com/android/gallery3d/app/AlbumSetPage.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/data/CameraShortcutImage.java
rc/com/android/gallery3d/data/FilterSource.java
rc/com/android/gallery3d/data/MediaObject.java
rc/com/android/gallery3d/data/SingleItemAlbum.java
rc/com/android/gallery3d/data/SnailAlbum.java
rc/com/android/gallery3d/data/SnailSource.java
|
45f089d69141e3fb0dfaad9bc34d275b61eb2aee |
02-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Show Camera placeholder as first filmstrip item in roll Bug: 7272674 The camera roll filmstrip view now shows a shortcut to launch the camera when opened from the Gallery app. Note: the edits to SnailAlbum and SnailSource were made to allow sharing code between SingleItemAlbum and SnailAlbum Change-Id: I1bd2f3db99138c4b79a41c9c5baee46704cd18e0
rc/com/android/gallery3d/app/AlbumSetPage.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/data/CameraShortcutImage.java
rc/com/android/gallery3d/data/FilterSource.java
rc/com/android/gallery3d/data/MediaObject.java
rc/com/android/gallery3d/data/SingleItemAlbum.java
rc/com/android/gallery3d/data/SnailAlbum.java
rc/com/android/gallery3d/data/SnailSource.java
|
2448bc22fa6480979b4a5b1678bb87da76ef13dc |
02-Oct-2012 |
Teng-Hui Zhu <ztenghui@google.com> |
am ca280cbe: am ecf8d288: am 65c16ee5: am 51915a62: Merge "Trimming: Exit current activity after click done" into gb-ub-photos-arches * commit 'ca280cbedddfeb2f3531dc18e863d0738adcf764': Trimming: Exit current activity after click done
|
ca280cbedddfeb2f3531dc18e863d0738adcf764 |
02-Oct-2012 |
Teng-Hui Zhu <ztenghui@google.com> |
am ecf8d288: am 65c16ee5: am 51915a62: Merge "Trimming: Exit current activity after click done" into gb-ub-photos-arches * commit 'ecf8d28848493a97e57669886d002f5ca8df5300': Trimming: Exit current activity after click done
|
7b7d5e7329f0c15ad5cb04183263e2ba13ce3f72 |
02-Oct-2012 |
John Reck <jreck@google.com> |
am e52bf8c2: am cdca6f5f: am 31e3baa0: am 536ff151: Merge "Fix NFC regression" into gb-ub-photos-arches * commit 'e52bf8c2083f542cd933e871b2afd6bc6c29e623': Fix NFC regression
|
ecf8d28848493a97e57669886d002f5ca8df5300 |
02-Oct-2012 |
Teng-Hui Zhu <ztenghui@google.com> |
am 65c16ee5: am 51915a62: Merge "Trimming: Exit current activity after click done" into gb-ub-photos-arches * commit '65c16ee5bb556df724b4d4a59dbc31c25697a939': Trimming: Exit current activity after click done
|
8c2f4430766faa80247db76dbfbf83e6733a8d68 |
02-Oct-2012 |
Teng-Hui Zhu <ztenghui@google.com> |
am 51915a62: Merge "Trimming: Exit current activity after click done" into gb-ub-photos-arches * commit '51915a622bbd32e90f0cd43b69a7851e13825737': Trimming: Exit current activity after click done
|
65c16ee5bb556df724b4d4a59dbc31c25697a939 |
02-Oct-2012 |
Teng-Hui Zhu <ztenghui@google.com> |
am 51915a62: Merge "Trimming: Exit current activity after click done" into gb-ub-photos-arches * commit '51915a622bbd32e90f0cd43b69a7851e13825737': Trimming: Exit current activity after click done
|
e52bf8c2083f542cd933e871b2afd6bc6c29e623 |
02-Oct-2012 |
John Reck <jreck@google.com> |
am cdca6f5f: am 31e3baa0: am 536ff151: Merge "Fix NFC regression" into gb-ub-photos-arches * commit 'cdca6f5fe3be3dcdc9d4478d23ce1ed5103d6705': Fix NFC regression
|
1ebac746eb319663f44fe9fbb7786cb9bb87489b |
02-Oct-2012 |
Teng-Hui Zhu <ztenghui@google.com> |
Merge "Trimming: Exit current activity after click done" into gb-ub-photos-arches
|
51915a622bbd32e90f0cd43b69a7851e13825737 |
02-Oct-2012 |
Teng-Hui Zhu <ztenghui@google.com> |
Merge "Trimming: Exit current activity after click done" into gb-ub-photos-arches
|
cdca6f5fe3be3dcdc9d4478d23ce1ed5103d6705 |
02-Oct-2012 |
John Reck <jreck@google.com> |
am 31e3baa0: am 536ff151: Merge "Fix NFC regression" into gb-ub-photos-arches * commit '31e3baa099c0d57280c4a538296ec0826b21d6ad': Fix NFC regression
|
31e3baa099c0d57280c4a538296ec0826b21d6ad |
02-Oct-2012 |
John Reck <jreck@google.com> |
am 536ff151: Merge "Fix NFC regression" into gb-ub-photos-arches * commit '536ff1512fae7c8ad6ee276bf102269011fb6e50': Fix NFC regression
|
02f3052ca85467ae226ba434526fb5a307fabf9c |
02-Oct-2012 |
John Reck <jreck@google.com> |
am 536ff151: Merge "Fix NFC regression" into gb-ub-photos-arches * commit '536ff1512fae7c8ad6ee276bf102269011fb6e50': Fix NFC regression
|
47f251a757f3ce66374492f08e49843b3651de4e |
02-Oct-2012 |
John Reck <jreck@google.com> |
Merge "Fix NFC regression" into gb-ub-photos-arches
|
536ff1512fae7c8ad6ee276bf102269011fb6e50 |
02-Oct-2012 |
John Reck <jreck@google.com> |
Merge "Fix NFC regression" into gb-ub-photos-arches
|
3cf591b21556be79ecc8549ded191d3b4ccfd2ab |
02-Oct-2012 |
John Reck <jreck@google.com> |
Fix NFC regression Bug: 7263536 Change-Id: Ieba6147fdc0279888ec1e6ea2101eab235522b9f
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/ui/ActionModeHandler.java
|
2619f20d30123a391cc6d37515fe8eb9d81d5029 |
02-Oct-2012 |
John Reck <jreck@google.com> |
Fix NFC regression Bug: 7263536 Change-Id: Ieba6147fdc0279888ec1e6ea2101eab235522b9f
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/ui/ActionModeHandler.java
|
7a4ac0df11ff3b5e2d95a01abd84e9aa6b85e1c0 |
02-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I30a49b3f642751223bf9eb7cd1c7a04db0b62515 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
753d2e7764d1f8fe2968141be3dd22d3adf16f14 |
02-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: If8a4110b8ab9049c4dd436ce3598fb6aff10cce7 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
aa518c2b5e252704949c589a66758933a1a79866 |
02-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I145d1bc30045731457d0e88020e266ce3ceb4e0e Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
00004cc04486ec67a8380c096407bb8fc810819b |
02-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I58b8b0327577f4d64131ae2d9f63661283ef7c63 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
ad4a5070230e7d0c62a0ae20229613f8a18e1df9 |
02-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I58b8b0327577f4d64131ae2d9f63661283ef7c63 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
6a0ed366fb64a3d06d0265129f7116d37370a041 |
02-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Icb59dd74fb53338abaf3498ac4e5109e97c81b47 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
ef8151d50fa7055ba39739f5ad2a85c6b9a8527f |
02-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Icb59dd74fb53338abaf3498ac4e5109e97c81b47 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
b1f1509d6c91793112d82ba1ec61c49405a49434 |
02-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am c2afd0f6: am c2506795: am 2ddf485a: am 6423defe: Fix crash, remove logging added to diagnose bug * commit 'c2afd0f62104753bee9d3cc881318c1ed133df5f': Fix crash, remove logging added to diagnose bug
|
c2afd0f62104753bee9d3cc881318c1ed133df5f |
02-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am c2506795: am 2ddf485a: am 6423defe: Fix crash, remove logging added to diagnose bug * commit 'c2506795528e6f8ea2b15e01fb206cb18da461fa': Fix crash, remove logging added to diagnose bug
|
c2506795528e6f8ea2b15e01fb206cb18da461fa |
02-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 2ddf485a: am 6423defe: Fix crash, remove logging added to diagnose bug * commit '2ddf485a61b675e84f00ed3e415788aaa8a8c156': Fix crash, remove logging added to diagnose bug
|
2ddf485a61b675e84f00ed3e415788aaa8a8c156 |
02-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 6423defe: Fix crash, remove logging added to diagnose bug * commit '6423defee1d8ccf4d462d40ae4f82c7d73b11ab5': Fix crash, remove logging added to diagnose bug
|
5cae45863dcfec9538fb0cc3606e5119a92f9185 |
02-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 6423defe: Fix crash, remove logging added to diagnose bug * commit '6423defee1d8ccf4d462d40ae4f82c7d73b11ab5': Fix crash, remove logging added to diagnose bug
|
bf2d8a1412c3b88c0a867e8bdb3f91a901fa66bc |
02-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Fix crash, remove logging added to diagnose bug Bug: 7216012 LocalMergeAlbum index was not being initialized in constructor so it was possible to access the index before it was populated with information. Change-Id: I7025839b0f3953b827f06c717cff6dc47a15b06c
rc/com/android/gallery3d/data/LocalMergeAlbum.java
|
6423defee1d8ccf4d462d40ae4f82c7d73b11ab5 |
02-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Fix crash, remove logging added to diagnose bug Bug: 7216012 LocalMergeAlbum index was not being initialized in constructor so it was possible to access the index before it was populated with information. Change-Id: I7025839b0f3953b827f06c717cff6dc47a15b06c
rc/com/android/gallery3d/data/LocalMergeAlbum.java
|
2bc896eba093277e7e530b4dca35ec09ed523c0b |
02-Oct-2012 |
Teng-Hui Zhu <ztenghui@google.com> |
Trimming: Exit current activity after click done Don't auto exit the trimmed video playing. bug:7093055 Change-Id: I97fa1556cbe0591f2204ab4135b85375f82abbe8
rc/com/android/gallery3d/app/TrimVideo.java
|
2833355c86cff90163457779adb2bc78a6ca0faa |
02-Oct-2012 |
Teng-Hui Zhu <ztenghui@google.com> |
Trimming: Exit current activity after click done Don't auto exit the trimmed video playing. bug:7093055 Change-Id: I97fa1556cbe0591f2204ab4135b85375f82abbe8
rc/com/android/gallery3d/app/TrimVideo.java
|
7bfb41eee5654a7f74b029e6d564b81f489ad229 |
02-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am f0a59827: am d22d50ba: am 1856b8fc: am 462923e5: Check item is editable before attempting to launch editor * commit 'f0a5982791b45aae05592ca0d33ddec08ff1bcad': Check item is editable before attempting to launch editor
|
f0a5982791b45aae05592ca0d33ddec08ff1bcad |
02-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am d22d50ba: am 1856b8fc: am 462923e5: Check item is editable before attempting to launch editor * commit 'd22d50bae77fbc58cd05bea61567aaf1cc7649a4': Check item is editable before attempting to launch editor
|
d22d50bae77fbc58cd05bea61567aaf1cc7649a4 |
02-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 1856b8fc: am 462923e5: Check item is editable before attempting to launch editor * commit '1856b8fcfdfe75093a14fe53c3d25f64680c941c': Check item is editable before attempting to launch editor
|
3f7cff4506d3ac27373dcad84e3c6bb73acb0ec5 |
02-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 462923e5: Check item is editable before attempting to launch editor * commit '462923e5800e151ab5ec450063334ba430c1da3a': Check item is editable before attempting to launch editor
|
1856b8fcfdfe75093a14fe53c3d25f64680c941c |
02-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 462923e5: Check item is editable before attempting to launch editor * commit '462923e5800e151ab5ec450063334ba430c1da3a': Check item is editable before attempting to launch editor
|
b11fb05ae8435dc90375ead6ecab62b7e10fb44f |
02-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Check item is editable before attempting to launch editor Bug: 7269840 Change-Id: I18af824865b8a158c7a89e2b34f51a32de144057
rc/com/android/gallery3d/app/PhotoPage.java
|
462923e5800e151ab5ec450063334ba430c1da3a |
02-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Check item is editable before attempting to launch editor Bug: 7269840 Change-Id: I18af824865b8a158c7a89e2b34f51a32de144057
rc/com/android/gallery3d/app/PhotoPage.java
|
eb4c41332cae6b0b8ba343e5140d77b18d77c9b2 |
02-Oct-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am 9ff5ea4a: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '9ff5ea4a69e7fd3ff193eb27af70bb8fb171ad2e': More logs for gallery crash error, remove a potential cause Fix Monkey NPE
|
9ff5ea4a69e7fd3ff193eb27af70bb8fb171ad2e |
02-Oct-2012 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with jb-mr1-release - do not merge Change-Id: I0c2d60d6f4521289ec4c08902e80034a3c758ca5
|
f69d96ea20536a1b03cd9b9360770d02795c53f6 |
02-Oct-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
66bdeb02678f3157aecabf719d267989a475744e |
02-Oct-2012 |
Owen Lin <owenlin@google.com> |
am 011646e7: am 2c36e518: am a3d2afd6: am 13360629: Remove ActionBarSherlock * commit '011646e7e1cb462fecdfa331f8145f05547c2201': Remove ActionBarSherlock
|
011646e7e1cb462fecdfa331f8145f05547c2201 |
02-Oct-2012 |
Owen Lin <owenlin@google.com> |
am 2c36e518: am a3d2afd6: am 13360629: Remove ActionBarSherlock * commit '2c36e51827bd4916ed9117958a166f84ba490e5a': Remove ActionBarSherlock
|
2c36e51827bd4916ed9117958a166f84ba490e5a |
02-Oct-2012 |
Owen Lin <owenlin@google.com> |
am a3d2afd6: am 13360629: Remove ActionBarSherlock * commit 'a3d2afd6b885ebc56f590e0b373f625bd0d64155': Remove ActionBarSherlock
|
2c3804ed3dba5526125964c94bee6e48996ca16b |
02-Oct-2012 |
Owen Lin <owenlin@google.com> |
am 13360629: Remove ActionBarSherlock * commit '1336062985c9824d7fd796b1cebd5eaa8e4163ca': Remove ActionBarSherlock
|
0158e1704c29734cf3d1eccc315bd58533c9ff36 |
02-Oct-2012 |
Owen Lin <owenlin@google.com> |
am 13360629: Remove ActionBarSherlock * commit '1336062985c9824d7fd796b1cebd5eaa8e4163ca': Remove ActionBarSherlock
|
a3d2afd6b885ebc56f590e0b373f625bd0d64155 |
02-Oct-2012 |
Owen Lin <owenlin@google.com> |
am 13360629: Remove ActionBarSherlock * commit '1336062985c9824d7fd796b1cebd5eaa8e4163ca': Remove ActionBarSherlock
|
26d50562cc36385deac10027de449fcbaac5d7ae |
02-Oct-2012 |
Owen Lin <owenlin@google.com> |
Remove ActionBarSherlock bug: 7242682 Change-Id: Ibf1fa136cafdca25273ee39ae9c065560b2db5cb
ndroid.mk
|
530a57a6cb3e0122facabe78ccb0745822cf0575 |
02-Oct-2012 |
Owen Lin <owenlin@google.com> |
Remove ActionBarSherlock bug: 7242682 Change-Id: Ibf1fa136cafdca25273ee39ae9c065560b2db5cb
ctionbarsherlock/res/color/abs__primary_text_disable_only_holo_dark.xml
ctionbarsherlock/res/color/abs__primary_text_disable_only_holo_light.xml
ctionbarsherlock/res/color/abs__primary_text_holo_dark.xml
ctionbarsherlock/res/color/abs__primary_text_holo_light.xml
ctionbarsherlock/res/drawable-hdpi/abs__ab_bottom_solid_dark_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_bottom_solid_inverse_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_bottom_solid_light_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_bottom_transparent_dark_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_bottom_transparent_light_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_share_pack_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_share_pack_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_solid_dark_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_solid_light_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_solid_shadow_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_stacked_solid_dark_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_stacked_solid_light_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_stacked_transparent_dark_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_stacked_transparent_light_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_transparent_dark_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_transparent_light_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__btn_cab_done_default_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__btn_cab_done_default_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__btn_cab_done_focused_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__btn_cab_done_focused_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__btn_cab_done_pressed_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__btn_cab_done_pressed_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__cab_background_bottom_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__cab_background_bottom_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__cab_background_top_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__cab_background_top_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__dialog_full_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__dialog_full_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ic_ab_back_holo_dark.png
ctionbarsherlock/res/drawable-hdpi/abs__ic_ab_back_holo_light.png
ctionbarsherlock/res/drawable-hdpi/abs__ic_cab_done_holo_dark.png
ctionbarsherlock/res/drawable-hdpi/abs__ic_cab_done_holo_light.png
ctionbarsherlock/res/drawable-hdpi/abs__ic_menu_moreoverflow_normal_holo_dark.png
ctionbarsherlock/res/drawable-hdpi/abs__ic_menu_moreoverflow_normal_holo_light.png
ctionbarsherlock/res/drawable-hdpi/abs__ic_menu_share_holo_dark.png
ctionbarsherlock/res/drawable-hdpi/abs__ic_menu_share_holo_light.png
ctionbarsherlock/res/drawable-hdpi/abs__list_activated_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__list_divider_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__list_divider_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__list_focused_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__list_longpressed_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__list_pressed_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__list_pressed_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__list_selector_disabled_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__list_selector_disabled_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__menu_dropdown_panel_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__menu_dropdown_panel_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__progress_bg_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__progress_bg_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__progress_primary_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__progress_primary_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__progress_secondary_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__progress_secondary_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__spinner_48_inner_holo.png
ctionbarsherlock/res/drawable-hdpi/abs__spinner_48_outer_holo.png
ctionbarsherlock/res/drawable-hdpi/abs__spinner_ab_default_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__spinner_ab_default_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__spinner_ab_disabled_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__spinner_ab_disabled_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__spinner_ab_focused_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__spinner_ab_focused_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__spinner_ab_pressed_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__spinner_ab_pressed_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__tab_selected_focused_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__tab_selected_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__tab_selected_pressed_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__tab_unselected_pressed_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_bottom_solid_dark_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_bottom_solid_inverse_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_bottom_solid_light_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_bottom_transparent_dark_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_bottom_transparent_light_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_share_pack_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_share_pack_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_solid_dark_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_solid_light_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_solid_shadow_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_stacked_solid_dark_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_stacked_solid_light_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_stacked_transparent_dark_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_stacked_transparent_light_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_transparent_dark_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_transparent_light_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__btn_cab_done_default_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__btn_cab_done_default_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__btn_cab_done_focused_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__btn_cab_done_focused_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__btn_cab_done_pressed_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__btn_cab_done_pressed_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__cab_background_bottom_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__cab_background_bottom_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__cab_background_top_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__cab_background_top_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__dialog_full_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__dialog_full_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ic_ab_back_holo_dark.png
ctionbarsherlock/res/drawable-mdpi/abs__ic_ab_back_holo_light.png
ctionbarsherlock/res/drawable-mdpi/abs__ic_cab_done_holo_dark.png
ctionbarsherlock/res/drawable-mdpi/abs__ic_cab_done_holo_light.png
ctionbarsherlock/res/drawable-mdpi/abs__ic_menu_moreoverflow_normal_holo_dark.png
ctionbarsherlock/res/drawable-mdpi/abs__ic_menu_moreoverflow_normal_holo_light.png
ctionbarsherlock/res/drawable-mdpi/abs__ic_menu_share_holo_dark.png
ctionbarsherlock/res/drawable-mdpi/abs__ic_menu_share_holo_light.png
ctionbarsherlock/res/drawable-mdpi/abs__list_activated_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__list_divider_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__list_divider_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__list_focused_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__list_longpressed_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__list_pressed_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__list_pressed_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__list_selector_disabled_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__list_selector_disabled_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__menu_dropdown_panel_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__menu_dropdown_panel_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__progress_bg_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__progress_bg_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__progress_primary_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__progress_primary_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__progress_secondary_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__progress_secondary_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__spinner_48_inner_holo.png
ctionbarsherlock/res/drawable-mdpi/abs__spinner_48_outer_holo.png
ctionbarsherlock/res/drawable-mdpi/abs__spinner_ab_default_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__spinner_ab_default_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__spinner_ab_disabled_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__spinner_ab_disabled_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__spinner_ab_focused_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__spinner_ab_focused_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__spinner_ab_pressed_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__spinner_ab_pressed_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__tab_selected_focused_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__tab_selected_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__tab_selected_pressed_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__tab_unselected_pressed_holo.9.png
ctionbarsherlock/res/drawable-v11/abs__progress_medium_holo.xml
ctionbarsherlock/res/drawable-xhdpi/abs__ab_bottom_solid_dark_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_bottom_solid_inverse_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_bottom_solid_light_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_bottom_transparent_dark_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_bottom_transparent_light_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_share_pack_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_share_pack_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_solid_dark_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_solid_light_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_solid_shadow_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_stacked_solid_dark_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_stacked_solid_light_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_stacked_transparent_dark_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_stacked_transparent_light_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_transparent_dark_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_transparent_light_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__btn_cab_done_default_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__btn_cab_done_default_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__btn_cab_done_focused_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__btn_cab_done_focused_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__btn_cab_done_pressed_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__btn_cab_done_pressed_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__cab_background_bottom_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__cab_background_bottom_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__cab_background_top_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__cab_background_top_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__dialog_full_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__dialog_full_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ic_ab_back_holo_dark.png
ctionbarsherlock/res/drawable-xhdpi/abs__ic_ab_back_holo_light.png
ctionbarsherlock/res/drawable-xhdpi/abs__ic_cab_done_holo_dark.png
ctionbarsherlock/res/drawable-xhdpi/abs__ic_cab_done_holo_light.png
ctionbarsherlock/res/drawable-xhdpi/abs__ic_menu_moreoverflow_normal_holo_dark.png
ctionbarsherlock/res/drawable-xhdpi/abs__ic_menu_moreoverflow_normal_holo_light.png
ctionbarsherlock/res/drawable-xhdpi/abs__ic_menu_share_holo_dark.png
ctionbarsherlock/res/drawable-xhdpi/abs__ic_menu_share_holo_light.png
ctionbarsherlock/res/drawable-xhdpi/abs__list_activated_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__list_divider_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__list_divider_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__list_focused_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__list_longpressed_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__list_pressed_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__list_pressed_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__list_selector_disabled_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__list_selector_disabled_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__menu_dropdown_panel_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__menu_dropdown_panel_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__progress_bg_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__progress_bg_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__progress_primary_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__progress_primary_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__progress_secondary_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__progress_secondary_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__spinner_48_inner_holo.png
ctionbarsherlock/res/drawable-xhdpi/abs__spinner_48_outer_holo.png
ctionbarsherlock/res/drawable-xhdpi/abs__spinner_ab_default_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__spinner_ab_default_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__spinner_ab_disabled_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__spinner_ab_disabled_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__spinner_ab_focused_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__spinner_ab_focused_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__spinner_ab_pressed_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__spinner_ab_pressed_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__tab_selected_focused_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__tab_selected_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__tab_selected_pressed_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__tab_unselected_pressed_holo.9.png
ctionbarsherlock/res/drawable/abs__activated_background_holo_dark.xml
ctionbarsherlock/res/drawable/abs__activated_background_holo_light.xml
ctionbarsherlock/res/drawable/abs__btn_cab_done_holo_dark.xml
ctionbarsherlock/res/drawable/abs__btn_cab_done_holo_light.xml
ctionbarsherlock/res/drawable/abs__ic_menu_moreoverflow_holo_dark.xml
ctionbarsherlock/res/drawable/abs__ic_menu_moreoverflow_holo_light.xml
ctionbarsherlock/res/drawable/abs__item_background_holo_dark.xml
ctionbarsherlock/res/drawable/abs__item_background_holo_light.xml
ctionbarsherlock/res/drawable/abs__list_selector_background_transition_holo_dark.xml
ctionbarsherlock/res/drawable/abs__list_selector_background_transition_holo_light.xml
ctionbarsherlock/res/drawable/abs__list_selector_holo_dark.xml
ctionbarsherlock/res/drawable/abs__list_selector_holo_light.xml
ctionbarsherlock/res/drawable/abs__progress_horizontal_holo_dark.xml
ctionbarsherlock/res/drawable/abs__progress_horizontal_holo_light.xml
ctionbarsherlock/res/drawable/abs__progress_medium_holo.xml
ctionbarsherlock/res/drawable/abs__spinner_ab_holo_dark.xml
ctionbarsherlock/res/drawable/abs__spinner_ab_holo_light.xml
ctionbarsherlock/res/drawable/abs__tab_indicator_ab_holo.xml
ctionbarsherlock/res/layout-large/abs__action_mode_close_item.xml
ctionbarsherlock/res/layout-v14/sherlock_spinner_dropdown_item.xml
ctionbarsherlock/res/layout-v14/sherlock_spinner_item.xml
ctionbarsherlock/res/layout-xlarge/abs__screen_action_bar.xml
ctionbarsherlock/res/layout-xlarge/abs__screen_action_bar_overlay.xml
ctionbarsherlock/res/layout/abs__action_bar_home.xml
ctionbarsherlock/res/layout/abs__action_bar_tab.xml
ctionbarsherlock/res/layout/abs__action_bar_tab_bar_view.xml
ctionbarsherlock/res/layout/abs__action_bar_title_item.xml
ctionbarsherlock/res/layout/abs__action_menu_item_layout.xml
ctionbarsherlock/res/layout/abs__action_menu_layout.xml
ctionbarsherlock/res/layout/abs__action_mode_bar.xml
ctionbarsherlock/res/layout/abs__action_mode_close_item.xml
ctionbarsherlock/res/layout/abs__activity_chooser_view.xml
ctionbarsherlock/res/layout/abs__activity_chooser_view_list_item.xml
ctionbarsherlock/res/layout/abs__dialog_title_holo.xml
ctionbarsherlock/res/layout/abs__list_menu_item_checkbox.xml
ctionbarsherlock/res/layout/abs__list_menu_item_icon.xml
ctionbarsherlock/res/layout/abs__list_menu_item_layout.xml
ctionbarsherlock/res/layout/abs__list_menu_item_radio.xml
ctionbarsherlock/res/layout/abs__popup_menu_item_layout.xml
ctionbarsherlock/res/layout/abs__screen_action_bar.xml
ctionbarsherlock/res/layout/abs__screen_action_bar_overlay.xml
ctionbarsherlock/res/layout/abs__screen_simple.xml
ctionbarsherlock/res/layout/abs__screen_simple_overlay_action_mode.xml
ctionbarsherlock/res/layout/sherlock_spinner_dropdown_item.xml
ctionbarsherlock/res/layout/sherlock_spinner_item.xml
ctionbarsherlock/res/values-land/abs__dimens.xml
ctionbarsherlock/res/values-large-hdpi-1024x600/abs__dimens.xml
ctionbarsherlock/res/values-large-land-hdpi-1024x600/abs__dimens.xml
ctionbarsherlock/res/values-large-land-mdpi-1024x600/abs__dimens.xml
ctionbarsherlock/res/values-large-mdpi-1024x600/abs__dimens.xml
ctionbarsherlock/res/values-large/abs__dimens.xml
ctionbarsherlock/res/values-sw600dp/abs__bools.xml
ctionbarsherlock/res/values-sw600dp/abs__dimens.xml
ctionbarsherlock/res/values-v11/abs__themes.xml
ctionbarsherlock/res/values-v14/abs__styles.xml
ctionbarsherlock/res/values-v14/abs__themes.xml
ctionbarsherlock/res/values-w360dp/abs__dimens.xml
ctionbarsherlock/res/values-w480dp/abs__bools.xml
ctionbarsherlock/res/values-w480dp/abs__config.xml
ctionbarsherlock/res/values-w500dp/abs__dimens.xml
ctionbarsherlock/res/values-w600dp/abs__dimens.xml
ctionbarsherlock/res/values-xlarge/abs__dimens.xml
ctionbarsherlock/res/values/abs__attrs.xml
ctionbarsherlock/res/values/abs__bools.xml
ctionbarsherlock/res/values/abs__colors.xml
ctionbarsherlock/res/values/abs__config.xml
ctionbarsherlock/res/values/abs__dimens.xml
ctionbarsherlock/res/values/abs__ids.xml
ctionbarsherlock/res/values/abs__strings.xml
ctionbarsherlock/res/values/abs__styles.xml
ctionbarsherlock/res/values/abs__themes.xml
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/ActionMenuPresenter.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/BaseMenuPresenter.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/MenuPresenter.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/IcsProgressBar.java
es/layout/action_bar_text.xml
es/layout/action_mode.xml
es/layout/popup_list_item.xml
es/menu/movie.xml
es/menu/operation.xml
es/menu/photo.xml
es/values-v14/styles.xml
es/values/styles.xml
|
665d2d9a47908c33472e9eda065cdbf13ff0cefa |
02-Oct-2012 |
Owen Lin <owenlin@google.com> |
Remove ActionBarSherlock bug: 7242682 Change-Id: Ibf1fa136cafdca25273ee39ae9c065560b2db5cb
ctionbarsherlock/src/android/support/v4/app/_ActionBarSherlockTrojanHorse.java
ctionbarsherlock/src/com/actionbarsherlock/ActionBarSherlock.java
ctionbarsherlock/src/com/actionbarsherlock/app/ActionBar.java
ctionbarsherlock/src/com/actionbarsherlock/app/SherlockActivity.java
ctionbarsherlock/src/com/actionbarsherlock/app/SherlockDialogFragment.java
ctionbarsherlock/src/com/actionbarsherlock/app/SherlockExpandableListActivity.java
ctionbarsherlock/src/com/actionbarsherlock/app/SherlockFragment.java
ctionbarsherlock/src/com/actionbarsherlock/app/SherlockFragmentActivity.java
ctionbarsherlock/src/com/actionbarsherlock/app/SherlockListActivity.java
ctionbarsherlock/src/com/actionbarsherlock/app/SherlockListFragment.java
ctionbarsherlock/src/com/actionbarsherlock/app/SherlockPreferenceActivity.java
ctionbarsherlock/src/com/actionbarsherlock/internal/ActionBarSherlockCompat.java
ctionbarsherlock/src/com/actionbarsherlock/internal/ActionBarSherlockNative.java
ctionbarsherlock/src/com/actionbarsherlock/internal/ResourcesCompat.java
ctionbarsherlock/src/com/actionbarsherlock/internal/app/ActionBarImpl.java
ctionbarsherlock/src/com/actionbarsherlock/internal/app/ActionBarWrapper.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/Animator.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/AnimatorListenerAdapter.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/AnimatorSet.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/FloatEvaluator.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/FloatKeyframeSet.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/IntEvaluator.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/IntKeyframeSet.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/Keyframe.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/KeyframeSet.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/ObjectAnimator.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/PropertyValuesHolder.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/TypeEvaluator.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/ValueAnimator.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/view/NineViewGroup.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/view/animation/AnimatorProxy.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/widget/NineFrameLayout.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/widget/NineHorizontalScrollView.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/widget/NineLinearLayout.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/ActionProviderWrapper.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/StandaloneActionMode.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/View_HasStateListenerSupport.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/View_OnAttachStateChangeListener.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/ActionMenu.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/ActionMenuItem.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/ActionMenuItemView.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/ActionMenuPresenter.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/ActionMenuView.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/BaseMenuPresenter.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/ListMenuItemView.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/MenuBuilder.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/MenuItemImpl.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/MenuItemWrapper.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/MenuPopupHelper.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/MenuPresenter.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/MenuView.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/MenuWrapper.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/SubMenuBuilder.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/SubMenuWrapper.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/AbsActionBarView.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/ActionBarContainer.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/ActionBarContextView.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/ActionBarView.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/CapitalizingButton.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/CapitalizingTextView.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/FakeDialogPhoneWindow.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/IcsAbsSpinner.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/IcsAdapterView.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/IcsLinearLayout.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/IcsListPopupWindow.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/IcsProgressBar.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/IcsSpinner.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/IcsView.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/ScrollingTabContainerView.java
ctionbarsherlock/src/com/actionbarsherlock/view/ActionMode.java
ctionbarsherlock/src/com/actionbarsherlock/view/ActionProvider.java
ctionbarsherlock/src/com/actionbarsherlock/view/CollapsibleActionView.java
ctionbarsherlock/src/com/actionbarsherlock/view/Menu.java
ctionbarsherlock/src/com/actionbarsherlock/view/MenuInflater.java
ctionbarsherlock/src/com/actionbarsherlock/view/MenuItem.java
ctionbarsherlock/src/com/actionbarsherlock/view/SubMenu.java
ctionbarsherlock/src/com/actionbarsherlock/view/Window.java
ctionbarsherlock/src/com/actionbarsherlock/widget/ActivityChooserModel.java
ctionbarsherlock/src/com/actionbarsherlock/widget/ActivityChooserView.java
ctionbarsherlock/src/com/actionbarsherlock/widget/ShareActionProvider.java
rc/com/android/gallery3d/app/AbstractGalleryActivity.java
rc/com/android/gallery3d/app/ActivityState.java
rc/com/android/gallery3d/app/AlbumPage.java
rc/com/android/gallery3d/app/AlbumSetPage.java
rc/com/android/gallery3d/app/CropImage.java
rc/com/android/gallery3d/app/Gallery.java
rc/com/android/gallery3d/app/GalleryActionBar.java
rc/com/android/gallery3d/app/MovieActivity.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/app/PickerActivity.java
rc/com/android/gallery3d/app/SinglePhotoDataAdapter.java
rc/com/android/gallery3d/app/StateManager.java
rc/com/android/gallery3d/ui/ActionModeHandler.java
rc/com/android/gallery3d/ui/MenuExecutor.java
rc/com/android/gallery3d/ui/PopupList.java
|
1336062985c9824d7fd796b1cebd5eaa8e4163ca |
02-Oct-2012 |
Owen Lin <owenlin@google.com> |
Remove ActionBarSherlock bug: 7242682 Change-Id: Ibf1fa136cafdca25273ee39ae9c065560b2db5cb
ndroid.mk
ctionbarsherlock/res/color/abs__primary_text_disable_only_holo_dark.xml
ctionbarsherlock/res/color/abs__primary_text_disable_only_holo_light.xml
ctionbarsherlock/res/color/abs__primary_text_holo_dark.xml
ctionbarsherlock/res/color/abs__primary_text_holo_light.xml
ctionbarsherlock/res/drawable-hdpi/abs__ab_bottom_solid_dark_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_bottom_solid_inverse_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_bottom_solid_light_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_bottom_transparent_dark_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_bottom_transparent_light_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_share_pack_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_share_pack_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_solid_dark_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_solid_light_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_solid_shadow_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_stacked_solid_dark_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_stacked_solid_light_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_stacked_transparent_dark_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_stacked_transparent_light_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_transparent_dark_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_transparent_light_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__btn_cab_done_default_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__btn_cab_done_default_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__btn_cab_done_focused_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__btn_cab_done_focused_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__btn_cab_done_pressed_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__btn_cab_done_pressed_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__cab_background_bottom_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__cab_background_bottom_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__cab_background_top_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__cab_background_top_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__dialog_full_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__dialog_full_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ic_ab_back_holo_dark.png
ctionbarsherlock/res/drawable-hdpi/abs__ic_ab_back_holo_light.png
ctionbarsherlock/res/drawable-hdpi/abs__ic_cab_done_holo_dark.png
ctionbarsherlock/res/drawable-hdpi/abs__ic_cab_done_holo_light.png
ctionbarsherlock/res/drawable-hdpi/abs__ic_menu_moreoverflow_normal_holo_dark.png
ctionbarsherlock/res/drawable-hdpi/abs__ic_menu_moreoverflow_normal_holo_light.png
ctionbarsherlock/res/drawable-hdpi/abs__ic_menu_share_holo_dark.png
ctionbarsherlock/res/drawable-hdpi/abs__ic_menu_share_holo_light.png
ctionbarsherlock/res/drawable-hdpi/abs__list_activated_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__list_divider_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__list_divider_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__list_focused_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__list_longpressed_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__list_pressed_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__list_pressed_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__list_selector_disabled_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__list_selector_disabled_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__menu_dropdown_panel_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__menu_dropdown_panel_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__progress_bg_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__progress_bg_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__progress_primary_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__progress_primary_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__progress_secondary_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__progress_secondary_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__spinner_48_inner_holo.png
ctionbarsherlock/res/drawable-hdpi/abs__spinner_48_outer_holo.png
ctionbarsherlock/res/drawable-hdpi/abs__spinner_ab_default_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__spinner_ab_default_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__spinner_ab_disabled_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__spinner_ab_disabled_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__spinner_ab_focused_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__spinner_ab_focused_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__spinner_ab_pressed_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__spinner_ab_pressed_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__tab_selected_focused_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__tab_selected_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__tab_selected_pressed_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__tab_unselected_pressed_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_bottom_solid_dark_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_bottom_solid_inverse_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_bottom_solid_light_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_bottom_transparent_dark_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_bottom_transparent_light_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_share_pack_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_share_pack_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_solid_dark_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_solid_light_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_solid_shadow_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_stacked_solid_dark_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_stacked_solid_light_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_stacked_transparent_dark_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_stacked_transparent_light_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_transparent_dark_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_transparent_light_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__btn_cab_done_default_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__btn_cab_done_default_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__btn_cab_done_focused_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__btn_cab_done_focused_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__btn_cab_done_pressed_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__btn_cab_done_pressed_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__cab_background_bottom_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__cab_background_bottom_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__cab_background_top_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__cab_background_top_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__dialog_full_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__dialog_full_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ic_ab_back_holo_dark.png
ctionbarsherlock/res/drawable-mdpi/abs__ic_ab_back_holo_light.png
ctionbarsherlock/res/drawable-mdpi/abs__ic_cab_done_holo_dark.png
ctionbarsherlock/res/drawable-mdpi/abs__ic_cab_done_holo_light.png
ctionbarsherlock/res/drawable-mdpi/abs__ic_menu_moreoverflow_normal_holo_dark.png
ctionbarsherlock/res/drawable-mdpi/abs__ic_menu_moreoverflow_normal_holo_light.png
ctionbarsherlock/res/drawable-mdpi/abs__ic_menu_share_holo_dark.png
ctionbarsherlock/res/drawable-mdpi/abs__ic_menu_share_holo_light.png
ctionbarsherlock/res/drawable-mdpi/abs__list_activated_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__list_divider_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__list_divider_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__list_focused_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__list_longpressed_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__list_pressed_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__list_pressed_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__list_selector_disabled_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__list_selector_disabled_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__menu_dropdown_panel_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__menu_dropdown_panel_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__progress_bg_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__progress_bg_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__progress_primary_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__progress_primary_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__progress_secondary_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__progress_secondary_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__spinner_48_inner_holo.png
ctionbarsherlock/res/drawable-mdpi/abs__spinner_48_outer_holo.png
ctionbarsherlock/res/drawable-mdpi/abs__spinner_ab_default_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__spinner_ab_default_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__spinner_ab_disabled_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__spinner_ab_disabled_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__spinner_ab_focused_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__spinner_ab_focused_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__spinner_ab_pressed_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__spinner_ab_pressed_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__tab_selected_focused_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__tab_selected_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__tab_selected_pressed_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__tab_unselected_pressed_holo.9.png
ctionbarsherlock/res/drawable-v11/abs__progress_medium_holo.xml
ctionbarsherlock/res/drawable-xhdpi/abs__ab_bottom_solid_dark_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_bottom_solid_inverse_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_bottom_solid_light_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_bottom_transparent_dark_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_bottom_transparent_light_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_share_pack_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_share_pack_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_solid_dark_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_solid_light_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_solid_shadow_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_stacked_solid_dark_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_stacked_solid_light_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_stacked_transparent_dark_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_stacked_transparent_light_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_transparent_dark_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_transparent_light_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__btn_cab_done_default_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__btn_cab_done_default_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__btn_cab_done_focused_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__btn_cab_done_focused_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__btn_cab_done_pressed_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__btn_cab_done_pressed_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__cab_background_bottom_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__cab_background_bottom_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__cab_background_top_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__cab_background_top_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__dialog_full_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__dialog_full_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ic_ab_back_holo_dark.png
ctionbarsherlock/res/drawable-xhdpi/abs__ic_ab_back_holo_light.png
ctionbarsherlock/res/drawable-xhdpi/abs__ic_cab_done_holo_dark.png
ctionbarsherlock/res/drawable-xhdpi/abs__ic_cab_done_holo_light.png
ctionbarsherlock/res/drawable-xhdpi/abs__ic_menu_moreoverflow_normal_holo_dark.png
ctionbarsherlock/res/drawable-xhdpi/abs__ic_menu_moreoverflow_normal_holo_light.png
ctionbarsherlock/res/drawable-xhdpi/abs__ic_menu_share_holo_dark.png
ctionbarsherlock/res/drawable-xhdpi/abs__ic_menu_share_holo_light.png
ctionbarsherlock/res/drawable-xhdpi/abs__list_activated_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__list_divider_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__list_divider_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__list_focused_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__list_longpressed_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__list_pressed_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__list_pressed_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__list_selector_disabled_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__list_selector_disabled_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__menu_dropdown_panel_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__menu_dropdown_panel_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__progress_bg_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__progress_bg_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__progress_primary_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__progress_primary_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__progress_secondary_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__progress_secondary_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__spinner_48_inner_holo.png
ctionbarsherlock/res/drawable-xhdpi/abs__spinner_48_outer_holo.png
ctionbarsherlock/res/drawable-xhdpi/abs__spinner_ab_default_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__spinner_ab_default_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__spinner_ab_disabled_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__spinner_ab_disabled_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__spinner_ab_focused_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__spinner_ab_focused_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__spinner_ab_pressed_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__spinner_ab_pressed_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__tab_selected_focused_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__tab_selected_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__tab_selected_pressed_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__tab_unselected_pressed_holo.9.png
ctionbarsherlock/res/drawable/abs__activated_background_holo_dark.xml
ctionbarsherlock/res/drawable/abs__activated_background_holo_light.xml
ctionbarsherlock/res/drawable/abs__btn_cab_done_holo_dark.xml
ctionbarsherlock/res/drawable/abs__btn_cab_done_holo_light.xml
ctionbarsherlock/res/drawable/abs__ic_menu_moreoverflow_holo_dark.xml
ctionbarsherlock/res/drawable/abs__ic_menu_moreoverflow_holo_light.xml
ctionbarsherlock/res/drawable/abs__item_background_holo_dark.xml
ctionbarsherlock/res/drawable/abs__item_background_holo_light.xml
ctionbarsherlock/res/drawable/abs__list_selector_background_transition_holo_dark.xml
ctionbarsherlock/res/drawable/abs__list_selector_background_transition_holo_light.xml
ctionbarsherlock/res/drawable/abs__list_selector_holo_dark.xml
ctionbarsherlock/res/drawable/abs__list_selector_holo_light.xml
ctionbarsherlock/res/drawable/abs__progress_horizontal_holo_dark.xml
ctionbarsherlock/res/drawable/abs__progress_horizontal_holo_light.xml
ctionbarsherlock/res/drawable/abs__progress_medium_holo.xml
ctionbarsherlock/res/drawable/abs__spinner_ab_holo_dark.xml
ctionbarsherlock/res/drawable/abs__spinner_ab_holo_light.xml
ctionbarsherlock/res/drawable/abs__tab_indicator_ab_holo.xml
ctionbarsherlock/res/layout-large/abs__action_mode_close_item.xml
ctionbarsherlock/res/layout-v14/sherlock_spinner_dropdown_item.xml
ctionbarsherlock/res/layout-v14/sherlock_spinner_item.xml
ctionbarsherlock/res/layout-xlarge/abs__screen_action_bar.xml
ctionbarsherlock/res/layout-xlarge/abs__screen_action_bar_overlay.xml
ctionbarsherlock/res/layout/abs__action_bar_home.xml
ctionbarsherlock/res/layout/abs__action_bar_tab.xml
ctionbarsherlock/res/layout/abs__action_bar_tab_bar_view.xml
ctionbarsherlock/res/layout/abs__action_bar_title_item.xml
ctionbarsherlock/res/layout/abs__action_menu_item_layout.xml
ctionbarsherlock/res/layout/abs__action_menu_layout.xml
ctionbarsherlock/res/layout/abs__action_mode_bar.xml
ctionbarsherlock/res/layout/abs__action_mode_close_item.xml
ctionbarsherlock/res/layout/abs__activity_chooser_view.xml
ctionbarsherlock/res/layout/abs__activity_chooser_view_list_item.xml
ctionbarsherlock/res/layout/abs__dialog_title_holo.xml
ctionbarsherlock/res/layout/abs__list_menu_item_checkbox.xml
ctionbarsherlock/res/layout/abs__list_menu_item_icon.xml
ctionbarsherlock/res/layout/abs__list_menu_item_layout.xml
ctionbarsherlock/res/layout/abs__list_menu_item_radio.xml
ctionbarsherlock/res/layout/abs__popup_menu_item_layout.xml
ctionbarsherlock/res/layout/abs__screen_action_bar.xml
ctionbarsherlock/res/layout/abs__screen_action_bar_overlay.xml
ctionbarsherlock/res/layout/abs__screen_simple.xml
ctionbarsherlock/res/layout/abs__screen_simple_overlay_action_mode.xml
ctionbarsherlock/res/layout/sherlock_spinner_dropdown_item.xml
ctionbarsherlock/res/layout/sherlock_spinner_item.xml
ctionbarsherlock/res/values-land/abs__dimens.xml
ctionbarsherlock/res/values-large-hdpi-1024x600/abs__dimens.xml
ctionbarsherlock/res/values-large-land-hdpi-1024x600/abs__dimens.xml
ctionbarsherlock/res/values-large-land-mdpi-1024x600/abs__dimens.xml
ctionbarsherlock/res/values-large-mdpi-1024x600/abs__dimens.xml
ctionbarsherlock/res/values-large/abs__dimens.xml
ctionbarsherlock/res/values-sw600dp/abs__bools.xml
ctionbarsherlock/res/values-sw600dp/abs__dimens.xml
ctionbarsherlock/res/values-v11/abs__themes.xml
ctionbarsherlock/res/values-v14/abs__styles.xml
ctionbarsherlock/res/values-v14/abs__themes.xml
ctionbarsherlock/res/values-w360dp/abs__dimens.xml
ctionbarsherlock/res/values-w480dp/abs__bools.xml
ctionbarsherlock/res/values-w480dp/abs__config.xml
ctionbarsherlock/res/values-w500dp/abs__dimens.xml
ctionbarsherlock/res/values-w600dp/abs__dimens.xml
ctionbarsherlock/res/values-xlarge/abs__dimens.xml
ctionbarsherlock/res/values/abs__attrs.xml
ctionbarsherlock/res/values/abs__bools.xml
ctionbarsherlock/res/values/abs__colors.xml
ctionbarsherlock/res/values/abs__config.xml
ctionbarsherlock/res/values/abs__dimens.xml
ctionbarsherlock/res/values/abs__ids.xml
ctionbarsherlock/res/values/abs__strings.xml
ctionbarsherlock/res/values/abs__styles.xml
ctionbarsherlock/res/values/abs__themes.xml
ctionbarsherlock/src/android/support/v4/app/_ActionBarSherlockTrojanHorse.java
ctionbarsherlock/src/com/actionbarsherlock/ActionBarSherlock.java
ctionbarsherlock/src/com/actionbarsherlock/app/ActionBar.java
ctionbarsherlock/src/com/actionbarsherlock/app/SherlockActivity.java
ctionbarsherlock/src/com/actionbarsherlock/app/SherlockDialogFragment.java
ctionbarsherlock/src/com/actionbarsherlock/app/SherlockExpandableListActivity.java
ctionbarsherlock/src/com/actionbarsherlock/app/SherlockFragment.java
ctionbarsherlock/src/com/actionbarsherlock/app/SherlockFragmentActivity.java
ctionbarsherlock/src/com/actionbarsherlock/app/SherlockListActivity.java
ctionbarsherlock/src/com/actionbarsherlock/app/SherlockListFragment.java
ctionbarsherlock/src/com/actionbarsherlock/app/SherlockPreferenceActivity.java
ctionbarsherlock/src/com/actionbarsherlock/internal/ActionBarSherlockCompat.java
ctionbarsherlock/src/com/actionbarsherlock/internal/ActionBarSherlockNative.java
ctionbarsherlock/src/com/actionbarsherlock/internal/ResourcesCompat.java
ctionbarsherlock/src/com/actionbarsherlock/internal/app/ActionBarImpl.java
ctionbarsherlock/src/com/actionbarsherlock/internal/app/ActionBarWrapper.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/Animator.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/AnimatorListenerAdapter.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/AnimatorSet.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/FloatEvaluator.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/FloatKeyframeSet.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/IntEvaluator.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/IntKeyframeSet.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/Keyframe.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/KeyframeSet.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/ObjectAnimator.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/PropertyValuesHolder.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/TypeEvaluator.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/ValueAnimator.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/view/NineViewGroup.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/view/animation/AnimatorProxy.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/widget/NineFrameLayout.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/widget/NineHorizontalScrollView.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/widget/NineLinearLayout.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/ActionProviderWrapper.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/StandaloneActionMode.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/View_HasStateListenerSupport.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/View_OnAttachStateChangeListener.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/ActionMenu.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/ActionMenuItem.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/ActionMenuItemView.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/ActionMenuPresenter.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/ActionMenuView.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/BaseMenuPresenter.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/ListMenuItemView.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/MenuBuilder.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/MenuItemImpl.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/MenuItemWrapper.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/MenuPopupHelper.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/MenuPresenter.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/MenuView.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/MenuWrapper.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/SubMenuBuilder.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/SubMenuWrapper.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/AbsActionBarView.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/ActionBarContainer.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/ActionBarContextView.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/ActionBarView.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/CapitalizingButton.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/CapitalizingTextView.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/FakeDialogPhoneWindow.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/IcsAbsSpinner.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/IcsAdapterView.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/IcsLinearLayout.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/IcsListPopupWindow.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/IcsProgressBar.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/IcsSpinner.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/IcsView.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/ScrollingTabContainerView.java
ctionbarsherlock/src/com/actionbarsherlock/view/ActionMode.java
ctionbarsherlock/src/com/actionbarsherlock/view/ActionProvider.java
ctionbarsherlock/src/com/actionbarsherlock/view/CollapsibleActionView.java
ctionbarsherlock/src/com/actionbarsherlock/view/Menu.java
ctionbarsherlock/src/com/actionbarsherlock/view/MenuInflater.java
ctionbarsherlock/src/com/actionbarsherlock/view/MenuItem.java
ctionbarsherlock/src/com/actionbarsherlock/view/SubMenu.java
ctionbarsherlock/src/com/actionbarsherlock/view/Window.java
ctionbarsherlock/src/com/actionbarsherlock/widget/ActivityChooserModel.java
ctionbarsherlock/src/com/actionbarsherlock/widget/ActivityChooserView.java
ctionbarsherlock/src/com/actionbarsherlock/widget/ShareActionProvider.java
es/layout/action_bar_text.xml
es/layout/action_mode.xml
es/layout/popup_list_item.xml
es/menu/movie.xml
es/menu/operation.xml
es/menu/photo.xml
es/values-v14/styles.xml
es/values/styles.xml
rc/com/android/gallery3d/app/AbstractGalleryActivity.java
rc/com/android/gallery3d/app/ActivityState.java
rc/com/android/gallery3d/app/AlbumPage.java
rc/com/android/gallery3d/app/AlbumSetPage.java
rc/com/android/gallery3d/app/CropImage.java
rc/com/android/gallery3d/app/Gallery.java
rc/com/android/gallery3d/app/GalleryActionBar.java
rc/com/android/gallery3d/app/MovieActivity.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/app/PickerActivity.java
rc/com/android/gallery3d/app/SinglePhotoDataAdapter.java
rc/com/android/gallery3d/app/StateManager.java
rc/com/android/gallery3d/ui/ActionModeHandler.java
rc/com/android/gallery3d/ui/MenuExecutor.java
rc/com/android/gallery3d/ui/PopupList.java
|
36cbd730eec6b5073642996e579d33f2ecc0d7d3 |
02-Oct-2012 |
Wu-cheng Li <wuchengli@google.com> |
am ffadb951: am 48f69b11: am 70814a18: am 935b9cfe: Merge "Update assets of the lock screen image in the secure album." into gb-ub-photos-arches * commit 'ffadb951f6667b351c12592e4b1f522a9e2a2a9b': Update assets of the lock screen image in the secure album.
|
ffadb951f6667b351c12592e4b1f522a9e2a2a9b |
02-Oct-2012 |
Wu-cheng Li <wuchengli@google.com> |
am 48f69b11: am 70814a18: am 935b9cfe: Merge "Update assets of the lock screen image in the secure album." into gb-ub-photos-arches * commit '48f69b114e041fcbca205c075ed75177af415043': Update assets of the lock screen image in the secure album.
|
48f69b114e041fcbca205c075ed75177af415043 |
02-Oct-2012 |
Wu-cheng Li <wuchengli@google.com> |
am 70814a18: am 935b9cfe: Merge "Update assets of the lock screen image in the secure album." into gb-ub-photos-arches * commit '70814a18aa9327c02e7876a939d10637dbf02155': Update assets of the lock screen image in the secure album.
|
c26e276d17bc45fc3775814353b95f55c576d49b |
02-Oct-2012 |
Wu-cheng Li <wuchengli@google.com> |
am 935b9cfe: Merge "Update assets of the lock screen image in the secure album." into gb-ub-photos-arches * commit '935b9cfe991c3afe119720c487dc24cc02c55584': Update assets of the lock screen image in the secure album.
|
e9053c6d2e8be5f2257068d17d07d0cec3126845 |
02-Oct-2012 |
Wu-cheng Li <wuchengli@google.com> |
am 935b9cfe: Merge "Update assets of the lock screen image in the secure album." into gb-ub-photos-arches * commit '935b9cfe991c3afe119720c487dc24cc02c55584': Update assets of the lock screen image in the secure album.
|
70814a18aa9327c02e7876a939d10637dbf02155 |
02-Oct-2012 |
Wu-cheng Li <wuchengli@google.com> |
am 935b9cfe: Merge "Update assets of the lock screen image in the secure album." into gb-ub-photos-arches * commit '935b9cfe991c3afe119720c487dc24cc02c55584': Update assets of the lock screen image in the secure album.
|
ea7a2599cca380a5127fec8f48b5fa80866ccdb0 |
02-Oct-2012 |
Wu-cheng Li <wuchengli@google.com> |
Merge "Update assets of the lock screen image in the secure album." into gb-ub-photos-arches
|
74e0682463c79b475be0b0dfc9a789921b4e31f1 |
02-Oct-2012 |
Wu-cheng Li <wuchengli@google.com> |
Merge "Update assets of the lock screen image in the secure album." into gb-ub-photos-arches
|
935b9cfe991c3afe119720c487dc24cc02c55584 |
02-Oct-2012 |
Wu-cheng Li <wuchengli@google.com> |
Merge "Update assets of the lock screen image in the secure album." into gb-ub-photos-arches
|
75b03b71dfce6b76f06f84077f60a6500f5577fa |
02-Oct-2012 |
George Mount <mount@google.com> |
am f6d3d496: am 4f3e420c: am ba36d9b1: am 2fc053ed: Merge "Revert "Enable swiping from LightCycle to Gallery"" into gb-ub-photos-arches * commit 'f6d3d49615a55aea291360384707420f7dd78bb0': Revert "Enable swiping from LightCycle to Gallery"
|
f6d3d49615a55aea291360384707420f7dd78bb0 |
02-Oct-2012 |
George Mount <mount@google.com> |
am 4f3e420c: am ba36d9b1: am 2fc053ed: Merge "Revert "Enable swiping from LightCycle to Gallery"" into gb-ub-photos-arches * commit '4f3e420cb591dba47e6fa92264012c5a26c60916': Revert "Enable swiping from LightCycle to Gallery"
|
4f3e420cb591dba47e6fa92264012c5a26c60916 |
02-Oct-2012 |
George Mount <mount@google.com> |
am ba36d9b1: am 2fc053ed: Merge "Revert "Enable swiping from LightCycle to Gallery"" into gb-ub-photos-arches * commit 'ba36d9b1ecc0d6021701d28682e5b1fccc165ab0': Revert "Enable swiping from LightCycle to Gallery"
|
a6f77a2e3edca93f32f6f6da06ef9345de13489f |
02-Oct-2012 |
George Mount <mount@google.com> |
am 2fc053ed: Merge "Revert "Enable swiping from LightCycle to Gallery"" into gb-ub-photos-arches * commit '2fc053edc38bf5070d980b541aa267b7a3325a8c': Revert "Enable swiping from LightCycle to Gallery"
|
ba36d9b1ecc0d6021701d28682e5b1fccc165ab0 |
02-Oct-2012 |
George Mount <mount@google.com> |
am 2fc053ed: Merge "Revert "Enable swiping from LightCycle to Gallery"" into gb-ub-photos-arches * commit '2fc053edc38bf5070d980b541aa267b7a3325a8c': Revert "Enable swiping from LightCycle to Gallery"
|
1823ad1a21cdc7327389a27c499453e942955847 |
02-Oct-2012 |
George Mount <mount@google.com> |
Merge "Revert "Enable swiping from LightCycle to Gallery"" into gb-ub-photos-arches
|
2fc053edc38bf5070d980b541aa267b7a3325a8c |
02-Oct-2012 |
George Mount <mount@google.com> |
Merge "Revert "Enable swiping from LightCycle to Gallery"" into gb-ub-photos-arches
|
e376d678326ea9d77f1ef0cfca1a3f6421f960c0 |
02-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 86e1e70a: am f3271d3d: am abf8e3fd: am 7b4bdd0a: Merge "Improve display of ActionBar album mode switcher" into gb-ub-photos-arches * commit '86e1e70ae9324e393e50f15c634eb223776fa227': Improve display of ActionBar album mode switcher
|
495b31474d2341e1bbe0b6e0d3f3b0cb67196a30 |
02-Oct-2012 |
John Hoford <hoford@google.com> |
am 842de483: am 90e00db9: am d0b8143d: am 3cf07221: Merge "Fix exposure and fixed warnings" into gb-ub-photos-arches * commit '842de4836331e1af1bc842ab967244e5356f553e': Fix exposure and fixed warnings
|
86e1e70ae9324e393e50f15c634eb223776fa227 |
02-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am f3271d3d: am abf8e3fd: am 7b4bdd0a: Merge "Improve display of ActionBar album mode switcher" into gb-ub-photos-arches * commit 'f3271d3d92576729a9099ed518f516eb3849ac22': Improve display of ActionBar album mode switcher
|
842de4836331e1af1bc842ab967244e5356f553e |
02-Oct-2012 |
John Hoford <hoford@google.com> |
am 90e00db9: am d0b8143d: am 3cf07221: Merge "Fix exposure and fixed warnings" into gb-ub-photos-arches * commit '90e00db960a6e2f5eb90fee4b9417fe96c29f997': Fix exposure and fixed warnings
|
f3271d3d92576729a9099ed518f516eb3849ac22 |
02-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am abf8e3fd: am 7b4bdd0a: Merge "Improve display of ActionBar album mode switcher" into gb-ub-photos-arches * commit 'abf8e3fd799bb729536973cef9863a78038497d5': Improve display of ActionBar album mode switcher
|
f770caedfe8bb5edec82927c02236053b653152c |
02-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 7b4bdd0a: Merge "Improve display of ActionBar album mode switcher" into gb-ub-photos-arches * commit '7b4bdd0ac9d2b13e33d46918551f7fb2d642922d': Improve display of ActionBar album mode switcher
|
1110aa3d591fcdcc9adb05bb14c742d354aad1bc |
02-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 7b4bdd0a: Merge "Improve display of ActionBar album mode switcher" into gb-ub-photos-arches * commit '7b4bdd0ac9d2b13e33d46918551f7fb2d642922d': Improve display of ActionBar album mode switcher
|
abf8e3fd799bb729536973cef9863a78038497d5 |
02-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 7b4bdd0a: Merge "Improve display of ActionBar album mode switcher" into gb-ub-photos-arches * commit '7b4bdd0ac9d2b13e33d46918551f7fb2d642922d': Improve display of ActionBar album mode switcher
|
81416668746d1a8e4ade633be97403683ef75803 |
02-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Improve display of ActionBar album mode switcher" into gb-ub-photos-arches
|
7b4bdd0ac9d2b13e33d46918551f7fb2d642922d |
02-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Improve display of ActionBar album mode switcher" into gb-ub-photos-arches
|
011fb7605e7ad2b3fd036367bd7ad7acb246831f |
02-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Improve display of ActionBar album mode switcher Bug: 7265942 Bug: 7266862 - Ellipsize the title of the album when appropriate - Show correctly title when swiping from camera to gallery - Hide the delete icon in the overflow menu to match the latest UX mocks, making more room for title Change-Id: Ief77f65c972e75086c5dbf4229c9462cbcc17940
es/layout/action_bar_text.xml
es/menu/photo.xml
|
ba534e23c5a6e065d3d99c6e0b8cf49a62ffa034 |
02-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Improve display of ActionBar album mode switcher Bug: 7265942 Bug: 7266862 - Ellipsize the title of the album when appropriate - Show correctly title when swiping from camera to gallery - Hide the delete icon in the overflow menu to match the latest UX mocks, making more room for title Change-Id: Ief77f65c972e75086c5dbf4229c9462cbcc17940
rc/com/android/gallery3d/app/GalleryActionBar.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/data/ComboAlbum.java
|
ee899c09c88e5b054397ac44ad20e5055cd24f39 |
02-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Improve display of ActionBar album mode switcher Bug: 7265942 Bug: 7266862 - Ellipsize the title of the album when appropriate - Show correctly title when swiping from camera to gallery - Hide the delete icon in the overflow menu to match the latest UX mocks, making more room for title Change-Id: Ief77f65c972e75086c5dbf4229c9462cbcc17940
es/layout/action_bar_text.xml
es/menu/photo.xml
rc/com/android/gallery3d/app/GalleryActionBar.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/data/ComboAlbum.java
|
3a31228c9a80723e3146f3e37150c3d99eada197 |
02-Oct-2012 |
George Mount <mount@google.com> |
Revert "Enable swiping from LightCycle to Gallery" This reverts commit 6fd25fd9a457346c8c32e8c4e68c7c491205730b Changed mechanism for enabling swipe in LightCycle. Change-Id: I5c9395eb97ee88d015fb3765d0594d92c4ae126d
rc/com/android/gallery3d/ui/ExtTexture.java
rc/com/android/gallery3d/util/TextureBuffer.java
|
3508b213dbad5dce76a3c57f8f4b76ad4e765b83 |
02-Oct-2012 |
George Mount <mount@google.com> |
Revert "Enable swiping from LightCycle to Gallery" This reverts commit 6fd25fd9a457346c8c32e8c4e68c7c491205730b Changed mechanism for enabling swipe in LightCycle. Change-Id: I5c9395eb97ee88d015fb3765d0594d92c4ae126d
rc/com/android/gallery3d/ui/ExtTexture.java
rc/com/android/gallery3d/util/TextureBuffer.java
|
90e00db960a6e2f5eb90fee4b9417fe96c29f997 |
02-Oct-2012 |
John Hoford <hoford@google.com> |
am d0b8143d: am 3cf07221: Merge "Fix exposure and fixed warnings" into gb-ub-photos-arches * commit 'd0b8143d42b96760aa864d36821ed57925444509': Fix exposure and fixed warnings
|
d0b8143d42b96760aa864d36821ed57925444509 |
02-Oct-2012 |
John Hoford <hoford@google.com> |
am 3cf07221: Merge "Fix exposure and fixed warnings" into gb-ub-photos-arches * commit '3cf072213abc2e2b03f7c1a0069b37b2ca79f70c': Fix exposure and fixed warnings
|
423936e5f780653f4c580cdf517252e3dd2609de |
02-Oct-2012 |
John Hoford <hoford@google.com> |
am 3cf07221: Merge "Fix exposure and fixed warnings" into gb-ub-photos-arches * commit '3cf072213abc2e2b03f7c1a0069b37b2ca79f70c': Fix exposure and fixed warnings
|
190614aa2e176e1b305046265ba767d95a5e6621 |
02-Oct-2012 |
John Hoford <hoford@google.com> |
Merge "Fix exposure and fixed warnings" into gb-ub-photos-arches
|
3cf072213abc2e2b03f7c1a0069b37b2ca79f70c |
02-Oct-2012 |
John Hoford <hoford@google.com> |
Merge "Fix exposure and fixed warnings" into gb-ub-photos-arches
|
b8bf8a5b773e5f049b80a082177c6398a95ddd4a |
02-Oct-2012 |
John Hoford <hoford@google.com> |
Fix exposure and fixed warnings bug:7234321
ni/Android.mk
ni/filters/brightness.c
ni/filters/contrast.c
ni/filters/exposure.c
ni/filters/filters.h
ni/filters/vignette.c
|
75a18593f2d58a05075f3e6996f0eb1ac62f3cce |
02-Oct-2012 |
John Hoford <hoford@google.com> |
Fix exposure and fixed warnings bug:7234321
ni/Android.mk
|
aab2640d1eec784f75fea0b4c8bb2ea4fb4325fd |
02-Oct-2012 |
John Hoford <hoford@google.com> |
Fix exposure and fixed warnings bug:7234321
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterBrightness.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterExposure.java
|
bf97d3aaeddfba06f6a00ee7abb23fcd28eb2e7d |
02-Oct-2012 |
John Hoford <hoford@google.com> |
Fix exposure and fixed warnings bug:7234321
ni/Android.mk
ni/filters/brightness.c
ni/filters/contrast.c
ni/filters/exposure.c
ni/filters/filters.h
ni/filters/vignette.c
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterBrightness.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterExposure.java
|
6c7bd63e60364966f7646e7afbd7af75db15a3f2 |
02-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am 130e600b: am c2f6458c: am 838f5981: am 83f50a9b: Merge "Fix for exceptions when image has no orientation data." into gb-ub-photos-arches * commit '130e600b01cbefc0e796eeafc2c006067d610e0f': Fix for exceptions when image has no orientation data.
|
130e600b01cbefc0e796eeafc2c006067d610e0f |
02-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am c2f6458c: am 838f5981: am 83f50a9b: Merge "Fix for exceptions when image has no orientation data." into gb-ub-photos-arches * commit 'c2f6458c9c1fa7b9b78a100364f871c393e7101e': Fix for exceptions when image has no orientation data.
|
c2f6458c9c1fa7b9b78a100364f871c393e7101e |
02-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am 838f5981: am 83f50a9b: Merge "Fix for exceptions when image has no orientation data." into gb-ub-photos-arches * commit '838f598105693121fb73e8dcf3b9fcbc204a3b5b': Fix for exceptions when image has no orientation data.
|
da4d8ef2fc173d59e197af927867b9659fc90e66 |
02-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am 83f50a9b: Merge "Fix for exceptions when image has no orientation data." into gb-ub-photos-arches * commit '83f50a9b3f3ba9ada8dc6999ed997499fd78c052': Fix for exceptions when image has no orientation data.
|
838f598105693121fb73e8dcf3b9fcbc204a3b5b |
02-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am 83f50a9b: Merge "Fix for exceptions when image has no orientation data." into gb-ub-photos-arches * commit '83f50a9b3f3ba9ada8dc6999ed997499fd78c052': Fix for exceptions when image has no orientation data.
|
107d6549f8990bb95b2be18a4a88f329ccbdb585 |
02-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Fix for exceptions when image has no orientation data." into gb-ub-photos-arches
|
83f50a9b3f3ba9ada8dc6999ed997499fd78c052 |
02-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Fix for exceptions when image has no orientation data." into gb-ub-photos-arches
|
0bb7209e12fbd7ea69ebddeed9f48e327d4f0c39 |
02-Oct-2012 |
George Mount <mount@google.com> |
am b8bca783: am c1f0289b: am 700ae7e0: am 526c3060: Merge "Enable swiping from LightCycle to Gallery" into gb-ub-photos-arches * commit 'b8bca783f42906bf06da68e506c9c1e9f232d657': Enable swiping from LightCycle to Gallery
|
b8bca783f42906bf06da68e506c9c1e9f232d657 |
02-Oct-2012 |
George Mount <mount@google.com> |
am c1f0289b: am 700ae7e0: am 526c3060: Merge "Enable swiping from LightCycle to Gallery" into gb-ub-photos-arches * commit 'c1f0289b15d890dea9b57dd7bbaeb6fe1643260b': Enable swiping from LightCycle to Gallery
|
c1f0289b15d890dea9b57dd7bbaeb6fe1643260b |
02-Oct-2012 |
George Mount <mount@google.com> |
am 700ae7e0: am 526c3060: Merge "Enable swiping from LightCycle to Gallery" into gb-ub-photos-arches * commit '700ae7e0a7737690abf20a7602bcab4ba4fff414': Enable swiping from LightCycle to Gallery
|
700ae7e0a7737690abf20a7602bcab4ba4fff414 |
02-Oct-2012 |
George Mount <mount@google.com> |
am 526c3060: Merge "Enable swiping from LightCycle to Gallery" into gb-ub-photos-arches * commit '526c306051b0b92bcd54923a52a4c5bccaef7d77': Enable swiping from LightCycle to Gallery
|
45f32a06525d6fb9830c4539740d95aa9603a836 |
02-Oct-2012 |
George Mount <mount@google.com> |
am 526c3060: Merge "Enable swiping from LightCycle to Gallery" into gb-ub-photos-arches * commit '526c306051b0b92bcd54923a52a4c5bccaef7d77': Enable swiping from LightCycle to Gallery
|
3366bf120596a10b9f6af73edf0e610352bad6e4 |
02-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am f8f51ce3: am 6f11e837: am e61c870f: am 3cf502a9: Move grid/filmstrip switching to ActionBar title "spinner" * commit 'f8f51ce3a0d3d81460299b9171d91da06359b325': Move grid/filmstrip switching to ActionBar title "spinner"
|
2085f1276ac5bfcfe91b9b08f7a77f72d38a5c32 |
02-Oct-2012 |
George Mount <mount@google.com> |
Merge "Enable swiping from LightCycle to Gallery" into gb-ub-photos-arches
|
526c306051b0b92bcd54923a52a4c5bccaef7d77 |
02-Oct-2012 |
George Mount <mount@google.com> |
Merge "Enable swiping from LightCycle to Gallery" into gb-ub-photos-arches
|
f8f51ce3a0d3d81460299b9171d91da06359b325 |
02-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 6f11e837: am e61c870f: am 3cf502a9: Move grid/filmstrip switching to ActionBar title "spinner" * commit '6f11e837ea9368a43ae16cdc9512c6ac739a1288': Move grid/filmstrip switching to ActionBar title "spinner"
|
6f11e837ea9368a43ae16cdc9512c6ac739a1288 |
02-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am e61c870f: am 3cf502a9: Move grid/filmstrip switching to ActionBar title "spinner" * commit 'e61c870ff4ff215d553e3596a519ead0b255ec0d': Move grid/filmstrip switching to ActionBar title "spinner"
|
e61c870ff4ff215d553e3596a519ead0b255ec0d |
02-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 3cf502a9: Move grid/filmstrip switching to ActionBar title "spinner" * commit '3cf502a91b36bf6ce633f897505b0a2c3fc53ad5': Move grid/filmstrip switching to ActionBar title "spinner"
|
cb425d0ed1039e1253163a9abdfd286871b028e4 |
02-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 3cf502a9: Move grid/filmstrip switching to ActionBar title "spinner" * commit '3cf502a91b36bf6ce633f897505b0a2c3fc53ad5': Move grid/filmstrip switching to ActionBar title "spinner"
|
4cbe4c6cd0c16f3bba51f287e5e03cf1e11be983 |
02-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 3cf502a9: Move grid/filmstrip switching to ActionBar title "spinner" * commit '3cf502a91b36bf6ce633f897505b0a2c3fc53ad5': Move grid/filmstrip switching to ActionBar title "spinner"
|
1b3ea98a77320446ad47d61773fbb586d12d2c1d |
30-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
More logs for gallery crash error, remove a potential cause Bug: 7216012 Made sure that FilterDeleteSet doesn't ever return stale item counts, added extra logging in LocalMergeAlbum for NoSuchElementException so that we can have more info to diagnose this crash if it happens in the future. Change-Id: Ic988522fda4a16bb483db6ad34bc7f81ee098b03
rc/com/android/gallery3d/data/FilterDeleteSet.java
rc/com/android/gallery3d/data/LocalMergeAlbum.java
|
05b294512f3242cbd8b292029a56178fd6bae139 |
02-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Move grid/filmstrip switching to ActionBar title "spinner" Bug: 7233818 Bug: 7240846 Bug: 7258973 Tapping the title of the album, whether in filmstrip or grid mode, allows switching between these modes using a menu. The album name is now displayed when viewing pictures in the filmstrip or zoomed in modes. Finally, no longer allow switching to grid mode when not appropriate. Change-Id: I4ee511feb7a74581fe185933ddd5110e5eb9feb0
es/menu/album.xml
es/menu/photo.xml
|
db61fdf195283c18b9dfbc523fced2358b437008 |
02-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Move grid/filmstrip switching to ActionBar title "spinner" Bug: 7233818 Bug: 7240846 Bug: 7258973 Tapping the title of the album, whether in filmstrip or grid mode, allows switching between these modes using a menu. The album name is now displayed when viewing pictures in the filmstrip or zoomed in modes. Finally, no longer allow switching to grid mode when not appropriate. Change-Id: I4ee511feb7a74581fe185933ddd5110e5eb9feb0
rc/com/android/gallery3d/app/AlbumPage.java
rc/com/android/gallery3d/app/GalleryActionBar.java
rc/com/android/gallery3d/app/PhotoPage.java
|
3cf502a91b36bf6ce633f897505b0a2c3fc53ad5 |
02-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
Move grid/filmstrip switching to ActionBar title "spinner" Bug: 7233818 Bug: 7240846 Bug: 7258973 Tapping the title of the album, whether in filmstrip or grid mode, allows switching between these modes using a menu. The album name is now displayed when viewing pictures in the filmstrip or zoomed in modes. Finally, no longer allow switching to grid mode when not appropriate. Change-Id: I4ee511feb7a74581fe185933ddd5110e5eb9feb0
es/menu/album.xml
es/menu/photo.xml
rc/com/android/gallery3d/app/AlbumPage.java
rc/com/android/gallery3d/app/GalleryActionBar.java
rc/com/android/gallery3d/app/PhotoPage.java
|
75a2d7937106330b37bf5180a898dba4ff2ea20e |
02-Oct-2012 |
John Reck <jreck@google.com> |
am 3e3edbeb: am f1ce7694: am f18dd1e1: am c58fe396: Merge "Remove OnFrameAvailableListener in tear down" into gb-ub-photos-arches * commit '3e3edbeb36b15f73f419a3b95dd34c4807ddd3ca': Remove OnFrameAvailableListener in tear down
|
3e3edbeb36b15f73f419a3b95dd34c4807ddd3ca |
02-Oct-2012 |
John Reck <jreck@google.com> |
am f1ce7694: am f18dd1e1: am c58fe396: Merge "Remove OnFrameAvailableListener in tear down" into gb-ub-photos-arches * commit 'f1ce7694bbb0a9b00c261e7fa433c967a741e097': Remove OnFrameAvailableListener in tear down
|
f1ce7694bbb0a9b00c261e7fa433c967a741e097 |
02-Oct-2012 |
John Reck <jreck@google.com> |
am f18dd1e1: am c58fe396: Merge "Remove OnFrameAvailableListener in tear down" into gb-ub-photos-arches * commit 'f18dd1e13dc291c03df01db703178b5fb414d0d1': Remove OnFrameAvailableListener in tear down
|
b288ba8e580746ef95b1b04caa2848152fc384a4 |
02-Oct-2012 |
John Reck <jreck@google.com> |
am c58fe396: Merge "Remove OnFrameAvailableListener in tear down" into gb-ub-photos-arches * commit 'c58fe396fb7c6208740fa22a005e94a358b8266f': Remove OnFrameAvailableListener in tear down
|
f18dd1e13dc291c03df01db703178b5fb414d0d1 |
02-Oct-2012 |
John Reck <jreck@google.com> |
am c58fe396: Merge "Remove OnFrameAvailableListener in tear down" into gb-ub-photos-arches * commit 'c58fe396fb7c6208740fa22a005e94a358b8266f': Remove OnFrameAvailableListener in tear down
|
c4f4569dba260d85bbed210c6dc0b646f63b4344 |
02-Oct-2012 |
John Reck <jreck@google.com> |
Merge "Remove OnFrameAvailableListener in tear down" into gb-ub-photos-arches
|
c58fe396fb7c6208740fa22a005e94a358b8266f |
02-Oct-2012 |
John Reck <jreck@google.com> |
Merge "Remove OnFrameAvailableListener in tear down" into gb-ub-photos-arches
|
7a02f1d1c0b8e5e3805068f08d6e7ed8ff44685d |
02-Oct-2012 |
John Reck <jreck@google.com> |
Remove OnFrameAvailableListener in tear down Bug: 7217305 Change-Id: I79d1741cd757b2cc15a42336153af755ae84bd57
rc/com/android/gallery3d/ui/SurfaceTextureScreenNail.java
|
71ba6e959569cb90f415490e40bd95855f894cc5 |
02-Oct-2012 |
John Reck <jreck@google.com> |
Remove OnFrameAvailableListener in tear down Bug: 7217305 Change-Id: I79d1741cd757b2cc15a42336153af755ae84bd57
rc/com/android/gallery3d/ui/SurfaceTextureScreenNail.java
|
aede0abc1e73eb6128b87e0cccb04ca0fcfb6bdc |
02-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Fix for exceptions when image has no orientation data. Bug: 7219163 When image has no orientation data, getOrientation now catches the SQLiteException. Change-Id: I6783f05bae67532c1b186fc07ca96b9361440984
rc/com/android/gallery3d/filtershow/cache/ImageLoader.java
|
02506a90577ba3f767d192b9547d4478bcc149a8 |
02-Oct-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Fix for exceptions when image has no orientation data. Bug: 7219163 When image has no orientation data, getOrientation now catches the SQLiteException. Change-Id: I6783f05bae67532c1b186fc07ca96b9361440984
rc/com/android/gallery3d/filtershow/cache/ImageLoader.java
|
47bca33ea5008aa90667ac854476c6edd20c28c6 |
01-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am 166c8313: (-s ours) am 875cfdbb: am 73a9a0f4: am d87b77c4: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches * commit '166c8313e6082331ff7a13d53eb3c043e152b002': Import translations. DO NOT MERGE
|
166c8313e6082331ff7a13d53eb3c043e152b002 |
01-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am 875cfdbb: am 73a9a0f4: am d87b77c4: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches * commit '875cfdbbb07ffc8ccc4ae05a26d0bfbb29c644ac': Import translations. DO NOT MERGE
|
1c13ba835dfc9ffe3478c5ab703afa69eb894bab |
01-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am bade5f01: (-s ours) am 89d63d04: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev * commit 'bade5f0119909f86c36a00e8e478fa7e65053ef1': Import translations. DO NOT MERGE
|
875cfdbbb07ffc8ccc4ae05a26d0bfbb29c644ac |
01-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am 73a9a0f4: am d87b77c4: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches * commit '73a9a0f4f366ed54cdc1f47b5d2c759084591fa2': Import translations. DO NOT MERGE
|
bade5f0119909f86c36a00e8e478fa7e65053ef1 |
01-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am 89d63d04: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev * commit '89d63d0408f438f098e8a51cb0dd76f9fe249da6': Import translations. DO NOT MERGE
|
d89d1e43f210e7d09becebf06fa4a739fc5c053b |
01-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am d87b77c4: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches * commit 'd87b77c46889e8d7b24c64e63b29cf7411445f03': Import translations. DO NOT MERGE
|
418d4d3450c88967c71691069983b27f8f6bb05f |
01-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am d87b77c4: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches * commit 'd87b77c46889e8d7b24c64e63b29cf7411445f03': Import translations. DO NOT MERGE
|
73a9a0f4f366ed54cdc1f47b5d2c759084591fa2 |
01-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am d87b77c4: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches * commit 'd87b77c46889e8d7b24c64e63b29cf7411445f03': Import translations. DO NOT MERGE
|
89d63d0408f438f098e8a51cb0dd76f9fe249da6 |
01-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
|
2557b3e741fd54fc89124fbadff3412e933896c6 |
01-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
|
d87b77c46889e8d7b24c64e63b29cf7411445f03 |
01-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
|
d833a076100ce0350e42b4829910aff1cf0b87e2 |
28-Sep-2012 |
George Mount <mount@google.com> |
Enable swiping from LightCycle to Gallery Bug 7212420 Change-Id: Ic61bc06c6113c969e4b2e6e9c87c78a8aa2cb402
rc/com/android/gallery3d/ui/ExtTexture.java
rc/com/android/gallery3d/util/TextureBuffer.java
|
6fd25fd9a457346c8c32e8c4e68c7c491205730b |
28-Sep-2012 |
George Mount <mount@google.com> |
Enable swiping from LightCycle to Gallery Bug 7212420 Change-Id: Ic61bc06c6113c969e4b2e6e9c87c78a8aa2cb402
rc/com/android/gallery3d/ui/ExtTexture.java
rc/com/android/gallery3d/util/TextureBuffer.java
|
60063798724db862b480bb5c67d122c77ff190f1 |
01-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 58d9b05c: am 83a9febf: am a58b741c: am d87c8624: More logs for gallery crash error, remove a potential cause * commit '58d9b05c892c9ba9846128199a14abb79256855b': More logs for gallery crash error, remove a potential cause
|
c547f04b459561fc56a03d7df21eb66c060669a2 |
01-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am 0933545a: (-s ours) am 444f58da: am ab8aec91: Import translations. DO NOT MERGE * commit '0933545a942627bd964280e5ab37dcbfcf030a37': Import translations. DO NOT MERGE
|
58d9b05c892c9ba9846128199a14abb79256855b |
01-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 83a9febf: am a58b741c: am d87c8624: More logs for gallery crash error, remove a potential cause * commit '83a9febff8b40133d2ed68b8e652da081be8cb5a': More logs for gallery crash error, remove a potential cause
|
83a9febff8b40133d2ed68b8e652da081be8cb5a |
01-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am a58b741c: am d87c8624: More logs for gallery crash error, remove a potential cause * commit 'a58b741cb28a7b64b09d75785b6cf2002a181093': More logs for gallery crash error, remove a potential cause
|
a58b741cb28a7b64b09d75785b6cf2002a181093 |
01-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am d87c8624: More logs for gallery crash error, remove a potential cause * commit 'd87c8624a7ae477a6dea86d63866ade04f8d7e7c': More logs for gallery crash error, remove a potential cause
|
4dd7d6aef36ad5f37127444659b976e751ad3188 |
01-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am d87c8624: More logs for gallery crash error, remove a potential cause * commit 'd87c8624a7ae477a6dea86d63866ade04f8d7e7c': More logs for gallery crash error, remove a potential cause
|
0933545a942627bd964280e5ab37dcbfcf030a37 |
01-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am 444f58da: am ab8aec91: Import translations. DO NOT MERGE * commit '444f58da053d623dbb830d0f45e173981f934ac4': Import translations. DO NOT MERGE
|
444f58da053d623dbb830d0f45e173981f934ac4 |
01-Oct-2012 |
Baligh Uddin <baligh@google.com> |
am ab8aec91: Import translations. DO NOT MERGE * commit 'ab8aec912151b1e15369bbd5fc9ab3d5177c7ef7': Import translations. DO NOT MERGE
|
ab8aec912151b1e15369bbd5fc9ab3d5177c7ef7 |
01-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ia898ac71d24823018d2ddc814078e4c506199e27 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
737c289a6c0c8e041fc4950247c16c582ae5e949 |
01-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ia0b8a81a41e422774829c4191f0d2cdd0876f73d Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
703f8a885d1990892582193f0c89b057cf05fd2a |
01-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ie907c6bfacb07ab244aa6265c12d6b210c8d581b Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
62c7ed6cc5e8ff24fbfaccb3fadf32a249cd90db |
01-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ie907c6bfacb07ab244aa6265c12d6b210c8d581b Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
226f837df740a25bb39b353439a0bc65dcb718a4 |
01-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Iffade9c4b265b08e41044b242a99324fc3847d6a Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
98c47be5a925f4515550004cb455ad73bec854d2 |
01-Oct-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Iffade9c4b265b08e41044b242a99324fc3847d6a Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
fa0ed34cf791d78f3c557d74c6da36be17fb1233 |
01-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 23695d8c: am 995dfee7: am 4038913f: am f497fdfa: Merge "Fix border bug and filter application - fix layout (use framelayout) - fix copy imagepreset - added a current image state panel - remove title for border images for now" into gb-ub-photos-arches * commit '23695d8c13b5cdda87c4c01a1d7891dc8ad3bd03': Fix border bug and filter application - fix layout (use framelayout) - fix copy imagepreset - added a current image state panel - remove title for border images for now
|
6b1a94c930fc5599ca4f9a09818ea7fb1fa8d36a |
01-Oct-2012 |
Teng-Hui Zhu <ztenghui@google.com> |
am 3e9630d6: am 88cc655f: am ceebfddc: am 1cd0fd28: Merge "Trimming: support more box by keeping more classes" into gb-ub-photos-arches * commit '3e9630d6e90972cc84bdd366b14ba20bf1cb286d': Trimming: support more box by keeping more classes
|
5f99e4b75bea7f055afbef561cc4e55de8930254 |
01-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am ef1b3e64: am 2d7dad17: am 3c9d65d5: am 21421a10: Merge "Fix crash in album page" into gb-ub-photos-arches * commit 'ef1b3e64f1815ed638e4ab8b77be68b2eb8ad30f': Fix crash in album page
|
1b781236fbb80a00594cb2521b58f53881c00fb5 |
01-Oct-2012 |
Teng-Hui Zhu <ztenghui@google.com> |
am 5f21fece: am 6aaf807b: am ed07af07: am 5168509f: Merge "Trimming: clean up strings and prevent too short or no trimming." into gb-ub-photos-arches * commit '5f21fece8c5568434c74edbd669a2e0161206ba3': Trimming: clean up strings and prevent too short or no trimming.
|
9dd6a8b8972bd3f67cb9e428d5153ec9e023e8b7 |
01-Oct-2012 |
Mangesh Ghiware <mghiware@google.com> |
am a2b4e3f5: am 6c20d518: am ff43ce94: am 3e2e9e9c: Merge "Remove video play icon and tap to play behavior for panorama." into gb-ub-photos-arches * commit 'a2b4e3f55a4d2fea9de2b30d7e2091849cc9c81c': Remove video play icon and tap to play behavior for panorama.
|
85309a300ff476d86dacf0ff045307a196f9852f |
01-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am d8977d54: am fad97bcb: am 94e05269: am 0aaf8fb8: Update FX/pano button appearance, placement, animation * commit 'd8977d54edc6e53e3663e53f1b607bc86fa8009a': Update FX/pano button appearance, placement, animation
|
7c439b9048abb173b0012b54bafd975917fc2b8f |
01-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 320280e4: am 2b49458e: am 699d4d2b: am 207b73ba: Add new gallery assets * commit '320280e496bfccaa5b4622c8cc5889590069c73a': Add new gallery assets
|
a5ec84207a32eab60409f5a2afdb6b6d1ef40e07 |
01-Oct-2012 |
Wu-cheng Li <wuchengli@google.com> |
am c9ddc4bc: am de161c0c: am 2ef8ea04: am f6b2ec81: Disable effects recording UI. * commit 'c9ddc4bc3f1c7d8b3efd04ea7a128c174d0008db': Disable effects recording UI.
|
82c1b05fb2df8acd9908f10dd026c6dbf3034a80 |
01-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 6707efea: am a3336a8a: am 7e035f20: am 0c3203f1: Remove the individual Curves channel filters Reorder the filters * commit '6707efea98c8e275df04a4e96f031b7c1c57fb6d': Remove the individual Curves channel filters Reorder the filters
|
594ac97d53e713ca5af04ee499c7a794141e9c82 |
01-Oct-2012 |
Dianne Hackborn <hackbod@google.com> |
am 432195cb: am 39f3462e: am 004174de: Merge "Fix issue #7255954: API Review: rename Dream to DreamService" into jb-mr1-dev * commit '432195cb2f2db1eb4b4fa15ce3365a653d5f8b3f': Fix issue #7255954: API Review: rename Dream to DreamService
|
fa434b0ece14ed98eb0e25d3a13374720d641709 |
30-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
More logs for gallery crash error, remove a potential cause Bug: 7216012 Made sure that FilterDeleteSet doesn't ever return stale item counts, added extra logging in LocalMergeAlbum for NoSuchElementException so that we can have more info to diagnose this crash if it happens in the future. Change-Id: Ic988522fda4a16bb483db6ad34bc7f81ee098b03
rc/com/android/gallery3d/data/FilterDeleteSet.java
rc/com/android/gallery3d/data/LocalMergeAlbum.java
|
d87c8624a7ae477a6dea86d63866ade04f8d7e7c |
30-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
More logs for gallery crash error, remove a potential cause Bug: 7216012 Made sure that FilterDeleteSet doesn't ever return stale item counts, added extra logging in LocalMergeAlbum for NoSuchElementException so that we can have more info to diagnose this crash if it happens in the future. Change-Id: Ic988522fda4a16bb483db6ad34bc7f81ee098b03
rc/com/android/gallery3d/data/FilterDeleteSet.java
rc/com/android/gallery3d/data/LocalMergeAlbum.java
|
23695d8c13b5cdda87c4c01a1d7891dc8ad3bd03 |
01-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 995dfee7: am 4038913f: am f497fdfa: Merge "Fix border bug and filter application - fix layout (use framelayout) - fix copy imagepreset - added a current image state panel - remove title for border images for now" into gb-ub-photos-arches * commit '995dfee7086c5964fda73cd0b2ce3d7d7855f918': Fix border bug and filter application - fix layout (use framelayout) - fix copy imagepreset - added a current image state panel - remove title for border images for now
|
3e9630d6e90972cc84bdd366b14ba20bf1cb286d |
01-Oct-2012 |
Teng-Hui Zhu <ztenghui@google.com> |
am 88cc655f: am ceebfddc: am 1cd0fd28: Merge "Trimming: support more box by keeping more classes" into gb-ub-photos-arches * commit '88cc655fd65f5486b69c8d8681c7e979dd20fb9b': Trimming: support more box by keeping more classes
|
ef1b3e64f1815ed638e4ab8b77be68b2eb8ad30f |
01-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 2d7dad17: am 3c9d65d5: am 21421a10: Merge "Fix crash in album page" into gb-ub-photos-arches * commit '2d7dad17cb8aa62e8462cb4f0c95f42aa460f794': Fix crash in album page
|
5f21fece8c5568434c74edbd669a2e0161206ba3 |
01-Oct-2012 |
Teng-Hui Zhu <ztenghui@google.com> |
am 6aaf807b: am ed07af07: am 5168509f: Merge "Trimming: clean up strings and prevent too short or no trimming." into gb-ub-photos-arches * commit '6aaf807b27a13c821a5c7ee5f9f7713860b4e686': Trimming: clean up strings and prevent too short or no trimming.
|
a2b4e3f55a4d2fea9de2b30d7e2091849cc9c81c |
01-Oct-2012 |
Mangesh Ghiware <mghiware@google.com> |
am 6c20d518: am ff43ce94: am 3e2e9e9c: Merge "Remove video play icon and tap to play behavior for panorama." into gb-ub-photos-arches * commit '6c20d5186b3bfb7f9d6da0f29f7c0af0e9b89f81': Remove video play icon and tap to play behavior for panorama.
|
d8977d54edc6e53e3663e53f1b607bc86fa8009a |
01-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am fad97bcb: am 94e05269: am 0aaf8fb8: Update FX/pano button appearance, placement, animation * commit 'fad97bcb759389a94d8575479a9a43cd71015041': Update FX/pano button appearance, placement, animation
|
320280e496bfccaa5b4622c8cc5889590069c73a |
01-Oct-2012 |
Bobby Georgescu <georgescu@google.com> |
am 2b49458e: am 699d4d2b: am 207b73ba: Add new gallery assets * commit '2b49458e03318232eb740d45558e3a82146e0728': Add new gallery assets
|
c9ddc4bc3f1c7d8b3efd04ea7a128c174d0008db |
01-Oct-2012 |
Wu-cheng Li <wuchengli@google.com> |
am de161c0c: am 2ef8ea04: am f6b2ec81: Disable effects recording UI. * commit 'de161c0c08d9c756f0c12c3d40cc34a03fc7a883': Disable effects recording UI.
|
6707efea98c8e275df04a4e96f031b7c1c57fb6d |
01-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am a3336a8a: am 7e035f20: am 0c3203f1: Remove the individual Curves channel filters Reorder the filters * commit 'a3336a8a566358a02ca68ba8c657b11f05565cdb': Remove the individual Curves channel filters Reorder the filters
|
432195cb2f2db1eb4b4fa15ce3365a653d5f8b3f |
01-Oct-2012 |
Dianne Hackborn <hackbod@google.com> |
am 39f3462e: am 004174de: Merge "Fix issue #7255954: API Review: rename Dream to DreamService" into jb-mr1-dev * commit '39f3462ea3c4001dc02526a287a6a32eff611421': Fix issue #7255954: API Review: rename Dream to DreamService
|
051320e338e8158483f8181e0fda70778802c3f6 |
01-Oct-2012 |
Wu-cheng Li <wuchengli@google.com> |
Update assets of the lock screen image in the secure album. bug:7192331 Change-Id: I551e14420e43106e97b093884571eaea27b00425
es/drawable-hdpi/ic_lockscreen_handle_normal.png
es/drawable-hdpi/placeholder_locked.9.png
es/drawable-mdpi/ic_lockscreen_handle_normal.png
es/drawable-mdpi/placeholder_locked.9.png
es/drawable-xhdpi/ic_lockscreen_handle_normal.png
es/drawable-xhdpi/placeholder_locked.9.png
|
4d82bf874aa99dbe7123ddbfcf1fba7fe62406b3 |
01-Oct-2012 |
Wu-cheng Li <wuchengli@google.com> |
Update assets of the lock screen image in the secure album. bug:7192331 Change-Id: I551e14420e43106e97b093884571eaea27b00425
rc/com/android/gallery3d/data/UnlockImage.java
|
445605fe37d3678c0297d99ae6ec036574d19633 |
01-Oct-2012 |
Wu-cheng Li <wuchengli@google.com> |
Update assets of the lock screen image in the secure album. bug:7192331 Change-Id: I551e14420e43106e97b093884571eaea27b00425
es/drawable-hdpi/ic_lockscreen_handle_normal.png
es/drawable-hdpi/placeholder_locked.9.png
es/drawable-mdpi/ic_lockscreen_handle_normal.png
es/drawable-mdpi/placeholder_locked.9.png
es/drawable-xhdpi/ic_lockscreen_handle_normal.png
es/drawable-xhdpi/placeholder_locked.9.png
rc/com/android/gallery3d/data/UnlockImage.java
|
d35cd9f226d9f607e4e836a37365f3838d3d82d8 |
01-Oct-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
995dfee7086c5964fda73cd0b2ce3d7d7855f918 |
01-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am 4038913f: am f497fdfa: Merge "Fix border bug and filter application - fix layout (use framelayout) - fix copy imagepreset - added a current image state panel - remove title for border images for now" into gb-ub-photos-arches * commit '4038913fa2333706b7e87a82aef61749f53be368': Fix border bug and filter application - fix layout (use framelayout) - fix copy imagepreset - added a current image state panel - remove title for border images for now
|
4038913fa2333706b7e87a82aef61749f53be368 |
01-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am f497fdfa: Merge "Fix border bug and filter application - fix layout (use framelayout) - fix copy imagepreset - added a current image state panel - remove title for border images for now" into gb-ub-photos-arches * commit 'f497fdfa1abfea7b4ddabd7850eb528ea1c126ee': Fix border bug and filter application - fix layout (use framelayout) - fix copy imagepreset - added a current image state panel - remove title for border images for now
|
506be7fdd56119e6507121d95b867814ef7c1e84 |
01-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am f497fdfa: Merge "Fix border bug and filter application - fix layout (use framelayout) - fix copy imagepreset - added a current image state panel - remove title for border images for now" into gb-ub-photos-arches * commit 'f497fdfa1abfea7b4ddabd7850eb528ea1c126ee': Fix border bug and filter application - fix layout (use framelayout) - fix copy imagepreset - added a current image state panel - remove title for border images for now
|
d16e4ee3cb7e63a5c4fa128e1793a6dadab4066a |
01-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
am f497fdfa: Merge "Fix border bug and filter application - fix layout (use framelayout) - fix copy imagepreset - added a current image state panel - remove title for border images for now" into gb-ub-photos-arches * commit 'f497fdfa1abfea7b4ddabd7850eb528ea1c126ee': Fix border bug and filter application - fix layout (use framelayout) - fix copy imagepreset - added a current image state panel - remove title for border images for now
|
bea843f7881f4503bcb4f0489da42f119d14ae23 |
01-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Merge "Fix border bug and filter application - fix layout (use framelayout) - fix copy imagepreset - added a current image state panel - remove title for border images for now" into gb-ub-photos-arches
|
f497fdfa1abfea7b4ddabd7850eb528ea1c126ee |
01-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Merge "Fix border bug and filter application - fix layout (use framelayout) - fix copy imagepreset - added a current image state panel - remove title for border images for now" into gb-ub-photos-arches
|
4367088e5419630afb1e849fc6ffbe885c0a9c1d |
01-Oct-2012 |
nicolasroard <nicolasroard@google.com> |
Merge "Fix border bug and filter application - fix layout (use framelayout) - fix copy imagepreset - added a current image state panel - remove title for border images for now" into gb-ub-photos-arches
|
21601de3f65a02ad5d9f0cca811252f84a265f42 |
01-Oct-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
88cc655fd65f5486b69c8d8681c7e979dd20fb9b |
30-Sep-2012 |
Teng-Hui Zhu <ztenghui@google.com> |
am ceebfddc: am 1cd0fd28: Merge "Trimming: support more box by keeping more classes" into gb-ub-photos-arches * commit 'ceebfddcea25a3a7b02b49a1e341de65298e847f': Trimming: support more box by keeping more classes
|
ceebfddcea25a3a7b02b49a1e341de65298e847f |
30-Sep-2012 |
Teng-Hui Zhu <ztenghui@google.com> |
am 1cd0fd28: Merge "Trimming: support more box by keeping more classes" into gb-ub-photos-arches * commit '1cd0fd2822ecc60adb09c90c27194ea8019ab59c': Trimming: support more box by keeping more classes
|
1d743975d46be4edb0e354412c21a964bb58bd6b |
30-Sep-2012 |
Teng-Hui Zhu <ztenghui@google.com> |
am 1cd0fd28: Merge "Trimming: support more box by keeping more classes" into gb-ub-photos-arches * commit '1cd0fd2822ecc60adb09c90c27194ea8019ab59c': Trimming: support more box by keeping more classes
|
1cd0fd2822ecc60adb09c90c27194ea8019ab59c |
30-Sep-2012 |
Teng-Hui Zhu <ztenghui@google.com> |
Merge "Trimming: support more box by keeping more classes" into gb-ub-photos-arches
|
b61c4873c573c6a2a8178c7cf0eb91cc75e270f8 |
30-Sep-2012 |
Teng-Hui Zhu <ztenghui@google.com> |
Trimming: support more box by keeping more classes bug:7093055 Change-Id: Ie4dbae8270cf0072dfc74b5c91fec628f4cad673
roguard.flags
|
284efccc5303da7aa20589799313bcb6ac2f945b |
30-Sep-2012 |
Teng-Hui Zhu <ztenghui@google.com> |
Trimming: support more box by keeping more classes bug:7093055 Change-Id: Ie4dbae8270cf0072dfc74b5c91fec628f4cad673
roguard.flags
|
2d7dad17cb8aa62e8462cb4f0c95f42aa460f794 |
30-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
am 3c9d65d5: am 21421a10: Merge "Fix crash in album page" into gb-ub-photos-arches * commit '3c9d65d5b0bab6bb93a9e3f48352c099b4ee2976': Fix crash in album page
|
3c9d65d5b0bab6bb93a9e3f48352c099b4ee2976 |
30-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
am 21421a10: Merge "Fix crash in album page" into gb-ub-photos-arches * commit '21421a10bc2ad9151d3d3075ad77d96610c2043f': Fix crash in album page
|
ebfc85abc65689b56228900ea00454f842b87d61 |
30-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
am 21421a10: Merge "Fix crash in album page" into gb-ub-photos-arches * commit '21421a10bc2ad9151d3d3075ad77d96610c2043f': Fix crash in album page
|
944e6fd69fc0cfae2c44395104167f1fc45c26a0 |
30-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Fix crash in album page" into gb-ub-photos-arches
|
21421a10bc2ad9151d3d3075ad77d96610c2043f |
30-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Fix crash in album page" into gb-ub-photos-arches
|
6aaf807b27a13c821a5c7ee5f9f7713860b4e686 |
30-Sep-2012 |
Teng-Hui Zhu <ztenghui@google.com> |
am ed07af07: am 5168509f: Merge "Trimming: clean up strings and prevent too short or no trimming." into gb-ub-photos-arches * commit 'ed07af07a8e793e0702c9fcf2ef14273eac03d3d': Trimming: clean up strings and prevent too short or no trimming.
|
079ccc76aab8ab3e6ac5c999969c98d01d0ce71c |
30-Sep-2012 |
Teng-Hui Zhu <ztenghui@google.com> |
am 5168509f: Merge "Trimming: clean up strings and prevent too short or no trimming." into gb-ub-photos-arches * commit '5168509fe260a9d549278a9a287c3d7e0c1b739e': Trimming: clean up strings and prevent too short or no trimming.
|
ed07af07a8e793e0702c9fcf2ef14273eac03d3d |
30-Sep-2012 |
Teng-Hui Zhu <ztenghui@google.com> |
am 5168509f: Merge "Trimming: clean up strings and prevent too short or no trimming." into gb-ub-photos-arches * commit '5168509fe260a9d549278a9a287c3d7e0c1b739e': Trimming: clean up strings and prevent too short or no trimming.
|
d133b9613f721ef91ae0858ef2160e1104ac0d50 |
30-Sep-2012 |
Teng-Hui Zhu <ztenghui@google.com> |
am 5168509f: Merge "Trimming: clean up strings and prevent too short or no trimming." into gb-ub-photos-arches * commit '5168509fe260a9d549278a9a287c3d7e0c1b739e': Trimming: clean up strings and prevent too short or no trimming.
|
27a265c696064fd5fe4cdc1835e6ef9b2b141d8a |
30-Sep-2012 |
Teng-Hui Zhu <ztenghui@google.com> |
Merge "Trimming: clean up strings and prevent too short or no trimming." into gb-ub-photos-arches
|
046306e7c4a26f65912f23af3631f23b00860406 |
30-Sep-2012 |
Teng-Hui Zhu <ztenghui@google.com> |
Merge "Trimming: clean up strings and prevent too short or no trimming." into gb-ub-photos-arches
|
5168509fe260a9d549278a9a287c3d7e0c1b739e |
30-Sep-2012 |
Teng-Hui Zhu <ztenghui@google.com> |
Merge "Trimming: clean up strings and prevent too short or no trimming." into gb-ub-photos-arches
|
a7004cf4ad98bb6c8922e6296a952b18eca55ef4 |
30-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
Fix crash in album page Bug: 7258955 Avoid second call to onPause when finishing ActivityState instance within onPause. Change-Id: I6081a6467e109a6edf35e60d24193e550cb0dd21
rc/com/android/gallery3d/app/AlbumPage.java
rc/com/android/gallery3d/app/StateManager.java
|
61861118986a0311293be74396a66ce900a39d59 |
30-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
Fix crash in album page Bug: 7258955 Avoid second call to onPause when finishing ActivityState instance within onPause. Change-Id: I6081a6467e109a6edf35e60d24193e550cb0dd21
rc/com/android/gallery3d/app/AlbumPage.java
rc/com/android/gallery3d/app/StateManager.java
|
6c20d5186b3bfb7f9d6da0f29f7c0af0e9b89f81 |
30-Sep-2012 |
Mangesh Ghiware <mghiware@google.com> |
am ff43ce94: am 3e2e9e9c: Merge "Remove video play icon and tap to play behavior for panorama." into gb-ub-photos-arches * commit 'ff43ce9433610caaab3fb18a0822e04206d697ab': Remove video play icon and tap to play behavior for panorama.
|
fad97bcb759389a94d8575479a9a43cd71015041 |
30-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
am 94e05269: am 0aaf8fb8: Update FX/pano button appearance, placement, animation * commit '94e05269ad0f8b965b76695223c2e84e5cb382e1': Update FX/pano button appearance, placement, animation
|
ff43ce9433610caaab3fb18a0822e04206d697ab |
30-Sep-2012 |
Mangesh Ghiware <mghiware@google.com> |
am 3e2e9e9c: Merge "Remove video play icon and tap to play behavior for panorama." into gb-ub-photos-arches * commit '3e2e9e9c7ee62b79632243a3e52f0abd70ce2a59': Remove video play icon and tap to play behavior for panorama.
|
5d76d0f31b4a5bd22f2bf352fccd3492e980e6ae |
30-Sep-2012 |
Mangesh Ghiware <mghiware@google.com> |
am 3e2e9e9c: Merge "Remove video play icon and tap to play behavior for panorama." into gb-ub-photos-arches * commit '3e2e9e9c7ee62b79632243a3e52f0abd70ce2a59': Remove video play icon and tap to play behavior for panorama.
|
fa99a3ef9c2f0d8d30c8fd5014238ecff9281aeb |
30-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
am 0aaf8fb8: Update FX/pano button appearance, placement, animation * commit '0aaf8fb8b86cbf6353937c12f377ad524661c553': Update FX/pano button appearance, placement, animation
|
94e05269ad0f8b965b76695223c2e84e5cb382e1 |
30-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
am 0aaf8fb8: Update FX/pano button appearance, placement, animation * commit '0aaf8fb8b86cbf6353937c12f377ad524661c553': Update FX/pano button appearance, placement, animation
|
05d0a09d72c494ac1c7e7aef8565c86430cd26b5 |
30-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
am 0aaf8fb8: Update FX/pano button appearance, placement, animation * commit '0aaf8fb8b86cbf6353937c12f377ad524661c553': Update FX/pano button appearance, placement, animation
|
ff84b98a22048de262b45bded684a69f891070d3 |
30-Sep-2012 |
Mangesh Ghiware <mghiware@google.com> |
Merge "Remove video play icon and tap to play behavior for panorama." into gb-ub-photos-arches
|
3e2e9e9c7ee62b79632243a3e52f0abd70ce2a59 |
30-Sep-2012 |
Mangesh Ghiware <mghiware@google.com> |
Merge "Remove video play icon and tap to play behavior for panorama." into gb-ub-photos-arches
|
09ff3c66f7760febc2c1ba02e9d6171b3f68d97e |
30-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
Update FX/pano button appearance, placement, animation Bug: 7213162 Bug: 7233446 Change-Id: Ief62e3f17ee08999a23656217dcf39bb91421d1e
es/drawable/photopage_bottom_button_background.xml
es/layout/photopage_bottom_controls.xml
es/values/colors.xml
|
0aaf8fb8b86cbf6353937c12f377ad524661c553 |
30-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
Update FX/pano button appearance, placement, animation Bug: 7213162 Bug: 7233446 Change-Id: Ief62e3f17ee08999a23656217dcf39bb91421d1e
es/drawable/photopage_bottom_button_background.xml
es/layout/photopage_bottom_controls.xml
es/values/colors.xml
rc/com/android/gallery3d/app/PhotoPageBottomControls.java
|
bb89c81f2fd8633729aabe9433d26d7ad5fe1254 |
30-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
Update FX/pano button appearance, placement, animation Bug: 7213162 Bug: 7233446 Change-Id: Ief62e3f17ee08999a23656217dcf39bb91421d1e
rc/com/android/gallery3d/app/PhotoPageBottomControls.java
|
1627c3c20129ea50e36b44f0a576d5567bcdae41 |
30-Sep-2012 |
Mangesh Ghiware <mghiware@google.com> |
Remove video play icon and tap to play behavior for panorama. Bug: 7258968 Per new UX design, there'll be a panorama viewer icon in the bottom right instead (see b/7233446) This is essentially a revert of Change-Id I17fdb5d6bcab1f3997a1ab92fcf45e0309b394b3 Change-Id: Ib35c99cca4ee9b2422dd16f5ea3b931ad5f08f35
rc/com/android/gallery3d/app/PhotoDataAdapter.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/app/SinglePhotoDataAdapter.java
rc/com/android/gallery3d/ui/PhotoView.java
|
c1c67ea813421a6173d1dab2ad75c11b51c7976d |
30-Sep-2012 |
Mangesh Ghiware <mghiware@google.com> |
Remove video play icon and tap to play behavior for panorama. Bug: 7258968 Per new UX design, there'll be a panorama viewer icon in the bottom right instead (see b/7233446) This is essentially a revert of Change-Id I17fdb5d6bcab1f3997a1ab92fcf45e0309b394b3 Change-Id: Ib35c99cca4ee9b2422dd16f5ea3b931ad5f08f35
rc/com/android/gallery3d/app/PhotoDataAdapter.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/app/SinglePhotoDataAdapter.java
rc/com/android/gallery3d/ui/PhotoView.java
|
2b49458e03318232eb740d45558e3a82146e0728 |
30-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
am 699d4d2b: am 207b73ba: Add new gallery assets * commit '699d4d2b1ba647cad60899d72c1cf60a851878de': Add new gallery assets
|
699d4d2b1ba647cad60899d72c1cf60a851878de |
30-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
am 207b73ba: Add new gallery assets * commit '207b73bafea60a79fde5e3323e87441762e4b6ed': Add new gallery assets
|
3459318ed7c7f20f56cab591493e625a98692b1f |
30-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
am 207b73ba: Add new gallery assets * commit '207b73bafea60a79fde5e3323e87441762e4b6ed': Add new gallery assets
|
0ca2c61bd060ef701f69fae5945057fba1c877b6 |
30-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
am 207b73ba: Add new gallery assets * commit '207b73bafea60a79fde5e3323e87441762e4b6ed': Add new gallery assets
|
a121a12946dd753aa49191454ebfac0d435c1d4e |
30-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
Add new gallery assets Bug: 7258964 Change-Id: I02600bff90de1f665d6a5958d3235346cbfdaa01
es/drawable-hdpi/ic_menu_photosphere.png
es/drawable-hdpi/ic_photoeditor_border.png
es/drawable-hdpi/ic_photoeditor_color.png
es/drawable-hdpi/ic_photoeditor_effects.png
es/drawable-hdpi/ic_photoeditor_fix.png
es/drawable-hdpi/placeholder_camera.9.png
es/drawable-hdpi/placeholder_locked.9.png
es/drawable-mdpi/ic_menu_photosphere.png
es/drawable-mdpi/ic_photoeditor_border.png
es/drawable-mdpi/ic_photoeditor_color.png
es/drawable-mdpi/ic_photoeditor_effects.png
es/drawable-mdpi/ic_photoeditor_fix.png
es/drawable-mdpi/placeholder_camera.9.png
es/drawable-mdpi/placeholder_locked.9.png
es/drawable-xhdpi/ic_menu_photosphere.png
es/drawable-xhdpi/ic_photoeditor_border.png
es/drawable-xhdpi/ic_photoeditor_color.png
es/drawable-xhdpi/ic_photoeditor_effects.png
es/drawable-xhdpi/ic_photoeditor_fix.png
es/drawable-xhdpi/placeholder_camera.9.png
es/drawable-xhdpi/placeholder_locked.9.png
|
207b73bafea60a79fde5e3323e87441762e4b6ed |
30-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
Add new gallery assets Bug: 7258964 Change-Id: I02600bff90de1f665d6a5958d3235346cbfdaa01
es/drawable-hdpi/ic_menu_photosphere.png
es/drawable-hdpi/ic_photoeditor_border.png
es/drawable-hdpi/ic_photoeditor_color.png
es/drawable-hdpi/ic_photoeditor_effects.png
es/drawable-hdpi/ic_photoeditor_fix.png
es/drawable-hdpi/placeholder_camera.9.png
es/drawable-hdpi/placeholder_locked.9.png
es/drawable-mdpi/ic_menu_photosphere.png
es/drawable-mdpi/ic_photoeditor_border.png
es/drawable-mdpi/ic_photoeditor_color.png
es/drawable-mdpi/ic_photoeditor_effects.png
es/drawable-mdpi/ic_photoeditor_fix.png
es/drawable-mdpi/placeholder_camera.9.png
es/drawable-mdpi/placeholder_locked.9.png
es/drawable-xhdpi/ic_menu_photosphere.png
es/drawable-xhdpi/ic_photoeditor_border.png
es/drawable-xhdpi/ic_photoeditor_color.png
es/drawable-xhdpi/ic_photoeditor_effects.png
es/drawable-xhdpi/ic_photoeditor_fix.png
es/drawable-xhdpi/placeholder_camera.9.png
es/drawable-xhdpi/placeholder_locked.9.png
|
de161c0c08d9c756f0c12c3d40cc34a03fc7a883 |
30-Sep-2012 |
Wu-cheng Li <wuchengli@google.com> |
am 2ef8ea04: am f6b2ec81: Disable effects recording UI. * commit '2ef8ea04349def9c6d584ed5853404977ee45936': Disable effects recording UI.
|
b8e528a266a4870c04a6f9e69ed2eb28727da53f |
30-Sep-2012 |
Wu-cheng Li <wuchengli@google.com> |
am f6b2ec81: Disable effects recording UI. * commit 'f6b2ec819e28d126f4ccb73d90e899e6fbed969e': Disable effects recording UI.
|
2ef8ea04349def9c6d584ed5853404977ee45936 |
30-Sep-2012 |
Wu-cheng Li <wuchengli@google.com> |
am f6b2ec81: Disable effects recording UI. * commit 'f6b2ec819e28d126f4ccb73d90e899e6fbed969e': Disable effects recording UI.
|
6be3a50c190eed6e2762b7a6ef05378a26c9339c |
30-Sep-2012 |
Wu-cheng Li <wuchengli@google.com> |
Disable effects recording UI. bug:7106963 Change-Id: I1c056b30efd9b2d8c976b611ada971a8bff1ad87
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
|
e8feb0cfbe90efb8c0d69b75d2f3dd0fbd88d29a |
30-Sep-2012 |
Wu-cheng Li <wuchengli@google.com> |
Disable effects recording UI. bug:7106963 Change-Id: I1c056b30efd9b2d8c976b611ada971a8bff1ad87
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
|
f6b2ec819e28d126f4ccb73d90e899e6fbed969e |
30-Sep-2012 |
Wu-cheng Li <wuchengli@google.com> |
Disable effects recording UI. bug:7106963 Change-Id: I1c056b30efd9b2d8c976b611ada971a8bff1ad87
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
|
0ec82e584a968383e8a646699cfbf30ee6f0da80 |
30-Sep-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
0e0d71794f9765cd4234386789c882dacbb4e318 |
29-Sep-2012 |
nicolasroard <nicolasroard@google.com> |
Fix border bug and filter application - fix layout (use framelayout) - fix copy imagepreset - added a current image state panel - remove title for border images for now bug:7256090 bug:7249672 bug:7234317 bug:7225150 Change-Id: I958628a1604c7e436e5d121556c8744f5748b1ec
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/HistoryAdapter.java
rc/com/android/gallery3d/filtershow/ImageStateAdapter.java
rc/com/android/gallery3d/filtershow/filters/ColorSpaceMatrix.java
rc/com/android/gallery3d/filtershow/filters/ImageFilter.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterBW.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterBWBlue.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterBWGreen.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterBWRed.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterBorder.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterBrightness.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterContrast.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterCurves.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterGradient.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterHue.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterSaturated.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterStraighten.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterVignette.java
rc/com/android/gallery3d/filtershow/imageshow/ImageShow.java
rc/com/android/gallery3d/filtershow/imageshow/ImageSmallFilter.java
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
|
bf93da72576b28f4e9dfb27f8f3fef702c8ae82d |
29-Sep-2012 |
nicolasroard <nicolasroard@google.com> |
Fix border bug and filter application - fix layout (use framelayout) - fix copy imagepreset - added a current image state panel - remove title for border images for now bug:7256090 bug:7249672 bug:7234317 bug:7225150 Change-Id: I958628a1604c7e436e5d121556c8744f5748b1ec
es/layout/filtershow_activity.xml
es/layout/filtershow_imagestate_row.xml
es/menu/filtershow_activity_menu.xml
es/values/filtershow_strings.xml
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/HistoryAdapter.java
rc/com/android/gallery3d/filtershow/ImageStateAdapter.java
rc/com/android/gallery3d/filtershow/filters/ColorSpaceMatrix.java
rc/com/android/gallery3d/filtershow/filters/ImageFilter.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterBW.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterBWBlue.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterBWGreen.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterBWRed.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterBorder.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterBrightness.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterContrast.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterCurves.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterGradient.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterHue.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterSaturated.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterStraighten.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterVignette.java
rc/com/android/gallery3d/filtershow/imageshow/ImageShow.java
rc/com/android/gallery3d/filtershow/imageshow/ImageSmallFilter.java
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
|
ba1ba19c27e90694f74985b37b7bcaea6c023621 |
29-Sep-2012 |
nicolasroard <nicolasroard@google.com> |
Fix border bug and filter application - fix layout (use framelayout) - fix copy imagepreset - added a current image state panel - remove title for border images for now bug:7256090 bug:7249672 bug:7234317 bug:7225150 Change-Id: I958628a1604c7e436e5d121556c8744f5748b1ec
es/layout/filtershow_activity.xml
es/layout/filtershow_imagestate_row.xml
es/menu/filtershow_activity_menu.xml
es/values/filtershow_strings.xml
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
|
d44b0d8348a9f91259ecbd59ec48c9df9f058141 |
29-Sep-2012 |
Teng-Hui Zhu <ztenghui@google.com> |
Trimming: clean up strings and prevent too short or no trimming. Also view the result if the activity is not stopped. bug:7093055 Change-Id: If244d567a4be9da22542398f6b7c22a081786339
es/values/strings.xml
rc/com/android/gallery3d/app/TrimVideo.java
|
c9b475377d06f7aeeb72b54e10a11017c4ccafef |
29-Sep-2012 |
Teng-Hui Zhu <ztenghui@google.com> |
Trimming: clean up strings and prevent too short or no trimming. Also view the result if the activity is not stopped. bug:7093055 Change-Id: If244d567a4be9da22542398f6b7c22a081786339
es/values/strings.xml
|
9d62824904bec0c57e86cc5ca7a82d8083d8a667 |
29-Sep-2012 |
Teng-Hui Zhu <ztenghui@google.com> |
Trimming: clean up strings and prevent too short or no trimming. Also view the result if the activity is not stopped. bug:7093055 Change-Id: If244d567a4be9da22542398f6b7c22a081786339
rc/com/android/gallery3d/app/TrimVideo.java
|
a3336a8a566358a02ca68ba8c657b11f05565cdb |
29-Sep-2012 |
nicolasroard <nicolasroard@google.com> |
am 7e035f20: am 0c3203f1: Remove the individual Curves channel filters Reorder the filters * commit '7e035f20c961d2f0dccd48772dee5273e95b9d45': Remove the individual Curves channel filters Reorder the filters
|
b6d3676f4fb49b41095a98c3ee5cfe7e84e9fc07 |
29-Sep-2012 |
nicolasroard <nicolasroard@google.com> |
am 0c3203f1: Remove the individual Curves channel filters Reorder the filters * commit '0c3203f1789df3f8bd772dfd655e73b44636b629': Remove the individual Curves channel filters Reorder the filters
|
f3f72accd95a77e6f3739b274cb04a9396bef112 |
29-Sep-2012 |
nicolasroard <nicolasroard@google.com> |
am 0c3203f1: Remove the individual Curves channel filters Reorder the filters * commit '0c3203f1789df3f8bd772dfd655e73b44636b629': Remove the individual Curves channel filters Reorder the filters
|
7e035f20c961d2f0dccd48772dee5273e95b9d45 |
29-Sep-2012 |
nicolasroard <nicolasroard@google.com> |
am 0c3203f1: Remove the individual Curves channel filters Reorder the filters * commit '0c3203f1789df3f8bd772dfd655e73b44636b629': Remove the individual Curves channel filters Reorder the filters
|
dacc688e9237890bd1698ccfa1e6402dc9f24f15 |
29-Sep-2012 |
nicolasroard <nicolasroard@google.com> |
Remove the individual Curves channel filters Reorder the filters bug:7234317 Change-Id: Ia726fa8ea82580c97784eb03d4c6740cf4a603c4
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
|
0c3203f1789df3f8bd772dfd655e73b44636b629 |
29-Sep-2012 |
nicolasroard <nicolasroard@google.com> |
Remove the individual Curves channel filters Reorder the filters bug:7234317 Change-Id: Ia726fa8ea82580c97784eb03d4c6740cf4a603c4
es/layout/filtershow_activity.xml
es/values/filtershow_strings.xml
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
|
7a9f7461af80edd31e5592d78bc7c6086cbfc3d7 |
29-Sep-2012 |
nicolasroard <nicolasroard@google.com> |
Remove the individual Curves channel filters Reorder the filters bug:7234317 Change-Id: Ia726fa8ea82580c97784eb03d4c6740cf4a603c4
es/layout/filtershow_activity.xml
es/values/filtershow_strings.xml
|
39f3462ea3c4001dc02526a287a6a32eff611421 |
29-Sep-2012 |
Dianne Hackborn <hackbod@google.com> |
am 004174de: Merge "Fix issue #7255954: API Review: rename Dream to DreamService" into jb-mr1-dev * commit '004174de4aa5b803d1f456cc8e905c9d672c2c4a': Fix issue #7255954: API Review: rename Dream to DreamService
|
004174de4aa5b803d1f456cc8e905c9d672c2c4a |
29-Sep-2012 |
Dianne Hackborn <hackbod@google.com> |
Merge "Fix issue #7255954: API Review: rename Dream to DreamService" into jb-mr1-dev
|
c89831861c69276094702f4ddb96be671f5402d5 |
29-Sep-2012 |
Dianne Hackborn <hackbod@google.com> |
Fix issue #7255954: API Review: rename Dream to DreamService Change-Id: Ie24be85e3bb1d59c266d3fc83d035d162a643252
ndroidManifest.xml
|
2e81a8d556919d8321033c04e712d20edbc18c88 |
29-Sep-2012 |
Jean-Baptiste Queru <jbq@google.com> |
am 122d29f1: Merge from jb-mr1-aah-dev * commit '122d29f1604a298148b30e73e08baddb68c1463a':
|
122d29f1604a298148b30e73e08baddb68c1463a |
29-Sep-2012 |
Jean-Baptiste Queru <jbq@google.com> |
Merge from jb-mr1-aah-dev Change-Id: I816c1be115edeeb69a873cb5dd9030732ba6f227
|
10e5287355c66a35ad3c773863ae7a4795f96522 |
29-Sep-2012 |
John Hoford <hoford@google.com> |
am 81384a1d: am eb9d5d27: am d42f6c69: Add contrast & brightness filters Added hue fixed contrast Stablized Contrast, Saturation, Tint, Exposure * commit '81384a1d78100e9fa5a0e5ac7e52a1da1709dce5': Add contrast & brightness filters Added hue fixed contrast Stablized Contrast, Saturation, Tint, Exposure
|
276ee773131f47f1150f78f05037359844dab459 |
29-Sep-2012 |
John Hoford <hoford@google.com> |
am eb9d5d27: am d42f6c69: Add contrast & brightness filters Added hue fixed contrast Stablized Contrast, Saturation, Tint, Exposure * commit 'eb9d5d27df1708c4269612b95ba8b56fb5da5993': Add contrast & brightness filters Added hue fixed contrast Stablized Contrast, Saturation, Tint, Exposure
|
81384a1d78100e9fa5a0e5ac7e52a1da1709dce5 |
29-Sep-2012 |
John Hoford <hoford@google.com> |
am eb9d5d27: am d42f6c69: Add contrast & brightness filters Added hue fixed contrast Stablized Contrast, Saturation, Tint, Exposure * commit 'eb9d5d27df1708c4269612b95ba8b56fb5da5993': Add contrast & brightness filters Added hue fixed contrast Stablized Contrast, Saturation, Tint, Exposure
|
6b2ea0240160278ac2f12e04e194f22db765c2d5 |
29-Sep-2012 |
John Hoford <hoford@google.com> |
am d42f6c69: Add contrast & brightness filters Added hue fixed contrast Stablized Contrast, Saturation, Tint, Exposure * commit 'd42f6c69c5980110c16cd679f914c4e4e7caa29d': Add contrast & brightness filters Added hue fixed contrast Stablized Contrast, Saturation, Tint, Exposure
|
fbeb687831651bf6fdb70581891aeb340b3e8f48 |
29-Sep-2012 |
John Hoford <hoford@google.com> |
am d42f6c69: Add contrast & brightness filters Added hue fixed contrast Stablized Contrast, Saturation, Tint, Exposure * commit 'd42f6c69c5980110c16cd679f914c4e4e7caa29d': Add contrast & brightness filters Added hue fixed contrast Stablized Contrast, Saturation, Tint, Exposure
|
eb9d5d27df1708c4269612b95ba8b56fb5da5993 |
29-Sep-2012 |
John Hoford <hoford@google.com> |
am d42f6c69: Add contrast & brightness filters Added hue fixed contrast Stablized Contrast, Saturation, Tint, Exposure * commit 'd42f6c69c5980110c16cd679f914c4e4e7caa29d': Add contrast & brightness filters Added hue fixed contrast Stablized Contrast, Saturation, Tint, Exposure
|
708ec6f8961071a3f680f7b70a28d0f8b18cc421 |
29-Sep-2012 |
Jean-Baptiste Queru <jbq@google.com> |
am ba44be29: Merge from jb-mr1-aah-dev * commit 'ba44be29e931251bf4beb6964d6add84e614528f':
|
ba44be29e931251bf4beb6964d6add84e614528f |
29-Sep-2012 |
Jean-Baptiste Queru <jbq@google.com> |
Merge from jb-mr1-aah-dev Change-Id: I032fc74d70985bec8402dbffdd251ded9004db2e
|
912ea3074e9551640b96b87b04a0f30504542c52 |
28-Sep-2012 |
John Hoford <hoford@google.com> |
Add contrast & brightness filters Added hue fixed contrast Stablized Contrast, Saturation, Tint, Exposure bug:7234321 Change-Id: Iadd1e3ab215b60f920b718fa56611a07f24effee
ni/Android.mk
ni/filters/brightness.c
ni/filters/contrast.c
ni/filters/filters.h
ni/filters/hue.c
|
eb697a9e32bae5dc61078f22c536ac701039ff81 |
28-Sep-2012 |
John Hoford <hoford@google.com> |
Add contrast & brightness filters Added hue fixed contrast Stablized Contrast, Saturation, Tint, Exposure bug:7234321 Change-Id: Iadd1e3ab215b60f920b718fa56611a07f24effee
ni/Android.mk
|
fc275d4e972304a8c4935d6161c74cbbbdf600ae |
28-Sep-2012 |
John Hoford <hoford@google.com> |
Add contrast & brightness filters Added hue fixed contrast Stablized Contrast, Saturation, Tint, Exposure bug:7234321 Change-Id: Iadd1e3ab215b60f920b718fa56611a07f24effee
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/filters/ColorSpaceMatrix.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterBrightness.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterContrast.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterHue.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterSaturated.java
|
d42f6c69c5980110c16cd679f914c4e4e7caa29d |
28-Sep-2012 |
John Hoford <hoford@google.com> |
Add contrast & brightness filters Added hue fixed contrast Stablized Contrast, Saturation, Tint, Exposure bug:7234321 Change-Id: Iadd1e3ab215b60f920b718fa56611a07f24effee
ni/Android.mk
ni/filters/brightness.c
ni/filters/contrast.c
ni/filters/filters.h
ni/filters/hue.c
es/layout/filtershow_activity.xml
es/values/filtershow_strings.xml
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/filters/ColorSpaceMatrix.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterBrightness.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterContrast.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterHue.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterSaturated.java
|
5de46c3a085352ad479c3acbf2330d77e953d281 |
28-Sep-2012 |
John Hoford <hoford@google.com> |
Add contrast & brightness filters Added hue fixed contrast Stablized Contrast, Saturation, Tint, Exposure bug:7234321 Change-Id: Iadd1e3ab215b60f920b718fa56611a07f24effee
es/layout/filtershow_activity.xml
es/values/filtershow_strings.xml
|
5a29130c91e956161fe998f58d6bc97a5cbb0d84 |
29-Sep-2012 |
nicolasroard <nicolasroard@google.com> |
am c92d9de2: am 786fe647: Improve ActionBar - show both undo and redo - add the checkmark with done instead of the up mark * commit 'c92d9de295efa5e0773aef1642d184e5fe8e8a38': Improve ActionBar - show both undo and redo - add the checkmark with done instead of the up mark
|
5072f35b70096003f5baf4eca5597d0f5df1f0d8 |
29-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
am 8c35f795: am d5480bd5: Merge "Debounce after quick fling towards camera but zoom if slow" into gb-ub-photos-arches * commit '8c35f7954f4e7aa6c2701fa1131978e6cd5cf79e': Debounce after quick fling towards camera but zoom if slow
|
1f1778711bd521fb0f472d8dd63530a1d4713270 |
29-Sep-2012 |
nicolasroard <nicolasroard@google.com> |
am 700c30f5: am c92d9de2: am 786fe647: Improve ActionBar - show both undo and redo - add the checkmark with done instead of the up mark * commit '700c30f5a64cf7bdf6146e60ff778b6e53ff377b': Improve ActionBar - show both undo and redo - add the checkmark with done instead of the up mark
|
700c30f5a64cf7bdf6146e60ff778b6e53ff377b |
29-Sep-2012 |
nicolasroard <nicolasroard@google.com> |
am c92d9de2: am 786fe647: Improve ActionBar - show both undo and redo - add the checkmark with done instead of the up mark * commit 'c92d9de295efa5e0773aef1642d184e5fe8e8a38': Improve ActionBar - show both undo and redo - add the checkmark with done instead of the up mark
|
805cdf714a70abf88ae5224940529d1855174da5 |
29-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
am 11ce3e85: am 8c35f795: am d5480bd5: Merge "Debounce after quick fling towards camera but zoom if slow" into gb-ub-photos-arches * commit '11ce3e857b62a09fca88726b893c37e9accf89cb': Debounce after quick fling towards camera but zoom if slow
|
c92d9de295efa5e0773aef1642d184e5fe8e8a38 |
29-Sep-2012 |
nicolasroard <nicolasroard@google.com> |
am 786fe647: Improve ActionBar - show both undo and redo - add the checkmark with done instead of the up mark * commit '786fe6476e4ccf4b98489ff69d8ef439533cdc2a': Improve ActionBar - show both undo and redo - add the checkmark with done instead of the up mark
|
12565031b12cb6838de4d225a91780246be8e6e6 |
29-Sep-2012 |
nicolasroard <nicolasroard@google.com> |
am 786fe647: Improve ActionBar - show both undo and redo - add the checkmark with done instead of the up mark * commit '786fe6476e4ccf4b98489ff69d8ef439533cdc2a': Improve ActionBar - show both undo and redo - add the checkmark with done instead of the up mark
|
4b19961e6b1e9cf91255767302fac147803a0852 |
29-Sep-2012 |
nicolasroard <nicolasroard@google.com> |
am 786fe647: Improve ActionBar - show both undo and redo - add the checkmark with done instead of the up mark * commit '786fe6476e4ccf4b98489ff69d8ef439533cdc2a': Improve ActionBar - show both undo and redo - add the checkmark with done instead of the up mark
|
e83215c9a82c811b61357091ff2ba45e5ba08092 |
29-Sep-2012 |
nicolasroard <nicolasroard@google.com> |
Improve ActionBar - show both undo and redo - add the checkmark with done instead of the up mark bug:7233986 Change-Id: I32af8068b08763461b720054f270cb6acabefbbf
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
|
786fe6476e4ccf4b98489ff69d8ef439533cdc2a |
29-Sep-2012 |
nicolasroard <nicolasroard@google.com> |
Improve ActionBar - show both undo and redo - add the checkmark with done instead of the up mark bug:7233986 Change-Id: I32af8068b08763461b720054f270cb6acabefbbf
es/layout/filtershow_actionbar.xml
es/menu/filtershow_activity_menu.xml
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
|
ec9611c06884fe91a77e4159bb01ade3f63fa100 |
29-Sep-2012 |
nicolasroard <nicolasroard@google.com> |
Improve ActionBar - show both undo and redo - add the checkmark with done instead of the up mark bug:7233986 Change-Id: I32af8068b08763461b720054f270cb6acabefbbf
es/layout/filtershow_actionbar.xml
es/menu/filtershow_activity_menu.xml
|
11ce3e857b62a09fca88726b893c37e9accf89cb |
29-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
am 8c35f795: am d5480bd5: Merge "Debounce after quick fling towards camera but zoom if slow" into gb-ub-photos-arches * commit '8c35f7954f4e7aa6c2701fa1131978e6cd5cf79e': Debounce after quick fling towards camera but zoom if slow
|
7bae08ad88181acc22fbbbfcbc41f39c3a937a66 |
29-Sep-2012 |
Jean-Baptiste Queru <jbq@google.com> |
am 5466d224: Merge from jb-mr1-aah-dev * commit '5466d224d68e1144f79283537549520d467a7f69':
|
8c35f7954f4e7aa6c2701fa1131978e6cd5cf79e |
29-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
am d5480bd5: Merge "Debounce after quick fling towards camera but zoom if slow" into gb-ub-photos-arches * commit 'd5480bd5a849517106f232326fd2d31b80b72b3f': Debounce after quick fling towards camera but zoom if slow
|
2552be7c53cb7456ac314e7bec6ec0835bb8515c |
29-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
am d5480bd5: Merge "Debounce after quick fling towards camera but zoom if slow" into gb-ub-photos-arches * commit 'd5480bd5a849517106f232326fd2d31b80b72b3f': Debounce after quick fling towards camera but zoom if slow
|
66b4e60be3cb2d5e6f0770f2d3690fc7ad7527e5 |
29-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Debounce after quick fling towards camera but zoom if slow" into gb-ub-photos-arches
|
d5480bd5a849517106f232326fd2d31b80b72b3f |
29-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Debounce after quick fling towards camera but zoom if slow" into gb-ub-photos-arches
|
c6d34735efceb8d4fa041d46fe13f63c8e3223e5 |
28-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
Debounce after quick fling towards camera but zoom if slow Bug: 7250026 Bug: 7213802 Change-Id: I3c900813937161744a36015469c70112f2cf356b
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/ui/PhotoView.java
rc/com/android/gallery3d/ui/PositionController.java
|
b27df4650459068b409924493bbadaf25bb7e191 |
28-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
Debounce after quick fling towards camera but zoom if slow Bug: 7250026 Bug: 7213802 Change-Id: I3c900813937161744a36015469c70112f2cf356b
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/ui/PhotoView.java
rc/com/android/gallery3d/ui/PositionController.java
|
5466d224d68e1144f79283537549520d467a7f69 |
28-Sep-2012 |
Jean-Baptiste Queru <jbq@google.com> |
Merge from jb-mr1-aah-dev Change-Id: I5f113bcb65b0e96aaa289d0a42e5b482adeb355e
|
a28e9eb66477929f5223f1a72d0dd80881b257e7 |
28-Sep-2012 |
Mangesh Ghiware <mghiware@google.com> |
am 43a81793: am 639c9c6d: am f98aafb7: Fix NPE in GalleryActionBar * commit '43a81793586a13e2e2e2d15767bd014c30badcb8': Fix NPE in GalleryActionBar
|
43a81793586a13e2e2e2d15767bd014c30badcb8 |
28-Sep-2012 |
Mangesh Ghiware <mghiware@google.com> |
am 639c9c6d: am f98aafb7: Fix NPE in GalleryActionBar * commit '639c9c6d767f70ab83fb97b13b108bb1df06cabf': Fix NPE in GalleryActionBar
|
c4b06c569d915fddc0fe7e71a31c9fbcbf0fba29 |
28-Sep-2012 |
Mangesh Ghiware <mghiware@google.com> |
am 639c9c6d: am f98aafb7: Fix NPE in GalleryActionBar * commit '639c9c6d767f70ab83fb97b13b108bb1df06cabf': Fix NPE in GalleryActionBar
|
639c9c6d767f70ab83fb97b13b108bb1df06cabf |
28-Sep-2012 |
Mangesh Ghiware <mghiware@google.com> |
am f98aafb7: Fix NPE in GalleryActionBar * commit 'f98aafb7eb65b889b0f831d607828ca4f8af64b6': Fix NPE in GalleryActionBar
|
910395678addf1c3f71e2898eccf5a483a6cdae2 |
28-Sep-2012 |
Mangesh Ghiware <mghiware@google.com> |
am f98aafb7: Fix NPE in GalleryActionBar * commit 'f98aafb7eb65b889b0f831d607828ca4f8af64b6': Fix NPE in GalleryActionBar
|
2fea855ed21c4f1b1cf144818c46783a8c502328 |
28-Sep-2012 |
Jean-Baptiste Queru <jbq@google.com> |
am c3977bea: Merge from jb-mr1-aah-dev * commit 'c3977bea403ab7ab21edd7732d577f7985905d30': Import translations. DO NOT MERGE Import translations. DO NOT MERGE Import translations. DO NOT MERGE
|
9055cd7d1fecd9b73d1907cac9bc234cb8021894 |
28-Sep-2012 |
Mangesh Ghiware <mghiware@google.com> |
Fix NPE in GalleryActionBar Bug: 7252666 Change-Id: Ide3c8e0d609743b34a3c53f3bb48dbeddb3f98c0
rc/com/android/gallery3d/app/GalleryActionBar.java
rc/com/android/gallery3d/ui/ActionModeHandler.java
|
f98aafb7eb65b889b0f831d607828ca4f8af64b6 |
28-Sep-2012 |
Mangesh Ghiware <mghiware@google.com> |
Fix NPE in GalleryActionBar Bug: 7252666 Change-Id: Ide3c8e0d609743b34a3c53f3bb48dbeddb3f98c0
rc/com/android/gallery3d/app/GalleryActionBar.java
rc/com/android/gallery3d/ui/ActionModeHandler.java
|
c3977bea403ab7ab21edd7732d577f7985905d30 |
28-Sep-2012 |
Jean-Baptiste Queru <jbq@google.com> |
Merge from jb-mr1-aah-dev Change-Id: I58c766d476ac0bc4d6e7117b41e6fd3246693291
|
1cbf06c6b06007ef8536bb0493659bac0a30fcce |
28-Sep-2012 |
Bart Sears <bsears@google.com> |
am 70d013fe: am 81286e10: am 5e91df3d: Merge "Add FilterShow and clean up native lib handling" into gb-ub-photos-arches * commit '70d013fe3fe087128efefc7fd5ae41e5d9c7bfdd': Add FilterShow and clean up native lib handling
|
95bd4f1977dca7d2a1b9839c6c3f9b2c7593c018 |
28-Sep-2012 |
Bart Sears <bsears@google.com> |
am 81286e10: am 5e91df3d: Merge "Add FilterShow and clean up native lib handling" into gb-ub-photos-arches * commit '81286e102219ce852f4d9ed1cb68b40fc8b1cb41': Add FilterShow and clean up native lib handling
|
70d013fe3fe087128efefc7fd5ae41e5d9c7bfdd |
28-Sep-2012 |
Bart Sears <bsears@google.com> |
am 81286e10: am 5e91df3d: Merge "Add FilterShow and clean up native lib handling" into gb-ub-photos-arches * commit '81286e102219ce852f4d9ed1cb68b40fc8b1cb41': Add FilterShow and clean up native lib handling
|
81286e102219ce852f4d9ed1cb68b40fc8b1cb41 |
28-Sep-2012 |
Bart Sears <bsears@google.com> |
am 5e91df3d: Merge "Add FilterShow and clean up native lib handling" into gb-ub-photos-arches * commit '5e91df3d56be743664c1a4a760f1668ec1de17dd': Add FilterShow and clean up native lib handling
|
0b4cbd5470783525dbb0ec1b11c0fb7649496d6c |
28-Sep-2012 |
Bart Sears <bsears@google.com> |
am 5e91df3d: Merge "Add FilterShow and clean up native lib handling" into gb-ub-photos-arches * commit '5e91df3d56be743664c1a4a760f1668ec1de17dd': Add FilterShow and clean up native lib handling
|
5e91df3d56be743664c1a4a760f1668ec1de17dd |
28-Sep-2012 |
Bart Sears <bsears@google.com> |
Merge "Add FilterShow and clean up native lib handling" into gb-ub-photos-arches
|
b4acc025590b503fa7f2a3b668063584218d0ec8 |
28-Sep-2012 |
nicolasroard <nicolasroard@google.com> |
am 2af873ee: am 91cb11f2: am 7caab0dc: Change the slider values range to -100 -> 100 * commit '2af873ee778f32d2118dfaa0b37ff3623104a9cc': Change the slider values range to -100 -> 100
|
2af873ee778f32d2118dfaa0b37ff3623104a9cc |
28-Sep-2012 |
nicolasroard <nicolasroard@google.com> |
am 91cb11f2: am 7caab0dc: Change the slider values range to -100 -> 100 * commit '91cb11f248a10b1b35621d092d9c0418e6867ede': Change the slider values range to -100 -> 100
|
7b222f3c6d512ab39e89c83e2e23569c7c767119 |
28-Sep-2012 |
nicolasroard <nicolasroard@google.com> |
am 91cb11f2: am 7caab0dc: Change the slider values range to -100 -> 100 * commit '91cb11f248a10b1b35621d092d9c0418e6867ede': Change the slider values range to -100 -> 100
|
91cb11f248a10b1b35621d092d9c0418e6867ede |
28-Sep-2012 |
nicolasroard <nicolasroard@google.com> |
am 7caab0dc: Change the slider values range to -100 -> 100 * commit '7caab0dc36f69b4c51c39bd191f2df44ea586b70': Change the slider values range to -100 -> 100
|
65e3e329616af22759311310c3876f7fed7a9ddf |
28-Sep-2012 |
nicolasroard <nicolasroard@google.com> |
am 7caab0dc: Change the slider values range to -100 -> 100 * commit '7caab0dc36f69b4c51c39bd191f2df44ea586b70': Change the slider values range to -100 -> 100
|
422dd98663e78de1b16accfde49cabda8d5a3568 |
28-Sep-2012 |
nicolasroard <nicolasroard@google.com> |
Change the slider values range to -100 -> 100 bug:7247494 Change-Id: Ie007d93ac5e6c412fb97c1fc8cfb383387cec2a0
rc/com/android/gallery3d/filtershow/ui/SliderController.java
|
7caab0dc36f69b4c51c39bd191f2df44ea586b70 |
28-Sep-2012 |
nicolasroard <nicolasroard@google.com> |
Change the slider values range to -100 -> 100 bug:7247494 Change-Id: Ie007d93ac5e6c412fb97c1fc8cfb383387cec2a0
rc/com/android/gallery3d/filtershow/ui/SliderController.java
|
225824cbef6c7742c989406fae2ff80d53dce343 |
28-Sep-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am 5fd38ec0: am 20ee087f: am 75a93c78: Merge "Fixed behavior for back key when viewing download." into gb-ub-photos-arches * commit '5fd38ec03f619c4f8226600f6fce9ea0e481f40a': Fixed behavior for back key when viewing download.
|
4358788c1afa885bce13db0a747bd50dd5e6e07a |
28-Sep-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am 20ee087f: am 75a93c78: Merge "Fixed behavior for back key when viewing download." into gb-ub-photos-arches * commit '20ee087f90ea1205761f4aa1f27f1914adad6bed': Fixed behavior for back key when viewing download.
|
5fd38ec03f619c4f8226600f6fce9ea0e481f40a |
28-Sep-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am 20ee087f: am 75a93c78: Merge "Fixed behavior for back key when viewing download." into gb-ub-photos-arches * commit '20ee087f90ea1205761f4aa1f27f1914adad6bed': Fixed behavior for back key when viewing download.
|
20ee087f90ea1205761f4aa1f27f1914adad6bed |
28-Sep-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am 75a93c78: Merge "Fixed behavior for back key when viewing download." into gb-ub-photos-arches * commit '75a93c78cd2a09eff08c16c6fee2bf683f483027': Fixed behavior for back key when viewing download.
|
31fa7f67f39d04b772e468e48ff4efdb8cd61f29 |
28-Sep-2012 |
Ruben Brunk <rubenbrunk@google.com> |
am 75a93c78: Merge "Fixed behavior for back key when viewing download." into gb-ub-photos-arches * commit '75a93c78cd2a09eff08c16c6fee2bf683f483027': Fixed behavior for back key when viewing download.
|
d2a39c1a71a6f93d64e4a0101e2faed0ecca72af |
28-Sep-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Fixed behavior for back key when viewing download." into gb-ub-photos-arches
|
75a93c78cd2a09eff08c16c6fee2bf683f483027 |
28-Sep-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Fixed behavior for back key when viewing download." into gb-ub-photos-arches
|
cda5ae868e98e1aad5d2924b3524d7caae1834ba |
28-Sep-2012 |
Bart Sears <bsears@google.com> |
Add FilterShow and clean up native lib handling Bug: 7165910 Add libjni_filtershow_filters to Gallery2 so users can edit photos Bug: 7250099 Remove native libs from the apk in /system/apps Change-Id: I0a8adacdcb4c349861187e4303d08666e204a266
ndroid.mk
|
ec6034e8cac6148aa48e4b2e46f4cf73b6f458dc |
28-Sep-2012 |
Bart Sears <bsears@google.com> |
Add FilterShow and clean up native lib handling Bug: 7165910 Add libjni_filtershow_filters to Gallery2 so users can edit photos Bug: 7250099 Remove native libs from the apk in /system/apps Change-Id: I0a8adacdcb4c349861187e4303d08666e204a266
ndroid.mk
|
2ab89ee752a33addc5f6c5c062865a22895acb46 |
28-Sep-2012 |
Teng-Hui Zhu <ztenghui@google.com> |
am 2dff1b6c: am 86a69307: am 3e77e84c: Merge "Trimming: Use OnClickListener for saving" into gb-ub-photos-arches * commit '2dff1b6c1e4cb38a24ba797305b436c3ab68a1a9': Trimming: Use OnClickListener for saving
|
32afdef67413c41d0c0e250638e1fa53d97423f1 |
28-Sep-2012 |
Teng-Hui Zhu <ztenghui@google.com> |
am 86a69307: am 3e77e84c: Merge "Trimming: Use OnClickListener for saving" into gb-ub-photos-arches * commit '86a693077dbd255939fe0c30edf046acfbff7974': Trimming: Use OnClickListener for saving
|
2dff1b6c1e4cb38a24ba797305b436c3ab68a1a9 |
28-Sep-2012 |
Teng-Hui Zhu <ztenghui@google.com> |
am 86a69307: am 3e77e84c: Merge "Trimming: Use OnClickListener for saving" into gb-ub-photos-arches * commit '86a693077dbd255939fe0c30edf046acfbff7974': Trimming: Use OnClickListener for saving
|
86a693077dbd255939fe0c30edf046acfbff7974 |
28-Sep-2012 |
Teng-Hui Zhu <ztenghui@google.com> |
am 3e77e84c: Merge "Trimming: Use OnClickListener for saving" into gb-ub-photos-arches * commit '3e77e84c66aa5ba2efab7ecc3dd37a03a790af9f': Trimming: Use OnClickListener for saving
|
975ab27c83340af18efba874530accc6d541fb97 |
28-Sep-2012 |
Teng-Hui Zhu <ztenghui@google.com> |
am 3e77e84c: Merge "Trimming: Use OnClickListener for saving" into gb-ub-photos-arches * commit '3e77e84c66aa5ba2efab7ecc3dd37a03a790af9f': Trimming: Use OnClickListener for saving
|
c3865e7023344ab5f4a573835fe032252a697113 |
28-Sep-2012 |
Teng-Hui Zhu <ztenghui@google.com> |
Merge "Trimming: Use OnClickListener for saving" into gb-ub-photos-arches
|
3e77e84c66aa5ba2efab7ecc3dd37a03a790af9f |
28-Sep-2012 |
Teng-Hui Zhu <ztenghui@google.com> |
Merge "Trimming: Use OnClickListener for saving" into gb-ub-photos-arches
|
422bb7887602dc42b87860f1a411b91f37fca185 |
28-Sep-2012 |
Baligh Uddin <baligh@google.com> |
am 7c73fe87: (-s ours) am c697efde: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev * commit '7c73fe877cca43ad3ade03735b49d8e3368332d0': Import translations. DO NOT MERGE
|
7922133f03228a6c1ba8a56c25b2e968ec853db0 |
28-Sep-2012 |
Baligh Uddin <baligh@google.com> |
am d0154609: (-s ours) am 123f653f: am f8706c89: (-s ours) Import translations. DO NOT MERGE * commit 'd015460984f152c7c4ef391ad853094ae74a8023': Import translations. DO NOT MERGE
|
a3918033c0173c6817f7ecc95261b130fc0aa814 |
28-Sep-2012 |
Baligh Uddin <baligh@google.com> |
am c697efde: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev * commit 'c697efde49a8492555d3d5b4595a9c72d3d7a7b4': Import translations. DO NOT MERGE
|
60c2b525c31adadcd6b36053f897f96b09c893a4 |
28-Sep-2012 |
Baligh Uddin <baligh@google.com> |
am 123f653f: (-s ours) am f8706c89: (-s ours) Import translations. DO NOT MERGE * commit '123f653fef5182e4b0b3933a77e15146be6ad82a': Import translations. DO NOT MERGE
|
7c73fe877cca43ad3ade03735b49d8e3368332d0 |
28-Sep-2012 |
Baligh Uddin <baligh@google.com> |
am c697efde: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev * commit 'c697efde49a8492555d3d5b4595a9c72d3d7a7b4': Import translations. DO NOT MERGE
|
d015460984f152c7c4ef391ad853094ae74a8023 |
28-Sep-2012 |
Baligh Uddin <baligh@google.com> |
am 123f653f: am f8706c89: (-s ours) Import translations. DO NOT MERGE * commit '123f653fef5182e4b0b3933a77e15146be6ad82a': Import translations. DO NOT MERGE
|
c697efde49a8492555d3d5b4595a9c72d3d7a7b4 |
28-Sep-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
|
123f653fef5182e4b0b3933a77e15146be6ad82a |
28-Sep-2012 |
Baligh Uddin <baligh@google.com> |
am f8706c89: (-s ours) Import translations. DO NOT MERGE * commit 'f8706c89cb45b45426f6bad8c593191595b043a2': Import translations. DO NOT MERGE
|
58f7545f79e8ee05b4b9486dbc8c857d927a86d7 |
28-Sep-2012 |
Baligh Uddin <baligh@google.com> |
am f8706c89: (-s ours) Import translations. DO NOT MERGE * commit 'f8706c89cb45b45426f6bad8c593191595b043a2': Import translations. DO NOT MERGE
|
f7d68b047d1219a86bd0f39b15e374bcafdb85c3 |
28-Sep-2012 |
Baligh Uddin <baligh@google.com> |
am f8706c89: (-s ours) Import translations. DO NOT MERGE * commit 'f8706c89cb45b45426f6bad8c593191595b043a2': Import translations. DO NOT MERGE
|
e0f0bda307dc8574d20f4fc858ce6ed921361c64 |
28-Sep-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: If271c40e7bebe578dfa2c1590b5333ec67bae65e Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
4a5ec394ac826dbd3b9cc74c4b6486fffe594e5f |
28-Sep-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I504a35d1c058c82e0598b0ac6bfcb79ecfbc70f8 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
30cc04f60001b81606be0c8738322e3c79017732 |
28-Sep-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I44e46936a99438bdd8b4c0cb70aafb254089ea8d Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
b433ea1381f1ce5f9b58acda15c0e0481e892e54 |
28-Sep-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ib4baef1ad1eebf6662df8cf39036011f84b5446d Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
ca5aa4942f65cd44c34e912d91b82436028f3082 |
28-Sep-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ib4baef1ad1eebf6662df8cf39036011f84b5446d Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
9fa1b8fabcc52a077abb2b5667699be59291fd7b |
28-Sep-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I14dfb266d984cb34719216018aecae3d07e79e9f Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
f8706c89cb45b45426f6bad8c593191595b043a2 |
28-Sep-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I14dfb266d984cb34719216018aecae3d07e79e9f Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
3c8e25d190e6f7e75be6ce75d4e6a882e824f5ed |
28-Sep-2012 |
Teng-Hui Zhu <ztenghui@google.com> |
Trimming: Use OnClickListener for saving bug:7093055 Change-Id: I4b6b408bb051aa1a7fb506f0b5d1db75fe3f1a2f
rc/com/android/gallery3d/app/TrimVideo.java
|
4450e439731d12638525c86a36cd26ac97bdc735 |
28-Sep-2012 |
Teng-Hui Zhu <ztenghui@google.com> |
Trimming: Use OnClickListener for saving bug:7093055 Change-Id: I4b6b408bb051aa1a7fb506f0b5d1db75fe3f1a2f
rc/com/android/gallery3d/app/TrimVideo.java
|
eae15a6d2ebbd5f27b2b91ceff7a77d2592914f9 |
28-Sep-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
bf7dd4cf74f1c6103004a3e3ed24b410bf3d2d59 |
28-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
am 8bde7ba1: am 3235768b: am c7e3c76d: Show a placeholder when the camera filmstrip is empty * commit '8bde7ba1ca46d3d9d2548bcde17e1508882729ac': Show a placeholder when the camera filmstrip is empty
|
a49c677c4fd1c40a8e3dea3c2152c3d79a699873 |
28-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
am 3235768b: am c7e3c76d: Show a placeholder when the camera filmstrip is empty * commit '3235768b6bf413e56fb76b469a7699a1df0107dd': Show a placeholder when the camera filmstrip is empty
|
8bde7ba1ca46d3d9d2548bcde17e1508882729ac |
28-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
am 3235768b: am c7e3c76d: Show a placeholder when the camera filmstrip is empty * commit '3235768b6bf413e56fb76b469a7699a1df0107dd': Show a placeholder when the camera filmstrip is empty
|
3235768b6bf413e56fb76b469a7699a1df0107dd |
28-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
am c7e3c76d: Show a placeholder when the camera filmstrip is empty * commit 'c7e3c76d6965f520a9651d309052c5f01726cd58': Show a placeholder when the camera filmstrip is empty
|
147541cd31e11099a3f92f37fea91d9933deddc6 |
28-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
am c7e3c76d: Show a placeholder when the camera filmstrip is empty * commit 'c7e3c76d6965f520a9651d309052c5f01726cd58': Show a placeholder when the camera filmstrip is empty
|
eecfffd67a1de914add60529aa55d33e5d28ac7a |
28-Sep-2012 |
Mangesh Ghiware <mghiware@google.com> |
am 8c3fe294: am bd1c876a: am 2e8472f3: Merge "Update to sharing panorama" into gb-ub-photos-arches * commit '8c3fe294e0de284407e507ab4bf54246a31189ec': Update to sharing panorama
|
19feb85efbf1479420f2e3858ec4892b02b4bbcc |
28-Sep-2012 |
nicolasroard <nicolasroard@google.com> |
am 3a3cbbd7: am 625a1ec6: am 5a429e56: Merge "Use an actionbar - move the "show original" button to the bottom left - move the history button to the overflow menu for now - add a reset item in the overflow menu." into gb-ub-photos-arches * commit '3a3cbbd70865eff4835af1e668b9c53e8f6914e9': Use an actionbar - move the "show original" button to the bottom left - move the history button to the overflow menu for now - add a reset item in the overflow menu.
|
758d578f1492149726eb77c1d74a4ec2af981b90 |
28-Sep-2012 |
Baligh Uddin <baligh@google.com> |
am d916f7de: (-s ours) am 2a4847a6: am 8473d944: (-s ours) Import translations. DO NOT MERGE * commit 'd916f7de8de3e6233597efc48cfbb8d2b5e2f773': Import translations. DO NOT MERGE
|
1743964660882d3960f5d3ea0bc1dec7f43e2cbc |
28-Sep-2012 |
Baligh Uddin <baligh@google.com> |
am ac7d9c93: (-s ours) am 00495d88: Import translations. DO NOT MERGE * commit 'ac7d9c939c6d56e0a81c7e7b65b3ecc4ed308a05': Import translations. DO NOT MERGE
|
0fa0d96e5e0a8be32066740288ada89e938c33a8 |
28-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
Show a placeholder when the camera filmstrip is empty Bug: 7213757 Tapping the placeholder takes the user back to the full-screen camera capture mode. Change-Id: I844f789b8e80f34e79f4a9c366c1c244bbf1f2a5
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/data/ActionImage.java
rc/com/android/gallery3d/data/EmptyAlbumImage.java
rc/com/android/gallery3d/data/FilterEmptyPromptSet.java
rc/com/android/gallery3d/data/FilterSource.java
rc/com/android/gallery3d/data/MediaObject.java
rc/com/android/gallery3d/data/UnlockImage.java
rc/com/android/gallery3d/ui/PhotoView.java
|
c7e3c76d6965f520a9651d309052c5f01726cd58 |
28-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
Show a placeholder when the camera filmstrip is empty Bug: 7213757 Tapping the placeholder takes the user back to the full-screen camera capture mode. Change-Id: I844f789b8e80f34e79f4a9c366c1c244bbf1f2a5
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/data/ActionImage.java
rc/com/android/gallery3d/data/EmptyAlbumImage.java
rc/com/android/gallery3d/data/FilterEmptyPromptSet.java
rc/com/android/gallery3d/data/FilterSource.java
rc/com/android/gallery3d/data/MediaObject.java
rc/com/android/gallery3d/data/UnlockImage.java
rc/com/android/gallery3d/ui/PhotoView.java
|
59a1cf8e25c61579da651177703cd03aae96db0d |
28-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
am 976a6076: am 8a7f0bd6: am 624ed9df: Fix up button behavior in camera app * commit '976a60766e1cdbf07d308489aa9e7e892787be2b': Fix up button behavior in camera app
|
5003601c51d30105cd1e2aaf2902f2378b61b69e |
28-Sep-2012 |
nicolasroard <nicolasroard@google.com> |
am ba079a2f: am 56c1aed4: am 863b4e65: We weren\'t applying the parameter on an existing filter * commit 'ba079a2f8d77bba214ec3da2a40b0dd1028113e1': We weren't applying the parameter on an existing filter
|
132d6fee5c36551ed2497508569f7c88c9864b5f |
28-Sep-2012 |
nicolasroard <nicolasroard@google.com> |
am 566d8175: am d019ac64: am 9579b815: Only apply the parameter to the currently edited filter * commit '566d81757ffbf97c9c54c5fd9edd3411c1207eef': Only apply the parameter to the currently edited filter
|
e504a2e4394725884e33a642c234aecfb194279f |
28-Sep-2012 |
John Reck <jreck@google.com> |
am a30fc48a: am 9ad74d1f: am 98d17b86: Merge "Fix Monkey NPE" into gb-ub-photos-arches * commit 'a30fc48a05fc89f02540b8406dd258d0c0ec10b2': Fix Monkey NPE
|
08a3d4fd1f56400d41235b2090f406f5d40998b7 |
28-Sep-2012 |
nicolasroard <nicolasroard@google.com> |
am 02519387: am 8d7ea82d: am 02f778af: Remove the pie slider, add a linear slider * commit '025193871d921c3249f061c188c1004a2ee570aa': Remove the pie slider, add a linear slider
|
5675549630a0517a05b87e73154e1c7abfd9af6c |
28-Sep-2012 |
Teng-Hui Zhu <ztenghui@google.com> |
am d5da6e0a: am cf5247ae: am 65f1bad3: Merge "Trimming: clean up the UI for trimming." into gb-ub-photos-arches * commit 'd5da6e0a0e0cee6fbd44d6577b5f5eb206d46169': Trimming: clean up the UI for trimming.
|
caf8f9a969798a3f1f755623d3d439f31a4986de |
28-Sep-2012 |
nicolasroard <nicolasroard@google.com> |
am 541eaa3d: am 4112a244: am f37e1e9a: Add the intent filter to start the new editor Set Gallery to identify as needing a largeHeap * commit '541eaa3d57af95ebc326c4a5dcdb81a6156b9420': Add the intent filter to start the new editor Set Gallery to identify as needing a largeHeap
|
f83b3cf1727a6d4460b6162ca5e803785c6d0280 |
28-Sep-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am bc708a02: (-s ours) Reconcile with jb-mr1-release - do not merge * commit 'bc708a022422571d2719e1ecaa7961c20f8337c9':
|
9803f290bfe1059abb46cebeeb7f76410db2df09 |
28-Sep-2012 |
Baligh Uddin <baligh@google.com> |
am 44de1c86: (-s ours) am bb742fca: am 8f6dc9ea: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches * commit '44de1c865919bbab4481fc18297054ea76c7c69e': Import translations. DO NOT MERGE
|
a506634c4b1811222771d0403447319bc287f166 |
28-Sep-2012 |
Baligh Uddin <baligh@google.com> |
am fd0d9750: (-s ours) am f1ace7ee: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev * commit 'fd0d9750683c0288912e76843b2de8ba24b0f10c': Import translations. DO NOT MERGE
|
848984c629e0f5bc89b1772745db1fc8529246fd |
28-Sep-2012 |
Mangesh Ghiware <mghiware@google.com> |
am bd1c876a: am 2e8472f3: Merge "Update to sharing panorama" into gb-ub-photos-arches * commit 'bd1c876a885f14f489b612e90a1a8d94a5040732': Update to sharing panorama
|
8c3fe294e0de284407e507ab4bf54246a31189ec |
28-Sep-2012 |
Mangesh Ghiware <mghiware@google.com> |
am bd1c876a: am 2e8472f3: Merge "Update to sharing panorama" into gb-ub-photos-arches * commit 'bd1c876a885f14f489b612e90a1a8d94a5040732': Update to sharing panorama
|
c771afa89c6bf45ec0e34224003ea9e07b8ea1e7 |
28-Sep-2012 |
Mangesh Ghiware <mghiware@google.com> |
am 2e8472f3: Merge "Update to sharing panorama" into gb-ub-photos-arches * commit '2e8472f304737acc3fbeb167b1b6f660f111f5c7': Update to sharing panorama
|
1bda464668b85132940390ee81e74e93925064fd |
28-Sep-2012 |
Mangesh Ghiware <mghiware@google.com> |
am 2e8472f3: Merge "Update to sharing panorama" into gb-ub-photos-arches * commit '2e8472f304737acc3fbeb167b1b6f660f111f5c7': Update to sharing panorama
|
bd1c876a885f14f489b612e90a1a8d94a5040732 |
28-Sep-2012 |
Mangesh Ghiware <mghiware@google.com> |
am 2e8472f3: Merge "Update to sharing panorama" into gb-ub-photos-arches * commit '2e8472f304737acc3fbeb167b1b6f660f111f5c7': Update to sharing panorama
|
0f1b184926ce211f79e73a9f7f20b4b4407ea383 |
28-Sep-2012 |
Mangesh Ghiware <mghiware@google.com> |
Merge "Update to sharing panorama" into gb-ub-photos-arches
|
d9b8148210e667c19835460260b8609ac0ad4299 |
28-Sep-2012 |
Mangesh Ghiware <mghiware@google.com> |
Merge "Update to sharing panorama" into gb-ub-photos-arches
|
2e8472f304737acc3fbeb167b1b6f660f111f5c7 |
28-Sep-2012 |
Mangesh Ghiware <mghiware@google.com> |
Merge "Update to sharing panorama" into gb-ub-photos-arches
|
2f589c8a35aee7fe17e899e2a3872f1473f3a176 |
28-Sep-2012 |
Mangesh Ghiware <mghiware@google.com> |
Update to sharing panorama Bug: 7150324 Use separate share intents for sharing panoarma and regular JPGs. If photo is a 360 panorama, promote sharing it on the action bar, and move sharing as JPG to overflow menu. MIME type changed to specify panorama360. Change-Id: I8d52733d105820ac17ff36a6ad9d7525893f6d27
es/menu/operation.xml
es/menu/photo.xml
es/values/strings.xml
|
5c9b8b60fec038876778093edbb1fba4005e696a |
28-Sep-2012 |
Mangesh Ghiware <mghiware@google.com> |
Update to sharing panorama Bug: 7150324 Use separate share intents for sharing panoarma and regular JPGs. If photo is a 360 panorama, promote sharing it on the action bar, and move sharing as JPG to overflow menu. MIME type changed to specify panorama360. Change-Id: I8d52733d105820ac17ff36a6ad9d7525893f6d27
rc/com/android/gallery3d/app/GalleryActionBar.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/ui/ActionModeHandler.java
rc/com/android/gallery3d/ui/MenuExecutor.java
rc/com/android/gallery3d/util/GalleryUtils.java
|
5172dee697c05235ddf932827d75e6fa0b81d382 |
28-Sep-2012 |
Mangesh Ghiware <mghiware@google.com> |
Update to sharing panorama Bug: 7150324 Use separate share intents for sharing panoarma and regular JPGs. If photo is a 360 panorama, promote sharing it on the action bar, and move sharing as JPG to overflow menu. MIME type changed to specify panorama360. Change-Id: I8d52733d105820ac17ff36a6ad9d7525893f6d27
es/menu/operation.xml
es/menu/photo.xml
es/values/strings.xml
rc/com/android/gallery3d/app/GalleryActionBar.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/ui/ActionModeHandler.java
rc/com/android/gallery3d/ui/MenuExecutor.java
rc/com/android/gallery3d/util/GalleryUtils.java
|
74349befea0938c689375430665d77cde1c24c45 |
28-Sep-2012 |
nicolasroard <nicolasroard@google.com> |
am 625a1ec6: am 5a429e56: Merge "Use an actionbar - move the "show original" button to the bottom left - move the history button to the overflow menu for now - add a reset item in the overflow menu." into gb-ub-photos-arches * commit '625a1ec63d3fa405d375fb74d6fb0544ae8b1b7f': Use an actionbar - move the "show original" button to the bottom left - move the history button to the overflow menu for now - add a reset item in the overflow menu.
|
3a3cbbd70865eff4835af1e668b9c53e8f6914e9 |
28-Sep-2012 |
nicolasroard <nicolasroard@google.com> |
am 625a1ec6: am 5a429e56: Merge "Use an actionbar - move the "show original" button to the bottom left - move the history button to the overflow menu for now - add a reset item in the overflow menu." into gb-ub-photos-arches * commit '625a1ec63d3fa405d375fb74d6fb0544ae8b1b7f': Use an actionbar - move the "show original" button to the bottom left - move the history button to the overflow menu for now - add a reset item in the overflow menu.
|
4ad1985aa0287b6edac9a76e763f54ab9656982d |
28-Sep-2012 |
nicolasroard <nicolasroard@google.com> |
am 5a429e56: Merge "Use an actionbar - move the "show original" button to the bottom left - move the history button to the overflow menu for now - add a reset item in the overflow menu." into gb-ub-photos-arches * commit '5a429e56ccf9b4ba2a0f5248b2e18d35122d6af6': Use an actionbar - move the "show original" button to the bottom left - move the history button to the overflow menu for now - add a reset item in the overflow menu.
|
8020c8597d4a97c583a4f1ca5660641c72ab53a8 |
28-Sep-2012 |
nicolasroard <nicolasroard@google.com> |
am 5a429e56: Merge "Use an actionbar - move the "show original" button to the bottom left - move the history button to the overflow menu for now - add a reset item in the overflow menu." into gb-ub-photos-arches * commit '5a429e56ccf9b4ba2a0f5248b2e18d35122d6af6': Use an actionbar - move the "show original" button to the bottom left - move the history button to the overflow menu for now - add a reset item in the overflow menu.
|
625a1ec63d3fa405d375fb74d6fb0544ae8b1b7f |
28-Sep-2012 |
nicolasroard <nicolasroard@google.com> |
am 5a429e56: Merge "Use an actionbar - move the "show original" button to the bottom left - move the history button to the overflow menu for now - add a reset item in the overflow menu." into gb-ub-photos-arches * commit '5a429e56ccf9b4ba2a0f5248b2e18d35122d6af6': Use an actionbar - move the "show original" button to the bottom left - move the history button to the overflow menu for now - add a reset item in the overflow menu.
|
dcd0a794cd6d9d6726a3c285b8a00a295293a27c |
28-Sep-2012 |
nicolasroard <nicolasroard@google.com> |
Merge "Use an actionbar - move the "show original" button to the bottom left - move the history button to the overflow menu for now - add a reset item in the overflow menu." into gb-ub-photos-arches
|
15ecac8f62d550de5e6f597630c650a92ae67d9c |
28-Sep-2012 |
nicolasroard <nicolasroard@google.com> |
Merge "Use an actionbar - move the "show original" button to the bottom left - move the history button to the overflow menu for now - add a reset item in the overflow menu." into gb-ub-photos-arches
|
5a429e56ccf9b4ba2a0f5248b2e18d35122d6af6 |
28-Sep-2012 |
nicolasroard <nicolasroard@google.com> |
Merge "Use an actionbar - move the "show original" button to the bottom left - move the history button to the overflow menu for now - add a reset item in the overflow menu." into gb-ub-photos-arches
|
386bef8a09e46ff306981f9ed15c70f78a7728eb |
28-Sep-2012 |
nicolasroard <nicolasroard@google.com> |
Use an actionbar - move the "show original" button to the bottom left - move the history button to the overflow menu for now - add a reset item in the overflow menu. bug:7234317 bug:7233975 bug:7233986 Change-Id: Icc1d03d1e1ce18f38b1169b466be62645424bc7e
ndroidManifest.xml
|
78042f39d3a48819303f2a78151a6a78f766096c |
28-Sep-2012 |
nicolasroard <nicolasroard@google.com> |
Use an actionbar - move the "show original" button to the bottom left - move the history button to the overflow menu for now - add a reset item in the overflow menu. bug:7234317 bug:7233975 bug:7233986 Change-Id: Icc1d03d1e1ce18f38b1169b466be62645424bc7e
es/layout/filtershow_activity.xml
es/menu/filtershow_activity_menu.xml
es/values/filtershow_strings.xml
|
62a3e83ecf62fc3ecb789a8dd73559e2b701f482 |
28-Sep-2012 |
nicolasroard <nicolasroard@google.com> |
Use an actionbar - move the "show original" button to the bottom left - move the history button to the overflow menu for now - add a reset item in the overflow menu. bug:7234317 bug:7233975 bug:7233986 Change-Id: Icc1d03d1e1ce18f38b1169b466be62645424bc7e
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/imageshow/ImageShow.java
rc/com/android/gallery3d/filtershow/imageshow/ImageSmallFilter.java
rc/com/android/gallery3d/filtershow/imageshow/ImageVignette.java
|
9594c8d3e0dd0d6157710ceae1d1deea8e566db4 |
28-Sep-2012 |
nicolasroard <nicolasroard@google.com> |
Use an actionbar - move the "show original" button to the bottom left - move the history button to the overflow menu for now - add a reset item in the overflow menu. bug:7234317 bug:7233975 bug:7233986 Change-Id: Icc1d03d1e1ce18f38b1169b466be62645424bc7e
ndroidManifest.xml
es/layout/filtershow_activity.xml
es/menu/filtershow_activity_menu.xml
es/values/filtershow_strings.xml
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/imageshow/ImageShow.java
rc/com/android/gallery3d/filtershow/imageshow/ImageSmallFilter.java
rc/com/android/gallery3d/filtershow/imageshow/ImageVignette.java
|
d916f7de8de3e6233597efc48cfbb8d2b5e2f773 |
28-Sep-2012 |
Baligh Uddin <baligh@google.com> |
am 2a4847a6: am 8473d944: (-s ours) Import translations. DO NOT MERGE * commit '2a4847a6fd70872b30b6824fb2c68118a27595dd': Import translations. DO NOT MERGE
|
ac7d9c939c6d56e0a81c7e7b65b3ecc4ed308a05 |
28-Sep-2012 |
Baligh Uddin <baligh@google.com> |
am 00495d88: Import translations. DO NOT MERGE * commit '00495d882702b3c34724f8d0b972e882ae4363df': Import translations. DO NOT MERGE
|
b36357608919217cf696391459e67f029a6c769a |
28-Sep-2012 |
Baligh Uddin <baligh@google.com> |
am 2a4847a6: (-s ours) am 8473d944: (-s ours) Import translations. DO NOT MERGE * commit '2a4847a6fd70872b30b6824fb2c68118a27595dd': Import translations. DO NOT MERGE
|
ee9d5f399f27863c476cea5f55e9d926489176b5 |
28-Sep-2012 |
Baligh Uddin <baligh@google.com> |
am 00495d88: (-s ours) Import translations. DO NOT MERGE * commit '00495d882702b3c34724f8d0b972e882ae4363df': Import translations. DO NOT MERGE
|
359a6a982b1c0138453ebf3f732dfa17b9fe773e |
28-Sep-2012 |
Baligh Uddin <baligh@google.com> |
am 8473d944: (-s ours) Import translations. DO NOT MERGE * commit '8473d94491059a07e9969de14751d5d3fd929061': Import translations. DO NOT MERGE
|
40788b37ebcddcb4bf4da806078eff531c51f40a |
28-Sep-2012 |
Baligh Uddin <baligh@google.com> |
am 8473d944: (-s ours) Import translations. DO NOT MERGE * commit '8473d94491059a07e9969de14751d5d3fd929061': Import translations. DO NOT MERGE
|
2a4847a6fd70872b30b6824fb2c68118a27595dd |
28-Sep-2012 |
Baligh Uddin <baligh@google.com> |
am 8473d944: (-s ours) Import translations. DO NOT MERGE * commit '8473d94491059a07e9969de14751d5d3fd929061': Import translations. DO NOT MERGE
|
deb9beb08aa8091194d1e0fd7f40a521804560e2 |
28-Sep-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ice7c798eb84e35599d3789e18590a3c78bdd4e72 Auto-generated-cl: translation import
es/values-sw/strings.xml
|
00495d882702b3c34724f8d0b972e882ae4363df |
28-Sep-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I0129ab582567ff7cb3d4202d5a489fe0e09e3b86 Auto-generated-cl: translation import
es/values-sw/strings.xml
|
9bda68667a422e2ca631c45bdbadc706fa0be2b1 |
28-Sep-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ic8a187f10f834eb210e087835664ebcb784a59cd Auto-generated-cl: translation import
es/values-sw/strings.xml
|
3bfb808c259dc095e28b3aa227986a583ad49e4f |
28-Sep-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I852979bedb664fdc7ac3bcde8e0491269e0719f5 Auto-generated-cl: translation import
es/values-de/strings.xml
es/values-es/strings.xml
es/values-sw/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
|
0ee657be6200a11dd8f3b7a1903595fc0329f382 |
28-Sep-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I852979bedb664fdc7ac3bcde8e0491269e0719f5 Auto-generated-cl: translation import
es/values-de/strings.xml
es/values-es/strings.xml
es/values-sw/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
|
ed4cddcd2b11f841564de4ec2082ed2579199378 |
28-Sep-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I7669fd2cd14f553106779c0a60e60400d6c9f196 Auto-generated-cl: translation import
es/values-sw/strings.xml
|
8473d94491059a07e9969de14751d5d3fd929061 |
28-Sep-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I7669fd2cd14f553106779c0a60e60400d6c9f196 Auto-generated-cl: translation import
es/values-sw/strings.xml
|
976a60766e1cdbf07d308489aa9e7e892787be2b |
28-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
am 8a7f0bd6: am 624ed9df: Fix up button behavior in camera app * commit '8a7f0bd6c9897a8191bdefd26e4a67ab3a601548': Fix up button behavior in camera app
|
cbb68584b63a7d6d74051ee76019dcd5d1d9990a |
28-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
am 8a7f0bd6: am 624ed9df: Fix up button behavior in camera app * commit '8a7f0bd6c9897a8191bdefd26e4a67ab3a601548': Fix up button behavior in camera app
|
8a7f0bd6c9897a8191bdefd26e4a67ab3a601548 |
28-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
am 624ed9df: Fix up button behavior in camera app * commit '624ed9df710ac4e34f3ff1d0c3bf4acd1c056258': Fix up button behavior in camera app
|
d5f7a8be68d1eab95f05fa6b28e76c192a6a9238 |
28-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
am 624ed9df: Fix up button behavior in camera app * commit '624ed9df710ac4e34f3ff1d0c3bf4acd1c056258': Fix up button behavior in camera app
|
7e1f12f95dcc79fc2edce5344d032aba1bd53f8d |
28-Sep-2012 |
John Reck <jreck@google.com> |
Fix Monkey NPE Bug: 7243032 Change-Id: I0e8757e6108f2e86bf4608b1535b1c528f2f3197
rc/com/android/gallery3d/app/PhotoPage.java
|
3a80bbf1edc5f8180be20c67288791267907f857 |
28-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
Fix up button behavior in camera app Bug: 7233448 Change-Id: Ifb2833f6c1303dc60a9b88b217648d0c0098f242
rc/com/android/gallery3d/app/AlbumPage.java
|
624ed9df710ac4e34f3ff1d0c3bf4acd1c056258 |
28-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
Fix up button behavior in camera app Bug: 7233448 Change-Id: Ifb2833f6c1303dc60a9b88b217648d0c0098f242
rc/com/android/gallery3d/app/AlbumPage.java
|
ba079a2f8d77bba214ec3da2a40b0dd1028113e1 |
28-Sep-2012 |
nicolasroard <nicolasroard@google.com> |
am 56c1aed4: am 863b4e65: We weren\'t applying the parameter on an existing filter * commit '56c1aed46be3c42a169f9da3545cb565b0732107': We weren't applying the parameter on an existing filter
|
d9c2860fdeb45dccdf553999cb03c066972fec6b |
28-Sep-2012 |
nicolasroard <nicolasroard@google.com> |
am 56c1aed4: am 863b4e65: We weren\'t applying the parameter on an existing filter * commit '56c1aed46be3c42a169f9da3545cb565b0732107': We weren't applying the parameter on an existing filter
|
56c1aed46be3c42a169f9da3545cb565b0732107 |
28-Sep-2012 |
nicolasroard <nicolasroard@google.com> |
am 863b4e65: We weren\'t applying the parameter on an existing filter * commit '863b4e65d172a19111f46e43f97e7e41927a3bc7': We weren't applying the parameter on an existing filter
|
7cf9695e62cf1697bf2735df81972a7980fa3bce |
28-Sep-2012 |
nicolasroard <nicolasroard@google.com> |
am 863b4e65: We weren\'t applying the parameter on an existing filter * commit '863b4e65d172a19111f46e43f97e7e41927a3bc7': We weren't applying the parameter on an existing filter
|
311b00eff28ab8ab7710f1f26242ebc2b0bf390a |
28-Sep-2012 |
nicolasroard <nicolasroard@google.com> |
We weren't applying the parameter on an existing filter bug:7247494 Change-Id: I482eecc34a5f91bc7d2cc5986e79b832b9aa3ef2
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
|
863b4e65d172a19111f46e43f97e7e41927a3bc7 |
28-Sep-2012 |
nicolasroard <nicolasroard@google.com> |
We weren't applying the parameter on an existing filter bug:7247494 Change-Id: I482eecc34a5f91bc7d2cc5986e79b832b9aa3ef2
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
|
2c98029df8115d44daa55963676ddcafce95c28c |
28-Sep-2012 |
nicolasroard <nicolasroard@google.com> |
am d019ac64: am 9579b815: Only apply the parameter to the currently edited filter * commit 'd019ac64c24d03873ba5983193f3fb10163e625c': Only apply the parameter to the currently edited filter
|
566d81757ffbf97c9c54c5fd9edd3411c1207eef |
28-Sep-2012 |
nicolasroard <nicolasroard@google.com> |
am d019ac64: am 9579b815: Only apply the parameter to the currently edited filter * commit 'd019ac64c24d03873ba5983193f3fb10163e625c': Only apply the parameter to the currently edited filter
|
d019ac64c24d03873ba5983193f3fb10163e625c |
28-Sep-2012 |
nicolasroard <nicolasroard@google.com> |
am 9579b815: Only apply the parameter to the currently edited filter * commit '9579b81504c16ac77aa7442767fbabe6abcfe24b': Only apply the parameter to the currently edited filter
|
4c4034d5df210470bfa34cc5350b6ac5d0126992 |
28-Sep-2012 |
nicolasroard <nicolasroard@google.com> |
am 9579b815: Only apply the parameter to the currently edited filter * commit '9579b81504c16ac77aa7442767fbabe6abcfe24b': Only apply the parameter to the currently edited filter
|
9426121f6e581e8cc40818d93d340511863c4462 |
28-Sep-2012 |
nicolasroard <nicolasroard@google.com> |
am 9579b815: Only apply the parameter to the currently edited filter * commit '9579b81504c16ac77aa7442767fbabe6abcfe24b': Only apply the parameter to the currently edited filter
|
a22d07e5fb84b10c8234a4eeb953b4cdbab574d2 |
28-Sep-2012 |
nicolasroard <nicolasroard@google.com> |
Only apply the parameter to the currently edited filter bug:7247494 Change-Id: I88b90ee5ea1d5bb83342a4be392308ea756375a1
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
|
fae561c02aeb1058c149a56a1b51eac8d4a82c62 |
28-Sep-2012 |
nicolasroard <nicolasroard@google.com> |
Only apply the parameter to the currently edited filter bug:7247494 Change-Id: I88b90ee5ea1d5bb83342a4be392308ea756375a1
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/filters/ImageFilter.java
rc/com/android/gallery3d/filtershow/imageshow/ImageShow.java
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
|
9579b81504c16ac77aa7442767fbabe6abcfe24b |
28-Sep-2012 |
nicolasroard <nicolasroard@google.com> |
Only apply the parameter to the currently edited filter bug:7247494 Change-Id: I88b90ee5ea1d5bb83342a4be392308ea756375a1
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/filters/ImageFilter.java
rc/com/android/gallery3d/filtershow/imageshow/ImageShow.java
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
|
5d997675cb97da94dfa81621132320086c549b08 |
28-Sep-2012 |
Teng-Hui Zhu <ztenghui@google.com> |
am 30be070c: am b6f203d2: am 27e933b0: Merge "Trimming: switch to use sherlock action bar" into gb-ub-photos-arches * commit '30be070cc0ce11d9c18d023a8f069e33cfa0503c': Trimming: switch to use sherlock action bar
|
2e008aa4b6fccd5af4b5161a79307e326831e103 |
28-Sep-2012 |
John Reck <jreck@google.com> |
am 9ad74d1f: am 98d17b86: Merge "Fix Monkey NPE" into gb-ub-photos-arches * commit '9ad74d1f01a322173d259fce1f90a59de39cc903': Fix Monkey NPE
|
a30fc48a05fc89f02540b8406dd258d0c0ec10b2 |
28-Sep-2012 |
John Reck <jreck@google.com> |
am 9ad74d1f: am 98d17b86: Merge "Fix Monkey NPE" into gb-ub-photos-arches * commit '9ad74d1f01a322173d259fce1f90a59de39cc903': Fix Monkey NPE
|
9ad74d1f01a322173d259fce1f90a59de39cc903 |
28-Sep-2012 |
John Reck <jreck@google.com> |
am 98d17b86: Merge "Fix Monkey NPE" into gb-ub-photos-arches * commit '98d17b863a5c8dc194496422459e73d7d38a2b9e': Fix Monkey NPE
|
664382a33a62086b5590576acb54bd373ea60a32 |
28-Sep-2012 |
John Reck <jreck@google.com> |
am 98d17b86: Merge "Fix Monkey NPE" into gb-ub-photos-arches * commit '98d17b863a5c8dc194496422459e73d7d38a2b9e': Fix Monkey NPE
|
8d07dc69a802696ea722ddade749bb573aa7d87c |
28-Sep-2012 |
John Reck <jreck@google.com> |
Merge "Fix Monkey NPE" into gb-ub-photos-arches
|
98d17b863a5c8dc194496422459e73d7d38a2b9e |
28-Sep-2012 |
John Reck <jreck@google.com> |
Merge "Fix Monkey NPE" into gb-ub-photos-arches
|
5fd03bcec942e73b8c4422aaf41739e19a58533e |
28-Sep-2012 |
nicolasroard <nicolasroard@google.com> |
am 8d7ea82d: am 02f778af: Remove the pie slider, add a linear slider * commit '8d7ea82d99eef07925f47237abef4ee5844e59ed': Remove the pie slider, add a linear slider
|
025193871d921c3249f061c188c1004a2ee570aa |
28-Sep-2012 |
nicolasroard <nicolasroard@google.com> |
am 8d7ea82d: am 02f778af: Remove the pie slider, add a linear slider * commit '8d7ea82d99eef07925f47237abef4ee5844e59ed': Remove the pie slider, add a linear slider
|
8d7ea82d99eef07925f47237abef4ee5844e59ed |
28-Sep-2012 |
nicolasroard <nicolasroard@google.com> |
am 02f778af: Remove the pie slider, add a linear slider * commit '02f778af1f8a2250d91da450f82c30572de96062': Remove the pie slider, add a linear slider
|
48d45b0d42d7daa1c824b5ef84850802d27dad54 |
28-Sep-2012 |
nicolasroard <nicolasroard@google.com> |
am 02f778af: Remove the pie slider, add a linear slider * commit '02f778af1f8a2250d91da450f82c30572de96062': Remove the pie slider, add a linear slider
|
90b3fa4aa65b332aebe5bcc0a87a74770adaecf1 |
28-Sep-2012 |
nicolasroard <nicolasroard@google.com> |
Remove the pie slider, add a linear slider bug:7247494 Change-Id: Id002b46d4a0ee0ff2a3ed9c4924defd0b1760b79
rc/com/android/gallery3d/filtershow/imageshow/ImageShow.java
rc/com/android/gallery3d/filtershow/imageshow/ImageSmallFilter.java
rc/com/android/gallery3d/filtershow/ui/PieSlider.java
rc/com/android/gallery3d/filtershow/ui/PieSliderListener.java
rc/com/android/gallery3d/filtershow/ui/SliderController.java
rc/com/android/gallery3d/filtershow/ui/SliderListener.java
|
02f778af1f8a2250d91da450f82c30572de96062 |
28-Sep-2012 |
nicolasroard <nicolasroard@google.com> |
Remove the pie slider, add a linear slider bug:7247494 Change-Id: Id002b46d4a0ee0ff2a3ed9c4924defd0b1760b79
rc/com/android/gallery3d/filtershow/imageshow/ImageShow.java
rc/com/android/gallery3d/filtershow/imageshow/ImageSmallFilter.java
rc/com/android/gallery3d/filtershow/ui/PieSlider.java
rc/com/android/gallery3d/filtershow/ui/PieSliderListener.java
rc/com/android/gallery3d/filtershow/ui/SliderController.java
rc/com/android/gallery3d/filtershow/ui/SliderListener.java
|
6bc3fdbb2dd48d74428aa0de57d725a65d68e2f5 |
28-Sep-2012 |
John Reck <jreck@google.com> |
Fix Monkey NPE Bug: 7243032 Change-Id: I0e8757e6108f2e86bf4608b1535b1c528f2f3197
rc/com/android/gallery3d/app/PhotoPage.java
|
53fe9f72433f2fdae30e1708c5933390202cbcf5 |
28-Sep-2012 |
John Reck <jreck@google.com> |
Fix Monkey NPE Bug: 7243032 Change-Id: I0e8757e6108f2e86bf4608b1535b1c528f2f3197
rc/com/android/gallery3d/app/PhotoPage.java
|
d5da6e0a0e0cee6fbd44d6577b5f5eb206d46169 |
27-Sep-2012 |
Teng-Hui Zhu <ztenghui@google.com> |
am cf5247ae: am 65f1bad3: Merge "Trimming: clean up the UI for trimming." into gb-ub-photos-arches * commit 'cf5247ae5a105dfff156cb739619484c6e35b233': Trimming: clean up the UI for trimming.
|
c5a25d369499437e61c809c3824aeaffe4381db0 |
27-Sep-2012 |
Teng-Hui Zhu <ztenghui@google.com> |
am cf5247ae: am 65f1bad3: Merge "Trimming: clean up the UI for trimming." into gb-ub-photos-arches * commit 'cf5247ae5a105dfff156cb739619484c6e35b233': Trimming: clean up the UI for trimming.
|
cf5247ae5a105dfff156cb739619484c6e35b233 |
27-Sep-2012 |
Teng-Hui Zhu <ztenghui@google.com> |
am 65f1bad3: Merge "Trimming: clean up the UI for trimming." into gb-ub-photos-arches * commit '65f1bad399eca7fe1e31808f2cb0ad3c9399901e': Trimming: clean up the UI for trimming.
|
4a073e44cc2d85f831c927a9645981e59dc8204e |
27-Sep-2012 |
Teng-Hui Zhu <ztenghui@google.com> |
am 65f1bad3: Merge "Trimming: clean up the UI for trimming." into gb-ub-photos-arches * commit '65f1bad399eca7fe1e31808f2cb0ad3c9399901e': Trimming: clean up the UI for trimming.
|
32b7ca4f98bdb3742a63a77f1bf1ef2b2a71ab5b |
27-Sep-2012 |
Teng-Hui Zhu <ztenghui@google.com> |
am 65f1bad3: Merge "Trimming: clean up the UI for trimming." into gb-ub-photos-arches * commit '65f1bad399eca7fe1e31808f2cb0ad3c9399901e': Trimming: clean up the UI for trimming.
|
65f1bad399eca7fe1e31808f2cb0ad3c9399901e |
27-Sep-2012 |
Teng-Hui Zhu <ztenghui@google.com> |
Merge "Trimming: clean up the UI for trimming." into gb-ub-photos-arches
|
541eaa3d57af95ebc326c4a5dcdb81a6156b9420 |
27-Sep-2012 |
nicolasroard <nicolasroard@google.com> |
am 4112a244: am f37e1e9a: Add the intent filter to start the new editor Set Gallery to identify as needing a largeHeap * commit '4112a24405bfe7591553c871eb3c17f8324dd0a2': Add the intent filter to start the new editor Set Gallery to identify as needing a largeHeap
|
b22c3caa460bc0ac57461de8078734919943376f |
27-Sep-2012 |
nicolasroard <nicolasroard@google.com> |
am 4112a244: am f37e1e9a: Add the intent filter to start the new editor Set Gallery to identify as needing a largeHeap * commit '4112a24405bfe7591553c871eb3c17f8324dd0a2': Add the intent filter to start the new editor Set Gallery to identify as needing a largeHeap
|
3f73074198f5ea2cf48271583792e19769191e57 |
27-Sep-2012 |
nicolasroard <nicolasroard@google.com> |
am f37e1e9a: Add the intent filter to start the new editor Set Gallery to identify as needing a largeHeap * commit 'f37e1e9a9ce5aade5ccb1ad24b754bde29327716': Add the intent filter to start the new editor Set Gallery to identify as needing a largeHeap
|
4112a24405bfe7591553c871eb3c17f8324dd0a2 |
27-Sep-2012 |
nicolasroard <nicolasroard@google.com> |
am f37e1e9a: Add the intent filter to start the new editor Set Gallery to identify as needing a largeHeap * commit 'f37e1e9a9ce5aade5ccb1ad24b754bde29327716': Add the intent filter to start the new editor Set Gallery to identify as needing a largeHeap
|
b4f1161da4662e6374238b7b749e7a3a4122eccd |
27-Sep-2012 |
nicolasroard <nicolasroard@google.com> |
Add the intent filter to start the new editor Set Gallery to identify as needing a largeHeap bug:7246621 Change-Id: I2d5bad8ea13353e9eb95ce8a7bc27e858c4c1d94
ndroidManifest.xml
|
f37e1e9a9ce5aade5ccb1ad24b754bde29327716 |
27-Sep-2012 |
nicolasroard <nicolasroard@google.com> |
Add the intent filter to start the new editor Set Gallery to identify as needing a largeHeap bug:7246621 Change-Id: I2d5bad8ea13353e9eb95ce8a7bc27e858c4c1d94
ndroidManifest.xml
|
b10a2712931ba35d35f3f795beb585eca4ce6738 |
27-Sep-2012 |
Teng-Hui Zhu <ztenghui@google.com> |
Trimming: clean up the UI for trimming. Get rid of the home button and use the done button only in the action bar. Switch back to use system actionbar / activity. Rename the ShortenExample. bug:7093240 Change-Id: I61684e9723af12cecc212bbd911c23aab0258463
rc/com/android/gallery3d/app/ShortenExample.java
rc/com/android/gallery3d/app/TrimVideo.java
rc/com/android/gallery3d/app/TrimVideoUtils.java
|
028ecd4e3bbd68c3b5b2fb91d3e7a666bc151765 |
27-Sep-2012 |
Teng-Hui Zhu <ztenghui@google.com> |
Trimming: clean up the UI for trimming. Get rid of the home button and use the done button only in the action bar. Switch back to use system actionbar / activity. Rename the ShortenExample. bug:7093240 Change-Id: I61684e9723af12cecc212bbd911c23aab0258463
es/layout/trim_menu.xml
es/menu/trim.xml
rc/com/android/gallery3d/app/ShortenExample.java
rc/com/android/gallery3d/app/TrimVideo.java
rc/com/android/gallery3d/app/TrimVideoUtils.java
|
90a84cc76823f691506fc5bd4a40778472f094e9 |
27-Sep-2012 |
Teng-Hui Zhu <ztenghui@google.com> |
Trimming: clean up the UI for trimming. Get rid of the home button and use the done button only in the action bar. Switch back to use system actionbar / activity. Rename the ShortenExample. bug:7093240 Change-Id: I61684e9723af12cecc212bbd911c23aab0258463
es/layout/trim_menu.xml
es/menu/trim.xml
|
bc708a022422571d2719e1ecaa7961c20f8337c9 |
27-Sep-2012 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with jb-mr1-release - do not merge Change-Id: Ie39273be5576eb018617e94534e1560c78adede8
|
d3e1dd8874f76829bf1c260779c0031742ec9217 |
27-Sep-2012 |
Baligh Uddin <baligh@google.com> |
am bb742fca: (-s ours) am 8f6dc9ea: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches * commit 'bb742fca07ea48737e01c06c8b940a5389a72262': Import translations. DO NOT MERGE
|
44de1c865919bbab4481fc18297054ea76c7c69e |
27-Sep-2012 |
Baligh Uddin <baligh@google.com> |
am bb742fca: am 8f6dc9ea: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches * commit 'bb742fca07ea48737e01c06c8b940a5389a72262': Import translations. DO NOT MERGE
|
f2ea468c7705c2f01909b6aafefaba513fd1524f |
27-Sep-2012 |
Baligh Uddin <baligh@google.com> |
am 8f6dc9ea: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches * commit '8f6dc9eab9feca563b08400a7ebd74fb5d0e3075': Import translations. DO NOT MERGE
|
e06b86996c2443c8996c9af68d6a773c1e81f08a |
27-Sep-2012 |
Baligh Uddin <baligh@google.com> |
am 8f6dc9ea: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches * commit '8f6dc9eab9feca563b08400a7ebd74fb5d0e3075': Import translations. DO NOT MERGE
|
bb742fca07ea48737e01c06c8b940a5389a72262 |
27-Sep-2012 |
Baligh Uddin <baligh@google.com> |
am 8f6dc9ea: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches * commit '8f6dc9eab9feca563b08400a7ebd74fb5d0e3075': Import translations. DO NOT MERGE
|
8f6dc9eab9feca563b08400a7ebd74fb5d0e3075 |
27-Sep-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
|
3f81eebebdcd1183eb422562e5a2b8a4dfcdd96a |
27-Sep-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
|
ad298e789d17bc89ec072a6a0968552eec2fa7c7 |
27-Sep-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
|
97d46fbcb43084bc4368d89223d0602a2202bebc |
27-Sep-2012 |
Baligh Uddin <baligh@google.com> |
am f1ace7ee: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev * commit 'f1ace7eec5ffba5918b3fb9e710f75ea867f42c1': Import translations. DO NOT MERGE
|
fd0d9750683c0288912e76843b2de8ba24b0f10c |
27-Sep-2012 |
Baligh Uddin <baligh@google.com> |
am f1ace7ee: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev * commit 'f1ace7eec5ffba5918b3fb9e710f75ea867f42c1': Import translations. DO NOT MERGE
|
f1ace7eec5ffba5918b3fb9e710f75ea867f42c1 |
27-Sep-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
|
c4bd50c0485691d3921607518aeba1b79874e828 |
27-Sep-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE"
|
30be070cc0ce11d9c18d023a8f069e33cfa0503c |
27-Sep-2012 |
Teng-Hui Zhu <ztenghui@google.com> |
am b6f203d2: am 27e933b0: Merge "Trimming: switch to use sherlock action bar" into gb-ub-photos-arches * commit 'b6f203d25b64e31062f0a3b040eeb5f5da464200': Trimming: switch to use sherlock action bar
|
bacaa99ca3eae39595e41117ff3eb6b3cb5a9a15 |
27-Sep-2012 |
Teng-Hui Zhu <ztenghui@google.com> |
am 27e933b0: Merge "Trimming: switch to use sherlock action bar" into gb-ub-photos-arches * commit '27e933b00279c177ae0d36b599aa1c90870922c1': Trimming: switch to use sherlock action bar
|
b1a8a35f92a7e696002db1c3b55d3544ba9ab6c3 |
27-Sep-2012 |
Teng-Hui Zhu <ztenghui@google.com> |
am 27e933b0: Merge "Trimming: switch to use sherlock action bar" into gb-ub-photos-arches * commit '27e933b00279c177ae0d36b599aa1c90870922c1': Trimming: switch to use sherlock action bar
|
b6f203d25b64e31062f0a3b040eeb5f5da464200 |
27-Sep-2012 |
Teng-Hui Zhu <ztenghui@google.com> |
am 27e933b0: Merge "Trimming: switch to use sherlock action bar" into gb-ub-photos-arches * commit '27e933b00279c177ae0d36b599aa1c90870922c1': Trimming: switch to use sherlock action bar
|
3c196bbaf191c7b0dbb54d45a2f74eb4a78f8943 |
27-Sep-2012 |
Teng-Hui Zhu <ztenghui@google.com> |
Merge "Trimming: switch to use sherlock action bar" into gb-ub-photos-arches
|
27e933b00279c177ae0d36b599aa1c90870922c1 |
27-Sep-2012 |
Teng-Hui Zhu <ztenghui@google.com> |
Merge "Trimming: switch to use sherlock action bar" into gb-ub-photos-arches
|
199e0c868b6bb09ba8ad0bb4b2efc903c0ae7216 |
27-Sep-2012 |
Teng-Hui Zhu <ztenghui@google.com> |
Merge "Trimming: switch to use sherlock action bar" into gb-ub-photos-arches
|
9fe814ed280a24c29afb744143e554d8c05d0358 |
27-Sep-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
1dfb273b20f2f1c66bd73e753b8e1df7aef65669 |
27-Sep-2012 |
Wu-cheng Li <wuchengli@google.com> |
am d0f7f1c9: am 30270915: am 743f8152: Several secure album changes. * commit 'd0f7f1c96ecbc6f4f8cd99d088720a2cc8fab92e': Several secure album changes.
|
d0f7f1c96ecbc6f4f8cd99d088720a2cc8fab92e |
27-Sep-2012 |
Wu-cheng Li <wuchengli@google.com> |
am 30270915: am 743f8152: Several secure album changes. * commit '30270915eb98894dd9ea1f613749ba0dd41fefe4': Several secure album changes.
|
30270915eb98894dd9ea1f613749ba0dd41fefe4 |
27-Sep-2012 |
Wu-cheng Li <wuchengli@google.com> |
am 743f8152: Several secure album changes. * commit '743f8152a1dd6ea47bcabc6fd95b6e8d8f1cd3e5': Several secure album changes.
|
dda5dc7b367e32aa2470a6e6d394348fc4cd7c8e |
27-Sep-2012 |
Wu-cheng Li <wuchengli@google.com> |
am 743f8152: Several secure album changes. * commit '743f8152a1dd6ea47bcabc6fd95b6e8d8f1cd3e5': Several secure album changes.
|
c30be26365c447b44fd783ddaead57c797249ef3 |
27-Sep-2012 |
Wu-cheng Li <wuchengli@google.com> |
am 743f8152: Several secure album changes. * commit '743f8152a1dd6ea47bcabc6fd95b6e8d8f1cd3e5': Several secure album changes.
|
07754f138bf0f1f23c952af3375889121df131b1 |
27-Sep-2012 |
Wu-cheng Li <wuchengli@google.com> |
Several secure album changes. - Make the lock screen photo be a standard portrait size photo - In the filmstrip, have the first tap on the lock screen photo take the user directly to the unlock screen. - Switch the asset to be a "locked" lock rather than an "unlocked" lock. bug:7192331 Change-Id: If7541cd67cdfb711f8dd721796db3343ae91343a
rc/com/android/gallery3d/data/UnlockImage.java
rc/com/android/gallery3d/ui/PhotoView.java
|
743f8152a1dd6ea47bcabc6fd95b6e8d8f1cd3e5 |
27-Sep-2012 |
Wu-cheng Li <wuchengli@google.com> |
Several secure album changes. - Make the lock screen photo be a standard portrait size photo - In the filmstrip, have the first tap on the lock screen photo take the user directly to the unlock screen. - Switch the asset to be a "locked" lock rather than an "unlocked" lock. bug:7192331 Change-Id: If7541cd67cdfb711f8dd721796db3343ae91343a
es/drawable-hdpi/ic_lockscreen_handle_normal.png
es/drawable-hdpi/ic_lockscreen_unlock_normal.png
es/drawable-mdpi/ic_lockscreen_handle_normal.png
es/drawable-mdpi/ic_lockscreen_unlock_normal.png
es/drawable-xhdpi/ic_lockscreen_handle_normal.png
es/drawable-xhdpi/ic_lockscreen_unlock_normal.png
rc/com/android/gallery3d/data/UnlockImage.java
rc/com/android/gallery3d/ui/PhotoView.java
|
24aa42330264fa9c7afea15441d8ac7d639b5368 |
27-Sep-2012 |
Wu-cheng Li <wuchengli@google.com> |
Several secure album changes. - Make the lock screen photo be a standard portrait size photo - In the filmstrip, have the first tap on the lock screen photo take the user directly to the unlock screen. - Switch the asset to be a "locked" lock rather than an "unlocked" lock. bug:7192331 Change-Id: If7541cd67cdfb711f8dd721796db3343ae91343a
es/drawable-hdpi/ic_lockscreen_handle_normal.png
es/drawable-hdpi/ic_lockscreen_unlock_normal.png
es/drawable-mdpi/ic_lockscreen_handle_normal.png
es/drawable-mdpi/ic_lockscreen_unlock_normal.png
es/drawable-xhdpi/ic_lockscreen_handle_normal.png
es/drawable-xhdpi/ic_lockscreen_unlock_normal.png
|
86d65e8323633bcd38703b9f9118b8c828dd7c14 |
27-Sep-2012 |
Owen Lin <owenlin@google.com> |
am 84604e89: am 8c60119e: am 4419f551: Merge "Don\'t set treat back as up if there is no parent album." into gb-ub-photos-arches * commit '84604e89cff6dca8f0f69247a3939e1a3e7268d7': Don't set treat back as up if there is no parent album.
|
84604e89cff6dca8f0f69247a3939e1a3e7268d7 |
27-Sep-2012 |
Owen Lin <owenlin@google.com> |
am 8c60119e: am 4419f551: Merge "Don\'t set treat back as up if there is no parent album." into gb-ub-photos-arches * commit '8c60119e20aa43bda2ccc3dee0da6ea6498e9a53': Don't set treat back as up if there is no parent album.
|
8c60119e20aa43bda2ccc3dee0da6ea6498e9a53 |
27-Sep-2012 |
Owen Lin <owenlin@google.com> |
am 4419f551: Merge "Don\'t set treat back as up if there is no parent album." into gb-ub-photos-arches * commit '4419f551b4ccb7457626dbb5a37c41afd71eb5ed': Don't set treat back as up if there is no parent album.
|
70f9283e24335dc39f0cb61b6eb4d46ec2108f73 |
27-Sep-2012 |
Owen Lin <owenlin@google.com> |
am 4419f551: Merge "Don\'t set treat back as up if there is no parent album." into gb-ub-photos-arches * commit '4419f551b4ccb7457626dbb5a37c41afd71eb5ed': Don't set treat back as up if there is no parent album.
|
39834b19e5d60fa86213b166fa5f72d1d9e8916d |
27-Sep-2012 |
Owen Lin <owenlin@google.com> |
Merge "Don't set treat back as up if there is no parent album." into gb-ub-photos-arches
|
4419f551b4ccb7457626dbb5a37c41afd71eb5ed |
27-Sep-2012 |
Owen Lin <owenlin@google.com> |
Merge "Don't set treat back as up if there is no parent album." into gb-ub-photos-arches
|
bb208dfe8c73dd086cc24075199d83d0ec40299c |
27-Sep-2012 |
Wu-cheng Li <wuchengli@google.com> |
am 3591c016: am f452f5d6: am b904ecba: Merge "Show unlock image in secure album only when camera roll has items." into gb-ub-photos-arches * commit '3591c0168f0bee381b893886db7bad0f92be91a8': Show unlock image in secure album only when camera roll has items.
|
3591c0168f0bee381b893886db7bad0f92be91a8 |
27-Sep-2012 |
Wu-cheng Li <wuchengli@google.com> |
am f452f5d6: am b904ecba: Merge "Show unlock image in secure album only when camera roll has items." into gb-ub-photos-arches * commit 'f452f5d6e4750cecdc9d0483767bae4fc7da83f2': Show unlock image in secure album only when camera roll has items.
|
f452f5d6e4750cecdc9d0483767bae4fc7da83f2 |
27-Sep-2012 |
Wu-cheng Li <wuchengli@google.com> |
am b904ecba: Merge "Show unlock image in secure album only when camera roll has items." into gb-ub-photos-arches * commit 'b904ecba4fed5c6abd877a326acfbd0440887b62': Show unlock image in secure album only when camera roll has items.
|
0912dc4a0c546e8044ca6ed698b67264eccc7c5a |
27-Sep-2012 |
Wu-cheng Li <wuchengli@google.com> |
am b904ecba: Merge "Show unlock image in secure album only when camera roll has items." into gb-ub-photos-arches * commit 'b904ecba4fed5c6abd877a326acfbd0440887b62': Show unlock image in secure album only when camera roll has items.
|
89b3bb0b52f5285eb2f67af335e994eb6a9cb2f6 |
27-Sep-2012 |
Wu-cheng Li <wuchengli@google.com> |
Merge "Show unlock image in secure album only when camera roll has items." into gb-ub-photos-arches
|
b904ecba4fed5c6abd877a326acfbd0440887b62 |
27-Sep-2012 |
Wu-cheng Li <wuchengli@google.com> |
Merge "Show unlock image in secure album only when camera roll has items." into gb-ub-photos-arches
|
b6a506fc5f5b05a478e2159c5454edde71c05832 |
27-Sep-2012 |
Wu-cheng Li <wuchengli@google.com> |
am 30e8718a: am c51c17dc: am 53605baf: Merge "Fix background replacement crash in camcorder." into gb-ub-photos-arches * commit '30e8718a1ed96683506fe81b11f3364cd5279ce6': Fix background replacement crash in camcorder.
|
30e8718a1ed96683506fe81b11f3364cd5279ce6 |
27-Sep-2012 |
Wu-cheng Li <wuchengli@google.com> |
am c51c17dc: am 53605baf: Merge "Fix background replacement crash in camcorder." into gb-ub-photos-arches * commit 'c51c17dca15f7926dc1cd6e0f044e80e716d18dd': Fix background replacement crash in camcorder.
|
c51c17dca15f7926dc1cd6e0f044e80e716d18dd |
27-Sep-2012 |
Wu-cheng Li <wuchengli@google.com> |
am 53605baf: Merge "Fix background replacement crash in camcorder." into gb-ub-photos-arches * commit '53605baff27905497fa38ec3887db1d031af5152': Fix background replacement crash in camcorder.
|
8c09bd6a63613e5d0a2736e0b0960851ff72a17c |
27-Sep-2012 |
Wu-cheng Li <wuchengli@google.com> |
am 53605baf: Merge "Fix background replacement crash in camcorder." into gb-ub-photos-arches * commit '53605baff27905497fa38ec3887db1d031af5152': Fix background replacement crash in camcorder.
|
53605baff27905497fa38ec3887db1d031af5152 |
27-Sep-2012 |
Wu-cheng Li <wuchengli@google.com> |
Merge "Fix background replacement crash in camcorder." into gb-ub-photos-arches
|
23c71c4053b914ac86367704bd9a1402dd8a88c8 |
27-Sep-2012 |
Wu-cheng Li <wuchengli@google.com> |
Fix background replacement crash in camcorder. Add proguard flag to prevent methods from removing. bug:7106963 Change-Id: I0e7372c3091dd02d4b475924d06b033717ca2028
roguard.flags
|
81e863b2aed2e7e7fcd2e9cd541ad05f46e01646 |
27-Sep-2012 |
Wu-cheng Li <wuchengli@google.com> |
Fix background replacement crash in camcorder. Add proguard flag to prevent methods from removing. bug:7106963 Change-Id: I0e7372c3091dd02d4b475924d06b033717ca2028
roguard.flags
|
b2875cbc572a30b31f4df24187a7c5e6873dfd0a |
27-Sep-2012 |
nicolasroard <nicolasroard@google.com> |
am 2d15f1a9: am 990c0725: am e3f9f579: Load the correct library... * commit '2d15f1a9f19d34f5d920f07f32f24aa6ced373d9': Load the correct library...
|
2d15f1a9f19d34f5d920f07f32f24aa6ced373d9 |
27-Sep-2012 |
nicolasroard <nicolasroard@google.com> |
am 990c0725: am e3f9f579: Load the correct library... * commit '990c072597b7836105a5ff4e7ec2483f8899b61e': Load the correct library...
|
fa6203dce535093150b9e3e129674c0c5a2ef218 |
27-Sep-2012 |
nicolasroard <nicolasroard@google.com> |
am e3f9f579: Load the correct library... * commit 'e3f9f579d73af613a33ba1d0a93dc101ea671a69': Load the correct library...
|
990c072597b7836105a5ff4e7ec2483f8899b61e |
27-Sep-2012 |
nicolasroard <nicolasroard@google.com> |
am e3f9f579: Load the correct library... * commit 'e3f9f579d73af613a33ba1d0a93dc101ea671a69': Load the correct library...
|
4b167794899049a659636523fb2efb275799b535 |
27-Sep-2012 |
nicolasroard <nicolasroard@google.com> |
Load the correct library... bug:7165910 Change-Id: I4cb19078b00268f179722a1c8ed594e68b35e953
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
|
e3f9f579d73af613a33ba1d0a93dc101ea671a69 |
27-Sep-2012 |
nicolasroard <nicolasroard@google.com> |
Load the correct library... bug:7165910 Change-Id: I4cb19078b00268f179722a1c8ed594e68b35e953
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
|
f439b7b5d46a0bea7bef3bca36df1adac47cde88 |
27-Sep-2012 |
nicolasroard <nicolasroard@google.com> |
am 475ef139: am f1e7d8e3: am 69d781ad: Fix the build * commit '475ef1396249298d0dc72354967029677629e781': Fix the build
|
475ef1396249298d0dc72354967029677629e781 |
27-Sep-2012 |
nicolasroard <nicolasroard@google.com> |
am f1e7d8e3: am 69d781ad: Fix the build * commit 'f1e7d8e3973dd809aae97adbee9f3f3d3c2a903f': Fix the build
|
ad1eaed6b065b6f3d4858538a3f80044a4e09dbe |
27-Sep-2012 |
nicolasroard <nicolasroard@google.com> |
am 69d781ad: Fix the build * commit '69d781ad1a135615a6d0e7cd6cf41db8fb9eabca': Fix the build
|
f1e7d8e3973dd809aae97adbee9f3f3d3c2a903f |
27-Sep-2012 |
nicolasroard <nicolasroard@google.com> |
am 69d781ad: Fix the build * commit '69d781ad1a135615a6d0e7cd6cf41db8fb9eabca': Fix the build
|
adb1a927280c471ed9f5435aade393aa7c427860 |
27-Sep-2012 |
nicolasroard <nicolasroard@google.com> |
Fix the build Change-Id: I6e645b5f5835ff4871881a7b73685fe074bce924
ni/Android.mk
|
08388e68673628c801c742aef8f5bf6ec41fc61f |
27-Sep-2012 |
nicolasroard <nicolasroard@google.com> |
Fix the build Change-Id: I6e645b5f5835ff4871881a7b73685fe074bce924
ni/Android.mk
|
69d781ad1a135615a6d0e7cd6cf41db8fb9eabca |
27-Sep-2012 |
nicolasroard <nicolasroard@google.com> |
Fix the build Change-Id: I6e645b5f5835ff4871881a7b73685fe074bce924
ni/Android.mk
|
f5b88e01430c24c9d21055a1e5656fea4f3fd6ae |
26-Sep-2012 |
Teng-Hui Zhu <ztenghui@google.com> |
Trimming: switch to use sherlock action bar Show a "done" instead of the icon according to the UX team. And we don't have API level dependency. bug:7093240 Change-Id: Ib331495dd233c4dcbeb3d587bd5a4d0d89039d49
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
|
71111a19a258ded2c9e899d0e4632ea283c8ae8d |
26-Sep-2012 |
Teng-Hui Zhu <ztenghui@google.com> |
Trimming: switch to use sherlock action bar Show a "done" instead of the icon according to the UX team. And we don't have API level dependency. bug:7093240 Change-Id: Ib331495dd233c4dcbeb3d587bd5a4d0d89039d49
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
rc/com/android/gallery3d/app/TrimVideo.java
rc/com/android/gallery3d/ui/MenuExecutor.java
|
5e92668f42b5f29a0e55653b0bbf2df342723a6d |
26-Sep-2012 |
Teng-Hui Zhu <ztenghui@google.com> |
Trimming: switch to use sherlock action bar Show a "done" instead of the icon according to the UX team. And we don't have API level dependency. bug:7093240 Change-Id: Ib331495dd233c4dcbeb3d587bd5a4d0d89039d49
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
es/menu/trim.xml
rc/com/android/gallery3d/app/TrimVideo.java
rc/com/android/gallery3d/ui/MenuExecutor.java
|
9275314bcfe1f96e09708ade409310b1a84ac073 |
26-Sep-2012 |
Teng-Hui Zhu <ztenghui@google.com> |
Trimming: switch to use sherlock action bar Show a "done" instead of the icon according to the UX team. And we don't have API level dependency. bug:7093240 Change-Id: Ib331495dd233c4dcbeb3d587bd5a4d0d89039d49
es/menu/trim.xml
|
5583fffebd55143f656548f6d53bbcdd4dc8686d |
27-Sep-2012 |
John Reck <jreck@google.com> |
am e8c1c44c: am d2fd71f8: am 2ce4bec8: Only create debugTag if necessary * commit 'e8c1c44c65e384b847b54557cefdff6a330ee9fc': Only create debugTag if necessary
|
75d0ea42dc29a47dbea676d7f5dc528e966840b2 |
27-Sep-2012 |
John Reck <jreck@google.com> |
am 46f8372b: am 2c55a48e: am 8fe22ecb: Don\'t requery a constant * commit '46f8372b2e056839fe65a923428e6878cbf22520': Don't requery a constant
|
e8c1c44c65e384b847b54557cefdff6a330ee9fc |
27-Sep-2012 |
John Reck <jreck@google.com> |
am d2fd71f8: am 2ce4bec8: Only create debugTag if necessary * commit 'd2fd71f89c6caf8e2dca4aeca1e1da1807a125ec': Only create debugTag if necessary
|
46f8372b2e056839fe65a923428e6878cbf22520 |
27-Sep-2012 |
John Reck <jreck@google.com> |
am 2c55a48e: am 8fe22ecb: Don\'t requery a constant * commit '2c55a48ebbb94f1595fef943fea375290327b8c6': Don't requery a constant
|
0b498001922b0f4c157d60af345e75663793b944 |
27-Sep-2012 |
John Reck <jreck@google.com> |
am 2ce4bec8: Only create debugTag if necessary * commit '2ce4bec82fd46ff71ee4a586719904a6313689bf': Only create debugTag if necessary
|
ec6b6c8ad32ee958ebe0277e20dbf7aa6bc63875 |
27-Sep-2012 |
John Reck <jreck@google.com> |
am 8fe22ecb: Don\'t requery a constant * commit '8fe22ecb8e744a09a2e0d867f876ecbf74c82298': Don't requery a constant
|
d2fd71f89c6caf8e2dca4aeca1e1da1807a125ec |
27-Sep-2012 |
John Reck <jreck@google.com> |
am 2ce4bec8: Only create debugTag if necessary * commit '2ce4bec82fd46ff71ee4a586719904a6313689bf': Only create debugTag if necessary
|
2c55a48ebbb94f1595fef943fea375290327b8c6 |
27-Sep-2012 |
John Reck <jreck@google.com> |
am 8fe22ecb: Don\'t requery a constant * commit '8fe22ecb8e744a09a2e0d867f876ecbf74c82298': Don't requery a constant
|
ff0dba310d010dc19ee6968bc6a9ac7fc3615cbc |
27-Sep-2012 |
John Reck <jreck@google.com> |
Only create debugTag if necessary Bug: 7238418 String concatenation isn't free Change-Id: I510a89ef8b673efb631d6f8929ab3d9d9b454931
rc/com/android/gallery3d/data/ImageCacheRequest.java
|
2ce4bec82fd46ff71ee4a586719904a6313689bf |
27-Sep-2012 |
John Reck <jreck@google.com> |
Only create debugTag if necessary Bug: 7238418 String concatenation isn't free Change-Id: I510a89ef8b673efb631d6f8929ab3d9d9b454931
rc/com/android/gallery3d/data/ImageCacheRequest.java
|
8fe22ecb8e744a09a2e0d867f876ecbf74c82298 |
27-Sep-2012 |
John Reck <jreck@google.com> |
Don't requery a constant Bug: 7238418 Change-Id: I1b7117cd30ffc51b51980830791779ec899c2f4b
rc/com/android/gallery3d/app/PhotoPage.java
|
656321672d728d390db78f5bf5ed1601287d6225 |
27-Sep-2012 |
John Reck <jreck@google.com> |
Don't requery a constant Bug: 7238418 Change-Id: I1b7117cd30ffc51b51980830791779ec899c2f4b
rc/com/android/gallery3d/app/PhotoPage.java
|
476c1fff028ab51358ac1505ed8caa97904f7afe |
27-Sep-2012 |
nicolasroard <nicolasroard@google.com> |
am 8fd42e1f: am 0ccadcf4: am 0d7cdf8e: Initial import of the new image editor * commit '8fd42e1fc5f8800660576c29676ee69fb11bf2e1': Initial import of the new image editor
|
8fd42e1fc5f8800660576c29676ee69fb11bf2e1 |
27-Sep-2012 |
nicolasroard <nicolasroard@google.com> |
am 0ccadcf4: am 0d7cdf8e: Initial import of the new image editor * commit '0ccadcf4a32a5bcdd97efd81da2312d38d4707df': Initial import of the new image editor
|
c1e0fb373631b1212ea476ca809cf57dd6c1ec8a |
27-Sep-2012 |
nicolasroard <nicolasroard@google.com> |
am 0d7cdf8e: Initial import of the new image editor * commit '0d7cdf8e763fb65c32bfad65245b3753deb75737': Initial import of the new image editor
|
18cd5169e41e3ff7b274614ed9ebdcd3a135da42 |
27-Sep-2012 |
nicolasroard <nicolasroard@google.com> |
am 0d7cdf8e: Initial import of the new image editor * commit '0d7cdf8e763fb65c32bfad65245b3753deb75737': Initial import of the new image editor
|
0ccadcf4a32a5bcdd97efd81da2312d38d4707df |
27-Sep-2012 |
nicolasroard <nicolasroard@google.com> |
am 0d7cdf8e: Initial import of the new image editor * commit '0d7cdf8e763fb65c32bfad65245b3753deb75737': Initial import of the new image editor
|
a21fca7316757b9e311a6fbcd82f1cf54e45e3fa |
25-Sep-2012 |
nicolasroard <nicolasroard@google.com> |
Initial import of the new image editor bug:7165910 Change-Id: I756d6594f5bddd233772c979410362ca22e232a3
ndroidManifest.xml
|
4cc4609f572bb0e98328735c19619211b75a4091 |
25-Sep-2012 |
nicolasroard <nicolasroard@google.com> |
Initial import of the new image editor bug:7165910 Change-Id: I756d6594f5bddd233772c979410362ca22e232a3
es/drawable/filtershow_background.png
es/drawable/filtershow_border_black.9.png
es/drawable/filtershow_border_film.png
es/drawable/filtershow_border_film2.9.png
es/drawable/filtershow_border_film3.9.png
es/drawable/filtershow_border_rounded_black.9.png
es/drawable/filtershow_border_rounded_white.9.png
es/drawable/filtershow_border_scratch3.9.png
es/drawable/filtershow_border_white.9.png
es/drawable/filtershow_button_background.xml
es/drawable/filtershow_button_border.png
es/drawable/filtershow_button_colors.png
es/drawable/filtershow_button_colors_contrast.png
es/drawable/filtershow_button_colors_curve.png
es/drawable/filtershow_button_colors_sharpen.png
es/drawable/filtershow_button_colors_vignette.png
es/drawable/filtershow_button_current.png
es/drawable/filtershow_button_fx.png
es/drawable/filtershow_button_geometry.png
es/drawable/filtershow_button_geometry_crop.png
es/drawable/filtershow_button_geometry_flip.png
es/drawable/filtershow_button_geometry_rotate.png
es/drawable/filtershow_button_geometry_straighten.png
es/drawable/filtershow_button_operations.png
es/drawable/filtershow_button_origin.png
es/drawable/filtershow_button_redo.png
es/drawable/filtershow_button_selected_background.9.png
es/drawable/filtershow_button_settings.png
es/drawable/filtershow_button_show_original.png
es/drawable/filtershow_button_undo.png
es/layout/filtershow_activity.xml
es/layout/filtershow_history_operation_row.xml
es/menu/filtershow_activity_menu.xml
es/menu/filtershow_menu_curves.xml
es/values/filtershow_color.xml
es/values/filtershow_strings.xml
es/values/filtershow_styles.xml
es/values/filtershow_values_attrs.xml
rc/com/android/gallery3d/filtershow/cache/DelayedPresetCache.java
rc/com/android/gallery3d/filtershow/cache/DirectPresetCache.java
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
rc/com/android/gallery3d/filtershow/presets/ImagePresetBW.java
rc/com/android/gallery3d/filtershow/presets/ImagePresetBWBlue.java
rc/com/android/gallery3d/filtershow/presets/ImagePresetBWGreen.java
rc/com/android/gallery3d/filtershow/presets/ImagePresetBWRed.java
rc/com/android/gallery3d/filtershow/presets/ImagePresetOld.java
rc/com/android/gallery3d/filtershow/presets/ImagePresetSaturated.java
rc/com/android/gallery3d/filtershow/presets/ImagePresetXProcessing.java
|
c3d751a2c2fe39bb0613ce139205bb59e1beb527 |
25-Sep-2012 |
nicolasroard <nicolasroard@google.com> |
Initial import of the new image editor bug:7165910 Change-Id: I756d6594f5bddd233772c979410362ca22e232a3
ni/Android.mk
ni/filters/bw.c
ni/filters/filters.h
ni/filters/gradient.c
ni/filters/saturated.c
ni/filters/vignette.c
|
01dd3d28c08ba52cd5c1a24c473a9d5be87f5919 |
25-Sep-2012 |
nicolasroard <nicolasroard@google.com> |
Initial import of the new image editor bug:7165910 Change-Id: I756d6594f5bddd233772c979410362ca22e232a3
ni/Android.mk
|
0d7cdf8e763fb65c32bfad65245b3753deb75737 |
25-Sep-2012 |
nicolasroard <nicolasroard@google.com> |
Initial import of the new image editor bug:7165910 Change-Id: I756d6594f5bddd233772c979410362ca22e232a3
ndroidManifest.xml
ni/Android.mk
ni/filters/bw.c
ni/filters/filters.h
ni/filters/gradient.c
ni/filters/saturated.c
ni/filters/vignette.c
es/drawable/filtershow_background.png
es/drawable/filtershow_border_black.9.png
es/drawable/filtershow_border_film.png
es/drawable/filtershow_border_film2.9.png
es/drawable/filtershow_border_film3.9.png
es/drawable/filtershow_border_rounded_black.9.png
es/drawable/filtershow_border_rounded_white.9.png
es/drawable/filtershow_border_scratch3.9.png
es/drawable/filtershow_border_white.9.png
es/drawable/filtershow_button_background.xml
es/drawable/filtershow_button_border.png
es/drawable/filtershow_button_colors.png
es/drawable/filtershow_button_colors_contrast.png
es/drawable/filtershow_button_colors_curve.png
es/drawable/filtershow_button_colors_sharpen.png
es/drawable/filtershow_button_colors_vignette.png
es/drawable/filtershow_button_current.png
es/drawable/filtershow_button_fx.png
es/drawable/filtershow_button_geometry.png
es/drawable/filtershow_button_geometry_crop.png
es/drawable/filtershow_button_geometry_flip.png
es/drawable/filtershow_button_geometry_rotate.png
es/drawable/filtershow_button_geometry_straighten.png
es/drawable/filtershow_button_operations.png
es/drawable/filtershow_button_origin.png
es/drawable/filtershow_button_redo.png
es/drawable/filtershow_button_selected_background.9.png
es/drawable/filtershow_button_settings.png
es/drawable/filtershow_button_show_original.png
es/drawable/filtershow_button_undo.png
es/layout/filtershow_activity.xml
es/layout/filtershow_history_operation_row.xml
es/menu/filtershow_activity_menu.xml
es/menu/filtershow_menu_curves.xml
es/values/filtershow_color.xml
es/values/filtershow_strings.xml
es/values/filtershow_styles.xml
es/values/filtershow_values_attrs.xml
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/HistoryAdapter.java
rc/com/android/gallery3d/filtershow/cache/BitmapCache.java
rc/com/android/gallery3d/filtershow/cache/Cache.java
rc/com/android/gallery3d/filtershow/cache/DelayedPresetCache.java
rc/com/android/gallery3d/filtershow/cache/DirectPresetCache.java
rc/com/android/gallery3d/filtershow/cache/ImageLoader.java
rc/com/android/gallery3d/filtershow/filters/ImageFilter.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterBW.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterBWBlue.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterBWGreen.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterBWRed.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterBorder.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterCurves.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterGradient.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterSaturated.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterStraighten.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterVignette.java
rc/com/android/gallery3d/filtershow/imageshow/ImageBorder.java
rc/com/android/gallery3d/filtershow/imageshow/ImageShow.java
rc/com/android/gallery3d/filtershow/imageshow/ImageSmallFilter.java
rc/com/android/gallery3d/filtershow/imageshow/ImageStraighten.java
rc/com/android/gallery3d/filtershow/imageshow/ImageVignette.java
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
rc/com/android/gallery3d/filtershow/presets/ImagePresetBW.java
rc/com/android/gallery3d/filtershow/presets/ImagePresetBWBlue.java
rc/com/android/gallery3d/filtershow/presets/ImagePresetBWGreen.java
rc/com/android/gallery3d/filtershow/presets/ImagePresetBWRed.java
rc/com/android/gallery3d/filtershow/presets/ImagePresetOld.java
rc/com/android/gallery3d/filtershow/presets/ImagePresetSaturated.java
rc/com/android/gallery3d/filtershow/presets/ImagePresetXProcessing.java
rc/com/android/gallery3d/filtershow/tools/SaveCopyTask.java
rc/com/android/gallery3d/filtershow/ui/ControlPoint.java
rc/com/android/gallery3d/filtershow/ui/ImageButtonTitle.java
rc/com/android/gallery3d/filtershow/ui/ImageCurves.java
rc/com/android/gallery3d/filtershow/ui/PieSlider.java
rc/com/android/gallery3d/filtershow/ui/PieSliderListener.java
rc/com/android/gallery3d/filtershow/ui/Spline.java
|
5728a84cf5fa2733b09af06b9016957a9a566624 |
25-Sep-2012 |
nicolasroard <nicolasroard@google.com> |
Initial import of the new image editor bug:7165910 Change-Id: I756d6594f5bddd233772c979410362ca22e232a3
rc/com/android/gallery3d/filtershow/FilterShowActivity.java
rc/com/android/gallery3d/filtershow/HistoryAdapter.java
rc/com/android/gallery3d/filtershow/cache/BitmapCache.java
rc/com/android/gallery3d/filtershow/cache/Cache.java
rc/com/android/gallery3d/filtershow/cache/DelayedPresetCache.java
rc/com/android/gallery3d/filtershow/cache/DirectPresetCache.java
rc/com/android/gallery3d/filtershow/cache/ImageLoader.java
rc/com/android/gallery3d/filtershow/filters/ImageFilter.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterBW.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterBWBlue.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterBWGreen.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterBWRed.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterBorder.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterCurves.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterGradient.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterSaturated.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterStraighten.java
rc/com/android/gallery3d/filtershow/filters/ImageFilterVignette.java
rc/com/android/gallery3d/filtershow/imageshow/ImageBorder.java
rc/com/android/gallery3d/filtershow/imageshow/ImageShow.java
rc/com/android/gallery3d/filtershow/imageshow/ImageSmallFilter.java
rc/com/android/gallery3d/filtershow/imageshow/ImageStraighten.java
rc/com/android/gallery3d/filtershow/imageshow/ImageVignette.java
rc/com/android/gallery3d/filtershow/presets/ImagePreset.java
rc/com/android/gallery3d/filtershow/presets/ImagePresetBW.java
rc/com/android/gallery3d/filtershow/presets/ImagePresetBWBlue.java
rc/com/android/gallery3d/filtershow/presets/ImagePresetBWGreen.java
rc/com/android/gallery3d/filtershow/presets/ImagePresetBWRed.java
rc/com/android/gallery3d/filtershow/presets/ImagePresetOld.java
rc/com/android/gallery3d/filtershow/presets/ImagePresetSaturated.java
rc/com/android/gallery3d/filtershow/presets/ImagePresetXProcessing.java
rc/com/android/gallery3d/filtershow/tools/SaveCopyTask.java
rc/com/android/gallery3d/filtershow/ui/ControlPoint.java
rc/com/android/gallery3d/filtershow/ui/ImageButtonTitle.java
rc/com/android/gallery3d/filtershow/ui/ImageCurves.java
rc/com/android/gallery3d/filtershow/ui/PieSlider.java
rc/com/android/gallery3d/filtershow/ui/PieSliderListener.java
rc/com/android/gallery3d/filtershow/ui/Spline.java
|
778416400c7eed399cc7f11ba47b4c9b568f1dde |
27-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
am 0f7ee82e: am bc0d5b1f: am 833f775a: Fix behavior of up button in Camera app * commit '0f7ee82ef3a20f34f8025a6daedbb695c04eef45': Fix behavior of up button in Camera app
|
0f7ee82ef3a20f34f8025a6daedbb695c04eef45 |
27-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
am bc0d5b1f: am 833f775a: Fix behavior of up button in Camera app * commit 'bc0d5b1fc519e22375c5bef6113a4741427ca241': Fix behavior of up button in Camera app
|
bc0d5b1fc519e22375c5bef6113a4741427ca241 |
27-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
am 833f775a: Fix behavior of up button in Camera app * commit '833f775afc9515567dc5aaf0cafe20e006e77545': Fix behavior of up button in Camera app
|
1c77be868902eb2205a831864795f17f4a93846d |
27-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
am 833f775a: Fix behavior of up button in Camera app * commit '833f775afc9515567dc5aaf0cafe20e006e77545': Fix behavior of up button in Camera app
|
833f775afc9515567dc5aaf0cafe20e006e77545 |
26-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
Fix behavior of up button in Camera app Bug: 7233448 - Up button now goes to gallery root when appropriate. Change-Id: Ib474335b2ac4139e7c5a213bda3efa481b24f224
rc/com/android/gallery3d/app/AlbumPage.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/util/GalleryUtils.java
|
4994b8649de154c59de47cb1a2e14acca1a17096 |
26-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
Fix behavior of up button in Camera app Bug: 7233448 - Up button now goes to gallery root when appropriate. Change-Id: Ib474335b2ac4139e7c5a213bda3efa481b24f224
rc/com/android/gallery3d/app/AlbumPage.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/util/GalleryUtils.java
|
2530899609fa33674c3f40c05899cde79c66b00e |
26-Sep-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I99032c4855dda1658aa1d9fd5bb99a09c4bed693 Auto-generated-cl: translation import
es/values-de/strings.xml
es/values-es/strings.xml
es/values-zh-rCN/strings.xml
|
2560d0515c090ecf8f64e429fa2d0b67ceb29d6f |
26-Sep-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I8e74df054094b23690d3a8859ecd9dbf0c34b58b Auto-generated-cl: translation import
es/values-de/strings.xml
es/values-es/strings.xml
es/values-zh-rCN/strings.xml
|
fc3328d60680552d905483da6988bae7ff55518d |
26-Sep-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I0e0dd8a9535eba225594612835470e1dc0cf89eb Auto-generated-cl: translation import
es/values-de/strings.xml
es/values-es/strings.xml
es/values-zh-rCN/strings.xml
|
49f2394f251badfc5df524eaeccfb9968fec8450 |
26-Sep-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I088c132a236954dd59ea069ab107dd0d4427b54d Auto-generated-cl: translation import
es/values-de/strings.xml
es/values-es/strings.xml
es/values-zh-rCN/strings.xml
|
1c74651f6e2d62152ebb2fc482dfe1b5f0d5363b |
26-Sep-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I088c132a236954dd59ea069ab107dd0d4427b54d Auto-generated-cl: translation import
es/values-de/strings.xml
es/values-es/strings.xml
es/values-zh-rCN/strings.xml
|
e50dbea0579fdf8c66aa934687f55a5383c746a8 |
26-Sep-2012 |
John Reck <jreck@google.com> |
am 992cf160: am def1872d: am 726cbd1a: Merge "Avoid unnecessary allocation" into gb-ub-photos-arches * commit '992cf1600ac238ea3ad9139be2c8a8b4ee0bdfbe': Avoid unnecessary allocation
|
992cf1600ac238ea3ad9139be2c8a8b4ee0bdfbe |
26-Sep-2012 |
John Reck <jreck@google.com> |
am def1872d: am 726cbd1a: Merge "Avoid unnecessary allocation" into gb-ub-photos-arches * commit 'def1872dc0facaee5ef85c1bec7ce21a3f5185a6': Avoid unnecessary allocation
|
def1872dc0facaee5ef85c1bec7ce21a3f5185a6 |
26-Sep-2012 |
John Reck <jreck@google.com> |
am 726cbd1a: Merge "Avoid unnecessary allocation" into gb-ub-photos-arches * commit '726cbd1af44cf7b0f795c4f0639b9b358be960c1': Avoid unnecessary allocation
|
188f300a016e8568d5bebe8065b20e675233baf2 |
26-Sep-2012 |
John Reck <jreck@google.com> |
am 726cbd1a: Merge "Avoid unnecessary allocation" into gb-ub-photos-arches * commit '726cbd1af44cf7b0f795c4f0639b9b358be960c1': Avoid unnecessary allocation
|
726cbd1af44cf7b0f795c4f0639b9b358be960c1 |
26-Sep-2012 |
John Reck <jreck@google.com> |
Merge "Avoid unnecessary allocation" into gb-ub-photos-arches
|
07ada6bf900e104aff8b1c1c6b3e84860afaa53f |
26-Sep-2012 |
John Reck <jreck@google.com> |
Merge "Avoid unnecessary allocation" into gb-ub-photos-arches
|
ab0b6d1f2bf34597fb22e1382bfa122a30987e62 |
26-Sep-2012 |
Teng-Hui Zhu <ztenghui@google.com> |
am fb2431d7: am a9b37429: am eb90d7e2: Merge "Trimming: switch to use selectors." into gb-ub-photos-arches * commit 'fb2431d7877b70e0b14de2dab3f99a6197ce4a14': Trimming: switch to use selectors.
|
fb2431d7877b70e0b14de2dab3f99a6197ce4a14 |
26-Sep-2012 |
Teng-Hui Zhu <ztenghui@google.com> |
am a9b37429: am eb90d7e2: Merge "Trimming: switch to use selectors." into gb-ub-photos-arches * commit 'a9b37429cf4caf22a9b4a2b140f0cc8764e4e0fa': Trimming: switch to use selectors.
|
a9b37429cf4caf22a9b4a2b140f0cc8764e4e0fa |
26-Sep-2012 |
Teng-Hui Zhu <ztenghui@google.com> |
am eb90d7e2: Merge "Trimming: switch to use selectors." into gb-ub-photos-arches * commit 'eb90d7e21a4814a920de5c7d6e5f662d7f0e6865': Trimming: switch to use selectors.
|
02fffa3ddf33c8c0c1a0e93e11f3107329227545 |
26-Sep-2012 |
Teng-Hui Zhu <ztenghui@google.com> |
am eb90d7e2: Merge "Trimming: switch to use selectors." into gb-ub-photos-arches * commit 'eb90d7e21a4814a920de5c7d6e5f662d7f0e6865': Trimming: switch to use selectors.
|
1e7a1ee88488fbdf28e44685a3859225c46483d6 |
26-Sep-2012 |
Teng-Hui Zhu <ztenghui@google.com> |
am eb90d7e2: Merge "Trimming: switch to use selectors." into gb-ub-photos-arches * commit 'eb90d7e21a4814a920de5c7d6e5f662d7f0e6865': Trimming: switch to use selectors.
|
9aab1ed0edf0faf8623390584445eac694a0ece9 |
26-Sep-2012 |
Teng-Hui Zhu <ztenghui@google.com> |
Merge "Trimming: switch to use selectors." into gb-ub-photos-arches
|
eb90d7e21a4814a920de5c7d6e5f662d7f0e6865 |
26-Sep-2012 |
Teng-Hui Zhu <ztenghui@google.com> |
Merge "Trimming: switch to use selectors." into gb-ub-photos-arches
|
50fe1db1e6d10e44eb2416b206249b332b302b32 |
26-Sep-2012 |
Teng-Hui Zhu <ztenghui@google.com> |
Merge "Trimming: switch to use selectors." into gb-ub-photos-arches
|
170a24ba21e9b3d5a3ba03998869a0840122cccd |
25-Sep-2012 |
Teng-Hui Zhu <ztenghui@google.com> |
Trimming: switch to use selectors. Switch into using 2 selectors for the starting and end point of triming. Shift the bar up a bit to accommandate the selectors. bug:7093240 Change-Id: If3b6fe285cd69756ecbfe1d52efd90b499150c72
es/drawable-hdpi/text_select_handle_left.png
es/drawable-hdpi/text_select_handle_right.png
es/drawable-mdpi/text_select_handle_left.png
es/drawable-mdpi/text_select_handle_right.png
es/drawable-xhdpi/text_select_handle_left.png
es/drawable-xhdpi/text_select_handle_right.png
|
9f59a5fa0302f80cd5bd540e864de091fb5703df |
25-Sep-2012 |
Teng-Hui Zhu <ztenghui@google.com> |
Trimming: switch to use selectors. Switch into using 2 selectors for the starting and end point of triming. Shift the bar up a bit to accommandate the selectors. bug:7093240 Change-Id: If3b6fe285cd69756ecbfe1d52efd90b499150c72
es/drawable-hdpi/text_select_handle_left.png
es/drawable-hdpi/text_select_handle_right.png
es/drawable-mdpi/text_select_handle_left.png
es/drawable-mdpi/text_select_handle_right.png
es/drawable-xhdpi/text_select_handle_left.png
es/drawable-xhdpi/text_select_handle_right.png
rc/com/android/gallery3d/app/TimeBar.java
rc/com/android/gallery3d/app/TrimTimeBar.java
|
a33d4f6662b26fcdcc4e92de168260a85631e9b5 |
25-Sep-2012 |
Teng-Hui Zhu <ztenghui@google.com> |
Trimming: switch to use selectors. Switch into using 2 selectors for the starting and end point of triming. Shift the bar up a bit to accommandate the selectors. bug:7093240 Change-Id: If3b6fe285cd69756ecbfe1d52efd90b499150c72
rc/com/android/gallery3d/app/TimeBar.java
rc/com/android/gallery3d/app/TrimTimeBar.java
|
ddf0225a5192a589fc578945f56440b09bf74d12 |
26-Sep-2012 |
John Reck <jreck@google.com> |
Avoid unnecessary allocation Bug: 7238418 Change-Id: Ic0a1ef0368368526401a53f02f680ef9d42ea310
rc/com/android/gallery3d/app/PhotoPage.java
|
a6b46808bda90361903eda14fdb4624ff2a03af4 |
26-Sep-2012 |
John Reck <jreck@google.com> |
Avoid unnecessary allocation Bug: 7238418 Change-Id: Ic0a1ef0368368526401a53f02f680ef9d42ea310
rc/com/android/gallery3d/app/PhotoPage.java
|
79bf0a2c14fdc552db1d36f9fbc0500013af96bf |
20-Sep-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Fixed behavior for back key when viewing download. Bug: 7205463 Bug: 7164238 Bug: 7175040 When viewing an image via the download notification from browser, changed the default behavior of the back key to take the user to the downloads folder. Change-Id: Ia842bfa0f23c3b0ba767e3f0447add2c9b2cc6a7
rc/com/android/gallery3d/data/UriSource.java
|
a04d66ec1561825577b89ca2fa886ba99117002c |
20-Sep-2012 |
Ruben Brunk <rubenbrunk@google.com> |
Fixed behavior for back key when viewing download. Bug: 7205463 Bug: 7164238 Bug: 7175040 When viewing an image via the download notification from browser, changed the default behavior of the back key to take the user to the downloads folder. Change-Id: Ia842bfa0f23c3b0ba767e3f0447add2c9b2cc6a7
rc/com/android/gallery3d/data/UriSource.java
|
fb0e11a104271fb7455e929094361a972d966508 |
19-Sep-2012 |
Owen Lin <owenlin@google.com> |
Don't set treat back as up if there is no parent album. Change-Id: I2ecadd8ace0f8d3e5ed38710a776e7c114f24274 fix: 7180467
rc/com/android/gallery3d/app/Gallery.java
|
432eb115e7395af525ec02a83c3caff0b0ed92d9 |
19-Sep-2012 |
Owen Lin <owenlin@google.com> |
Don't set treat back as up if there is no parent album. Change-Id: I2ecadd8ace0f8d3e5ed38710a776e7c114f24274 fix: 7180467
rc/com/android/gallery3d/app/Gallery.java
|
86c9ac192fd83cefa5f42e71aa15876db9c59ed9 |
26-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
am 140d4979: am 41153708: am 3fd76400: Fix display of clustering items in album set page * commit '140d497920aeae2d146a0f2282627c3a58698af6': Fix display of clustering items in album set page
|
140d497920aeae2d146a0f2282627c3a58698af6 |
26-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
am 41153708: am 3fd76400: Fix display of clustering items in album set page * commit '41153708c1ecf5a1fe1c85093748d1b79e6c6d2b': Fix display of clustering items in album set page
|
41153708c1ecf5a1fe1c85093748d1b79e6c6d2b |
26-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
am 3fd76400: Fix display of clustering items in album set page * commit '3fd764008a73dd76be87b02f42d0e00786015c8a': Fix display of clustering items in album set page
|
27f4d87d331133a9ae2373a24ed99c838c0250d8 |
26-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
am 3fd76400: Fix display of clustering items in album set page * commit '3fd764008a73dd76be87b02f42d0e00786015c8a': Fix display of clustering items in album set page
|
3fd764008a73dd76be87b02f42d0e00786015c8a |
26-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
Fix display of clustering items in album set page Bug: 7217602 There was an incorrect assumption that onCreateActionBar would always be called before onResume. Change-Id: Id50c2dc3fd8167958501e12c66d11ac82a86349b
rc/com/android/gallery3d/app/AlbumSetPage.java
|
3959f7359020a371a861c080d819b47a0be3c2a5 |
26-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
Fix display of clustering items in album set page Bug: 7217602 There was an incorrect assumption that onCreateActionBar would always be called before onResume. Change-Id: Id50c2dc3fd8167958501e12c66d11ac82a86349b
rc/com/android/gallery3d/app/AlbumSetPage.java
|
046df819be90d2b89f6137449071e18cd10866f0 |
26-Sep-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am 27a5b343: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '27a5b343a56a89462f30c927c0e3128fc1a6b492': Grid/filmstrip switching behavior improvements
|
27a5b343a56a89462f30c927c0e3128fc1a6b492 |
26-Sep-2012 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with jb-mr1-release - do not merge Change-Id: Ia83a79464c9de6fe7711f0823c033390c751a574
|
23f19fb12a04c1d425a41f054687568d693e3fa0 |
26-Sep-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
aa4d0ffbe18b0dc953fa778b512fd99aea12ae6b |
26-Sep-2012 |
Wu-cheng Li <wuchengli@google.com> |
Show unlock image in secure album only when camera roll has items. bug:7192331 Change-Id: I8e0a9ea87181c2256632a4dc802cc0668fac1e0e
rc/com/android/gallery3d/data/SecureAlbum.java
|
cc2f059ce62cbb04a605e6adda6f4b278210cd1a |
26-Sep-2012 |
Wu-cheng Li <wuchengli@google.com> |
Show unlock image in secure album only when camera roll has items. bug:7192331 Change-Id: I8e0a9ea87181c2256632a4dc802cc0668fac1e0e
rc/com/android/gallery3d/data/SecureAlbum.java
|
5d8c5ab975aa78f15bc2be7c12b70c3cb1ee37b8 |
26-Sep-2012 |
Wu-cheng Li <wuchengli@google.com> |
am 21f0765f: am ca9054fc: am 9c3912a2: Remove icon attributon. * commit '21f0765f9ebbe8f8fdf6e1742584e5497719fcca': Remove icon attributon.
|
21f0765f9ebbe8f8fdf6e1742584e5497719fcca |
26-Sep-2012 |
Wu-cheng Li <wuchengli@google.com> |
am ca9054fc: am 9c3912a2: Remove icon attributon. * commit 'ca9054fcc0ffaf62b2f2cdf0a54c42e56f9ef9d7': Remove icon attributon.
|
f69cbe2da1f7d52bd7236e9a775f1a609d453357 |
26-Sep-2012 |
Wu-cheng Li <wuchengli@google.com> |
am 9c3912a2: Remove icon attributon. * commit '9c3912a2dcea9131a63ddcb10e1df2a1f3ae8269': Remove icon attributon.
|
ca654cd1a66c03482e355341fc2bf15072d2746e |
26-Sep-2012 |
Wu-cheng Li <wuchengli@google.com> |
am 9c3912a2: Remove icon attributon. * commit '9c3912a2dcea9131a63ddcb10e1df2a1f3ae8269': Remove icon attributon.
|
ca9054fcc0ffaf62b2f2cdf0a54c42e56f9ef9d7 |
26-Sep-2012 |
Wu-cheng Li <wuchengli@google.com> |
am 9c3912a2: Remove icon attributon. * commit '9c3912a2dcea9131a63ddcb10e1df2a1f3ae8269': Remove icon attributon.
|
7dba7345975398fe34138fdb0515f055d5980886 |
26-Sep-2012 |
Wu-cheng Li <wuchengli@google.com> |
Remove icon attributon. bug:6855540 Change-Id: Ia2ab04523797da907aa73a013b6146ff929838b9
ndroidManifest.xml
|
0ca13cde846034450159a9e0f097f098cb476dab |
26-Sep-2012 |
Wu-cheng Li <wuchengli@google.com> |
Remove icon attributon. bug:6855540 Change-Id: Ia2ab04523797da907aa73a013b6146ff929838b9
es/values/photoeditor_styles.xml
|
9c3912a2dcea9131a63ddcb10e1df2a1f3ae8269 |
26-Sep-2012 |
Wu-cheng Li <wuchengli@google.com> |
Remove icon attributon. bug:6855540 Change-Id: Ia2ab04523797da907aa73a013b6146ff929838b9
ndroidManifest.xml
es/values/photoeditor_styles.xml
|
bd6b30fbca89f29eabcf08be0edd05b401c47c14 |
26-Sep-2012 |
Doris Liu <tianliu@google.com> |
am df011e7b: am eef77bc5: am e5bb9ff0: Merge "Making switchState public" into gb-ub-photos-arches * commit 'df011e7b87f13da8c3875f9f3222ace9d75d03d2': Making switchState public
|
37e2c82ae2107d80b5303144a0bc82ac6f688130 |
26-Sep-2012 |
Bart Sears <bsears@google.com> |
am 28df5bda: am 53f497a1: am 99420758: Merge "Revert "Update gallery launcher icons."" into gb-ub-photos-arches * commit '28df5bdac5b89d3dc001d8f3180fa8fb1ffd511a': Revert "Update gallery launcher icons."
|
81388139501f0cbd06e87ad6f456a74e645cd7a7 |
26-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
am f04c28ca: am 726d29f9: am 00ccf35f: Grid/filmstrip switching behavior improvements * commit 'f04c28cafb871c32915351b89b0daff4b8c30078': Grid/filmstrip switching behavior improvements
|
71e92bd07da61022888ecbca23fb0ab2b2b50cdd |
20-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
Grid/filmstrip switching behavior improvements Bug: 7200453 Bug: 7196483 Bug: 7222179 Bug: 7224619 Changes: - Launch camera in capture even if paused in grid/filmstrip - Fixed behavior of filmstrip button after launching grid from camera - Refresh bar timeouts after swiping a photo - Partially swiping from camera to filmstrip without lifting finger and then swiping back no longer results in unwanted switch to filmstrip - Removed hacky solution to switching to filmstrip mode Change-Id: I5cdde927e6a27a03b99a7f4883c5601bc281f4c8
rc/com/android/gallery3d/app/AlbumPage.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/app/TransitionStore.java
rc/com/android/gallery3d/ui/PhotoView.java
|
df011e7b87f13da8c3875f9f3222ace9d75d03d2 |
25-Sep-2012 |
Doris Liu <tianliu@google.com> |
am eef77bc5: am e5bb9ff0: Merge "Making switchState public" into gb-ub-photos-arches * commit 'eef77bc56d79695a99d0690bfdb8049eaeb87d84': Making switchState public
|
56566b870c97cc22ec348b10b33e1dcfba99c64f |
25-Sep-2012 |
Doris Liu <tianliu@google.com> |
am e5bb9ff0: Merge "Making switchState public" into gb-ub-photos-arches * commit 'e5bb9ff0a5c2a02aa1ba441f62dec6a4e197d0d3': Making switchState public
|
eef77bc56d79695a99d0690bfdb8049eaeb87d84 |
25-Sep-2012 |
Doris Liu <tianliu@google.com> |
am e5bb9ff0: Merge "Making switchState public" into gb-ub-photos-arches * commit 'e5bb9ff0a5c2a02aa1ba441f62dec6a4e197d0d3': Making switchState public
|
dc4107678f6ae7ff017c662e94a7cf628940a47e |
25-Sep-2012 |
Doris Liu <tianliu@google.com> |
Merge "Making switchState public" into gb-ub-photos-arches
|
e5bb9ff0a5c2a02aa1ba441f62dec6a4e197d0d3 |
25-Sep-2012 |
Doris Liu <tianliu@google.com> |
Merge "Making switchState public" into gb-ub-photos-arches
|
28df5bdac5b89d3dc001d8f3180fa8fb1ffd511a |
25-Sep-2012 |
Bart Sears <bsears@google.com> |
am 53f497a1: am 99420758: Merge "Revert "Update gallery launcher icons."" into gb-ub-photos-arches * commit '53f497a1b24e5bb53285dbe0b434c178465a4569': Revert "Update gallery launcher icons."
|
53f497a1b24e5bb53285dbe0b434c178465a4569 |
25-Sep-2012 |
Bart Sears <bsears@google.com> |
am 99420758: Merge "Revert "Update gallery launcher icons."" into gb-ub-photos-arches * commit '99420758f796b4d461c40033b886a0b464986902': Revert "Update gallery launcher icons."
|
b427d222dc0fbd1d4d3583daef2b889817b74e9c |
25-Sep-2012 |
Bart Sears <bsears@google.com> |
am 99420758: Merge "Revert "Update gallery launcher icons."" into gb-ub-photos-arches * commit '99420758f796b4d461c40033b886a0b464986902': Revert "Update gallery launcher icons."
|
a2c1511363e661b091f192de035a5c1dc66c011f |
25-Sep-2012 |
Bart Sears <bsears@google.com> |
am 99420758: Merge "Revert "Update gallery launcher icons."" into gb-ub-photos-arches * commit '99420758f796b4d461c40033b886a0b464986902': Revert "Update gallery launcher icons."
|
cb7f75f48ffaa3d3b87aecb30113cdb35994c215 |
25-Sep-2012 |
Bart Sears <bsears@google.com> |
Merge "Revert "Update gallery launcher icons."" into gb-ub-photos-arches
|
99420758f796b4d461c40033b886a0b464986902 |
25-Sep-2012 |
Bart Sears <bsears@google.com> |
Merge "Revert "Update gallery launcher icons."" into gb-ub-photos-arches
|
f04c28cafb871c32915351b89b0daff4b8c30078 |
25-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
am 726d29f9: am 00ccf35f: Grid/filmstrip switching behavior improvements * commit '726d29f915ab0a128fecf32c20e6fbd1de7b71ee': Grid/filmstrip switching behavior improvements
|
a6bcb213eeedacaec5b002f3147522ee054b940e |
25-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
am 00ccf35f: Grid/filmstrip switching behavior improvements * commit '00ccf35f8ec016b2cb8fdcf0c65ba643dca54a14': Grid/filmstrip switching behavior improvements
|
726d29f915ab0a128fecf32c20e6fbd1de7b71ee |
25-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
am 00ccf35f: Grid/filmstrip switching behavior improvements * commit '00ccf35f8ec016b2cb8fdcf0c65ba643dca54a14': Grid/filmstrip switching behavior improvements
|
ee5d41dbbeb8399a4eda7db84227efe2cd0a5267 |
25-Sep-2012 |
Bart Sears <bsears@google.com> |
Revert "Update gallery launcher icons." For now, go back to JB icons for Gallery Bug: 6855540 This reverts commit 9bf98d94d59571d220f7e288f565f599422f9b82 Change-Id: I1659134d54f7baa8488b791b903d3da37ab01662
es/mipmap-hdpi/ic_launcher_gallery.png
es/mipmap-mdpi/ic_launcher_gallery.png
es/mipmap-xhdpi/ic_launcher_gallery.png
|
9950027fa2e6912055fd2231a8831f359b8b8bca |
25-Sep-2012 |
Bart Sears <bsears@google.com> |
Revert "Update gallery launcher icons." For now, go back to JB icons for Gallery Bug: 6855540 This reverts commit 9bf98d94d59571d220f7e288f565f599422f9b82 Change-Id: I1659134d54f7baa8488b791b903d3da37ab01662
es/mipmap-hdpi/ic_launcher_gallery.png
es/mipmap-mdpi/ic_launcher_gallery.png
es/mipmap-xhdpi/ic_launcher_gallery.png
|
fcee3ef453be5f1cc2bd88f1e0b3e7f85129ee7a |
20-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
Grid/filmstrip switching behavior improvements Bug: 7200453 Bug: 7196483 Bug: 7222179 Bug: 7224619 Changes: - Launch camera in capture even if paused in grid/filmstrip - Fixed behavior of filmstrip button after launching grid from camera - Refresh bar timeouts after swiping a photo - Partially swiping from camera to filmstrip without lifting finger and then swiping back no longer results in unwanted switch to filmstrip - Removed hacky solution to switching to filmstrip mode Change-Id: I5cdde927e6a27a03b99a7f4883c5601bc281f4c8
rc/com/android/gallery3d/app/AlbumPage.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/app/TransitionStore.java
rc/com/android/gallery3d/ui/PhotoView.java
|
00ccf35f8ec016b2cb8fdcf0c65ba643dca54a14 |
20-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
Grid/filmstrip switching behavior improvements Bug: 7200453 Bug: 7196483 Bug: 7222179 Bug: 7224619 Changes: - Launch camera in capture even if paused in grid/filmstrip - Fixed behavior of filmstrip button after launching grid from camera - Refresh bar timeouts after swiping a photo - Partially swiping from camera to filmstrip without lifting finger and then swiping back no longer results in unwanted switch to filmstrip - Removed hacky solution to switching to filmstrip mode Change-Id: I5cdde927e6a27a03b99a7f4883c5601bc281f4c8
rc/com/android/gallery3d/app/AlbumPage.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/app/TransitionStore.java
rc/com/android/gallery3d/ui/PhotoView.java
|
d878e03fea7bf48937f82aa86b83730130ee8b1e |
25-Sep-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
9f232b29975c151bb927025004a3a4f98be60fec |
25-Sep-2012 |
Wu-cheng Li <wuchengli@google.com> |
am 3788fd19: am 9bea5d18: am 62e8403c: Add API check for "context" input port of effects recording. * commit '3788fd19607c54beea91f0888cdfe8d7f264ed75': Add API check for "context" input port of effects recording.
|
3788fd19607c54beea91f0888cdfe8d7f264ed75 |
25-Sep-2012 |
Wu-cheng Li <wuchengli@google.com> |
am 9bea5d18: am 62e8403c: Add API check for "context" input port of effects recording. * commit '9bea5d18cf54f4df1ee98d1f0c00280259af55c6': Add API check for "context" input port of effects recording.
|
bc7dd6eea959f439af4f18551c8c4c44821df3b7 |
25-Sep-2012 |
Wu-cheng Li <wuchengli@google.com> |
am 63b621fd: am 9c6615ed: am 7c79f6ca: Merge "Add an unlock image in the end of secure album." into gb-ub-photos-arches * commit '63b621fdfbd24f8bed9e7205d087268e27e7b411': Add an unlock image in the end of secure album.
|
64606a08db8bafef3688329780222eb0517d830d |
25-Sep-2012 |
Wu-cheng Li <wuchengli@google.com> |
am 62e8403c: Add API check for "context" input port of effects recording. * commit '62e8403c69f4a82a4023651499a88f15eaa47fa5': Add API check for "context" input port of effects recording.
|
63b621fdfbd24f8bed9e7205d087268e27e7b411 |
25-Sep-2012 |
Wu-cheng Li <wuchengli@google.com> |
am 9c6615ed: am 7c79f6ca: Merge "Add an unlock image in the end of secure album." into gb-ub-photos-arches * commit '9c6615ed2e55349e69861fd390099c59378741e1': Add an unlock image in the end of secure album.
|
9bea5d18cf54f4df1ee98d1f0c00280259af55c6 |
25-Sep-2012 |
Wu-cheng Li <wuchengli@google.com> |
am 62e8403c: Add API check for "context" input port of effects recording. * commit '62e8403c69f4a82a4023651499a88f15eaa47fa5': Add API check for "context" input port of effects recording.
|
9c6615ed2e55349e69861fd390099c59378741e1 |
25-Sep-2012 |
Wu-cheng Li <wuchengli@google.com> |
am 7c79f6ca: Merge "Add an unlock image in the end of secure album." into gb-ub-photos-arches * commit '7c79f6cab19e60d887a42b03fb123bb0358141b5': Add an unlock image in the end of secure album.
|
c722a7cd2861538f70f2dc988cbcc4ea9362ae98 |
25-Sep-2012 |
Wu-cheng Li <wuchengli@google.com> |
Add API check for "context" input port of effects recording. bug:7106963 Change-Id: Ia065903dd120bf20862c6adfd8a699277a27ac50
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
|
aea27617b83c551cea08379cf81375c4d7eceb13 |
25-Sep-2012 |
Wu-cheng Li <wuchengli@google.com> |
Add API check for "context" input port of effects recording. bug:7106963 Change-Id: Ia065903dd120bf20862c6adfd8a699277a27ac50
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
|
62e8403c69f4a82a4023651499a88f15eaa47fa5 |
25-Sep-2012 |
Wu-cheng Li <wuchengli@google.com> |
Add API check for "context" input port of effects recording. bug:7106963 Change-Id: Ia065903dd120bf20862c6adfd8a699277a27ac50
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
|
ec46666d2f3d9ab94e0d94efdd09183e3ee1b77b |
25-Sep-2012 |
Wu-cheng Li <wuchengli@google.com> |
am 7c79f6ca: Merge "Add an unlock image in the end of secure album." into gb-ub-photos-arches * commit '7c79f6cab19e60d887a42b03fb123bb0358141b5': Add an unlock image in the end of secure album.
|
87529b45deaa836019dfb0218e583660fc806c87 |
25-Sep-2012 |
Wu-cheng Li <wuchengli@google.com> |
am 7c79f6ca: Merge "Add an unlock image in the end of secure album." into gb-ub-photos-arches * commit '7c79f6cab19e60d887a42b03fb123bb0358141b5': Add an unlock image in the end of secure album.
|
7c79f6cab19e60d887a42b03fb123bb0358141b5 |
25-Sep-2012 |
Wu-cheng Li <wuchengli@google.com> |
Merge "Add an unlock image in the end of secure album." into gb-ub-photos-arches
|
b24323c723fa55f057211f785b17e2d0d534eb7d |
25-Sep-2012 |
Wu-cheng Li <wuchengli@google.com> |
Merge "Add an unlock image in the end of secure album." into gb-ub-photos-arches
|
5f6d2c38790de61bbd820a31090e9bd777544989 |
24-Sep-2012 |
Wu-cheng Li <wuchengli@google.com> |
Add an unlock image in the end of secure album. When camera is started from secure lock screen, put placeholder "proto-photo" at the end of the camera roll. When it is clicked, it takes the user to the lock screen. bug:7192331 Change-Id: Ia444d3bb8a88ba69bba4c47cb9783a60a6986c34
es/drawable-hdpi/ic_lockscreen_unlock_normal.png
es/drawable-mdpi/ic_lockscreen_unlock_normal.png
es/drawable-xhdpi/ic_lockscreen_unlock_normal.png
|
8868aa1b2d199e7fa869c9c5fad3079175621002 |
24-Sep-2012 |
Wu-cheng Li <wuchengli@google.com> |
Add an unlock image in the end of secure album. When camera is started from secure lock screen, put placeholder "proto-photo" at the end of the camera roll. When it is clicked, it takes the user to the lock screen. bug:7192331 Change-Id: Ia444d3bb8a88ba69bba4c47cb9783a60a6986c34
es/drawable-hdpi/ic_lockscreen_unlock_normal.png
es/drawable-mdpi/ic_lockscreen_unlock_normal.png
es/drawable-xhdpi/ic_lockscreen_unlock_normal.png
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/data/MediaObject.java
rc/com/android/gallery3d/data/SecureAlbum.java
rc/com/android/gallery3d/data/SecureSource.java
rc/com/android/gallery3d/data/UnlockImage.java
|
b2f6a0c2d2ecbac4047f96621980ba36d3c647c8 |
24-Sep-2012 |
Wu-cheng Li <wuchengli@google.com> |
Add an unlock image in the end of secure album. When camera is started from secure lock screen, put placeholder "proto-photo" at the end of the camera roll. When it is clicked, it takes the user to the lock screen. bug:7192331 Change-Id: Ia444d3bb8a88ba69bba4c47cb9783a60a6986c34
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/data/MediaObject.java
rc/com/android/gallery3d/data/SecureAlbum.java
rc/com/android/gallery3d/data/SecureSource.java
rc/com/android/gallery3d/data/UnlockImage.java
|
cc21fc9b31eee9e5c91279dcc8f24bc75460adcb |
25-Sep-2012 |
Pin Ting <pinting@google.com> |
am a9bf352f: am ea35d458: am 03f6fce6: Enable effects recording in JellyBean. * commit 'a9bf352fd10a5cc033871cffabadc6897fb5757a': Enable effects recording in JellyBean.
|
a9bf352fd10a5cc033871cffabadc6897fb5757a |
25-Sep-2012 |
Pin Ting <pinting@google.com> |
am ea35d458: am 03f6fce6: Enable effects recording in JellyBean. * commit 'ea35d458c8fdab41bc67275687296794055ab42b': Enable effects recording in JellyBean.
|
ea35d458c8fdab41bc67275687296794055ab42b |
25-Sep-2012 |
Pin Ting <pinting@google.com> |
am 03f6fce6: Enable effects recording in JellyBean. * commit '03f6fce66de39b3578ac036557c1ec1aed729f61': Enable effects recording in JellyBean.
|
77f228c9158a1631f82d1e066cf78ada7637a954 |
25-Sep-2012 |
Pin Ting <pinting@google.com> |
am 03f6fce6: Enable effects recording in JellyBean. * commit '03f6fce66de39b3578ac036557c1ec1aed729f61': Enable effects recording in JellyBean.
|
0a0cc9bb0072c01a9b35c3d0275f9bcacfc7d988 |
25-Sep-2012 |
Pin Ting <pinting@google.com> |
Enable effects recording in JellyBean. Bug:7106963 Change-Id: I2ef0a30d1b9c970fdd9ce01459173db3bde99c6b
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
|
03f6fce66de39b3578ac036557c1ec1aed729f61 |
25-Sep-2012 |
Pin Ting <pinting@google.com> |
Enable effects recording in JellyBean. Bug:7106963 Change-Id: I2ef0a30d1b9c970fdd9ce01459173db3bde99c6b
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
|
32de13e9dd6905f548ca74a60056fabd4c499b99 |
25-Sep-2012 |
Pin Ting <pinting@google.com> |
Enable effects recording in JellyBean. Bug:7106963 Change-Id: I2ef0a30d1b9c970fdd9ce01459173db3bde99c6b
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
|
90ca5a8e774d19efe257e4d45a0318f032381362 |
25-Sep-2012 |
Wu-cheng Li <wuchengli@google.com> |
am f6adf2bf: am b45d2ba8: am 5eff2242: Register secure image capture intent. * commit 'f6adf2bf7e7ec9c088075195a832f21141c6caa6': Register secure image capture intent.
|
f6adf2bf7e7ec9c088075195a832f21141c6caa6 |
25-Sep-2012 |
Wu-cheng Li <wuchengli@google.com> |
am b45d2ba8: am 5eff2242: Register secure image capture intent. * commit 'b45d2ba845306f8ecdbc2df8e71fee25351ca591': Register secure image capture intent.
|
1341b4a1157a9ee271fe294239a90403240063a5 |
25-Sep-2012 |
Wu-cheng Li <wuchengli@google.com> |
am 5eff2242: Register secure image capture intent. * commit '5eff22421ad9bd7af8611e72d98c7ab71f842cb2': Register secure image capture intent.
|
b45d2ba845306f8ecdbc2df8e71fee25351ca591 |
25-Sep-2012 |
Wu-cheng Li <wuchengli@google.com> |
am 5eff2242: Register secure image capture intent. * commit '5eff22421ad9bd7af8611e72d98c7ab71f842cb2': Register secure image capture intent.
|
fb5c8120b0c10d1a8fc5c92a949a9d53f3202002 |
25-Sep-2012 |
Wu-cheng Li <wuchengli@google.com> |
Register secure image capture intent. bug:7225688 Change-Id: I22f0ee81a921b3ec811444c7d554f2400e6a5485
ndroidManifest.xml
|
5eff22421ad9bd7af8611e72d98c7ab71f842cb2 |
25-Sep-2012 |
Wu-cheng Li <wuchengli@google.com> |
Register secure image capture intent. bug:7225688 Change-Id: I22f0ee81a921b3ec811444c7d554f2400e6a5485
ndroidManifest.xml
|
8dc58b622b58085df828f9ad8e57bec3a7710438 |
25-Sep-2012 |
Michael Kolb <kolby@google.com> |
am 2f533301: am 73685c0d: am f6a5c701: Merge "Remove old camera activity from launcher" into gb-ub-photos-arches * commit '2f5333016382acb73074a7694b9737c36cb73ee6': Remove old camera activity from launcher
|
2f5333016382acb73074a7694b9737c36cb73ee6 |
25-Sep-2012 |
Michael Kolb <kolby@google.com> |
am 73685c0d: am f6a5c701: Merge "Remove old camera activity from launcher" into gb-ub-photos-arches * commit '73685c0d721cdcd74f95f361ede439be29517d23': Remove old camera activity from launcher
|
f28676971d83efc63864742d3b0a1dc8ff2fbea1 |
25-Sep-2012 |
Michael Kolb <kolby@google.com> |
am f6a5c701: Merge "Remove old camera activity from launcher" into gb-ub-photos-arches * commit 'f6a5c701d3fa41b93e12768e2456e993960321e6': Remove old camera activity from launcher
|
73685c0d721cdcd74f95f361ede439be29517d23 |
25-Sep-2012 |
Michael Kolb <kolby@google.com> |
am f6a5c701: Merge "Remove old camera activity from launcher" into gb-ub-photos-arches * commit 'f6a5c701d3fa41b93e12768e2456e993960321e6': Remove old camera activity from launcher
|
f6a5c701d3fa41b93e12768e2456e993960321e6 |
25-Sep-2012 |
Michael Kolb <kolby@google.com> |
Merge "Remove old camera activity from launcher" into gb-ub-photos-arches
|
e70c9c5847eed1d8101540bc562e27896185e96d |
25-Sep-2012 |
Michael Kolb <kolby@google.com> |
Remove old camera activity from launcher Bug: 7201108 The old activity can still be started via: adb shell am start -n com.google.android.gallery3d/com.android.camera.Camera Change-Id: I57094903375a1ab26c43b7f6870de073d58345fa
ndroidManifest.xml
|
5dbbfcd44ff6360cd46ec636b006c52b5ebd9293 |
25-Sep-2012 |
Michael Kolb <kolby@google.com> |
Remove old camera activity from launcher Bug: 7201108 The old activity can still be started via: adb shell am start -n com.google.android.gallery3d/com.android.camera.Camera Change-Id: I57094903375a1ab26c43b7f6870de073d58345fa
ndroidManifest.xml
|
070a93c7be06e676b56770efc0452f0a542947b2 |
24-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
am 75e24b15: am 9c8506d7: am e06c9f10: Restore missing "Group by" option in camera roll grid view * commit '75e24b15ee60bff0fb49cff3b15ed0b4dd46f691': Restore missing "Group by" option in camera roll grid view
|
75e24b15ee60bff0fb49cff3b15ed0b4dd46f691 |
24-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
am 9c8506d7: am e06c9f10: Restore missing "Group by" option in camera roll grid view * commit '9c8506d7b7fde6e2fcb93912f0210f48a41fbdb7': Restore missing "Group by" option in camera roll grid view
|
e56a7c27f7516edd9d8b719edefeb1d5c603450a |
24-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
am ec063932: am de1a390c: am 3eb2e643: Fix occasional crash when restoring photo page state * commit 'ec063932876d25cc90da52ef4cc13378bab9e8d3': Fix occasional crash when restoring photo page state
|
ec063932876d25cc90da52ef4cc13378bab9e8d3 |
24-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
am de1a390c: am 3eb2e643: Fix occasional crash when restoring photo page state * commit 'de1a390c3d9d6e74c0469fd60eeaed6d601b75a0': Fix occasional crash when restoring photo page state
|
bc07870f30186a2b5f06baabcbb416c1c02a3c3d |
24-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
am e06c9f10: Restore missing "Group by" option in camera roll grid view * commit 'e06c9f109f06813ca1f8a0abb549d51aefd4973d': Restore missing "Group by" option in camera roll grid view
|
9c8506d7b7fde6e2fcb93912f0210f48a41fbdb7 |
24-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
am e06c9f10: Restore missing "Group by" option in camera roll grid view * commit 'e06c9f109f06813ca1f8a0abb549d51aefd4973d': Restore missing "Group by" option in camera roll grid view
|
92d01cafb390a886cf45b9df60007d403a7051eb |
24-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
Restore missing "Group by" option in camera roll grid view Bug: 7217410 Change-Id: I1488f02919a8702be2eb41696f627f9e3d94ce88
rc/com/android/gallery3d/app/PhotoPage.java
|
e06c9f109f06813ca1f8a0abb549d51aefd4973d |
24-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
Restore missing "Group by" option in camera roll grid view Bug: 7217410 Change-Id: I1488f02919a8702be2eb41696f627f9e3d94ce88
rc/com/android/gallery3d/app/PhotoPage.java
|
de1a390c3d9d6e74c0469fd60eeaed6d601b75a0 |
24-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
am 3eb2e643: Fix occasional crash when restoring photo page state * commit '3eb2e643a40d1be77998373343cdf8b14764f58c': Fix occasional crash when restoring photo page state
|
b96e6337cc647a61ec845aca71e15adcf4258b57 |
24-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
am 3eb2e643: Fix occasional crash when restoring photo page state * commit '3eb2e643a40d1be77998373343cdf8b14764f58c': Fix occasional crash when restoring photo page state
|
77551a6b619e63c59d518b42b472556ebf750484 |
24-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
Fix occasional crash when restoring photo page state Bug: 7216012 If the saved state being used to restore the photo page includes an out-of-bounds index, ignore it and reset the index to 0. Change-Id: I1b8aa82cbc553297189abb57bd274d7eb53f61e0
rc/com/android/gallery3d/app/PhotoPage.java
|
3eb2e643a40d1be77998373343cdf8b14764f58c |
24-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
Fix occasional crash when restoring photo page state Bug: 7216012 If the saved state being used to restore the photo page includes an out-of-bounds index, ignore it and reset the index to 0. Change-Id: I1b8aa82cbc553297189abb57bd274d7eb53f61e0
rc/com/android/gallery3d/app/PhotoPage.java
|
1ebf7910d890e37e5fbd60034b8c44c69a0e718e |
24-Sep-2012 |
Teng-Hui Zhu <ztenghui@google.com> |
am b175c757: am fd020e65: am 15ff1b1c: The trimming solution with the mp4parser library. * commit 'b175c7573d84bc740f3e5cca2dc89d976f4d3c28': The trimming solution with the mp4parser library.
|
b175c7573d84bc740f3e5cca2dc89d976f4d3c28 |
24-Sep-2012 |
Teng-Hui Zhu <ztenghui@google.com> |
am fd020e65: am 15ff1b1c: The trimming solution with the mp4parser library. * commit 'fd020e657d18528ab47b7650d6e109f16e5317a2': The trimming solution with the mp4parser library.
|
ebbae806acdf9c9d81a022adeed935f02f84b7b5 |
24-Sep-2012 |
Teng-Hui Zhu <ztenghui@google.com> |
am 15ff1b1c: The trimming solution with the mp4parser library. * commit '15ff1b1ca52bea348b8a490b5b5abe53fa43eaf2': The trimming solution with the mp4parser library.
|
fd020e657d18528ab47b7650d6e109f16e5317a2 |
24-Sep-2012 |
Teng-Hui Zhu <ztenghui@google.com> |
am 15ff1b1c: The trimming solution with the mp4parser library. * commit '15ff1b1ca52bea348b8a490b5b5abe53fa43eaf2': The trimming solution with the mp4parser library.
|
8c32a04458f04d2a6b0dca05c98e24c9bc5c412a |
24-Sep-2012 |
Teng-Hui Zhu <ztenghui@google.com> |
The trimming solution with the mp4parser library. bug:7093055 Change-Id: I598a81d80c9c5107696f3af7761207e3ec88f3ff
roguard.flags
|
2cc6e35b284578b646d9dfad57496257aa2a5945 |
24-Sep-2012 |
Teng-Hui Zhu <ztenghui@google.com> |
The trimming solution with the mp4parser library. bug:7093055 Change-Id: I598a81d80c9c5107696f3af7761207e3ec88f3ff
ndroid.mk
|
15ff1b1ca52bea348b8a490b5b5abe53fa43eaf2 |
24-Sep-2012 |
Teng-Hui Zhu <ztenghui@google.com> |
The trimming solution with the mp4parser library. bug:7093055 Change-Id: I598a81d80c9c5107696f3af7761207e3ec88f3ff
ndroid.mk
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
roguard.flags
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/app/ShortenExample.java
rc/com/android/gallery3d/app/TrimVideo.java
|
561df21b1651cf6b266f241bb1a3945c05c229bf |
24-Sep-2012 |
Teng-Hui Zhu <ztenghui@google.com> |
The trimming solution with the mp4parser library. bug:7093055 Change-Id: I598a81d80c9c5107696f3af7761207e3ec88f3ff
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/app/ShortenExample.java
rc/com/android/gallery3d/app/TrimVideo.java
|
53b1c293a1ebb18e18d8b7df3c976f1b7392a18e |
24-Sep-2012 |
Teng-Hui Zhu <ztenghui@google.com> |
The trimming solution with the mp4parser library. bug:7093055 Change-Id: I598a81d80c9c5107696f3af7761207e3ec88f3ff
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
|
065eb2bbe7f099c0bea75152c371b3731d71de64 |
24-Sep-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am 099eeb32: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '099eeb328d862cdd7e1e489f4ed3e4344de22e68':
|
099eeb328d862cdd7e1e489f4ed3e4344de22e68 |
24-Sep-2012 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with jb-mr1-release - do not merge Change-Id: I11d8713eb61744492dd1768c2e5f8e08f7bd3ee7
|
ba084f6fb972b81b06a087620f2e1e585328c7e6 |
24-Sep-2012 |
Jean-Baptiste Queru <jbq@google.com> |
am 23c7f767: Re-sync branches * commit '23c7f7672b05e65839da97b3ec6923381fa3e177': Use vendor specific MIME type for sharing LightCycle panoramas
|
23c7f7672b05e65839da97b3ec6923381fa3e177 |
24-Sep-2012 |
Jean-Baptiste Queru <jbq@google.com> |
Re-sync branches Change-Id: I1c29b68cb5ff8c9b602978628aadb96232ef9151
|
64975868d7054e72b92136990855e614d087a9c2 |
24-Sep-2012 |
Mangesh Ghiware <mghiware@google.com> |
am 4f32d514: Use vendor specific MIME type for sharing LightCycle panoramas * commit '4f32d514ee7474d867d04bf3934f9e11e9e92783': Use vendor specific MIME type for sharing LightCycle panoramas
|
0d1d54052b2905ea68fc7d79f4dbfd40f610fcb5 |
24-Sep-2012 |
Mangesh Ghiware <mghiware@google.com> |
am 4f32d514: Use vendor specific MIME type for sharing LightCycle panoramas * commit '4f32d514ee7474d867d04bf3934f9e11e9e92783': Use vendor specific MIME type for sharing LightCycle panoramas
|
756f7413eaf253e9ac928e3d3bb0fc4cd8bb3bc5 |
24-Sep-2012 |
Baligh Uddin <baligh@google.com> |
am 708b22cc: (-s ours) am 8a51f5fb: am 2267ac9f: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches * commit '708b22cc6369201101a31ed61ca92f238c0d1ed0': Import translations. DO NOT MERGE
|
4f8b0c9dbe83f42091632c39c03192c65419767b |
24-Sep-2012 |
Baligh Uddin <baligh@google.com> |
am 3bf55e62: (-s ours) am 846aa619: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev * commit '3bf55e623277b6156f0f32adba64227578cf70ca': Import translations. DO NOT MERGE
|
f6ba7c17f15a047702c1f9558c183e9fa3a53f14 |
24-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
am e2f26101: am 16635c68: am 9b270f4f: Snap a photo to the center after fling ends in filmstrip * commit 'e2f261010005283ec854dc87ea2f42e58cb4f6cc': Snap a photo to the center after fling ends in filmstrip
|
4f32d514ee7474d867d04bf3934f9e11e9e92783 |
24-Sep-2012 |
Mangesh Ghiware <mghiware@google.com> |
Use vendor specific MIME type for sharing LightCycle panoramas Bug: 7150324 Change-Id: I78d426672e9a8fc69f0b9b564438e40eb0230719
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/data/LocalImage.java
rc/com/android/gallery3d/data/MediaObject.java
rc/com/android/gallery3d/data/UriImage.java
rc/com/android/gallery3d/ui/ActionModeHandler.java
rc/com/android/gallery3d/ui/MenuExecutor.java
|
a0222b73be4f34f4ddc263cdacaf108a4d4f56db |
24-Sep-2012 |
Mangesh Ghiware <mghiware@google.com> |
Use vendor specific MIME type for sharing LightCycle panoramas Bug: 7150324 Change-Id: I78d426672e9a8fc69f0b9b564438e40eb0230719
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/data/LocalImage.java
rc/com/android/gallery3d/data/MediaObject.java
rc/com/android/gallery3d/data/UriImage.java
rc/com/android/gallery3d/ui/ActionModeHandler.java
rc/com/android/gallery3d/ui/MenuExecutor.java
|
94a7444cd0397e830a31cf3b754967bb7e64fcd7 |
22-Sep-2012 |
Doris Liu <tianliu@google.com> |
Making switchState public Bug: 7208910 switchState was only accessible within package com.android.gallery3d.app . Now changing it to public so that it can be called from camera. This is part 1 of 2 in fixing the bug. Not sure if it's the best way to fix it. Comments are welcome. Change-Id: I4aac46f640f2dd3aa973abd9610a37fa2842ed29
rc/com/android/gallery3d/app/StateManager.java
|
9b8a4277b5c0e8b29cab51834c6a8bf4147576ba |
22-Sep-2012 |
Doris Liu <tianliu@google.com> |
Making switchState public Bug: 7208910 switchState was only accessible within package com.android.gallery3d.app . Now changing it to public so that it can be called from camera. This is part 1 of 2 in fixing the bug. Not sure if it's the best way to fix it. Comments are welcome. Change-Id: I4aac46f640f2dd3aa973abd9610a37fa2842ed29
rc/com/android/gallery3d/app/StateManager.java
|
153f41c3c1842db66a6458152f4f17950f8fbfad |
22-Sep-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
708b22cc6369201101a31ed61ca92f238c0d1ed0 |
22-Sep-2012 |
Baligh Uddin <baligh@google.com> |
am 8a51f5fb: am 2267ac9f: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches * commit '8a51f5fba10d8527a4b55f7cb6b9990cdfcdb49f': Import translations. DO NOT MERGE
|
3bf55e623277b6156f0f32adba64227578cf70ca |
22-Sep-2012 |
Baligh Uddin <baligh@google.com> |
am 846aa619: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev * commit '846aa6193f506c0e890b93ffd71a0f1e06b70b45': Import translations. DO NOT MERGE
|
f23c9afdf5ca976943ad2b815b9451699230bb40 |
22-Sep-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE"
|
bca3fe260a5943e1f1647de26def5b2f76e8b9b8 |
22-Sep-2012 |
Baligh Uddin <baligh@google.com> |
am 2267ac9f: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches * commit '2267ac9fe59393a11034e4bcfa37b919492006fa': Import translations. DO NOT MERGE
es/values-vi/strings.xml
|
69f6ead40d76406777d774bf3e1b21afd823fca0 |
22-Sep-2012 |
Baligh Uddin <baligh@google.com> |
am 2267ac9f: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches * commit '2267ac9fe59393a11034e4bcfa37b919492006fa': Import translations. DO NOT MERGE
|
8a51f5fba10d8527a4b55f7cb6b9990cdfcdb49f |
22-Sep-2012 |
Baligh Uddin <baligh@google.com> |
am 2267ac9f: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches * commit '2267ac9fe59393a11034e4bcfa37b919492006fa': Import translations. DO NOT MERGE
|
846aa6193f506c0e890b93ffd71a0f1e06b70b45 |
22-Sep-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
|
2267ac9fe59393a11034e4bcfa37b919492006fa |
22-Sep-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
|
e2f261010005283ec854dc87ea2f42e58cb4f6cc |
21-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
am 16635c68: am 9b270f4f: Snap a photo to the center after fling ends in filmstrip * commit '16635c683408a9644b8aa3916f55c74702e90aa4': Snap a photo to the center after fling ends in filmstrip
|
16635c683408a9644b8aa3916f55c74702e90aa4 |
21-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
am 9b270f4f: Snap a photo to the center after fling ends in filmstrip * commit '9b270f4f2e20fb0f0455529c2e20990173a75470': Snap a photo to the center after fling ends in filmstrip
|
9e8942c7d1b6f1cf2991ba7fcd45e47c1b53d140 |
21-Sep-2012 |
Wu-cheng Li <wuchengli@google.com> |
am 0786b28a: am d62ab871: am 23e595f0: Support secure image capture mode. * commit '0786b28ac34d2a013b181c6447fe87d8f1cd8551': Support secure image capture mode.
|
207136431eb8c1a8d4d90ef7a57feb991ccd9262 |
21-Sep-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am bb54f5e7: (-s ours) am 14461c5d: am 766566ac: (-s ours) Reconcile with jb-mr0-release - do not merge * commit 'bb54f5e7ca3b5d4399417e30d96e68f232b191f4': Do not accept fling gesture after we changed from/to filmstrip mode.
|
14d0a777aba412771d5edfa9e2c2121244a3b2ae |
21-Sep-2012 |
Chih-Chung Chang <chihchung@google.com> |
am 876dc96e: am dd8676e9: am 2e3b5a9e: am e311bb72: Do not accept fling gesture after we changed from/to filmstrip mode. * commit '876dc96e7f9230115204b831d4e06041e1c410fa': Do not accept fling gesture after we changed from/to filmstrip mode.
|
0673c2e894d083313cbccb0e8a1bd30b0721e7f7 |
21-Sep-2012 |
Jean-Baptiste Queru <jbq@google.com> |
am 9700bd96: am 5d1a63ea: am 2f4c73d9: Merge from AOSP * commit '9700bd9657f4a9d3780263f9229297ae2203fe8d':
|
c4dfe02d4a190a6403236723fbd0e82bddd01bd1 |
21-Sep-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am 3ee3141b: am b479a91a: am 2ee9fcd1: Reconcile with jb-release * commit '3ee3141b2909fc89299f7fa4100512a9e8e95afa':
|
14d82f87234ad680c12b3da16a49fa4f55c414df |
21-Sep-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am 0e66f3b4: am 3eb9d1b1: am de5318ce: Reconcile with jb-mr0-release * commit '0e66f3b48e48d58411ef2890f5912543052aa145':
|
200db6c82c959aac098421d5688f41fcf3661d6e |
21-Sep-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I9e9d7ce42fccb4f56e17902d65ec18915470ace3 Auto-generated-cl: translation import
es/values-lv/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
|
22804c140b2dfe61f80d4368a9b86f2a47820970 |
21-Sep-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I7c4a2425d7dc0ef6aa78d74abfe38c14eb263401 Auto-generated-cl: translation import
es/values-vi/strings.xml
|
6b1d9811a2550b30de5d1a5cdadea889f7ecd2c1 |
21-Sep-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Idc80521ca1c53d1fc8f6a776baefa9986b8a4ea1 Auto-generated-cl: translation import
es/values-vi/strings.xml
|
6265f67a3b33d3bcab362faa7509969749ba24a0 |
21-Sep-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Idc80521ca1c53d1fc8f6a776baefa9986b8a4ea1 Auto-generated-cl: translation import
es/values-vi/strings.xml
|
4ab4417fd1252df7ad3f8824fc133810090e2ec8 |
21-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
Snap a photo to the center after fling ends in filmstrip Bug: 7050303 Change-Id: I7770d5642b376a1b888f34c5806f2291b64ecf68
rc/com/android/gallery3d/ui/PositionController.java
|
9b270f4f2e20fb0f0455529c2e20990173a75470 |
21-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
Snap a photo to the center after fling ends in filmstrip Bug: 7050303 Change-Id: I7770d5642b376a1b888f34c5806f2291b64ecf68
rc/com/android/gallery3d/ui/PositionController.java
|
0786b28ac34d2a013b181c6447fe87d8f1cd8551 |
21-Sep-2012 |
Wu-cheng Li <wuchengli@google.com> |
am d62ab871: am 23e595f0: Support secure image capture mode. * commit 'd62ab871d5e32140bc36a2fe4cb47588dff1fa52': Support secure image capture mode.
|
d62ab871d5e32140bc36a2fe4cb47588dff1fa52 |
21-Sep-2012 |
Wu-cheng Li <wuchengli@google.com> |
am 23e595f0: Support secure image capture mode. * commit '23e595f0c656ebaeb63f78e3018b5830628c5afe': Support secure image capture mode.
|
bb54f5e7ca3b5d4399417e30d96e68f232b191f4 |
21-Sep-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am 14461c5d: am 766566ac: (-s ours) Reconcile with jb-mr0-release - do not merge * commit '14461c5dcfbd1a4bd9d0853dcc0a627aba3eb6f2': Do not accept fling gesture after we changed from/to filmstrip mode.
|
876dc96e7f9230115204b831d4e06041e1c410fa |
21-Sep-2012 |
Chih-Chung Chang <chihchung@google.com> |
am dd8676e9: am 2e3b5a9e: am e311bb72: Do not accept fling gesture after we changed from/to filmstrip mode. * commit 'dd8676e952cb373f2f813becc512242e6bad2208': Do not accept fling gesture after we changed from/to filmstrip mode.
|
9700bd9657f4a9d3780263f9229297ae2203fe8d |
21-Sep-2012 |
Jean-Baptiste Queru <jbq@google.com> |
am 5d1a63ea: am 2f4c73d9: Merge from AOSP * commit '5d1a63eac8e719f20b76b79bef99e2bce84180c9':
|
3ee3141b2909fc89299f7fa4100512a9e8e95afa |
21-Sep-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am b479a91a: am 2ee9fcd1: Reconcile with jb-release * commit 'b479a91abd7c78b69f98edee7fc9b0931c79f448':
|
0e66f3b48e48d58411ef2890f5912543052aa145 |
21-Sep-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am 3eb9d1b1: am de5318ce: Reconcile with jb-mr0-release * commit '3eb9d1b11727ed0b322b2f36f6b9fb3519905490':
|
14461c5dcfbd1a4bd9d0853dcc0a627aba3eb6f2 |
21-Sep-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am 766566ac: (-s ours) Reconcile with jb-mr0-release - do not merge * commit '766566ac1c5560166b786a1018cd2360c43888a0': Do not accept fling gesture after we changed from/to filmstrip mode.
|
dd8676e952cb373f2f813becc512242e6bad2208 |
21-Sep-2012 |
Chih-Chung Chang <chihchung@google.com> |
am 2e3b5a9e: am e311bb72: Do not accept fling gesture after we changed from/to filmstrip mode. * commit '2e3b5a9e4c687e8eac85e12dcc77415847bdc039': Do not accept fling gesture after we changed from/to filmstrip mode.
|
5d1a63eac8e719f20b76b79bef99e2bce84180c9 |
21-Sep-2012 |
Jean-Baptiste Queru <jbq@google.com> |
am 2f4c73d9: Merge from AOSP * commit '2f4c73d9995158522bd18db125232838afd099e8': Fine-tune SDK versions Progressbar: correct the first updated value for progressbar
|
b479a91abd7c78b69f98edee7fc9b0931c79f448 |
21-Sep-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am 2ee9fcd1: Reconcile with jb-release * commit '2ee9fcd1c0b883413f3e4d274882d864a552720b':
|
3eb9d1b11727ed0b322b2f36f6b9fb3519905490 |
21-Sep-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am de5318ce: Reconcile with jb-mr0-release * commit 'de5318ceca4693c3ec3002cf9470d84200c6a0ee':
|
c91a8256685f3f2e12667a19d049dabd75242a6a |
21-Sep-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
23e595f0c656ebaeb63f78e3018b5830628c5afe |
21-Sep-2012 |
Wu-cheng Li <wuchengli@google.com> |
Support secure image capture mode. bug:7141738 Change-Id: I4ea010609d16da469998ebb40ad8282b9468de25
rc/com/android/gallery3d/app/CropImage.java
rc/com/android/gallery3d/app/PhotoPage.java
|
8e23dd070f2c49d64d356c22f55801c4f915de5c |
21-Sep-2012 |
Wu-cheng Li <wuchengli@google.com> |
Support secure image capture mode. bug:7141738 Change-Id: I4ea010609d16da469998ebb40ad8282b9468de25
rc/com/android/gallery3d/app/CropImage.java
rc/com/android/gallery3d/app/PhotoPage.java
|
cd7dc6886d63128046c8ddfa8eb7a33d5d56c36c |
21-Sep-2012 |
Ed Heyl <edheyl@google.com> |
am e5d42e33: am 44d92736: Merge remote-tracking branch \'goog/gb-ub-photos-arches\' into jb-mr1-dev * commit 'e5d42e3394b89c24e9d22db1d6ceff72c9c9b00a': Import translations. DO NOT MERGE
|
35c6e7571fedda86940998ff33aae568531ab0f7 |
21-Sep-2012 |
Baligh Uddin <baligh@google.com> |
am 6865e5f8: (-s ours) am 7fb8a422: Import translations. DO NOT MERGE * commit '6865e5f8a06487d35717f73a3c7bd26e4a6222b6': Import translations. DO NOT MERGE
|
e5d42e3394b89c24e9d22db1d6ceff72c9c9b00a |
21-Sep-2012 |
Ed Heyl <edheyl@google.com> |
am 44d92736: Merge remote-tracking branch \'goog/gb-ub-photos-arches\' into jb-mr1-dev * commit '44d92736b05855fad9c15831ff3ae0860d962f11': Import translations. DO NOT MERGE
|
6865e5f8a06487d35717f73a3c7bd26e4a6222b6 |
21-Sep-2012 |
Baligh Uddin <baligh@google.com> |
am 7fb8a422: Import translations. DO NOT MERGE * commit '7fb8a422c48e5e8a8a43fa3de6f55ce03721c7ec': Import translations. DO NOT MERGE
|
44d92736b05855fad9c15831ff3ae0860d962f11 |
21-Sep-2012 |
Ed Heyl <edheyl@google.com> |
Merge remote-tracking branch 'goog/gb-ub-photos-arches' into jb-mr1-dev
|
87fee519da5fd27d630a7d3ca8e8b5434e09c580 |
20-Sep-2012 |
Jean-Baptiste Queru <jbq@google.com> |
Merge Change-Id: Iea7c5bb7e63962f680259c3b698f7eacb9098e5e
|
8d9399c6f20ee44e99fe150b9107a2cc7aaf7b6a |
20-Sep-2012 |
Jean-Baptiste Queru <jbq@google.com> |
Reconcile with AOSP Change-Id: I2ed77939ae5449e927068da1bae5d717b220859c
|
7fb8a422c48e5e8a8a43fa3de6f55ce03721c7ec |
20-Sep-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I7783e54826e36d2c5e7cbc0dcd4fd0bef829f20f Auto-generated-cl: translation import
es/values-lv/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
|
042ad91b2b91a08947a2aabd69242c90d657616d |
20-Sep-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I799c19e091b38fa5bcabe8f8c8c42d56ef933a41 Auto-generated-cl: translation import
es/values-lv/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
|
7e52a84b142c081c7292a442277a3d9e5e1bf8ef |
20-Sep-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I799c19e091b38fa5bcabe8f8c8c42d56ef933a41 Auto-generated-cl: translation import
es/values-lv/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
|
c12645e1c9255dd54f6e5a3e50fdc99d337037a3 |
20-Sep-2012 |
Jean-Baptiste Queru <jbq@google.com> |
Reconcile forked Gallery2 Change-Id: I0fae300a6f28155e0f80096a616d34ea150240b2
|
766566ac1c5560166b786a1018cd2360c43888a0 |
20-Sep-2012 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with jb-mr0-release - do not merge Change-Id: I08c7654bad53aad3a1b72c8a229973f889045902
|
3f9c18ed225decec4e73325d561feea310546796 |
20-Sep-2012 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with jb-mr1-release - do not merge Change-Id: I264ae21c4a260cdf4e4f08d1ced7cae3cdc0a7ab
|
d93115936def8a60533711529e3893f1b5cc7a9c |
20-Sep-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
d09ac6c0173147a5c6a4869a344fec965308d46b |
20-Sep-2012 |
Wu-cheng Li <wuchengli@google.com> |
Merge "Remove CAN_USE_FLAG_SECURE constant." into gb-ub-photos-arches
|
735919847c476d8d70fad38765902351aa1ef9ae |
20-Sep-2012 |
Wu-cheng Li <wuchengli@google.com> |
Merge "Remove CAN_USE_FLAG_SECURE constant." into gb-ub-photos-arches
|
22b82bef36cc04d5f73a5eded39c096c4f35d42f |
20-Sep-2012 |
Wu-cheng Li <wuchengli@google.com> |
Merge "Hide grid view menu item in secure album." into gb-ub-photos-arches
|
7d3f604287805c6f00adb4e69e1c26488acf3487 |
20-Sep-2012 |
Wu-cheng Li <wuchengli@google.com> |
Merge "Hide grid view menu item in secure album." into gb-ub-photos-arches
|
58379a0f462b13106dacabdf896fa1e22af1cc85 |
19-Sep-2012 |
Wu-cheng Li <wuchengli@google.com> |
Remove CAN_USE_FLAG_SECURE constant. bug:7191713 Change-Id: Ia439970d9b51316ccf003fa17453deed7a27cf2b
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
|
626baf694dcf3f4b27313ce5f6b33be7a5124ff6 |
19-Sep-2012 |
Wu-cheng Li <wuchengli@google.com> |
Remove CAN_USE_FLAG_SECURE constant. bug:7191713 Change-Id: Ia439970d9b51316ccf003fa17453deed7a27cf2b
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
|
32727c5c8844da540801486fe45de5056cbf4008 |
19-Sep-2012 |
Wu-cheng Li <wuchengli@google.com> |
Remove CAN_USE_FLAG_SECURE constant. bug:7191713 Change-Id: Ia439970d9b51316ccf003fa17453deed7a27cf2b
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
|
556d928aa36781b56236fa1fb4669eff56c39cd3 |
20-Sep-2012 |
Wu-cheng Li <wuchengli@google.com> |
Hide grid view menu item in secure album. bug:7200451 Change-Id: I23b6fbc48aac46e9b25b159416bc9f64a357d038
rc/com/android/gallery3d/app/PhotoPage.java
|
fc3651d38708c6475b808b6fad27ee66bdd6ee04 |
20-Sep-2012 |
Wu-cheng Li <wuchengli@google.com> |
Hide grid view menu item in secure album. bug:7200451 Change-Id: I23b6fbc48aac46e9b25b159416bc9f64a357d038
rc/com/android/gallery3d/app/PhotoPage.java
|
ca2cdc2a65606c9ffd2954367dac4e0f8e79188b |
19-Sep-2012 |
Earl Ou <shunhsingou@google.com> |
Fix metadata of cropped image for details display. + drop the old thumbnail of the cropped image + update DateTime tag in EXIF + add EXIF Software tag + display DATE_MODIFIED in details instead of DATE_TAKEN Bug:7192433 Change-Id: I89dcb29dd3242f58fe96cd25398217e94f42fc97
rc/com/android/gallery3d/app/CropImage.java
rc/com/android/gallery3d/data/LocalImage.java
rc/com/android/gallery3d/data/LocalMediaItem.java
rc/com/android/gallery3d/exif/ExifData.java
rc/com/android/gallery3d/exif/ExifTag.java
|
133c49e9bda0b3dcc005a0dfc7ab999926c0ef7f |
19-Sep-2012 |
Earl Ou <shunhsingou@google.com> |
Fix metadata of cropped image for details display. + drop the old thumbnail of the cropped image + update DateTime tag in EXIF + add EXIF Software tag + display DATE_MODIFIED in details instead of DATE_TAKEN Bug:7192433 Change-Id: I89dcb29dd3242f58fe96cd25398217e94f42fc97
rc/com/android/gallery3d/app/CropImage.java
rc/com/android/gallery3d/data/LocalImage.java
rc/com/android/gallery3d/data/LocalMediaItem.java
rc/com/android/gallery3d/exif/ExifData.java
rc/com/android/gallery3d/exif/ExifTag.java
|
146f1ba7e3586428624db5b1b2189867bf01e538 |
20-Sep-2012 |
Hung-ying Tyan <tyanh@google.com> |
Merge "Tests for ExifData" into gb-ub-photos-arches
|
7a0b5fecd1cc1276c0c0ce6a1337b122cd3e70f8 |
20-Sep-2012 |
Hung-ying Tyan <tyanh@google.com> |
Merge "Tests for ExifData" into gb-ub-photos-arches
|
17d76c9d27d6ac09ef3fcc8bef8e26c80cc6ccf0 |
20-Sep-2012 |
Hung-ying Tyan <tyanh@google.com> |
Merge "Simplify the usage of ExifData" into gb-ub-photos-arches
|
c6c63414293c31bdc4c10ebb5e8f232306d136ec |
20-Sep-2012 |
Hung-ying Tyan <tyanh@google.com> |
Merge "Simplify the usage of ExifData" into gb-ub-photos-arches
|
825ad7babd740577a6f42489bf4f1a03935076fd |
18-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
Add bottom bar UI for photo page Bug: 7050303 Bug: 7170148 Pulled the handling of the display of the edit (FX) button out into a separate file and put in the groundwork for supporting multiple buttons within a container along the bottom of the screen and managing their display as well as animating them in and out. Also added a button for launching the panorama viewer when appropriate Change-Id: Iee3083e0693ef3c1f55264b922f02b9a702d2103
es/layout/photopage_bottom_controls.xml
|
091e299adaf8d0df1151e0e12dbca87e60661752 |
18-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
Add bottom bar UI for photo page Bug: 7050303 Bug: 7170148 Pulled the handling of the display of the edit (FX) button out into a separate file and put in the groundwork for supporting multiple buttons within a container along the bottom of the screen and managing their display as well as animating them in and out. Also added a button for launching the panorama viewer when appropriate Change-Id: Iee3083e0693ef3c1f55264b922f02b9a702d2103
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/app/PhotoPageBottomControls.java
|
f44499dda32783cc74643723ed01ce636e81b186 |
18-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
Add bottom bar UI for photo page Bug: 7050303 Bug: 7170148 Pulled the handling of the display of the edit (FX) button out into a separate file and put in the groundwork for supporting multiple buttons within a container along the bottom of the screen and managing their display as well as animating them in and out. Also added a button for launching the panorama viewer when appropriate Change-Id: Iee3083e0693ef3c1f55264b922f02b9a702d2103
es/layout/photopage_bottom_controls.xml
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/app/PhotoPageBottomControls.java
|
af8391b14a7ab43618da8874ba21ce8f7243b162 |
20-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
Make ActionBar always present in filmstrip Bug: 7196718 Change-Id: Id297f28402da20efd99a9f90376a18f041fe8448
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/ui/PhotoView.java
|
56bdcb7272f222fde5e4c6fc133cb490b31c7667 |
20-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
Make ActionBar always present in filmstrip Bug: 7196718 Change-Id: Id297f28402da20efd99a9f90376a18f041fe8448
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/ui/PhotoView.java
|
c6ab8e66459865a87efd9a99091439c7496d4cd1 |
20-Sep-2012 |
Jean-Baptiste Queru <jbq@google.com> |
Reconcile branches Change-Id: Ifa5c1684906f14596e9530cb86db8a568776cbcd
|
a45ae2c4dd76f7c36cee0f8e5d91294d8714fb5d |
19-Sep-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I87c1664b1a905b42035da98f051feb0fcd001cc0 Auto-generated-cl: translation import
es/values-et/strings.xml
|
d9bc0d97e9dd8d10f5c07ccbdc99ccac11ab1d11 |
19-Sep-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ifa642d4cd44fa4751660dc13593b12e419ff356f Auto-generated-cl: translation import
es/values-et/strings.xml
|
f5af22101142aec7b73323f3c07909833daf27a5 |
19-Sep-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ifa642d4cd44fa4751660dc13593b12e419ff356f Auto-generated-cl: translation import
es/values-et/strings.xml
|
b32ed62b8e5ba6a9bd547cfbde88a56174bf375d |
19-Sep-2012 |
Ed Heyl <edheyl@google.com> |
reset jb-mr1-dev branch to photos-a branch
|
5c0710968ad576fee79abe7d4f03a0d3188377f1 |
19-Sep-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
2abb15cd5ac2dc5987c409023af2d1bf7851d74c |
19-Sep-2012 |
Earl Ou <shunhsingou@google.com> |
Tests for ExifData Bug:7192363 Change-Id: Ic74ecad2eff50e26efa85f928ef7904a2c51ecc7
ests/src/com/android/gallery3d/exif/ExifDataTest.java
ests/src/com/android/gallery3d/exif/ExifOutputStreamTest.java
ests/src/com/android/gallery3d/exif/ExifParserTest.java
ests/src/com/android/gallery3d/exif/ExifReaderTest.java
ests/src/com/android/gallery3d/exif/ExifTagTest.java
ests/src/com/android/gallery3d/exif/ExifTestRunner.java
ests/src/com/android/gallery3d/exif/ExifXmlDataTestCase.java
|
ce64bc9790075359aa99874351850384057dfa5d |
19-Sep-2012 |
Earl Ou <shunhsingou@google.com> |
Tests for ExifData Bug:7192363 Change-Id: Ic74ecad2eff50e26efa85f928ef7904a2c51ecc7
ests/src/com/android/gallery3d/exif/ExifDataTest.java
ests/src/com/android/gallery3d/exif/ExifOutputStreamTest.java
ests/src/com/android/gallery3d/exif/ExifParserTest.java
ests/src/com/android/gallery3d/exif/ExifReaderTest.java
ests/src/com/android/gallery3d/exif/ExifTagTest.java
ests/src/com/android/gallery3d/exif/ExifTestRunner.java
ests/src/com/android/gallery3d/exif/ExifXmlDataTestCase.java
|
b5b30a05b575cac7b00e5f793004900307c3cbc6 |
30-Aug-2012 |
Earl Ou <shunhsingou@google.com> |
Simplify the usage of ExifData Bug:7192363 Change-Id: I2c6ab9974f4472f63483a4de814728584944535e
rc/com/android/gallery3d/app/CropImage.java
rc/com/android/gallery3d/exif/ExifData.java
rc/com/android/gallery3d/exif/ExifOutputStream.java
rc/com/android/gallery3d/exif/ExifParser.java
rc/com/android/gallery3d/exif/ExifTag.java
rc/com/android/gallery3d/exif/IfdData.java
ests/src/com/android/gallery3d/exif/ExifParserTest.java
ests/src/com/android/gallery3d/exif/ExifReaderTest.java
|
89591324c5d1097e59217177ad3ea74598867584 |
30-Aug-2012 |
Earl Ou <shunhsingou@google.com> |
Simplify the usage of ExifData Bug:7192363 Change-Id: I2c6ab9974f4472f63483a4de814728584944535e
rc/com/android/gallery3d/app/CropImage.java
rc/com/android/gallery3d/exif/ExifData.java
rc/com/android/gallery3d/exif/ExifOutputStream.java
rc/com/android/gallery3d/exif/ExifParser.java
rc/com/android/gallery3d/exif/ExifTag.java
rc/com/android/gallery3d/exif/IfdData.java
ests/src/com/android/gallery3d/exif/ExifParserTest.java
ests/src/com/android/gallery3d/exif/ExifReaderTest.java
|
5439e7f0ec09c59c1159c2ba233ecd95f26fb9fe |
19-Sep-2012 |
Pin Ting <pinting@google.com> |
Merge "Use 565 pixel format for pre-JB; use 888 otherwise." into gb-ub-photos-arches
|
577f939faa74e6189152bc016666d79dc647de4a |
19-Sep-2012 |
Pin Ting <pinting@google.com> |
Merge "Use 565 pixel format for pre-JB; use 888 otherwise." into gb-ub-photos-arches
|
026f5ae50aa45536805c286f03775e1c28c4b983 |
19-Sep-2012 |
Pin Ting <pinting@google.com> |
Use 565 pixel format for pre-JB; use 888 otherwise. Bug:7189512 Change-Id: Iec5d528fef4f4fc589370339add299a40fc8f26e
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
|
c5378acab92e5d9428e35acc595f09c4bfcb3823 |
19-Sep-2012 |
Pin Ting <pinting@google.com> |
Use 565 pixel format for pre-JB; use 888 otherwise. Bug:7189512 Change-Id: Iec5d528fef4f4fc589370339add299a40fc8f26e
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
rc/com/android/gallery3d/ui/GLRootView.java
rc/com/android/gallery3d/ui/GalleryEGLConfigChooser.java
|
2e1771b997ab6966411b2c612562c538ae3e325d |
19-Sep-2012 |
Pin Ting <pinting@google.com> |
Use 565 pixel format for pre-JB; use 888 otherwise. Bug:7189512 Change-Id: Iec5d528fef4f4fc589370339add299a40fc8f26e
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
rc/com/android/gallery3d/ui/GLRootView.java
rc/com/android/gallery3d/ui/GalleryEGLConfigChooser.java
|
a7f4e15ea94735e31739dd1122ed97018a552dfd |
18-Sep-2012 |
George Mount <mount@google.com> |
Add UriImage support for viewing LightCycle panoramas. Change-Id: I7f61cef39370fd23b9481708dc3c902c17873074
rc/com/android/gallery3d/app/PhotoDataAdapter.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/app/SinglePhotoDataAdapter.java
rc/com/android/gallery3d/data/LocalImage.java
rc/com/android/gallery3d/data/MediaItem.java
rc/com/android/gallery3d/data/UriImage.java
rc_pd/com/android/gallery3d/util/LightCycleHelper.java
|
f8a39c644637a15b9291eb9299762b8cf91cd76a |
18-Sep-2012 |
George Mount <mount@google.com> |
Add UriImage support for viewing LightCycle panoramas. Change-Id: I7f61cef39370fd23b9481708dc3c902c17873074
rc/com/android/gallery3d/app/PhotoDataAdapter.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/app/SinglePhotoDataAdapter.java
rc/com/android/gallery3d/data/LocalImage.java
rc/com/android/gallery3d/data/MediaItem.java
rc/com/android/gallery3d/data/UriImage.java
rc_pd/com/android/gallery3d/util/LightCycleHelper.java
|
0bb34d3547f62df1a1fbc0bb261b9ffaba280b40 |
18-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Fix incorrect texture size causing artifacts in animation" into gb-ub-photos-arches
|
17ac550d1c73ce89a6fa7f68c5b02fc44e6030b3 |
18-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Fix incorrect texture size causing artifacts in animation" into gb-ub-photos-arches
|
c0187742021786e5a736eb83b2921b3a4bf6ca85 |
18-Sep-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
53c755963bfab7614c1c2fe381d7c2b767606ed5 |
18-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
Fix incorrect texture size causing artifacts in animation Bug: 7181383 Change-Id: I3895b89ccdd03e55acc656f0d6944f4a9d398ad5
rc/com/android/gallery3d/app/AlbumPage.java
rc/com/android/gallery3d/app/AlbumSetPage.java
rc/com/android/gallery3d/ui/PreparePageFadeoutTexture.java
|
7077701c8b11f6022cc712f5450e0f7b29535e41 |
18-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
Fix incorrect texture size causing artifacts in animation Bug: 7181383 Change-Id: I3895b89ccdd03e55acc656f0d6944f4a9d398ad5
rc/com/android/gallery3d/app/AlbumPage.java
rc/com/android/gallery3d/app/AlbumSetPage.java
rc/com/android/gallery3d/ui/PreparePageFadeoutTexture.java
|
4cb71a4cefa7ad7fb3bb740ff67c584e9499b535 |
17-Sep-2012 |
Wu-cheng Li <wuchengli@google.com> |
Do not show edit button in secure album. bug:7183052 Change-Id: I94ca6703e5c3a0e2af552be2065be361210185b2
rc/com/android/gallery3d/app/PhotoPage.java
|
58f898c9cc0228f084d903b5d27ae609cedfc9b9 |
17-Sep-2012 |
Wu-cheng Li <wuchengli@google.com> |
Do not show edit button in secure album. bug:7183052 Change-Id: I94ca6703e5c3a0e2af552be2065be361210185b2
rc/com/android/gallery3d/app/PhotoPage.java
|
c7e76d52814e75bd8654835b25b954c47db833f7 |
17-Sep-2012 |
Wu-cheng Li <wuchengli@google.com> |
Use a different task affinity for secure camera. This makes sure non-secure camera activity is not started in secure lock screen. Also add excludeFromRecents for secure camera. bug:7148152 Change-Id: I18a10ccf95f22563aad59d5d936470af47596b91
ndroidManifest.xml
|
2e346284c10c968300833708aa3c8acd8cf5abe7 |
17-Sep-2012 |
Wu-cheng Li <wuchengli@google.com> |
Use a different task affinity for secure camera. This makes sure non-secure camera activity is not started in secure lock screen. Also add excludeFromRecents for secure camera. bug:7148152 Change-Id: I18a10ccf95f22563aad59d5d936470af47596b91
ndroidManifest.xml
|
032fa41a5f0703fea4f063bdb5541505c8afbc40 |
18-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
Reskin: increase album icon size Bug: 7050303 Change-Id: I29c804ec74c797f112950481ea2b606508950033
es/values/dimensions.xml
|
8fd3e79fbe43e002751c448fb273df085f75cbbf |
18-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
Reskin: increase album icon size Bug: 7050303 Change-Id: I29c804ec74c797f112950481ea2b606508950033
es/values/dimensions.xml
|
ea412e3624c23a65812e86e1d2bf2b5ae7b1ed0a |
18-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Fix bugs relating to grid/filmstrip switching" into gb-ub-photos-arches
|
e508d0198377d6fe56650814f137a30285367d44 |
18-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Fix bugs relating to grid/filmstrip switching" into gb-ub-photos-arches
|
bcec1d75de1471623c8efdbaddaa8c76dc379b96 |
17-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
Don't switch back to fullscreen camera when flinging Bug: 7145903 Bug: 7050303 It was very annoying to users to fling in the filmstrip and end up in the fullscreen camera mode, so disabling that. Long-term, we want to be smarter about this and do the zoom to the full-screen if it's a short swipe rather than a fling. Change-Id: I40ac4848a267c06fc41e161a7a292b8f03b2ef4c
rc/com/android/gallery3d/ui/PhotoView.java
|
83380c9f6b75603633bbec2efa1034d4de489e7b |
17-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
Don't switch back to fullscreen camera when flinging Bug: 7145903 Bug: 7050303 It was very annoying to users to fling in the filmstrip and end up in the fullscreen camera mode, so disabling that. Long-term, we want to be smarter about this and do the zoom to the full-screen if it's a short swipe rather than a fling. Change-Id: I40ac4848a267c06fc41e161a7a292b8f03b2ef4c
rc/com/android/gallery3d/ui/PhotoView.java
|
9193ac8ef029767254e4c3dfd49f73156c307f55 |
17-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
Fix bugs relating to grid/filmstrip switching Bug: 7180582 Bug: 7146147 Change-Id: I3d2ad8866a938f9f162e14f11bc2e021834ba513
rc/com/android/gallery3d/app/AlbumPage.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/data/FilterDeleteSet.java
|
a9b52df63ae6edbe0f2158bfc3c701fde41782c1 |
17-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
Fix bugs relating to grid/filmstrip switching Bug: 7180582 Bug: 7146147 Change-Id: I3d2ad8866a938f9f162e14f11bc2e021834ba513
rc/com/android/gallery3d/app/AlbumPage.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/data/FilterDeleteSet.java
|
6d634842ffe2ec5d9d0c7984140145da06f53ffc |
17-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Reskin: do not show edit (FX) button in filmstrip mode" into gb-ub-photos-arches
|
41ba75e788cac9cbd867e8afb93064e7004fac64 |
17-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Reskin: update colors to match latest mocks" into gb-ub-photos-arches
|
8b94f996ad82ce26a66be6ba8f40c487a847b3da |
17-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Reskin: update colors to match latest mocks" into gb-ub-photos-arches
|
b10323d962c5dcd875c88ef4cc21e7b332b24974 |
17-Sep-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
|
5d54be7c82a3534cb921c9128677f9f299bf01ff |
17-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
Reskin: do not show edit (FX) button in filmstrip mode Bug: 7050303 Change-Id: Ibab686bc8581e8cc24a722950ff3b8b77023edd4
rc/com/android/gallery3d/app/PhotoPage.java
|
d4553b1337cf6729ee3bc572b9cb3841145db7dd |
17-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
Reskin: do not show edit (FX) button in filmstrip mode Bug: 7050303 Change-Id: Ibab686bc8581e8cc24a722950ff3b8b77023edd4
rc/com/android/gallery3d/app/PhotoPage.java
|
7402dfa165e7ed3f98cdd675dbc5325c6acb16df |
17-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
Reskin: update colors to match latest mocks Bug: 7050303 Change-Id: Ie582fe561d763a5010a0aea8b3a391237f5fbc1e
es/values/colors.xml
|
6f1fedc4150e16f31d676b00bf07a13c4ba8e5e9 |
17-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
Reskin: update colors to match latest mocks Bug: 7050303 Change-Id: Ie582fe561d763a5010a0aea8b3a391237f5fbc1e
es/values/colors.xml
|
debbda532909e0bae11e67aa4328516faeeee77b |
17-Sep-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I890266e488c3478118e471e3f84217e654ecb589 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-cs/strings.xml
es/values-de/strings.xml
es/values-es-rUS/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
7c614e8078674fdd426ac3196ad56821a8f063c4 |
17-Sep-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I890266e488c3478118e471e3f84217e654ecb589 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-cs/strings.xml
es/values-de/strings.xml
es/values-es-rUS/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
8cfc7f0ce4bed1538b85b40fe08a5528cac8c270 |
17-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
Fix build breakage Change-Id: I88f1a9f2f1306d959d6a5398faa2c6f50cb24501
rc/com/android/gallery3d/app/AlbumSetPage.java
|
f5cf4adb019ed662af8d30d54dc78a160a7b4370 |
17-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
Fix build breakage Change-Id: I88f1a9f2f1306d959d6a5398faa2c6f50cb24501
rc/com/android/gallery3d/app/AlbumSetPage.java
|
d208e12012152bf757c0492cd3bfc91f101294cc |
14-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
Show large button to open the camera when gallery is empty Bug: 7156303 Change-Id: I0447c3eaee680e80f09cc3aff714aace85ee77d9
rc/com/android/gallery3d/app/AlbumSetPage.java
|
ba9c3f7993b817c2b1310138c8a2a48d681a000e |
14-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
Show large button to open the camera when gallery is empty Bug: 7156303 Change-Id: I0447c3eaee680e80f09cc3aff714aace85ee77d9
rc/com/android/gallery3d/app/AlbumSetPage.java
|
aa5b0e41a6d61b2806f3bbffc89c70fa308ddd3b |
17-Sep-2012 |
Michael Kolb <kolby@google.com> |
Fix manifest to launch correct activity Bug: 7175368 Change task affinity to launch correct camera activity Change-Id: I6bd22a8b64317a8e37f4c13ebf374465096662e7
ndroidManifest.xml
|
617040c5c479d0229342734e4933b63b22be114b |
17-Sep-2012 |
Michael Kolb <kolby@google.com> |
Fix manifest to launch correct activity Bug: 7175368 Change task affinity to launch correct camera activity Change-Id: I6bd22a8b64317a8e37f4c13ebf374465096662e7
ndroidManifest.xml
|
951f46f2147efa7589e2be1c737929fffd415812 |
17-Sep-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
36a1062a8a6bca02b1238ae3d22673112e1930c9 |
15-Sep-2012 |
Doris Liu <tianliu@google.com> |
Update AndroidManifest for video caputure intent in the new camera Bug: 7174617 Change-Id: Ib749615fbcb4bc8c882138d29ed234441ca4103e
ndroidManifest.xml
|
1a875b21515baa2f105d9970a3e1d615f771d538 |
15-Sep-2012 |
Doris Liu <tianliu@google.com> |
Update AndroidManifest for video caputure intent in the new camera Bug: 7174617 Change-Id: Ib749615fbcb4bc8c882138d29ed234441ca4103e
ndroidManifest.xml
|
c605ef03a8e4263646c40dfcf86e839f5e403e73 |
16-Sep-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
093829c3f2f91e6722a4c676ba9e833e2a4e291c |
15-Sep-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
|
4d751041a09c1c536b209eb9b313b905c0be6166 |
14-Sep-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
dfb1c8c3160c640a84a28f2a0ebf21b6648aa543 |
14-Sep-2012 |
Mangesh Ghiware <mghiware@google.com> |
Add launcher icon for old camera UI Needed for testing HAL Change-Id: I528fe4564d1e2a2b9fe0e2a5be711da3c98a4a45
ndroidManifest.xml
|
c6ece8cc3c941803a77b3c58fa5e4ec7e0a6a744 |
14-Sep-2012 |
Mangesh Ghiware <mghiware@google.com> |
Add launcher icon for old camera UI Needed for testing HAL Change-Id: I528fe4564d1e2a2b9fe0e2a5be711da3c98a4a45
ndroidManifest.xml
|
9b12d9fe96aa6381ff11348549e699db6f18d35e |
14-Sep-2012 |
Mangesh Ghiware <mghiware@google.com> |
Handle image capture intent using new camera UI. Bug: 7166362 Change-Id: I253230342803c12d25025378ef80ba3ef96a1233
ndroidManifest.xml
|
fd9924947260eb2851843ef1e91b47e10eae1337 |
14-Sep-2012 |
Mangesh Ghiware <mghiware@google.com> |
Handle image capture intent using new camera UI. Bug: 7166362 Change-Id: I253230342803c12d25025378ef80ba3ef96a1233
ndroidManifest.xml
|
9e1cc034ee4f9a694591e6ba2d210bcd3f4ecda2 |
14-Sep-2012 |
Mangesh Ghiware <mghiware@google.com> |
Merge "Update AndroidManifest.xml" into gb-ub-photos-arches
|
174cc63800b3f6cb6df445a8f239dc6720c1b079 |
14-Sep-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I223da3a3d940255346be9eef7d8234f7f845cd2d Auto-generated-cl: translation import
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-ca/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-ru/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-uk/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
379bb554385d24ec3d196c4bba76b556dc29ad1a |
14-Sep-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I223da3a3d940255346be9eef7d8234f7f845cd2d Auto-generated-cl: translation import
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-ca/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-ru/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-uk/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
40c697f4f17dc8dddd504d42700de1c6359b06f8 |
14-Sep-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
a03ff6f3fad765def142825d70722922f34d6a5e |
14-Sep-2012 |
Mangesh Ghiware <mghiware@google.com> |
Update AndroidManifest.xml Handle launcher, camera, and video camera intents using new CameraActivity. Continue to handle image and video capture intents using old Camera and VideoCamera activities. Bug: 7167758 Change-Id: Idfddedf04c9664a368f745ebf3f5b44c3d584207
ndroidManifest.xml
|
0454ddea71cb03db9e72b16024f8a55ed3b88b72 |
14-Sep-2012 |
Mangesh Ghiware <mghiware@google.com> |
Update AndroidManifest.xml Handle launcher, camera, and video camera intents using new CameraActivity. Continue to handle image and video capture intents using old Camera and VideoCamera activities. Bug: 7167758 Change-Id: Idfddedf04c9664a368f745ebf3f5b44c3d584207
ndroidManifest.xml
|
6dc73063d683a05509467c915d306c2f68434bc0 |
14-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Only show FX button for photos" into gb-ub-photos-arches
|
0b0283daab224412f9b3f7d04294ddea83d8f582 |
14-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Only show FX button for photos" into gb-ub-photos-arches
|
d2ba8d7efb61b5c1a57b3ceb3e29da0dda484afc |
14-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Show animation when opening albums directly in filmstrip" into gb-ub-photos-arches
|
e18ad87571a6a9f0e1943f9c527c8d908494256e |
14-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Show animation when opening albums directly in filmstrip" into gb-ub-photos-arches
|
07c3fac5195496cb18ec60c82ffc036fc567fd99 |
14-Sep-2012 |
Owen Lin <owenlin@google.com> |
Merge "Cancel the loading task when clicking on back in Cropping." into gb-ub-photos-arches
|
2873cd146c22734371c1ee458131d56616f25e6a |
14-Sep-2012 |
Owen Lin <owenlin@google.com> |
Merge "Cancel the loading task when clicking on back in Cropping." into gb-ub-photos-arches
|
726602b9f9b57dcfc213d2a7752ef111389da620 |
14-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
Only show FX button for photos Bug: 7165294 Change-Id: Ia35f5981cba5a69f94964a9c38361b01ea1cdbfd
rc/com/android/gallery3d/app/PhotoPage.java
|
14ad4efd409887a0f4cd90e29818c8c3bd2ece8f |
14-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
Only show FX button for photos Bug: 7165294 Change-Id: Ia35f5981cba5a69f94964a9c38361b01ea1cdbfd
rc/com/android/gallery3d/app/PhotoPage.java
|
a14c4dbc5719fdc95648a1cb4eb7b617836e2a35 |
14-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
Show animation when opening albums directly in filmstrip Bug: 7166947 Change-Id: Id67e93431365043673e08b400aea5df9ae53f14c
rc/com/android/gallery3d/app/AlbumSetPage.java
|
6b64c0670429a41b1fabb36e679a36b7e6fa9194 |
14-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
Show animation when opening albums directly in filmstrip Bug: 7166947 Change-Id: Id67e93431365043673e08b400aea5df9ae53f14c
rc/com/android/gallery3d/app/AlbumSetPage.java
|
292dc44db465f060bbb9ff0346ac6332c427b3fa |
14-Sep-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
|
ee96fa8b2c67ab4ae2ac1cb3c0d9795af04cc9b7 |
14-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
Animate correctly when opening single-photo album Bug: 7164177 Change-Id: I5ce60a8e842e3ddf0e356568f17ee488edef23cd
rc/com/android/gallery3d/app/AlbumPage.java
rc/com/android/gallery3d/app/AlbumSetPage.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/ui/PreparePageFadeoutTexture.java
rc/com/android/gallery3d/ui/SlotView.java
|
51bc561e85053abfd7fda695e3cd20710acca85c |
14-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
Animate correctly when opening single-photo album Bug: 7164177 Change-Id: I5ce60a8e842e3ddf0e356568f17ee488edef23cd
rc/com/android/gallery3d/app/AlbumPage.java
rc/com/android/gallery3d/app/AlbumSetPage.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/ui/PreparePageFadeoutTexture.java
rc/com/android/gallery3d/ui/SlotView.java
|
cf73c177f2308afa19fb3c19143403e5ba65f914 |
13-Sep-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I726d6cc6d3948b7a6ddf248ec17e4db91689344a Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
0d1ed05f4eeea4ff6e4c0f8067ea65242f485090 |
13-Sep-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I726d6cc6d3948b7a6ddf248ec17e4db91689344a Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
1acc7da7aa512a551b3cc77f9e6d91b1a685c85e |
13-Sep-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
bd12e52656278fd61635c7d54bfe493e80dc9817 |
13-Sep-2012 |
Owen Lin <owenlin@google.com> |
Cancel the loading task when clicking on back in Cropping. bug: 5636363 Change-Id: I0e00b6119c4d184328002d1b2128e33ababc798b
rc/com/android/gallery3d/app/CropImage.java
|
222c07220dbe5b1be959437eb315ae72a0c8aa50 |
13-Sep-2012 |
Owen Lin <owenlin@google.com> |
Cancel the loading task when clicking on back in Cropping. bug: 5636363 Change-Id: I0e00b6119c4d184328002d1b2128e33ababc798b
rc/com/android/gallery3d/app/CropImage.java
|
cfa55ef2cf5d09e22ffc28c2fd7c89b872f7be96 |
12-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
Reskin: Fix stability bugs introduced by reskin Bug: 7150348 Bug: 7144206 Bug: 7050303 If PhotoPage is launched/resumed on a completely empty album (for instance, if Gallery was opened to the Camera folder and paused, all photos were deleted via the Camera app, and then Gallery is resumed), bail out of PhotoPage since it cannot handle this. Also fixes an NPE. Change-Id: I162ff5ad149c322704c8af7d4705d87ae6c6098a
rc/com/android/gallery3d/app/AlbumPage.java
rc/com/android/gallery3d/app/PhotoPage.java
|
b265ebb01cc046b74329eeb28dbecb24e0f953d2 |
13-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
When tapping single-photo albums, launch photo directly Bug: 7145102 Change-Id: I75c66f2f37fc11f3846fdbd40083787ba38af207
rc/com/android/gallery3d/app/AlbumSetPage.java
rc/com/android/gallery3d/app/PhotoPage.java
|
2cd3567be7f92c5e89beecc2d672768ef05507c7 |
13-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
When tapping single-photo albums, launch photo directly Bug: 7145102 Change-Id: I75c66f2f37fc11f3846fdbd40083787ba38af207
rc/com/android/gallery3d/app/AlbumSetPage.java
rc/com/android/gallery3d/app/PhotoPage.java
|
9b3c279ce002fbf9305966461e465e8e611de446 |
13-Sep-2012 |
Teng-Hui Zhu <ztenghui@google.com> |
Merge "Make ndk-build happy for Gallery jni." into gb-ub-photos-arches
|
1de93cc0cbd940ed1d07048dda56406e7c3a7d96 |
12-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
Reskin: Fix stability bugs introduced by reskin Bug: 7150348 Bug: 7144206 Bug: 7050303 If PhotoPage is launched/resumed on a completely empty album (for instance, if Gallery was opened to the Camera folder and paused, all photos were deleted via the Camera app, and then Gallery is resumed), bail out of PhotoPage since it cannot handle this. Also fixes an NPE. Change-Id: I162ff5ad149c322704c8af7d4705d87ae6c6098a
rc/com/android/gallery3d/app/AlbumPage.java
rc/com/android/gallery3d/app/PhotoPage.java
|
d397378f8a1a2a1107e258155448b02599fdc2ce |
12-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
Reskin: Fix stability bugs introduced by reskin Bug: 7150348 Bug: 7144206 Bug: 7050303 If PhotoPage is launched/resumed on a completely empty album (for instance, if Gallery was opened to the Camera folder and paused, all photos were deleted via the Camera app, and then Gallery is resumed), bail out of PhotoPage since it cannot handle this. Also fixes an NPE. Change-Id: I162ff5ad149c322704c8af7d4705d87ae6c6098a
rc/com/android/gallery3d/app/AlbumPage.java
rc/com/android/gallery3d/app/PhotoPage.java
|
553070be484d59488605b4da0cafb0723946215b |
12-Sep-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
a1d65900c67ba487dec08727bcd70084ae7f90bf |
12-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Reskin: fix bug introduce by Gallery reskin" into gb-ub-photos-arches
|
b5c28dec15896a8f75c47aed932b66ec11e01425 |
12-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Reskin: fix bug introduce by Gallery reskin" into gb-ub-photos-arches
|
879ba7b0cd6d9fa61bd412ecb32fc8f156eda843 |
12-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
Launch next-gen editor if present and show FX button Bug: 7050303 Shows editor button on the photo page and launches the next-gen photo editor if it is present on the device. Change-Id: I4058cffaec3fc4b446bd90dbecb809681d3255ea
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/data/FilterDeleteSet.java
|
a9948ef755f665f1327ef80760df3858f1030454 |
12-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
Launch next-gen editor if present and show FX button Bug: 7050303 Shows editor button on the photo page and launches the next-gen photo editor if it is present on the device. Change-Id: I4058cffaec3fc4b446bd90dbecb809681d3255ea
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/data/FilterDeleteSet.java
|
35be3cb85415d9f7252d60275a8ef0b01a72d9f3 |
11-Sep-2012 |
Teng-Hui Zhu <ztenghui@google.com> |
Make ndk-build happy for Gallery jni. Need to specify the APP_PLATFORM to support egl.h when running ndk-build locally. Change-Id: Ic2bf1e8b8021816063a123f5c2398727ea4b0493
ni/Application.mk
|
f472a4bfb9da267bdc0522d67c73267cf9e098cb |
11-Sep-2012 |
Teng-Hui Zhu <ztenghui@google.com> |
Make ndk-build happy for Gallery jni. Need to specify the APP_PLATFORM to support egl.h when running ndk-build locally. Change-Id: Ic2bf1e8b8021816063a123f5c2398727ea4b0493
ni/Application.mk
|
ada2073e38142154223a9703b1e26af6f58e0e16 |
11-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
Reskin: fix bug introduce by Gallery reskin Bug: 7146147 Bug: 7050303 Change-Id: Ia9782868937cc9a03e4c8b5f77033d13d80d5d8a
rc/com/android/gallery3d/app/AlbumPage.java
|
9159cccd5d7e840b04c2507bfe29c76e046a4f6f |
11-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
Reskin: fix bug introduce by Gallery reskin Bug: 7146147 Bug: 7050303 Change-Id: Ia9782868937cc9a03e4c8b5f77033d13d80d5d8a
rc/com/android/gallery3d/app/AlbumPage.java
|
3a6b33e50aa999d7c1b149a29bf8697d39e21489 |
11-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Reskin: stop at first photo after swipe from camera" into gb-ub-photos-arches
|
9e2feb16dac75187c71789435c6003b5f194ddd2 |
11-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Reskin: stop at first photo after swipe from camera" into gb-ub-photos-arches
|
9c4cf6d5c9d0ced9a19819e31392ecca0a754649 |
11-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
Reskin: stop at first photo after swipe from camera Bug: 6399763 Bug: 7050303 Change-Id: I433bead637416f3c6e47fdc7567bb5de7575c01c
rc/com/android/gallery3d/ui/PhotoView.java
|
dc10b30ba0366126ed1ad5133b36e97d76335049 |
11-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
Reskin: stop at first photo after swipe from camera Bug: 6399763 Bug: 7050303 Change-Id: I433bead637416f3c6e47fdc7567bb5de7575c01c
rc/com/android/gallery3d/ui/PhotoView.java
|
92fe93cc3ca759f488f82137fcb4476edfe1cf85 |
11-Sep-2012 |
George Mount <mount@google.com> |
Merge "Separate build for AOSP and Google panorama modules." into gb-ub-photos-arches
|
b6b2e0f617f7d3f6ea12d82d6add2607d341809d |
11-Sep-2012 |
George Mount <mount@google.com> |
Merge "Separate build for AOSP and Google panorama modules." into gb-ub-photos-arches
|
3e8946e66ba43e04f0837cee18a4865d6476209f |
24-Aug-2012 |
Teng-Hui Zhu <ztenghui@google.com> |
Add the UI elements for video trim activity. 1. Refactored the classes to support both the video play and trim. Now the common code for controller overlay is in CommonControllerOverlay, which is basically the same as the original MovieControllerOverlay without animation. Because in trimming, we don't want to hide all the controller. The specific animations are implemented in the sub-classes which are TrimControllerOverlay and MovieControllerOverlay. At the same time, TrimTimeBar extended TimeBar to support the extra trimming start scrubber and end scrubber. The interface between the timebar and the controllerOverlay are kept almost the same way, except adding the trimming info when necessary. With all these, the activity of TrimVideo now relied on the TrimTimeBar and TrimControllerOverlay. Similarily, the MovieActivity relied on the TimeBar and MovieControllerOverlay. 2. Hook the TrimVideo activity with the trim menu. Note that the icons are temporary for now, still need UX input on that. bug:7093055 Change-Id: Ib9bfbc090106744a569fce4c451ddffc0a2c699b
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
|
e7d37f56af35bbbb4a86392328a82cc4680aff47 |
24-Aug-2012 |
Teng-Hui Zhu <ztenghui@google.com> |
Add the UI elements for video trim activity. 1. Refactored the classes to support both the video play and trim. Now the common code for controller overlay is in CommonControllerOverlay, which is basically the same as the original MovieControllerOverlay without animation. Because in trimming, we don't want to hide all the controller. The specific animations are implemented in the sub-classes which are TrimControllerOverlay and MovieControllerOverlay. At the same time, TrimTimeBar extended TimeBar to support the extra trimming start scrubber and end scrubber. The interface between the timebar and the controllerOverlay are kept almost the same way, except adding the trimming info when necessary. With all these, the activity of TrimVideo now relied on the TrimTimeBar and TrimControllerOverlay. Similarily, the MovieActivity relied on the TimeBar and MovieControllerOverlay. 2. Hook the TrimVideo activity with the trim menu. Note that the icons are temporary for now, still need UX input on that. bug:7093055 Change-Id: Ib9bfbc090106744a569fce4c451ddffc0a2c699b
ndroidManifest.xml
|
a1a2f784d285e7ee8e6e65d5fbee6f903655d888 |
24-Aug-2012 |
Teng-Hui Zhu <ztenghui@google.com> |
Add the UI elements for video trim activity. 1. Refactored the classes to support both the video play and trim. Now the common code for controller overlay is in CommonControllerOverlay, which is basically the same as the original MovieControllerOverlay without animation. Because in trimming, we don't want to hide all the controller. The specific animations are implemented in the sub-classes which are TrimControllerOverlay and MovieControllerOverlay. At the same time, TrimTimeBar extended TimeBar to support the extra trimming start scrubber and end scrubber. The interface between the timebar and the controllerOverlay are kept almost the same way, except adding the trimming info when necessary. With all these, the activity of TrimVideo now relied on the TrimTimeBar and TrimControllerOverlay. Similarily, the MovieActivity relied on the TimeBar and MovieControllerOverlay. 2. Hook the TrimVideo activity with the trim menu. Note that the icons are temporary for now, still need UX input on that. bug:7093055 Change-Id: Ib9bfbc090106744a569fce4c451ddffc0a2c699b
es/layout/trim_view.xml
es/menu/trim.xml
es/values/strings.xml
|
25930913dc7129a1e6d07a88f9b79d69029d2535 |
24-Aug-2012 |
Teng-Hui Zhu <ztenghui@google.com> |
Add the UI elements for video trim activity. 1. Refactored the classes to support both the video play and trim. Now the common code for controller overlay is in CommonControllerOverlay, which is basically the same as the original MovieControllerOverlay without animation. Because in trimming, we don't want to hide all the controller. The specific animations are implemented in the sub-classes which are TrimControllerOverlay and MovieControllerOverlay. At the same time, TrimTimeBar extended TimeBar to support the extra trimming start scrubber and end scrubber. The interface between the timebar and the controllerOverlay are kept almost the same way, except adding the trimming info when necessary. With all these, the activity of TrimVideo now relied on the TrimTimeBar and TrimControllerOverlay. Similarily, the MovieActivity relied on the TimeBar and MovieControllerOverlay. 2. Hook the TrimVideo activity with the trim menu. Note that the icons are temporary for now, still need UX input on that. bug:7093055 Change-Id: Ib9bfbc090106744a569fce4c451ddffc0a2c699b
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
rc/com/android/gallery3d/app/CommonControllerOverlay.java
rc/com/android/gallery3d/app/ControllerOverlay.java
rc/com/android/gallery3d/app/MovieControllerOverlay.java
rc/com/android/gallery3d/app/MoviePlayer.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/app/TimeBar.java
rc/com/android/gallery3d/app/TrimControllerOverlay.java
rc/com/android/gallery3d/app/TrimTimeBar.java
rc/com/android/gallery3d/app/TrimVideo.java
rc/com/android/gallery3d/ui/MenuExecutor.java
|
3f1f1baf3a674927e25cd5cd885fb372796bd3a0 |
24-Aug-2012 |
Teng-Hui Zhu <ztenghui@google.com> |
Add the UI elements for video trim activity. 1. Refactored the classes to support both the video play and trim. Now the common code for controller overlay is in CommonControllerOverlay, which is basically the same as the original MovieControllerOverlay without animation. Because in trimming, we don't want to hide all the controller. The specific animations are implemented in the sub-classes which are TrimControllerOverlay and MovieControllerOverlay. At the same time, TrimTimeBar extended TimeBar to support the extra trimming start scrubber and end scrubber. The interface between the timebar and the controllerOverlay are kept almost the same way, except adding the trimming info when necessary. With all these, the activity of TrimVideo now relied on the TrimTimeBar and TrimControllerOverlay. Similarily, the MovieActivity relied on the TimeBar and MovieControllerOverlay. 2. Hook the TrimVideo activity with the trim menu. Note that the icons are temporary for now, still need UX input on that. bug:7093055 Change-Id: Ib9bfbc090106744a569fce4c451ddffc0a2c699b
ndroidManifest.xml
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
es/layout/trim_view.xml
es/menu/trim.xml
es/values/strings.xml
rc/com/android/gallery3d/app/CommonControllerOverlay.java
rc/com/android/gallery3d/app/ControllerOverlay.java
rc/com/android/gallery3d/app/MovieControllerOverlay.java
rc/com/android/gallery3d/app/MoviePlayer.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/app/TimeBar.java
rc/com/android/gallery3d/app/TrimControllerOverlay.java
rc/com/android/gallery3d/app/TrimTimeBar.java
rc/com/android/gallery3d/app/TrimVideo.java
rc/com/android/gallery3d/ui/MenuExecutor.java
|
cde4939a8fd562d181a07ff838e83c0badfeef49 |
11-Sep-2012 |
George Mount <mount@google.com> |
Separate build for AOSP and Google panorama modules. Change-Id: Icb1059569914711a704334282566d898f58d1a30
rc_pd/com/android/gallery3d/util/LightCycleHelper.java
|
4f9d4d54f2e5d9be7a737b73b8c91f1c5a5b21e8 |
11-Sep-2012 |
George Mount <mount@google.com> |
Separate build for AOSP and Google panorama modules. Change-Id: Icb1059569914711a704334282566d898f58d1a30
rc_pd/com/android/gallery3d/util/LightCycleHelper.java
|
e7b57c8e46bc97a460bd51f5903191b105dd0386 |
11-Sep-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
1a980d945c8715de18bdbe6406599503d812185f |
06-Sep-2012 |
Chih-Chung Chang <chihchung@google.com> |
Do not accept fling gesture after we changed from/to filmstrip mode. Change-Id: Ifb3d692bcf621ff02c6d4e6d91ba8484d702f905
rc/com/android/gallery3d/ui/PhotoView.java
|
e9494164bd7dd1c55c99b3ae1e842b88bf6abd78 |
06-Sep-2012 |
Chih-Chung Chang <chihchung@google.com> |
Do not accept fling gesture after we changed from/to filmstrip mode. Change-Id: Ifb3d692bcf621ff02c6d4e6d91ba8484d702f905
rc/com/android/gallery3d/ui/PhotoView.java
|
df6a98a8a7ff8cbbb0fc633ec855c66d4e306fbb |
11-Sep-2012 |
Owen Lin <owenlin@google.com> |
Merge "Don't start filmstrip mode in Get Content mode." into gb-ub-photos-arches
|
4e19aebb22c40beb18ed9b5e8d4c0a07e205674e |
11-Sep-2012 |
Owen Lin <owenlin@google.com> |
Merge "Don't start filmstrip mode in Get Content mode." into gb-ub-photos-arches
|
676d4762496eddae66930c6f8b0bae22a22b3ef6 |
04-Sep-2012 |
Owen Lin <owenlin@google.com> |
Ensure peekObject is called in the syncrhonization block. bug: 7019598 Change-Id: If153287078826afc9827ea64364b4fb64f2b3a5f
rc/com/android/gallery3d/app/AlbumDataLoader.java
rc/com/android/gallery3d/app/AlbumSetDataLoader.java
rc/com/android/gallery3d/app/PhotoDataAdapter.java
rc/com/android/gallery3d/data/ClusterAlbumSet.java
rc/com/android/gallery3d/data/DataManager.java
rc/com/android/gallery3d/data/LocalAlbum.java
rc/com/android/gallery3d/data/MediaSource.java
rc/com/android/gallery3d/data/MtpDevice.java
rc/com/android/gallery3d/data/Path.java
|
5251514287e41c57076029b08484d20beb5967b5 |
04-Sep-2012 |
Owen Lin <owenlin@google.com> |
Ensure peekObject is called in the syncrhonization block. bug: 7019598 Change-Id: If153287078826afc9827ea64364b4fb64f2b3a5f
rc/com/android/gallery3d/app/AlbumDataLoader.java
rc/com/android/gallery3d/app/AlbumSetDataLoader.java
rc/com/android/gallery3d/app/PhotoDataAdapter.java
rc/com/android/gallery3d/data/ClusterAlbumSet.java
rc/com/android/gallery3d/data/DataManager.java
rc/com/android/gallery3d/data/LocalAlbum.java
rc/com/android/gallery3d/data/MediaSource.java
rc/com/android/gallery3d/data/MtpDevice.java
rc/com/android/gallery3d/data/Path.java
|
d9473d49b311306196327cc3083696911e857df3 |
11-Sep-2012 |
Owen Lin <owenlin@google.com> |
Merge "Remove the space before colons in details." into gb-ub-photos-arches
|
960306bb25cb79ded4f5cb0f3b329ff042e0e837 |
11-Sep-2012 |
Owen Lin <owenlin@google.com> |
Merge "Remove the space before colons in details." into gb-ub-photos-arches
|
9b095a3b59740534cf528db2b179b30fef267663 |
10-Sep-2012 |
Wu-cheng Li <wuchengli@google.com> |
Add attribution of icons. Change-Id: I5c7a5580ec4bd6313a3f536f0b9e3927d8ab624e
ndroidManifest.xml
|
9db3b49abc5d29a990c1b82b15b26d64d9279f8d |
10-Sep-2012 |
Wu-cheng Li <wuchengli@google.com> |
Add attribution of icons. Change-Id: I5c7a5580ec4bd6313a3f536f0b9e3927d8ab624e
es/values/photoeditor_styles.xml
|
3d9a8e2079f62bf3b3ea4272320877d1f4f0c241 |
10-Sep-2012 |
Wu-cheng Li <wuchengli@google.com> |
Add attribution of icons. Change-Id: I5c7a5580ec4bd6313a3f536f0b9e3927d8ab624e
ndroidManifest.xml
es/values/photoeditor_styles.xml
|
10d8759b5b4d0cf0351bce929eb7b6420aabbfd9 |
11-Sep-2012 |
Owen Lin <owenlin@google.com> |
Don't start filmstrip mode in Get Content mode. Change-Id: Ib04f5c134d44b2d8e80e7fdecf2503e950487837 fix: 7135936
rc/com/android/gallery3d/app/AlbumSetPage.java
|
0caf3cfbbc1a200e060da11d44f37dc8da4699be |
11-Sep-2012 |
Owen Lin <owenlin@google.com> |
Don't start filmstrip mode in Get Content mode. Change-Id: Ib04f5c134d44b2d8e80e7fdecf2503e950487837 fix: 7135936
rc/com/android/gallery3d/app/AlbumSetPage.java
|
e5f22a35b87bb7178a1421f573731590e5f68048 |
11-Sep-2012 |
Michael Kolb <kolby@google.com> |
Merge "Enable new camera UI" into gb-ub-photos-arches
|
acbff926677310747417338e22ab018dca80e4ff |
11-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Improvements to empty album behavior in Gallery" into gb-ub-photos-arches
|
8b092bce0716e5f53d53dc9f9be2e7c9978d685c |
11-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Improvements to empty album behavior in Gallery" into gb-ub-photos-arches
|
e840cafb77fd7019dc0b7bd41f81289e6ce18600 |
10-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
Improvements to empty album behavior in Gallery Bug: 7131332 Bug: 7009464 Toasts are now immediately dismissed if a non-empty album is selected, and dismissed once Picasa Albums load at an otherwise empty gallery root. The alert added in a previous prompt has been replaced with a Toast also. Change-Id: Icca79ab264b94979eedcf78e5c3899af745d8813
rc/com/android/gallery3d/app/AlbumPage.java
rc/com/android/gallery3d/app/AlbumSetPage.java
|
09995299480b797254873319caffd5408624988b |
10-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
Improvements to empty album behavior in Gallery Bug: 7131332 Bug: 7009464 Toasts are now immediately dismissed if a non-empty album is selected, and dismissed once Picasa Albums load at an otherwise empty gallery root. The alert added in a previous prompt has been replaced with a Toast also. Change-Id: Icca79ab264b94979eedcf78e5c3899af745d8813
rc/com/android/gallery3d/app/AlbumPage.java
rc/com/android/gallery3d/app/AlbumSetPage.java
|
b8a207b8b346c6c085e968e6e59d60ee2c6ef589 |
11-Sep-2012 |
Doris Liu <tianliu@google.com> |
More logging added for monkey crash The crash is difficult to repro. So I'm adding more logging here to help figure out what caused the crash next time it happens. Bug: 6495745 Change-Id: Ib6a47f45e0508bc5def61fdc9f4e4a488b48ad92
rc/com/android/gallery3d/data/MediaObject.java
|
a9144c8942f68d4a68de63103f590d0f55a95dd4 |
11-Sep-2012 |
Doris Liu <tianliu@google.com> |
More logging added for monkey crash The crash is difficult to repro. So I'm adding more logging here to help figure out what caused the crash next time it happens. Bug: 6495745 Change-Id: Ib6a47f45e0508bc5def61fdc9f4e4a488b48ad92
rc/com/android/gallery3d/data/MediaObject.java
|
ae0453756c1b8807743823a021ada539a77ed4d7 |
06-Sep-2012 |
Chih-Chung Chang <chihchung@google.com> |
Do not accept fling gesture after we changed from/to filmstrip mode. Change-Id: Ifb3d692bcf621ff02c6d4e6d91ba8484d702f905
rc/com/android/gallery3d/ui/PhotoView.java
|
645cf9fe7f14a05ca4f1e0efbdc0365c5655eee0 |
11-Sep-2012 |
Michael Kolb <kolby@google.com> |
Enable new camera UI Bug: 7139361 Leave both icons in launcher for comparisons Change-Id: I9ecf0af5f27f5fc3e8be092a54188238d51b281e
ndroidManifest.xml
|
a1f4258a6c9a97e9ee1dec0a32d416b33f5663d7 |
11-Sep-2012 |
Michael Kolb <kolby@google.com> |
Enable new camera UI Bug: 7139361 Leave both icons in launcher for comparisons Change-Id: I9ecf0af5f27f5fc3e8be092a54188238d51b281e
ndroidManifest.xml
|
464b7559175f45b488bb24be3d16843f1bf80cd4 |
10-Sep-2012 |
George Mount <mount@google.com> |
Remove VIEW activity from LightCycle. Bug 7133257 Change-Id: I4b3c968ceaa01d9461a788553f23bf7694ac4b3c
rc/com/android/gallery3d/app/PhotoPage.java
rc_pd/com/android/gallery3d/util/LightCycleHelper.java
|
7108c4078436488ede37608c62a6b953b51db835 |
10-Sep-2012 |
George Mount <mount@google.com> |
Remove VIEW activity from LightCycle. Bug 7133257 Change-Id: I4b3c968ceaa01d9461a788553f23bf7694ac4b3c
rc/com/android/gallery3d/app/PhotoPage.java
rc_pd/com/android/gallery3d/util/LightCycleHelper.java
|
28a935837a20c45c870a95ee075ed9e3ac0df9fd |
07-Sep-2012 |
George Mount <mount@google.com> |
Show play icon for panorama. Bug 7124494 Change-Id: I17fdb5d6bcab1f3997a1ab92fcf45e0309b394b3
rc/com/android/gallery3d/app/PhotoDataAdapter.java
rc/com/android/gallery3d/app/SinglePhotoDataAdapter.java
rc/com/android/gallery3d/data/LocalImage.java
rc/com/android/gallery3d/data/LocalVideo.java
rc/com/android/gallery3d/data/MediaItem.java
rc/com/android/gallery3d/ui/PhotoView.java
|
a535522fa7661771351e42465c67ed70825ed2e4 |
07-Sep-2012 |
George Mount <mount@google.com> |
Show play icon for panorama. Bug 7124494 Change-Id: I17fdb5d6bcab1f3997a1ab92fcf45e0309b394b3
rc/com/android/gallery3d/app/PhotoDataAdapter.java
rc/com/android/gallery3d/app/SinglePhotoDataAdapter.java
rc/com/android/gallery3d/data/LocalImage.java
rc/com/android/gallery3d/data/LocalVideo.java
rc/com/android/gallery3d/data/MediaItem.java
rc/com/android/gallery3d/ui/PhotoView.java
|
1ab2f94443bba3ac3db22243216e7cfdf0167931 |
10-Sep-2012 |
Doris Liu <tianliu@google.com> |
Merge "Back button should progress through the app" into gb-ub-photos-arches
|
3e654aabf9af7a5396faa7fbea11bc7076db1c3e |
10-Sep-2012 |
Doris Liu <tianliu@google.com> |
Merge "Back button should progress through the app" into gb-ub-photos-arches
|
a8c0af76b6553ec3a925e91e0547beecf97d5c2e |
10-Sep-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
|
8c7f513066e2b927384f4333b6bcc0b63133f738 |
10-Sep-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
|
61189fb735e0a2c77bf477fc5f457517542eb433 |
10-Sep-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I432b178fd229f51b6a9f780471801f6a2172abbd Auto-generated-cl: translation import
es/values-es/photoeditor_strings.xml
|
26e4fe1a9287d2b96eecd6afbdb8ddce0af0a149 |
10-Sep-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I432b178fd229f51b6a9f780471801f6a2172abbd Auto-generated-cl: translation import
es/values-es/photoeditor_strings.xml
|
e3fe2114e79c53d25c2bf6c886900f43bf5742b3 |
10-Sep-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I2e8ce986461075f2a93a02309d845d887b8d9a11 Auto-generated-cl: translation import
es/values-zh-rTW/strings.xml
|
fbc14a6aaad64acbe2f548911ac9437dd1b0248d |
10-Sep-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I7434d5a9fd137cf2ee2931f0f9df7eeae7c8ad54 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
3dc1b4fe7a15dc89e19beeb14f2e64a1c9a7ff47 |
10-Sep-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I7434d5a9fd137cf2ee2931f0f9df7eeae7c8ad54 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
30bd7c6cd9611bc63748ec50973050b18901b1f2 |
10-Sep-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
d57afb53c887891024a5dad825d88f088a598258 |
10-Sep-2012 |
Wu-cheng Li <wuchengli@google.com> |
Do not allow panorama viewer in secure album. bug:7053266 Change-Id: I5195638e03e5eb32d47b50b7b568a40cd8a222d9
rc/com/android/gallery3d/app/PhotoPage.java
|
bef18c1e167f5835c8f854e76a91da63b700f93b |
10-Sep-2012 |
Wu-cheng Li <wuchengli@google.com> |
Do not allow panorama viewer in secure album. bug:7053266 Change-Id: I5195638e03e5eb32d47b50b7b568a40cd8a222d9
rc/com/android/gallery3d/app/PhotoPage.java
|
df0fd9bc507780cd4594d4358e02e5547deb7c6d |
10-Sep-2012 |
Wu-cheng Li <wuchengli@google.com> |
Fix build error in old version of java. Change-Id: I2f88846a10afd696d7dd94ddeee767c3d89d5ccf
rc/com/android/gallery3d/app/TransitionStore.java
|
23e1cc8d20971a03db2bbbe8b012fabcb40c6431 |
10-Sep-2012 |
Wu-cheng Li <wuchengli@google.com> |
Fix build error in old version of java. Change-Id: I2f88846a10afd696d7dd94ddeee767c3d89d5ccf
rc/com/android/gallery3d/app/TransitionStore.java
|
22700f63e0098b2be1a2b13a2920ba56e0952730 |
10-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
Fix import statement breaking build Change-Id: I0d2acb3ece6ed2aea04033f911a69b266b6cc7de
rc/com/android/gallery3d/app/PhotoPage.java
|
c6781c0c0d8d193863ca09455a5bda3d542db493 |
10-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
Fix import statement breaking build Change-Id: I0d2acb3ece6ed2aea04033f911a69b266b6cc7de
rc/com/android/gallery3d/app/PhotoPage.java
|
2350397f87438968dd1b61125115577129aa28d7 |
09-Sep-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
4ee977a7af5495bbe2f7b032d85020ef8e1c2ef7 |
07-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
Reskin: switching between filmstrip and grid in album Bug: 7050303 Bug: 6541425 Allows switching between the filmstrip and the grid views within albums and launches camera roll in filmstrip mode by default. Also fixes animation issue when animating from full-screen to grid view. Change-Id: I2a37b92c129cc090fd807973f7e3e82fed207cd3
es/menu/album.xml
es/menu/photo.xml
es/values/strings.xml
|
6e3cdcf8604dd202b9de08e0942d40d8cbbd26f5 |
07-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
Reskin: switching between filmstrip and grid in album Bug: 7050303 Bug: 6541425 Allows switching between the filmstrip and the grid views within albums and launches camera roll in filmstrip mode by default. Also fixes animation issue when animating from full-screen to grid view. Change-Id: I2a37b92c129cc090fd807973f7e3e82fed207cd3
rc/com/android/gallery3d/app/AlbumPage.java
rc/com/android/gallery3d/app/AlbumSetPage.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/app/TransitionStore.java
rc/com/android/gallery3d/data/LocalAlbum.java
rc/com/android/gallery3d/data/LocalMergeAlbum.java
rc/com/android/gallery3d/data/MediaSet.java
rc/com/android/gallery3d/ui/PhotoView.java
rc/com/android/gallery3d/util/MediaSetUtils.java
|
7eea4d3ac59aa88d327fc0d58f5e4052f43c54c9 |
07-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
Reskin: switching between filmstrip and grid in album Bug: 7050303 Bug: 6541425 Allows switching between the filmstrip and the grid views within albums and launches camera roll in filmstrip mode by default. Also fixes animation issue when animating from full-screen to grid view. Change-Id: I2a37b92c129cc090fd807973f7e3e82fed207cd3
es/menu/album.xml
es/menu/photo.xml
es/values/strings.xml
rc/com/android/gallery3d/app/AlbumPage.java
rc/com/android/gallery3d/app/AlbumSetPage.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/app/TransitionStore.java
rc/com/android/gallery3d/data/LocalAlbum.java
rc/com/android/gallery3d/data/LocalMergeAlbum.java
rc/com/android/gallery3d/data/MediaSet.java
rc/com/android/gallery3d/ui/PhotoView.java
rc/com/android/gallery3d/util/MediaSetUtils.java
|
0f229418c48d0d54004702b175564c4e638f15bd |
07-Sep-2012 |
Doris Liu <tianliu@google.com> |
Back button should progress through the app When Gallery is launched via notification, back button should progress through the app before return to Home Bug: 6925612 Change-Id: I9da2120c6f607f8b6d3fa57d8a70225bc66fb8ef
rc/com/android/gallery3d/app/Gallery.java
|
aeb4cccdc14c2b3199658a1d109a1fd89a53a288 |
07-Sep-2012 |
Doris Liu <tianliu@google.com> |
Back button should progress through the app When Gallery is launched via notification, back button should progress through the app before return to Home Bug: 6925612 Change-Id: I9da2120c6f607f8b6d3fa57d8a70225bc66fb8ef
rc/com/android/gallery3d/app/Gallery.java
|
4badebb6c36f6dc5ae1af74d78acd1e7f2e251c9 |
07-Sep-2012 |
George Mount <mount@google.com> |
Merge "Use XmpUtil to detect panorama instead of caption." into gb-ub-photos-arches
|
b05d8805d94dc3d60a0e1b966cf2c0cd58109938 |
07-Sep-2012 |
George Mount <mount@google.com> |
Merge "Use XmpUtil to detect panorama instead of caption." into gb-ub-photos-arches
|
f10ed2d3355f808304e33cb145d0c232a787d03a |
07-Sep-2012 |
George Mount <mount@google.com> |
Use XmpUtil to detect panorama instead of caption. Bug 7124493 Change-Id: I7a21206b47aea701428132d8500fa0873cb3c91a
rc/com/android/gallery3d/data/LocalImage.java
|
e1bcbb01bae4beca9c8cc158ac55932e4e4255a9 |
07-Sep-2012 |
George Mount <mount@google.com> |
Use XmpUtil to detect panorama instead of caption. Bug 7124493 Change-Id: I7a21206b47aea701428132d8500fa0873cb3c91a
rc/com/android/gallery3d/data/LocalImage.java
|
88e08dcfe74274646383a237b6306877ef74bf1f |
05-Sep-2012 |
Wu-cheng Li <wuchengli@google.com> |
Update media items when a picture is deleted in secure album. Query the database and only show the media items that still exist. bug:7053266 Change-Id: Ic8c1b8c514e59741436bca14e918ef100eaf14f8
rc/com/android/gallery3d/data/SecureAlbum.java
|
5ca6f98efb5b1d2a48b55a3a5e4cf4ef8e8e4d78 |
05-Sep-2012 |
Wu-cheng Li <wuchengli@google.com> |
Update media items when a picture is deleted in secure album. Query the database and only show the media items that still exist. bug:7053266 Change-Id: Ic8c1b8c514e59741436bca14e918ef100eaf14f8
rc/com/android/gallery3d/data/SecureAlbum.java
|
2e3b5a9e4c687e8eac85e12dcc77415847bdc039 |
07-Sep-2012 |
Chih-Chung Chang <chihchung@google.com> |
am e311bb72: Do not accept fling gesture after we changed from/to filmstrip mode. * commit 'e311bb72205569675f36784ad67d5bd950a944b8': Do not accept fling gesture after we changed from/to filmstrip mode.
|
3048199327b1b59b95732b14b6f90308134e454f |
06-Sep-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
|
3f9e0a327653555183543248fb902d791b8723c6 |
06-Sep-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
|
c286e5b4669fdaf88bb7c52817c0f98d4286c007 |
06-Sep-2012 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with jb-mr1-release - do not merge Change-Id: I24a1895c971a1774b19d7f0603e0b8260a20f230
|
897941077377354648d5edc72a003f25bfb7366c |
06-Sep-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
e311bb72205569675f36784ad67d5bd950a944b8 |
06-Sep-2012 |
Chih-Chung Chang <chihchung@google.com> |
Do not accept fling gesture after we changed from/to filmstrip mode. Change-Id: Ifb3d692bcf621ff02c6d4e6d91ba8484d702f905
rc/com/android/gallery3d/ui/PhotoView.java
|
ea9fd1b43e30e9dcb769c1b818b5481ae3604a31 |
06-Sep-2012 |
Hung-ying Tyan <tyanh@google.com> |
Merge "Fix some typos and style in ExifTag" into gb-ub-photos-arches
|
f6ed8a0f048ac3a17664bd2d0899542a5bf1be54 |
06-Sep-2012 |
Hung-ying Tyan <tyanh@google.com> |
Merge "Fix some typos and style in ExifTag" into gb-ub-photos-arches
|
441381d3ca400972bd05f6659d456c7a227778a0 |
06-Sep-2012 |
Hung-ying Tyan <tyanh@google.com> |
Merge "Rearrange the constants in ExifTag" into gb-ub-photos-arches
|
580daa127d39eb539e6c7911d3a2329a9cfe30db |
06-Sep-2012 |
Hung-ying Tyan <tyanh@google.com> |
Merge "Rearrange the constants in ExifTag" into gb-ub-photos-arches
|
62ee0284ae490510c82ef681f860200672654e04 |
05-Sep-2012 |
Earl Ou <shunhsingou@google.com> |
Fix some typos and style in ExifTag Change-Id: I2f8a8f0e529d6db9132ac57e09e86fcc18aba842
rc/com/android/gallery3d/exif/ExifTag.java
|
a01ddb85bf1fbca2ea9a2bc200853ba0c8a252f3 |
05-Sep-2012 |
Earl Ou <shunhsingou@google.com> |
Fix some typos and style in ExifTag Change-Id: I2f8a8f0e529d6db9132ac57e09e86fcc18aba842
rc/com/android/gallery3d/exif/ExifTag.java
|
c27ecc21a04d901d8069dddd31a00d335e9ae097 |
30-Aug-2012 |
Earl Ou <shunhsingou@google.com> |
Rearrange the constants in ExifTag Change-Id: I62ab6e52869dfa5b3fee7993bd109f4c5eed91a9
rc/com/android/gallery3d/app/CropImage.java
rc/com/android/gallery3d/exif/ExifData.java
rc/com/android/gallery3d/exif/ExifOutputStream.java
rc/com/android/gallery3d/exif/ExifParser.java
rc/com/android/gallery3d/exif/ExifTag.java
ests/src/com/android/gallery3d/exif/ExifParserTest.java
ests/src/com/android/gallery3d/exif/ExifReaderTest.java
|
2486ee3787f4fa8aeec4983559101f0000cd92b0 |
30-Aug-2012 |
Earl Ou <shunhsingou@google.com> |
Rearrange the constants in ExifTag Change-Id: I62ab6e52869dfa5b3fee7993bd109f4c5eed91a9
rc/com/android/gallery3d/app/CropImage.java
rc/com/android/gallery3d/exif/ExifData.java
rc/com/android/gallery3d/exif/ExifOutputStream.java
rc/com/android/gallery3d/exif/ExifParser.java
rc/com/android/gallery3d/exif/ExifTag.java
ests/src/com/android/gallery3d/exif/ExifParserTest.java
ests/src/com/android/gallery3d/exif/ExifReaderTest.java
|
0aa21cfcb47437ba3e3368828d472fb61729e7e4 |
06-Sep-2012 |
Doris Liu <tianliu@google.com> |
Fix tap to focus, back button to camera on Manta Changed the move threshold from a hard coded value to be proportional to the size of the view. Bug: 7080033 Bug: 7066859 Change-Id: Id7b81fb3da1783951886d43fe9a3df35186af985
rc/com/android/gallery3d/ui/PhotoView.java
|
cda9315a4b3fb0228cbcd3e9a18d8c90f0a8a3e0 |
06-Sep-2012 |
Doris Liu <tianliu@google.com> |
Fix tap to focus, back button to camera on Manta Changed the move threshold from a hard coded value to be proportional to the size of the view. Bug: 7080033 Bug: 7066859 Change-Id: Id7b81fb3da1783951886d43fe9a3df35186af985
rc/com/android/gallery3d/ui/PhotoView.java
|
0bfb719a5a7996539d7aaaa4a920c49b14c7faf7 |
06-Sep-2012 |
George Mount <mount@google.com> |
Merge "Change lightcycle call to be in Gallery's package" into gb-ub-photos-arches
|
581f8fc2f7b9453cb91ba0eacd3412f8c99a6e38 |
06-Sep-2012 |
George Mount <mount@google.com> |
Merge "Change lightcycle call to be in Gallery's package" into gb-ub-photos-arches
|
34691cc16aaa0866b4ec3322921494aba86fce7f |
05-Sep-2012 |
George Mount <mount@google.com> |
Change lightcycle call to be in Gallery's package Bug 7076869 Change-Id: I315b660d8a7cd84db6d06f0aa38275c7f5e4b4a6
rc/com/android/gallery3d/app/PackagesMonitor.java
rc_pd/com/android/gallery3d/util/LightCycleHelper.java
|
2e6c1901f6d83d448686950722b6fac064282780 |
05-Sep-2012 |
George Mount <mount@google.com> |
Change lightcycle call to be in Gallery's package Bug 7076869 Change-Id: I315b660d8a7cd84db6d06f0aa38275c7f5e4b4a6
rc/com/android/gallery3d/app/PackagesMonitor.java
rc_pd/com/android/gallery3d/util/LightCycleHelper.java
|
482d3c0c4bc10f6ff79a0b003326ed4f31a4227d |
05-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Increase threshold for logging texture size warnings" into gb-ub-photos-arches
|
d496898ad9554554655ff4fa39d509ea21be9178 |
05-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Increase threshold for logging texture size warnings" into gb-ub-photos-arches
|
a4dbfd0eaac2e25b646bb7735a0bcb119244de45 |
05-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Reskin: darker gray placeholder colors in gallery" into gb-ub-photos-arches
|
cc8ac0a0bf61dc043854859ad9df69e5d4cb6408 |
05-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Reskin: darker gray placeholder colors in gallery" into gb-ub-photos-arches
|
f64279241d6861e32aed534b2fb6ed3c5ee5faea |
05-Sep-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I80a4c7ddfb4d26b59b7adcd9c34248aae768f861 Auto-generated-cl: translation import
es/values-hr/strings.xml
es/values-ja/strings.xml
es/values-ms/strings.xml
es/values-zh-rCN/strings.xml
|
3fd59b8cf2a7975353760664d987785b131f72dd |
05-Sep-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I80a4c7ddfb4d26b59b7adcd9c34248aae768f861 Auto-generated-cl: translation import
es/values-hr/strings.xml
es/values-ja/strings.xml
es/values-ms/strings.xml
es/values-zh-rCN/strings.xml
|
c05a8d695274a06c9be66e227cbdadd754047250 |
04-Sep-2012 |
Angus Kong <shkong@google.com> |
Move LightCycle checking to the closed source. bug:7076779 Change-Id: Ieebe0343a46257ca07f06483beb9391a90d7727a
allerycommon/src/com/android/gallery3d/common/LightCycleHelper.java
|
37ce22db2aa8dce5f6b05160c99b65cb3dfae0c1 |
04-Sep-2012 |
Angus Kong <shkong@google.com> |
Move LightCycle checking to the closed source. bug:7076779 Change-Id: Ieebe0343a46257ca07f06483beb9391a90d7727a
allerycommon/src/com/android/gallery3d/common/LightCycleHelper.java
rc/com/android/gallery3d/app/PackagesMonitor.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/data/LocalImage.java
rc_pd/com/android/gallery3d/util/LightCycleHelper.java
|
4f59a411667f1c75c1b3ea2ad0ec07e82defa5d1 |
04-Sep-2012 |
Angus Kong <shkong@google.com> |
Move LightCycle checking to the closed source. bug:7076779 Change-Id: Ieebe0343a46257ca07f06483beb9391a90d7727a
allerycommon/src/com/android/gallery3d/common/LightCycleHelper.java
rc/com/android/gallery3d/app/PackagesMonitor.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/data/LocalImage.java
rc_pd/com/android/gallery3d/util/LightCycleHelper.java
|
2b95674f2e91005447bf69ce7bf8b452965f4a42 |
05-Sep-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
02ec00b91039736d478c6e59ba90d5bbcd1a8044 |
05-Sep-2012 |
Owen Lin <owenlin@google.com> |
Remove the space before colons in details. bug: 6587084 Change-Id: Ifdbe24e84fb55c1892edb5652455274fc3775291
rc/com/android/gallery3d/ui/DialogDetailsView.java
|
02884d1ae2d331c272b02c38dc55efd5a05008ae |
05-Sep-2012 |
Owen Lin <owenlin@google.com> |
Remove the space before colons in details. bug: 6587084 Change-Id: Ifdbe24e84fb55c1892edb5652455274fc3775291
rc/com/android/gallery3d/ui/DialogDetailsView.java
|
c31facc8b9b6bd5883a3332df7bfd315f2806aa4 |
05-Sep-2012 |
Owen Lin <owenlin@google.com> |
Merge "Revert "Remove the previewImage and staticWallpaperPreview."" into gb-ub-photos-arches
|
73277e5b774cbf0a46ffc296d9b68521c3ecd440 |
05-Sep-2012 |
Owen Lin <owenlin@google.com> |
Merge "Revert "Remove the previewImage and staticWallpaperPreview."" into gb-ub-photos-arches
|
4e5b1891aee8cfc97501dfab86596982aedc0fdc |
05-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
Reskin: darker gray placeholder colors in gallery Bug: 7106371 Bug: 7050303 Change-Id: I68eaa46ef4632778d5f9b6fb2c57d513e8c4c433
es/values/colors.xml
|
730bd521a8383f47884e3eaf664efdd10267ed83 |
05-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
Reskin: darker gray placeholder colors in gallery Bug: 7106371 Bug: 7050303 Change-Id: I68eaa46ef4632778d5f9b6fb2c57d513e8c4c433
es/values/colors.xml
|
e5e265910f4cf8a11a54234e547acd7d7e081a4f |
04-Sep-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
|
f9f44521327cd5206f45755a7bb06fa4065ad4c4 |
04-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
Increase threshold for logging texture size warnings Bug: 7094140 Change-Id: I0dc56dc92db6821527ceb71e49c3e83d818340c2
rc/com/android/gallery3d/ui/BasicTexture.java
|
6b41f11759977c4d34755627858192b7e9cd33c7 |
04-Sep-2012 |
Bobby Georgescu <georgescu@google.com> |
Increase threshold for logging texture size warnings Bug: 7094140 Change-Id: I0dc56dc92db6821527ceb71e49c3e83d818340c2
rc/com/android/gallery3d/ui/BasicTexture.java
|
672b8b84749b145fc582355555c9a621aa118028 |
04-Sep-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
61152454278c53d2251128779f18ac4fbac6a605 |
04-Sep-2012 |
Owen Lin <owenlin@google.com> |
Merge "Make a time jump when user clicks outsides the scrubber." into gb-ub-photos-arches
|
5cbe945e294fff334a71b55a994c948da997cb2a |
04-Sep-2012 |
Owen Lin <owenlin@google.com> |
Merge "Make a time jump when user clicks outsides the scrubber." into gb-ub-photos-arches
|
f88808169c995219ba9651df8c52161b56d2fedb |
04-Sep-2012 |
Owen Lin <owenlin@google.com> |
Merge "Set inMutable to true if we may reuse the bitmap." into gb-ub-photos-arches
|
ac0d63e802aae7732f5efa840af41016fc26f728 |
04-Sep-2012 |
Owen Lin <owenlin@google.com> |
Merge "Set inMutable to true if we may reuse the bitmap." into gb-ub-photos-arches
|
e0e401752dd79d3610fedabe551e62cb852447a7 |
04-Sep-2012 |
Owen Lin <owenlin@google.com> |
Make a time jump when user clicks outsides the scrubber. bug: 7080593 Change-Id: I913aee6e416c10d68403d7f9d4102d4dcc41e1d4
rc/com/android/gallery3d/app/TimeBar.java
|
bcca048557ff3637b7d1cce2893cfc095111ebdd |
04-Sep-2012 |
Owen Lin <owenlin@google.com> |
Make a time jump when user clicks outsides the scrubber. bug: 7080593 Change-Id: I913aee6e416c10d68403d7f9d4102d4dcc41e1d4
rc/com/android/gallery3d/app/TimeBar.java
|
0fb7f34668b317895b6be1d2e64d01601fb64c76 |
04-Sep-2012 |
Owen Lin <owenlin@google.com> |
Set inMutable to true if we may reuse the bitmap. bug: 7092330 Change-Id: I0def7e2e9ce57d09ba7f5e001b33cc605a6af44c
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
|
d01a96e278ea96ee6ee43b37e60c4d37a8959e95 |
04-Sep-2012 |
Owen Lin <owenlin@google.com> |
Set inMutable to true if we may reuse the bitmap. bug: 7092330 Change-Id: I0def7e2e9ce57d09ba7f5e001b33cc605a6af44c
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
rc/com/android/gallery3d/data/DecodeUtils.java
|
a625b6562d3bfc86465778b336c96fb42064be21 |
04-Sep-2012 |
Owen Lin <owenlin@google.com> |
Set inMutable to true if we may reuse the bitmap. bug: 7092330 Change-Id: I0def7e2e9ce57d09ba7f5e001b33cc605a6af44c
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
rc/com/android/gallery3d/data/DecodeUtils.java
|
25d33864d28f6acf25d2e835a85bf04a9a22f57e |
04-Sep-2012 |
Hung-ying Tyan <tyanh@google.com> |
Fix NPE in CropImage.changeExifImageSizeTag(). Bug: 7099850 Change-Id: Ib7b3b7d9fddaf53853bcc98b9588dfadda0aee6f
rc/com/android/gallery3d/app/CropImage.java
|
ecb4052503ad1c37c796699d3aec6a1e749f25f1 |
04-Sep-2012 |
Hung-ying Tyan <tyanh@google.com> |
Fix NPE in CropImage.changeExifImageSizeTag(). Bug: 7099850 Change-Id: Ib7b3b7d9fddaf53853bcc98b9588dfadda0aee6f
rc/com/android/gallery3d/app/CropImage.java
|
92bcd817e09a8f029766a42f3e8f06d2bbb69e2c |
03-Sep-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
38e7740b7c363a993390f53a70a6e5c0536825e8 |
03-Sep-2012 |
Owen Lin <owenlin@google.com> |
Merge "Fix NPE when deleting a photo in Clustering mode." into gb-ub-photos-arches
|
dc433a066188e52593aaf7f0fae96191f44a5e26 |
03-Sep-2012 |
Owen Lin <owenlin@google.com> |
Merge "Fix NPE when deleting a photo in Clustering mode." into gb-ub-photos-arches
|
331de49c4624e49b903bfd0b7da69e1dc5e446f4 |
03-Sep-2012 |
Hung-ying Tyan <tyanh@google.com> |
Merge "Handle other header tag in ExifParser before APP1" into gb-ub-photos-arches
|
b38af94687799862863ef10de91ade4683721dd2 |
03-Sep-2012 |
Hung-ying Tyan <tyanh@google.com> |
Merge "Handle other header tag in ExifParser before APP1" into gb-ub-photos-arches
|
512b025a04796ef057afdf780f21039068ba74d4 |
03-Sep-2012 |
Hung-ying Tyan <tyanh@google.com> |
Merge "Handle mis-ordered APP segment in ExifOutputStream" into gb-ub-photos-arches
|
3b4506fbc838ba4dbed3f84f0600b74cdf3f7b55 |
03-Sep-2012 |
Hung-ying Tyan <tyanh@google.com> |
Merge "Handle mis-ordered APP segment in ExifOutputStream" into gb-ub-photos-arches
|
e4ffc8ea9320109a30f377324d5d109d5615293b |
03-Sep-2012 |
Hung-ying Tyan <tyanh@google.com> |
Merge "Remove the parameter of getAllExifTags() in IfdData" into gb-ub-photos-arches
|
4a3b0de9f672b7840db4436986c46dea3cb03d0d |
03-Sep-2012 |
Hung-ying Tyan <tyanh@google.com> |
Merge "Remove the parameter of getAllExifTags() in IfdData" into gb-ub-photos-arches
|
49c8a24d7492d0de939d1f3d351586a5e3678e1e |
03-Sep-2012 |
Hung-ying Tyan <tyanh@google.com> |
Merge "Fix some typos and style in previous CL" into gb-ub-photos-arches
|
3a1a370a96a2a09e640e67e370aec8f6a9d93bb4 |
03-Sep-2012 |
Hung-ying Tyan <tyanh@google.com> |
Merge "Fix some typos and style in previous CL" into gb-ub-photos-arches
|
993d5f7c4c39c66647a248ffa623f4e60b76ff36 |
03-Sep-2012 |
Hung-ying Tyan <tyanh@google.com> |
Merge "Save EXIF info to cropped picasa image with the new EXIF lib." into gb-ub-photos-arches
|
8a81312ec4065063ed69147a0340ab96d77b6d7d |
03-Sep-2012 |
Hung-ying Tyan <tyanh@google.com> |
Merge "Save EXIF info to cropped picasa image with the new EXIF lib." into gb-ub-photos-arches
|
e47a4f31dfe968256e1591cb6e9a6672bafb335b |
31-Aug-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I7c4f92160aade1405f96383212cda95f6b75f38f Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-cs/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rTW/strings.xml
|
16bd84b151294172cd939bd52a9dad033359336a |
31-Aug-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I7c4f92160aade1405f96383212cda95f6b75f38f Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-cs/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rTW/strings.xml
|
4cec566b34655e76b90f8ca089f151e6f42ede0c |
31-Aug-2012 |
Earl Ou <shunhsingou@google.com> |
Handle other header tag in ExifParser before APP1 Change-Id: I44398e3ed054de441810b795daff8d1edb06df59
rc/com/android/gallery3d/exif/ExifOutputStream.java
rc/com/android/gallery3d/exif/ExifParser.java
rc/com/android/gallery3d/exif/JpegHeader.java
|
4c1cb48500c2da3307c3da3744f2c0ce32930ef9 |
31-Aug-2012 |
Earl Ou <shunhsingou@google.com> |
Handle other header tag in ExifParser before APP1 Change-Id: I44398e3ed054de441810b795daff8d1edb06df59
rc/com/android/gallery3d/exif/ExifOutputStream.java
rc/com/android/gallery3d/exif/ExifParser.java
rc/com/android/gallery3d/exif/JpegHeader.java
|
b6cb8121aa89d06d1fc397d443d22224b634da88 |
31-Aug-2012 |
Earl Ou <shunhsingou@google.com> |
Handle mis-ordered APP segment in ExifOutputStream Change-Id: Ic5ce13d17658e24d1ae42009d3ab30ae538cee10
rc/com/android/gallery3d/exif/ExifOutputStream.java
|
7347a8ef6bddfc256004e427d5edd736f0b1902b |
31-Aug-2012 |
Earl Ou <shunhsingou@google.com> |
Handle mis-ordered APP segment in ExifOutputStream Change-Id: Ic5ce13d17658e24d1ae42009d3ab30ae538cee10
rc/com/android/gallery3d/exif/ExifOutputStream.java
|
470e5d80030a466dce5986943a3aed3f8b628bb6 |
31-Aug-2012 |
Wu-cheng Li <wuchengli@google.com> |
Merge "Use FLAG_SHOW_WHEN_LOCKED for secure album." into gb-ub-photos-arches
|
6661c4610254e81098dc67c087b69900a32f0f0d |
31-Aug-2012 |
Wu-cheng Li <wuchengli@google.com> |
Merge "Use FLAG_SHOW_WHEN_LOCKED for secure album." into gb-ub-photos-arches
|
efd480e85dc5bd0d2ca0ac82d03e141212388830 |
30-Aug-2012 |
Wu-cheng Li <wuchengli@google.com> |
Use FLAG_SHOW_WHEN_LOCKED for secure album. The activity needs this flag to be on top of the lock screen when the camera is started from the secure lock screen. bug:5955016 Change-Id: If554a3f7fef4c03a981c83afe22b8c4980b954d1
rc/com/android/gallery3d/app/ActivityState.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/app/SlideshowPage.java
|
b02977e128c7b85ad964c3ed90a6c5ed26ac682d |
30-Aug-2012 |
Wu-cheng Li <wuchengli@google.com> |
Use FLAG_SHOW_WHEN_LOCKED for secure album. The activity needs this flag to be on top of the lock screen when the camera is started from the secure lock screen. bug:5955016 Change-Id: If554a3f7fef4c03a981c83afe22b8c4980b954d1
rc/com/android/gallery3d/app/ActivityState.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/app/SlideshowPage.java
|
b11eb496b430ab0e69fcbe88b89af37b57eb6342 |
31-Aug-2012 |
Wu-Cheng Li <wuchengli@google.com> |
Merge "Add api check for FLAG_SECURE." into gb-ub-photos-arches
|
ba8ed6b62dc7bcae6603aa9a3f77f138f64f34fb |
31-Aug-2012 |
Wu-Cheng Li <wuchengli@google.com> |
Merge "Add api check for FLAG_SECURE." into gb-ub-photos-arches
|
fcc407b4e5a6786c1d476c37d90ef9487508b95d |
30-Aug-2012 |
Ahbong Chang <cwahbong@google.com> |
Add api check for FLAG_SECURE. Bug: 7023285 Change-Id: I515123a7454595846bbea6369c05cd22b7d2ec60
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
|
ce1e6cb9dfd5d8d41153b2a00671a3698d405994 |
30-Aug-2012 |
Ahbong Chang <cwahbong@google.com> |
Add api check for FLAG_SECURE. Bug: 7023285 Change-Id: I515123a7454595846bbea6369c05cd22b7d2ec60
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
|
a552971b6a8124d8990b4b618fe9b9aea70d7c98 |
30-Aug-2012 |
Ahbong Chang <cwahbong@google.com> |
Add api check for FLAG_SECURE. Bug: 7023285 Change-Id: I515123a7454595846bbea6369c05cd22b7d2ec60
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
|
10a1d3e2130ceb0e8d38440eb6e800e912de8f1c |
31-Aug-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
|
9d51e0966dc906cec30c4a8bf03a0ae3e0c1f6e4 |
31-Aug-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
|
9bc2a5c83de59a3131bfeb31dad45df2b47715ab |
31-Aug-2012 |
Earl Ou <shunhsingou@google.com> |
Remove the parameter of getAllExifTags() in IfdData Change-Id: Iec7f04a9866c53caa2d66d5ea6f679460980b378
rc/com/android/gallery3d/exif/ExifOutputStream.java
rc/com/android/gallery3d/exif/IfdData.java
ests/src/com/android/gallery3d/exif/ExifReaderTest.java
|
397d48c17b398c72ea40f8d0b47a90488d9f8abf |
31-Aug-2012 |
Earl Ou <shunhsingou@google.com> |
Remove the parameter of getAllExifTags() in IfdData Change-Id: Iec7f04a9866c53caa2d66d5ea6f679460980b378
rc/com/android/gallery3d/exif/ExifOutputStream.java
rc/com/android/gallery3d/exif/IfdData.java
ests/src/com/android/gallery3d/exif/ExifReaderTest.java
|
e48c0f96ee3f9654c3538664dd59485927fb44d6 |
31-Aug-2012 |
Earl Ou <shunhsingou@google.com> |
Fix some typos and style in previous CL Change-Id: If78c0bfebccb20b0c4dad42a11b5dd0946b4e172
rc/com/android/gallery3d/exif/ExifData.java
rc/com/android/gallery3d/exif/ExifOutputStream.java
rc/com/android/gallery3d/exif/OrderedDataOutputStream.java
|
d4295b44baead5276704016a37ade53075fc209e |
31-Aug-2012 |
Earl Ou <shunhsingou@google.com> |
Fix some typos and style in previous CL Change-Id: If78c0bfebccb20b0c4dad42a11b5dd0946b4e172
rc/com/android/gallery3d/exif/ExifData.java
rc/com/android/gallery3d/exif/ExifOutputStream.java
rc/com/android/gallery3d/exif/OrderedDataOutputStream.java
|
3b8bd33be5041d77855f756fbba1993294cffac4 |
29-Aug-2012 |
Earl Ou <shunhsingou@google.com> |
Save EXIF info to cropped picasa image with the new EXIF lib. Bug:5248023 Change-Id: I35f401826f4fa586e9899e3ca5f5f9b9ab39b28e
rc/com/android/gallery3d/app/CropImage.java
rc/com/android/gallery3d/exif/ExifData.java
rc/com/android/gallery3d/exif/ExifTag.java
rc_pd/com/android/gallery3d/picasasource/PicasaSource.java
|
1c6566dfa563ece622df26a851e10c1c3b371a52 |
29-Aug-2012 |
Earl Ou <shunhsingou@google.com> |
Save EXIF info to cropped picasa image with the new EXIF lib. Bug:5248023 Change-Id: I35f401826f4fa586e9899e3ca5f5f9b9ab39b28e
rc/com/android/gallery3d/app/CropImage.java
rc/com/android/gallery3d/exif/ExifData.java
rc/com/android/gallery3d/exif/ExifTag.java
rc_pd/com/android/gallery3d/picasasource/PicasaSource.java
|
e2e7336bcf766e651a4c147291b2f5e925e99220 |
30-Aug-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
afebbfa1b19f70f5c197e781071fadaf560d778d |
29-Aug-2012 |
Earl Ou <shunhsingou@google.com> |
Add prefix to GPS tag in ExifTag Change-Id: Ib07d2847ddcbed3b06d07afa2a6d5851c27760b1
rc/com/android/gallery3d/exif/ExifTag.java
|
5babc396c3d3692445387864c4ea1740f6d92b06 |
29-Aug-2012 |
Earl Ou <shunhsingou@google.com> |
Add prefix to GPS tag in ExifTag Change-Id: Ib07d2847ddcbed3b06d07afa2a6d5851c27760b1
rc/com/android/gallery3d/exif/ExifTag.java
|
81791ebda14bed2f71b15c866df4ec48cbd3b73c |
29-Aug-2012 |
Earl Ou <shunhsingou@google.com> |
Re-save Exif info for cropped local image Bug:5248023 Change-Id: I744330f28b887bff4d12937e06f8d20db153ac7e
rc/com/android/gallery3d/app/CropImage.java
|
5f18b4c19b0d854475bb8cb611fd7c23a3f7a1c5 |
29-Aug-2012 |
Earl Ou <shunhsingou@google.com> |
Re-save Exif info for cropped local image Bug:5248023 Change-Id: I744330f28b887bff4d12937e06f8d20db153ac7e
rc/com/android/gallery3d/app/CropImage.java
|
04998342fbceaacdb2bfe5e5c47cdda035329640 |
30-Aug-2012 |
Owen Lin <owenlin@android.com> |
Merge "ExifOutputStream" into gb-ub-photos-arches
|
940819044b7d780f1dd7109d6dbdc365b3c08c14 |
30-Aug-2012 |
Owen Lin <owenlin@android.com> |
Merge "ExifOutputStream" into gb-ub-photos-arches
|
441b6807f274763dfe2eb2d65baa5391af93d7a1 |
29-Aug-2012 |
Owen Lin <owenlin@google.com> |
Remove unused resources and fix some warnings. Change-Id: I075977150c7da7650e723e29406f24ae2e23ea97
es/layout/simple_action_bar.xml
|
06961efbb7552d345a550708d8e40f0fb9345a9e |
29-Aug-2012 |
Owen Lin <owenlin@google.com> |
Remove unused resources and fix some warnings. Change-Id: I075977150c7da7650e723e29406f24ae2e23ea97
rc/com/android/gallery3d/app/AlbumPage.java
rc/com/android/gallery3d/app/AlbumSetPage.java
rc/com/android/gallery3d/app/CropImage.java
rc/com/android/gallery3d/app/ManageCachePage.java
rc/com/android/gallery3d/app/MoviePlayer.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/data/LocalAlbumSet.java
rc/com/android/gallery3d/data/MtpDevice.java
rc/com/android/gallery3d/data/MtpImage.java
rc/com/android/gallery3d/data/SizeClustering.java
rc/com/android/gallery3d/data/UriSource.java
rc/com/android/gallery3d/ui/MenuExecutor.java
rc/com/android/gallery3d/ui/Paper.java
rc/com/android/gallery3d/ui/PhotoView.java
rc/com/android/gallery3d/ui/PositionController.java
rc/com/android/gallery3d/util/GalleryUtils.java
|
28cb4161da5fc3756933ca67d509b8af1c6275f1 |
29-Aug-2012 |
Owen Lin <owenlin@google.com> |
Remove unused resources and fix some warnings. Change-Id: I075977150c7da7650e723e29406f24ae2e23ea97
es/layout/simple_action_bar.xml
rc/com/android/gallery3d/app/AlbumPage.java
rc/com/android/gallery3d/app/AlbumSetPage.java
rc/com/android/gallery3d/app/CropImage.java
rc/com/android/gallery3d/app/ManageCachePage.java
rc/com/android/gallery3d/app/MoviePlayer.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/data/LocalAlbumSet.java
rc/com/android/gallery3d/data/MtpDevice.java
rc/com/android/gallery3d/data/MtpImage.java
rc/com/android/gallery3d/data/SizeClustering.java
rc/com/android/gallery3d/data/UriSource.java
rc/com/android/gallery3d/ui/MenuExecutor.java
rc/com/android/gallery3d/ui/Paper.java
rc/com/android/gallery3d/ui/PhotoView.java
rc/com/android/gallery3d/ui/PositionController.java
rc/com/android/gallery3d/util/GalleryUtils.java
|
b9e41109f413768d6f8bb5ec7c14ca31fbc0c098 |
30-Aug-2012 |
Owen Lin <owenlin@google.com> |
Fix NPE when deleting a photo in Clustering mode. bug: 7075760 Change-Id: I64b278b8c9436ada23738f28510736dcf7e18755
rc/com/android/gallery3d/data/MediaSet.java
|
aaad70913d88b943ac2dada2ee7b3e11c2c9d246 |
30-Aug-2012 |
Owen Lin <owenlin@google.com> |
Fix NPE when deleting a photo in Clustering mode. bug: 7075760 Change-Id: I64b278b8c9436ada23738f28510736dcf7e18755
rc/com/android/gallery3d/data/MediaSet.java
|
b282374131b3f9b306968440550fca0dbe756ee0 |
30-Aug-2012 |
Hung-ying Tyan <tyanh@google.com> |
Merge "Add equals() function in ExifData, IfdData, and ExifTag" into gb-ub-photos-arches
|
e786d3cb1521db74a1c48cae52b8b55b1cee0292 |
30-Aug-2012 |
Hung-ying Tyan <tyanh@google.com> |
Merge "Add equals() function in ExifData, IfdData, and ExifTag" into gb-ub-photos-arches
|
c2ac168aaeb959f9f33db3b574a845a4d6686af3 |
30-Aug-2012 |
Hung-ying Tyan <tyanh@google.com> |
Merge "Redesign the set function of ExifTag" into gb-ub-photos-arches
|
9e15920a6a152a1e93e457cdaf6cd14758007be4 |
30-Aug-2012 |
Hung-ying Tyan <tyanh@google.com> |
Merge "Redesign the set function of ExifTag" into gb-ub-photos-arches
|
4729f2992f820d5c03011253cd5f528bf0b40129 |
28-Aug-2012 |
Earl Ou <shunhsingou@google.com> |
ExifOutputStream Change-Id: I9f2de77e87a502ccdadba0b18658621028c538c9
rc/com/android/gallery3d/exif/ExifData.java
rc/com/android/gallery3d/exif/ExifOutputStream.java
rc/com/android/gallery3d/exif/OrderedDataOutputStream.java
rc/com/android/gallery3d/exif/Util.java
ests/src/com/android/gallery3d/exif/ExifOutputStreamTest.java
ests/src/com/android/gallery3d/exif/ExifTestRunner.java
|
4f529e7cada294befb66a1fc9b72b1aa164597df |
28-Aug-2012 |
Earl Ou <shunhsingou@google.com> |
ExifOutputStream Change-Id: I9f2de77e87a502ccdadba0b18658621028c538c9
rc/com/android/gallery3d/exif/ExifData.java
rc/com/android/gallery3d/exif/ExifOutputStream.java
rc/com/android/gallery3d/exif/OrderedDataOutputStream.java
rc/com/android/gallery3d/exif/Util.java
ests/src/com/android/gallery3d/exif/ExifOutputStreamTest.java
ests/src/com/android/gallery3d/exif/ExifTestRunner.java
|
1d3dfbf55bb320dc4d1d4379c385b629c107f713 |
28-Aug-2012 |
Earl Ou <shunhsingou@google.com> |
Add equals() function in ExifData, IfdData, and ExifTag Change-Id: I96c5767354548d0f0d7571fd1d8812e1ab54a5c4
rc/com/android/gallery3d/exif/ExifData.java
rc/com/android/gallery3d/exif/ExifTag.java
rc/com/android/gallery3d/exif/IfdData.java
rc/com/android/gallery3d/exif/Rational.java
rc/com/android/gallery3d/exif/Util.java
|
cde6ac521216801e835df1c20b68dd21d4fd04a4 |
28-Aug-2012 |
Earl Ou <shunhsingou@google.com> |
Add equals() function in ExifData, IfdData, and ExifTag Change-Id: I96c5767354548d0f0d7571fd1d8812e1ab54a5c4
rc/com/android/gallery3d/exif/ExifData.java
rc/com/android/gallery3d/exif/ExifTag.java
rc/com/android/gallery3d/exif/IfdData.java
rc/com/android/gallery3d/exif/Rational.java
rc/com/android/gallery3d/exif/Util.java
|
a393402c67ab65c322a1ce4c2f6714397591c363 |
29-Aug-2012 |
Earl Ou <shunhsingou@google.com> |
Redesign the set function of ExifTag Change-Id: Iaf5632d759fe14c167cba54099b99719b31e3431
rc/com/android/gallery3d/exif/ExifParser.java
rc/com/android/gallery3d/exif/ExifTag.java
ests/src/com/android/gallery3d/exif/ExifParserTest.java
ests/src/com/android/gallery3d/exif/ExifReaderTest.java
|
5df339d5ef4550ceb12070f5e17335df2c4fff62 |
29-Aug-2012 |
Earl Ou <shunhsingou@google.com> |
Redesign the set function of ExifTag Change-Id: Iaf5632d759fe14c167cba54099b99719b31e3431
rc/com/android/gallery3d/exif/ExifParser.java
rc/com/android/gallery3d/exif/ExifTag.java
ests/src/com/android/gallery3d/exif/ExifParserTest.java
ests/src/com/android/gallery3d/exif/ExifReaderTest.java
|
39f8f0bf9ebbcc580948f022649dd0d1f29656a3 |
30-Aug-2012 |
Owen Lin <owenlin@google.com> |
Merge "Fix OOM in TileImageView." into gb-ub-photos-arches
|
e05f0fa8b946d4eb5c8c8c0361150b90e877c87d |
30-Aug-2012 |
Owen Lin <owenlin@google.com> |
Merge "Fix OOM in TileImageView." into gb-ub-photos-arches
|
3f16dda60fb583c39f91a98b4bccf4ef220f2c3a |
30-Aug-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I381c77c04e94bce19bde5edd7ce7057b54fa2a8f Auto-generated-cl: translation import
es/values-am/strings.xml
es/values-be/strings.xml
es/values-ca/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-fr/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-zu/strings.xml
|
94eba1277ceecbbb55c29149175f756253b59d4f |
30-Aug-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I381c77c04e94bce19bde5edd7ce7057b54fa2a8f Auto-generated-cl: translation import
es/values-am/strings.xml
es/values-be/strings.xml
es/values-ca/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-fr/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-zu/strings.xml
|
352e514333afed64d2914e16e9f91dfffa8f7bd7 |
30-Aug-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Reskin: Correctly position rotated thumbs in album listing" into gb-ub-photos-arches
|
47301935ff08dc6f8b879ef49be3872fd84543cd |
30-Aug-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Reskin: Correctly position rotated thumbs in album listing" into gb-ub-photos-arches
|
39765b30b48c4530e11642a05a582ddf3ad27992 |
28-Aug-2012 |
Bobby Georgescu <georgescu@google.com> |
Reskin: Correctly position rotated thumbs in album listing Bug: 7067732 Bug: 7050303 Changing the slots to be non-square surfaced a small math error, and also raised the question of where exactly to render the texture. The solution that makes the most sense given the current design is to fit the thumbnail (which is always square in our case) in the largest square that fits inside the slot, and aligned to the top. Change-Id: I98d94ad9255399aa4f1e5c403ff81811674bb264
rc/com/android/gallery3d/ui/AbstractSlotRenderer.java
|
6826dc9b0358431159008c512bad320b657f0cc6 |
28-Aug-2012 |
Bobby Georgescu <georgescu@google.com> |
Reskin: Correctly position rotated thumbs in album listing Bug: 7067732 Bug: 7050303 Changing the slots to be non-square surfaced a small math error, and also raised the question of where exactly to render the texture. The solution that makes the most sense given the current design is to fit the thumbnail (which is always square in our case) in the largest square that fits inside the slot, and aligned to the top. Change-Id: I98d94ad9255399aa4f1e5c403ff81811674bb264
rc/com/android/gallery3d/ui/AbstractSlotRenderer.java
|
fc3adbe0404ca3c6b2dd0c01c576f15012dff096 |
29-Aug-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
8fe96573217f52b1200920e09727f98157610cb0 |
24-Aug-2012 |
Angus Kong <shkong@google.com> |
Invoke LightCycle viewer for panoramas. 1. Add SUPPORT_PANORAMA_VIEW to supported operations. 2. Add helper methods in LightCycleHelper: a. checks if the image file is a panorama. b. invokes the panorama view activity. bug:6912297 Change-Id: I7909e49632cad02a795943a113bca6aec17df9dd
allerycommon/src/com/android/gallery3d/common/LightCycleHelper.java
|
83be4e0c9b8e3372eff8f9b1a396afd961b72921 |
24-Aug-2012 |
Angus Kong <shkong@google.com> |
Invoke LightCycle viewer for panoramas. 1. Add SUPPORT_PANORAMA_VIEW to supported operations. 2. Add helper methods in LightCycleHelper: a. checks if the image file is a panorama. b. invokes the panorama view activity. bug:6912297 Change-Id: I7909e49632cad02a795943a113bca6aec17df9dd
allerycommon/src/com/android/gallery3d/common/LightCycleHelper.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/data/LocalImage.java
rc/com/android/gallery3d/data/MediaObject.java
|
f40669b90a0e3acd49bf2d3a7f889e0d89c24a95 |
24-Aug-2012 |
Angus Kong <shkong@google.com> |
Invoke LightCycle viewer for panoramas. 1. Add SUPPORT_PANORAMA_VIEW to supported operations. 2. Add helper methods in LightCycleHelper: a. checks if the image file is a panorama. b. invokes the panorama view activity. bug:6912297 Change-Id: I7909e49632cad02a795943a113bca6aec17df9dd
allerycommon/src/com/android/gallery3d/common/LightCycleHelper.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/data/LocalImage.java
rc/com/android/gallery3d/data/MediaObject.java
|
b048b26bdcd533a7f52558bd25201d74df7c591e |
29-Aug-2012 |
Hung-ying Tyan <tyanh@google.com> |
Merge "Fix pinch out gesture for film strip mode on gingerbread." into gb-ub-photos-arches
|
25f2aa192479a87abdec2ab66b05820290c465d3 |
29-Aug-2012 |
Hung-ying Tyan <tyanh@google.com> |
Merge "Fix pinch out gesture for film strip mode on gingerbread." into gb-ub-photos-arches
|
5b7c8cd73344b76c8f77764317d477d2b9a49884 |
29-Aug-2012 |
Owen Lin <owenlin@google.com> |
Fix OOM in TileImageView. The problem is we keep too many decoded images in the upload queue. Those images will be free after it getting uploaded. However, there is a bug which suspend the uploading sometimes. Change-Id: Id97c04eba974cc77e5d8c50588b0cbef776f79da fix: 6995091
rc/com/android/gallery3d/ui/TextureUploader.java
rc/com/android/gallery3d/ui/TileImageView.java
|
fb6aafde995cfaeb57f3009f10a4c0c843993162 |
29-Aug-2012 |
Owen Lin <owenlin@google.com> |
Fix OOM in TileImageView. The problem is we keep too many decoded images in the upload queue. Those images will be free after it getting uploaded. However, there is a bug which suspend the uploading sometimes. Change-Id: Id97c04eba974cc77e5d8c50588b0cbef776f79da fix: 6995091
rc/com/android/gallery3d/ui/TextureUploader.java
rc/com/android/gallery3d/ui/TileImageView.java
|
baef14a1aafdd7a173b90f022ed3c9272fb9f359 |
29-Aug-2012 |
Owen Lin <owenlin@google.com> |
Merge "Fix NPE in viewing single image." into gb-ub-photos-arches
|
894300ca4d2da44e9c4fb5d8ec7d7a5d8662da51 |
29-Aug-2012 |
Owen Lin <owenlin@google.com> |
Merge "Fix NPE in viewing single image." into gb-ub-photos-arches
|
4d47b3472cccf84e8c71d8fb389a79bc83b321ee |
29-Aug-2012 |
Hung-ying Tyan <tyanh@google.com> |
Fix pinch out gesture for film strip mode on gingerbread. On crespo running Android 2.3.6, a pinch out gesture results in the following call sequence: onDown(), onUp() and then onSingleTapUp(). The correct sequence for a single-tap-up gesture should be: onDown(), onSingleTapUp() and onUp(). The call sequence for a pinch out gesture in JB is: onDown() and then onUp(). Base on these observations, a condition is added in onSingleTapUp() to filter out the false alarm where onSingleTapUp() is called within a pinch out gesture. Bug: 7023717 Change-Id: I010b87f95c3197a299a7d907ce32e93a1d5e958f
rc/com/android/gallery3d/ui/PhotoView.java
|
a5371c293c15a3aa09ba7465ab48de36f275214c |
29-Aug-2012 |
Hung-ying Tyan <tyanh@google.com> |
Fix pinch out gesture for film strip mode on gingerbread. On crespo running Android 2.3.6, a pinch out gesture results in the following call sequence: onDown(), onUp() and then onSingleTapUp(). The correct sequence for a single-tap-up gesture should be: onDown(), onSingleTapUp() and onUp(). The call sequence for a pinch out gesture in JB is: onDown() and then onUp(). Base on these observations, a condition is added in onSingleTapUp() to filter out the false alarm where onSingleTapUp() is called within a pinch out gesture. Bug: 7023717 Change-Id: I010b87f95c3197a299a7d907ce32e93a1d5e958f
rc/com/android/gallery3d/ui/PhotoView.java
|
650a9df4376e7c4f0b64d439b5d38dd81b7fcdcd |
28-Aug-2012 |
Earl Ou <shunhsingou@google.com> |
Save the offset of next IFD in the IfdData Change-Id: I2c5d2ad390d970603a7a9ce2145029d871098fdb
rc/com/android/gallery3d/exif/IfdData.java
|
b0f84ee364784ffb64bb58df675a8042cbb49a6d |
28-Aug-2012 |
Earl Ou <shunhsingou@google.com> |
Save the offset of next IFD in the IfdData Change-Id: I2c5d2ad390d970603a7a9ce2145029d871098fdb
rc/com/android/gallery3d/exif/IfdData.java
|
056f37f9ec862c4050040da132523b59d85c973b |
29-Aug-2012 |
Hung-ying Tyan <tyanh@google.com> |
Merge "Save ByteOrder in the ExifData" into gb-ub-photos-arches
|
8c5365966b3995697a182db6e52530c7914d2233 |
29-Aug-2012 |
Hung-ying Tyan <tyanh@google.com> |
Merge "Save ByteOrder in the ExifData" into gb-ub-photos-arches
|
ebc26da861cbe7b9725e9c8828730ee4c9d5e3de |
28-Aug-2012 |
Earl Ou <shunhsingou@google.com> |
Save ByteOrder in the ExifData This is useful for decoding undefined data. Change-Id: Ied6864c4d3a8e05ca47215bf5358bd4196f2d3a0
rc/com/android/gallery3d/exif/ExifData.java
rc/com/android/gallery3d/exif/ExifParser.java
rc/com/android/gallery3d/exif/ExifReader.java
|
7973bc292dcacaa5e68eecaff533d19b5cffc1e8 |
28-Aug-2012 |
Earl Ou <shunhsingou@google.com> |
Save ByteOrder in the ExifData This is useful for decoding undefined data. Change-Id: Ied6864c4d3a8e05ca47215bf5358bd4196f2d3a0
rc/com/android/gallery3d/exif/ExifData.java
rc/com/android/gallery3d/exif/ExifParser.java
rc/com/android/gallery3d/exif/ExifReader.java
|
f67891cb9b5a47a6412cfa88b889b4b76fd22e79 |
29-Aug-2012 |
Wu-cheng Li <wuchengli@google.com> |
Old panorama only supports ICS and forward. bug:7075249 Change-Id: I0b5884459a417444966ac88284056a182104a68b
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
|
d670c560a9cdc9d695233c5ff6dda2f91ee6eff8 |
29-Aug-2012 |
Wu-cheng Li <wuchengli@google.com> |
Old panorama only supports ICS and forward. bug:7075249 Change-Id: I0b5884459a417444966ac88284056a182104a68b
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
|
e44b08e727a9df677b6969ff921a2392e865e8dc |
29-Aug-2012 |
Wu-cheng Li <wuchengli@google.com> |
Old panorama only supports ICS and forward. bug:7075249 Change-Id: I0b5884459a417444966ac88284056a182104a68b
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
|
24081fe26ca25448ddb9c8f9cc7f406d26344dec |
28-Aug-2012 |
Owen Lin <owenlin@google.com> |
Fix NPE in viewing single image. bug: 7052228 Change-Id: Iaca5ed062cd3c8233f212551cf4312f0828f12dc
rc/com/android/gallery3d/app/GalleryActionBar.java
rc/com/android/gallery3d/app/PhotoPage.java
|
9b7fe0007a8e07f1155dacec7b299042b825da7c |
28-Aug-2012 |
Owen Lin <owenlin@google.com> |
Fix NPE in viewing single image. bug: 7052228 Change-Id: Iaca5ed062cd3c8233f212551cf4312f0828f12dc
rc/com/android/gallery3d/app/GalleryActionBar.java
rc/com/android/gallery3d/app/PhotoPage.java
|
e883ea20addbecccca565606808398233deb03d3 |
29-Aug-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
|
766941ee72831a2c76defb4d826cab24d918e0df |
27-Aug-2012 |
Bobby Georgescu <georgescu@google.com> |
Reskin: Launch photos in lights-out mode Bug: 7050303 - Launch photos in lights out mode when opening from album - One last missing call to super.onCreate added in ManageCachePage Change-Id: I7ad0e64f30748b724d184791e0e0a6a030850049
rc/com/android/gallery3d/app/AlbumPage.java
rc/com/android/gallery3d/app/ManageCachePage.java
rc/com/android/gallery3d/app/PhotoPage.java
|
45d791d5271e7283550140cfaca5b4bdfa0c0d14 |
27-Aug-2012 |
Bobby Georgescu <georgescu@google.com> |
Reskin: Launch photos in lights-out mode Bug: 7050303 - Launch photos in lights out mode when opening from album - One last missing call to super.onCreate added in ManageCachePage Change-Id: I7ad0e64f30748b724d184791e0e0a6a030850049
rc/com/android/gallery3d/app/AlbumPage.java
rc/com/android/gallery3d/app/ManageCachePage.java
rc/com/android/gallery3d/app/PhotoPage.java
|
023f68df2db2bcbfefd3ec9575ad0ad869a0937e |
28-Aug-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ic3d0c37f225b2bef282b536f5305c79c0f014367 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
acae844ef9d2cb415f117940b9611862edf03237 |
28-Aug-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ic3d0c37f225b2bef282b536f5305c79c0f014367 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
1142e7ca217158ee9157a0faa7ccc894619aacd6 |
28-Aug-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
3fa6947fc3909020f3a37cc1fd9a9b9d4d9f93e8 |
27-Aug-2012 |
Owen Lin <owenlin@google.com> |
Fix some UI bugs in using SherlockActionBar. - Use sherlock's verion of requestWindowFeature. - Use sherlock's theme in Custom selection list. bug: 6927267 Change-Id: I706e45378b10e6e088e048d97fcaca57fb4bf3f4
es/layout/action_mode.xml
es/layout/popup_list_item.xml
es/values-v11/styles.xml
es/values/styles.xml
rc/com/android/gallery3d/app/CropImage.java
rc/com/android/gallery3d/app/Gallery.java
rc/com/android/gallery3d/app/MovieActivity.java
rc/com/android/gallery3d/app/PickerActivity.java
rc/com/android/gallery3d/ui/PopupList.java
|
279852dfcec2abacee1c5d8b6f53f94830fd4e86 |
27-Aug-2012 |
Owen Lin <owenlin@google.com> |
Fix some UI bugs in using SherlockActionBar. - Use sherlock's verion of requestWindowFeature. - Use sherlock's theme in Custom selection list. bug: 6927267 Change-Id: I706e45378b10e6e088e048d97fcaca57fb4bf3f4
rc/com/android/gallery3d/app/CropImage.java
rc/com/android/gallery3d/app/Gallery.java
rc/com/android/gallery3d/app/MovieActivity.java
rc/com/android/gallery3d/app/PickerActivity.java
rc/com/android/gallery3d/ui/PopupList.java
|
8331b6a3d39b5b87eb70ac0cc201f525689c45fb |
27-Aug-2012 |
Owen Lin <owenlin@google.com> |
Fix some UI bugs in using SherlockActionBar. - Use sherlock's verion of requestWindowFeature. - Use sherlock's theme in Custom selection list. bug: 6927267 Change-Id: I706e45378b10e6e088e048d97fcaca57fb4bf3f4
es/layout/action_mode.xml
es/layout/popup_list_item.xml
es/values-v11/styles.xml
es/values/styles.xml
|
898a2f4540635528a0916b0a6b0a177869854ae9 |
26-Aug-2012 |
Wu-cheng Li <wuchengli@google.com> |
Disable action bar home button and menu items in secure album. All menu items are disabled except delete. bug:5955016 Change-Id: Ibf947b0c50b0591a774d298fbfbe692c9a88575d
rc/com/android/gallery3d/app/PhotoPage.java
|
1cbddfcb7d1f5ab087a1ee0d2dc98331bd6d4998 |
26-Aug-2012 |
Wu-cheng Li <wuchengli@google.com> |
Disable action bar home button and menu items in secure album. All menu items are disabled except delete. bug:5955016 Change-Id: Ibf947b0c50b0591a774d298fbfbe692c9a88575d
rc/com/android/gallery3d/app/PhotoPage.java
|
ab586616e72cc6474ee812644a562ceb75b52801 |
28-Aug-2012 |
Wu-cheng Li <wuchengli@google.com> |
Merge "Register STILL_IMAGE_CAMERA_SECURE intent in the manifest." into gb-ub-photos-arches
|
ea1d1d283f6e75f012fe091608cf0b588866a511 |
25-Aug-2012 |
Wu-cheng Li <wuchengli@google.com> |
Add api check for camera HDR. bug:7054776 Change-Id: Id551b7f1d76168b7735f0a48c19619431b93b66e
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
|
862f237b9ccef1ed5a7b2e9e1b8d5d291709d7e0 |
25-Aug-2012 |
Wu-cheng Li <wuchengli@google.com> |
Add api check for camera HDR. bug:7054776 Change-Id: Id551b7f1d76168b7735f0a48c19619431b93b66e
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
|
46f9d24b8440fe790aa4bdd625dbf231b140df17 |
25-Aug-2012 |
Wu-cheng Li <wuchengli@google.com> |
Add api check for camera HDR. bug:7054776 Change-Id: Id551b7f1d76168b7735f0a48c19619431b93b66e
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
|
2f4c73d9995158522bd18db125232838afd099e8 |
28-Aug-2012 |
Jean-Baptiste Queru <jbq@google.com> |
Merge from AOSP Change-Id: I11aeba06aa988e97d12125028327ed46fe2bc9c7
|
0d9061bd11c1b9def55e858fdd5ce5e9959e62db |
24-Aug-2012 |
Teng-Hui Zhu <ztenghui@google.com> |
add the menu button to support trimming This is only visible for video item. Change-Id: I17f8e902f3560cc8524f890705c020901331df74
es/menu/photo.xml
es/values/strings.xml
|
4a52b40a06fa7bb8fd11c88af0c21cf290e45b39 |
24-Aug-2012 |
Teng-Hui Zhu <ztenghui@google.com> |
add the menu button to support trimming This is only visible for video item. Change-Id: I17f8e902f3560cc8524f890705c020901331df74
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/data/LocalVideo.java
rc/com/android/gallery3d/data/MediaObject.java
rc/com/android/gallery3d/ui/MenuExecutor.java
|
50ea2d2938218ac6b2039f0e42998cfbbc45d1f1 |
24-Aug-2012 |
Teng-Hui Zhu <ztenghui@google.com> |
add the menu button to support trimming This is only visible for video item. Change-Id: I17f8e902f3560cc8524f890705c020901331df74
es/menu/photo.xml
es/values/strings.xml
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/data/LocalVideo.java
rc/com/android/gallery3d/data/MediaObject.java
rc/com/android/gallery3d/ui/MenuExecutor.java
|
ab0541b013bc2833283d338a69d1bc1f56cdc49b |
27-Aug-2012 |
Bobby Georgescu <georgescu@google.com> |
Reskin: tweaks to colors and spacings to match mocks Bug: 7050303 - Call super.onCreate in ActivityState subclasses in order to correctly initialize background colors, correcting oversight in previous change - Tweak background and label colors to match mocks - Tweak grid spacings to match mocks Change-Id: Iba5cba6c60e8a750d8e50c1d0c14c916754a95c2
es/values/colors.xml
es/values/dimensions.xml
|
de13f16dbffc9a0cadc05913c1fce1ffcd8f6dd3 |
27-Aug-2012 |
Bobby Georgescu <georgescu@google.com> |
Reskin: tweaks to colors and spacings to match mocks Bug: 7050303 - Call super.onCreate in ActivityState subclasses in order to correctly initialize background colors, correcting oversight in previous change - Tweak background and label colors to match mocks - Tweak grid spacings to match mocks Change-Id: Iba5cba6c60e8a750d8e50c1d0c14c916754a95c2
rc/com/android/gallery3d/app/AlbumPage.java
rc/com/android/gallery3d/app/AlbumSetPage.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/app/SlideshowPage.java
|
45c56f2d34c71d0bc9b84ebeef6d1314738d0fc0 |
27-Aug-2012 |
Bobby Georgescu <georgescu@google.com> |
Reskin: tweaks to colors and spacings to match mocks Bug: 7050303 - Call super.onCreate in ActivityState subclasses in order to correctly initialize background colors, correcting oversight in previous change - Tweak background and label colors to match mocks - Tweak grid spacings to match mocks Change-Id: Iba5cba6c60e8a750d8e50c1d0c14c916754a95c2
es/values/colors.xml
es/values/dimensions.xml
rc/com/android/gallery3d/app/AlbumPage.java
rc/com/android/gallery3d/app/AlbumSetPage.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/app/SlideshowPage.java
|
92bc6105736a1486ac74e4c7ec1bb8b57c24e6f8 |
27-Aug-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
1dfffe03c8db552e94280d6968418024b26da350 |
27-Aug-2012 |
Chih-Chung Chang <chihchung@google.com> |
Merge "Progressbar: correct the first updated value for progressbar"
|
220fb8a924a458f15c2223ff10881d5ec31e818e |
27-Aug-2012 |
Wu-cheng Li <wuchengli@google.com> |
Merge "Add secure album support for lock screen camera." into gb-ub-photos-arches
|
90432185dfabecad9b805b1f166cc58147c9be73 |
27-Aug-2012 |
Wu-cheng Li <wuchengli@google.com> |
Merge "Add secure album support for lock screen camera." into gb-ub-photos-arches
|
ec3c73a3c4b7f7b841f707a1b965222c0e86195e |
22-Aug-2012 |
Wu-cheng Li <wuchengli@google.com> |
Add secure album support for lock screen camera. Secure album only shows the media items added by the camera. bug:5955016 Change-Id: Id26abec4dfcc036cf9de682398fed25eed73d1a5
rc/com/android/gallery3d/app/AppBridge.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/data/ChangeNotifier.java
rc/com/android/gallery3d/data/DataManager.java
rc/com/android/gallery3d/data/LocalAlbumSet.java
rc/com/android/gallery3d/data/SecureAlbum.java
rc/com/android/gallery3d/data/SecureSource.java
|
a0ce682e40c39ce046c48d8a7f989fff01bb9f2c |
22-Aug-2012 |
Wu-cheng Li <wuchengli@google.com> |
Add secure album support for lock screen camera. Secure album only shows the media items added by the camera. bug:5955016 Change-Id: Id26abec4dfcc036cf9de682398fed25eed73d1a5
rc/com/android/gallery3d/app/AppBridge.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/data/ChangeNotifier.java
rc/com/android/gallery3d/data/DataManager.java
rc/com/android/gallery3d/data/LocalAlbumSet.java
rc/com/android/gallery3d/data/SecureAlbum.java
rc/com/android/gallery3d/data/SecureSource.java
|
8a35777369b212bf0dd087d20574e9894547a048 |
27-Aug-2012 |
Angus Kong <shkong@google.com> |
Merge "Add LightCycle helper class." into gb-ub-photos-arches
|
d2ddb74b4731fc51fe6942bb4da7b2c38a2a1577 |
27-Aug-2012 |
Angus Kong <shkong@google.com> |
Merge "Add LightCycle helper class." into gb-ub-photos-arches
|
65ba13d0361be253ebe913b83c7345a811566cf5 |
26-Aug-2012 |
Angus Kong <shkong@google.com> |
Add LightCycle helper class. LightCycleHelper also receives event of package changes to get updated. bug:6912297 Change-Id: Ib822ee778537b64986389bf8eeec36f61c9289f2
allerycommon/src/com/android/gallery3d/common/LightCycleHelper.java
|
305e6e3d3091cd4a500fdbaabde18e531b8d450a |
26-Aug-2012 |
Angus Kong <shkong@google.com> |
Add LightCycle helper class. LightCycleHelper also receives event of package changes to get updated. bug:6912297 Change-Id: Ib822ee778537b64986389bf8eeec36f61c9289f2
allerycommon/src/com/android/gallery3d/common/LightCycleHelper.java
rc/com/android/gallery3d/app/PackagesMonitor.java
|
b0c2d70af79673fed3fda13657f92bccec35da19 |
26-Aug-2012 |
Angus Kong <shkong@google.com> |
Add LightCycle helper class. LightCycleHelper also receives event of package changes to get updated. bug:6912297 Change-Id: Ib822ee778537b64986389bf8eeec36f61c9289f2
allerycommon/src/com/android/gallery3d/common/LightCycleHelper.java
rc/com/android/gallery3d/app/PackagesMonitor.java
|
aa185242f8d54cad51c231b630ec15fd9e556fcf |
25-Aug-2012 |
Bobby Georgescu <georgescu@google.com> |
Reskin: show placeholder color before album label is ready Bug: 7050303 Change-Id: I679ecf6360f2ae3bfe19fc0677998ac8b1589bcf
es/values/colors.xml
|
da3df03ed46ac5ce19beba0618dfa3932dad05bc |
25-Aug-2012 |
Bobby Georgescu <georgescu@google.com> |
Reskin: show placeholder color before album label is ready Bug: 7050303 Change-Id: I679ecf6360f2ae3bfe19fc0677998ac8b1589bcf
rc/com/android/gallery3d/ui/AlbumSetSlotRenderer.java
|
541e25df9f933d58d4678f58519558473db5a333 |
25-Aug-2012 |
Bobby Georgescu <georgescu@google.com> |
Reskin: show placeholder color before album label is ready Bug: 7050303 Change-Id: I679ecf6360f2ae3bfe19fc0677998ac8b1589bcf
es/values/colors.xml
rc/com/android/gallery3d/ui/AlbumSetSlotRenderer.java
|
785e19f5dea93fcd78b4ccf4c98f8c16568f8f48 |
25-Aug-2012 |
Bobby Georgescu <georgescu@google.com> |
Make transition from album page to photo page even smoother Bug: 6979922 Bug: 7050303 Change-Id: Iaa2582125f0706a34317fa90fea73749cd2cf995
rc/com/android/gallery3d/app/AlbumPage.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/ui/PositionController.java
|
02ef48574ef7099ebaa0386bd6fd676bd2fd5489 |
25-Aug-2012 |
Bobby Georgescu <georgescu@google.com> |
Make transition from album page to photo page even smoother Bug: 6979922 Bug: 7050303 Change-Id: Iaa2582125f0706a34317fa90fea73749cd2cf995
rc/com/android/gallery3d/app/AlbumPage.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/ui/PositionController.java
|
75da47f8d384e58367c5458c366978918c0b6696 |
23-Aug-2012 |
Bobby Georgescu <georgescu@google.com> |
Offer to launch camera when Gallery completely empty Bug: 7009464 Rather than showing a blank screen, alerts the user that the gallery is empty and offers to launch the camera, if the device has one. Change-Id: I0bf71f1cbe7c96a4dc063b5d38b9a282538234c9
rc/com/android/gallery3d/app/AlbumSetPage.java
|
5992daf6f4cb56742cbf33a014c5c2c142c6957e |
23-Aug-2012 |
Bobby Georgescu <georgescu@google.com> |
Offer to launch camera when Gallery completely empty Bug: 7009464 Rather than showing a blank screen, alerts the user that the gallery is empty and offers to launch the camera, if the device has one. Change-Id: I0bf71f1cbe7c96a4dc063b5d38b9a282538234c9
rc/com/android/gallery3d/app/AlbumSetPage.java
|
fa3e84a0ce70f03b47c94434fdb52780a8b08e62 |
27-Aug-2012 |
Owen Lin <owenlin@google.com> |
Merge "Uses ActionBarSherlock in Gallery" into gb-ub-photos-arches
|
30bf426bdecfe355fcc3a10b8102649c9c70b37b |
27-Aug-2012 |
Owen Lin <owenlin@google.com> |
Merge "Uses ActionBarSherlock in Gallery" into gb-ub-photos-arches
|
2104e7be341685b4b6b9fd2748164960e9e6619d |
23-Aug-2012 |
Owen Lin <owenlin@google.com> |
Uses ActionBarSherlock in Gallery bug: 6927267 Change-Id: I1c22975d1a1f3a36510ad93e6a0cefea110ca38f
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
allerycommon/src/com/android/gallery3d/common/HttpClientFactory.java
allerycommon/src/com/android/gallery3d/common/Utils.java
|
a57d8fedf0b998036289b7bc30de8268553304f4 |
23-Aug-2012 |
Owen Lin <owenlin@google.com> |
Uses ActionBarSherlock in Gallery bug: 6927267 Change-Id: I1c22975d1a1f3a36510ad93e6a0cefea110ca38f
es/layout/action_bar_text.xml
es/menu/movie.xml
es/menu/operation.xml
es/menu/photo.xml
es/values-v14/styles.xml
rc/com/android/gallery3d/ui/DetailsAddressResolver.java
|
e681d65a336c9ae79098b8a7e49cfe1e5affb695 |
23-Aug-2012 |
Owen Lin <owenlin@google.com> |
Uses ActionBarSherlock in Gallery bug: 6927267 Change-Id: I1c22975d1a1f3a36510ad93e6a0cefea110ca38f
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
allerycommon/src/com/android/gallery3d/common/HttpClientFactory.java
allerycommon/src/com/android/gallery3d/common/Utils.java
rc/com/android/gallery3d/actionbar/ActionBarInterface.java
rc/com/android/gallery3d/actionbar/ActionBarUtils.java
rc/com/android/gallery3d/actionbar/ActionModeInterface.java
rc/com/android/gallery3d/actionbar/MenuHolder.java
rc/com/android/gallery3d/actionbar/SimpleActionBar.java
rc/com/android/gallery3d/actionbar/SimpleActionBarView.java
rc/com/android/gallery3d/actionbar/SimpleActionMode.java
rc/com/android/gallery3d/actionbar/SimpleMenu.java
rc/com/android/gallery3d/actionbar/SimpleMenuInflater.java
rc/com/android/gallery3d/actionbar/SystemActionBarWrapper.java
rc/com/android/gallery3d/actionbar/SystemActionModeWrapper.java
rc/com/android/gallery3d/app/AbstractGalleryActivity.java
rc/com/android/gallery3d/app/ActivityState.java
rc/com/android/gallery3d/app/AlbumDataLoader.java
rc/com/android/gallery3d/app/AlbumPage.java
rc/com/android/gallery3d/app/AlbumSetDataLoader.java
rc/com/android/gallery3d/app/AlbumSetPage.java
rc/com/android/gallery3d/app/CropImage.java
rc/com/android/gallery3d/app/FilterUtils.java
rc/com/android/gallery3d/app/GalleryActionBar.java
rc/com/android/gallery3d/app/GalleryActivity.java
rc/com/android/gallery3d/app/MovieActivity.java
rc/com/android/gallery3d/app/PhotoDataAdapter.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/app/PickerActivity.java
rc/com/android/gallery3d/app/SinglePhotoDataAdapter.java
rc/com/android/gallery3d/app/StateManager.java
rc/com/android/gallery3d/ui/ActionModeHandler.java
rc/com/android/gallery3d/ui/AlbumSetSlidingWindow.java
rc/com/android/gallery3d/ui/AlbumSetSlotRenderer.java
rc/com/android/gallery3d/ui/AlbumSlidingWindow.java
rc/com/android/gallery3d/ui/AlbumSlotRenderer.java
rc/com/android/gallery3d/ui/CacheStorageUsageInfo.java
rc/com/android/gallery3d/ui/CropView.java
rc/com/android/gallery3d/ui/DetailsAddressResolver.java
rc/com/android/gallery3d/ui/DetailsHelper.java
rc/com/android/gallery3d/ui/DialogDetailsView.java
rc/com/android/gallery3d/ui/ImportCompleteListener.java
rc/com/android/gallery3d/ui/ManageCacheDrawer.java
rc/com/android/gallery3d/ui/MenuExecutor.java
rc/com/android/gallery3d/ui/PhotoView.java
rc/com/android/gallery3d/ui/SelectionManager.java
rc/com/android/gallery3d/ui/SlotView.java
|
b21b8e58a604f6c701245d84b141b5b87663192b |
23-Aug-2012 |
Owen Lin <owenlin@google.com> |
Uses ActionBarSherlock in Gallery bug: 6927267 Change-Id: I1c22975d1a1f3a36510ad93e6a0cefea110ca38f
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
allerycommon/src/com/android/gallery3d/common/HttpClientFactory.java
allerycommon/src/com/android/gallery3d/common/Utils.java
es/layout/action_bar_text.xml
es/menu/movie.xml
es/menu/operation.xml
es/menu/photo.xml
es/values-v14/styles.xml
rc/com/android/gallery3d/actionbar/ActionBarInterface.java
rc/com/android/gallery3d/actionbar/ActionBarUtils.java
rc/com/android/gallery3d/actionbar/ActionModeInterface.java
rc/com/android/gallery3d/actionbar/MenuHolder.java
rc/com/android/gallery3d/actionbar/SimpleActionBar.java
rc/com/android/gallery3d/actionbar/SimpleActionBarView.java
rc/com/android/gallery3d/actionbar/SimpleActionMode.java
rc/com/android/gallery3d/actionbar/SimpleMenu.java
rc/com/android/gallery3d/actionbar/SimpleMenuInflater.java
rc/com/android/gallery3d/actionbar/SystemActionBarWrapper.java
rc/com/android/gallery3d/actionbar/SystemActionModeWrapper.java
rc/com/android/gallery3d/app/AbstractGalleryActivity.java
rc/com/android/gallery3d/app/ActivityState.java
rc/com/android/gallery3d/app/AlbumDataLoader.java
rc/com/android/gallery3d/app/AlbumPage.java
rc/com/android/gallery3d/app/AlbumSetDataLoader.java
rc/com/android/gallery3d/app/AlbumSetPage.java
rc/com/android/gallery3d/app/CropImage.java
rc/com/android/gallery3d/app/FilterUtils.java
rc/com/android/gallery3d/app/GalleryActionBar.java
rc/com/android/gallery3d/app/GalleryActivity.java
rc/com/android/gallery3d/app/MovieActivity.java
rc/com/android/gallery3d/app/PhotoDataAdapter.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/app/PickerActivity.java
rc/com/android/gallery3d/app/SinglePhotoDataAdapter.java
rc/com/android/gallery3d/app/StateManager.java
rc/com/android/gallery3d/ui/ActionModeHandler.java
rc/com/android/gallery3d/ui/AlbumSetSlidingWindow.java
rc/com/android/gallery3d/ui/AlbumSetSlotRenderer.java
rc/com/android/gallery3d/ui/AlbumSlidingWindow.java
rc/com/android/gallery3d/ui/AlbumSlotRenderer.java
rc/com/android/gallery3d/ui/CacheStorageUsageInfo.java
rc/com/android/gallery3d/ui/CropView.java
rc/com/android/gallery3d/ui/DetailsAddressResolver.java
rc/com/android/gallery3d/ui/DetailsHelper.java
rc/com/android/gallery3d/ui/DialogDetailsView.java
rc/com/android/gallery3d/ui/ImportCompleteListener.java
rc/com/android/gallery3d/ui/ManageCacheDrawer.java
rc/com/android/gallery3d/ui/MenuExecutor.java
rc/com/android/gallery3d/ui/PhotoView.java
rc/com/android/gallery3d/ui/SelectionManager.java
rc/com/android/gallery3d/ui/SlotView.java
|
3d5c7f5c79492de43dfe58b78bc97cdce1ec8dd7 |
27-Aug-2012 |
Hung-ying Tyan <tyanh@google.com> |
Merge "Read thumbnail into ExifData" into gb-ub-photos-arches
|
f6513f51e9c8cc307164305215e4122bf93fb08d |
27-Aug-2012 |
Hung-ying Tyan <tyanh@google.com> |
Merge "Read thumbnail into ExifData" into gb-ub-photos-arches
|
fd745274358be4afdc0876985b108c2a20ef6b06 |
16-Aug-2012 |
Earl Ou <shunhsingou@google.com> |
Read thumbnail into ExifData Change-Id: Iccc0fbbda1734795ff431075bade700ca5076a08
rc/com/android/gallery3d/exif/ExifData.java
rc/com/android/gallery3d/exif/ExifReader.java
ests/src/com/android/gallery3d/exif/ExifReaderTest.java
|
d83a3749f50a8b493a12dfc96aaa0da2f9a6d08b |
16-Aug-2012 |
Earl Ou <shunhsingou@google.com> |
Read thumbnail into ExifData Change-Id: Iccc0fbbda1734795ff431075bade700ca5076a08
rc/com/android/gallery3d/exif/ExifData.java
rc/com/android/gallery3d/exif/ExifReader.java
ests/src/com/android/gallery3d/exif/ExifReaderTest.java
|
f27cbd2417a4171e49af603aa7da02fab865e102 |
27-Aug-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
|
7916a57fb06d625e5c544e289cd487622d2c3137 |
27-Aug-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
|
3da9ced73a3a56df270664f4ad8aa346b9c6e2cc |
26-Aug-2012 |
Wu-cheng Li <wuchengli@google.com> |
Register STILL_IMAGE_CAMERA_SECURE intent in the manifest. bug:7053266 Change-Id: I6468a82f5da5afb98316d52b31117f1cc4f82fb9
ndroidManifest.xml
|
8745db70dec195c8e5fcfe997f167e8ba1a33264 |
26-Aug-2012 |
Wu-cheng Li <wuchengli@google.com> |
Register STILL_IMAGE_CAMERA_SECURE intent in the manifest. bug:7053266 Change-Id: I6468a82f5da5afb98316d52b31117f1cc4f82fb9
ndroidManifest.xml
|
2eb6d0ba14136055bfe7bede55013f1fe1b324d2 |
25-Aug-2012 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with jb-mr1-release - do not merge Change-Id: I31e003a4f4083752a160f9f859f3de72ed30df12
|
93d87ff509cabdad9f02f379df7eba01a44969c7 |
23-Aug-2012 |
Bobby Georgescu <georgescu@google.com> |
Ongoing reskin of Gallery app Bug: 7050303 Moved the majority of color settings from hardcoded to colors.xml in order to allow rapid iteration with UX input. Started changing some colors and layouts to reflect latest UX mocks. Change-Id: I300338e9f75c71f3ed3f36140d16e893387f3184
rc/com/android/gallery3d/app/ActivityState.java
rc/com/android/gallery3d/app/AlbumPage.java
rc/com/android/gallery3d/app/AlbumSetPage.java
rc/com/android/gallery3d/app/Config.java
rc/com/android/gallery3d/app/ManageCachePage.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/app/SlideshowPage.java
rc/com/android/gallery3d/ui/AlbumLabelMaker.java
rc/com/android/gallery3d/ui/AlbumSetSlotRenderer.java
rc/com/android/gallery3d/ui/AlbumSlotRenderer.java
rc/com/android/gallery3d/ui/BitmapScreenNail.java
rc/com/android/gallery3d/ui/GLCanvas.java
rc/com/android/gallery3d/ui/GLCanvasImpl.java
rc/com/android/gallery3d/ui/ManageCacheDrawer.java
rc/com/android/gallery3d/ui/PhotoView.java
rc/com/android/gallery3d/ui/SlotView.java
rc/com/android/gallery3d/util/GalleryUtils.java
ests/src/com/android/gallery3d/ui/GLCanvasStub.java
|
26067cb4727abc0b04c6283302ca0b83131d7cf1 |
23-Aug-2012 |
Bobby Georgescu <georgescu@google.com> |
Ongoing reskin of Gallery app Bug: 7050303 Moved the majority of color settings from hardcoded to colors.xml in order to allow rapid iteration with UX input. Started changing some colors and layouts to reflect latest UX mocks. Change-Id: I300338e9f75c71f3ed3f36140d16e893387f3184
es/values/colors.xml
es/values/dimensions.xml
|
915c2c5b2c367df71599370613af0924bd7c4887 |
23-Aug-2012 |
Bobby Georgescu <georgescu@google.com> |
Ongoing reskin of Gallery app Bug: 7050303 Moved the majority of color settings from hardcoded to colors.xml in order to allow rapid iteration with UX input. Started changing some colors and layouts to reflect latest UX mocks. Change-Id: I300338e9f75c71f3ed3f36140d16e893387f3184
es/values/colors.xml
es/values/dimensions.xml
rc/com/android/gallery3d/app/ActivityState.java
rc/com/android/gallery3d/app/AlbumPage.java
rc/com/android/gallery3d/app/AlbumSetPage.java
rc/com/android/gallery3d/app/Config.java
rc/com/android/gallery3d/app/ManageCachePage.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/app/SlideshowPage.java
rc/com/android/gallery3d/ui/AlbumLabelMaker.java
rc/com/android/gallery3d/ui/AlbumSetSlotRenderer.java
rc/com/android/gallery3d/ui/AlbumSlotRenderer.java
rc/com/android/gallery3d/ui/BitmapScreenNail.java
rc/com/android/gallery3d/ui/GLCanvas.java
rc/com/android/gallery3d/ui/GLCanvasImpl.java
rc/com/android/gallery3d/ui/ManageCacheDrawer.java
rc/com/android/gallery3d/ui/PhotoView.java
rc/com/android/gallery3d/ui/SlotView.java
rc/com/android/gallery3d/util/GalleryUtils.java
ests/src/com/android/gallery3d/ui/GLCanvasStub.java
|
81adc468ba001b025d118c3d3a5bdebe11b54eae |
24-Aug-2012 |
Jean-Baptiste Queru <jbq@google.com> |
Merge "Fine-tune SDK versions"
|
8542a43940dd7cfee04fa059b8313dd1139ad7f6 |
24-Aug-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I87825a89d6a75f65528c6d2edfcebd753040457e Auto-generated-cl: translation import
es/values-sw/photoeditor_strings.xml
|
015de507c0cd8543546dcf6fc673ba2f15576228 |
24-Aug-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I87825a89d6a75f65528c6d2edfcebd753040457e Auto-generated-cl: translation import
es/values-sw/photoeditor_strings.xml
|
ed3f467915e1e9b869674b1bd6acf0c4fa2372d1 |
24-Aug-2012 |
Jean-Baptiste Queru <jbq@google.com> |
Fine-tune SDK versions Change-Id: Ic8ebb95d51a4a66da7b026ea93572db1781bed35
ndroidManifest.xml
|
0b6bca8513ae49dacbfdbd9c800ba9f542b6b68b |
24-Aug-2012 |
Hung-ying Tyan <tyanh@google.com> |
Merge "Rename TiffInputStream to CountedDataInputStream" into gb-ub-photos-arches
|
1e16dd6bdaa2ef99539f60e051a816f4ce9f3a3f |
24-Aug-2012 |
Hung-ying Tyan <tyanh@google.com> |
Merge "Rename TiffInputStream to CountedDataInputStream" into gb-ub-photos-arches
|
3258a8a39632c39ea68204845bd83a179ef9030d |
24-Aug-2012 |
Hung-ying Tyan <tyanh@google.com> |
Merge "Re-design ExifParser for some strange Exif header" into gb-ub-photos-arches
|
66e64517f9b2b18485f4436aecac54f1998f2823 |
24-Aug-2012 |
Hung-ying Tyan <tyanh@google.com> |
Merge "Re-design ExifParser for some strange Exif header" into gb-ub-photos-arches
|
f073abfda875213723f6323a79756609ca60675d |
15-Aug-2012 |
Earl Ou <shunhsingou@google.com> |
Rename TiffInputStream to CountedDataInputStream Change-Id: Ie52ab9a58ae47f5a0b9113c6006844b73567d864
rc/com/android/gallery3d/exif/CountedDataInputStream.java
rc/com/android/gallery3d/exif/ExifParser.java
rc/com/android/gallery3d/exif/TiffInputStream.java
|
bdbf57f29db2c98dd2e0d05cd062c063fe90cd54 |
15-Aug-2012 |
Earl Ou <shunhsingou@google.com> |
Rename TiffInputStream to CountedDataInputStream Change-Id: Ie52ab9a58ae47f5a0b9113c6006844b73567d864
rc/com/android/gallery3d/exif/CountedDataInputStream.java
rc/com/android/gallery3d/exif/ExifParser.java
rc/com/android/gallery3d/exif/TiffInputStream.java
|
ccd9f271fa2bfa56196aef78d0a87d3b00be2015 |
14-Aug-2012 |
Earl Ou <shunhsingou@google.com> |
Re-design ExifParser for some strange Exif header The previous design failed to parser file with strange IFD position. Therefore we need a new design. Change-Id: I9f008a9259df6ef7d9a5022e126d6f25069e3d00
rc/com/android/gallery3d/exif/ExifData.java
rc/com/android/gallery3d/exif/ExifParser.java
rc/com/android/gallery3d/exif/ExifReader.java
rc/com/android/gallery3d/exif/ExifTag.java
rc/com/android/gallery3d/exif/IfdData.java
rc/com/android/gallery3d/exif/IfdId.java
rc/com/android/gallery3d/exif/IfdParser.java
rc/com/android/gallery3d/exif/Rational.java
ests/src/com/android/gallery3d/exif/ExifParserTest.java
ests/src/com/android/gallery3d/exif/ExifReaderTest.java
ests/src/com/android/gallery3d/exif/ExifXmlReader.java
|
4ae9b211fee74f801f003bc9ad716e214de1a4f0 |
14-Aug-2012 |
Earl Ou <shunhsingou@google.com> |
Re-design ExifParser for some strange Exif header The previous design failed to parser file with strange IFD position. Therefore we need a new design. Change-Id: I9f008a9259df6ef7d9a5022e126d6f25069e3d00
rc/com/android/gallery3d/exif/ExifData.java
rc/com/android/gallery3d/exif/ExifParser.java
rc/com/android/gallery3d/exif/ExifReader.java
rc/com/android/gallery3d/exif/ExifTag.java
rc/com/android/gallery3d/exif/IfdData.java
rc/com/android/gallery3d/exif/IfdId.java
rc/com/android/gallery3d/exif/IfdParser.java
rc/com/android/gallery3d/exif/Rational.java
ests/src/com/android/gallery3d/exif/ExifParserTest.java
ests/src/com/android/gallery3d/exif/ExifReaderTest.java
ests/src/com/android/gallery3d/exif/ExifXmlReader.java
|
54b8926da0bdc30577641af1f2fc7b151ea6f3e5 |
24-Aug-2012 |
Owen Lin <owenlin@android.com> |
Merge "Use GalleryUtils.getSelectionModePrompt instead of duplicated code." into gb-ub-photos-arches
|
97fd6fa6b87350a609d717c56ade783135a81616 |
24-Aug-2012 |
Owen Lin <owenlin@android.com> |
Merge "Use GalleryUtils.getSelectionModePrompt instead of duplicated code." into gb-ub-photos-arches
|
8ce73319ec3047d7df3fb55405f3c53a8a169d67 |
24-Aug-2012 |
Owen Lin <owenlin@google.com> |
Revert "Revert "Uses ActionBarSherlock library in MovieActivity."" This reverts commit 13da281769d4558c42d86a54536ff6da6826b0ac.
roguard.flags
|
ab1f41e4494426f835319fa2b1e1ee2a74034b34 |
24-Aug-2012 |
Owen Lin <owenlin@google.com> |
Revert "Revert "Uses ActionBarSherlock library in MovieActivity."" This reverts commit 13da281769d4558c42d86a54536ff6da6826b0ac.
ndroid.mk
|
e6086fb7794e1b757e856f4f94f0f9a09bff5c68 |
24-Aug-2012 |
Owen Lin <owenlin@google.com> |
Revert "Revert "Uses ActionBarSherlock library in MovieActivity."" This reverts commit 13da281769d4558c42d86a54536ff6da6826b0ac.
ctionbarsherlock/res/color/abs__primary_text_disable_only_holo_dark.xml
ctionbarsherlock/res/color/abs__primary_text_disable_only_holo_light.xml
ctionbarsherlock/res/color/abs__primary_text_holo_dark.xml
ctionbarsherlock/res/color/abs__primary_text_holo_light.xml
ctionbarsherlock/res/drawable-hdpi/abs__ab_bottom_solid_dark_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_bottom_solid_inverse_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_bottom_solid_light_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_bottom_transparent_dark_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_bottom_transparent_light_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_share_pack_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_share_pack_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_solid_dark_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_solid_light_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_solid_shadow_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_stacked_solid_dark_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_stacked_solid_light_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_stacked_transparent_dark_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_stacked_transparent_light_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_transparent_dark_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_transparent_light_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__btn_cab_done_default_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__btn_cab_done_default_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__btn_cab_done_focused_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__btn_cab_done_focused_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__btn_cab_done_pressed_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__btn_cab_done_pressed_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__cab_background_bottom_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__cab_background_bottom_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__cab_background_top_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__cab_background_top_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__dialog_full_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__dialog_full_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ic_ab_back_holo_dark.png
ctionbarsherlock/res/drawable-hdpi/abs__ic_ab_back_holo_light.png
ctionbarsherlock/res/drawable-hdpi/abs__ic_cab_done_holo_dark.png
ctionbarsherlock/res/drawable-hdpi/abs__ic_cab_done_holo_light.png
ctionbarsherlock/res/drawable-hdpi/abs__ic_menu_moreoverflow_normal_holo_dark.png
ctionbarsherlock/res/drawable-hdpi/abs__ic_menu_moreoverflow_normal_holo_light.png
ctionbarsherlock/res/drawable-hdpi/abs__ic_menu_share_holo_dark.png
ctionbarsherlock/res/drawable-hdpi/abs__ic_menu_share_holo_light.png
ctionbarsherlock/res/drawable-hdpi/abs__list_activated_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__list_divider_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__list_divider_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__list_focused_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__list_longpressed_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__list_pressed_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__list_pressed_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__list_selector_disabled_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__list_selector_disabled_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__menu_dropdown_panel_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__menu_dropdown_panel_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__progress_bg_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__progress_bg_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__progress_primary_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__progress_primary_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__progress_secondary_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__progress_secondary_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__spinner_48_inner_holo.png
ctionbarsherlock/res/drawable-hdpi/abs__spinner_48_outer_holo.png
ctionbarsherlock/res/drawable-hdpi/abs__spinner_ab_default_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__spinner_ab_default_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__spinner_ab_disabled_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__spinner_ab_disabled_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__spinner_ab_focused_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__spinner_ab_focused_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__spinner_ab_pressed_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__spinner_ab_pressed_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__tab_selected_focused_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__tab_selected_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__tab_selected_pressed_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__tab_unselected_pressed_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_bottom_solid_dark_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_bottom_solid_inverse_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_bottom_solid_light_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_bottom_transparent_dark_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_bottom_transparent_light_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_share_pack_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_share_pack_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_solid_dark_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_solid_light_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_solid_shadow_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_stacked_solid_dark_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_stacked_solid_light_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_stacked_transparent_dark_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_stacked_transparent_light_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_transparent_dark_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_transparent_light_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__btn_cab_done_default_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__btn_cab_done_default_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__btn_cab_done_focused_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__btn_cab_done_focused_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__btn_cab_done_pressed_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__btn_cab_done_pressed_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__cab_background_bottom_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__cab_background_bottom_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__cab_background_top_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__cab_background_top_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__dialog_full_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__dialog_full_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ic_ab_back_holo_dark.png
ctionbarsherlock/res/drawable-mdpi/abs__ic_ab_back_holo_light.png
ctionbarsherlock/res/drawable-mdpi/abs__ic_cab_done_holo_dark.png
ctionbarsherlock/res/drawable-mdpi/abs__ic_cab_done_holo_light.png
ctionbarsherlock/res/drawable-mdpi/abs__ic_menu_moreoverflow_normal_holo_dark.png
ctionbarsherlock/res/drawable-mdpi/abs__ic_menu_moreoverflow_normal_holo_light.png
ctionbarsherlock/res/drawable-mdpi/abs__ic_menu_share_holo_dark.png
ctionbarsherlock/res/drawable-mdpi/abs__ic_menu_share_holo_light.png
ctionbarsherlock/res/drawable-mdpi/abs__list_activated_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__list_divider_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__list_divider_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__list_focused_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__list_longpressed_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__list_pressed_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__list_pressed_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__list_selector_disabled_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__list_selector_disabled_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__menu_dropdown_panel_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__menu_dropdown_panel_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__progress_bg_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__progress_bg_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__progress_primary_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__progress_primary_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__progress_secondary_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__progress_secondary_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__spinner_48_inner_holo.png
ctionbarsherlock/res/drawable-mdpi/abs__spinner_48_outer_holo.png
ctionbarsherlock/res/drawable-mdpi/abs__spinner_ab_default_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__spinner_ab_default_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__spinner_ab_disabled_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__spinner_ab_disabled_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__spinner_ab_focused_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__spinner_ab_focused_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__spinner_ab_pressed_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__spinner_ab_pressed_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__tab_selected_focused_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__tab_selected_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__tab_selected_pressed_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__tab_unselected_pressed_holo.9.png
ctionbarsherlock/res/drawable-v11/abs__progress_medium_holo.xml
ctionbarsherlock/res/drawable-xhdpi/abs__ab_bottom_solid_dark_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_bottom_solid_inverse_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_bottom_solid_light_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_bottom_transparent_dark_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_bottom_transparent_light_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_share_pack_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_share_pack_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_solid_dark_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_solid_light_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_solid_shadow_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_stacked_solid_dark_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_stacked_solid_light_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_stacked_transparent_dark_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_stacked_transparent_light_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_transparent_dark_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_transparent_light_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__btn_cab_done_default_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__btn_cab_done_default_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__btn_cab_done_focused_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__btn_cab_done_focused_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__btn_cab_done_pressed_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__btn_cab_done_pressed_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__cab_background_bottom_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__cab_background_bottom_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__cab_background_top_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__cab_background_top_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__dialog_full_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__dialog_full_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ic_ab_back_holo_dark.png
ctionbarsherlock/res/drawable-xhdpi/abs__ic_ab_back_holo_light.png
ctionbarsherlock/res/drawable-xhdpi/abs__ic_cab_done_holo_dark.png
ctionbarsherlock/res/drawable-xhdpi/abs__ic_cab_done_holo_light.png
ctionbarsherlock/res/drawable-xhdpi/abs__ic_menu_moreoverflow_normal_holo_dark.png
ctionbarsherlock/res/drawable-xhdpi/abs__ic_menu_moreoverflow_normal_holo_light.png
ctionbarsherlock/res/drawable-xhdpi/abs__ic_menu_share_holo_dark.png
ctionbarsherlock/res/drawable-xhdpi/abs__ic_menu_share_holo_light.png
ctionbarsherlock/res/drawable-xhdpi/abs__list_activated_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__list_divider_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__list_divider_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__list_focused_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__list_longpressed_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__list_pressed_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__list_pressed_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__list_selector_disabled_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__list_selector_disabled_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__menu_dropdown_panel_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__menu_dropdown_panel_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__progress_bg_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__progress_bg_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__progress_primary_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__progress_primary_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__progress_secondary_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__progress_secondary_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__spinner_48_inner_holo.png
ctionbarsherlock/res/drawable-xhdpi/abs__spinner_48_outer_holo.png
ctionbarsherlock/res/drawable-xhdpi/abs__spinner_ab_default_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__spinner_ab_default_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__spinner_ab_disabled_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__spinner_ab_disabled_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__spinner_ab_focused_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__spinner_ab_focused_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__spinner_ab_pressed_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__spinner_ab_pressed_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__tab_selected_focused_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__tab_selected_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__tab_selected_pressed_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__tab_unselected_pressed_holo.9.png
ctionbarsherlock/res/drawable/abs__activated_background_holo_dark.xml
ctionbarsherlock/res/drawable/abs__activated_background_holo_light.xml
ctionbarsherlock/res/drawable/abs__btn_cab_done_holo_dark.xml
ctionbarsherlock/res/drawable/abs__btn_cab_done_holo_light.xml
ctionbarsherlock/res/drawable/abs__ic_menu_moreoverflow_holo_dark.xml
ctionbarsherlock/res/drawable/abs__ic_menu_moreoverflow_holo_light.xml
ctionbarsherlock/res/drawable/abs__item_background_holo_dark.xml
ctionbarsherlock/res/drawable/abs__item_background_holo_light.xml
ctionbarsherlock/res/drawable/abs__list_selector_background_transition_holo_dark.xml
ctionbarsherlock/res/drawable/abs__list_selector_background_transition_holo_light.xml
ctionbarsherlock/res/drawable/abs__list_selector_holo_dark.xml
ctionbarsherlock/res/drawable/abs__list_selector_holo_light.xml
ctionbarsherlock/res/drawable/abs__progress_horizontal_holo_dark.xml
ctionbarsherlock/res/drawable/abs__progress_horizontal_holo_light.xml
ctionbarsherlock/res/drawable/abs__progress_medium_holo.xml
ctionbarsherlock/res/drawable/abs__spinner_ab_holo_dark.xml
ctionbarsherlock/res/drawable/abs__spinner_ab_holo_light.xml
ctionbarsherlock/res/drawable/abs__tab_indicator_ab_holo.xml
ctionbarsherlock/res/layout-large/abs__action_mode_close_item.xml
ctionbarsherlock/res/layout-v14/sherlock_spinner_dropdown_item.xml
ctionbarsherlock/res/layout-v14/sherlock_spinner_item.xml
ctionbarsherlock/res/layout-xlarge/abs__screen_action_bar.xml
ctionbarsherlock/res/layout-xlarge/abs__screen_action_bar_overlay.xml
ctionbarsherlock/res/layout/abs__action_bar_home.xml
ctionbarsherlock/res/layout/abs__action_bar_tab.xml
ctionbarsherlock/res/layout/abs__action_bar_tab_bar_view.xml
ctionbarsherlock/res/layout/abs__action_bar_title_item.xml
ctionbarsherlock/res/layout/abs__action_menu_item_layout.xml
ctionbarsherlock/res/layout/abs__action_menu_layout.xml
ctionbarsherlock/res/layout/abs__action_mode_bar.xml
ctionbarsherlock/res/layout/abs__action_mode_close_item.xml
ctionbarsherlock/res/layout/abs__activity_chooser_view.xml
ctionbarsherlock/res/layout/abs__activity_chooser_view_list_item.xml
ctionbarsherlock/res/layout/abs__dialog_title_holo.xml
ctionbarsherlock/res/layout/abs__list_menu_item_checkbox.xml
ctionbarsherlock/res/layout/abs__list_menu_item_icon.xml
ctionbarsherlock/res/layout/abs__list_menu_item_layout.xml
ctionbarsherlock/res/layout/abs__list_menu_item_radio.xml
ctionbarsherlock/res/layout/abs__popup_menu_item_layout.xml
ctionbarsherlock/res/layout/abs__screen_action_bar.xml
ctionbarsherlock/res/layout/abs__screen_action_bar_overlay.xml
ctionbarsherlock/res/layout/abs__screen_simple.xml
ctionbarsherlock/res/layout/abs__screen_simple_overlay_action_mode.xml
ctionbarsherlock/res/layout/sherlock_spinner_dropdown_item.xml
ctionbarsherlock/res/layout/sherlock_spinner_item.xml
ctionbarsherlock/res/values-land/abs__dimens.xml
ctionbarsherlock/res/values-large-hdpi-1024x600/abs__dimens.xml
ctionbarsherlock/res/values-large-land-hdpi-1024x600/abs__dimens.xml
ctionbarsherlock/res/values-large-land-mdpi-1024x600/abs__dimens.xml
ctionbarsherlock/res/values-large-mdpi-1024x600/abs__dimens.xml
ctionbarsherlock/res/values-large/abs__dimens.xml
ctionbarsherlock/res/values-sw600dp/abs__bools.xml
ctionbarsherlock/res/values-sw600dp/abs__dimens.xml
ctionbarsherlock/res/values-v11/abs__themes.xml
ctionbarsherlock/res/values-v14/abs__styles.xml
ctionbarsherlock/res/values-v14/abs__themes.xml
ctionbarsherlock/res/values-w360dp/abs__dimens.xml
ctionbarsherlock/res/values-w480dp/abs__bools.xml
ctionbarsherlock/res/values-w480dp/abs__config.xml
ctionbarsherlock/res/values-w500dp/abs__dimens.xml
ctionbarsherlock/res/values-w600dp/abs__dimens.xml
ctionbarsherlock/res/values-xlarge/abs__dimens.xml
ctionbarsherlock/res/values/abs__attrs.xml
ctionbarsherlock/res/values/abs__bools.xml
ctionbarsherlock/res/values/abs__colors.xml
ctionbarsherlock/res/values/abs__config.xml
ctionbarsherlock/res/values/abs__dimens.xml
ctionbarsherlock/res/values/abs__ids.xml
ctionbarsherlock/res/values/abs__strings.xml
ctionbarsherlock/res/values/abs__styles.xml
ctionbarsherlock/res/values/abs__themes.xml
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/ActionMenuPresenter.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/BaseMenuPresenter.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/MenuPresenter.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/IcsProgressBar.java
es/values/styles.xml
|
ac46c7f5749141dfa91f7a1d8f923ef3bb7fd600 |
24-Aug-2012 |
Owen Lin <owenlin@google.com> |
Revert "Revert "Uses ActionBarSherlock library in MovieActivity."" This reverts commit 13da281769d4558c42d86a54536ff6da6826b0ac.
ctionbarsherlock/src/android/support/v4/app/_ActionBarSherlockTrojanHorse.java
ctionbarsherlock/src/com/actionbarsherlock/ActionBarSherlock.java
ctionbarsherlock/src/com/actionbarsherlock/app/ActionBar.java
ctionbarsherlock/src/com/actionbarsherlock/app/SherlockActivity.java
ctionbarsherlock/src/com/actionbarsherlock/app/SherlockDialogFragment.java
ctionbarsherlock/src/com/actionbarsherlock/app/SherlockExpandableListActivity.java
ctionbarsherlock/src/com/actionbarsherlock/app/SherlockFragment.java
ctionbarsherlock/src/com/actionbarsherlock/app/SherlockFragmentActivity.java
ctionbarsherlock/src/com/actionbarsherlock/app/SherlockListActivity.java
ctionbarsherlock/src/com/actionbarsherlock/app/SherlockListFragment.java
ctionbarsherlock/src/com/actionbarsherlock/app/SherlockPreferenceActivity.java
ctionbarsherlock/src/com/actionbarsherlock/internal/ActionBarSherlockCompat.java
ctionbarsherlock/src/com/actionbarsherlock/internal/ActionBarSherlockNative.java
ctionbarsherlock/src/com/actionbarsherlock/internal/ResourcesCompat.java
ctionbarsherlock/src/com/actionbarsherlock/internal/app/ActionBarImpl.java
ctionbarsherlock/src/com/actionbarsherlock/internal/app/ActionBarWrapper.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/Animator.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/AnimatorListenerAdapter.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/AnimatorSet.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/FloatEvaluator.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/FloatKeyframeSet.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/IntEvaluator.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/IntKeyframeSet.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/Keyframe.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/KeyframeSet.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/ObjectAnimator.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/PropertyValuesHolder.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/TypeEvaluator.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/ValueAnimator.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/view/NineViewGroup.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/view/animation/AnimatorProxy.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/widget/NineFrameLayout.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/widget/NineHorizontalScrollView.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/widget/NineLinearLayout.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/ActionProviderWrapper.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/StandaloneActionMode.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/View_HasStateListenerSupport.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/View_OnAttachStateChangeListener.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/ActionMenu.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/ActionMenuItem.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/ActionMenuItemView.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/ActionMenuPresenter.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/ActionMenuView.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/BaseMenuPresenter.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/ListMenuItemView.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/MenuBuilder.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/MenuItemImpl.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/MenuItemWrapper.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/MenuPopupHelper.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/MenuPresenter.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/MenuView.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/MenuWrapper.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/SubMenuBuilder.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/SubMenuWrapper.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/AbsActionBarView.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/ActionBarContainer.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/ActionBarContextView.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/ActionBarView.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/CapitalizingButton.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/CapitalizingTextView.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/FakeDialogPhoneWindow.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/IcsAbsSpinner.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/IcsAdapterView.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/IcsLinearLayout.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/IcsListPopupWindow.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/IcsProgressBar.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/IcsSpinner.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/IcsView.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/ScrollingTabContainerView.java
ctionbarsherlock/src/com/actionbarsherlock/view/ActionMode.java
ctionbarsherlock/src/com/actionbarsherlock/view/ActionProvider.java
ctionbarsherlock/src/com/actionbarsherlock/view/CollapsibleActionView.java
ctionbarsherlock/src/com/actionbarsherlock/view/Menu.java
ctionbarsherlock/src/com/actionbarsherlock/view/MenuInflater.java
ctionbarsherlock/src/com/actionbarsherlock/view/MenuItem.java
ctionbarsherlock/src/com/actionbarsherlock/view/SubMenu.java
ctionbarsherlock/src/com/actionbarsherlock/view/Window.java
ctionbarsherlock/src/com/actionbarsherlock/widget/ActivityChooserModel.java
ctionbarsherlock/src/com/actionbarsherlock/widget/ActivityChooserView.java
ctionbarsherlock/src/com/actionbarsherlock/widget/ShareActionProvider.java
rc/com/android/gallery3d/app/MovieActivity.java
|
8a861a02136d15b45b9dbdc80e4f3bcc9de057c8 |
24-Aug-2012 |
Owen Lin <owenlin@google.com> |
Revert "Revert "Uses ActionBarSherlock library in MovieActivity."" This reverts commit 13da281769d4558c42d86a54536ff6da6826b0ac.
ndroid.mk
ctionbarsherlock/res/color/abs__primary_text_disable_only_holo_dark.xml
ctionbarsherlock/res/color/abs__primary_text_disable_only_holo_light.xml
ctionbarsherlock/res/color/abs__primary_text_holo_dark.xml
ctionbarsherlock/res/color/abs__primary_text_holo_light.xml
ctionbarsherlock/res/drawable-hdpi/abs__ab_bottom_solid_dark_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_bottom_solid_inverse_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_bottom_solid_light_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_bottom_transparent_dark_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_bottom_transparent_light_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_share_pack_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_share_pack_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_solid_dark_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_solid_light_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_solid_shadow_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_stacked_solid_dark_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_stacked_solid_light_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_stacked_transparent_dark_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_stacked_transparent_light_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_transparent_dark_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_transparent_light_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__btn_cab_done_default_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__btn_cab_done_default_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__btn_cab_done_focused_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__btn_cab_done_focused_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__btn_cab_done_pressed_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__btn_cab_done_pressed_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__cab_background_bottom_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__cab_background_bottom_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__cab_background_top_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__cab_background_top_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__dialog_full_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__dialog_full_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ic_ab_back_holo_dark.png
ctionbarsherlock/res/drawable-hdpi/abs__ic_ab_back_holo_light.png
ctionbarsherlock/res/drawable-hdpi/abs__ic_cab_done_holo_dark.png
ctionbarsherlock/res/drawable-hdpi/abs__ic_cab_done_holo_light.png
ctionbarsherlock/res/drawable-hdpi/abs__ic_menu_moreoverflow_normal_holo_dark.png
ctionbarsherlock/res/drawable-hdpi/abs__ic_menu_moreoverflow_normal_holo_light.png
ctionbarsherlock/res/drawable-hdpi/abs__ic_menu_share_holo_dark.png
ctionbarsherlock/res/drawable-hdpi/abs__ic_menu_share_holo_light.png
ctionbarsherlock/res/drawable-hdpi/abs__list_activated_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__list_divider_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__list_divider_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__list_focused_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__list_longpressed_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__list_pressed_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__list_pressed_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__list_selector_disabled_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__list_selector_disabled_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__menu_dropdown_panel_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__menu_dropdown_panel_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__progress_bg_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__progress_bg_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__progress_primary_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__progress_primary_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__progress_secondary_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__progress_secondary_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__spinner_48_inner_holo.png
ctionbarsherlock/res/drawable-hdpi/abs__spinner_48_outer_holo.png
ctionbarsherlock/res/drawable-hdpi/abs__spinner_ab_default_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__spinner_ab_default_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__spinner_ab_disabled_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__spinner_ab_disabled_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__spinner_ab_focused_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__spinner_ab_focused_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__spinner_ab_pressed_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__spinner_ab_pressed_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__tab_selected_focused_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__tab_selected_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__tab_selected_pressed_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__tab_unselected_pressed_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_bottom_solid_dark_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_bottom_solid_inverse_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_bottom_solid_light_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_bottom_transparent_dark_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_bottom_transparent_light_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_share_pack_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_share_pack_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_solid_dark_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_solid_light_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_solid_shadow_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_stacked_solid_dark_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_stacked_solid_light_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_stacked_transparent_dark_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_stacked_transparent_light_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_transparent_dark_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_transparent_light_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__btn_cab_done_default_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__btn_cab_done_default_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__btn_cab_done_focused_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__btn_cab_done_focused_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__btn_cab_done_pressed_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__btn_cab_done_pressed_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__cab_background_bottom_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__cab_background_bottom_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__cab_background_top_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__cab_background_top_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__dialog_full_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__dialog_full_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ic_ab_back_holo_dark.png
ctionbarsherlock/res/drawable-mdpi/abs__ic_ab_back_holo_light.png
ctionbarsherlock/res/drawable-mdpi/abs__ic_cab_done_holo_dark.png
ctionbarsherlock/res/drawable-mdpi/abs__ic_cab_done_holo_light.png
ctionbarsherlock/res/drawable-mdpi/abs__ic_menu_moreoverflow_normal_holo_dark.png
ctionbarsherlock/res/drawable-mdpi/abs__ic_menu_moreoverflow_normal_holo_light.png
ctionbarsherlock/res/drawable-mdpi/abs__ic_menu_share_holo_dark.png
ctionbarsherlock/res/drawable-mdpi/abs__ic_menu_share_holo_light.png
ctionbarsherlock/res/drawable-mdpi/abs__list_activated_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__list_divider_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__list_divider_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__list_focused_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__list_longpressed_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__list_pressed_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__list_pressed_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__list_selector_disabled_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__list_selector_disabled_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__menu_dropdown_panel_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__menu_dropdown_panel_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__progress_bg_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__progress_bg_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__progress_primary_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__progress_primary_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__progress_secondary_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__progress_secondary_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__spinner_48_inner_holo.png
ctionbarsherlock/res/drawable-mdpi/abs__spinner_48_outer_holo.png
ctionbarsherlock/res/drawable-mdpi/abs__spinner_ab_default_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__spinner_ab_default_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__spinner_ab_disabled_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__spinner_ab_disabled_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__spinner_ab_focused_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__spinner_ab_focused_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__spinner_ab_pressed_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__spinner_ab_pressed_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__tab_selected_focused_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__tab_selected_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__tab_selected_pressed_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__tab_unselected_pressed_holo.9.png
ctionbarsherlock/res/drawable-v11/abs__progress_medium_holo.xml
ctionbarsherlock/res/drawable-xhdpi/abs__ab_bottom_solid_dark_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_bottom_solid_inverse_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_bottom_solid_light_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_bottom_transparent_dark_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_bottom_transparent_light_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_share_pack_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_share_pack_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_solid_dark_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_solid_light_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_solid_shadow_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_stacked_solid_dark_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_stacked_solid_light_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_stacked_transparent_dark_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_stacked_transparent_light_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_transparent_dark_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_transparent_light_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__btn_cab_done_default_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__btn_cab_done_default_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__btn_cab_done_focused_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__btn_cab_done_focused_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__btn_cab_done_pressed_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__btn_cab_done_pressed_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__cab_background_bottom_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__cab_background_bottom_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__cab_background_top_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__cab_background_top_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__dialog_full_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__dialog_full_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ic_ab_back_holo_dark.png
ctionbarsherlock/res/drawable-xhdpi/abs__ic_ab_back_holo_light.png
ctionbarsherlock/res/drawable-xhdpi/abs__ic_cab_done_holo_dark.png
ctionbarsherlock/res/drawable-xhdpi/abs__ic_cab_done_holo_light.png
ctionbarsherlock/res/drawable-xhdpi/abs__ic_menu_moreoverflow_normal_holo_dark.png
ctionbarsherlock/res/drawable-xhdpi/abs__ic_menu_moreoverflow_normal_holo_light.png
ctionbarsherlock/res/drawable-xhdpi/abs__ic_menu_share_holo_dark.png
ctionbarsherlock/res/drawable-xhdpi/abs__ic_menu_share_holo_light.png
ctionbarsherlock/res/drawable-xhdpi/abs__list_activated_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__list_divider_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__list_divider_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__list_focused_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__list_longpressed_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__list_pressed_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__list_pressed_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__list_selector_disabled_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__list_selector_disabled_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__menu_dropdown_panel_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__menu_dropdown_panel_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__progress_bg_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__progress_bg_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__progress_primary_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__progress_primary_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__progress_secondary_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__progress_secondary_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__spinner_48_inner_holo.png
ctionbarsherlock/res/drawable-xhdpi/abs__spinner_48_outer_holo.png
ctionbarsherlock/res/drawable-xhdpi/abs__spinner_ab_default_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__spinner_ab_default_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__spinner_ab_disabled_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__spinner_ab_disabled_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__spinner_ab_focused_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__spinner_ab_focused_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__spinner_ab_pressed_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__spinner_ab_pressed_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__tab_selected_focused_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__tab_selected_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__tab_selected_pressed_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__tab_unselected_pressed_holo.9.png
ctionbarsherlock/res/drawable/abs__activated_background_holo_dark.xml
ctionbarsherlock/res/drawable/abs__activated_background_holo_light.xml
ctionbarsherlock/res/drawable/abs__btn_cab_done_holo_dark.xml
ctionbarsherlock/res/drawable/abs__btn_cab_done_holo_light.xml
ctionbarsherlock/res/drawable/abs__ic_menu_moreoverflow_holo_dark.xml
ctionbarsherlock/res/drawable/abs__ic_menu_moreoverflow_holo_light.xml
ctionbarsherlock/res/drawable/abs__item_background_holo_dark.xml
ctionbarsherlock/res/drawable/abs__item_background_holo_light.xml
ctionbarsherlock/res/drawable/abs__list_selector_background_transition_holo_dark.xml
ctionbarsherlock/res/drawable/abs__list_selector_background_transition_holo_light.xml
ctionbarsherlock/res/drawable/abs__list_selector_holo_dark.xml
ctionbarsherlock/res/drawable/abs__list_selector_holo_light.xml
ctionbarsherlock/res/drawable/abs__progress_horizontal_holo_dark.xml
ctionbarsherlock/res/drawable/abs__progress_horizontal_holo_light.xml
ctionbarsherlock/res/drawable/abs__progress_medium_holo.xml
ctionbarsherlock/res/drawable/abs__spinner_ab_holo_dark.xml
ctionbarsherlock/res/drawable/abs__spinner_ab_holo_light.xml
ctionbarsherlock/res/drawable/abs__tab_indicator_ab_holo.xml
ctionbarsherlock/res/layout-large/abs__action_mode_close_item.xml
ctionbarsherlock/res/layout-v14/sherlock_spinner_dropdown_item.xml
ctionbarsherlock/res/layout-v14/sherlock_spinner_item.xml
ctionbarsherlock/res/layout-xlarge/abs__screen_action_bar.xml
ctionbarsherlock/res/layout-xlarge/abs__screen_action_bar_overlay.xml
ctionbarsherlock/res/layout/abs__action_bar_home.xml
ctionbarsherlock/res/layout/abs__action_bar_tab.xml
ctionbarsherlock/res/layout/abs__action_bar_tab_bar_view.xml
ctionbarsherlock/res/layout/abs__action_bar_title_item.xml
ctionbarsherlock/res/layout/abs__action_menu_item_layout.xml
ctionbarsherlock/res/layout/abs__action_menu_layout.xml
ctionbarsherlock/res/layout/abs__action_mode_bar.xml
ctionbarsherlock/res/layout/abs__action_mode_close_item.xml
ctionbarsherlock/res/layout/abs__activity_chooser_view.xml
ctionbarsherlock/res/layout/abs__activity_chooser_view_list_item.xml
ctionbarsherlock/res/layout/abs__dialog_title_holo.xml
ctionbarsherlock/res/layout/abs__list_menu_item_checkbox.xml
ctionbarsherlock/res/layout/abs__list_menu_item_icon.xml
ctionbarsherlock/res/layout/abs__list_menu_item_layout.xml
ctionbarsherlock/res/layout/abs__list_menu_item_radio.xml
ctionbarsherlock/res/layout/abs__popup_menu_item_layout.xml
ctionbarsherlock/res/layout/abs__screen_action_bar.xml
ctionbarsherlock/res/layout/abs__screen_action_bar_overlay.xml
ctionbarsherlock/res/layout/abs__screen_simple.xml
ctionbarsherlock/res/layout/abs__screen_simple_overlay_action_mode.xml
ctionbarsherlock/res/layout/sherlock_spinner_dropdown_item.xml
ctionbarsherlock/res/layout/sherlock_spinner_item.xml
ctionbarsherlock/res/values-land/abs__dimens.xml
ctionbarsherlock/res/values-large-hdpi-1024x600/abs__dimens.xml
ctionbarsherlock/res/values-large-land-hdpi-1024x600/abs__dimens.xml
ctionbarsherlock/res/values-large-land-mdpi-1024x600/abs__dimens.xml
ctionbarsherlock/res/values-large-mdpi-1024x600/abs__dimens.xml
ctionbarsherlock/res/values-large/abs__dimens.xml
ctionbarsherlock/res/values-sw600dp/abs__bools.xml
ctionbarsherlock/res/values-sw600dp/abs__dimens.xml
ctionbarsherlock/res/values-v11/abs__themes.xml
ctionbarsherlock/res/values-v14/abs__styles.xml
ctionbarsherlock/res/values-v14/abs__themes.xml
ctionbarsherlock/res/values-w360dp/abs__dimens.xml
ctionbarsherlock/res/values-w480dp/abs__bools.xml
ctionbarsherlock/res/values-w480dp/abs__config.xml
ctionbarsherlock/res/values-w500dp/abs__dimens.xml
ctionbarsherlock/res/values-w600dp/abs__dimens.xml
ctionbarsherlock/res/values-xlarge/abs__dimens.xml
ctionbarsherlock/res/values/abs__attrs.xml
ctionbarsherlock/res/values/abs__bools.xml
ctionbarsherlock/res/values/abs__colors.xml
ctionbarsherlock/res/values/abs__config.xml
ctionbarsherlock/res/values/abs__dimens.xml
ctionbarsherlock/res/values/abs__ids.xml
ctionbarsherlock/res/values/abs__strings.xml
ctionbarsherlock/res/values/abs__styles.xml
ctionbarsherlock/res/values/abs__themes.xml
ctionbarsherlock/src/android/support/v4/app/_ActionBarSherlockTrojanHorse.java
ctionbarsherlock/src/com/actionbarsherlock/ActionBarSherlock.java
ctionbarsherlock/src/com/actionbarsherlock/app/ActionBar.java
ctionbarsherlock/src/com/actionbarsherlock/app/SherlockActivity.java
ctionbarsherlock/src/com/actionbarsherlock/app/SherlockDialogFragment.java
ctionbarsherlock/src/com/actionbarsherlock/app/SherlockExpandableListActivity.java
ctionbarsherlock/src/com/actionbarsherlock/app/SherlockFragment.java
ctionbarsherlock/src/com/actionbarsherlock/app/SherlockFragmentActivity.java
ctionbarsherlock/src/com/actionbarsherlock/app/SherlockListActivity.java
ctionbarsherlock/src/com/actionbarsherlock/app/SherlockListFragment.java
ctionbarsherlock/src/com/actionbarsherlock/app/SherlockPreferenceActivity.java
ctionbarsherlock/src/com/actionbarsherlock/internal/ActionBarSherlockCompat.java
ctionbarsherlock/src/com/actionbarsherlock/internal/ActionBarSherlockNative.java
ctionbarsherlock/src/com/actionbarsherlock/internal/ResourcesCompat.java
ctionbarsherlock/src/com/actionbarsherlock/internal/app/ActionBarImpl.java
ctionbarsherlock/src/com/actionbarsherlock/internal/app/ActionBarWrapper.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/Animator.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/AnimatorListenerAdapter.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/AnimatorSet.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/FloatEvaluator.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/FloatKeyframeSet.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/IntEvaluator.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/IntKeyframeSet.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/Keyframe.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/KeyframeSet.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/ObjectAnimator.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/PropertyValuesHolder.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/TypeEvaluator.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/ValueAnimator.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/view/NineViewGroup.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/view/animation/AnimatorProxy.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/widget/NineFrameLayout.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/widget/NineHorizontalScrollView.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/widget/NineLinearLayout.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/ActionProviderWrapper.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/StandaloneActionMode.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/View_HasStateListenerSupport.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/View_OnAttachStateChangeListener.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/ActionMenu.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/ActionMenuItem.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/ActionMenuItemView.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/ActionMenuPresenter.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/ActionMenuView.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/BaseMenuPresenter.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/ListMenuItemView.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/MenuBuilder.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/MenuItemImpl.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/MenuItemWrapper.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/MenuPopupHelper.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/MenuPresenter.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/MenuView.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/MenuWrapper.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/SubMenuBuilder.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/SubMenuWrapper.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/AbsActionBarView.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/ActionBarContainer.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/ActionBarContextView.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/ActionBarView.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/CapitalizingButton.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/CapitalizingTextView.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/FakeDialogPhoneWindow.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/IcsAbsSpinner.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/IcsAdapterView.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/IcsLinearLayout.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/IcsListPopupWindow.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/IcsProgressBar.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/IcsSpinner.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/IcsView.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/ScrollingTabContainerView.java
ctionbarsherlock/src/com/actionbarsherlock/view/ActionMode.java
ctionbarsherlock/src/com/actionbarsherlock/view/ActionProvider.java
ctionbarsherlock/src/com/actionbarsherlock/view/CollapsibleActionView.java
ctionbarsherlock/src/com/actionbarsherlock/view/Menu.java
ctionbarsherlock/src/com/actionbarsherlock/view/MenuInflater.java
ctionbarsherlock/src/com/actionbarsherlock/view/MenuItem.java
ctionbarsherlock/src/com/actionbarsherlock/view/SubMenu.java
ctionbarsherlock/src/com/actionbarsherlock/view/Window.java
ctionbarsherlock/src/com/actionbarsherlock/widget/ActivityChooserModel.java
ctionbarsherlock/src/com/actionbarsherlock/widget/ActivityChooserView.java
ctionbarsherlock/src/com/actionbarsherlock/widget/ShareActionProvider.java
roguard.flags
es/values/styles.xml
rc/com/android/gallery3d/app/MovieActivity.java
|
4a1ce33c47659113160d1e749121070c5e05fd7f |
24-Aug-2012 |
Owen Lin <owenlin@google.com> |
Revert "Uses ActionBarSherlock library in MovieActivity." This reverts commit 89b437722a24d0c7d6e2acffc30c215f22814234.
roguard.flags
|
989c84cf319b3cb162af3ae7d5ca73520ae75695 |
24-Aug-2012 |
Owen Lin <owenlin@google.com> |
Revert "Uses ActionBarSherlock library in MovieActivity." This reverts commit 89b437722a24d0c7d6e2acffc30c215f22814234.
ndroid.mk
|
efd06845a9b4e0a8f802f6af50aeedbbede70c2c |
24-Aug-2012 |
Owen Lin <owenlin@google.com> |
Revert "Uses ActionBarSherlock library in MovieActivity." This reverts commit 89b437722a24d0c7d6e2acffc30c215f22814234.
ctionbarsherlock/res/color/abs__primary_text_disable_only_holo_dark.xml
ctionbarsherlock/res/color/abs__primary_text_disable_only_holo_light.xml
ctionbarsherlock/res/color/abs__primary_text_holo_dark.xml
ctionbarsherlock/res/color/abs__primary_text_holo_light.xml
ctionbarsherlock/res/drawable-hdpi/abs__ab_bottom_solid_dark_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_bottom_solid_inverse_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_bottom_solid_light_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_bottom_transparent_dark_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_bottom_transparent_light_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_share_pack_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_share_pack_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_solid_dark_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_solid_light_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_solid_shadow_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_stacked_solid_dark_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_stacked_solid_light_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_stacked_transparent_dark_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_stacked_transparent_light_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_transparent_dark_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_transparent_light_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__btn_cab_done_default_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__btn_cab_done_default_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__btn_cab_done_focused_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__btn_cab_done_focused_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__btn_cab_done_pressed_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__btn_cab_done_pressed_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__cab_background_bottom_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__cab_background_bottom_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__cab_background_top_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__cab_background_top_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__dialog_full_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__dialog_full_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ic_ab_back_holo_dark.png
ctionbarsherlock/res/drawable-hdpi/abs__ic_ab_back_holo_light.png
ctionbarsherlock/res/drawable-hdpi/abs__ic_cab_done_holo_dark.png
ctionbarsherlock/res/drawable-hdpi/abs__ic_cab_done_holo_light.png
ctionbarsherlock/res/drawable-hdpi/abs__ic_menu_moreoverflow_normal_holo_dark.png
ctionbarsherlock/res/drawable-hdpi/abs__ic_menu_moreoverflow_normal_holo_light.png
ctionbarsherlock/res/drawable-hdpi/abs__ic_menu_share_holo_dark.png
ctionbarsherlock/res/drawable-hdpi/abs__ic_menu_share_holo_light.png
ctionbarsherlock/res/drawable-hdpi/abs__list_activated_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__list_divider_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__list_divider_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__list_focused_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__list_longpressed_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__list_pressed_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__list_pressed_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__list_selector_disabled_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__list_selector_disabled_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__menu_dropdown_panel_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__menu_dropdown_panel_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__progress_bg_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__progress_bg_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__progress_primary_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__progress_primary_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__progress_secondary_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__progress_secondary_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__spinner_48_inner_holo.png
ctionbarsherlock/res/drawable-hdpi/abs__spinner_48_outer_holo.png
ctionbarsherlock/res/drawable-hdpi/abs__spinner_ab_default_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__spinner_ab_default_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__spinner_ab_disabled_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__spinner_ab_disabled_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__spinner_ab_focused_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__spinner_ab_focused_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__spinner_ab_pressed_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__spinner_ab_pressed_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__tab_selected_focused_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__tab_selected_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__tab_selected_pressed_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__tab_unselected_pressed_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_bottom_solid_dark_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_bottom_solid_inverse_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_bottom_solid_light_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_bottom_transparent_dark_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_bottom_transparent_light_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_share_pack_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_share_pack_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_solid_dark_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_solid_light_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_solid_shadow_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_stacked_solid_dark_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_stacked_solid_light_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_stacked_transparent_dark_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_stacked_transparent_light_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_transparent_dark_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_transparent_light_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__btn_cab_done_default_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__btn_cab_done_default_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__btn_cab_done_focused_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__btn_cab_done_focused_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__btn_cab_done_pressed_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__btn_cab_done_pressed_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__cab_background_bottom_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__cab_background_bottom_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__cab_background_top_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__cab_background_top_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__dialog_full_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__dialog_full_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ic_ab_back_holo_dark.png
ctionbarsherlock/res/drawable-mdpi/abs__ic_ab_back_holo_light.png
ctionbarsherlock/res/drawable-mdpi/abs__ic_cab_done_holo_dark.png
ctionbarsherlock/res/drawable-mdpi/abs__ic_cab_done_holo_light.png
ctionbarsherlock/res/drawable-mdpi/abs__ic_menu_moreoverflow_normal_holo_dark.png
ctionbarsherlock/res/drawable-mdpi/abs__ic_menu_moreoverflow_normal_holo_light.png
ctionbarsherlock/res/drawable-mdpi/abs__ic_menu_share_holo_dark.png
ctionbarsherlock/res/drawable-mdpi/abs__ic_menu_share_holo_light.png
ctionbarsherlock/res/drawable-mdpi/abs__list_activated_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__list_divider_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__list_divider_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__list_focused_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__list_longpressed_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__list_pressed_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__list_pressed_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__list_selector_disabled_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__list_selector_disabled_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__menu_dropdown_panel_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__menu_dropdown_panel_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__progress_bg_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__progress_bg_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__progress_primary_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__progress_primary_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__progress_secondary_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__progress_secondary_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__spinner_48_inner_holo.png
ctionbarsherlock/res/drawable-mdpi/abs__spinner_48_outer_holo.png
ctionbarsherlock/res/drawable-mdpi/abs__spinner_ab_default_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__spinner_ab_default_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__spinner_ab_disabled_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__spinner_ab_disabled_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__spinner_ab_focused_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__spinner_ab_focused_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__spinner_ab_pressed_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__spinner_ab_pressed_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__tab_selected_focused_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__tab_selected_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__tab_selected_pressed_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__tab_unselected_pressed_holo.9.png
ctionbarsherlock/res/drawable-v11/abs__progress_medium_holo.xml
ctionbarsherlock/res/drawable-xhdpi/abs__ab_bottom_solid_dark_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_bottom_solid_inverse_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_bottom_solid_light_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_bottom_transparent_dark_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_bottom_transparent_light_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_share_pack_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_share_pack_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_solid_dark_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_solid_light_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_solid_shadow_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_stacked_solid_dark_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_stacked_solid_light_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_stacked_transparent_dark_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_stacked_transparent_light_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_transparent_dark_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_transparent_light_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__btn_cab_done_default_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__btn_cab_done_default_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__btn_cab_done_focused_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__btn_cab_done_focused_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__btn_cab_done_pressed_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__btn_cab_done_pressed_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__cab_background_bottom_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__cab_background_bottom_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__cab_background_top_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__cab_background_top_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__dialog_full_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__dialog_full_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ic_ab_back_holo_dark.png
ctionbarsherlock/res/drawable-xhdpi/abs__ic_ab_back_holo_light.png
ctionbarsherlock/res/drawable-xhdpi/abs__ic_cab_done_holo_dark.png
ctionbarsherlock/res/drawable-xhdpi/abs__ic_cab_done_holo_light.png
ctionbarsherlock/res/drawable-xhdpi/abs__ic_menu_moreoverflow_normal_holo_dark.png
ctionbarsherlock/res/drawable-xhdpi/abs__ic_menu_moreoverflow_normal_holo_light.png
ctionbarsherlock/res/drawable-xhdpi/abs__ic_menu_share_holo_dark.png
ctionbarsherlock/res/drawable-xhdpi/abs__ic_menu_share_holo_light.png
ctionbarsherlock/res/drawable-xhdpi/abs__list_activated_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__list_divider_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__list_divider_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__list_focused_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__list_longpressed_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__list_pressed_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__list_pressed_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__list_selector_disabled_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__list_selector_disabled_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__menu_dropdown_panel_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__menu_dropdown_panel_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__progress_bg_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__progress_bg_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__progress_primary_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__progress_primary_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__progress_secondary_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__progress_secondary_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__spinner_48_inner_holo.png
ctionbarsherlock/res/drawable-xhdpi/abs__spinner_48_outer_holo.png
ctionbarsherlock/res/drawable-xhdpi/abs__spinner_ab_default_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__spinner_ab_default_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__spinner_ab_disabled_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__spinner_ab_disabled_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__spinner_ab_focused_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__spinner_ab_focused_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__spinner_ab_pressed_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__spinner_ab_pressed_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__tab_selected_focused_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__tab_selected_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__tab_selected_pressed_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__tab_unselected_pressed_holo.9.png
ctionbarsherlock/res/drawable/abs__activated_background_holo_dark.xml
ctionbarsherlock/res/drawable/abs__activated_background_holo_light.xml
ctionbarsherlock/res/drawable/abs__btn_cab_done_holo_dark.xml
ctionbarsherlock/res/drawable/abs__btn_cab_done_holo_light.xml
ctionbarsherlock/res/drawable/abs__ic_menu_moreoverflow_holo_dark.xml
ctionbarsherlock/res/drawable/abs__ic_menu_moreoverflow_holo_light.xml
ctionbarsherlock/res/drawable/abs__item_background_holo_dark.xml
ctionbarsherlock/res/drawable/abs__item_background_holo_light.xml
ctionbarsherlock/res/drawable/abs__list_selector_background_transition_holo_dark.xml
ctionbarsherlock/res/drawable/abs__list_selector_background_transition_holo_light.xml
ctionbarsherlock/res/drawable/abs__list_selector_holo_dark.xml
ctionbarsherlock/res/drawable/abs__list_selector_holo_light.xml
ctionbarsherlock/res/drawable/abs__progress_horizontal_holo_dark.xml
ctionbarsherlock/res/drawable/abs__progress_horizontal_holo_light.xml
ctionbarsherlock/res/drawable/abs__progress_medium_holo.xml
ctionbarsherlock/res/drawable/abs__spinner_ab_holo_dark.xml
ctionbarsherlock/res/drawable/abs__spinner_ab_holo_light.xml
ctionbarsherlock/res/drawable/abs__tab_indicator_ab_holo.xml
ctionbarsherlock/res/layout-large/abs__action_mode_close_item.xml
ctionbarsherlock/res/layout-v14/sherlock_spinner_dropdown_item.xml
ctionbarsherlock/res/layout-v14/sherlock_spinner_item.xml
ctionbarsherlock/res/layout-xlarge/abs__screen_action_bar.xml
ctionbarsherlock/res/layout-xlarge/abs__screen_action_bar_overlay.xml
ctionbarsherlock/res/layout/abs__action_bar_home.xml
ctionbarsherlock/res/layout/abs__action_bar_tab.xml
ctionbarsherlock/res/layout/abs__action_bar_tab_bar_view.xml
ctionbarsherlock/res/layout/abs__action_bar_title_item.xml
ctionbarsherlock/res/layout/abs__action_menu_item_layout.xml
ctionbarsherlock/res/layout/abs__action_menu_layout.xml
ctionbarsherlock/res/layout/abs__action_mode_bar.xml
ctionbarsherlock/res/layout/abs__action_mode_close_item.xml
ctionbarsherlock/res/layout/abs__activity_chooser_view.xml
ctionbarsherlock/res/layout/abs__activity_chooser_view_list_item.xml
ctionbarsherlock/res/layout/abs__dialog_title_holo.xml
ctionbarsherlock/res/layout/abs__list_menu_item_checkbox.xml
ctionbarsherlock/res/layout/abs__list_menu_item_icon.xml
ctionbarsherlock/res/layout/abs__list_menu_item_layout.xml
ctionbarsherlock/res/layout/abs__list_menu_item_radio.xml
ctionbarsherlock/res/layout/abs__popup_menu_item_layout.xml
ctionbarsherlock/res/layout/abs__screen_action_bar.xml
ctionbarsherlock/res/layout/abs__screen_action_bar_overlay.xml
ctionbarsherlock/res/layout/abs__screen_simple.xml
ctionbarsherlock/res/layout/abs__screen_simple_overlay_action_mode.xml
ctionbarsherlock/res/layout/sherlock_spinner_dropdown_item.xml
ctionbarsherlock/res/layout/sherlock_spinner_item.xml
ctionbarsherlock/res/values-land/abs__dimens.xml
ctionbarsherlock/res/values-large-hdpi-1024x600/abs__dimens.xml
ctionbarsherlock/res/values-large-land-hdpi-1024x600/abs__dimens.xml
ctionbarsherlock/res/values-large-land-mdpi-1024x600/abs__dimens.xml
ctionbarsherlock/res/values-large-mdpi-1024x600/abs__dimens.xml
ctionbarsherlock/res/values-large/abs__dimens.xml
ctionbarsherlock/res/values-sw600dp/abs__bools.xml
ctionbarsherlock/res/values-sw600dp/abs__dimens.xml
ctionbarsherlock/res/values-v11/abs__themes.xml
ctionbarsherlock/res/values-v14/abs__styles.xml
ctionbarsherlock/res/values-v14/abs__themes.xml
ctionbarsherlock/res/values-w360dp/abs__dimens.xml
ctionbarsherlock/res/values-w480dp/abs__bools.xml
ctionbarsherlock/res/values-w480dp/abs__config.xml
ctionbarsherlock/res/values-w500dp/abs__dimens.xml
ctionbarsherlock/res/values-w600dp/abs__dimens.xml
ctionbarsherlock/res/values-xlarge/abs__dimens.xml
ctionbarsherlock/res/values/abs__attrs.xml
ctionbarsherlock/res/values/abs__bools.xml
ctionbarsherlock/res/values/abs__colors.xml
ctionbarsherlock/res/values/abs__config.xml
ctionbarsherlock/res/values/abs__dimens.xml
ctionbarsherlock/res/values/abs__ids.xml
ctionbarsherlock/res/values/abs__strings.xml
ctionbarsherlock/res/values/abs__styles.xml
ctionbarsherlock/res/values/abs__themes.xml
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/ActionMenuPresenter.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/BaseMenuPresenter.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/MenuPresenter.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/IcsProgressBar.java
es/values/styles.xml
|
139babe614d1f17730665c764bc9e5ed79f1c1ea |
24-Aug-2012 |
Owen Lin <owenlin@google.com> |
Revert "Uses ActionBarSherlock library in MovieActivity." This reverts commit 89b437722a24d0c7d6e2acffc30c215f22814234.
ctionbarsherlock/src/android/support/v4/app/_ActionBarSherlockTrojanHorse.java
ctionbarsherlock/src/com/actionbarsherlock/ActionBarSherlock.java
ctionbarsherlock/src/com/actionbarsherlock/app/ActionBar.java
ctionbarsherlock/src/com/actionbarsherlock/app/SherlockActivity.java
ctionbarsherlock/src/com/actionbarsherlock/app/SherlockDialogFragment.java
ctionbarsherlock/src/com/actionbarsherlock/app/SherlockExpandableListActivity.java
ctionbarsherlock/src/com/actionbarsherlock/app/SherlockFragment.java
ctionbarsherlock/src/com/actionbarsherlock/app/SherlockFragmentActivity.java
ctionbarsherlock/src/com/actionbarsherlock/app/SherlockListActivity.java
ctionbarsherlock/src/com/actionbarsherlock/app/SherlockListFragment.java
ctionbarsherlock/src/com/actionbarsherlock/app/SherlockPreferenceActivity.java
ctionbarsherlock/src/com/actionbarsherlock/internal/ActionBarSherlockCompat.java
ctionbarsherlock/src/com/actionbarsherlock/internal/ActionBarSherlockNative.java
ctionbarsherlock/src/com/actionbarsherlock/internal/ResourcesCompat.java
ctionbarsherlock/src/com/actionbarsherlock/internal/app/ActionBarImpl.java
ctionbarsherlock/src/com/actionbarsherlock/internal/app/ActionBarWrapper.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/Animator.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/AnimatorListenerAdapter.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/AnimatorSet.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/FloatEvaluator.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/FloatKeyframeSet.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/IntEvaluator.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/IntKeyframeSet.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/Keyframe.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/KeyframeSet.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/ObjectAnimator.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/PropertyValuesHolder.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/TypeEvaluator.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/ValueAnimator.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/view/NineViewGroup.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/view/animation/AnimatorProxy.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/widget/NineFrameLayout.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/widget/NineHorizontalScrollView.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/widget/NineLinearLayout.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/ActionProviderWrapper.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/StandaloneActionMode.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/View_HasStateListenerSupport.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/View_OnAttachStateChangeListener.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/ActionMenu.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/ActionMenuItem.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/ActionMenuItemView.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/ActionMenuPresenter.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/ActionMenuView.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/BaseMenuPresenter.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/ListMenuItemView.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/MenuBuilder.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/MenuItemImpl.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/MenuItemWrapper.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/MenuPopupHelper.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/MenuPresenter.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/MenuView.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/MenuWrapper.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/SubMenuBuilder.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/SubMenuWrapper.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/AbsActionBarView.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/ActionBarContainer.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/ActionBarContextView.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/ActionBarView.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/CapitalizingButton.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/CapitalizingTextView.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/FakeDialogPhoneWindow.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/IcsAbsSpinner.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/IcsAdapterView.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/IcsLinearLayout.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/IcsListPopupWindow.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/IcsProgressBar.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/IcsSpinner.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/IcsView.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/ScrollingTabContainerView.java
ctionbarsherlock/src/com/actionbarsherlock/view/ActionMode.java
ctionbarsherlock/src/com/actionbarsherlock/view/ActionProvider.java
ctionbarsherlock/src/com/actionbarsherlock/view/CollapsibleActionView.java
ctionbarsherlock/src/com/actionbarsherlock/view/Menu.java
ctionbarsherlock/src/com/actionbarsherlock/view/MenuInflater.java
ctionbarsherlock/src/com/actionbarsherlock/view/MenuItem.java
ctionbarsherlock/src/com/actionbarsherlock/view/SubMenu.java
ctionbarsherlock/src/com/actionbarsherlock/view/Window.java
ctionbarsherlock/src/com/actionbarsherlock/widget/ActivityChooserModel.java
ctionbarsherlock/src/com/actionbarsherlock/widget/ActivityChooserView.java
ctionbarsherlock/src/com/actionbarsherlock/widget/ShareActionProvider.java
rc/com/android/gallery3d/app/MovieActivity.java
|
13da281769d4558c42d86a54536ff6da6826b0ac |
24-Aug-2012 |
Owen Lin <owenlin@google.com> |
Revert "Uses ActionBarSherlock library in MovieActivity." This reverts commit 89b437722a24d0c7d6e2acffc30c215f22814234.
ndroid.mk
ctionbarsherlock/res/color/abs__primary_text_disable_only_holo_dark.xml
ctionbarsherlock/res/color/abs__primary_text_disable_only_holo_light.xml
ctionbarsherlock/res/color/abs__primary_text_holo_dark.xml
ctionbarsherlock/res/color/abs__primary_text_holo_light.xml
ctionbarsherlock/res/drawable-hdpi/abs__ab_bottom_solid_dark_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_bottom_solid_inverse_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_bottom_solid_light_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_bottom_transparent_dark_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_bottom_transparent_light_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_share_pack_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_share_pack_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_solid_dark_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_solid_light_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_solid_shadow_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_stacked_solid_dark_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_stacked_solid_light_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_stacked_transparent_dark_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_stacked_transparent_light_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_transparent_dark_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_transparent_light_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__btn_cab_done_default_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__btn_cab_done_default_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__btn_cab_done_focused_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__btn_cab_done_focused_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__btn_cab_done_pressed_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__btn_cab_done_pressed_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__cab_background_bottom_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__cab_background_bottom_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__cab_background_top_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__cab_background_top_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__dialog_full_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__dialog_full_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ic_ab_back_holo_dark.png
ctionbarsherlock/res/drawable-hdpi/abs__ic_ab_back_holo_light.png
ctionbarsherlock/res/drawable-hdpi/abs__ic_cab_done_holo_dark.png
ctionbarsherlock/res/drawable-hdpi/abs__ic_cab_done_holo_light.png
ctionbarsherlock/res/drawable-hdpi/abs__ic_menu_moreoverflow_normal_holo_dark.png
ctionbarsherlock/res/drawable-hdpi/abs__ic_menu_moreoverflow_normal_holo_light.png
ctionbarsherlock/res/drawable-hdpi/abs__ic_menu_share_holo_dark.png
ctionbarsherlock/res/drawable-hdpi/abs__ic_menu_share_holo_light.png
ctionbarsherlock/res/drawable-hdpi/abs__list_activated_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__list_divider_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__list_divider_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__list_focused_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__list_longpressed_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__list_pressed_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__list_pressed_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__list_selector_disabled_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__list_selector_disabled_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__menu_dropdown_panel_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__menu_dropdown_panel_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__progress_bg_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__progress_bg_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__progress_primary_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__progress_primary_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__progress_secondary_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__progress_secondary_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__spinner_48_inner_holo.png
ctionbarsherlock/res/drawable-hdpi/abs__spinner_48_outer_holo.png
ctionbarsherlock/res/drawable-hdpi/abs__spinner_ab_default_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__spinner_ab_default_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__spinner_ab_disabled_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__spinner_ab_disabled_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__spinner_ab_focused_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__spinner_ab_focused_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__spinner_ab_pressed_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__spinner_ab_pressed_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__tab_selected_focused_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__tab_selected_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__tab_selected_pressed_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__tab_unselected_pressed_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_bottom_solid_dark_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_bottom_solid_inverse_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_bottom_solid_light_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_bottom_transparent_dark_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_bottom_transparent_light_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_share_pack_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_share_pack_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_solid_dark_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_solid_light_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_solid_shadow_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_stacked_solid_dark_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_stacked_solid_light_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_stacked_transparent_dark_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_stacked_transparent_light_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_transparent_dark_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_transparent_light_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__btn_cab_done_default_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__btn_cab_done_default_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__btn_cab_done_focused_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__btn_cab_done_focused_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__btn_cab_done_pressed_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__btn_cab_done_pressed_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__cab_background_bottom_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__cab_background_bottom_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__cab_background_top_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__cab_background_top_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__dialog_full_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__dialog_full_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ic_ab_back_holo_dark.png
ctionbarsherlock/res/drawable-mdpi/abs__ic_ab_back_holo_light.png
ctionbarsherlock/res/drawable-mdpi/abs__ic_cab_done_holo_dark.png
ctionbarsherlock/res/drawable-mdpi/abs__ic_cab_done_holo_light.png
ctionbarsherlock/res/drawable-mdpi/abs__ic_menu_moreoverflow_normal_holo_dark.png
ctionbarsherlock/res/drawable-mdpi/abs__ic_menu_moreoverflow_normal_holo_light.png
ctionbarsherlock/res/drawable-mdpi/abs__ic_menu_share_holo_dark.png
ctionbarsherlock/res/drawable-mdpi/abs__ic_menu_share_holo_light.png
ctionbarsherlock/res/drawable-mdpi/abs__list_activated_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__list_divider_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__list_divider_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__list_focused_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__list_longpressed_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__list_pressed_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__list_pressed_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__list_selector_disabled_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__list_selector_disabled_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__menu_dropdown_panel_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__menu_dropdown_panel_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__progress_bg_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__progress_bg_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__progress_primary_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__progress_primary_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__progress_secondary_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__progress_secondary_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__spinner_48_inner_holo.png
ctionbarsherlock/res/drawable-mdpi/abs__spinner_48_outer_holo.png
ctionbarsherlock/res/drawable-mdpi/abs__spinner_ab_default_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__spinner_ab_default_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__spinner_ab_disabled_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__spinner_ab_disabled_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__spinner_ab_focused_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__spinner_ab_focused_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__spinner_ab_pressed_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__spinner_ab_pressed_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__tab_selected_focused_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__tab_selected_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__tab_selected_pressed_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__tab_unselected_pressed_holo.9.png
ctionbarsherlock/res/drawable-v11/abs__progress_medium_holo.xml
ctionbarsherlock/res/drawable-xhdpi/abs__ab_bottom_solid_dark_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_bottom_solid_inverse_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_bottom_solid_light_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_bottom_transparent_dark_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_bottom_transparent_light_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_share_pack_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_share_pack_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_solid_dark_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_solid_light_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_solid_shadow_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_stacked_solid_dark_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_stacked_solid_light_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_stacked_transparent_dark_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_stacked_transparent_light_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_transparent_dark_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_transparent_light_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__btn_cab_done_default_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__btn_cab_done_default_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__btn_cab_done_focused_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__btn_cab_done_focused_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__btn_cab_done_pressed_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__btn_cab_done_pressed_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__cab_background_bottom_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__cab_background_bottom_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__cab_background_top_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__cab_background_top_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__dialog_full_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__dialog_full_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ic_ab_back_holo_dark.png
ctionbarsherlock/res/drawable-xhdpi/abs__ic_ab_back_holo_light.png
ctionbarsherlock/res/drawable-xhdpi/abs__ic_cab_done_holo_dark.png
ctionbarsherlock/res/drawable-xhdpi/abs__ic_cab_done_holo_light.png
ctionbarsherlock/res/drawable-xhdpi/abs__ic_menu_moreoverflow_normal_holo_dark.png
ctionbarsherlock/res/drawable-xhdpi/abs__ic_menu_moreoverflow_normal_holo_light.png
ctionbarsherlock/res/drawable-xhdpi/abs__ic_menu_share_holo_dark.png
ctionbarsherlock/res/drawable-xhdpi/abs__ic_menu_share_holo_light.png
ctionbarsherlock/res/drawable-xhdpi/abs__list_activated_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__list_divider_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__list_divider_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__list_focused_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__list_longpressed_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__list_pressed_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__list_pressed_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__list_selector_disabled_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__list_selector_disabled_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__menu_dropdown_panel_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__menu_dropdown_panel_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__progress_bg_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__progress_bg_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__progress_primary_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__progress_primary_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__progress_secondary_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__progress_secondary_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__spinner_48_inner_holo.png
ctionbarsherlock/res/drawable-xhdpi/abs__spinner_48_outer_holo.png
ctionbarsherlock/res/drawable-xhdpi/abs__spinner_ab_default_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__spinner_ab_default_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__spinner_ab_disabled_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__spinner_ab_disabled_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__spinner_ab_focused_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__spinner_ab_focused_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__spinner_ab_pressed_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__spinner_ab_pressed_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__tab_selected_focused_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__tab_selected_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__tab_selected_pressed_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__tab_unselected_pressed_holo.9.png
ctionbarsherlock/res/drawable/abs__activated_background_holo_dark.xml
ctionbarsherlock/res/drawable/abs__activated_background_holo_light.xml
ctionbarsherlock/res/drawable/abs__btn_cab_done_holo_dark.xml
ctionbarsherlock/res/drawable/abs__btn_cab_done_holo_light.xml
ctionbarsherlock/res/drawable/abs__ic_menu_moreoverflow_holo_dark.xml
ctionbarsherlock/res/drawable/abs__ic_menu_moreoverflow_holo_light.xml
ctionbarsherlock/res/drawable/abs__item_background_holo_dark.xml
ctionbarsherlock/res/drawable/abs__item_background_holo_light.xml
ctionbarsherlock/res/drawable/abs__list_selector_background_transition_holo_dark.xml
ctionbarsherlock/res/drawable/abs__list_selector_background_transition_holo_light.xml
ctionbarsherlock/res/drawable/abs__list_selector_holo_dark.xml
ctionbarsherlock/res/drawable/abs__list_selector_holo_light.xml
ctionbarsherlock/res/drawable/abs__progress_horizontal_holo_dark.xml
ctionbarsherlock/res/drawable/abs__progress_horizontal_holo_light.xml
ctionbarsherlock/res/drawable/abs__progress_medium_holo.xml
ctionbarsherlock/res/drawable/abs__spinner_ab_holo_dark.xml
ctionbarsherlock/res/drawable/abs__spinner_ab_holo_light.xml
ctionbarsherlock/res/drawable/abs__tab_indicator_ab_holo.xml
ctionbarsherlock/res/layout-large/abs__action_mode_close_item.xml
ctionbarsherlock/res/layout-v14/sherlock_spinner_dropdown_item.xml
ctionbarsherlock/res/layout-v14/sherlock_spinner_item.xml
ctionbarsherlock/res/layout-xlarge/abs__screen_action_bar.xml
ctionbarsherlock/res/layout-xlarge/abs__screen_action_bar_overlay.xml
ctionbarsherlock/res/layout/abs__action_bar_home.xml
ctionbarsherlock/res/layout/abs__action_bar_tab.xml
ctionbarsherlock/res/layout/abs__action_bar_tab_bar_view.xml
ctionbarsherlock/res/layout/abs__action_bar_title_item.xml
ctionbarsherlock/res/layout/abs__action_menu_item_layout.xml
ctionbarsherlock/res/layout/abs__action_menu_layout.xml
ctionbarsherlock/res/layout/abs__action_mode_bar.xml
ctionbarsherlock/res/layout/abs__action_mode_close_item.xml
ctionbarsherlock/res/layout/abs__activity_chooser_view.xml
ctionbarsherlock/res/layout/abs__activity_chooser_view_list_item.xml
ctionbarsherlock/res/layout/abs__dialog_title_holo.xml
ctionbarsherlock/res/layout/abs__list_menu_item_checkbox.xml
ctionbarsherlock/res/layout/abs__list_menu_item_icon.xml
ctionbarsherlock/res/layout/abs__list_menu_item_layout.xml
ctionbarsherlock/res/layout/abs__list_menu_item_radio.xml
ctionbarsherlock/res/layout/abs__popup_menu_item_layout.xml
ctionbarsherlock/res/layout/abs__screen_action_bar.xml
ctionbarsherlock/res/layout/abs__screen_action_bar_overlay.xml
ctionbarsherlock/res/layout/abs__screen_simple.xml
ctionbarsherlock/res/layout/abs__screen_simple_overlay_action_mode.xml
ctionbarsherlock/res/layout/sherlock_spinner_dropdown_item.xml
ctionbarsherlock/res/layout/sherlock_spinner_item.xml
ctionbarsherlock/res/values-land/abs__dimens.xml
ctionbarsherlock/res/values-large-hdpi-1024x600/abs__dimens.xml
ctionbarsherlock/res/values-large-land-hdpi-1024x600/abs__dimens.xml
ctionbarsherlock/res/values-large-land-mdpi-1024x600/abs__dimens.xml
ctionbarsherlock/res/values-large-mdpi-1024x600/abs__dimens.xml
ctionbarsherlock/res/values-large/abs__dimens.xml
ctionbarsherlock/res/values-sw600dp/abs__bools.xml
ctionbarsherlock/res/values-sw600dp/abs__dimens.xml
ctionbarsherlock/res/values-v11/abs__themes.xml
ctionbarsherlock/res/values-v14/abs__styles.xml
ctionbarsherlock/res/values-v14/abs__themes.xml
ctionbarsherlock/res/values-w360dp/abs__dimens.xml
ctionbarsherlock/res/values-w480dp/abs__bools.xml
ctionbarsherlock/res/values-w480dp/abs__config.xml
ctionbarsherlock/res/values-w500dp/abs__dimens.xml
ctionbarsherlock/res/values-w600dp/abs__dimens.xml
ctionbarsherlock/res/values-xlarge/abs__dimens.xml
ctionbarsherlock/res/values/abs__attrs.xml
ctionbarsherlock/res/values/abs__bools.xml
ctionbarsherlock/res/values/abs__colors.xml
ctionbarsherlock/res/values/abs__config.xml
ctionbarsherlock/res/values/abs__dimens.xml
ctionbarsherlock/res/values/abs__ids.xml
ctionbarsherlock/res/values/abs__strings.xml
ctionbarsherlock/res/values/abs__styles.xml
ctionbarsherlock/res/values/abs__themes.xml
ctionbarsherlock/src/android/support/v4/app/_ActionBarSherlockTrojanHorse.java
ctionbarsherlock/src/com/actionbarsherlock/ActionBarSherlock.java
ctionbarsherlock/src/com/actionbarsherlock/app/ActionBar.java
ctionbarsherlock/src/com/actionbarsherlock/app/SherlockActivity.java
ctionbarsherlock/src/com/actionbarsherlock/app/SherlockDialogFragment.java
ctionbarsherlock/src/com/actionbarsherlock/app/SherlockExpandableListActivity.java
ctionbarsherlock/src/com/actionbarsherlock/app/SherlockFragment.java
ctionbarsherlock/src/com/actionbarsherlock/app/SherlockFragmentActivity.java
ctionbarsherlock/src/com/actionbarsherlock/app/SherlockListActivity.java
ctionbarsherlock/src/com/actionbarsherlock/app/SherlockListFragment.java
ctionbarsherlock/src/com/actionbarsherlock/app/SherlockPreferenceActivity.java
ctionbarsherlock/src/com/actionbarsherlock/internal/ActionBarSherlockCompat.java
ctionbarsherlock/src/com/actionbarsherlock/internal/ActionBarSherlockNative.java
ctionbarsherlock/src/com/actionbarsherlock/internal/ResourcesCompat.java
ctionbarsherlock/src/com/actionbarsherlock/internal/app/ActionBarImpl.java
ctionbarsherlock/src/com/actionbarsherlock/internal/app/ActionBarWrapper.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/Animator.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/AnimatorListenerAdapter.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/AnimatorSet.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/FloatEvaluator.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/FloatKeyframeSet.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/IntEvaluator.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/IntKeyframeSet.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/Keyframe.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/KeyframeSet.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/ObjectAnimator.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/PropertyValuesHolder.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/TypeEvaluator.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/ValueAnimator.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/view/NineViewGroup.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/view/animation/AnimatorProxy.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/widget/NineFrameLayout.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/widget/NineHorizontalScrollView.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/widget/NineLinearLayout.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/ActionProviderWrapper.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/StandaloneActionMode.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/View_HasStateListenerSupport.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/View_OnAttachStateChangeListener.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/ActionMenu.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/ActionMenuItem.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/ActionMenuItemView.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/ActionMenuPresenter.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/ActionMenuView.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/BaseMenuPresenter.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/ListMenuItemView.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/MenuBuilder.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/MenuItemImpl.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/MenuItemWrapper.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/MenuPopupHelper.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/MenuPresenter.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/MenuView.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/MenuWrapper.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/SubMenuBuilder.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/SubMenuWrapper.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/AbsActionBarView.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/ActionBarContainer.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/ActionBarContextView.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/ActionBarView.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/CapitalizingButton.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/CapitalizingTextView.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/FakeDialogPhoneWindow.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/IcsAbsSpinner.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/IcsAdapterView.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/IcsLinearLayout.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/IcsListPopupWindow.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/IcsProgressBar.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/IcsSpinner.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/IcsView.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/ScrollingTabContainerView.java
ctionbarsherlock/src/com/actionbarsherlock/view/ActionMode.java
ctionbarsherlock/src/com/actionbarsherlock/view/ActionProvider.java
ctionbarsherlock/src/com/actionbarsherlock/view/CollapsibleActionView.java
ctionbarsherlock/src/com/actionbarsherlock/view/Menu.java
ctionbarsherlock/src/com/actionbarsherlock/view/MenuInflater.java
ctionbarsherlock/src/com/actionbarsherlock/view/MenuItem.java
ctionbarsherlock/src/com/actionbarsherlock/view/SubMenu.java
ctionbarsherlock/src/com/actionbarsherlock/view/Window.java
ctionbarsherlock/src/com/actionbarsherlock/widget/ActivityChooserModel.java
ctionbarsherlock/src/com/actionbarsherlock/widget/ActivityChooserView.java
ctionbarsherlock/src/com/actionbarsherlock/widget/ShareActionProvider.java
roguard.flags
es/values/styles.xml
rc/com/android/gallery3d/app/MovieActivity.java
|
5088095aaa2194194390148a7ac16d1e2c18e239 |
22-Aug-2012 |
Owen Lin <owenlin@google.com> |
Uses ActionBarSherlock library in MovieActivity. bug: 6927267 Change-Id: I4b63e41be5cff22af0f7d830739c719e91cd6fff
roguard.flags
|
859110b0cddf275c35f7c9c835a5a85784d4e93e |
22-Aug-2012 |
Owen Lin <owenlin@google.com> |
Uses ActionBarSherlock library in MovieActivity. bug: 6927267 Change-Id: I4b63e41be5cff22af0f7d830739c719e91cd6fff
ndroid.mk
|
208089d7cf4a11760636dd10e07b205315b2cda6 |
22-Aug-2012 |
Owen Lin <owenlin@google.com> |
Uses ActionBarSherlock library in MovieActivity. bug: 6927267 Change-Id: I4b63e41be5cff22af0f7d830739c719e91cd6fff
ctionbarsherlock/res/color/abs__primary_text_disable_only_holo_dark.xml
ctionbarsherlock/res/color/abs__primary_text_disable_only_holo_light.xml
ctionbarsherlock/res/color/abs__primary_text_holo_dark.xml
ctionbarsherlock/res/color/abs__primary_text_holo_light.xml
ctionbarsherlock/res/drawable-hdpi/abs__ab_bottom_solid_dark_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_bottom_solid_inverse_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_bottom_solid_light_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_bottom_transparent_dark_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_bottom_transparent_light_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_share_pack_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_share_pack_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_solid_dark_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_solid_light_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_solid_shadow_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_stacked_solid_dark_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_stacked_solid_light_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_stacked_transparent_dark_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_stacked_transparent_light_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_transparent_dark_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_transparent_light_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__btn_cab_done_default_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__btn_cab_done_default_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__btn_cab_done_focused_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__btn_cab_done_focused_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__btn_cab_done_pressed_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__btn_cab_done_pressed_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__cab_background_bottom_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__cab_background_bottom_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__cab_background_top_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__cab_background_top_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__dialog_full_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__dialog_full_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ic_ab_back_holo_dark.png
ctionbarsherlock/res/drawable-hdpi/abs__ic_ab_back_holo_light.png
ctionbarsherlock/res/drawable-hdpi/abs__ic_cab_done_holo_dark.png
ctionbarsherlock/res/drawable-hdpi/abs__ic_cab_done_holo_light.png
ctionbarsherlock/res/drawable-hdpi/abs__ic_menu_moreoverflow_normal_holo_dark.png
ctionbarsherlock/res/drawable-hdpi/abs__ic_menu_moreoverflow_normal_holo_light.png
ctionbarsherlock/res/drawable-hdpi/abs__ic_menu_share_holo_dark.png
ctionbarsherlock/res/drawable-hdpi/abs__ic_menu_share_holo_light.png
ctionbarsherlock/res/drawable-hdpi/abs__list_activated_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__list_divider_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__list_divider_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__list_focused_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__list_longpressed_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__list_pressed_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__list_pressed_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__list_selector_disabled_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__list_selector_disabled_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__menu_dropdown_panel_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__menu_dropdown_panel_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__progress_bg_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__progress_bg_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__progress_primary_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__progress_primary_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__progress_secondary_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__progress_secondary_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__spinner_48_inner_holo.png
ctionbarsherlock/res/drawable-hdpi/abs__spinner_48_outer_holo.png
ctionbarsherlock/res/drawable-hdpi/abs__spinner_ab_default_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__spinner_ab_default_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__spinner_ab_disabled_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__spinner_ab_disabled_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__spinner_ab_focused_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__spinner_ab_focused_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__spinner_ab_pressed_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__spinner_ab_pressed_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__tab_selected_focused_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__tab_selected_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__tab_selected_pressed_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__tab_unselected_pressed_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_bottom_solid_dark_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_bottom_solid_inverse_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_bottom_solid_light_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_bottom_transparent_dark_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_bottom_transparent_light_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_share_pack_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_share_pack_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_solid_dark_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_solid_light_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_solid_shadow_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_stacked_solid_dark_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_stacked_solid_light_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_stacked_transparent_dark_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_stacked_transparent_light_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_transparent_dark_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_transparent_light_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__btn_cab_done_default_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__btn_cab_done_default_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__btn_cab_done_focused_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__btn_cab_done_focused_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__btn_cab_done_pressed_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__btn_cab_done_pressed_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__cab_background_bottom_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__cab_background_bottom_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__cab_background_top_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__cab_background_top_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__dialog_full_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__dialog_full_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ic_ab_back_holo_dark.png
ctionbarsherlock/res/drawable-mdpi/abs__ic_ab_back_holo_light.png
ctionbarsherlock/res/drawable-mdpi/abs__ic_cab_done_holo_dark.png
ctionbarsherlock/res/drawable-mdpi/abs__ic_cab_done_holo_light.png
ctionbarsherlock/res/drawable-mdpi/abs__ic_menu_moreoverflow_normal_holo_dark.png
ctionbarsherlock/res/drawable-mdpi/abs__ic_menu_moreoverflow_normal_holo_light.png
ctionbarsherlock/res/drawable-mdpi/abs__ic_menu_share_holo_dark.png
ctionbarsherlock/res/drawable-mdpi/abs__ic_menu_share_holo_light.png
ctionbarsherlock/res/drawable-mdpi/abs__list_activated_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__list_divider_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__list_divider_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__list_focused_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__list_longpressed_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__list_pressed_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__list_pressed_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__list_selector_disabled_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__list_selector_disabled_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__menu_dropdown_panel_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__menu_dropdown_panel_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__progress_bg_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__progress_bg_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__progress_primary_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__progress_primary_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__progress_secondary_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__progress_secondary_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__spinner_48_inner_holo.png
ctionbarsherlock/res/drawable-mdpi/abs__spinner_48_outer_holo.png
ctionbarsherlock/res/drawable-mdpi/abs__spinner_ab_default_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__spinner_ab_default_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__spinner_ab_disabled_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__spinner_ab_disabled_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__spinner_ab_focused_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__spinner_ab_focused_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__spinner_ab_pressed_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__spinner_ab_pressed_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__tab_selected_focused_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__tab_selected_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__tab_selected_pressed_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__tab_unselected_pressed_holo.9.png
ctionbarsherlock/res/drawable-v11/abs__progress_medium_holo.xml
ctionbarsherlock/res/drawable-xhdpi/abs__ab_bottom_solid_dark_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_bottom_solid_inverse_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_bottom_solid_light_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_bottom_transparent_dark_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_bottom_transparent_light_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_share_pack_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_share_pack_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_solid_dark_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_solid_light_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_solid_shadow_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_stacked_solid_dark_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_stacked_solid_light_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_stacked_transparent_dark_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_stacked_transparent_light_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_transparent_dark_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_transparent_light_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__btn_cab_done_default_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__btn_cab_done_default_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__btn_cab_done_focused_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__btn_cab_done_focused_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__btn_cab_done_pressed_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__btn_cab_done_pressed_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__cab_background_bottom_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__cab_background_bottom_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__cab_background_top_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__cab_background_top_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__dialog_full_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__dialog_full_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ic_ab_back_holo_dark.png
ctionbarsherlock/res/drawable-xhdpi/abs__ic_ab_back_holo_light.png
ctionbarsherlock/res/drawable-xhdpi/abs__ic_cab_done_holo_dark.png
ctionbarsherlock/res/drawable-xhdpi/abs__ic_cab_done_holo_light.png
ctionbarsherlock/res/drawable-xhdpi/abs__ic_menu_moreoverflow_normal_holo_dark.png
ctionbarsherlock/res/drawable-xhdpi/abs__ic_menu_moreoverflow_normal_holo_light.png
ctionbarsherlock/res/drawable-xhdpi/abs__ic_menu_share_holo_dark.png
ctionbarsherlock/res/drawable-xhdpi/abs__ic_menu_share_holo_light.png
ctionbarsherlock/res/drawable-xhdpi/abs__list_activated_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__list_divider_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__list_divider_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__list_focused_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__list_longpressed_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__list_pressed_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__list_pressed_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__list_selector_disabled_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__list_selector_disabled_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__menu_dropdown_panel_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__menu_dropdown_panel_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__progress_bg_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__progress_bg_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__progress_primary_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__progress_primary_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__progress_secondary_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__progress_secondary_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__spinner_48_inner_holo.png
ctionbarsherlock/res/drawable-xhdpi/abs__spinner_48_outer_holo.png
ctionbarsherlock/res/drawable-xhdpi/abs__spinner_ab_default_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__spinner_ab_default_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__spinner_ab_disabled_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__spinner_ab_disabled_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__spinner_ab_focused_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__spinner_ab_focused_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__spinner_ab_pressed_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__spinner_ab_pressed_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__tab_selected_focused_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__tab_selected_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__tab_selected_pressed_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__tab_unselected_pressed_holo.9.png
ctionbarsherlock/res/drawable/abs__activated_background_holo_dark.xml
ctionbarsherlock/res/drawable/abs__activated_background_holo_light.xml
ctionbarsherlock/res/drawable/abs__btn_cab_done_holo_dark.xml
ctionbarsherlock/res/drawable/abs__btn_cab_done_holo_light.xml
ctionbarsherlock/res/drawable/abs__ic_menu_moreoverflow_holo_dark.xml
ctionbarsherlock/res/drawable/abs__ic_menu_moreoverflow_holo_light.xml
ctionbarsherlock/res/drawable/abs__item_background_holo_dark.xml
ctionbarsherlock/res/drawable/abs__item_background_holo_light.xml
ctionbarsherlock/res/drawable/abs__list_selector_background_transition_holo_dark.xml
ctionbarsherlock/res/drawable/abs__list_selector_background_transition_holo_light.xml
ctionbarsherlock/res/drawable/abs__list_selector_holo_dark.xml
ctionbarsherlock/res/drawable/abs__list_selector_holo_light.xml
ctionbarsherlock/res/drawable/abs__progress_horizontal_holo_dark.xml
ctionbarsherlock/res/drawable/abs__progress_horizontal_holo_light.xml
ctionbarsherlock/res/drawable/abs__progress_medium_holo.xml
ctionbarsherlock/res/drawable/abs__spinner_ab_holo_dark.xml
ctionbarsherlock/res/drawable/abs__spinner_ab_holo_light.xml
ctionbarsherlock/res/drawable/abs__tab_indicator_ab_holo.xml
ctionbarsherlock/res/layout-large/abs__action_mode_close_item.xml
ctionbarsherlock/res/layout-v14/sherlock_spinner_dropdown_item.xml
ctionbarsherlock/res/layout-v14/sherlock_spinner_item.xml
ctionbarsherlock/res/layout-xlarge/abs__screen_action_bar.xml
ctionbarsherlock/res/layout-xlarge/abs__screen_action_bar_overlay.xml
ctionbarsherlock/res/layout/abs__action_bar_home.xml
ctionbarsherlock/res/layout/abs__action_bar_tab.xml
ctionbarsherlock/res/layout/abs__action_bar_tab_bar_view.xml
ctionbarsherlock/res/layout/abs__action_bar_title_item.xml
ctionbarsherlock/res/layout/abs__action_menu_item_layout.xml
ctionbarsherlock/res/layout/abs__action_menu_layout.xml
ctionbarsherlock/res/layout/abs__action_mode_bar.xml
ctionbarsherlock/res/layout/abs__action_mode_close_item.xml
ctionbarsherlock/res/layout/abs__activity_chooser_view.xml
ctionbarsherlock/res/layout/abs__activity_chooser_view_list_item.xml
ctionbarsherlock/res/layout/abs__dialog_title_holo.xml
ctionbarsherlock/res/layout/abs__list_menu_item_checkbox.xml
ctionbarsherlock/res/layout/abs__list_menu_item_icon.xml
ctionbarsherlock/res/layout/abs__list_menu_item_layout.xml
ctionbarsherlock/res/layout/abs__list_menu_item_radio.xml
ctionbarsherlock/res/layout/abs__popup_menu_item_layout.xml
ctionbarsherlock/res/layout/abs__screen_action_bar.xml
ctionbarsherlock/res/layout/abs__screen_action_bar_overlay.xml
ctionbarsherlock/res/layout/abs__screen_simple.xml
ctionbarsherlock/res/layout/abs__screen_simple_overlay_action_mode.xml
ctionbarsherlock/res/layout/sherlock_spinner_dropdown_item.xml
ctionbarsherlock/res/layout/sherlock_spinner_item.xml
ctionbarsherlock/res/values-land/abs__dimens.xml
ctionbarsherlock/res/values-large-hdpi-1024x600/abs__dimens.xml
ctionbarsherlock/res/values-large-land-hdpi-1024x600/abs__dimens.xml
ctionbarsherlock/res/values-large-land-mdpi-1024x600/abs__dimens.xml
ctionbarsherlock/res/values-large-mdpi-1024x600/abs__dimens.xml
ctionbarsherlock/res/values-large/abs__dimens.xml
ctionbarsherlock/res/values-sw600dp/abs__bools.xml
ctionbarsherlock/res/values-sw600dp/abs__dimens.xml
ctionbarsherlock/res/values-v11/abs__themes.xml
ctionbarsherlock/res/values-v14/abs__styles.xml
ctionbarsherlock/res/values-v14/abs__themes.xml
ctionbarsherlock/res/values-w360dp/abs__dimens.xml
ctionbarsherlock/res/values-w480dp/abs__bools.xml
ctionbarsherlock/res/values-w480dp/abs__config.xml
ctionbarsherlock/res/values-w500dp/abs__dimens.xml
ctionbarsherlock/res/values-w600dp/abs__dimens.xml
ctionbarsherlock/res/values-xlarge/abs__dimens.xml
ctionbarsherlock/res/values/abs__attrs.xml
ctionbarsherlock/res/values/abs__bools.xml
ctionbarsherlock/res/values/abs__colors.xml
ctionbarsherlock/res/values/abs__config.xml
ctionbarsherlock/res/values/abs__dimens.xml
ctionbarsherlock/res/values/abs__ids.xml
ctionbarsherlock/res/values/abs__strings.xml
ctionbarsherlock/res/values/abs__styles.xml
ctionbarsherlock/res/values/abs__themes.xml
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/ActionMenuPresenter.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/BaseMenuPresenter.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/MenuPresenter.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/IcsProgressBar.java
es/values/styles.xml
|
cf48d24782e1d44d2126167b5a0db7cb2906b78f |
22-Aug-2012 |
Owen Lin <owenlin@google.com> |
Uses ActionBarSherlock library in MovieActivity. bug: 6927267 Change-Id: I4b63e41be5cff22af0f7d830739c719e91cd6fff
ctionbarsherlock/src/android/support/v4/app/_ActionBarSherlockTrojanHorse.java
ctionbarsherlock/src/com/actionbarsherlock/ActionBarSherlock.java
ctionbarsherlock/src/com/actionbarsherlock/app/ActionBar.java
ctionbarsherlock/src/com/actionbarsherlock/app/SherlockActivity.java
ctionbarsherlock/src/com/actionbarsherlock/app/SherlockDialogFragment.java
ctionbarsherlock/src/com/actionbarsherlock/app/SherlockExpandableListActivity.java
ctionbarsherlock/src/com/actionbarsherlock/app/SherlockFragment.java
ctionbarsherlock/src/com/actionbarsherlock/app/SherlockFragmentActivity.java
ctionbarsherlock/src/com/actionbarsherlock/app/SherlockListActivity.java
ctionbarsherlock/src/com/actionbarsherlock/app/SherlockListFragment.java
ctionbarsherlock/src/com/actionbarsherlock/app/SherlockPreferenceActivity.java
ctionbarsherlock/src/com/actionbarsherlock/internal/ActionBarSherlockCompat.java
ctionbarsherlock/src/com/actionbarsherlock/internal/ActionBarSherlockNative.java
ctionbarsherlock/src/com/actionbarsherlock/internal/ResourcesCompat.java
ctionbarsherlock/src/com/actionbarsherlock/internal/app/ActionBarImpl.java
ctionbarsherlock/src/com/actionbarsherlock/internal/app/ActionBarWrapper.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/Animator.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/AnimatorListenerAdapter.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/AnimatorSet.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/FloatEvaluator.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/FloatKeyframeSet.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/IntEvaluator.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/IntKeyframeSet.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/Keyframe.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/KeyframeSet.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/ObjectAnimator.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/PropertyValuesHolder.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/TypeEvaluator.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/ValueAnimator.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/view/NineViewGroup.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/view/animation/AnimatorProxy.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/widget/NineFrameLayout.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/widget/NineHorizontalScrollView.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/widget/NineLinearLayout.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/ActionProviderWrapper.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/StandaloneActionMode.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/View_HasStateListenerSupport.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/View_OnAttachStateChangeListener.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/ActionMenu.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/ActionMenuItem.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/ActionMenuItemView.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/ActionMenuPresenter.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/ActionMenuView.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/BaseMenuPresenter.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/ListMenuItemView.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/MenuBuilder.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/MenuItemImpl.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/MenuItemWrapper.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/MenuPopupHelper.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/MenuPresenter.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/MenuView.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/MenuWrapper.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/SubMenuBuilder.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/SubMenuWrapper.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/AbsActionBarView.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/ActionBarContainer.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/ActionBarContextView.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/ActionBarView.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/CapitalizingButton.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/CapitalizingTextView.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/FakeDialogPhoneWindow.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/IcsAbsSpinner.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/IcsAdapterView.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/IcsLinearLayout.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/IcsListPopupWindow.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/IcsProgressBar.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/IcsSpinner.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/IcsView.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/ScrollingTabContainerView.java
ctionbarsherlock/src/com/actionbarsherlock/view/ActionMode.java
ctionbarsherlock/src/com/actionbarsherlock/view/ActionProvider.java
ctionbarsherlock/src/com/actionbarsherlock/view/CollapsibleActionView.java
ctionbarsherlock/src/com/actionbarsherlock/view/Menu.java
ctionbarsherlock/src/com/actionbarsherlock/view/MenuInflater.java
ctionbarsherlock/src/com/actionbarsherlock/view/MenuItem.java
ctionbarsherlock/src/com/actionbarsherlock/view/SubMenu.java
ctionbarsherlock/src/com/actionbarsherlock/view/Window.java
ctionbarsherlock/src/com/actionbarsherlock/widget/ActivityChooserModel.java
ctionbarsherlock/src/com/actionbarsherlock/widget/ActivityChooserView.java
ctionbarsherlock/src/com/actionbarsherlock/widget/ShareActionProvider.java
rc/com/android/gallery3d/app/MovieActivity.java
|
89b437722a24d0c7d6e2acffc30c215f22814234 |
22-Aug-2012 |
Owen Lin <owenlin@google.com> |
Uses ActionBarSherlock library in MovieActivity. bug: 6927267 Change-Id: I4b63e41be5cff22af0f7d830739c719e91cd6fff
ndroid.mk
ctionbarsherlock/res/color/abs__primary_text_disable_only_holo_dark.xml
ctionbarsherlock/res/color/abs__primary_text_disable_only_holo_light.xml
ctionbarsherlock/res/color/abs__primary_text_holo_dark.xml
ctionbarsherlock/res/color/abs__primary_text_holo_light.xml
ctionbarsherlock/res/drawable-hdpi/abs__ab_bottom_solid_dark_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_bottom_solid_inverse_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_bottom_solid_light_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_bottom_transparent_dark_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_bottom_transparent_light_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_share_pack_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_share_pack_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_solid_dark_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_solid_light_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_solid_shadow_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_stacked_solid_dark_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_stacked_solid_light_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_stacked_transparent_dark_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_stacked_transparent_light_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_transparent_dark_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ab_transparent_light_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__btn_cab_done_default_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__btn_cab_done_default_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__btn_cab_done_focused_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__btn_cab_done_focused_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__btn_cab_done_pressed_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__btn_cab_done_pressed_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__cab_background_bottom_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__cab_background_bottom_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__cab_background_top_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__cab_background_top_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__dialog_full_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__dialog_full_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__ic_ab_back_holo_dark.png
ctionbarsherlock/res/drawable-hdpi/abs__ic_ab_back_holo_light.png
ctionbarsherlock/res/drawable-hdpi/abs__ic_cab_done_holo_dark.png
ctionbarsherlock/res/drawable-hdpi/abs__ic_cab_done_holo_light.png
ctionbarsherlock/res/drawable-hdpi/abs__ic_menu_moreoverflow_normal_holo_dark.png
ctionbarsherlock/res/drawable-hdpi/abs__ic_menu_moreoverflow_normal_holo_light.png
ctionbarsherlock/res/drawable-hdpi/abs__ic_menu_share_holo_dark.png
ctionbarsherlock/res/drawable-hdpi/abs__ic_menu_share_holo_light.png
ctionbarsherlock/res/drawable-hdpi/abs__list_activated_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__list_divider_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__list_divider_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__list_focused_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__list_longpressed_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__list_pressed_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__list_pressed_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__list_selector_disabled_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__list_selector_disabled_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__menu_dropdown_panel_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__menu_dropdown_panel_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__progress_bg_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__progress_bg_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__progress_primary_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__progress_primary_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__progress_secondary_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__progress_secondary_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__spinner_48_inner_holo.png
ctionbarsherlock/res/drawable-hdpi/abs__spinner_48_outer_holo.png
ctionbarsherlock/res/drawable-hdpi/abs__spinner_ab_default_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__spinner_ab_default_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__spinner_ab_disabled_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__spinner_ab_disabled_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__spinner_ab_focused_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__spinner_ab_focused_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__spinner_ab_pressed_holo_dark.9.png
ctionbarsherlock/res/drawable-hdpi/abs__spinner_ab_pressed_holo_light.9.png
ctionbarsherlock/res/drawable-hdpi/abs__tab_selected_focused_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__tab_selected_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__tab_selected_pressed_holo.9.png
ctionbarsherlock/res/drawable-hdpi/abs__tab_unselected_pressed_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_bottom_solid_dark_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_bottom_solid_inverse_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_bottom_solid_light_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_bottom_transparent_dark_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_bottom_transparent_light_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_share_pack_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_share_pack_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_solid_dark_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_solid_light_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_solid_shadow_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_stacked_solid_dark_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_stacked_solid_light_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_stacked_transparent_dark_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_stacked_transparent_light_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_transparent_dark_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ab_transparent_light_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__btn_cab_done_default_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__btn_cab_done_default_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__btn_cab_done_focused_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__btn_cab_done_focused_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__btn_cab_done_pressed_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__btn_cab_done_pressed_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__cab_background_bottom_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__cab_background_bottom_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__cab_background_top_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__cab_background_top_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__dialog_full_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__dialog_full_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__ic_ab_back_holo_dark.png
ctionbarsherlock/res/drawable-mdpi/abs__ic_ab_back_holo_light.png
ctionbarsherlock/res/drawable-mdpi/abs__ic_cab_done_holo_dark.png
ctionbarsherlock/res/drawable-mdpi/abs__ic_cab_done_holo_light.png
ctionbarsherlock/res/drawable-mdpi/abs__ic_menu_moreoverflow_normal_holo_dark.png
ctionbarsherlock/res/drawable-mdpi/abs__ic_menu_moreoverflow_normal_holo_light.png
ctionbarsherlock/res/drawable-mdpi/abs__ic_menu_share_holo_dark.png
ctionbarsherlock/res/drawable-mdpi/abs__ic_menu_share_holo_light.png
ctionbarsherlock/res/drawable-mdpi/abs__list_activated_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__list_divider_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__list_divider_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__list_focused_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__list_longpressed_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__list_pressed_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__list_pressed_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__list_selector_disabled_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__list_selector_disabled_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__menu_dropdown_panel_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__menu_dropdown_panel_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__progress_bg_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__progress_bg_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__progress_primary_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__progress_primary_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__progress_secondary_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__progress_secondary_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__spinner_48_inner_holo.png
ctionbarsherlock/res/drawable-mdpi/abs__spinner_48_outer_holo.png
ctionbarsherlock/res/drawable-mdpi/abs__spinner_ab_default_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__spinner_ab_default_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__spinner_ab_disabled_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__spinner_ab_disabled_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__spinner_ab_focused_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__spinner_ab_focused_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__spinner_ab_pressed_holo_dark.9.png
ctionbarsherlock/res/drawable-mdpi/abs__spinner_ab_pressed_holo_light.9.png
ctionbarsherlock/res/drawable-mdpi/abs__tab_selected_focused_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__tab_selected_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__tab_selected_pressed_holo.9.png
ctionbarsherlock/res/drawable-mdpi/abs__tab_unselected_pressed_holo.9.png
ctionbarsherlock/res/drawable-v11/abs__progress_medium_holo.xml
ctionbarsherlock/res/drawable-xhdpi/abs__ab_bottom_solid_dark_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_bottom_solid_inverse_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_bottom_solid_light_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_bottom_transparent_dark_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_bottom_transparent_light_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_share_pack_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_share_pack_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_solid_dark_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_solid_light_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_solid_shadow_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_stacked_solid_dark_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_stacked_solid_light_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_stacked_transparent_dark_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_stacked_transparent_light_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_transparent_dark_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ab_transparent_light_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__btn_cab_done_default_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__btn_cab_done_default_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__btn_cab_done_focused_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__btn_cab_done_focused_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__btn_cab_done_pressed_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__btn_cab_done_pressed_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__cab_background_bottom_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__cab_background_bottom_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__cab_background_top_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__cab_background_top_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__dialog_full_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__dialog_full_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__ic_ab_back_holo_dark.png
ctionbarsherlock/res/drawable-xhdpi/abs__ic_ab_back_holo_light.png
ctionbarsherlock/res/drawable-xhdpi/abs__ic_cab_done_holo_dark.png
ctionbarsherlock/res/drawable-xhdpi/abs__ic_cab_done_holo_light.png
ctionbarsherlock/res/drawable-xhdpi/abs__ic_menu_moreoverflow_normal_holo_dark.png
ctionbarsherlock/res/drawable-xhdpi/abs__ic_menu_moreoverflow_normal_holo_light.png
ctionbarsherlock/res/drawable-xhdpi/abs__ic_menu_share_holo_dark.png
ctionbarsherlock/res/drawable-xhdpi/abs__ic_menu_share_holo_light.png
ctionbarsherlock/res/drawable-xhdpi/abs__list_activated_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__list_divider_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__list_divider_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__list_focused_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__list_longpressed_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__list_pressed_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__list_pressed_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__list_selector_disabled_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__list_selector_disabled_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__menu_dropdown_panel_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__menu_dropdown_panel_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__progress_bg_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__progress_bg_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__progress_primary_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__progress_primary_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__progress_secondary_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__progress_secondary_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__spinner_48_inner_holo.png
ctionbarsherlock/res/drawable-xhdpi/abs__spinner_48_outer_holo.png
ctionbarsherlock/res/drawable-xhdpi/abs__spinner_ab_default_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__spinner_ab_default_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__spinner_ab_disabled_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__spinner_ab_disabled_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__spinner_ab_focused_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__spinner_ab_focused_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__spinner_ab_pressed_holo_dark.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__spinner_ab_pressed_holo_light.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__tab_selected_focused_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__tab_selected_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__tab_selected_pressed_holo.9.png
ctionbarsherlock/res/drawable-xhdpi/abs__tab_unselected_pressed_holo.9.png
ctionbarsherlock/res/drawable/abs__activated_background_holo_dark.xml
ctionbarsherlock/res/drawable/abs__activated_background_holo_light.xml
ctionbarsherlock/res/drawable/abs__btn_cab_done_holo_dark.xml
ctionbarsherlock/res/drawable/abs__btn_cab_done_holo_light.xml
ctionbarsherlock/res/drawable/abs__ic_menu_moreoverflow_holo_dark.xml
ctionbarsherlock/res/drawable/abs__ic_menu_moreoverflow_holo_light.xml
ctionbarsherlock/res/drawable/abs__item_background_holo_dark.xml
ctionbarsherlock/res/drawable/abs__item_background_holo_light.xml
ctionbarsherlock/res/drawable/abs__list_selector_background_transition_holo_dark.xml
ctionbarsherlock/res/drawable/abs__list_selector_background_transition_holo_light.xml
ctionbarsherlock/res/drawable/abs__list_selector_holo_dark.xml
ctionbarsherlock/res/drawable/abs__list_selector_holo_light.xml
ctionbarsherlock/res/drawable/abs__progress_horizontal_holo_dark.xml
ctionbarsherlock/res/drawable/abs__progress_horizontal_holo_light.xml
ctionbarsherlock/res/drawable/abs__progress_medium_holo.xml
ctionbarsherlock/res/drawable/abs__spinner_ab_holo_dark.xml
ctionbarsherlock/res/drawable/abs__spinner_ab_holo_light.xml
ctionbarsherlock/res/drawable/abs__tab_indicator_ab_holo.xml
ctionbarsherlock/res/layout-large/abs__action_mode_close_item.xml
ctionbarsherlock/res/layout-v14/sherlock_spinner_dropdown_item.xml
ctionbarsherlock/res/layout-v14/sherlock_spinner_item.xml
ctionbarsherlock/res/layout-xlarge/abs__screen_action_bar.xml
ctionbarsherlock/res/layout-xlarge/abs__screen_action_bar_overlay.xml
ctionbarsherlock/res/layout/abs__action_bar_home.xml
ctionbarsherlock/res/layout/abs__action_bar_tab.xml
ctionbarsherlock/res/layout/abs__action_bar_tab_bar_view.xml
ctionbarsherlock/res/layout/abs__action_bar_title_item.xml
ctionbarsherlock/res/layout/abs__action_menu_item_layout.xml
ctionbarsherlock/res/layout/abs__action_menu_layout.xml
ctionbarsherlock/res/layout/abs__action_mode_bar.xml
ctionbarsherlock/res/layout/abs__action_mode_close_item.xml
ctionbarsherlock/res/layout/abs__activity_chooser_view.xml
ctionbarsherlock/res/layout/abs__activity_chooser_view_list_item.xml
ctionbarsherlock/res/layout/abs__dialog_title_holo.xml
ctionbarsherlock/res/layout/abs__list_menu_item_checkbox.xml
ctionbarsherlock/res/layout/abs__list_menu_item_icon.xml
ctionbarsherlock/res/layout/abs__list_menu_item_layout.xml
ctionbarsherlock/res/layout/abs__list_menu_item_radio.xml
ctionbarsherlock/res/layout/abs__popup_menu_item_layout.xml
ctionbarsherlock/res/layout/abs__screen_action_bar.xml
ctionbarsherlock/res/layout/abs__screen_action_bar_overlay.xml
ctionbarsherlock/res/layout/abs__screen_simple.xml
ctionbarsherlock/res/layout/abs__screen_simple_overlay_action_mode.xml
ctionbarsherlock/res/layout/sherlock_spinner_dropdown_item.xml
ctionbarsherlock/res/layout/sherlock_spinner_item.xml
ctionbarsherlock/res/values-land/abs__dimens.xml
ctionbarsherlock/res/values-large-hdpi-1024x600/abs__dimens.xml
ctionbarsherlock/res/values-large-land-hdpi-1024x600/abs__dimens.xml
ctionbarsherlock/res/values-large-land-mdpi-1024x600/abs__dimens.xml
ctionbarsherlock/res/values-large-mdpi-1024x600/abs__dimens.xml
ctionbarsherlock/res/values-large/abs__dimens.xml
ctionbarsherlock/res/values-sw600dp/abs__bools.xml
ctionbarsherlock/res/values-sw600dp/abs__dimens.xml
ctionbarsherlock/res/values-v11/abs__themes.xml
ctionbarsherlock/res/values-v14/abs__styles.xml
ctionbarsherlock/res/values-v14/abs__themes.xml
ctionbarsherlock/res/values-w360dp/abs__dimens.xml
ctionbarsherlock/res/values-w480dp/abs__bools.xml
ctionbarsherlock/res/values-w480dp/abs__config.xml
ctionbarsherlock/res/values-w500dp/abs__dimens.xml
ctionbarsherlock/res/values-w600dp/abs__dimens.xml
ctionbarsherlock/res/values-xlarge/abs__dimens.xml
ctionbarsherlock/res/values/abs__attrs.xml
ctionbarsherlock/res/values/abs__bools.xml
ctionbarsherlock/res/values/abs__colors.xml
ctionbarsherlock/res/values/abs__config.xml
ctionbarsherlock/res/values/abs__dimens.xml
ctionbarsherlock/res/values/abs__ids.xml
ctionbarsherlock/res/values/abs__strings.xml
ctionbarsherlock/res/values/abs__styles.xml
ctionbarsherlock/res/values/abs__themes.xml
ctionbarsherlock/src/android/support/v4/app/_ActionBarSherlockTrojanHorse.java
ctionbarsherlock/src/com/actionbarsherlock/ActionBarSherlock.java
ctionbarsherlock/src/com/actionbarsherlock/app/ActionBar.java
ctionbarsherlock/src/com/actionbarsherlock/app/SherlockActivity.java
ctionbarsherlock/src/com/actionbarsherlock/app/SherlockDialogFragment.java
ctionbarsherlock/src/com/actionbarsherlock/app/SherlockExpandableListActivity.java
ctionbarsherlock/src/com/actionbarsherlock/app/SherlockFragment.java
ctionbarsherlock/src/com/actionbarsherlock/app/SherlockFragmentActivity.java
ctionbarsherlock/src/com/actionbarsherlock/app/SherlockListActivity.java
ctionbarsherlock/src/com/actionbarsherlock/app/SherlockListFragment.java
ctionbarsherlock/src/com/actionbarsherlock/app/SherlockPreferenceActivity.java
ctionbarsherlock/src/com/actionbarsherlock/internal/ActionBarSherlockCompat.java
ctionbarsherlock/src/com/actionbarsherlock/internal/ActionBarSherlockNative.java
ctionbarsherlock/src/com/actionbarsherlock/internal/ResourcesCompat.java
ctionbarsherlock/src/com/actionbarsherlock/internal/app/ActionBarImpl.java
ctionbarsherlock/src/com/actionbarsherlock/internal/app/ActionBarWrapper.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/Animator.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/AnimatorListenerAdapter.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/AnimatorSet.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/FloatEvaluator.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/FloatKeyframeSet.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/IntEvaluator.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/IntKeyframeSet.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/Keyframe.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/KeyframeSet.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/ObjectAnimator.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/PropertyValuesHolder.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/TypeEvaluator.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/ValueAnimator.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/view/NineViewGroup.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/view/animation/AnimatorProxy.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/widget/NineFrameLayout.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/widget/NineHorizontalScrollView.java
ctionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/widget/NineLinearLayout.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/ActionProviderWrapper.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/StandaloneActionMode.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/View_HasStateListenerSupport.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/View_OnAttachStateChangeListener.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/ActionMenu.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/ActionMenuItem.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/ActionMenuItemView.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/ActionMenuPresenter.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/ActionMenuView.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/BaseMenuPresenter.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/ListMenuItemView.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/MenuBuilder.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/MenuItemImpl.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/MenuItemWrapper.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/MenuPopupHelper.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/MenuPresenter.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/MenuView.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/MenuWrapper.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/SubMenuBuilder.java
ctionbarsherlock/src/com/actionbarsherlock/internal/view/menu/SubMenuWrapper.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/AbsActionBarView.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/ActionBarContainer.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/ActionBarContextView.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/ActionBarView.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/CapitalizingButton.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/CapitalizingTextView.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/FakeDialogPhoneWindow.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/IcsAbsSpinner.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/IcsAdapterView.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/IcsLinearLayout.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/IcsListPopupWindow.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/IcsProgressBar.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/IcsSpinner.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/IcsView.java
ctionbarsherlock/src/com/actionbarsherlock/internal/widget/ScrollingTabContainerView.java
ctionbarsherlock/src/com/actionbarsherlock/view/ActionMode.java
ctionbarsherlock/src/com/actionbarsherlock/view/ActionProvider.java
ctionbarsherlock/src/com/actionbarsherlock/view/CollapsibleActionView.java
ctionbarsherlock/src/com/actionbarsherlock/view/Menu.java
ctionbarsherlock/src/com/actionbarsherlock/view/MenuInflater.java
ctionbarsherlock/src/com/actionbarsherlock/view/MenuItem.java
ctionbarsherlock/src/com/actionbarsherlock/view/SubMenu.java
ctionbarsherlock/src/com/actionbarsherlock/view/Window.java
ctionbarsherlock/src/com/actionbarsherlock/widget/ActivityChooserModel.java
ctionbarsherlock/src/com/actionbarsherlock/widget/ActivityChooserView.java
ctionbarsherlock/src/com/actionbarsherlock/widget/ShareActionProvider.java
roguard.flags
es/values/styles.xml
rc/com/android/gallery3d/app/MovieActivity.java
|
25388ece6abf11f4a953f4625a983e834e23124a |
23-Aug-2012 |
Bobby Georgescu <georgescu@google.com> |
Fix NPE, ANRs in Gallery Bug: 7041482 Bug: 7041769 Change-Id: I06596bd9a058a8fe51c19108a0891c458950f22b
rc/com/android/gallery3d/app/AlbumPage.java
rc/com/android/gallery3d/ui/PreparePageFadeoutTexture.java
|
bf95f25a2ed8dde3515fba71e4250f74cb379419 |
24-Aug-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ida5be8ba77e6596843caeddd998a7e67f4c565d6 Auto-generated-cl: translation import
es/values-sw/photoeditor_strings.xml
es/values-zh-rCN/photoeditor_strings.xml
|
06f9f6a044f6a7ee01a278789f19e690b07ba12c |
24-Aug-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ida5be8ba77e6596843caeddd998a7e67f4c565d6 Auto-generated-cl: translation import
es/values-sw/photoeditor_strings.xml
es/values-zh-rCN/photoeditor_strings.xml
|
cd05ff0772df2c87b29180f0f8a90842c6ac8e52 |
23-Aug-2012 |
Bobby Georgescu <georgescu@google.com> |
Fix NPE, ANRs in Gallery Bug: 7041482 Bug: 7041769 Change-Id: I06596bd9a058a8fe51c19108a0891c458950f22b
rc/com/android/gallery3d/app/AlbumPage.java
rc/com/android/gallery3d/ui/PreparePageFadeoutTexture.java
|
4e88a8c2a2addfadb05ca9699f505a3f348f3692 |
23-Aug-2012 |
Bobby Georgescu <georgescu@google.com> |
Fix NPE, ANRs in Gallery Bug: 7041482 Bug: 7041769 Change-Id: I06596bd9a058a8fe51c19108a0891c458950f22b
rc/com/android/gallery3d/app/AlbumPage.java
rc/com/android/gallery3d/ui/PreparePageFadeoutTexture.java
|
1e394fad0fd846eddc0c890e8c813a65733c3365 |
23-Aug-2012 |
Bobby Georgescu <georgescu@google.com> |
Fix ANRs in Gallery Bug: 7041769 Change-Id: Idc2a266bffd0d2c641fba69cfede13e1e83f276b
rc/com/android/gallery3d/ui/PreparePageFadeoutTexture.java
|
b0b56b7d5e2d707c8094b23b058da3cfd1446d3c |
23-Aug-2012 |
Bobby Georgescu <georgescu@google.com> |
Fix ANRs in Gallery Bug: 7041769 Change-Id: Idc2a266bffd0d2c641fba69cfede13e1e83f276b
rc/com/android/gallery3d/ui/PreparePageFadeoutTexture.java
|
c760a5c49774c90b97ae818c6ee4e14825361b4b |
23-Aug-2012 |
Bobby Georgescu <georgescu@google.com> |
Fix ANRs in Gallery Bug: 7041769 Change-Id: Idc2a266bffd0d2c641fba69cfede13e1e83f276b
rc/com/android/gallery3d/ui/PreparePageFadeoutTexture.java
|
5b571d81c4f5f3f0f553ec772ac5d763d0e84ec1 |
23-Aug-2012 |
Keun young Park <keunyoung@google.com> |
fix mips build - LOCAL_SDK_VERSION should be defined always Change-Id: Icd1972279c76bd28e3caf9b44f1cea9b585836a1
ni/Android.mk
|
002effc4639c80692f7846b5497550d7749a79f4 |
23-Aug-2012 |
Keun young Park <keunyoung@google.com> |
fix mips build - LOCAL_SDK_VERSION should be defined always Change-Id: Icd1972279c76bd28e3caf9b44f1cea9b585836a1
ni/Android.mk
|
85ff0017174fec835e5b1e1e5b924f9aeee501e1 |
23-Aug-2012 |
Keun young Park <keunyoung@google.com> |
fix mips build - LOCAL_SDK_VERSION should be defined always Change-Id: Icd1972279c76bd28e3caf9b44f1cea9b585836a1
ni/Android.mk
|
e805014e4876fac05c861cd8195b5d55622c083c |
23-Aug-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
b7a30302207d2a16b72750d9acb01ebfaf7a5dca |
23-Aug-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
|
a82af4ad600cacf12909f907516b94b3a6e7390e |
23-Aug-2012 |
Pin Ting <pinting@google.com> |
Hide UI entry of effects recording. Change-Id: Ie35526e7fbc38c56c0c19653ba50fcafb685791b
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
|
c021f58653f8350a2d86753fadfb2feda177d03f |
23-Aug-2012 |
Pin Ting <pinting@google.com> |
Hide UI entry of effects recording. Change-Id: Ie35526e7fbc38c56c0c19653ba50fcafb685791b
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
|
df792aa8493fd5bfad04a5a44440a04bb8c47b14 |
23-Aug-2012 |
Pin Ting <pinting@google.com> |
Hide UI entry of effects recording. Change-Id: Ie35526e7fbc38c56c0c19653ba50fcafb685791b
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
|
db8fe504f7e0bb4795fcd0f5491f41c634c75dc4 |
23-Aug-2012 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with jb-mr1-release - do not merge Change-Id: Ie28d5e0cd9d4f28edd7d13db377bf79979a27804
|
85120468c2e926bcd1ba35a5924e974bcd44a487 |
22-Aug-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Id5bb3597b3c9762b0dd564f8ec0eed458e88140a Auto-generated-cl: translation import
es/values-af/photoeditor_strings.xml
es/values-bg/photoeditor_strings.xml
es/values-tr/photoeditor_strings.xml
|
84d0147c9e2d00e2258a3325e5efedd11ce696a8 |
22-Aug-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Id5bb3597b3c9762b0dd564f8ec0eed458e88140a Auto-generated-cl: translation import
es/values-af/photoeditor_strings.xml
es/values-bg/photoeditor_strings.xml
es/values-tr/photoeditor_strings.xml
|
bdfde3a263996918f9f2fc1d352a36ad59880ed4 |
22-Aug-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
7e5b976e8f3c5168acea1156bc2e330ef5d87517 |
22-Aug-2012 |
Wu-Cheng Li <wuchengli@google.com> |
Merge "Do not use Theme.Holo and Theme.Holo.Dialog on gingerbread." into gb-ub-photos-arches
|
fe5f61fe12c8537caa4b82f316b99672d7737bd6 |
22-Aug-2012 |
Ahbong Chang <cwahbong@google.com> |
Use GalleryUtils.getSelectionModePrompt instead of duplicated code. Change-Id: I1cdffb8b8d87f25f91382c3602f12c327ec11849
rc/com/android/gallery3d/app/AlbumSetPage.java
|
9a93949a6ab6348b1a600496a7d52267620aab95 |
22-Aug-2012 |
Ahbong Chang <cwahbong@google.com> |
Use GalleryUtils.getSelectionModePrompt instead of duplicated code. Change-Id: I1cdffb8b8d87f25f91382c3602f12c327ec11849
rc/com/android/gallery3d/app/AlbumSetPage.java
|
5fc3e59fd67811e38c134f6d58c42572243330be |
21-Aug-2012 |
Ahbong Chang <cwahbong@google.com> |
Do not use Theme.Holo and Theme.Holo.Dialog on gingerbread. Bug: 6982707 Change-Id: I84726bcd6cefcc3bd0f313306163a3d80d9cdade
ndroidManifest.xml
|
68ef563aba1a1fec69484830bf530df142ed3553 |
21-Aug-2012 |
Ahbong Chang <cwahbong@google.com> |
Do not use Theme.Holo and Theme.Holo.Dialog on gingerbread. Bug: 6982707 Change-Id: I84726bcd6cefcc3bd0f313306163a3d80d9cdade
es/values-v11/styles.xml
es/values/styles.xml
|
ab15e830ee7b0bf81d979de57f947c334e9edb14 |
21-Aug-2012 |
Ahbong Chang <cwahbong@google.com> |
Do not use Theme.Holo and Theme.Holo.Dialog on gingerbread. Bug: 6982707 Change-Id: I84726bcd6cefcc3bd0f313306163a3d80d9cdade
ndroidManifest.xml
es/values-v11/styles.xml
es/values/styles.xml
|
5b75f104029c8e89f73a062a194637fc3e281e63 |
22-Aug-2012 |
Wu-cheng Li <wuchengli@google.com> |
Merge "Add API check for view transformation properties." into gb-ub-photos-arches
|
0bb1995c07d8030b3ce2de51cde2a875113c5ae3 |
22-Aug-2012 |
Wu-cheng Li <wuchengli@google.com> |
Merge "Add API check for view transformation properties." into gb-ub-photos-arches
|
622246a1cb249f6b7619067939b10972cdc379c1 |
22-Aug-2012 |
Wu-cheng Li <wuchengli@google.com> |
Add API check for view transformation properties. Ex: View.setTranslationX, View.setPivotX, etc. bug:6982696 Change-Id: Ib9fc5f3d7c83d99ced47dcd79dfee430d7ad67c8
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
|
157f891aa9ff56c047a7f4a3809958bbe7e6e58b |
22-Aug-2012 |
Wu-cheng Li <wuchengli@google.com> |
Add API check for view transformation properties. Ex: View.setTranslationX, View.setPivotX, etc. bug:6982696 Change-Id: Ib9fc5f3d7c83d99ced47dcd79dfee430d7ad67c8
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
|
d41a508729ee04d0aab00c192c40570353b240d9 |
22-Aug-2012 |
Wu-cheng Li <wuchengli@google.com> |
Add API check for view transformation properties. Ex: View.setTranslationX, View.setPivotX, etc. bug:6982696 Change-Id: Ib9fc5f3d7c83d99ced47dcd79dfee430d7ad67c8
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
|
455088b7721487df60bd9362d83f8d8e8c5eb686 |
22-Aug-2012 |
Yuli Huang <yuli@google.com> |
Merge "Dismiss dialog in onPause() where we still have the window." into gb-ub-photos-arches
|
20f54bd2a66eb4e1fdf78abe9ba514395d2bcd83 |
22-Aug-2012 |
Yuli Huang <yuli@google.com> |
Merge "Dismiss dialog in onPause() where we still have the window." into gb-ub-photos-arches
|
35b18f52d267218c2a8f6491313f3dbee5140d1a |
22-Aug-2012 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with jb-mr1-release - do not merge Change-Id: I2862f79047727bcf7d5bca5ba5f99b1cc820043d
|
00892484b5fa2c7640cdfee48fc68cba206c2512 |
21-Aug-2012 |
Baligh Uddin <baligh@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
|
73270c1a66972666f6f7f5d1d1756780c97366f0 |
21-Aug-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Improvements in animation from album page to photo page" into gb-ub-photos-arches
|
3b3de069bc6c3b533844f010d8a4877416db2942 |
21-Aug-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Improvements in animation from album page to photo page" into gb-ub-photos-arches
|
98fd8558d88db439e21fa126463ea33d2c75ccd3 |
21-Aug-2012 |
Bobby Georgescu <georgescu@google.com> |
Improvements in animation from album page to photo page Bug: 6631829 Bug: 6979922 Change-Id: I99fd330f3ec8bf363f8602a2f893167ca2a9c71b
rc/com/android/gallery3d/app/AlbumPage.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/ui/BitmapScreenNail.java
rc/com/android/gallery3d/ui/PositionController.java
rc/com/android/gallery3d/ui/PreparePageFadeoutTexture.java
|
f4a707f9716874025b189d0e4ca4dfad0d7abbab |
21-Aug-2012 |
Bobby Georgescu <georgescu@google.com> |
Improvements in animation from album page to photo page Bug: 6631829 Bug: 6979922 Change-Id: I99fd330f3ec8bf363f8602a2f893167ca2a9c71b
rc/com/android/gallery3d/app/AlbumPage.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/ui/BitmapScreenNail.java
rc/com/android/gallery3d/ui/PositionController.java
rc/com/android/gallery3d/ui/PreparePageFadeoutTexture.java
|
ad631de36ade7d5039c157555cc2b3ba5d1e3b56 |
21-Aug-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I480220fd3cdfc17f37ecd73179e4e827f2f6effa Auto-generated-cl: translation import
es/values-am/photoeditor_strings.xml
es/values-be/photoeditor_strings.xml
es/values-bg/photoeditor_strings.xml
es/values-ca/photoeditor_strings.xml
es/values-da/photoeditor_strings.xml
es/values-de/photoeditor_strings.xml
es/values-el/photoeditor_strings.xml
es/values-en-rGB/photoeditor_strings.xml
es/values-es-rUS/photoeditor_strings.xml
es/values-es/photoeditor_strings.xml
es/values-et/photoeditor_strings.xml
es/values-fi/photoeditor_strings.xml
es/values-fr/photoeditor_strings.xml
es/values-hi/photoeditor_strings.xml
es/values-hr/photoeditor_strings.xml
es/values-hu/photoeditor_strings.xml
es/values-in/photoeditor_strings.xml
es/values-it/photoeditor_strings.xml
es/values-ja/photoeditor_strings.xml
es/values-ko/photoeditor_strings.xml
es/values-lt/photoeditor_strings.xml
es/values-lv/photoeditor_strings.xml
es/values-ms/photoeditor_strings.xml
es/values-nb/photoeditor_strings.xml
es/values-nl/photoeditor_strings.xml
es/values-pl/photoeditor_strings.xml
es/values-pt-rPT/photoeditor_strings.xml
es/values-pt/photoeditor_strings.xml
es/values-ro/photoeditor_strings.xml
es/values-ru/photoeditor_strings.xml
es/values-sk/photoeditor_strings.xml
es/values-sl/photoeditor_strings.xml
es/values-sr/photoeditor_strings.xml
es/values-sv/photoeditor_strings.xml
es/values-sw/photoeditor_strings.xml
es/values-th/photoeditor_strings.xml
es/values-tl/photoeditor_strings.xml
es/values-tr/photoeditor_strings.xml
es/values-uk/photoeditor_strings.xml
es/values-vi/photoeditor_strings.xml
es/values-zh-rCN/photoeditor_strings.xml
es/values-zh-rTW/photoeditor_strings.xml
es/values-zu/photoeditor_strings.xml
|
88dd4a07ef8605827c6beb7989128368b10f9af4 |
21-Aug-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I480220fd3cdfc17f37ecd73179e4e827f2f6effa Auto-generated-cl: translation import
es/values-am/photoeditor_strings.xml
es/values-be/photoeditor_strings.xml
es/values-bg/photoeditor_strings.xml
es/values-ca/photoeditor_strings.xml
es/values-da/photoeditor_strings.xml
es/values-de/photoeditor_strings.xml
es/values-el/photoeditor_strings.xml
es/values-en-rGB/photoeditor_strings.xml
es/values-es-rUS/photoeditor_strings.xml
es/values-es/photoeditor_strings.xml
es/values-et/photoeditor_strings.xml
es/values-fi/photoeditor_strings.xml
es/values-fr/photoeditor_strings.xml
es/values-hi/photoeditor_strings.xml
es/values-hr/photoeditor_strings.xml
es/values-hu/photoeditor_strings.xml
es/values-in/photoeditor_strings.xml
es/values-it/photoeditor_strings.xml
es/values-ja/photoeditor_strings.xml
es/values-ko/photoeditor_strings.xml
es/values-lt/photoeditor_strings.xml
es/values-lv/photoeditor_strings.xml
es/values-ms/photoeditor_strings.xml
es/values-nb/photoeditor_strings.xml
es/values-nl/photoeditor_strings.xml
es/values-pl/photoeditor_strings.xml
es/values-pt-rPT/photoeditor_strings.xml
es/values-pt/photoeditor_strings.xml
es/values-ro/photoeditor_strings.xml
es/values-ru/photoeditor_strings.xml
es/values-sk/photoeditor_strings.xml
es/values-sl/photoeditor_strings.xml
es/values-sr/photoeditor_strings.xml
es/values-sv/photoeditor_strings.xml
es/values-sw/photoeditor_strings.xml
es/values-th/photoeditor_strings.xml
es/values-tl/photoeditor_strings.xml
es/values-tr/photoeditor_strings.xml
es/values-uk/photoeditor_strings.xml
es/values-vi/photoeditor_strings.xml
es/values-zh-rCN/photoeditor_strings.xml
es/values-zh-rTW/photoeditor_strings.xml
es/values-zu/photoeditor_strings.xml
|
c66a9fcb6fa2d4dac03e6ed8fb957e66ab13365d |
21-Aug-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ic2096bce02fe3a051562af897690920525f4e33c Auto-generated-cl: translation import
es/values-pt-rPT/strings.xml
|
2e4a453e9fcc226e1854da5f3c90510237a2e0de |
21-Aug-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
00da1f719370d6d7b1776678b281938e94973daa |
14-Aug-2012 |
Owen Lin <owenlin@google.com> |
Revert "Remove the previewImage and staticWallpaperPreview." This reverts commit 47c247e7c575d712546814b8dc4c737de93c2e61.
es/xml-v11/wallpaper_picker_preview.xml
es/xml-v11/widget_info.xml
es/xml/wallpaper_picker_preview.xml
es/xml/widget_info.xml
|
8393c768a133e7e240892d38d7a4c73d9ffd6e8e |
14-Aug-2012 |
Owen Lin <owenlin@google.com> |
Revert "Remove the previewImage and staticWallpaperPreview." This reverts commit 47c247e7c575d712546814b8dc4c737de93c2e61.
es/xml-v11/wallpaper_picker_preview.xml
es/xml-v11/widget_info.xml
es/xml/wallpaper_picker_preview.xml
es/xml/widget_info.xml
|
7d912500bbe28aea0295fe05e69bf9c079a22d5a |
21-Aug-2012 |
Yuli Huang <yuli@google.com> |
Dismiss dialog in onPause() where we still have the window. bug:6561957 Change-Id: I652c4ec1dd64c650c29f3e4e36ae1200da691694
rc/com/android/gallery3d/app/CropImage.java
|
447577d618a474bca15c50706da7f8fd853d726a |
21-Aug-2012 |
Yuli Huang <yuli@google.com> |
Dismiss dialog in onPause() where we still have the window. bug:6561957 Change-Id: I652c4ec1dd64c650c29f3e4e36ae1200da691694
rc/com/android/gallery3d/app/CropImage.java
|
714f5b3197152fea7b237882462367791e403599 |
21-Aug-2012 |
Wu-cheng Li <wuchengli@google.com> |
Merge "Add an API check for starting preview in Jpeg callback." into gb-ub-photos-arches
|
2f87ec50d8f934b2637363f9ef63accadf2427c2 |
21-Aug-2012 |
Wu-cheng Li <wuchengli@google.com> |
Merge "Add an API check for starting preview in Jpeg callback." into gb-ub-photos-arches
|
6f0689d79d67a51ff797d3fc3f8d40ceb82455ef |
21-Aug-2012 |
Wu-cheng Li <wuchengli@google.com> |
Merge "Add an API check for starting preview in Jpeg callback." into gb-ub-photos-arches
|
b792397e370e18217cc567b108dbb506e3e6f108 |
21-Aug-2012 |
Hung-ying Tyan <tyanh@google.com> |
Merge "Move ThreadPool to gallerycommon for picasasync and picasastore." into gb-ub-photos-arches
|
36d16bc95d7ed7d12fc8136ae68a9579b20cf5a1 |
21-Aug-2012 |
Wu-cheng Li <wuchengli@google.com> |
Add an API check for starting preview in Jpeg callback. The CTS was added in ICS. 8fe4f547c45 bug:6996830 Change-Id: I89a5ef4f542b4c5d75da042fe1e6e481a5fe5c89
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
|
6dc1785d3f079a3b658d998aa2d3c788989e49b5 |
21-Aug-2012 |
Wu-cheng Li <wuchengli@google.com> |
Add an API check for starting preview in Jpeg callback. The CTS was added in ICS. 8fe4f547c45 bug:6996830 Change-Id: I89a5ef4f542b4c5d75da042fe1e6e481a5fe5c89
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
|
a31da5858f1f7c4f3351d5e83cd63724e09f9e19 |
21-Aug-2012 |
Wu-cheng Li <wuchengli@google.com> |
Add an API check for starting preview in Jpeg callback. The CTS was added in ICS. 8fe4f547c45 bug:6996830 Change-Id: I89a5ef4f542b4c5d75da042fe1e6e481a5fe5c89
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
|
67e633e2def63232ea71f462896388592e4119ea |
20-Aug-2012 |
Ahbong Chang <cwahbong@google.com> |
Do not use android:attr/dividerHorizontal. And copy the specific drawables from the framework. Bug: 7016227 Change-Id: Ie0ac3cad351aac1974b964f6690856cd344fb27f
es/drawable-hdpi/list_divider_holo_dark.9.png
es/drawable-mdpi/list_divider_holo_dark.9.png
es/drawable-xhdpi/list_divider_holo_dark.9.png
es/layout/dialog_picker.xml
|
468f721c56496d5b1497392843131189f2c8be92 |
20-Aug-2012 |
Ahbong Chang <cwahbong@google.com> |
Do not use android:attr/dividerHorizontal. And copy the specific drawables from the framework. Bug: 7016227 Change-Id: Ie0ac3cad351aac1974b964f6690856cd344fb27f
es/drawable-hdpi/list_divider_holo_dark.9.png
es/drawable-mdpi/list_divider_holo_dark.9.png
es/drawable-xhdpi/list_divider_holo_dark.9.png
es/layout/dialog_picker.xml
|
d6e8dd7466a6faca9694220384c5217077bd1d58 |
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/Future.java
allerycommon/src/com/android/gallery3d/util/FutureListener.java
allerycommon/src/com/android/gallery3d/util/PriorityThreadFactory.java
allerycommon/src/com/android/gallery3d/util/ThreadPool.java
|
a84ecfd1f81f7b2989852631d182d6898a2af32d |
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/Future.java
allerycommon/src/com/android/gallery3d/util/FutureListener.java
allerycommon/src/com/android/gallery3d/util/PriorityThreadFactory.java
allerycommon/src/com/android/gallery3d/util/ThreadPool.java
rc/com/android/gallery3d/util/Future.java
rc/com/android/gallery3d/util/FutureListener.java
rc/com/android/gallery3d/util/PriorityThreadFactory.java
rc/com/android/gallery3d/util/ThreadPool.java
|
a7f90298629bc6549ffd60adadd387f6caee8c59 |
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/Future.java
allerycommon/src/com/android/gallery3d/util/FutureListener.java
allerycommon/src/com/android/gallery3d/util/PriorityThreadFactory.java
allerycommon/src/com/android/gallery3d/util/ThreadPool.java
rc/com/android/gallery3d/util/Future.java
rc/com/android/gallery3d/util/FutureListener.java
rc/com/android/gallery3d/util/PriorityThreadFactory.java
rc/com/android/gallery3d/util/ThreadPool.java
|
bafebac3ac39ad2220f80448b3862d07d4bfcd74 |
20-Aug-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I958d1958822bc3c608ae3d16f7e0ade0bb156e93 Auto-generated-cl: translation import
es/values-ar/photoeditor_strings.xml
es/values-cs/photoeditor_strings.xml
es/values-es-rUS/photoeditor_strings.xml
es/values-fa/photoeditor_strings.xml
es/values-hr/photoeditor_strings.xml
es/values-iw/photoeditor_strings.xml
es/values-ms/photoeditor_strings.xml
es/values-sk/photoeditor_strings.xml
es/values-sr/photoeditor_strings.xml
es/values-tr/photoeditor_strings.xml
|
1327ecc43b576f44930bdcd1e152a5d374581d24 |
20-Aug-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I958d1958822bc3c608ae3d16f7e0ade0bb156e93 Auto-generated-cl: translation import
es/values-ar/photoeditor_strings.xml
es/values-cs/photoeditor_strings.xml
es/values-es-rUS/photoeditor_strings.xml
es/values-fa/photoeditor_strings.xml
es/values-hr/photoeditor_strings.xml
es/values-iw/photoeditor_strings.xml
es/values-ms/photoeditor_strings.xml
es/values-sk/photoeditor_strings.xml
es/values-sr/photoeditor_strings.xml
es/values-tr/photoeditor_strings.xml
|
8d9ba62f4b254c8492b4d5883ab23a6231a49274 |
20-Aug-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
183c6c994311fe4aa75dad1e42b69d83981ceeca |
19-Aug-2012 |
Wu-cheng Li <wuchengli@google.com> |
Rotate the camera screen nail correctly in gingerbread. In gingerbread, camera screen nail is a static image. Handle its rotation like a bitmap screen nail. bug:6927809 Change-Id: I554483e58fc9e32399acb20f426d7ec35631b7ac
rc/com/android/gallery3d/app/AppBridge.java
rc/com/android/gallery3d/app/PhotoDataAdapter.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/app/SinglePhotoDataAdapter.java
rc/com/android/gallery3d/ui/PhotoView.java
|
dbb6acc204ba6f095eb0e49e1298e9ceda2c3096 |
19-Aug-2012 |
Wu-cheng Li <wuchengli@google.com> |
Rotate the camera screen nail correctly in gingerbread. In gingerbread, camera screen nail is a static image. Handle its rotation like a bitmap screen nail. bug:6927809 Change-Id: I554483e58fc9e32399acb20f426d7ec35631b7ac
rc/com/android/gallery3d/app/AppBridge.java
rc/com/android/gallery3d/app/PhotoDataAdapter.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/app/SinglePhotoDataAdapter.java
rc/com/android/gallery3d/ui/PhotoView.java
|
6c589e23b30849f095c464e73c6bc5cfa68a8586 |
20-Aug-2012 |
Ahbong Chang <cwahbong@google.com> |
Divider and cancel button now show in the dialog picker. The root node of the included gl_root_group is "merge", whose attributes can not be overriden by any "include" tag since it will be dropped. All of the children inside gl_root_group have no weight. This makes the first object occupy the whole space. We use a weighted frame layout to wrap gl_root_group. Bug: 7016213 Change-Id: I758806848f6af3eff2f7746c6ef949ce639c7f6e
es/layout/dialog_picker.xml
|
691d3f75f896200796b5307143504f9eb260c9e3 |
20-Aug-2012 |
Ahbong Chang <cwahbong@google.com> |
Divider and cancel button now show in the dialog picker. The root node of the included gl_root_group is "merge", whose attributes can not be overriden by any "include" tag since it will be dropped. All of the children inside gl_root_group have no weight. This makes the first object occupy the whole space. We use a weighted frame layout to wrap gl_root_group. Bug: 7016213 Change-Id: I758806848f6af3eff2f7746c6ef949ce639c7f6e
es/layout/dialog_picker.xml
|
d4798893a31705ade83c87c8915ea58f905018a0 |
16-Aug-2012 |
George Mount <mount@google.com> |
Clear activity result when launching from lock screen. Bug 6710029 When the screen is locked during video play, the activity result from that play will be triggered immediately when unlocking to camera. The result must be destroyed on unlock so that the resume goes to the camera rather than to the video display. Change-Id: Ifa6f00fa1cba119d5fc6e762d1757bd6aac576f4
rc/com/android/gallery3d/app/ActivityState.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/app/StateManager.java
|
14d3289b4867c21da93ec4032119c0091bc78c30 |
16-Aug-2012 |
George Mount <mount@google.com> |
Clear activity result when launching from lock screen. Bug 6710029 When the screen is locked during video play, the activity result from that play will be triggered immediately when unlocking to camera. The result must be destroyed on unlock so that the resume goes to the camera rather than to the video display. Change-Id: Ifa6f00fa1cba119d5fc6e762d1757bd6aac576f4
rc/com/android/gallery3d/app/ActivityState.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/app/StateManager.java
|
824d9c136513fb4b705b33fdb045925e1f67f290 |
17-Aug-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I68a4bea7aa4cd7720cca2c2b45fbf8a37121d8cd Auto-generated-cl: translation import
es/values-af/photoeditor_strings.xml
es/values-am/photoeditor_strings.xml
es/values-ar/photoeditor_strings.xml
es/values-da/photoeditor_strings.xml
es/values-de/photoeditor_strings.xml
es/values-el/photoeditor_strings.xml
es/values-en-rGB/photoeditor_strings.xml
es/values-es/photoeditor_strings.xml
es/values-fa/photoeditor_strings.xml
es/values-fr/photoeditor_strings.xml
es/values-hu/photoeditor_strings.xml
es/values-it/photoeditor_strings.xml
es/values-nb/photoeditor_strings.xml
es/values-nl/photoeditor_strings.xml
es/values-pt-rPT/photoeditor_strings.xml
es/values-sv/photoeditor_strings.xml
es/values-sw/photoeditor_strings.xml
es/values-zu/photoeditor_strings.xml
|
91ac05ca91846236a4fa05a524e18ed49dc2639c |
17-Aug-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I68a4bea7aa4cd7720cca2c2b45fbf8a37121d8cd Auto-generated-cl: translation import
es/values-af/photoeditor_strings.xml
es/values-am/photoeditor_strings.xml
es/values-ar/photoeditor_strings.xml
es/values-da/photoeditor_strings.xml
es/values-de/photoeditor_strings.xml
es/values-el/photoeditor_strings.xml
es/values-en-rGB/photoeditor_strings.xml
es/values-es/photoeditor_strings.xml
es/values-fa/photoeditor_strings.xml
es/values-fr/photoeditor_strings.xml
es/values-hu/photoeditor_strings.xml
es/values-it/photoeditor_strings.xml
es/values-nb/photoeditor_strings.xml
es/values-nl/photoeditor_strings.xml
es/values-pt-rPT/photoeditor_strings.xml
es/values-sv/photoeditor_strings.xml
es/values-sw/photoeditor_strings.xml
es/values-zu/photoeditor_strings.xml
|
82cdb7bf23b0a9f2f26acd141dce7012bd8c70d5 |
17-Aug-2012 |
Owen Lin <owenlin@google.com> |
Fix NPE when view a single photo. bug: 6995776 Change-Id: Iba213dfefcab04f2c856f55dc3446e3314f30a6f
rc/com/android/gallery3d/actionbar/SystemActionBarWrapper.java
|
bbe8bd33beb1ee7a01a55cca74624b36a7d25074 |
17-Aug-2012 |
Owen Lin <owenlin@google.com> |
Fix NPE when view a single photo. bug: 6995776 Change-Id: Iba213dfefcab04f2c856f55dc3446e3314f30a6f
rc/com/android/gallery3d/actionbar/SystemActionBarWrapper.java
|
17a27b9733ef4cfe047deebbabaa4ab64ede2a71 |
08-May-2012 |
Wu, Hao <hao.wu@intel.com> |
Progressbar: correct the first updated value for progressbar This patch corrects the first updated value from 0 to 1. After execute first operation, then need to update Progress to 1, not 0. Change-Id: Ie3ae6bea79b3e50e727723d75de84b1797aaf382 Author: Wu, Hao <hao.wu@intel.com> Signed-off-by: Xiaokang Qin <xiaokang.qin@intel.com> Signed-off-by: Beare, Bruce J <bruce.j.beare@intel.com> Signed-off-by: Jack Ren <jack.ren@intel.com> Author-tracking-BZ: 34729
rc/com/android/gallery3d/ui/MenuExecutor.java
|
c2b8e1c0906398cbdb5aea6bef67d71f3d36f25c |
17-Aug-2012 |
Owen Lin <owenlin@google.com> |
Merge "Load AsyncTask class in UI thread." into gb-ub-photos-arches
|
198f95271ef2eb554d4002574ea4333619584465 |
17-Aug-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Revert Gallery ActionBar theme change pending UX input" into gb-ub-photos-arches
|
0e90b72790fa85813819937db5b45fae63e2ac77 |
17-Aug-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Revert Gallery ActionBar theme change pending UX input" into gb-ub-photos-arches
|
b195696d6d721084128784c630a410256bfd3a42 |
16-Aug-2012 |
Owen Lin <owenlin@google.com> |
Load AsyncTask class in UI thread. bug: 7005321 Change-Id: I4f8806553aee34fb2ebeaef010c14c88679a7f72
rc/com/android/gallery3d/app/GalleryAppImpl.java
|
91055408e94f0a7517971f52290c52f2a75ed52a |
16-Aug-2012 |
Owen Lin <owenlin@google.com> |
Load AsyncTask class in UI thread. bug: 7005321 Change-Id: I4f8806553aee34fb2ebeaef010c14c88679a7f72
rc/com/android/gallery3d/app/GalleryAppImpl.java
|
b67518294e4d8e098ec575cede4b786d606e0d97 |
17-Aug-2012 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with jb-mr1-release - do not merge Change-Id: I149dfaf17bb62bf665598dfd43ccffdaa5699d5e
|
0e3357178b45b665af0bca5f34abd71a31e9d0f4 |
17-Aug-2012 |
Bobby Georgescu <georgescu@google.com> |
Revert Gallery ActionBar theme change pending UX input Bug: 6996822 Change-Id: I984864101013ade438b97f36c3ac168260d9bb80
es/values/styles.xml
|
0c9dc7900af6131d24c2d0906205ba29ee0fd92b |
17-Aug-2012 |
Bobby Georgescu <georgescu@google.com> |
Revert Gallery ActionBar theme change pending UX input Bug: 6996822 Change-Id: I984864101013ade438b97f36c3ac168260d9bb80
es/values/styles.xml
|
7807898476dc2d32c9491852f303f654e8ed8650 |
16-Aug-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Iec65ab66d059dab9d58032ae84ec2302742a0a5b Auto-generated-cl: translation import
es/values-af/photoeditor_strings.xml
es/values-am/photoeditor_strings.xml
es/values-ar/photoeditor_strings.xml
es/values-be/photoeditor_strings.xml
es/values-bg/photoeditor_strings.xml
es/values-ca/photoeditor_strings.xml
es/values-cs/photoeditor_strings.xml
es/values-da/photoeditor_strings.xml
es/values-de/photoeditor_strings.xml
es/values-el/photoeditor_strings.xml
es/values-en-rGB/photoeditor_strings.xml
es/values-es-rUS/photoeditor_strings.xml
es/values-es/photoeditor_strings.xml
es/values-et/photoeditor_strings.xml
es/values-fa/photoeditor_strings.xml
es/values-fi/photoeditor_strings.xml
es/values-fr/photoeditor_strings.xml
es/values-hi/photoeditor_strings.xml
es/values-hr/photoeditor_strings.xml
es/values-hu/photoeditor_strings.xml
es/values-in/photoeditor_strings.xml
es/values-it/photoeditor_strings.xml
es/values-iw/photoeditor_strings.xml
es/values-ja/photoeditor_strings.xml
es/values-ko/photoeditor_strings.xml
es/values-lt/photoeditor_strings.xml
es/values-lv/photoeditor_strings.xml
es/values-ms/photoeditor_strings.xml
es/values-nb/photoeditor_strings.xml
es/values-nl/photoeditor_strings.xml
es/values-pl/photoeditor_strings.xml
es/values-pt-rPT/photoeditor_strings.xml
es/values-pt/photoeditor_strings.xml
es/values-ro/photoeditor_strings.xml
es/values-ru/photoeditor_strings.xml
es/values-sk/photoeditor_strings.xml
es/values-sl/photoeditor_strings.xml
es/values-sr/photoeditor_strings.xml
es/values-sv/photoeditor_strings.xml
es/values-sw/photoeditor_strings.xml
es/values-th/photoeditor_strings.xml
es/values-tl/photoeditor_strings.xml
es/values-tr/photoeditor_strings.xml
es/values-uk/photoeditor_strings.xml
es/values-vi/photoeditor_strings.xml
es/values-zh-rCN/photoeditor_strings.xml
es/values-zh-rTW/photoeditor_strings.xml
es/values-zu/photoeditor_strings.xml
|
eee9878c22f22fdb3916318c67923d97c664386b |
16-Aug-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Iec65ab66d059dab9d58032ae84ec2302742a0a5b Auto-generated-cl: translation import
es/values-af/photoeditor_strings.xml
es/values-am/photoeditor_strings.xml
es/values-ar/photoeditor_strings.xml
es/values-be/photoeditor_strings.xml
es/values-bg/photoeditor_strings.xml
es/values-ca/photoeditor_strings.xml
es/values-cs/photoeditor_strings.xml
es/values-da/photoeditor_strings.xml
es/values-de/photoeditor_strings.xml
es/values-el/photoeditor_strings.xml
es/values-en-rGB/photoeditor_strings.xml
es/values-es-rUS/photoeditor_strings.xml
es/values-es/photoeditor_strings.xml
es/values-et/photoeditor_strings.xml
es/values-fa/photoeditor_strings.xml
es/values-fi/photoeditor_strings.xml
es/values-fr/photoeditor_strings.xml
es/values-hi/photoeditor_strings.xml
es/values-hr/photoeditor_strings.xml
es/values-hu/photoeditor_strings.xml
es/values-in/photoeditor_strings.xml
es/values-it/photoeditor_strings.xml
es/values-iw/photoeditor_strings.xml
es/values-ja/photoeditor_strings.xml
es/values-ko/photoeditor_strings.xml
es/values-lt/photoeditor_strings.xml
es/values-lv/photoeditor_strings.xml
es/values-ms/photoeditor_strings.xml
es/values-nb/photoeditor_strings.xml
es/values-nl/photoeditor_strings.xml
es/values-pl/photoeditor_strings.xml
es/values-pt-rPT/photoeditor_strings.xml
es/values-pt/photoeditor_strings.xml
es/values-ro/photoeditor_strings.xml
es/values-ru/photoeditor_strings.xml
es/values-sk/photoeditor_strings.xml
es/values-sl/photoeditor_strings.xml
es/values-sr/photoeditor_strings.xml
es/values-sv/photoeditor_strings.xml
es/values-sw/photoeditor_strings.xml
es/values-th/photoeditor_strings.xml
es/values-tl/photoeditor_strings.xml
es/values-tr/photoeditor_strings.xml
es/values-uk/photoeditor_strings.xml
es/values-vi/photoeditor_strings.xml
es/values-zh-rCN/photoeditor_strings.xml
es/values-zh-rTW/photoeditor_strings.xml
es/values-zu/photoeditor_strings.xml
|
befedeb53f9a619f8f787d70585f569b3ab5cec3 |
16-Aug-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: I1bcc59ab000f860e35e7c304cc7f58ab85bbeafd Auto-generated-cl: translation import
es/values-hi/strings.xml
|
283efd7579659b474a0668c23c076521f464fb55 |
16-Aug-2012 |
Doris Liu <tianliu@google.com> |
Merge "More on content description for photo editor butns" into gb-ub-photos-arches
|
81679512d9c9b3d2474a27e54c85457b7d5ef464 |
16-Aug-2012 |
Doris Liu <tianliu@google.com> |
Merge "More on content description for photo editor butns" into gb-ub-photos-arches
|
2ff8ee4aa907fcd733a62476e4ff051958202e27 |
16-Aug-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
ea8c8f1126c75e2284d9eb8be20fc423366871a5 |
16-Aug-2012 |
Owen Lin <owenlin@google.com> |
Merge "Fix some bugs introduced by the ActionBarWrapper." into gb-ub-photos-arches
|
a1627e5b586d6e3cfbd0578fd483af6967fcf388 |
16-Aug-2012 |
Owen Lin <owenlin@google.com> |
Merge "Fix some bugs introduced by the ActionBarWrapper." into gb-ub-photos-arches
|
ac1ee5e1218c6cdfb0426870925ec10e89c06c4e |
16-Aug-2012 |
Doris Liu <tianliu@google.com> |
More on content description for photo editor butns Incorporated Yuli's suggestions on the naming of some of the photo effects buttons. Change-Id: Iec5f50f7537d12b9a77f65ee76f758642b2b2838
es/values/photoeditor_strings.xml
|
840c9d680f9b5d07b0930a1071901c21d2b416de |
16-Aug-2012 |
Doris Liu <tianliu@google.com> |
More on content description for photo editor butns Incorporated Yuli's suggestions on the naming of some of the photo effects buttons. Change-Id: Iec5f50f7537d12b9a77f65ee76f758642b2b2838
es/values/photoeditor_strings.xml
|
b2927a6811d4b1c46570d6642f9c872320ac7b5b |
16-Aug-2012 |
Owen Lin <owenlin@google.com> |
Fix some bugs introduced by the ActionBarWrapper. bug: 6927267 Change-Id: If05082a4fec25f93d38c6096ebacc5a82e7e7c2e
rc/com/android/gallery3d/actionbar/SystemActionBarWrapper.java
rc/com/android/gallery3d/actionbar/SystemActionModeWrapper.java
rc/com/android/gallery3d/ui/ActionModeHandler.java
rc/com/android/gallery3d/util/Holder.java
|
0cc65b3bd5e4fc1c54fda93d3dab171adcca30a6 |
16-Aug-2012 |
Owen Lin <owenlin@google.com> |
Fix some bugs introduced by the ActionBarWrapper. bug: 6927267 Change-Id: If05082a4fec25f93d38c6096ebacc5a82e7e7c2e
rc/com/android/gallery3d/actionbar/SystemActionBarWrapper.java
rc/com/android/gallery3d/actionbar/SystemActionModeWrapper.java
rc/com/android/gallery3d/ui/ActionModeHandler.java
rc/com/android/gallery3d/util/Holder.java
|
ad2d3108ead2b057fb7ece3984bc7252268afabf |
16-Aug-2012 |
Ahbong Chang <cwahbong@google.com> |
Check if actionbar exists at ActionBarUtils.getActionBar(). Bug: 6927267 Change-Id: I85645f25879ced48a85a2bef4f55f1c34b8806ec
rc/com/android/gallery3d/actionbar/ActionBarUtils.java
|
4cf1aefb45fcb7eb7395cdb59aaf462c43f60905 |
16-Aug-2012 |
Ahbong Chang <cwahbong@google.com> |
Check if actionbar exists at ActionBarUtils.getActionBar(). Bug: 6927267 Change-Id: I85645f25879ced48a85a2bef4f55f1c34b8806ec
rc/com/android/gallery3d/actionbar/ActionBarUtils.java
|
86e27816b1c89840ab14152eff9bd7a123c71587 |
15-Aug-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ie5b5a5aefade4c45e3270fddbaced7b30ea6cc08 Auto-generated-cl: translation import
es/values-af/photoeditor_strings.xml
es/values-am/photoeditor_strings.xml
es/values-ar/photoeditor_strings.xml
es/values-be/photoeditor_strings.xml
es/values-bg/photoeditor_strings.xml
es/values-ca/photoeditor_strings.xml
es/values-cs/photoeditor_strings.xml
es/values-da/photoeditor_strings.xml
es/values-de/photoeditor_strings.xml
es/values-el/photoeditor_strings.xml
es/values-en-rGB/photoeditor_strings.xml
es/values-es-rUS/photoeditor_strings.xml
es/values-es/photoeditor_strings.xml
es/values-et/photoeditor_strings.xml
es/values-fa/photoeditor_strings.xml
es/values-fi/photoeditor_strings.xml
es/values-fr/photoeditor_strings.xml
es/values-hi/photoeditor_strings.xml
es/values-hr/photoeditor_strings.xml
es/values-hu/photoeditor_strings.xml
es/values-in/photoeditor_strings.xml
es/values-it/photoeditor_strings.xml
es/values-iw/photoeditor_strings.xml
es/values-ja/photoeditor_strings.xml
es/values-ko/photoeditor_strings.xml
es/values-lt/photoeditor_strings.xml
es/values-lv/photoeditor_strings.xml
es/values-ms/photoeditor_strings.xml
es/values-nb/photoeditor_strings.xml
es/values-nl/photoeditor_strings.xml
es/values-pl/photoeditor_strings.xml
es/values-pt-rPT/photoeditor_strings.xml
es/values-pt/photoeditor_strings.xml
es/values-ro/photoeditor_strings.xml
es/values-ru/photoeditor_strings.xml
es/values-sk/photoeditor_strings.xml
es/values-sl/photoeditor_strings.xml
es/values-sr/photoeditor_strings.xml
es/values-sv/photoeditor_strings.xml
es/values-sw/photoeditor_strings.xml
es/values-th/photoeditor_strings.xml
es/values-tl/photoeditor_strings.xml
es/values-tr/photoeditor_strings.xml
es/values-uk/photoeditor_strings.xml
es/values-vi/photoeditor_strings.xml
es/values-zh-rCN/photoeditor_strings.xml
es/values-zh-rTW/photoeditor_strings.xml
es/values-zu/photoeditor_strings.xml
|
5cede6dbbc322313d77595caf649f50bf34f593c |
15-Aug-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: Ie5b5a5aefade4c45e3270fddbaced7b30ea6cc08 Auto-generated-cl: translation import
es/values-af/photoeditor_strings.xml
es/values-am/photoeditor_strings.xml
es/values-ar/photoeditor_strings.xml
es/values-be/photoeditor_strings.xml
es/values-bg/photoeditor_strings.xml
es/values-ca/photoeditor_strings.xml
es/values-cs/photoeditor_strings.xml
es/values-da/photoeditor_strings.xml
es/values-de/photoeditor_strings.xml
es/values-el/photoeditor_strings.xml
es/values-en-rGB/photoeditor_strings.xml
es/values-es-rUS/photoeditor_strings.xml
es/values-es/photoeditor_strings.xml
es/values-et/photoeditor_strings.xml
es/values-fa/photoeditor_strings.xml
es/values-fi/photoeditor_strings.xml
es/values-fr/photoeditor_strings.xml
es/values-hi/photoeditor_strings.xml
es/values-hr/photoeditor_strings.xml
es/values-hu/photoeditor_strings.xml
es/values-in/photoeditor_strings.xml
es/values-it/photoeditor_strings.xml
es/values-iw/photoeditor_strings.xml
es/values-ja/photoeditor_strings.xml
es/values-ko/photoeditor_strings.xml
es/values-lt/photoeditor_strings.xml
es/values-lv/photoeditor_strings.xml
es/values-ms/photoeditor_strings.xml
es/values-nb/photoeditor_strings.xml
es/values-nl/photoeditor_strings.xml
es/values-pl/photoeditor_strings.xml
es/values-pt-rPT/photoeditor_strings.xml
es/values-pt/photoeditor_strings.xml
es/values-ro/photoeditor_strings.xml
es/values-ru/photoeditor_strings.xml
es/values-sk/photoeditor_strings.xml
es/values-sl/photoeditor_strings.xml
es/values-sr/photoeditor_strings.xml
es/values-sv/photoeditor_strings.xml
es/values-sw/photoeditor_strings.xml
es/values-th/photoeditor_strings.xml
es/values-tl/photoeditor_strings.xml
es/values-tr/photoeditor_strings.xml
es/values-uk/photoeditor_strings.xml
es/values-vi/photoeditor_strings.xml
es/values-zh-rCN/photoeditor_strings.xml
es/values-zh-rTW/photoeditor_strings.xml
es/values-zu/photoeditor_strings.xml
|
811474375e10d9d743ee3931346673890b494b62 |
15-Aug-2012 |
Doris Liu <tianliu@google.com> |
Adding content description to effect buttons This CL adds content description/accessiblity label to the special effects buttons in photo editor. Bug: 6676889 Change-Id: I5446c95b5ec6a1084d82feb102e11b3b722254d1
es/layout/photoeditor_actionbar.xml
es/layout/photoeditor_effects_color.xml
es/layout/photoeditor_effects_menu.xml
es/values/photoeditor_strings.xml
|
f6bb12a6840bede9e490e59ed4f7bbd6836d7f32 |
15-Aug-2012 |
Doris Liu <tianliu@google.com> |
Adding content description to effect buttons This CL adds content description/accessiblity label to the special effects buttons in photo editor. Bug: 6676889 Change-Id: I5446c95b5ec6a1084d82feb102e11b3b722254d1
es/layout/photoeditor_actionbar.xml
es/layout/photoeditor_effects_color.xml
es/layout/photoeditor_effects_menu.xml
es/values/photoeditor_strings.xml
|
c139b515b3796853490ad57ccaa596bb7f2286de |
15-Aug-2012 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with jb-mr1-release - do not merge Change-Id: If4e80006b1f802a7bca33bb10253f09c2b10ac73
|
ec134c8edef5f7f31d6b904f9f4f1fc53fc3e4ca |
15-Aug-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
a987b12c396ef9b0482c4ca827131db125bf8ef8 |
15-Aug-2012 |
Owen Lin <owenlin@google.com> |
Merge "Add SimpleMenuXXX implementation for the Gingerbread platform." into gb-ub-photos-arches
|
1adebb6237ef1f14643971218dac6bd87196bf37 |
15-Aug-2012 |
Owen Lin <owenlin@google.com> |
Merge "Add SimpleMenuXXX implementation for the Gingerbread platform." into gb-ub-photos-arches
|
b127580d7783872406f0c73d842570d20ad4997e |
15-Aug-2012 |
Owen Lin <owenlin@google.com> |
Merge "Add SimpleMenuXXX implementation for the Gingerbread platform." into gb-ub-photos-arches
|
2ca946798edb9921847ff411f3c747e441d79824 |
15-Aug-2012 |
Owen Lin <owenlin@google.com> |
Merge "Extract the action bar interface." into gb-ub-photos-arches
|
f1d63437353326b3d59c20361959a6e4d7450e57 |
15-Aug-2012 |
Owen Lin <owenlin@google.com> |
Merge "Extract the action bar interface." into gb-ub-photos-arches
|
00e4a6e52dab2f7ef3f6574f20a12d4a39e76124 |
17-Jul-2012 |
Owen Lin <owenlin@google.com> |
Add SimpleMenuXXX implementation for the Gingerbread platform. 1. Add a SimpleMenuInflator to parse the res/menu/xxx.xml files. 2. Add minimal code to show the menu. **NOTE** This change is going to be replaced by the ActionBar compat library when it gets ready and integrated. The purpose of this change is making Gallery/Camera run on GB. Change-Id: Ia7d402c82a6da1b9558ebbd103e161d2471b34dd
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
|
92f8a567fb47496df3a6b3f4a68b5359b0371fd2 |
17-Jul-2012 |
Owen Lin <owenlin@google.com> |
Add SimpleMenuXXX implementation for the Gingerbread platform. 1. Add a SimpleMenuInflator to parse the res/menu/xxx.xml files. 2. Add minimal code to show the menu. **NOTE** This change is going to be replaced by the ActionBar compat library when it gets ready and integrated. The purpose of this change is making Gallery/Camera run on GB. Change-Id: Ia7d402c82a6da1b9558ebbd103e161d2471b34dd
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
rc/com/android/gallery3d/actionbar/ActionBarUtils.java
rc/com/android/gallery3d/actionbar/SimpleActionBar.java
rc/com/android/gallery3d/actionbar/SimpleActionBarView.java
rc/com/android/gallery3d/actionbar/SimpleActionMode.java
rc/com/android/gallery3d/actionbar/SimpleMenu.java
rc/com/android/gallery3d/actionbar/SimpleMenuInflater.java
rc/com/android/gallery3d/actionbar/SystemActionModeWrapper.java
rc/com/android/gallery3d/app/ActivityState.java
rc/com/android/gallery3d/ui/PopupList.java
|
d84941f0649c751c0cc5fd2f6b233380e878ca26 |
17-Jul-2012 |
Owen Lin <owenlin@google.com> |
Add SimpleMenuXXX implementation for the Gingerbread platform. 1. Add a SimpleMenuInflator to parse the res/menu/xxx.xml files. 2. Add minimal code to show the menu. **NOTE** This change is going to be replaced by the ActionBar compat library when it gets ready and integrated. The purpose of this change is making Gallery/Camera run on GB. Change-Id: Ia7d402c82a6da1b9558ebbd103e161d2471b34dd
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
es/layout/main.xml
es/layout/simple_action_bar.xml
rc/com/android/gallery3d/actionbar/ActionBarUtils.java
rc/com/android/gallery3d/actionbar/SimpleActionBar.java
rc/com/android/gallery3d/actionbar/SimpleActionBarView.java
rc/com/android/gallery3d/actionbar/SimpleActionMode.java
rc/com/android/gallery3d/actionbar/SimpleMenu.java
rc/com/android/gallery3d/actionbar/SimpleMenuInflater.java
rc/com/android/gallery3d/actionbar/SystemActionModeWrapper.java
rc/com/android/gallery3d/app/ActivityState.java
rc/com/android/gallery3d/ui/PopupList.java
|
fef28b97e8bd77ebd64f41b3b15c3cfd49529018 |
17-Jul-2012 |
Owen Lin <owenlin@google.com> |
Add SimpleMenuXXX implementation for the Gingerbread platform. 1. Add a SimpleMenuInflator to parse the res/menu/xxx.xml files. 2. Add minimal code to show the menu. **NOTE** This change is going to be replaced by the ActionBar compat library when it gets ready and integrated. The purpose of this change is making Gallery/Camera run on GB. Change-Id: Ia7d402c82a6da1b9558ebbd103e161d2471b34dd
es/layout/main.xml
es/layout/simple_action_bar.xml
|
7c1e03a70f54fb735e6ef59733a02131579ae1f8 |
13-Jul-2012 |
Owen Lin <owenlin@google.com> |
Extract the action bar interface. So that we can use different implementation for different API levels. **NOTE** This change is going to be replaced by the ActionBar compat library when it gets ready. The purpose of this change is making Gallery/Camera run on GB. bug: 6927267 Change-Id: Ic8bb2518918168ea889db6452d6760de390d96b2
rc/com/android/gallery3d/actionbar/ActionBarInterface.java
rc/com/android/gallery3d/actionbar/ActionBarUtils.java
rc/com/android/gallery3d/actionbar/ActionModeInterface.java
rc/com/android/gallery3d/actionbar/MenuHolder.java
rc/com/android/gallery3d/actionbar/SystemActionBarWrapper.java
rc/com/android/gallery3d/actionbar/SystemActionModeWrapper.java
rc/com/android/gallery3d/app/AlbumPage.java
rc/com/android/gallery3d/app/AlbumSetPage.java
rc/com/android/gallery3d/app/CropImage.java
rc/com/android/gallery3d/app/GalleryActionBar.java
rc/com/android/gallery3d/app/MovieActivity.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/ui/ActionModeHandler.java
rc/com/android/gallery3d/ui/MenuExecutor.java
rc/com/android/gallery3d/util/HelpUtils.java
|
2bb717f1ea38e2ce33dd102a23afe6bfacb5675c |
13-Jul-2012 |
Owen Lin <owenlin@google.com> |
Extract the action bar interface. So that we can use different implementation for different API levels. **NOTE** This change is going to be replaced by the ActionBar compat library when it gets ready. The purpose of this change is making Gallery/Camera run on GB. bug: 6927267 Change-Id: Ic8bb2518918168ea889db6452d6760de390d96b2
rc/com/android/gallery3d/actionbar/ActionBarInterface.java
rc/com/android/gallery3d/actionbar/ActionBarUtils.java
rc/com/android/gallery3d/actionbar/ActionModeInterface.java
rc/com/android/gallery3d/actionbar/MenuHolder.java
rc/com/android/gallery3d/actionbar/SystemActionBarWrapper.java
rc/com/android/gallery3d/actionbar/SystemActionModeWrapper.java
rc/com/android/gallery3d/app/AlbumPage.java
rc/com/android/gallery3d/app/AlbumSetPage.java
rc/com/android/gallery3d/app/CropImage.java
rc/com/android/gallery3d/app/GalleryActionBar.java
rc/com/android/gallery3d/app/MovieActivity.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/ui/ActionModeHandler.java
rc/com/android/gallery3d/ui/MenuExecutor.java
rc/com/android/gallery3d/util/HelpUtils.java
|
92c1a441c5bc5daeae09a2a2d79453f527ac99df |
15-Aug-2012 |
Owen Lin <owenlin@android.com> |
Merge "A simple ExifReader and its test" into gb-ub-photos-arches
|
64223e1a46eafaee0502c94dbac5637aeba9414e |
15-Aug-2012 |
Owen Lin <owenlin@android.com> |
Merge "A simple ExifReader and its test" into gb-ub-photos-arches
|
d959ed2336fceacf3a983f178494dd539f12068f |
15-Aug-2012 |
Owen Lin <owenlin@android.com> |
Merge "A simple ExifReader and its test" into gb-ub-photos-arches
|
1eebc5823081fe272697148cd14d79bbae911208 |
09-Aug-2012 |
Earl Ou <shunhsingou@google.com> |
A simple ExifReader and its test Change-Id: I1a30d24591bbdab288e04e3705ece388b533f247
ests/res/xml/galaxy_nexus.xml
|
e81de49429e1c29385baffc7ce17b7188badc49a |
09-Aug-2012 |
Earl Ou <shunhsingou@google.com> |
A simple ExifReader and its test Change-Id: I1a30d24591bbdab288e04e3705ece388b533f247
rc/com/android/gallery3d/exif/ExifData.java
rc/com/android/gallery3d/exif/ExifReader.java
rc/com/android/gallery3d/exif/IfdData.java
ests/src/com/android/gallery3d/exif/ExifParserTest.java
ests/src/com/android/gallery3d/exif/ExifReaderTest.java
ests/src/com/android/gallery3d/exif/ExifTestRunner.java
ests/src/com/android/gallery3d/exif/ExifXmlReader.java
|
321e7c477a66df696b92d1617a33f6bafab7886d |
09-Aug-2012 |
Earl Ou <shunhsingou@google.com> |
A simple ExifReader and its test Change-Id: I1a30d24591bbdab288e04e3705ece388b533f247
rc/com/android/gallery3d/exif/ExifData.java
rc/com/android/gallery3d/exif/ExifReader.java
rc/com/android/gallery3d/exif/IfdData.java
ests/res/xml/galaxy_nexus.xml
ests/src/com/android/gallery3d/exif/ExifParserTest.java
ests/src/com/android/gallery3d/exif/ExifReaderTest.java
ests/src/com/android/gallery3d/exif/ExifTestRunner.java
ests/src/com/android/gallery3d/exif/ExifXmlReader.java
|
0bf21ae1aebc9e0d9a8c47fdd4712898ca62dbf1 |
14-Aug-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Gallery reskin: album list spacing, action bar theme" into gb-ub-photos-arches
|
9ef602b77ad0cc7aca49a05f39f193277e0e8ae7 |
14-Aug-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Gallery reskin: album list spacing, action bar theme" into gb-ub-photos-arches
|
3c6116e67c18e10fdc9186f4c0191690f217ef11 |
14-Aug-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Gallery reskin: album list spacing, action bar theme" into gb-ub-photos-arches
|
07c2b5adfb6d4d01e97744b218cb084d79474002 |
13-Aug-2012 |
Bobby Georgescu <georgescu@google.com> |
Gallery reskin: album list spacing, action bar theme Change-Id: Ic556f22bd25c57ddd0b659a7f43a7a1afbdcb8df
es/values/dimensions.xml
es/values/styles.xml
|
f17dbdf94fb5534266336f99bdd8014ace672ea7 |
13-Aug-2012 |
Bobby Georgescu <georgescu@google.com> |
Gallery reskin: album list spacing, action bar theme Change-Id: Ic556f22bd25c57ddd0b659a7f43a7a1afbdcb8df
rc/com/android/gallery3d/app/AlbumSetPage.java
rc/com/android/gallery3d/app/Config.java
|
f0c89374bfc008fb79ac3cb91cfd6d565d203041 |
13-Aug-2012 |
Bobby Georgescu <georgescu@google.com> |
Gallery reskin: album list spacing, action bar theme Change-Id: Ic556f22bd25c57ddd0b659a7f43a7a1afbdcb8df
es/values/dimensions.xml
es/values/styles.xml
rc/com/android/gallery3d/app/AlbumSetPage.java
rc/com/android/gallery3d/app/Config.java
|
9bafd6c3e51fca4e8dffdee1466035d887bea7c9 |
14-Aug-2012 |
Ying Wang <wangying@google.com> |
Retire LOCAL_NDK_VERSION. Bug: 6932421 Change-Id: I9e5e8fba22ac235701c002e27012bb3954896140
ni/Android.mk
|
5a2a2d22e4ce4e5a02857436f43d8f624b7c1d46 |
14-Aug-2012 |
Ying Wang <wangying@google.com> |
Retire LOCAL_NDK_VERSION. Bug: 6932421 Change-Id: I9e5e8fba22ac235701c002e27012bb3954896140
ni/Android.mk
|
4c47cca7e2beb1fd4109e18f78c4288392a2ca94 |
14-Aug-2012 |
Ying Wang <wangying@google.com> |
Retire LOCAL_NDK_VERSION. Bug: 6932421 Change-Id: I9e5e8fba22ac235701c002e27012bb3954896140
ni/Android.mk
|
6357d3af52d7eb327a236fff4a8cf98f53238d73 |
14-Aug-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
c66753055d3a74e80a5cce0fe608d930ad14072f |
14-Aug-2012 |
Wu-cheng Li <wuchengli@google.com> |
Rename ThemeCamera to Theme.Camera to be consistent. bug:6982707 Change-Id: Ic82f542ee8aafdf6c49344887459e75303ca5df8
ndroidManifest.xml
|
ceb25e968ae6c7360de52c477816995ee3edc340 |
14-Aug-2012 |
Wu-cheng Li <wuchengli@google.com> |
Rename ThemeCamera to Theme.Camera to be consistent. bug:6982707 Change-Id: Ic82f542ee8aafdf6c49344887459e75303ca5df8
ndroidManifest.xml
|
a7c64453563b15d19b083ba546dce9f4aae42406 |
14-Aug-2012 |
Wu-cheng Li <wuchengli@google.com> |
Merge "Make a copy of MotionEvent in MotionEventHelper.transform." into gb-ub-photos-arches
|
cac6ef162e2cd25df1bbd03c4930fd8110b31724 |
14-Aug-2012 |
Wu-cheng Li <wuchengli@google.com> |
Merge "Make a copy of MotionEvent in MotionEventHelper.transform." into gb-ub-photos-arches
|
fdba983c8c51c4d0ac04a0b98cc230274578b29f |
14-Aug-2012 |
Owen Lin <owenlin@google.com> |
Merge "Remove the previewImage and staticWallpaperPreview." into gb-ub-photos-arches
|
9b274a593d85d1ad022a603b6a8cf437ca453624 |
14-Aug-2012 |
Owen Lin <owenlin@google.com> |
Merge "Remove the previewImage and staticWallpaperPreview." into gb-ub-photos-arches
|
bf2bde536e70f4ef83c7d6184b0bf265823ce790 |
13-Aug-2012 |
Owen Lin <owenlin@google.com> |
Remove the previewImage and staticWallpaperPreview. Change-Id: I804ea494efdcca5fa70944f29e92c5f022f622c1 fix: 6974862
es/xml-v11/wallpaper_picker_preview.xml
es/xml-v11/widget_info.xml
es/xml/wallpaper_picker_preview.xml
es/xml/widget_info.xml
|
47c247e7c575d712546814b8dc4c737de93c2e61 |
13-Aug-2012 |
Owen Lin <owenlin@google.com> |
Remove the previewImage and staticWallpaperPreview. Change-Id: I804ea494efdcca5fa70944f29e92c5f022f622c1 fix: 6974862
es/xml-v11/wallpaper_picker_preview.xml
es/xml-v11/widget_info.xml
es/xml/wallpaper_picker_preview.xml
es/xml/widget_info.xml
|
861fcb65a1f37d9d327585d6e1a5a0e395b60217 |
14-Aug-2012 |
Owen Lin <owenlin@google.com> |
Merge "Extract EXIF info only for JPEG files" into gb-ub-photos-arches
|
5b60e00145ba8dd5086723c98a5d6c4c3188d3d1 |
14-Aug-2012 |
Owen Lin <owenlin@google.com> |
Merge "Extract EXIF info only for JPEG files" into gb-ub-photos-arches
|
51442eb3f16ff6c880b7cbb4df80063cccf7788e |
13-Aug-2012 |
Bobby Georgescu <georgescu@google.com> |
Show album counts in Gallery & other small reskin fixes Bug: 6975144 Change-Id: I2f12c6482cc009aecbca3e26482ebd8944f01bb8
es/values/dimensions.xml
|
bb99150a872a7265e44ae5bd9eb3ce3534ac12b3 |
13-Aug-2012 |
Bobby Georgescu <georgescu@google.com> |
Show album counts in Gallery & other small reskin fixes Bug: 6975144 Change-Id: I2f12c6482cc009aecbca3e26482ebd8944f01bb8
rc/com/android/gallery3d/app/Config.java
rc/com/android/gallery3d/ui/AlbumLabelMaker.java
rc/com/android/gallery3d/ui/AlbumSetSlotRenderer.java
|
e24cc7208a6d3760a87dfd4b80a7a6683fe146eb |
13-Aug-2012 |
Bobby Georgescu <georgescu@google.com> |
Show album counts in Gallery & other small reskin fixes Bug: 6975144 Change-Id: I2f12c6482cc009aecbca3e26482ebd8944f01bb8
es/values/dimensions.xml
rc/com/android/gallery3d/app/Config.java
rc/com/android/gallery3d/ui/AlbumLabelMaker.java
rc/com/android/gallery3d/ui/AlbumSetSlotRenderer.java
|
132639d195167ca82048ffce55587ceb51433d5d |
13-Aug-2012 |
Bobby Georgescu <georgescu@google.com> |
Fix white viewfinder flash introduced by Gallery UI reskin Bug: 6974088 Change-Id: Id6269fdbe4b5cf0d5befee800ff3c57c3b501448
es/layout/gl_root_group.xml
|
6601b3a226c9e5c9ac10e2dd8f1ee8a78946cc5c |
13-Aug-2012 |
Bobby Georgescu <georgescu@google.com> |
Fix white viewfinder flash introduced by Gallery UI reskin Bug: 6974088 Change-Id: Id6269fdbe4b5cf0d5befee800ff3c57c3b501448
es/layout/gl_root_group.xml
|
d4d77d0502371e9dc04706df06f4c3ab93a52bac |
13-Aug-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
e89a4e7d2808b44b2da6827d13d6da6ce0998896 |
13-Aug-2012 |
Wu-cheng Li <wuchengli@google.com> |
Make a copy of MotionEvent in MotionEventHelper.transform. RotateLayout transforms the event in dispatchTouchEvent. If the event is not handled, the parent of RotateLayout may send the transformed event to other views and the coordinates will be wrong. Make a copy of MotionEvent in transform. This also makes the behavior consistent in different API levels. bug:6974916 Change-Id: Id835767cc9be3f244e5abe2b855e5188045adedc
rc/com/android/gallery3d/util/MotionEventHelper.java
|
37ba3d7b5953decbb7cc21f74cd61ceed12b199a |
13-Aug-2012 |
Wu-cheng Li <wuchengli@google.com> |
Make a copy of MotionEvent in MotionEventHelper.transform. RotateLayout transforms the event in dispatchTouchEvent. If the event is not handled, the parent of RotateLayout may send the transformed event to other views and the coordinates will be wrong. Make a copy of MotionEvent in transform. This also makes the behavior consistent in different API levels. bug:6974916 Change-Id: Id835767cc9be3f244e5abe2b855e5188045adedc
rc/com/android/gallery3d/util/MotionEventHelper.java
|
bc8808a30e524e943b28b484d974b52769694e37 |
09-Aug-2012 |
Owen Lin <owenlin@google.com> |
Extract EXIF info only for JPEG files bug: 6489840 Change-Id: I0ad682bffa5374d0d61ebaa502cc8b90e469b4c8
rc/com/android/gallery3d/data/LocalImage.java
rc/com/android/gallery3d/data/LocalMediaItem.java
rc/com/android/gallery3d/ui/PopupList.java
|
1a6969b26ce90b6acfb4af8aba2f4f8f208e2e57 |
09-Aug-2012 |
Owen Lin <owenlin@google.com> |
Extract EXIF info only for JPEG files bug: 6489840 Change-Id: I0ad682bffa5374d0d61ebaa502cc8b90e469b4c8
rc/com/android/gallery3d/data/LocalImage.java
rc/com/android/gallery3d/data/LocalMediaItem.java
rc/com/android/gallery3d/ui/PopupList.java
|
de8079dab0123ea087c3c9adbcf1c476bcf79a42 |
10-Aug-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "First gallery reskin iteration." into gb-ub-photos-arches
|
42a68a6f524bbd206b68eda650cc45d7e2a509af |
10-Aug-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "First gallery reskin iteration." into gb-ub-photos-arches
|
b959576d3f44138b11fc76a8647c3ad071420082 |
10-Aug-2012 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with jb-mr1-release - do not merge Change-Id: I970a76de7ddcd1ac415dff3eee35e7de33675c19
|
58cdc3fb0b7035f74db46f516115ded26f63c454 |
10-Aug-2012 |
Wu-cheng Li <wuchengli@google.com> |
Merge "Guard android.media.effect.Effect with TargetApi." into gb-ub-photos-arches
|
112a8beb812397c9cfbc49e218d7864fc7c23e91 |
10-Aug-2012 |
Wu-cheng Li <wuchengli@google.com> |
Merge "Guard android.media.effect.Effect with TargetApi." into gb-ub-photos-arches
|
de244e303e70aa0443e78d3923a9966b27d91562 |
10-Aug-2012 |
Wu-cheng Li <wuchengli@google.com> |
Merge "Guard SurfaceTextureScreenNail with TargetApi." into gb-ub-photos-arches
|
c9388fe7c9c5cc68ee121927c19f73db524c6662 |
10-Aug-2012 |
Wu-cheng Li <wuchengli@google.com> |
Merge "Guard SurfaceTextureScreenNail with TargetApi." into gb-ub-photos-arches
|
e28625fde6c89b099a5e4e05dd9bc5be5e8a57e4 |
10-Aug-2012 |
Owen Lin <owenlin@android.com> |
Merge "Check if the ExifParser paser every part in the test" into gb-ub-photos-arches
|
eefd60c61d6a255a302d64f492c0aa78a88371d6 |
10-Aug-2012 |
Owen Lin <owenlin@android.com> |
Merge "Check if the ExifParser paser every part in the test" into gb-ub-photos-arches
|
b6f5404c42bdba2a7e9c695362e2e623fb2eff46 |
10-Aug-2012 |
Owen Lin <owenlin@android.com> |
Merge "Fix ExifParser bug when APP0 exists in Jpeg file" into gb-ub-photos-arches
|
9eff62295434aef142037c969863a248140da0d4 |
10-Aug-2012 |
Owen Lin <owenlin@android.com> |
Merge "Fix ExifParser bug when APP0 exists in Jpeg file" into gb-ub-photos-arches
|
fdc13c38bed810979fbed5629e2bf53b5c10470e |
10-Aug-2012 |
Owen Lin <owenlin@android.com> |
Merge "ignore uncompressed thumbnail when test exif thumbnail" into gb-ub-photos-arches
|
11f7376cae5739fd847c291c25dc8b146cc159ae |
10-Aug-2012 |
Owen Lin <owenlin@android.com> |
Merge "ignore uncompressed thumbnail when test exif thumbnail" into gb-ub-photos-arches
|
52363de6ad9d4a06fd141c1af2707d979de4ad3a |
10-Aug-2012 |
Owen Lin <owenlin@android.com> |
Merge "Handle error when string length=0 in IfdParser" into gb-ub-photos-arches
|
13722d8f4dc6d0b0f868f73885f5f1c1298590cc |
10-Aug-2012 |
Owen Lin <owenlin@android.com> |
Merge "Handle error when string length=0 in IfdParser" into gb-ub-photos-arches
|
350fff29e3d2b48613c7e78cc1453e4ebd4ce281 |
10-Aug-2012 |
Wu-cheng Li <wuchengli@google.com> |
Guard SurfaceTextureScreenNail with TargetApi. bug:6927809 Change-Id: If03ffbcbf908a960f00bba97be0cdbf317ecabe8
rc/com/android/gallery3d/ui/SurfaceTextureScreenNail.java
|
a9fb0f51165bf1ba8287f4abaf5319efaf2cae84 |
10-Aug-2012 |
Wu-cheng Li <wuchengli@google.com> |
Guard SurfaceTextureScreenNail with TargetApi. bug:6927809 Change-Id: If03ffbcbf908a960f00bba97be0cdbf317ecabe8
rc/com/android/gallery3d/ui/SurfaceTextureScreenNail.java
|
e4dd6fed7021d181f5b6be50b3e9663b65c125c4 |
10-Aug-2012 |
Wu-cheng Li <wuchengli@google.com> |
Guard android.media.effect.Effect with TargetApi. bug:6927717 Change-Id: I25f881ab449ea4cb26a41c5219884d93725a1693
rc/com/android/gallery3d/photoeditor/filters/AutoFixFilter.java
rc/com/android/gallery3d/photoeditor/filters/ColorTemperatureFilter.java
rc/com/android/gallery3d/photoeditor/filters/CropFilter.java
rc/com/android/gallery3d/photoeditor/filters/CrossProcessFilter.java
rc/com/android/gallery3d/photoeditor/filters/DocumentaryFilter.java
rc/com/android/gallery3d/photoeditor/filters/DoodleFilter.java
rc/com/android/gallery3d/photoeditor/filters/DuotoneFilter.java
rc/com/android/gallery3d/photoeditor/filters/FaceTanFilter.java
rc/com/android/gallery3d/photoeditor/filters/FaceliftFilter.java
rc/com/android/gallery3d/photoeditor/filters/FillLightFilter.java
rc/com/android/gallery3d/photoeditor/filters/Filter.java
rc/com/android/gallery3d/photoeditor/filters/FisheyeFilter.java
rc/com/android/gallery3d/photoeditor/filters/FlipFilter.java
rc/com/android/gallery3d/photoeditor/filters/GrainFilter.java
rc/com/android/gallery3d/photoeditor/filters/GrayscaleFilter.java
rc/com/android/gallery3d/photoeditor/filters/HighlightFilter.java
rc/com/android/gallery3d/photoeditor/filters/LomoishFilter.java
rc/com/android/gallery3d/photoeditor/filters/NegativeFilter.java
rc/com/android/gallery3d/photoeditor/filters/PosterizeFilter.java
rc/com/android/gallery3d/photoeditor/filters/RedEyeFilter.java
rc/com/android/gallery3d/photoeditor/filters/RotateFilter.java
rc/com/android/gallery3d/photoeditor/filters/SaturationFilter.java
rc/com/android/gallery3d/photoeditor/filters/SepiaFilter.java
rc/com/android/gallery3d/photoeditor/filters/ShadowFilter.java
rc/com/android/gallery3d/photoeditor/filters/SharpenFilter.java
rc/com/android/gallery3d/photoeditor/filters/StraightenFilter.java
rc/com/android/gallery3d/photoeditor/filters/TintFilter.java
rc/com/android/gallery3d/photoeditor/filters/VignetteFilter.java
|
8731f48d35a9039b49e11b5f5ac33f8ae27ec399 |
10-Aug-2012 |
Wu-cheng Li <wuchengli@google.com> |
Guard android.media.effect.Effect with TargetApi. bug:6927717 Change-Id: I25f881ab449ea4cb26a41c5219884d93725a1693
rc/com/android/gallery3d/photoeditor/filters/AutoFixFilter.java
rc/com/android/gallery3d/photoeditor/filters/ColorTemperatureFilter.java
rc/com/android/gallery3d/photoeditor/filters/CropFilter.java
rc/com/android/gallery3d/photoeditor/filters/CrossProcessFilter.java
rc/com/android/gallery3d/photoeditor/filters/DocumentaryFilter.java
rc/com/android/gallery3d/photoeditor/filters/DoodleFilter.java
rc/com/android/gallery3d/photoeditor/filters/DuotoneFilter.java
rc/com/android/gallery3d/photoeditor/filters/FaceTanFilter.java
rc/com/android/gallery3d/photoeditor/filters/FaceliftFilter.java
rc/com/android/gallery3d/photoeditor/filters/FillLightFilter.java
rc/com/android/gallery3d/photoeditor/filters/Filter.java
rc/com/android/gallery3d/photoeditor/filters/FisheyeFilter.java
rc/com/android/gallery3d/photoeditor/filters/FlipFilter.java
rc/com/android/gallery3d/photoeditor/filters/GrainFilter.java
rc/com/android/gallery3d/photoeditor/filters/GrayscaleFilter.java
rc/com/android/gallery3d/photoeditor/filters/HighlightFilter.java
rc/com/android/gallery3d/photoeditor/filters/LomoishFilter.java
rc/com/android/gallery3d/photoeditor/filters/NegativeFilter.java
rc/com/android/gallery3d/photoeditor/filters/PosterizeFilter.java
rc/com/android/gallery3d/photoeditor/filters/RedEyeFilter.java
rc/com/android/gallery3d/photoeditor/filters/RotateFilter.java
rc/com/android/gallery3d/photoeditor/filters/SaturationFilter.java
rc/com/android/gallery3d/photoeditor/filters/SepiaFilter.java
rc/com/android/gallery3d/photoeditor/filters/ShadowFilter.java
rc/com/android/gallery3d/photoeditor/filters/SharpenFilter.java
rc/com/android/gallery3d/photoeditor/filters/StraightenFilter.java
rc/com/android/gallery3d/photoeditor/filters/TintFilter.java
rc/com/android/gallery3d/photoeditor/filters/VignetteFilter.java
|
bf1afd575aee4f199ad05b62fff1e2f0de447dda |
09-Aug-2012 |
Bobby Georgescu <georgescu@google.com> |
First gallery reskin iteration. Change-Id: I2b79ca9f40346a777141562c9a4762d7a8b460f6
es/layout/gl_root_group.xml
es/values-xlarge/dimensions.xml
es/values-xlarge/styles.xml
es/values/dimensions.xml
|
15f32af5378a7afde1996c8dd5ccbd591fe2b9ad |
09-Aug-2012 |
Bobby Georgescu <georgescu@google.com> |
First gallery reskin iteration. Change-Id: I2b79ca9f40346a777141562c9a4762d7a8b460f6
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/app/SlideshowPage.java
rc/com/android/gallery3d/ui/AlbumLabelMaker.java
rc/com/android/gallery3d/ui/AlbumSetSlotRenderer.java
rc/com/android/gallery3d/ui/AlbumSlotRenderer.java
rc/com/android/gallery3d/ui/GLCanvas.java
rc/com/android/gallery3d/ui/GLCanvasImpl.java
ests/src/com/android/gallery3d/ui/GLCanvasStub.java
|
c90a116a7fd65d41e8258dc7b9a14218649697e6 |
09-Aug-2012 |
Bobby Georgescu <georgescu@google.com> |
First gallery reskin iteration. Change-Id: I2b79ca9f40346a777141562c9a4762d7a8b460f6
es/layout/gl_root_group.xml
es/values-xlarge/dimensions.xml
es/values-xlarge/styles.xml
es/values/dimensions.xml
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/app/SlideshowPage.java
rc/com/android/gallery3d/ui/AlbumLabelMaker.java
rc/com/android/gallery3d/ui/AlbumSetSlotRenderer.java
rc/com/android/gallery3d/ui/AlbumSlotRenderer.java
rc/com/android/gallery3d/ui/GLCanvas.java
rc/com/android/gallery3d/ui/GLCanvasImpl.java
ests/src/com/android/gallery3d/ui/GLCanvasStub.java
|
60d93ec52ff8790c991d9c2f92bb27d0aa8431b4 |
09-Aug-2012 |
Baligh Uddin <baligh@google.com> |
Import translations. DO NOT MERGE Change-Id: If31f6b3c327b5d3fe83201b2456054d641f1e580 Auto-generated-cl: translation import
es/values-hi/strings.xml
|
72e2953aabd44ed6d0db9e8bcde40a9db0c875ae |
09-Aug-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
103509d112e24814df5064522b8d7856fb969d09 |
09-Aug-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Hold WakeLock during MTP import" into gb-ub-photos-arches
|
95591d2a17036cbc610a9ab586d5e66b8036edd0 |
09-Aug-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Hold WakeLock during MTP import" into gb-ub-photos-arches
|
9fde84052f44308046067c8f1c7ab9b24320dc70 |
09-Aug-2012 |
Owen Lin <owenlin@google.com> |
Merge "Rotate the texture in building PhotoFallbackEffect" into gb-ub-photos-arches
|
9dc7c9b8e1230b6461c5247513876cb10c0f1b07 |
09-Aug-2012 |
Owen Lin <owenlin@google.com> |
Merge "Rotate the texture in building PhotoFallbackEffect" into gb-ub-photos-arches
|
ee87994cca9e35444b17ba6c1c129cdc1cd998d4 |
08-Aug-2012 |
Pin Ting <pinting@google.com> |
Don't use getPreferredPreviewSizeForVideo and getSupportedVideoSizes before api 11. Bug:6927815 Change-Id: Ifaa154c93536cfcc65fb1c67834dc737f2065f11
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
|
2af39076c256030229f12427b60221b0cbfa85eb |
08-Aug-2012 |
Pin Ting <pinting@google.com> |
Don't use getPreferredPreviewSizeForVideo and getSupportedVideoSizes before api 11. Bug:6927815 Change-Id: Ifaa154c93536cfcc65fb1c67834dc737f2065f11
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
|
910935b67775d03def8769884bbac910892b6e24 |
08-Aug-2012 |
Pin Ting <pinting@google.com> |
Don't use getPreferredPreviewSizeForVideo and getSupportedVideoSizes before api 11. Bug:6927815 Change-Id: Ifaa154c93536cfcc65fb1c67834dc737f2065f11
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
|
30b81b134b9992cc55812e2c530817f9512dd999 |
08-Aug-2012 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with jb-mr1-release - do not merge Change-Id: I27aa18fe1f65a6c91d030dbae65c185c9b1680aa
|
605603f22fc9f4ced1e84f6d0a1d4bbdb295cc09 |
08-Aug-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
380414670b541d41216fde770b60a442bc72f642 |
08-Aug-2012 |
Owen Lin <owenlin@google.com> |
Rotate the texture in building PhotoFallbackEffect bug: 6525127 Change-Id: Iba348450b62190a1a2149cf0d7f20f19625cb6cf
rc/com/android/gallery3d/ui/PhotoView.java
|
38155c4f4dd6f0173337eb9f3fea54803192e229 |
08-Aug-2012 |
Owen Lin <owenlin@google.com> |
Rotate the texture in building PhotoFallbackEffect bug: 6525127 Change-Id: Iba348450b62190a1a2149cf0d7f20f19625cb6cf
rc/com/android/gallery3d/ui/PhotoView.java
|
b69655f5c12b599d5e9282dde56f82265e94a174 |
08-Aug-2012 |
Wu-cheng Li <wuchengli@google.com> |
Change minSdkVersion to 10. bug:6927809 Change-Id: I6dcea54d3204bca71975a2600ee704a7161bf0bc
ndroidManifest.xml
|
788d039b2fe8724916e228c86fbd73bd69a30797 |
08-Aug-2012 |
Wu-cheng Li <wuchengli@google.com> |
Change minSdkVersion to 10. bug:6927809 Change-Id: I6dcea54d3204bca71975a2600ee704a7161bf0bc
ndroidManifest.xml
|
40abc1752cbed25168f23b74b95b44b95f5ab110 |
07-Aug-2012 |
Earl Ou <shunhsingou@google.com> |
Check if the ExifParser paser every part in the test Change-Id: I1c58dfbbf74ada1d7f3d629ace4851d5022170f6
ests/src/com/android/gallery3d/exif/ExifParserTest.java
|
ebb149b1eba216020c4e95a7327c001870878396 |
07-Aug-2012 |
Earl Ou <shunhsingou@google.com> |
Check if the ExifParser paser every part in the test Change-Id: I1c58dfbbf74ada1d7f3d629ace4851d5022170f6
ests/src/com/android/gallery3d/exif/ExifParserTest.java
|
441606c1291d4042c298862683d268521bb881d6 |
07-Aug-2012 |
Earl Ou <shunhsingou@google.com> |
Fix ExifParser bug when APP0 exists in Jpeg file Change-Id: If5843757e00bc12bc50003eef3d78b9c3cedf69e
rc/com/android/gallery3d/exif/ExifParser.java
|
23ea2b53d9625471774dd219c36701b656c64616 |
07-Aug-2012 |
Earl Ou <shunhsingou@google.com> |
Fix ExifParser bug when APP0 exists in Jpeg file Change-Id: If5843757e00bc12bc50003eef3d78b9c3cedf69e
rc/com/android/gallery3d/exif/ExifParser.java
|
3fda31aa8d78ba7d4d323a6c111fb4bb33288573 |
08-Aug-2012 |
Earl Ou <shunhsingou@google.com> |
ignore uncompressed thumbnail when test exif thumbnail Change-Id: I32baae44994f3b113405082f55539e1a2a3db8bb
ests/src/com/android/gallery3d/exif/ExifParserTest.java
|
eb8418af087dd20696255b80a97182c2b4ecc0d8 |
08-Aug-2012 |
Earl Ou <shunhsingou@google.com> |
ignore uncompressed thumbnail when test exif thumbnail Change-Id: I32baae44994f3b113405082f55539e1a2a3db8bb
ests/src/com/android/gallery3d/exif/ExifParserTest.java
|
0d64f476c62215c7738655f62b89f93ac60c7fe2 |
08-Aug-2012 |
Earl Ou <shunhsingou@google.com> |
Handle error when string length=0 in IfdParser Change-Id: I3a51e85060f3acd5026555e5f8d21f8cb2e0641e
rc/com/android/gallery3d/exif/IfdParser.java
ests/src/com/android/gallery3d/exif/ExifParserTest.java
|
0ee84c4254d16b584e6f3bf11d6c658631c349c0 |
08-Aug-2012 |
Earl Ou <shunhsingou@google.com> |
Handle error when string length=0 in IfdParser Change-Id: I3a51e85060f3acd5026555e5f8d21f8cb2e0641e
rc/com/android/gallery3d/exif/IfdParser.java
ests/src/com/android/gallery3d/exif/ExifParserTest.java
|
a4b25ba430727beb07b6f75bb5edd8d57b8676e4 |
08-Aug-2012 |
Bobby Georgescu <georgescu@google.com> |
Hold WakeLock during MTP import Bug: 6680729 Bug: 6827858 Change-Id: Ida82db3288a429dacc5830b82ec6bbd954f75cf1
rc/com/android/gallery3d/app/ManageCachePage.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/ui/ImportCompleteListener.java
rc/com/android/gallery3d/ui/MenuExecutor.java
|
ba50b9420e64731fd5aa8b1410e1f36457a1635a |
08-Aug-2012 |
Bobby Georgescu <georgescu@google.com> |
Hold WakeLock during MTP import Bug: 6680729 Bug: 6827858 Change-Id: Ida82db3288a429dacc5830b82ec6bbd954f75cf1
rc/com/android/gallery3d/app/ManageCachePage.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/ui/ImportCompleteListener.java
rc/com/android/gallery3d/ui/MenuExecutor.java
|
cc09b72dd272717d4b805bc091893f8e2303567f |
07-Aug-2012 |
Owen Lin <owenlin@google.com> |
Guard the usage of MenuItem.setShowAsAction in MenuHelper. bug: 6927642 Change-Id: I3907ac2f86d38c15b681185abee5906ce243339a
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
|
4bbfbebdfb584a0c3e348f60f7a95476c43b67f6 |
07-Aug-2012 |
Owen Lin <owenlin@google.com> |
Guard the usage of MenuItem.setShowAsAction in MenuHelper. bug: 6927642 Change-Id: I3907ac2f86d38c15b681185abee5906ce243339a
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
rc/com/android/gallery3d/util/HelpUtils.java
|
ba04cb7a9c5e57a166f8057950711ec7b8da2ba4 |
07-Aug-2012 |
Owen Lin <owenlin@google.com> |
Guard the usage of MenuItem.setShowAsAction in MenuHelper. bug: 6927642 Change-Id: I3907ac2f86d38c15b681185abee5906ce243339a
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
rc/com/android/gallery3d/util/HelpUtils.java
|
6da4724e8d21e0e3df809a832c72365528959b27 |
08-Aug-2012 |
Pin Ting <pinting@google.com> |
Hide effect recording UI in ICS api level. Bug:6913179 Change-Id: I76e533fa04ac35a1e5b1ee54b9e120434e96ebbf
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
|
e242e1b75bbf2aff9cac6cae024829f215554046 |
08-Aug-2012 |
Pin Ting <pinting@google.com> |
Hide effect recording UI in ICS api level. Bug:6913179 Change-Id: I76e533fa04ac35a1e5b1ee54b9e120434e96ebbf
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
|
28038df8ccc1422541276974e9cf140fd4b76f1e |
08-Aug-2012 |
Pin Ting <pinting@google.com> |
Hide effect recording UI in ICS api level. Bug:6913179 Change-Id: I76e533fa04ac35a1e5b1ee54b9e120434e96ebbf
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
|
f16413f210f355229aa1271d21a70013da98362d |
07-Aug-2012 |
Wu-Cheng Li <wuchengli@google.com> |
Merge "Move motion event related methods to class MotionEventHelper." into gb-ub-photos-arches
|
6b06d7b738a31945d190fb44002f64540ae6c3ae |
07-Aug-2012 |
Wu-Cheng Li <wuchengli@google.com> |
Merge "Move motion event related methods to class MotionEventHelper." into gb-ub-photos-arches
|
e5607e00781d0870b716e39377d2639c3fbbf830 |
07-Aug-2012 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with jb-mr1-release - do not merge Change-Id: I32a5c466b503dd385266bdad3f4f003140a8df6c
|
61e6f7fc304a16c977ea37b35fc390f5db76b4f2 |
07-Aug-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
ab3625ea8cab1cc338578090feefeb642f109eca |
07-Aug-2012 |
Owen Lin <owenlin@android.com> |
Merge "1. add interoperability ifd in exif test and 2. add some log" into gb-ub-photos-arches
|
755388cd2caf8c537fb71cb833a606596854d65a |
07-Aug-2012 |
Owen Lin <owenlin@android.com> |
Merge "1. add interoperability ifd in exif test and 2. add some log" into gb-ub-photos-arches
|
077aca8984fb00b34c6cb0e72968808fad4a48d0 |
07-Aug-2012 |
Owen Lin <owenlin@android.com> |
Merge "Change Thumbnail test for ExifParser when there is no thumbnail or thumbnail's information" into gb-ub-photos-arches
|
185012b4124717a8510fc391087580c517e98607 |
07-Aug-2012 |
Owen Lin <owenlin@android.com> |
Merge "Change Thumbnail test for ExifParser when there is no thumbnail or thumbnail's information" into gb-ub-photos-arches
|
5d6c49fbc92f29ad4311ca747c5eba4df84fb74a |
07-Aug-2012 |
Owen Lin <owenlin@android.com> |
Merge "Use hex to represent unknown type and byte type for ExifParser debugging" into gb-ub-photos-arches
|
11a66c3f1b710eac3080b6247a5ac810b430819b |
07-Aug-2012 |
Owen Lin <owenlin@android.com> |
Merge "Use hex to represent unknown type and byte type for ExifParser debugging" into gb-ub-photos-arches
|
57b74ccd37271a894886f3acf2ba3201493caa87 |
07-Aug-2012 |
Owen Lin <owenlin@android.com> |
Merge "1. Use xml to record true data for ExifParserTest 2. A ExifTestRunner" into gb-ub-photos-arches
|
31ddc8bfba254e7d36bc541aa9274818a761cef4 |
07-Aug-2012 |
Owen Lin <owenlin@android.com> |
Merge "1. Use xml to record true data for ExifParserTest 2. A ExifTestRunner" into gb-ub-photos-arches
|
d1975270b68e8b2513bdcf78b4451ddcbd3964fd |
07-Aug-2012 |
Ahbong Chang <cwahbong@google.com> |
Move motion event related methods to class MotionEventHelper. Bug: 6943189 Change-Id: I9084cc8ebb501a5b772ed4e00bd64a3b2e8bafb3
rc/com/android/gallery3d/ui/GLRootView.java
rc/com/android/gallery3d/util/MotionEventHelper.java
|
8fedc27c552424cc5d8e72783bd53f38538190e9 |
07-Aug-2012 |
Ahbong Chang <cwahbong@google.com> |
Move motion event related methods to class MotionEventHelper. Bug: 6943189 Change-Id: I9084cc8ebb501a5b772ed4e00bd64a3b2e8bafb3
rc/com/android/gallery3d/ui/GLRootView.java
rc/com/android/gallery3d/util/MotionEventHelper.java
|
29eddab2166a684c670b99da9b87808745693c17 |
07-Aug-2012 |
Earl Ou <shunhsingou@google.com> |
Use hex to represent unknown type and byte type for ExifParser debugging Change-Id: I1d63698a34cc2c582e3c9c1a117231489ea9e3a2
ests/res/xml/galaxy_nexus.xml
|
907cc18f1210d21a58c5f7852548493896b160b2 |
06-Aug-2012 |
Earl Ou <shunhsingou@google.com> |
1. Use xml to record true data for ExifParserTest 2. A ExifTestRunner Change-Id: I6f0133a42670f5f4cbfa37a06bac41a8f6beceef
ests/AndroidManifest.xml
|
c61cc7c10e6b4f9453314a51e39296bbd40b3cc5 |
07-Aug-2012 |
Earl Ou <shunhsingou@google.com> |
1. add interoperability ifd in exif test and 2. add some log Change-Id: I888d856a17e59754d5a43b10ec8c4d30b582c503
ests/src/com/android/gallery3d/exif/ExifParserTest.java
|
1156d3887da5cb11ab04cd6cf1d1ce2f12ccc00e |
07-Aug-2012 |
Earl Ou <shunhsingou@google.com> |
1. add interoperability ifd in exif test and 2. add some log Change-Id: I888d856a17e59754d5a43b10ec8c4d30b582c503
ests/src/com/android/gallery3d/exif/ExifParserTest.java
|
fd3a9b84992ec78ea431d346fdc7870f54d3e1cc |
07-Aug-2012 |
Earl Ou <shunhsingou@google.com> |
Change Thumbnail test for ExifParser when there is no thumbnail or thumbnail's information Change-Id: Iabd632612895051ee73b776616355bf5e3680d34
ests/src/com/android/gallery3d/exif/ExifParserTest.java
|
052298ac6fe91cd9c7939baeb5fe970367673da9 |
07-Aug-2012 |
Earl Ou <shunhsingou@google.com> |
Change Thumbnail test for ExifParser when there is no thumbnail or thumbnail's information Change-Id: Iabd632612895051ee73b776616355bf5e3680d34
ests/src/com/android/gallery3d/exif/ExifParserTest.java
|
81ed85086cf9b4e4c7113227a00b42813fd9407b |
07-Aug-2012 |
Earl Ou <shunhsingou@google.com> |
Use hex to represent unknown type and byte type for ExifParser debugging Change-Id: I1d63698a34cc2c582e3c9c1a117231489ea9e3a2
ests/src/com/android/gallery3d/exif/ExifParserTest.java
|
07d72dd54106d24136ed520557c04e69989f054d |
07-Aug-2012 |
Earl Ou <shunhsingou@google.com> |
Use hex to represent unknown type and byte type for ExifParser debugging Change-Id: I1d63698a34cc2c582e3c9c1a117231489ea9e3a2
ests/res/xml/galaxy_nexus.xml
ests/src/com/android/gallery3d/exif/ExifParserTest.java
|
808df821a29ad8e84bfc24f7e47668cbd72a6d34 |
06-Aug-2012 |
Earl Ou <shunhsingou@google.com> |
1. Use xml to record true data for ExifParserTest 2. A ExifTestRunner Change-Id: I6f0133a42670f5f4cbfa37a06bac41a8f6beceef
ests/src/com/android/gallery3d/exif/ExifParserTest.java
ests/src/com/android/gallery3d/exif/ExifTestRunner.java
|
fa0639a373f97818f0d477c2067a0c5c5c7dd86a |
06-Aug-2012 |
Earl Ou <shunhsingou@google.com> |
1. Use xml to record true data for ExifParserTest 2. A ExifTestRunner Change-Id: I6f0133a42670f5f4cbfa37a06bac41a8f6beceef
ests/AndroidManifest.xml
ests/res/raw/galaxy_nexus.jpg
ests/res/raw/test_galaxy_nexus.jpg
ests/res/xml/galaxy_nexus.xml
ests/src/com/android/gallery3d/exif/ExifParserTest.java
ests/src/com/android/gallery3d/exif/ExifTestRunner.java
|
b8efaa090f3500057ae95e2ef8710d3ec4d69d3f |
06-Aug-2012 |
Earl Ou <shunhsingou@google.com> |
1. Use xml to record true data for ExifParserTest 2. A ExifTestRunner Change-Id: I6f0133a42670f5f4cbfa37a06bac41a8f6beceef
ests/res/raw/galaxy_nexus.jpg
ests/res/raw/test_galaxy_nexus.jpg
ests/res/xml/galaxy_nexus.xml
|
fbf6dbaf20e1508f19468c33021813d078afdb35 |
07-Aug-2012 |
Angus Kong <shkong@google.com> |
Add check for using SurfaceTexture when recording. bug:6839752 Change-Id: Iafc6535fe057c7cd34264c6b104d2326e2f56a89
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
|
1e0f6e9760727d78bca4d861c1013ae78cddb5e5 |
07-Aug-2012 |
Angus Kong <shkong@google.com> |
Add check for using SurfaceTexture when recording. bug:6839752 Change-Id: Iafc6535fe057c7cd34264c6b104d2326e2f56a89
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
|
4e9b8e44bfe9c15e80ed60ce1b99520ed72ce764 |
07-Aug-2012 |
Angus Kong <shkong@google.com> |
Add check for using SurfaceTexture when recording. bug:6839752 Change-Id: Iafc6535fe057c7cd34264c6b104d2326e2f56a89
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
|
b0102e910a3917b0ea8caba9c9d5b0e344b7a3e5 |
06-Aug-2012 |
Yuli Huang <yuli@google.com> |
Do not show photo editor before api level 14. bug:6927717 Change-Id: Iab0fddaa169e03b65dd0a987ee8b5c892f971000
ndroidManifest.xml
|
5926da91e2cf4005cc2c7e89fe297d05a4b630c3 |
06-Aug-2012 |
Yuli Huang <yuli@google.com> |
Do not show photo editor before api level 14. bug:6927717 Change-Id: Iab0fddaa169e03b65dd0a987ee8b5c892f971000
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
rc/com/android/gallery3d/app/GalleryAppImpl.java
|
778ec3597e00cd048224b2c393e2d925bfb27c57 |
06-Aug-2012 |
Yuli Huang <yuli@google.com> |
Do not show photo editor before api level 14. bug:6927717 Change-Id: Iab0fddaa169e03b65dd0a987ee8b5c892f971000
ndroidManifest.xml
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
rc/com/android/gallery3d/app/GalleryAppImpl.java
|
51fbbcf9abe7528ee4b8d083fa3b6c2426e69688 |
06-Aug-2012 |
Yuli Huang <yuli@google.com> |
Do not show photo editor before api level 14. bug:6927717 Change-Id: Iab0fddaa169e03b65dd0a987ee8b5c892f971000
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
|
0ffaf13005ae33a09537459205901d9d073873f5 |
07-Aug-2012 |
Wu-cheng Li <wuchengli@google.com> |
Add API check for surface texture. bug:6927809 Change-Id: I4b08df6670337592bb0ac1c2cf1235af085e9a1d
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
|
211807ba43ac5a93e94130a1256cc0423fff0e37 |
07-Aug-2012 |
Wu-cheng Li <wuchengli@google.com> |
Add API check for surface texture. bug:6927809 Change-Id: I4b08df6670337592bb0ac1c2cf1235af085e9a1d
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
|
8df785a5c11d728892102f0faefc0d3c719bc207 |
07-Aug-2012 |
Wu-cheng Li <wuchengli@google.com> |
Add API check for surface texture. bug:6927809 Change-Id: I4b08df6670337592bb0ac1c2cf1235af085e9a1d
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
|
f64370b97c30338f8231aadf8386b4669d1dffbf |
06-Aug-2012 |
Earl Ou <shunhsingou@google.com> |
Add all ExifTag constant Change-Id: I8a5309cdb1d216c80df9b88973a3b72a5cf9a80f
rc/com/android/gallery3d/exif/ExifTag.java
|
346622b46b955b898f1d9b6db559c834a6299b8b |
06-Aug-2012 |
Earl Ou <shunhsingou@google.com> |
Add all ExifTag constant Change-Id: I8a5309cdb1d216c80df9b88973a3b72a5cf9a80f
rc/com/android/gallery3d/exif/ExifTag.java
|
2537905fa993c6f387d4fddece9d195d1950cdff |
07-Aug-2012 |
Owen Lin <owenlin@android.com> |
Merge "use InstrumentationTestCase for ExifParserTest" into gb-ub-photos-arches
|
355de374b040bbc218028b6dc0ce6412d75fc5da |
07-Aug-2012 |
Owen Lin <owenlin@android.com> |
Merge "use InstrumentationTestCase for ExifParserTest" into gb-ub-photos-arches
|
b69961bc531bbd402c32f55ab9de881131839813 |
07-Aug-2012 |
Owen Lin <owenlin@android.com> |
Merge "Remove TYPE_SUB_IFD for next() in IfdParser" into gb-ub-photos-arches
|
8f2806d762ca4c4a91b4158e7693fd40050ef393 |
07-Aug-2012 |
Owen Lin <owenlin@android.com> |
Merge "Remove TYPE_SUB_IFD for next() in IfdParser" into gb-ub-photos-arches
|
1b6f064cd4c3993b60dda00146d15dfb001aade3 |
07-Aug-2012 |
Owen Lin <owenlin@android.com> |
Merge "Check number of exif tag in test" into gb-ub-photos-arches
|
747879219a637b1dee37696df035dcb303b187f2 |
07-Aug-2012 |
Owen Lin <owenlin@android.com> |
Merge "Check number of exif tag in test" into gb-ub-photos-arches
|
138887d13f8c154462d87ccec050b2e541d98341 |
07-Aug-2012 |
Owen Lin <owenlin@android.com> |
Merge "Test read thumbnail" into gb-ub-photos-arches
|
b56f91f1e3e5ba474186f852f16a30b5366e5f4d |
07-Aug-2012 |
Owen Lin <owenlin@android.com> |
Merge "Test read thumbnail" into gb-ub-photos-arches
|
eb311f5725171f97868acad2f3567b1fe7481e67 |
07-Aug-2012 |
Owen Lin <owenlin@android.com> |
Merge "fix next ifd bug in ExifParser" into gb-ub-photos-arches
|
6e2c8bb73cfcb4f0401231db1fa4af097e754300 |
07-Aug-2012 |
Owen Lin <owenlin@android.com> |
Merge "fix next ifd bug in ExifParser" into gb-ub-photos-arches
|
351f3467bd976465727a3a867e8adccd9aadb0ad |
07-Aug-2012 |
Owen Lin <owenlin@android.com> |
Merge "Fix bug when call next() after nextidf in exif parser" into gb-ub-photos-arches
|
ec6da4a15e8db7093fd2d97432906f2da87f3cc7 |
07-Aug-2012 |
Owen Lin <owenlin@android.com> |
Merge "Fix bug when call next() after nextidf in exif parser" into gb-ub-photos-arches
|
f5592d983ebb0a1bb9822b6aed0f2935a581cfbd |
07-Aug-2012 |
Owen Lin <owenlin@android.com> |
Merge "Test only keep some exif tags for value" into gb-ub-photos-arches
|
f10af23ef043c913a387f179f3bb12cffeca0f00 |
07-Aug-2012 |
Owen Lin <owenlin@android.com> |
Merge "Test only keep some exif tags for value" into gb-ub-photos-arches
|
fd7cfc4f038a78de489cbe1a37a6c1cde84504d1 |
06-Aug-2012 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with jb-mr1-release - do not merge Change-Id: I777141c45361238f717e457d3af3f75e268c1fcc
|
e9c0f94634647e8d05d8f4b731f6548630320c48 |
06-Aug-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
4f5541c245076b89a9cb2e2d4b451c7f5dcb6e1a |
03-Aug-2012 |
Earl Ou <shunhsingou@google.com> |
use InstrumentationTestCase for ExifParserTest because we don't need to test Activity Change-Id: I3d21f7f5ca05cffba3bd2cd54c5899255e1103c1
ests/src/com/android/gallery3d/exif/ExifParserTest.java
|
015bc4005e6fbb7ab9540071102a9faff19a7b04 |
03-Aug-2012 |
Earl Ou <shunhsingou@google.com> |
use InstrumentationTestCase for ExifParserTest because we don't need to test Activity Change-Id: I3d21f7f5ca05cffba3bd2cd54c5899255e1103c1
ests/src/com/android/gallery3d/exif/ExifParserTest.java
|
bdcdb15ad345633bbab6505207008f018059f107 |
03-Aug-2012 |
Earl Ou <shunhsingou@google.com> |
Remove TYPE_SUB_IFD for next() in IfdParser We should not read the offset because there are too many exception. Users should check the id of the tag and decide how to read the block by themselves. Change-Id: Ie3f162c5c6dc25f15107e193adc080c7b51112b5
rc/com/android/gallery3d/exif/ExifTag.java
rc/com/android/gallery3d/exif/IfdParser.java
ests/src/com/android/gallery3d/exif/ExifParserTest.java
|
24b08ee2f57fd58c72cc010ad6040f0a0fd363d9 |
03-Aug-2012 |
Earl Ou <shunhsingou@google.com> |
Remove TYPE_SUB_IFD for next() in IfdParser We should not read the offset because there are too many exception. Users should check the id of the tag and decide how to read the block by themselves. Change-Id: Ie3f162c5c6dc25f15107e193adc080c7b51112b5
rc/com/android/gallery3d/exif/ExifTag.java
rc/com/android/gallery3d/exif/IfdParser.java
ests/src/com/android/gallery3d/exif/ExifParserTest.java
|
9fae341c1a958285d93d86698ea7ff28dc4bde89 |
02-Aug-2012 |
Earl Ou <shunhsingou@google.com> |
Check number of exif tag in test Change-Id: Ic84c7c004fe0ab5fcea9a0cc6e7f9d86db61abd8
ests/src/com/android/gallery3d/exif/ExifParserTest.java
|
6b504911a9944bd78ffed093b7d3d806172751d2 |
02-Aug-2012 |
Earl Ou <shunhsingou@google.com> |
Check number of exif tag in test Change-Id: Ic84c7c004fe0ab5fcea9a0cc6e7f9d86db61abd8
ests/src/com/android/gallery3d/exif/ExifParserTest.java
|
04504616c1b187ef67304cd5daf2123fae75e23c |
02-Aug-2012 |
Earl Ou <shunhsingou@google.com> |
Test read thumbnail Change-Id: I2f7add7e3c9fc6ffe8c75f191f4b0322bc3047d5
ests/src/com/android/gallery3d/exif/ExifParserTest.java
|
f2fb2500bb07f756050e5e211e02b94d73633a97 |
02-Aug-2012 |
Earl Ou <shunhsingou@google.com> |
Test read thumbnail Change-Id: I2f7add7e3c9fc6ffe8c75f191f4b0322bc3047d5
ests/src/com/android/gallery3d/exif/ExifParserTest.java
|
3da2799ea9bc7b711b164167d09bdda0bd8fee6f |
02-Aug-2012 |
Earl Ou <shunhsingou@google.com> |
fix next ifd bug in ExifParser Originally if we don't read value of tag we won't get 'NEXT_IFD' Change-Id: I235977b3b482fbc4736c244d280c384c26df6483
rc/com/android/gallery3d/exif/IfdParser.java
|
8bf999c568660e7b27c9952d29bcf60ed3bf7739 |
02-Aug-2012 |
Earl Ou <shunhsingou@google.com> |
fix next ifd bug in ExifParser Originally if we don't read value of tag we won't get 'NEXT_IFD' Change-Id: I235977b3b482fbc4736c244d280c384c26df6483
rc/com/android/gallery3d/exif/IfdParser.java
|
52f093f1b7b99622c35931f0af47349d32a67e19 |
01-Aug-2012 |
Earl Ou <shunhsingou@google.com> |
Fix bug when call next() after nextidf in exif parser Change-Id: Ibb0204627418f8fa650ce32e798a768da7762d59
rc/com/android/gallery3d/exif/IfdParser.java
|
3ebec4bb830b61c365849972d0b7d4aa1bb91adb |
01-Aug-2012 |
Earl Ou <shunhsingou@google.com> |
Fix bug when call next() after nextidf in exif parser Change-Id: Ibb0204627418f8fa650ce32e798a768da7762d59
rc/com/android/gallery3d/exif/IfdParser.java
|
3624abec1cb3f795554b983936e99deaf2d2a09d |
04-Aug-2012 |
Nick Kralevich <nnk@google.com> |
Explicitly export content providers In a future version of Android, the default value for <provider android:exported> will change from true to false. Explicitly set android:exported="true" Bug: 3306452 Change-Id: Ic5d3152988ed6a576501830338ec324f056921c4
ndroidManifest.xml
|
e8e80ba0801b78593ff5849d5352f99664dbce5d |
04-Aug-2012 |
Nick Kralevich <nnk@google.com> |
Explicitly export content providers In a future version of Android, the default value for <provider android:exported> will change from true to false. Explicitly set android:exported="true" Bug: 3306452 Change-Id: Ic5d3152988ed6a576501830338ec324f056921c4
ndroidManifest.xml
|
dabfa4c76ea265d3e5a50711612ec55230a93b98 |
03-Aug-2012 |
Doris Liu <tianliu@google.com> |
Merge "Add logging for monkey" into gb-ub-photos-arches
|
accda65c07c02bdf63c13492d5cd7694bfd94833 |
03-Aug-2012 |
Doris Liu <tianliu@google.com> |
Merge "Add logging for monkey" into gb-ub-photos-arches
|
a10412773da774666363aa9b3cd811d78d7f16a7 |
03-Aug-2012 |
Wu-cheng Li <wuchengli@google.com> |
TargetApi of ShareActionProvider should be ICS. bug:6706723 Change-Id: I8d82662c4bdd44f970cb93b9986208e5f4db3c31
rc/com/android/gallery3d/app/MovieActivity.java
|
c8abaf283b5123fa1b0c69d8feac168337a7e0a4 |
03-Aug-2012 |
Wu-cheng Li <wuchengli@google.com> |
TargetApi of ShareActionProvider should be ICS. bug:6706723 Change-Id: I8d82662c4bdd44f970cb93b9986208e5f4db3c31
rc/com/android/gallery3d/app/MovieActivity.java
|
e4554024a216d853f81301e4747c260cd64ee271 |
03-Aug-2012 |
Doris Liu <tianliu@google.com> |
Add logging for monkey Bug: 6495745 Change-Id: Ib24ba3dd6a887259c5e6083ca5eb270a0bd4e801
rc/com/android/gallery3d/data/MediaObject.java
|
eb8561c88dd966486001b0405f94aed43d8bfa52 |
03-Aug-2012 |
Doris Liu <tianliu@google.com> |
Add logging for monkey Bug: 6495745 Change-Id: Ib24ba3dd6a887259c5e6083ca5eb270a0bd4e801
rc/com/android/gallery3d/data/MediaObject.java
|
fe8367e6f1c5e28a8e01f1c4c3e3e07884a3d762 |
28-Jul-2012 |
Mangesh Ghiware <mghiware@google.com> |
Show the correct image on a ACTION_VIEW Bug: 6819100 Change-Id: I7c381c506fa627c3f285fb6857b77cdb770addb7
rc/com/android/gallery3d/app/PhotoDataAdapter.java
|
3000f70d462f27ddf992a50b57db2ef9c8dcac15 |
28-Jul-2012 |
Mangesh Ghiware <mghiware@google.com> |
Show the correct image on a ACTION_VIEW Bug: 6819100 Change-Id: I7c381c506fa627c3f285fb6857b77cdb770addb7
rc/com/android/gallery3d/app/PhotoDataAdapter.java
|
33c29e6d953aa8c8296d740791042090b82949cd |
02-Aug-2012 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with jb-mr1-release - do not merge Change-Id: Ica41c06fcca0136f9270601759ec5d5f02a5ed32
|
ef306de9242f353baf995d758291aa9bbc36fbfd |
02-Aug-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
ac77bcc7dd61a73297fec25d5b8d8a18154e39c5 |
01-Aug-2012 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with jb-mr1-release - do not merge Change-Id: I623977c46ebcdd6843dfe146e67acc1bc306982b
|
44158eaedb9e05a0ad09e3bcdc69ba0306c6566b |
01-Aug-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
0b144ee37ec84b53e2ac97ead8c0e70b527cadd3 |
01-Aug-2012 |
Wu-cheng Li <wuchengli@google.com> |
Fix typo of datetaken field. Change-Id: I3d53388696101178598910d0b73444988408cbc3
rc/com/android/gallery3d/data/BucketHelper.java
|
042a8366f79693ec3ac572afd25d877f48949a63 |
01-Aug-2012 |
Wu-cheng Li <wuchengli@google.com> |
Fix typo of datetaken field. Change-Id: I3d53388696101178598910d0b73444988408cbc3
rc/com/android/gallery3d/data/BucketHelper.java
|
a52297793ac4a2a719023446fd63e4ecff86fffb |
01-Aug-2012 |
Wu-cheng Li <wuchengli@google.com> |
Merge "Change minSdkVersion to 11." into gb-ub-photos-arches
|
4285894ea4facfae76ff57df97f4fd8342608bd4 |
01-Aug-2012 |
Earl Ou <shunhsingou@google.com> |
Test only keep some exif tags for value Change-Id: I06962ffb4e1c6844cc8c0d24b686571483f16c22
ests/src/com/android/gallery3d/exif/ExifParserTest.java
|
7d8caf1774c61657bb3fbe63acc3e2749115b3a3 |
01-Aug-2012 |
Earl Ou <shunhsingou@google.com> |
Test only keep some exif tags for value Change-Id: I06962ffb4e1c6844cc8c0d24b686571483f16c22
ests/src/com/android/gallery3d/exif/ExifParserTest.java
|
1819ed3baf83be8476ba82f7854f5c2d17c0fcf0 |
01-Aug-2012 |
Earl Ou <shunhsingou@google.com> |
Merge "Test skip to next ifd in ExifParserTest" into gb-ub-photos-arches
|
7559565c93def2b410b7b4a317501b43d65ca397 |
01-Aug-2012 |
Earl Ou <shunhsingou@google.com> |
Merge "Test skip to next ifd in ExifParserTest" into gb-ub-photos-arches
|
98ad41f842f8f926bb44a4f9bb03492e26eb0346 |
01-Aug-2012 |
Earl Ou <shunhsingou@google.com> |
Merge "ExifParserTest" into gb-ub-photos-arches
|
6b2598542c0650fe9acd94df29fb09a7ba10264a |
01-Aug-2012 |
Earl Ou <shunhsingou@google.com> |
Merge "ExifParserTest" into gb-ub-photos-arches
|
04d5e24fac892e2fd8be4fad4d2545066132a518 |
01-Aug-2012 |
Earl Ou <shunhsingou@google.com> |
Merge "ExifParserTest" into gb-ub-photos-arches
|
c29549176f059e5955627c4349c73ab94ecbd32a |
01-Aug-2012 |
Earl Ou <shunhsingou@google.com> |
Merge "Add some constants for exif tag" into gb-ub-photos-arches
|
af0df741c51a2b571a10b7d16d46f251b7346660 |
01-Aug-2012 |
Earl Ou <shunhsingou@google.com> |
Merge "Add some constants for exif tag" into gb-ub-photos-arches
|
7fbdc58ae8938ea77655e97fdc2235a097d61c7f |
01-Aug-2012 |
Earl Ou <shunhsingou@google.com> |
Merge "Fix a bug in IfdParser" into gb-ub-photos-arches
|
3697070673be6cafbed0aeb54b6127a67ca9ac8c |
01-Aug-2012 |
Earl Ou <shunhsingou@google.com> |
Merge "Fix a bug in IfdParser" into gb-ub-photos-arches
|
dbbfed236dc1bb81826ea87e9e2cd09aa141cb8d |
01-Aug-2012 |
Earl Ou <shunhsingou@google.com> |
Test skip to next ifd in ExifParserTest Change-Id: Icc53e75d563acb304c23349c28d604d439b4b314
ests/src/com/android/gallery3d/exif/ExifParserTest.java
|
c72fad97373f07b8aa52740104e751d4f440ee72 |
01-Aug-2012 |
Earl Ou <shunhsingou@google.com> |
Test skip to next ifd in ExifParserTest Change-Id: Icc53e75d563acb304c23349c28d604d439b4b314
ests/src/com/android/gallery3d/exif/ExifParserTest.java
|
5a860df750540060d97b365c14222696e8af40f1 |
01-Aug-2012 |
Earl Ou <shunhsingou@google.com> |
ExifParserTest test basic parse function of ExifParser Change-Id: I4dbe9231917c205b0cb95aab639744ce0debbec8
ests/res/raw/test_galaxy_nexus.jpg
|
fb11e05fff4b17f0954ce3be96e5c4b5e478ba57 |
01-Aug-2012 |
Earl Ou <shunhsingou@google.com> |
ExifParserTest test basic parse function of ExifParser Change-Id: I4dbe9231917c205b0cb95aab639744ce0debbec8
ests/src/com/android/gallery3d/exif/ExifParserTest.java
|
6131e77599056a9f1a19d6e4a71d191594b89805 |
01-Aug-2012 |
Earl Ou <shunhsingou@google.com> |
ExifParserTest test basic parse function of ExifParser Change-Id: I4dbe9231917c205b0cb95aab639744ce0debbec8
ests/res/raw/test_galaxy_nexus.jpg
ests/src/com/android/gallery3d/exif/ExifParserTest.java
|
6ae93dbed7938eccdb5273dfc6655d65a9546343 |
31-Jul-2012 |
Owen Lin <owenlin@google.com> |
Don't use Files.getContentUri in previous API levels. Change-Id: I4d096734d22c93b83b2bf8082450ad0d73ade837
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
|
29446731c8cfa6e0456fe8b39fc3ce21c69207a6 |
31-Jul-2012 |
Owen Lin <owenlin@google.com> |
Don't use Files.getContentUri in previous API levels. Change-Id: I4d096734d22c93b83b2bf8082450ad0d73ade837
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
rc/com/android/gallery3d/data/BucketHelper.java
rc/com/android/gallery3d/data/LocalAlbum.java
rc/com/android/gallery3d/data/LocalAlbumSet.java
rc/com/android/gallery3d/data/LocalMergeAlbum.java
|
90df352389eda7c964e6a43a0b752d27f16e02a7 |
31-Jul-2012 |
Owen Lin <owenlin@google.com> |
Don't use Files.getContentUri in previous API levels. Change-Id: I4d096734d22c93b83b2bf8082450ad0d73ade837
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
rc/com/android/gallery3d/data/BucketHelper.java
rc/com/android/gallery3d/data/LocalAlbum.java
rc/com/android/gallery3d/data/LocalAlbumSet.java
rc/com/android/gallery3d/data/LocalMergeAlbum.java
|
e7e234f2d41dbf2d3a3d1bd7669d848f2c8ac66d |
01-Aug-2012 |
Owen Lin <owenlin@google.com> |
Merge "Remove /mtp from TOP_SET_PATH before HC." into gb-ub-photos-arches
|
4febde56c93bcc8662a56f2334718f1d1b1f6fff |
01-Aug-2012 |
Owen Lin <owenlin@google.com> |
Merge "Remove /mtp from TOP_SET_PATH before HC." into gb-ub-photos-arches
|
421069e798b7bca6fe4868c528edcf530abf3929 |
01-Aug-2012 |
Earl Ou <shunhsingou@google.com> |
Add some constants for exif tag Change-Id: I236f8187668bb144f47214b7241a873223111f9e
rc/com/android/gallery3d/exif/ExifTag.java
|
d8e698db7180658b1747daf7c7582a705a94ef98 |
01-Aug-2012 |
Earl Ou <shunhsingou@google.com> |
Add some constants for exif tag Change-Id: I236f8187668bb144f47214b7241a873223111f9e
rc/com/android/gallery3d/exif/ExifTag.java
|
d7a9a6cffb4663c4ed28c4205367cf3c41191e36 |
01-Aug-2012 |
Earl Ou <shunhsingou@google.com> |
Fix a bug in IfdParser Originally if we call next after the last tag without read the value, we will receive a wrong tag. Change-Id: Ib154d112a568c593270ee6676d4954a7c26567f2
rc/com/android/gallery3d/exif/IfdParser.java
|
0d5f1bb5b6b2c1d0c3d26c8cae1b322f29d4508d |
01-Aug-2012 |
Earl Ou <shunhsingou@google.com> |
Fix a bug in IfdParser Originally if we call next after the last tag without read the value, we will receive a wrong tag. Change-Id: Ib154d112a568c593270ee6676d4954a7c26567f2
rc/com/android/gallery3d/exif/IfdParser.java
|
876e2d37e7f4e69b5779683b68bf412df5a957d5 |
01-Aug-2012 |
Owen Lin <owenlin@google.com> |
Remove /mtp from TOP_SET_PATH before HC. bug: 6913061 Change-Id: Iecdb6452035b83070502977265a3e0d526ea784c
rc/com/android/gallery3d/data/DataManager.java
|
b200e27b998df8856bc060a9f418e662864458b2 |
01-Aug-2012 |
Owen Lin <owenlin@google.com> |
Remove /mtp from TOP_SET_PATH before HC. bug: 6913061 Change-Id: Iecdb6452035b83070502977265a3e0d526ea784c
rc/com/android/gallery3d/data/DataManager.java
|
0274197ce17a3f807a007d002998246fe5d66f56 |
01-Aug-2012 |
Wu-cheng Li <wuchengli@google.com> |
Change minSdkVersion to 11. Change-Id: If1f4ebb2850e80c965be4e664a67eb8023376926
ndroidManifest.xml
|
a50a00a8dfcc6f62812af2986b0bc855bd7d114f |
01-Aug-2012 |
Wu-cheng Li <wuchengli@google.com> |
Change minSdkVersion to 11. Change-Id: If1f4ebb2850e80c965be4e664a67eb8023376926
ndroidManifest.xml
|
db9e5096ccff45b72b546b2c2ed53704bdf79b59 |
01-Aug-2012 |
Owen Lin <owenlin@google.com> |
Merge "Suppress the warnings in EffectRecorder" into gb-ub-photos-arches
|
3f11bbe72c1245d981c3304b2b6a1a93de76edcf |
01-Aug-2012 |
Chih-Chung Chang <chihchung@google.com> |
Merge "Handle null item in findIndexOfPathInCache." into gb-ub-photos-arches
|
6608d900c702972a19e0f9e8526add7a8b522fd3 |
01-Aug-2012 |
Chih-Chung Chang <chihchung@google.com> |
Merge "Handle null item in findIndexOfPathInCache." into gb-ub-photos-arches
|
bfc04b862a7b0c8d8ebca377eac6cb2a73fd64c2 |
01-Aug-2012 |
Chih-Chung Chang <chihchung@google.com> |
Handle null item in findIndexOfPathInCache. Bug: 6708911 Change-Id: Ifd1e8342906a3c61d30448ea6b0085c37ccdeb03
rc/com/android/gallery3d/app/PhotoDataAdapter.java
|
0086dbabb383a9ba5e06a8b49e3e180bfa36a64b |
01-Aug-2012 |
Chih-Chung Chang <chihchung@google.com> |
Handle null item in findIndexOfPathInCache. Bug: 6708911 Change-Id: Ifd1e8342906a3c61d30448ea6b0085c37ccdeb03
rc/com/android/gallery3d/app/PhotoDataAdapter.java
|
c603e749e4332e86a02ba6a934c66665930ea45e |
01-Aug-2012 |
Owen Lin <owenlin@google.com> |
Suppress the warnings in EffectRecorder Change-Id: I29d8348f40c35e720ab230e2c599bf8a8ff2a953
roguard.flags
|
1a2b42ccdff80c6bec680d56e6d00a5b4ecc7dda |
01-Aug-2012 |
Owen Lin <owenlin@google.com> |
Suppress the warnings in EffectRecorder Change-Id: I29d8348f40c35e720ab230e2c599bf8a8ff2a953
roguard.flags
|
466bad26640724d7f61edb8c87cca5dba9b2aa67 |
19-Jul-2012 |
Wu-cheng Li <wuchengli@google.com> |
Do not use ShareActionProvider before API 14. Use simple share intent before API 14. bug:6706723 Change-Id: I47930f0b81c7c8c1943054964a093967a7704bf1
es/menu/movie.xml
es/menu/operation.xml
es/menu/photo.xml
|
319e47a40cb1ff7bed70c1659c316af1041516ad |
19-Jul-2012 |
Wu-cheng Li <wuchengli@google.com> |
Do not use ShareActionProvider before API 14. Use simple share intent before API 14. bug:6706723 Change-Id: I47930f0b81c7c8c1943054964a093967a7704bf1
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
|
fb5571987f2555b04731b6f3e1c479efc16d542a |
19-Jul-2012 |
Wu-cheng Li <wuchengli@google.com> |
Do not use ShareActionProvider before API 14. Use simple share intent before API 14. bug:6706723 Change-Id: I47930f0b81c7c8c1943054964a093967a7704bf1
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
es/menu/movie.xml
es/menu/operation.xml
es/menu/photo.xml
rc/com/android/gallery3d/app/GalleryActionBar.java
rc/com/android/gallery3d/app/MovieActivity.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/ui/ActionModeHandler.java
rc/com/android/gallery3d/ui/MenuExecutor.java
|
48ab020fa10500cb89d67782abd824d26339acfa |
19-Jul-2012 |
Wu-cheng Li <wuchengli@google.com> |
Do not use ShareActionProvider before API 14. Use simple share intent before API 14. bug:6706723 Change-Id: I47930f0b81c7c8c1943054964a093967a7704bf1
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
rc/com/android/gallery3d/app/GalleryActionBar.java
rc/com/android/gallery3d/app/MovieActivity.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/ui/ActionModeHandler.java
rc/com/android/gallery3d/ui/MenuExecutor.java
|
eea522754d385c30d1918ab27c52e09d631ac7be |
31-Jul-2012 |
Chih-Chung Chang <chihchung@google.com> |
Manually transform the event coordinates on older platforms. Change-Id: I070b27112ea028f2a1596dcdfa480537765174b9
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
rc/com/android/gallery3d/ui/GLRootView.java
|
abf0ea68634c1d21870c48297ab6898491e0c56f |
31-Jul-2012 |
Chih-Chung Chang <chihchung@google.com> |
Manually transform the event coordinates on older platforms. Change-Id: I070b27112ea028f2a1596dcdfa480537765174b9
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
rc/com/android/gallery3d/ui/GLRootView.java
|
ebd718780e2439cf30ba124b66c24f5253deedb2 |
31-Jul-2012 |
Chih-Chung Chang <chihchung@google.com> |
Manually transform the event coordinates on older platforms. Change-Id: I070b27112ea028f2a1596dcdfa480537765174b9
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
|
4756768db7866b9046dd0b7cc23f82273fbd4a7b |
01-Aug-2012 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with jb-mr1-release - do not merge Change-Id: I71f44d5cbc8d472de454bcee33de8cc5879776de
|
34deadcda01cf4d33eade2590df226895b70243e |
31-Jul-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Fix bugs 6882711 and 6836814" into gb-ub-photos-arches
|
12087cb18047940abd3fbad2c8b20d5017e9225b |
31-Jul-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Fix bugs 6882711 and 6836814" into gb-ub-photos-arches
|
80d807c37135a73e6c92aef3751a6436eb9e3c73 |
31-Jul-2012 |
The Android Open Source Project <initial-contribution@android.com> |
Sync with jb-mr1-dev Change-Id: I9a32d6562c1db5031763241e8624be666624b3e4
|
d4dfe1395e6e83c3fb815b955c6db2ddae2aa2f4 |
31-Jul-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
cd8e78b4e9393317854fc3553ea5fbd03a5557fa |
31-Jul-2012 |
Angus Kong <shkong@google.com> |
Add API check for camera metering area. bug:6881073 Change-Id: I08ea3bd8e6f128e8998f4048eb451cb80c342fe5
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
|
68cdf08079df14c4f121bc2bff5b65ab204e6a88 |
31-Jul-2012 |
Angus Kong <shkong@google.com> |
Add API check for camera metering area. bug:6881073 Change-Id: I08ea3bd8e6f128e8998f4048eb451cb80c342fe5
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
|
585663e31d75ad9fc4e681465fa0ad4cfd489b6a |
31-Jul-2012 |
Angus Kong <shkong@google.com> |
Add API check for camera metering area. bug:6881073 Change-Id: I08ea3bd8e6f128e8998f4048eb451cb80c342fe5
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
|
f7e86b3a54618d8b767d787661bcbb806abc3b42 |
31-Jul-2012 |
Ahbong Chang <cwahbong@google.com> |
Merge "Check api level before invoking setHomeButtonEnabled()." into gb-ub-photos-arches
|
636b8a77e6002c9827ab9886c1460c22cd18b217 |
31-Jul-2012 |
Ahbong Chang <cwahbong@google.com> |
Merge "Check api level before invoking setHomeButtonEnabled()." into gb-ub-photos-arches
|
2dbd6b0c73987566e8c980ef867a9795627ac41c |
31-Jul-2012 |
Owen Lin <owenlin@google.com> |
Merge "Fix some lint warnings in Gallery." into gb-ub-photos-arches
|
35bdc6ef998d33e3ee980b823a5bb456add72dfe |
31-Jul-2012 |
Owen Lin <owenlin@google.com> |
Merge "Fix some lint warnings in Gallery." into gb-ub-photos-arches
|
30d70764999fa00b335502d269e5a170a0f2843e |
31-Jul-2012 |
Owen Lin <owenlin@google.com> |
Merge "Fix some lint warnings in Gallery." into gb-ub-photos-arches
|
89e7975ade04cea9df6dff285fe1c74425e4df7f |
31-Jul-2012 |
Ahbong Chang <cwahbong@google.com> |
Check api level before invoking setHomeButtonEnabled(). Bug: 6706785 Change-Id: I2ad4d4961705c38a4d1047732f45dc9c69580782
rc/com/android/gallery3d/app/GalleryActionBar.java
|
329a202d49247dd4f496e493d9b0892185dbf3a5 |
31-Jul-2012 |
Ahbong Chang <cwahbong@google.com> |
Check api level before invoking setHomeButtonEnabled(). Bug: 6706785 Change-Id: I2ad4d4961705c38a4d1047732f45dc9c69580782
rc/com/android/gallery3d/app/GalleryActionBar.java
|
b676383b7fb40ec07f19ae5193d110f4a55ea84f |
31-Jul-2012 |
Pin Ting <pinting@google.com> |
Merge "Don't use QUALITY_xxxP and hasProfile prior to API level 11." into gb-ub-photos-arches
|
43a8826d61d4cc66ed2faa7e0c60fd00175f9be9 |
31-Jul-2012 |
Earl Ou <shunhsingou@google.com> |
Merge "Fix Gallery2Tests Build" into gb-ub-photos-arches
|
d0af76e010fd959b1e97ef8e3a9e96dd50343db7 |
31-Jul-2012 |
Earl Ou <shunhsingou@google.com> |
Fix Gallery2Tests Build Remove dependancy of android-test-runner in Android.mk Also LOCAL_SDK_VERSION is needed in Android.mk for unbundle-branches to avoid hiden api Change-Id: I38cef8261aab264fe5a109ca5a6857eee3dff11b
ests/Android.mk
|
c130eed3ac25a20a981d811796076177f1628f92 |
31-Jul-2012 |
Earl Ou <shunhsingou@google.com> |
Fix Gallery2Tests Build Remove dependancy of android-test-runner in Android.mk Also LOCAL_SDK_VERSION is needed in Android.mk for unbundle-branches to avoid hiden api Change-Id: I38cef8261aab264fe5a109ca5a6857eee3dff11b
ests/Android.mk
|
9bea81c2ae6d2d5be8643511ea7e644a26231868 |
31-Jul-2012 |
Pin Ting <pinting@google.com> |
Don't use QUALITY_xxxP and hasProfile prior to API level 11. Bug:6900688 Change-Id: I4b852a3727e46a9bd3ebb55c726e64519f9c2092
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
|
f3b0384acb06f1615c4d3ed2c7c2dff8090fe7b0 |
31-Jul-2012 |
Pin Ting <pinting@google.com> |
Don't use QUALITY_xxxP and hasProfile prior to API level 11. Bug:6900688 Change-Id: I4b852a3727e46a9bd3ebb55c726e64519f9c2092
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
|
4d063b338503dc81e9b16b89bc171a98b59fe6a9 |
31-Jul-2012 |
Pin Ting <pinting@google.com> |
Don't use QUALITY_xxxP and hasProfile prior to API level 11. Bug:6900688 Change-Id: I4b852a3727e46a9bd3ebb55c726e64519f9c2092
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
|
d61248536b0dc28ca9e5f84b20e63a4c96ac3ff3 |
30-Jul-2012 |
Bobby Georgescu <georgescu@google.com> |
Fix bugs 6882711 and 6836814 Bug: 6882711 Bug: 6836814 A number of issues surrounding the behavior after deleting the last photo from the camera roll within the Camera app, including occasional black screen & incorrectly persistent action bar. Change-Id: Ib5f41a78c613da90bb844aab2d40f45e314d3ee3
rc/com/android/gallery3d/app/PhotoDataAdapter.java
|
830b3c77904916f2a09f8445743db44885226066 |
30-Jul-2012 |
Bobby Georgescu <georgescu@google.com> |
Fix bugs 6882711 and 6836814 Bug: 6882711 Bug: 6836814 A number of issues surrounding the behavior after deleting the last photo from the camera roll within the Camera app, including occasional black screen & incorrectly persistent action bar. Change-Id: Ib5f41a78c613da90bb844aab2d40f45e314d3ee3
rc/com/android/gallery3d/app/PhotoDataAdapter.java
|
defe6eac0a3f26bc6abad6539d31179f905422f4 |
30-Jul-2012 |
Pin Ting <pinting@google.com> |
Merge "Remove dependency on android.widget.Switch." into gb-ub-photos-arches
|
f3c101901aa9c937209640cf55975d90439d53d4 |
30-Jul-2012 |
Pin Ting <pinting@google.com> |
Merge "Remove dependency on android.widget.Switch." into gb-ub-photos-arches
|
bcf887f08a6849acb03b5a0cc03e820a9e56550a |
30-Jul-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to master
|
3ff33ee566475998767adff1f32e5aa42d27ea3c |
27-Jul-2012 |
Owen Lin <owenlin@google.com> |
Don't call Action.setLogo and Action.setHomeButtonEnabled in old API levels. bug: 6706724 bug: 6706785 Change-Id: I09e48b8a042c5ce84442dddaf4e4bdfd1960ec4f
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
rc/com/android/gallery3d/app/GalleryActionBar.java
rc/com/android/gallery3d/app/MovieActivity.java
|
cc8e7ab7ae0912186beff20e7f042fd6c1e78b35 |
27-Jul-2012 |
Owen Lin <owenlin@google.com> |
Don't call Action.setLogo and Action.setHomeButtonEnabled in old API levels. bug: 6706724 bug: 6706785 Change-Id: I09e48b8a042c5ce84442dddaf4e4bdfd1960ec4f
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
rc/com/android/gallery3d/app/GalleryActionBar.java
rc/com/android/gallery3d/app/MovieActivity.java
|
c8c62ea8c9f27e9c06e671cad7ff4a7ab64bfa0f |
27-Jul-2012 |
Owen Lin <owenlin@google.com> |
Don't call Action.setLogo and Action.setHomeButtonEnabled in old API levels. bug: 6706724 bug: 6706785 Change-Id: I09e48b8a042c5ce84442dddaf4e4bdfd1960ec4f
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
|
2ad69713cdb44d1b0ed17104586e81564871ca73 |
26-Jul-2012 |
Owen Lin <owenlin@google.com> |
Fix some lint warnings in Gallery. 1. Implement our own openPipeHelper 2. Add @TargetApi to TileImageViewAdapter Change-Id: I74dca78c4c4f18e0f782afad02d5ba9b410a503e
allerycommon/src/com/android/gallery3d/common/AsyncTaskUtil.java
|
ed97d58f2028938aeb3e49c10ac598cc3e7a28c6 |
26-Jul-2012 |
Owen Lin <owenlin@google.com> |
Fix some lint warnings in Gallery. 1. Implement our own openPipeHelper 2. Add @TargetApi to TileImageViewAdapter Change-Id: I74dca78c4c4f18e0f782afad02d5ba9b410a503e
allerycommon/src/com/android/gallery3d/common/AsyncTaskUtil.java
rc/com/android/gallery3d/provider/GalleryProvider.java
rc/com/android/gallery3d/ui/TileImageViewAdapter.java
|
a51e351e6972845ce37eff2b90571cd9ce73ac62 |
26-Jul-2012 |
Owen Lin <owenlin@google.com> |
Fix some lint warnings in Gallery. 1. Implement our own openPipeHelper 2. Add @TargetApi to TileImageViewAdapter Change-Id: I74dca78c4c4f18e0f782afad02d5ba9b410a503e
allerycommon/src/com/android/gallery3d/common/AsyncTaskUtil.java
rc/com/android/gallery3d/provider/GalleryProvider.java
rc/com/android/gallery3d/ui/TileImageViewAdapter.java
|
f51196e8b35f6c7ff81fce6a2fb837f1d4f76c40 |
30-Jul-2012 |
Ahbong Chang <cwahbong@google.com> |
Merge "Code clean up." into gb-ub-photos-arches
|
75a352ad80c698f8c0c3801b7e31b6795b93f955 |
30-Jul-2012 |
Ahbong Chang <cwahbong@google.com> |
Merge "Code clean up." into gb-ub-photos-arches
|
9636c66cb89e7243de92eb46ae90d6223b3d79f5 |
30-Jul-2012 |
Earl Ou <shunhsingou@google.com> |
Merge "Low-level exif parser" into gb-ub-photos-arches
|
7408df8b744f725e28248dbf790a8241b7d002d8 |
30-Jul-2012 |
Earl Ou <shunhsingou@google.com> |
Merge "Low-level exif parser" into gb-ub-photos-arches
|
57ae9b9cde9e2c9333648951a3b588f3d319df06 |
30-Jul-2012 |
Ahbong Chang <cwahbong@google.com> |
Code clean up. Remove unused imports. Remove unused fields. Remove unnecessary cast. Add missing override annotations. Change-Id: Idad2e587697a5015eb5363d7b71fab9de9cc8ffb
rc/com/android/gallery3d/ui/DetailsAddressResolver.java
|
c775e7fa64a08a55ae8286643157e2534cf34d45 |
30-Jul-2012 |
Ahbong Chang <cwahbong@google.com> |
Code clean up. Remove unused imports. Remove unused fields. Remove unnecessary cast. Add missing override annotations. Change-Id: Idad2e587697a5015eb5363d7b71fab9de9cc8ffb
allerycommon/src/com/android/gallery3d/common/FileCache.java
allerycommon/src/com/android/gallery3d/common/Fingerprint.java
allerycommon/src/com/android/gallery3d/common/HttpClientFactory.java
allerycommon/src/com/android/gallery3d/common/Scroller.java
|
813ac7496e93faa2cf0f2763df421a146d38fc11 |
30-Jul-2012 |
Ahbong Chang <cwahbong@google.com> |
Code clean up. Remove unused imports. Remove unused fields. Remove unnecessary cast. Add missing override annotations. Change-Id: Idad2e587697a5015eb5363d7b71fab9de9cc8ffb
allerycommon/src/com/android/gallery3d/common/FileCache.java
allerycommon/src/com/android/gallery3d/common/Fingerprint.java
allerycommon/src/com/android/gallery3d/common/HttpClientFactory.java
allerycommon/src/com/android/gallery3d/common/Scroller.java
rc/com/android/gallery3d/app/AlbumDataLoader.java
rc/com/android/gallery3d/app/AlbumPage.java
rc/com/android/gallery3d/app/AlbumPicker.java
rc/com/android/gallery3d/app/AlbumSetDataLoader.java
rc/com/android/gallery3d/app/AppBridge.java
rc/com/android/gallery3d/app/CropImage.java
rc/com/android/gallery3d/app/EyePosition.java
rc/com/android/gallery3d/app/FilterUtils.java
rc/com/android/gallery3d/app/GalleryActionBar.java
rc/com/android/gallery3d/app/GalleryAppImpl.java
rc/com/android/gallery3d/app/ManageCachePage.java
rc/com/android/gallery3d/app/MovieControllerOverlay.java
rc/com/android/gallery3d/app/OrientationManager.java
rc/com/android/gallery3d/app/PhotoDataAdapter.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/app/PickerActivity.java
rc/com/android/gallery3d/app/SinglePhotoDataAdapter.java
rc/com/android/gallery3d/app/SlideshowDataAdapter.java
rc/com/android/gallery3d/app/SlideshowPage.java
rc/com/android/gallery3d/data/BitmapPool.java
rc/com/android/gallery3d/data/ClusterAlbum.java
rc/com/android/gallery3d/data/ClusterAlbumSet.java
rc/com/android/gallery3d/data/ComboAlbum.java
rc/com/android/gallery3d/data/ComboAlbumSet.java
rc/com/android/gallery3d/data/DataManager.java
rc/com/android/gallery3d/data/DownloadCache.java
rc/com/android/gallery3d/data/DownloadUtils.java
rc/com/android/gallery3d/data/Face.java
rc/com/android/gallery3d/data/FaceClustering.java
rc/com/android/gallery3d/data/FilterDeleteSet.java
rc/com/android/gallery3d/data/FilterSource.java
rc/com/android/gallery3d/data/FilterTypeSet.java
rc/com/android/gallery3d/data/LocalImage.java
rc/com/android/gallery3d/data/LocalMediaItem.java
rc/com/android/gallery3d/data/LocalSource.java
rc/com/android/gallery3d/data/LocationClustering.java
rc/com/android/gallery3d/data/MediaDetails.java
rc/com/android/gallery3d/data/MediaSet.java
rc/com/android/gallery3d/data/MtpClient.java
rc/com/android/gallery3d/data/MtpContext.java
rc/com/android/gallery3d/data/MtpImage.java
rc/com/android/gallery3d/data/MtpSource.java
rc/com/android/gallery3d/data/SizeClustering.java
rc/com/android/gallery3d/data/SnailAlbum.java
rc/com/android/gallery3d/data/SnailItem.java
rc/com/android/gallery3d/data/SnailSource.java
rc/com/android/gallery3d/data/TagClustering.java
rc/com/android/gallery3d/data/TimeClustering.java
rc/com/android/gallery3d/data/UriImage.java
rc/com/android/gallery3d/gadget/LocalPhotoSource.java
rc/com/android/gallery3d/gadget/MediaSetSource.java
rc/com/android/gallery3d/gadget/WidgetService.java
rc/com/android/gallery3d/onetimeinitializer/GalleryWidgetMigrator.java
rc/com/android/gallery3d/ui/ActionModeHandler.java
rc/com/android/gallery3d/ui/BasicTexture.java
rc/com/android/gallery3d/ui/BitmapScreenNail.java
rc/com/android/gallery3d/ui/CacheStorageUsageInfo.java
rc/com/android/gallery3d/ui/ColorTexture.java
rc/com/android/gallery3d/ui/CropView.java
rc/com/android/gallery3d/ui/DetailsAddressResolver.java
rc/com/android/gallery3d/ui/DialogDetailsView.java
rc/com/android/gallery3d/ui/EdgeEffect.java
rc/com/android/gallery3d/ui/EdgeView.java
rc/com/android/gallery3d/ui/ExtTexture.java
rc/com/android/gallery3d/ui/FlingScroller.java
rc/com/android/gallery3d/ui/GLCanvasImpl.java
rc/com/android/gallery3d/ui/GalleryEGLConfigChooser.java
rc/com/android/gallery3d/ui/GestureRecognizer.java
rc/com/android/gallery3d/ui/MenuExecutor.java
rc/com/android/gallery3d/ui/Paper.java
rc/com/android/gallery3d/ui/PhotoView.java
rc/com/android/gallery3d/ui/SurfaceTextureScreenNail.java
rc/com/android/gallery3d/ui/UndoBarView.java
rc/com/android/gallery3d/ui/UploadedTexture.java
rc/com/android/gallery3d/util/GalleryUtils.java
rc/com/android/gallery3d/util/MediaSetUtils.java
rc/com/android/gallery3d/util/PriorityThreadFactory.java
rc/com/android/gallery3d/util/Profile.java
rc/com/android/gallery3d/util/ProfileData.java
rc/com/android/gallery3d/util/ReverseGeocoder.java
rc/com/android/gallery3d/util/ThreadPool.java
|
7817979db0c52ffeacb951625b1e821eba303285 |
30-Jul-2012 |
Ahbong Chang <cwahbong@google.com> |
Code clean up. Remove unused imports. Remove unused fields. Remove unnecessary cast. Add missing override annotations. Change-Id: Idad2e587697a5015eb5363d7b71fab9de9cc8ffb
allerycommon/src/com/android/gallery3d/common/FileCache.java
allerycommon/src/com/android/gallery3d/common/Fingerprint.java
allerycommon/src/com/android/gallery3d/common/HttpClientFactory.java
allerycommon/src/com/android/gallery3d/common/Scroller.java
rc/com/android/gallery3d/app/AlbumDataLoader.java
rc/com/android/gallery3d/app/AlbumPage.java
rc/com/android/gallery3d/app/AlbumPicker.java
rc/com/android/gallery3d/app/AlbumSetDataLoader.java
rc/com/android/gallery3d/app/AppBridge.java
rc/com/android/gallery3d/app/CropImage.java
rc/com/android/gallery3d/app/EyePosition.java
rc/com/android/gallery3d/app/FilterUtils.java
rc/com/android/gallery3d/app/GalleryActionBar.java
rc/com/android/gallery3d/app/GalleryAppImpl.java
rc/com/android/gallery3d/app/ManageCachePage.java
rc/com/android/gallery3d/app/MovieControllerOverlay.java
rc/com/android/gallery3d/app/OrientationManager.java
rc/com/android/gallery3d/app/PhotoDataAdapter.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/app/PickerActivity.java
rc/com/android/gallery3d/app/SinglePhotoDataAdapter.java
rc/com/android/gallery3d/app/SlideshowDataAdapter.java
rc/com/android/gallery3d/app/SlideshowPage.java
rc/com/android/gallery3d/data/BitmapPool.java
rc/com/android/gallery3d/data/ClusterAlbum.java
rc/com/android/gallery3d/data/ClusterAlbumSet.java
rc/com/android/gallery3d/data/ComboAlbum.java
rc/com/android/gallery3d/data/ComboAlbumSet.java
rc/com/android/gallery3d/data/DataManager.java
rc/com/android/gallery3d/data/DownloadCache.java
rc/com/android/gallery3d/data/DownloadUtils.java
rc/com/android/gallery3d/data/Face.java
rc/com/android/gallery3d/data/FaceClustering.java
rc/com/android/gallery3d/data/FilterDeleteSet.java
rc/com/android/gallery3d/data/FilterSource.java
rc/com/android/gallery3d/data/FilterTypeSet.java
rc/com/android/gallery3d/data/LocalImage.java
rc/com/android/gallery3d/data/LocalMediaItem.java
rc/com/android/gallery3d/data/LocalSource.java
rc/com/android/gallery3d/data/LocationClustering.java
rc/com/android/gallery3d/data/MediaDetails.java
rc/com/android/gallery3d/data/MediaSet.java
rc/com/android/gallery3d/data/MtpClient.java
rc/com/android/gallery3d/data/MtpContext.java
rc/com/android/gallery3d/data/MtpImage.java
rc/com/android/gallery3d/data/MtpSource.java
rc/com/android/gallery3d/data/SizeClustering.java
rc/com/android/gallery3d/data/SnailAlbum.java
rc/com/android/gallery3d/data/SnailItem.java
rc/com/android/gallery3d/data/SnailSource.java
rc/com/android/gallery3d/data/TagClustering.java
rc/com/android/gallery3d/data/TimeClustering.java
rc/com/android/gallery3d/data/UriImage.java
rc/com/android/gallery3d/gadget/LocalPhotoSource.java
rc/com/android/gallery3d/gadget/MediaSetSource.java
rc/com/android/gallery3d/gadget/WidgetService.java
rc/com/android/gallery3d/onetimeinitializer/GalleryWidgetMigrator.java
rc/com/android/gallery3d/ui/ActionModeHandler.java
rc/com/android/gallery3d/ui/BasicTexture.java
rc/com/android/gallery3d/ui/BitmapScreenNail.java
rc/com/android/gallery3d/ui/CacheStorageUsageInfo.java
rc/com/android/gallery3d/ui/ColorTexture.java
rc/com/android/gallery3d/ui/CropView.java
rc/com/android/gallery3d/ui/DetailsAddressResolver.java
rc/com/android/gallery3d/ui/DialogDetailsView.java
rc/com/android/gallery3d/ui/EdgeEffect.java
rc/com/android/gallery3d/ui/EdgeView.java
rc/com/android/gallery3d/ui/ExtTexture.java
rc/com/android/gallery3d/ui/FlingScroller.java
rc/com/android/gallery3d/ui/GLCanvasImpl.java
rc/com/android/gallery3d/ui/GalleryEGLConfigChooser.java
rc/com/android/gallery3d/ui/GestureRecognizer.java
rc/com/android/gallery3d/ui/MenuExecutor.java
rc/com/android/gallery3d/ui/Paper.java
rc/com/android/gallery3d/ui/PhotoView.java
rc/com/android/gallery3d/ui/SurfaceTextureScreenNail.java
rc/com/android/gallery3d/ui/UndoBarView.java
rc/com/android/gallery3d/ui/UploadedTexture.java
rc/com/android/gallery3d/util/GalleryUtils.java
rc/com/android/gallery3d/util/MediaSetUtils.java
rc/com/android/gallery3d/util/PriorityThreadFactory.java
rc/com/android/gallery3d/util/Profile.java
rc/com/android/gallery3d/util/ProfileData.java
rc/com/android/gallery3d/util/ReverseGeocoder.java
rc/com/android/gallery3d/util/ThreadPool.java
|
ea8759d2cf72a292a97264955bc895984d1ec257 |
24-Jul-2012 |
Earl Ou <shunhsingou@google.com> |
Low-level exif parser Change-Id: I592184c79320d08a3cb871a63ea33742071876e3
rc/com/android/gallery3d/exif/ExifInvalidFormatException.java
rc/com/android/gallery3d/exif/ExifParser.java
rc/com/android/gallery3d/exif/ExifTag.java
rc/com/android/gallery3d/exif/IfdParser.java
rc/com/android/gallery3d/exif/Rational.java
rc/com/android/gallery3d/exif/TiffInputStream.java
|
73e933f1f57002d2e593aa7b471811d8837f8767 |
24-Jul-2012 |
Earl Ou <shunhsingou@google.com> |
Low-level exif parser Change-Id: I592184c79320d08a3cb871a63ea33742071876e3
rc/com/android/gallery3d/exif/ExifInvalidFormatException.java
rc/com/android/gallery3d/exif/ExifParser.java
rc/com/android/gallery3d/exif/ExifTag.java
rc/com/android/gallery3d/exif/IfdParser.java
rc/com/android/gallery3d/exif/Rational.java
rc/com/android/gallery3d/exif/TiffInputStream.java
|
2ee9fcd1c0b883413f3e4d274882d864a552720b |
27-Jul-2012 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with jb-release Change-Id: Ie95fe2b6b772217090296b8409f1f1f7326a0a93
|
59f87a199266d00ec38d39126a27b2e105a45184 |
26-Jul-2012 |
Pin Ting <pinting@google.com> |
Remove dependency on android.widget.Switch. Bug:6706782 Change-Id: I9a86f9fbcb45c9def18f325e95ef6cfcd63edaff
es/values-v14/styles.xml
es/values/attrs.xml
es/values/styles.xml
|
2408a5f4f7216c4d6c398592c353bf449c55cf6b |
26-Jul-2012 |
Pin Ting <pinting@google.com> |
Remove dependency on android.widget.Switch. Bug:6706782 Change-Id: I9a86f9fbcb45c9def18f325e95ef6cfcd63edaff
es/values-v14/styles.xml
es/values/attrs.xml
es/values/styles.xml
|
dbc472eb08c19e78811823f8b83e59c3aeacc6d0 |
20-Jul-2012 |
Michael Kolb <kolby@google.com> |
Use actual selection for album/photo details Bug: 6533154 Change-Id: I21ce95d79567396840f08095b986ecc54263a295
rc/com/android/gallery3d/app/AlbumDataLoader.java
rc/com/android/gallery3d/app/AlbumPage.java
rc/com/android/gallery3d/app/AlbumSetDataLoader.java
rc/com/android/gallery3d/app/AlbumSetPage.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/ui/DetailsHelper.java
rc/com/android/gallery3d/ui/DialogDetailsView.java
|
995c4566bed7df1aa48ba7e1351f964efa73880b |
20-Jul-2012 |
Michael Kolb <kolby@google.com> |
Use actual selection for album/photo details Bug: 6533154 Change-Id: I21ce95d79567396840f08095b986ecc54263a295
rc/com/android/gallery3d/app/AlbumDataLoader.java
rc/com/android/gallery3d/app/AlbumPage.java
rc/com/android/gallery3d/app/AlbumSetDataLoader.java
rc/com/android/gallery3d/app/AlbumSetPage.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/ui/DetailsHelper.java
rc/com/android/gallery3d/ui/DialogDetailsView.java
|
7294278d21739474259729bd19b9a8e40d55e377 |
26-Jul-2012 |
Ed Heyl <ed@google.com> |
Merge remote-tracking branch 'goog/master' into jb-mr1-dev
|
ebc7b85574f315079488a43e37cbe866fdf5e932 |
26-Jul-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to master
|
068379c2d04142c6992dcd7a8835a1d5404b47b7 |
26-Jul-2012 |
Owen Lin <owenlin@google.com> |
Merge "Add @TargetApi for all Mtp related code." into gb-ub-photos-arches
|
0348d8c50c98fe5befb661032f13615b1673bba3 |
26-Jul-2012 |
Owen Lin <owenlin@google.com> |
Merge "Add @TargetApi for all Mtp related code." into gb-ub-photos-arches
|
668646ebf4f360f75f2f593f581599ad158cce91 |
26-Jul-2012 |
Angus Kong <shkong@google.com> |
Merge "Add check for camera focus/metering area." into gb-ub-photos-arches
|
54c17d5bdfeca2a1a785de2083164a209c60f2a7 |
26-Jul-2012 |
Angus Kong <shkong@google.com> |
Merge "Add check for camera focus/metering area." into gb-ub-photos-arches
|
57a755ef3d2c1a529912d8f34f4290a4767d5479 |
26-Jul-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Only give haptic feedback when enabled in system settings" into gb-ub-photos-arches
|
0b2016f5be20d5d9c5980af658cd67f07d8ede5f |
26-Jul-2012 |
Bobby Georgescu <georgescu@google.com> |
Merge "Only give haptic feedback when enabled in system settings" into gb-ub-photos-arches
|
6f9a145d14b9cb1a7406b11a76deb5ec595d3bb9 |
24-Jul-2012 |
Angus Kong <shkong@google.com> |
Add check for camera focus/metering area. bug:6881073 Change-Id: I6ea851befc9f95d4b3def3e7d04da7285be5a755
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
|
afa4525b6b30eee943eac0d23dd84caba98eb740 |
24-Jul-2012 |
Angus Kong <shkong@google.com> |
Add check for camera focus/metering area. bug:6881073 Change-Id: I6ea851befc9f95d4b3def3e7d04da7285be5a755
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
|
6c64f55edcaddd2a2677f39678830540ccea5a4f |
24-Jul-2012 |
Angus Kong <shkong@google.com> |
Add check for camera focus/metering area. bug:6881073 Change-Id: I6ea851befc9f95d4b3def3e7d04da7285be5a755
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
|
8666b54366e52f2ea5df5ce039a1e12370846486 |
25-Jul-2012 |
Angus Kong <shkong@google.com> |
Merge "Rename to HAS_ZOOM_WHEN_RECORDING." into gb-ub-photos-arches
|
ba7300542d3b2e76c91136f5370a8f94e36a3ec6 |
25-Jul-2012 |
Angus Kong <shkong@google.com> |
Merge "Rename to HAS_ZOOM_WHEN_RECORDING." into gb-ub-photos-arches
|
8538bbdd8bdf14e29f5c7a092ee824c1a675c0c0 |
24-Jul-2012 |
Angus Kong <shkong@google.com> |
Rename to HAS_ZOOM_WHEN_RECORDING. Rename HAS_CAMCORDER_ZOOM to HAS_ZOOM_WHEN_RECORDING. bug:6838676 Change-Id: I12446f62810b391b1f40944ee93258efe1689a93
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
|
9734d9d102e889b24e2f88bfed3ff66fda32ef3a |
24-Jul-2012 |
Angus Kong <shkong@google.com> |
Rename to HAS_ZOOM_WHEN_RECORDING. Rename HAS_CAMCORDER_ZOOM to HAS_ZOOM_WHEN_RECORDING. bug:6838676 Change-Id: I12446f62810b391b1f40944ee93258efe1689a93
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
|
d498a90641c98ab93c3b063b45274304c0f53b53 |
24-Jul-2012 |
Angus Kong <shkong@google.com> |
Rename to HAS_ZOOM_WHEN_RECORDING. Rename HAS_CAMCORDER_ZOOM to HAS_ZOOM_WHEN_RECORDING. bug:6838676 Change-Id: I12446f62810b391b1f40944ee93258efe1689a93
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
|
d840343eb85f99131b61b5dc59cf6cb939cf8d95 |
25-Jul-2012 |
Bobby Georgescu <georgescu@google.com> |
Fix for monkey-generated NPE in PhotoView from bug 6848371 In other parts of the code, there are checks for getGLRoot returning null, and one was missing here. Bug: 6848371 Change-Id: I3a7a1e1ea9847a43f4791de84f5f70cc27d53a1a
rc/com/android/gallery3d/ui/PhotoView.java
|
14ce29ab5608daaa3d0074cdfc9fc85988537ff2 |
25-Jul-2012 |
Bobby Georgescu <georgescu@google.com> |
Fix for monkey-generated NPE in PhotoView from bug 6848371 In other parts of the code, there are checks for getGLRoot returning null, and one was missing here. Bug: 6848371 Change-Id: I3a7a1e1ea9847a43f4791de84f5f70cc27d53a1a
rc/com/android/gallery3d/ui/PhotoView.java
|
f2893ae7e282dab0d427d5785bef8c8da93da493 |
25-Jul-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to master
|
1502f354bca4496e88138347ed5034c9399d1a25 |
25-Jul-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to jb-dev
|
03cb9d26e23a97c44bb4464f0a633a56d4391a98 |
24-Jul-2012 |
Bobby Georgescu <georgescu@google.com> |
Only give haptic feedback when enabled in system settings Bug: 6866688 Change-Id: I4e349fe666244ef5459dd591c8141768b24c910a
rc/com/android/gallery3d/app/ActivityState.java
rc/com/android/gallery3d/app/AlbumPage.java
rc/com/android/gallery3d/app/AlbumSetPage.java
|
11f14dc9e1d4d04b7c21b076445f3cb8c173753b |
24-Jul-2012 |
Bobby Georgescu <georgescu@google.com> |
Only give haptic feedback when enabled in system settings Bug: 6866688 Change-Id: I4e349fe666244ef5459dd591c8141768b24c910a
rc/com/android/gallery3d/app/ActivityState.java
rc/com/android/gallery3d/app/AlbumPage.java
rc/com/android/gallery3d/app/AlbumSetPage.java
|
75eb8b6490b50fd6eb543c4bf8b645ed5c1388a8 |
24-Jul-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to master
|
394c37fe04d715b09f157c6789b10fc8e563592e |
24-Jul-2012 |
Owen Lin <owenlin@google.com> |
Add @TargetApi for all Mtp related code. These classes should not be called since the MtpSource won't be registered to DataManager. Change-Id: I3f88dc24f295af3d9e18218f56e6c30731c1e328
rc/com/android/gallery3d/data/MtpClient.java
rc/com/android/gallery3d/data/MtpContext.java
rc/com/android/gallery3d/data/MtpDevice.java
rc/com/android/gallery3d/data/MtpDeviceSet.java
rc/com/android/gallery3d/data/MtpImage.java
|
d43ea8bb1b1afcb27c1c6c673c8ed2707bc70ff0 |
24-Jul-2012 |
Owen Lin <owenlin@google.com> |
Add @TargetApi for all Mtp related code. These classes should not be called since the MtpSource won't be registered to DataManager. Change-Id: I3f88dc24f295af3d9e18218f56e6c30731c1e328
rc/com/android/gallery3d/data/MtpClient.java
rc/com/android/gallery3d/data/MtpContext.java
rc/com/android/gallery3d/data/MtpDevice.java
rc/com/android/gallery3d/data/MtpDeviceSet.java
rc/com/android/gallery3d/data/MtpImage.java
|
52dfb17e3c93b3762130ec8912c6e16c9dea0edc |
24-Jul-2012 |
Owen Lin <owenlin@google.com> |
Use our own OverScroller for backward compatibility. Change-Id: Ibcf48a638ab716116d1ce2ff8c2686741ca0a996
rc/com/android/gallery3d/ui/ScrollerHelper.java
|
b133af5904c7f0ad5686d78f2c2b464454e3876c |
24-Jul-2012 |
Owen Lin <owenlin@google.com> |
Use our own OverScroller for backward compatibility. Change-Id: Ibcf48a638ab716116d1ce2ff8c2686741ca0a996
rc/com/android/gallery3d/ui/ScrollerHelper.java
|
d5bcc6bf262edfc2bc736e5ed1d636b30a1c44fe |
24-Jul-2012 |
Owen Lin <owenlin@google.com> |
Avoid using class defined in API level 14. Change-Id: Ia6385f98b048292de70c6e8aa628a2e6fc629485
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
|
81aef137fc0d841b992cc7771902458df6272954 |
24-Jul-2012 |
Owen Lin <owenlin@google.com> |
Avoid using class defined in API level 14. Change-Id: Ia6385f98b048292de70c6e8aa628a2e6fc629485
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
|
bc1489c807b97ba590d2baf276fb622ef15d38de |
24-Jul-2012 |
Owen Lin <owenlin@google.com> |
Avoid using class defined in API level 14. Change-Id: Ia6385f98b048292de70c6e8aa628a2e6fc629485
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
|
b205bf971b601b4921ce7edf6933b8ae792f627e |
23-Jul-2012 |
Andrew Hsieh <andrewhsieh@google.com> |
Merge "Fixed x86 build" into gb-ub-photos-arches
|
143e8847e3b6e3783316d824f7e6b34e6b350f09 |
19-Jul-2012 |
Andrew Hsieh <andrewhsieh@google.com> |
Fixed x86 build NDK supports x86 from r6. Without setting correct LOCAL_NDK_VERSION build may fail to add library path for "-llog" and "-lEGL" Change-Id: I863e20e434d274b5d8924eafcf1f5e1d0b05f90d
ni/Android.mk
|
7c3884646bd55993c2488007b6a9e9d6f13f0297 |
19-Jul-2012 |
Andrew Hsieh <andrewhsieh@google.com> |
Fixed x86 build NDK supports x86 from r6. Without setting correct LOCAL_NDK_VERSION build may fail to add library path for "-llog" and "-lEGL" Change-Id: I863e20e434d274b5d8924eafcf1f5e1d0b05f90d
ni/Android.mk
|
4c8abc39a0974a062a1c1dbcebc085f7ebcd1736 |
19-Jul-2012 |
Andrew Hsieh <andrewhsieh@google.com> |
Fixed x86 build NDK supports x86 from r6. Without setting correct LOCAL_NDK_VERSION build may fail to add library path for "-llog" and "-lEGL" Change-Id: I863e20e434d274b5d8924eafcf1f5e1d0b05f90d
ni/Android.mk
|
5ff98724cfde262dc6d1b484b5000fc22f22bac5 |
21-Jul-2012 |
Wu-cheng Li <wuchengli@google.com> |
Fix crash on launch for tablet devices. bug:6851887 Change-Id: I18c956c6727d10fcc1045d7ec0010d30a16acfc2
es/values-xlarge/styles.xml
|
67d2443e15cfe52e19e7b2523ff0883540c75e0e |
21-Jul-2012 |
Wu-cheng Li <wuchengli@google.com> |
Fix crash on launch for tablet devices. bug:6851887 Change-Id: I18c956c6727d10fcc1045d7ec0010d30a16acfc2
es/values-xlarge/styles.xml
|
636ac5dc0666fc5debd5ec6753aadfd243a6642c |
20-Jul-2012 |
Ying Wang <wangying@google.com> |
Import translations. DO NOT MERGE Change-Id: I1b238d3cc489879b18c835d7e8e23431c92efdd1 Auto-generated-cl: translation import
es/values-fa/strings.xml
|
7df23d8eb8ca33390223aba7cf755d5410b22e9b |
20-Jul-2012 |
Wu-cheng Li <wuchengli@google.com> |
Update gallery launcher icons. bug:6845667 Change-Id: I4f3b87415bb9786732fff375afd8eccaeb7ef1d8
es/mipmap-hdpi/ic_launcher_gallery.png
es/mipmap-mdpi/ic_launcher_gallery.png
es/mipmap-xhdpi/ic_launcher_gallery.png
|
9bf98d94d59571d220f7e288f565f599422f9b82 |
20-Jul-2012 |
Wu-cheng Li <wuchengli@google.com> |
Update gallery launcher icons. bug:6845667 Change-Id: I4f3b87415bb9786732fff375afd8eccaeb7ef1d8
es/mipmap-hdpi/ic_launcher_gallery.png
es/mipmap-mdpi/ic_launcher_gallery.png
es/mipmap-xhdpi/ic_launcher_gallery.png
|
24ca336b4cc73ac4c59487a9af2230c28b715734 |
20-Jul-2012 |
Wu-cheng Li <wuchengli@google.com> |
Merge "Do not use listPreferredItemHeightSmall before API 14." into gb-ub-photos-arches
|
2b44c26ec288da393f3b745647b529a0d58e4aa4 |
19-Jul-2012 |
Wu-cheng Li <wuchengli@google.com> |
Do not use listPreferredItemHeightSmall before API 14. bug:6706647 Change-Id: I9ebdb299e16bdf467cc46b3d094306d93147ee64
es/layout/action_bar_text.xml
es/layout/popup_list_item.xml
es/values-v14/styles.xml
es/values/attrs.xml
es/values/styles.xml
|
99c4c15c64fda3ccde5755c51527aa5094f8fda6 |
19-Jul-2012 |
Wu-cheng Li <wuchengli@google.com> |
Do not use listPreferredItemHeightSmall before API 14. bug:6706647 Change-Id: I9ebdb299e16bdf467cc46b3d094306d93147ee64
es/layout/action_bar_text.xml
es/layout/popup_list_item.xml
es/values-v14/styles.xml
es/values/attrs.xml
es/values/styles.xml
|
6332c9943afd4b708ab84a82023b3aaec900971c |
20-Jul-2012 |
Angus Kong <shkong@google.com> |
Add check for camcorder zoom. bug:6838676 Change-Id: I9aeda27cf55ded444841ade40ea1eb1b91da01cb
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
|
b593dbcb19db6d8cd1a4eddcaffd1c1073c406a7 |
20-Jul-2012 |
Angus Kong <shkong@google.com> |
Add check for camcorder zoom. bug:6838676 Change-Id: I9aeda27cf55ded444841ade40ea1eb1b91da01cb
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
|
064c30b6c89c4282487290ea11e7d3fd1ef68c64 |
20-Jul-2012 |
Angus Kong <shkong@google.com> |
Add check for camcorder zoom. bug:6838676 Change-Id: I9aeda27cf55ded444841ade40ea1eb1b91da01cb
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
|
84629ee950ade6f1e6beefacbe06cc110b987124 |
20-Jul-2012 |
Chih-Chung Chang <chihchung@google.com> |
Only make time lapse recording available on and after Honeycomb. Change-Id: Ia5b2f69a3c0feb9e0219118a7dd372a09cf2da73
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
|
5a0e374ef4a35211d5ae149ac6adb91ce5375911 |
20-Jul-2012 |
Chih-Chung Chang <chihchung@google.com> |
Only make time lapse recording available on and after Honeycomb. Change-Id: Ia5b2f69a3c0feb9e0219118a7dd372a09cf2da73
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
|
a895fae285e0a163faa523c6fe6e05e0f379fe16 |
20-Jul-2012 |
Chih-Chung Chang <chihchung@google.com> |
Only make time lapse recording available on and after Honeycomb. Change-Id: Ia5b2f69a3c0feb9e0219118a7dd372a09cf2da73
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
|
6e72ddc6f3cf3293428b45f574f79dbe4160b70d |
19-Jul-2012 |
Jean-Baptiste Queru <jbq@google.com> |
Fix non-ARM builds - use the proper way to reference libraries Change-Id: Ibd84af84861d1cbaa8203e4b287cb20f5e9027a0
ni/Android.mk
|
1be429dec24f5fabb34083b8d0c264661e33924e |
19-Jul-2012 |
Jean-Baptiste Queru <jbq@google.com> |
Fix non-ARM builds - use the proper way to reference libraries Change-Id: Ibd84af84861d1cbaa8203e4b287cb20f5e9027a0
ni/Android.mk
|
331bb4180d56f7cb1f88e919edd398709568dbfe |
19-Jul-2012 |
Jean-Baptiste Queru <jbq@google.com> |
Fix non-ARM builds - use the proper way to reference libraries Change-Id: Ibd84af84861d1cbaa8203e4b287cb20f5e9027a0
ni/Android.mk
|
de5318ceca4693c3ec3002cf9470d84200c6a0ee |
19-Jul-2012 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with jb-mr0-release Change-Id: Icf6d8b9461cfd22e019d735a8ba66812879e3083
|
69404ec7eec6fb1985cbbcd8c46716779546035f |
19-Jul-2012 |
Wu-cheng Li <wuchengli@google.com> |
Change minSdkVersion to 13. bug:6706723 Change-Id: I3bb7cfa173f6fdd2ba9df4bda96ea31349b5bd5c
ndroidManifest.xml
|
7ca90116a6f7c81f2a20ff8cb8968d41321acafd |
19-Jul-2012 |
Wu-cheng Li <wuchengli@google.com> |
Change minSdkVersion to 13. bug:6706723 Change-Id: I3bb7cfa173f6fdd2ba9df4bda96ea31349b5bd5c
ndroidManifest.xml
|
af9b68cd1743f88c5a33f26d7f3b7689e3351a20 |
19-Jul-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to jb-dev
|
f4e528dceb5381eb81f97e55089436de0364bca3 |
18-Jul-2012 |
Ying Wang <wangying@google.com> |
Import translations. DO NOT MERGE Change-Id: I2090d15e5bdf9944b8300748da4f8eca4b797709 Auto-generated-cl: translation import
es/values-fa/strings.xml
|
6af8c7d7caca4f0ba9879db09da7daa100ddd0cf |
18-Jul-2012 |
Ying Wang <wangying@google.com> |
Import translations. DO NOT MERGE Change-Id: I7c0a46f58b9086734ec66568601cb5efd536bcd6 Auto-generated-cl: translation import
es/values-fa/strings.xml
|
25fdccffbf475cbd60cad33005878d3f2d0ef7a4 |
18-Jul-2012 |
Ying Wang <wangying@google.com> |
Import translations. DO NOT MERGE Change-Id: I7c0a46f58b9086734ec66568601cb5efd536bcd6 Auto-generated-cl: translation import
es/values-fa/strings.xml
|
ba1e4cb460bb95f366154d8fcb67bab681fbab75 |
18-Jul-2012 |
Owen Lin <owenlin@google.com> |
Merge "Make CustomMenu compatible with API level 10." into gb-ub-photos-arches
|
270534bff0fc53a910cdb1fff76e4a4750980147 |
18-Jul-2012 |
Owen Lin <owenlin@google.com> |
Merge "Make CustomMenu compatible with API level 10." into gb-ub-photos-arches
|
fd1b3aa0d8d1b99a79ee64957d7a0936759874ff |
18-Jul-2012 |
Owen Lin <owenlin@google.com> |
Merge "Make CustomMenu compatible with API level 10." into gb-ub-photos-arches
|
a32433403e84be341f417e52c15c6f6ed1002519 |
17-Jul-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr0-release history after reset to jb-dev
|
dff1479e600007aaf9f2b2d8c56ab1ce7854e983 |
17-Jul-2012 |
Ying Wang <wangying@google.com> |
Import translations. DO NOT MERGE Change-Id: I46832a8f8bd16162a91401670eea64278e7806d1 Auto-generated-cl: translation import
es/values-ru/strings.xml
|
b49334dd44f446150203ad1cfe7317608204cfa0 |
17-Jul-2012 |
Ying Wang <wangying@google.com> |
Import translations. DO NOT MERGE Change-Id: I7211ff883bfdf8f5483d4b2f19f7f3572116335a Auto-generated-cl: translation import
es/values-ru/strings.xml
|
d7f6eb1c3ac9c87e1058770586e128290f71d025 |
17-Jul-2012 |
Ying Wang <wangying@google.com> |
Import translations. DO NOT MERGE Change-Id: I7211ff883bfdf8f5483d4b2f19f7f3572116335a Auto-generated-cl: translation import
es/values-ru/strings.xml
|
b54c878d978ec6729edfef6690f59ea55ceae639 |
11-Jul-2012 |
Owen Lin <owenlin@google.com> |
Make CustomMenu compatible with API level 10. bug: 6802855 Change-Id: I230c91bd9744935a181881131dcd2275ed89d819
rc/com/android/gallery3d/ui/ActionModeHandler.java
rc/com/android/gallery3d/ui/CustomMenu.java
rc/com/android/gallery3d/ui/PopupList.java
rc/com/android/gallery3d/ui/SelectionMenu.java
|
c909dd6ff9c4a9492040f654f94a7894b44bbd53 |
11-Jul-2012 |
Owen Lin <owenlin@google.com> |
Make CustomMenu compatible with API level 10. bug: 6802855 Change-Id: I230c91bd9744935a181881131dcd2275ed89d819
es/drawable-hdpi/menu_dropdown_panel_holo_dark.9.png
es/drawable-mdpi/menu_dropdown_panel_holo_dark.9.png
es/drawable-xhdpi/menu_dropdown_panel_holo_dark.9.png
es/layout/popup_list_item.xml
es/menu/selection.xml
es/values/ids.xml
|
44ef42f215d68ade8b63d18fede944c244a2a1dd |
11-Jul-2012 |
Owen Lin <owenlin@google.com> |
Make CustomMenu compatible with API level 10. bug: 6802855 Change-Id: I230c91bd9744935a181881131dcd2275ed89d819
es/drawable-hdpi/menu_dropdown_panel_holo_dark.9.png
es/drawable-mdpi/menu_dropdown_panel_holo_dark.9.png
es/drawable-xhdpi/menu_dropdown_panel_holo_dark.9.png
es/layout/popup_list_item.xml
es/menu/selection.xml
es/values/ids.xml
rc/com/android/gallery3d/ui/ActionModeHandler.java
rc/com/android/gallery3d/ui/CustomMenu.java
rc/com/android/gallery3d/ui/PopupList.java
rc/com/android/gallery3d/ui/SelectionMenu.java
|
b10338195e79a6e6303ad22c9fe06d658a379244 |
17-Jul-2012 |
Ahbong Chang <cwahbong@google.com> |
Merge "Add checker for panorama supporting." into gb-ub-photos-arches
|
208a15be34593493c63bb2b99a7fd8db48a93e6e |
17-Jul-2012 |
Ahbong Chang <cwahbong@google.com> |
Add checker for panorama supporting. Bug: 6816669 Change-Id: I34f80485d46f04f7adc49e2fd49dea1a08a72af9
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
|
0f81000f72968aa378c7eb50e82f506aa77a6a33 |
17-Jul-2012 |
Ahbong Chang <cwahbong@google.com> |
Add checker for panorama supporting. Bug: 6816669 Change-Id: I34f80485d46f04f7adc49e2fd49dea1a08a72af9
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
|
80bacf0bb7db15ea21029b6ce645ec093562aa7d |
17-Jul-2012 |
Ahbong Chang <cwahbong@google.com> |
Add checker for panorama supporting. Bug: 6816669 Change-Id: I34f80485d46f04f7adc49e2fd49dea1a08a72af9
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
|
032006c4f453b8403c5ce18025575d7c21b02406 |
16-Jul-2012 |
Ying Wang <wangying@google.com> |
Merge "Import translations. DO NOT MERGE"
|
b60dec6d1ca85a1287aeb80855fae0c0a9aeaade |
16-Jul-2012 |
Ying Wang <wangying@google.com> |
Import translations. DO NOT MERGE Change-Id: I9f824e4ef25030fa326c33bf2e29a75a8b588e39 Auto-generated-cl: translation import
es/values-fa/photoeditor_strings.xml
|
191a5e933d8c9fb4ea34e635ff7d98281586a216 |
16-Jul-2012 |
Ying Wang <wangying@google.com> |
Import translations. DO NOT MERGE Change-Id: Ib588a4ce4dc897fbf676781e9a08ac5718b543aa Auto-generated-cl: translation import
es/values-fa/strings.xml
|
aae16d9be98e27dcf4cb062c393a0e87bc03aa79 |
16-Jul-2012 |
Ying Wang <wangying@google.com> |
Import translations. DO NOT MERGE Change-Id: I3252729107c7525ca5d208ba106a10a0e9917661 Auto-generated-cl: translation import
es/values-fa/strings.xml
|
602c7321d728f8332d057182b6ac223b2c4b4716 |
16-Jul-2012 |
Ying Wang <wangying@google.com> |
Import translations. DO NOT MERGE Change-Id: I3252729107c7525ca5d208ba106a10a0e9917661 Auto-generated-cl: translation import
es/values-fa/strings.xml
|
6073969496ffb1846aa50c126e0bbb9358b9700b |
13-Jul-2012 |
Ying Wang <wangying@google.com> |
am 2936da9b: (-s ours) am 8c1fe6d3: Import translations. DO NOT MERGE * commit '2936da9b396a5c2286f61e20fe9f4a21bbc4534d': Import translations. DO NOT MERGE
|
2936da9b396a5c2286f61e20fe9f4a21bbc4534d |
13-Jul-2012 |
Ying Wang <wangying@google.com> |
am 8c1fe6d3: Import translations. DO NOT MERGE * commit '8c1fe6d39f511c60f03763c1c905a437fc02c3ab': Import translations. DO NOT MERGE
|
7f4ced6e601634b0d19c635393f19671ebd61a6e |
13-Jul-2012 |
Ying Wang <wangying@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
|
624c2d4ccd9dd497e75797976a4bec4fd79d0f88 |
13-Jul-2012 |
Ying Wang <wangying@google.com> |
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches
|
774568ec3d6fc7581ad5c9df41be553c9af8fcf7 |
13-Jul-2012 |
Ying Wang <wangying@google.com> |
Merge "Change "current" sdk version to 16 as it becomes official" into gb-ub-photos-arches
|
20df354dae9d0ba7d1dd584b724818e28d9fe733 |
13-Jul-2012 |
Ying Wang <wangying@google.com> |
Merge "Change "current" sdk version to 16 as it becomes official" into gb-ub-photos-arches
|
08dec0cc2a60c30592845128a61a762c9484ca17 |
13-Jul-2012 |
Ed Heyl <ed@google.com> |
Merge remote-tracking branch 'goog/master' into gb-ub-photos-arches
|
c8626d95cdea9b647231f349cec6b41b93dea99e |
13-Jul-2012 |
Ed Heyl <ed@google.com> |
Merge remote-tracking branch 'goog/master' into gb-ub-photos-arches
|
74dcb88ab640a2a5a5ec263ee5dbbacd93e8962a |
13-Jul-2012 |
Ying Wang <wangying@google.com> |
Import translations. DO NOT MERGE Change-Id: Ied8634473195dea6df909dd08bdb2da16d99788c Auto-generated-cl: translation import
es/values-fa/strings.xml
|
8c1fe6d39f511c60f03763c1c905a437fc02c3ab |
13-Jul-2012 |
Ying Wang <wangying@google.com> |
Import translations. DO NOT MERGE Change-Id: I2d34057147bfe8ae4d4698e43c41aed9c2b9f71e Auto-generated-cl: translation import
es/values-fa/strings.xml
|
45effbf76d0ac2289f4795accda65749c175de04 |
13-Jul-2012 |
Ying Wang <wangying@google.com> |
Import translations. DO NOT MERGE Change-Id: Ic33cc9dc568e0acf7d12f5d743801689647ea916 Auto-generated-cl: translation import
es/values-fa/strings.xml
|
13b5a263afd446548ef00ea991194892d2c65375 |
13-Jul-2012 |
Ying Wang <wangying@google.com> |
Import translations. DO NOT MERGE Change-Id: Ic33cc9dc568e0acf7d12f5d743801689647ea916 Auto-generated-cl: translation import
es/values-fa/strings.xml
|
184b3f93beff0e85afb7d4415519332adbcf4784 |
13-Jul-2012 |
Ying Wang <wangying@google.com> |
Change "current" sdk version to 16 as it becomes official Change-Id: I09c13b99ff1bc368e1fa335f2efc4cba5410d2f5
ndroid.mk
allerycommon/Android.mk
|
1ce42a976d0abfbc0f4a7d2f76fd01e718b6a54d |
13-Jul-2012 |
Ying Wang <wangying@google.com> |
Change "current" sdk version to 16 as it becomes official Change-Id: I09c13b99ff1bc368e1fa335f2efc4cba5410d2f5
allerycommon/Android.mk
|
0315c71d905803cc361b5815b6595c37305b6425 |
13-Jul-2012 |
Ying Wang <wangying@google.com> |
Change "current" sdk version to 16 as it becomes official Change-Id: I09c13b99ff1bc368e1fa335f2efc4cba5410d2f5
ndroid.mk
allerycommon/Android.mk
|
109bbb6199f48aa677f425dc0d5fb2ae3e8765fc |
13-Jul-2012 |
Chih-Chung Chang <chihchung@google.com> |
Only use SurfaceTexture.release and setIconAttribute on newer platforms. Bug: 6706784 Change-Id: Ic1bb2bb27c3184d791de566d88dbade039fb9d87
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
rc/com/android/gallery3d/app/AbstractGalleryActivity.java
rc/com/android/gallery3d/ui/SurfaceTextureScreenNail.java
|
00862f13a4b7be86ee7fec8eead0bb4e35193cd7 |
13-Jul-2012 |
Chih-Chung Chang <chihchung@google.com> |
Only use SurfaceTexture.release and setIconAttribute on newer platforms. Bug: 6706784 Change-Id: Ic1bb2bb27c3184d791de566d88dbade039fb9d87
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
|
840ae396bac4ff8ff34e88c8d2a1773cb112a4b6 |
13-Jul-2012 |
Chih-Chung Chang <chihchung@google.com> |
Only use SurfaceTexture.release and setIconAttribute on newer platforms. Bug: 6706784 Change-Id: Ic1bb2bb27c3184d791de566d88dbade039fb9d87
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
rc/com/android/gallery3d/app/AbstractGalleryActivity.java
rc/com/android/gallery3d/ui/SurfaceTextureScreenNail.java
|
6911cdad988bc9abdf32a34a5b3c60374dd4a9e4 |
13-Jul-2012 |
Angus Kong <shkong@google.com> |
Add the method for hidden fields. bug:6698375 Change-Id: I5feb3fdd680fec0d745bd3176f4676c16484d4ed
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
|
708bfce7f38274073611a32de69e16fe8bf292ea |
13-Jul-2012 |
Angus Kong <shkong@google.com> |
Add the method for hidden fields. bug:6698375 Change-Id: I5feb3fdd680fec0d745bd3176f4676c16484d4ed
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
|
1b10bf568327fa6c6c1ddbfd98cb17524bebfd46 |
13-Jul-2012 |
Angus Kong <shkong@google.com> |
Add the method for hidden fields. bug:6698375 Change-Id: I5feb3fdd680fec0d745bd3176f4676c16484d4ed
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
|
0c03082cc886cbaf76bec8b725d72dd42a01f645 |
11-Jul-2012 |
Ahbong Chang <cwahbong@google.com> |
Add existence check for face detection methods. android.hardware.Camera.setFaceDetectionListener() android.hardware.Camera.startFaceDetection() android.hardware.Camera.stopFaceDetection() android.hardware.Camera.Parameters.getMaxNumDetectedFaces() Bug: 6707152 Change-Id: Ia6b54246273548db44ec28c40f9efe49048ea8d5
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
|
5c1268331bd39f04894786f37e04584ffb4cf6e6 |
11-Jul-2012 |
Ahbong Chang <cwahbong@google.com> |
Add existence check for face detection methods. android.hardware.Camera.setFaceDetectionListener() android.hardware.Camera.startFaceDetection() android.hardware.Camera.stopFaceDetection() android.hardware.Camera.Parameters.getMaxNumDetectedFaces() Bug: 6707152 Change-Id: Ia6b54246273548db44ec28c40f9efe49048ea8d5
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
|
4bfc86a3d6ce4df7fa3751ef5e06cf622cae0de2 |
11-Jul-2012 |
Ahbong Chang <cwahbong@google.com> |
Add existence check for face detection methods. android.hardware.Camera.setFaceDetectionListener() android.hardware.Camera.startFaceDetection() android.hardware.Camera.stopFaceDetection() android.hardware.Camera.Parameters.getMaxNumDetectedFaces() Bug: 6707152 Change-Id: Ia6b54246273548db44ec28c40f9efe49048ea8d5
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
|
d79a78abc7a35adfe7437f1664de525349da2e02 |
11-Jul-2012 |
Wu-cheng Li <wuchengli@google.com> |
Merge "Make jni build against NDK." into gb-ub-photos-arches
|
8078dd58ecc9d677199fcf968ab0db746c4a80d9 |
04-Jul-2012 |
Wu-cheng Li <wuchengli@google.com> |
Make jni build against NDK. bug:6698708 Change-Id: I913e2f29657abc0af79223ba49148a6080d39ba7
ni/Android.mk
ni/jni_egl_fence.cpp
|
6afb3b8d234ed1a0ba27f4f2e4921f69cabbf2e0 |
04-Jul-2012 |
Wu-cheng Li <wuchengli@google.com> |
Make jni build against NDK. bug:6698708 Change-Id: I913e2f29657abc0af79223ba49148a6080d39ba7
ni/Android.mk
|
fd0975a26fbbe5b1b8d35b46a6c9b7c5f228fdd2 |
04-Jul-2012 |
Wu-cheng Li <wuchengli@google.com> |
Make jni build against NDK. bug:6698708 Change-Id: I913e2f29657abc0af79223ba49148a6080d39ba7
ni/Android.mk
ni/jni_egl_fence.cpp
|
a7b6c0afd2485df9927df43fe434488ede337188 |
10-Jul-2012 |
Hung-ying Tyan <tyanh@google.com> |
Merge "Add existence check for DevicePolicyManager.getCameraDisabled()"
|
a7ded76de610b3a025b0c2052fcbeb952c482bd6 |
09-Jul-2012 |
Hung-ying Tyan <tyanh@google.com> |
Add existence check for DevicePolicyManager.getCameraDisabled() Bug: 6706695 Change-Id: Ib8ea8805a4bea862c8407f8c73a6e5ba1e0f49d3
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
|
d5b66ad52b8aa7e1ec82dba88a58ae893b58432e |
09-Jul-2012 |
Hung-ying Tyan <tyanh@google.com> |
Add existence check for DevicePolicyManager.getCameraDisabled() Bug: 6706695 Change-Id: Ib8ea8805a4bea862c8407f8c73a6e5ba1e0f49d3
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
|
8880e1f41c568ae56326051ff926448c0edaf6f6 |
09-Jul-2012 |
Hung-ying Tyan <tyanh@google.com> |
Add existence check for DevicePolicyManager.getCameraDisabled() Bug: 6706695 Change-Id: Ib8ea8805a4bea862c8407f8c73a6e5ba1e0f49d3
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
|
b4c3749c039c7a13affb11dbc92d54a8c19d2db6 |
09-Jul-2012 |
Ying Wang <wangying@google.com> |
Import translations. DO NOT MERGE Change-Id: I93d4e9712d9e6dc0fb8035e222982b5fcd0955a5 Auto-generated-cl: translation import
es/values-bg/strings.xml
es/values-cs/strings.xml
es/values-de/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-in/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-ro/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-tr/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
|
e419a8b625761cf153c6bf1e1ca541c93a9a91ed |
09-Jul-2012 |
Ying Wang <wangying@google.com> |
Import translations. DO NOT MERGE Change-Id: I93d4e9712d9e6dc0fb8035e222982b5fcd0955a5 Auto-generated-cl: translation import
es/values-bg/strings.xml
es/values-cs/strings.xml
es/values-de/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-in/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-ro/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-tr/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
|
5a3fdd606c075c662502ab24bf609e6547d05dd7 |
09-Jul-2012 |
Ying Wang <wangying@google.com> |
Import translations. DO NOT MERGE Change-Id: I1b461a3723c5439fefd54362be20a4a0100be5c8 Auto-generated-cl: translation import
es/values-bg/strings.xml
es/values-cs/strings.xml
es/values-de/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-in/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-ro/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-tr/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
|
11c7b82795abf98cad4a041b89e614236cb6254f |
09-Jul-2012 |
Ying Wang <wangying@google.com> |
Import translations. DO NOT MERGE Change-Id: I1b461a3723c5439fefd54362be20a4a0100be5c8 Auto-generated-cl: translation import
es/values-bg/strings.xml
es/values-cs/strings.xml
es/values-de/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-in/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-ro/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-tr/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
|
f7d461c6efebcd9fa29236fbddc31b702c87fba8 |
06-Jul-2012 |
Yuli Huang <yuli@google.com> |
Avoid using setSystemUiVisibility in old platforms. bug:6785569 Change-Id: I0a19ab2818b6f34d530c5d65e781d3168533d44f
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
rc/com/android/gallery3d/ui/GLRootView.java
|
5424e3274478fca29eb8bf8a8c92140e85b8925a |
06-Jul-2012 |
Yuli Huang <yuli@google.com> |
Avoid using setSystemUiVisibility in old platforms. bug:6785569 Change-Id: I0a19ab2818b6f34d530c5d65e781d3168533d44f
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
|
b0774a3bfb24d8515fc3ddf152fabf82f0ff67e5 |
06-Jul-2012 |
Yuli Huang <yuli@google.com> |
Avoid using setSystemUiVisibility in old platforms. bug:6785569 Change-Id: I0a19ab2818b6f34d530c5d65e781d3168533d44f
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
rc/com/android/gallery3d/ui/GLRootView.java
|
b98ecd613b64dff8b025ba14fc017ed6ccb191ab |
05-Jul-2012 |
Owen Lin <owenlin@google.com> |
Don't test the EXTRA_LOCAL_ONLY before HC. Change-Id: Idebb2aba994e38cf7eead795f1834ff98eaec27d
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
rc/com/android/gallery3d/ui/CustomMenu.java
rc/com/android/gallery3d/util/GalleryUtils.java
|
3969aca03ea7537e793c5c55acec752148151480 |
05-Jul-2012 |
Owen Lin <owenlin@google.com> |
Don't test the EXTRA_LOCAL_ONLY before HC. Change-Id: Idebb2aba994e38cf7eead795f1834ff98eaec27d
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
|
fe9989a9a58d5ef883099ef747625aca0232df35 |
05-Jul-2012 |
Owen Lin <owenlin@google.com> |
Don't test the EXTRA_LOCAL_ONLY before HC. Change-Id: Idebb2aba994e38cf7eead795f1834ff98eaec27d
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
rc/com/android/gallery3d/ui/CustomMenu.java
rc/com/android/gallery3d/util/GalleryUtils.java
|
4de3fa9d07bc7a8fdf8089a26badf38d8d2d8a3a |
04-Jul-2012 |
Owen Lin <owenlin@google.com> |
Use different back algorithm for Gallery's widget after JB. Change-Id: I1c3c6eea4e5794555a36179b295b15d9dba6de74
rc/com/android/gallery3d/gadget/WidgetClickHandler.java
|
88097d4175d44c4c08af4e8652df6dff458aeff1 |
04-Jul-2012 |
Owen Lin <owenlin@google.com> |
Use different back algorithm for Gallery's widget after JB. Change-Id: I1c3c6eea4e5794555a36179b295b15d9dba6de74
rc/com/android/gallery3d/gadget/WidgetClickHandler.java
|
362f50ca3adea7a13302e22b07bd9a45a952333b |
04-Jul-2012 |
Owen Lin <owenlin@google.com> |
Don't show the shuffle and album widget for old platforms Change-Id: Ide7074025aefe289bf6c71d623eac5100ab72932
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
|
cdb3717c706421fbf392b5da8018c5a029c59324 |
04-Jul-2012 |
Owen Lin <owenlin@google.com> |
Don't show the shuffle and album widget for old platforms Change-Id: Ide7074025aefe289bf6c71d623eac5100ab72932
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
rc/com/android/gallery3d/gadget/PhotoAppWidgetProvider.java
rc/com/android/gallery3d/gadget/WidgetConfigure.java
rc/com/android/gallery3d/gadget/WidgetService.java
|
a2cb30b688131380cab763a1b4da25f15a9fa45a |
04-Jul-2012 |
Owen Lin <owenlin@google.com> |
Don't show the shuffle and album widget for old platforms Change-Id: Ide7074025aefe289bf6c71d623eac5100ab72932
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
rc/com/android/gallery3d/gadget/PhotoAppWidgetProvider.java
rc/com/android/gallery3d/gadget/WidgetConfigure.java
rc/com/android/gallery3d/gadget/WidgetService.java
|
b4cadafb8c454aff10b4096a801cc71f8519fe8a |
04-Jul-2012 |
Owen Lin <owenlin@google.com> |
Don't use invalidateOptionsMenu before API level 11. Change-Id: If46d46e44797b2bd4f66235eca0954a55d0008cf
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
|
fdccf988358df08f711a98aa79d3dbda44141ce4 |
04-Jul-2012 |
Owen Lin <owenlin@google.com> |
Don't use invalidateOptionsMenu before API level 11. Change-Id: If46d46e44797b2bd4f66235eca0954a55d0008cf
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
rc/com/android/gallery3d/app/AbstractGalleryActivity.java
rc/com/android/gallery3d/app/ActivityState.java
rc/com/android/gallery3d/app/Gallery.java
|
b1eb01cd02d1e75e6b9c3e593f6ff34335e2ca8a |
04-Jul-2012 |
Owen Lin <owenlin@google.com> |
Don't use invalidateOptionsMenu before API level 11. Change-Id: If46d46e44797b2bd4f66235eca0954a55d0008cf
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
rc/com/android/gallery3d/app/AbstractGalleryActivity.java
rc/com/android/gallery3d/app/ActivityState.java
rc/com/android/gallery3d/app/Gallery.java
|
9341cc2b9e2939e9915ff62fa9b11e56951947d1 |
04-Jul-2012 |
Chih-Chung Chang <chihchung@google.com> |
Don't use AutoFocusMoveCallback on older platforms. Change-Id: I281888ee88c08b1caf4754e714f0f42c75e26dd9
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
|
2842c13febedd5a4fe5cf06ada8418d0098a5d6d |
04-Jul-2012 |
Chih-Chung Chang <chihchung@google.com> |
Don't use AutoFocusMoveCallback on older platforms. Change-Id: I281888ee88c08b1caf4754e714f0f42c75e26dd9
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
|
097518e3dcbf212a78fa1fe3ad1ddea236401eb5 |
04-Jul-2012 |
Chih-Chung Chang <chihchung@google.com> |
Don't use AutoFocusMoveCallback on older platforms. Change-Id: I281888ee88c08b1caf4754e714f0f42c75e26dd9
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
|
a207d3326346d6da7b713d2be097a42a0401f354 |
03-Jul-2012 |
Chih-Chung Chang <chihchung@google.com> |
Use MTP only if the MTP API is available. Change-Id: I5c747d0da2905eb344c56dfab6333034dd5eecc3
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
|
59b53e0547413da04cb4c7409f8331dc5d8481f2 |
03-Jul-2012 |
Chih-Chung Chang <chihchung@google.com> |
Use MTP only if the MTP API is available. Change-Id: I5c747d0da2905eb344c56dfab6333034dd5eecc3
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
rc/com/android/gallery3d/data/DataManager.java
|
04ebde7418493debda790f3eae933b5f6c38e897 |
03-Jul-2012 |
Chih-Chung Chang <chihchung@google.com> |
Use MTP only if the MTP API is available. Change-Id: I5c747d0da2905eb344c56dfab6333034dd5eecc3
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
rc/com/android/gallery3d/data/DataManager.java
|
ca00c16c5a645e50e74bb82631128d408dc18788 |
04-Jul-2012 |
Hung-ying Tyan <tyanh@google.com> |
Merge "Add ExifTags to hold tag names that are not available in ExifInterface"
|
aadaaa8482521a1b468f6b3a65811aac8ac212f0 |
04-Jul-2012 |
Hung-ying Tyan <tyanh@google.com> |
Merge "Add ExifTags to hold tag names that are not available in ExifInterface"
|
742b888d9055cec7d63fccef8c74b1352f537160 |
04-Jul-2012 |
Hung-ying Tyan <tyanh@google.com> |
Merge "Add ExifTags to hold tag names that are not available in ExifInterface"
|
0f38b9a09a61e3383fe7795eed6d280d10708f34 |
03-Jul-2012 |
Ying Wang <wangying@google.com> |
Import translations. DO NOT MERGE Change-Id: I5ecde362be1d6e55ecc5e6fe5f449a3e435080f8 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-da/strings.xml
es/values-el/strings.xml
es/values-hu/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-tl/strings.xml
es/values-uk/strings.xml
es/values-zh-rCN/strings.xml
|
85c4d54f7d59eea01dfc8c9ea4c51ec59f67cd68 |
03-Jul-2012 |
Ying Wang <wangying@google.com> |
Import translations. DO NOT MERGE Change-Id: I5ecde362be1d6e55ecc5e6fe5f449a3e435080f8 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-da/strings.xml
es/values-el/strings.xml
es/values-hu/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-tl/strings.xml
es/values-uk/strings.xml
es/values-zh-rCN/strings.xml
|
9e7992d94d18a1e6f32c9e4b8bc6f72e30f92983 |
03-Jul-2012 |
Ying Wang <wangying@google.com> |
Import translations. DO NOT MERGE Change-Id: I502e70e7b7acf9821cdefdc92352924c8fa9ba99 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-ca/strings.xml
es/values-da/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-fa/strings.xml
es/values-hu/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ru/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-uk/strings.xml
es/values-zh-rCN/strings.xml
es/values-zu/strings.xml
|
450fce8be2bed14129a13a7c2be1e1fc2ca7d9ab |
03-Jul-2012 |
Ying Wang <wangying@google.com> |
Import translations. DO NOT MERGE Change-Id: I502e70e7b7acf9821cdefdc92352924c8fa9ba99 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-ca/strings.xml
es/values-da/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-fa/strings.xml
es/values-hu/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ru/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-uk/strings.xml
es/values-zh-rCN/strings.xml
es/values-zu/strings.xml
|
0fd7f73931b66a5156ff53aff6f99ad24f1a2a54 |
03-Jul-2012 |
Hung-ying Tyan <tyanh@google.com> |
Add ExifTags to hold tag names that are not available in ExifInterface prior to API level 11. Bug: 6775786 Change-Id: Iab564f577d9a0b87c8fb7b91eda6cabc12b5a11a
allerycommon/src/com/android/gallery3d/common/ExifTags.java
|
36d9adcad2a0e74c796737d6521ac2d29afe944c |
03-Jul-2012 |
Hung-ying Tyan <tyanh@google.com> |
Add ExifTags to hold tag names that are not available in ExifInterface prior to API level 11. Bug: 6775786 Change-Id: Iab564f577d9a0b87c8fb7b91eda6cabc12b5a11a
allerycommon/src/com/android/gallery3d/common/ExifTags.java
rc/com/android/gallery3d/app/CropImage.java
rc/com/android/gallery3d/data/MediaDetails.java
|
6b9ff6aa3da883ee4efd682b3c6c331cf49066e1 |
03-Jul-2012 |
Hung-ying Tyan <tyanh@google.com> |
Add ExifTags to hold tag names that are not available in ExifInterface prior to API level 11. Bug: 6775786 Change-Id: Iab564f577d9a0b87c8fb7b91eda6cabc12b5a11a
allerycommon/src/com/android/gallery3d/common/ExifTags.java
rc/com/android/gallery3d/app/CropImage.java
rc/com/android/gallery3d/data/MediaDetails.java
|
7c3c93892c21a836ec816d18cb3133bca9ce4275 |
02-Jul-2012 |
Chih-Chung Chang <chihchung@google.com> |
Remove dependencies on APIs only exist on newer platforms. Change-Id: I606a23863247454051dd183ddf6b77f6bc882685
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
allerycommon/src/com/android/gallery3d/common/OverScroller.java
allerycommon/src/com/android/gallery3d/common/Scroller.java
|
4ebfbc28bc94084b27c87914450699bc5c474d1a |
02-Jul-2012 |
Chih-Chung Chang <chihchung@google.com> |
Remove dependencies on APIs only exist on newer platforms. Change-Id: I606a23863247454051dd183ddf6b77f6bc882685
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
allerycommon/src/com/android/gallery3d/common/OverScroller.java
allerycommon/src/com/android/gallery3d/common/Scroller.java
rc/com/android/gallery3d/app/MoviePlayer.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/ui/ActionModeHandler.java
rc/com/android/gallery3d/ui/PositionController.java
rc/com/android/gallery3d/ui/SurfaceTextureScreenNail.java
|
6772173d2a49b87a1d209f42fe52b5f830596f99 |
02-Jul-2012 |
Chih-Chung Chang <chihchung@google.com> |
Remove dependencies on APIs only exist on newer platforms. Change-Id: I606a23863247454051dd183ddf6b77f6bc882685
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
allerycommon/src/com/android/gallery3d/common/OverScroller.java
allerycommon/src/com/android/gallery3d/common/Scroller.java
rc/com/android/gallery3d/app/MoviePlayer.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/ui/ActionModeHandler.java
rc/com/android/gallery3d/ui/PositionController.java
rc/com/android/gallery3d/ui/SurfaceTextureScreenNail.java
|
5b981d12a290b7bd10d8439ff3a5a9533069b26e |
28-Jun-2012 |
Owen Lin <owenlin@google.com> |
Don't reuse bitmap before HoneyComb. Change-Id: I0df9bf0a8f43e28ed25b436d4c584dc3ceb43c1d
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
|
7aac26484af3d40df81e1d08c673bd925856a7fa |
28-Jun-2012 |
Owen Lin <owenlin@google.com> |
Don't reuse bitmap before HoneyComb. Change-Id: I0df9bf0a8f43e28ed25b436d4c584dc3ceb43c1d
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
rc/com/android/gallery3d/app/AbstractGalleryActivity.java
rc/com/android/gallery3d/app/CropImage.java
rc/com/android/gallery3d/app/MoviePlayer.java
rc/com/android/gallery3d/app/Wallpaper.java
rc/com/android/gallery3d/data/BitmapPool.java
rc/com/android/gallery3d/data/DecodeUtils.java
rc/com/android/gallery3d/data/ImageCacheRequest.java
rc/com/android/gallery3d/data/LocalImage.java
rc/com/android/gallery3d/data/MediaItem.java
rc/com/android/gallery3d/ui/AlbumSetSlidingWindow.java
rc/com/android/gallery3d/ui/AlbumSlidingWindow.java
rc/com/android/gallery3d/ui/BitmapScreenNail.java
rc/com/android/gallery3d/ui/GLRootView.java
|
df4763cf8752fb1babc7244fc2be33ed87d3b072 |
28-Jun-2012 |
Owen Lin <owenlin@google.com> |
Don't reuse bitmap before HoneyComb. Change-Id: I0df9bf0a8f43e28ed25b436d4c584dc3ceb43c1d
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
rc/com/android/gallery3d/app/AbstractGalleryActivity.java
rc/com/android/gallery3d/app/CropImage.java
rc/com/android/gallery3d/app/MoviePlayer.java
rc/com/android/gallery3d/app/Wallpaper.java
rc/com/android/gallery3d/data/BitmapPool.java
rc/com/android/gallery3d/data/DecodeUtils.java
rc/com/android/gallery3d/data/ImageCacheRequest.java
rc/com/android/gallery3d/data/LocalImage.java
rc/com/android/gallery3d/data/MediaItem.java
rc/com/android/gallery3d/ui/AlbumSetSlidingWindow.java
rc/com/android/gallery3d/ui/AlbumSlidingWindow.java
rc/com/android/gallery3d/ui/BitmapScreenNail.java
rc/com/android/gallery3d/ui/GLRootView.java
|
ce8b4485801843c14abc3654e57aad96d1364e49 |
29-Jun-2012 |
The Android Open Source Project <initial-contribution@android.com> |
Avoid using View.SYSTEM_UI_FLAG_LOW_PROFILE. Use View.STATUS_BAR_HIDDEN instead. Bug:6706727 Change-Id: I0324a251b10eba11350f1813ee975d493bbcfafa
rc/com/android/gallery3d/app/MoviePlayer.java
rc/com/android/gallery3d/ui/GLRootView.java
|
ca7d9bfb42c1d5037bcecdde30eb836755140b03 |
29-Jun-2012 |
The Android Open Source Project <initial-contribution@android.com> |
Avoid using View.SYSTEM_UI_FLAG_LOW_PROFILE. Use View.STATUS_BAR_HIDDEN instead. Bug:6706727 Change-Id: I0324a251b10eba11350f1813ee975d493bbcfafa
rc/com/android/gallery3d/app/MoviePlayer.java
rc/com/android/gallery3d/ui/GLRootView.java
|
8812c63bc0a7bc0650e2176cb3eb033eb342c7aa |
02-Jul-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: I5d153253458dc03fab2e24a08c9208eec6552bdd Auto-generated-cl: translation import
es/values-be/strings.xml
es/values-ca/strings.xml
es/values-en-rGB/strings.xml
es/values-fa/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ru/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-zu/strings.xml
|
b86930228a01c783078005627fbe2bc79f3a88fb |
02-Jul-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: I5d153253458dc03fab2e24a08c9208eec6552bdd Auto-generated-cl: translation import
es/values-be/strings.xml
es/values-ca/strings.xml
es/values-en-rGB/strings.xml
es/values-fa/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ru/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-zu/strings.xml
|
7eb805de51f5dd9a5dfa98fa3b2fb90ba2582210 |
02-Jul-2012 |
Yuli Huang <yuli@google.com> |
Merge "Do not use NfcAdapter API in old platforms."
|
fdbf964798ea6d8a55295ddef49be005f076cfde |
02-Jul-2012 |
Yuli Huang <yuli@google.com> |
Merge "Do not use NfcAdapter API in old platforms."
|
184cd3caf36a44f85615f819a1b13b13c48be7c6 |
29-Jun-2012 |
Ying Wang <wangying@google.com> |
Import translations. DO NOT MERGE Change-Id: I7eac634e7f838f0eea492ec6b01fec518a7a3b39 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
e18dd7c80a69a8139a3397d2e6f97a1dce9f608c |
29-Jun-2012 |
Ying Wang <wangying@google.com> |
Import translations. DO NOT MERGE Change-Id: I7eac634e7f838f0eea492ec6b01fec518a7a3b39 Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
7c8efb6d525bc1d3865d059816d1bdbe4caad3ff |
29-Jun-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am 14b961f6: Reconcile with jb-release * commit '14b961f6ef4ab2177765c3e64676f0735d934158':
|
401bacca01c28b9bb8d9827c6cd42f0f036f554e |
29-Jun-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am 14b961f6: Reconcile with jb-release * commit '14b961f6ef4ab2177765c3e64676f0735d934158':
|
584cbe25fef4946d5b6198b9d292e1af139f561a |
29-Jun-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am 14b961f6: Reconcile with jb-release * commit '14b961f6ef4ab2177765c3e64676f0735d934158':
|
14b961f6ef4ab2177765c3e64676f0735d934158 |
29-Jun-2012 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with jb-release Change-Id: Iba9ed40f75d1d8519d5052fa4dd5fd6796cf8e24
|
63c102894b916b3eeb8d35237a7a8ec39cf51c48 |
29-Jun-2012 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with jb-release Change-Id: Iba9ed40f75d1d8519d5052fa4dd5fd6796cf8e24
|
224ac13e358178738094d2cba0a2a7ed974519a9 |
29-Jun-2012 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with jb-release Change-Id: Iba9ed40f75d1d8519d5052fa4dd5fd6796cf8e24
|
fc86994f86f8cfb31e151c9e730dc1e9dc7b3349 |
29-Jun-2012 |
Yuli Huang <yuli@google.com> |
Do not use NfcAdapter API in old platforms. bug:6698904 Change-Id: I8cab312a212e4cba43187a73bc76d3f2164527a9
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/ui/ActionModeHandler.java
|
1c74ba27ea9187de2272f294b663c13d43bb7436 |
29-Jun-2012 |
Yuli Huang <yuli@google.com> |
Do not use NfcAdapter API in old platforms. bug:6698904 Change-Id: I8cab312a212e4cba43187a73bc76d3f2164527a9
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/ui/ActionModeHandler.java
|
c7261d5d6460012d4330518ab302e153fd84a7b6 |
29-Jun-2012 |
Wu-cheng Li <wuchengli@google.com> |
Make gallery/camera build in JB API level. Bug:4965992 Change-Id: I91e56aacb5447c811aafce756292ab5ee0636cee
ndroidManifest.xml
|
cd44238580181e2f5100794be59a2b15e9d68b1d |
29-Jun-2012 |
Wu-cheng Li <wuchengli@google.com> |
Make gallery/camera build in JB API level. Bug:4965992 Change-Id: I91e56aacb5447c811aafce756292ab5ee0636cee
ndroid.mk
|
f8e36b36cecf6c7330041356425756dd8d76e949 |
29-Jun-2012 |
Wu-cheng Li <wuchengli@google.com> |
Make gallery/camera build in JB API level. Bug:4965992 Change-Id: I91e56aacb5447c811aafce756292ab5ee0636cee
ndroid.mk
ndroidManifest.xml
|
374a83f8285bd1b0b86fa7323e07dbc7de3e3487 |
29-Jun-2012 |
Owen Lin <owenlin@google.com> |
Merge "Remove hardwired strings for no external storage."
|
a013d704604c040c367a1a814b6ce2ecb95de0ac |
29-Jun-2012 |
Owen Lin <owenlin@google.com> |
Merge "Remove hardwired strings for no external storage."
|
a2cc443402773dbbe0491e6290e87c2f691a5a62 |
29-Jun-2012 |
Owen Lin <owenlin@google.com> |
Merge "Remove hardwired strings for no external storage."
|
c52ef1a238932267d7295c28dca403c74377f495 |
29-Jun-2012 |
Hung-ying Tyan <tyanh@google.com> |
Merge "Pass correct intent to IntentService in PackagesMonitor"
|
0bba10c41de7078ccbf59c401bce17f2b68c7260 |
29-Jun-2012 |
Hung-ying Tyan <tyanh@google.com> |
Merge "Pass correct intent to IntentService in PackagesMonitor"
|
e494711fa0109bcb5b522457f21dd904f422b015 |
29-Jun-2012 |
Owen Lin <owenlin@google.com> |
Merge "Don't use Build.VERSION_CODES."
|
0e986a42c334c64e0d4a05d4f1d09ac12069080f |
29-Jun-2012 |
Owen Lin <owenlin@google.com> |
Merge "Don't use Build.VERSION_CODES."
|
78a6a0f549e977489f84809f42e3fb45c1eac1e8 |
29-Jun-2012 |
Owen Lin <owenlin@google.com> |
Merge "Don't reuse bitmaps in BitmapRegionDecoder before JB."
|
44c63eea58110b79cb4c2003c161bc2a5f9aa6f3 |
29-Jun-2012 |
Owen Lin <owenlin@google.com> |
Merge "Don't reuse bitmaps in BitmapRegionDecoder before JB."
|
59a38959ba90a0760e7850e72e03d69900d5ac63 |
28-Jun-2012 |
Hung-ying Tyan <tyanh@google.com> |
Pass correct intent to IntentService in PackagesMonitor Bug: 6755040 Change-Id: I073f4acd026cfcae3e2f4759657324f48b7238c4
rc/com/android/gallery3d/app/PackagesMonitor.java
|
1d0ff12ed167d40c3b59c83b06842b2a4941dc28 |
28-Jun-2012 |
Hung-ying Tyan <tyanh@google.com> |
Pass correct intent to IntentService in PackagesMonitor Bug: 6755040 Change-Id: I073f4acd026cfcae3e2f4759657324f48b7238c4
rc/com/android/gallery3d/app/PackagesMonitor.java
|
9d672ab4d15942cd8f8950692fa3e9764d5aa8b5 |
29-Jun-2012 |
Owen Lin <owenlin@google.com> |
Merge "Don't use Display.getSize()."
|
1fb473e5f9f61c3117e639286b2d62b2c34d0dbb |
29-Jun-2012 |
Owen Lin <owenlin@google.com> |
Merge "Don't use Display.getSize()."
|
26d26a7a64a982e2f53ddbf59014877c986434dd |
29-Jun-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to jb-dev
|
6c81a1417d437610f1aedc837ef2e88be74edf4c |
29-Jun-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to jb-dev
|
ceef2da52f5dedab1929babcad1c774dcb175b0d |
28-Jun-2012 |
Eric Fischer <enf@google.com> |
am 51e332a8: (-s ours) am 7aeb8cd4: Import translations. DO NOT MERGE * commit '51e332a88899b86c2f706e8ad164877665fe319a': Import translations. DO NOT MERGE
|
bc411ba52133d9d1280bf9fa5f48acbe5b954024 |
28-Jun-2012 |
Eric Fischer <enf@google.com> |
am 51e332a8: (-s ours) am 7aeb8cd4: Import translations. DO NOT MERGE * commit '51e332a88899b86c2f706e8ad164877665fe319a': Import translations. DO NOT MERGE
|
51e332a88899b86c2f706e8ad164877665fe319a |
28-Jun-2012 |
Eric Fischer <enf@google.com> |
am 7aeb8cd4: Import translations. DO NOT MERGE * commit '7aeb8cd43cdf11aec3f925e76cf84b37fecdb260': Import translations. DO NOT MERGE
|
8a2f839e36d79eaa904e91a6909c1c0832f927f3 |
28-Jun-2012 |
Eric Fischer <enf@google.com> |
am 7aeb8cd4: Import translations. DO NOT MERGE * commit '7aeb8cd43cdf11aec3f925e76cf84b37fecdb260': Import translations. DO NOT MERGE
|
d292508a47f2901d0946ef69c0c96fcd6051e7d4 |
28-Jun-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: I4ea9a929181ee1b09cdd4628af095ffaa86646e3 Auto-generated-cl: translation import
es/values-sw/strings.xml
|
9d272d79cccd5c74c1bf1996d7d7beb353d50b6a |
28-Jun-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: I4ea9a929181ee1b09cdd4628af095ffaa86646e3 Auto-generated-cl: translation import
es/values-sw/strings.xml
|
7aeb8cd43cdf11aec3f925e76cf84b37fecdb260 |
28-Jun-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: I340bc2547295382bdbbf31b933e2facec181cbfc Auto-generated-cl: translation import
es/values-sw/strings.xml
|
7b7534a6e3af6ab9f4c975a77720ff7df2534012 |
28-Jun-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: I340bc2547295382bdbbf31b933e2facec181cbfc Auto-generated-cl: translation import
es/values-sw/strings.xml
|
987f5330637bb0f812845c6a4ab941d416f9b7bd |
28-Jun-2012 |
Owen Lin <owenlin@google.com> |
Don't use Build.VERSION_CODES. Since they won't be available on old platform. bug: 6752318 Change-Id: I55a9e83dbf05b93c83c68cb31f6edcbc29793283
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
|
3a45725ad42324cd2db172fb082fe80772d94d3f |
28-Jun-2012 |
Owen Lin <owenlin@google.com> |
Don't use Build.VERSION_CODES. Since they won't be available on old platform. bug: 6752318 Change-Id: I55a9e83dbf05b93c83c68cb31f6edcbc29793283
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
rc/com/android/gallery3d/app/CropImage.java
rc/com/android/gallery3d/app/MoviePlayer.java
rc/com/android/gallery3d/app/Wallpaper.java
rc/com/android/gallery3d/data/LocalImage.java
rc/com/android/gallery3d/ui/GLRootView.java
|
bfe478b2fdbc3526ce465a18b30fe5195fa1fe8a |
28-Jun-2012 |
Owen Lin <owenlin@google.com> |
Don't use Build.VERSION_CODES. Since they won't be available on old platform. bug: 6752318 Change-Id: I55a9e83dbf05b93c83c68cb31f6edcbc29793283
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
rc/com/android/gallery3d/app/CropImage.java
rc/com/android/gallery3d/app/MoviePlayer.java
rc/com/android/gallery3d/app/Wallpaper.java
rc/com/android/gallery3d/data/LocalImage.java
rc/com/android/gallery3d/ui/GLRootView.java
|
00b187956db9e3b0f33354d3dfcc2c3a0693eee2 |
27-Jun-2012 |
Owen Lin <owenlin@google.com> |
Don't reuse bitmaps in BitmapRegionDecoder before JB. Change-Id: I8a2f520f98116af6861fa2cd1460e6f848bbb4e4
allerycommon/Android.mk
|
30aa92093126f00b46543ae3b5d1035a3270f240 |
27-Jun-2012 |
Owen Lin <owenlin@google.com> |
Don't reuse bitmaps in BitmapRegionDecoder before JB. Change-Id: I8a2f520f98116af6861fa2cd1460e6f848bbb4e4
allerycommon/Android.mk
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
rc/com/android/gallery3d/ui/TileImageView.java
rc/com/android/gallery3d/ui/TileImageViewAdapter.java
|
d09121f9fb7cf571a6b71c4174835dd4b7359595 |
27-Jun-2012 |
Owen Lin <owenlin@google.com> |
Don't reuse bitmaps in BitmapRegionDecoder before JB. Change-Id: I8a2f520f98116af6861fa2cd1460e6f848bbb4e4
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
rc/com/android/gallery3d/ui/TileImageView.java
rc/com/android/gallery3d/ui/TileImageViewAdapter.java
|
76bfd87c90c98a46c06ea67dd895fc8f016f7267 |
27-Jun-2012 |
Owen Lin <owenlin@google.com> |
Don't reuse bitmaps in BitmapRegionDecoder before JB. Change-Id: I8a2f520f98116af6861fa2cd1460e6f848bbb4e4
allerycommon/Android.mk
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
|
648f2a170843b856acc73745c71ffc675be5100a |
28-Jun-2012 |
Hung-ying Tyan <tyanh@google.com> |
Merge "Replace BroadcastReceiver.goAsync() with IntentService"
|
96e5fe73c500bed6dd4e792178570f825fc3a1c3 |
27-Jun-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to jb-dev
|
391dd515ff1237b7914f8849fbf6dc6bd5fa6751 |
27-Jun-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to jb-dev
|
c20ef6cfc116645e07d04ce4d6b203fc8a6d4d01 |
27-Jun-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to jb-dev
|
c5c00b80d9eb2b651d855eafce06a6fff8ff178a |
27-Jun-2012 |
Ying Wang <wangying@google.com> |
am c9cd45b3: (-s ours) am d857f776: Merge "Import translations. DO NOT MERGE" into jb-dev * commit 'c9cd45b321a834d20629ff9dc91fec2ccce79f7c': Import translations. DO NOT MERGE
|
bd83978ee73d2f5833b3bd26d78ac79eff81fbe6 |
27-Jun-2012 |
Ying Wang <wangying@google.com> |
am c9cd45b3: (-s ours) am d857f776: Merge "Import translations. DO NOT MERGE" into jb-dev * commit 'c9cd45b321a834d20629ff9dc91fec2ccce79f7c': Import translations. DO NOT MERGE
|
c9cd45b321a834d20629ff9dc91fec2ccce79f7c |
27-Jun-2012 |
Ying Wang <wangying@google.com> |
am d857f776: Merge "Import translations. DO NOT MERGE" into jb-dev * commit 'd857f77613007fc2005903eb33e5315ed45368c4': Import translations. DO NOT MERGE
|
756b166d4426ffc46e1475f524b63add2c3405f1 |
27-Jun-2012 |
Ying Wang <wangying@google.com> |
am d857f776: Merge "Import translations. DO NOT MERGE" into jb-dev * commit 'd857f77613007fc2005903eb33e5315ed45368c4': Import translations. DO NOT MERGE
|
c12169de602caefc055296e36c8bcf20cf9796bf |
27-Jun-2012 |
Ying Wang <wangying@google.com> |
Merge "Import translations. DO NOT MERGE"
|
002cd0573efe2f0587452df53819132cc13dcf96 |
27-Jun-2012 |
Ying Wang <wangying@google.com> |
Merge "Import translations. DO NOT MERGE"
|
d857f77613007fc2005903eb33e5315ed45368c4 |
27-Jun-2012 |
Ying Wang <wangying@google.com> |
Merge "Import translations. DO NOT MERGE" into jb-dev
|
898e643de59a79f3b652bf3e27591dea5eda3dd2 |
27-Jun-2012 |
Ying Wang <wangying@google.com> |
Merge "Import translations. DO NOT MERGE" into jb-dev
|
397ac9c3ab80f60ed629674c73c65b92442779ed |
27-Jun-2012 |
Ying Wang <wangying@google.com> |
am 3326551f: (-s ours) am c00af20f: Import translations. DO NOT MERGE * commit '3326551f504f48073c7083738e1f58f4cf7a3f49': Import translations. DO NOT MERGE
|
194232f03b5f8108540fd52f2fa56cdabc82e3e6 |
27-Jun-2012 |
Ying Wang <wangying@google.com> |
am 3326551f: (-s ours) am c00af20f: Import translations. DO NOT MERGE * commit '3326551f504f48073c7083738e1f58f4cf7a3f49': Import translations. DO NOT MERGE
|
d34413a55613c9ae58cc94324f88631e37f9ef8b |
27-Jun-2012 |
Ying Wang <wangying@google.com> |
Import translations. DO NOT MERGE Change-Id: If975fd0d8a50a650b05756ba1a3202ac49df4748
es/values-af/strings.xml
|
47006127731a472804002876a6d03da41a859d5d |
27-Jun-2012 |
Ying Wang <wangying@google.com> |
Import translations. DO NOT MERGE Change-Id: If975fd0d8a50a650b05756ba1a3202ac49df4748
es/values-af/strings.xml
|
53ea7963d6a17b5f1327eac1bdeb071743465cb4 |
27-Jun-2012 |
Ying Wang <wangying@google.com> |
Import translations. DO NOT MERGE Change-Id: I01abb0b9f6481a865cc3c796bc301f1a34c76be7
es/values-af/strings.xml
|
375f65d579fc4d7291de4c824722754770eaf5f8 |
27-Jun-2012 |
Ying Wang <wangying@google.com> |
Import translations. DO NOT MERGE Change-Id: I01abb0b9f6481a865cc3c796bc301f1a34c76be7
es/values-af/strings.xml
|
3326551f504f48073c7083738e1f58f4cf7a3f49 |
27-Jun-2012 |
Ying Wang <wangying@google.com> |
am c00af20f: Import translations. DO NOT MERGE * commit 'c00af20f0613cbfc2a2a650372840ac37789878f': Import translations. DO NOT MERGE
|
c653fa370c341331f8e3f76e4d62d22897c289ee |
27-Jun-2012 |
Ying Wang <wangying@google.com> |
am c00af20f: Import translations. DO NOT MERGE * commit 'c00af20f0613cbfc2a2a650372840ac37789878f': Import translations. DO NOT MERGE
|
f273a58486d619609692a37ec44c3914b597a9a2 |
27-Jun-2012 |
Ying Wang <wangying@google.com> |
Import translations. DO NOT MERGE Change-Id: Id2dc6d5f32fc724c03e0f3a628590f6f07f87357
es/values-af/strings.xml
|
936663cb1be5d9fb498fc3a4000eb40dd60fcf30 |
27-Jun-2012 |
Ying Wang <wangying@google.com> |
Import translations. DO NOT MERGE Change-Id: Id2dc6d5f32fc724c03e0f3a628590f6f07f87357
es/values-af/strings.xml
|
c00af20f0613cbfc2a2a650372840ac37789878f |
27-Jun-2012 |
Ying Wang <wangying@google.com> |
Import translations. DO NOT MERGE Change-Id: I5df2833519f46df2d6d9b5e290b605b0811d397f
es/values-af/strings.xml
|
81bfdceb32f56412d55dba27025b42c0b2411ba4 |
27-Jun-2012 |
Ying Wang <wangying@google.com> |
Import translations. DO NOT MERGE Change-Id: I5df2833519f46df2d6d9b5e290b605b0811d397f
es/values-af/strings.xml
|
74bd9983a471a53399524bb43e6bec04cb165fa3 |
27-Jun-2012 |
Hung-ying Tyan <tyanh@google.com> |
Replace BroadcastReceiver.goAsync() with IntentService to make Gallery run on older API. Change-Id: I30dacb38eb4e70ed3f89135544d6c514d0379add
ndroidManifest.xml
|
9d9450fdf1efeb7a906d21913ba859218514dd29 |
27-Jun-2012 |
Hung-ying Tyan <tyanh@google.com> |
Replace BroadcastReceiver.goAsync() with IntentService to make Gallery run on older API. Change-Id: I30dacb38eb4e70ed3f89135544d6c514d0379add
rc/com/android/gallery3d/app/PackagesMonitor.java
|
a56270e9d7072be946569815712dea09b2544718 |
27-Jun-2012 |
Hung-ying Tyan <tyanh@google.com> |
Replace BroadcastReceiver.goAsync() with IntentService to make Gallery run on older API. Change-Id: I30dacb38eb4e70ed3f89135544d6c514d0379add
ndroidManifest.xml
rc/com/android/gallery3d/app/PackagesMonitor.java
|
cccb63219fc92b7f6a6e322746f276e6f07c7dd0 |
27-Jun-2012 |
Owen Lin <owenlin@google.com> |
Don't use Display.getSize(). Change-Id: I9b5c9021bae2b58d2815a909c97104f215d4d2e8
rc/com/android/gallery3d/app/Wallpaper.java
rc/com/android/gallery3d/util/GalleryUtils.java
|
a67532ff46d69b39936f209ce73682363b0a43c0 |
27-Jun-2012 |
Owen Lin <owenlin@google.com> |
Don't use Display.getSize(). Change-Id: I9b5c9021bae2b58d2815a909c97104f215d4d2e8
rc/com/android/gallery3d/app/Wallpaper.java
rc/com/android/gallery3d/util/GalleryUtils.java
|
5281c0b1fb73947d5808b9abab2d70266bc2dcdf |
27-Jun-2012 |
Chih-Chung Chang <chihchung@google.com> |
am acd75301: am bb52543c: Merge "Show undo option for 3 seconds after the last picture is deleted." into jb-dev * commit 'acd753010dcf6d8079e4620722921694cb041dbf': Show undo option for 3 seconds after the last picture is deleted.
|
8ba7701ccacfe48c9632abbf51fac891edb72774 |
27-Jun-2012 |
Chih-Chung Chang <chihchung@google.com> |
am acd75301: am bb52543c: Merge "Show undo option for 3 seconds after the last picture is deleted." into jb-dev * commit 'acd753010dcf6d8079e4620722921694cb041dbf': Show undo option for 3 seconds after the last picture is deleted.
|
57ec2e5724e4e152d994592193e29e76267a6e9c |
27-Jun-2012 |
Chih-Chung Chang <chihchung@google.com> |
am bb52543c: Merge "Show undo option for 3 seconds after the last picture is deleted." into jb-dev * commit 'bb52543c6ba40749d7046f6ea9da4a8b30793f8d': Show undo option for 3 seconds after the last picture is deleted.
|
acd753010dcf6d8079e4620722921694cb041dbf |
27-Jun-2012 |
Chih-Chung Chang <chihchung@google.com> |
am bb52543c: Merge "Show undo option for 3 seconds after the last picture is deleted." into jb-dev * commit 'bb52543c6ba40749d7046f6ea9da4a8b30793f8d': Show undo option for 3 seconds after the last picture is deleted.
|
d593a2c1853b4a5a900f194b0a32dc1ac9b1939c |
27-Jun-2012 |
Chih-Chung Chang <chihchung@google.com> |
Merge "Show undo option for 3 seconds after the last picture is deleted." into jb-dev
|
bb52543c6ba40749d7046f6ea9da4a8b30793f8d |
27-Jun-2012 |
Chih-Chung Chang <chihchung@google.com> |
Merge "Show undo option for 3 seconds after the last picture is deleted." into jb-dev
|
429745b69f9113ecf64bf713ff5e040eda0d89cd |
27-Jun-2012 |
Hung-ying Tyan <tyanh@google.com> |
am 52d51fff: am fc826a5f: Merge "Migrate local-album gallery widgets from pre-JB." into jb-dev * commit '52d51fff7affd82bc69b025d261ebf19b25728c2': Migrate local-album gallery widgets from pre-JB.
|
f30aae7dfa064f65697214a3b107b581b42f135b |
27-Jun-2012 |
Hung-ying Tyan <tyanh@google.com> |
am 52d51fff: am fc826a5f: Merge "Migrate local-album gallery widgets from pre-JB." into jb-dev * commit '52d51fff7affd82bc69b025d261ebf19b25728c2': Migrate local-album gallery widgets from pre-JB.
|
ec8e475a4778bf41e237daec73a88adab911bca9 |
27-Jun-2012 |
Hung-ying Tyan <tyanh@google.com> |
am fc826a5f: Merge "Migrate local-album gallery widgets from pre-JB." into jb-dev * commit 'fc826a5ff488e9e3b27d2a521518e0ae5346b9fe': Migrate local-album gallery widgets from pre-JB.
|
52d51fff7affd82bc69b025d261ebf19b25728c2 |
27-Jun-2012 |
Hung-ying Tyan <tyanh@google.com> |
am fc826a5f: Merge "Migrate local-album gallery widgets from pre-JB." into jb-dev * commit 'fc826a5ff488e9e3b27d2a521518e0ae5346b9fe': Migrate local-album gallery widgets from pre-JB.
|
676ec6a3ac03d7f0797325dc7067b82cf55b1ff2 |
27-Jun-2012 |
Hung-ying Tyan <tyanh@google.com> |
Merge "Migrate local-album gallery widgets from pre-JB." into jb-dev
|
fc826a5ff488e9e3b27d2a521518e0ae5346b9fe |
27-Jun-2012 |
Hung-ying Tyan <tyanh@google.com> |
Merge "Migrate local-album gallery widgets from pre-JB." into jb-dev
|
e0dcf33665378829a4a0d437ef06429d95f6e211 |
27-Jun-2012 |
Chih-Chung Chang <chihchung@google.com> |
Show undo option for 3 seconds after the last picture is deleted. Bug: 6742326 Change-Id: I5008c1984fff0a2affaeabf2a195cfcdc517ebc2
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/data/FilterDeleteSet.java
|
c370476adcf29f311ceec70a119792a0168781e9 |
27-Jun-2012 |
Chih-Chung Chang <chihchung@google.com> |
Show undo option for 3 seconds after the last picture is deleted. Bug: 6742326 Change-Id: I5008c1984fff0a2affaeabf2a195cfcdc517ebc2
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/data/FilterDeleteSet.java
|
7e36dead955115eb1b0c2eab644c6902f3477d1c |
26-Jun-2012 |
Hung-ying Tyan <tyanh@google.com> |
Migrate local-album gallery widgets from pre-JB. The path of external storage is changed to /storage/sdcard0 in JB and the bucket IDs in MediaStore are changed accordinly. The local-album gallery widget is saved by its bucket ID so this needs to be migrated to new value as well. Bug: 6720251 Change-Id: I58a3044f2f05d428a9524f7a8053259950d5128d
rc/com/android/gallery3d/gadget/PhotoAppWidgetProvider.java
rc/com/android/gallery3d/gadget/WidgetDatabaseHelper.java
rc/com/android/gallery3d/onetimeinitializer/GalleryWidgetMigrator.java
|
40234dd934d0dac0a65c896d9d287d58bc10b198 |
26-Jun-2012 |
Hung-ying Tyan <tyanh@google.com> |
Migrate local-album gallery widgets from pre-JB. The path of external storage is changed to /storage/sdcard0 in JB and the bucket IDs in MediaStore are changed accordinly. The local-album gallery widget is saved by its bucket ID so this needs to be migrated to new value as well. Bug: 6720251 Change-Id: I58a3044f2f05d428a9524f7a8053259950d5128d
rc/com/android/gallery3d/gadget/PhotoAppWidgetProvider.java
rc/com/android/gallery3d/gadget/WidgetDatabaseHelper.java
rc/com/android/gallery3d/onetimeinitializer/GalleryWidgetMigrator.java
|
414bb728bf9b20cc58f1991b1db0d7758a82bc78 |
26-Jun-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to jb-dev
|
885b3cc0a393c9ebf9d86cbf9351473c87df8d99 |
26-Jun-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to jb-dev
|
2cff26966184986441109053d351d522c9bcb643 |
26-Jun-2012 |
Chih-Chung Chang <chihchung@google.com> |
am 27a76801: am c7e89dae: Update thumbnail if a picture is deleted in background. * commit '27a768018b18f45b9dd912bafd09dea64460f852': Update thumbnail if a picture is deleted in background.
|
d75226857721967fc59104404b32d9f28afaa26a |
26-Jun-2012 |
Chih-Chung Chang <chihchung@google.com> |
am 27a76801: am c7e89dae: Update thumbnail if a picture is deleted in background. * commit '27a768018b18f45b9dd912bafd09dea64460f852': Update thumbnail if a picture is deleted in background.
|
6de536dbc81345e1a19355fb9f3ad0aa2ea2ab8a |
26-Jun-2012 |
Chih-Chung Chang <chihchung@google.com> |
am c7e89dae: Update thumbnail if a picture is deleted in background. * commit 'c7e89daeb178a895de211c411d09a822de52e4e9': Update thumbnail if a picture is deleted in background.
|
27a768018b18f45b9dd912bafd09dea64460f852 |
26-Jun-2012 |
Chih-Chung Chang <chihchung@google.com> |
am c7e89dae: Update thumbnail if a picture is deleted in background. * commit 'c7e89daeb178a895de211c411d09a822de52e4e9': Update thumbnail if a picture is deleted in background.
|
eb55e15ba4989e172ccfe9b7eeb6768c9020a514 |
26-Jun-2012 |
Chih-Chung Chang <chihchung@google.com> |
Update thumbnail if a picture is deleted in background. Bug: 6712751 Change-Id: I17f56c9ff04441e51f28b3e3bec23b1ac308b70c
rc/com/android/gallery3d/data/DataManager.java
rc/com/android/gallery3d/data/LocalAlbum.java
rc/com/android/gallery3d/data/LocalImage.java
rc/com/android/gallery3d/data/LocalVideo.java
|
c7e89daeb178a895de211c411d09a822de52e4e9 |
26-Jun-2012 |
Chih-Chung Chang <chihchung@google.com> |
Update thumbnail if a picture is deleted in background. Bug: 6712751 Change-Id: I17f56c9ff04441e51f28b3e3bec23b1ac308b70c
rc/com/android/gallery3d/data/DataManager.java
rc/com/android/gallery3d/data/LocalAlbum.java
rc/com/android/gallery3d/data/LocalImage.java
rc/com/android/gallery3d/data/LocalVideo.java
|
8c986ba35be4a40444b844b14b128ceaf7f5df0b |
26-Jun-2012 |
Chih-Chung Chang <chihchung@google.com> |
am 64cebdd1: am 6118af9d: Fix the behavior of deleting the last picture. * commit '64cebdd1eebd2c001e6680f247c6f741889ad989': Fix the behavior of deleting the last picture.
|
57e297d1c6927759a18e599114676150b6cb0f26 |
26-Jun-2012 |
Chih-Chung Chang <chihchung@google.com> |
am 64cebdd1: am 6118af9d: Fix the behavior of deleting the last picture. * commit '64cebdd1eebd2c001e6680f247c6f741889ad989': Fix the behavior of deleting the last picture.
|
b26c4acfe4e18446a02bc49812f101d1669a92fa |
26-Jun-2012 |
Chih-Chung Chang <chihchung@google.com> |
am 6118af9d: Fix the behavior of deleting the last picture. * commit '6118af9ddad8acc050133154f8f60c842c7f9bfa': Fix the behavior of deleting the last picture.
|
64cebdd1eebd2c001e6680f247c6f741889ad989 |
26-Jun-2012 |
Chih-Chung Chang <chihchung@google.com> |
am 6118af9d: Fix the behavior of deleting the last picture. * commit '6118af9ddad8acc050133154f8f60c842c7f9bfa': Fix the behavior of deleting the last picture.
|
c6e089b29703c8506b7b85c5af796e8c340b0818 |
22-Jun-2012 |
Chih-Chung Chang <chihchung@google.com> |
Fix the behavior of deleting the last picture. Also fix the jank while deleting multiple pictures quickly. Bug: 6713932, 6712555 Change-Id: I9d64d8bbdcd4ec0dc9a447a51d50f88ff27363b4
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/data/FilterDeleteSet.java
rc/com/android/gallery3d/ui/PhotoView.java
|
6118af9ddad8acc050133154f8f60c842c7f9bfa |
22-Jun-2012 |
Chih-Chung Chang <chihchung@google.com> |
Fix the behavior of deleting the last picture. Also fix the jank while deleting multiple pictures quickly. Bug: 6713932, 6712555 Change-Id: I9d64d8bbdcd4ec0dc9a447a51d50f88ff27363b4
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/data/FilterDeleteSet.java
rc/com/android/gallery3d/ui/PhotoView.java
|
9cd7480fb9f20999f69d760102f775eacebc790a |
26-Jun-2012 |
Pin Ting <pinting@google.com> |
Merge "Use public OverScroller() instead of a hidden one.."
|
fa4fcf8a20203560aa148ce6087cad216a762123 |
26-Jun-2012 |
Pin Ting <pinting@google.com> |
Merge "Use public OverScroller() instead of a hidden one.."
|
f595d29594a3b0bdba2a42def50c3cffd2b5ce35 |
26-Jun-2012 |
Owen Lin <owenlin@google.com> |
Merge "Use another version of setRemoteViews for backward compatibility."
|
197dad5accc03ecb57a8c80331e8125d4b823c24 |
26-Jun-2012 |
Owen Lin <owenlin@google.com> |
Merge "Use another version of setRemoteViews for backward compatibility."
|
6a0fdc244230b3f67377314f054c3632d1fd0966 |
26-Jun-2012 |
Owen Lin <owenlin@google.com> |
Merge "Use MediaColumns.WIDTH and MediaColumns.HEIGHT only when they are available."
|
51a5ad187c63ae5581dabef8ed672b1d712f6fb2 |
26-Jun-2012 |
Owen Lin <owenlin@google.com> |
Merge "Use MediaColumns.WIDTH and MediaColumns.HEIGHT only when they are available."
|
8b930828c7a33d668876972c22a515e9163592f7 |
20-Jun-2012 |
Pin Ting <pinting@google.com> |
Use public OverScroller() instead of a hidden one.. Bug:6698374 Change-Id: I3a97d0b4bbfb5e2a1e9f4a656d39db636defcdbd
rc/com/android/gallery3d/ui/PositionController.java
|
6f788d8f1b286a37f92b35797ca09a9d7c0d38a4 |
20-Jun-2012 |
Pin Ting <pinting@google.com> |
Use public OverScroller() instead of a hidden one.. Bug:6698374 Change-Id: I3a97d0b4bbfb5e2a1e9f4a656d39db636defcdbd
rc/com/android/gallery3d/ui/PositionController.java
|
e672931bcb93f03507124d1bebf73b9d822ff1f7 |
23-Jun-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am 57150b3c: Reconcile with jb-release * commit '57150b3c30a066bdf7f346223bf0707a345c4e47':
|
b26356554e3a7c493b32994f01effe2e62754c7d |
23-Jun-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am 57150b3c: Reconcile with jb-release * commit '57150b3c30a066bdf7f346223bf0707a345c4e47':
|
58c98ee0799c8f263e1a2cbe981dee76d8a4a1ab |
23-Jun-2012 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with jb-release Change-Id: Ica9e5255d9ea862cb24ef52d69545881147a2a26
|
57150b3c30a066bdf7f346223bf0707a345c4e47 |
23-Jun-2012 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with jb-release Change-Id: Ica9e5255d9ea862cb24ef52d69545881147a2a26
|
c2c635454bf83f0356b6bdbc8449de7eb79cb8e8 |
23-Jun-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to jb-dev
|
48e26419f3a16661330f6766053d677be6a11bf8 |
23-Jun-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to jb-dev
|
b824fcdce4ee1ef5336438eb670cbb083243d779 |
22-Jun-2012 |
Ying Wang <wangying@google.com> |
am ea34811c: (-s ours) am 55fad05e: Import translations. DO NOT MERGE * commit 'ea34811c9e7e301c1deba0fedd331101cfe7ce5f': Import translations. DO NOT MERGE
|
b2384434729b6c844aa1cba103fbaf7d7d53501e |
22-Jun-2012 |
Ying Wang <wangying@google.com> |
am ea34811c: (-s ours) am 55fad05e: Import translations. DO NOT MERGE * commit 'ea34811c9e7e301c1deba0fedd331101cfe7ce5f': Import translations. DO NOT MERGE
|
0b75223a5513d6335397a7e76158b245713a4fca |
22-Jun-2012 |
Ying Wang <wangying@google.com> |
am 55fad05e: Import translations. DO NOT MERGE * commit '55fad05ef4a80b3a690d4748c5b90fb5c0488d22': Import translations. DO NOT MERGE
|
ea34811c9e7e301c1deba0fedd331101cfe7ce5f |
22-Jun-2012 |
Ying Wang <wangying@google.com> |
am 55fad05e: Import translations. DO NOT MERGE * commit '55fad05ef4a80b3a690d4748c5b90fb5c0488d22': Import translations. DO NOT MERGE
|
ce7538ec2a14327e6bd921836c036d6aee1bb876 |
22-Jun-2012 |
Ying Wang <wangying@google.com> |
Import translations. DO NOT MERGE Change-Id: If644f38aa01a00a9eb6906f487ec46c0f1a0d532
es/values-bg/strings.xml
|
89b83408acebc3ebf9bf6a19bb064473497dc920 |
22-Jun-2012 |
Ying Wang <wangying@google.com> |
Import translations. DO NOT MERGE Change-Id: If644f38aa01a00a9eb6906f487ec46c0f1a0d532
es/values-bg/strings.xml
|
c12b7160f8da366f32fc61b5abba3f34be1e003f |
22-Jun-2012 |
Ying Wang <wangying@google.com> |
Import translations. DO NOT MERGE Change-Id: I49c07cd7b3bde69fb0b2b09c298710cae6d2a91f
es/values-bg/strings.xml
|
55fad05ef4a80b3a690d4748c5b90fb5c0488d22 |
22-Jun-2012 |
Ying Wang <wangying@google.com> |
Import translations. DO NOT MERGE Change-Id: I49c07cd7b3bde69fb0b2b09c298710cae6d2a91f
es/values-bg/strings.xml
|
69c267a84a1c5ba06154756cb65395ef12c7f767 |
22-Jun-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am 9334cdf3: Reconcile with jb-release * commit '9334cdf3825667134a55b198568c76ae40fc4a57':
|
902aa126032fb1eeaf18e1dc7413002f15c8a20b |
22-Jun-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am 9334cdf3: Reconcile with jb-release * commit '9334cdf3825667134a55b198568c76ae40fc4a57':
|
a442e6706b936d0fb21f10b71a7c63851ef72c2c |
22-Jun-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am 9334cdf3: Reconcile with jb-release * commit '9334cdf3825667134a55b198568c76ae40fc4a57':
|
6754748fffae96664d659a31f24160242fcfb998 |
22-Jun-2012 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with jb-release Change-Id: I20961dda95f0a5b0b580b73de5e8b09434eaaa44
|
ddaeb31a5b6501fbbb2b16b3ceaa11ade7cc2e49 |
22-Jun-2012 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with jb-release Change-Id: I20961dda95f0a5b0b580b73de5e8b09434eaaa44
|
9334cdf3825667134a55b198568c76ae40fc4a57 |
22-Jun-2012 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with jb-release Change-Id: I20961dda95f0a5b0b580b73de5e8b09434eaaa44
|
369d0e6b4ee4f034a418177516ea8a76a16953df |
22-Jun-2012 |
Owen Lin <owenlin@google.com> |
Use another version of setRemoteViews for backward compatibility. bug: 6706684 Change-Id: I6fd77845d64cfb9e6830c1eabdcb5c2e9a7df854
rc/com/android/gallery3d/gadget/PhotoAppWidgetProvider.java
|
343f7984c8184e0a1ade23885699c2aa9be1378f |
22-Jun-2012 |
Owen Lin <owenlin@google.com> |
Use another version of setRemoteViews for backward compatibility. bug: 6706684 Change-Id: I6fd77845d64cfb9e6830c1eabdcb5c2e9a7df854
rc/com/android/gallery3d/gadget/PhotoAppWidgetProvider.java
|
0c4c03a9fa2486d8021ad8f36067aa985aa2c85d |
21-Jun-2012 |
Owen Lin <owenlin@google.com> |
Use MediaColumns.WIDTH and MediaColumns.HEIGHT only when they are available. bug:6698720 Change-Id: Iaabfd1d5fe16b5d89f564d688a78e773ad36c8bd
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
|
b47927b7b43679e7315e6099e0a610760320d18d |
21-Jun-2012 |
Owen Lin <owenlin@google.com> |
Use MediaColumns.WIDTH and MediaColumns.HEIGHT only when they are available. bug:6698720 Change-Id: Iaabfd1d5fe16b5d89f564d688a78e773ad36c8bd
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
rc/com/android/gallery3d/app/CropImage.java
rc/com/android/gallery3d/data/LocalImage.java
|
40228b9d0ac27ae47c30d8fbcf6c253de707b71b |
21-Jun-2012 |
Owen Lin <owenlin@google.com> |
Use MediaColumns.WIDTH and MediaColumns.HEIGHT only when they are available. bug:6698720 Change-Id: Iaabfd1d5fe16b5d89f564d688a78e773ad36c8bd
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
rc/com/android/gallery3d/app/CropImage.java
rc/com/android/gallery3d/data/LocalImage.java
|
628eda8ffb6d6c9280b392f35fdbff1ca362e319 |
21-Jun-2012 |
Owen Lin <owenlin@google.com> |
Remove hardwired strings for no external storage. bug: 6682495 Change-Id: I68652d6b01842a42907b953574d563cf98e65219
rc/com/android/gallery3d/app/AbstractGalleryActivity.java
|
edc1ebec23379a328e3b808ce9ee6e09a479bc92 |
21-Jun-2012 |
Owen Lin <owenlin@google.com> |
Remove hardwired strings for no external storage. bug: 6682495 Change-Id: I68652d6b01842a42907b953574d563cf98e65219
es/values/strings.xml
|
fd3071dfc28b4caad583c77d7a4d9dad8fb86a3a |
21-Jun-2012 |
Owen Lin <owenlin@google.com> |
Remove hardwired strings for no external storage. bug: 6682495 Change-Id: I68652d6b01842a42907b953574d563cf98e65219
es/values/strings.xml
rc/com/android/gallery3d/app/AbstractGalleryActivity.java
|
5d095edd840841440b029b4adc6e4fc2261d9bd6 |
20-Jun-2012 |
Owen Lin <owenlin@google.com> |
Guard the use of SYSTEM_UI_FLAG_XXXX with TargetApi bug: 6698718 Change-Id: I6962f0128ce2bd57658b7f3b77d2bc150eff1f60
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
rc/com/android/gallery3d/app/MovieActivity.java
rc/com/android/gallery3d/app/MoviePlayer.java
rc/com/android/gallery3d/ui/GLRootView.java
|
7a5e1e771ae58241f3a2be36f23025f282032261 |
20-Jun-2012 |
Owen Lin <owenlin@google.com> |
Guard the use of SYSTEM_UI_FLAG_XXXX with TargetApi bug: 6698718 Change-Id: I6962f0128ce2bd57658b7f3b77d2bc150eff1f60
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
rc/com/android/gallery3d/app/MovieActivity.java
rc/com/android/gallery3d/app/MoviePlayer.java
rc/com/android/gallery3d/ui/GLRootView.java
|
9199c4d69ebc9b9589271d1e62ba80138b1db700 |
20-Jun-2012 |
Owen Lin <owenlin@google.com> |
Guard the use of SYSTEM_UI_FLAG_XXXX with TargetApi bug: 6698718 Change-Id: I6962f0128ce2bd57658b7f3b77d2bc150eff1f60
allerycommon/src/com/android/gallery3d/common/ApiHelper.java
|
23c057c70f7887ee9ae14923d8e3421d4bf59a38 |
21-Jun-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to jb-dev
|
7b94da7da1601a480b1af24f2243d502ffb16eb0 |
21-Jun-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to jb-dev
|
e577eee0762e7aa9449f9145495790730ce8b415 |
21-Jun-2012 |
Eric Fischer <enf@google.com> |
am 3ca90d33: (-s ours) am 424df443: Import translations. DO NOT MERGE * commit '3ca90d33f83ba529349a4c1e577879af8220a33a': Import translations. DO NOT MERGE
|
5bd1da49ab875a2eeba645731d05e7a4043dea4b |
21-Jun-2012 |
Eric Fischer <enf@google.com> |
am 3ca90d33: (-s ours) am 424df443: Import translations. DO NOT MERGE * commit '3ca90d33f83ba529349a4c1e577879af8220a33a': Import translations. DO NOT MERGE
|
217a0e7b15c031e80de69b1f08f46af274fe84c6 |
21-Jun-2012 |
Eric Fischer <enf@google.com> |
am 424df443: Import translations. DO NOT MERGE * commit '424df443c6d1252c858d90e6e3a73914e81e4d14': Import translations. DO NOT MERGE
|
3ca90d33f83ba529349a4c1e577879af8220a33a |
21-Jun-2012 |
Eric Fischer <enf@google.com> |
am 424df443: Import translations. DO NOT MERGE * commit '424df443c6d1252c858d90e6e3a73914e81e4d14': Import translations. DO NOT MERGE
|
f5c19d6176bfb2de032f3a0a24468c8dd06ef6ee |
21-Jun-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: Ib58116d9f2da412110e7a45fe8c41eea73f771b1
es/values-af/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
|
2122358459ff38f4cb9f21d086f4ef3000b0e172 |
21-Jun-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: Ib58116d9f2da412110e7a45fe8c41eea73f771b1
es/values-af/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
|
4b9fa27a079b6cc97705c90c96234df2d2201065 |
21-Jun-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: Ife7bedf0d5a4ef1a25a0474b56773da7c635317e
es/values-af/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
|
424df443c6d1252c858d90e6e3a73914e81e4d14 |
21-Jun-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: Ife7bedf0d5a4ef1a25a0474b56773da7c635317e
es/values-af/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
|
cc2c83f4adde2ead9b15f32954551caa30eb52ef |
21-Jun-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to jb-dev
|
e0ddc04c1816def8605e156c6348bd52c0a0c9c6 |
21-Jun-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to jb-dev
|
17a888d26488d25eb88d351f5527e0a332752721 |
21-Jun-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to jb-dev
|
13dd0735edee26b5699cbf2abedcebec32e962ca |
21-Jun-2012 |
Wu-cheng Li <wuchengli@google.com> |
Use View.setBackgroundDrawable instead of setBackground. View.setBackground was added in API 16. Use setBackgroundDrawable instead. bug:6698428 Change-Id: I1346ba4c640ae98d76e333779b4620cdc48b6a3a
rc/com/android/gallery3d/app/MoviePlayer.java
|
22a3633a5b84449a419ecb92479703725bdd6723 |
21-Jun-2012 |
Wu-cheng Li <wuchengli@google.com> |
Use View.setBackgroundDrawable instead of setBackground. View.setBackground was added in API 16. Use setBackgroundDrawable instead. bug:6698428 Change-Id: I1346ba4c640ae98d76e333779b4620cdc48b6a3a
rc/com/android/gallery3d/app/MoviePlayer.java
|
d2387299fa70930573c0a7703da9151013e99dd3 |
21-Jun-2012 |
Eric Fischer <enf@google.com> |
am 2e671684: (-s ours) am 2574da18: Import translations. DO NOT MERGE * commit '2e67168492d5453876e913937ed1e36111fc2e48': Import translations. DO NOT MERGE
|
78f8e0ad3addf7e7075735f5c8c2c04c750c858c |
21-Jun-2012 |
Eric Fischer <enf@google.com> |
am 2e671684: (-s ours) am 2574da18: Import translations. DO NOT MERGE * commit '2e67168492d5453876e913937ed1e36111fc2e48': Import translations. DO NOT MERGE
|
5d98dcace09aca14e47dfaebe29213991f6ffa45 |
21-Jun-2012 |
Eric Fischer <enf@google.com> |
am 2574da18: Import translations. DO NOT MERGE * commit '2574da183322bef8eb84ab2411bc14d5ff202655': Import translations. DO NOT MERGE
|
2e67168492d5453876e913937ed1e36111fc2e48 |
21-Jun-2012 |
Eric Fischer <enf@google.com> |
am 2574da18: Import translations. DO NOT MERGE * commit '2574da183322bef8eb84ab2411bc14d5ff202655': Import translations. DO NOT MERGE
|
3b7e14ad05557e97578a6776ad4190b7697fd4c3 |
21-Jun-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: If82aede2b76dc81e117d9b6e62bb21c96aaf8914
es/values-am/strings.xml
es/values-el/strings.xml
|
ff08772a422a8f93792cf49f0f804ee4f42a909f |
21-Jun-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: If82aede2b76dc81e117d9b6e62bb21c96aaf8914
es/values-am/strings.xml
es/values-el/strings.xml
|
af0ad5dde55c9fef8ee72607e70cdcb9ba6ebf60 |
21-Jun-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: I74d3d343c159a47c3375fbbb28b2579034d33d72
es/values-am/strings.xml
es/values-el/strings.xml
|
2574da183322bef8eb84ab2411bc14d5ff202655 |
21-Jun-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: I74d3d343c159a47c3375fbbb28b2579034d33d72
es/values-am/strings.xml
es/values-el/strings.xml
|
a869ad79695d3e109c1eaa05fd107f25d8971522 |
20-Jun-2012 |
Wei Huang <weih@google.com> |
am 254a6b42: am 82220026: Merge "Fade in/out the undo bar." into jb-dev * commit '254a6b42372179bcc9cf6166639325d11411be77': Fade in/out the undo bar.
|
18dafe5c81d5667e6d06fa43ed82a0cb5e3aa9e1 |
20-Jun-2012 |
Wei Huang <weih@google.com> |
am 254a6b42: am 82220026: Merge "Fade in/out the undo bar." into jb-dev * commit '254a6b42372179bcc9cf6166639325d11411be77': Fade in/out the undo bar.
|
26d64699fa23ca6baca8af934dc9c7aec1270523 |
20-Jun-2012 |
Wei Huang <weih@google.com> |
am 82220026: Merge "Fade in/out the undo bar." into jb-dev * commit '822200267879dfaaf77421007116e59c5bb372cd': Fade in/out the undo bar.
|
254a6b42372179bcc9cf6166639325d11411be77 |
20-Jun-2012 |
Wei Huang <weih@google.com> |
am 82220026: Merge "Fade in/out the undo bar." into jb-dev * commit '822200267879dfaaf77421007116e59c5bb372cd': Fade in/out the undo bar.
|
822200267879dfaaf77421007116e59c5bb372cd |
20-Jun-2012 |
Wei Huang <weih@google.com> |
Merge "Fade in/out the undo bar." into jb-dev
|
02e2b177284957a7005750d2e0662e36e4ea1f93 |
20-Jun-2012 |
Ying Wang <wangying@google.com> |
am f058c3e7: (-s ours) am 705d8085: Import translations. DO NOT MERGE * commit 'f058c3e790e5d5d811a925808111abf4671f439e': Import translations. DO NOT MERGE
|
2ddce6e0fd08d553abfef03629eb66e575ad6ed6 |
20-Jun-2012 |
Ying Wang <wangying@google.com> |
am f058c3e7: (-s ours) am 705d8085: Import translations. DO NOT MERGE * commit 'f058c3e790e5d5d811a925808111abf4671f439e': Import translations. DO NOT MERGE
|
8f3bbd2e3715231e598b9cf5450aa9555fbdfdbb |
20-Jun-2012 |
Ying Wang <wangying@google.com> |
am 705d8085: Import translations. DO NOT MERGE * commit '705d808558fd3e165fd787b8628aae7db084e764': Import translations. DO NOT MERGE
|
f058c3e790e5d5d811a925808111abf4671f439e |
20-Jun-2012 |
Ying Wang <wangying@google.com> |
am 705d8085: Import translations. DO NOT MERGE * commit '705d808558fd3e165fd787b8628aae7db084e764': Import translations. DO NOT MERGE
|
3b5e97547049d96a6f3cbe4b1c914adfd16f1e0a |
20-Jun-2012 |
Ying Wang <wangying@google.com> |
Import translations. DO NOT MERGE Change-Id: Ie875f22d881a5f35fce1484e0cfe6237b15699f7
es/values-es-rUS/strings.xml
es/values-iw/strings.xml
es/values-nl/strings.xml
es/values-sw/strings.xml
|
86ac54b10762baec444c28eb22d1ebd22ef4ee3a |
20-Jun-2012 |
Ying Wang <wangying@google.com> |
Import translations. DO NOT MERGE Change-Id: Ie875f22d881a5f35fce1484e0cfe6237b15699f7
es/values-es-rUS/strings.xml
es/values-iw/strings.xml
es/values-nl/strings.xml
es/values-sw/strings.xml
|
923f0e88877cb675a9ac9f2d8191768f1ab9044a |
20-Jun-2012 |
Ying Wang <wangying@google.com> |
Import translations. DO NOT MERGE Change-Id: I7b28f69652740d7e0f0a9e55ec40c9b710986391
es/values-es-rUS/strings.xml
es/values-iw/strings.xml
es/values-nl/strings.xml
es/values-sw/strings.xml
|
705d808558fd3e165fd787b8628aae7db084e764 |
20-Jun-2012 |
Ying Wang <wangying@google.com> |
Import translations. DO NOT MERGE Change-Id: I7b28f69652740d7e0f0a9e55ec40c9b710986391
es/values-es-rUS/strings.xml
es/values-iw/strings.xml
es/values-nl/strings.xml
es/values-sw/strings.xml
|
e3b6ad7dfd453b7adbd7c4eb8d5fd3c1add2a4cc |
20-Jun-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am 377329db: Reconcile with jb-release * commit '377329db75cc550ed78418c0c6a04a5ac534e5ba': Make SystemUI always consists with the contrller overlay.
|
c902b5864e92676a751eddb328f67434f1a6e654 |
20-Jun-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am 377329db: Reconcile with jb-release * commit '377329db75cc550ed78418c0c6a04a5ac534e5ba': Make SystemUI always consists with the contrller overlay.
|
cdb08709370dff4bd4175546be7dd73cf7012fab |
20-Jun-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am 377329db: Reconcile with jb-release * commit '377329db75cc550ed78418c0c6a04a5ac534e5ba': Make SystemUI always consists with the contrller overlay.
|
a19d4f4c1a7bf539dd9dc3e7908a4d79f0d826e0 |
20-Jun-2012 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with jb-release Change-Id: I38e3c46db8518d6c3d45afcf7b1d99421d95811d
|
ffe6be6db42ac8bfa511def0e9ba927b2e8afadc |
20-Jun-2012 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with jb-release Change-Id: I38e3c46db8518d6c3d45afcf7b1d99421d95811d
|
377329db75cc550ed78418c0c6a04a5ac534e5ba |
20-Jun-2012 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with jb-release Change-Id: I38e3c46db8518d6c3d45afcf7b1d99421d95811d
|
eca084d89311f26a2a4fc11af0fe780a8475d5af |
20-Jun-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to jb-dev
|
5627a134dc1d946fdfa2acacfe825125d9d0bb9f |
20-Jun-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to jb-dev
|
7d80a2ec8a40d351c8cee5f1a9305520c48e50e2 |
20-Jun-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to jb-dev
|
387e9ebf3cde1938e5b3fb490656923d60e6a5b6 |
19-Jun-2012 |
Chih-Chung Chang <chihchung@google.com> |
Fade in/out the undo bar. The fading out happens after 3 seconds or the user swipes away. Bug: 6610348 Change-Id: Icd4dea7b0396f26556240adab93b9e645a9f1e58
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/ui/PhotoView.java
rc/com/android/gallery3d/ui/UndoBarView.java
|
517e1bd25305d4e82d101a8c06be0119dde2eab3 |
19-Jun-2012 |
Chih-Chung Chang <chihchung@google.com> |
Fade in/out the undo bar. The fading out happens after 3 seconds or the user swipes away. Bug: 6610348 Change-Id: Icd4dea7b0396f26556240adab93b9e645a9f1e58
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/ui/PhotoView.java
rc/com/android/gallery3d/ui/UndoBarView.java
|
d0f79f64c0a7ec68ffcaa98992aae0af22a9cee1 |
20-Jun-2012 |
Owen Lin <owenlin@google.com> |
Move LongSparseArray into Gallery for unbundling. Change-Id: Ifa0d06818a2d21bd8ddeabe808d792f39c31322f
allerycommon/src/com/android/gallery3d/common/LongSparseArray.java
rc/com/android/gallery3d/ui/TileImageView.java
|
4fedfdf37a52530c68997637468e26171c93c2d9 |
20-Jun-2012 |
Owen Lin <owenlin@google.com> |
Move LongSparseArray into Gallery for unbundling. Change-Id: Ifa0d06818a2d21bd8ddeabe808d792f39c31322f
allerycommon/src/com/android/gallery3d/common/LongSparseArray.java
rc/com/android/gallery3d/ui/TileImageView.java
|
1c67c03c284af2867d0f4efd85f52e88438db123 |
20-Jun-2012 |
Owen Lin <owenlin@google.com> |
Move LongSparseArray into Gallery for unbundling. Change-Id: Ifa0d06818a2d21bd8ddeabe808d792f39c31322f
allerycommon/src/com/android/gallery3d/common/LongSparseArray.java
|
54983bfbfa867fdc5ddc8d60be80a31750d98bb4 |
19-Jun-2012 |
Eric Fischer <enf@google.com> |
am 2e3a1767: (-s ours) am 8c93a140: Import translations. DO NOT MERGE * commit '2e3a1767f4e0b7769f0726795efba3a8f7c1de1f': Import translations. DO NOT MERGE
|
f3309d1905996031148f60eff4fcb80688970f28 |
19-Jun-2012 |
Eric Fischer <enf@google.com> |
am 2e3a1767: (-s ours) am 8c93a140: Import translations. DO NOT MERGE * commit '2e3a1767f4e0b7769f0726795efba3a8f7c1de1f': Import translations. DO NOT MERGE
|
2215a5a7e3dfe26f20b60f3b0e561d97f7d42114 |
19-Jun-2012 |
Eric Fischer <enf@google.com> |
am 8c93a140: Import translations. DO NOT MERGE * commit '8c93a140f61d2880163dcc7dc99fa177aa4f0b2b': Import translations. DO NOT MERGE
|
2e3a1767f4e0b7769f0726795efba3a8f7c1de1f |
19-Jun-2012 |
Eric Fischer <enf@google.com> |
am 8c93a140: Import translations. DO NOT MERGE * commit '8c93a140f61d2880163dcc7dc99fa177aa4f0b2b': Import translations. DO NOT MERGE
|
20f8dddf9d2e98290be7864705c3c758e751e983 |
19-Jun-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: If311f3cbb087651e37b00789c69cd4035ec03e02
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
0f2a9b8cd38dab7212234eb0e0d5f66d6f485ba6 |
19-Jun-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: If311f3cbb087651e37b00789c69cd4035ec03e02
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
e1abe27be808e0b9c8fdfacf4ff094b58f982ba5 |
19-Jun-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: Ibcd085099f2a66292ff49a84cf05910b430fe147
es/values-en-rGB/strings.xml
es/values-fi/strings.xml
|
8c93a140f61d2880163dcc7dc99fa177aa4f0b2b |
19-Jun-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: Ibcd085099f2a66292ff49a84cf05910b430fe147
es/values-en-rGB/strings.xml
es/values-fi/strings.xml
|
1430b63b486564829da060813c005bb601994782 |
19-Jun-2012 |
Owen Lin <owenlin@google.com> |
Make SystemUI always consists with the contrller overlay. Change-Id: I81f2a71fd38fc2588a9acb97b9d333978ffb5e48 fix: 6679875
rc/com/android/gallery3d/app/MoviePlayer.java
rc/com/android/gallery3d/app/TimeBar.java
|
68148d1cd4fa8d027fa33fc084754c3fa450374e |
19-Jun-2012 |
Owen Lin <owenlin@google.com> |
Make SystemUI always consists with the contrller overlay. Change-Id: I81f2a71fd38fc2588a9acb97b9d333978ffb5e48 fix: 6679875
rc/com/android/gallery3d/app/MoviePlayer.java
rc/com/android/gallery3d/app/TimeBar.java
|
588071c7d36bcc48a15325d709f5a9b2d4afa604 |
19-Jun-2012 |
Wei Huang <weih@google.com> |
am 382feb11: am 885f729f: Merge "Make SystemUI always consists with the contrller overlay." into jb-dev * commit '382feb11b767600d6aed8ad97d08d9de7a8673e0': Make SystemUI always consists with the contrller overlay.
|
77fbd94502cc3b7bbf89ec82896850fe4f489ca3 |
19-Jun-2012 |
Wei Huang <weih@google.com> |
am 382feb11: am 885f729f: Merge "Make SystemUI always consists with the contrller overlay." into jb-dev * commit '382feb11b767600d6aed8ad97d08d9de7a8673e0': Make SystemUI always consists with the contrller overlay.
|
cc6fb6fa68e3bf2e042a32cd1cbb1b30ddae875c |
19-Jun-2012 |
Wei Huang <weih@google.com> |
am 885f729f: Merge "Make SystemUI always consists with the contrller overlay." into jb-dev * commit '885f729fa16f9a25e688b23f1f9a94ab1bc591d5': Make SystemUI always consists with the contrller overlay.
|
382feb11b767600d6aed8ad97d08d9de7a8673e0 |
19-Jun-2012 |
Wei Huang <weih@google.com> |
am 885f729f: Merge "Make SystemUI always consists with the contrller overlay." into jb-dev * commit '885f729fa16f9a25e688b23f1f9a94ab1bc591d5': Make SystemUI always consists with the contrller overlay.
|
99aedc6a630d4b8ca3dc586fa52c8b1f8d848824 |
19-Jun-2012 |
Wei Huang <weih@google.com> |
Merge "Make SystemUI always consists with the contrller overlay." into jb-dev
|
885f729fa16f9a25e688b23f1f9a94ab1bc591d5 |
19-Jun-2012 |
Wei Huang <weih@google.com> |
Merge "Make SystemUI always consists with the contrller overlay." into jb-dev
|
554eaa071d3dcbd160dde7fd9af29a77e501de1f |
19-Jun-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am da1698d5: Reconcile with jb-release * commit 'da1698d5fd2606b56f51d82711e9bff5c5beb580':
|
79573d27a11dc7c219729c0862c25683d3cb4507 |
19-Jun-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am da1698d5: Reconcile with jb-release * commit 'da1698d5fd2606b56f51d82711e9bff5c5beb580':
|
4420d1437153858354cab978af80a74035e3da4b |
19-Jun-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am da1698d5: Reconcile with jb-release * commit 'da1698d5fd2606b56f51d82711e9bff5c5beb580':
|
12096eab5c0b1f28d57c6dd8eccfef77c3da510d |
19-Jun-2012 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with jb-release Change-Id: I0763b67b445b03b74c5a873a5373d30528acebf9
|
6a925de2b8f0e50cdc3006d156430952439cef8b |
19-Jun-2012 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with jb-release Change-Id: I0763b67b445b03b74c5a873a5373d30528acebf9
|
da1698d5fd2606b56f51d82711e9bff5c5beb580 |
19-Jun-2012 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with jb-release Change-Id: I0763b67b445b03b74c5a873a5373d30528acebf9
|
9341d4788874c0b67ab90104e41267340fc536e3 |
19-Jun-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to jb-dev
|
e0dccb08e23673d91358a8b326f595daa37bebc2 |
19-Jun-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to jb-dev
|
72e6a37e3d61e1f4941c4ea8f7680b88532b4db6 |
19-Jun-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to jb-dev
|
05b6d78f11389724d1add0fc96ad4feb02eb6df2 |
19-Jun-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am 17f64cac: Reconcile with jb-release * commit '17f64cac08778af45774f6d8a808381b0dc6f1a2':
|
6a6c0acc830c82d8f788a511de434a93806a5984 |
19-Jun-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am 17f64cac: Reconcile with jb-release * commit '17f64cac08778af45774f6d8a808381b0dc6f1a2':
|
ef5733dbbb5ec6accc7b105997407a2943c01205 |
19-Jun-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am 17f64cac: Reconcile with jb-release * commit '17f64cac08778af45774f6d8a808381b0dc6f1a2':
|
cfc2ec028a1a429fd3a663eb2ca0d454bf40f9c2 |
19-Jun-2012 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with jb-release Change-Id: Ice7fa76d34e7120514e558cc86fd1b76ae718074
|
4f7c4b376dda088b24c46d9e964d4032a58b59b2 |
19-Jun-2012 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with jb-release Change-Id: Ice7fa76d34e7120514e558cc86fd1b76ae718074
|
17f64cac08778af45774f6d8a808381b0dc6f1a2 |
19-Jun-2012 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with jb-release Change-Id: Ice7fa76d34e7120514e558cc86fd1b76ae718074
|
ef294176c1d61714ffbbd324d3e118f249292aaa |
19-Jun-2012 |
Owen Lin <owenlin@google.com> |
Make SystemUI always consists with the contrller overlay. Change-Id: I81f2a71fd38fc2588a9acb97b9d333978ffb5e48 fix: 6679875
rc/com/android/gallery3d/app/MoviePlayer.java
rc/com/android/gallery3d/app/TimeBar.java
|
0b4e90974bb2f171ec3b684c10d8b9c4d97afbde |
19-Jun-2012 |
Owen Lin <owenlin@google.com> |
Make SystemUI always consists with the contrller overlay. Change-Id: I81f2a71fd38fc2588a9acb97b9d333978ffb5e48 fix: 6679875
rc/com/android/gallery3d/app/MoviePlayer.java
rc/com/android/gallery3d/app/TimeBar.java
|
5b935fd858b90cbf73968dfa6aa1e6d551312af1 |
19-Jun-2012 |
Wei Huang <weih@google.com> |
am 078be806: am d937a2e9: Merge "Fix Gallery glitch due to ColorTexture." into jb-dev * commit '078be806c9caa4c750e17d44851e075e8cf09ef2': Fix Gallery glitch due to ColorTexture.
|
9e168b172b45ed795f1751146954edef3cb8b2dd |
19-Jun-2012 |
Wei Huang <weih@google.com> |
am 078be806: am d937a2e9: Merge "Fix Gallery glitch due to ColorTexture." into jb-dev * commit '078be806c9caa4c750e17d44851e075e8cf09ef2': Fix Gallery glitch due to ColorTexture.
|
b9a1cd4f6c205b5a2a53fe61b1e17ddbb573c969 |
19-Jun-2012 |
Wei Huang <weih@google.com> |
am d937a2e9: Merge "Fix Gallery glitch due to ColorTexture." into jb-dev * commit 'd937a2e931f222d2e60d9da007df4647b975eb7f': Fix Gallery glitch due to ColorTexture.
|
078be806c9caa4c750e17d44851e075e8cf09ef2 |
19-Jun-2012 |
Wei Huang <weih@google.com> |
am d937a2e9: Merge "Fix Gallery glitch due to ColorTexture." into jb-dev * commit 'd937a2e931f222d2e60d9da007df4647b975eb7f': Fix Gallery glitch due to ColorTexture.
|
7802aba4f3ea92df65f7cf8b7de2d61d87b75034 |
19-Jun-2012 |
Wei Huang <weih@google.com> |
Merge "Fix Gallery glitch due to ColorTexture." into jb-dev
|
d937a2e931f222d2e60d9da007df4647b975eb7f |
19-Jun-2012 |
Wei Huang <weih@google.com> |
Merge "Fix Gallery glitch due to ColorTexture." into jb-dev
|
a3a225f1f6afe0fb6a8af4fc1a81a8a1a227946d |
19-Jun-2012 |
Owen Lin <owenlin@google.com> |
Fix Gallery glitch due to ColorTexture. Change the initial value of mTextureTarget to GL_TEXTURE_2D, since it is default enabled. bug:6668616 Change-Id: I4bf475ca1a02fed3371e8223003a10e88ce8d519
rc/com/android/gallery3d/ui/GLCanvasImpl.java
|
1cbde8f63a4862e814078da9b7cefce0c6291dab |
19-Jun-2012 |
Owen Lin <owenlin@google.com> |
Fix Gallery glitch due to ColorTexture. Change the initial value of mTextureTarget to GL_TEXTURE_2D, since it is default enabled. bug:6668616 Change-Id: I4bf475ca1a02fed3371e8223003a10e88ce8d519
rc/com/android/gallery3d/ui/GLCanvasImpl.java
|
4157e9acf8caea558b738006e4c553cd2f4110c6 |
18-Jun-2012 |
Ying Wang <wangying@google.com> |
am 90e71542: (-s ours) am c66604cb: Import translations. DO NOT MERGE * commit '90e71542d1307a3b142509ee658304920d1b3f3d': Import translations. DO NOT MERGE
|
46d51c68b2b1a90e638d2135e204dc51768d5628 |
18-Jun-2012 |
Ying Wang <wangying@google.com> |
am 90e71542: (-s ours) am c66604cb: Import translations. DO NOT MERGE * commit '90e71542d1307a3b142509ee658304920d1b3f3d': Import translations. DO NOT MERGE
|
64b98696232131c15606eb50fba66ab4c71b183a |
18-Jun-2012 |
Chih-Chung Chang <chihchung@google.com> |
am f915fe3a: am 2ce59cbd: Fix scaling gesture responsiveness. * commit 'f915fe3aae9b44d7cdc96633a1b6ebe10bbb431e': Fix scaling gesture responsiveness.
|
18a7e2e3a032b8542c793680eb120f75cb774561 |
18-Jun-2012 |
Chih-Chung Chang <chihchung@google.com> |
am 756359c0: am 6b891c6a: Add swipe-to-delete gesture. * commit '756359c0bb6aa1d97c48a621f6d0dda64c2ca055': Add swipe-to-delete gesture.
|
5184bca140f81962a698c4d003f47f4699018d96 |
18-Jun-2012 |
Chih-Chung Chang <chihchung@google.com> |
am f915fe3a: am 2ce59cbd: Fix scaling gesture responsiveness. * commit 'f915fe3aae9b44d7cdc96633a1b6ebe10bbb431e': Fix scaling gesture responsiveness.
|
afc36d89360051b87c169360b44566eeffb29912 |
18-Jun-2012 |
Chih-Chung Chang <chihchung@google.com> |
am 756359c0: am 6b891c6a: Add swipe-to-delete gesture. * commit '756359c0bb6aa1d97c48a621f6d0dda64c2ca055': Add swipe-to-delete gesture.
|
822e70abbc706594b380588a0cd0bf20b118fcfc |
18-Jun-2012 |
Chih-Chung Chang <chihchung@google.com> |
am 756359c0: am 6b891c6a: Add swipe-to-delete gesture. * commit '756359c0bb6aa1d97c48a621f6d0dda64c2ca055': Add swipe-to-delete gesture.
|
fe217b7e5aec2a3aa99551c4e229083422b47804 |
18-Jun-2012 |
Ying Wang <wangying@google.com> |
am c66604cb: Import translations. DO NOT MERGE * commit 'c66604cb29e0402ecbeb37ab79d9db0851fce3ec': Import translations. DO NOT MERGE
|
90e71542d1307a3b142509ee658304920d1b3f3d |
18-Jun-2012 |
Ying Wang <wangying@google.com> |
am c66604cb: Import translations. DO NOT MERGE * commit 'c66604cb29e0402ecbeb37ab79d9db0851fce3ec': Import translations. DO NOT MERGE
|
3772856152d4e404f4f9486d6026adb9fc66bf76 |
18-Jun-2012 |
Chih-Chung Chang <chihchung@google.com> |
am 2ce59cbd: Fix scaling gesture responsiveness. * commit '2ce59cbd4368eaf0f30cfea28891bd47155182cb': Fix scaling gesture responsiveness.
|
f915fe3aae9b44d7cdc96633a1b6ebe10bbb431e |
18-Jun-2012 |
Chih-Chung Chang <chihchung@google.com> |
am 2ce59cbd: Fix scaling gesture responsiveness. * commit '2ce59cbd4368eaf0f30cfea28891bd47155182cb': Fix scaling gesture responsiveness.
|
1875d41bdb081d507dc4287a93ad273527aa8e09 |
18-Jun-2012 |
Chih-Chung Chang <chihchung@google.com> |
am 6b891c6a: Add swipe-to-delete gesture. * commit '6b891c6a3739f8c49d42f9db6fc76cb92c7c5f25': Add swipe-to-delete gesture.
|
01244eaf188a7f02954b7b269a3efd9330dbc69b |
18-Jun-2012 |
Chih-Chung Chang <chihchung@google.com> |
am 6b891c6a: Add swipe-to-delete gesture. * commit '6b891c6a3739f8c49d42f9db6fc76cb92c7c5f25': Add swipe-to-delete gesture.
|
756359c0bb6aa1d97c48a621f6d0dda64c2ca055 |
18-Jun-2012 |
Chih-Chung Chang <chihchung@google.com> |
am 6b891c6a: Add swipe-to-delete gesture. * commit '6b891c6a3739f8c49d42f9db6fc76cb92c7c5f25': Add swipe-to-delete gesture.
|
b399f4bba78e8a31977807dd57e03d1e3cf8e9a7 |
18-Jun-2012 |
Ying Wang <wangying@google.com> |
Import translations. DO NOT MERGE Change-Id: Ib1876c5daebce55dc45ee46d493a8f6494bce54a
es/values-sw/strings.xml
|
d6e23b6ff938f176f19f9cb2728f607b68cc1510 |
18-Jun-2012 |
Ying Wang <wangying@google.com> |
Import translations. DO NOT MERGE Change-Id: Ib1876c5daebce55dc45ee46d493a8f6494bce54a
es/values-sw/strings.xml
|
2ccf399c8d381a7f16ea6fc7180a95b90eea2834 |
18-Jun-2012 |
Ying Wang <wangying@google.com> |
Import translations. DO NOT MERGE Change-Id: I68a09a0a51b46c4929d725dbd22d2176fadba8c6
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
c66604cb29e0402ecbeb37ab79d9db0851fce3ec |
18-Jun-2012 |
Ying Wang <wangying@google.com> |
Import translations. DO NOT MERGE Change-Id: I68a09a0a51b46c4929d725dbd22d2176fadba8c6
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
8d84cc6d45b956b3ed52ba2a1c5ea49105f047cc |
18-Jun-2012 |
Chih-Chung Chang <chihchung@google.com> |
Fix scaling gesture responsiveness. Bug: 6632011 Change-Id: I9cfeafa4365354a631565f8ee4a9b53df76d06e9
rc/com/android/gallery3d/ui/PhotoView.java
rc/com/android/gallery3d/ui/PositionController.java
|
2ce59cbd4368eaf0f30cfea28891bd47155182cb |
18-Jun-2012 |
Chih-Chung Chang <chihchung@google.com> |
Fix scaling gesture responsiveness. Bug: 6632011 Change-Id: I9cfeafa4365354a631565f8ee4a9b53df76d06e9
rc/com/android/gallery3d/ui/PhotoView.java
rc/com/android/gallery3d/ui/PositionController.java
|
27b88dc6c971e9ef6253652a18f1baaa99ed6e6f |
07-Jun-2012 |
Chih-Chung Chang <chihchung@google.com> |
Add swipe-to-delete gesture. Change-Id: I992e59702f9dfff17da2f4464e48c9228d42b1b3
es/drawable-hdpi/ic_menu_revert_holo_dark.png
es/drawable-hdpi/panel_undo_holo.9.png
es/drawable-mdpi/ic_menu_revert_holo_dark.png
es/drawable-mdpi/panel_undo_holo.9.png
es/drawable-xhdpi/ic_menu_revert_holo_dark.png
es/drawable-xhdpi/panel_undo_holo.9.png
es/values/strings.xml
|
4ddc93e1f61858195a62729e54450502628fe28a |
07-Jun-2012 |
Chih-Chung Chang <chihchung@google.com> |
Add swipe-to-delete gesture. Change-Id: I992e59702f9dfff17da2f4464e48c9228d42b1b3
rc/com/android/gallery3d/app/PhotoDataAdapter.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/app/SinglePhotoDataAdapter.java
rc/com/android/gallery3d/data/FilterDeleteSet.java
rc/com/android/gallery3d/data/FilterSet.java
rc/com/android/gallery3d/data/FilterSource.java
rc/com/android/gallery3d/data/FilterTypeSet.java
rc/com/android/gallery3d/data/MtpSource.java
rc/com/android/gallery3d/ui/GLView.java
rc/com/android/gallery3d/ui/GestureRecognizer.java
rc/com/android/gallery3d/ui/MenuExecutor.java
rc/com/android/gallery3d/ui/PhotoView.java
rc/com/android/gallery3d/ui/PositionController.java
rc/com/android/gallery3d/ui/StringTexture.java
rc/com/android/gallery3d/ui/UndoBarView.java
|
6b891c6a3739f8c49d42f9db6fc76cb92c7c5f25 |
07-Jun-2012 |
Chih-Chung Chang <chihchung@google.com> |
Add swipe-to-delete gesture. Change-Id: I992e59702f9dfff17da2f4464e48c9228d42b1b3
es/drawable-hdpi/ic_menu_revert_holo_dark.png
es/drawable-hdpi/panel_undo_holo.9.png
es/drawable-mdpi/ic_menu_revert_holo_dark.png
es/drawable-mdpi/panel_undo_holo.9.png
es/drawable-xhdpi/ic_menu_revert_holo_dark.png
es/drawable-xhdpi/panel_undo_holo.9.png
es/values/strings.xml
rc/com/android/gallery3d/app/PhotoDataAdapter.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/app/SinglePhotoDataAdapter.java
rc/com/android/gallery3d/data/FilterDeleteSet.java
rc/com/android/gallery3d/data/FilterSet.java
rc/com/android/gallery3d/data/FilterSource.java
rc/com/android/gallery3d/data/FilterTypeSet.java
rc/com/android/gallery3d/data/MtpSource.java
rc/com/android/gallery3d/ui/GLView.java
rc/com/android/gallery3d/ui/GestureRecognizer.java
rc/com/android/gallery3d/ui/MenuExecutor.java
rc/com/android/gallery3d/ui/PhotoView.java
rc/com/android/gallery3d/ui/PositionController.java
rc/com/android/gallery3d/ui/StringTexture.java
rc/com/android/gallery3d/ui/UndoBarView.java
|
91fa21a608148f64fa0973b9402d03f09c5a5018 |
15-Jun-2012 |
Jean-Baptiste Queru <jbq@google.com> |
am e0279d33: resolved conflicts for merge of cf6f99e7 to jb-dev-plus-aosp * commit 'e0279d33974a095b12abfe33f3e0be84b5e7b7d0': Gallery2: Check privative effects
|
a3e74b9e2af780a6395d89e10121fb9d72852e2c |
15-Jun-2012 |
Jean-Baptiste Queru <jbq@google.com> |
am e0279d33: resolved conflicts for merge of cf6f99e7 to jb-dev-plus-aosp * commit 'e0279d33974a095b12abfe33f3e0be84b5e7b7d0': Gallery2: Check privative effects
|
ac9ae4fd0a4ff040fd9cc0c62691be2ef927c1a4 |
15-Jun-2012 |
Jean-Baptiste Queru <jbq@google.com> |
resolved conflicts for merge of cf6f99e7 to jb-dev-plus-aosp Change-Id: I4d8d85960b5f0289ee442278db39b8f8c445d73e
|
e0279d33974a095b12abfe33f3e0be84b5e7b7d0 |
15-Jun-2012 |
Jean-Baptiste Queru <jbq@google.com> |
resolved conflicts for merge of cf6f99e7 to jb-dev-plus-aosp Change-Id: I4d8d85960b5f0289ee442278db39b8f8c445d73e
|
0560bd141a709741dc48edc117ab4675347118b2 |
14-Jun-2012 |
Jean-Baptiste Queru <jbq@google.com> |
am 8d340042: Merge "Gallery2: Check privative effects" * commit '8d340042d2b79218b19f650803ea6a584c61f01f': Gallery2: Check privative effects
|
cf6f99e72089b61a8f495a3ae940d106f38e3377 |
14-Jun-2012 |
Jean-Baptiste Queru <jbq@google.com> |
am 8d340042: Merge "Gallery2: Check privative effects" * commit '8d340042d2b79218b19f650803ea6a584c61f01f': Gallery2: Check privative effects
|
8d340042d2b79218b19f650803ea6a584c61f01f |
14-Jun-2012 |
Jean-Baptiste Queru <jbq@google.com> |
Merge "Gallery2: Check privative effects"
|
0d21544a1af1b7a77a5990f1418c54d22a72b5d1 |
12-Jun-2012 |
Jorge Ruesga <j.ruesga.criado@gmail.com> |
Gallery2: Check privative effects Gallery2 has 2 effects (FaceTan and Facelift) from the privative gapps. If gapps is not present, Gallery2 gets into a FC when click on this effects. This patch checks if the permission "com.google.android.media.effects" exists and hide this 2 effects if permission not exists Patch 2: Use EffectFactory.isEffectSupported to detect if filters exists Patch 3: Make isPresent method from effect classes a static method Patch 4: Change actions classes for static calling to effects classes Change-Id: I8f6b59e57e504114835ab3283f65a72b4f6774a8
rc/com/android/gallery3d/photoeditor/EffectsBar.java
rc/com/android/gallery3d/photoeditor/actions/EffectAction.java
rc/com/android/gallery3d/photoeditor/actions/FaceTanAction.java
rc/com/android/gallery3d/photoeditor/actions/FaceliftAction.java
rc/com/android/gallery3d/photoeditor/filters/FaceTanFilter.java
rc/com/android/gallery3d/photoeditor/filters/FaceliftFilter.java
|
a901f8861f9b62386ad9729d533db744964a8690 |
12-Jun-2012 |
Jorge Ruesga <j.ruesga.criado@gmail.com> |
Gallery2: Check privative effects Gallery2 has 2 effects (FaceTan and Facelift) from the privative gapps. If gapps is not present, Gallery2 gets into a FC when click on this effects. This patch checks if the permission "com.google.android.media.effects" exists and hide this 2 effects if permission not exists Patch 2: Use EffectFactory.isEffectSupported to detect if filters exists Patch 3: Make isPresent method from effect classes a static method Patch 4: Change actions classes for static calling to effects classes Change-Id: I8f6b59e57e504114835ab3283f65a72b4f6774a8
rc/com/android/gallery3d/photoeditor/EffectsBar.java
rc/com/android/gallery3d/photoeditor/actions/EffectAction.java
rc/com/android/gallery3d/photoeditor/actions/FaceTanAction.java
rc/com/android/gallery3d/photoeditor/actions/FaceliftAction.java
rc/com/android/gallery3d/photoeditor/filters/FaceTanFilter.java
rc/com/android/gallery3d/photoeditor/filters/FaceliftFilter.java
|
da007a3b9245b7beab0a8a7effa251a0e47b47e7 |
13-Jun-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to jb-dev
|
5f60ecd0fece86dc5664a228e22e9418f47646f6 |
13-Jun-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to jb-dev
|
64f13787caf4964178730a06baa26f4a71806ceb |
12-Jun-2012 |
Ying Wang <wangying@google.com> |
am 295c2453: (-s ours) am 6dd67099: Import translations. DO NOT MERGE * commit '295c2453f820709b8aa2a431940af1020d2de585': Import translations. DO NOT MERGE
|
103c5b04d678212a25d52301d0b4062b93f9e945 |
12-Jun-2012 |
Ying Wang <wangying@google.com> |
am 295c2453: (-s ours) am 6dd67099: Import translations. DO NOT MERGE * commit '295c2453f820709b8aa2a431940af1020d2de585': Import translations. DO NOT MERGE
|
4b9d76ce80f50c6b708a558c26ff0028cf362d3f |
12-Jun-2012 |
Ying Wang <wangying@google.com> |
am 6dd67099: Import translations. DO NOT MERGE * commit '6dd670997a88fe7502f9ce0e4f9c872b7352027f': Import translations. DO NOT MERGE
|
295c2453f820709b8aa2a431940af1020d2de585 |
12-Jun-2012 |
Ying Wang <wangying@google.com> |
am 6dd67099: Import translations. DO NOT MERGE * commit '6dd670997a88fe7502f9ce0e4f9c872b7352027f': Import translations. DO NOT MERGE
|
98774f622c1455e1d77888874cb152577f81fe43 |
12-Jun-2012 |
Ying Wang <wangying@google.com> |
Import translations. DO NOT MERGE Change-Id: Idb929a3d9027bfc52a8fe9fd49d06a8ee22b268f
es/values-am/strings.xml
es/values-fa/strings.xml
|
5bced1b7da3a1d3e8ad7e93e641467f30db40874 |
12-Jun-2012 |
Ying Wang <wangying@google.com> |
Import translations. DO NOT MERGE Change-Id: Idb929a3d9027bfc52a8fe9fd49d06a8ee22b268f
es/values-am/strings.xml
es/values-fa/strings.xml
|
6dd670997a88fe7502f9ce0e4f9c872b7352027f |
12-Jun-2012 |
Ying Wang <wangying@google.com> |
Import translations. DO NOT MERGE Change-Id: Id76289427ddecca985371b6d11e3e1fcb7f8b49f
es/values-am/strings.xml
es/values-fa/strings.xml
|
2ac10525348c9eef016265d025e6cdd8ded5fd6f |
12-Jun-2012 |
Ying Wang <wangying@google.com> |
Import translations. DO NOT MERGE Change-Id: Id76289427ddecca985371b6d11e3e1fcb7f8b49f
es/values-am/strings.xml
es/values-fa/strings.xml
|
745abe66e328fed50b3eeed129cb5216dc707b5e |
12-Jun-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to jb-dev
|
d9500509b4f7bf7f61d5a994f53f83c065cccced |
12-Jun-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to jb-dev
|
8e191e826d835d596ae2270f2e14689960f1178e |
11-Jun-2012 |
Jean-Baptiste Queru <jbq@google.com> |
am 27d6bf93: am b62f354d: am 582c3bb9: Merge "Gallery2: Use ICS alert drawable" * commit '27d6bf937c3d9934fed171ea69aafaf90c9463e6': Gallery2: Use ICS alert drawable
|
3c5c14f979ccacc554ed0de8d2298b616ae78298 |
11-Jun-2012 |
Jean-Baptiste Queru <jbq@google.com> |
am 27d6bf93: am b62f354d: am 582c3bb9: Merge "Gallery2: Use ICS alert drawable" * commit '27d6bf937c3d9934fed171ea69aafaf90c9463e6': Gallery2: Use ICS alert drawable
|
c2bb1a78a19688f40b80176c1667289ebbfbd418 |
11-Jun-2012 |
Jean-Baptiste Queru <jbq@google.com> |
am b62f354d: am 582c3bb9: Merge "Gallery2: Use ICS alert drawable" * commit 'b62f354d4f890a20f6bec37eac83226f75a4a475': Gallery2: Use ICS alert drawable
|
27d6bf937c3d9934fed171ea69aafaf90c9463e6 |
11-Jun-2012 |
Jean-Baptiste Queru <jbq@google.com> |
am b62f354d: am 582c3bb9: Merge "Gallery2: Use ICS alert drawable" * commit 'b62f354d4f890a20f6bec37eac83226f75a4a475': Gallery2: Use ICS alert drawable
|
c523881a06b3226c741dd429f6b5d7964e400d0e |
11-Jun-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: I1eb9710c0fdf95d4d39a3b36ecb2606a64723177
es/values-en-rGB/strings.xml
|
e791e1c5bb5441528442dbb1e203c493a802d788 |
11-Jun-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: I1eb9710c0fdf95d4d39a3b36ecb2606a64723177
es/values-en-rGB/strings.xml
|
6017dcea9fe23323e48a88d93113c9040d6241fd |
11-Jun-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am d23a3e37: Reconcile with jb-release * commit 'd23a3e37680ee0b84bec0ada0ff8e64da79b805e':
|
0fd253ab66f038ddb347fecf6040dca9a725bac0 |
11-Jun-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am d23a3e37: Reconcile with jb-release * commit 'd23a3e37680ee0b84bec0ada0ff8e64da79b805e':
|
baad95dbb4bd8a17447bf6ba41906921144cdaca |
11-Jun-2012 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with jb-release Change-Id: I4eaf451a2a61d0fa8fc37a1a045ab02ca4ae0711
|
d23a3e37680ee0b84bec0ada0ff8e64da79b805e |
11-Jun-2012 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with jb-release Change-Id: I4eaf451a2a61d0fa8fc37a1a045ab02ca4ae0711
|
ced8b274a7019f57a418c5924dd529d199cceb1e |
11-Jun-2012 |
Yuli Huang <yuli@google.com> |
am 4712ffa6: am 132db75a: Don\'t display loading text when loading album sets. * commit '4712ffa668e60c23418be104a66f07da57d64cc2': Don't display loading text when loading album sets.
|
c9c5782a7ff44090ef07af6948f6765d34477953 |
11-Jun-2012 |
Yuli Huang <yuli@google.com> |
am 4712ffa6: am 132db75a: Don\'t display loading text when loading album sets. * commit '4712ffa668e60c23418be104a66f07da57d64cc2': Don't display loading text when loading album sets.
|
885ad9488f31d6148048d38bdb7d7efe9552d89b |
11-Jun-2012 |
Yuli Huang <yuli@google.com> |
am 132db75a: Don\'t display loading text when loading album sets. * commit '132db75a1fa9b41d3000c6cb29bd3d90a7d8ef28': Don't display loading text when loading album sets.
|
4712ffa668e60c23418be104a66f07da57d64cc2 |
11-Jun-2012 |
Yuli Huang <yuli@google.com> |
am 132db75a: Don\'t display loading text when loading album sets. * commit '132db75a1fa9b41d3000c6cb29bd3d90a7d8ef28': Don't display loading text when loading album sets.
|
4cdb37e1d7cd475e8ad4f04749755a225d8caed8 |
11-Jun-2012 |
Jean-Baptiste Queru <jbq@google.com> |
am 582c3bb9: Merge "Gallery2: Use ICS alert drawable" * commit '582c3bb99cf58b55defa5f788d488c62f771b60e': Gallery2: Use ICS alert drawable
|
b62f354d4f890a20f6bec37eac83226f75a4a475 |
11-Jun-2012 |
Jean-Baptiste Queru <jbq@google.com> |
am 582c3bb9: Merge "Gallery2: Use ICS alert drawable" * commit '582c3bb99cf58b55defa5f788d488c62f771b60e': Gallery2: Use ICS alert drawable
|
582c3bb99cf58b55defa5f788d488c62f771b60e |
11-Jun-2012 |
Jean-Baptiste Queru <jbq@google.com> |
Merge "Gallery2: Use ICS alert drawable"
|
48777e89f784d9518e76418cb47e3ae8e9c3c799 |
11-Jun-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to jb-dev
|
829a66bd14c5e775615feccb90fe9cac0cdd9e37 |
11-Jun-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to jb-dev
|
e2bd0fa7863f5912073bcdee88ebc281b8d125c6 |
11-Jun-2012 |
Yuli Huang <yuli@google.com> |
Don't display loading text when loading album sets. bug:6635606 Change-Id: I55f0dafd5ead8455ed8bee1f03c06ca03662ebbd
rc/com/android/gallery3d/ui/AlbumSetSlotRenderer.java
|
132db75a1fa9b41d3000c6cb29bd3d90a7d8ef28 |
11-Jun-2012 |
Yuli Huang <yuli@google.com> |
Don't display loading text when loading album sets. bug:6635606 Change-Id: I55f0dafd5ead8455ed8bee1f03c06ca03662ebbd
rc/com/android/gallery3d/ui/AlbumSetSlotRenderer.java
|
415a4430e5700bb40fdc2894b560fb7d95a421a1 |
09-Jun-2012 |
Eric Fischer <enf@google.com> |
am 30116cd2: (-s ours) am 1d3a2ec8: Import translations. DO NOT MERGE * commit '30116cd2dd2b0da7e70537d6a52b1a620eef75d0': Import translations. DO NOT MERGE
|
d1dd97fa663ff6dc257c4ec2f3b55f11bbe9aeaa |
09-Jun-2012 |
Eric Fischer <enf@google.com> |
am 30116cd2: (-s ours) am 1d3a2ec8: Import translations. DO NOT MERGE * commit '30116cd2dd2b0da7e70537d6a52b1a620eef75d0': Import translations. DO NOT MERGE
|
4f5cd82f14021b47ca3a015249804b98062d0d11 |
09-Jun-2012 |
Eric Fischer <enf@google.com> |
am 1d3a2ec8: Import translations. DO NOT MERGE * commit '1d3a2ec89bd286f253f1f050f7e9e5406119273b': Import translations. DO NOT MERGE
|
30116cd2dd2b0da7e70537d6a52b1a620eef75d0 |
09-Jun-2012 |
Eric Fischer <enf@google.com> |
am 1d3a2ec8: Import translations. DO NOT MERGE * commit '1d3a2ec89bd286f253f1f050f7e9e5406119273b': Import translations. DO NOT MERGE
|
b722966fbf26decc5a817579cdb9402e5ae98e1b |
09-Jun-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: I3e067ce23fd1d27086b2a8b60e7532f6aa8f7601
es/values-en-rGB/strings.xml
|
1d3a2ec89bd286f253f1f050f7e9e5406119273b |
09-Jun-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: I3e067ce23fd1d27086b2a8b60e7532f6aa8f7601
es/values-en-rGB/strings.xml
|
6a7808efcb619a9723e97aa6112febc4033aa3ea |
07-Jun-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am e167e1cf: Reconcile with jb-release * commit 'e167e1cf7f23f3605523c6c6808a1a39eecc74ef':
|
705fe7d5b29203d97fca5ac179c291ed8e3b251e |
07-Jun-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am e167e1cf: Reconcile with jb-release * commit 'e167e1cf7f23f3605523c6c6808a1a39eecc74ef':
|
1799572fdbf3dfd9e14d68737e115ee3886e0ef9 |
07-Jun-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am e167e1cf: Reconcile with jb-release * commit 'e167e1cf7f23f3605523c6c6808a1a39eecc74ef':
|
c026f585a09e5bc835b231152f58abe6a3dfdcc9 |
07-Jun-2012 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with jb-release Change-Id: I617695b74de11b9aec6d4b4355d6859f0ada53e8
|
12645787db5147653c315caeac4ef84d8a9f5799 |
07-Jun-2012 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with jb-release Change-Id: I617695b74de11b9aec6d4b4355d6859f0ada53e8
|
e167e1cf7f23f3605523c6c6808a1a39eecc74ef |
07-Jun-2012 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with jb-release Change-Id: I617695b74de11b9aec6d4b4355d6859f0ada53e8
|
666d4d6a1f1f9d4ebd09fcba09512463b62f6497 |
07-Jun-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to jb-dev
|
a7f42ff97512bfb5d8a4cc4c569331dea015bdb3 |
07-Jun-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to jb-dev
|
8556b276287e68ca8ab07b7b2de08c354c626955 |
07-Jun-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to jb-dev
|
c12443b8690c4a5536a56bc2acdf887cbf17f6e2 |
06-Jun-2012 |
Wei Huang <weih@google.com> |
am 5543eac3: am e6d36bb2: Merge "Check the offset of output rect when cropping image." into jb-dev * commit '5543eac38b2bd0e0606deaf8da15d20f415c748f': Check the offset of output rect when cropping image.
|
5c26ec6ecb9e4540aaf315a58803abbe099b4ddc |
06-Jun-2012 |
Wei Huang <weih@google.com> |
am 5543eac3: am e6d36bb2: Merge "Check the offset of output rect when cropping image." into jb-dev * commit '5543eac38b2bd0e0606deaf8da15d20f415c748f': Check the offset of output rect when cropping image.
|
f19f0cb5c1a18be8689bfdf054ac06c27a8484ca |
06-Jun-2012 |
Wei Huang <weih@google.com> |
am e6d36bb2: Merge "Check the offset of output rect when cropping image." into jb-dev * commit 'e6d36bb213c749a750bffd5e37ce85c232a64ff3': Check the offset of output rect when cropping image.
|
5543eac38b2bd0e0606deaf8da15d20f415c748f |
06-Jun-2012 |
Wei Huang <weih@google.com> |
am e6d36bb2: Merge "Check the offset of output rect when cropping image." into jb-dev * commit 'e6d36bb213c749a750bffd5e37ce85c232a64ff3': Check the offset of output rect when cropping image.
|
e6d36bb213c749a750bffd5e37ce85c232a64ff3 |
06-Jun-2012 |
Wei Huang <weih@google.com> |
Merge "Check the offset of output rect when cropping image." into jb-dev
|
11bd4e3013dc68449d38b04a68192837d94bb311 |
06-Jun-2012 |
Eric Fischer <enf@google.com> |
am 6edae671: (-s ours) am 699ef52c: Import translations. DO NOT MERGE * commit '6edae671aa8f5da345420185f7ecd61fe2d2e6dd': Import translations. DO NOT MERGE
|
a510985496d47ef6fecaa1b00ed8384d496b2322 |
06-Jun-2012 |
Eric Fischer <enf@google.com> |
am 6edae671: (-s ours) am 699ef52c: Import translations. DO NOT MERGE * commit '6edae671aa8f5da345420185f7ecd61fe2d2e6dd': Import translations. DO NOT MERGE
|
9a2d066be67f665342843b064b7a1321b5ffb15b |
06-Jun-2012 |
Eric Fischer <enf@google.com> |
am 699ef52c: Import translations. DO NOT MERGE * commit '699ef52cb398a2d5a7ec962e7df2837a6dbccef4': Import translations. DO NOT MERGE
|
6edae671aa8f5da345420185f7ecd61fe2d2e6dd |
06-Jun-2012 |
Eric Fischer <enf@google.com> |
am 699ef52c: Import translations. DO NOT MERGE * commit '699ef52cb398a2d5a7ec962e7df2837a6dbccef4': Import translations. DO NOT MERGE
|
460258141e31325140382850230936ced90d3d80 |
06-Jun-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: I5847ab732e86841a916b6d641766c329c4e367be
es/values-ca/strings.xml
es/values-uk/strings.xml
es/values-zh-rCN/strings.xml
|
8be70c9176a9dc70d77b259e857d3beb13cff524 |
06-Jun-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: I5847ab732e86841a916b6d641766c329c4e367be
es/values-ca/strings.xml
es/values-uk/strings.xml
es/values-zh-rCN/strings.xml
|
d6a9377fc100dfaa9ea59f4cc7e7d0487dce235c |
06-Jun-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: I543c2eab5652cf2f6ad3534ce9d59bd3a973e74b
es/values-ca/strings.xml
es/values-uk/strings.xml
es/values-zh-rCN/strings.xml
|
699ef52cb398a2d5a7ec962e7df2837a6dbccef4 |
06-Jun-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: I543c2eab5652cf2f6ad3534ce9d59bd3a973e74b
es/values-ca/strings.xml
es/values-uk/strings.xml
es/values-zh-rCN/strings.xml
|
4ae4a0bc1caad66077cd728d28cf0fe019133075 |
06-Jun-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to jb-dev
|
bbdf3a911a9b4c7425dd5e10ad3e2745c1a96a67 |
06-Jun-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to jb-dev
|
eae57c0ccbb9d22a61f681fed3d2696a5135d3c4 |
30-May-2012 |
Owen Lin <owenlin@google.com> |
Check the offset of output rect when cropping image. bug: 6568720 Change-Id: I36c98cab5830eaac15369ada1a1a988e10b0fbf4
rc/com/android/gallery3d/app/CropImage.java
rc/com/android/gallery3d/app/Wallpaper.java
|
4b9c37d08dc78118de53c1f3349024164abf2512 |
30-May-2012 |
Owen Lin <owenlin@google.com> |
Check the offset of output rect when cropping image. bug: 6568720 Change-Id: I36c98cab5830eaac15369ada1a1a988e10b0fbf4
rc/com/android/gallery3d/app/CropImage.java
rc/com/android/gallery3d/app/Wallpaper.java
|
28811ef30abaf2b34a350daa7e93473d90c23a87 |
05-Jun-2012 |
Wei Huang <weih@google.com> |
am 98e39643: am 1b27f309: Merge "Update drawable for the new resize handles." into jb-dev * commit '98e3964391668a5774e2d9b06751e8b2c61c144a': Update drawable for the new resize handles.
|
e51b3d35f414bcfcb72daac416685a07b34a77ef |
05-Jun-2012 |
Wei Huang <weih@google.com> |
am 98e39643: am 1b27f309: Merge "Update drawable for the new resize handles." into jb-dev * commit '98e3964391668a5774e2d9b06751e8b2c61c144a': Update drawable for the new resize handles.
|
4bdbac7b471644729ba2506bd917f46d21a071b4 |
05-Jun-2012 |
Eric Fischer <enf@google.com> |
am cc9da2a5: (-s ours) am 49661d3f: Import translations. DO NOT MERGE * commit 'cc9da2a5704a3b76027eac8a20ff2c1de407a9f9': Import translations. DO NOT MERGE
|
c3b068d627016195a24bd669070e030a5a9d9df1 |
05-Jun-2012 |
Eric Fischer <enf@google.com> |
am cc9da2a5: (-s ours) am 49661d3f: Import translations. DO NOT MERGE * commit 'cc9da2a5704a3b76027eac8a20ff2c1de407a9f9': Import translations. DO NOT MERGE
|
7adf92607f702ee6af0906016f3539538fd7c826 |
05-Jun-2012 |
Wei Huang <weih@google.com> |
am 1b27f309: Merge "Update drawable for the new resize handles." into jb-dev * commit '1b27f3096d814d7b2a536dde59d7dbfc91945a05': Update drawable for the new resize handles.
|
98e3964391668a5774e2d9b06751e8b2c61c144a |
05-Jun-2012 |
Wei Huang <weih@google.com> |
am 1b27f309: Merge "Update drawable for the new resize handles." into jb-dev * commit '1b27f3096d814d7b2a536dde59d7dbfc91945a05': Update drawable for the new resize handles.
|
c101e729342fbfe2e8117e2755589363046db3f4 |
05-Jun-2012 |
Wei Huang <weih@google.com> |
Merge "Update drawable for the new resize handles." into jb-dev
|
1b27f3096d814d7b2a536dde59d7dbfc91945a05 |
05-Jun-2012 |
Wei Huang <weih@google.com> |
Merge "Update drawable for the new resize handles." into jb-dev
|
ea74682db34875dbc7365e368cbdde17868349c7 |
05-Jun-2012 |
Eric Fischer <enf@google.com> |
am 49661d3f: Import translations. DO NOT MERGE * commit '49661d3f313d32620cb15247a46e593e333a778d': Import translations. DO NOT MERGE
|
cc9da2a5704a3b76027eac8a20ff2c1de407a9f9 |
05-Jun-2012 |
Eric Fischer <enf@google.com> |
am 49661d3f: Import translations. DO NOT MERGE * commit '49661d3f313d32620cb15247a46e593e333a778d': Import translations. DO NOT MERGE
|
96655b46c65d89ce6792e8471905cfb7f50f052b |
05-Jun-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: I7ad1b46db67adde3e45c2dc24b77622a29af3150
es/values-rm/strings.xml
es/values-vi/strings.xml
|
3c61e37e7cd6118bc8835ea16597162c2a8a00e9 |
05-Jun-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: I7ad1b46db67adde3e45c2dc24b77622a29af3150
es/values-rm/strings.xml
es/values-vi/strings.xml
|
23791ab8ab7fdee0565983ee8b7ca8b6d7bdf379 |
05-Jun-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: I3b315a50d72129caf734b5d7279e352e73d74cdb
es/values-rm/strings.xml
es/values-vi/strings.xml
|
49661d3f313d32620cb15247a46e593e333a778d |
05-Jun-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: I3b315a50d72129caf734b5d7279e352e73d74cdb
es/values-rm/strings.xml
es/values-vi/strings.xml
|
f1a20585d43e158ac8e9f006df07e8c42ffe3220 |
05-Jun-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to jb-dev
|
6aa1eac61416741d700cc0195e3583f84e62dbf4 |
05-Jun-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to jb-dev
|
970551731dcd2078ad269f3f8101b6f08d667bd1 |
05-Jun-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to jb-dev
|
a5ba2903a0ba0b371d2c6740981e34298c517933 |
05-Jun-2012 |
Yuli Huang <yuli@google.com> |
Update drawable for the new resize handles. bug:6598235 Change-Id: Id765f4024ad2896b3f172dce3408b2634fb1eb18
es/drawable-hdpi/camera_crop_holo.png
es/drawable-mdpi/camera_crop_holo.png
es/drawable-xhdpi/camera_crop_holo.png
|
3fb087a76e68d795e7c3157160829e37e3692e86 |
05-Jun-2012 |
Yuli Huang <yuli@google.com> |
Update drawable for the new resize handles. bug:6598235 Change-Id: Id765f4024ad2896b3f172dce3408b2634fb1eb18
es/drawable-hdpi/camera_crop_holo.png
es/drawable-mdpi/camera_crop_holo.png
es/drawable-xhdpi/camera_crop_holo.png
|
db4d7cee81f2326ec3c14c952019e2421508128d |
05-Jun-2012 |
Eric Fischer <enf@google.com> |
am 8ddda9cd: (-s ours) am b4343fb4: Import translations. DO NOT MERGE * commit '8ddda9cda3a1a04d21f209dcbbdc81964582f6bd': Import translations. DO NOT MERGE
|
dbabccd5cb8727c387c77e02cc43e41aa4a710cb |
05-Jun-2012 |
Eric Fischer <enf@google.com> |
am 8ddda9cd: (-s ours) am b4343fb4: Import translations. DO NOT MERGE * commit '8ddda9cda3a1a04d21f209dcbbdc81964582f6bd': Import translations. DO NOT MERGE
|
019531bf700fd2b3e83ea4edf28f8417b6b4acc8 |
04-Jun-2012 |
Eric Fischer <enf@google.com> |
am b4343fb4: Import translations. DO NOT MERGE * commit 'b4343fb4517a760f09fb383b7b382ac793e01144': Import translations. DO NOT MERGE
|
8ddda9cda3a1a04d21f209dcbbdc81964582f6bd |
04-Jun-2012 |
Eric Fischer <enf@google.com> |
am b4343fb4: Import translations. DO NOT MERGE * commit 'b4343fb4517a760f09fb383b7b382ac793e01144': Import translations. DO NOT MERGE
|
f84d0cbb3ac4acb87d3b63580f597502f2de5ba3 |
04-Jun-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: I630c967050e27c228f1f05333cc2a3590b3eadcb
es/values-bg/strings.xml
es/values-cs/strings.xml
es/values-pt-rPT/strings.xml
es/values-rm/strings.xml
|
1e8204e717b02f7b40933ea6b67ab221ee440cf5 |
04-Jun-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: I630c967050e27c228f1f05333cc2a3590b3eadcb
es/values-bg/strings.xml
es/values-cs/strings.xml
es/values-pt-rPT/strings.xml
es/values-rm/strings.xml
|
55305bc090a485334249350e5c24b8d30a13f850 |
04-Jun-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: Idb069f2aca29a88fa1b34d7198968109fe88fa9e
es/values-bg/strings.xml
es/values-cs/strings.xml
es/values-pt-rPT/strings.xml
es/values-rm/strings.xml
|
b4343fb4517a760f09fb383b7b382ac793e01144 |
04-Jun-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: Idb069f2aca29a88fa1b34d7198968109fe88fa9e
es/values-bg/strings.xml
es/values-cs/strings.xml
es/values-pt-rPT/strings.xml
es/values-rm/strings.xml
|
f811624793ff6d57424e240543b7cc4868080305 |
04-Jun-2012 |
Wei Huang <weih@google.com> |
am 2f6fb1ce: am 25a91535: Merge "Update the screen nail size even if screen nail is still the same one." into jb-dev * commit '2f6fb1ceef0fa27ecea869934b4c09ade97ec2cc': Update the screen nail size even if screen nail is still the same one.
|
0d225404c9c104b1db361142f662ea432253504d |
04-Jun-2012 |
Wei Huang <weih@google.com> |
am 2f6fb1ce: am 25a91535: Merge "Update the screen nail size even if screen nail is still the same one." into jb-dev * commit '2f6fb1ceef0fa27ecea869934b4c09ade97ec2cc': Update the screen nail size even if screen nail is still the same one.
|
9c5710a08d83c6728ef5bd58c77475706b6ee61f |
04-Jun-2012 |
Wei Huang <weih@google.com> |
am 25a91535: Merge "Update the screen nail size even if screen nail is still the same one." into jb-dev * commit '25a9153565d0ecd760387499fce4ba10474175d2': Update the screen nail size even if screen nail is still the same one.
|
2f6fb1ceef0fa27ecea869934b4c09ade97ec2cc |
04-Jun-2012 |
Wei Huang <weih@google.com> |
am 25a91535: Merge "Update the screen nail size even if screen nail is still the same one." into jb-dev * commit '25a9153565d0ecd760387499fce4ba10474175d2': Update the screen nail size even if screen nail is still the same one.
|
eb05110658d06001d077b5fe2250e97465e248ed |
04-Jun-2012 |
Wei Huang <weih@google.com> |
Merge "Update the screen nail size even if screen nail is still the same one." into jb-dev
|
25a9153565d0ecd760387499fce4ba10474175d2 |
04-Jun-2012 |
Wei Huang <weih@google.com> |
Merge "Update the screen nail size even if screen nail is still the same one." into jb-dev
|
7ce9bb4ba05a4f6ebf63ae211d8b4766e3ab139c |
03-Jun-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to jb-dev
|
75ffc1c186b80ceb633a2d632b7ad01996ed5993 |
03-Jun-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to jb-dev
|
0510d2467c18a4bf5fab2c4fd56950afd0b84cb4 |
03-Jun-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to jb-dev
|
37bab5fb8b3ca073e8d3f765b0d2c1d2e316640f |
03-Jun-2012 |
Ruei-sung Lin <rslin@google.com> |
am 30e51141: am e5c8ed74: Fix b/6590795 dejank photo effect slider * commit '30e511418cb69e04525964675885485dde18da8a': Fix b/6590795 dejank photo effect slider
|
2fcbc6e28273a0bb8ec4414a9caa5268dbf79c6d |
03-Jun-2012 |
Ruei-sung Lin <rslin@google.com> |
am 30e51141: am e5c8ed74: Fix b/6590795 dejank photo effect slider * commit '30e511418cb69e04525964675885485dde18da8a': Fix b/6590795 dejank photo effect slider
|
8c07b6802a14111209cc114e0bba0f898ba3703d |
03-Jun-2012 |
Ruei-sung Lin <rslin@google.com> |
am e5c8ed74: Fix b/6590795 dejank photo effect slider * commit 'e5c8ed74768f16e4e82c46a31d5118788dbb3a57': Fix b/6590795 dejank photo effect slider
|
30e511418cb69e04525964675885485dde18da8a |
03-Jun-2012 |
Ruei-sung Lin <rslin@google.com> |
am e5c8ed74: Fix b/6590795 dejank photo effect slider * commit 'e5c8ed74768f16e4e82c46a31d5118788dbb3a57': Fix b/6590795 dejank photo effect slider
|
0bd89c21b27aaacdb93a46fa67856344034feec2 |
31-May-2012 |
Ruei-sung Lin <rslin@google.com> |
Fix b/6590795 dejank photo effect slider Change-Id: I14737bd01361b58c6bd4af19957d514368cc19ea
ni/Android.mk
ni/jni_egl_fence.cpp
ni/jni_egl_fence.h
|
9a5cd762a6faf547c436ee3cda3624748d6095c5 |
31-May-2012 |
Ruei-sung Lin <rslin@google.com> |
Fix b/6590795 dejank photo effect slider Change-Id: I14737bd01361b58c6bd4af19957d514368cc19ea
ndroid.mk
ni/Android.mk
|
ee4163e667ebf1a972b49c0fad93f1fb90cebcb7 |
31-May-2012 |
Ruei-sung Lin <rslin@google.com> |
Fix b/6590795 dejank photo effect slider Change-Id: I14737bd01361b58c6bd4af19957d514368cc19ea
rc/com/android/gallery3d/photoeditor/FilterStack.java
|
e5c8ed74768f16e4e82c46a31d5118788dbb3a57 |
31-May-2012 |
Ruei-sung Lin <rslin@google.com> |
Fix b/6590795 dejank photo effect slider Change-Id: I14737bd01361b58c6bd4af19957d514368cc19ea
ndroid.mk
ni/Android.mk
ni/jni_egl_fence.cpp
ni/jni_egl_fence.h
rc/com/android/gallery3d/photoeditor/FilterStack.java
|
146046ad6c164072929ee9fb06a2931c4f5a5671 |
02-Jun-2012 |
Jean-Baptiste Queru <jbq@google.com> |
am 0ab62de3: Merge 79b8f0b7 * commit '0ab62de3e8d00c6d1ed9c7cc67a41125468b1c05': Adding xhdpi version of app icon. Bug: 6596419
|
24f5b493d55a3b8c5f831aaa5e46409b0c9583eb |
02-Jun-2012 |
Jean-Baptiste Queru <jbq@google.com> |
am 0ab62de3: Merge 79b8f0b7 * commit '0ab62de3e8d00c6d1ed9c7cc67a41125468b1c05': Adding xhdpi version of app icon. Bug: 6596419
|
52cb591fa679c3ba3ce4589ea551fc81903b0e5d |
02-Jun-2012 |
Jean-Baptiste Queru <jbq@google.com> |
Merge 79b8f0b7 Change-Id: Ideb1bf5d1d40baff73f662c3eaad200ad9dc94ac
|
0ab62de3e8d00c6d1ed9c7cc67a41125468b1c05 |
02-Jun-2012 |
Jean-Baptiste Queru <jbq@google.com> |
Merge 79b8f0b7 Change-Id: Ideb1bf5d1d40baff73f662c3eaad200ad9dc94ac
|
855f44b021944cbc3c039c92c6d557130abef48e |
01-Jun-2012 |
Chih-Chung Chang <chihchung@google.com> |
Update the screen nail size even if screen nail is still the same one. Because the rotation value may have changed. Bug: 6594218 Change-Id: I8da2a3041da0e27e1b80723dab8a825a2350c2dd
rc/com/android/gallery3d/ui/PhotoView.java
|
5551dfa4c4e644737785c19f10b13304f94ef2fc |
01-Jun-2012 |
Chih-Chung Chang <chihchung@google.com> |
Update the screen nail size even if screen nail is still the same one. Because the rotation value may have changed. Bug: 6594218 Change-Id: I8da2a3041da0e27e1b80723dab8a825a2350c2dd
rc/com/android/gallery3d/ui/PhotoView.java
|
7896ee05fe545322154adc93862e91083c9b77ef |
01-Jun-2012 |
Christian Robertson <robertsonc@google.com> |
Adding xhdpi version of app icon. Bug: 6596419 Change-Id: I6f8b044d14854f41a4ba788756045f1ee1f56759
es/mipmap-xhdpi/ic_launcher_gallery.png
|
79b8f0b7dbb65a0dd2c32108688903b8147d35d6 |
01-Jun-2012 |
Christian Robertson <robertsonc@google.com> |
Adding xhdpi version of app icon. Bug: 6596419 Change-Id: I6f8b044d14854f41a4ba788756045f1ee1f56759
es/mipmap-xhdpi/ic_launcher_gallery.png
|
cda745a661960130e12b7b5957f825506c8ba877 |
01-Jun-2012 |
Eric Fischer <enf@google.com> |
am 309a9cbb: (-s ours) am 8da8d1d4: Import translations. DO NOT MERGE * commit '309a9cbb72f6dccc1dc972a72da02935f2f0331e': Import translations. DO NOT MERGE
|
31df211705df529c2af6ef8d6f2e830acc3c6c2d |
01-Jun-2012 |
Eric Fischer <enf@google.com> |
am 309a9cbb: (-s ours) am 8da8d1d4: Import translations. DO NOT MERGE * commit '309a9cbb72f6dccc1dc972a72da02935f2f0331e': Import translations. DO NOT MERGE
|
7212b7822ac67a23f853e57a862e4c343dea8e08 |
01-Jun-2012 |
Eric Fischer <enf@google.com> |
am 8da8d1d4: Import translations. DO NOT MERGE * commit '8da8d1d488698ce545ca056f119a03a4f4b189ec': Import translations. DO NOT MERGE
|
309a9cbb72f6dccc1dc972a72da02935f2f0331e |
01-Jun-2012 |
Eric Fischer <enf@google.com> |
am 8da8d1d4: Import translations. DO NOT MERGE * commit '8da8d1d488698ce545ca056f119a03a4f4b189ec': Import translations. DO NOT MERGE
|
f8e8933ef8370171605d8baeaafd8e792b1b6639 |
01-Jun-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: Ia4cc33ee514ce169636fda6e8007389ac60c8e17
es/values-be/strings.xml
es/values-de/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-ja/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-ro/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-tr/strings.xml
es/values-zh-rTW/strings.xml
|
9ab4ff1c34a5a825c1e203de12c6dc9e10a048cf |
01-Jun-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: Ia4cc33ee514ce169636fda6e8007389ac60c8e17
es/values-be/strings.xml
es/values-de/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-ja/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-ro/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-tr/strings.xml
es/values-zh-rTW/strings.xml
|
8da8d1d488698ce545ca056f119a03a4f4b189ec |
01-Jun-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: Ie58fbc6fe46cbf13cf54a0db03d50bda43f778de
es/values-be/strings.xml
es/values-de/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-ja/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-ro/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-tr/strings.xml
es/values-zh-rTW/strings.xml
|
6ce111894997166f7f32b80e70f8d14bf2602f96 |
01-Jun-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: Ie58fbc6fe46cbf13cf54a0db03d50bda43f778de
es/values-be/strings.xml
es/values-de/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-ja/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-ro/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-tr/strings.xml
es/values-zh-rTW/strings.xml
|
ee4b138c4f17d7282518704bb3c67b119b2d0f62 |
01-Jun-2012 |
Wei Huang <weih@google.com> |
am e2b5f9f4: am 9d4ee023: Merge "Use "Gallery" instead of "Photo Studio" as the label for photo editor." into jb-dev * commit 'e2b5f9f468360ca19e446c9d94d4a0120024d3aa': Use "Gallery" instead of "Photo Studio" as the label for photo editor.
|
e2b5f9f468360ca19e446c9d94d4a0120024d3aa |
01-Jun-2012 |
Wei Huang <weih@google.com> |
am 9d4ee023: Merge "Use "Gallery" instead of "Photo Studio" as the label for photo editor." into jb-dev * commit '9d4ee023cb6b754d07d33fb94dd7ae33851b2d35': Use "Gallery" instead of "Photo Studio" as the label for photo editor.
|
9d4ee023cb6b754d07d33fb94dd7ae33851b2d35 |
01-Jun-2012 |
Wei Huang <weih@google.com> |
Merge "Use "Gallery" instead of "Photo Studio" as the label for photo editor." into jb-dev
|
7f811903c59845ae8a3461a94a88b40a2d3114e3 |
01-Jun-2012 |
Chih-Chung Chang <chihchung@google.com> |
am 1eed3b2a: am 6f30a447: Merge "Don\'t allow the orientation to be unlocked if "Rotation Lock" is checked in Settings." into jb-dev * commit '1eed3b2ac7abb0fc2078605d9341f14f6197dbf5': Don't allow the orientation to be unlocked if "Rotation Lock" is checked in Settings.
|
a4929d776fba1c1f25d1d9b8a7d55b655986e82b |
01-Jun-2012 |
Chih-Chung Chang <chihchung@google.com> |
am 1eed3b2a: am 6f30a447: Merge "Don\'t allow the orientation to be unlocked if "Rotation Lock" is checked in Settings." into jb-dev * commit '1eed3b2ac7abb0fc2078605d9341f14f6197dbf5': Don't allow the orientation to be unlocked if "Rotation Lock" is checked in Settings.
|
988b6a327efa3838dd043780f401a26a04d7fecc |
01-Jun-2012 |
Chih-Chung Chang <chihchung@google.com> |
am 6f30a447: Merge "Don\'t allow the orientation to be unlocked if "Rotation Lock" is checked in Settings." into jb-dev * commit '6f30a44785f5dc19d3db1b3d80d828826c2a44dd': Don't allow the orientation to be unlocked if "Rotation Lock" is checked in Settings.
|
1eed3b2ac7abb0fc2078605d9341f14f6197dbf5 |
01-Jun-2012 |
Chih-Chung Chang <chihchung@google.com> |
am 6f30a447: Merge "Don\'t allow the orientation to be unlocked if "Rotation Lock" is checked in Settings." into jb-dev * commit '6f30a44785f5dc19d3db1b3d80d828826c2a44dd': Don't allow the orientation to be unlocked if "Rotation Lock" is checked in Settings.
|
6f30a44785f5dc19d3db1b3d80d828826c2a44dd |
01-Jun-2012 |
Chih-Chung Chang <chihchung@google.com> |
Merge "Don't allow the orientation to be unlocked if "Rotation Lock" is checked in Settings." into jb-dev
|
c4be10eadc24a86eb8648fd5273a68cd63e42288 |
31-May-2012 |
Björn Lundén <blunden2@gmail.com> |
Gallery2: Use ICS alert drawable Same bug here. It's using the old compability drawable instead of the Holo theme one. Change-Id: Ia84ce1d305ee63fc6bc1fdb407a91b3421842eb1
rc/com/android/gallery3d/app/AbstractGalleryActivity.java
|
23b602e709f1551acdb7cf2caaf5b7838b567d15 |
31-May-2012 |
Björn Lundén <blunden2@gmail.com> |
Gallery2: Use ICS alert drawable Same bug here. It's using the old compability drawable instead of the Holo theme one. Change-Id: Ia84ce1d305ee63fc6bc1fdb407a91b3421842eb1
rc/com/android/gallery3d/app/AbstractGalleryActivity.java
|
b123d22c4ea6b458d7a29566da5789391912dfc1 |
31-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
Use "Gallery" instead of "Photo Studio" as the label for photo editor. Bug: 6589966 Change-Id: I0760fa6864da5c398e157f386295dea372f0b33e
ndroidManifest.xml
|
90fff68ef711006c42f7658bcd0cc2cddcd16fed |
31-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
Use "Gallery" instead of "Photo Studio" as the label for photo editor. Bug: 6589966 Change-Id: I0760fa6864da5c398e157f386295dea372f0b33e
ndroidManifest.xml
|
a150debe00d48181ab01c1de442638d02487ba5c |
31-May-2012 |
Eric Fischer <enf@google.com> |
am 06baaba7: (-s ours) am a72d51b6: Import translations. DO NOT MERGE * commit '06baaba784177d3b75b8e653f3f558ece40400be': Import translations. DO NOT MERGE
|
0b9c76009451d0c639e2bcae2cce5f01f3bf3896 |
31-May-2012 |
Eric Fischer <enf@google.com> |
am 06baaba7: (-s ours) am a72d51b6: Import translations. DO NOT MERGE * commit '06baaba784177d3b75b8e653f3f558ece40400be': Import translations. DO NOT MERGE
|
f408f23f2fd26c6a335bea78c693a9eba9a89932 |
31-May-2012 |
Eric Fischer <enf@google.com> |
am a72d51b6: Import translations. DO NOT MERGE * commit 'a72d51b6a4b5dadc0dea91882e0cdafc97c652b3': Import translations. DO NOT MERGE
|
06baaba784177d3b75b8e653f3f558ece40400be |
31-May-2012 |
Eric Fischer <enf@google.com> |
am a72d51b6: Import translations. DO NOT MERGE * commit 'a72d51b6a4b5dadc0dea91882e0cdafc97c652b3': Import translations. DO NOT MERGE
|
4283ac523be001b6bc2d605d305e34ab9b364d12 |
31-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
Don't allow the orientation to be unlocked if "Rotation Lock" is checked in Settings. Bug: 6577802 Change-Id: I5c8eefbb154eedcf71e80e082261e38450105892
rc/com/android/gallery3d/app/OrientationManager.java
|
d0781ecea9a9ad299c6466a81ef66ab78af9dee3 |
31-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
Don't allow the orientation to be unlocked if "Rotation Lock" is checked in Settings. Bug: 6577802 Change-Id: I5c8eefbb154eedcf71e80e082261e38450105892
rc/com/android/gallery3d/app/OrientationManager.java
|
66537f852f60fa0b02cfa52ba67c5776a24309b5 |
31-May-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: I2bcbcd25d41212cb4e81b1e2f621f635cb1d9c8a
es/values-af/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-it/strings.xml
es/values-ru/strings.xml
es/values-sv/strings.xml
es/values-zh-rCN/strings.xml
|
b03186a84d5f13e5d3541264632b2d1f176dc40e |
31-May-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: I2bcbcd25d41212cb4e81b1e2f621f635cb1d9c8a
es/values-af/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-it/strings.xml
es/values-ru/strings.xml
es/values-sv/strings.xml
es/values-zh-rCN/strings.xml
|
b82af61c1eb949c6cde36289d5a36ded763ef886 |
31-May-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: I854fe48674bc25b209370d0e943bba9704fdf3cd
es/values-af/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-it/strings.xml
es/values-ru/strings.xml
es/values-sv/strings.xml
es/values-zh-rCN/strings.xml
|
a72d51b6a4b5dadc0dea91882e0cdafc97c652b3 |
31-May-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: I854fe48674bc25b209370d0e943bba9704fdf3cd
es/values-af/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-it/strings.xml
es/values-ru/strings.xml
es/values-sv/strings.xml
es/values-zh-rCN/strings.xml
|
8db2ac265116c98cce1969448c929253ab085d30 |
31-May-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to jb-dev
|
289a60cb8f58f95983c53a8b826b997554204282 |
31-May-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to jb-dev
|
5c254b8e4737db1a332b07c7cf62c0ff40b2a4ed |
31-May-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to jb-dev
|
95584440e5db9bb224ee6424db0f8000d040aab5 |
31-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
am 5d67dcb7: am 192b7f1d: Improve scale gesture snapback. * commit '5d67dcb792f4799c8aff6f2b2db74b28eff0b3d2': Improve scale gesture snapback.
|
e90bcd6ce4b0ba0f2aadd1c514b8565875eae658 |
31-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
am 5d67dcb7: am 192b7f1d: Improve scale gesture snapback. * commit '5d67dcb792f4799c8aff6f2b2db74b28eff0b3d2': Improve scale gesture snapback.
|
f1415ea04faace4f51ae0f2429eebacec5039f05 |
31-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
am 192b7f1d: Improve scale gesture snapback. * commit '192b7f1ddf08e7bfa0c65dbf61edb81ebb5a0998': Improve scale gesture snapback.
|
5d67dcb792f4799c8aff6f2b2db74b28eff0b3d2 |
31-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
am 192b7f1d: Improve scale gesture snapback. * commit '192b7f1ddf08e7bfa0c65dbf61edb81ebb5a0998': Improve scale gesture snapback.
|
192b7f1ddf08e7bfa0c65dbf61edb81ebb5a0998 |
31-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
Improve scale gesture snapback. If the picture is zoomed-in, we want to keep the focus point stay in the same position on screen, so we need to adjust the target mCurrentX value. Bug: 6563619 Change-Id: I87b23da99aced1490187e550bd43fad733122577
rc/com/android/gallery3d/ui/PositionController.java
|
ae4b345047813f555fd934e7c23f2d935795b21b |
31-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
Improve scale gesture snapback. If the picture is zoomed-in, we want to keep the focus point stay in the same position on screen, so we need to adjust the target mCurrentX value. Bug: 6563619 Change-Id: I87b23da99aced1490187e550bd43fad733122577
rc/com/android/gallery3d/ui/PositionController.java
|
ddb4b32f4cfdd0086af093255db2adbfb539aa0b |
31-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
am eb72c11f: am f3f90752: If the focused box was at minimal scale, we try to make it the minimal scale under the new view size. * commit 'eb72c11fe3ec4c145ec2d0ee81684ff8bf667683': If the focused box was at minimal scale, we try to make it the minimal scale under the new view size.
|
921865bbd9873cd2b14bd3dc1795194d0af52388 |
31-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
am eb72c11f: am f3f90752: If the focused box was at minimal scale, we try to make it the minimal scale under the new view size. * commit 'eb72c11fe3ec4c145ec2d0ee81684ff8bf667683': If the focused box was at minimal scale, we try to make it the minimal scale under the new view size.
|
7267ae921c6f933959d83cd739c774248a6ffa3f |
31-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
am f3f90752: If the focused box was at minimal scale, we try to make it the minimal scale under the new view size. * commit 'f3f90752ca92372d61ca0ec22a9846261cfbcbde': If the focused box was at minimal scale, we try to make it the minimal scale under the new view size.
|
eb72c11fe3ec4c145ec2d0ee81684ff8bf667683 |
31-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
am f3f90752: If the focused box was at minimal scale, we try to make it the minimal scale under the new view size. * commit 'f3f90752ca92372d61ca0ec22a9846261cfbcbde': If the focused box was at minimal scale, we try to make it the minimal scale under the new view size.
|
a6be5e8150124acec22b40f47f75ab18d49879f7 |
31-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
am cda378ac: am 42e1fed4: Move to final position after view size change. * commit 'cda378ac40ca7f317ad9eae387b45140b5bded8f': Move to final position after view size change.
|
24629b290e992f6a1f09e90a1fa9c2ac783a5204 |
31-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
am cda378ac: am 42e1fed4: Move to final position after view size change. * commit 'cda378ac40ca7f317ad9eae387b45140b5bded8f': Move to final position after view size change.
|
5e14557f5db5555d0015a47b3281e4c4f7a68c58 |
31-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
am 42e1fed4: Move to final position after view size change. * commit '42e1fed4edd9ed1e326aab2f7969242c56812952': Move to final position after view size change.
|
cda378ac40ca7f317ad9eae387b45140b5bded8f |
31-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
am 42e1fed4: Move to final position after view size change. * commit '42e1fed4edd9ed1e326aab2f7969242c56812952': Move to final position after view size change.
|
f3f90752ca92372d61ca0ec22a9846261cfbcbde |
31-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
If the focused box was at minimal scale, we try to make it the minimal scale under the new view size. Bug: 6584425 Change-Id: I7dcc748cb3659a06f2ca4d8550d075fdda2949fa
rc/com/android/gallery3d/ui/PositionController.java
|
94fd2f9fa2bac08bc6da084d24243e679d44ea78 |
31-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
If the focused box was at minimal scale, we try to make it the minimal scale under the new view size. Bug: 6584425 Change-Id: I7dcc748cb3659a06f2ca4d8550d075fdda2949fa
rc/com/android/gallery3d/ui/PositionController.java
|
d416516856065b7b652b71700853b02d93376327 |
31-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
Move to final position after view size change. Bug: 6584188 Change-Id: If6ab23532bd7040701e358f9cdd813d2f6a71e5c
rc/com/android/gallery3d/ui/PhotoView.java
rc/com/android/gallery3d/ui/PositionController.java
|
42e1fed4edd9ed1e326aab2f7969242c56812952 |
31-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
Move to final position after view size change. Bug: 6584188 Change-Id: If6ab23532bd7040701e358f9cdd813d2f6a71e5c
rc/com/android/gallery3d/ui/PhotoView.java
rc/com/android/gallery3d/ui/PositionController.java
|
491f74d5a7478b6f8f9f3a5541fe049562d2466c |
30-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
am b5110a32: am 28b4d3a8: Merge "Improve image size change handling." into jb-dev * commit 'b5110a32e9d9dcb221f61cb3547b733f4493a62b': Improve image size change handling.
|
11c68d0330f575050004da189af4d877e7c33872 |
30-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
am b5110a32: am 28b4d3a8: Merge "Improve image size change handling." into jb-dev * commit 'b5110a32e9d9dcb221f61cb3547b733f4493a62b': Improve image size change handling.
|
15d619b0da39ad7b3ea73291e8d3a3e367225d17 |
30-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
am 28b4d3a8: Merge "Improve image size change handling." into jb-dev * commit '28b4d3a8fd7a70647f9445752bf1a4e73b99f265': Improve image size change handling.
|
b5110a32e9d9dcb221f61cb3547b733f4493a62b |
30-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
am 28b4d3a8: Merge "Improve image size change handling." into jb-dev * commit '28b4d3a8fd7a70647f9445752bf1a4e73b99f265': Improve image size change handling.
|
7507d23f7fb8b9a42a9e01d8af5762a94ccbab85 |
30-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
Merge "Improve image size change handling." into jb-dev
|
28b4d3a8fd7a70647f9445752bf1a4e73b99f265 |
30-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
Merge "Improve image size change handling." into jb-dev
|
5b633cd5d35fefce723f25474c2f54cd7dd7136a |
30-May-2012 |
Eric Fischer <enf@google.com> |
am 1919a7a2: (-s ours) am c23258a5: Import translations. DO NOT MERGE * commit '1919a7a27641571cec9ed5d9bf4f4ceef3590939': Import translations. DO NOT MERGE
|
393ab59b7fbcffd0a0d7c54a1e78ebbe95c7b36d |
30-May-2012 |
Eric Fischer <enf@google.com> |
am 1919a7a2: (-s ours) am c23258a5: Import translations. DO NOT MERGE * commit '1919a7a27641571cec9ed5d9bf4f4ceef3590939': Import translations. DO NOT MERGE
|
efe38b0e05da3e2f2f453ffe231f46376ed5bf6c |
30-May-2012 |
Eric Fischer <enf@google.com> |
am c23258a5: Import translations. DO NOT MERGE * commit 'c23258a525b475666e4bff21da72a9c8a93e4971': Import translations. DO NOT MERGE
|
1919a7a27641571cec9ed5d9bf4f4ceef3590939 |
30-May-2012 |
Eric Fischer <enf@google.com> |
am c23258a5: Import translations. DO NOT MERGE * commit 'c23258a525b475666e4bff21da72a9c8a93e4971': Import translations. DO NOT MERGE
|
50b36b040ca886be12e11a9ca06351cea34bedbe |
30-May-2012 |
Eric Fischer <enf@google.com> |
Merge "Import translations. DO NOT MERGE"
|
9e0ded9d736576d936b099098ac595ee3e9089a5 |
30-May-2012 |
Eric Fischer <enf@google.com> |
Merge "Import translations. DO NOT MERGE"
|
f03de63324ee6f032ebb160acc4c5995f459cd7d |
30-May-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am 3c827838: Reconcile with jb-release * commit '3c82783863a2de9779a9ba68bed6b450fadebe4a':
|
b2458ef9e56d828c1900c1fb7b09eb1ff894630c |
30-May-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am 3c827838: Reconcile with jb-release * commit '3c82783863a2de9779a9ba68bed6b450fadebe4a':
|
2859c16d954ceb67f695d1f32c31e970b45054bc |
30-May-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am 3c827838: Reconcile with jb-release * commit '3c82783863a2de9779a9ba68bed6b450fadebe4a':
|
e290e9a130bd12919d5ec6de746a301506117e20 |
30-May-2012 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with jb-release Change-Id: Ib078ec6a8d678533d89d2db0d1d8df2fa6c724e8
|
0d4e2813e82f5829ef880eb04e5806d6ecf6ba3e |
30-May-2012 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with jb-release Change-Id: Ib078ec6a8d678533d89d2db0d1d8df2fa6c724e8
|
3c82783863a2de9779a9ba68bed6b450fadebe4a |
30-May-2012 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with jb-release Change-Id: Ib078ec6a8d678533d89d2db0d1d8df2fa6c724e8
|
5683b66232ee4106f16270e264f9eeb3fba5b35f |
30-May-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: I57a2c1fcaa457e650abd4546cf49b764d05036be
es/values-ar/strings.xml
es/values-es-rUS/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-in/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-pl/strings.xml
es/values-pt/strings.xml
es/values-tl/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zu/strings.xml
|
9dbf1623388bd5c3d7e85d3607b424b9c9744a23 |
30-May-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: I57a2c1fcaa457e650abd4546cf49b764d05036be
es/values-ar/strings.xml
es/values-es-rUS/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-in/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-pl/strings.xml
es/values-pt/strings.xml
es/values-tl/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zu/strings.xml
|
9c9b072733dda91b553fbf3cde94f7e13be276f8 |
30-May-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: Idbc7268dabbede56d3fddb73f3513b8bdcde6a8d
es/values-ar/strings.xml
es/values-es-rUS/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-in/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-pl/strings.xml
es/values-pt/strings.xml
es/values-tl/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zu/strings.xml
|
c23258a525b475666e4bff21da72a9c8a93e4971 |
30-May-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: Idbc7268dabbede56d3fddb73f3513b8bdcde6a8d
es/values-ar/strings.xml
es/values-es-rUS/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-in/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-pl/strings.xml
es/values-pt/strings.xml
es/values-tl/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zu/strings.xml
|
9e9e9302b322798639e01727e5c3ca886f279af1 |
30-May-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to jb-dev
|
e9e4fbef372e33e90157b602f83d85e27211cd99 |
30-May-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to jb-dev
|
3b28722f154155b28b22301c0ae8c6f25e09fcd4 |
30-May-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to jb-dev
|
860b7463c16f44a7b8fce01a79161ce3e8d47214 |
30-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
Improve image size change handling. - When the camera relative frame is set, we delay the change for camera rectange until the next setImageSize call. This avoids the unwanted intermediate state if we change them separately. - Don't draw other screennails when the camera is in full screen. This avoids showing other screennails when the image size changes. - When the aspect ratio of the image changes, we assume the view angle of the longer side doesn't change (so the aspect ratio change is because the view angle of the shorter side changes). This matches what camera preview does. Bug: 6566612 Change-Id: I7603416f31c96ba77c96cdc2a3d0b79f8921c491
rc/com/android/gallery3d/ui/PhotoView.java
rc/com/android/gallery3d/ui/PositionController.java
|
9f44f35c211229bc0c5ca17823f5d7b6bb3583a1 |
30-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
Improve image size change handling. - When the camera relative frame is set, we delay the change for camera rectange until the next setImageSize call. This avoids the unwanted intermediate state if we change them separately. - Don't draw other screennails when the camera is in full screen. This avoids showing other screennails when the image size changes. - When the aspect ratio of the image changes, we assume the view angle of the longer side doesn't change (so the aspect ratio change is because the view angle of the shorter side changes). This matches what camera preview does. Bug: 6566612 Change-Id: I7603416f31c96ba77c96cdc2a3d0b79f8921c491
rc/com/android/gallery3d/ui/PhotoView.java
rc/com/android/gallery3d/ui/PositionController.java
|
e81e383bcc61754db39e7a9d729c0acf43824ddc |
29-May-2012 |
Eric Fischer <enf@google.com> |
Merge "Import translations. DO NOT MERGE"
|
7a89249c3ba345a1f9d830767087ec269a28c869 |
29-May-2012 |
Eric Fischer <enf@google.com> |
Merge "Import translations. DO NOT MERGE"
|
f3c5b30b3274195f3355efd3b93e580f99009d73 |
29-May-2012 |
Eric Fischer <enf@google.com> |
Merge "Import translations. DO NOT MERGE"
|
bd32bb4d596679b8108bbbbde0ed65ab22992035 |
29-May-2012 |
Eric Fischer <enf@google.com> |
Merge "Import translations. DO NOT MERGE"
|
e927a3e39039d28ad58738fe0cfa6269e3c0ed64 |
29-May-2012 |
Wei Huang <weih@google.com> |
am 20582d2f: am f1f02b6e: Merge "Keep screen on for user-initiated slideshow." into jb-dev * commit '20582d2f79f82f8a8529753194c863d1593ad08c': Keep screen on for user-initiated slideshow.
|
da0ef8ea78cf0ab4b2b769c2148d3f95ed516291 |
29-May-2012 |
Wei Huang <weih@google.com> |
am 20582d2f: am f1f02b6e: Merge "Keep screen on for user-initiated slideshow." into jb-dev * commit '20582d2f79f82f8a8529753194c863d1593ad08c': Keep screen on for user-initiated slideshow.
|
ae26d83bae46fc3c2967620867fe26096966654b |
29-May-2012 |
Wei Huang <weih@google.com> |
am f1f02b6e: Merge "Keep screen on for user-initiated slideshow." into jb-dev * commit 'f1f02b6ec5998102257f0c60d61b0b07df796064': Keep screen on for user-initiated slideshow.
|
20582d2f79f82f8a8529753194c863d1593ad08c |
29-May-2012 |
Wei Huang <weih@google.com> |
am f1f02b6e: Merge "Keep screen on for user-initiated slideshow." into jb-dev * commit 'f1f02b6ec5998102257f0c60d61b0b07df796064': Keep screen on for user-initiated slideshow.
|
f1f02b6ec5998102257f0c60d61b0b07df796064 |
29-May-2012 |
Wei Huang <weih@google.com> |
Merge "Keep screen on for user-initiated slideshow." into jb-dev
|
5b34567ba2fd1f60c9a277b0056828352100bdf8 |
29-May-2012 |
Eric Fischer <enf@google.com> |
am 601a18b3: (-s ours) am cde8d176: Merge "Import translations. DO NOT MERGE" into jb-dev * commit '601a18b3d77a95e37585d051d8de2802bf3c84a4': Import translations. DO NOT MERGE
|
f3bcd7b173d63cb2d18425602ca514f137625708 |
29-May-2012 |
Eric Fischer <enf@google.com> |
am 601a18b3: (-s ours) am cde8d176: Merge "Import translations. DO NOT MERGE" into jb-dev * commit '601a18b3d77a95e37585d051d8de2802bf3c84a4': Import translations. DO NOT MERGE
|
56b95290369c65e4552b9f38ee1de081760e2203 |
29-May-2012 |
Eric Fischer <enf@google.com> |
am cde8d176: Merge "Import translations. DO NOT MERGE" into jb-dev * commit 'cde8d1762af242a89aeea6062b185e7717da5a62': Import translations. DO NOT MERGE
|
601a18b3d77a95e37585d051d8de2802bf3c84a4 |
29-May-2012 |
Eric Fischer <enf@google.com> |
am cde8d176: Merge "Import translations. DO NOT MERGE" into jb-dev * commit 'cde8d1762af242a89aeea6062b185e7717da5a62': Import translations. DO NOT MERGE
|
2f6678b1697d7eab45b00c12bf5e1893eb272164 |
29-May-2012 |
Eric Fischer <enf@google.com> |
Merge "Import translations. DO NOT MERGE" into jb-dev
|
cde8d1762af242a89aeea6062b185e7717da5a62 |
29-May-2012 |
Eric Fischer <enf@google.com> |
Merge "Import translations. DO NOT MERGE" into jb-dev
|
fa0644d92f488c2f80b626eb86795e9be0ef0cd6 |
29-May-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: Ifff95b969b5388df20cd834f81cab4a11ed655bf
es/values-cs/photoeditor_strings.xml
|
b4a2ff68cd17b8778e5bcd54f4f9f5e8b9da1de4 |
29-May-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: Ifff95b969b5388df20cd834f81cab4a11ed655bf
es/values-cs/photoeditor_strings.xml
|
3e6afd011bfae76d2d9b724b9b24391332294a0b |
29-May-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: Id68af15d8c2c99947e9118446736fda1a588769a
es/values-cs/photoeditor_strings.xml
|
bccc8603a2ad829968bf10a0f25d34feb7d6f148 |
29-May-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: Id68af15d8c2c99947e9118446736fda1a588769a
es/values-cs/photoeditor_strings.xml
|
fe39cb55712ae1f431bf6426297978914f1aa3e3 |
29-May-2012 |
Eric Fischer <enf@google.com> |
am d31562a6: (-s ours) am fd08e675: Import translations. DO NOT MERGE * commit 'd31562a6fdccf6d1b37264c90a623b6c790e9241': Import translations. DO NOT MERGE
|
bb8a7792e4adbc52bb17fcdf293b250c15428ab4 |
29-May-2012 |
Eric Fischer <enf@google.com> |
am d31562a6: (-s ours) am fd08e675: Import translations. DO NOT MERGE * commit 'd31562a6fdccf6d1b37264c90a623b6c790e9241': Import translations. DO NOT MERGE
|
d4ed01fe6e7f98895b31d727000ada5a53234f02 |
29-May-2012 |
Eric Fischer <enf@google.com> |
am fd08e675: Import translations. DO NOT MERGE * commit 'fd08e675f3d83594bb7e78577d40fea1537a4935': Import translations. DO NOT MERGE
|
d31562a6fdccf6d1b37264c90a623b6c790e9241 |
29-May-2012 |
Eric Fischer <enf@google.com> |
am fd08e675: Import translations. DO NOT MERGE * commit 'fd08e675f3d83594bb7e78577d40fea1537a4935': Import translations. DO NOT MERGE
|
e3ff4885286396a72cb757cb15d287577f80174e |
29-May-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: Ib9ae85b5013a12c2d2ea10ea7b48d0636797cefd
es/values-am/strings.xml
es/values-ca/strings.xml
es/values-da/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-fr/strings.xml
es/values-iw/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
|
d19f7d5806e4f23a76657146db612153eab30a66 |
29-May-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: Ib9ae85b5013a12c2d2ea10ea7b48d0636797cefd
es/values-am/strings.xml
es/values-ca/strings.xml
es/values-da/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-fr/strings.xml
es/values-iw/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
|
31b408e82582d23caa438219391761895aa264b0 |
29-May-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: Ief5e6efb118d8e5b229736a5a4c3a22d5b8f796c
es/values-am/strings.xml
es/values-ca/strings.xml
es/values-da/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-fr/strings.xml
es/values-iw/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
|
fd08e675f3d83594bb7e78577d40fea1537a4935 |
29-May-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: Ief5e6efb118d8e5b229736a5a4c3a22d5b8f796c
es/values-am/strings.xml
es/values-ca/strings.xml
es/values-da/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-fr/strings.xml
es/values-iw/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
|
ab8f7cd1c7be4553e522e4475592ddbb7fb12fdb |
29-May-2012 |
Wei Huang <weih@google.com> |
am 0cb52a72: am 20d558a1: Merge "Fix over-sized images in drawable-sw600dp." into jb-dev * commit '0cb52a7232d738a58010bed106472b27e0b2c002': Fix over-sized images in drawable-sw600dp.
|
aafe98f439c058df2c7536530f97c3078a60ff06 |
29-May-2012 |
Wei Huang <weih@google.com> |
am 0cb52a72: am 20d558a1: Merge "Fix over-sized images in drawable-sw600dp." into jb-dev * commit '0cb52a7232d738a58010bed106472b27e0b2c002': Fix over-sized images in drawable-sw600dp.
|
c9421318967ea53f1f3dfc1130d55f8e110663f2 |
29-May-2012 |
Wei Huang <weih@google.com> |
am 20d558a1: Merge "Fix over-sized images in drawable-sw600dp." into jb-dev * commit '20d558a1b9d5f0e2b6cf4fa2b7d38b5a5ce8acf6': Fix over-sized images in drawable-sw600dp.
|
0cb52a7232d738a58010bed106472b27e0b2c002 |
29-May-2012 |
Wei Huang <weih@google.com> |
am 20d558a1: Merge "Fix over-sized images in drawable-sw600dp." into jb-dev * commit '20d558a1b9d5f0e2b6cf4fa2b7d38b5a5ce8acf6': Fix over-sized images in drawable-sw600dp.
|
15f7f40cb31bffafd279ea3dec5ce0167cb2ad37 |
29-May-2012 |
Wei Huang <weih@google.com> |
Merge "Fix over-sized images in drawable-sw600dp." into jb-dev
|
20d558a1b9d5f0e2b6cf4fa2b7d38b5a5ce8acf6 |
29-May-2012 |
Wei Huang <weih@google.com> |
Merge "Fix over-sized images in drawable-sw600dp." into jb-dev
|
b04f0a4c6ab4e4047bb1bdc2d8bedc8e6c18a2d2 |
29-May-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am 7f950388: Reconcile with jb-release nakasi-factoryrom-release * commit '7f9503883e36c6201ae1e19cc8442bb1edc5bc19':
|
0d48ac6f7f36b8bf58e520c3406e799906c68490 |
29-May-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am 7f950388: Reconcile with jb-release nakasi-factoryrom-release * commit '7f9503883e36c6201ae1e19cc8442bb1edc5bc19':
|
f94594cf17147cbdc7721125a0c37efef5a634a3 |
29-May-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am 7f950388: Reconcile with jb-release nakasi-factoryrom-release * commit '7f9503883e36c6201ae1e19cc8442bb1edc5bc19':
|
8dd0034b0b6e92ddc62eb4aeb4198eb2ac49af2f |
29-May-2012 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with jb-release nakasi-factoryrom-release Change-Id: I066f2ea934faee09776a9c798d414bc6d66a57af
|
26fb412b2f3a81649a904d945662f515f9f1d847 |
29-May-2012 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with jb-release nakasi-factoryrom-release Change-Id: I066f2ea934faee09776a9c798d414bc6d66a57af
|
7f9503883e36c6201ae1e19cc8442bb1edc5bc19 |
29-May-2012 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with jb-release nakasi-factoryrom-release Change-Id: I066f2ea934faee09776a9c798d414bc6d66a57af
|
82c88846f4e683f892ef7997f58c759ef87ab131 |
29-May-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to jb-dev
|
34cd903edd9cee5c47cc2a2b80893e5d5025cb15 |
29-May-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to jb-dev
|
e010f7ce506a3b3dd07396c996ed71cc23f3cd41 |
29-May-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to jb-dev
|
26eb4ed5239f59de7a7e212a03047f3e0afa3c74 |
28-May-2012 |
Yuli Huang <yuli@google.com> |
Keep screen on for user-initiated slideshow. Change-Id: I3085398c663e2c38a31cfde5a07b23446bb7bd7f b:6450305
rc/com/android/gallery3d/app/ActivityState.java
rc/com/android/gallery3d/app/Gallery.java
rc/com/android/gallery3d/app/SlideshowDream.java
rc/com/android/gallery3d/app/SlideshowPage.java
|
afb3d1d8f341620f6b69d47d52b515f53817aa91 |
28-May-2012 |
Yuli Huang <yuli@google.com> |
Keep screen on for user-initiated slideshow. Change-Id: I3085398c663e2c38a31cfde5a07b23446bb7bd7f b:6450305
rc/com/android/gallery3d/app/ActivityState.java
rc/com/android/gallery3d/app/Gallery.java
rc/com/android/gallery3d/app/SlideshowDream.java
rc/com/android/gallery3d/app/SlideshowPage.java
|
7051ee33ff730782cac3c150669a10e4e474ff66 |
26-May-2012 |
Hung-ying Tyan <tyanh@google.com> |
Fix over-sized images in drawable-sw600dp. We have both drawable-sw600dp/ and drawable-sw600dp-mdpi/. We are getting images from drawable-sw600dp/ and they are too large. Those over-sized images are removed, and to avoid confusion, move the images in drawable-sw600dp-mdpi/ to drawable-sw600dp/. Bug: 6549010 Change-Id: Ibd6dea8aec3740c4e6d5992ccdba3518fbb89a23
es/drawable-sw600dp-mdpi/bg_vidcontrol.png
es/drawable-sw600dp-mdpi/ic_pan_thumb.9.png
es/drawable-sw600dp-mdpi/ic_vidcontrol_pause.png
es/drawable-sw600dp-mdpi/ic_vidcontrol_play.png
es/drawable-sw600dp-mdpi/ic_vidcontrol_reload.png
es/drawable-sw600dp-mdpi/ic_video_thumb.png
es/drawable-sw600dp-mdpi/scrubber_knob.png
es/drawable-sw600dp/bg_vidcontrol.png
es/drawable-sw600dp/ic_pan_thumb.9.png
es/drawable-sw600dp/ic_vidcontrol_pause.png
es/drawable-sw600dp/ic_vidcontrol_play.png
es/drawable-sw600dp/ic_vidcontrol_reload.png
es/drawable-sw600dp/ic_video_thumb.png
es/drawable-sw600dp/scrubber_knob.png
|
c971548e3d078d77c07a5cdf361b9b6050ec7385 |
26-May-2012 |
Hung-ying Tyan <tyanh@google.com> |
Fix over-sized images in drawable-sw600dp. We have both drawable-sw600dp/ and drawable-sw600dp-mdpi/. We are getting images from drawable-sw600dp/ and they are too large. Those over-sized images are removed, and to avoid confusion, move the images in drawable-sw600dp-mdpi/ to drawable-sw600dp/. Bug: 6549010 Change-Id: Ibd6dea8aec3740c4e6d5992ccdba3518fbb89a23
es/drawable-sw600dp-mdpi/bg_vidcontrol.png
es/drawable-sw600dp-mdpi/ic_pan_thumb.9.png
es/drawable-sw600dp-mdpi/ic_vidcontrol_pause.png
es/drawable-sw600dp-mdpi/ic_vidcontrol_play.png
es/drawable-sw600dp-mdpi/ic_vidcontrol_reload.png
es/drawable-sw600dp-mdpi/ic_video_thumb.png
es/drawable-sw600dp-mdpi/scrubber_knob.png
es/drawable-sw600dp/bg_vidcontrol.png
es/drawable-sw600dp/ic_pan_thumb.9.png
es/drawable-sw600dp/ic_vidcontrol_pause.png
es/drawable-sw600dp/ic_vidcontrol_play.png
es/drawable-sw600dp/ic_vidcontrol_reload.png
es/drawable-sw600dp/ic_video_thumb.png
es/drawable-sw600dp/scrubber_knob.png
|
fe7938d8b23d9121f9975c51d2162cb109fab261 |
26-May-2012 |
Owen Lin <owenlin@google.com> |
am a563beee: am 00bb8e43: Add back the background when we show the action bar * commit 'a563beeed8ab19d0960e6ce33503726dc6a2e398': Add back the background when we show the action bar
|
1053753e5baa32ccbc1e635d6aae74b450a805bb |
26-May-2012 |
Owen Lin <owenlin@google.com> |
am a563beee: am 00bb8e43: Add back the background when we show the action bar * commit 'a563beeed8ab19d0960e6ce33503726dc6a2e398': Add back the background when we show the action bar
|
e87bf94b6b53f4b52fab67aadb947da1a3660ced |
26-May-2012 |
Owen Lin <owenlin@google.com> |
am a563beee: am 00bb8e43: Add back the background when we show the action bar * commit 'a563beeed8ab19d0960e6ce33503726dc6a2e398': Add back the background when we show the action bar
|
d4f218b0e4ef2279fc0e78a61397575ace235778 |
26-May-2012 |
Owen Lin <owenlin@google.com> |
am 00bb8e43: Add back the background when we show the action bar * commit '00bb8e439e33848d679a4404c203af9ed1a06a19': Add back the background when we show the action bar
|
169b142cdf996c772702a8239bf6ab711a29d63a |
26-May-2012 |
Owen Lin <owenlin@google.com> |
am 00bb8e43: Add back the background when we show the action bar * commit '00bb8e439e33848d679a4404c203af9ed1a06a19': Add back the background when we show the action bar
|
a563beeed8ab19d0960e6ce33503726dc6a2e398 |
26-May-2012 |
Owen Lin <owenlin@google.com> |
am 00bb8e43: Add back the background when we show the action bar * commit '00bb8e439e33848d679a4404c203af9ed1a06a19': Add back the background when we show the action bar
|
b603e674b9e0bc7372fd535f7f3ac0b9b4e3a689 |
24-May-2012 |
Owen Lin <owenlin@google.com> |
Add back the background when we show the action bar This change fix the following UI issues: 1. We add a black backgorund when ActionBar shows and remove it when we hide the action bar. 2. Make the postion of video stable when opening 3. Prevent glitching when opening a video 4. Make it really full-screen. 5. Hide ControlOverlay at begining. bug:6519765 bug:6491674 Change-Id: I3ab033642df2c4a158b99385b02e3e967eebeabd
rc/com/android/gallery3d/app/MovieActivity.java
rc/com/android/gallery3d/app/MovieControllerOverlay.java
rc/com/android/gallery3d/app/MoviePlayer.java
|
5366111a30ec5d4198e9c7e75cf60349d6fd7cb1 |
24-May-2012 |
Owen Lin <owenlin@google.com> |
Add back the background when we show the action bar This change fix the following UI issues: 1. We add a black backgorund when ActionBar shows and remove it when we hide the action bar. 2. Make the postion of video stable when opening 3. Prevent glitching when opening a video 4. Make it really full-screen. 5. Hide ControlOverlay at begining. bug:6519765 bug:6491674 Change-Id: I3ab033642df2c4a158b99385b02e3e967eebeabd
es/layout/movie_view.xml
|
00bb8e439e33848d679a4404c203af9ed1a06a19 |
24-May-2012 |
Owen Lin <owenlin@google.com> |
Add back the background when we show the action bar This change fix the following UI issues: 1. We add a black backgorund when ActionBar shows and remove it when we hide the action bar. 2. Make the postion of video stable when opening 3. Prevent glitching when opening a video 4. Make it really full-screen. 5. Hide ControlOverlay at begining. bug:6519765 bug:6491674 Change-Id: I3ab033642df2c4a158b99385b02e3e967eebeabd
es/layout/movie_view.xml
rc/com/android/gallery3d/app/MovieActivity.java
rc/com/android/gallery3d/app/MovieControllerOverlay.java
rc/com/android/gallery3d/app/MoviePlayer.java
|
b6f953962cb8d52234219195ffc3b326c6c1d27d |
25-May-2012 |
Eric Fischer <enf@google.com> |
am f6688d1e: (-s ours) am ceab9f07: Import translations. DO NOT MERGE * commit 'f6688d1e099d79ff288dc14ee94e7ad2bcf1c470': Import translations. DO NOT MERGE
|
28968bdc0a1deadb3877b44094bd0cf0b995e0f9 |
25-May-2012 |
Eric Fischer <enf@google.com> |
am f6688d1e: (-s ours) am ceab9f07: Import translations. DO NOT MERGE * commit 'f6688d1e099d79ff288dc14ee94e7ad2bcf1c470': Import translations. DO NOT MERGE
|
dce00ee7eaf4c33ee8760f056f2ceec236dc5883 |
25-May-2012 |
Eric Fischer <enf@google.com> |
am ceab9f07: Import translations. DO NOT MERGE * commit 'ceab9f07470e899c2ff34d4ddd4a43395a9f6523': Import translations. DO NOT MERGE
|
f6688d1e099d79ff288dc14ee94e7ad2bcf1c470 |
25-May-2012 |
Eric Fischer <enf@google.com> |
am ceab9f07: Import translations. DO NOT MERGE * commit 'ceab9f07470e899c2ff34d4ddd4a43395a9f6523': Import translations. DO NOT MERGE
|
098f0a931062054be16185b4523f0e5f81b32693 |
25-May-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: Ie3efea4133d63aac5b1df887925b914b7107859d
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
16767eb1e6b1f42338efdd7fa49c28691a380bee |
25-May-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: Ie3efea4133d63aac5b1df887925b914b7107859d
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
d56c6436ae60f261714bb47100e6adc060d83f8a |
25-May-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: Ica289f7c9b3b9fcb792be31e2088300cd1d5ac92
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
ceab9f07470e899c2ff34d4ddd4a43395a9f6523 |
25-May-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: Ica289f7c9b3b9fcb792be31e2088300cd1d5ac92
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
752b7b104084d8480dc373c7b9d102a8101afae9 |
25-May-2012 |
Angus Kong <shkong@google.com> |
am 903f8394: am 95c2aeab: Force to stop scrolling in filmstrip mode. * commit '903f83944aa056644373e8d0660bddf2861f0390': Force to stop scrolling in filmstrip mode.
|
8e2815df1bde6b7be4168d0a5719e777ff252835 |
25-May-2012 |
Angus Kong <shkong@google.com> |
am 903f8394: am 95c2aeab: Force to stop scrolling in filmstrip mode. * commit '903f83944aa056644373e8d0660bddf2861f0390': Force to stop scrolling in filmstrip mode.
|
541d9be56490ae3da657e23eedaa065fcf8d46b7 |
25-May-2012 |
Angus Kong <shkong@google.com> |
am 95c2aeab: Force to stop scrolling in filmstrip mode. * commit '95c2aeab0bf398b45d8a9c562fd110d1e3756139': Force to stop scrolling in filmstrip mode.
|
903f83944aa056644373e8d0660bddf2861f0390 |
25-May-2012 |
Angus Kong <shkong@google.com> |
am 95c2aeab: Force to stop scrolling in filmstrip mode. * commit '95c2aeab0bf398b45d8a9c562fd110d1e3756139': Force to stop scrolling in filmstrip mode.
|
b1475e112677eac0f58e7e2925f801016e7982da |
25-May-2012 |
Angus Kong <shkong@google.com> |
Force to stop scrolling in filmstrip mode. bug:6554106 Change-Id: I4305ce7068a36e72a325996a88c1d227a2d2b20c
rc/com/android/gallery3d/ui/PositionController.java
|
95c2aeab0bf398b45d8a9c562fd110d1e3756139 |
25-May-2012 |
Angus Kong <shkong@google.com> |
Force to stop scrolling in filmstrip mode. bug:6554106 Change-Id: I4305ce7068a36e72a325996a88c1d227a2d2b20c
rc/com/android/gallery3d/ui/PositionController.java
|
212c2acba6f7438fe13f97dd5e51fad00c7a8eb5 |
24-May-2012 |
The Android Automerger <android-build@android.com> |
merge in nakasi-factoryrom-release history after reset to jb-dev
|
09920c5467987c77fdec1d8b34a1269d011c1dae |
24-May-2012 |
The Android Automerger <android-build@android.com> |
merge in nakasi-factoryrom-release history after reset to jb-dev
|
51ebd39ba647e06528361c3ddac5765b1c5ee7dc |
24-May-2012 |
The Android Automerger <android-build@android.com> |
merge in nakasi-factoryrom-release history after reset to jb-dev
|
ef27e4239a091d735abc2760091ce42d54f58703 |
24-May-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am fe1ade17: Reconcile with jb-release nakasi-factoryrom-release * commit 'fe1ade179e5285178c691b5b397d59a8d927d0e4':
|
106fd1dd6d8041f40e650d89807776045971be85 |
24-May-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am fe1ade17: Reconcile with jb-release nakasi-factoryrom-release * commit 'fe1ade179e5285178c691b5b397d59a8d927d0e4':
|
aef2ba94e49f3233ab7dae90dc5634748e5a15e1 |
24-May-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am fe1ade17: Reconcile with jb-release nakasi-factoryrom-release * commit 'fe1ade179e5285178c691b5b397d59a8d927d0e4':
|
b9ae66c0b663c461fdaac8c763c9e1eab2cb4509 |
24-May-2012 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with jb-release nakasi-factoryrom-release Change-Id: Ica8aa2dd8cbd2b5ac3dcdd4dc1f277394076f75f
|
5126bbe0f33c813a10077b39f9ae43b0cbd9592b |
24-May-2012 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with jb-release nakasi-factoryrom-release Change-Id: Ica8aa2dd8cbd2b5ac3dcdd4dc1f277394076f75f
|
fe1ade179e5285178c691b5b397d59a8d927d0e4 |
24-May-2012 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with jb-release nakasi-factoryrom-release Change-Id: Ica8aa2dd8cbd2b5ac3dcdd4dc1f277394076f75f
|
80dc5dd3cd5e2f7a301373bbf2ab776f9a71f4ce |
24-May-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to jb-dev
|
d0811fce039e8ce2f134182c3fbe42cb932d0f68 |
24-May-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to jb-dev
|
dcfe4ba638eea9b1b58f0f39de17ae2676c25d2e |
24-May-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to jb-dev
|
cd0f9a9557def0d8eb0fc599c203dcaf46451773 |
23-May-2012 |
Christian Robertson <robertsonc@google.com> |
am 0d7cd057: am 83bb96be: Merge "Updating launcher icon to fix alignment. Bug: 6511716" into jb-dev * commit '0d7cd0570cbe29c5f1f38d3d6ab88f4484913838': Updating launcher icon to fix alignment. Bug: 6511716
|
b1731ddcaee74f13575c5a6a27be7361ebd9a5df |
23-May-2012 |
Christian Robertson <robertsonc@google.com> |
am 0d7cd057: am 83bb96be: Merge "Updating launcher icon to fix alignment. Bug: 6511716" into jb-dev * commit '0d7cd0570cbe29c5f1f38d3d6ab88f4484913838': Updating launcher icon to fix alignment. Bug: 6511716
|
d2ff30ca491073a04eb22cd2e0f64bb6f936e527 |
23-May-2012 |
Christian Robertson <robertsonc@google.com> |
am 83bb96be: Merge "Updating launcher icon to fix alignment. Bug: 6511716" into jb-dev * commit '83bb96be9e602ed81c03cbb48e20471ebb235d25': Updating launcher icon to fix alignment. Bug: 6511716
|
0d7cd0570cbe29c5f1f38d3d6ab88f4484913838 |
23-May-2012 |
Christian Robertson <robertsonc@google.com> |
am 83bb96be: Merge "Updating launcher icon to fix alignment. Bug: 6511716" into jb-dev * commit '83bb96be9e602ed81c03cbb48e20471ebb235d25': Updating launcher icon to fix alignment. Bug: 6511716
|
ba89d7be061d7b7a64ef411117774cde058afdf1 |
23-May-2012 |
Christian Robertson <robertsonc@google.com> |
Merge "Updating launcher icon to fix alignment. Bug: 6511716" into jb-dev
|
83bb96be9e602ed81c03cbb48e20471ebb235d25 |
23-May-2012 |
Christian Robertson <robertsonc@google.com> |
Merge "Updating launcher icon to fix alignment. Bug: 6511716" into jb-dev
|
b3e4e9cef5bf37cc67c1eb91520881bc2cc6bd9c |
23-May-2012 |
Christian Robertson <robertsonc@google.com> |
Updating launcher icon to fix alignment. Bug: 6511716 Change-Id: Icf1ab8d7cce0217717db3044366280248e093a86
es/mipmap-hdpi/ic_launcher_gallery.png
es/mipmap-mdpi/ic_launcher_gallery.png
|
2ecf995abdf978fa2e1683daea936b0c19fd0f1b |
23-May-2012 |
Christian Robertson <robertsonc@google.com> |
Updating launcher icon to fix alignment. Bug: 6511716 Change-Id: Icf1ab8d7cce0217717db3044366280248e093a86
es/mipmap-hdpi/ic_launcher_gallery.png
es/mipmap-mdpi/ic_launcher_gallery.png
|
6b0b9c9617e462edb9750fb96f0e1ed558ccb6af |
23-May-2012 |
Wei Huang <weih@google.com> |
am 9c208d30: am 4608195e: Merge "Fix 6519765 Ghosting is seen when hiding the actionbar in fullscreen video playback mode b:6519765" into jb-dev * commit '9c208d30b74d23cf2e194054e76a7161e0fd0771': Fix 6519765 Ghosting is seen when hiding the actionbar in fullscreen video playback mode b:6519765
|
01872be093626e96f7b4413b58444eccf7660aae |
23-May-2012 |
Wei Huang <weih@google.com> |
am 9c208d30: am 4608195e: Merge "Fix 6519765 Ghosting is seen when hiding the actionbar in fullscreen video playback mode b:6519765" into jb-dev * commit '9c208d30b74d23cf2e194054e76a7161e0fd0771': Fix 6519765 Ghosting is seen when hiding the actionbar in fullscreen video playback mode b:6519765
|
82576a89a0e19436838b852d8ab60db5ae5625b3 |
23-May-2012 |
Wei Huang <weih@google.com> |
am 4608195e: Merge "Fix 6519765 Ghosting is seen when hiding the actionbar in fullscreen video playback mode b:6519765" into jb-dev * commit '4608195e1c3f29a15fb61a8f3cd0797af9dbc938': Fix 6519765 Ghosting is seen when hiding the actionbar in fullscreen video playback mode b:6519765
|
9c208d30b74d23cf2e194054e76a7161e0fd0771 |
23-May-2012 |
Wei Huang <weih@google.com> |
am 4608195e: Merge "Fix 6519765 Ghosting is seen when hiding the actionbar in fullscreen video playback mode b:6519765" into jb-dev * commit '4608195e1c3f29a15fb61a8f3cd0797af9dbc938': Fix 6519765 Ghosting is seen when hiding the actionbar in fullscreen video playback mode b:6519765
|
edef8e44a8645da8149d94198d69cac92d395c7c |
23-May-2012 |
Yuli Huang <yuli@google.com> |
am e8340d42: am 2ea599ae: Merge "Back should progress through Gallery and return Home for widget intents." into jb-dev * commit 'e8340d42618e4595a20181517c8e49143e6d6d5d': Back should progress through Gallery and return Home for widget intents.
|
b5d6a1c0abbc001885690b49a3e57d24f0e2ece3 |
23-May-2012 |
Yuli Huang <yuli@google.com> |
am e8340d42: am 2ea599ae: Merge "Back should progress through Gallery and return Home for widget intents." into jb-dev * commit 'e8340d42618e4595a20181517c8e49143e6d6d5d': Back should progress through Gallery and return Home for widget intents.
|
8a6d85511e9928f1cac00276b5c9466b30684b0c |
23-May-2012 |
Yuli Huang <yuli@google.com> |
am 2ea599ae: Merge "Back should progress through Gallery and return Home for widget intents." into jb-dev * commit '2ea599aee03d431af770fb39e83d7a93a66b2ac0': Back should progress through Gallery and return Home for widget intents.
|
e8340d42618e4595a20181517c8e49143e6d6d5d |
23-May-2012 |
Yuli Huang <yuli@google.com> |
am 2ea599ae: Merge "Back should progress through Gallery and return Home for widget intents." into jb-dev * commit '2ea599aee03d431af770fb39e83d7a93a66b2ac0': Back should progress through Gallery and return Home for widget intents.
|
7adc57932ded45f3d64fa1d70a59968b6600d2ad |
23-May-2012 |
Wei Huang <weih@google.com> |
Merge "Fix 6519765 Ghosting is seen when hiding the actionbar in fullscreen video playback mode b:6519765" into jb-dev
|
4608195e1c3f29a15fb61a8f3cd0797af9dbc938 |
23-May-2012 |
Wei Huang <weih@google.com> |
Merge "Fix 6519765 Ghosting is seen when hiding the actionbar in fullscreen video playback mode b:6519765" into jb-dev
|
520ba66194c822a63b23f93976ed6640127b5730 |
23-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
am aa8fecd7: am 835bc683: Merge "Remove the background in MovieActivity." into jb-dev * commit 'aa8fecd75109807c8242a77d7563ec1cc138f92d': Remove the background in MovieActivity.
|
1f43aed289b1e8ac74fabdb142d22edf8c1d5ccd |
23-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
am aa8fecd7: am 835bc683: Merge "Remove the background in MovieActivity." into jb-dev * commit 'aa8fecd75109807c8242a77d7563ec1cc138f92d': Remove the background in MovieActivity.
|
0512090c594cbce08eb02c327c71167a89ffbe24 |
23-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
am 8c33b5f9: am 6673c212: Merge "Put a black View in front of SurfaceView." into jb-dev * commit '8c33b5f9782d95f6cc3b163485a2cc2c846ca74d': Put a black View in front of SurfaceView.
|
256b4da154c1ecab07d034f57d8bb13e4cec846f |
23-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
am 8c33b5f9: am 6673c212: Merge "Put a black View in front of SurfaceView." into jb-dev * commit '8c33b5f9782d95f6cc3b163485a2cc2c846ca74d': Put a black View in front of SurfaceView.
|
4d21eadfbe6e705585cb7b7fe796a3b601fcf0da |
23-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
am 8c33b5f9: am 6673c212: Merge "Put a black View in front of SurfaceView." into jb-dev * commit '8c33b5f9782d95f6cc3b163485a2cc2c846ca74d': Put a black View in front of SurfaceView.
|
7bd8d1db664a65fe4ce500f8d96edbb329120857 |
23-May-2012 |
Yuli Huang <yuli@google.com> |
Merge "Back should progress through Gallery and return Home for widget intents." into jb-dev
|
2ea599aee03d431af770fb39e83d7a93a66b2ac0 |
23-May-2012 |
Yuli Huang <yuli@google.com> |
Merge "Back should progress through Gallery and return Home for widget intents." into jb-dev
|
a8c61cc2f814b6165ad3e1c6a18e39eb88873657 |
23-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
am 835bc683: Merge "Remove the background in MovieActivity." into jb-dev * commit '835bc6835d42009999536f509ed1dd2f5359cf9b': Remove the background in MovieActivity.
|
aa8fecd75109807c8242a77d7563ec1cc138f92d |
23-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
am 835bc683: Merge "Remove the background in MovieActivity." into jb-dev * commit '835bc6835d42009999536f509ed1dd2f5359cf9b': Remove the background in MovieActivity.
|
763c15401ef16431157d8f37873f2896ee5005a8 |
23-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
am 6673c212: Merge "Put a black View in front of SurfaceView." into jb-dev * commit '6673c21275772af55c9ae72cd78cbbe710edc023': Put a black View in front of SurfaceView.
|
154fe67e4df8cd24ad45a32953b6876cc74fd291 |
23-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
am 6673c212: Merge "Put a black View in front of SurfaceView." into jb-dev * commit '6673c21275772af55c9ae72cd78cbbe710edc023': Put a black View in front of SurfaceView.
|
8c33b5f9782d95f6cc3b163485a2cc2c846ca74d |
23-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
am 6673c212: Merge "Put a black View in front of SurfaceView." into jb-dev * commit '6673c21275772af55c9ae72cd78cbbe710edc023': Put a black View in front of SurfaceView.
|
527422cf0c871460d050f7935f594620f64397fc |
23-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
Merge "Remove the background in MovieActivity." into jb-dev
|
835bc6835d42009999536f509ed1dd2f5359cf9b |
23-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
Merge "Remove the background in MovieActivity." into jb-dev
|
0b1cd254da3a9f413686c93f931f221ccdcae591 |
23-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
Merge "Put a black View in front of SurfaceView." into jb-dev
|
3066fecc8500acba68b35e8a4d5804405ae863d9 |
23-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
Merge "Put a black View in front of SurfaceView." into jb-dev
|
6673c21275772af55c9ae72cd78cbbe710edc023 |
23-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
Merge "Put a black View in front of SurfaceView." into jb-dev
|
5d53689cb1cb837985c2737557903f2a2af7c3d8 |
23-May-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to jb-dev
|
9459b1556e2122298fb0b51e0165d3cce4f7b742 |
23-May-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to jb-dev
|
b15c049553d4d0db53fce185fb867ed75a77efed |
23-May-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to jb-dev
|
e1e712d28efea7b55e225c660e855e507594a990 |
22-May-2012 |
Ray Chen <raychen@google.com> |
Fix 6519765 Ghosting is seen when hiding the actionbar in fullscreen video playback mode b:6519765 Ensure SYSTEM_UI_FLAG_LAYOUT_STABLE and SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN is set in all states so ActionBarOverlayLayout can response to fitSystemWindows and onSystemVisibilityChange correctly. Change-Id: I41a33c9e7d21243bde6fa64e6cd1b709e7b04203
rc/com/android/gallery3d/app/MoviePlayer.java
|
24525c28e4c8b4432831b4a2bdb3806017b7772b |
22-May-2012 |
Ray Chen <raychen@google.com> |
Fix 6519765 Ghosting is seen when hiding the actionbar in fullscreen video playback mode b:6519765 Ensure SYSTEM_UI_FLAG_LAYOUT_STABLE and SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN is set in all states so ActionBarOverlayLayout can response to fitSystemWindows and onSystemVisibilityChange correctly. Change-Id: I41a33c9e7d21243bde6fa64e6cd1b709e7b04203
rc/com/android/gallery3d/app/MoviePlayer.java
|
e11a51883b91f5fd439c99562e85ff4374d61467 |
23-May-2012 |
Yuli Huang <yuli@google.com> |
Back should progress through Gallery and return Home for widget intents. bug:6384492 Change-Id: I7ffb824568e400ff5724a29c1908c34a1e10235c
rc/com/android/gallery3d/app/Gallery.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/gadget/WidgetClickHandler.java
|
54fe6202b6f7d233e7645c121321fe0f3d20fc8b |
23-May-2012 |
Yuli Huang <yuli@google.com> |
Back should progress through Gallery and return Home for widget intents. bug:6384492 Change-Id: I7ffb824568e400ff5724a29c1908c34a1e10235c
rc/com/android/gallery3d/app/Gallery.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/gadget/WidgetClickHandler.java
|
8f3c2a770d1877ea882a8b97b1f39bfd492d3cfe |
22-May-2012 |
Owen Lin <owenlin@google.com> |
Remove the background in MovieActivity. This is a regression. We add the background for bug 6494653. So we need to remove it in MovieActivity as well. bug:6491674 Change-Id: I6fb692fa778a1200ffbed741ca0996cb7eeef32f
rc/com/android/gallery3d/app/MovieActivity.java
|
5dd57a27b013e5019d727d8badb604f319222ddf |
22-May-2012 |
Owen Lin <owenlin@google.com> |
Remove the background in MovieActivity. This is a regression. We add the background for bug 6494653. So we need to remove it in MovieActivity as well. bug:6491674 Change-Id: I6fb692fa778a1200ffbed741ca0996cb7eeef32f
rc/com/android/gallery3d/app/MovieActivity.java
|
30ffcd20bb0cfe55862fbe78f49d1f84b26770a7 |
23-May-2012 |
Wei Huang <weih@google.com> |
am 390da9c5: am 13188c88: Merge "Fix 6259517 "0 images / videos available" toast is displayed in gallery on launch though it has images / videos" into jb-dev * commit '390da9c54201b3caddd26c60751fff9b103cd8eb': Fix 6259517 "0 images / videos available" toast is displayed in gallery on launch though it has images / videos
|
a184a9a485a2b56a595f21270e172179c4528932 |
23-May-2012 |
Wei Huang <weih@google.com> |
am 390da9c5: am 13188c88: Merge "Fix 6259517 "0 images / videos available" toast is displayed in gallery on launch though it has images / videos" into jb-dev * commit '390da9c54201b3caddd26c60751fff9b103cd8eb': Fix 6259517 "0 images / videos available" toast is displayed in gallery on launch though it has images / videos
|
49f9488f8ea38c1838823a076d5b42d4fa97dbcf |
23-May-2012 |
Wei Huang <weih@google.com> |
am 390da9c5: am 13188c88: Merge "Fix 6259517 "0 images / videos available" toast is displayed in gallery on launch though it has images / videos" into jb-dev * commit '390da9c54201b3caddd26c60751fff9b103cd8eb': Fix 6259517 "0 images / videos available" toast is displayed in gallery on launch though it has images / videos
|
13e7d5b043bdee019a465c5bad6d63e39ebd6ffd |
23-May-2012 |
Wei Huang <weih@google.com> |
am 4dbce842: am 96b012c8: Merge "Recycle textures when we don\'t need them." into jb-dev * commit '4dbce8423245ff34c47178480d81587f0e27efbe': Recycle textures when we don't need them.
|
09009ceb63a56fbc8ba7aeabc197e142f72b334b |
23-May-2012 |
Wei Huang <weih@google.com> |
am 4dbce842: am 96b012c8: Merge "Recycle textures when we don\'t need them." into jb-dev * commit '4dbce8423245ff34c47178480d81587f0e27efbe': Recycle textures when we don't need them.
|
2c8bccb902a01a860e75e5fa41d31139836acc32 |
23-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
am c3114525: am e6251df0: Unlock orientation only when action bar is needed. * commit 'c3114525c778471e8946567aeb02535aec8a24a9': Unlock orientation only when action bar is needed.
|
e52cf95bb459e51711eaef71a2e3415944d02e5c |
23-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
am c3114525: am e6251df0: Unlock orientation only when action bar is needed. * commit 'c3114525c778471e8946567aeb02535aec8a24a9': Unlock orientation only when action bar is needed.
|
82872d7605fa854bd2a244be1da5d67e15f67f67 |
23-May-2012 |
Wei Huang <weih@google.com> |
am 13188c88: Merge "Fix 6259517 "0 images / videos available" toast is displayed in gallery on launch though it has images / videos" into jb-dev * commit '13188c884a93f6086cbf4e860fb6dfcbc44c6e13': Fix 6259517 "0 images / videos available" toast is displayed in gallery on launch though it has images / videos
|
536bc5ad662b0a982d22a29a8f19f0fac1c3be60 |
23-May-2012 |
Wei Huang <weih@google.com> |
am 13188c88: Merge "Fix 6259517 "0 images / videos available" toast is displayed in gallery on launch though it has images / videos" into jb-dev * commit '13188c884a93f6086cbf4e860fb6dfcbc44c6e13': Fix 6259517 "0 images / videos available" toast is displayed in gallery on launch though it has images / videos
|
390da9c54201b3caddd26c60751fff9b103cd8eb |
23-May-2012 |
Wei Huang <weih@google.com> |
am 13188c88: Merge "Fix 6259517 "0 images / videos available" toast is displayed in gallery on launch though it has images / videos" into jb-dev * commit '13188c884a93f6086cbf4e860fb6dfcbc44c6e13': Fix 6259517 "0 images / videos available" toast is displayed in gallery on launch though it has images / videos
|
1d306766046b5336d59d82c3c82f8ae6bd12cec0 |
23-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
Put a black View in front of SurfaceView. This prevents SurfaceView from being transparent before the first draw. Bug: 6507478 Change-Id: I2170f23d4c9844bfc3854d6120f5e72cc0d591ca
es/layout/cropimage.xml
es/layout/dialog_picker.xml
es/layout/gl_root_group.xml
es/layout/main.xml
|
43edc9c33da294f3b5b97e55a58f5fd608d6209d |
23-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
Put a black View in front of SurfaceView. This prevents SurfaceView from being transparent before the first draw. Bug: 6507478 Change-Id: I2170f23d4c9844bfc3854d6120f5e72cc0d591ca
rc/com/android/gallery3d/ui/GLRootView.java
|
edada7ca2b7c70c5459cbe488c1a16cc186f2bf0 |
23-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
Put a black View in front of SurfaceView. This prevents SurfaceView from being transparent before the first draw. Bug: 6507478 Change-Id: I2170f23d4c9844bfc3854d6120f5e72cc0d591ca
es/layout/cropimage.xml
es/layout/dialog_picker.xml
es/layout/gl_root_group.xml
es/layout/main.xml
rc/com/android/gallery3d/ui/GLRootView.java
|
f9d0c61e3aafcd3d7df3d64ee7d7fe61dc7d738d |
23-May-2012 |
Wei Huang <weih@google.com> |
am 96b012c8: Merge "Recycle textures when we don\'t need them." into jb-dev * commit '96b012c84436c776fe515f7d70eb4f8f309ce38a': Recycle textures when we don't need them.
|
4dbce8423245ff34c47178480d81587f0e27efbe |
23-May-2012 |
Wei Huang <weih@google.com> |
am 96b012c8: Merge "Recycle textures when we don\'t need them." into jb-dev * commit '96b012c84436c776fe515f7d70eb4f8f309ce38a': Recycle textures when we don't need them.
|
3a7e56ec9a8176d00511dfdc2ccfd64da78d543d |
23-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
am e6251df0: Unlock orientation only when action bar is needed. * commit 'e6251df06f0b3c8f556043f8b725b4b19be7474d': Unlock orientation only when action bar is needed.
|
c3114525c778471e8946567aeb02535aec8a24a9 |
23-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
am e6251df0: Unlock orientation only when action bar is needed. * commit 'e6251df06f0b3c8f556043f8b725b4b19be7474d': Unlock orientation only when action bar is needed.
|
13188c884a93f6086cbf4e860fb6dfcbc44c6e13 |
23-May-2012 |
Wei Huang <weih@google.com> |
Merge "Fix 6259517 "0 images / videos available" toast is displayed in gallery on launch though it has images / videos" into jb-dev
|
883920dce45c1794a8aa6a696563df1bbafeaf45 |
23-May-2012 |
Wei Huang <weih@google.com> |
Merge "Fix 6259517 "0 images / videos available" toast is displayed in gallery on launch though it has images / videos" into jb-dev
|
4a69011efe35e1df830008630b1055ad23ae8176 |
23-May-2012 |
Wei Huang <weih@google.com> |
Merge "Recycle textures when we don't need them." into jb-dev
|
96b012c84436c776fe515f7d70eb4f8f309ce38a |
23-May-2012 |
Wei Huang <weih@google.com> |
Merge "Recycle textures when we don't need them." into jb-dev
|
d266a1a63c0a58e8d9824d32f5c01e45835523a0 |
16-May-2012 |
Ray Chen <raychen@google.com> |
Fix 6259517 "0 images / videos available" toast is displayed in gallery on launch though it has images / videos And removed sync error toast. Bug: 6259517 Change-Id: Ib7b25176a6db290220661a2e98e4e031043201d9
es/values/strings.xml
|
e8c1e69f85efb8673d0606f3aca729a366038753 |
16-May-2012 |
Ray Chen <raychen@google.com> |
Fix 6259517 "0 images / videos available" toast is displayed in gallery on launch though it has images / videos And removed sync error toast. Bug: 6259517 Change-Id: Ib7b25176a6db290220661a2e98e4e031043201d9
es/values/strings.xml
rc/com/android/gallery3d/app/AlbumPage.java
rc/com/android/gallery3d/app/AlbumSetDataLoader.java
rc/com/android/gallery3d/app/AlbumSetPage.java
rc/com/android/gallery3d/data/ComboAlbumSet.java
rc/com/android/gallery3d/data/LocalAlbumSet.java
rc/com/android/gallery3d/data/MediaSet.java
rc/com/android/gallery3d/data/MtpDeviceSet.java
|
0b920dba5d7452132f51c322e4a8282a1f73aac0 |
16-May-2012 |
Ray Chen <raychen@google.com> |
Fix 6259517 "0 images / videos available" toast is displayed in gallery on launch though it has images / videos And removed sync error toast. Bug: 6259517 Change-Id: Ib7b25176a6db290220661a2e98e4e031043201d9
rc/com/android/gallery3d/app/AlbumPage.java
rc/com/android/gallery3d/app/AlbumSetDataLoader.java
rc/com/android/gallery3d/app/AlbumSetPage.java
rc/com/android/gallery3d/data/ComboAlbumSet.java
rc/com/android/gallery3d/data/LocalAlbumSet.java
rc/com/android/gallery3d/data/MediaSet.java
rc/com/android/gallery3d/data/MtpDeviceSet.java
|
b9e6e7f1dffe3d4e4736ed67a323f11a174afbb1 |
22-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
Unlock orientation only when action bar is needed. Bug: 6482079 Change-Id: I75d96ca7957f80e9c52f35edf74127f82f194f63
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/ui/PhotoView.java
rc/com/android/gallery3d/ui/PositionController.java
|
e6251df06f0b3c8f556043f8b725b4b19be7474d |
22-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
Unlock orientation only when action bar is needed. Bug: 6482079 Change-Id: I75d96ca7957f80e9c52f35edf74127f82f194f63
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/ui/PhotoView.java
rc/com/android/gallery3d/ui/PositionController.java
|
c64d08694f22ad3ba6f5e29b78ad4da83c42bf09 |
22-May-2012 |
Owen Lin <owenlin@google.com> |
Recycle textures when we don't need them. bug: 6307447 Change-Id: Id0c1abab54e1fbb75364dffda9f1f72d6b39310b
rc/com/android/gallery3d/ui/AlbumSetSlidingWindow.java
rc/com/android/gallery3d/ui/AlbumSetSlotRenderer.java
rc/com/android/gallery3d/ui/AlbumSlidingWindow.java
rc/com/android/gallery3d/ui/AlbumSlotRenderer.java
rc/com/android/gallery3d/ui/FadeOutTexture.java
rc/com/android/gallery3d/ui/FadeTexture.java
|
3535d67239b1b1e4ee038f39dece64545b78f2ed |
22-May-2012 |
Owen Lin <owenlin@google.com> |
Recycle textures when we don't need them. bug: 6307447 Change-Id: Id0c1abab54e1fbb75364dffda9f1f72d6b39310b
rc/com/android/gallery3d/ui/AlbumSetSlidingWindow.java
rc/com/android/gallery3d/ui/AlbumSetSlotRenderer.java
rc/com/android/gallery3d/ui/AlbumSlidingWindow.java
rc/com/android/gallery3d/ui/AlbumSlotRenderer.java
rc/com/android/gallery3d/ui/FadeOutTexture.java
rc/com/android/gallery3d/ui/FadeTexture.java
|
48deb2a2378d556166aed160f112dbf950100ec5 |
23-May-2012 |
Owen Lin <owenlin@google.com> |
am 686a77c5: am 5c64aba0: Fix build. * commit '686a77c5af59bded2079b753da98617a12ddd4ae': Fix build.
|
6750aeb3c54d0178651492c7667401ffc7125ed0 |
23-May-2012 |
Owen Lin <owenlin@google.com> |
am 686a77c5: am 5c64aba0: Fix build. * commit '686a77c5af59bded2079b753da98617a12ddd4ae': Fix build.
|
6462a53680a2b5cdd048893373f55a28769ae330 |
23-May-2012 |
Owen Lin <owenlin@google.com> |
am 5c64aba0: Fix build. * commit '5c64aba0315281a67894b7d772e128e0bb6bea01': Fix build.
|
686a77c5af59bded2079b753da98617a12ddd4ae |
23-May-2012 |
Owen Lin <owenlin@google.com> |
am 5c64aba0: Fix build. * commit '5c64aba0315281a67894b7d772e128e0bb6bea01': Fix build.
|
048ca675a9e659fb0d3b150880d71cd42770023d |
23-May-2012 |
Owen Lin <owenlin@google.com> |
Fix build. Change-Id: Ied20eb41fcae52f40f319adb0fbbfad4d94e3019
ests/src/com/android/gallery3d/ui/TextureTest.java
|
5c64aba0315281a67894b7d772e128e0bb6bea01 |
23-May-2012 |
Owen Lin <owenlin@google.com> |
Fix build. Change-Id: Ied20eb41fcae52f40f319adb0fbbfad4d94e3019
ests/src/com/android/gallery3d/ui/TextureTest.java
|
bfdd45f0046c1620a112cd54519140c744385c91 |
22-May-2012 |
Owen Lin <owenlin@google.com> |
am 22ec75f7: am 37c60594: Add a new state uploading to UploadedTexture. * commit '22ec75f7ab93636a21fc7549f9f64004875c9f51': Add a new state uploading to UploadedTexture.
|
735b7fa6ec6d69f8c922539d6ab7e0668e183633 |
22-May-2012 |
Owen Lin <owenlin@google.com> |
am 22ec75f7: am 37c60594: Add a new state uploading to UploadedTexture. * commit '22ec75f7ab93636a21fc7549f9f64004875c9f51': Add a new state uploading to UploadedTexture.
|
5ff511298b148368719b729e8786dc5e4d37c856 |
22-May-2012 |
Owen Lin <owenlin@google.com> |
am 37c60594: Add a new state uploading to UploadedTexture. * commit '37c605949219b8bf54c165c34d6405f5f2989f50': Add a new state uploading to UploadedTexture.
|
22ec75f7ab93636a21fc7549f9f64004875c9f51 |
22-May-2012 |
Owen Lin <owenlin@google.com> |
am 37c60594: Add a new state uploading to UploadedTexture. * commit '37c605949219b8bf54c165c34d6405f5f2989f50': Add a new state uploading to UploadedTexture.
|
5fbbc83e7e0b307683ac1203c310b9d5d5e77361 |
22-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
am a2b4f8ba: am e919bcff: Hide status bar in lights out mode. * commit 'a2b4f8ba73013a3300470586f653ac55153c3304': Hide status bar in lights out mode.
|
d0f9bd65039d8839b55108587a4cc29e04e9ac04 |
22-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
am a2b4f8ba: am e919bcff: Hide status bar in lights out mode. * commit 'a2b4f8ba73013a3300470586f653ac55153c3304': Hide status bar in lights out mode.
|
68386e085d3e2338be74996ff99672ff849467cb |
18-May-2012 |
Owen Lin <owenlin@google.com> |
Add a new state uploading to UploadedTexture. This state means the texture is being uploaded in background and should not be drawn now to prevent janking. Sometimes, we may lose GLContext and we will need to reupload textures again. In this case, we would like to upload these texture in foreground instead of using TextureUploader. (for simplicity since this won't happen too often). bug: 6519344 Change-Id: Ic5d7547c6a0eb4b044b79aa0eb4eb52397faac03
rc/com/android/gallery3d/app/AlbumPage.java
rc/com/android/gallery3d/ui/AlbumSetSlotRenderer.java
rc/com/android/gallery3d/ui/AlbumSlotRenderer.java
rc/com/android/gallery3d/ui/BasicTexture.java
rc/com/android/gallery3d/ui/ExtTexture.java
rc/com/android/gallery3d/ui/GLCanvasImpl.java
rc/com/android/gallery3d/ui/GLRootView.java
rc/com/android/gallery3d/ui/NinePatchTexture.java
rc/com/android/gallery3d/ui/PhotoFallbackEffect.java
rc/com/android/gallery3d/ui/PhotoView.java
rc/com/android/gallery3d/ui/RawTexture.java
rc/com/android/gallery3d/ui/TextureUploader.java
rc/com/android/gallery3d/ui/TileImageView.java
rc/com/android/gallery3d/ui/UploadedTexture.java
ests/src/com/android/gallery3d/ui/TextureTest.java
|
37c605949219b8bf54c165c34d6405f5f2989f50 |
18-May-2012 |
Owen Lin <owenlin@google.com> |
Add a new state uploading to UploadedTexture. This state means the texture is being uploaded in background and should not be drawn now to prevent janking. Sometimes, we may lose GLContext and we will need to reupload textures again. In this case, we would like to upload these texture in foreground instead of using TextureUploader. (for simplicity since this won't happen too often). bug: 6519344 Change-Id: Ic5d7547c6a0eb4b044b79aa0eb4eb52397faac03
rc/com/android/gallery3d/app/AlbumPage.java
rc/com/android/gallery3d/ui/AlbumSetSlotRenderer.java
rc/com/android/gallery3d/ui/AlbumSlotRenderer.java
rc/com/android/gallery3d/ui/BasicTexture.java
rc/com/android/gallery3d/ui/ExtTexture.java
rc/com/android/gallery3d/ui/GLCanvasImpl.java
rc/com/android/gallery3d/ui/GLRootView.java
rc/com/android/gallery3d/ui/NinePatchTexture.java
rc/com/android/gallery3d/ui/PhotoFallbackEffect.java
rc/com/android/gallery3d/ui/PhotoView.java
rc/com/android/gallery3d/ui/RawTexture.java
rc/com/android/gallery3d/ui/TextureUploader.java
rc/com/android/gallery3d/ui/TileImageView.java
rc/com/android/gallery3d/ui/UploadedTexture.java
ests/src/com/android/gallery3d/ui/TextureTest.java
|
d8c3678ec8bb0a8d2ee943019cede892e2fe867b |
22-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
am e919bcff: Hide status bar in lights out mode. * commit 'e919bcff63e898d53869725a979cdfd01ef92b08': Hide status bar in lights out mode.
|
a2b4f8ba73013a3300470586f653ac55153c3304 |
22-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
am e919bcff: Hide status bar in lights out mode. * commit 'e919bcff63e898d53869725a979cdfd01ef92b08': Hide status bar in lights out mode.
|
c68428f3d7cb145e8613115984644e1c1c9aa87f |
22-May-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am 4bbf4952: Reconcile with jb-release * commit '4bbf4952c6cf747f4151917fe0ecdd9800c4168d': Limit the size of a ScreenNail.
|
34d653f66b290e4e9e4eadc614e8c86015bafe22 |
22-May-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am 4bbf4952: Reconcile with jb-release * commit '4bbf4952c6cf747f4151917fe0ecdd9800c4168d': Limit the size of a ScreenNail.
|
83023abc129db57aa7805f5928d6814cbeb4262f |
22-May-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am 4bbf4952: Reconcile with jb-release * commit '4bbf4952c6cf747f4151917fe0ecdd9800c4168d': Limit the size of a ScreenNail.
|
d23dce36e993e33b764a2ee11810fa983be0210a |
22-May-2012 |
Owen Lin <owenlin@google.com> |
am 60728ce6: am c2c0b01f: Reuse bitmap to prevent GC in TiledImageView. * commit '60728ce686325511615983f6a047da65445a247a': Reuse bitmap to prevent GC in TiledImageView.
|
d64158a8e2188f219324eb1aec19dcbe7380c80e |
22-May-2012 |
Owen Lin <owenlin@google.com> |
am 60728ce6: am c2c0b01f: Reuse bitmap to prevent GC in TiledImageView. * commit '60728ce686325511615983f6a047da65445a247a': Reuse bitmap to prevent GC in TiledImageView.
|
9fe30ebdf52f03de992526073e098e3af25b042d |
22-May-2012 |
The Android Automerger <android-build@android.com> |
merge in nakasi-factoryrom-release history after reset to jb-dev
|
ba90187c98998b3bdbff076dbfc45bbddbd15146 |
22-May-2012 |
The Android Automerger <android-build@android.com> |
merge in nakasi-factoryrom-release history after reset to jb-dev
|
822f077ca5ffb0bfae9a59dfa139f48b4ae60e46 |
22-May-2012 |
The Android Automerger <android-build@android.com> |
merge in nakasi-factoryrom-release history after reset to jb-dev
|
fc63aa5e3840a0a786fe7f59b6d291d7bbd4cd93 |
22-May-2012 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with jb-release Change-Id: Iab183513b82663ccd910b17a5c985db9e1a3f04a
|
71faaead1ca846ab3f68bd731da3308ced7aa6bf |
22-May-2012 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with jb-release Change-Id: Iab183513b82663ccd910b17a5c985db9e1a3f04a
|
4bbf4952c6cf747f4151917fe0ecdd9800c4168d |
22-May-2012 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with jb-release Change-Id: Iab183513b82663ccd910b17a5c985db9e1a3f04a
|
d0eabeec017489d907b0c7a70d8d0859414c9350 |
22-May-2012 |
Owen Lin <owenlin@google.com> |
Limit the size of a ScreenNail. bug:6528366 This bug was happened because we are trying to make a texture beyond the max size allowed in GL. Here is what we do in this CL: 1. Limit the size of a screen nail 2. Print warning message, if we try to allocate a texture beyond the size 3. Don't show fall-back animation if the image is not loaded yet. Change-Id: I004b1138efd0eef7ba11aa89556f67743ca46745
rc/com/android/gallery3d/app/PhotoDataAdapter.java
rc/com/android/gallery3d/ui/BasicTexture.java
rc/com/android/gallery3d/ui/BitmapScreenNail.java
rc/com/android/gallery3d/ui/GLRootView.java
rc/com/android/gallery3d/ui/PhotoView.java
|
26be5cc3130f273dcb8c79a024a3df43d5ce9e60 |
22-May-2012 |
Owen Lin <owenlin@google.com> |
Limit the size of a ScreenNail. bug:6528366 This bug was happened because we are trying to make a texture beyond the max size allowed in GL. Here is what we do in this CL: 1. Limit the size of a screen nail 2. Print warning message, if we try to allocate a texture beyond the size 3. Don't show fall-back animation if the image is not loaded yet. Change-Id: I004b1138efd0eef7ba11aa89556f67743ca46745
rc/com/android/gallery3d/app/PhotoDataAdapter.java
rc/com/android/gallery3d/ui/BasicTexture.java
rc/com/android/gallery3d/ui/BitmapScreenNail.java
rc/com/android/gallery3d/ui/GLRootView.java
rc/com/android/gallery3d/ui/PhotoView.java
|
395f37474e02c623ab64bcc6d4d470dc75e0a8fa |
22-May-2012 |
Owen Lin <owenlin@google.com> |
am c2c0b01f: Reuse bitmap to prevent GC in TiledImageView. * commit 'c2c0b01fbbf243eee1a11c33ba6dd1ce918a9ce5': Reuse bitmap to prevent GC in TiledImageView.
|
60728ce686325511615983f6a047da65445a247a |
22-May-2012 |
Owen Lin <owenlin@google.com> |
am c2c0b01f: Reuse bitmap to prevent GC in TiledImageView. * commit 'c2c0b01fbbf243eee1a11c33ba6dd1ce918a9ce5': Reuse bitmap to prevent GC in TiledImageView.
|
c5c5f2558e9ed3bc46a94c5515481b1dac9ffd77 |
22-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
Hide status bar in lights out mode. Bug: 6451200 Change-Id: I6ad5ffc203fd8e6be9191ba13a4a99eb716c4734
rc/com/android/gallery3d/ui/GLRootView.java
|
e919bcff63e898d53869725a979cdfd01ef92b08 |
22-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
Hide status bar in lights out mode. Bug: 6451200 Change-Id: I6ad5ffc203fd8e6be9191ba13a4a99eb716c4734
rc/com/android/gallery3d/ui/GLRootView.java
|
08476ae7099dcb4c65e348474d6abe7e9bb2a150 |
18-May-2012 |
Owen Lin <owenlin@google.com> |
Reuse bitmap to prevent GC in TiledImageView. bug:5948093 Change-Id: Iad89c5809bde0de5409752330f607aab153dceba
rc/com/android/gallery3d/app/PhotoDataAdapter.java
rc/com/android/gallery3d/ui/BitmapTileProvider.java
rc/com/android/gallery3d/ui/TileImageView.java
rc/com/android/gallery3d/ui/TileImageViewAdapter.java
rc/com/android/gallery3d/ui/UploadedTexture.java
|
c2c0b01fbbf243eee1a11c33ba6dd1ce918a9ce5 |
18-May-2012 |
Owen Lin <owenlin@google.com> |
Reuse bitmap to prevent GC in TiledImageView. bug:5948093 Change-Id: Iad89c5809bde0de5409752330f607aab153dceba
rc/com/android/gallery3d/app/PhotoDataAdapter.java
rc/com/android/gallery3d/ui/BitmapTileProvider.java
rc/com/android/gallery3d/ui/TileImageView.java
rc/com/android/gallery3d/ui/TileImageViewAdapter.java
rc/com/android/gallery3d/ui/UploadedTexture.java
|
a0f59b705e8cff5415bf7247b3ed544ced5d3a14 |
22-May-2012 |
Owen Lin <owenlin@google.com> |
am 4176af0d: am 49affdc4: Limit the size of a ScreenNail. * commit '4176af0db4721e95c185617fe89b686c0c833348': Limit the size of a ScreenNail.
|
a8eed01c080ba928a66229647491116a86cfd9d8 |
22-May-2012 |
Owen Lin <owenlin@google.com> |
am 4176af0d: am 49affdc4: Limit the size of a ScreenNail. * commit '4176af0db4721e95c185617fe89b686c0c833348': Limit the size of a ScreenNail.
|
b39b91a0989bef5dd0fe7bfa630ba53eb90de469 |
22-May-2012 |
Owen Lin <owenlin@google.com> |
am 49affdc4: Limit the size of a ScreenNail. * commit '49affdc4e274098a34e4eb2dbe4a89a750f1ba7f': Limit the size of a ScreenNail.
|
4176af0db4721e95c185617fe89b686c0c833348 |
22-May-2012 |
Owen Lin <owenlin@google.com> |
am 49affdc4: Limit the size of a ScreenNail. * commit '49affdc4e274098a34e4eb2dbe4a89a750f1ba7f': Limit the size of a ScreenNail.
|
3bd73388114f851dcb67d1ce38966e4d22fd1d22 |
22-May-2012 |
Owen Lin <owenlin@google.com> |
Limit the size of a ScreenNail. bug:6528366 This bug was happened because we are trying to make a texture beyond the max size allowed in GL. Here is what we do in this CL: 1. Limit the size of a screen nail 2. Print warning message, if we try to allocate a texture beyond the size 3. Don't show fall-back animation if the image is not loaded yet. Change-Id: I004b1138efd0eef7ba11aa89556f67743ca46745
rc/com/android/gallery3d/app/PhotoDataAdapter.java
rc/com/android/gallery3d/ui/BasicTexture.java
rc/com/android/gallery3d/ui/BitmapScreenNail.java
rc/com/android/gallery3d/ui/GLRootView.java
rc/com/android/gallery3d/ui/PhotoView.java
|
49affdc4e274098a34e4eb2dbe4a89a750f1ba7f |
22-May-2012 |
Owen Lin <owenlin@google.com> |
Limit the size of a ScreenNail. bug:6528366 This bug was happened because we are trying to make a texture beyond the max size allowed in GL. Here is what we do in this CL: 1. Limit the size of a screen nail 2. Print warning message, if we try to allocate a texture beyond the size 3. Don't show fall-back animation if the image is not loaded yet. Change-Id: I004b1138efd0eef7ba11aa89556f67743ca46745
rc/com/android/gallery3d/app/PhotoDataAdapter.java
rc/com/android/gallery3d/ui/BasicTexture.java
rc/com/android/gallery3d/ui/BitmapScreenNail.java
rc/com/android/gallery3d/ui/GLRootView.java
rc/com/android/gallery3d/ui/PhotoView.java
|
927ecab100c37c5dacc29a6738cf1d3fb8df9335 |
22-May-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to jb-dev
|
d42fc575814e4135e0b5f339e9b0f21bd9e62de3 |
22-May-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to jb-dev
|
8248b6caa58ae2e3eefa05510858cfae60a56856 |
22-May-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to jb-dev
|
3d3d0f151738c9f27cf2a2b03db06e9d54364c91 |
22-May-2012 |
Ray Chen <raychen@google.com> |
am 09cb288a: am 21c2e665: Fix 6360834 Select All is shown in place of Deselect all option * commit '09cb288a8dfc9cc2b2b451188b5755a144108e90': Fix 6360834 Select All is shown in place of Deselect all option
|
061940ca96fc40ee2a1a997c349fc619d67456de |
22-May-2012 |
Ray Chen <raychen@google.com> |
am 09cb288a: am 21c2e665: Fix 6360834 Select All is shown in place of Deselect all option * commit '09cb288a8dfc9cc2b2b451188b5755a144108e90': Fix 6360834 Select All is shown in place of Deselect all option
|
d947491c00614f412cb2fb37537771b102037809 |
22-May-2012 |
Ray Chen <raychen@google.com> |
am 21c2e665: Fix 6360834 Select All is shown in place of Deselect all option * commit '21c2e665fdc1d1af0c91ab9c104d13fb7dc2444e': Fix 6360834 Select All is shown in place of Deselect all option
|
09cb288a8dfc9cc2b2b451188b5755a144108e90 |
22-May-2012 |
Ray Chen <raychen@google.com> |
am 21c2e665: Fix 6360834 Select All is shown in place of Deselect all option * commit '21c2e665fdc1d1af0c91ab9c104d13fb7dc2444e': Fix 6360834 Select All is shown in place of Deselect all option
|
7f9061790e1b67b6c674314ac41a399c550f8b88 |
03-May-2012 |
Ray Chen <raychen@google.com> |
Fix 6360834 Select All is shown in place of Deselect all option The CL changes the SelectionManager's toggle method so it changes itself to inverse selection mode when all items are already selected, and onSelectionModeChange will be triggered so the listener can update the selection menu (Select all/Deselect all) and ActionBar. Change-Id: I9aa5507067415e52f6800c254ecb4d68e7395ffa b: 6360834
rc/com/android/gallery3d/app/AlbumSetPage.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/ui/ActionModeHandler.java
rc/com/android/gallery3d/ui/SelectionManager.java
|
21c2e665fdc1d1af0c91ab9c104d13fb7dc2444e |
03-May-2012 |
Ray Chen <raychen@google.com> |
Fix 6360834 Select All is shown in place of Deselect all option The CL changes the SelectionManager's toggle method so it changes itself to inverse selection mode when all items are already selected, and onSelectionModeChange will be triggered so the listener can update the selection menu (Select all/Deselect all) and ActionBar. Change-Id: I9aa5507067415e52f6800c254ecb4d68e7395ffa b: 6360834
rc/com/android/gallery3d/app/AlbumSetPage.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/ui/ActionModeHandler.java
rc/com/android/gallery3d/ui/SelectionManager.java
|
479971ac0e50b41ddd06c12ff6919457784131a6 |
22-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
am 55d2ae71: am 3efc2b24: Merge "Don\'t fire data change notification before the data is made consistent." into jb-dev * commit '55d2ae71bed1db01098254d5404cc0187d51dcb5': Don't fire data change notification before the data is made consistent.
|
8ce036efaf34a333ab5b6adde7e1928854de11c6 |
22-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
am 55d2ae71: am 3efc2b24: Merge "Don\'t fire data change notification before the data is made consistent." into jb-dev * commit '55d2ae71bed1db01098254d5404cc0187d51dcb5': Don't fire data change notification before the data is made consistent.
|
9a00132c80b5de18f9e4fd66f6f2f0ea135cd750 |
22-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
am 3ebf7dd4: am 7a836b5a: Merge "Fix capture animation if we are far away from the camera preview." into jb-dev * commit '3ebf7dd4a88576187fea4f77164f2b25bcb40efc': Fix capture animation if we are far away from the camera preview.
|
7d829ad318f0ef79facde4dac7211cd438c7a75b |
22-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
am 3ebf7dd4: am 7a836b5a: Merge "Fix capture animation if we are far away from the camera preview." into jb-dev * commit '3ebf7dd4a88576187fea4f77164f2b25bcb40efc': Fix capture animation if we are far away from the camera preview.
|
8557ee0c00b57af62b98c6af513aaa45758f31bd |
22-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
am 3efc2b24: Merge "Don\'t fire data change notification before the data is made consistent." into jb-dev * commit '3efc2b24e29f7591993c43ef2653332054203578': Don't fire data change notification before the data is made consistent.
|
55d2ae71bed1db01098254d5404cc0187d51dcb5 |
22-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
am 3efc2b24: Merge "Don\'t fire data change notification before the data is made consistent." into jb-dev * commit '3efc2b24e29f7591993c43ef2653332054203578': Don't fire data change notification before the data is made consistent.
|
a66e2692d6d72a632b6901b9f53f4167292de307 |
22-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
am 7a836b5a: Merge "Fix capture animation if we are far away from the camera preview." into jb-dev * commit '7a836b5ad59be5b122cbbacaa3a1882d4a791355': Fix capture animation if we are far away from the camera preview.
|
3ebf7dd4a88576187fea4f77164f2b25bcb40efc |
22-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
am 7a836b5a: Merge "Fix capture animation if we are far away from the camera preview." into jb-dev * commit '7a836b5ad59be5b122cbbacaa3a1882d4a791355': Fix capture animation if we are far away from the camera preview.
|
6ca39c75e668eab51645f33117cae5156f64975d |
22-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
Merge "Don't fire data change notification before the data is made consistent." into jb-dev
|
3efc2b24e29f7591993c43ef2653332054203578 |
22-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
Merge "Don't fire data change notification before the data is made consistent." into jb-dev
|
b8ab1f5676cd93e11f4afd4ced7032ab92bf3f31 |
22-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
Merge "Fix capture animation if we are far away from the camera preview." into jb-dev
|
7a836b5ad59be5b122cbbacaa3a1882d4a791355 |
22-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
Merge "Fix capture animation if we are far away from the camera preview." into jb-dev
|
432fb6c92b2885fa7fa4ce5f75cfdea58e9889a0 |
21-May-2012 |
Wei Huang <weih@google.com> |
am 1f868ff7: am d7ebcd2f: Merge "Fix 6513486: Extend char limit from 30 to 50. b:6513486" into jb-dev * commit '1f868ff7b18a931e5a8a70ca4b6be6face74eacb': Fix 6513486: Extend char limit from 30 to 50. b:6513486
|
f3a6c7cf66cb813e22e6a87d1a94897fd9be73d7 |
21-May-2012 |
Wei Huang <weih@google.com> |
am 1f868ff7: am d7ebcd2f: Merge "Fix 6513486: Extend char limit from 30 to 50. b:6513486" into jb-dev * commit '1f868ff7b18a931e5a8a70ca4b6be6face74eacb': Fix 6513486: Extend char limit from 30 to 50. b:6513486
|
06d43ec524b82d5b4608bd1994712e1fe4ea8063 |
21-May-2012 |
Wei Huang <weih@google.com> |
am 8d403845: am 614fe145: Merge "Fix the detail isn\'t updated for the selected thumbnail." into jb-dev * commit '8d403845b68b6cb78431e72b611f03d55d706b37': Fix the detail isn't updated for the selected thumbnail.
|
be4db52e6a47b3c2ff38f31e808cbcc62c678178 |
21-May-2012 |
Wei Huang <weih@google.com> |
am 8d403845: am 614fe145: Merge "Fix the detail isn\'t updated for the selected thumbnail." into jb-dev * commit '8d403845b68b6cb78431e72b611f03d55d706b37': Fix the detail isn't updated for the selected thumbnail.
|
448fe3d7992c8667f4154a6057caf5e292135625 |
21-May-2012 |
Ray Chen <raychen@google.com> |
am a8b132f3: am a3871050: Fix 6385004 When video playback in gallery is launched from another app, Up should cross back to Gallery, except when the logo-bitmap extra is set. * commit 'a8b132f30f87356b83e6caed8372b65abb7caf08': Fix 6385004 When video playback in gallery is launched from another app, Up should cross back to Gallery, except when the logo-bitmap extra is set.
|
d419300b2ce79ff81c300e9db2d9a2b9fecd03cc |
21-May-2012 |
Ray Chen <raychen@google.com> |
am a8b132f3: am a3871050: Fix 6385004 When video playback in gallery is launched from another app, Up should cross back to Gallery, except when the logo-bitmap extra is set. * commit 'a8b132f30f87356b83e6caed8372b65abb7caf08': Fix 6385004 When video playback in gallery is launched from another app, Up should cross back to Gallery, except when the logo-bitmap extra is set.
|
1ea1cadadc7a8186568c261584886ad7fef1171e |
21-May-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am aaaeabd6: Reconcile with jb-release nakasi-factoryrom-release * commit 'aaaeabd6a655068605747ad492ddb0ee128d1c36': Fix a NPE found by Moneky. Fix a dead lock while we freeze the screen. Restore deleted string still referenced from menu resource.
|
ebae5b6534e8e66e203ab499e4a374e1a114f19d |
21-May-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am aaaeabd6: Reconcile with jb-release nakasi-factoryrom-release * commit 'aaaeabd6a655068605747ad492ddb0ee128d1c36': Fix a NPE found by Moneky. Fix a dead lock while we freeze the screen. Restore deleted string still referenced from menu resource.
|
fbde5266d7d16fcb309305b431c53ff66c363b26 |
21-May-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am aaaeabd6: Reconcile with jb-release nakasi-factoryrom-release * commit 'aaaeabd6a655068605747ad492ddb0ee128d1c36': Fix a NPE found by Moneky. Fix a dead lock while we freeze the screen. Restore deleted string still referenced from menu resource.
|
9fb774d2d443388cfa81f2d7e34ca43e9d8b6578 |
21-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
Don't fire data change notification before the data is made consistent. Bug: 6500467 Change-Id: Ia064461daba92bbf1172eae5d321bf5049de6d48
rc/com/android/gallery3d/app/PhotoDataAdapter.java
|
d2f509734c5c75298c3fed0edf71d55cd71ad9ae |
21-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
Don't fire data change notification before the data is made consistent. Bug: 6500467 Change-Id: Ia064461daba92bbf1172eae5d321bf5049de6d48
rc/com/android/gallery3d/app/PhotoDataAdapter.java
|
64a1ab21704c8e760055dabdd7aa067cd410a1de |
21-May-2012 |
Wei Huang <weih@google.com> |
am d7ebcd2f: Merge "Fix 6513486: Extend char limit from 30 to 50. b:6513486" into jb-dev * commit 'd7ebcd2fef383f0a68b6af40e15bee81f3ec5c4b': Fix 6513486: Extend char limit from 30 to 50. b:6513486
|
1f868ff7b18a931e5a8a70ca4b6be6face74eacb |
21-May-2012 |
Wei Huang <weih@google.com> |
am d7ebcd2f: Merge "Fix 6513486: Extend char limit from 30 to 50. b:6513486" into jb-dev * commit 'd7ebcd2fef383f0a68b6af40e15bee81f3ec5c4b': Fix 6513486: Extend char limit from 30 to 50. b:6513486
|
ae311e4eb0d9bed68f1c7c48f6eefbac1b2eee76 |
21-May-2012 |
Wei Huang <weih@google.com> |
am 614fe145: Merge "Fix the detail isn\'t updated for the selected thumbnail." into jb-dev * commit '614fe145f539119084b4cf0b1d6892bfcded1a0b': Fix the detail isn't updated for the selected thumbnail.
|
8d403845b68b6cb78431e72b611f03d55d706b37 |
21-May-2012 |
Wei Huang <weih@google.com> |
am 614fe145: Merge "Fix the detail isn\'t updated for the selected thumbnail." into jb-dev * commit '614fe145f539119084b4cf0b1d6892bfcded1a0b': Fix the detail isn't updated for the selected thumbnail.
|
538f5d32e293d62c17923cd3d33f6d449371613d |
21-May-2012 |
Ray Chen <raychen@google.com> |
am a3871050: Fix 6385004 When video playback in gallery is launched from another app, Up should cross back to Gallery, except when the logo-bitmap extra is set. * commit 'a3871050845b4921379add2b126add3cfbab1109': Fix 6385004 When video playback in gallery is launched from another app, Up should cross back to Gallery, except when the logo-bitmap extra is set.
|
a8b132f30f87356b83e6caed8372b65abb7caf08 |
21-May-2012 |
Ray Chen <raychen@google.com> |
am a3871050: Fix 6385004 When video playback in gallery is launched from another app, Up should cross back to Gallery, except when the logo-bitmap extra is set. * commit 'a3871050845b4921379add2b126add3cfbab1109': Fix 6385004 When video playback in gallery is launched from another app, Up should cross back to Gallery, except when the logo-bitmap extra is set.
|
d7ebcd2fef383f0a68b6af40e15bee81f3ec5c4b |
21-May-2012 |
Wei Huang <weih@google.com> |
Merge "Fix 6513486: Extend char limit from 30 to 50. b:6513486" into jb-dev
|
52973767f43e7f7e3637cbd31e1c52c3285a2522 |
21-May-2012 |
Wei Huang <weih@google.com> |
Merge "Fix the detail isn't updated for the selected thumbnail." into jb-dev
|
614fe145f539119084b4cf0b1d6892bfcded1a0b |
21-May-2012 |
Wei Huang <weih@google.com> |
Merge "Fix the detail isn't updated for the selected thumbnail." into jb-dev
|
193c30d055a46e0adf14bf619ca527a429d78c33 |
21-May-2012 |
Yuli Huang <yuli@google.com> |
am 42102780: am c9f743a7: Fix action-bar title for cropping wallpaper. * commit '4210278064a0763498494911947794244ecafff8': Fix action-bar title for cropping wallpaper.
|
abd2dad875f1a901ecf2a2a8dcd86da9498ba9f5 |
21-May-2012 |
Yuli Huang <yuli@google.com> |
am 42102780: am c9f743a7: Fix action-bar title for cropping wallpaper. * commit '4210278064a0763498494911947794244ecafff8': Fix action-bar title for cropping wallpaper.
|
1aa3d1e04ab0f12af1e38b3ec143cfc8e2c19cb3 |
21-May-2012 |
Yuli Huang <yuli@google.com> |
am 42102780: am c9f743a7: Fix action-bar title for cropping wallpaper. * commit '4210278064a0763498494911947794244ecafff8': Fix action-bar title for cropping wallpaper.
|
9efe1d0e07b7acd00a162f842c9b2207022cd0c6 |
21-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
am 17063028: am ab82ed93: Remove camera icon in Gallery if there is no launcher icon. * commit '170630286be791a793ad8a253bd9fb06ba4a7ba4': Remove camera icon in Gallery if there is no launcher icon.
|
0b47c6446202822ce412872d95144ade5b2b6ee6 |
21-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
am 17063028: am ab82ed93: Remove camera icon in Gallery if there is no launcher icon. * commit '170630286be791a793ad8a253bd9fb06ba4a7ba4': Remove camera icon in Gallery if there is no launcher icon.
|
1e7884cedd47a95d6154282b784342b48385016d |
21-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
am afa19311: am 62c29e71: Handle null for the video resolution field in MediaProvider. * commit 'afa19311f39dc772936c6be37e3be750690c8a4b': Handle null for the video resolution field in MediaProvider.
|
e77219dac604d355989042ac77308058298963a1 |
21-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
am afa19311: am 62c29e71: Handle null for the video resolution field in MediaProvider. * commit 'afa19311f39dc772936c6be37e3be750690c8a4b': Handle null for the video resolution field in MediaProvider.
|
6c8c3fd57801285698d959bf059eccbe2aefeff5 |
21-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
am 35cb0acf: am 71cd89a3: Don\'t jump back to the camera preview if we started an activity. * commit '35cb0acf25c1df17b4f30061b3f33c3eef1f0b5f': Don't jump back to the camera preview if we started an activity.
|
e0bba7d8e5f75f0a7e4d4f0b5cd7d16a14542a5c |
21-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
am 35cb0acf: am 71cd89a3: Don\'t jump back to the camera preview if we started an activity. * commit '35cb0acf25c1df17b4f30061b3f33c3eef1f0b5f': Don't jump back to the camera preview if we started an activity.
|
5674941857e1409b84b207a82b7e8f92e5a59336 |
21-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
am f5f0506e: am 0b2486cf: Use View.setSystemUiVisibility to enter/leave lights-out mode. * commit 'f5f0506efdf2cc9f6541248a46814393b4c75c82': Use View.setSystemUiVisibility to enter/leave lights-out mode.
|
57a77a6e970874970ee15f6cd1b166af6ff502af |
21-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
am f5f0506e: am 0b2486cf: Use View.setSystemUiVisibility to enter/leave lights-out mode. * commit 'f5f0506efdf2cc9f6541248a46814393b4c75c82': Use View.setSystemUiVisibility to enter/leave lights-out mode.
|
af163fa224b5f09698f97a57fbe717627bc9daaa |
21-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
am 4ca412f0: am 0f2db4b9: Merge "Show gray tile for screennails not loaded yet." into jb-dev * commit '4ca412f023b066c9361c919e63a71fc57883f0a3': Show gray tile for screennails not loaded yet.
|
43e7b2c5d3d267ee162badefaaaf1944153dc729 |
21-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
am 4ca412f0: am 0f2db4b9: Merge "Show gray tile for screennails not loaded yet." into jb-dev * commit '4ca412f023b066c9361c919e63a71fc57883f0a3': Show gray tile for screennails not loaded yet.
|
448b3f1f6ee55304a6da80fb73c6f02292699dfc |
21-May-2012 |
Owen Lin <owenlin@google.com> |
am cb530e67: am d759b7c1: Refresh the action bar timeout when button is clicked. * commit 'cb530e6735b76fa2841908c35f3ffccfed4b1ad0': Refresh the action bar timeout when button is clicked.
|
6757fc3b52f594eefc3342e5e8cb05a440ed443d |
21-May-2012 |
Owen Lin <owenlin@google.com> |
am cb530e67: am d759b7c1: Refresh the action bar timeout when button is clicked. * commit 'cb530e6735b76fa2841908c35f3ffccfed4b1ad0': Refresh the action bar timeout when button is clicked.
|
df627f840c13b2331536ae0f80786500ae7a4287 |
21-May-2012 |
Owen Lin <owenlin@google.com> |
am be0503fc: am 4b56917d: Merge "Fix a NPE found by Moneky." into jb-dev * commit 'be0503fcc7799575cbf2ae7784ac78f35ac9738f': Fix a NPE found by Moneky.
|
e5cce09fc4d449413f6b452c82eb06dd672c6a0d |
21-May-2012 |
Owen Lin <owenlin@google.com> |
am be0503fc: am 4b56917d: Merge "Fix a NPE found by Moneky." into jb-dev * commit 'be0503fcc7799575cbf2ae7784ac78f35ac9738f': Fix a NPE found by Moneky.
|
1555976dd9b0ba5dfa5e5ecd6bb3ce46c44875bb |
21-May-2012 |
Angus Kong <shkong@google.com> |
am 7b2d9e2a: am 43a80fd8: Support Panorama preview. * commit '7b2d9e2abb8024ec0ce096c4fbbd6d5dd2939b3c': Support Panorama preview.
|
bf33f68ec759c743ae5fbcb6412dd6d808bcac91 |
21-May-2012 |
Angus Kong <shkong@google.com> |
am 7b2d9e2a: am 43a80fd8: Support Panorama preview. * commit '7b2d9e2abb8024ec0ce096c4fbbd6d5dd2939b3c': Support Panorama preview.
|
eb0f201582e0512b7bcece4d33297f15802e82a0 |
21-May-2012 |
Owen Lin <owenlin@google.com> |
am d1539278: am 616a70fd: Add transition animation for tapping from PhotoPage. * commit 'd1539278b70ce37380ad531b51ea67398b77e916': Add transition animation for tapping from PhotoPage.
|
2eee2ff95f7fae39e00f6f0f6c390e62b0c9ad11 |
21-May-2012 |
Owen Lin <owenlin@google.com> |
am d1539278: am 616a70fd: Add transition animation for tapping from PhotoPage. * commit 'd1539278b70ce37380ad531b51ea67398b77e916': Add transition animation for tapping from PhotoPage.
|
62d433d8071f87a02b6cc10b6554db8b840b253b |
21-May-2012 |
Owen Lin <owenlin@google.com> |
am c7d4c59e: am 59d6f1b9: Merge "Set the window backgrond and remove it in onCreate()." into jb-dev * commit 'c7d4c59e9827580214f5c3b78742dd51b19a0da8': Set the window backgrond and remove it in onCreate().
|
7d918bf00fe1bf06fc9e2b079e04ef397b146133 |
21-May-2012 |
Owen Lin <owenlin@google.com> |
am c7d4c59e: am 59d6f1b9: Merge "Set the window backgrond and remove it in onCreate()." into jb-dev * commit 'c7d4c59e9827580214f5c3b78742dd51b19a0da8': Set the window backgrond and remove it in onCreate().
|
2e9d360486b0787684843f38700123a401c58275 |
21-May-2012 |
Owen Lin <owenlin@google.com> |
am c7d4c59e: am 59d6f1b9: Merge "Set the window backgrond and remove it in onCreate()." into jb-dev * commit 'c7d4c59e9827580214f5c3b78742dd51b19a0da8': Set the window backgrond and remove it in onCreate().
|
27706e69507f76b5f90e2915bfc5db892ebfddf1 |
21-May-2012 |
Angus Kong <shkong@google.com> |
am 7b329a0a: am 9723770a: Revert "Support Panorama preview." * commit '7b329a0af29f75ae759eab03070ef070cb4c5f76': Revert "Support Panorama preview."
|
79d6b7d0ed3c11c660bcfb518b7ee62550a811cb |
21-May-2012 |
Angus Kong <shkong@google.com> |
am 7b329a0a: am 9723770a: Revert "Support Panorama preview." * commit '7b329a0af29f75ae759eab03070ef070cb4c5f76': Revert "Support Panorama preview."
|
a3875d3a62e1776d19101d02b7063b8c0fdcb313 |
21-May-2012 |
Angus Kong <shkong@google.com> |
am ade3b48c: am 41832d9f: Support Panorama preview. * commit 'ade3b48caa971faa71345a033f23c01b9ac70302': Support Panorama preview.
|
61f6d8f034dca11582c381be656041a15539c6de |
21-May-2012 |
Angus Kong <shkong@google.com> |
am ade3b48c: am 41832d9f: Support Panorama preview. * commit 'ade3b48caa971faa71345a033f23c01b9ac70302': Support Panorama preview.
|
29238d45a5bb4be3084aca4e1ebfc7d848fa21be |
21-May-2012 |
Ray Chen <raychen@google.com> |
am f798a30a: am b4e38c9a: Merge "Fix 6213053 Add Help entry point to Gallery (targeted for J release) b: 6213053" into jb-dev * commit 'f798a30a9eb8ed2c3e5b20d2ed8727c743c95d39': Fix 6213053 Add Help entry point to Gallery (targeted for J release) b: 6213053
|
7cd06f16d6dc61d846fb1b222ae97adca229bfc5 |
21-May-2012 |
Ray Chen <raychen@google.com> |
am f798a30a: am b4e38c9a: Merge "Fix 6213053 Add Help entry point to Gallery (targeted for J release) b: 6213053" into jb-dev * commit 'f798a30a9eb8ed2c3e5b20d2ed8727c743c95d39': Fix 6213053 Add Help entry point to Gallery (targeted for J release) b: 6213053
|
f7c946f04ee34224d7d78b437ee68d2718b0327d |
21-May-2012 |
Ray Chen <raychen@google.com> |
am f798a30a: am b4e38c9a: Merge "Fix 6213053 Add Help entry point to Gallery (targeted for J release) b: 6213053" into jb-dev * commit 'f798a30a9eb8ed2c3e5b20d2ed8727c743c95d39': Fix 6213053 Add Help entry point to Gallery (targeted for J release) b: 6213053
|
413c64886b6784cef4f4ff3d6d59e9d1507ce506 |
21-May-2012 |
Ray Chen <raychen@google.com> |
am 75f615f7: am 93ccc28d: Merge "Fix 6479216 Playing a video should go full-screen first" into jb-dev * commit '75f615f7826e825edddc38c17768499438f6df79': Fix 6479216 Playing a video should go full-screen first
|
ea593328eeafda3a0780c30281a39f7dfcb2c7e4 |
21-May-2012 |
Ray Chen <raychen@google.com> |
am 75f615f7: am 93ccc28d: Merge "Fix 6479216 Playing a video should go full-screen first" into jb-dev * commit '75f615f7826e825edddc38c17768499438f6df79': Fix 6479216 Playing a video should go full-screen first
|
c631a7fdffe6f26f14a8473feff0e2db794440be |
21-May-2012 |
Yuli Huang <yuli@google.com> |
am f6dc92aa: am 5338d195: Smooth opening animation by modifying interpolation curve. * commit 'f6dc92aa29172236aa4c994b7eaac65d8fef2f52': Smooth opening animation by modifying interpolation curve.
|
99d5b43f580a21d422f64da052422373c11e461a |
21-May-2012 |
Yuli Huang <yuli@google.com> |
am f6dc92aa: am 5338d195: Smooth opening animation by modifying interpolation curve. * commit 'f6dc92aa29172236aa4c994b7eaac65d8fef2f52': Smooth opening animation by modifying interpolation curve.
|
fb14073b494ee6ead2538641d04ad8177b433001 |
19-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
Fix capture animation if we are far away from the camera preview. Bug: 6481823 Change-Id: If2511c8dd08e0483cdc3139068ee190e2b08126d
rc/com/android/gallery3d/ui/PhotoView.java
rc/com/android/gallery3d/ui/PositionController.java
|
c4791b7721a8417be5be33a67c8ade6e82b03a2c |
19-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
Fix capture animation if we are far away from the camera preview. Bug: 6481823 Change-Id: If2511c8dd08e0483cdc3139068ee190e2b08126d
rc/com/android/gallery3d/ui/PhotoView.java
rc/com/android/gallery3d/ui/PositionController.java
|
07230947ed37713cd600da05abeadcee7781d6b3 |
21-May-2012 |
Yuli Huang <yuli@google.com> |
Fix the detail isn't updated for the selected thumbnail. bug:6521826 Change-Id: I1c07c10414ad45721b65583ed5f976c992d27698
rc/com/android/gallery3d/app/AlbumPage.java
rc/com/android/gallery3d/app/AlbumSetPage.java
|
8e4eb7e6d69c2f22605ce96837c2b14d48d084b0 |
21-May-2012 |
Yuli Huang <yuli@google.com> |
Fix the detail isn't updated for the selected thumbnail. bug:6521826 Change-Id: I1c07c10414ad45721b65583ed5f976c992d27698
rc/com/android/gallery3d/app/AlbumPage.java
rc/com/android/gallery3d/app/AlbumSetPage.java
|
2789bb0256e62b29c04f608510ae11df2d35dca9 |
16-May-2012 |
Ray Chen <raychen@google.com> |
Fix 6385004 When video playback in gallery is launched from another app, Up should cross back to Gallery, except when the logo-bitmap extra is set. Change-Id: Id0c43872386cc0272bc76d37a9c866d5ffae700f b: 6385004
rc/com/android/gallery3d/app/MovieActivity.java
rc/com/android/gallery3d/app/PhotoPage.java
|
a3871050845b4921379add2b126add3cfbab1109 |
16-May-2012 |
Ray Chen <raychen@google.com> |
Fix 6385004 When video playback in gallery is launched from another app, Up should cross back to Gallery, except when the logo-bitmap extra is set. Change-Id: Id0c43872386cc0272bc76d37a9c866d5ffae700f b: 6385004
rc/com/android/gallery3d/app/MovieActivity.java
rc/com/android/gallery3d/app/PhotoPage.java
|
3a063578aea242c91a422d19ec238ce8e8df0efc |
18-May-2012 |
Ray Chen <raychen@google.com> |
Fix 6513486: Extend char limit from 30 to 50. b:6513486 Change-Id: I1d4cdd7e1c0a5019458778120f6be9e5b0492e1b
es/values/strings.xml
|
1eb03bc81e1f8b2553c0acfb24ba2cad90822421 |
18-May-2012 |
Ray Chen <raychen@google.com> |
Fix 6513486: Extend char limit from 30 to 50. b:6513486 Change-Id: I1d4cdd7e1c0a5019458778120f6be9e5b0492e1b
es/values/strings.xml
|
eaa54cfa2a256ee2d962080b5c47b70e5c8590e3 |
20-May-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to jb-dev
|
ab8932c8806bfbd528362103604e8c859173a4fb |
20-May-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to jb-dev
|
a9c99c8d7a3762068832f0ec7b79b0f52c312622 |
20-May-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to jb-dev
|
0f5ed90fa36c5f9aa7732f776bb52ebda2734d93 |
19-May-2012 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with jb-release nakasi-factoryrom-release Change-Id: I00d1e51120d9a41e8d5e33646f9f86e852e0631e
|
3daf1337961ff62e61f600f4df2c340ce7091c44 |
19-May-2012 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with jb-release nakasi-factoryrom-release Change-Id: I00d1e51120d9a41e8d5e33646f9f86e852e0631e
|
aaaeabd6a655068605747ad492ddb0ee128d1c36 |
19-May-2012 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with jb-release nakasi-factoryrom-release Change-Id: I00d1e51120d9a41e8d5e33646f9f86e852e0631e
|
8dc6061a9019e4e091d8e0d10f05d96d2d0db14d |
17-May-2012 |
Owen Lin <owenlin@google.com> |
Fix a NPE found by Moneky. AlbumLabelMaker.mBitmapPool could be null if the setLabelWidth() has never been called or called with width as 0. bug:6510386 Change-Id: Idaaa0a1a7239271ba3ae3217e65029b382464c10
rc/com/android/gallery3d/ui/AlbumLabelMaker.java
|
92fc4eb8ea97843b42431eadcfa2277a8b236dc2 |
17-May-2012 |
Owen Lin <owenlin@google.com> |
Fix a NPE found by Moneky. AlbumLabelMaker.mBitmapPool could be null if the setLabelWidth() has never been called or called with width as 0. bug:6510386 Change-Id: Idaaa0a1a7239271ba3ae3217e65029b382464c10
rc/com/android/gallery3d/ui/AlbumLabelMaker.java
|
52465222df33508a0238e09ddc82525f926d0b76 |
18-May-2012 |
The Android Automerger <android-build@android.com> |
merge in nakasi-factoryrom-release history after reset to jb-dev
|
92184ee411f1f477678c69ecc2b3538bf6a01d15 |
18-May-2012 |
The Android Automerger <android-build@android.com> |
merge in nakasi-factoryrom-release history after reset to jb-dev
|
4c0cc7ad486200d0dd0725d39531a6a3418fc7ab |
18-May-2012 |
The Android Automerger <android-build@android.com> |
merge in nakasi-factoryrom-release history after reset to jb-dev
|
bff5894706818149393714f4355989672b4ebd71 |
18-May-2012 |
Yuli Huang <yuli@google.com> |
am c9f743a7: Fix action-bar title for cropping wallpaper. * commit 'c9f743a777cf5e5e91bad7810584be052db21eed': Fix action-bar title for cropping wallpaper.
|
ce49a3073aeaf0e626466adba48b82b295a1fc43 |
18-May-2012 |
Yuli Huang <yuli@google.com> |
am c9f743a7: Fix action-bar title for cropping wallpaper. * commit 'c9f743a777cf5e5e91bad7810584be052db21eed': Fix action-bar title for cropping wallpaper.
|
4210278064a0763498494911947794244ecafff8 |
18-May-2012 |
Yuli Huang <yuli@google.com> |
am c9f743a7: Fix action-bar title for cropping wallpaper. * commit 'c9f743a777cf5e5e91bad7810584be052db21eed': Fix action-bar title for cropping wallpaper.
|
9c89d80b702defe324e90050037e91edb83bbeea |
18-May-2012 |
Yuli Huang <yuli@google.com> |
Fix action-bar title for cropping wallpaper. bug:6513495 Change-Id: I97b76c948d5c9fa0bb11f2fe89a0d10f490dbe14
rc/com/android/gallery3d/app/CropImage.java
|
c9f743a777cf5e5e91bad7810584be052db21eed |
18-May-2012 |
Yuli Huang <yuli@google.com> |
Fix action-bar title for cropping wallpaper. bug:6513495 Change-Id: I97b76c948d5c9fa0bb11f2fe89a0d10f490dbe14
es/values/strings.xml
rc/com/android/gallery3d/app/CropImage.java
|
14abbea82c1a8ce123ceb5d5559a3cd3c108a865 |
18-May-2012 |
Yuli Huang <yuli@google.com> |
Fix action-bar title for cropping wallpaper. bug:6513495 Change-Id: I97b76c948d5c9fa0bb11f2fe89a0d10f490dbe14
es/values/strings.xml
|
cc4158260866f4efd086d4a5d3d3dba86c5cc7df |
18-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
am ab82ed93: Remove camera icon in Gallery if there is no launcher icon. * commit 'ab82ed93f46a728018e7f1fdc3d0a877dc3d9171': Remove camera icon in Gallery if there is no launcher icon.
|
170630286be791a793ad8a253bd9fb06ba4a7ba4 |
18-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
am ab82ed93: Remove camera icon in Gallery if there is no launcher icon. * commit 'ab82ed93f46a728018e7f1fdc3d0a877dc3d9171': Remove camera icon in Gallery if there is no launcher icon.
|
bbaf45d756215a682041f3d553d6b8aea72b93e4 |
18-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
am 62c29e71: Handle null for the video resolution field in MediaProvider. * commit '62c29e71e226ae31573ab883a18e30fdfcb2711b': Handle null for the video resolution field in MediaProvider.
|
afa19311f39dc772936c6be37e3be750690c8a4b |
18-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
am 62c29e71: Handle null for the video resolution field in MediaProvider. * commit '62c29e71e226ae31573ab883a18e30fdfcb2711b': Handle null for the video resolution field in MediaProvider.
|
c39c6321e9ff9f2ad8318cde70d1ab12801a2c57 |
18-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
Remove camera icon in Gallery if there is no launcher icon. Bug: 6516793 Change-Id: I7ec88065565bcafdd2534cd8c7fd8f2591743447
rc/com/android/gallery3d/util/GalleryUtils.java
|
ab82ed93f46a728018e7f1fdc3d0a877dc3d9171 |
18-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
Remove camera icon in Gallery if there is no launcher icon. Bug: 6516793 Change-Id: I7ec88065565bcafdd2534cd8c7fd8f2591743447
rc/com/android/gallery3d/util/GalleryUtils.java
|
a77ea1a80f71dbae047155de191b9a9179f2576d |
18-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
Handle null for the video resolution field in MediaProvider. Bug: 6517317 Change-Id: Ic9bb769b3b8e8816bc76a4500c6a2770e69a4dc5
rc/com/android/gallery3d/data/LocalVideo.java
|
62c29e71e226ae31573ab883a18e30fdfcb2711b |
18-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
Handle null for the video resolution field in MediaProvider. Bug: 6517317 Change-Id: Ic9bb769b3b8e8816bc76a4500c6a2770e69a4dc5
rc/com/android/gallery3d/data/LocalVideo.java
|
fc900703c2453a4f1705deea5106a750d76c087c |
18-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
am 71cd89a3: Don\'t jump back to the camera preview if we started an activity. * commit '71cd89a38752bc22ae0ec2df965e4280b776623c': Don't jump back to the camera preview if we started an activity.
|
35cb0acf25c1df17b4f30061b3f33c3eef1f0b5f |
18-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
am 71cd89a3: Don\'t jump back to the camera preview if we started an activity. * commit '71cd89a38752bc22ae0ec2df965e4280b776623c': Don't jump back to the camera preview if we started an activity.
|
446bbd93e88a8c8cb0eb033d01186e633c2428fa |
18-May-2012 |
Yuli Huang <yuli@google.com> |
am 327ce0f5: am bcfa1b79: Merge "Fix card effect shown in opening animation." into jb-dev * commit '327ce0f5baec28a581f562473f6e0dd2ef596a26': Fix card effect shown in opening animation.
|
484260c9e8035c0a5a56abe3c04f37cb03b78498 |
18-May-2012 |
Yuli Huang <yuli@google.com> |
am 327ce0f5: am bcfa1b79: Merge "Fix card effect shown in opening animation." into jb-dev * commit '327ce0f5baec28a581f562473f6e0dd2ef596a26': Fix card effect shown in opening animation.
|
9c9e2815fb0548ec3acd61a9c6586fd9aaf8bef2 |
18-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
am 585c1c6c: am ff6687e6: Merge "Handle layout change between pausing and resuming." into jb-dev * commit '585c1c6c4d4741a76fae468262bac021a1e16884': Handle layout change between pausing and resuming.
|
1345b33e65753046f1ac6d113aa90d4517c5a681 |
18-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
am 585c1c6c: am ff6687e6: Merge "Handle layout change between pausing and resuming." into jb-dev * commit '585c1c6c4d4741a76fae468262bac021a1e16884': Handle layout change between pausing and resuming.
|
959d73597a3f19c393200570e2909fae60e50a23 |
18-May-2012 |
Owen Lin <owenlin@google.com> |
am 2b1b6b24: am cb1a39a2: Merge "Remove the black layer in MovieActivity." into jb-dev * commit '2b1b6b249e8aea9e1f9366de780d3c54f6273304': Remove the black layer in MovieActivity.
|
420e3d3bae81bc6580c3b37e148f2fc8cde6eeed |
18-May-2012 |
Owen Lin <owenlin@google.com> |
am 2b1b6b24: am cb1a39a2: Merge "Remove the black layer in MovieActivity." into jb-dev * commit '2b1b6b249e8aea9e1f9366de780d3c54f6273304': Remove the black layer in MovieActivity.
|
00e386faeb06d7b2bece4d9121c835771a476da8 |
18-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
am 0b2486cf: Use View.setSystemUiVisibility to enter/leave lights-out mode. * commit '0b2486cff0c1b951c54325596256b986307f7f3a': Use View.setSystemUiVisibility to enter/leave lights-out mode.
|
f5f0506efdf2cc9f6541248a46814393b4c75c82 |
18-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
am 0b2486cf: Use View.setSystemUiVisibility to enter/leave lights-out mode. * commit '0b2486cff0c1b951c54325596256b986307f7f3a': Use View.setSystemUiVisibility to enter/leave lights-out mode.
|
2b007514884f0c641e8864f56832f77652c4e11e |
18-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
Don't jump back to the camera preview if we started an activity. Bug: 6429570 Change-Id: Ib25dfc4ade235b8c7d7d87c981671ef9308d128b
rc/com/android/gallery3d/app/PhotoPage.java
|
71cd89a38752bc22ae0ec2df965e4280b776623c |
18-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
Don't jump back to the camera preview if we started an activity. Bug: 6429570 Change-Id: Ib25dfc4ade235b8c7d7d87c981671ef9308d128b
rc/com/android/gallery3d/app/PhotoPage.java
|
203af87f102cc8ad1287a838d52f0a70896ab1c8 |
18-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
Use View.setSystemUiVisibility to enter/leave lights-out mode. Bug: 6451200 Change-Id: I8e27b3e5eedfa2652f06dfc8f377c9cef8100160
rc/com/android/gallery3d/app/ActivityState.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/ui/GLRoot.java
rc/com/android/gallery3d/ui/GLRootView.java
ests/src/com/android/gallery3d/ui/GLRootMock.java
ests/src/com/android/gallery3d/ui/GLRootStub.java
|
0b2486cff0c1b951c54325596256b986307f7f3a |
18-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
Use View.setSystemUiVisibility to enter/leave lights-out mode. Bug: 6451200 Change-Id: I8e27b3e5eedfa2652f06dfc8f377c9cef8100160
rc/com/android/gallery3d/app/ActivityState.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/ui/GLRoot.java
rc/com/android/gallery3d/ui/GLRootView.java
ests/src/com/android/gallery3d/ui/GLRootMock.java
ests/src/com/android/gallery3d/ui/GLRootStub.java
|
2f7587855bf2780bd34cae356ebf56164ec43de5 |
18-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
am 0f2db4b9: Merge "Show gray tile for screennails not loaded yet." into jb-dev * commit '0f2db4b94d2824db2e5be748924cd51fcc8b9498': Show gray tile for screennails not loaded yet.
|
4ca412f023b066c9361c919e63a71fc57883f0a3 |
18-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
am 0f2db4b9: Merge "Show gray tile for screennails not loaded yet." into jb-dev * commit '0f2db4b94d2824db2e5be748924cd51fcc8b9498': Show gray tile for screennails not loaded yet.
|
1271b1a831bba981d227ec9968ab5ca1cc95d11c |
18-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
Merge "Show gray tile for screennails not loaded yet." into jb-dev
|
0f2db4b94d2824db2e5be748924cd51fcc8b9498 |
18-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
Merge "Show gray tile for screennails not loaded yet." into jb-dev
|
222ce915c5e67477e0bab8ec2336cada1de63075 |
18-May-2012 |
Owen Lin <owenlin@google.com> |
am d759b7c1: Refresh the action bar timeout when button is clicked. * commit 'd759b7c1fc449f4f0ef91997738bbef1bbd96677': Refresh the action bar timeout when button is clicked.
|
cb530e6735b76fa2841908c35f3ffccfed4b1ad0 |
18-May-2012 |
Owen Lin <owenlin@google.com> |
am d759b7c1: Refresh the action bar timeout when button is clicked. * commit 'd759b7c1fc449f4f0ef91997738bbef1bbd96677': Refresh the action bar timeout when button is clicked.
|
17df03ce167eab04f51bf6f67d7f8085ac8ae10d |
11-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
Show gray tile for screennails not loaded yet. Bug: 6452217 Change-Id: Ied9c2e2c91f4ffe218a73ba1a123df92a2aab98a
rc/com/android/gallery3d/app/PhotoDataAdapter.java
rc/com/android/gallery3d/app/SinglePhotoDataAdapter.java
rc/com/android/gallery3d/data/LocalImage.java
rc/com/android/gallery3d/data/LocalMediaItem.java
rc/com/android/gallery3d/data/LocalVideo.java
rc/com/android/gallery3d/ui/BitmapScreenNail.java
rc/com/android/gallery3d/ui/BitmapTileProvider.java
rc/com/android/gallery3d/ui/PhotoView.java
rc/com/android/gallery3d/ui/PositionController.java
rc/com/android/gallery3d/ui/TileImageView.java
rc/com/android/gallery3d/ui/TileImageViewAdapter.java
|
f5ce6aeba448f418c99736465f7a02dacd7715bb |
11-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
Show gray tile for screennails not loaded yet. Bug: 6452217 Change-Id: Ied9c2e2c91f4ffe218a73ba1a123df92a2aab98a
rc/com/android/gallery3d/app/PhotoDataAdapter.java
rc/com/android/gallery3d/app/SinglePhotoDataAdapter.java
rc/com/android/gallery3d/data/LocalImage.java
rc/com/android/gallery3d/data/LocalMediaItem.java
rc/com/android/gallery3d/data/LocalVideo.java
rc/com/android/gallery3d/ui/BitmapScreenNail.java
rc/com/android/gallery3d/ui/BitmapTileProvider.java
rc/com/android/gallery3d/ui/PhotoView.java
rc/com/android/gallery3d/ui/PositionController.java
rc/com/android/gallery3d/ui/TileImageView.java
rc/com/android/gallery3d/ui/TileImageViewAdapter.java
|
7e95af23b0cb2eb6f82d5225bea2d3f768d5dcc7 |
18-May-2012 |
Owen Lin <owenlin@google.com> |
am 3b3968b5: am 46f7f860: Merge "Fix a dead lock while we freeze the screen." into jb-dev * commit '3b3968b54d766e73da8d43e37d5db8942298b661': Fix a dead lock while we freeze the screen.
|
c6d4b9501dfedc37787d4c041d6e35d53e9c6dd1 |
18-May-2012 |
Owen Lin <owenlin@google.com> |
am 3b3968b5: am 46f7f860: Merge "Fix a dead lock while we freeze the screen." into jb-dev * commit '3b3968b54d766e73da8d43e37d5db8942298b661': Fix a dead lock while we freeze the screen.
|
97a9cd065adf110a55480828ef1c580e61ba6bda |
18-May-2012 |
Owen Lin <owenlin@google.com> |
am 84664904: am 20d98161: Merge "Hide the share button if the shared URI is not "content:"." into jb-dev * commit '846649046510b9ac75210d7618b2192d40c7a739': Hide the share button if the shared URI is not "content:".
|
4c44658f2b44b57c8d32383b577f375f090782ab |
18-May-2012 |
Owen Lin <owenlin@google.com> |
am 84664904: am 20d98161: Merge "Hide the share button if the shared URI is not "content:"." into jb-dev * commit '846649046510b9ac75210d7618b2192d40c7a739': Hide the share button if the shared URI is not "content:".
|
3b35f3a3e4146e632bd5387a0f5f6683c783f98a |
17-May-2012 |
Owen Lin <owenlin@google.com> |
Refresh the action bar timeout when button is clicked. Also handle with the confirm dialog, we show the action bar as long as the confirm dialog is shown. And we start to timeout the action bar when the confirm dialog get dismissed. bug: 6478646 Change-Id: I3f0e7e61b43b0dd2bb2b1e2b4444c8dcb5706e1a
rc/com/android/gallery3d/app/ManageCachePage.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/ui/ImportCompleteListener.java
rc/com/android/gallery3d/ui/MenuExecutor.java
|
d759b7c1fc449f4f0ef91997738bbef1bbd96677 |
17-May-2012 |
Owen Lin <owenlin@google.com> |
Refresh the action bar timeout when button is clicked. Also handle with the confirm dialog, we show the action bar as long as the confirm dialog is shown. And we start to timeout the action bar when the confirm dialog get dismissed. bug: 6478646 Change-Id: I3f0e7e61b43b0dd2bb2b1e2b4444c8dcb5706e1a
rc/com/android/gallery3d/app/ManageCachePage.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/ui/ImportCompleteListener.java
rc/com/android/gallery3d/ui/MenuExecutor.java
|
1cdd051d2faa387ebe98b941bf13d1513cdaa443 |
17-May-2012 |
Owen Lin <owenlin@google.com> |
am 4b56917d: Merge "Fix a NPE found by Moneky." into jb-dev * commit '4b56917d18c35bec2f5e64f55c864163f0d518c9': Fix a NPE found by Moneky.
|
be0503fcc7799575cbf2ae7784ac78f35ac9738f |
17-May-2012 |
Owen Lin <owenlin@google.com> |
am 4b56917d: Merge "Fix a NPE found by Moneky." into jb-dev * commit '4b56917d18c35bec2f5e64f55c864163f0d518c9': Fix a NPE found by Moneky.
|
931a10095f72a0334ac5ab5da174e646cb5bacf9 |
17-May-2012 |
Owen Lin <owenlin@google.com> |
Merge "Fix a NPE found by Moneky." into jb-dev
|
4b56917d18c35bec2f5e64f55c864163f0d518c9 |
17-May-2012 |
Owen Lin <owenlin@google.com> |
Merge "Fix a NPE found by Moneky." into jb-dev
|
b0a2795170e4861d171becdb9ee60e2b6f001b58 |
17-May-2012 |
Angus Kong <shkong@google.com> |
am 43a80fd8: Support Panorama preview. * commit '43a80fd806247cb50e81bacda3ad21d210e9ae88': Support Panorama preview.
|
7b2d9e2abb8024ec0ce096c4fbbd6d5dd2939b3c |
17-May-2012 |
Angus Kong <shkong@google.com> |
am 43a80fd8: Support Panorama preview. * commit '43a80fd806247cb50e81bacda3ad21d210e9ae88': Support Panorama preview.
|
8f7b76df88c4468b54a9977f2687d5fcab19ba7d |
17-May-2012 |
Owen Lin <owenlin@google.com> |
Fix a NPE found by Moneky. AlbumLabelMaker.mBitmapPool could be null if the setLabelWidth() has never been called or called with width as 0. bug:6510386 Change-Id: Idaaa0a1a7239271ba3ae3217e65029b382464c10
rc/com/android/gallery3d/ui/AlbumLabelMaker.java
|
8a626914e388a57c2378c86e82b24158d6098330 |
17-May-2012 |
Owen Lin <owenlin@google.com> |
Fix a NPE found by Moneky. AlbumLabelMaker.mBitmapPool could be null if the setLabelWidth() has never been called or called with width as 0. bug:6510386 Change-Id: Idaaa0a1a7239271ba3ae3217e65029b382464c10
rc/com/android/gallery3d/ui/AlbumLabelMaker.java
|
5d895388e23ffe73c10a08b4b1039c0251e569cb |
17-May-2012 |
Angus Kong <shkong@google.com> |
Support Panorama preview. The panorama preview doesn't consider display rotation. bug:6305152 Change-Id: I6389a74d3c0e64d8b6bc206e728d1088f04be225
rc/com/android/gallery3d/app/AppBridge.java
rc/com/android/gallery3d/app/PhotoDataAdapter.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/app/SinglePhotoDataAdapter.java
rc/com/android/gallery3d/ui/PhotoView.java
|
43a80fd806247cb50e81bacda3ad21d210e9ae88 |
17-May-2012 |
Angus Kong <shkong@google.com> |
Support Panorama preview. The panorama preview doesn't consider display rotation. bug:6305152 Change-Id: I6389a74d3c0e64d8b6bc206e728d1088f04be225
rc/com/android/gallery3d/app/AppBridge.java
rc/com/android/gallery3d/app/PhotoDataAdapter.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/app/SinglePhotoDataAdapter.java
rc/com/android/gallery3d/ui/PhotoView.java
|
1badc9e6420101e7c02768c8eab28066eae64f9c |
17-May-2012 |
Owen Lin <owenlin@google.com> |
am 616a70fd: Add transition animation for tapping from PhotoPage. * commit '616a70fdb4473d2fbd7b70772a3a82b908aeae1e': Add transition animation for tapping from PhotoPage.
|
d1539278b70ce37380ad531b51ea67398b77e916 |
17-May-2012 |
Owen Lin <owenlin@google.com> |
am 616a70fd: Add transition animation for tapping from PhotoPage. * commit '616a70fdb4473d2fbd7b70772a3a82b908aeae1e': Add transition animation for tapping from PhotoPage.
|
3aad1aba14d3abe8324e0a0e129627d51a466bc4 |
07-May-2012 |
Owen Lin <owenlin@google.com> |
Add transition animation for tapping from PhotoPage. bug:6383694 Change-Id: Ib457d6b636dafd3f8ef7340bfa85725f14d90bd0
rc/com/android/gallery3d/app/AbstractGalleryActivity.java
rc/com/android/gallery3d/app/ActivityState.java
rc/com/android/gallery3d/app/AlbumPage.java
rc/com/android/gallery3d/app/GalleryActivity.java
rc/com/android/gallery3d/app/PhotoDataAdapter.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/app/SinglePhotoDataAdapter.java
rc/com/android/gallery3d/app/StateManager.java
rc/com/android/gallery3d/app/TransitionStore.java
rc/com/android/gallery3d/ui/AlbumSlotRenderer.java
rc/com/android/gallery3d/ui/PhotoFallbackEffect.java
rc/com/android/gallery3d/ui/PhotoView.java
rc/com/android/gallery3d/ui/SlotView.java
|
616a70fdb4473d2fbd7b70772a3a82b908aeae1e |
07-May-2012 |
Owen Lin <owenlin@google.com> |
Add transition animation for tapping from PhotoPage. bug:6383694 Change-Id: Ib457d6b636dafd3f8ef7340bfa85725f14d90bd0
rc/com/android/gallery3d/app/AbstractGalleryActivity.java
rc/com/android/gallery3d/app/ActivityState.java
rc/com/android/gallery3d/app/AlbumPage.java
rc/com/android/gallery3d/app/GalleryActivity.java
rc/com/android/gallery3d/app/PhotoDataAdapter.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/app/SinglePhotoDataAdapter.java
rc/com/android/gallery3d/app/StateManager.java
rc/com/android/gallery3d/app/TransitionStore.java
rc/com/android/gallery3d/ui/AlbumSlotRenderer.java
rc/com/android/gallery3d/ui/PhotoFallbackEffect.java
rc/com/android/gallery3d/ui/PhotoView.java
rc/com/android/gallery3d/ui/SlotView.java
|
fcfc531238639c0c9d085daa1fe7d71dacfc1123 |
17-May-2012 |
Owen Lin <owenlin@google.com> |
am 59d6f1b9: Merge "Set the window backgrond and remove it in onCreate()." into jb-dev * commit '59d6f1b97c7159dd9faead8872f2d583dbb49ac8': Set the window backgrond and remove it in onCreate().
|
b117a96642a30effd5740cb2fb4452ac4100a6f7 |
17-May-2012 |
Owen Lin <owenlin@google.com> |
am 59d6f1b9: Merge "Set the window backgrond and remove it in onCreate()." into jb-dev * commit '59d6f1b97c7159dd9faead8872f2d583dbb49ac8': Set the window backgrond and remove it in onCreate().
|
c7d4c59e9827580214f5c3b78742dd51b19a0da8 |
17-May-2012 |
Owen Lin <owenlin@google.com> |
am 59d6f1b9: Merge "Set the window backgrond and remove it in onCreate()." into jb-dev * commit '59d6f1b97c7159dd9faead8872f2d583dbb49ac8': Set the window backgrond and remove it in onCreate().
|
93300e13d5ae3b4e4c532a90fc7f763ec62cbb8c |
17-May-2012 |
Owen Lin <owenlin@google.com> |
Merge "Set the window backgrond and remove it in onCreate()." into jb-dev
|
59d6f1b97c7159dd9faead8872f2d583dbb49ac8 |
17-May-2012 |
Owen Lin <owenlin@google.com> |
Merge "Set the window backgrond and remove it in onCreate()." into jb-dev
|
f64f806ff423588117e36e83a5110a27a1809ebf |
17-May-2012 |
Angus Kong <shkong@google.com> |
am 9723770a: Revert "Support Panorama preview." * commit '9723770a40d230092204dd685f19ff4bce6dabd5': Revert "Support Panorama preview."
|
7b329a0af29f75ae759eab03070ef070cb4c5f76 |
17-May-2012 |
Angus Kong <shkong@google.com> |
am 9723770a: Revert "Support Panorama preview." * commit '9723770a40d230092204dd685f19ff4bce6dabd5': Revert "Support Panorama preview."
|
ac1ae2d40d302ce2c2b48e592385b44a338ca34e |
17-May-2012 |
Angus Kong <shkong@google.com> |
am 41832d9f: Support Panorama preview. * commit '41832d9f1568c7d8227fb9ffebaf7830345cffff': Support Panorama preview.
|
ade3b48caa971faa71345a033f23c01b9ac70302 |
17-May-2012 |
Angus Kong <shkong@google.com> |
am 41832d9f: Support Panorama preview. * commit '41832d9f1568c7d8227fb9ffebaf7830345cffff': Support Panorama preview.
|
4d38c9a2322918a9590652c70773307421110d0b |
17-May-2012 |
Angus Kong <shkong@google.com> |
Revert "Support Panorama preview." This reverts commit 41832d9f1568c7d8227fb9ffebaf7830345cffff
rc/com/android/gallery3d/app/AppBridge.java
rc/com/android/gallery3d/app/PhotoDataAdapter.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/app/SinglePhotoDataAdapter.java
rc/com/android/gallery3d/ui/PhotoView.java
|
9723770a40d230092204dd685f19ff4bce6dabd5 |
17-May-2012 |
Angus Kong <shkong@google.com> |
Revert "Support Panorama preview." This reverts commit 41832d9f1568c7d8227fb9ffebaf7830345cffff
rc/com/android/gallery3d/app/AppBridge.java
rc/com/android/gallery3d/app/PhotoDataAdapter.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/app/SinglePhotoDataAdapter.java
rc/com/android/gallery3d/ui/PhotoView.java
|
d5c545b45ac938dd358f0eb3af40a574a6e96a09 |
17-May-2012 |
Angus Kong <shkong@google.com> |
Support Panorama preview. The panorama preview doesn't consider display rotation. bug:6305152 Change-Id: I6b87c18ed8eadf1b2bf5e64437c5b290d111cbba
rc/com/android/gallery3d/app/AppBridge.java
rc/com/android/gallery3d/app/PhotoDataAdapter.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/app/SinglePhotoDataAdapter.java
rc/com/android/gallery3d/ui/PhotoView.java
|
41832d9f1568c7d8227fb9ffebaf7830345cffff |
17-May-2012 |
Angus Kong <shkong@google.com> |
Support Panorama preview. The panorama preview doesn't consider display rotation. bug:6305152 Change-Id: I6b87c18ed8eadf1b2bf5e64437c5b290d111cbba
rc/com/android/gallery3d/app/AppBridge.java
rc/com/android/gallery3d/app/PhotoDataAdapter.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/app/SinglePhotoDataAdapter.java
rc/com/android/gallery3d/ui/PhotoView.java
|
e55c04de3937857fac46d0d46ef3106ce4d7bbea |
16-May-2012 |
Owen Lin <owenlin@google.com> |
Set the window backgrond and remove it in onCreate(). To have better transistion when launching the app. bug: 6494653 Change-Id: I0f28796d599931c676c99e8f19a9f34e05018570
es/values-xlarge/styles.xml
es/values/styles.xml
|
fee562b9bf026d4b3c338ba9ce2592b98bb3c11a |
16-May-2012 |
Owen Lin <owenlin@google.com> |
Set the window backgrond and remove it in onCreate(). To have better transistion when launching the app. bug: 6494653 Change-Id: I0f28796d599931c676c99e8f19a9f34e05018570
rc/com/android/gallery3d/app/AbstractGalleryActivity.java
|
7896b2ce915cbd180682e94e2fe3d246ff760763 |
16-May-2012 |
Owen Lin <owenlin@google.com> |
Set the window backgrond and remove it in onCreate(). To have better transistion when launching the app. bug: 6494653 Change-Id: I0f28796d599931c676c99e8f19a9f34e05018570
es/values-xlarge/styles.xml
es/values/styles.xml
rc/com/android/gallery3d/app/AbstractGalleryActivity.java
|
95575e3a9a751fb3533424e088d0d1772a68f41b |
17-May-2012 |
Ray Chen <raychen@google.com> |
am b4e38c9a: Merge "Fix 6213053 Add Help entry point to Gallery (targeted for J release) b: 6213053" into jb-dev * commit 'b4e38c9a5945b9651dca1b2b8fe6e0e2833c0fa6': Fix 6213053 Add Help entry point to Gallery (targeted for J release) b: 6213053
|
1ca2a4b8e288ab1b0ea0bf9ea20aa4e5d408cbfd |
17-May-2012 |
Ray Chen <raychen@google.com> |
am b4e38c9a: Merge "Fix 6213053 Add Help entry point to Gallery (targeted for J release) b: 6213053" into jb-dev * commit 'b4e38c9a5945b9651dca1b2b8fe6e0e2833c0fa6': Fix 6213053 Add Help entry point to Gallery (targeted for J release) b: 6213053
|
f798a30a9eb8ed2c3e5b20d2ed8727c743c95d39 |
17-May-2012 |
Ray Chen <raychen@google.com> |
am b4e38c9a: Merge "Fix 6213053 Add Help entry point to Gallery (targeted for J release) b: 6213053" into jb-dev * commit 'b4e38c9a5945b9651dca1b2b8fe6e0e2833c0fa6': Fix 6213053 Add Help entry point to Gallery (targeted for J release) b: 6213053
|
433a2e5b10824f5355eec02765b0c9ad6ac6c87c |
17-May-2012 |
Ray Chen <raychen@google.com> |
Merge "Fix 6213053 Add Help entry point to Gallery (targeted for J release) b: 6213053" into jb-dev
|
b4e38c9a5945b9651dca1b2b8fe6e0e2833c0fa6 |
17-May-2012 |
Ray Chen <raychen@google.com> |
Merge "Fix 6213053 Add Help entry point to Gallery (targeted for J release) b: 6213053" into jb-dev
|
cbb51cf68a2bbd1b0923dcf2593a0dada1a7f4bb |
17-May-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to jb-dev
|
0e2dadeb2821e9f8124339c1b08e21d6b964cbb4 |
17-May-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to jb-dev
|
85a86f3ea2f531b9e95df44017cd3bd90ac75b71 |
17-May-2012 |
Ray Chen <raychen@google.com> |
am 93ccc28d: Merge "Fix 6479216 Playing a video should go full-screen first" into jb-dev * commit '93ccc28d149fc8f92929e53c7d1ce1ef6c3c8dee': Fix 6479216 Playing a video should go full-screen first
|
75f615f7826e825edddc38c17768499438f6df79 |
17-May-2012 |
Ray Chen <raychen@google.com> |
am 93ccc28d: Merge "Fix 6479216 Playing a video should go full-screen first" into jb-dev * commit '93ccc28d149fc8f92929e53c7d1ce1ef6c3c8dee': Fix 6479216 Playing a video should go full-screen first
|
f2105d95743e9ab8cdbd280e3fa5e4744a0bc0ea |
17-May-2012 |
Ray Chen <raychen@google.com> |
Merge "Fix 6479216 Playing a video should go full-screen first" into jb-dev
|
93ccc28d149fc8f92929e53c7d1ce1ef6c3c8dee |
17-May-2012 |
Ray Chen <raychen@google.com> |
Merge "Fix 6479216 Playing a video should go full-screen first" into jb-dev
|
175967d5f75c6ba6c13310651a3ed8abbf9390bb |
17-May-2012 |
Yuli Huang <yuli@google.com> |
am 5338d195: Smooth opening animation by modifying interpolation curve. * commit '5338d1959406e95a580858e418794e23e05c47e2': Smooth opening animation by modifying interpolation curve.
|
f6dc92aa29172236aa4c994b7eaac65d8fef2f52 |
17-May-2012 |
Yuli Huang <yuli@google.com> |
am 5338d195: Smooth opening animation by modifying interpolation curve. * commit '5338d1959406e95a580858e418794e23e05c47e2': Smooth opening animation by modifying interpolation curve.
|
c2fdc7bde6fe4a545c7a21662f3f2bfface2c0e6 |
17-May-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to jb-dev
|
1916f8fc52bf13aaf2419985e0af945d20d2913e |
17-May-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to jb-dev
|
e6fdbef6f9da726c0ddcbe79b22294828e58233f |
17-May-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to jb-dev
|
f442bd9ec64defaba6771ce44558798e29757ddd |
17-May-2012 |
Ray Chen <raychen@google.com> |
Fix 6213053 Add Help entry point to Gallery (targeted for J release) b: 6213053 Change-Id: Ib94a8bbdb3114a198b775025c5864a3d83cdd5ad
es/menu/albumset.xml
es/values/strings.xml
|
698f086739927ed1ace3754ce8d117365b0cb268 |
17-May-2012 |
Ray Chen <raychen@google.com> |
Fix 6213053 Add Help entry point to Gallery (targeted for J release) b: 6213053 Change-Id: Ib94a8bbdb3114a198b775025c5864a3d83cdd5ad
rc/com/android/gallery3d/app/AlbumSetPage.java
rc/com/android/gallery3d/util/GalleryUtils.java
rc/com/android/gallery3d/util/HelpUtils.java
|
daf88feb0aab5806723b850d22a372cafe758239 |
17-May-2012 |
Ray Chen <raychen@google.com> |
Fix 6213053 Add Help entry point to Gallery (targeted for J release) b: 6213053 Change-Id: Ib94a8bbdb3114a198b775025c5864a3d83cdd5ad
es/menu/albumset.xml
es/values/strings.xml
rc/com/android/gallery3d/app/AlbumSetPage.java
rc/com/android/gallery3d/util/GalleryUtils.java
rc/com/android/gallery3d/util/HelpUtils.java
|
ab1c41d2bea026fbb2f29e121413ff164ab326b8 |
17-May-2012 |
Yuli Huang <yuli@google.com> |
Smooth opening animation by modifying interpolation curve. bug:5367032 Change-Id: I15ad839ede723591f081be200c1c16a8a9a901d0
rc/com/android/gallery3d/ui/PositionController.java
|
5338d1959406e95a580858e418794e23e05c47e2 |
17-May-2012 |
Yuli Huang <yuli@google.com> |
Smooth opening animation by modifying interpolation curve. bug:5367032 Change-Id: I15ad839ede723591f081be200c1c16a8a9a901d0
rc/com/android/gallery3d/ui/PositionController.java
|
18a3296347bb975b3bee59d00719896d5d453421 |
17-May-2012 |
Yuli Huang <yuli@google.com> |
am bcfa1b79: Merge "Fix card effect shown in opening animation." into jb-dev * commit 'bcfa1b79930e567c6a52235445c759d37041ed0c': Fix card effect shown in opening animation.
|
327ce0f5baec28a581f562473f6e0dd2ef596a26 |
17-May-2012 |
Yuli Huang <yuli@google.com> |
am bcfa1b79: Merge "Fix card effect shown in opening animation." into jb-dev * commit 'bcfa1b79930e567c6a52235445c759d37041ed0c': Fix card effect shown in opening animation.
|
3b6b379870fa7899a33e7f5fb8d40f4966694216 |
17-May-2012 |
Yuli Huang <yuli@google.com> |
Merge "Fix card effect shown in opening animation." into jb-dev
|
bcfa1b79930e567c6a52235445c759d37041ed0c |
17-May-2012 |
Yuli Huang <yuli@google.com> |
Merge "Fix card effect shown in opening animation." into jb-dev
|
63c6f1b4d367a43772313caa1c8e10e0376de650 |
17-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
am ff6687e6: Merge "Handle layout change between pausing and resuming." into jb-dev * commit 'ff6687e68791b86eeda54194b6bcddffb69651da': Handle layout change between pausing and resuming.
|
585c1c6c4d4741a76fae468262bac021a1e16884 |
17-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
am ff6687e6: Merge "Handle layout change between pausing and resuming." into jb-dev * commit 'ff6687e68791b86eeda54194b6bcddffb69651da': Handle layout change between pausing and resuming.
|
ff6687e68791b86eeda54194b6bcddffb69651da |
17-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
Merge "Handle layout change between pausing and resuming." into jb-dev
|
254805b257148eb1289ac053f332ed1339be0392 |
17-May-2012 |
Owen Lin <owenlin@google.com> |
am cb1a39a2: Merge "Remove the black layer in MovieActivity." into jb-dev * commit 'cb1a39a26ae491185f92cf33fea0205331f8447f': Remove the black layer in MovieActivity.
|
2b1b6b249e8aea9e1f9366de780d3c54f6273304 |
17-May-2012 |
Owen Lin <owenlin@google.com> |
am cb1a39a2: Merge "Remove the black layer in MovieActivity." into jb-dev * commit 'cb1a39a26ae491185f92cf33fea0205331f8447f': Remove the black layer in MovieActivity.
|
cb1a39a26ae491185f92cf33fea0205331f8447f |
17-May-2012 |
Owen Lin <owenlin@google.com> |
Merge "Remove the black layer in MovieActivity." into jb-dev
|
6607de80c095fcd7bdc4fab14cc5a970e661d36e |
17-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
Handle layout change between pausing and resuming. Bug: 6468414 Change-Id: Ib190b620bea5a60f12d6075beaeb3bcd10b87802
rc/com/android/gallery3d/app/PhotoPage.java
|
253c5aec7692afdd7880fbd169d4b44d5679cbc0 |
17-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
Handle layout change between pausing and resuming. Bug: 6468414 Change-Id: Ib190b620bea5a60f12d6075beaeb3bcd10b87802
rc/com/android/gallery3d/app/PhotoPage.java
|
48961c4469c01816fad41d057fca7a02f9b1ae71 |
16-May-2012 |
Owen Lin <owenlin@google.com> |
Fix a dead lock while we freeze the screen. bug: 6504696 Change-Id: If960967142bb0df773ce075bf76f5726c37e1d27
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/ui/GLRoot.java
rc/com/android/gallery3d/ui/GLRootView.java
|
8130925c60b786759e852a6088776c626d8ee0e2 |
16-May-2012 |
Owen Lin <owenlin@google.com> |
Fix a dead lock while we freeze the screen. bug: 6504696 Change-Id: If960967142bb0df773ce075bf76f5726c37e1d27
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/ui/GLRoot.java
rc/com/android/gallery3d/ui/GLRootView.java
|
006151abb689f3abb391ac8ed8fa25d3766d311e |
16-May-2012 |
Owen Lin <owenlin@google.com> |
Remove the black layer in MovieActivity. bug:6491674 Change-Id: I45323fde110b05eda2a342c8f0a85a3ba219d1da
ndroidManifest.xml
|
9c43c104009cbdf65db5d223e173dae9e184713b |
16-May-2012 |
Owen Lin <owenlin@google.com> |
Remove the black layer in MovieActivity. bug:6491674 Change-Id: I45323fde110b05eda2a342c8f0a85a3ba219d1da
es/values/styles.xml
|
a60eac630aa93b986565ed97511e00f7b0e58281 |
16-May-2012 |
Owen Lin <owenlin@google.com> |
Remove the black layer in MovieActivity. bug:6491674 Change-Id: I45323fde110b05eda2a342c8f0a85a3ba219d1da
ndroidManifest.xml
es/values/styles.xml
|
cc77f32f105a1d72b93c2ab40affffbba98d37f2 |
16-May-2012 |
Owen Lin <owenlin@google.com> |
am 46f7f860: Merge "Fix a dead lock while we freeze the screen." into jb-dev * commit '46f7f860ebae5a8f98e3a174a1c3d180d0cbc0ac': Fix a dead lock while we freeze the screen.
|
3b3968b54d766e73da8d43e37d5db8942298b661 |
16-May-2012 |
Owen Lin <owenlin@google.com> |
am 46f7f860: Merge "Fix a dead lock while we freeze the screen." into jb-dev * commit '46f7f860ebae5a8f98e3a174a1c3d180d0cbc0ac': Fix a dead lock while we freeze the screen.
|
46f7f860ebae5a8f98e3a174a1c3d180d0cbc0ac |
16-May-2012 |
Owen Lin <owenlin@google.com> |
Merge "Fix a dead lock while we freeze the screen." into jb-dev
|
48e08e8e420ef49bae62d3875c0b4e103ce56293 |
16-May-2012 |
Owen Lin <owenlin@google.com> |
Merge "Fix a dead lock while we freeze the screen." into jb-dev
|
79cf902f4cc602774e90bc2040f0029978becb61 |
16-May-2012 |
Owen Lin <owenlin@google.com> |
Fix a dead lock while we freeze the screen. bug: 6504696 Change-Id: If960967142bb0df773ce075bf76f5726c37e1d27
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/ui/GLRoot.java
rc/com/android/gallery3d/ui/GLRootView.java
|
40ffdb6244ba8492af8d29dce6d5bacdfd021af6 |
16-May-2012 |
Owen Lin <owenlin@google.com> |
Fix a dead lock while we freeze the screen. bug: 6504696 Change-Id: If960967142bb0df773ce075bf76f5726c37e1d27
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/ui/GLRoot.java
rc/com/android/gallery3d/ui/GLRootView.java
|
0aa77d29b418df8c780eeb45dd844a5a5aa0a20c |
16-May-2012 |
Owen Lin <owenlin@google.com> |
am 20d98161: Merge "Hide the share button if the shared URI is not "content:"." into jb-dev * commit '20d98161df7427042a69ef38014219ac87a53e36': Hide the share button if the shared URI is not "content:".
|
846649046510b9ac75210d7618b2192d40c7a739 |
16-May-2012 |
Owen Lin <owenlin@google.com> |
am 20d98161: Merge "Hide the share button if the shared URI is not "content:"." into jb-dev * commit '20d98161df7427042a69ef38014219ac87a53e36': Hide the share button if the shared URI is not "content:".
|
20d98161df7427042a69ef38014219ac87a53e36 |
16-May-2012 |
Owen Lin <owenlin@google.com> |
Merge "Hide the share button if the shared URI is not "content:"." into jb-dev
|
3f767be06bf17d7391226ef96633e104e25c3697 |
16-May-2012 |
Eric Fischer <enf@google.com> |
Restore deleted string still referenced from menu resource. Change-Id: I518dc004a92ee68682c2085c8d2f002896198feb
es/values/strings.xml
|
faac4c284d470bc5fa380a37a22272a65931cad7 |
16-May-2012 |
Eric Fischer <enf@google.com> |
Restore deleted string still referenced from menu resource. Change-Id: I518dc004a92ee68682c2085c8d2f002896198feb
es/values/strings.xml
|
e4f1caf076a0810f3fc79ff347679f1fe77b0974 |
16-May-2012 |
Eric Fischer <enf@google.com> |
am e832a0ec: am bc8d5327: Restore deleted string still referenced from menu resource. * commit 'e832a0ec023aa22996bd9e488e2a407b84cbe2b9': Restore deleted string still referenced from menu resource.
|
83d4679b0dd7418bc7ffdc42e9e71216de786b8a |
16-May-2012 |
Eric Fischer <enf@google.com> |
am e832a0ec: am bc8d5327: Restore deleted string still referenced from menu resource. * commit 'e832a0ec023aa22996bd9e488e2a407b84cbe2b9': Restore deleted string still referenced from menu resource.
|
3b4f57f9c92b570ae15d496368f67d5b29130287 |
16-May-2012 |
Eric Fischer <enf@google.com> |
am bc8d5327: Restore deleted string still referenced from menu resource. * commit 'bc8d532738a130474969b7bb158848acd9645bf1': Restore deleted string still referenced from menu resource.
|
e832a0ec023aa22996bd9e488e2a407b84cbe2b9 |
16-May-2012 |
Eric Fischer <enf@google.com> |
am bc8d5327: Restore deleted string still referenced from menu resource. * commit 'bc8d532738a130474969b7bb158848acd9645bf1': Restore deleted string still referenced from menu resource.
|
40133f318d373edaf3fcf69fc042e36ea6be645b |
16-May-2012 |
Eric Fischer <enf@google.com> |
Restore deleted string still referenced from menu resource. Change-Id: I518dc004a92ee68682c2085c8d2f002896198feb
es/values/strings.xml
|
bc8d532738a130474969b7bb158848acd9645bf1 |
16-May-2012 |
Eric Fischer <enf@google.com> |
Restore deleted string still referenced from menu resource. Change-Id: I518dc004a92ee68682c2085c8d2f002896198feb
es/values/strings.xml
|
f154141d74c8f8c85ec3e3f44165782ba1576a34 |
16-May-2012 |
Eric Fischer <enf@google.com> |
am 80a45af0: (-s ours) am a30d822e: Import translations. DO NOT MERGE * commit '80a45af063396d4770082b542c29738781f4fbc0': Import translations. DO NOT MERGE
|
205414c9151120e8e1437a57bce398327e008b03 |
16-May-2012 |
Eric Fischer <enf@google.com> |
am 80a45af0: (-s ours) am a30d822e: Import translations. DO NOT MERGE * commit '80a45af063396d4770082b542c29738781f4fbc0': Import translations. DO NOT MERGE
|
abd5b3596f56849f2d93baad98293153b1a3560b |
16-May-2012 |
Eric Fischer <enf@google.com> |
am a30d822e: Import translations. DO NOT MERGE * commit 'a30d822e6034b3182eca341b4e76f5ecaf484e7a': Import translations. DO NOT MERGE
|
80a45af063396d4770082b542c29738781f4fbc0 |
16-May-2012 |
Eric Fischer <enf@google.com> |
am a30d822e: Import translations. DO NOT MERGE * commit 'a30d822e6034b3182eca341b4e76f5ecaf484e7a': Import translations. DO NOT MERGE
|
343cfe1499b0224b9e9179f2a8c83fc0e7facff2 |
16-May-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: I7ce56d9778b2e489bc152e60d5ea9b526701de76
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
9d0a432133dce593a9edf38a04077559c93583e4 |
16-May-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: I7ce56d9778b2e489bc152e60d5ea9b526701de76
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
34e213bc90f2fc7a7e23af44a6b3c6feeead9cd5 |
16-May-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: Ie35416e91d38c143eaa7d2898d60215d534c0ae6
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
a30d822e6034b3182eca341b4e76f5ecaf484e7a |
16-May-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: Ie35416e91d38c143eaa7d2898d60215d534c0ae6
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
ded2316db6f1b2ebd23b68577c8a4a11282118de |
16-May-2012 |
Owen Lin <owenlin@google.com> |
Hide the share button if the shared URI is not "content:". bug:6494818 Change-Id: I70a2997c07c19433cadee34fa348d27445bf2647
rc/com/android/gallery3d/app/MovieActivity.java
|
be055bc0318828029a4bda0e31e9d8e3ce17ca4b |
16-May-2012 |
Owen Lin <owenlin@google.com> |
Hide the share button if the shared URI is not "content:". bug:6494818 Change-Id: I70a2997c07c19433cadee34fa348d27445bf2647
rc/com/android/gallery3d/app/MovieActivity.java
|
0e389e520eaa6671c0033c45f8e712e7882b23be |
16-May-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am ecee3d35: Reconcile with jb-release nakasi-factoryrom-release * commit 'ecee3d356546957d897983827d6388fb0a94aed0': Fix black screen when viewing Gmail image file attachment. Bug: 6415848 Fix crash when select all is pressed. Fix ANR in PhotoPage. Fix SinglePhotoDataAdapter getScreenNail() bug #6176711: guard against null GalleryActionBar.
|
f1fac5b259c1205736cd4545345b77d091214fa8 |
16-May-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am ecee3d35: Reconcile with jb-release nakasi-factoryrom-release * commit 'ecee3d356546957d897983827d6388fb0a94aed0': Fix black screen when viewing Gmail image file attachment. Bug: 6415848 Fix crash when select all is pressed. Fix ANR in PhotoPage. Fix SinglePhotoDataAdapter getScreenNail() bug #6176711: guard against null GalleryActionBar.
|
a1c60d3983c6d22db6011ef0d122078fee53f8e2 |
16-May-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am ecee3d35: Reconcile with jb-release nakasi-factoryrom-release * commit 'ecee3d356546957d897983827d6388fb0a94aed0': Fix black screen when viewing Gmail image file attachment. Bug: 6415848 Fix crash when select all is pressed. Fix ANR in PhotoPage. Fix SinglePhotoDataAdapter getScreenNail() bug #6176711: guard against null GalleryActionBar.
|
454087fe87eedac2ad1523766979e014ca66cbd8 |
16-May-2012 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with jb-release nakasi-factoryrom-release Change-Id: Id2c75aeb60e36d1eab5c884fcc13bd2e1e6fdeaf
|
c0c1b61b8cd30c77e13e43c3694dddf5cefcd820 |
16-May-2012 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with jb-release nakasi-factoryrom-release Change-Id: Id2c75aeb60e36d1eab5c884fcc13bd2e1e6fdeaf
|
ecee3d356546957d897983827d6388fb0a94aed0 |
16-May-2012 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with jb-release nakasi-factoryrom-release Change-Id: Id2c75aeb60e36d1eab5c884fcc13bd2e1e6fdeaf
|
5c2164729a41207a0b617300f67beac006d88ca8 |
16-May-2012 |
The Android Automerger <android-build@android.com> |
merge in nakasi-factoryrom-release history after reset to jb-dev
|
f1afebbd326748ad75c15a1e4b9e1ba0b40526ba |
16-May-2012 |
The Android Automerger <android-build@android.com> |
merge in nakasi-factoryrom-release history after reset to jb-dev
|
8a05e56962634f0dcd980031d5de5bca35498b9e |
16-May-2012 |
The Android Automerger <android-build@android.com> |
merge in nakasi-factoryrom-release history after reset to jb-dev
|
39c6d76e646d1aa4ef28197d108dba58a54ecb42 |
16-May-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to jb-dev
|
1ae90ccf36a074fb84b175c3b43d7868bf8fbcad |
16-May-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to jb-dev
|
1b80dfe8f3287bef6ec2e50c4abc92bb3ad29121 |
16-May-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to jb-dev
|
3c3b07e3a1511e736d5629c2bc4573d34c48f3ec |
15-May-2012 |
Yuli Huang <yuli@google.com> |
Fix card effect shown in opening animation. bug:6495753 Change-Id: I7a640c2dddef0b7c58e0b7d5a00cbc4aab6ec43d
rc/com/android/gallery3d/ui/PhotoView.java
rc/com/android/gallery3d/ui/PositionController.java
|
f320b8429dd5c68c117b8e9b1a36a435f4f4ff13 |
15-May-2012 |
Yuli Huang <yuli@google.com> |
Fix card effect shown in opening animation. bug:6495753 Change-Id: I7a640c2dddef0b7c58e0b7d5a00cbc4aab6ec43d
rc/com/android/gallery3d/ui/PhotoView.java
rc/com/android/gallery3d/ui/PositionController.java
|
949046e8168dbe2d4c66f89fe07b79a2126b56ea |
16-May-2012 |
Yuli Huang <yuli@google.com> |
am 252f5e76: am bd7c016d: Avoid black screen when PhotoPage just starts. * commit '252f5e767194a26323ac9f2a5c6ae6d60f2a7ece': Avoid black screen when PhotoPage just starts.
|
8c4db8d3cce486e0bd8d0f847b0880a75c7c3832 |
16-May-2012 |
Yuli Huang <yuli@google.com> |
am 252f5e76: am bd7c016d: Avoid black screen when PhotoPage just starts. * commit '252f5e767194a26323ac9f2a5c6ae6d60f2a7ece': Avoid black screen when PhotoPage just starts.
|
252f5e767194a26323ac9f2a5c6ae6d60f2a7ece |
16-May-2012 |
Yuli Huang <yuli@google.com> |
am bd7c016d: Avoid black screen when PhotoPage just starts. * commit 'bd7c016d728853d38f98a3c6077b7bd9b08858b9': Avoid black screen when PhotoPage just starts.
|
5d360bf0b8b724743c2daf9a3cadbe2d929e38a1 |
16-May-2012 |
Ray Chen <raychen@google.com> |
am 7b2e7f01: am f284d8f4: Merge "Fix 6470803 De-jank for video playback in fullscreen" into jb-dev * commit '7b2e7f0199b091beceed87e61be03d681529a1a7': Fix 6470803 De-jank for video playback in fullscreen
|
b150db41b601da17993380c36786bb18ee612929 |
16-May-2012 |
Ray Chen <raychen@google.com> |
am 7b2e7f01: am f284d8f4: Merge "Fix 6470803 De-jank for video playback in fullscreen" into jb-dev * commit '7b2e7f0199b091beceed87e61be03d681529a1a7': Fix 6470803 De-jank for video playback in fullscreen
|
74dfd2d16b911dd22f7c18be9467d5b22746b59b |
16-May-2012 |
Ray Chen <raychen@google.com> |
am 88cdee47: am 3349078e: Merge "Fix 6046544: Deleting a photo takes multiple steps and the flow is inconsistent with other deleting flows on other core apps" into jb-dev * commit '88cdee4713e0b338b076dc4e7e36256a9a46fdbd': Fix 6046544: Deleting a photo takes multiple steps and the flow is inconsistent with other deleting flows on other core apps
|
1528197495d782e532cdf8059a0d7953f63c87b6 |
16-May-2012 |
Ray Chen <raychen@google.com> |
am 88cdee47: am 3349078e: Merge "Fix 6046544: Deleting a photo takes multiple steps and the flow is inconsistent with other deleting flows on other core apps" into jb-dev * commit '88cdee4713e0b338b076dc4e7e36256a9a46fdbd': Fix 6046544: Deleting a photo takes multiple steps and the flow is inconsistent with other deleting flows on other core apps
|
4a4bef35a1ebcd36f4831bc8e58d4b1631c22f41 |
16-May-2012 |
Ray Chen <raychen@google.com> |
am 88cdee47: am 3349078e: Merge "Fix 6046544: Deleting a photo takes multiple steps and the flow is inconsistent with other deleting flows on other core apps" into jb-dev * commit '88cdee4713e0b338b076dc4e7e36256a9a46fdbd': Fix 6046544: Deleting a photo takes multiple steps and the flow is inconsistent with other deleting flows on other core apps
|
7b2e7f0199b091beceed87e61be03d681529a1a7 |
16-May-2012 |
Ray Chen <raychen@google.com> |
am f284d8f4: Merge "Fix 6470803 De-jank for video playback in fullscreen" into jb-dev * commit 'f284d8f41ffa15cb7bf0167013700ed21f451fab': Fix 6470803 De-jank for video playback in fullscreen
|
31c4e5421b262a4c3ea40f651f03f71cb7e94f88 |
16-May-2012 |
Ray Chen <raychen@google.com> |
am 3349078e: Merge "Fix 6046544: Deleting a photo takes multiple steps and the flow is inconsistent with other deleting flows on other core apps" into jb-dev * commit '3349078ecd14bb462756c5c1a3a3b594d5b97cb9': Fix 6046544: Deleting a photo takes multiple steps and the flow is inconsistent with other deleting flows on other core apps
|
88cdee4713e0b338b076dc4e7e36256a9a46fdbd |
16-May-2012 |
Ray Chen <raychen@google.com> |
am 3349078e: Merge "Fix 6046544: Deleting a photo takes multiple steps and the flow is inconsistent with other deleting flows on other core apps" into jb-dev * commit '3349078ecd14bb462756c5c1a3a3b594d5b97cb9': Fix 6046544: Deleting a photo takes multiple steps and the flow is inconsistent with other deleting flows on other core apps
|
4fa3d5bb57d166d915225b60e9f659e9c91fb9b3 |
15-May-2012 |
Yuli Huang <yuli@google.com> |
Avoid black screen when PhotoPage just starts. bug:5367032 Change-Id: I6bd56026ec32bcee972d69855966750b9a57cdf4
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/ui/PhotoView.java
rc/com/android/gallery3d/ui/PositionController.java
|
bd7c016d728853d38f98a3c6077b7bd9b08858b9 |
15-May-2012 |
Yuli Huang <yuli@google.com> |
Avoid black screen when PhotoPage just starts. bug:5367032 Change-Id: I6bd56026ec32bcee972d69855966750b9a57cdf4
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/ui/PhotoView.java
rc/com/android/gallery3d/ui/PositionController.java
|
c600cdef0f959fea6b519109466aee6b10bb1e8b |
16-May-2012 |
Ray Chen <raychen@google.com> |
Merge "Fix 6470803 De-jank for video playback in fullscreen" into jb-dev
|
f284d8f41ffa15cb7bf0167013700ed21f451fab |
16-May-2012 |
Ray Chen <raychen@google.com> |
Merge "Fix 6470803 De-jank for video playback in fullscreen" into jb-dev
|
61fac7134e9a452f7fbde7ce2dd2f77e7b7d2dca |
16-May-2012 |
Ray Chen <raychen@google.com> |
Merge "Fix 6046544: Deleting a photo takes multiple steps and the flow is inconsistent with other deleting flows on other core apps" into jb-dev
|
bbc3c68f7d56a1d51169436d7b7fb15ebf73c1ac |
16-May-2012 |
Ray Chen <raychen@google.com> |
Merge "Fix 6046544: Deleting a photo takes multiple steps and the flow is inconsistent with other deleting flows on other core apps" into jb-dev
|
3349078ecd14bb462756c5c1a3a3b594d5b97cb9 |
16-May-2012 |
Ray Chen <raychen@google.com> |
Merge "Fix 6046544: Deleting a photo takes multiple steps and the flow is inconsistent with other deleting flows on other core apps" into jb-dev
|
ced68f1594d9feb867ab2514eff5f82404f61f69 |
15-May-2012 |
Ray Chen <raychen@google.com> |
Fix 6046544: Deleting a photo takes multiple steps and the flow is inconsistent with other deleting flows on other core apps Per request, change the confirm dialog message to "Delete the selected item(s)?" b: 6046544 Change-Id: I46f7fd42a9f9fbf2399aca78ed9b2e67a15acb65
es/values/strings.xml
|
9ad7d738bd36217c85222865cf0bd539dd31a716 |
15-May-2012 |
Ray Chen <raychen@google.com> |
Fix 6046544: Deleting a photo takes multiple steps and the flow is inconsistent with other deleting flows on other core apps Per request, change the confirm dialog message to "Delete the selected item(s)?" b: 6046544 Change-Id: I46f7fd42a9f9fbf2399aca78ed9b2e67a15acb65
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/ui/ActionModeHandler.java
rc/com/android/gallery3d/ui/MenuExecutor.java
|
9a033b07b8e0d9fe7419b7a0d876e9c7febf43c8 |
15-May-2012 |
Ray Chen <raychen@google.com> |
Fix 6046544: Deleting a photo takes multiple steps and the flow is inconsistent with other deleting flows on other core apps Per request, change the confirm dialog message to "Delete the selected item(s)?" b: 6046544 Change-Id: I46f7fd42a9f9fbf2399aca78ed9b2e67a15acb65
es/values/strings.xml
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/ui/ActionModeHandler.java
rc/com/android/gallery3d/ui/MenuExecutor.java
|
6e2500f6566284d7c7a39d21d753562263eb1ea9 |
16-May-2012 |
Owen Lin <owenlin@google.com> |
am 787d57a7: am 65ebe2f7: Merge "Add animation for the paddings in SlotView." into jb-dev * commit '787d57a7ed44cde0a74bccca013b5b8f323748dd': Add animation for the paddings in SlotView.
|
222bce32cef3df332a6cdae8b90511b82891eb06 |
16-May-2012 |
Owen Lin <owenlin@google.com> |
am 787d57a7: am 65ebe2f7: Merge "Add animation for the paddings in SlotView." into jb-dev * commit '787d57a7ed44cde0a74bccca013b5b8f323748dd': Add animation for the paddings in SlotView.
|
787d57a7ed44cde0a74bccca013b5b8f323748dd |
16-May-2012 |
Owen Lin <owenlin@google.com> |
am 65ebe2f7: Merge "Add animation for the paddings in SlotView." into jb-dev * commit '65ebe2f71fea25ef8a770fbc08af8cc29d80c20d': Add animation for the paddings in SlotView.
|
65ebe2f71fea25ef8a770fbc08af8cc29d80c20d |
16-May-2012 |
Owen Lin <owenlin@google.com> |
Merge "Add animation for the paddings in SlotView." into jb-dev
|
6e9d5b044a8342f130c5d13cf14eb31fe74c5764 |
16-May-2012 |
Eric Fischer <enf@google.com> |
am 59d2a10f: (-s ours) am 66e52983: Import translations. DO NOT MERGE * commit '59d2a10fbe082fbeb82573af08fc6445dfd90469': Import translations. DO NOT MERGE
|
8bb62821015a6e8a4ab33a55695565fe9156204f |
16-May-2012 |
Eric Fischer <enf@google.com> |
am 59d2a10f: (-s ours) am 66e52983: Import translations. DO NOT MERGE * commit '59d2a10fbe082fbeb82573af08fc6445dfd90469': Import translations. DO NOT MERGE
|
08ef43c2c672c051f55b2fba76495b3549c538e0 |
16-May-2012 |
Eric Fischer <enf@google.com> |
am 66e52983: Import translations. DO NOT MERGE * commit '66e5298344f12aeb1a652f8731609f7959e15385': Import translations. DO NOT MERGE
|
59d2a10fbe082fbeb82573af08fc6445dfd90469 |
16-May-2012 |
Eric Fischer <enf@google.com> |
am 66e52983: Import translations. DO NOT MERGE * commit '66e5298344f12aeb1a652f8731609f7959e15385': Import translations. DO NOT MERGE
|
dd930a59e3f6783b2b5bfa154b26506ef0df6873 |
16-May-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: Ie14d3f0aef0ada917b7de6b4176d442565ae9b3a
es/values-ko/strings.xml
|
c46beb501f519fab926141902a5b8e49cdb7f62f |
16-May-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: Ie14d3f0aef0ada917b7de6b4176d442565ae9b3a
es/values-ko/strings.xml
|
1ef94e73cc5516e4f4761206c3ce970677f524d0 |
16-May-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: If6a4cfc400038645f49db5604b6bd58b5207aa96
es/values-ko/strings.xml
|
66e5298344f12aeb1a652f8731609f7959e15385 |
16-May-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: If6a4cfc400038645f49db5604b6bd58b5207aa96
es/values-ko/strings.xml
|
f5b3e0d196a6ac9b1daa93d7e298fbe890c30982 |
15-May-2012 |
The Android Automerger <android-build@android.com> |
merge in nakasi-factoryrom-release history after reset to jb-dev
|
1f696e1762a4da0494ef129515e5391bdac7ce65 |
15-May-2012 |
The Android Automerger <android-build@android.com> |
merge in nakasi-factoryrom-release history after reset to jb-dev
|
5e4f3700610220e1d37ab6f23fb9ca457ebf13e9 |
15-May-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to jb-dev
|
c4e3a48633189acaa3253bba33ee2e35b847ae77 |
15-May-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to jb-dev
|
31ff9c402fa14b8697f1bfa8a91912b22169f0c4 |
15-May-2012 |
Eric Fischer <enf@google.com> |
am 5cd229b3: (-s ours) am 00af9fc9: Import translations. DO NOT MERGE * commit '5cd229b367037fded6eae9fa3a328a9ab4f52508': Import translations. DO NOT MERGE
|
48243334070e66872daeb667f4697ccd6c1020fb |
15-May-2012 |
Eric Fischer <enf@google.com> |
am 5cd229b3: (-s ours) am 00af9fc9: Import translations. DO NOT MERGE * commit '5cd229b367037fded6eae9fa3a328a9ab4f52508': Import translations. DO NOT MERGE
|
d7c2c4bf2c689949a3b0202826b0f465a2926cc9 |
15-May-2012 |
Eric Fischer <enf@google.com> |
am 00af9fc9: Import translations. DO NOT MERGE * commit '00af9fc9bc8a2eefd3e506ce23fc00c67b1c8be9': Import translations. DO NOT MERGE
|
5cd229b367037fded6eae9fa3a328a9ab4f52508 |
15-May-2012 |
Eric Fischer <enf@google.com> |
am 00af9fc9: Import translations. DO NOT MERGE * commit '00af9fc9bc8a2eefd3e506ce23fc00c67b1c8be9': Import translations. DO NOT MERGE
|
369800f4be526fe460d2089c03359a2db3cb59df |
14-May-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: I0a3057ba775776b9148af3e9ab7fd302f21cb8c0
es/values-cs/strings.xml
|
5ac531134bf4e23ac136282ba36b2a88d485af02 |
14-May-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: I0a3057ba775776b9148af3e9ab7fd302f21cb8c0
es/values-cs/strings.xml
|
74521a3b3475bf480f4a55a716a722461cedecce |
14-May-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: Ic6c64cb7f77eeae21d806cd2bcf0c72784fb433a
es/values-cs/strings.xml
|
00af9fc9bc8a2eefd3e506ce23fc00c67b1c8be9 |
14-May-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: Ic6c64cb7f77eeae21d806cd2bcf0c72784fb433a
es/values-cs/strings.xml
|
c88fabf51e67d1ff83f4b6439cb135b6b877898a |
09-May-2012 |
Owen Lin <owenlin@google.com> |
Add animation for the paddings in SlotView. bug:6383118 Change-Id: I034be207f73b027de448cef562a534f986d0cbe1
rc/com/android/gallery3d/ui/SlotView.java
|
83f88ad1c72ae24acc5e78efc93c1e09e1c70c97 |
09-May-2012 |
Owen Lin <owenlin@google.com> |
Add animation for the paddings in SlotView. bug:6383118 Change-Id: I034be207f73b027de448cef562a534f986d0cbe1
rc/com/android/gallery3d/ui/SlotView.java
|
295776f8a02bb6dfb7f84b22bbf3f71065a66f0d |
14-May-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to jb-dev
|
a0b5058ead113e9022362582dba8512de4c82442 |
14-May-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to jb-dev
|
c07003d543a9b2b28dd152372e5355789ef1772e |
14-May-2012 |
Ray Chen <raychen@google.com> |
Fix 6479216 Playing a video should go full-screen first Change-Id: I7b1d2bd28531ec4fd4b65862122cf058ef69066e b: 6479216
rc/com/android/gallery3d/app/MoviePlayer.java
|
392a29210937c16a9086450bcfb98d1c61b0d87e |
14-May-2012 |
Ray Chen <raychen@google.com> |
Fix 6479216 Playing a video should go full-screen first Change-Id: I7b1d2bd28531ec4fd4b65862122cf058ef69066e b: 6479216
rc/com/android/gallery3d/app/MoviePlayer.java
|
9617f47a1b307299d98644f54ea5b20839dae615 |
11-May-2012 |
Ray Chen <raychen@google.com> |
Fix 6470803 De-jank for video playback in fullscreen b: 6470803 Change-Id: I91fd8430c34e84eac45c33070f0f571627e96820
rc/com/android/gallery3d/app/MovieActivity.java
rc/com/android/gallery3d/app/MovieControllerOverlay.java
|
43650c63eb751a367ff0d75af152d0b244c0e748 |
11-May-2012 |
Ray Chen <raychen@google.com> |
Fix 6470803 De-jank for video playback in fullscreen b: 6470803 Change-Id: I91fd8430c34e84eac45c33070f0f571627e96820
rc/com/android/gallery3d/app/MovieActivity.java
rc/com/android/gallery3d/app/MovieControllerOverlay.java
|
f781e93fbf8cd317d67b8cd41d04553f7e3aceb1 |
11-May-2012 |
Wu-cheng Li <wuchengli@google.com> |
am 697069a9: am 666f6f11: Merge "Remove behind screenOrientation from camera activities." into jb-dev * commit '697069a9bed362fff120b28d5e87b3345b0e370a': Remove behind screenOrientation from camera activities.
|
697069a9bed362fff120b28d5e87b3345b0e370a |
11-May-2012 |
Wu-cheng Li <wuchengli@google.com> |
am 666f6f11: Merge "Remove behind screenOrientation from camera activities." into jb-dev * commit '666f6f11e8019bb3ebc84010cf74a85e9e2019ca': Remove behind screenOrientation from camera activities.
|
666f6f11e8019bb3ebc84010cf74a85e9e2019ca |
11-May-2012 |
Wu-cheng Li <wuchengli@google.com> |
Merge "Remove behind screenOrientation from camera activities." into jb-dev
|
6ccc663f84b42ba4dde0982fb7b22f2a556c4e96 |
11-May-2012 |
Wu-cheng Li <wuchengli@google.com> |
Remove behind screenOrientation from camera activities. Camera has both landscape and portrait layouts. Screen orientation will be set in onCreate. "behind" is not needed anymore. bug:6480864 Change-Id: I6fe3bbe85addf30bae0d037fdddd0ee8569238de
ndroidManifest.xml
|
b1e38ecd7a9dd67fd34c5fd481e751c40909ba26 |
11-May-2012 |
Wu-cheng Li <wuchengli@google.com> |
Remove behind screenOrientation from camera activities. Camera has both landscape and portrait layouts. Screen orientation will be set in onCreate. "behind" is not needed anymore. bug:6480864 Change-Id: I6fe3bbe85addf30bae0d037fdddd0ee8569238de
ndroidManifest.xml
|
7cfdb7c330635c7cc737098d6c49450bd7511600 |
11-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
am 218c3de8: am 6033e075: Merge "Better data change handling for PhotoDataAdapter and PhotoView." into jb-dev * commit '218c3de8e1cf515752fe2fa4700c34267fc38eb5': Better data change handling for PhotoDataAdapter and PhotoView.
|
249693ae621a1f7626147d075679edc9f1547e05 |
11-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
am 218c3de8: am 6033e075: Merge "Better data change handling for PhotoDataAdapter and PhotoView." into jb-dev * commit '218c3de8e1cf515752fe2fa4700c34267fc38eb5': Better data change handling for PhotoDataAdapter and PhotoView.
|
218c3de8e1cf515752fe2fa4700c34267fc38eb5 |
11-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
am 6033e075: Merge "Better data change handling for PhotoDataAdapter and PhotoView." into jb-dev * commit '6033e0754ee1e1270cef74e12e40a4f9f2408e91': Better data change handling for PhotoDataAdapter and PhotoView.
|
d88db1dbe50b9e147d7d5796e82f0c7bffb03ccb |
11-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
Merge "Better data change handling for PhotoDataAdapter and PhotoView." into jb-dev
|
6033e0754ee1e1270cef74e12e40a4f9f2408e91 |
11-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
Merge "Better data change handling for PhotoDataAdapter and PhotoView." into jb-dev
|
c31bda66b05eae587fd86f758e2bd7ce30c58394 |
11-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
Better data change handling for PhotoDataAdapter and PhotoView. Change-Id: I0f67d918b95000d10786d2035286e036346bfa4e
rc/com/android/gallery3d/app/PhotoDataAdapter.java
rc/com/android/gallery3d/data/LocalImage.java
rc/com/android/gallery3d/ui/PhotoView.java
|
214993dc4abf87c386123af50e3c34184ba11cb6 |
11-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
Better data change handling for PhotoDataAdapter and PhotoView. Change-Id: I0f67d918b95000d10786d2035286e036346bfa4e
rc/com/android/gallery3d/app/PhotoDataAdapter.java
rc/com/android/gallery3d/data/LocalImage.java
rc/com/android/gallery3d/ui/PhotoView.java
|
2c1f616fa1e9efe6f3c2b0daea21c60ca04d517b |
11-May-2012 |
Owen Lin <owenlin@google.com> |
am 35f941db: am da438c77: Merge "Make sure we won\'t upload recycled bitmap." into jb-dev * commit '35f941db269314bc8c866e1ced2de17fd7686c03': Make sure we won't upload recycled bitmap.
|
fd7f32146ee580d70ba06cea63c3eda3a09d7e20 |
11-May-2012 |
Owen Lin <owenlin@google.com> |
am 35f941db: am da438c77: Merge "Make sure we won\'t upload recycled bitmap." into jb-dev * commit '35f941db269314bc8c866e1ced2de17fd7686c03': Make sure we won't upload recycled bitmap.
|
35f941db269314bc8c866e1ced2de17fd7686c03 |
11-May-2012 |
Owen Lin <owenlin@google.com> |
am da438c77: Merge "Make sure we won\'t upload recycled bitmap." into jb-dev * commit 'da438c77120c0ec5a626f78c5dc48dc1c2b0ea26': Make sure we won't upload recycled bitmap.
|
da438c77120c0ec5a626f78c5dc48dc1c2b0ea26 |
11-May-2012 |
Owen Lin <owenlin@google.com> |
Merge "Make sure we won't upload recycled bitmap." into jb-dev
|
97c7b4364de1b1473e8c32449d69bbff2125d503 |
11-May-2012 |
Owen Lin <owenlin@google.com> |
Merge "Make sure we won't upload recycled bitmap." into jb-dev
|
cde543cdd536c2f3126d1fcd03a3f4b23d15496c |
10-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
am dc65d3ac: am d2e409d1: Merge "Add freeze/unfreeze for GLRootView." into jb-dev * commit 'dc65d3acb83600b2d9b1f553152ef0701e1eda46': Add freeze/unfreeze for GLRootView.
|
9ba034a326a8159a7a94e8db4ecbaccc62a64bfb |
10-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
am dc65d3ac: am d2e409d1: Merge "Add freeze/unfreeze for GLRootView." into jb-dev * commit 'dc65d3acb83600b2d9b1f553152ef0701e1eda46': Add freeze/unfreeze for GLRootView.
|
adf5e127660613677b6e298c1ff48eeb73400411 |
10-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
am c421de27: am 91c1435e: Merge "Handle ScreenNail size change." into jb-dev * commit 'c421de27ddd1330732e5f3ceddd4136cb1e27520': Handle ScreenNail size change.
|
6f804596bacd0a8aa23fed65f11c099e0f5c4798 |
10-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
am c421de27: am 91c1435e: Merge "Handle ScreenNail size change." into jb-dev * commit 'c421de27ddd1330732e5f3ceddd4136cb1e27520': Handle ScreenNail size change.
|
dc65d3acb83600b2d9b1f553152ef0701e1eda46 |
10-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
am d2e409d1: Merge "Add freeze/unfreeze for GLRootView." into jb-dev * commit 'd2e409d1dd54160483edac3a420f59bc5d83fcc6': Add freeze/unfreeze for GLRootView.
|
c421de27ddd1330732e5f3ceddd4136cb1e27520 |
10-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
am 91c1435e: Merge "Handle ScreenNail size change." into jb-dev * commit '91c1435ea3a25a7c0e071ecf378ed58690b8a650': Handle ScreenNail size change.
|
2818f88c3b6a1d49a757672f6a91c3d766866219 |
10-May-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to jb-dev
|
60403e4569d32ea1a7cb5cb32580587734d2bf10 |
10-May-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to jb-dev
|
d2e409d1dd54160483edac3a420f59bc5d83fcc6 |
10-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
Merge "Add freeze/unfreeze for GLRootView." into jb-dev
|
98695cc43fdf82be53495957541af584d9b6c4d3 |
10-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
Merge "Add freeze/unfreeze for GLRootView." into jb-dev
|
34e6b587229c4863bb805859d9515abecd8abc5d |
10-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
Add freeze/unfreeze for GLRootView. Change-Id: Ieb78041fea22b064d176ea1318cf5883d5d4c94f
rc/com/android/gallery3d/ui/GLRoot.java
rc/com/android/gallery3d/ui/GLRootView.java
ests/src/com/android/gallery3d/ui/GLRootMock.java
ests/src/com/android/gallery3d/ui/GLRootStub.java
|
1ade1266d8e13830e3b07c1ebd8c95f4e859e129 |
10-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
Add freeze/unfreeze for GLRootView. Change-Id: Ieb78041fea22b064d176ea1318cf5883d5d4c94f
rc/com/android/gallery3d/ui/GLRoot.java
rc/com/android/gallery3d/ui/GLRootView.java
ests/src/com/android/gallery3d/ui/GLRootMock.java
ests/src/com/android/gallery3d/ui/GLRootStub.java
|
5db5972e81694b2aa2f945d197d1bbd73a4ec7a7 |
10-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
Merge "Handle ScreenNail size change." into jb-dev
|
91c1435ea3a25a7c0e071ecf378ed58690b8a650 |
10-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
Merge "Handle ScreenNail size change." into jb-dev
|
e7f3b19cec67d89b7542eda305ad19967324924b |
10-May-2012 |
Eric Fischer <enf@google.com> |
Merge "Import translations. DO NOT MERGE"
|
db3a87b35c6a52f503cc771d945130ed24e730bd |
10-May-2012 |
Eric Fischer <enf@google.com> |
Merge "Import translations. DO NOT MERGE"
|
c8a643b350eb075cb3c67ddb743fc6570ba87c58 |
09-May-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: I649abc52094a6ce50c33f8b83bdb5bee4331f31d
es/values-af/photoeditor_strings.xml
es/values-fa/photoeditor_strings.xml
es/values-in/photoeditor_strings.xml
es/values-ms/photoeditor_strings.xml
es/values-pl/photoeditor_strings.xml
es/values-zh-rCN/photoeditor_strings.xml
|
f87bb236af2275180df1b378e00e3b20d6bfdd2c |
09-May-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: I649abc52094a6ce50c33f8b83bdb5bee4331f31d
es/values-af/photoeditor_strings.xml
es/values-fa/photoeditor_strings.xml
es/values-in/photoeditor_strings.xml
es/values-ms/photoeditor_strings.xml
es/values-pl/photoeditor_strings.xml
es/values-zh-rCN/photoeditor_strings.xml
|
9eddd6b1b81c34ef446bde1a6821431cd667ed1d |
09-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
am 30c328de: am 7b6ce039: Merge "Revert "Fix 6360834 Select All is shown in place of Deselect all option"" into jb-dev * commit '30c328de909a17068dbbb7f972e5b3fabb2d1419': Revert "Fix 6360834 Select All is shown in place of Deselect all option"
|
94305f1ca23da013dee7d14a5453b6f38eb83be8 |
09-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
am 30c328de: am 7b6ce039: Merge "Revert "Fix 6360834 Select All is shown in place of Deselect all option"" into jb-dev * commit '30c328de909a17068dbbb7f972e5b3fabb2d1419': Revert "Fix 6360834 Select All is shown in place of Deselect all option"
|
f50138112206aa2a56de202738d5ff0e96339365 |
09-May-2012 |
Hung-ying Tyan <tyanh@google.com> |
am 43db778f: am c2f441dc: Merge "Mark FileCache initialized after init really goes through." into jb-dev * commit '43db778f6b5206b2c9e3a429f0fefccd98b87d0a': Mark FileCache initialized after init really goes through.
|
5b8cf3a7a4b3c066f1be4f88813b7f889474786d |
09-May-2012 |
Hung-ying Tyan <tyanh@google.com> |
am 43db778f: am c2f441dc: Merge "Mark FileCache initialized after init really goes through." into jb-dev * commit '43db778f6b5206b2c9e3a429f0fefccd98b87d0a': Mark FileCache initialized after init really goes through.
|
29e406b7d1873d75cf0e352dccf1265d9383cafe |
09-May-2012 |
Ray Chen <raychen@google.com> |
am d48bc97b: am 11a3c9c6: Merge "Fix 6360834 Select All is shown in place of Deselect all option" into jb-dev * commit 'd48bc97be8709cc227b0f82f1296fd5b98932c2c': Fix 6360834 Select All is shown in place of Deselect all option
|
0b0a398978a3177fde1a3f5159a587a66d36dfb8 |
09-May-2012 |
Ray Chen <raychen@google.com> |
am d48bc97b: am 11a3c9c6: Merge "Fix 6360834 Select All is shown in place of Deselect all option" into jb-dev * commit 'd48bc97be8709cc227b0f82f1296fd5b98932c2c': Fix 6360834 Select All is shown in place of Deselect all option
|
971f76b52c438599180b60e3586e378866ed20e3 |
09-May-2012 |
Yuli Huang <yuli@google.com> |
am 4f7f1090: am 78d5dac0: Crop-image doesn\'t show its title in the action-bar. * commit '4f7f109070a8940dfa7e1992a9f7e2fec6e4bf00': Crop-image doesn't show its title in the action-bar.
|
4a010586322cd88cb8c3f5b26decce132639c01f |
09-May-2012 |
Yuli Huang <yuli@google.com> |
am 4f7f1090: am 78d5dac0: Crop-image doesn\'t show its title in the action-bar. * commit '4f7f109070a8940dfa7e1992a9f7e2fec6e4bf00': Crop-image doesn't show its title in the action-bar.
|
0ab0ad778844a5d5ed54b24146a2c47aa2b76139 |
09-May-2012 |
Eric Fischer <enf@google.com> |
am e722b26f: (-s ours) am b79e7627: Import translations. DO NOT MERGE * commit 'e722b26f8544f6a5cac701e30490c7de5bddd30e': Import translations. DO NOT MERGE
|
4f606dc0cf15478c493359061fecf7149248a0a1 |
09-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
am 8bd75ae0: am 2ef46ed2: Better orientation change handling. * commit '8bd75ae0a35105eddb885f6377d73d26159b8820': Better orientation change handling.
|
dcbc37140a7756bfedfa28daa5b88f67432d3ba6 |
09-May-2012 |
Eric Fischer <enf@google.com> |
am e722b26f: (-s ours) am b79e7627: Import translations. DO NOT MERGE * commit 'e722b26f8544f6a5cac701e30490c7de5bddd30e': Import translations. DO NOT MERGE
|
6400d4f494c8ddefed4741135ff1cf3780f3d202 |
09-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
am 8bd75ae0: am 2ef46ed2: Better orientation change handling. * commit '8bd75ae0a35105eddb885f6377d73d26159b8820': Better orientation change handling.
|
be5cf54e8c08224701c7a385ec632ff2b3e435d6 |
09-May-2012 |
Owen Lin <owenlin@google.com> |
am 2c7dccde: am ec9a0335: Keep the last page if finish() is rejected. * commit '2c7dccde7734643fd6e1a68b769c383c587b7601': Keep the last page if finish() is rejected.
|
442109eb23d52b080cb3f7780453e3eb746d6595 |
09-May-2012 |
Owen Lin <owenlin@google.com> |
am 2c7dccde: am ec9a0335: Keep the last page if finish() is rejected. * commit '2c7dccde7734643fd6e1a68b769c383c587b7601': Keep the last page if finish() is rejected.
|
1a780ac7076f7d192c3e151d7224bb5f604b1294 |
09-May-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to jb-dev
|
23342ce3a4bf5a84aa041239826e512fad0dff71 |
09-May-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to jb-dev
|
731b7679ee1b4182cf0986f08da847feee51635c |
09-May-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to jb-dev
|
82f7ac999aae05b251cfe2c886020780832cd4a3 |
09-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
Handle ScreenNail size change. Bug: 6355399 Change-Id: Ice7560c12aa06cf8ac58cc3883f0888b5c6e71a5
rc/com/android/gallery3d/app/AppBridge.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/data/SnailAlbum.java
rc/com/android/gallery3d/data/SnailItem.java
rc/com/android/gallery3d/data/SnailSource.java
rc/com/android/gallery3d/ui/PhotoView.java
|
3b4a8aeb0353fa18a2b5267b3952a80a6c6d4d13 |
09-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
Handle ScreenNail size change. Bug: 6355399 Change-Id: Ice7560c12aa06cf8ac58cc3883f0888b5c6e71a5
rc/com/android/gallery3d/app/AppBridge.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/data/SnailAlbum.java
rc/com/android/gallery3d/data/SnailItem.java
rc/com/android/gallery3d/data/SnailSource.java
rc/com/android/gallery3d/ui/PhotoView.java
|
30c328de909a17068dbbb7f972e5b3fabb2d1419 |
09-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
am 7b6ce039: Merge "Revert "Fix 6360834 Select All is shown in place of Deselect all option"" into jb-dev * commit '7b6ce03945499a76fd888058a1e6092c34ba8d67': Revert "Fix 6360834 Select All is shown in place of Deselect all option"
|
037a86ecbf4d01ca6036a86170ce569a6f212fa4 |
09-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
Merge "Revert "Fix 6360834 Select All is shown in place of Deselect all option"" into jb-dev
|
7b6ce03945499a76fd888058a1e6092c34ba8d67 |
09-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
Merge "Revert "Fix 6360834 Select All is shown in place of Deselect all option"" into jb-dev
|
f1fa189ae1bb1c26ed8e06ce4ed19d4804d75d7d |
09-May-2012 |
Ray Chen <raychen@google.com> |
Revert "Fix 6360834 Select All is shown in place of Deselect all option" This reverts commit c90170e80b934700c3e2b9978374fb73a910f68c.
rc/com/android/gallery3d/app/AlbumSetPage.java
rc/com/android/gallery3d/ui/ActionModeHandler.java
rc/com/android/gallery3d/ui/SelectionManager.java
|
e99a6ba365b388985bb5f4238002d90c2df28251 |
09-May-2012 |
Ray Chen <raychen@google.com> |
Revert "Fix 6360834 Select All is shown in place of Deselect all option" This reverts commit c90170e80b934700c3e2b9978374fb73a910f68c.
rc/com/android/gallery3d/app/AlbumSetPage.java
rc/com/android/gallery3d/ui/ActionModeHandler.java
rc/com/android/gallery3d/ui/SelectionManager.java
|
43db778f6b5206b2c9e3a429f0fefccd98b87d0a |
09-May-2012 |
Hung-ying Tyan <tyanh@google.com> |
am c2f441dc: Merge "Mark FileCache initialized after init really goes through." into jb-dev * commit 'c2f441dc1ed400dc446240e9360eeff3d8c8f07c': Mark FileCache initialized after init really goes through.
|
d48bc97be8709cc227b0f82f1296fd5b98932c2c |
09-May-2012 |
Ray Chen <raychen@google.com> |
am 11a3c9c6: Merge "Fix 6360834 Select All is shown in place of Deselect all option" into jb-dev * commit '11a3c9c68185f05eb390697f5c037c6000aea6de': Fix 6360834 Select All is shown in place of Deselect all option
|
4f7f109070a8940dfa7e1992a9f7e2fec6e4bf00 |
09-May-2012 |
Yuli Huang <yuli@google.com> |
am 78d5dac0: Crop-image doesn\'t show its title in the action-bar. * commit '78d5dac00fd19fdc34269aae7653f9f4839dc357': Crop-image doesn't show its title in the action-bar.
|
05928cf201c1e3b5491e6dd8a3277fe687b57bfc |
09-May-2012 |
Eric Fischer <enf@google.com> |
am b79e7627: Import translations. DO NOT MERGE * commit 'b79e762798b55d6551c5b78ec09c8234415ac3b5': Import translations. DO NOT MERGE
|
e722b26f8544f6a5cac701e30490c7de5bddd30e |
09-May-2012 |
Eric Fischer <enf@google.com> |
am b79e7627: Import translations. DO NOT MERGE * commit 'b79e762798b55d6551c5b78ec09c8234415ac3b5': Import translations. DO NOT MERGE
|
8bd75ae0a35105eddb885f6377d73d26159b8820 |
09-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
am 2ef46ed2: Better orientation change handling. * commit '2ef46ed28b28b355d7f3f1432c7b1196b832a859': Better orientation change handling.
|
2c7dccde7734643fd6e1a68b769c383c587b7601 |
09-May-2012 |
Owen Lin <owenlin@google.com> |
am ec9a0335: Keep the last page if finish() is rejected. * commit 'ec9a033559f34e5407387cb7d095aee27ddc337b': Keep the last page if finish() is rejected.
|
cfe6f453dc7f03785a36a4a1f936fc202b2a6954 |
09-May-2012 |
Hung-ying Tyan <tyanh@google.com> |
Merge "Mark FileCache initialized after init really goes through." into jb-dev
|
c2f441dc1ed400dc446240e9360eeff3d8c8f07c |
09-May-2012 |
Hung-ying Tyan <tyanh@google.com> |
Merge "Mark FileCache initialized after init really goes through." into jb-dev
|
de31f23381b248f3141242a8e4906023a949e898 |
09-May-2012 |
Owen Lin <owenlin@google.com> |
Make sure we won't upload recycled bitmap. bug: 6465117 Change-Id: I97553ba9da0256cfedde3a5752224380b1a3ee6f
rc/com/android/gallery3d/ui/AlbumSetSlidingWindow.java
rc/com/android/gallery3d/ui/AlbumSlidingWindow.java
rc/com/android/gallery3d/ui/TextureUploader.java
|
5bde7b562ec039f392e31a0cf39787a3e466be93 |
09-May-2012 |
Owen Lin <owenlin@google.com> |
Make sure we won't upload recycled bitmap. bug: 6465117 Change-Id: I97553ba9da0256cfedde3a5752224380b1a3ee6f
rc/com/android/gallery3d/ui/AlbumSetSlidingWindow.java
rc/com/android/gallery3d/ui/AlbumSlidingWindow.java
rc/com/android/gallery3d/ui/TextureUploader.java
|
6af26aeeea3ad7b4b06aa785dee00d47f0b29f5f |
09-May-2012 |
Ray Chen <raychen@google.com> |
Merge "Fix 6360834 Select All is shown in place of Deselect all option" into jb-dev
|
11a3c9c68185f05eb390697f5c037c6000aea6de |
09-May-2012 |
Ray Chen <raychen@google.com> |
Merge "Fix 6360834 Select All is shown in place of Deselect all option" into jb-dev
|
ebf0f78490f851766f643d3d45fa351f4e92e091 |
09-May-2012 |
Yuli Huang <yuli@google.com> |
Crop-image doesn't show its title in the action-bar. bug:6464608 Change-Id: I7b463beaa96f5f475812ec4f0c3de1118a6d0895
rc/com/android/gallery3d/app/CropImage.java
|
78d5dac00fd19fdc34269aae7653f9f4839dc357 |
09-May-2012 |
Yuli Huang <yuli@google.com> |
Crop-image doesn't show its title in the action-bar. bug:6464608 Change-Id: I7b463beaa96f5f475812ec4f0c3de1118a6d0895
rc/com/android/gallery3d/app/CropImage.java
|
e046da1460d216f6267c6b9fe2e978aeff486be2 |
09-May-2012 |
Hung-ying Tyan <tyanh@google.com> |
Mark FileCache initialized after init really goes through. Bug: 5988196 Change-Id: Ia826ce6a33c200a2cd09c21d7ef22f4dd161caa9
allerycommon/src/com/android/gallery3d/common/FileCache.java
|
6ba7a26bbb0b53eaced67714a6652ebdec74ac4a |
09-May-2012 |
Hung-ying Tyan <tyanh@google.com> |
Mark FileCache initialized after init really goes through. Bug: 5988196 Change-Id: Ia826ce6a33c200a2cd09c21d7ef22f4dd161caa9
allerycommon/src/com/android/gallery3d/common/FileCache.java
|
b1c26fab4316980663e50f49d617e6e14d340c74 |
09-May-2012 |
Hung-ying Tyan <tyanh@google.com> |
Mark FileCache initialized after init really goes through. Bug: 5988196 Change-Id: Ia826ce6a33c200a2cd09c21d7ef22f4dd161caa9
allerycommon/src/com/android/gallery3d/common/FileCache.java
|
e7a49195b7f65237668edbae3b5af1335d0aae66 |
03-May-2012 |
Ray Chen <raychen@google.com> |
Fix 6360834 Select All is shown in place of Deselect all option The CL changes the SelectionManager's toggle method so it changes itself to inverse selection mode when all items are already selected, and onSelectionModeChange will be triggered so the listener can update the selection menu (Select all/Deselect all) and ActionBar. Change-Id: I570a299cc8fd7d1d5acab948f9c6531a9adde486 b: 6360834
rc/com/android/gallery3d/app/AlbumSetPage.java
rc/com/android/gallery3d/ui/ActionModeHandler.java
rc/com/android/gallery3d/ui/SelectionManager.java
|
c90170e80b934700c3e2b9978374fb73a910f68c |
03-May-2012 |
Ray Chen <raychen@google.com> |
Fix 6360834 Select All is shown in place of Deselect all option The CL changes the SelectionManager's toggle method so it changes itself to inverse selection mode when all items are already selected, and onSelectionModeChange will be triggered so the listener can update the selection menu (Select all/Deselect all) and ActionBar. Change-Id: I570a299cc8fd7d1d5acab948f9c6531a9adde486 b: 6360834
rc/com/android/gallery3d/app/AlbumSetPage.java
rc/com/android/gallery3d/ui/ActionModeHandler.java
rc/com/android/gallery3d/ui/SelectionManager.java
|
7692880cbae4fc7a08c9aa26d424e3567596ccb4 |
08-May-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: I92195544c0e69468c5aab4e7132d6e5d8ce53945
es/values-af/photoeditor_strings.xml
es/values-fa/photoeditor_strings.xml
es/values-in/photoeditor_strings.xml
es/values-ms/photoeditor_strings.xml
es/values-pl/photoeditor_strings.xml
es/values-zh-rCN/photoeditor_strings.xml
|
b79e762798b55d6551c5b78ec09c8234415ac3b5 |
08-May-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: I92195544c0e69468c5aab4e7132d6e5d8ce53945
es/values-af/photoeditor_strings.xml
es/values-fa/photoeditor_strings.xml
es/values-in/photoeditor_strings.xml
es/values-ms/photoeditor_strings.xml
es/values-pl/photoeditor_strings.xml
es/values-zh-rCN/photoeditor_strings.xml
|
b4cd53a028fccef6b071251063036617fe3db71a |
08-May-2012 |
Eric Fischer <enf@google.com> |
am 67ef88e7: (-s ours) am dc0e7625: Import translations. DO NOT MERGE * commit '67ef88e7f29283e2dce92f7267d3f07e169408b6': Import translations. DO NOT MERGE
|
410f99bf48cdfa403bb2a3351a1a22bd9ddb5141 |
08-May-2012 |
Eric Fischer <enf@google.com> |
am 67ef88e7: (-s ours) am dc0e7625: Import translations. DO NOT MERGE * commit '67ef88e7f29283e2dce92f7267d3f07e169408b6': Import translations. DO NOT MERGE
|
fe87d2903ddbb15649bc1091cd4a62c23adc4f2b |
08-May-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to jb-dev
|
deb51df26ce1b26f52927e46d8d2bbb0f09872f3 |
08-May-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to jb-dev
|
61c7a76313336db2883ddb1624af45d9c5048d2a |
08-May-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to jb-dev
|
ac02f46aa7ec727b839affb9aee415f01c1c2193 |
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/app/AppBridge.java
rc/com/android/gallery3d/app/OrientationManager.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/ui/GLRoot.java
rc/com/android/gallery3d/ui/GLRootView.java
rc/com/android/gallery3d/ui/GLView.java
rc/com/android/gallery3d/ui/OrientationSource.java
rc/com/android/gallery3d/ui/PhotoView.java
ests/src/com/android/gallery3d/ui/GLRootMock.java
ests/src/com/android/gallery3d/ui/GLRootStub.java
|
2ef46ed28b28b355d7f3f1432c7b1196b832a859 |
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/app/AppBridge.java
rc/com/android/gallery3d/app/OrientationManager.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/ui/GLRoot.java
rc/com/android/gallery3d/ui/GLRootView.java
rc/com/android/gallery3d/ui/GLView.java
rc/com/android/gallery3d/ui/OrientationSource.java
rc/com/android/gallery3d/ui/PhotoView.java
ests/src/com/android/gallery3d/ui/GLRootMock.java
ests/src/com/android/gallery3d/ui/GLRootStub.java
|
b503801ebea0280bc5b55b092d4a5a61a7705f4a |
04-May-2012 |
Owen Lin <owenlin@google.com> |
Keep the last page if finish() is rejected. bug: 6414642 Change-Id: I480edc43608c08088177113cb3607d517c91e9f6
rc/com/android/gallery3d/app/StateManager.java
|
ec9a033559f34e5407387cb7d095aee27ddc337b |
04-May-2012 |
Owen Lin <owenlin@google.com> |
Keep the last page if finish() is rejected. bug: 6414642 Change-Id: I480edc43608c08088177113cb3607d517c91e9f6
rc/com/android/gallery3d/app/StateManager.java
|
0b381a1c09417516647a0cdf8c9e70db466ccb63 |
07-May-2012 |
Eric Fischer <enf@google.com> |
am dc0e7625: Import translations. DO NOT MERGE * commit 'dc0e7625d69cce4c933f927c0f9474c951abe758': Import translations. DO NOT MERGE
|
67ef88e7f29283e2dce92f7267d3f07e169408b6 |
07-May-2012 |
Eric Fischer <enf@google.com> |
am dc0e7625: Import translations. DO NOT MERGE * commit 'dc0e7625d69cce4c933f927c0f9474c951abe758': Import translations. DO NOT MERGE
|
ce8ae4f03e227609bb7ae840a437cf649251369b |
07-May-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: Ia266db1c3715c642e2035b8d0b7b269d07a0a0f6
es/values-am/photoeditor_strings.xml
es/values-ar/photoeditor_strings.xml
es/values-be/photoeditor_strings.xml
es/values-bg/photoeditor_strings.xml
es/values-cs/photoeditor_strings.xml
es/values-de/photoeditor_strings.xml
es/values-es-rUS/photoeditor_strings.xml
es/values-es/photoeditor_strings.xml
es/values-et/photoeditor_strings.xml
es/values-fi/photoeditor_strings.xml
es/values-fr/photoeditor_strings.xml
es/values-hi/photoeditor_strings.xml
es/values-hr/photoeditor_strings.xml
es/values-hu/photoeditor_strings.xml
es/values-it/photoeditor_strings.xml
es/values-iw/photoeditor_strings.xml
es/values-ja/photoeditor_strings.xml
es/values-ko/photoeditor_strings.xml
es/values-lt/photoeditor_strings.xml
es/values-lv/photoeditor_strings.xml
es/values-nb/photoeditor_strings.xml
es/values-pt-rPT/photoeditor_strings.xml
es/values-pt/photoeditor_strings.xml
es/values-ro/photoeditor_strings.xml
es/values-ru/photoeditor_strings.xml
es/values-sk/photoeditor_strings.xml
es/values-sl/photoeditor_strings.xml
es/values-sr/photoeditor_strings.xml
es/values-sv/photoeditor_strings.xml
es/values-sw/photoeditor_strings.xml
es/values-th/photoeditor_strings.xml
es/values-tl/photoeditor_strings.xml
es/values-tr/photoeditor_strings.xml
es/values-uk/photoeditor_strings.xml
es/values-vi/photoeditor_strings.xml
es/values-zh-rTW/photoeditor_strings.xml
es/values-zu/photoeditor_strings.xml
|
81c2f0115a81446ed51a5ed86b4eaaa2e1de2050 |
07-May-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: Ia266db1c3715c642e2035b8d0b7b269d07a0a0f6
es/values-am/photoeditor_strings.xml
es/values-ar/photoeditor_strings.xml
es/values-be/photoeditor_strings.xml
es/values-bg/photoeditor_strings.xml
es/values-cs/photoeditor_strings.xml
es/values-de/photoeditor_strings.xml
es/values-es-rUS/photoeditor_strings.xml
es/values-es/photoeditor_strings.xml
es/values-et/photoeditor_strings.xml
es/values-fi/photoeditor_strings.xml
es/values-fr/photoeditor_strings.xml
es/values-hi/photoeditor_strings.xml
es/values-hr/photoeditor_strings.xml
es/values-hu/photoeditor_strings.xml
es/values-it/photoeditor_strings.xml
es/values-iw/photoeditor_strings.xml
es/values-ja/photoeditor_strings.xml
es/values-ko/photoeditor_strings.xml
es/values-lt/photoeditor_strings.xml
es/values-lv/photoeditor_strings.xml
es/values-nb/photoeditor_strings.xml
es/values-pt-rPT/photoeditor_strings.xml
es/values-pt/photoeditor_strings.xml
es/values-ro/photoeditor_strings.xml
es/values-ru/photoeditor_strings.xml
es/values-sk/photoeditor_strings.xml
es/values-sl/photoeditor_strings.xml
es/values-sr/photoeditor_strings.xml
es/values-sv/photoeditor_strings.xml
es/values-sw/photoeditor_strings.xml
es/values-th/photoeditor_strings.xml
es/values-tl/photoeditor_strings.xml
es/values-tr/photoeditor_strings.xml
es/values-uk/photoeditor_strings.xml
es/values-vi/photoeditor_strings.xml
es/values-zh-rTW/photoeditor_strings.xml
es/values-zu/photoeditor_strings.xml
|
32354e461893431b9e2f868b4842c49efaa2408d |
07-May-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: Ie522d1506aea36e73a326270218df5ba0fd5c4a5
es/values-am/photoeditor_strings.xml
es/values-ar/photoeditor_strings.xml
es/values-be/photoeditor_strings.xml
es/values-bg/photoeditor_strings.xml
es/values-cs/photoeditor_strings.xml
es/values-de/photoeditor_strings.xml
es/values-es-rUS/photoeditor_strings.xml
es/values-es/photoeditor_strings.xml
es/values-et/photoeditor_strings.xml
es/values-fi/photoeditor_strings.xml
es/values-fr/photoeditor_strings.xml
es/values-hi/photoeditor_strings.xml
es/values-hr/photoeditor_strings.xml
es/values-hu/photoeditor_strings.xml
es/values-it/photoeditor_strings.xml
es/values-iw/photoeditor_strings.xml
es/values-ja/photoeditor_strings.xml
es/values-ko/photoeditor_strings.xml
es/values-lt/photoeditor_strings.xml
es/values-lv/photoeditor_strings.xml
es/values-nb/photoeditor_strings.xml
es/values-pt-rPT/photoeditor_strings.xml
es/values-pt/photoeditor_strings.xml
es/values-ro/photoeditor_strings.xml
es/values-ru/photoeditor_strings.xml
es/values-sk/photoeditor_strings.xml
es/values-sl/photoeditor_strings.xml
es/values-sr/photoeditor_strings.xml
es/values-sv/photoeditor_strings.xml
es/values-sw/photoeditor_strings.xml
es/values-th/photoeditor_strings.xml
es/values-tl/photoeditor_strings.xml
es/values-tr/photoeditor_strings.xml
es/values-uk/photoeditor_strings.xml
es/values-vi/photoeditor_strings.xml
es/values-zh-rTW/photoeditor_strings.xml
es/values-zu/photoeditor_strings.xml
|
dc0e7625d69cce4c933f927c0f9474c951abe758 |
07-May-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: Ie522d1506aea36e73a326270218df5ba0fd5c4a5
es/values-am/photoeditor_strings.xml
es/values-ar/photoeditor_strings.xml
es/values-be/photoeditor_strings.xml
es/values-bg/photoeditor_strings.xml
es/values-cs/photoeditor_strings.xml
es/values-de/photoeditor_strings.xml
es/values-es-rUS/photoeditor_strings.xml
es/values-es/photoeditor_strings.xml
es/values-et/photoeditor_strings.xml
es/values-fi/photoeditor_strings.xml
es/values-fr/photoeditor_strings.xml
es/values-hi/photoeditor_strings.xml
es/values-hr/photoeditor_strings.xml
es/values-hu/photoeditor_strings.xml
es/values-it/photoeditor_strings.xml
es/values-iw/photoeditor_strings.xml
es/values-ja/photoeditor_strings.xml
es/values-ko/photoeditor_strings.xml
es/values-lt/photoeditor_strings.xml
es/values-lv/photoeditor_strings.xml
es/values-nb/photoeditor_strings.xml
es/values-pt-rPT/photoeditor_strings.xml
es/values-pt/photoeditor_strings.xml
es/values-ro/photoeditor_strings.xml
es/values-ru/photoeditor_strings.xml
es/values-sk/photoeditor_strings.xml
es/values-sl/photoeditor_strings.xml
es/values-sr/photoeditor_strings.xml
es/values-sv/photoeditor_strings.xml
es/values-sw/photoeditor_strings.xml
es/values-th/photoeditor_strings.xml
es/values-tl/photoeditor_strings.xml
es/values-tr/photoeditor_strings.xml
es/values-uk/photoeditor_strings.xml
es/values-vi/photoeditor_strings.xml
es/values-zh-rTW/photoeditor_strings.xml
es/values-zu/photoeditor_strings.xml
|
3728833f5c2f8393f87b4b64e8c28a29efff5c7d |
07-May-2012 |
Yuli Huang <yuli@google.com> |
am ae7f737d: am 625d51a1: Fix back-button\'s behavior in Crop. * commit 'ae7f737d29f2298a7f2f8e64672776895b96cd3a': Fix back-button's behavior in Crop.
|
a1890664b8017b144d693f2503e75095cd88bf13 |
07-May-2012 |
Yuli Huang <yuli@google.com> |
am ae7f737d: am 625d51a1: Fix back-button\'s behavior in Crop. * commit 'ae7f737d29f2298a7f2f8e64672776895b96cd3a': Fix back-button's behavior in Crop.
|
ae7f737d29f2298a7f2f8e64672776895b96cd3a |
07-May-2012 |
Yuli Huang <yuli@google.com> |
am 625d51a1: Fix back-button\'s behavior in Crop. * commit '625d51a1d6e8cbc5884fdcdddeebcd85454935da': Fix back-button's behavior in Crop.
|
147f9cbcdad905d75a25606bdbe8a5cc8fb5bd4d |
07-May-2012 |
Yuli Huang <yuli@google.com> |
Fix back-button's behavior in Crop. bug:6452504 Change-Id: Ic11dd58c613764e3e6cf7a35135678777e49a4ef
rc/com/android/gallery3d/app/CropImage.java
|
625d51a1d6e8cbc5884fdcdddeebcd85454935da |
07-May-2012 |
Yuli Huang <yuli@google.com> |
Fix back-button's behavior in Crop. bug:6452504 Change-Id: Ic11dd58c613764e3e6cf7a35135678777e49a4ef
rc/com/android/gallery3d/app/CropImage.java
|
e24aa580c6fd024e534afbf77797a26199de296b |
07-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
am 5cc74cb6: am 194feaf5: Merge "Set default buffer size for SurfaceTexture." into jb-dev * commit '5cc74cb64f20d106e9214cbfd0daabf364ed5249': Set default buffer size for SurfaceTexture.
|
37ce8903c2e981094be22bfa3bd73271f8fa8436 |
07-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
am 5cc74cb6: am 194feaf5: Merge "Set default buffer size for SurfaceTexture." into jb-dev * commit '5cc74cb64f20d106e9214cbfd0daabf364ed5249': Set default buffer size for SurfaceTexture.
|
5cc74cb64f20d106e9214cbfd0daabf364ed5249 |
07-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
am 194feaf5: Merge "Set default buffer size for SurfaceTexture." into jb-dev * commit '194feaf54ddf55455c22ddfd2812f8dc0ed9d25b': Set default buffer size for SurfaceTexture.
|
39a4577a96e71e611cf01bc5d87f65cabc16f996 |
07-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
Merge "Set default buffer size for SurfaceTexture." into jb-dev
|
194feaf54ddf55455c22ddfd2812f8dc0ed9d25b |
07-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
Merge "Set default buffer size for SurfaceTexture." into jb-dev
|
cd60838419a02a48089a9f9116bdaa19f273c791 |
07-May-2012 |
Yuli Huang <yuli@google.com> |
am c51ad6ef: am 4b69c5f5: Remove PhotoPage spinner shown in the action-bar. * commit 'c51ad6ef8510dc5ba06616e9f1d36cb21db8ab74': Remove PhotoPage spinner shown in the action-bar.
|
4f8f31b3e6956a0e6b72e690afa8af916dd8a9a5 |
07-May-2012 |
Yuli Huang <yuli@google.com> |
am c51ad6ef: am 4b69c5f5: Remove PhotoPage spinner shown in the action-bar. * commit 'c51ad6ef8510dc5ba06616e9f1d36cb21db8ab74': Remove PhotoPage spinner shown in the action-bar.
|
c51ad6ef8510dc5ba06616e9f1d36cb21db8ab74 |
07-May-2012 |
Yuli Huang <yuli@google.com> |
am 4b69c5f5: Remove PhotoPage spinner shown in the action-bar. * commit '4b69c5f52e8ef3209bc0b6889c4a6355614607ca': Remove PhotoPage spinner shown in the action-bar.
|
7bf40c578fe8a93442acd5b4c0dedddb1ad553ce |
07-May-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to jb-dev
|
3c293addb361a59e2906ee7cca61adf803cefb81 |
07-May-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to jb-dev
|
92a16ddfe7ee187e3b85a5bcd5fcaacedafbd5b2 |
07-May-2012 |
Yuli Huang <yuli@google.com> |
Remove PhotoPage spinner shown in the action-bar. Remove spinners shown for loading data out of view. bug:5406790 Change-Id: Iffaf97937b86b869559a27f190941c1de263e422
rc/com/android/gallery3d/app/Gallery.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/app/StateManager.java
rc/com/android/gallery3d/util/GalleryUtils.java
rc/com/android/gallery3d/util/SpinnerVisibilitySetter.java
|
4b69c5f52e8ef3209bc0b6889c4a6355614607ca |
07-May-2012 |
Yuli Huang <yuli@google.com> |
Remove PhotoPage spinner shown in the action-bar. Remove spinners shown for loading data out of view. bug:5406790 Change-Id: Iffaf97937b86b869559a27f190941c1de263e422
rc/com/android/gallery3d/app/Gallery.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/app/StateManager.java
rc/com/android/gallery3d/util/GalleryUtils.java
rc/com/android/gallery3d/util/SpinnerVisibilitySetter.java
|
6c01e3c2eb562a006c45c8599f39b9712f8d6e20 |
07-May-2012 |
Hung-ying Tyan <tyanh@google.com> |
am d1d86037: am 8f1c528d: Merge "Add UNIQUE to EntrySchema." into jb-dev * commit 'd1d86037aa7170fc8c76da4879eecd405931bc07': Add UNIQUE to EntrySchema.
|
4a55b496b59b4b01b5f4735f2320006746113b98 |
07-May-2012 |
Hung-ying Tyan <tyanh@google.com> |
am d1d86037: am 8f1c528d: Merge "Add UNIQUE to EntrySchema." into jb-dev * commit 'd1d86037aa7170fc8c76da4879eecd405931bc07': Add UNIQUE to EntrySchema.
|
9f42ab29cdb964a4e763e26d3dbf5142e103d7d6 |
07-May-2012 |
Yuli Huang <yuli@google.com> |
am 45a5a26e: am 5e1b1159: Add \'process\' attribute for PhotoEditor. * commit '45a5a26efd45113cc981acc98d3d16a331b091f0': Add 'process' attribute for PhotoEditor.
|
d1d86037aa7170fc8c76da4879eecd405931bc07 |
07-May-2012 |
Hung-ying Tyan <tyanh@google.com> |
am 8f1c528d: Merge "Add UNIQUE to EntrySchema." into jb-dev * commit '8f1c528dde90caf2d667634f769772cdac1d674d': Add UNIQUE to EntrySchema.
|
45a5a26efd45113cc981acc98d3d16a331b091f0 |
07-May-2012 |
Yuli Huang <yuli@google.com> |
am 5e1b1159: Add \'process\' attribute for PhotoEditor. * commit '5e1b1159cb4e9cde0c92ef5a873ab4bae094314c': Add 'process' attribute for PhotoEditor.
|
14b548fa1c9f7cc94a47e4b39edab0adce5a8b74 |
07-May-2012 |
Hung-ying Tyan <tyanh@google.com> |
Merge "Add UNIQUE to EntrySchema." into jb-dev
|
8f1c528dde90caf2d667634f769772cdac1d674d |
07-May-2012 |
Hung-ying Tyan <tyanh@google.com> |
Merge "Add UNIQUE to EntrySchema." into jb-dev
|
5f51073581d5325c88cc3f1d3f86203f2c4f2712 |
07-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
Set default buffer size for SurfaceTexture. This is needed for Panorama. Change-Id: I452335cfec6357aef7b66ecac003a4b0ca0fd9fe
rc/com/android/gallery3d/ui/SurfaceTextureScreenNail.java
|
21b251499eabca5bcd5c9dfeee11f57f2e5b6ad5 |
07-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
Set default buffer size for SurfaceTexture. This is needed for Panorama. Change-Id: I452335cfec6357aef7b66ecac003a4b0ca0fd9fe
rc/com/android/gallery3d/ui/SurfaceTextureScreenNail.java
|
ce2b3e03d3ba1f802a1fdb8284d15797d10925ac |
07-May-2012 |
Yuli Huang <yuli@google.com> |
Add 'process' attribute for PhotoEditor. PhotoEditor, similar to CropImage, demands much memory and should run in another process to avoid OOM because of too fragmented memory. bug:6318340 Change-Id: Ic5a71959435f66b8b7bc9b1c80baf8a70ccfecaf
ndroidManifest.xml
|
5e1b1159cb4e9cde0c92ef5a873ab4bae094314c |
07-May-2012 |
Yuli Huang <yuli@google.com> |
Add 'process' attribute for PhotoEditor. PhotoEditor, similar to CropImage, demands much memory and should run in another process to avoid OOM because of too fragmented memory. bug:6318340 Change-Id: Ic5a71959435f66b8b7bc9b1c80baf8a70ccfecaf
ndroidManifest.xml
|
7a35edfcdf45c83c1964a689409be4c18633df45 |
07-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
am 415474d0: am ba12eae9: Add transition for card deck effect. * commit '415474d0d79194fcb2b13a5464d6da9f02ecd4ac': Add transition for card deck effect.
|
d88a5de58198b3c19abcb0d48e87422daef5c37f |
07-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
am 415474d0: am ba12eae9: Add transition for card deck effect. * commit '415474d0d79194fcb2b13a5464d6da9f02ecd4ac': Add transition for card deck effect.
|
415474d0d79194fcb2b13a5464d6da9f02ecd4ac |
07-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
am ba12eae9: Add transition for card deck effect. * commit 'ba12eae90b5b1a80ee002aa0df8c5c5189c4faa3': Add transition for card deck effect.
|
43c230018e32608e9d2a7156cedc2e81c1af6309 |
06-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
Add transition for card deck effect. Bug 6442785: Controls disappear & preview surface gets warped after deleting just taken video Bug 6399861: Filmstrip: Pinch-out animation in fullscreen photo > filmstrip should be metaphorically consistent with the stack of cards model Bug 6429677: Gray shadow shows up when start Change-Id: I408cf250e67b4def20f5f15621fe57d7845c90f9
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/ui/PhotoView.java
rc/com/android/gallery3d/ui/PositionController.java
|
ba12eae90b5b1a80ee002aa0df8c5c5189c4faa3 |
06-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
Add transition for card deck effect. Bug 6442785: Controls disappear & preview surface gets warped after deleting just taken video Bug 6399861: Filmstrip: Pinch-out animation in fullscreen photo > filmstrip should be metaphorically consistent with the stack of cards model Bug 6429677: Gray shadow shows up when start Change-Id: I408cf250e67b4def20f5f15621fe57d7845c90f9
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/ui/PhotoView.java
rc/com/android/gallery3d/ui/PositionController.java
|
b848d15f1491d73a54126dc5fafc4a45beaed036 |
07-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
am 6b7f29a6: am 6575794a: Fix 6429662: Video snapshot doesn\'t work * commit '6b7f29a6b5f48fe3b4f131ae82688de020b9a25c': Fix 6429662: Video snapshot doesn't work
|
b5b97ab20898057d16005d44122a161e4c67b5f1 |
07-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
am 6b7f29a6: am 6575794a: Fix 6429662: Video snapshot doesn\'t work * commit '6b7f29a6b5f48fe3b4f131ae82688de020b9a25c': Fix 6429662: Video snapshot doesn't work
|
9949842d5682f13a90631509b996288d8e45ca62 |
07-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
am 1945e5f8: am d9355113: Put play video icon at the same place of the screennails. * commit '1945e5f8a6e153f986a7d344a57fda4eaa762ae7': Put play video icon at the same place of the screennails.
|
6364814b1eb7b5499c7f33b9ee7db4d773d21ebb |
07-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
am 1945e5f8: am d9355113: Put play video icon at the same place of the screennails. * commit '1945e5f8a6e153f986a7d344a57fda4eaa762ae7': Put play video icon at the same place of the screennails.
|
6b7f29a6b5f48fe3b4f131ae82688de020b9a25c |
07-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
am 6575794a: Fix 6429662: Video snapshot doesn\'t work * commit '6575794a9c09f22d5721e212c093e0a2df376d0c': Fix 6429662: Video snapshot doesn't work
|
1945e5f8a6e153f986a7d344a57fda4eaa762ae7 |
07-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
am d9355113: Put play video icon at the same place of the screennails. * commit 'd9355113da391f8bbddef1d2a2126ce6edc72291': Put play video icon at the same place of the screennails.
|
bcaf5e626149060dd07ecdb19fe02d0987fb31e6 |
07-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
am 61b079eb: am 66ca848b: Tapping on the camera icon no matter what should open camera. * commit '61b079eb67fe8ff3449070e1cc62344c22096de9': Tapping on the camera icon no matter what should open camera.
|
c4b142d57570bbe05de41c024a17fe819f2085d4 |
07-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
am 61b079eb: am 66ca848b: Tapping on the camera icon no matter what should open camera. * commit '61b079eb67fe8ff3449070e1cc62344c22096de9': Tapping on the camera icon no matter what should open camera.
|
61b079eb67fe8ff3449070e1cc62344c22096de9 |
07-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
am 66ca848b: Tapping on the camera icon no matter what should open camera. * commit '66ca848b2f58b813d366642088d274a1b7c4a90c': Tapping on the camera icon no matter what should open camera.
|
2628fcbcd0c8b4c018bef5987beac9f4e8061db1 |
05-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
Fix 6429662: Video snapshot doesn't work Change-Id: I6414be7f00ee103b7047128fdc92e03ca87c7703
rc/com/android/gallery3d/app/AppBridge.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/ui/PhotoView.java
|
6575794a9c09f22d5721e212c093e0a2df376d0c |
05-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
Fix 6429662: Video snapshot doesn't work Change-Id: I6414be7f00ee103b7047128fdc92e03ca87c7703
rc/com/android/gallery3d/app/AppBridge.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/ui/PhotoView.java
|
1e1341f74fd9199751640d75442aaad2da1139df |
05-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
Put play video icon at the same place of the screennails. Bug: 6412197 Change-Id: Idaae46c598035639907a85f726b763b80bd9572d
rc/com/android/gallery3d/app/PhotoDataAdapter.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/app/SinglePhotoDataAdapter.java
rc/com/android/gallery3d/ui/PhotoView.java
rc/com/android/gallery3d/ui/TileImageView.java
|
d9355113da391f8bbddef1d2a2126ce6edc72291 |
05-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
Put play video icon at the same place of the screennails. Bug: 6412197 Change-Id: Idaae46c598035639907a85f726b763b80bd9572d
rc/com/android/gallery3d/app/PhotoDataAdapter.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/app/SinglePhotoDataAdapter.java
rc/com/android/gallery3d/ui/PhotoView.java
rc/com/android/gallery3d/ui/TileImageView.java
|
fd7d6bface4230593001e1afede7f4d251589cda |
04-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
Tapping on the camera icon no matter what should open camera. Bug: 6437677 Change-Id: I41ead463652c11986825744465f181ca75674c60
rc/com/android/gallery3d/app/PhotoPage.java
|
66ca848b2f58b813d366642088d274a1b7c4a90c |
04-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
Tapping on the camera icon no matter what should open camera. Bug: 6437677 Change-Id: I41ead463652c11986825744465f181ca75674c60
rc/com/android/gallery3d/app/PhotoPage.java
|
7d2fdbdf0af45e088184c70b685494a9ad3c979d |
06-May-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to jb-dev
|
4d673ffaa813efb3cc2688cd583820fec0ddf9d7 |
06-May-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to jb-dev
|
faaa40a2022031b0bee5a3db1c19d5462deabfd5 |
06-May-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to jb-dev
|
5af686fd1cc7fce8b94d302e94ca4b057e21a129 |
05-May-2012 |
Martijn Coenen <maco@google.com> |
am f93fa04f: am 4b24522a: Merge "Add support for Beaming multiple pictures." into jb-dev * commit 'f93fa04fb3b449b1cf3ec838ee365ded7608a8fd': Add support for Beaming multiple pictures.
|
5f7a09742bd75d587133f34561a23e5cb8a5159b |
05-May-2012 |
Martijn Coenen <maco@google.com> |
am f93fa04f: am 4b24522a: Merge "Add support for Beaming multiple pictures." into jb-dev * commit 'f93fa04fb3b449b1cf3ec838ee365ded7608a8fd': Add support for Beaming multiple pictures.
|
f93fa04fb3b449b1cf3ec838ee365ded7608a8fd |
05-May-2012 |
Martijn Coenen <maco@google.com> |
am 4b24522a: Merge "Add support for Beaming multiple pictures." into jb-dev * commit '4b24522afa79ccee3b021d57fcd475f476014585': Add support for Beaming multiple pictures.
|
f6ea3f162565001f91909b06db099a988e1a1a59 |
05-May-2012 |
Martijn Coenen <maco@google.com> |
Merge "Add support for Beaming multiple pictures." into jb-dev
|
4b24522afa79ccee3b021d57fcd475f476014585 |
05-May-2012 |
Martijn Coenen <maco@google.com> |
Merge "Add support for Beaming multiple pictures." into jb-dev
|
1aa6aad89161c7011dc8689e16bde468701f97ee |
05-May-2012 |
Yuli Huang <yuli@google.com> |
am a74fb3ec: am 88cc2ca5: Fix a TODO by replacing a string. * commit 'a74fb3ecde26749f23b4613f6823505f38e7ee5d': Fix a TODO by replacing a string.
|
e4383978b719e0379bd7bf73474de01621385d8a |
05-May-2012 |
Yuli Huang <yuli@google.com> |
am a74fb3ec: am 88cc2ca5: Fix a TODO by replacing a string. * commit 'a74fb3ecde26749f23b4613f6823505f38e7ee5d': Fix a TODO by replacing a string.
|
a74fb3ecde26749f23b4613f6823505f38e7ee5d |
05-May-2012 |
Yuli Huang <yuli@google.com> |
am 88cc2ca5: Fix a TODO by replacing a string. * commit '88cc2ca5f5596762a5546ec7426756f2036be455': Fix a TODO by replacing a string.
|
7f10aa3f5ff28b3d6d392033efb677c6165af1fe |
05-May-2012 |
Yuli Huang <yuli@google.com> |
Fix a TODO by replacing a string. Change-Id: I17216e0ca83a185842bc69151fcf8c5136e2b873
rc/com/android/gallery3d/app/PhotoPage.java
|
88cc2ca5f5596762a5546ec7426756f2036be455 |
05-May-2012 |
Yuli Huang <yuli@google.com> |
Fix a TODO by replacing a string. Change-Id: I17216e0ca83a185842bc69151fcf8c5136e2b873
rc/com/android/gallery3d/app/PhotoPage.java
|
a94824007c8b8d4e786cd27eb742ea4e66bee8e2 |
05-May-2012 |
Yuli Huang <yuli@google.com> |
am fe77cad5: am c2fcc7a6: Don\'t show spinner to avoid janky transition. * commit 'fe77cad5114cc5d19843ca93feefe1a5e9d7dab0': Don't show spinner to avoid janky transition.
|
90b81d1860f6b614341cedb56702f2f690888e22 |
05-May-2012 |
Yuli Huang <yuli@google.com> |
am fe77cad5: am c2fcc7a6: Don\'t show spinner to avoid janky transition. * commit 'fe77cad5114cc5d19843ca93feefe1a5e9d7dab0': Don't show spinner to avoid janky transition.
|
fe77cad5114cc5d19843ca93feefe1a5e9d7dab0 |
05-May-2012 |
Yuli Huang <yuli@google.com> |
am c2fcc7a6: Don\'t show spinner to avoid janky transition. * commit 'c2fcc7a681070e6c1d024ecf60b6a2a3e3f1a68b': Don't show spinner to avoid janky transition.
|
258e1a25312696bce23ceb83c4c731148023b91b |
03-May-2012 |
Yuli Huang <yuli@google.com> |
Don't show spinner to avoid janky transition. bug:5406790 Change-Id: Ieea09f43d5230e1507c16001ec12b3ea6e3c3f0e
rc/com/android/gallery3d/app/AlbumPage.java
rc/com/android/gallery3d/app/AlbumSetPage.java
|
c2fcc7a681070e6c1d024ecf60b6a2a3e3f1a68b |
03-May-2012 |
Yuli Huang <yuli@google.com> |
Don't show spinner to avoid janky transition. bug:5406790 Change-Id: Ieea09f43d5230e1507c16001ec12b3ea6e3c3f0e
rc/com/android/gallery3d/app/AlbumPage.java
rc/com/android/gallery3d/app/AlbumSetPage.java
|
5ab1b873244b6cde813593f2879159b03574135c |
05-May-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to jb-dev
|
86104d7cfcb98b1412aa4d3689f234b6a165233c |
05-May-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to jb-dev
|
0407ab6427268d3cc8b8f0b58148fdb8bf358919 |
05-May-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to jb-dev
|
ab6b35eba1dd79538935f50f6edcd654419311af |
04-May-2012 |
Eric Fischer <enf@google.com> |
am d9954e12: (-s ours) am 3191875f: Import translations. DO NOT MERGE * commit 'd9954e12a82d8fca4d08614657b7ee7509ba6294': Import translations. DO NOT MERGE
|
54427888ed3b2f1ef2fd202c18aa8c9fd2ff535a |
04-May-2012 |
Eric Fischer <enf@google.com> |
am d9954e12: (-s ours) am 3191875f: Import translations. DO NOT MERGE * commit 'd9954e12a82d8fca4d08614657b7ee7509ba6294': Import translations. DO NOT MERGE
|
1055efa83b216e633026a970f51197ed884f77b1 |
04-May-2012 |
Eric Fischer <enf@google.com> |
am 3191875f: Import translations. DO NOT MERGE * commit '3191875f78461ae828d689e9607ff152adbc73fe': Import translations. DO NOT MERGE
|
d9954e12a82d8fca4d08614657b7ee7509ba6294 |
04-May-2012 |
Eric Fischer <enf@google.com> |
am 3191875f: Import translations. DO NOT MERGE * commit '3191875f78461ae828d689e9607ff152adbc73fe': Import translations. DO NOT MERGE
|
22400aff78a6dbe7bed9bcb7a44211b1d0d07529 |
04-May-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: I7f9521775fb29c3d2fb4b65165600167c9ee9706
es/values-ca/photoeditor_strings.xml
es/values-da/photoeditor_strings.xml
es/values-el/photoeditor_strings.xml
es/values-en-rGB/photoeditor_strings.xml
es/values-nl/photoeditor_strings.xml
es/values-sr/photoeditor_strings.xml
es/values-tr/photoeditor_strings.xml
es/values-zh-rTW/photoeditor_strings.xml
|
5eeb896fd725652fb1d93031b9878f33e904cd19 |
04-May-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: I7f9521775fb29c3d2fb4b65165600167c9ee9706
es/values-ca/photoeditor_strings.xml
es/values-da/photoeditor_strings.xml
es/values-el/photoeditor_strings.xml
es/values-en-rGB/photoeditor_strings.xml
es/values-nl/photoeditor_strings.xml
es/values-sr/photoeditor_strings.xml
es/values-tr/photoeditor_strings.xml
es/values-zh-rTW/photoeditor_strings.xml
|
bc9a3b1259168ddf01f2881d427ab9da0178c98d |
04-May-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: I1e32bdca2eaa33696ebf0ef14df3c78de98e99d9
es/values-ca/photoeditor_strings.xml
es/values-da/photoeditor_strings.xml
es/values-el/photoeditor_strings.xml
es/values-en-rGB/photoeditor_strings.xml
es/values-nl/photoeditor_strings.xml
es/values-sr/photoeditor_strings.xml
es/values-tr/photoeditor_strings.xml
es/values-zh-rTW/photoeditor_strings.xml
|
3191875f78461ae828d689e9607ff152adbc73fe |
04-May-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: I1e32bdca2eaa33696ebf0ef14df3c78de98e99d9
es/values-ca/photoeditor_strings.xml
es/values-da/photoeditor_strings.xml
es/values-el/photoeditor_strings.xml
es/values-en-rGB/photoeditor_strings.xml
es/values-nl/photoeditor_strings.xml
es/values-sr/photoeditor_strings.xml
es/values-tr/photoeditor_strings.xml
es/values-zh-rTW/photoeditor_strings.xml
|
a67d89563df7c8847ee335723e097aaaffe43c36 |
04-May-2012 |
Hung-ying Tyan <tyanh@google.com> |
Add UNIQUE to EntrySchema. Change-Id: I0fbf69a60aafe8d7a82241467d077c48beadbf49
allerycommon/src/com/android/gallery3d/common/Entry.java
allerycommon/src/com/android/gallery3d/common/EntrySchema.java
|
8b11cc6464a046ca9d725a8dfa3d2297a502caa0 |
04-May-2012 |
Hung-ying Tyan <tyanh@google.com> |
Add UNIQUE to EntrySchema. Change-Id: I0fbf69a60aafe8d7a82241467d077c48beadbf49
allerycommon/src/com/android/gallery3d/common/Entry.java
allerycommon/src/com/android/gallery3d/common/EntrySchema.java
|
02b8b037b478dbaf596402d6fdf8157794bd51e7 |
04-May-2012 |
Hung-ying Tyan <tyanh@google.com> |
Add UNIQUE to EntrySchema. Change-Id: I0fbf69a60aafe8d7a82241467d077c48beadbf49
allerycommon/src/com/android/gallery3d/common/Entry.java
allerycommon/src/com/android/gallery3d/common/EntrySchema.java
|
a70324d7e7572e5ba9a0c2c8b4c35d2407d33553 |
04-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
am 88db064e: am 17ffedda: Fix 6399813: tapping on a photo that isn\'t in the middle of the screen doesn\'t select it. * commit '88db064e5c19c8401ba6b0757779f28cd063b9e5': Fix 6399813: tapping on a photo that isn't in the middle of the screen doesn't select it.
|
6fc7d93e40b9dba0398efee55c4f6cdb92d77852 |
04-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
am f44bad78: am afb49dcc: Use activity-alias to disable camera icon dynamically. * commit 'f44bad78efc5a3fd3f07bbf88f57e8c0de279649': Use activity-alias to disable camera icon dynamically.
|
2e289309690b97e51623b472143ff2e4203bb72f |
04-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
am 88db064e: am 17ffedda: Fix 6399813: tapping on a photo that isn\'t in the middle of the screen doesn\'t select it. * commit '88db064e5c19c8401ba6b0757779f28cd063b9e5': Fix 6399813: tapping on a photo that isn't in the middle of the screen doesn't select it.
|
f44bad78efc5a3fd3f07bbf88f57e8c0de279649 |
04-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
am afb49dcc: Use activity-alias to disable camera icon dynamically. * commit 'afb49dcc1e3d6db6364cdc35d42e694803b3475e': Use activity-alias to disable camera icon dynamically.
|
88db064e5c19c8401ba6b0757779f28cd063b9e5 |
04-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
am 17ffedda: Fix 6399813: tapping on a photo that isn\'t in the middle of the screen doesn\'t select it. * commit '17ffedda6e3ed57b38afbb775594cf30d83fc652': Fix 6399813: tapping on a photo that isn't in the middle of the screen doesn't select it.
|
aa29fadb1921b8276ba19cdbf09082f84546480b |
04-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
Use activity-alias to disable camera icon dynamically. Bug: 6438794 Change-Id: Ie2184979f95187eac2411f07b8caee2cad4c4add
ndroidManifest.xml
|
afb49dcc1e3d6db6364cdc35d42e694803b3475e |
04-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
Use activity-alias to disable camera icon dynamically. Bug: 6438794 Change-Id: Ie2184979f95187eac2411f07b8caee2cad4c4add
ndroidManifest.xml
|
1f9d97a22fb095c19cecbb87e08ff5bc7806dfca |
03-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
Fix 6399813: tapping on a photo that isn't in the middle of the screen doesn't select it. Also make tapping while flinging stop the scroll instead of opening the item. Change-Id: Iefef4738d7d74b29e4594ea3ae2cb1c91e0e17ab
rc/com/android/gallery3d/ui/PhotoView.java
rc/com/android/gallery3d/ui/PositionController.java
|
17ffedda6e3ed57b38afbb775594cf30d83fc652 |
03-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
Fix 6399813: tapping on a photo that isn't in the middle of the screen doesn't select it. Also make tapping while flinging stop the scroll instead of opening the item. Change-Id: Iefef4738d7d74b29e4594ea3ae2cb1c91e0e17ab
rc/com/android/gallery3d/ui/PhotoView.java
rc/com/android/gallery3d/ui/PositionController.java
|
506dda75534bb06cba4c461b5391b5b4d6bd9d91 |
04-May-2012 |
Ray Chen <raychen@google.com> |
am dc4944e5: am 4cbf2b13: Merge "Fix 6341866 ANR in com.google.android.gallery3d due to com.android.gallery3d.ui.TileImageViewAdapter.setScreenNail" into jb-dev * commit 'dc4944e5a9a1f0daba6b92498ecaa5ba86249b82': Fix 6341866 ANR in com.google.android.gallery3d due to com.android.gallery3d.ui.TileImageViewAdapter.setScreenNail
|
03eae8f2a42926a01ec7289fc78827769bf97c2f |
04-May-2012 |
Ray Chen <raychen@google.com> |
am dc4944e5: am 4cbf2b13: Merge "Fix 6341866 ANR in com.google.android.gallery3d due to com.android.gallery3d.ui.TileImageViewAdapter.setScreenNail" into jb-dev * commit 'dc4944e5a9a1f0daba6b92498ecaa5ba86249b82': Fix 6341866 ANR in com.google.android.gallery3d due to com.android.gallery3d.ui.TileImageViewAdapter.setScreenNail
|
dc4944e5a9a1f0daba6b92498ecaa5ba86249b82 |
04-May-2012 |
Ray Chen <raychen@google.com> |
am 4cbf2b13: Merge "Fix 6341866 ANR in com.google.android.gallery3d due to com.android.gallery3d.ui.TileImageViewAdapter.setScreenNail" into jb-dev * commit '4cbf2b139b6588ed6f9c0cec1d9185c5b72fdea6': Fix 6341866 ANR in com.google.android.gallery3d due to com.android.gallery3d.ui.TileImageViewAdapter.setScreenNail
|
d6a033d59667a53527d19f1f0e07c950aff6d74a |
04-May-2012 |
Ray Chen <raychen@google.com> |
Merge "Fix 6341866 ANR in com.google.android.gallery3d due to com.android.gallery3d.ui.TileImageViewAdapter.setScreenNail" into jb-dev
|
4cbf2b139b6588ed6f9c0cec1d9185c5b72fdea6 |
04-May-2012 |
Ray Chen <raychen@google.com> |
Merge "Fix 6341866 ANR in com.google.android.gallery3d due to com.android.gallery3d.ui.TileImageViewAdapter.setScreenNail" into jb-dev
|
5aa82d956658c8e3aa7d7a598a100b9c4814d3dc |
04-May-2012 |
Eric Fischer <enf@google.com> |
am 8f526423: (-s ours) am b3dc6118: Merge "Import translations. DO NOT MERGE" into jb-dev * commit '8f526423ad187254bbb5dc93c6d5499bc4bba72b': Import translations. DO NOT MERGE
|
9b03b9c96023dfb978d29b50306cd5ca04bc9df6 |
04-May-2012 |
Eric Fischer <enf@google.com> |
am 8f526423: (-s ours) am b3dc6118: Merge "Import translations. DO NOT MERGE" into jb-dev * commit '8f526423ad187254bbb5dc93c6d5499bc4bba72b': Import translations. DO NOT MERGE
|
bb8a9f13f9bffa2e2370867b2c8d060e8ba2ef20 |
03-May-2012 |
Eric Fischer <enf@google.com> |
am b3dc6118: Merge "Import translations. DO NOT MERGE" into jb-dev * commit 'b3dc6118590bd14906bcc83162ee01f2e28a72d1': Import translations. DO NOT MERGE
|
8f526423ad187254bbb5dc93c6d5499bc4bba72b |
03-May-2012 |
Eric Fischer <enf@google.com> |
am b3dc6118: Merge "Import translations. DO NOT MERGE" into jb-dev * commit 'b3dc6118590bd14906bcc83162ee01f2e28a72d1': Import translations. DO NOT MERGE
|
850898db2addc778ba1b677d4a00bdaf1ffe5292 |
03-May-2012 |
Eric Fischer <enf@google.com> |
Merge "Import translations. DO NOT MERGE"
|
a862d5079fc7be5a131b3346619f0bda8d691f62 |
03-May-2012 |
Eric Fischer <enf@google.com> |
Merge "Import translations. DO NOT MERGE"
|
7c488be7da80c5ed47da7347dbb435d80f72c6e6 |
03-May-2012 |
Eric Fischer <enf@google.com> |
Merge "Import translations. DO NOT MERGE" into jb-dev
|
b3dc6118590bd14906bcc83162ee01f2e28a72d1 |
03-May-2012 |
Eric Fischer <enf@google.com> |
Merge "Import translations. DO NOT MERGE" into jb-dev
|
645d0f2a441f9dccbf5041fdcc3fb99493a57143 |
03-May-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: Iba1e4fc3cb7158b32e25db047fc0793e21d52c48
es/values-af/photoeditor_strings.xml
es/values-am/photoeditor_strings.xml
es/values-ar/photoeditor_strings.xml
es/values-be/photoeditor_strings.xml
es/values-bg/photoeditor_strings.xml
es/values-ca/photoeditor_strings.xml
es/values-cs/photoeditor_strings.xml
es/values-da/photoeditor_strings.xml
es/values-de/photoeditor_strings.xml
es/values-el/photoeditor_strings.xml
es/values-en-rGB/photoeditor_strings.xml
es/values-es-rUS/photoeditor_strings.xml
es/values-es/photoeditor_strings.xml
es/values-et/photoeditor_strings.xml
es/values-fa/photoeditor_strings.xml
es/values-fi/photoeditor_strings.xml
es/values-fr/photoeditor_strings.xml
es/values-hi/photoeditor_strings.xml
es/values-hr/photoeditor_strings.xml
es/values-hu/photoeditor_strings.xml
es/values-in/photoeditor_strings.xml
es/values-it/photoeditor_strings.xml
es/values-iw/photoeditor_strings.xml
es/values-ja/photoeditor_strings.xml
es/values-ko/photoeditor_strings.xml
es/values-lt/photoeditor_strings.xml
es/values-lv/photoeditor_strings.xml
es/values-ms/photoeditor_strings.xml
es/values-nb/photoeditor_strings.xml
es/values-nl/photoeditor_strings.xml
es/values-pl/photoeditor_strings.xml
es/values-pt-rPT/photoeditor_strings.xml
es/values-pt/photoeditor_strings.xml
es/values-ro/photoeditor_strings.xml
es/values-ru/photoeditor_strings.xml
es/values-sk/photoeditor_strings.xml
es/values-sl/photoeditor_strings.xml
es/values-sr/photoeditor_strings.xml
es/values-sv/photoeditor_strings.xml
es/values-sw/photoeditor_strings.xml
es/values-th/photoeditor_strings.xml
es/values-tl/photoeditor_strings.xml
es/values-tr/photoeditor_strings.xml
es/values-uk/photoeditor_strings.xml
es/values-vi/photoeditor_strings.xml
es/values-zh-rCN/photoeditor_strings.xml
es/values-zh-rTW/photoeditor_strings.xml
es/values-zu/photoeditor_strings.xml
|
56df09a404a9b23070022e070128211bbe6ad74f |
03-May-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: Iba1e4fc3cb7158b32e25db047fc0793e21d52c48
es/values-af/photoeditor_strings.xml
es/values-am/photoeditor_strings.xml
es/values-ar/photoeditor_strings.xml
es/values-be/photoeditor_strings.xml
es/values-bg/photoeditor_strings.xml
es/values-ca/photoeditor_strings.xml
es/values-cs/photoeditor_strings.xml
es/values-da/photoeditor_strings.xml
es/values-de/photoeditor_strings.xml
es/values-el/photoeditor_strings.xml
es/values-en-rGB/photoeditor_strings.xml
es/values-es-rUS/photoeditor_strings.xml
es/values-es/photoeditor_strings.xml
es/values-et/photoeditor_strings.xml
es/values-fa/photoeditor_strings.xml
es/values-fi/photoeditor_strings.xml
es/values-fr/photoeditor_strings.xml
es/values-hi/photoeditor_strings.xml
es/values-hr/photoeditor_strings.xml
es/values-hu/photoeditor_strings.xml
es/values-in/photoeditor_strings.xml
es/values-it/photoeditor_strings.xml
es/values-iw/photoeditor_strings.xml
es/values-ja/photoeditor_strings.xml
es/values-ko/photoeditor_strings.xml
es/values-lt/photoeditor_strings.xml
es/values-lv/photoeditor_strings.xml
es/values-ms/photoeditor_strings.xml
es/values-nb/photoeditor_strings.xml
es/values-nl/photoeditor_strings.xml
es/values-pl/photoeditor_strings.xml
es/values-pt-rPT/photoeditor_strings.xml
es/values-pt/photoeditor_strings.xml
es/values-ro/photoeditor_strings.xml
es/values-ru/photoeditor_strings.xml
es/values-sk/photoeditor_strings.xml
es/values-sl/photoeditor_strings.xml
es/values-sr/photoeditor_strings.xml
es/values-sv/photoeditor_strings.xml
es/values-sw/photoeditor_strings.xml
es/values-th/photoeditor_strings.xml
es/values-tl/photoeditor_strings.xml
es/values-tr/photoeditor_strings.xml
es/values-uk/photoeditor_strings.xml
es/values-vi/photoeditor_strings.xml
es/values-zh-rCN/photoeditor_strings.xml
es/values-zh-rTW/photoeditor_strings.xml
es/values-zu/photoeditor_strings.xml
|
43231e90cf5a086203930f3088f27784854c8149 |
03-May-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: Icd8c0249e077f2848cd3df3c2375114ae3e2e3c8
es/values-af/photoeditor_strings.xml
es/values-am/photoeditor_strings.xml
es/values-ar/photoeditor_strings.xml
es/values-be/photoeditor_strings.xml
es/values-bg/photoeditor_strings.xml
es/values-ca/photoeditor_strings.xml
es/values-cs/photoeditor_strings.xml
es/values-da/photoeditor_strings.xml
es/values-de/photoeditor_strings.xml
es/values-el/photoeditor_strings.xml
es/values-en-rGB/photoeditor_strings.xml
es/values-es-rUS/photoeditor_strings.xml
es/values-es/photoeditor_strings.xml
es/values-et/photoeditor_strings.xml
es/values-fa/photoeditor_strings.xml
es/values-fi/photoeditor_strings.xml
es/values-fr/photoeditor_strings.xml
es/values-hi/photoeditor_strings.xml
es/values-hr/photoeditor_strings.xml
es/values-hu/photoeditor_strings.xml
es/values-in/photoeditor_strings.xml
es/values-it/photoeditor_strings.xml
es/values-iw/photoeditor_strings.xml
es/values-ja/photoeditor_strings.xml
es/values-ko/photoeditor_strings.xml
es/values-lt/photoeditor_strings.xml
es/values-lv/photoeditor_strings.xml
es/values-ms/photoeditor_strings.xml
es/values-nb/photoeditor_strings.xml
es/values-nl/photoeditor_strings.xml
es/values-pl/photoeditor_strings.xml
es/values-pt-rPT/photoeditor_strings.xml
es/values-pt/photoeditor_strings.xml
es/values-ro/photoeditor_strings.xml
es/values-ru/photoeditor_strings.xml
es/values-sk/photoeditor_strings.xml
es/values-sl/photoeditor_strings.xml
es/values-sr/photoeditor_strings.xml
es/values-sv/photoeditor_strings.xml
es/values-sw/photoeditor_strings.xml
es/values-th/photoeditor_strings.xml
es/values-tl/photoeditor_strings.xml
es/values-tr/photoeditor_strings.xml
es/values-uk/photoeditor_strings.xml
es/values-vi/photoeditor_strings.xml
es/values-zh-rCN/photoeditor_strings.xml
es/values-zh-rTW/photoeditor_strings.xml
es/values-zu/photoeditor_strings.xml
|
9167f9be03902ac59c0124dd7125fa11445956e4 |
03-May-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: Icd8c0249e077f2848cd3df3c2375114ae3e2e3c8
es/values-af/photoeditor_strings.xml
es/values-am/photoeditor_strings.xml
es/values-ar/photoeditor_strings.xml
es/values-be/photoeditor_strings.xml
es/values-bg/photoeditor_strings.xml
es/values-ca/photoeditor_strings.xml
es/values-cs/photoeditor_strings.xml
es/values-da/photoeditor_strings.xml
es/values-de/photoeditor_strings.xml
es/values-el/photoeditor_strings.xml
es/values-en-rGB/photoeditor_strings.xml
es/values-es-rUS/photoeditor_strings.xml
es/values-es/photoeditor_strings.xml
es/values-et/photoeditor_strings.xml
es/values-fa/photoeditor_strings.xml
es/values-fi/photoeditor_strings.xml
es/values-fr/photoeditor_strings.xml
es/values-hi/photoeditor_strings.xml
es/values-hr/photoeditor_strings.xml
es/values-hu/photoeditor_strings.xml
es/values-in/photoeditor_strings.xml
es/values-it/photoeditor_strings.xml
es/values-iw/photoeditor_strings.xml
es/values-ja/photoeditor_strings.xml
es/values-ko/photoeditor_strings.xml
es/values-lt/photoeditor_strings.xml
es/values-lv/photoeditor_strings.xml
es/values-ms/photoeditor_strings.xml
es/values-nb/photoeditor_strings.xml
es/values-nl/photoeditor_strings.xml
es/values-pl/photoeditor_strings.xml
es/values-pt-rPT/photoeditor_strings.xml
es/values-pt/photoeditor_strings.xml
es/values-ro/photoeditor_strings.xml
es/values-ru/photoeditor_strings.xml
es/values-sk/photoeditor_strings.xml
es/values-sl/photoeditor_strings.xml
es/values-sr/photoeditor_strings.xml
es/values-sv/photoeditor_strings.xml
es/values-sw/photoeditor_strings.xml
es/values-th/photoeditor_strings.xml
es/values-tl/photoeditor_strings.xml
es/values-tr/photoeditor_strings.xml
es/values-uk/photoeditor_strings.xml
es/values-vi/photoeditor_strings.xml
es/values-zh-rCN/photoeditor_strings.xml
es/values-zh-rTW/photoeditor_strings.xml
es/values-zu/photoeditor_strings.xml
|
8727edc5482e1761e555508f83de6213d5d3b541 |
03-May-2012 |
Eric Fischer <enf@google.com> |
am ecd0e033: (-s ours) am 92b5162f: Import translations. DO NOT MERGE * commit 'ecd0e03300f765d1a34a4189d07cde22975d4a4e': Import translations. DO NOT MERGE
|
3db58a46d49357c008e181f3df7ea8b584f2b239 |
03-May-2012 |
Eric Fischer <enf@google.com> |
am ecd0e033: (-s ours) am 92b5162f: Import translations. DO NOT MERGE * commit 'ecd0e03300f765d1a34a4189d07cde22975d4a4e': Import translations. DO NOT MERGE
|
3490ebe6413842e5288ade5227ce5c84d79de508 |
03-May-2012 |
Eric Fischer <enf@google.com> |
am 92b5162f: Import translations. DO NOT MERGE * commit '92b5162fc3edb48dcda5019881fdad1f70f0cb16': Import translations. DO NOT MERGE
|
ecd0e03300f765d1a34a4189d07cde22975d4a4e |
03-May-2012 |
Eric Fischer <enf@google.com> |
am 92b5162f: Import translations. DO NOT MERGE * commit '92b5162fc3edb48dcda5019881fdad1f70f0cb16': Import translations. DO NOT MERGE
|
e176d53761de6d45b306b929d81cbd62843b863e |
03-May-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: I6f229f2f85af67c76d057e23c22c6ccba7795f85
es/values-es-rUS/strings.xml
es/values-nb/strings.xml
|
b43d45df4951e887f4012f04067092688fc447ef |
03-May-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: I6f229f2f85af67c76d057e23c22c6ccba7795f85
es/values-es-rUS/strings.xml
es/values-nb/strings.xml
|
6b8f5b9f00b4cdd2c05cc74b7f5b6ed8ed8638e2 |
03-May-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: Iefc176de3ac6c1b849ced8c547ea35c3db68834b
es/values-es-rUS/strings.xml
es/values-nb/strings.xml
|
92b5162fc3edb48dcda5019881fdad1f70f0cb16 |
03-May-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: Iefc176de3ac6c1b849ced8c547ea35c3db68834b
es/values-es-rUS/strings.xml
es/values-nb/strings.xml
|
3c79a48ff6abfd2b40e5d615dcd13e56d27d254e |
03-May-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to jb-dev
|
bbd66533176a036c73a76d607819e8e3486cdd43 |
03-May-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to jb-dev
|
9c69d30887cbcfc4f60d617b274dada6df4d3672 |
03-May-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to jb-dev
|
1d9ab1712d866959412eb7e2622f8aefadf62964 |
03-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
am 833808e5: am 609a25b9: Merge "Add camera icon for camera roll." into jb-dev * commit '833808e552f2821e532efa04ff9a53780f19999b': Add camera icon for camera roll.
|
b3893170bba7b583fdd6435d2548137c80b525c0 |
03-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
am 833808e5: am 609a25b9: Merge "Add camera icon for camera roll." into jb-dev * commit '833808e552f2821e532efa04ff9a53780f19999b': Add camera icon for camera roll.
|
bce8b32620d1121617334dea9c9098e4fa19003d |
03-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
am 833808e5: am 609a25b9: Merge "Add camera icon for camera roll." into jb-dev * commit '833808e552f2821e532efa04ff9a53780f19999b': Add camera icon for camera roll.
|
1915695e3cbf7d7248616054cdd03b7ce1a0eaef |
03-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
am 97b7b78c: am 3ab1028f: Merge "Fix NPE in onFullScreenChanged message handler. Bug: 6430929" into jb-dev * commit '97b7b78cc8473b85367de3cc713d7bc8a8d33beb': Fix NPE in onFullScreenChanged message handler. Bug: 6430929
|
893838b86c4847f4917ac12de71e476905d22224 |
03-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
am 97b7b78c: am 3ab1028f: Merge "Fix NPE in onFullScreenChanged message handler. Bug: 6430929" into jb-dev * commit '97b7b78cc8473b85367de3cc713d7bc8a8d33beb': Fix NPE in onFullScreenChanged message handler. Bug: 6430929
|
eb1be328073c67c54d47209551bfe4343806e245 |
03-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
am 609a25b9: Merge "Add camera icon for camera roll." into jb-dev * commit '609a25b98a576e788c3eff507bc162616d1e64bd': Add camera icon for camera roll.
|
833808e552f2821e532efa04ff9a53780f19999b |
03-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
am 609a25b9: Merge "Add camera icon for camera roll." into jb-dev * commit '609a25b98a576e788c3eff507bc162616d1e64bd': Add camera icon for camera roll.
|
97b7b78cc8473b85367de3cc713d7bc8a8d33beb |
03-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
am 3ab1028f: Merge "Fix NPE in onFullScreenChanged message handler. Bug: 6430929" into jb-dev * commit '3ab1028ff9965615d6f90e5073c8d23775c51bb2': Fix NPE in onFullScreenChanged message handler. Bug: 6430929
|
266638231ff0ab052a1ae9b2f8656c71647e1ea6 |
03-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
Merge "Add camera icon for camera roll." into jb-dev
|
d17d924d8eff9ef0e25050f08b901361ef16cdaf |
03-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
Merge "Add camera icon for camera roll." into jb-dev
|
609a25b98a576e788c3eff507bc162616d1e64bd |
03-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
Merge "Add camera icon for camera roll." into jb-dev
|
2dedb26ed8c8260c11490b7a6e8f195d2a578935 |
03-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
Merge "Fix NPE in onFullScreenChanged message handler. Bug: 6430929" into jb-dev
|
3ab1028ff9965615d6f90e5073c8d23775c51bb2 |
03-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
Merge "Fix NPE in onFullScreenChanged message handler. Bug: 6430929" into jb-dev
|
2c1a35c13d09e601c94e1021c7e4691b83846ec0 |
03-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
Add camera icon for camera roll. Bug: 6411709 Change-Id: I2476dba7edb2b763f3b7727f0034fa300cf0287a
rc/com/android/gallery3d/app/AlbumPage.java
rc/com/android/gallery3d/app/AlbumSetPage.java
rc/com/android/gallery3d/util/GalleryUtils.java
|
f4ef5226e1a460a936ca24374047380d7da4ee60 |
03-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
Add camera icon for camera roll. Bug: 6411709 Change-Id: I2476dba7edb2b763f3b7727f0034fa300cf0287a
es/menu/album.xml
|
402237b43fd853377e5dba4e048839ad23b99d72 |
03-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
Add camera icon for camera roll. Bug: 6411709 Change-Id: I2476dba7edb2b763f3b7727f0034fa300cf0287a
es/menu/album.xml
rc/com/android/gallery3d/app/AlbumPage.java
rc/com/android/gallery3d/app/AlbumSetPage.java
rc/com/android/gallery3d/util/GalleryUtils.java
|
8616245fcb5ee8e8ddb7b6ea493c07ca309a22a7 |
03-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
Fix NPE in onFullScreenChanged message handler. Bug: 6430929 Also tweak the timing of showing action bar and the timing of unlock orientation. Change-Id: I1af4703ccf99f5257e9724a20d0aa216d20e13c2
rc/com/android/gallery3d/app/OrientationManager.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/ui/PhotoView.java
|
aeb3062e84ed28f0e25a73f511f287ae0a3e4294 |
03-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
Fix NPE in onFullScreenChanged message handler. Bug: 6430929 Also tweak the timing of showing action bar and the timing of unlock orientation. Change-Id: I1af4703ccf99f5257e9724a20d0aa216d20e13c2
rc/com/android/gallery3d/app/OrientationManager.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/ui/PhotoView.java
|
dd369030abd27c5015c7f39bbb9381446f9608d2 |
03-May-2012 |
Yuli Huang <yuli@google.com> |
am b1df47da: am 2f61a1c9: Simplify Yes/No/Cancel dialog to Yes/Cancel dialog. * commit 'b1df47daee28114b7971a369fd65305fbf0a32e1': Simplify Yes/No/Cancel dialog to Yes/Cancel dialog.
|
d9ee415a8ccd32bed8cb55553c6b4a4ea090840a |
03-May-2012 |
Yuli Huang <yuli@google.com> |
am b1df47da: am 2f61a1c9: Simplify Yes/No/Cancel dialog to Yes/Cancel dialog. * commit 'b1df47daee28114b7971a369fd65305fbf0a32e1': Simplify Yes/No/Cancel dialog to Yes/Cancel dialog.
|
81359712fb926b77112f241877ef661a15b9689f |
03-May-2012 |
Yuli Huang <yuli@google.com> |
am b1df47da: am 2f61a1c9: Simplify Yes/No/Cancel dialog to Yes/Cancel dialog. * commit 'b1df47daee28114b7971a369fd65305fbf0a32e1': Simplify Yes/No/Cancel dialog to Yes/Cancel dialog.
|
3374f1dd4d7b6b1b70623b89726b0170bf65bc65 |
03-May-2012 |
Yuli Huang <yuli@google.com> |
am 2f61a1c9: Simplify Yes/No/Cancel dialog to Yes/Cancel dialog. * commit '2f61a1c91f323ecd4ea5e385eb2b543517a23a0d': Simplify Yes/No/Cancel dialog to Yes/Cancel dialog.
|
b1df47daee28114b7971a369fd65305fbf0a32e1 |
03-May-2012 |
Yuli Huang <yuli@google.com> |
am 2f61a1c9: Simplify Yes/No/Cancel dialog to Yes/Cancel dialog. * commit '2f61a1c91f323ecd4ea5e385eb2b543517a23a0d': Simplify Yes/No/Cancel dialog to Yes/Cancel dialog.
|
83850dd2fd26dde48ab02d16ca5f59c885ad35b8 |
03-May-2012 |
Yuli Huang <yuli@google.com> |
Simplify Yes/No/Cancel dialog to Yes/Cancel dialog. Simplify the dialog options to confirm if the user wants to discard unsaved edited photo, similar to MMS asking if the user wants to discard the unsent message. bug:6436477 Change-Id: Ic5af09a1ed46033a25b4ac42bf05b9739f6e8447
es/values/photoeditor_strings.xml
|
91a7d446c293d0a58f9857f828b01b1e08bf26db |
03-May-2012 |
Yuli Huang <yuli@google.com> |
Simplify Yes/No/Cancel dialog to Yes/Cancel dialog. Simplify the dialog options to confirm if the user wants to discard unsaved edited photo, similar to MMS asking if the user wants to discard the unsent message. bug:6436477 Change-Id: Ic5af09a1ed46033a25b4ac42bf05b9739f6e8447
rc/com/android/gallery3d/photoeditor/ActionBar.java
rc/com/android/gallery3d/photoeditor/PhotoEditor.java
rc/com/android/gallery3d/photoeditor/YesCancelDialogBuilder.java
rc/com/android/gallery3d/photoeditor/YesNoCancelDialogBuilder.java
|
2f61a1c91f323ecd4ea5e385eb2b543517a23a0d |
03-May-2012 |
Yuli Huang <yuli@google.com> |
Simplify Yes/No/Cancel dialog to Yes/Cancel dialog. Simplify the dialog options to confirm if the user wants to discard unsaved edited photo, similar to MMS asking if the user wants to discard the unsent message. bug:6436477 Change-Id: Ic5af09a1ed46033a25b4ac42bf05b9739f6e8447
es/values/photoeditor_strings.xml
rc/com/android/gallery3d/photoeditor/ActionBar.java
rc/com/android/gallery3d/photoeditor/PhotoEditor.java
rc/com/android/gallery3d/photoeditor/YesCancelDialogBuilder.java
rc/com/android/gallery3d/photoeditor/YesNoCancelDialogBuilder.java
|
ce5fb56e072eb4fd1b6e3ab171c10d486646c14b |
03-May-2012 |
Yuli Huang <yuli@google.com> |
am af0adede: am 37531196: Merge "Fix NPE because of concurrent access in both GL and main threads." into jb-dev * commit 'af0adedefa3d2a283cfa58390cf7925823bf7fda': Fix NPE because of concurrent access in both GL and main threads.
|
052de7a94856b6b0492e8a9838e3d2031887ee49 |
03-May-2012 |
Yuli Huang <yuli@google.com> |
am af0adede: am 37531196: Merge "Fix NPE because of concurrent access in both GL and main threads." into jb-dev * commit 'af0adedefa3d2a283cfa58390cf7925823bf7fda': Fix NPE because of concurrent access in both GL and main threads.
|
af0adedefa3d2a283cfa58390cf7925823bf7fda |
03-May-2012 |
Yuli Huang <yuli@google.com> |
am 37531196: Merge "Fix NPE because of concurrent access in both GL and main threads." into jb-dev * commit '37531196bbecc15a8bf035381afeb61279a947ae': Fix NPE because of concurrent access in both GL and main threads.
|
ccc2ef5296119c723b4b7de3d6d5e562963db420 |
03-May-2012 |
Yuli Huang <yuli@google.com> |
Merge "Fix NPE because of concurrent access in both GL and main threads." into jb-dev
|
37531196bbecc15a8bf035381afeb61279a947ae |
03-May-2012 |
Yuli Huang <yuli@google.com> |
Merge "Fix NPE because of concurrent access in both GL and main threads." into jb-dev
|
da7d146014dd8c7bfd8f4f1f61f56bd87b39eb65 |
03-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
am eb30a86c: am 61f94714: Show/hide action bar at the right time. * commit 'eb30a86c5ef0c7e8027ab942d53e2c3c6b780437': Show/hide action bar at the right time.
|
5c896772044a248e122d0e260f6bbd90ec8cb010 |
03-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
am eb30a86c: am 61f94714: Show/hide action bar at the right time. * commit 'eb30a86c5ef0c7e8027ab942d53e2c3c6b780437': Show/hide action bar at the right time.
|
eb30a86c5ef0c7e8027ab942d53e2c3c6b780437 |
03-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
am 61f94714: Show/hide action bar at the right time. * commit '61f94714c3702115d2f89bb5f8829697be0c3680': Show/hide action bar at the right time.
|
3e553345da6aa4061f67505882eaae0ac120f89b |
02-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
Show/hide action bar at the right time. Bug: 6399476 Change-Id: I5046b2e73822ebadd94680f61d87db183b40b5c2
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/ui/PhotoView.java
|
61f94714c3702115d2f89bb5f8829697be0c3680 |
02-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
Show/hide action bar at the right time. Bug: 6399476 Change-Id: I5046b2e73822ebadd94680f61d87db183b40b5c2
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/ui/PhotoView.java
|
8803024b66da1c6d1771b33d0681ada533a0031d |
03-May-2012 |
Pin Ting <pinting@google.com> |
am 38045795: am 06c6401e: Turn on unlockOrientation to make onConfigurationChanged in camera work. * commit '38045795891d4bbc925f068073393ac66cb979c6': Turn on unlockOrientation to make onConfigurationChanged in camera work.
|
c5c877882233531b0c55f0ce225130add03603e1 |
03-May-2012 |
Pin Ting <pinting@google.com> |
am 38045795: am 06c6401e: Turn on unlockOrientation to make onConfigurationChanged in camera work. * commit '38045795891d4bbc925f068073393ac66cb979c6': Turn on unlockOrientation to make onConfigurationChanged in camera work.
|
38045795891d4bbc925f068073393ac66cb979c6 |
03-May-2012 |
Pin Ting <pinting@google.com> |
am 06c6401e: Turn on unlockOrientation to make onConfigurationChanged in camera work. * commit '06c6401eededc2ec842ba4994a838c2ded0a666c': Turn on unlockOrientation to make onConfigurationChanged in camera work.
|
ed5b46b29247cb3edbfc2d89619428a751d3cea5 |
02-May-2012 |
Yuli Huang <yuli@google.com> |
Fix NPE because of concurrent access in both GL and main threads. bug:6411187 Change-Id: I811c83f49837ee921436fec0c6b1bf2de0156e0a
rc/com/android/gallery3d/app/GalleryActionBar.java
|
677584c7242d21ef2ca8adbedb5f9e3f016b54b3 |
02-May-2012 |
Yuli Huang <yuli@google.com> |
Fix NPE because of concurrent access in both GL and main threads. bug:6411187 Change-Id: I811c83f49837ee921436fec0c6b1bf2de0156e0a
rc/com/android/gallery3d/app/GalleryActionBar.java
|
d7a94a57852e9c0d0f837cdd0bff8f4583b63df9 |
03-May-2012 |
Pin Ting <pinting@google.com> |
Turn on unlockOrientation to make onConfigurationChanged in camera work. Bug:6304805 Change-Id: Ia5a8df4153a7ddc7847a8a3744a3537120edb143
rc/com/android/gallery3d/app/PhotoPage.java
|
06c6401eededc2ec842ba4994a838c2ded0a666c |
03-May-2012 |
Pin Ting <pinting@google.com> |
Turn on unlockOrientation to make onConfigurationChanged in camera work. Bug:6304805 Change-Id: Ia5a8df4153a7ddc7847a8a3744a3537120edb143
rc/com/android/gallery3d/app/PhotoPage.java
|
bf967f878000b22b2bc9b906d00d6aa3ea0d3e88 |
02-May-2012 |
Eric Fischer <enf@google.com> |
am 6870d401: (-s ours) am d570731b: Import translations. DO NOT MERGE * commit '6870d401f34adc29c6f84a70b26689138ede2896': Import translations. DO NOT MERGE
|
fe7a6e3dfd7126207bd5fe792e66d9fcb1fd30e3 |
02-May-2012 |
Eric Fischer <enf@google.com> |
am 6870d401: (-s ours) am d570731b: Import translations. DO NOT MERGE * commit '6870d401f34adc29c6f84a70b26689138ede2896': Import translations. DO NOT MERGE
|
d65b3fb6c43e2691aa16d874649d21c94c64ca9c |
02-May-2012 |
Eric Fischer <enf@google.com> |
am d570731b: Import translations. DO NOT MERGE * commit 'd570731b3946566c38984487a719e9b0f5e8cd6c': Import translations. DO NOT MERGE
|
6870d401f34adc29c6f84a70b26689138ede2896 |
02-May-2012 |
Eric Fischer <enf@google.com> |
am d570731b: Import translations. DO NOT MERGE * commit 'd570731b3946566c38984487a719e9b0f5e8cd6c': Import translations. DO NOT MERGE
|
8d9dd84af152b14aac4eb5442712dc835e948ff5 |
02-May-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: I173ebbf3160eb55506dc6695b18d6267d3fca885
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
b1bedd6150c2428f5cdc2bb39158b8cb42a64512 |
02-May-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: I173ebbf3160eb55506dc6695b18d6267d3fca885
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
b06fa95fa90716ec65d127421a1a2d4de2a6cc83 |
02-May-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: I80d90a523de8148c14e643b3d81e5d1be7108a86
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
d570731b3946566c38984487a719e9b0f5e8cd6c |
02-May-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: I80d90a523de8148c14e643b3d81e5d1be7108a86
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
5c3d0a0cb2008942a033c30c75f82fbc73036313 |
02-May-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to jb-dev
|
a6f2a0a7d6af3c3ac9673658e0fe21ae9eccba3b |
02-May-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to jb-dev
|
7b32ab37db2dbd6a172de7a694cf1da31a35f574 |
02-May-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to jb-dev
|
7fed6409603f56682c5a35af35ee12414f66eee0 |
02-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
am b0c6de54: am 33f8567d: Fix the Camera controls disappearing after zooming problem. * commit 'b0c6de54e6555c6be9f13c362aaeae63dc18023d': Fix the Camera controls disappearing after zooming problem.
|
81de7b34f669073ccfbe96504d16c74d6467eecb |
02-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
am b0c6de54: am 33f8567d: Fix the Camera controls disappearing after zooming problem. * commit 'b0c6de54e6555c6be9f13c362aaeae63dc18023d': Fix the Camera controls disappearing after zooming problem.
|
b0c6de54e6555c6be9f13c362aaeae63dc18023d |
02-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
am 33f8567d: Fix the Camera controls disappearing after zooming problem. * commit '33f8567dd5003e4bb342683f3768ab7552648b02': Fix the Camera controls disappearing after zooming problem.
|
a3b71abdb18a974e3269a6808c67431e6c86fc28 |
01-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
Fix the Camera controls disappearing after zooming problem. Bug: 6392682 Change-Id: I065c52b44c02f9314e58e82846cdf22e2d940eab
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/ui/PhotoView.java
|
33f8567dd5003e4bb342683f3768ab7552648b02 |
01-May-2012 |
Chih-Chung Chang <chihchung@google.com> |
Fix the Camera controls disappearing after zooming problem. Bug: 6392682 Change-Id: I065c52b44c02f9314e58e82846cdf22e2d940eab
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/ui/PhotoView.java
|
f4cb61d9c5ff783d6fb6bda5c1dd6b6300cd73a8 |
02-May-2012 |
Yuli Huang <yuli@google.com> |
am fe2b997f: am f50ce2b7: Fix \'Edit\' and \'Crop\' behaviors. * commit 'fe2b997fbbc24d9bb118bf5cb9d36d3b2f38663d': Fix 'Edit' and 'Crop' behaviors.
|
05ac34be339616883e4bcdc1da3f3631091fcf90 |
02-May-2012 |
Yuli Huang <yuli@google.com> |
am fe2b997f: am f50ce2b7: Fix \'Edit\' and \'Crop\' behaviors. * commit 'fe2b997fbbc24d9bb118bf5cb9d36d3b2f38663d': Fix 'Edit' and 'Crop' behaviors.
|
f9c34e21b209b2dda131a26a4dd09096eaeb4277 |
02-May-2012 |
Yuli Huang <yuli@google.com> |
am fe2b997f: am f50ce2b7: Fix \'Edit\' and \'Crop\' behaviors. * commit 'fe2b997fbbc24d9bb118bf5cb9d36d3b2f38663d': Fix 'Edit' and 'Crop' behaviors.
|
450ede0b52d37c515c64ca638569a93819239849 |
02-May-2012 |
Yuli Huang <yuli@google.com> |
am f50ce2b7: Fix \'Edit\' and \'Crop\' behaviors. * commit 'f50ce2b708c0c70930a346206fdd526f53ae6004': Fix 'Edit' and 'Crop' behaviors.
|
fe2b997fbbc24d9bb118bf5cb9d36d3b2f38663d |
02-May-2012 |
Yuli Huang <yuli@google.com> |
am f50ce2b7: Fix \'Edit\' and \'Crop\' behaviors. * commit 'f50ce2b708c0c70930a346206fdd526f53ae6004': Fix 'Edit' and 'Crop' behaviors.
|
02113e41268923c1d316c36756afe7ac97037439 |
01-May-2012 |
Yuli Huang <yuli@google.com> |
Fix 'Edit' and 'Crop' behaviors. 1. Make Gallery show edited local photo after resuming, similar to how it shows cropped local photo after resuming. 2. Fix inconsistency between cropping local/PWA photo. bug:6168430 Change-Id: Ia350e0c67f05969ad42f56b9693c09c3b6433d3c
es/values/strings.xml
|
3db691c36312afb934463f0549a33a7eb58bf696 |
01-May-2012 |
Yuli Huang <yuli@google.com> |
Fix 'Edit' and 'Crop' behaviors. 1. Make Gallery show edited local photo after resuming, similar to how it shows cropped local photo after resuming. 2. Fix inconsistency between cropping local/PWA photo. bug:6168430 Change-Id: Ia350e0c67f05969ad42f56b9693c09c3b6433d3c
rc/com/android/gallery3d/app/PhotoDataAdapter.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/photoeditor/PhotoEditor.java
rc/com/android/gallery3d/ui/MenuExecutor.java
|
f50ce2b708c0c70930a346206fdd526f53ae6004 |
01-May-2012 |
Yuli Huang <yuli@google.com> |
Fix 'Edit' and 'Crop' behaviors. 1. Make Gallery show edited local photo after resuming, similar to how it shows cropped local photo after resuming. 2. Fix inconsistency between cropping local/PWA photo. bug:6168430 Change-Id: Ia350e0c67f05969ad42f56b9693c09c3b6433d3c
es/values/strings.xml
rc/com/android/gallery3d/app/PhotoDataAdapter.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/photoeditor/PhotoEditor.java
rc/com/android/gallery3d/ui/MenuExecutor.java
|
00b1a30842bd0fef11f55b1e62798b39956c6c2e |
02-May-2012 |
Owen Lin <owenlin@google.com> |
am 32a000c6: am edd4807d: Merge "Change thumbnail\'s position only when it is invisible." into jb-dev * commit '32a000c60f5fb18f46f8683df79f89f02574257b': Change thumbnail's position only when it is invisible.
|
3e0f230725d1dd8e1f451fb3a1c81e0ad3a07dc0 |
02-May-2012 |
Owen Lin <owenlin@google.com> |
am 32a000c6: am edd4807d: Merge "Change thumbnail\'s position only when it is invisible." into jb-dev * commit '32a000c60f5fb18f46f8683df79f89f02574257b': Change thumbnail's position only when it is invisible.
|
4c53c1fc1aaad7fe9f99485c7e71bd2fe01d1300 |
02-May-2012 |
Owen Lin <owenlin@google.com> |
am d1314e75: am 603f9090: Merge "Fix a issue that we are trying upload a recycled tile." into jb-dev * commit 'd1314e754bfb077ec868848c5b0a639ac2d9a60e': Fix a issue that we are trying upload a recycled tile.
|
d4751f066c97c10e1c2f42462f94f19f57944fdf |
02-May-2012 |
Owen Lin <owenlin@google.com> |
am d1314e75: am 603f9090: Merge "Fix a issue that we are trying upload a recycled tile." into jb-dev * commit 'd1314e754bfb077ec868848c5b0a639ac2d9a60e': Fix a issue that we are trying upload a recycled tile.
|
9b2d0ebad9ba2cafed17b925696ba6fe15fbfd9c |
02-May-2012 |
Owen Lin <owenlin@google.com> |
am cd7842a9: am 0820262b: Merge "Add support to draw on texture." into jb-dev * commit 'cd7842a9d3686bf8002f811fe4c21d5fe601ebfb': Add support to draw on texture.
|
af791240e20a53e9d5bd62e361dacc320fbf7ff4 |
02-May-2012 |
Owen Lin <owenlin@google.com> |
am cd7842a9: am 0820262b: Merge "Add support to draw on texture." into jb-dev * commit 'cd7842a9d3686bf8002f811fe4c21d5fe601ebfb': Add support to draw on texture.
|
32a000c60f5fb18f46f8683df79f89f02574257b |
02-May-2012 |
Owen Lin <owenlin@google.com> |
am edd4807d: Merge "Change thumbnail\'s position only when it is invisible." into jb-dev * commit 'edd4807d55c34683fdf87770559bd16a5f9163d7': Change thumbnail's position only when it is invisible.
|
d1314e754bfb077ec868848c5b0a639ac2d9a60e |
02-May-2012 |
Owen Lin <owenlin@google.com> |
am 603f9090: Merge "Fix a issue that we are trying upload a recycled tile." into jb-dev * commit '603f9090bed0908374eda827be2c08a7a1b8d8c2': Fix a issue that we are trying upload a recycled tile.
|
cd7842a9d3686bf8002f811fe4c21d5fe601ebfb |
02-May-2012 |
Owen Lin <owenlin@google.com> |
am 0820262b: Merge "Add support to draw on texture." into jb-dev * commit '0820262bea846c466706ab488d038747ddcdd747': Add support to draw on texture.
|
c3d5fcfbbb0cd6bd14cc9930fff36356b0024371 |
02-May-2012 |
Owen Lin <owenlin@google.com> |
Merge "Change thumbnail's position only when it is invisible." into jb-dev
|
edd4807d55c34683fdf87770559bd16a5f9163d7 |
02-May-2012 |
Owen Lin <owenlin@google.com> |
Merge "Change thumbnail's position only when it is invisible." into jb-dev
|
c6ba487196474a75461100ae3b1886151b106026 |
02-May-2012 |
Owen Lin <owenlin@google.com> |
Merge "Fix a issue that we are trying upload a recycled tile." into jb-dev
|
603f9090bed0908374eda827be2c08a7a1b8d8c2 |
02-May-2012 |
Owen Lin <owenlin@google.com> |
Merge "Fix a issue that we are trying upload a recycled tile." into jb-dev
|
c7faa9ef9e493d7af0345efa403c74c168c3843e |
02-May-2012 |
Owen Lin <owenlin@google.com> |
Merge "Add support to draw on texture." into jb-dev
|
0820262bea846c466706ab488d038747ddcdd747 |
02-May-2012 |
Owen Lin <owenlin@google.com> |
Merge "Add support to draw on texture." into jb-dev
|
960290b28c2a0d69216c5412c4da2f4e5c58e602 |
02-May-2012 |
Owen Lin <owenlin@google.com> |
Change thumbnail's position only when it is invisible. bug:6393694 Change-Id: I33f41c3c894b4c6d28e0832cfd4badbfca3a4f64
rc/com/android/gallery3d/app/AlbumPage.java
|
c63554245d9a822a9fbe5aeda8612624434fd247 |
02-May-2012 |
Owen Lin <owenlin@google.com> |
Change thumbnail's position only when it is invisible. bug:6393694 Change-Id: I33f41c3c894b4c6d28e0832cfd4badbfca3a4f64
rc/com/android/gallery3d/app/AlbumPage.java
|
023eb0887e122a41315066dbebb8c89360b98810 |
24-Apr-2012 |
Owen Lin <owenlin@google.com> |
Add support to draw on texture. Change-Id: I95dd5d29352692b702503969e1ebe07bc91a8a73
rc/com/android/gallery3d/ui/GLCanvas.java
rc/com/android/gallery3d/ui/GLCanvasImpl.java
rc/com/android/gallery3d/ui/Raw2DTexture.java
rc/com/android/gallery3d/ui/RawTexture.java
ests/src/com/android/gallery3d/ui/GLCanvasStub.java
|
8ac2e8630f33f4d5f65731dc56efa9bfb3570cd7 |
24-Apr-2012 |
Owen Lin <owenlin@google.com> |
Add support to draw on texture. Change-Id: I95dd5d29352692b702503969e1ebe07bc91a8a73
rc/com/android/gallery3d/ui/GLCanvas.java
rc/com/android/gallery3d/ui/GLCanvasImpl.java
rc/com/android/gallery3d/ui/Raw2DTexture.java
rc/com/android/gallery3d/ui/RawTexture.java
ests/src/com/android/gallery3d/ui/GLCanvasStub.java
|
e78cfe56792b4f05aa41f02db863d1ec8eea5236 |
02-May-2012 |
Owen Lin <owenlin@google.com> |
am fd2347f6: am eea90e65: Merge "Fix photo rotates incorrectly in crop image." into jb-dev * commit 'fd2347f60dbb11de6f4c3e3bbe48471dace3f848': Fix photo rotates incorrectly in crop image.
|
2759b13ea135bdc03388ed6f0ebe1bbc1692919c |
02-May-2012 |
Owen Lin <owenlin@google.com> |
am fd2347f6: am eea90e65: Merge "Fix photo rotates incorrectly in crop image." into jb-dev * commit 'fd2347f60dbb11de6f4c3e3bbe48471dace3f848': Fix photo rotates incorrectly in crop image.
|
fd2347f60dbb11de6f4c3e3bbe48471dace3f848 |
02-May-2012 |
Owen Lin <owenlin@google.com> |
am eea90e65: Merge "Fix photo rotates incorrectly in crop image." into jb-dev * commit 'eea90e65dcfcd1c9b2c8cfcbb9b20855f380a72a': Fix photo rotates incorrectly in crop image.
|
01b38a1d30f9002b67bdf93ea0277fbf9f8813ea |
27-Apr-2012 |
Owen Lin <owenlin@google.com> |
Fix a issue that we are trying upload a recycled tile. bug:5779992 Change-Id: I2503c87e9cea4e8b0ad5250b1508d06f44125779
rc/com/android/gallery3d/ui/TileImageView.java
|
5548396020eed79dde29f33fa68d4d593b9dd013 |
27-Apr-2012 |
Owen Lin <owenlin@google.com> |
Fix a issue that we are trying upload a recycled tile. bug:5779992 Change-Id: I2503c87e9cea4e8b0ad5250b1508d06f44125779
rc/com/android/gallery3d/ui/TileImageView.java
|
98db32decd9cbc4d3405f9c75f3a43a0e74f873f |
02-May-2012 |
Ray Chen <raychen@google.com> |
Fix 6341866 ANR in com.google.android.gallery3d due to com.android.gallery3d.ui.TileImageViewAdapter.setScreenNail RegionDecoder is run in a lower priority thread but it uses the same lock as setScreenNail while decoding, so a priority inversion causes this ANR. The change tries to separate the lock so setScreenNail doesn't have to wait on the decoding process so the ANR could be avoided. Change-Id: I02cc26fa0535adaa57cdcf94b819970e179311d1 b:6341866
rc/com/android/gallery3d/ui/TileImageViewAdapter.java
|
6fc8d72ce0814a70c74be71fb9d0775b8d7ca768 |
02-May-2012 |
Ray Chen <raychen@google.com> |
Fix 6341866 ANR in com.google.android.gallery3d due to com.android.gallery3d.ui.TileImageViewAdapter.setScreenNail RegionDecoder is run in a lower priority thread but it uses the same lock as setScreenNail while decoding, so a priority inversion causes this ANR. The change tries to separate the lock so setScreenNail doesn't have to wait on the decoding process so the ANR could be avoided. Change-Id: I02cc26fa0535adaa57cdcf94b819970e179311d1 b:6341866
rc/com/android/gallery3d/ui/TileImageViewAdapter.java
|
82cae104296a478ab5e69dd123266096ec004b2b |
02-May-2012 |
Owen Lin <owenlin@google.com> |
Merge "Fix photo rotates incorrectly in crop image." into jb-dev
|
eea90e65dcfcd1c9b2c8cfcbb9b20855f380a72a |
02-May-2012 |
Owen Lin <owenlin@google.com> |
Merge "Fix photo rotates incorrectly in crop image." into jb-dev
|
4439a2ad5548d686d945f24ab2ce296b87d50381 |
01-May-2012 |
Eric Fischer <enf@google.com> |
am d42f82b3: (-s ours) am 814360ae: Merge "Import translations. DO NOT MERGE" into jb-dev * commit 'd42f82b3c0836d500cc9584a590362ec26337156': Import translations. DO NOT MERGE
|
f677a1fa58faca82869774dd52bd8589c51adf6f |
01-May-2012 |
Eric Fischer <enf@google.com> |
am d42f82b3: (-s ours) am 814360ae: Merge "Import translations. DO NOT MERGE" into jb-dev * commit 'd42f82b3c0836d500cc9584a590362ec26337156': Import translations. DO NOT MERGE
|
b0ab11e7fb9d5c22a7852f4a4bc42ba19cc31bf0 |
01-May-2012 |
Eric Fischer <enf@google.com> |
am 814360ae: Merge "Import translations. DO NOT MERGE" into jb-dev * commit '814360ae97d59e333440076b5517fff0c6be5ca9': Import translations. DO NOT MERGE
|
d42f82b3c0836d500cc9584a590362ec26337156 |
01-May-2012 |
Eric Fischer <enf@google.com> |
am 814360ae: Merge "Import translations. DO NOT MERGE" into jb-dev * commit '814360ae97d59e333440076b5517fff0c6be5ca9': Import translations. DO NOT MERGE
|
c2087d3e9a5bc28f97e291209805b083282b7cb1 |
01-May-2012 |
Eric Fischer <enf@google.com> |
Merge "Import translations. DO NOT MERGE"
|
11edcc7014171b9a1fb368b437e249666fcaa23c |
01-May-2012 |
Eric Fischer <enf@google.com> |
Merge "Import translations. DO NOT MERGE"
|
5f7164c10aa1a1e8667fd086312cd7047998d006 |
01-May-2012 |
Eric Fischer <enf@google.com> |
Merge "Import translations. DO NOT MERGE" into jb-dev
|
814360ae97d59e333440076b5517fff0c6be5ca9 |
01-May-2012 |
Eric Fischer <enf@google.com> |
Merge "Import translations. DO NOT MERGE" into jb-dev
|
bad30776566ff4b1fdca3371705faac473c81d38 |
01-May-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: I40d1d3dafb1bb71b6478dbfd56afc630b962113d
es/values-es-rUS/photoeditor_strings.xml
es/values-ms/photoeditor_strings.xml
es/values-sw/photoeditor_strings.xml
|
fa71442fa3bd56875ab30a6191114ab9600b53da |
01-May-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: I40d1d3dafb1bb71b6478dbfd56afc630b962113d
es/values-es-rUS/photoeditor_strings.xml
es/values-ms/photoeditor_strings.xml
es/values-sw/photoeditor_strings.xml
|
3d92bfda93ebb9539205a8e24e82601505d3c37a |
01-May-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: I17da847d9cf238a770caa867bd27ea227797d71f
es/values-es-rUS/photoeditor_strings.xml
es/values-ms/photoeditor_strings.xml
es/values-sw/photoeditor_strings.xml
|
1ee54f6ca0cf7377232e3fe5f70110e22ded712e |
01-May-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: I17da847d9cf238a770caa867bd27ea227797d71f
es/values-es-rUS/photoeditor_strings.xml
es/values-ms/photoeditor_strings.xml
es/values-sw/photoeditor_strings.xml
|
ab7fea53e4b8353377119fa8c8f45fdad37dafd5 |
01-May-2012 |
Eric Fischer <enf@google.com> |
am a1630d9f: (-s ours) am 1f0f6c7e: Import translations. DO NOT MERGE * commit 'a1630d9f1e92099b4b9f505f397af4ee885fea02': Import translations. DO NOT MERGE
|
96c702b1e4fba5f617b238d4c7ee4f6be261fff9 |
01-May-2012 |
Eric Fischer <enf@google.com> |
am a1630d9f: (-s ours) am 1f0f6c7e: Import translations. DO NOT MERGE * commit 'a1630d9f1e92099b4b9f505f397af4ee885fea02': Import translations. DO NOT MERGE
|
4f4b45dac21191808dd79c9f4e78c0195ec66571 |
01-May-2012 |
Eric Fischer <enf@google.com> |
am 1f0f6c7e: Import translations. DO NOT MERGE * commit '1f0f6c7ec233e25601b6f035d75a65aa19ea9a5e': Import translations. DO NOT MERGE
|
a1630d9f1e92099b4b9f505f397af4ee885fea02 |
01-May-2012 |
Eric Fischer <enf@google.com> |
am 1f0f6c7e: Import translations. DO NOT MERGE * commit '1f0f6c7ec233e25601b6f035d75a65aa19ea9a5e': Import translations. DO NOT MERGE
|
4ee08a2e2e68e6be7bd9f14a30e5cee5c93cb001 |
01-May-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: I166d8c1f6827bc0fac7b4f0436f59aac67394633
es/values-es-rUS/strings.xml
es/values-ms/strings.xml
es/values-sw/strings.xml
|
a2799d4973e11c5f7c9b00d1bc61f31de463ce57 |
01-May-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: I166d8c1f6827bc0fac7b4f0436f59aac67394633
es/values-es-rUS/strings.xml
es/values-ms/strings.xml
es/values-sw/strings.xml
|
59acc86d908eb2e14424ac51e570600000da377c |
01-May-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: I5a1227b0df7f6744d13a263ea433ccadccc76be8
es/values-es-rUS/strings.xml
es/values-ms/strings.xml
es/values-sw/strings.xml
|
1f0f6c7ec233e25601b6f035d75a65aa19ea9a5e |
01-May-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: I5a1227b0df7f6744d13a263ea433ccadccc76be8
es/values-es-rUS/strings.xml
es/values-ms/strings.xml
es/values-sw/strings.xml
|
0be5daa3d0e1f2113bc3b280cfded84e443d7f01 |
01-May-2012 |
Yuli Huang <yuli@google.com> |
am 43c69e0d: am dd97a122: Increase localization string limit. * commit '43c69e0df9fd0f1237e1d05ecb8b40ca0f06bfb5': Increase localization string limit.
|
a477dbf6cba684e770325f436bf27ed5368c4ebf |
01-May-2012 |
Yuli Huang <yuli@google.com> |
am 43c69e0d: am dd97a122: Increase localization string limit. * commit '43c69e0df9fd0f1237e1d05ecb8b40ca0f06bfb5': Increase localization string limit.
|
0f14c8e9014e9ce9d81d667204ac66bf685d864e |
01-May-2012 |
Yuli Huang <yuli@google.com> |
am dd97a122: Increase localization string limit. * commit 'dd97a122cc8992c31d0ded4313b925fa5612dbf1': Increase localization string limit.
|
43c69e0df9fd0f1237e1d05ecb8b40ca0f06bfb5 |
01-May-2012 |
Yuli Huang <yuli@google.com> |
am dd97a122: Increase localization string limit. * commit 'dd97a122cc8992c31d0ded4313b925fa5612dbf1': Increase localization string limit.
|
d2935160df453c9a950e64a51b619ecc6b1ab92d |
01-May-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to jb-dev
|
01510cd3e059cfbf7d49b2099fbb2291a46b7950 |
01-May-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to jb-dev
|
70e48b88db2a8323f3e3470a06240697de6d9c45 |
01-May-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to jb-dev
|
254e21663aee8d7794bc9bdb5aa3779b4474f90a |
01-May-2012 |
Jean-Baptiste Queru <jbq@google.com> |
am b5d5adf0: am 86c2de0e: am 5e73eda6: Merge "Add missing xhdpi icon to Gallery2" * commit 'b5d5adf0c803132245bdb7202fe0cd6a7e5043c4': Add missing xhdpi icon to Gallery2
|
a597ee3045baca0b5d56fbf4469df3baa50547d5 |
01-May-2012 |
Jean-Baptiste Queru <jbq@google.com> |
am b5d5adf0: am 86c2de0e: am 5e73eda6: Merge "Add missing xhdpi icon to Gallery2" * commit 'b5d5adf0c803132245bdb7202fe0cd6a7e5043c4': Add missing xhdpi icon to Gallery2
|
d217088097da370f6c7ec8ec848b208f2b691c9e |
01-May-2012 |
Jean-Baptiste Queru <jbq@google.com> |
am 86c2de0e: am 5e73eda6: Merge "Add missing xhdpi icon to Gallery2" * commit '86c2de0e1e09633be5e2de56ecb2a7efcc08305e': Add missing xhdpi icon to Gallery2
|
b5d5adf0c803132245bdb7202fe0cd6a7e5043c4 |
01-May-2012 |
Jean-Baptiste Queru <jbq@google.com> |
am 86c2de0e: am 5e73eda6: Merge "Add missing xhdpi icon to Gallery2" * commit '86c2de0e1e09633be5e2de56ecb2a7efcc08305e': Add missing xhdpi icon to Gallery2
|
86c2de0e1e09633be5e2de56ecb2a7efcc08305e |
01-May-2012 |
Jean-Baptiste Queru <jbq@google.com> |
am 5e73eda6: Merge "Add missing xhdpi icon to Gallery2" * commit '5e73eda63d73a3e0f94d6ef633d7704e31b8e48e': Add missing xhdpi icon to Gallery2
|
5e73eda63d73a3e0f94d6ef633d7704e31b8e48e |
01-May-2012 |
Jean-Baptiste Queru <jbq@google.com> |
Merge "Add missing xhdpi icon to Gallery2"
|
0f2769b8f7a7d6435b87ad5fa4de81da17b70d9d |
01-May-2012 |
Yuli Huang <yuli@google.com> |
Increase localization string limit. bug:6421026 Change-Id: I8a296c37287605680eaaeda5765257cf45d5fc8e
es/values/photoeditor_strings.xml
|
dd97a122cc8992c31d0ded4313b925fa5612dbf1 |
01-May-2012 |
Yuli Huang <yuli@google.com> |
Increase localization string limit. bug:6421026 Change-Id: I8a296c37287605680eaaeda5765257cf45d5fc8e
es/values/photoeditor_strings.xml
|
85f22697b5b8d00a2c9210743d9b54120a4f5e9d |
30-Apr-2012 |
Chih-Chung Chang <chihchung@google.com> |
Fix black screen when viewing Gmail image file attachment. Bug: 6415848 Change-Id: Iec369866be6b5546fbd8cb77eb95a29f92e00b84
rc/com/android/gallery3d/ui/PositionController.java
|
ca4dafb77b8c427838803983e360d7c9fe70b32b |
30-Apr-2012 |
Chih-Chung Chang <chihchung@google.com> |
Fix black screen when viewing Gmail image file attachment. Bug: 6415848 Change-Id: Iec369866be6b5546fbd8cb77eb95a29f92e00b84
rc/com/android/gallery3d/ui/PositionController.java
|
955e71d986fd0472fef899fd5ab56e1b86a0f325 |
30-Apr-2012 |
Wu-cheng Li <wuchengli@google.com> |
Fix crash when select all is pressed. bug:6411186 Change-Id: Iaa71a320bc4d6d70aade41d5144f75ba6db36e6d
rc/com/android/gallery3d/ui/MenuExecutor.java
|
c6aae5f6356fa3bad1b82a71b51fddff8e21858b |
30-Apr-2012 |
Wu-cheng Li <wuchengli@google.com> |
Fix crash when select all is pressed. bug:6411186 Change-Id: Iaa71a320bc4d6d70aade41d5144f75ba6db36e6d
rc/com/android/gallery3d/ui/MenuExecutor.java
|
0d8b9ebddde169eaaaded9331d470bd2cf9cb8a6 |
30-Apr-2012 |
Eric Fischer <enf@google.com> |
am 654f786f: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-dev * commit '654f786f369a2740435fc27a728d85ae2504d429': Import translations. DO NOT MERGE
|
e84e2963ede2ebc898f59c9daf44558db8db0eab |
30-Apr-2012 |
Eric Fischer <enf@google.com> |
am 654f786f: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-dev * commit '654f786f369a2740435fc27a728d85ae2504d429': Import translations. DO NOT MERGE
|
c0e340eeb9e5daac81644ff848318448f2c8ef8f |
30-Apr-2012 |
Eric Fischer <enf@google.com> |
Merge "Import translations. DO NOT MERGE"
|
97c78638179e791f735a839a36703cf4680b6a7d |
30-Apr-2012 |
Eric Fischer <enf@google.com> |
Merge "Import translations. DO NOT MERGE"
|
939e3386d4c7c7c01d7a5e2583d049c77a0df45a |
30-Apr-2012 |
Eric Fischer <enf@google.com> |
Merge "Import translations. DO NOT MERGE" into jb-dev
|
654f786f369a2740435fc27a728d85ae2504d429 |
30-Apr-2012 |
Eric Fischer <enf@google.com> |
Merge "Import translations. DO NOT MERGE" into jb-dev
|
d1c4bf61076871947c7dff35b21b6aac75d4e590 |
30-Apr-2012 |
Eric Fischer <enf@google.com> |
am 642ed688: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-dev * commit '642ed688019936b7bab712977f30c28659da63cb': Import translations. DO NOT MERGE
|
7738b023f74bb779b7ecc2eca5b51f8c17907d71 |
30-Apr-2012 |
Eric Fischer <enf@google.com> |
am 642ed688: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-dev * commit '642ed688019936b7bab712977f30c28659da63cb': Import translations. DO NOT MERGE
|
2b892bc69f6f4900e02f9ff8947b25400b441ab3 |
30-Apr-2012 |
Eric Fischer <enf@google.com> |
Merge "Import translations. DO NOT MERGE"
|
642ed688019936b7bab712977f30c28659da63cb |
30-Apr-2012 |
Eric Fischer <enf@google.com> |
Merge "Import translations. DO NOT MERGE" into jb-dev
|
b774ded2eaca82e2f43a66751cdccd9aea4edbc8 |
30-Apr-2012 |
Wei Huang <weih@google.com> |
am 50213b69: Merge "Don\'t enter film mode automatically when moving from camera preview to picture." into jb-dev * commit '50213b692c09a0121d066d8e1101ec253898e934': Don't enter film mode automatically when moving from camera preview to picture.
|
c943e163b91891f3b2b79bc1bae34af10ec3cf54 |
30-Apr-2012 |
Wei Huang <weih@google.com> |
am 50213b69: Merge "Don\'t enter film mode automatically when moving from camera preview to picture." into jb-dev * commit '50213b692c09a0121d066d8e1101ec253898e934': Don't enter film mode automatically when moving from camera preview to picture.
|
348988dc1934981a96018006b4af6c38f33cf26e |
30-Apr-2012 |
Wei Huang <weih@google.com> |
Merge "Don't enter film mode automatically when moving from camera preview to picture." into jb-dev
|
50213b692c09a0121d066d8e1101ec253898e934 |
30-Apr-2012 |
Wei Huang <weih@google.com> |
Merge "Don't enter film mode automatically when moving from camera preview to picture." into jb-dev
|
a03ad179e64997e3ce7949e5cad6724c9b6054c6 |
30-Apr-2012 |
Chih-Chung Chang <chihchung@google.com> |
Don't enter film mode automatically when moving from camera preview to picture. Also don't follow the scaling touch once we decide to change film mode, this makes the animation smoother. Change-Id: I45f97bd8c3cc90666370afeb1c18d21dfcc87c06
rc/com/android/gallery3d/ui/PhotoView.java
|
18958c51f1412d959d52500ceefc46f987d035f3 |
30-Apr-2012 |
Chih-Chung Chang <chihchung@google.com> |
Don't enter film mode automatically when moving from camera preview to picture. Also don't follow the scaling touch once we decide to change film mode, this makes the animation smoother. Change-Id: I45f97bd8c3cc90666370afeb1c18d21dfcc87c06
rc/com/android/gallery3d/ui/PhotoView.java
|
171f5eaffc064472460bc61f33280c8d2205d172 |
30-Apr-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: I81d0c999c8cc273044a4b8fbab92f6223ddd4654
es/values-af/photoeditor_strings.xml
es/values-am/photoeditor_strings.xml
es/values-ar/photoeditor_strings.xml
es/values-be/photoeditor_strings.xml
es/values-bg/photoeditor_strings.xml
es/values-ca/photoeditor_strings.xml
es/values-cs/photoeditor_strings.xml
es/values-da/photoeditor_strings.xml
es/values-de/photoeditor_strings.xml
es/values-el/photoeditor_strings.xml
es/values-en-rGB/photoeditor_strings.xml
es/values-es/photoeditor_strings.xml
es/values-et/photoeditor_strings.xml
es/values-fa/photoeditor_strings.xml
es/values-fi/photoeditor_strings.xml
es/values-fr/photoeditor_strings.xml
es/values-hi/photoeditor_strings.xml
es/values-hr/photoeditor_strings.xml
es/values-hu/photoeditor_strings.xml
es/values-in/photoeditor_strings.xml
es/values-it/photoeditor_strings.xml
es/values-iw/photoeditor_strings.xml
es/values-ja/photoeditor_strings.xml
es/values-ko/photoeditor_strings.xml
es/values-lt/photoeditor_strings.xml
es/values-lv/photoeditor_strings.xml
es/values-nb/photoeditor_strings.xml
es/values-nl/photoeditor_strings.xml
es/values-pl/photoeditor_strings.xml
es/values-pt-rPT/photoeditor_strings.xml
es/values-pt/photoeditor_strings.xml
es/values-ro/photoeditor_strings.xml
es/values-ru/photoeditor_strings.xml
es/values-sk/photoeditor_strings.xml
es/values-sl/photoeditor_strings.xml
es/values-sr/photoeditor_strings.xml
es/values-sv/photoeditor_strings.xml
es/values-th/photoeditor_strings.xml
es/values-tl/photoeditor_strings.xml
es/values-tr/photoeditor_strings.xml
es/values-uk/photoeditor_strings.xml
es/values-vi/photoeditor_strings.xml
es/values-zh-rCN/photoeditor_strings.xml
es/values-zh-rTW/photoeditor_strings.xml
es/values-zu/photoeditor_strings.xml
|
fbdc19049e22b8b98af04e0a378c7a67810f0da7 |
30-Apr-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: I81d0c999c8cc273044a4b8fbab92f6223ddd4654
es/values-af/photoeditor_strings.xml
es/values-am/photoeditor_strings.xml
es/values-ar/photoeditor_strings.xml
es/values-be/photoeditor_strings.xml
es/values-bg/photoeditor_strings.xml
es/values-ca/photoeditor_strings.xml
es/values-cs/photoeditor_strings.xml
es/values-da/photoeditor_strings.xml
es/values-de/photoeditor_strings.xml
es/values-el/photoeditor_strings.xml
es/values-en-rGB/photoeditor_strings.xml
es/values-es/photoeditor_strings.xml
es/values-et/photoeditor_strings.xml
es/values-fa/photoeditor_strings.xml
es/values-fi/photoeditor_strings.xml
es/values-fr/photoeditor_strings.xml
es/values-hi/photoeditor_strings.xml
es/values-hr/photoeditor_strings.xml
es/values-hu/photoeditor_strings.xml
es/values-in/photoeditor_strings.xml
es/values-it/photoeditor_strings.xml
es/values-iw/photoeditor_strings.xml
es/values-ja/photoeditor_strings.xml
es/values-ko/photoeditor_strings.xml
es/values-lt/photoeditor_strings.xml
es/values-lv/photoeditor_strings.xml
es/values-nb/photoeditor_strings.xml
es/values-nl/photoeditor_strings.xml
es/values-pl/photoeditor_strings.xml
es/values-pt-rPT/photoeditor_strings.xml
es/values-pt/photoeditor_strings.xml
es/values-ro/photoeditor_strings.xml
es/values-ru/photoeditor_strings.xml
es/values-sk/photoeditor_strings.xml
es/values-sl/photoeditor_strings.xml
es/values-sr/photoeditor_strings.xml
es/values-sv/photoeditor_strings.xml
es/values-th/photoeditor_strings.xml
es/values-tl/photoeditor_strings.xml
es/values-tr/photoeditor_strings.xml
es/values-uk/photoeditor_strings.xml
es/values-vi/photoeditor_strings.xml
es/values-zh-rCN/photoeditor_strings.xml
es/values-zh-rTW/photoeditor_strings.xml
es/values-zu/photoeditor_strings.xml
|
8752a61d1d2c39b63e392a9caca4a5d285ac3b64 |
30-Apr-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: Iaa63de7b4ec73667fb08073608aec374dbc9529c
es/values-af/photoeditor_strings.xml
es/values-am/photoeditor_strings.xml
es/values-ar/photoeditor_strings.xml
es/values-be/photoeditor_strings.xml
es/values-bg/photoeditor_strings.xml
es/values-ca/photoeditor_strings.xml
es/values-cs/photoeditor_strings.xml
es/values-da/photoeditor_strings.xml
es/values-de/photoeditor_strings.xml
es/values-el/photoeditor_strings.xml
es/values-en-rGB/photoeditor_strings.xml
es/values-es-rUS/photoeditor_strings.xml
es/values-es/photoeditor_strings.xml
es/values-et/photoeditor_strings.xml
es/values-fa/photoeditor_strings.xml
es/values-fi/photoeditor_strings.xml
es/values-fr/photoeditor_strings.xml
es/values-hi/photoeditor_strings.xml
es/values-hr/photoeditor_strings.xml
es/values-hu/photoeditor_strings.xml
es/values-in/photoeditor_strings.xml
es/values-it/photoeditor_strings.xml
es/values-iw/photoeditor_strings.xml
es/values-ja/photoeditor_strings.xml
es/values-ko/photoeditor_strings.xml
es/values-lt/photoeditor_strings.xml
es/values-lv/photoeditor_strings.xml
es/values-ms/photoeditor_strings.xml
es/values-nb/photoeditor_strings.xml
es/values-nl/photoeditor_strings.xml
es/values-pl/photoeditor_strings.xml
es/values-pt-rPT/photoeditor_strings.xml
es/values-pt/photoeditor_strings.xml
es/values-ro/photoeditor_strings.xml
es/values-ru/photoeditor_strings.xml
es/values-sk/photoeditor_strings.xml
es/values-sl/photoeditor_strings.xml
es/values-sr/photoeditor_strings.xml
es/values-sv/photoeditor_strings.xml
es/values-sw/photoeditor_strings.xml
es/values-th/photoeditor_strings.xml
es/values-tl/photoeditor_strings.xml
es/values-tr/photoeditor_strings.xml
es/values-uk/photoeditor_strings.xml
es/values-vi/photoeditor_strings.xml
es/values-zh-rCN/photoeditor_strings.xml
es/values-zh-rTW/photoeditor_strings.xml
es/values-zu/photoeditor_strings.xml
|
69e1271db7b7b1bf5f7b63b01abd4527eee83e3c |
30-Apr-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: Iaa63de7b4ec73667fb08073608aec374dbc9529c
es/values-af/photoeditor_strings.xml
es/values-am/photoeditor_strings.xml
es/values-ar/photoeditor_strings.xml
es/values-be/photoeditor_strings.xml
es/values-bg/photoeditor_strings.xml
es/values-ca/photoeditor_strings.xml
es/values-cs/photoeditor_strings.xml
es/values-da/photoeditor_strings.xml
es/values-de/photoeditor_strings.xml
es/values-el/photoeditor_strings.xml
es/values-en-rGB/photoeditor_strings.xml
es/values-es-rUS/photoeditor_strings.xml
es/values-es/photoeditor_strings.xml
es/values-et/photoeditor_strings.xml
es/values-fa/photoeditor_strings.xml
es/values-fi/photoeditor_strings.xml
es/values-fr/photoeditor_strings.xml
es/values-hi/photoeditor_strings.xml
es/values-hr/photoeditor_strings.xml
es/values-hu/photoeditor_strings.xml
es/values-in/photoeditor_strings.xml
es/values-it/photoeditor_strings.xml
es/values-iw/photoeditor_strings.xml
es/values-ja/photoeditor_strings.xml
es/values-ko/photoeditor_strings.xml
es/values-lt/photoeditor_strings.xml
es/values-lv/photoeditor_strings.xml
es/values-ms/photoeditor_strings.xml
es/values-nb/photoeditor_strings.xml
es/values-nl/photoeditor_strings.xml
es/values-pl/photoeditor_strings.xml
es/values-pt-rPT/photoeditor_strings.xml
es/values-pt/photoeditor_strings.xml
es/values-ro/photoeditor_strings.xml
es/values-ru/photoeditor_strings.xml
es/values-sk/photoeditor_strings.xml
es/values-sl/photoeditor_strings.xml
es/values-sr/photoeditor_strings.xml
es/values-sv/photoeditor_strings.xml
es/values-sw/photoeditor_strings.xml
es/values-th/photoeditor_strings.xml
es/values-tl/photoeditor_strings.xml
es/values-tr/photoeditor_strings.xml
es/values-uk/photoeditor_strings.xml
es/values-vi/photoeditor_strings.xml
es/values-zh-rCN/photoeditor_strings.xml
es/values-zh-rTW/photoeditor_strings.xml
es/values-zu/photoeditor_strings.xml
|
e75f9af30603e026e55f319360b5761ee7c1eda0 |
30-Apr-2012 |
Chih-Chung Chang <chihchung@google.com> |
am acac98ca: Merge "Fix black screen when viewing Gmail image file attachment. Bug: 6415848" into jb-dev * commit 'acac98ca45868dffc77efab154b07d3842879760': Fix black screen when viewing Gmail image file attachment. Bug: 6415848
|
1da7a40528ba066bf69b9b846d8f0544ca7fa25a |
30-Apr-2012 |
Chih-Chung Chang <chihchung@google.com> |
am acac98ca: Merge "Fix black screen when viewing Gmail image file attachment. Bug: 6415848" into jb-dev * commit 'acac98ca45868dffc77efab154b07d3842879760': Fix black screen when viewing Gmail image file attachment. Bug: 6415848
|
a0310aed2f9facb517b57e538f81e6fb506c2d82 |
30-Apr-2012 |
Chih-Chung Chang <chihchung@google.com> |
Merge "Fix black screen when viewing Gmail image file attachment. Bug: 6415848" into jb-dev
|
acac98ca45868dffc77efab154b07d3842879760 |
30-Apr-2012 |
Chih-Chung Chang <chihchung@google.com> |
Merge "Fix black screen when viewing Gmail image file attachment. Bug: 6415848" into jb-dev
|
87baee154396cba12d785d7657bab45fe9285c0f |
30-Apr-2012 |
Chih-Chung Chang <chihchung@google.com> |
Fix black screen when viewing Gmail image file attachment. Bug: 6415848 Change-Id: Iec369866be6b5546fbd8cb77eb95a29f92e00b84
rc/com/android/gallery3d/ui/PositionController.java
|
b56ff734d0117cd5813cd2328edc57c4630ff1c3 |
30-Apr-2012 |
Chih-Chung Chang <chihchung@google.com> |
Fix black screen when viewing Gmail image file attachment. Bug: 6415848 Change-Id: Iec369866be6b5546fbd8cb77eb95a29f92e00b84
rc/com/android/gallery3d/ui/PositionController.java
|
5e925ae3c785aa98f7d6b3c079c938d25008badd |
30-Apr-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: Ie9afe62f6e6189c1053bf72da89eaab4e902bb64
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
19fb58b4bc086028a184a5f8f873f43e0cc178f9 |
30-Apr-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: Ie9afe62f6e6189c1053bf72da89eaab4e902bb64
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
fb2ea77112803842c1aa5892c3d08d9927cea5cf |
30-Apr-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: Idb5ec471d418db5894e27985b90b9c2d57575660
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
b60af938ed2bec74f731062b94c21bd0b5b94db0 |
30-Apr-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: Idb5ec471d418db5894e27985b90b9c2d57575660
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
eb03fd23c8afbd15dcb1cc6048c1e99576b0cf82 |
30-Apr-2012 |
Wu-cheng Li <wuchengli@google.com> |
am 57263d33: Fix crash when select all is pressed. * commit '57263d33064e4fce39b88b54f73e425f66a550eb': Fix crash when select all is pressed.
|
297175fbc531ec0a960689c0f7d4d50196d18251 |
30-Apr-2012 |
Wu-cheng Li <wuchengli@google.com> |
am 57263d33: Fix crash when select all is pressed. * commit '57263d33064e4fce39b88b54f73e425f66a550eb': Fix crash when select all is pressed.
|
57263d33064e4fce39b88b54f73e425f66a550eb |
30-Apr-2012 |
Wu-cheng Li <wuchengli@google.com> |
Fix crash when select all is pressed. bug:6411186 Change-Id: Iaa71a320bc4d6d70aade41d5144f75ba6db36e6d
rc/com/android/gallery3d/ui/MenuExecutor.java
|
28d4c4d0b2df6b297a5ca701cad7f83df864d9a7 |
30-Apr-2012 |
Wu-cheng Li <wuchengli@google.com> |
Fix crash when select all is pressed. bug:6411186 Change-Id: Iaa71a320bc4d6d70aade41d5144f75ba6db36e6d
rc/com/android/gallery3d/ui/MenuExecutor.java
|
1112c55e8a410533b33e5636f57a4a9c5f072cad |
30-Apr-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to jb-dev
|
bad6a337900d9ed8ac2066e20bd0973ff32629a2 |
30-Apr-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to jb-dev
|
57440ca89b94a3367b49d70b1045faabbc4f703e |
30-Apr-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to jb-dev
|
b182236e32f543c9d614f31e29ea4cf05e224034 |
30-Apr-2012 |
Chih-Chung Chang <chihchung@google.com> |
am b1e9fd89: Fix Back behavior in gallery grid and remove camera preview tile. * commit 'b1e9fd893d62adae1f92d29dfc08bc76f8764491': Fix Back behavior in gallery grid and remove camera preview tile.
|
a83878b32490d126b0b42a44652e7ef2a5857e9b |
30-Apr-2012 |
Chih-Chung Chang <chihchung@google.com> |
am b1e9fd89: Fix Back behavior in gallery grid and remove camera preview tile. * commit 'b1e9fd893d62adae1f92d29dfc08bc76f8764491': Fix Back behavior in gallery grid and remove camera preview tile.
|
30acac409a65548312ca819e855e40bec1a65cce |
30-Apr-2012 |
Chih-Chung Chang <chihchung@google.com> |
Fix Back behavior in gallery grid and remove camera preview tile. Bug: 6411801 Bug: 6411709 Change-Id: Iebd7db06d44d315ac67eb8c5133b86044fce30c4
rc/com/android/gallery3d/app/AlbumPage.java
rc/com/android/gallery3d/app/PhotoPage.java
|
b1e9fd893d62adae1f92d29dfc08bc76f8764491 |
30-Apr-2012 |
Chih-Chung Chang <chihchung@google.com> |
Fix Back behavior in gallery grid and remove camera preview tile. Bug: 6411801 Bug: 6411709 Change-Id: Iebd7db06d44d315ac67eb8c5133b86044fce30c4
rc/com/android/gallery3d/app/AlbumPage.java
rc/com/android/gallery3d/app/PhotoPage.java
|
5202cdcae99a033c3b33fabbf798615f04ccae22 |
30-Apr-2012 |
Wu-cheng Li <wuchengli@google.com> |
am 82af7be9: Merge "Expose delete button in action bar in portrait." into jb-dev * commit '82af7be9e2053965ee4f524cae4912b20ccbd8fa': Expose delete button in action bar in portrait.
|
aa558cb1346fe3bb945c1fc66a0bc9050fb5901e |
30-Apr-2012 |
Wu-cheng Li <wuchengli@google.com> |
am 82af7be9: Merge "Expose delete button in action bar in portrait." into jb-dev * commit '82af7be9e2053965ee4f524cae4912b20ccbd8fa': Expose delete button in action bar in portrait.
|
70400d3175be22d91f221b1f7b52a1e8ac499c4d |
30-Apr-2012 |
Wu-cheng Li <wuchengli@google.com> |
am b5dc542f: Do not show action bar on camera. * commit 'b5dc542fbaeaf99bebdcf775ef0e034e89e88eae': Do not show action bar on camera.
|
6de34e71e31a22029081049b17cfa9dbcf75bddd |
30-Apr-2012 |
Wu-cheng Li <wuchengli@google.com> |
am b5dc542f: Do not show action bar on camera. * commit 'b5dc542fbaeaf99bebdcf775ef0e034e89e88eae': Do not show action bar on camera.
|
82af7be9e2053965ee4f524cae4912b20ccbd8fa |
30-Apr-2012 |
Wu-cheng Li <wuchengli@google.com> |
Merge "Expose delete button in action bar in portrait." into jb-dev
|
ea726188eb28a84dc84389a35e82c632e04c8b04 |
30-Apr-2012 |
Wu-cheng Li <wuchengli@google.com> |
Do not show action bar on camera. bug:6411406 Change-Id: I4fbb95c9913046b4d5b1cfa4ede10490d156ed3f
rc/com/android/gallery3d/app/PhotoPage.java
|
b5dc542fbaeaf99bebdcf775ef0e034e89e88eae |
30-Apr-2012 |
Wu-cheng Li <wuchengli@google.com> |
Do not show action bar on camera. bug:6411406 Change-Id: I4fbb95c9913046b4d5b1cfa4ede10490d156ed3f
rc/com/android/gallery3d/app/PhotoPage.java
|
842d8c7f770ab3643abb2064e1af0af1080943b5 |
30-Apr-2012 |
Wu-cheng Li <wuchengli@google.com> |
am 3d99b968: Merge "Use gallery icon for action bar app icon in camera." into jb-dev * commit '3d99b968eef7d81ca34420d437d48cacb4ce94bd': Use gallery icon for action bar app icon in camera.
|
3d99b968eef7d81ca34420d437d48cacb4ce94bd |
30-Apr-2012 |
Wu-cheng Li <wuchengli@google.com> |
Merge "Use gallery icon for action bar app icon in camera." into jb-dev
|
e9faef758abc46fbe6c63ac4dbeba1f04c40b14b |
30-Apr-2012 |
Wu-cheng Li <wuchengli@google.com> |
Use gallery icon for action bar app icon in camera. bug:6410923 Change-Id: Ie5b7c5a6b852ed59b61ee0cc4e462dee991167b8
ndroidManifest.xml
|
680ab6c25a99f96847c18224663551498b16ea63 |
30-Apr-2012 |
Wu-cheng Li <wuchengli@google.com> |
Use gallery icon for action bar app icon in camera. bug:6410923 Change-Id: Ie5b7c5a6b852ed59b61ee0cc4e462dee991167b8
ndroidManifest.xml
|
dc498bf9d9cee8089846d8578308ebaf10644dbb |
30-Apr-2012 |
Chih-Chung Chang <chihchung@google.com> |
am bd141b5a: Support drawing in different orientation in Gallery. * commit 'bd141b5a51c96f6fcaddfa547f0928ce69cf0755': Support drawing in different orientation in Gallery.
|
b68b2f665f3f6594f1e8d03a4aa91c848f7faa9c |
30-Apr-2012 |
Chih-Chung Chang <chihchung@google.com> |
am bd141b5a: Support drawing in different orientation in Gallery. * commit 'bd141b5a51c96f6fcaddfa547f0928ce69cf0755': Support drawing in different orientation in Gallery.
|
779323233418b951926d6ae71347953bec88be10 |
30-Apr-2012 |
Pin Ting <pinting@google.com> |
am 23a5e6f2: Merge "Remove unused code." into jb-dev * commit '23a5e6f233f688f2e1ca2b10b5d1c615a263e83d': Remove unused code.
|
1644952b7558fc0513060bcdb5bf042c742cb145 |
30-Apr-2012 |
Pin Ting <pinting@google.com> |
am 23a5e6f2: Merge "Remove unused code." into jb-dev * commit '23a5e6f233f688f2e1ca2b10b5d1c615a263e83d': Remove unused code.
|
ad08811a71e246d45ecdf97402f08cf7bd68e83b |
26-Apr-2012 |
Chih-Chung Chang <chihchung@google.com> |
Support drawing in different orientation in Gallery. Bug 6312994: Swipe UX: do not directly show the camera roll when camera starts Bug 6313191: Swipe UX: Change swipe direction after the user rotated the device Bug 6313192: Swiping UX: make Gallery display in rotated mode Bug 6399447: Filmstrip: in Gallery, pressing Back from filmstrip doesn't perform the right animation Bug 6399974: Filmstrip: when swiping from full-screen photo to filmstrip mode, camera view and the photo-roll don't align correctly Bug 6400014: Swiping UX: in Camera portrait mode, tapping on the Thumbnail doesn't align camera view and the photo-roll correctly Bug 6401075: Able to scroll through the gallery pics while capturing video. Bug 6405087: Filmstrip does not change with orientation Change-Id: I8c479d87800c63b7a95c199c0c1c3bc512d66d42
rc/com/android/gallery3d/app/AbstractGalleryActivity.java
rc/com/android/gallery3d/app/AlbumPage.java
rc/com/android/gallery3d/app/AppBridge.java
rc/com/android/gallery3d/app/CameraScreenNail.java
rc/com/android/gallery3d/app/GalleryActivity.java
rc/com/android/gallery3d/app/OrientationManager.java
rc/com/android/gallery3d/app/PhotoDataAdapter.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/app/SinglePhotoDataAdapter.java
rc/com/android/gallery3d/ui/GLRoot.java
rc/com/android/gallery3d/ui/GLRootView.java
rc/com/android/gallery3d/ui/GLView.java
rc/com/android/gallery3d/ui/PhotoView.java
rc/com/android/gallery3d/ui/PositionController.java
rc/com/android/gallery3d/ui/ScreenNailHolder.java
rc/com/android/gallery3d/ui/TileImageView.java
ests/src/com/android/gallery3d/ui/GLRootMock.java
ests/src/com/android/gallery3d/ui/GLRootStub.java
|
bd141b5a51c96f6fcaddfa547f0928ce69cf0755 |
26-Apr-2012 |
Chih-Chung Chang <chihchung@google.com> |
Support drawing in different orientation in Gallery. Bug 6312994: Swipe UX: do not directly show the camera roll when camera starts Bug 6313191: Swipe UX: Change swipe direction after the user rotated the device Bug 6313192: Swiping UX: make Gallery display in rotated mode Bug 6399447: Filmstrip: in Gallery, pressing Back from filmstrip doesn't perform the right animation Bug 6399974: Filmstrip: when swiping from full-screen photo to filmstrip mode, camera view and the photo-roll don't align correctly Bug 6400014: Swiping UX: in Camera portrait mode, tapping on the Thumbnail doesn't align camera view and the photo-roll correctly Bug 6401075: Able to scroll through the gallery pics while capturing video. Bug 6405087: Filmstrip does not change with orientation Change-Id: I8c479d87800c63b7a95c199c0c1c3bc512d66d42
rc/com/android/gallery3d/app/AbstractGalleryActivity.java
rc/com/android/gallery3d/app/AlbumPage.java
rc/com/android/gallery3d/app/AppBridge.java
rc/com/android/gallery3d/app/CameraScreenNail.java
rc/com/android/gallery3d/app/GalleryActivity.java
rc/com/android/gallery3d/app/OrientationManager.java
rc/com/android/gallery3d/app/PhotoDataAdapter.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/app/SinglePhotoDataAdapter.java
rc/com/android/gallery3d/ui/GLRoot.java
rc/com/android/gallery3d/ui/GLRootView.java
rc/com/android/gallery3d/ui/GLView.java
rc/com/android/gallery3d/ui/PhotoView.java
rc/com/android/gallery3d/ui/PositionController.java
rc/com/android/gallery3d/ui/ScreenNailHolder.java
rc/com/android/gallery3d/ui/TileImageView.java
ests/src/com/android/gallery3d/ui/GLRootMock.java
ests/src/com/android/gallery3d/ui/GLRootStub.java
|
ac9c2f6f230660a657f9d3b64c7a3bbf8b3bd598 |
30-Apr-2012 |
Pin Ting <pinting@google.com> |
Merge "Remove unused code." into jb-dev
|
23a5e6f233f688f2e1ca2b10b5d1c615a263e83d |
30-Apr-2012 |
Pin Ting <pinting@google.com> |
Merge "Remove unused code." into jb-dev
|
66ad9bad29631e77be2722211d46ac13c151f9b2 |
30-Apr-2012 |
Wu-cheng Li <wuchengli@google.com> |
Expose delete button in action bar in portrait. bug:6411759 Change-Id: I135edad5ab7d1194c774e7d5ee680cf3ba3206ad
es/menu-land/photo.xml
es/menu/photo.xml
|
8ade16daa59f135cf321c1a8b78a88d3f3fb100a |
30-Apr-2012 |
Wu-cheng Li <wuchengli@google.com> |
Expose delete button in action bar in portrait. bug:6411759 Change-Id: I135edad5ab7d1194c774e7d5ee680cf3ba3206ad
es/menu-land/photo.xml
es/menu/photo.xml
|
bd4b0ddb075c6a5745fcd07867635af5c1ebe45e |
30-Apr-2012 |
Pin Ting <pinting@google.com> |
Remove unused code. Change-Id: Icd68f286a8b97594495f56d6b4bfa2e785462f5d
rc/com/android/gallery3d/app/ManageCachePage.java
|
87aff90167434de623721ba6149603bb4c7b54a8 |
30-Apr-2012 |
Pin Ting <pinting@google.com> |
Remove unused code. Change-Id: Icd68f286a8b97594495f56d6b4bfa2e785462f5d
rc/com/android/gallery3d/app/ManageCachePage.java
|
43d52b2a118c2e1e048ba17a0ea50bac54e7fe67 |
30-Apr-2012 |
Yuli Huang <yuli@google.com> |
am 68e76bd4: (-s ours) Merge "Make \'Edit\' behave more consistent with \'Crop\'. DO NOT MERGE." into jb-dev * commit '68e76bd4cad9c9b15ae1307de09e847e0891ee3c': Make 'Edit' behave more consistent with 'Crop'. DO NOT MERGE.
|
e035c1335d5682fe6d642dd7a0aff5d1e90202d0 |
30-Apr-2012 |
Yuli Huang <yuli@google.com> |
am 68e76bd4: (-s ours) Merge "Make \'Edit\' behave more consistent with \'Crop\'. DO NOT MERGE." into jb-dev * commit '68e76bd4cad9c9b15ae1307de09e847e0891ee3c': Make 'Edit' behave more consistent with 'Crop'. DO NOT MERGE.
|
03a8fa5c7a7c1a47ac88fc2e6c9fe527d1a5771a |
30-Apr-2012 |
Yuli Huang <yuli@google.com> |
am 68e76bd4: (-s ours) Merge "Make \'Edit\' behave more consistent with \'Crop\'. DO NOT MERGE." into jb-dev * commit '68e76bd4cad9c9b15ae1307de09e847e0891ee3c': Make 'Edit' behave more consistent with 'Crop'. DO NOT MERGE.
|
68e76bd4cad9c9b15ae1307de09e847e0891ee3c |
30-Apr-2012 |
Yuli Huang <yuli@google.com> |
Merge "Make 'Edit' behave more consistent with 'Crop'. DO NOT MERGE." into jb-dev
|
af0974f574d007a90ed7a319a78605a09f01570a |
30-Apr-2012 |
Yuli Huang <yuli@google.com> |
Merge "Make 'Edit' behave more consistent with 'Crop'. DO NOT MERGE." into jb-dev
|
a61f19793afe59eaa26d4c02ab23c1fbeea7ead6 |
27-Apr-2012 |
Martijn Coenen <maco@google.com> |
Add support for Beaming multiple pictures. Change-Id: I12bb82bb605813168a7870807390ce2cb37a9a15
rc/com/android/gallery3d/ui/ActionModeHandler.java
|
af4ab4faeeb640b285311a305ff128b33b964389 |
27-Apr-2012 |
Martijn Coenen <maco@google.com> |
Add support for Beaming multiple pictures. Change-Id: I12bb82bb605813168a7870807390ce2cb37a9a15
rc/com/android/gallery3d/ui/ActionModeHandler.java
|
2679c2220bd81da22e21f7ad454205f5fc5dc964 |
27-Apr-2012 |
Eric Fischer <enf@google.com> |
am 1f34ad1e: (-s ours) Import translations. DO NOT MERGE * commit '1f34ad1e6c6f1af8a288fe661b824d7a8ea3cd2a': Import translations. DO NOT MERGE
|
97d6d90d17754694923c02d60242a9dd0dfbcea8 |
27-Apr-2012 |
Eric Fischer <enf@google.com> |
am 1f34ad1e: (-s ours) Import translations. DO NOT MERGE * commit '1f34ad1e6c6f1af8a288fe661b824d7a8ea3cd2a': Import translations. DO NOT MERGE
|
482d27ba7d2c9d9b2a5313c10e8a7be940dd7afa |
27-Apr-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: I6ce4eb808519167358f7ff63a7893f3faa482b62
es/values-bg/strings.xml
es/values-cs/strings.xml
es/values-es-rUS/strings.xml
es/values-fa/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-ms/strings.xml
es/values-pt-rPT/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sr/strings.xml
es/values-th/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
|
3e54da49e97a681ecf9f27893659da58c2c538c0 |
27-Apr-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: I6ce4eb808519167358f7ff63a7893f3faa482b62
es/values-bg/strings.xml
es/values-cs/strings.xml
es/values-es-rUS/strings.xml
es/values-fa/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-ms/strings.xml
es/values-pt-rPT/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sr/strings.xml
es/values-th/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
|
1f34ad1e6c6f1af8a288fe661b824d7a8ea3cd2a |
27-Apr-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: I5f364684f5e0d05d5e8cbbef3d4b6bbc40229061
es/values-bg/strings.xml
es/values-cs/strings.xml
es/values-es-rUS/strings.xml
es/values-fa/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-ms/strings.xml
es/values-pt-rPT/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sr/strings.xml
es/values-th/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
|
c0609cac6ce969c573431fdbaf431dbd04b953e5 |
27-Apr-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: I5f364684f5e0d05d5e8cbbef3d4b6bbc40229061
es/values-bg/strings.xml
es/values-cs/strings.xml
es/values-es-rUS/strings.xml
es/values-fa/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-ms/strings.xml
es/values-pt-rPT/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sr/strings.xml
es/values-th/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
|
f375599300f05880a4060f7c8f290ae9f5847d0f |
25-Apr-2012 |
Yuli Huang <yuli@google.com> |
Make 'Edit' behave more consistent with 'Crop'. DO NOT MERGE. 1. Save edited PWA photo in 'dowload', same as cropped images. 2. Fix Crop-image toast may show strings without i18n. bug:6168430 Change-Id: Ic99a478e684597d3dc1a105c4f592dd98d8f227d
rc/com/android/gallery3d/app/CropImage.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/data/MtpContext.java
rc/com/android/gallery3d/photoeditor/SaveCopyTask.java
rc/com/android/gallery3d/util/BucketNames.java
rc/com/android/gallery3d/util/MediaSetUtils.java
|
985e289d4ceed04351c300484d28299dcf915896 |
25-Apr-2012 |
Yuli Huang <yuli@google.com> |
Make 'Edit' behave more consistent with 'Crop'. DO NOT MERGE. 1. Save edited PWA photo in 'dowload', same as cropped images. 2. Fix Crop-image toast may show strings without i18n. bug:6168430 Change-Id: Ic99a478e684597d3dc1a105c4f592dd98d8f227d
es/values/photoeditor_strings.xml
es/values/strings.xml
rc/com/android/gallery3d/app/CropImage.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/data/MtpContext.java
rc/com/android/gallery3d/photoeditor/SaveCopyTask.java
rc/com/android/gallery3d/util/BucketNames.java
rc/com/android/gallery3d/util/MediaSetUtils.java
|
d88996f5f73b45a7116cb45e83af187d7425281b |
25-Apr-2012 |
Yuli Huang <yuli@google.com> |
Make 'Edit' behave more consistent with 'Crop'. DO NOT MERGE. 1. Save edited PWA photo in 'dowload', same as cropped images. 2. Fix Crop-image toast may show strings without i18n. bug:6168430 Change-Id: Ic99a478e684597d3dc1a105c4f592dd98d8f227d
es/values/photoeditor_strings.xml
es/values/strings.xml
|
52083a2fcca3007ddde51ccd166d602d95583bee |
27-Apr-2012 |
Owen Lin <owenlin@google.com> |
Fix photo rotates incorrectly in crop image. bug:6399424 Change-Id: Icc0aca5e9abcd643f8e246211e37bd177bf8ff31
rc/com/android/gallery3d/data/UriSource.java
|
be6e69c8d57f63a96b14237b943ab5ae6343813e |
27-Apr-2012 |
Owen Lin <owenlin@google.com> |
Fix photo rotates incorrectly in crop image. bug:6399424 Change-Id: Icc0aca5e9abcd643f8e246211e37bd177bf8ff31
rc/com/android/gallery3d/data/UriSource.java
|
7d6d4703aeaef77fcf96777c101263c25e20547c |
26-Apr-2012 |
Eric Fischer <enf@google.com> |
Merge "Import translations. DO NOT MERGE"
|
58b3deec72d401b331baa2fd865b643a7613f3a9 |
26-Apr-2012 |
Eric Fischer <enf@google.com> |
Merge "Import translations. DO NOT MERGE"
|
15f08d6515f61661a172a49b8fe6f86221035b7f |
26-Apr-2012 |
Eric Fischer <enf@google.com> |
am 03be062c: (-s ours) Import translations. DO NOT MERGE * commit '03be062c715e60cd1fc0cbfe8c5b61726203232d': Import translations. DO NOT MERGE
|
a4595dd62a3f1583fa1c16dbdca1e6006a010f0b |
26-Apr-2012 |
Eric Fischer <enf@google.com> |
am 03be062c: (-s ours) Import translations. DO NOT MERGE * commit '03be062c715e60cd1fc0cbfe8c5b61726203232d': Import translations. DO NOT MERGE
|
ff1cf37af66f9d9f7a81ce7251baa643fc5775ce |
26-Apr-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: Ibe4ad2e00e95790e7891fc0d9e035fcb744629b9
es/values-af/photoeditor_strings.xml
es/values-am/photoeditor_strings.xml
es/values-ar/photoeditor_strings.xml
es/values-be/photoeditor_strings.xml
es/values-bg/photoeditor_strings.xml
es/values-ca/photoeditor_strings.xml
es/values-cs/photoeditor_strings.xml
es/values-da/photoeditor_strings.xml
es/values-de/photoeditor_strings.xml
es/values-el/photoeditor_strings.xml
es/values-en-rGB/photoeditor_strings.xml
es/values-es-rUS/photoeditor_strings.xml
es/values-es/photoeditor_strings.xml
es/values-et/photoeditor_strings.xml
es/values-fa/photoeditor_strings.xml
es/values-fi/photoeditor_strings.xml
es/values-fr/photoeditor_strings.xml
es/values-hi/photoeditor_strings.xml
es/values-hr/photoeditor_strings.xml
es/values-hu/photoeditor_strings.xml
es/values-in/photoeditor_strings.xml
es/values-it/photoeditor_strings.xml
es/values-iw/photoeditor_strings.xml
es/values-ja/photoeditor_strings.xml
es/values-ko/photoeditor_strings.xml
es/values-lt/photoeditor_strings.xml
es/values-lv/photoeditor_strings.xml
es/values-ms/photoeditor_strings.xml
es/values-nb/photoeditor_strings.xml
es/values-nl/photoeditor_strings.xml
es/values-pl/photoeditor_strings.xml
es/values-pt-rPT/photoeditor_strings.xml
es/values-pt/photoeditor_strings.xml
es/values-ro/photoeditor_strings.xml
es/values-ru/photoeditor_strings.xml
es/values-sk/photoeditor_strings.xml
es/values-sl/photoeditor_strings.xml
es/values-sr/photoeditor_strings.xml
es/values-sv/photoeditor_strings.xml
es/values-sw/photoeditor_strings.xml
es/values-th/photoeditor_strings.xml
es/values-tl/photoeditor_strings.xml
es/values-tr/photoeditor_strings.xml
es/values-uk/photoeditor_strings.xml
es/values-vi/photoeditor_strings.xml
es/values-zh-rCN/photoeditor_strings.xml
es/values-zh-rTW/photoeditor_strings.xml
es/values-zu/photoeditor_strings.xml
|
158d6a42741a7d0b03ece11071a142691217592e |
26-Apr-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: Ibe4ad2e00e95790e7891fc0d9e035fcb744629b9
es/values-af/photoeditor_strings.xml
es/values-am/photoeditor_strings.xml
es/values-ar/photoeditor_strings.xml
es/values-be/photoeditor_strings.xml
es/values-bg/photoeditor_strings.xml
es/values-ca/photoeditor_strings.xml
es/values-cs/photoeditor_strings.xml
es/values-da/photoeditor_strings.xml
es/values-de/photoeditor_strings.xml
es/values-el/photoeditor_strings.xml
es/values-en-rGB/photoeditor_strings.xml
es/values-es-rUS/photoeditor_strings.xml
es/values-es/photoeditor_strings.xml
es/values-et/photoeditor_strings.xml
es/values-fa/photoeditor_strings.xml
es/values-fi/photoeditor_strings.xml
es/values-fr/photoeditor_strings.xml
es/values-hi/photoeditor_strings.xml
es/values-hr/photoeditor_strings.xml
es/values-hu/photoeditor_strings.xml
es/values-in/photoeditor_strings.xml
es/values-it/photoeditor_strings.xml
es/values-iw/photoeditor_strings.xml
es/values-ja/photoeditor_strings.xml
es/values-ko/photoeditor_strings.xml
es/values-lt/photoeditor_strings.xml
es/values-lv/photoeditor_strings.xml
es/values-ms/photoeditor_strings.xml
es/values-nb/photoeditor_strings.xml
es/values-nl/photoeditor_strings.xml
es/values-pl/photoeditor_strings.xml
es/values-pt-rPT/photoeditor_strings.xml
es/values-pt/photoeditor_strings.xml
es/values-ro/photoeditor_strings.xml
es/values-ru/photoeditor_strings.xml
es/values-sk/photoeditor_strings.xml
es/values-sl/photoeditor_strings.xml
es/values-sr/photoeditor_strings.xml
es/values-sv/photoeditor_strings.xml
es/values-sw/photoeditor_strings.xml
es/values-th/photoeditor_strings.xml
es/values-tl/photoeditor_strings.xml
es/values-tr/photoeditor_strings.xml
es/values-uk/photoeditor_strings.xml
es/values-vi/photoeditor_strings.xml
es/values-zh-rCN/photoeditor_strings.xml
es/values-zh-rTW/photoeditor_strings.xml
es/values-zu/photoeditor_strings.xml
|
7e93ae78899e6aa0d4b2babba6a6df5122a19d9e |
26-Apr-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: Id21a966b0d23972c9f48250eecd5f2f3a39ce724
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
3fea3f6f48ebf56b8e892d35da979a5e4956902b |
26-Apr-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: Id21a966b0d23972c9f48250eecd5f2f3a39ce724
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
03be062c715e60cd1fc0cbfe8c5b61726203232d |
26-Apr-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: I6b49535f98a414ec3c7989099d09f37a70ff5e00
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-it/strings.xml
es/values-lv/strings.xml
es/values-nl/strings.xml
es/values-pt/strings.xml
es/values-sl/strings.xml
es/values-sw/strings.xml
es/values-zu/strings.xml
|
781eb0ab13d6fb6f504303ed4b65fbd93976a7ec |
26-Apr-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: I6b49535f98a414ec3c7989099d09f37a70ff5e00
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-it/strings.xml
es/values-lv/strings.xml
es/values-nl/strings.xml
es/values-pt/strings.xml
es/values-sl/strings.xml
es/values-sw/strings.xml
es/values-zu/strings.xml
|
3782c80cd9b44dc1cff60fb33460adc20bf66bd9 |
26-Apr-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to jb-dev
|
fa13c6435bf8fcfe8d83afb25f9bbf4c62538865 |
26-Apr-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to jb-dev
|
6c7b3716fecc1e22cf2c946471bb2e7ce374c681 |
26-Apr-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to jb-dev
|
39a188023147792e8a25b96d61ba373d6bc62fd3 |
26-Apr-2012 |
Wu-cheng Li <wuchengli@google.com> |
am 74976b13: Do not use card effect for camera screen nail. * commit '74976b1397fe34b212741bd92e30fa25aaec7ad8': Do not use card effect for camera screen nail.
|
5aa782bd01186095ea7e6a950477194f132e5d9e |
26-Apr-2012 |
Wu-cheng Li <wuchengli@google.com> |
am 74976b13: Do not use card effect for camera screen nail. * commit '74976b1397fe34b212741bd92e30fa25aaec7ad8': Do not use card effect for camera screen nail.
|
9f13c0ec31e748ab7ade660e416efd03b63176fa |
26-Apr-2012 |
Wu-cheng Li <wuchengli@google.com> |
Do not use card effect for camera screen nail. bug:6402571 Change-Id: I362e675ea4160b7b940e0da4bd018e0e8c7add57
rc/com/android/gallery3d/ui/PhotoView.java
|
74976b1397fe34b212741bd92e30fa25aaec7ad8 |
26-Apr-2012 |
Wu-cheng Li <wuchengli@google.com> |
Do not use card effect for camera screen nail. bug:6402571 Change-Id: I362e675ea4160b7b940e0da4bd018e0e8c7add57
rc/com/android/gallery3d/ui/PhotoView.java
|
af367d91bb817623c40d490d1819ca0e875210f5 |
26-Apr-2012 |
Wu-cheng Li <wuchengli@google.com> |
am 78824571: Make sure action bar is hidden when camera starts. * commit '788245711658188131ae2670e44fb6ca8ad5d53a': Make sure action bar is hidden when camera starts.
|
78e090f827e6398aab269113abefd0fa43d38273 |
26-Apr-2012 |
Wu-cheng Li <wuchengli@google.com> |
am 78824571: Make sure action bar is hidden when camera starts. * commit '788245711658188131ae2670e44fb6ca8ad5d53a': Make sure action bar is hidden when camera starts.
|
79fb06ac02baa80dcf039ef05f0b19b7373038a8 |
26-Apr-2012 |
Wu-cheng Li <wuchengli@google.com> |
Make sure action bar is hidden when camera starts. bug:6402552 Change-Id: I2ec39e607a505490e431181eb40e259102b9a773
rc/com/android/gallery3d/app/PhotoPage.java
|
788245711658188131ae2670e44fb6ca8ad5d53a |
26-Apr-2012 |
Wu-cheng Li <wuchengli@google.com> |
Make sure action bar is hidden when camera starts. bug:6402552 Change-Id: I2ec39e607a505490e431181eb40e259102b9a773
rc/com/android/gallery3d/app/PhotoPage.java
|
b38103b76082ff80f303285b470e6e2240217916 |
25-Apr-2012 |
Yuli Huang <yuli@google.com> |
Make 'Edit' behave more consistent with 'Crop'. 1. Save edited PWA photo in 'dowload', same as cropped images. 2. Fix Crop-image toast may show strings without i18n. bug:6168430 Change-Id: Ie1ea8e5774f6dee632477a6f887aa766a295a120
es/values/photoeditor_strings.xml
es/values/strings.xml
|
af5a110df0ad6a14677af12e3dd5ee055f54732a |
25-Apr-2012 |
Yuli Huang <yuli@google.com> |
Make 'Edit' behave more consistent with 'Crop'. 1. Save edited PWA photo in 'dowload', same as cropped images. 2. Fix Crop-image toast may show strings without i18n. bug:6168430 Change-Id: Ie1ea8e5774f6dee632477a6f887aa766a295a120
rc/com/android/gallery3d/app/CropImage.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/data/MtpContext.java
rc/com/android/gallery3d/photoeditor/SaveCopyTask.java
rc/com/android/gallery3d/util/BucketNames.java
rc/com/android/gallery3d/util/MediaSetUtils.java
|
54d626f5b529508637c3117a28874bee35bb0fc8 |
25-Apr-2012 |
Yuli Huang <yuli@google.com> |
Make 'Edit' behave more consistent with 'Crop'. 1. Save edited PWA photo in 'dowload', same as cropped images. 2. Fix Crop-image toast may show strings without i18n. bug:6168430 Change-Id: Ie1ea8e5774f6dee632477a6f887aa766a295a120
es/values/photoeditor_strings.xml
es/values/strings.xml
rc/com/android/gallery3d/app/CropImage.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/data/MtpContext.java
rc/com/android/gallery3d/photoeditor/SaveCopyTask.java
rc/com/android/gallery3d/util/BucketNames.java
rc/com/android/gallery3d/util/MediaSetUtils.java
|
97fda0f82ba30ff0e08aedee17129a8c71d936e1 |
26-Apr-2012 |
Wu-cheng Li <wuchengli@google.com> |
am 736cf74b: Hide action bar when camera screen nail is displayed. * commit '736cf74b170d32374c8b35dbe6a46d975258be87': Hide action bar when camera screen nail is displayed.
|
6486509ebf29af2c4526342265a620bd371cb96a |
24-Apr-2012 |
Wu-cheng Li <wuchengli@google.com> |
Hide action bar when camera screen nail is displayed. bug:6363385 Change-Id: Ic37afa779339cfe5f66f0a40cbf4870ff1a6a0ee
rc/com/android/gallery3d/app/PhotoPage.java
|
736cf74b170d32374c8b35dbe6a46d975258be87 |
24-Apr-2012 |
Wu-cheng Li <wuchengli@google.com> |
Hide action bar when camera screen nail is displayed. bug:6363385 Change-Id: Ic37afa779339cfe5f66f0a40cbf4870ff1a6a0ee
rc/com/android/gallery3d/app/PhotoPage.java
|
ab2b347ef5526d8deff52d86260f835c6f5aff3d |
25-Apr-2012 |
Eric Fischer <enf@google.com> |
am 306a3193: (-s ours) Import translations. DO NOT MERGE * commit '306a3193743d5e61b18ae4c8defa1f6077fb37ec': Import translations. DO NOT MERGE
|
f0db602d7b5c48412a54be72b4f542080e74e471 |
25-Apr-2012 |
Eric Fischer <enf@google.com> |
am 306a3193: (-s ours) Import translations. DO NOT MERGE * commit '306a3193743d5e61b18ae4c8defa1f6077fb37ec': Import translations. DO NOT MERGE
|
29f6c83b65155b71ae022fd292402dd4ec4d425e |
25-Apr-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: Ic2b00aaa84a720899ed02dae660b11e26dae5050
es/values-ca/strings.xml
es/values-en-rGB/strings.xml
es/values-iw/strings.xml
es/values-nb/strings.xml
es/values-sv/strings.xml
|
1d08306057ef0a6414ec078525c8bdf7e0b0ec12 |
25-Apr-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: Ic2b00aaa84a720899ed02dae660b11e26dae5050
es/values-ca/strings.xml
es/values-en-rGB/strings.xml
es/values-iw/strings.xml
es/values-nb/strings.xml
es/values-sv/strings.xml
|
306a3193743d5e61b18ae4c8defa1f6077fb37ec |
25-Apr-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: I725031b6fd65e573b5852b98aace63bd8ebe15e8
es/values-ca/strings.xml
es/values-en-rGB/strings.xml
es/values-iw/strings.xml
es/values-nb/strings.xml
es/values-sv/strings.xml
|
031018e89e14e203f4ff4ed70e73a54571e34606 |
25-Apr-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: I725031b6fd65e573b5852b98aace63bd8ebe15e8
es/values-ca/strings.xml
es/values-en-rGB/strings.xml
es/values-iw/strings.xml
es/values-nb/strings.xml
es/values-sv/strings.xml
|
155ec712034ad89664a5c0f7f133dda0a41bb1d8 |
25-Apr-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to jb-dev
|
c7f4a81b1f1a3a53ba2d3d9e127095cf1af71a24 |
25-Apr-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to jb-dev
|
b9243e53a776f93114f153a0e53037d23939ce0e |
25-Apr-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to jb-dev
|
f58550407fffcddd0ecc656809288b6f034585fe |
25-Apr-2012 |
Yuli Huang <yuli@google.com> |
Merge "Increase blue layer alpha to make highlights more evident."
|
b3afd5505b0e0491fe50e2342df6e6aabb86bf30 |
25-Apr-2012 |
Chih-Chung Chang <chihchung@google.com> |
Merge "Remove scissor tests."
|
08d886617e5eb6e8bc3d422972dedbfbea5ca564 |
25-Apr-2012 |
Chih-Chung Chang <chihchung@google.com> |
Merge "Remove scissor tests."
|
077dbd0511cd5f9b3a8933be9c4072d8c6dbddef |
25-Apr-2012 |
Ray Chen <raychen@google.com> |
Fix 6376466 After deleting photo, the next one will be shown too dark b:6376466 Change-Id: I7328215c45995d6ae1813ed861da3ad826809461
rc/com/android/gallery3d/ui/PhotoView.java
|
a11f19872b6059d97d31c047ac752354670e1267 |
25-Apr-2012 |
Ray Chen <raychen@google.com> |
Fix 6376466 After deleting photo, the next one will be shown too dark b:6376466 Change-Id: I7328215c45995d6ae1813ed861da3ad826809461
rc/com/android/gallery3d/ui/PhotoView.java
|
cd4795d3c7485a665b9ed2dd8ede980f94dd63c5 |
25-Apr-2012 |
Chih-Chung Chang <chihchung@google.com> |
Remove scissor tests. Change-Id: I9f2c462a251e518ce5954dde0eb6e509734254c4
rc/com/android/gallery3d/ui/GLCanvasImpl.java
rc/com/android/gallery3d/ui/GLRootView.java
rc/com/android/gallery3d/ui/Raw2DTexture.java
|
57d3cb26a80cdf6b20b2185b02ebf07f3bc2592c |
25-Apr-2012 |
Chih-Chung Chang <chihchung@google.com> |
Remove scissor tests. Change-Id: I9f2c462a251e518ce5954dde0eb6e509734254c4
rc/com/android/gallery3d/ui/GLCanvasImpl.java
rc/com/android/gallery3d/ui/GLRootView.java
rc/com/android/gallery3d/ui/Raw2DTexture.java
|
8c37ab36a811affcb213166c2c5277f17cad8007 |
25-Apr-2012 |
Yuli Huang <yuli@google.com> |
Increase blue layer alpha to make highlights more evident. bug:6145331 Change-Id: I0d8848a3f66885509dcde315e3403be0bb248bd6
es/drawable-hdpi/grid_pressed.9.png
es/drawable-hdpi/grid_selected.9.png
es/drawable-mdpi/grid_pressed.9.png
es/drawable-mdpi/grid_selected.9.png
es/drawable-xhdpi/grid_pressed.9.png
es/drawable-xhdpi/grid_selected.9.png
|
8192162033e0a91292cca3e1a07a362626a48a41 |
25-Apr-2012 |
Yuli Huang <yuli@google.com> |
Increase blue layer alpha to make highlights more evident. bug:6145331 Change-Id: I0d8848a3f66885509dcde315e3403be0bb248bd6
es/drawable-hdpi/grid_pressed.9.png
es/drawable-hdpi/grid_selected.9.png
es/drawable-mdpi/grid_pressed.9.png
es/drawable-mdpi/grid_selected.9.png
es/drawable-xhdpi/grid_pressed.9.png
es/drawable-xhdpi/grid_selected.9.png
|
56363ddedc94981a0745065d792603bbf7d23878 |
20-Apr-2012 |
Owen Lin <owenlin@google.com> |
Fix NPE in Gallery. This happens if user set type in an intent. But we get a different type from content resolver. Change-Id: Iabafce7f7aaff23a7a9ee09e1d38ab50049abc88 fix: 6358473
rc/com/android/gallery3d/app/CropImage.java
rc/com/android/gallery3d/app/Gallery.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/data/DataManager.java
rc/com/android/gallery3d/data/LocalSource.java
rc/com/android/gallery3d/data/MediaSource.java
rc/com/android/gallery3d/data/UriImage.java
rc/com/android/gallery3d/data/UriSource.java
|
21a412c93c9b0401b039f4eb86d4950752e5bb84 |
20-Apr-2012 |
Owen Lin <owenlin@google.com> |
Fix NPE in Gallery. This happens if user set type in an intent. But we get a different type from content resolver. Change-Id: Iabafce7f7aaff23a7a9ee09e1d38ab50049abc88 fix: 6358473
rc/com/android/gallery3d/app/CropImage.java
rc/com/android/gallery3d/app/Gallery.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/data/DataManager.java
rc/com/android/gallery3d/data/LocalSource.java
rc/com/android/gallery3d/data/MediaSource.java
rc/com/android/gallery3d/data/UriImage.java
rc/com/android/gallery3d/data/UriSource.java
|
c79766a95de4635145a0426ed822af6c4732a70c |
25-Apr-2012 |
Chih-Chung Chang <chihchung@google.com> |
Merge "Don't do capture animation if we don't have Camera ScreenNail."
|
714fe2055eed029fa2a622f2e2504524f4881ba2 |
25-Apr-2012 |
Chih-Chung Chang <chihchung@google.com> |
Merge "Don't do capture animation if we don't have Camera ScreenNail."
|
9e65a3ae634f0e5b6fccaa929b54b884be0380e4 |
25-Apr-2012 |
Chih-Chung Chang <chihchung@google.com> |
Don't do capture animation if we don't have Camera ScreenNail. Also make "Back" jump to first picture instead of the previous one. Bug: 6388263 Change-Id: Idf78363cf3952bf66c6b0688e79d99c01956cd07
rc/com/android/gallery3d/app/PhotoDataAdapter.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/app/SinglePhotoDataAdapter.java
rc/com/android/gallery3d/ui/PhotoView.java
|
160e6d776daab93610b3d12413ad9ff2dd867d8b |
25-Apr-2012 |
Chih-Chung Chang <chihchung@google.com> |
Don't do capture animation if we don't have Camera ScreenNail. Also make "Back" jump to first picture instead of the previous one. Bug: 6388263 Change-Id: Idf78363cf3952bf66c6b0688e79d99c01956cd07
rc/com/android/gallery3d/app/PhotoDataAdapter.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/app/SinglePhotoDataAdapter.java
rc/com/android/gallery3d/ui/PhotoView.java
|
f766a104d9a525fff4fc9c699a6a0228e2770923 |
25-Apr-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am 082ea423: am 49826d43: Reconcile with ics-mr1-release * commit '082ea4230f5892379cb0eebfd87d1594e51987ec': Patch 2 for MR1. Patch for MR1.
|
510d704620c585065477983e9ffcd2375a5d7521 |
25-Apr-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am 082ea423: am 49826d43: Reconcile with ics-mr1-release * commit '082ea4230f5892379cb0eebfd87d1594e51987ec': Patch 2 for MR1. Patch for MR1.
|
a3ad3faa88e2406e6f048c63e9175639e8969f15 |
24-Apr-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: Ibdcd41844e4c0e170db6dfc3fdd40f6bbc9e09e3
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
6fda18d3e87b18e5ecac9ce77dfbd9c65dad3da1 |
24-Apr-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: Ibdcd41844e4c0e170db6dfc3fdd40f6bbc9e09e3
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
ea3743e57785433a2be319b0303604258dfcb43d |
24-Apr-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to master
|
4489f440760a01be7842112ec07b0496a304f8f6 |
24-Apr-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to master
|
7b5cb3a3305acb3fedd1f99c0654a0dc9476e839 |
24-Apr-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to master
|
210934990196deeea0d19a148e85b3c1c136eb40 |
20-Apr-2012 |
Chih-Chung Chang <chihchung@google.com> |
Add capture animation in Gallery. Change-Id: Ibf95cc64f37a4518377e64124af6606c4f14cdaa
rc/com/android/gallery3d/app/AbstractGalleryActivity.java
rc/com/android/gallery3d/app/Gallery.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/app/PickerActivity.java
rc/com/android/gallery3d/ui/CaptureAnimation.java
rc/com/android/gallery3d/ui/PhotoView.java
rc/com/android/gallery3d/ui/PositionController.java
|
2c6173822a612597c79be41b126367ddfbb5d518 |
20-Apr-2012 |
Chih-Chung Chang <chihchung@google.com> |
Add capture animation in Gallery. Change-Id: Ibf95cc64f37a4518377e64124af6606c4f14cdaa
rc/com/android/gallery3d/app/AbstractGalleryActivity.java
rc/com/android/gallery3d/app/Gallery.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/app/PickerActivity.java
rc/com/android/gallery3d/ui/CaptureAnimation.java
rc/com/android/gallery3d/ui/PhotoView.java
rc/com/android/gallery3d/ui/PositionController.java
|
337624b3d7a9eab0da9f2829f3f95ef5f101fefc |
24-Apr-2012 |
Wu-cheng Li <wuchengli@google.com> |
Merge "Add a method to disable toggle status bar."
|
97d7d0f272d3f4619ded2bdc80ced457937be507 |
24-Apr-2012 |
Wu-cheng Li <wuchengli@google.com> |
Merge "Add a method to disable toggle status bar."
|
ad761dc6ac5dd9884f12438237d681ac5caac71d |
24-Apr-2012 |
Wu-cheng Li <wuchengli@google.com> |
Add a method to disable toggle status bar. Camera does not show status bar in both landscape and portrait. bug:6378178 Change-Id: I80cead9c0e2ef0256288aafead6bd1a96cc93d7b
rc/com/android/gallery3d/app/AbstractGalleryActivity.java
|
b1db75c15ef546fef26ee7e34321f3087562a0f7 |
24-Apr-2012 |
Wu-cheng Li <wuchengli@google.com> |
Add a method to disable toggle status bar. Camera does not show status bar in both landscape and portrait. bug:6378178 Change-Id: I80cead9c0e2ef0256288aafead6bd1a96cc93d7b
rc/com/android/gallery3d/app/AbstractGalleryActivity.java
|
08fe3f900d867ef9cb3be819c67b8e41a9b560c8 |
24-Apr-2012 |
Yuli Huang <yuli@google.com> |
Merge "Add prominent highlights for touch feedback."
|
b774b7e12c332d9369b70a09c9f103749e9ca774 |
24-Apr-2012 |
Yuli Huang <yuli@google.com> |
Merge "Add prominent highlights for touch feedback."
|
ea8e952ea7eb0ba613cebf0e1771dfeac330275b |
24-Apr-2012 |
Angus Kong <shkong@google.com> |
Merge "Add Raw2DTexture."
|
56248134ae583f850d5144da34be2f1608fa3e1c |
24-Apr-2012 |
Angus Kong <shkong@google.com> |
Merge "Add Raw2DTexture."
|
21db31f5dd7db63f2a5b24a9da721011a2312a1a |
11-Apr-2012 |
Angus Kong <shkong@google.com> |
Add Raw2DTexture. Raw2DTexture is a wrapper of GL 2D texture. It also support copy other texture's content into this texture. bug:5988937 Change-Id: Ib4f6ff7ed2f6ea499517536366b511b7984a9b98
rc/com/android/gallery3d/ui/ExtTexture.java
rc/com/android/gallery3d/ui/GLId.java
rc/com/android/gallery3d/ui/Raw2DTexture.java
rc/com/android/gallery3d/ui/SurfaceTextureScreenNail.java
|
ffc2a4a77f7164dd435d07c11a3df290c4b64079 |
11-Apr-2012 |
Angus Kong <shkong@google.com> |
Add Raw2DTexture. Raw2DTexture is a wrapper of GL 2D texture. It also support copy other texture's content into this texture. bug:5988937 Change-Id: Ib4f6ff7ed2f6ea499517536366b511b7984a9b98
rc/com/android/gallery3d/ui/ExtTexture.java
rc/com/android/gallery3d/ui/GLId.java
rc/com/android/gallery3d/ui/Raw2DTexture.java
rc/com/android/gallery3d/ui/SurfaceTextureScreenNail.java
|
4072ab93a57bcb2ad9fab6f42edf3805420080ec |
24-Apr-2012 |
Yuli Huang <yuli@google.com> |
Add prominent highlights for touch feedback. Mimic the system UI to fade out highlights on touch releases. bug:6145331 bug:5379176 Change-Id: I44c9245a926b2c5eb46b28d494c6393ba7f0c30c
rc/com/android/gallery3d/app/AlbumPage.java
rc/com/android/gallery3d/app/AlbumSetPage.java
rc/com/android/gallery3d/app/ManageCachePage.java
rc/com/android/gallery3d/ui/AbstractSlotRenderer.java
rc/com/android/gallery3d/ui/AlbumSetSlotRenderer.java
rc/com/android/gallery3d/ui/AlbumSlotRenderer.java
rc/com/android/gallery3d/ui/FadeInTexture.java
rc/com/android/gallery3d/ui/FadeOutTexture.java
rc/com/android/gallery3d/ui/FadeTexture.java
rc/com/android/gallery3d/ui/SlotView.java
|
90fe70f11b0961e1e5ae353cdf563236a55f502d |
24-Apr-2012 |
Yuli Huang <yuli@google.com> |
Add prominent highlights for touch feedback. Mimic the system UI to fade out highlights on touch releases. bug:6145331 bug:5379176 Change-Id: I44c9245a926b2c5eb46b28d494c6393ba7f0c30c
rc/com/android/gallery3d/app/AlbumPage.java
rc/com/android/gallery3d/app/AlbumSetPage.java
rc/com/android/gallery3d/app/ManageCachePage.java
rc/com/android/gallery3d/ui/AbstractSlotRenderer.java
rc/com/android/gallery3d/ui/AlbumSetSlotRenderer.java
rc/com/android/gallery3d/ui/AlbumSlotRenderer.java
rc/com/android/gallery3d/ui/FadeInTexture.java
rc/com/android/gallery3d/ui/FadeOutTexture.java
rc/com/android/gallery3d/ui/FadeTexture.java
rc/com/android/gallery3d/ui/SlotView.java
|
9f4a37dc27f431efdf4bae7bf0641f741fa25cd2 |
23-Apr-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am 49826d43: Reconcile with ics-mr1-release * commit '49826d43d1911939ccb1ac1ee9755ba5057065f6': Patch 2 for MR1. Patch for MR1.
|
082ea4230f5892379cb0eebfd87d1594e51987ec |
23-Apr-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am 49826d43: Reconcile with ics-mr1-release * commit '49826d43d1911939ccb1ac1ee9755ba5057065f6': Patch 2 for MR1. Patch for MR1.
|
20c6893f975e75f7eccadbd3775ebf0acfcd9ee0 |
23-Apr-2012 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with ics-mr1-release Change-Id: If202c8b713a5d273115764c404cbe45a88c8d658
|
49826d43d1911939ccb1ac1ee9755ba5057065f6 |
23-Apr-2012 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with ics-mr1-release Change-Id: If202c8b713a5d273115764c404cbe45a88c8d658
|
09e5150dfbf56fbef93010e2e3da2885e4e59b49 |
23-Apr-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to master
|
3fb8fa818bc95342be92dd8a070d18de106273fe |
23-Apr-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to master
|
e9ce46f1b85c375b92783ac45059dde80c30f2da |
23-Apr-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to master
|
988b74c4d75c0e117279c4e3e4a86367aee3631c |
05-Apr-2012 |
Ray Chen <raychen@google.com> |
Fix 6046544 Deleting a photo takes multiple steps and the flow is inconsistent with other deleting flows on other core apps This CL adds a confirm dialog to delete command and removes all confirm/cancel menu items from the actionbar. b:6046544 Change-Id: I3afe7b59b4f6d1216e192a621621f7bf544e1919
es/menu-land/photo.xml
es/menu/operation.xml
es/menu/photo.xml
es/values/strings.xml
|
85c9ea40b0026befe79c4ba866a73f5d58ee5555 |
05-Apr-2012 |
Ray Chen <raychen@google.com> |
Fix 6046544 Deleting a photo takes multiple steps and the flow is inconsistent with other deleting flows on other core apps This CL adds a confirm dialog to delete command and removes all confirm/cancel menu items from the actionbar. b:6046544 Change-Id: I3afe7b59b4f6d1216e192a621621f7bf544e1919
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/ui/ActionModeHandler.java
rc/com/android/gallery3d/ui/MenuExecutor.java
|
67098d1a72fd04e2af06d3a5939cde28c65f70d9 |
05-Apr-2012 |
Ray Chen <raychen@google.com> |
Fix 6046544 Deleting a photo takes multiple steps and the flow is inconsistent with other deleting flows on other core apps This CL adds a confirm dialog to delete command and removes all confirm/cancel menu items from the actionbar. b:6046544 Change-Id: I3afe7b59b4f6d1216e192a621621f7bf544e1919
es/menu-land/photo.xml
es/menu/operation.xml
es/menu/photo.xml
es/values/strings.xml
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/ui/ActionModeHandler.java
rc/com/android/gallery3d/ui/MenuExecutor.java
|
6e98a5bb1862af0056fe009184dc8aa2fc4611a2 |
23-Apr-2012 |
Ray Chen <raychen@google.com> |
Merge "Fix 6208468 21 ANR(s) in: com.google.android.gallery3d on crespo during monkey runs for JRM80 b:6208468"
|
3fb40bd6f7431e84481d8bccad61299b5f21a2f9 |
23-Apr-2012 |
Ray Chen <raychen@google.com> |
Merge "Fix 6208468 21 ANR(s) in: com.google.android.gallery3d on crespo during monkey runs for JRM80 b:6208468"
|
e860f3939442bb53b9bac1187a4005521a01582b |
23-Apr-2012 |
Ray Chen <raychen@google.com> |
Merge "Fix 6046987 The header on the contextual action bar when multiple photos are selected is very janky b:6046987"
|
c2a3c753afba43e211e999881bd2cbbdf2182ffd |
23-Apr-2012 |
Ray Chen <raychen@google.com> |
Merge "Fix 6046987 The header on the contextual action bar when multiple photos are selected is very janky b:6046987"
|
56f23ee044053b07f8a15d123486c9bc4ac5f00c |
23-Apr-2012 |
Ray Chen <raychen@google.com> |
Merge "Fix 6046987 The header on the contextual action bar when multiple photos are selected is very janky b:6046987"
|
4546aed13220c6c39bfa11236eb6c239fdee09d4 |
22-Apr-2012 |
Björn Lundén <blunden2@gmail.com> |
Add missing xhdpi icon to Gallery2 Change-Id: Ie20b8c71e9082f229f66253c0a0a5d7acf6a532c
es/mipmap-xhdpi/ic_launcher_gallery.png
|
833e5635702b23fb7fad28377d6cb318b27510d2 |
22-Apr-2012 |
Björn Lundén <blunden2@gmail.com> |
Add missing xhdpi icon to Gallery2 Change-Id: Ie20b8c71e9082f229f66253c0a0a5d7acf6a532c
es/mipmap-xhdpi/ic_launcher_gallery.png
|
276c07a00096684db4b99d0d4433186cd7754208 |
20-Apr-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: Id5aa8ee935dca1e7d44d6b59b43c52d3241ed9b0
es/values-el/strings.xml
es/values-ms/strings.xml
es/values-sl/strings.xml
es/values-zh-rCN/strings.xml
|
8e150e57e0052eb5fbe0c2221d90fc65c1d181d5 |
20-Apr-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: Id5aa8ee935dca1e7d44d6b59b43c52d3241ed9b0
es/values-el/strings.xml
es/values-ms/strings.xml
es/values-sl/strings.xml
es/values-zh-rCN/strings.xml
|
75098751ca463136d39719dcdeafc24c8acedb7d |
20-Apr-2012 |
Owen Lin <owenlin@google.com> |
Merge "Fix a UI bug in rendering a rotated image."
|
686a36c8cec0389e7e3133862b56b34d7e74bc3d |
20-Apr-2012 |
Owen Lin <owenlin@google.com> |
Merge "Fix a UI bug in rendering a rotated image."
|
f9a5a456aa75949c1065656ba01ab2ca350de7e9 |
20-Apr-2012 |
Ray Chen <raychen@google.com> |
Fix 6208468 21 ANR(s) in: com.google.android.gallery3d on crespo during monkey runs for JRM80 b:6208468 Both getDataManager and getImageCacheService use the same lock but the latter method is blocked on RandomAccessFile's open syscall. The lock should be separated because they're independent and getDataManager is very frequently used too. Change-Id: I4d44cfc949f45a31c7200c8327115bc4b7fde60f
rc/com/android/gallery3d/app/GalleryAppImpl.java
|
6b677eb6dfb1cc51ca6dbe6ab43da2f6020fbf2c |
20-Apr-2012 |
Ray Chen <raychen@google.com> |
Fix 6208468 21 ANR(s) in: com.google.android.gallery3d on crespo during monkey runs for JRM80 b:6208468 Both getDataManager and getImageCacheService use the same lock but the latter method is blocked on RandomAccessFile's open syscall. The lock should be separated because they're independent and getDataManager is very frequently used too. Change-Id: I4d44cfc949f45a31c7200c8327115bc4b7fde60f
rc/com/android/gallery3d/app/GalleryAppImpl.java
|
375404a8e494fc1d76d24b8568b3db36601a8495 |
21-Mar-2012 |
Chih-Chung Chang <chihchung@google.com> |
Patch 2 for MR1. Change-Id: I39cc780e0ef49c4e0863a1a83e585e16f0a32425
rc/com/android/gallery3d/ui/PhotoView.java
rc/com/android/gallery3d/ui/PositionController.java
|
fd695590504c1eb612b4002952ec1e23ee63d91c |
21-Mar-2012 |
Chih-Chung Chang <chihchung@google.com> |
Patch 2 for MR1. Change-Id: I39cc780e0ef49c4e0863a1a83e585e16f0a32425
rc/com/android/gallery3d/ui/PhotoView.java
rc/com/android/gallery3d/ui/PositionController.java
|
80c117a6b38ba5a4da6e8ea42a5e3b3d19c4e93e |
20-Mar-2012 |
Chih-Chung Chang <chihchung@google.com> |
Patch for MR1. Change-Id: I3f4bba2854257008eed95b8eacce598abdca3180
rc/com/android/gallery3d/app/PhotoDataAdapter.java
rc/com/android/gallery3d/ui/BitmapTileProvider.java
rc/com/android/gallery3d/ui/PhotoView.java
rc/com/android/gallery3d/ui/TileImageView.java
rc/com/android/gallery3d/ui/TileImageViewAdapter.java
rc/com/android/gallery3d/ui/UploadedTexture.java
|
1cdcda4829b7278973beab8be81291e8c5c76e7d |
20-Mar-2012 |
Chih-Chung Chang <chihchung@google.com> |
Patch for MR1. Change-Id: I3f4bba2854257008eed95b8eacce598abdca3180
rc/com/android/gallery3d/app/PhotoDataAdapter.java
rc/com/android/gallery3d/ui/BitmapTileProvider.java
rc/com/android/gallery3d/ui/PhotoView.java
rc/com/android/gallery3d/ui/TileImageView.java
rc/com/android/gallery3d/ui/TileImageViewAdapter.java
rc/com/android/gallery3d/ui/UploadedTexture.java
|
7b7d083dad25c079786150941691296d7b98e284 |
19-Apr-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: I00bdda6e887bda0b9248d1366a52350786fa7cbb
es/values-af/strings.xml
es/values-am/strings.xml
es/values-bg/strings.xml
es/values-cs/strings.xml
es/values-es-rUS/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sr/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-vi/strings.xml
es/values-zh-rTW/strings.xml
|
0d49dc5b4ebc51e7dc026c7028a6a7b917e83dc7 |
19-Apr-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: I00bdda6e887bda0b9248d1366a52350786fa7cbb
es/values-af/strings.xml
es/values-am/strings.xml
es/values-bg/strings.xml
es/values-cs/strings.xml
es/values-es-rUS/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sr/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-vi/strings.xml
es/values-zh-rTW/strings.xml
|
c2d0a221e53661b898848fa2dc8067f6be255439 |
19-Apr-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to master
|
abe8de4d56189669637a706562a12f83147e13a9 |
19-Apr-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to master
|
a3fe9d3bc7bee0b6768769ed47da016aac8dc2cd |
19-Apr-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to master
|
650f89f2bdf6e6832a6c2fe2ea1ff1b5b8674701 |
19-Apr-2012 |
Chih-Chung Chang <chihchung@google.com> |
Merge "In filmstrip, show placeholders for pictures not loaded yet."
|
85fa50eaba8ed9a44c4a369b75c304f2bcb9857d |
19-Apr-2012 |
Chih-Chung Chang <chihchung@google.com> |
Merge "In filmstrip, show placeholders for pictures not loaded yet."
|
b79bbd85bc1ce26a18a2be1100b95dfacbbce5e6 |
19-Apr-2012 |
Chih-Chung Chang <chihchung@google.com> |
In filmstrip, show placeholders for pictures not loaded yet. Change-Id: I037f1f054da4a3800045d5b89724341ac22272a5
rc/com/android/gallery3d/app/PhotoDataAdapter.java
rc/com/android/gallery3d/app/SinglePhotoDataAdapter.java
rc/com/android/gallery3d/ui/BitmapScreenNail.java
rc/com/android/gallery3d/ui/BitmapTileProvider.java
rc/com/android/gallery3d/ui/PhotoView.java
rc/com/android/gallery3d/ui/PositionController.java
rc/com/android/gallery3d/ui/ScreenNail.java
rc/com/android/gallery3d/ui/SurfaceTextureScreenNail.java
rc/com/android/gallery3d/ui/TileImageViewAdapter.java
|
c3b2d478f9032a8decf5c6254a238fc49e41b72c |
19-Apr-2012 |
Chih-Chung Chang <chihchung@google.com> |
In filmstrip, show placeholders for pictures not loaded yet. Change-Id: I037f1f054da4a3800045d5b89724341ac22272a5
rc/com/android/gallery3d/app/PhotoDataAdapter.java
rc/com/android/gallery3d/app/SinglePhotoDataAdapter.java
rc/com/android/gallery3d/ui/BitmapScreenNail.java
rc/com/android/gallery3d/ui/BitmapTileProvider.java
rc/com/android/gallery3d/ui/PhotoView.java
rc/com/android/gallery3d/ui/PositionController.java
rc/com/android/gallery3d/ui/ScreenNail.java
rc/com/android/gallery3d/ui/SurfaceTextureScreenNail.java
rc/com/android/gallery3d/ui/TileImageViewAdapter.java
|
c40e77630144b4deed13fe4996c8f3987baf7c8a |
19-Apr-2012 |
Ray Chen <raychen@google.com> |
Fix 6046987 The header on the contextual action bar when multiple photos are selected is very janky b:6046987 Change-Id: I86c79cf4d8995bfa0faab95ecd61e89879847630
es/drawable-hdpi/dropdown_ic_arrow_normal_holo_dark.png
es/drawable-hdpi/dropdown_normal_holo_dark.9.png
es/drawable-mdpi/dropdown_ic_arrow_normal_holo_dark.png
es/drawable-mdpi/dropdown_normal_holo_dark.9.png
es/drawable-xhdpi/dropdown_ic_arrow_normal_holo_dark.png
es/layout/action_mode.xml
|
0f4f00b1c311527f31afa2d7a481b46675aeb14e |
19-Apr-2012 |
Ray Chen <raychen@google.com> |
Fix 6046987 The header on the contextual action bar when multiple photos are selected is very janky b:6046987 Change-Id: I86c79cf4d8995bfa0faab95ecd61e89879847630
rc/com/android/gallery3d/ui/CustomMenu.java
|
add4514f5d39bc6c2156ebbf96e693669a9141a7 |
19-Apr-2012 |
Ray Chen <raychen@google.com> |
Fix 6046987 The header on the contextual action bar when multiple photos are selected is very janky b:6046987 Change-Id: I86c79cf4d8995bfa0faab95ecd61e89879847630
es/drawable-hdpi/dropdown_ic_arrow_normal_holo_dark.png
es/drawable-hdpi/dropdown_normal_holo_dark.9.png
es/drawable-mdpi/dropdown_ic_arrow_normal_holo_dark.png
es/drawable-mdpi/dropdown_normal_holo_dark.9.png
es/drawable-xhdpi/dropdown_ic_arrow_normal_holo_dark.png
es/layout/action_mode.xml
rc/com/android/gallery3d/ui/CustomMenu.java
|
4ddae7b90c19375df0f122f5c1770340afb2e14f |
19-Apr-2012 |
Owen Lin <owenlin@google.com> |
Fix a UI bug in rendering a rotated image. Change-Id: I14f9f74c5d810dfbb56151722c7f604522fea938
rc/com/android/gallery3d/ui/AbstractSlotRenderer.java
|
a25864674c3ce58bd8e013af9c1af7b8e3b0946d |
19-Apr-2012 |
Owen Lin <owenlin@google.com> |
Fix a UI bug in rendering a rotated image. Change-Id: I14f9f74c5d810dfbb56151722c7f604522fea938
rc/com/android/gallery3d/ui/AbstractSlotRenderer.java
|
2dc6eab8fdc312fd7d628b147cc7f55bfd8b7810 |
19-Apr-2012 |
Chih-Chung Chang <chihchung@google.com> |
Merge "Allow filmstrip to scroll before the screennail is loaded."
|
9a07b173ebeba2cccc41550d02803b544a9bea49 |
19-Apr-2012 |
Chih-Chung Chang <chihchung@google.com> |
Merge "Allow filmstrip to scroll before the screennail is loaded."
|
4831a8fbd146ed627b8f6be4f4d1fed4cd4e3fe5 |
19-Apr-2012 |
Chih-Chung Chang <chihchung@google.com> |
Allow filmstrip to scroll before the screennail is loaded. Change-Id: I9aa7405902c4bfb7e4946cfe4e1263314a958686
rc/com/android/gallery3d/app/PhotoDataAdapter.java
rc/com/android/gallery3d/ui/PhotoView.java
rc/com/android/gallery3d/ui/PositionController.java
|
fb1a15559bb2a0a1c8a41efd3e0420a2a2d70590 |
19-Apr-2012 |
Chih-Chung Chang <chihchung@google.com> |
Allow filmstrip to scroll before the screennail is loaded. Change-Id: I9aa7405902c4bfb7e4946cfe4e1263314a958686
rc/com/android/gallery3d/app/PhotoDataAdapter.java
rc/com/android/gallery3d/ui/PhotoView.java
rc/com/android/gallery3d/ui/PositionController.java
|
52dae5953ea5ac8828942f33d0031a393b79ad5e |
18-Apr-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: Ib1909c28cbf36dd37530f4b2442f87ab9b2964f1
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-ca/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-en-rGB/strings.xml
es/values-es/strings.xml
es/values-fr/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-nb/strings.xml
es/values-pt-rPT/strings.xml
es/values-sv/strings.xml
es/values-uk/strings.xml
es/values-zu/strings.xml
|
68cf1645ab5f187f6c77a936e1a26d6a90b686d3 |
18-Apr-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: Ib1909c28cbf36dd37530f4b2442f87ab9b2964f1
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-ca/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-en-rGB/strings.xml
es/values-es/strings.xml
es/values-fr/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-nb/strings.xml
es/values-pt-rPT/strings.xml
es/values-sv/strings.xml
es/values-uk/strings.xml
es/values-zu/strings.xml
|
bc7468a0e0ae4309b2435a43b27b5f55428c1403 |
18-Apr-2012 |
Chih-Chung Chang <chihchung@google.com> |
am 3abf8faf: am 42c1892a: Patch 2 for MR1. * commit '3abf8faf44da51a63243b7cc943cdb0055141ef4':
|
c7fc8d01472c1e4b40660673b6e3517e0b97f4ad |
18-Apr-2012 |
Chih-Chung Chang <chihchung@google.com> |
am 3abf8faf: am 42c1892a: Patch 2 for MR1. * commit '3abf8faf44da51a63243b7cc943cdb0055141ef4':
|
d103c1adbd6fdff0cded6456bbd5adecce6aaffb |
18-Apr-2012 |
Chih-Chung Chang <chihchung@google.com> |
am 402e680d: am 4745319b: Patch for MR1. * commit '402e680d220e73d80c5889e129fab459af9713c5':
|
c82cc37674726df60ebb2b53b7376088a4b72283 |
18-Apr-2012 |
Chih-Chung Chang <chihchung@google.com> |
am 402e680d: am 4745319b: Patch for MR1. * commit '402e680d220e73d80c5889e129fab459af9713c5':
|
f54bf915769d1600876eac5558a4aaf8171d6c16 |
18-Apr-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to master
|
9e8953dfe461d3f3ebe93f4528817c0ff6ad32c7 |
18-Apr-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to master
|
4c34496172094f1dac72889d9634a1b38845e86d |
18-Apr-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to master
|
a0b06477b94978c447eedf1686def0fecc356aeb |
18-Apr-2012 |
Chih-Chung Chang <chihchung@google.com> |
Film strip should be accessible only when an image is its default state. Change-Id: I4df0db809f6a3f8d28b4e7bbbcddc3fa19d35387
rc/com/android/gallery3d/ui/PhotoView.java
|
099989b310d84fe13eff0cdf2902bb3fb0bcbd14 |
18-Apr-2012 |
Chih-Chung Chang <chihchung@google.com> |
Film strip should be accessible only when an image is its default state. Change-Id: I4df0db809f6a3f8d28b4e7bbbcddc3fa19d35387
rc/com/android/gallery3d/ui/PhotoView.java
|
2eaa2112c460e931ad0261b408213d3d1217d96f |
17-Apr-2012 |
Chih-Chung Chang <chihchung@google.com> |
Add thumb pool the cache Bitmap used for thumbnails. Change-Id: Ib710f2a6fc1aa86fe4abdd18d1fa7ac71396a3b4
rc/com/android/gallery3d/app/AbstractGalleryActivity.java
rc/com/android/gallery3d/app/CameraScreenNail.java
rc/com/android/gallery3d/app/PhotoDataAdapter.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/app/SinglePhotoDataAdapter.java
rc/com/android/gallery3d/data/BitmapPool.java
rc/com/android/gallery3d/data/DecodeUtils.java
rc/com/android/gallery3d/data/ImageCacheRequest.java
rc/com/android/gallery3d/data/MediaItem.java
rc/com/android/gallery3d/ui/AlbumLabelMaker.java
rc/com/android/gallery3d/ui/AlbumSetSlidingWindow.java
rc/com/android/gallery3d/ui/BitmapScreenNail.java
rc/com/android/gallery3d/ui/BitmapTileProvider.java
rc/com/android/gallery3d/ui/PhotoView.java
rc/com/android/gallery3d/ui/PositionController.java
rc/com/android/gallery3d/ui/ScreenNail.java
rc/com/android/gallery3d/ui/SurfaceTextureScreenNail.java
rc/com/android/gallery3d/ui/TileImageView.java
rc/com/android/gallery3d/ui/TileImageViewAdapter.java
|
b8be1e0ad76b6abc0da7ead39f7a9811195d001e |
17-Apr-2012 |
Chih-Chung Chang <chihchung@google.com> |
Add thumb pool the cache Bitmap used for thumbnails. Change-Id: Ib710f2a6fc1aa86fe4abdd18d1fa7ac71396a3b4
rc/com/android/gallery3d/app/AbstractGalleryActivity.java
rc/com/android/gallery3d/app/CameraScreenNail.java
rc/com/android/gallery3d/app/PhotoDataAdapter.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/app/SinglePhotoDataAdapter.java
rc/com/android/gallery3d/data/BitmapPool.java
rc/com/android/gallery3d/data/DecodeUtils.java
rc/com/android/gallery3d/data/ImageCacheRequest.java
rc/com/android/gallery3d/data/MediaItem.java
rc/com/android/gallery3d/ui/AlbumLabelMaker.java
rc/com/android/gallery3d/ui/AlbumSetSlidingWindow.java
rc/com/android/gallery3d/ui/BitmapScreenNail.java
rc/com/android/gallery3d/ui/BitmapTileProvider.java
rc/com/android/gallery3d/ui/PhotoView.java
rc/com/android/gallery3d/ui/PositionController.java
rc/com/android/gallery3d/ui/ScreenNail.java
rc/com/android/gallery3d/ui/SurfaceTextureScreenNail.java
rc/com/android/gallery3d/ui/TileImageView.java
rc/com/android/gallery3d/ui/TileImageViewAdapter.java
|
146df37d6a6c7ca8686f5934b3d90b16c24a2583 |
18-Apr-2012 |
Wu-cheng Li <wuchengli@google.com> |
Merge "Add page tap listener."
|
2ae47200a8ac7a57eff925d287f7b48a2360d95c |
18-Apr-2012 |
Wu-cheng Li <wuchengli@google.com> |
Merge "Add page tap listener."
|
36c27fb695ff66bea4a00cfc063b142a736a782f |
18-Apr-2012 |
Wu-cheng Li <wuchengli@google.com> |
Add page tap listener. Camera needs this for touch focus and video snapshot. bug:6313318 Change-Id: Ie0b8129160c2a79d4b20fab2173027cddfee7a79
rc/com/android/gallery3d/app/PhotoPage.java
|
014d9586d8145a33f4e99eaad570587f6d650026 |
18-Apr-2012 |
Wu-cheng Li <wuchengli@google.com> |
Add page tap listener. Camera needs this for touch focus and video snapshot. bug:6313318 Change-Id: Ie0b8129160c2a79d4b20fab2173027cddfee7a79
rc/com/android/gallery3d/app/PhotoPage.java
|
4eaad6f512b4c1e7cf01fc56c2af78eca92fbf07 |
18-Apr-2012 |
Owen Lin <owenlin@android.com> |
Merge "Slower scrolling for fling in filmstrip mode."
|
1ff1afcbe2046fa239e4b0684f41f5ed41fe707c |
18-Apr-2012 |
Owen Lin <owenlin@android.com> |
Merge "Slower scrolling for fling in filmstrip mode."
|
101b5d6115100652a25e33f0ffbd6108aa7f9276 |
17-Apr-2012 |
Owen Lin <owenlin@google.com> |
Fix NPE in onContentDirty. onContentDirty is suppose to be called in Main thread. Change-Id: Ic6a0fba8abd8a3e17d400bcfc5b82d272b07bc41
rc/com/android/gallery3d/data/LocalAlbumSet.java
rc/com/android/gallery3d/data/MtpDeviceSet.java
|
9ca9c3705c2176f1da98c573a9d765fc65b840ce |
17-Apr-2012 |
Owen Lin <owenlin@google.com> |
Fix NPE in onContentDirty. onContentDirty is suppose to be called in Main thread. Change-Id: Ic6a0fba8abd8a3e17d400bcfc5b82d272b07bc41
rc/com/android/gallery3d/data/LocalAlbumSet.java
rc/com/android/gallery3d/data/MtpDeviceSet.java
|
3c21751275b2b8719dfc549b059d09436d4c2e19 |
17-Apr-2012 |
Owen Lin <owenlin@google.com> |
Fix NPE in SlotView. This NPE is actually a concurrent issue. We shall lock renderring when we clean up the slots' data. But it didn't, so it may access to null data. Change-Id: I2a8abfbb77f83bd9a240477fa53216ce69b7774d fix: 6302487 fix: 6308873
rc/com/android/gallery3d/app/AlbumPage.java
rc/com/android/gallery3d/app/AlbumSetPage.java
rc/com/android/gallery3d/app/ManageCachePage.java
rc/com/android/gallery3d/ui/ActionModeHandler.java
rc/com/android/gallery3d/ui/SlotView.java
|
48ba94ae713dbf57898cfa84ae69517da50cf7a0 |
17-Apr-2012 |
Owen Lin <owenlin@google.com> |
Fix NPE in SlotView. This NPE is actually a concurrent issue. We shall lock renderring when we clean up the slots' data. But it didn't, so it may access to null data. Change-Id: I2a8abfbb77f83bd9a240477fa53216ce69b7774d fix: 6302487 fix: 6308873
rc/com/android/gallery3d/app/AlbumPage.java
rc/com/android/gallery3d/app/AlbumSetPage.java
rc/com/android/gallery3d/app/ManageCachePage.java
rc/com/android/gallery3d/ui/ActionModeHandler.java
rc/com/android/gallery3d/ui/SlotView.java
|
d6657f30bd6fac1891602c754b22f00e67e79d6b |
17-Apr-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: Ie4ec34a3ec88133e80fe9da1e800ab5c74c89b14
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
29763f7a278c5d894f3590db1809c56e5a2b9a0a |
17-Apr-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: Ie4ec34a3ec88133e80fe9da1e800ab5c74c89b14
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
f569ed027597c60a3a3ad900eb016d8d55886f3a |
17-Apr-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to master
|
67c820015e2f4f7caf8582f803b9795a58ac6abe |
17-Apr-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to master
|
a9eca3f48c4652cf7b885fedcf9a19b335ccd7fe |
17-Apr-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to master
|
a5c3c853f35416146701ca2fc2cf17ab04ea9738 |
17-Apr-2012 |
Yuli Huang <yuli@google.com> |
Fix b/6318340: window range isn't updated when data size changes. bug:6318340 Change-Id: I2098ddc75fe1a4422a20ab90f02a12c9be85c31e
rc/com/android/gallery3d/ui/AlbumSetSlidingWindow.java
rc/com/android/gallery3d/ui/AlbumSlidingWindow.java
|
cd938f3f05975de73658dc2f2b6c632b7ee569a3 |
17-Apr-2012 |
Yuli Huang <yuli@google.com> |
Fix b/6318340: window range isn't updated when data size changes. bug:6318340 Change-Id: I2098ddc75fe1a4422a20ab90f02a12c9be85c31e
rc/com/android/gallery3d/ui/AlbumSetSlidingWindow.java
rc/com/android/gallery3d/ui/AlbumSlidingWindow.java
|
f2c18aada3ca6a588694f4882ecf5479eed70930 |
16-Apr-2012 |
Ray Chen <raychen@google.com> |
Fix b/6213053 Add Help entry point to Gallery (targeted for J release) b:6213053 Change-Id: Ib9d9c5e69f09d6c2fffb4e6ecb09b2c3ae700365
es/menu/albumset.xml
es/values/strings.xml
|
3d6983be31e4c5a9fc76bf3e89033f7237c5a5ca |
16-Apr-2012 |
Ray Chen <raychen@google.com> |
Fix b/6213053 Add Help entry point to Gallery (targeted for J release) b:6213053 Change-Id: Ib9d9c5e69f09d6c2fffb4e6ecb09b2c3ae700365
rc/com/android/gallery3d/app/AlbumSetPage.java
rc/com/android/gallery3d/util/GalleryUtils.java
|
e7d1767e30d01270bf67714b1902a316960952c0 |
16-Apr-2012 |
Ray Chen <raychen@google.com> |
Fix b/6213053 Add Help entry point to Gallery (targeted for J release) b:6213053 Change-Id: Ib9d9c5e69f09d6c2fffb4e6ecb09b2c3ae700365
es/menu/albumset.xml
es/values/strings.xml
rc/com/android/gallery3d/app/AlbumSetPage.java
rc/com/android/gallery3d/util/GalleryUtils.java
|
2a8766065ee4ede16bf432a3aeeca9e4ff10c09c |
17-Apr-2012 |
Owen Lin <owenlin@google.com> |
Merge "Fix a concurrent issue in reload()."
|
2ca50f8b4d102471f7fa2f0163d6fef131abdd19 |
17-Apr-2012 |
Owen Lin <owenlin@google.com> |
Merge "Fix a concurrent issue in reload()."
|
6e32315ba37592eae9d16310d48ce4dbd4a45c5e |
16-Apr-2012 |
Chih-Chung Chang <chihchung@google.com> |
Slower scrolling for fling in filmstrip mode. Also don't animate scale for the first image size. Change-Id: I6a71c00e813bd203e9f454bc9a776eadec06fd78
rc/com/android/gallery3d/ui/PositionController.java
|
d848862c1dd0689df8df5d684476cfd3897557d6 |
16-Apr-2012 |
Chih-Chung Chang <chihchung@google.com> |
Slower scrolling for fling in filmstrip mode. Also don't animate scale for the first image size. Change-Id: I6a71c00e813bd203e9f454bc9a776eadec06fd78
rc/com/android/gallery3d/ui/PositionController.java
|
125649ecc3b3a20f027c11c2eaa3b2868e25a038 |
16-Apr-2012 |
Owen Lin <owenlin@google.com> |
Fix a concurrent issue in reload(). We need to hold the DataManager.LOCK when calling reload. Change-Id: If908c233bcd835effffc7750a7ef07f56a63136c fix: 6315479
rc/com/android/gallery3d/data/LocalAlbumSet.java
rc/com/android/gallery3d/data/MtpDeviceSet.java
|
91adea8b4fc292b046b66c6501166fe7a151d253 |
16-Apr-2012 |
Owen Lin <owenlin@google.com> |
Fix a concurrent issue in reload(). We need to hold the DataManager.LOCK when calling reload. Change-Id: If908c233bcd835effffc7750a7ef07f56a63136c fix: 6315479
rc/com/android/gallery3d/data/LocalAlbumSet.java
rc/com/android/gallery3d/data/MtpDeviceSet.java
|
5c4347c02fb37469a53ce8c7b2f54575ce361e23 |
17-Apr-2012 |
Chih-Chung Chang <chihchung@google.com> |
am 3f3316a5: am 81bdb903: am 42c1892a: Patch 2 for MR1. * commit '3f3316a5e86dd24af60023a877d027fef28e9b4f':
|
55d935518441c8a80a5f01dd8ca723c084cdc77b |
17-Apr-2012 |
Chih-Chung Chang <chihchung@google.com> |
am 3f3316a5: am 81bdb903: am 42c1892a: Patch 2 for MR1. * commit '3f3316a5e86dd24af60023a877d027fef28e9b4f':
|
93d00d14712edb1fefa02339f280f142a86736ed |
17-Apr-2012 |
Chih-Chung Chang <chihchung@google.com> |
am f253572e: am 43b32d04: am 4745319b: Patch for MR1. * commit 'f253572ebc6fd821340dd621b199a2d42ae67d3e':
|
332f7ea06481b2c051ee139dda6529a4a87de61f |
17-Apr-2012 |
Chih-Chung Chang <chihchung@google.com> |
am f253572e: am 43b32d04: am 4745319b: Patch for MR1. * commit 'f253572ebc6fd821340dd621b199a2d42ae67d3e':
|
79313739459b539db25e9606916a860cb15e1326 |
17-Apr-2012 |
Chih-Chung Chang <chihchung@google.com> |
am 51f0fad1: (-s ours) am da7c5fab: am 42c1892a: Patch 2 for MR1. * commit '51f0fad1840800a914cede46ea83447b81e61b8e': Patch 2 for MR1.
|
408849a26bf4be1dddceba2ff0c71df2f3eecb94 |
17-Apr-2012 |
Chih-Chung Chang <chihchung@google.com> |
am 51f0fad1: (-s ours) am da7c5fab: am 42c1892a: Patch 2 for MR1. * commit '51f0fad1840800a914cede46ea83447b81e61b8e': Patch 2 for MR1.
|
82996e30013514a0eb6f88f091efd2c47a76ec74 |
17-Apr-2012 |
Chih-Chung Chang <chihchung@google.com> |
am 85171a9b: (-s ours) am 0c425fbb: am 4745319b: Patch for MR1. * commit '85171a9bc1a1571e3256135893757b0c7a6ab4b7': Patch for MR1.
|
3fb54127e740195598c7c0bf64ec2e3c5b3b6452 |
17-Apr-2012 |
Chih-Chung Chang <chihchung@google.com> |
am 85171a9b: (-s ours) am 0c425fbb: am 4745319b: Patch for MR1. * commit '85171a9bc1a1571e3256135893757b0c7a6ab4b7': Patch for MR1.
|
2852b910c900287a2e7be619bf8297b7788f6b09 |
17-Apr-2012 |
Chih-Chung Chang <chihchung@google.com> |
am 81bdb903: am 42c1892a: Patch 2 for MR1. * commit '81bdb9032bfc6c59480cdabf03858688cc8b66c1':
|
3f3316a5e86dd24af60023a877d027fef28e9b4f |
17-Apr-2012 |
Chih-Chung Chang <chihchung@google.com> |
am 81bdb903: am 42c1892a: Patch 2 for MR1. * commit '81bdb9032bfc6c59480cdabf03858688cc8b66c1':
|
fa45de397eafeb8e74e5d6c8b0cb2ef8629975a6 |
17-Apr-2012 |
Chih-Chung Chang <chihchung@google.com> |
am 43b32d04: am 4745319b: Patch for MR1. * commit '43b32d04f0bee0ac7d83844d09255f52a9fbe5d1':
|
f253572ebc6fd821340dd621b199a2d42ae67d3e |
17-Apr-2012 |
Chih-Chung Chang <chihchung@google.com> |
am 43b32d04: am 4745319b: Patch for MR1. * commit '43b32d04f0bee0ac7d83844d09255f52a9fbe5d1':
|
51f0fad1840800a914cede46ea83447b81e61b8e |
17-Apr-2012 |
Chih-Chung Chang <chihchung@google.com> |
am da7c5fab: am 42c1892a: Patch 2 for MR1. * commit 'da7c5fab68cb65d0535d230b9487bfaa5d6ded56': Patch 2 for MR1.
|
85171a9bc1a1571e3256135893757b0c7a6ab4b7 |
17-Apr-2012 |
Chih-Chung Chang <chihchung@google.com> |
am 0c425fbb: am 4745319b: Patch for MR1. * commit '0c425fbb3776f5445825d5f2d0ef77493874cec0': Patch for MR1.
|
e85b0be2aa78a0714e2867df998c843d97ba21d0 |
17-Apr-2012 |
Chih-Chung Chang <chihchung@google.com> |
am 42c1892a: Patch 2 for MR1. * commit '42c1892ab508a02ea957fe8796086362e163c123': Patch 2 for MR1.
|
3abf8faf44da51a63243b7cc943cdb0055141ef4 |
17-Apr-2012 |
Chih-Chung Chang <chihchung@google.com> |
am 42c1892a: Patch 2 for MR1. * commit '42c1892ab508a02ea957fe8796086362e163c123': Patch 2 for MR1.
|
e46a34ae888359bbcc49f03520cd1efd8c5fe2c4 |
17-Apr-2012 |
Chih-Chung Chang <chihchung@google.com> |
am 4745319b: Patch for MR1. * commit '4745319b4f5e1f5056502f20698eb5910d249333': Patch for MR1.
|
402e680d220e73d80c5889e129fab459af9713c5 |
17-Apr-2012 |
Chih-Chung Chang <chihchung@google.com> |
am 4745319b: Patch for MR1. * commit '4745319b4f5e1f5056502f20698eb5910d249333': Patch for MR1.
|
3e737049552c0804a2bd8c908ade17bc735dc45f |
17-Apr-2012 |
Chih-Chung Chang <chihchung@google.com> |
am 42c1892a: Patch 2 for MR1. * commit '42c1892ab508a02ea957fe8796086362e163c123': Patch 2 for MR1.
|
da7c5fab68cb65d0535d230b9487bfaa5d6ded56 |
17-Apr-2012 |
Chih-Chung Chang <chihchung@google.com> |
am 42c1892a: Patch 2 for MR1. * commit '42c1892ab508a02ea957fe8796086362e163c123': Patch 2 for MR1.
|
cd45d55792727b9e412e910dd6d836bad21338ce |
17-Apr-2012 |
Chih-Chung Chang <chihchung@google.com> |
am 4745319b: Patch for MR1. * commit '4745319b4f5e1f5056502f20698eb5910d249333': Patch for MR1.
|
0c425fbb3776f5445825d5f2d0ef77493874cec0 |
17-Apr-2012 |
Chih-Chung Chang <chihchung@google.com> |
am 4745319b: Patch for MR1. * commit '4745319b4f5e1f5056502f20698eb5910d249333': Patch for MR1.
|
d45b469a720010a68a6fcdfd5327fc16f31d014a |
17-Apr-2012 |
Chih-Chung Chang <chihchung@google.com> |
am 42c1892a: Patch 2 for MR1. * commit '42c1892ab508a02ea957fe8796086362e163c123': Patch 2 for MR1.
|
81bdb9032bfc6c59480cdabf03858688cc8b66c1 |
17-Apr-2012 |
Chih-Chung Chang <chihchung@google.com> |
am 42c1892a: Patch 2 for MR1. * commit '42c1892ab508a02ea957fe8796086362e163c123': Patch 2 for MR1.
|
db5579c97ff408f4361b742daa013e9cdf33a290 |
17-Apr-2012 |
Chih-Chung Chang <chihchung@google.com> |
am 4745319b: Patch for MR1. * commit '4745319b4f5e1f5056502f20698eb5910d249333': Patch for MR1.
|
43b32d04f0bee0ac7d83844d09255f52a9fbe5d1 |
17-Apr-2012 |
Chih-Chung Chang <chihchung@google.com> |
am 4745319b: Patch for MR1. * commit '4745319b4f5e1f5056502f20698eb5910d249333': Patch for MR1.
|
b9ec867eb25bf5ea12b7fd0cc4e598a6792f01a7 |
16-Apr-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to master
|
2e353623cd1558630e5e200cf54e11a4dc53b007 |
16-Apr-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to master
|
442256d10bfe9f9c3f0023ea3b1f6e133dadc394 |
16-Apr-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to master
|
0fd46993facd2d2ac80eab64e4f0f8c8e79350dc |
16-Apr-2012 |
Chih-Chung Chang <chihchung@google.com> |
Define max height/width for each picture in filmstrip mode. Change-Id: I844a32f95237724a60a64afe5f746798886dcc2c
rc/com/android/gallery3d/ui/PositionController.java
|
642561dd3177f9511c8bbeb90839066ecc451054 |
16-Apr-2012 |
Chih-Chung Chang <chihchung@google.com> |
Define max height/width for each picture in filmstrip mode. Change-Id: I844a32f95237724a60a64afe5f746798886dcc2c
rc/com/android/gallery3d/ui/PositionController.java
|
a754c6b508bb3c32312c4983d5371b8173f106fd |
16-Apr-2012 |
Chih-Chung Chang <chihchung@google.com> |
Reduce padding between photos, from 96 pixels to 16 dp. Change-Id: I62b0013da45b7d7495b34e9e4e1e791bac9c9c1f
rc/com/android/gallery3d/ui/PositionController.java
|
aced34ca03fbd76b072dcdce26f4883ac4d1b25c |
16-Apr-2012 |
Chih-Chung Chang <chihchung@google.com> |
Reduce padding between photos, from 96 pixels to 16 dp. Change-Id: I62b0013da45b7d7495b34e9e4e1e791bac9c9c1f
rc/com/android/gallery3d/ui/PositionController.java
|
f35ae59d9e9d19bbfe2705d9b29db164e5082df1 |
12-Apr-2012 |
Owen Lin <owenlin@google.com> |
Fix ANR in PhotoPage. This bugs happens because we open too many PhotoPage(s) (and onSingleTapUp is a delayed event). However, each of the PhotoPage need a Thread to run tile decoder. When we close one of the PhotoPage, it will wait the tile decoder to get finished first. However, the title decoder may still waiting in the queue and never got a chance to run. Change-Id: I113d1150729892edb4fe36bc5a1dc131db300476 fix: 6319833
rc/com/android/gallery3d/app/AlbumPage.java
rc/com/android/gallery3d/app/AlbumSetPage.java
|
a9f3be9c7e80e26c0c09ca45d829269c49d8835d |
12-Apr-2012 |
Owen Lin <owenlin@google.com> |
Fix ANR in PhotoPage. This bugs happens because we open too many PhotoPage(s) (and onSingleTapUp is a delayed event). However, each of the PhotoPage need a Thread to run tile decoder. When we close one of the PhotoPage, it will wait the tile decoder to get finished first. However, the title decoder may still waiting in the queue and never got a chance to run. Change-Id: I113d1150729892edb4fe36bc5a1dc131db300476 fix: 6319833
rc/com/android/gallery3d/app/AlbumPage.java
rc/com/android/gallery3d/app/AlbumSetPage.java
|
0c9b33142eab6dbc2fdfe58179b26fa497b7eff0 |
14-Apr-2012 |
Martijn Coenen <maco@google.com> |
Merge "Use new Beam push API."
|
483203d37da239d9c455239791c1defe2acdfa37 |
14-Apr-2012 |
Martijn Coenen <maco@google.com> |
Merge "Use new Beam push API."
|
1e648cb762bf539102888846d18c0b3de5d6fc56 |
14-Apr-2012 |
Martijn Coenen <maco@google.com> |
Use new Beam push API. Change-Id: I3e5a69832d1ac01759e37fbde2cf2c1926219445
rc/com/android/gallery3d/app/PhotoPage.java
|
a41ed05ff2f71d2177b4f24f53acd848b46fc840 |
14-Apr-2012 |
Martijn Coenen <maco@google.com> |
Use new Beam push API. Change-Id: I3e5a69832d1ac01759e37fbde2cf2c1926219445
rc/com/android/gallery3d/app/PhotoPage.java
|
433ca72064eebca08791f4de02ba349118af2273 |
13-Apr-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: Ic4925614c94fbbb2a4d57b5666bf8847aabf2ed6
es/values-in/strings.xml
|
b8346f6d7910ae06d4572fd49c3aa4011e69f002 |
13-Apr-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: Ic4925614c94fbbb2a4d57b5666bf8847aabf2ed6
es/values-in/strings.xml
|
47795fea8bc6e4bd65af73c2cabcdae593f78952 |
12-Apr-2012 |
Owen Lin <owenlin@google.com> |
Fix ANR in PhotoPage. This bugs happens because we open too many PhotoPage(s) (and onSingleTapUp is a delayed event). However, each of the PhotoPage need a Thread to run tile decoder. When we close one of the PhotoPage, it will wait the tile decoder to get finished first. However, the title decoder may still waiting in the queue and never got a chance to run. Change-Id: I113d1150729892edb4fe36bc5a1dc131db300476 fix: 6319833
rc/com/android/gallery3d/app/AlbumPage.java
rc/com/android/gallery3d/app/AlbumSetPage.java
|
cf06397b2bc65335fb97d5788f18cad4897126a2 |
12-Apr-2012 |
Owen Lin <owenlin@google.com> |
Fix ANR in PhotoPage. This bugs happens because we open too many PhotoPage(s) (and onSingleTapUp is a delayed event). However, each of the PhotoPage need a Thread to run tile decoder. When we close one of the PhotoPage, it will wait the tile decoder to get finished first. However, the title decoder may still waiting in the queue and never got a chance to run. Change-Id: I113d1150729892edb4fe36bc5a1dc131db300476 fix: 6319833
rc/com/android/gallery3d/app/AlbumPage.java
rc/com/android/gallery3d/app/AlbumSetPage.java
|
e0dff0321fa4175346019fee3c0909e12fea6093 |
12-Apr-2012 |
Yuli Huang <yuli@google.com> |
Fix SinglePhotoDataAdapter getScreenNail() bug:6322259 Change-Id: I6cf5de88fc07e4b73b028faa3b2a063b4d47fd20
rc/com/android/gallery3d/app/SinglePhotoDataAdapter.java
|
88d715de7a950616371b771dbb6a124b1718914b |
12-Apr-2012 |
Yuli Huang <yuli@google.com> |
Fix SinglePhotoDataAdapter getScreenNail() bug:6322259 Change-Id: I6cf5de88fc07e4b73b028faa3b2a063b4d47fd20
rc/com/android/gallery3d/app/SinglePhotoDataAdapter.java
|
fe047898b1afd2b85ab37755cdf3f19b058abc58 |
12-Apr-2012 |
Yuli Huang <yuli@google.com> |
Fix SinglePhotoDataAdapter getScreenNail() bug:6322259 Change-Id: I6cf5de88fc07e4b73b028faa3b2a063b4d47fd20
rc/com/android/gallery3d/app/SinglePhotoDataAdapter.java
|
96a9d9daa55fa5dc9bd73f3352d60942b06e67a0 |
12-Apr-2012 |
Yuli Huang <yuli@google.com> |
Fix SinglePhotoDataAdapter getScreenNail() bug:6322259 Change-Id: I6cf5de88fc07e4b73b028faa3b2a063b4d47fd20
rc/com/android/gallery3d/app/SinglePhotoDataAdapter.java
|
336d99740ef62ac11c95e0c68df62d357a59e340 |
11-Apr-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to master
|
c9df3c8558851c101aaa5e6f63ffaccdb5dfb761 |
11-Apr-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to master
|
e6df30dfc67a56a141fa4c0c9ebdd01b6c4c21f5 |
10-Apr-2012 |
Yuli Huang <yuli@google.com> |
Merge "Save edited photo in the source photo directory if applicable."
|
311cf7a595e8d466fa427f15d86341271c002bf5 |
10-Apr-2012 |
Yuli Huang <yuli@google.com> |
Merge "Save edited photo in the source photo directory if applicable."
|
7770cc98c71b6976d8908135d9c289cb89c0c7c3 |
10-Apr-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to master
|
4293eba11973b69a5a7cacb1a5e58f3655482447 |
10-Apr-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to master
|
785a980f3dc660d82bfb2be81bbe70a42631f5dd |
10-Apr-2012 |
Chih-Chung Chang <chihchung@google.com> |
Merge "Add new filmstrip mode for PhotoView."
|
19baeb146fc2b589d5624d1a62b5b01d172c2ef3 |
10-Apr-2012 |
Chih-Chung Chang <chihchung@google.com> |
Merge "Add new filmstrip mode for PhotoView."
|
8bb545968ebb45b25c7ed88632a1f82f8295baae |
02-Apr-2012 |
Chih-Chung Chang <chihchung@google.com> |
Add new filmstrip mode for PhotoView. Change-Id: I9da9896303ced8d63a3557d5e6e9bc06fb366cf5
rc/com/android/gallery3d/app/PhotoDataAdapter.java
rc/com/android/gallery3d/app/SinglePhotoDataAdapter.java
rc/com/android/gallery3d/ui/AnimationTime.java
rc/com/android/gallery3d/ui/BitmapScreenNail.java
rc/com/android/gallery3d/ui/EdgeView.java
rc/com/android/gallery3d/ui/GLRootView.java
rc/com/android/gallery3d/ui/PhotoView.java
rc/com/android/gallery3d/ui/PositionController.java
rc/com/android/gallery3d/util/RangeArray.java
rc/com/android/gallery3d/util/RangeBoolArray.java
rc/com/android/gallery3d/util/RangeIntArray.java
|
b7ec5534c7b539be2397c27cfa5e8b992974c12d |
02-Apr-2012 |
Chih-Chung Chang <chihchung@google.com> |
Add new filmstrip mode for PhotoView. Change-Id: I9da9896303ced8d63a3557d5e6e9bc06fb366cf5
rc/com/android/gallery3d/app/PhotoDataAdapter.java
rc/com/android/gallery3d/app/SinglePhotoDataAdapter.java
rc/com/android/gallery3d/ui/AnimationTime.java
rc/com/android/gallery3d/ui/BitmapScreenNail.java
rc/com/android/gallery3d/ui/EdgeView.java
rc/com/android/gallery3d/ui/GLRootView.java
rc/com/android/gallery3d/ui/PhotoView.java
rc/com/android/gallery3d/ui/PositionController.java
rc/com/android/gallery3d/util/RangeArray.java
rc/com/android/gallery3d/util/RangeBoolArray.java
rc/com/android/gallery3d/util/RangeIntArray.java
|
68767b61aa7b0b2eebf673a05c9e7b7429eb5ee7 |
10-Apr-2012 |
Yuli Huang <yuli@google.com> |
Save edited photo in the source photo directory if applicable. bug:6168430 Change-Id: I97d8cf1d286bc4d5d7c38ba5118b9a952f17b252
rc/com/android/gallery3d/photoeditor/BitmapUtils.java
rc/com/android/gallery3d/photoeditor/SaveCopyTask.java
|
03669482a3b290e06282579c6d6b90ac014b0dce |
10-Apr-2012 |
Yuli Huang <yuli@google.com> |
Save edited photo in the source photo directory if applicable. bug:6168430 Change-Id: I97d8cf1d286bc4d5d7c38ba5118b9a952f17b252
rc/com/android/gallery3d/photoeditor/BitmapUtils.java
rc/com/android/gallery3d/photoeditor/SaveCopyTask.java
|
d8d1cfdb80a7bcc950e8deb957a6c55ec83a68b0 |
09-Apr-2012 |
Owen Lin <owenlin@google.com> |
Add BytesBufferPool to prevent GC. Change-Id: Ia8513ff380a60f102481cbf25650eca149b75064
rc/com/android/gallery3d/app/AbstractGalleryActivity.java
rc/com/android/gallery3d/data/BitmapPool.java
rc/com/android/gallery3d/data/BytesBufferPool.java
rc/com/android/gallery3d/data/ImageCacheRequest.java
rc/com/android/gallery3d/data/ImageCacheService.java
rc/com/android/gallery3d/data/MediaItem.java
rc/com/android/gallery3d/ui/AlbumLabelMaker.java
rc/com/android/gallery3d/ui/BitmapPool.java
rc/com/android/gallery3d/ui/TextureUploader.java
|
cafd30f96355ad446943d60cd2595d08423944e2 |
09-Apr-2012 |
Owen Lin <owenlin@google.com> |
Add BytesBufferPool to prevent GC. Change-Id: Ia8513ff380a60f102481cbf25650eca149b75064
rc/com/android/gallery3d/app/AbstractGalleryActivity.java
rc/com/android/gallery3d/data/BitmapPool.java
rc/com/android/gallery3d/data/BytesBufferPool.java
rc/com/android/gallery3d/data/ImageCacheRequest.java
rc/com/android/gallery3d/data/ImageCacheService.java
rc/com/android/gallery3d/data/MediaItem.java
rc/com/android/gallery3d/ui/AlbumLabelMaker.java
rc/com/android/gallery3d/ui/BitmapPool.java
rc/com/android/gallery3d/ui/TextureUploader.java
|
a66827d34d8c29a612787e3fa2557a53191494da |
09-Apr-2012 |
Owen Lin <owenlin@google.com> |
Prevent album's label get flashing when content changed. Change-Id: I1b00b308af740ccab143a073643729ca880770f4
rc/com/android/gallery3d/app/AlbumSetDataLoader.java
rc/com/android/gallery3d/ui/AlbumLabelMaker.java
rc/com/android/gallery3d/ui/AlbumSetSlidingWindow.java
|
8ef6c55bdad9a3e835ce56bdc98681434b4ac5b3 |
09-Apr-2012 |
Owen Lin <owenlin@google.com> |
Prevent album's label get flashing when content changed. Change-Id: I1b00b308af740ccab143a073643729ca880770f4
rc/com/android/gallery3d/app/AlbumSetDataLoader.java
rc/com/android/gallery3d/ui/AlbumLabelMaker.java
rc/com/android/gallery3d/ui/AlbumSetSlidingWindow.java
|
1a47f1172fe94f49646103cd7a19fb1f856451e2 |
09-Apr-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to master
|
dcc7c280e650c44344f6625d29d2c56eb9f7ce55 |
09-Apr-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to master
|
2d6bc8026f98dbe8afacb8eddbe7301a57b7d771 |
09-Apr-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to master
|
359dadda41154bd1836312a70280b42d86777be1 |
06-Apr-2012 |
Owen Lin <owenlin@google.com> |
Refactor. Rename AlbumView to AlbumSlotRenderer. Change-Id: I7d8d3586a910dac35975e4effa0d02528e2ccf98
rc/com/android/gallery3d/app/AlbumDataAdapter.java
rc/com/android/gallery3d/app/AlbumDataLoader.java
rc/com/android/gallery3d/app/AlbumPage.java
rc/com/android/gallery3d/app/AlbumSetDataAdapter.java
rc/com/android/gallery3d/app/AlbumSetDataLoader.java
rc/com/android/gallery3d/app/AlbumSetPage.java
rc/com/android/gallery3d/app/Config.java
rc/com/android/gallery3d/app/ManageCachePage.java
rc/com/android/gallery3d/ui/AlbumLabelMaker.java
rc/com/android/gallery3d/ui/AlbumSetSlidingWindow.java
rc/com/android/gallery3d/ui/AlbumSetSlotRenderer.java
rc/com/android/gallery3d/ui/AlbumSetView.java
rc/com/android/gallery3d/ui/AlbumSlidingWindow.java
rc/com/android/gallery3d/ui/AlbumSlotRenderer.java
rc/com/android/gallery3d/ui/AlbumView.java
rc/com/android/gallery3d/ui/ManageCacheDrawer.java
|
c3d8ac3b9504346dafc49e006b5f732dd1db21e8 |
06-Apr-2012 |
Owen Lin <owenlin@google.com> |
Refactor. Rename AlbumView to AlbumSlotRenderer. Change-Id: I7d8d3586a910dac35975e4effa0d02528e2ccf98
rc/com/android/gallery3d/app/AlbumDataAdapter.java
rc/com/android/gallery3d/app/AlbumDataLoader.java
rc/com/android/gallery3d/app/AlbumPage.java
rc/com/android/gallery3d/app/AlbumSetDataAdapter.java
rc/com/android/gallery3d/app/AlbumSetDataLoader.java
rc/com/android/gallery3d/app/AlbumSetPage.java
rc/com/android/gallery3d/app/Config.java
rc/com/android/gallery3d/app/ManageCachePage.java
rc/com/android/gallery3d/ui/AlbumLabelMaker.java
rc/com/android/gallery3d/ui/AlbumSetSlidingWindow.java
rc/com/android/gallery3d/ui/AlbumSetSlotRenderer.java
rc/com/android/gallery3d/ui/AlbumSetView.java
rc/com/android/gallery3d/ui/AlbumSlidingWindow.java
rc/com/android/gallery3d/ui/AlbumSlotRenderer.java
rc/com/android/gallery3d/ui/AlbumView.java
rc/com/android/gallery3d/ui/ManageCacheDrawer.java
|
c4643904af89c54a9cf54f1ff9df5dec7ae6b4a1 |
04-Apr-2012 |
Owen Lin <owenlin@google.com> |
Draw less to improve performance. Also adjust the upload order to upload nearby textures first. Change-Id: I2d6a8807a14b4602882dd2e5c03030c356f49e47
es/drawable/dark_strip.9.png
|
da6adcd0ff528338328021747ef9c4dfe5aa8742 |
04-Apr-2012 |
Owen Lin <owenlin@google.com> |
Draw less to improve performance. Also adjust the upload order to upload nearby textures first. Change-Id: I2d6a8807a14b4602882dd2e5c03030c356f49e47
rc/com/android/gallery3d/ui/AlbumLabelMaker.java
rc/com/android/gallery3d/ui/AlbumSetSlidingWindow.java
rc/com/android/gallery3d/ui/AlbumSetView.java
rc/com/android/gallery3d/ui/AlbumSlidingWindow.java
rc/com/android/gallery3d/ui/AlbumView.java
|
cd36bfc52cc4e7f4b667ba3c5e8eb950647ae9d1 |
04-Apr-2012 |
Owen Lin <owenlin@google.com> |
Draw less to improve performance. Also adjust the upload order to upload nearby textures first. Change-Id: I2d6a8807a14b4602882dd2e5c03030c356f49e47
es/drawable/dark_strip.9.png
rc/com/android/gallery3d/ui/AlbumLabelMaker.java
rc/com/android/gallery3d/ui/AlbumSetSlidingWindow.java
rc/com/android/gallery3d/ui/AlbumSetView.java
rc/com/android/gallery3d/ui/AlbumSlidingWindow.java
rc/com/android/gallery3d/ui/AlbumView.java
|
50f337a7a1af66a5c5db359d1d3dbb199f5d7edd |
06-Apr-2012 |
Owen Lin <owenlin@google.com> |
Merge "Fix flashing in "Make available offline"."
|
9d4fa5130c21d24ee323a9b7e40f1775f370f3a3 |
05-Apr-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: I25af65661cea80a20a4dc95da3acc2c8f528e0a1
es/values-in/strings.xml
|
d994e0193e556feb0b3430b62f14b0efda8c8058 |
05-Apr-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: I25af65661cea80a20a4dc95da3acc2c8f528e0a1
es/values-in/strings.xml
|
64ad5048d56d9e03b5f4563b54364c8efc656add |
05-Apr-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to master
|
5f030bf93c060aab816ac85e1c31fcf0d825160b |
05-Apr-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to master
|
ed79d50b3f703227dbe55e3272925c260e490831 |
03-Apr-2012 |
Owen Lin <owenlin@google.com> |
Fix flashing in "Make available offline". Change-Id: I84f0896c6038eb21d32e0d5fe0cafec5d339e6ec
rc/com/android/gallery3d/ui/FadeInTexture.java
rc/com/android/gallery3d/ui/GLCanvasImpl.java
|
fc7efade75629450c0c160329fb42b3dbd5361f4 |
03-Apr-2012 |
Owen Lin <owenlin@google.com> |
Fix flashing in "Make available offline". Change-Id: I84f0896c6038eb21d32e0d5fe0cafec5d339e6ec
rc/com/android/gallery3d/ui/FadeInTexture.java
rc/com/android/gallery3d/ui/GLCanvasImpl.java
|
31cac30e46a293f6d0901e22c6ab0d083cae7021 |
04-Apr-2012 |
Owen Lin <owenlin@google.com> |
Refactor. Merge SelectionDrawer with SlotRenderer. Change-Id: Iaa50b2a78beb95fc83208a5f74cf612650cd8643
rc/com/android/gallery3d/app/AlbumPage.java
rc/com/android/gallery3d/app/AlbumSetPage.java
rc/com/android/gallery3d/app/ManageCachePage.java
rc/com/android/gallery3d/data/DataSourceType.java
rc/com/android/gallery3d/data/Path.java
rc/com/android/gallery3d/ui/AbstractSlotRenderer.java
rc/com/android/gallery3d/ui/AlbumLabelMaker.java
rc/com/android/gallery3d/ui/AlbumSetSlidingWindow.java
rc/com/android/gallery3d/ui/AlbumSetView.java
rc/com/android/gallery3d/ui/AlbumView.java
rc/com/android/gallery3d/ui/GridDrawer.java
rc/com/android/gallery3d/ui/HighlightDrawer.java
rc/com/android/gallery3d/ui/IconDrawer.java
rc/com/android/gallery3d/ui/ManageCacheDrawer.java
rc/com/android/gallery3d/ui/SelectionDrawer.java
rc/com/android/gallery3d/ui/SelectionManager.java
|
48503a022b1e32e9a8a7597ff2c272eb7a6cab58 |
04-Apr-2012 |
Owen Lin <owenlin@google.com> |
Refactor. Merge SelectionDrawer with SlotRenderer. Change-Id: Iaa50b2a78beb95fc83208a5f74cf612650cd8643
rc/com/android/gallery3d/app/AlbumPage.java
rc/com/android/gallery3d/app/AlbumSetPage.java
rc/com/android/gallery3d/app/ManageCachePage.java
rc/com/android/gallery3d/data/DataSourceType.java
rc/com/android/gallery3d/data/Path.java
rc/com/android/gallery3d/ui/AbstractSlotRenderer.java
rc/com/android/gallery3d/ui/AlbumLabelMaker.java
rc/com/android/gallery3d/ui/AlbumSetSlidingWindow.java
rc/com/android/gallery3d/ui/AlbumSetView.java
rc/com/android/gallery3d/ui/AlbumView.java
rc/com/android/gallery3d/ui/GridDrawer.java
rc/com/android/gallery3d/ui/HighlightDrawer.java
rc/com/android/gallery3d/ui/IconDrawer.java
rc/com/android/gallery3d/ui/ManageCacheDrawer.java
rc/com/android/gallery3d/ui/SelectionDrawer.java
rc/com/android/gallery3d/ui/SelectionManager.java
|
d8fb81f601830385a2343d08ad5dd171e4c7bfe0 |
29-Mar-2012 |
Owen Lin <owenlin@google.com> |
Upload textures in background. Change-Id: I365f7be9aaab793366884249cbb10e8b6f0ab0e6
rc/com/android/gallery3d/app/AbstractGalleryActivity.java
rc/com/android/gallery3d/app/AlbumDataAdapter.java
rc/com/android/gallery3d/app/AlbumSetDataAdapter.java
rc/com/android/gallery3d/data/ImageCacheRequest.java
rc/com/android/gallery3d/data/MediaItem.java
rc/com/android/gallery3d/ui/AlbumLabelMaker.java
rc/com/android/gallery3d/ui/AlbumSetSlidingWindow.java
rc/com/android/gallery3d/ui/AlbumSetView.java
rc/com/android/gallery3d/ui/AlbumSlidingWindow.java
rc/com/android/gallery3d/ui/AlbumView.java
rc/com/android/gallery3d/ui/BitmapPool.java
rc/com/android/gallery3d/ui/GLRoot.java
rc/com/android/gallery3d/ui/GLRootView.java
rc/com/android/gallery3d/ui/SlotView.java
rc/com/android/gallery3d/ui/TextureUploader.java
rc/com/android/gallery3d/ui/TileImageView.java
|
d705545b21241e5f9d98ae732d1aee1856e58b76 |
29-Mar-2012 |
Owen Lin <owenlin@google.com> |
Upload textures in background. Change-Id: I365f7be9aaab793366884249cbb10e8b6f0ab0e6
rc/com/android/gallery3d/app/AbstractGalleryActivity.java
rc/com/android/gallery3d/app/AlbumDataAdapter.java
rc/com/android/gallery3d/app/AlbumSetDataAdapter.java
rc/com/android/gallery3d/data/ImageCacheRequest.java
rc/com/android/gallery3d/data/MediaItem.java
rc/com/android/gallery3d/ui/AlbumLabelMaker.java
rc/com/android/gallery3d/ui/AlbumSetSlidingWindow.java
rc/com/android/gallery3d/ui/AlbumSetView.java
rc/com/android/gallery3d/ui/AlbumSlidingWindow.java
rc/com/android/gallery3d/ui/AlbumView.java
rc/com/android/gallery3d/ui/BitmapPool.java
rc/com/android/gallery3d/ui/GLRoot.java
rc/com/android/gallery3d/ui/GLRootView.java
rc/com/android/gallery3d/ui/SlotView.java
rc/com/android/gallery3d/ui/TextureUploader.java
rc/com/android/gallery3d/ui/TileImageView.java
|
5e96a9f26b2a8745235a706df5352ae7fb872a93 |
05-Apr-2012 |
Owen Lin <owenlin@google.com> |
Merge "Make all drawing happens in background."
|
f4db9db978b68d9f1568a7606cf0b5ce055dfe2a |
05-Apr-2012 |
Owen Lin <owenlin@google.com> |
Merge "Make all drawing happens in background."
|
1a4bd273afe5dd11592f7625c2f19853b6f174e9 |
26-Mar-2012 |
Owen Lin <owenlin@google.com> |
Make all drawing happens in background. Also move more rendering code to SlotRenderers (AlbumSetView and AlbumView). Change-Id: I1d678711bfd3655a48bb4b99d8ca175e088bdffb
rc/com/android/gallery3d/app/AlbumSetDataAdapter.java
rc/com/android/gallery3d/ui/AbstractDisplayItem.java
rc/com/android/gallery3d/ui/AlbumLabelMaker.java
rc/com/android/gallery3d/ui/AlbumSetSlidingWindow.java
rc/com/android/gallery3d/ui/AlbumSetView.java
rc/com/android/gallery3d/ui/AlbumSlidingWindow.java
rc/com/android/gallery3d/ui/AlbumView.java
rc/com/android/gallery3d/ui/BitmapLoader.java
rc/com/android/gallery3d/ui/DisplayItem.java
rc/com/android/gallery3d/ui/GridDrawer.java
rc/com/android/gallery3d/ui/HighlightDrawer.java
rc/com/android/gallery3d/ui/IconDrawer.java
rc/com/android/gallery3d/ui/ManageCacheDrawer.java
rc/com/android/gallery3d/ui/SlotView.java
|
8123444bb1cff7a6d1874bbcd100337f30ef8006 |
26-Mar-2012 |
Owen Lin <owenlin@google.com> |
Make all drawing happens in background. Also move more rendering code to SlotRenderers (AlbumSetView and AlbumView). Change-Id: I1d678711bfd3655a48bb4b99d8ca175e088bdffb
rc/com/android/gallery3d/app/AlbumSetDataAdapter.java
rc/com/android/gallery3d/ui/AbstractDisplayItem.java
rc/com/android/gallery3d/ui/AlbumLabelMaker.java
rc/com/android/gallery3d/ui/AlbumSetSlidingWindow.java
rc/com/android/gallery3d/ui/AlbumSetView.java
rc/com/android/gallery3d/ui/AlbumSlidingWindow.java
rc/com/android/gallery3d/ui/AlbumView.java
rc/com/android/gallery3d/ui/BitmapLoader.java
rc/com/android/gallery3d/ui/DisplayItem.java
rc/com/android/gallery3d/ui/GridDrawer.java
rc/com/android/gallery3d/ui/HighlightDrawer.java
rc/com/android/gallery3d/ui/IconDrawer.java
rc/com/android/gallery3d/ui/ManageCacheDrawer.java
rc/com/android/gallery3d/ui/SlotView.java
|
71632ac6c1596dd1fd477f95e268f96ad72ea572 |
04-Apr-2012 |
Owen Lin <owenlin@google.com> |
Fix NPE in Gallery. bug: 6249248 Change-Id: I41851c6524163195f6296a15893d962e706b3449
rc/com/android/gallery3d/app/AlbumPage.java
rc/com/android/gallery3d/app/AlbumSetPage.java
|
13e61e48a4eb7e09bdcb84fac0b15c33b5970599 |
04-Apr-2012 |
Owen Lin <owenlin@google.com> |
Fix NPE in Gallery. bug: 6249248 Change-Id: I41851c6524163195f6296a15893d962e706b3449
rc/com/android/gallery3d/app/AlbumPage.java
rc/com/android/gallery3d/app/AlbumSetPage.java
|
a453f33acb2e0d2d3bdf1d46121bab4fdad02900 |
27-Mar-2012 |
Martijn Coenen <maco@google.com> |
Support for beaming a picture. Change-Id: I73d69f164b455ffa90a495001190937025a56dc5
ndroidManifest.xml
|
33ef03776b7734717b16f6fc861b831fb1b1dfac |
27-Mar-2012 |
Martijn Coenen <maco@google.com> |
Support for beaming a picture. Change-Id: I73d69f164b455ffa90a495001190937025a56dc5
ndroidManifest.xml
rc/com/android/gallery3d/app/PhotoPage.java
|
f9a737de45b0d9ef5bb3355bb2e79dd1d0402d5c |
27-Mar-2012 |
Martijn Coenen <maco@google.com> |
Support for beaming a picture. Change-Id: I73d69f164b455ffa90a495001190937025a56dc5
rc/com/android/gallery3d/app/PhotoPage.java
|
aa83905a60186d53ce5bda85085b1d86aaa7733b |
04-Apr-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to master
|
b3623c1b197a99c0b71c566ae148cee54747fac1 |
04-Apr-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to master
|
5188c1a82e070357d6c410802add9996f1113471 |
04-Apr-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to master
|
23d27a71741e40525cd2c3a80d2715e10ac22a6b |
03-Apr-2012 |
Mike Lockwood <lockwood@google.com> |
Merge remote-tracking branch 'goog/ics-aah'
|
7794a9e2f8c8ecff4fc93526f0f5e76bb93fa2a6 |
03-Apr-2012 |
Mike Lockwood <lockwood@google.com> |
Merge remote-tracking branch 'goog/ics-aah'
|
d9e425f8c36d347d5e469997c633dcb7bf0544b6 |
03-Apr-2012 |
Mike Lockwood <lockwood@google.com> |
Merge remote-tracking branch 'goog/ics-aah'
|
faffb8e160051177131b37041ef8481caa1bf356 |
03-Apr-2012 |
Mike Lockwood <lockwood@google.com> |
Merge remote-tracking branch 'goog/ics-aah'
|
3957efd020f2e80d79cd3fed019f2883668a1c9e |
03-Apr-2012 |
Wu-cheng Li <wuchengli@google.com> |
Fix OOM when switching between camera and camcorder. - Camera activities extend AbstractGalleryActivity. So onDestroy is moved from Gallery to AbstractGalleryActivity. - Use WeakReference for values in the WeakHashMap of SpinnerVisibilitySetter. bug:5954389 Change-Id: Ib15f269bd4c54a4621bdff58e7ea16b44f8fb3e3
rc/com/android/gallery3d/app/AbstractGalleryActivity.java
rc/com/android/gallery3d/app/Gallery.java
rc/com/android/gallery3d/util/SpinnerVisibilitySetter.java
|
dbb1d3ffd511e1fa34f8ddc59bbd8f89c3789f9d |
03-Apr-2012 |
Wu-cheng Li <wuchengli@google.com> |
Fix OOM when switching between camera and camcorder. - Camera activities extend AbstractGalleryActivity. So onDestroy is moved from Gallery to AbstractGalleryActivity. - Use WeakReference for values in the WeakHashMap of SpinnerVisibilitySetter. bug:5954389 Change-Id: Ib15f269bd4c54a4621bdff58e7ea16b44f8fb3e3
rc/com/android/gallery3d/app/AbstractGalleryActivity.java
rc/com/android/gallery3d/app/Gallery.java
rc/com/android/gallery3d/util/SpinnerVisibilitySetter.java
|
95a2b19183930da2e1b272501a9bd7435a1da61f |
03-Apr-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to master
|
79867b6d36b16c06af5b3a4845f964c404af853f |
03-Apr-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to master
|
4098fec781d8617d63ee6d33a4766bf7043cc98d |
03-Apr-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to master
|
98c2490a424da79beefbdd8a29fb90ab006c77b0 |
03-Apr-2012 |
Ray Chen <raychen@google.com> |
Fix b/3462852 [UI] When linking from Camera preview - App icon with 'Up' arrow should go to next level up Change startActivity to switchState because not every MediaObject implements "getContentUri" which may cause runtime exception. Change-Id: I88be6e9e8f15ad17f4c7347b6dfc200c7682ce01
rc/com/android/gallery3d/app/AlbumPage.java
rc/com/android/gallery3d/app/PhotoPage.java
|
4d10b422e7a74a4e5788c45612cea9dee8681ed1 |
03-Apr-2012 |
Ray Chen <raychen@google.com> |
Fix b/3462852 [UI] When linking from Camera preview - App icon with 'Up' arrow should go to next level up Change startActivity to switchState because not every MediaObject implements "getContentUri" which may cause runtime exception. Change-Id: I88be6e9e8f15ad17f4c7347b6dfc200c7682ce01
rc/com/android/gallery3d/app/AlbumPage.java
rc/com/android/gallery3d/app/PhotoPage.java
|
1f9901cd00acbdaf0725edda2ea8854601a242aa |
03-Apr-2012 |
Ray Chen <raychen@google.com> |
Merge "Fix b/6046544 Deleting a photo takes multiple steps and the flow is inconsistent with other deleting flows on other core apps"
|
602295200f93a54d891d25db14b524beb5ca4d01 |
03-Apr-2012 |
Ray Chen <raychen@google.com> |
Merge "Fix b/6046544 Deleting a photo takes multiple steps and the flow is inconsistent with other deleting flows on other core apps"
|
37c1fd0b77fb5c0e0aeef9b7f65cd47c446b1664 |
03-Apr-2012 |
Yuli Huang <yuli@google.com> |
Merge "Fix b/5974240: Sliders may not be responsive to touches."
|
b2686582020e7a99a02420b9146fe9999e508af4 |
03-Apr-2012 |
Yuli Huang <yuli@google.com> |
Merge "Fix b/5974240: Sliders may not be responsive to touches."
|
155389f89ec75d2d7d0b7ce1155028bfccdae177 |
03-Apr-2012 |
Yuli Huang <yuli@google.com> |
Merge "Fix b/5974240: Sliders may not be responsive to touches."
|
fc28f4b3866dd7f5ae841174fd3c28be3a2e672f |
02-Apr-2012 |
Yuli Huang <yuli@google.com> |
Fix b/5974240: Sliders may not be responsive to touches. Add padding around sliders to increase its touchable areas. Change-Id: I034e25804811b14ce6137c72472191dabd7bdef8
rc/com/android/gallery3d/photoeditor/actions/AbstractSeekBar.java
rc/com/android/gallery3d/photoeditor/actions/ColorSeekBar.java
rc/com/android/gallery3d/photoeditor/actions/EffectToolKit.java
|
2829298b8f82c02ede53ab116ddb2d964aef4d24 |
02-Apr-2012 |
Yuli Huang <yuli@google.com> |
Fix b/5974240: Sliders may not be responsive to touches. Add padding around sliders to increase its touchable areas. Change-Id: I034e25804811b14ce6137c72472191dabd7bdef8
es/layout/photoeditor_color_seekbar.xml
es/layout/photoeditor_effect_tool_panel.xml
es/layout/photoeditor_scale_seekbar.xml
es/values-sw320dp/photoeditor_dimens.xml
es/values-sw600dp/photoeditor_dimens.xml
es/values-sw800dp/photoeditor_dimens.xml
es/values/photoeditor_styles.xml
|
ed56097798bd587243962af29986a314174b60ac |
02-Apr-2012 |
Yuli Huang <yuli@google.com> |
Fix b/5974240: Sliders may not be responsive to touches. Add padding around sliders to increase its touchable areas. Change-Id: I034e25804811b14ce6137c72472191dabd7bdef8
es/layout/photoeditor_color_seekbar.xml
es/layout/photoeditor_effect_tool_panel.xml
es/layout/photoeditor_scale_seekbar.xml
es/values-sw320dp/photoeditor_dimens.xml
es/values-sw600dp/photoeditor_dimens.xml
es/values-sw800dp/photoeditor_dimens.xml
es/values/photoeditor_styles.xml
rc/com/android/gallery3d/photoeditor/actions/AbstractSeekBar.java
rc/com/android/gallery3d/photoeditor/actions/ColorSeekBar.java
rc/com/android/gallery3d/photoeditor/actions/EffectToolKit.java
|
a191cc8a944ee3d8e23e538a7a0c96b7a0789284 |
02-Apr-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to master
|
f8c6a3b2fa0e87ee471b9fb041b36429f162bfe7 |
02-Apr-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to master
|
2415a060b1cf69f5820e8d4d5c9954271cad2cd6 |
02-Apr-2012 |
Chih-Chung Chang <chihchung@google.com> |
Remove FilmStripView. Change-Id: I45cee8c32863cc65eba4c5e83e667e104cf24e42
rc/com/android/gallery3d/app/AlbumPage.java
rc/com/android/gallery3d/app/Config.java
rc/com/android/gallery3d/app/PhotoDataAdapter.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/app/SinglePhotoDataAdapter.java
rc/com/android/gallery3d/ui/AlbumSlidingWindow.java
rc/com/android/gallery3d/ui/AlbumView.java
rc/com/android/gallery3d/ui/FilmStripView.java
rc/com/android/gallery3d/ui/PhotoView.java
rc/com/android/gallery3d/ui/StripDrawer.java
|
6fd7be888ad60728ad5486540b7af527afbe65d2 |
02-Apr-2012 |
Chih-Chung Chang <chihchung@google.com> |
Remove FilmStripView. Change-Id: I45cee8c32863cc65eba4c5e83e667e104cf24e42
es/drawable-hdpi/navstrip_translucent.9.png
es/drawable-hdpi/thumb_selected.9.png
es/drawable-mdpi/navstrip_translucent.9.png
es/drawable-mdpi/thumb_selected.9.png
es/drawable-xhdpi/thumb_selected.9.png
es/values/dimensions.xml
|
921895ba0b3511aeba053bdc0c965f9d3f62eb51 |
02-Apr-2012 |
Chih-Chung Chang <chihchung@google.com> |
Remove FilmStripView. Change-Id: I45cee8c32863cc65eba4c5e83e667e104cf24e42
es/drawable-hdpi/navstrip_translucent.9.png
es/drawable-hdpi/thumb_selected.9.png
es/drawable-mdpi/navstrip_translucent.9.png
es/drawable-mdpi/thumb_selected.9.png
es/drawable-xhdpi/thumb_selected.9.png
es/values/dimensions.xml
rc/com/android/gallery3d/app/AlbumPage.java
rc/com/android/gallery3d/app/Config.java
rc/com/android/gallery3d/app/PhotoDataAdapter.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/app/SinglePhotoDataAdapter.java
rc/com/android/gallery3d/ui/AlbumSlidingWindow.java
rc/com/android/gallery3d/ui/AlbumView.java
rc/com/android/gallery3d/ui/FilmStripView.java
rc/com/android/gallery3d/ui/PhotoView.java
rc/com/android/gallery3d/ui/StripDrawer.java
|
948b5ffc4c004b6e4daf18f64165fb555bc4d6b2 |
02-Apr-2012 |
Owen Lin <owenlin@google.com> |
Merge "Delete buffers and textures in GL."
|
49b137806386ff0c8cf5caba4bf7e0a9aab4b7b9 |
02-Apr-2012 |
Owen Lin <owenlin@google.com> |
Merge "Delete buffers and textures in GL."
|
0ce2e732acac42c875e04943a593b147d9e97d02 |
02-Apr-2012 |
Owen Lin <owenlin@google.com> |
Delete buffers and textures in GL. Change-Id: I7cd6647c7da56040c040f43859ce8e440db7b498
rc/com/android/gallery3d/ui/GLCanvasImpl.java
rc/com/android/gallery3d/ui/GLId.java
|
ba7d106f7e4fcb0036e694449e6fc5b002526309 |
02-Apr-2012 |
Owen Lin <owenlin@google.com> |
Delete buffers and textures in GL. Change-Id: I7cd6647c7da56040c040f43859ce8e440db7b498
rc/com/android/gallery3d/ui/GLCanvasImpl.java
rc/com/android/gallery3d/ui/GLId.java
|
f52afa956baba2c616c70466080e8252224cf5de |
23-Mar-2012 |
Owen Lin <owenlin@google.com> |
Remove Position and PositionRepository. Also fix a regression introduced in previous change. Change-Id: I534c8ca7838f3518856cf48878dd49beeb331562
rc/com/android/gallery3d/app/AlbumPage.java
rc/com/android/gallery3d/app/AlbumSetPage.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/ui/PositionProvider.java
rc/com/android/gallery3d/ui/PositionRepository.java
rc/com/android/gallery3d/ui/RelativePosition.java
rc/com/android/gallery3d/ui/SlotView.java
ests/src/com/android/gallery3d/data/GalleryAppStub.java
|
2341c197b0becf99422e8ad305def77df6161714 |
23-Mar-2012 |
Owen Lin <owenlin@google.com> |
Remove Position and PositionRepository. Also fix a regression introduced in previous change. Change-Id: I534c8ca7838f3518856cf48878dd49beeb331562
rc/com/android/gallery3d/app/AlbumPage.java
rc/com/android/gallery3d/app/AlbumSetPage.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/ui/PositionProvider.java
rc/com/android/gallery3d/ui/PositionRepository.java
rc/com/android/gallery3d/ui/RelativePosition.java
rc/com/android/gallery3d/ui/SlotView.java
ests/src/com/android/gallery3d/data/GalleryAppStub.java
|
94223cd77c93806751ce5f1986bb9aa8e599fd50 |
01-Apr-2012 |
Ray Chen <raychen@google.com> |
Fix b/6046544 Deleting a photo takes multiple steps and the flow is inconsistent with other deleting flows on other core apps This CL removes the cancel options, the next one will address the undo feature. Change-Id: I99bb24fee0add0ffe6b4fcc9d32528abdd0ed418
es/menu/operation.xml
es/menu/photo.xml
|
30df081c46b6e1d3db3f1ed6bd06072413b5d023 |
01-Apr-2012 |
Ray Chen <raychen@google.com> |
Fix b/6046544 Deleting a photo takes multiple steps and the flow is inconsistent with other deleting flows on other core apps This CL removes the cancel options, the next one will address the undo feature. Change-Id: I99bb24fee0add0ffe6b4fcc9d32528abdd0ed418
es/menu/operation.xml
es/menu/photo.xml
|
037e06c5e11ca4a4e40b0741f2d6604b2fd9337a |
22-Mar-2012 |
Chih-Chung Chang <chihchung@google.com> |
Use SurfaceTexture to show Camera preview. Change-Id: I8bf63dfc5b969ecce51841378b093a650b6f91d8
rc/com/android/gallery3d/app/AlbumPage.java
rc/com/android/gallery3d/app/CameraScreenNail.java
rc/com/android/gallery3d/app/CameraView.java
rc/com/android/gallery3d/app/PhotoDataAdapter.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/app/ScreenNailBridge.java
rc/com/android/gallery3d/data/SnailSource.java
rc/com/android/gallery3d/ui/BasicTexture.java
rc/com/android/gallery3d/ui/BitmapScreenNail.java
rc/com/android/gallery3d/ui/BitmapTileProvider.java
rc/com/android/gallery3d/ui/ExtTexture.java
rc/com/android/gallery3d/ui/GLCanvas.java
rc/com/android/gallery3d/ui/GLCanvasImpl.java
rc/com/android/gallery3d/ui/GLId.java
rc/com/android/gallery3d/ui/NinePatchTexture.java
rc/com/android/gallery3d/ui/PhotoView.java
rc/com/android/gallery3d/ui/ScreenNail.java
rc/com/android/gallery3d/ui/ScreenNailHolder.java
rc/com/android/gallery3d/ui/SurfaceTextureScreenNail.java
rc/com/android/gallery3d/ui/TileImageView.java
rc/com/android/gallery3d/ui/UploadedTexture.java
ests/src/com/android/gallery3d/ui/GLCanvasStub.java
ests/src/com/android/gallery3d/ui/TextureTest.java
|
b29a27f475a2c449abdda8d4e03d30914feed8c6 |
22-Mar-2012 |
Chih-Chung Chang <chihchung@google.com> |
Use SurfaceTexture to show Camera preview. Change-Id: I8bf63dfc5b969ecce51841378b093a650b6f91d8
rc/com/android/gallery3d/app/AlbumPage.java
rc/com/android/gallery3d/app/CameraScreenNail.java
rc/com/android/gallery3d/app/CameraView.java
rc/com/android/gallery3d/app/PhotoDataAdapter.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/app/ScreenNailBridge.java
rc/com/android/gallery3d/data/SnailSource.java
rc/com/android/gallery3d/ui/BasicTexture.java
rc/com/android/gallery3d/ui/BitmapScreenNail.java
rc/com/android/gallery3d/ui/BitmapTileProvider.java
rc/com/android/gallery3d/ui/ExtTexture.java
rc/com/android/gallery3d/ui/GLCanvas.java
rc/com/android/gallery3d/ui/GLCanvasImpl.java
rc/com/android/gallery3d/ui/GLId.java
rc/com/android/gallery3d/ui/NinePatchTexture.java
rc/com/android/gallery3d/ui/PhotoView.java
rc/com/android/gallery3d/ui/ScreenNail.java
rc/com/android/gallery3d/ui/ScreenNailHolder.java
rc/com/android/gallery3d/ui/SurfaceTextureScreenNail.java
rc/com/android/gallery3d/ui/TileImageView.java
rc/com/android/gallery3d/ui/UploadedTexture.java
ests/src/com/android/gallery3d/ui/GLCanvasStub.java
ests/src/com/android/gallery3d/ui/TextureTest.java
|
e2f692defbf6ec4aae6e1d05fbf0f75a55e32e49 |
29-Mar-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to master
|
4b551c661dd3a0488678dcbeb95843749650b14b |
29-Mar-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to master
|
79a981552fc364fae8bf62c8811cba05600f6bf5 |
29-Mar-2012 |
Ray Chen <raychen@google.com> |
Merge "Move getTypeString from PicasaAlbumSet to MediaObject."
|
b10f96d2141fae10073ec48f25d7b824647f8f31 |
29-Mar-2012 |
Ray Chen <raychen@google.com> |
Merge "Move getTypeString from PicasaAlbumSet to MediaObject."
|
d134e18e3c2d9614099d3b74e1a6a12159a1e81a |
23-Mar-2012 |
Ray Chen <raychen@google.com> |
Move getTypeString from PicasaAlbumSet to MediaObject. b/5344124 Change-Id: I28a43615ebec0aa84c3b16ac006def26f7b56162
rc/com/android/gallery3d/data/LocalAlbumSet.java
rc/com/android/gallery3d/data/MediaObject.java
|
578f58212f6a29ba15c2e5795fbdd04fddb80019 |
23-Mar-2012 |
Ray Chen <raychen@google.com> |
Move getTypeString from PicasaAlbumSet to MediaObject. b/5344124 Change-Id: I28a43615ebec0aa84c3b16ac006def26f7b56162
rc/com/android/gallery3d/data/LocalAlbumSet.java
rc/com/android/gallery3d/data/MediaObject.java
|
14ecb55d726509cfc2cadcbfa786f508e979c0cb |
29-Mar-2012 |
Chih-Chung Chang <chihchung@google.com> |
Merge "Patch 2 for master."
|
cac5a12dfae2df6ea61c73e961b3222ac3e9c2af |
29-Mar-2012 |
Chih-Chung Chang <chihchung@google.com> |
Merge "Patch 2 for master."
|
56259dfb34a2ffef9e874172309494300b87a21a |
28-Mar-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to master
|
6423755b2fb42bb8750f82bb21b4a0570b2341b2 |
28-Mar-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to master
|
0c194f77419636a3086c1d8217f50a08bbfe91f5 |
28-Mar-2012 |
Owen Lin <owenlin@google.com> |
Merge "Refactor. Make the code simpler."
|
68299015ac722e050794c5b3d8a3991871cac9f5 |
28-Mar-2012 |
Owen Lin <owenlin@google.com> |
Merge "Refactor. Make the code simpler."
|
6ee4fd7eae8aeeec9f6f6a87ce206da2a33a87e5 |
27-Mar-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to master
|
c2fa44f5d5ba9e435ec95340d9eb29bb943596cb |
27-Mar-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to master
|
ed46d77c16cd80357f4a0feada2435dfba8104a6 |
26-Mar-2012 |
Yuli Huang <yuli@google.com> |
Fix b/6212093: Title wasn't updated for orientation changes. Change-Id: I407cfb8f2bde5bab302045188f4f511bdcd2347a b:6212093
rc/com/android/gallery3d/app/PhotoPage.java
|
4062ad476a6fdf65a29a3d2716d7ac3179a02055 |
26-Mar-2012 |
Yuli Huang <yuli@google.com> |
Fix b/6212093: Title wasn't updated for orientation changes. Change-Id: I407cfb8f2bde5bab302045188f4f511bdcd2347a b:6212093
rc/com/android/gallery3d/app/PhotoPage.java
|
8d38e0f5118fe655ffd4d2c6fa264b66cc34af1d |
26-Mar-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to master
|
eaf6fbd52abc9f702ba24b766bf25a54731ad365 |
26-Mar-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to master
|
154e8390badccfca815943741afc25a7ab1721f4 |
26-Mar-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to master
|
534b12fd804610dd67b8109bc08ba76f31afb33e |
21-Mar-2012 |
Chih-Chung Chang <chihchung@google.com> |
Patch 2 for master. Change-Id: I8b7c9fd326c4f247a1f2129b1d64388a223d79e0
rc/com/android/gallery3d/ui/GestureRecognizer.java
rc/com/android/gallery3d/ui/PhotoView.java
rc/com/android/gallery3d/ui/PositionController.java
|
95860d26aef15e6a87cbbc81b15bd92eff309475 |
21-Mar-2012 |
Chih-Chung Chang <chihchung@google.com> |
Patch 2 for master. Change-Id: I8b7c9fd326c4f247a1f2129b1d64388a223d79e0
rc/com/android/gallery3d/ui/GestureRecognizer.java
rc/com/android/gallery3d/ui/PhotoView.java
rc/com/android/gallery3d/ui/PositionController.java
|
7260f6f74d465520e4497b23fe56f98abb0c15a2 |
22-Mar-2012 |
Owen Lin <owenlin@google.com> |
Refactor. Make the code simpler. Change-Id: I2d3b7a1cfed17afcf6b7ee3e7bf1ca13ada8d9c3
rc/com/android/gallery3d/app/AlbumPage.java
rc/com/android/gallery3d/app/AlbumSetPage.java
rc/com/android/gallery3d/app/ManageCachePage.java
rc/com/android/gallery3d/ui/AlbumSetSlidingWindow.java
rc/com/android/gallery3d/ui/AlbumSetView.java
rc/com/android/gallery3d/ui/AlbumSlidingWindow.java
rc/com/android/gallery3d/ui/AlbumView.java
rc/com/android/gallery3d/ui/DisplayItem.java
rc/com/android/gallery3d/ui/FilmStripView.java
rc/com/android/gallery3d/ui/Paper.java
rc/com/android/gallery3d/ui/RelativePosition.java
rc/com/android/gallery3d/ui/SlotView.java
|
83a036c52d6c157ca52bee67b9c6ec3018b4a47d |
22-Mar-2012 |
Owen Lin <owenlin@google.com> |
Refactor. Make the code simpler. Change-Id: I2d3b7a1cfed17afcf6b7ee3e7bf1ca13ada8d9c3
rc/com/android/gallery3d/app/AlbumPage.java
rc/com/android/gallery3d/app/AlbumSetPage.java
rc/com/android/gallery3d/app/ManageCachePage.java
rc/com/android/gallery3d/ui/AlbumSetSlidingWindow.java
rc/com/android/gallery3d/ui/AlbumSetView.java
rc/com/android/gallery3d/ui/AlbumSlidingWindow.java
rc/com/android/gallery3d/ui/AlbumView.java
rc/com/android/gallery3d/ui/DisplayItem.java
rc/com/android/gallery3d/ui/FilmStripView.java
rc/com/android/gallery3d/ui/Paper.java
rc/com/android/gallery3d/ui/RelativePosition.java
rc/com/android/gallery3d/ui/SlotView.java
|
93466b34a570e12fbb0194b9e7a1b62470498ad9 |
23-Mar-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: Ie08a098ada3db0dd6b6791a117997c6c5cb043e9
es/values-zh-rCN/strings.xml
|
bf71930c60d207fa92790e0f2f57b99c78d6b9a2 |
23-Mar-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: Ie08a098ada3db0dd6b6791a117997c6c5cb043e9
es/values-zh-rCN/strings.xml
|
0499bbe3ba2110ff964018042307a0a7441e3f19 |
22-Mar-2012 |
Chih-Chung Chang <chihchung@google.com> |
Merge "New effect in photo browsing."
|
7e3d6ee9f4a7e764cb66439f226c7fb66d4f2021 |
22-Mar-2012 |
Chih-Chung Chang <chihchung@google.com> |
Merge "New effect in photo browsing."
|
2b35f06004869b859a33630bbc28238ebc0e6873 |
21-Mar-2012 |
Chih-Chung Chang <chihchung@google.com> |
Patch 2 for MR1. Change-Id: I39cc780e0ef49c4e0863a1a83e585e16f0a32425
rc/com/android/gallery3d/ui/PhotoView.java
rc/com/android/gallery3d/ui/PositionController.java
|
42c1892ab508a02ea957fe8796086362e163c123 |
21-Mar-2012 |
Chih-Chung Chang <chihchung@google.com> |
Patch 2 for MR1. Change-Id: I39cc780e0ef49c4e0863a1a83e585e16f0a32425
rc/com/android/gallery3d/ui/PhotoView.java
rc/com/android/gallery3d/ui/PositionController.java
|
dc02dbc8aaca26ff4d39ce141d9fdaa0b79e3ffb |
22-Mar-2012 |
Hung-ying Tyan <tyanh@google.com> |
Merge "Make PackagesMonitor go async"
|
2100cf3b392556e0f084c59a31275e3ee8d5edcc |
22-Mar-2012 |
Hung-ying Tyan <tyanh@google.com> |
Merge "Make PackagesMonitor go async"
|
b644675e504488653067204242a82f0a160125be |
21-Mar-2012 |
Hung-ying Tyan <tyanh@google.com> |
Make PackagesMonitor go async to offload package event processing from main thread. Bug: 6109890 Change-Id: I77e1fad9a4ac24020eed68d53ca7e1d253248890
rc/com/android/gallery3d/app/PackagesMonitor.java
|
bb0be068e9182278d30efd42cad5cf369ff93db4 |
21-Mar-2012 |
Hung-ying Tyan <tyanh@google.com> |
Make PackagesMonitor go async to offload package event processing from main thread. Bug: 6109890 Change-Id: I77e1fad9a4ac24020eed68d53ca7e1d253248890
rc/com/android/gallery3d/app/PackagesMonitor.java
|
4a01c6ee151797d8a2c04b28ba089c81dbb4362f |
21-Mar-2012 |
Chih-Chung Chang <chihchung@google.com> |
New effect in photo browsing. Change-Id: I12ca70f56f5c874292a7a6f38f0518bbc855ed70
rc/com/android/gallery3d/app/PhotoDataAdapter.java
rc/com/android/gallery3d/ui/BitmapTileProvider.java
rc/com/android/gallery3d/ui/PhotoView.java
rc/com/android/gallery3d/ui/TileImageView.java
rc/com/android/gallery3d/ui/TileImageViewAdapter.java
rc/com/android/gallery3d/ui/UploadedTexture.java
|
cb4fb7c19f20405fb5e08513e6297dffce824118 |
21-Mar-2012 |
Chih-Chung Chang <chihchung@google.com> |
New effect in photo browsing. Change-Id: I12ca70f56f5c874292a7a6f38f0518bbc855ed70
rc/com/android/gallery3d/app/PhotoDataAdapter.java
rc/com/android/gallery3d/ui/BitmapTileProvider.java
rc/com/android/gallery3d/ui/PhotoView.java
rc/com/android/gallery3d/ui/TileImageView.java
rc/com/android/gallery3d/ui/TileImageViewAdapter.java
rc/com/android/gallery3d/ui/UploadedTexture.java
|
3910e0e70817283863268a059d581caf70309120 |
22-Mar-2012 |
Wu-cheng Li <wuchengli@google.com> |
Merge "Remove singleTask mode of panorama."
|
fd7b017df6323aa9ac81ec297652dfb934986856 |
22-Mar-2012 |
Owen Lin <owenlin@google.com> |
Merge changes I1acef9fc,I53ddb3cd * changes: Make top level albums can be loaded concurrently. Add log to debug loading time.
|
1955a95dabfab2a8320a99984ab482ef48c10783 |
22-Mar-2012 |
Owen Lin <owenlin@google.com> |
Merge changes I1acef9fc,I53ddb3cd * changes: Make top level albums can be loaded concurrently. Add log to debug loading time.
|
8a9b7b57a49906cd39d875a14294e5b343c4526b |
21-Mar-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to master
|
ac3f38a0694589ebfb4c4f1d04c9242c8907eb19 |
21-Mar-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to master
|
2be1eecb0e8f6aa441ee484551195db8d1a19f74 |
21-Mar-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to master
|
54fe02fa80770e26d35c0e132ca23b81c99de945 |
20-Mar-2012 |
Yuli Huang <yuli@google.com> |
Fix incorrect initial position/scale of opening animations. 1. Initial position of opening animation isn't correctly offset if the position repository isn't properly offset by the action bar height. 2. Initial scale of opening animation should match the thumbnail instead of using a fixed value 240. This CL is part of efforts to fix b:6016973. Change-Id: I620705357ba7594d43685e47488928f9fc93d9f6
rc/com/android/gallery3d/app/AlbumPage.java
rc/com/android/gallery3d/app/AlbumSetPage.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/ui/PhotoView.java
rc/com/android/gallery3d/ui/PositionController.java
|
04ac045bf8da5082bbb0bdc9ea5f9c9b5b796ad0 |
20-Mar-2012 |
Yuli Huang <yuli@google.com> |
Fix incorrect initial position/scale of opening animations. 1. Initial position of opening animation isn't correctly offset if the position repository isn't properly offset by the action bar height. 2. Initial scale of opening animation should match the thumbnail instead of using a fixed value 240. This CL is part of efforts to fix b:6016973. Change-Id: I620705357ba7594d43685e47488928f9fc93d9f6
rc/com/android/gallery3d/app/AlbumPage.java
rc/com/android/gallery3d/app/AlbumSetPage.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/ui/PhotoView.java
rc/com/android/gallery3d/ui/PositionController.java
|
61ca4fb388bccac0c741261dc90c67dacd83c99f |
15-Mar-2012 |
Chih-Chung Chang <chihchung@google.com> |
Create a ScreenNail interface so we can add other types of screenails. Add a new MediaItem type to contain a ScreenNail. Change-Id: Ia303949f3013dd48ded204eaf9ec69a102b8503e
es/layout/main.xml
|
706a7cf399bc0297a80802a311e843e517d32241 |
15-Mar-2012 |
Chih-Chung Chang <chihchung@google.com> |
Create a ScreenNail interface so we can add other types of screenails. Add a new MediaItem type to contain a ScreenNail. Change-Id: Ia303949f3013dd48ded204eaf9ec69a102b8503e
rc/com/android/gallery3d/app/CameraView.java
rc/com/android/gallery3d/app/PhotoDataAdapter.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/app/ScreenNailBridge.java
rc/com/android/gallery3d/app/SinglePhotoDataAdapter.java
rc/com/android/gallery3d/data/DataManager.java
rc/com/android/gallery3d/data/MediaItem.java
rc/com/android/gallery3d/data/SnailAlbum.java
rc/com/android/gallery3d/data/SnailItem.java
rc/com/android/gallery3d/data/SnailSource.java
rc/com/android/gallery3d/ui/BitmapScreenNail.java
rc/com/android/gallery3d/ui/BitmapTileProvider.java
rc/com/android/gallery3d/ui/PhotoView.java
rc/com/android/gallery3d/ui/ScreenNail.java
rc/com/android/gallery3d/ui/TileImageView.java
rc/com/android/gallery3d/ui/TileImageViewAdapter.java
|
15b351a22d02e89d882fc9fe32b3f4c512080e0a |
15-Mar-2012 |
Chih-Chung Chang <chihchung@google.com> |
Create a ScreenNail interface so we can add other types of screenails. Add a new MediaItem type to contain a ScreenNail. Change-Id: Ia303949f3013dd48ded204eaf9ec69a102b8503e
es/layout/main.xml
rc/com/android/gallery3d/app/CameraView.java
rc/com/android/gallery3d/app/PhotoDataAdapter.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/app/ScreenNailBridge.java
rc/com/android/gallery3d/app/SinglePhotoDataAdapter.java
rc/com/android/gallery3d/data/DataManager.java
rc/com/android/gallery3d/data/MediaItem.java
rc/com/android/gallery3d/data/SnailAlbum.java
rc/com/android/gallery3d/data/SnailItem.java
rc/com/android/gallery3d/data/SnailSource.java
rc/com/android/gallery3d/ui/BitmapScreenNail.java
rc/com/android/gallery3d/ui/BitmapTileProvider.java
rc/com/android/gallery3d/ui/PhotoView.java
rc/com/android/gallery3d/ui/ScreenNail.java
rc/com/android/gallery3d/ui/TileImageView.java
rc/com/android/gallery3d/ui/TileImageViewAdapter.java
|
df47bac7c9000d50420061ac22dd259337bd160a |
20-Mar-2012 |
Chih-Chung Chang <chihchung@google.com> |
Patch for MR1. Change-Id: I3f4bba2854257008eed95b8eacce598abdca3180
rc/com/android/gallery3d/app/PhotoDataAdapter.java
rc/com/android/gallery3d/ui/BitmapTileProvider.java
rc/com/android/gallery3d/ui/PhotoView.java
rc/com/android/gallery3d/ui/TileImageView.java
rc/com/android/gallery3d/ui/TileImageViewAdapter.java
rc/com/android/gallery3d/ui/UploadedTexture.java
|
4745319b4f5e1f5056502f20698eb5910d249333 |
20-Mar-2012 |
Chih-Chung Chang <chihchung@google.com> |
Patch for MR1. Change-Id: I3f4bba2854257008eed95b8eacce598abdca3180
rc/com/android/gallery3d/app/PhotoDataAdapter.java
rc/com/android/gallery3d/ui/BitmapTileProvider.java
rc/com/android/gallery3d/ui/PhotoView.java
rc/com/android/gallery3d/ui/TileImageView.java
rc/com/android/gallery3d/ui/TileImageViewAdapter.java
rc/com/android/gallery3d/ui/UploadedTexture.java
|
bc1c49cc2614e521cafdcfcfe5c26326ab5127b7 |
20-Mar-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to master
rc/com/android/gallery3d/app/AbstractGalleryActivity.java
rc/com/android/gallery3d/app/AlbumPage.java
rc/com/android/gallery3d/app/AlbumSetPage.java
rc/com/android/gallery3d/app/Gallery.java
rc/com/android/gallery3d/app/GalleryActionBar.java
rc/com/android/gallery3d/app/ManageCachePage.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/app/PickerActivity.java
|
c7013c3d45ce3cf397146586406c16c46b911d11 |
20-Mar-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to master
|
e52c9ea5a5f7bb189e027dc7a2ea53b16242266c |
20-Mar-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to master
|
effdb2d800199796d9ff7b155465f7adef7ab7d8 |
20-Mar-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to master
|
813ba6f4c7f6c36928bf926f7856eb744a823b43 |
16-Mar-2012 |
Owen Lin <owenlin@google.com> |
Make top level albums can be loaded concurrently. Change-Id: I1acef9fc9a442c36ad1d9d0931b0defc6091bf33 fix: 5947962
rc/com/android/gallery3d/data/LocalAlbumSet.java
rc/com/android/gallery3d/data/MtpDeviceSet.java
|
aa6ac7f6ce0e1cab5b36e6bba97d2fec082f4759 |
16-Mar-2012 |
Owen Lin <owenlin@google.com> |
Make top level albums can be loaded concurrently. Change-Id: I1acef9fc9a442c36ad1d9d0931b0defc6091bf33 fix: 5947962
rc/com/android/gallery3d/data/LocalAlbumSet.java
rc/com/android/gallery3d/data/MtpDeviceSet.java
|
e80b47691bfc340f76464b97bac5ad6fe9f561de |
13-Mar-2012 |
Owen Lin <owenlin@google.com> |
Add log to debug loading time. Change-Id: I53ddb3cdce7abe9de7c5bbd85c1adad474bdff2f
rc/com/android/gallery3d/app/AlbumSetDataAdapter.java
rc/com/android/gallery3d/data/LocalAlbumSet.java
|
c3b30370ce9665d4371f61f0224b7f262dd2c7ee |
13-Mar-2012 |
Owen Lin <owenlin@google.com> |
Add log to debug loading time. Change-Id: I53ddb3cdce7abe9de7c5bbd85c1adad474bdff2f
rc/com/android/gallery3d/app/AlbumSetDataAdapter.java
rc/com/android/gallery3d/data/LocalAlbumSet.java
|
9af4a90dae4c05acfd1ec4f8d63375e8c0ebb430 |
20-Mar-2012 |
Ray Chen <raychen@google.com> |
Fix b/6191707 Unable to set Custom wallpaper from Home Change-Id: I130f74c94ebf5d93922807f7fee5ae7f189a15d4
rc/com/android/gallery3d/app/AbstractGalleryActivity.java
rc/com/android/gallery3d/app/AlbumPage.java
rc/com/android/gallery3d/app/AlbumSetPage.java
rc/com/android/gallery3d/app/Gallery.java
rc/com/android/gallery3d/app/GalleryActionBar.java
rc/com/android/gallery3d/app/ManageCachePage.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/app/PickerActivity.java
|
8cab3e872dd95e55ba34fdb94269a0c5069e72ae |
20-Mar-2012 |
Ray Chen <raychen@google.com> |
Fix b/6191707 Unable to set Custom wallpaper from Home Change-Id: I130f74c94ebf5d93922807f7fee5ae7f189a15d4
rc/com/android/gallery3d/app/AbstractGalleryActivity.java
rc/com/android/gallery3d/app/AlbumPage.java
rc/com/android/gallery3d/app/AlbumSetPage.java
rc/com/android/gallery3d/app/Gallery.java
rc/com/android/gallery3d/app/GalleryActionBar.java
rc/com/android/gallery3d/app/ManageCachePage.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/app/PickerActivity.java
|
627b9ef62c1ec53a037421f2b3013c422785aa44 |
19-Mar-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to master
|
6a032145a26876d19f21c3f4510a26ed32c25217 |
19-Mar-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to master
|
406732b0cb0f54a858e63903e960a5094b957938 |
19-Mar-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to master
|
0ac559a113c82aa3077acb6c71737efdc52ef409 |
19-Mar-2012 |
Wu-cheng Li <wuchengli@google.com> |
Remove singleTask mode of panorama. Camera, VideoCamera, PanoramaActivity will be combined to reduce the latency. singleTask should be removed to achieve that. bug:5954389 Change-Id: Ic79f59baffd24669910d1f05b65865788803b79c
ndroidManifest.xml
|
5320ee47672ca9936959d6e765149eb22fef9c6f |
19-Mar-2012 |
Wu-cheng Li <wuchengli@google.com> |
Remove singleTask mode of panorama. Camera, VideoCamera, PanoramaActivity will be combined to reduce the latency. singleTask should be removed to achieve that. bug:5954389 Change-Id: Ic79f59baffd24669910d1f05b65865788803b79c
ndroidManifest.xml
|
d8d04a85419c75b91348d3baeba416a14c5132f7 |
16-Mar-2012 |
Ray Chen <raychen@google.com> |
Revert "bug #6176711: guard against null GalleryActionBar." and fix DialogPicker's NPE issue while setting wallpaper. Change-Id: I833ebfb04907d3a1378df98db51c96b490796a00
rc/com/android/gallery3d/app/AbstractGalleryActivity.java
rc/com/android/gallery3d/app/ActivityState.java
rc/com/android/gallery3d/app/AlbumPage.java
rc/com/android/gallery3d/app/Gallery.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/app/PickerActivity.java
|
655f63f04638dfe31045eab1b6b4c39cc2db10db |
16-Mar-2012 |
Ray Chen <raychen@google.com> |
Revert "bug #6176711: guard against null GalleryActionBar." and fix DialogPicker's NPE issue while setting wallpaper. Change-Id: I833ebfb04907d3a1378df98db51c96b490796a00
rc/com/android/gallery3d/app/AbstractGalleryActivity.java
rc/com/android/gallery3d/app/ActivityState.java
rc/com/android/gallery3d/app/AlbumPage.java
rc/com/android/gallery3d/app/Gallery.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/app/PickerActivity.java
|
01449be9b1b89e72bcbcce9901421fc9c9cf713a |
16-Mar-2012 |
Owen Lin <owenlin@google.com> |
Merge "Fix a regression, we forget assigne a value to a member variable."
|
32f779384c64e4c1abad40bd0acc9bfe3ac900eb |
16-Mar-2012 |
Owen Lin <owenlin@google.com> |
Merge "Fix a regression, we forget assigne a value to a member variable."
|
30566df4aa13c0649e89d09298d819102ba7d979 |
16-Mar-2012 |
Owen Lin <owenlin@google.com> |
Fix a regression, we forget assigne a value to a member variable. Change-Id: I07b6654ddf73f4c92a75d81a3ec8f1075526f5fd
rc/com/android/gallery3d/ui/AlbumSlidingWindow.java
|
b8480e3dd6ad41f6622e9b39e79c17467eb17c6f |
16-Mar-2012 |
Owen Lin <owenlin@google.com> |
Fix a regression, we forget assigne a value to a member variable. Change-Id: I07b6654ddf73f4c92a75d81a3ec8f1075526f5fd
rc/com/android/gallery3d/ui/AlbumSlidingWindow.java
|
6efbd7283aea80eef8e5001291eb53c9e156e88c |
15-Mar-2012 |
Wei Huang <weih@google.com> |
bug #6176711: guard against null GalleryActionBar. When entering Gallery app from WallPaper picker, the activity is DialogPicker, which doesn't initialize GalleryActionbar so getGalleryActionbar() returns null. Guard against using the null object. I fixed the obvious NPE here, but Ray or Yuli should take a closer look, to see why this is broken. Change-Id: Ic6923c388ea7b72ab402131fc3b039546509e340
rc/com/android/gallery3d/app/ActivityState.java
rc/com/android/gallery3d/app/AlbumPage.java
rc/com/android/gallery3d/app/PhotoPage.java
|
8ed226f1d1a05dc94d512fc183f0a539b0361e6b |
15-Mar-2012 |
Wei Huang <weih@google.com> |
bug #6176711: guard against null GalleryActionBar. When entering Gallery app from WallPaper picker, the activity is DialogPicker, which doesn't initialize GalleryActionbar so getGalleryActionbar() returns null. Guard against using the null object. I fixed the obvious NPE here, but Ray or Yuli should take a closer look, to see why this is broken. Change-Id: Ic6923c388ea7b72ab402131fc3b039546509e340
rc/com/android/gallery3d/app/ActivityState.java
rc/com/android/gallery3d/app/AlbumPage.java
rc/com/android/gallery3d/app/PhotoPage.java
|
e63419969925c1e17a0415cde139d5117bf1fa86 |
15-Mar-2012 |
Wei Huang <weih@google.com> |
Merge "bug #6176711: guard against null GalleryActionBar."
|
6fe7e6ae561511922f99346a8021f44a126c6218 |
15-Mar-2012 |
Wei Huang <weih@google.com> |
bug #6176711: guard against null GalleryActionBar. When entering Gallery app from WallPaper picker, the activity is DialogPicker, which doesn't initialize GalleryActionbar so getGalleryActionbar() returns null. Guard against using the null object. I fixed the obvious NPE here, but Ray or Yuli should take a closer look, to see why this is broken. Change-Id: Ic6923c388ea7b72ab402131fc3b039546509e340
rc/com/android/gallery3d/app/ActivityState.java
rc/com/android/gallery3d/app/AlbumPage.java
rc/com/android/gallery3d/app/PhotoPage.java
|
2a4306a4b3c019c50687473d931753a82912ac48 |
15-Mar-2012 |
Wei Huang <weih@google.com> |
bug #6176711: guard against null GalleryActionBar. When entering Gallery app from WallPaper picker, the activity is DialogPicker, which doesn't initialize GalleryActionbar so getGalleryActionbar() returns null. Guard against using the null object. I fixed the obvious NPE here, but Ray or Yuli should take a closer look, to see why this is broken. Change-Id: Ic6923c388ea7b72ab402131fc3b039546509e340
rc/com/android/gallery3d/app/ActivityState.java
rc/com/android/gallery3d/app/AlbumPage.java
rc/com/android/gallery3d/app/PhotoPage.java
|
db261d32cb7845a52454e7fb1552dd7aa819f6c3 |
15-Mar-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: I49d04d1c50230fbd0af5046d7df4a2a86a3b4b05
es/values-da/strings.xml
|
6f9ec66b2d707ec3560455987b3bf6e2f7fbe880 |
15-Mar-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: I49d04d1c50230fbd0af5046d7df4a2a86a3b4b05
es/values-da/strings.xml
|
147e492fe3082be16f6e31639083bb1698323eff |
15-Mar-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to master
|
c510324d8963e78d21695317950042ba2714a87e |
15-Mar-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to master
|
e4cf38e08d742667601e19798a6e3c5de382620b |
15-Mar-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to master
|
240ae3805a11a5de23f9e6405c56a52cb1662f64 |
15-Mar-2012 |
Pin Ting <pinting@google.com> |
Merge "Change panorama java package name."
|
f56d0974690c275fec2f5dc45a17daff4b495ee1 |
15-Mar-2012 |
Pin Ting <pinting@google.com> |
Change panorama java package name. bug:5954391 Make camera, camcorder, panorama activities share the same java package. Change-Id: I5b72e94d5fa335a4089e3700e4cc3b5af3f882f6
ndroidManifest.xml
|
fb46bf859ca82777c477b24d3a0b756e957684bb |
15-Mar-2012 |
Pin Ting <pinting@google.com> |
Change panorama java package name. bug:5954391 Make camera, camcorder, panorama activities share the same java package. Change-Id: I5b72e94d5fa335a4089e3700e4cc3b5af3f882f6
ndroidManifest.xml
|
be0cb26de2b21fd5166b05ff5db427636344b7b6 |
07-Mar-2012 |
Ray Chen <raychen@google.com> |
Fix 6039387 Wrong app icon shown when playing 'personal video' from Videos app Change-Id: Idf5af5172d5d413e64712331e3e6331f13e1b95c
rc/com/android/gallery3d/app/MovieActivity.java
|
7b9c72a32694f180fbc7bf4652720db9d46e30f4 |
07-Mar-2012 |
Ray Chen <raychen@google.com> |
Fix 6039387 Wrong app icon shown when playing 'personal video' from Videos app Change-Id: Idf5af5172d5d413e64712331e3e6331f13e1b95c
rc/com/android/gallery3d/app/MovieActivity.java
|
84c220f10a643927c8a2126de8a755d8d7f7ec9e |
06-Mar-2012 |
Ray Chen <raychen@google.com> |
Fix 3462852 [UI] When linking from Camera preview - App icon with 'Up' arrow should go to next level up. Some changes in this CL: 1. ActivityState can decide whether to enable home button and show up arrow 2. ActivityState can handle home_up event on its own 3. Support getContentUri in LocalAlbum (Image/Video Roll) and LocalMergeAlbum (Camera Roll) 4. Gallery supports view action for AlbumPage (Camera Roll) Change-Id: I85a75cdce9cbc2a877651fdec34a0180ed8e785c
rc/com/android/gallery3d/app/ActivityState.java
rc/com/android/gallery3d/app/AlbumPage.java
rc/com/android/gallery3d/app/Gallery.java
rc/com/android/gallery3d/app/GalleryActionBar.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/app/StateManager.java
rc/com/android/gallery3d/data/LocalAlbum.java
rc/com/android/gallery3d/data/LocalAlbumSet.java
rc/com/android/gallery3d/data/LocalMergeAlbum.java
rc/com/android/gallery3d/data/LocalSource.java
|
f3f7f56af19f3f04a7daefd16981e5f55e39053d |
06-Mar-2012 |
Ray Chen <raychen@google.com> |
Fix 3462852 [UI] When linking from Camera preview - App icon with 'Up' arrow should go to next level up. Some changes in this CL: 1. ActivityState can decide whether to enable home button and show up arrow 2. ActivityState can handle home_up event on its own 3. Support getContentUri in LocalAlbum (Image/Video Roll) and LocalMergeAlbum (Camera Roll) 4. Gallery supports view action for AlbumPage (Camera Roll) Change-Id: I85a75cdce9cbc2a877651fdec34a0180ed8e785c
rc/com/android/gallery3d/app/ActivityState.java
rc/com/android/gallery3d/app/AlbumPage.java
rc/com/android/gallery3d/app/Gallery.java
rc/com/android/gallery3d/app/GalleryActionBar.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/app/StateManager.java
rc/com/android/gallery3d/data/LocalAlbum.java
rc/com/android/gallery3d/data/LocalAlbumSet.java
rc/com/android/gallery3d/data/LocalMergeAlbum.java
rc/com/android/gallery3d/data/LocalSource.java
|
6cdbcc42c9edf92ca63982925309c0adcaf88437 |
15-Mar-2012 |
Ray Chen <raychen@google.com> |
Merge "Fix 5406844 Category switcher does not highlight current selection"
|
e8589158f7a19c78f3b8c483d7f0d8e98b06ce88 |
15-Mar-2012 |
Ray Chen <raychen@google.com> |
Merge "Fix 5406844 Category switcher does not highlight current selection"
|
aab9c1009dee21288b07aad92d68179ec306c4df |
14-Mar-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to master
|
45d2330f67eea06ea85731277d1554cea585cfed |
14-Mar-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to master
|
b92a95c4592ed0150acea2a06d86359506b83193 |
14-Mar-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to master
|
762f8e20f608bc805d9e9f01fa2c4925f4735cf0 |
14-Mar-2012 |
Chih-Chung Chang <chihchung@google.com> |
Aggregate three gesture detectors. Change-Id: I270cd7bdeb81d9a8ea5d3aa122f44074413e7616
rc/com/android/gallery3d/ui/GestureRecognizer.java
rc/com/android/gallery3d/ui/PhotoView.java
|
3a02809c97669a157cf45bfd61d45272110d4091 |
14-Mar-2012 |
Chih-Chung Chang <chihchung@google.com> |
Aggregate three gesture detectors. Change-Id: I270cd7bdeb81d9a8ea5d3aa122f44074413e7616
rc/com/android/gallery3d/ui/GestureRecognizer.java
rc/com/android/gallery3d/ui/PhotoView.java
|
f82afee9759df87b4f26e9f5f6b0d2cd6cdc1db4 |
14-Mar-2012 |
Owen Lin <owenlin@google.com> |
Reorganize import for all files. Change-Id: Ia9188bcde727e317e6a476caccaea562f0758b19
rc/com/android/gallery3d/ui/ProgressSpinner.java
|
73a04ff386d590f797d95b02286442108063b569 |
14-Mar-2012 |
Owen Lin <owenlin@google.com> |
Reorganize import for all files. Change-Id: Ia9188bcde727e317e6a476caccaea562f0758b19
rc/com/android/gallery3d/anim/Animation.java
rc/com/android/gallery3d/app/AlbumPicker.java
rc/com/android/gallery3d/app/Config.java
rc/com/android/gallery3d/app/DialogPicker.java
rc/com/android/gallery3d/app/EyePosition.java
rc/com/android/gallery3d/app/GalleryActionBar.java
rc/com/android/gallery3d/app/GalleryActivity.java
rc/com/android/gallery3d/app/GalleryApp.java
rc/com/android/gallery3d/app/GalleryAppImpl.java
rc/com/android/gallery3d/app/GalleryContext.java
rc/com/android/gallery3d/app/ManageCachePage.java
rc/com/android/gallery3d/app/MovieControllerOverlay.java
rc/com/android/gallery3d/app/PackagesMonitor.java
rc/com/android/gallery3d/app/PhotoDataAdapter.java
rc/com/android/gallery3d/app/PickerActivity.java
rc/com/android/gallery3d/app/SinglePhotoDataAdapter.java
rc/com/android/gallery3d/app/SlideshowDream.java
rc/com/android/gallery3d/app/SlideshowPage.java
rc/com/android/gallery3d/app/StateManager.java
rc/com/android/gallery3d/app/TimeBar.java
rc/com/android/gallery3d/data/ChangeNotifier.java
rc/com/android/gallery3d/data/ClusterAlbumSet.java
rc/com/android/gallery3d/data/ComboAlbum.java
rc/com/android/gallery3d/data/DataManager.java
rc/com/android/gallery3d/data/DownloadCache.java
rc/com/android/gallery3d/data/DownloadUtils.java
rc/com/android/gallery3d/data/Exif.java
rc/com/android/gallery3d/data/LocalAlbum.java
rc/com/android/gallery3d/data/LocalAlbumSet.java
rc/com/android/gallery3d/data/LocalMediaItem.java
rc/com/android/gallery3d/data/LocalVideo.java
rc/com/android/gallery3d/data/LocationClustering.java
rc/com/android/gallery3d/data/MediaDetails.java
rc/com/android/gallery3d/data/MediaSource.java
rc/com/android/gallery3d/data/MtpClient.java
rc/com/android/gallery3d/data/MtpContext.java
rc/com/android/gallery3d/data/MtpDevice.java
rc/com/android/gallery3d/data/MtpDeviceSet.java
rc/com/android/gallery3d/data/MtpImage.java
rc/com/android/gallery3d/data/SizeClustering.java
rc/com/android/gallery3d/data/TagClustering.java
rc/com/android/gallery3d/data/TimeClustering.java
rc/com/android/gallery3d/data/UriSource.java
rc/com/android/gallery3d/gadget/LocalPhotoSource.java
rc/com/android/gallery3d/gadget/MediaSetSource.java
rc/com/android/gallery3d/gadget/PhotoAppWidgetProvider.java
rc/com/android/gallery3d/gadget/WidgetClickHandler.java
rc/com/android/gallery3d/gadget/WidgetConfigure.java
rc/com/android/gallery3d/gadget/WidgetDatabaseHelper.java
rc/com/android/gallery3d/gadget/WidgetService.java
rc/com/android/gallery3d/gadget/WidgetSource.java
rc/com/android/gallery3d/gadget/WidgetTypeChooser.java
rc/com/android/gallery3d/gadget/WidgetUtils.java
rc/com/android/gallery3d/provider/GalleryProvider.java
rc/com/android/gallery3d/ui/ActionModeHandler.java
rc/com/android/gallery3d/ui/BitmapTexture.java
rc/com/android/gallery3d/ui/BitmapTileProvider.java
rc/com/android/gallery3d/ui/CacheStorageUsageInfo.java
rc/com/android/gallery3d/ui/CanvasTexture.java
rc/com/android/gallery3d/ui/CropView.java
rc/com/android/gallery3d/ui/CustomMenu.java
rc/com/android/gallery3d/ui/DetailsHelper.java
rc/com/android/gallery3d/ui/EdgeEffect.java
rc/com/android/gallery3d/ui/FadeInTexture.java
rc/com/android/gallery3d/ui/FilmStripView.java
rc/com/android/gallery3d/ui/FlingScroller.java
rc/com/android/gallery3d/ui/GLCanvasImpl.java
rc/com/android/gallery3d/ui/GLRootView.java
rc/com/android/gallery3d/ui/GLView.java
rc/com/android/gallery3d/ui/GridDrawer.java
rc/com/android/gallery3d/ui/HighlightDrawer.java
rc/com/android/gallery3d/ui/IconDrawer.java
rc/com/android/gallery3d/ui/ImportCompleteListener.java
rc/com/android/gallery3d/ui/ManageCacheDrawer.java
rc/com/android/gallery3d/ui/NinePatchTexture.java
rc/com/android/gallery3d/ui/Paper.java
rc/com/android/gallery3d/ui/PhotoView.java
rc/com/android/gallery3d/ui/PositionController.java
rc/com/android/gallery3d/ui/PositionRepository.java
rc/com/android/gallery3d/ui/ProgressSpinner.java
rc/com/android/gallery3d/ui/ResourceTexture.java
rc/com/android/gallery3d/ui/ScrollBarView.java
rc/com/android/gallery3d/ui/ScrollerHelper.java
rc/com/android/gallery3d/ui/SelectionDrawer.java
rc/com/android/gallery3d/ui/SlideshowView.java
rc/com/android/gallery3d/ui/StringTexture.java
rc/com/android/gallery3d/ui/StripDrawer.java
rc/com/android/gallery3d/ui/SynchronizedHandler.java
rc/com/android/gallery3d/ui/TileImageView.java
rc/com/android/gallery3d/ui/UploadedTexture.java
rc/com/android/gallery3d/util/CacheManager.java
rc/com/android/gallery3d/util/GalleryUtils.java
rc/com/android/gallery3d/util/IdentityCache.java
rc/com/android/gallery3d/util/MediaSetUtils.java
rc/com/android/gallery3d/util/Profile.java
rc/com/android/gallery3d/util/ProfileData.java
rc/com/android/gallery3d/util/ReverseGeocoder.java
|
2b3ee0ea07246b859a5b75d8a6102a7cce7ec838 |
14-Mar-2012 |
Owen Lin <owenlin@google.com> |
Reorganize import for all files. Change-Id: Ia9188bcde727e317e6a476caccaea562f0758b19
rc/com/android/gallery3d/anim/Animation.java
rc/com/android/gallery3d/app/AlbumPicker.java
rc/com/android/gallery3d/app/Config.java
rc/com/android/gallery3d/app/DialogPicker.java
rc/com/android/gallery3d/app/EyePosition.java
rc/com/android/gallery3d/app/GalleryActionBar.java
rc/com/android/gallery3d/app/GalleryActivity.java
rc/com/android/gallery3d/app/GalleryApp.java
rc/com/android/gallery3d/app/GalleryAppImpl.java
rc/com/android/gallery3d/app/GalleryContext.java
rc/com/android/gallery3d/app/ManageCachePage.java
rc/com/android/gallery3d/app/MovieControllerOverlay.java
rc/com/android/gallery3d/app/PackagesMonitor.java
rc/com/android/gallery3d/app/PhotoDataAdapter.java
rc/com/android/gallery3d/app/PickerActivity.java
rc/com/android/gallery3d/app/SinglePhotoDataAdapter.java
rc/com/android/gallery3d/app/SlideshowDream.java
rc/com/android/gallery3d/app/SlideshowPage.java
rc/com/android/gallery3d/app/StateManager.java
rc/com/android/gallery3d/app/TimeBar.java
rc/com/android/gallery3d/data/ChangeNotifier.java
rc/com/android/gallery3d/data/ClusterAlbumSet.java
rc/com/android/gallery3d/data/ComboAlbum.java
rc/com/android/gallery3d/data/DataManager.java
rc/com/android/gallery3d/data/DownloadCache.java
rc/com/android/gallery3d/data/DownloadUtils.java
rc/com/android/gallery3d/data/Exif.java
rc/com/android/gallery3d/data/LocalAlbum.java
rc/com/android/gallery3d/data/LocalAlbumSet.java
rc/com/android/gallery3d/data/LocalMediaItem.java
rc/com/android/gallery3d/data/LocalVideo.java
rc/com/android/gallery3d/data/LocationClustering.java
rc/com/android/gallery3d/data/MediaDetails.java
rc/com/android/gallery3d/data/MediaSource.java
rc/com/android/gallery3d/data/MtpClient.java
rc/com/android/gallery3d/data/MtpContext.java
rc/com/android/gallery3d/data/MtpDevice.java
rc/com/android/gallery3d/data/MtpDeviceSet.java
rc/com/android/gallery3d/data/MtpImage.java
rc/com/android/gallery3d/data/SizeClustering.java
rc/com/android/gallery3d/data/TagClustering.java
rc/com/android/gallery3d/data/TimeClustering.java
rc/com/android/gallery3d/data/UriSource.java
rc/com/android/gallery3d/gadget/LocalPhotoSource.java
rc/com/android/gallery3d/gadget/MediaSetSource.java
rc/com/android/gallery3d/gadget/PhotoAppWidgetProvider.java
rc/com/android/gallery3d/gadget/WidgetClickHandler.java
rc/com/android/gallery3d/gadget/WidgetConfigure.java
rc/com/android/gallery3d/gadget/WidgetDatabaseHelper.java
rc/com/android/gallery3d/gadget/WidgetService.java
rc/com/android/gallery3d/gadget/WidgetSource.java
rc/com/android/gallery3d/gadget/WidgetTypeChooser.java
rc/com/android/gallery3d/gadget/WidgetUtils.java
rc/com/android/gallery3d/provider/GalleryProvider.java
rc/com/android/gallery3d/ui/ActionModeHandler.java
rc/com/android/gallery3d/ui/BitmapTexture.java
rc/com/android/gallery3d/ui/BitmapTileProvider.java
rc/com/android/gallery3d/ui/CacheStorageUsageInfo.java
rc/com/android/gallery3d/ui/CanvasTexture.java
rc/com/android/gallery3d/ui/CropView.java
rc/com/android/gallery3d/ui/CustomMenu.java
rc/com/android/gallery3d/ui/DetailsHelper.java
rc/com/android/gallery3d/ui/EdgeEffect.java
rc/com/android/gallery3d/ui/FadeInTexture.java
rc/com/android/gallery3d/ui/FilmStripView.java
rc/com/android/gallery3d/ui/FlingScroller.java
rc/com/android/gallery3d/ui/GLCanvasImpl.java
rc/com/android/gallery3d/ui/GLRootView.java
rc/com/android/gallery3d/ui/GLView.java
rc/com/android/gallery3d/ui/GridDrawer.java
rc/com/android/gallery3d/ui/HighlightDrawer.java
rc/com/android/gallery3d/ui/IconDrawer.java
rc/com/android/gallery3d/ui/ImportCompleteListener.java
rc/com/android/gallery3d/ui/ManageCacheDrawer.java
rc/com/android/gallery3d/ui/NinePatchTexture.java
rc/com/android/gallery3d/ui/Paper.java
rc/com/android/gallery3d/ui/PhotoView.java
rc/com/android/gallery3d/ui/PositionController.java
rc/com/android/gallery3d/ui/PositionRepository.java
rc/com/android/gallery3d/ui/ProgressSpinner.java
rc/com/android/gallery3d/ui/ResourceTexture.java
rc/com/android/gallery3d/ui/ScrollBarView.java
rc/com/android/gallery3d/ui/ScrollerHelper.java
rc/com/android/gallery3d/ui/SelectionDrawer.java
rc/com/android/gallery3d/ui/SlideshowView.java
rc/com/android/gallery3d/ui/StringTexture.java
rc/com/android/gallery3d/ui/StripDrawer.java
rc/com/android/gallery3d/ui/SynchronizedHandler.java
rc/com/android/gallery3d/ui/TileImageView.java
rc/com/android/gallery3d/ui/UploadedTexture.java
rc/com/android/gallery3d/util/CacheManager.java
rc/com/android/gallery3d/util/GalleryUtils.java
rc/com/android/gallery3d/util/IdentityCache.java
rc/com/android/gallery3d/util/MediaSetUtils.java
rc/com/android/gallery3d/util/Profile.java
rc/com/android/gallery3d/util/ProfileData.java
rc/com/android/gallery3d/util/ReverseGeocoder.java
|
7e0a28c2999f2d2c0aab4ecb7a03ac3e37078724 |
14-Mar-2012 |
Owen Lin <owenlin@google.com> |
Merge "Reuse bitmap for all micro thumb images to prevent GC."
|
52cf405c5e6758aec1dd14b4b9e80909ffe72e76 |
14-Mar-2012 |
Owen Lin <owenlin@google.com> |
Merge "Reuse bitmap for all micro thumb images to prevent GC."
|
aa03cd0a539c56dcc0c6d2f9a000d8374b394b41 |
07-Mar-2012 |
Owen Lin <owenlin@google.com> |
Reuse bitmap for all micro thumb images to prevent GC. Change-Id: I27d3002e5bb745a597f52962fe24744c8329441c
allerycommon/src/com/android/gallery3d/common/BitmapUtils.java
allerycommon/src/com/android/gallery3d/common/Utils.java
|
504dd40f27893b120c7a978b5b01b73bd23559bb |
07-Mar-2012 |
Owen Lin <owenlin@google.com> |
Reuse bitmap for all micro thumb images to prevent GC. Change-Id: I27d3002e5bb745a597f52962fe24744c8329441c
allerycommon/src/com/android/gallery3d/common/BitmapUtils.java
allerycommon/src/com/android/gallery3d/common/Utils.java
rc/com/android/gallery3d/app/AbstractGalleryActivity.java
rc/com/android/gallery3d/data/DecodeUtils.java
rc/com/android/gallery3d/data/ImageCacheRequest.java
rc/com/android/gallery3d/data/ImageCacheService.java
rc/com/android/gallery3d/data/LocalImage.java
rc/com/android/gallery3d/data/LocalVideo.java
rc/com/android/gallery3d/data/MediaItem.java
rc/com/android/gallery3d/data/MtpImage.java
rc/com/android/gallery3d/data/UriImage.java
rc/com/android/gallery3d/ui/AbstractDisplayItem.java
rc/com/android/gallery3d/ui/AlbumSetSlidingWindow.java
rc/com/android/gallery3d/ui/AlbumSlidingWindow.java
rc/com/android/gallery3d/ui/BitmapPool.java
|
4bb5912e85f6d1bd8a6b78d6d52b4c4da7aeb740 |
07-Mar-2012 |
Owen Lin <owenlin@google.com> |
Reuse bitmap for all micro thumb images to prevent GC. Change-Id: I27d3002e5bb745a597f52962fe24744c8329441c
allerycommon/src/com/android/gallery3d/common/BitmapUtils.java
allerycommon/src/com/android/gallery3d/common/Utils.java
rc/com/android/gallery3d/app/AbstractGalleryActivity.java
rc/com/android/gallery3d/data/DecodeUtils.java
rc/com/android/gallery3d/data/ImageCacheRequest.java
rc/com/android/gallery3d/data/ImageCacheService.java
rc/com/android/gallery3d/data/LocalImage.java
rc/com/android/gallery3d/data/LocalVideo.java
rc/com/android/gallery3d/data/MediaItem.java
rc/com/android/gallery3d/data/MtpImage.java
rc/com/android/gallery3d/data/UriImage.java
rc/com/android/gallery3d/ui/AbstractDisplayItem.java
rc/com/android/gallery3d/ui/AlbumSetSlidingWindow.java
rc/com/android/gallery3d/ui/AlbumSlidingWindow.java
rc/com/android/gallery3d/ui/BitmapPool.java
|
268b5f4d3eeb8c81cc126d0637679f097be1389f |
13-Mar-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to master
|
5dedc69195f2def1eaf42d57885328c01fe85589 |
13-Mar-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to master
|
68c98d3213cc762673797b2ed1c061e2c3e63742 |
12-Mar-2012 |
Yuli Huang <yuli@google.com> |
Simplify PhotoEditor code. 1. Encapsulate spinner usages inside Toolbar. 2. Remove unnecessary static variable usages. Change-Id: Iaec614c5322a50c1e2c0cfa9cec1971b85e32f8a
rc/com/android/gallery3d/photoeditor/SpinnerProgressDialog.java
|
2012e23a44435642088d2a505f51bdd9d6c02542 |
12-Mar-2012 |
Yuli Huang <yuli@google.com> |
Simplify PhotoEditor code. 1. Encapsulate spinner usages inside Toolbar. 2. Remove unnecessary static variable usages. Change-Id: Iaec614c5322a50c1e2c0cfa9cec1971b85e32f8a
rc/com/android/gallery3d/photoeditor/EffectsBar.java
rc/com/android/gallery3d/photoeditor/PhotoEditor.java
rc/com/android/gallery3d/photoeditor/SpinnerProgressDialog.java
rc/com/android/gallery3d/photoeditor/Toolbar.java
|
5cac6d5dd9688e85970ab001cd615f56ce5a0555 |
12-Mar-2012 |
Yuli Huang <yuli@google.com> |
Simplify PhotoEditor code. 1. Encapsulate spinner usages inside Toolbar. 2. Remove unnecessary static variable usages. Change-Id: Iaec614c5322a50c1e2c0cfa9cec1971b85e32f8a
rc/com/android/gallery3d/photoeditor/EffectsBar.java
rc/com/android/gallery3d/photoeditor/PhotoEditor.java
rc/com/android/gallery3d/photoeditor/SpinnerProgressDialog.java
rc/com/android/gallery3d/photoeditor/Toolbar.java
|
1aa44309ab6eccaca4d2b056dc289f13ad4f72ec |
13-Mar-2012 |
Chih-Chung Chang <chihchung@google.com> |
Merge "Set task affinity for Camera activities."
|
df7359e6466ae1cee6980663e4cadfb3df06cbbd |
12-Mar-2012 |
Chih-Chung Chang <chihchung@google.com> |
Set task affinity for Camera activities. Bug: 6156475 Change-Id: Idd1be6941242fdfc7f46c706c4a1948acf85d2be
ndroidManifest.xml
|
2250dfb9a884b4b2c06b4c8060aa3c37c8d7ad37 |
12-Mar-2012 |
Chih-Chung Chang <chihchung@google.com> |
Set task affinity for Camera activities. Bug: 6156475 Change-Id: Idd1be6941242fdfc7f46c706c4a1948acf85d2be
ndroidManifest.xml
|
d5617d5d6a5f4b0c0f68b2fda5a587b8272ca5c2 |
12-Mar-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: Ibd6567a362824e6ca459de53191c32c31813aa9d
es/values-in/strings.xml
|
0778565d10d9c7ee903d8cb869be24278cf0ef09 |
12-Mar-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: Ibd6567a362824e6ca459de53191c32c31813aa9d
es/values-in/strings.xml
|
3ed262d9eafb82b5a21137fd0ea15488a11a4522 |
12-Mar-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to master
|
2e71b59e5085c81df4558247c52b9eb5233bf649 |
12-Mar-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to master
|
8f193003633be3239883c62a2011210832d14f7c |
12-Mar-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to master
|
b95e2e9e5956e3a049d99c6961d7bd22c098cdaf |
12-Mar-2012 |
Ray Chen <raychen@google.com> |
Fix 5406844 Category switcher does not highlight current selection Change-Id: I7f6295d452764220bd3faa49526be25872a42e6d
es/layout/action_bar_text.xml
|
22a6e1fb446e7ef423a7a758b2ea4053245094bf |
12-Mar-2012 |
Ray Chen <raychen@google.com> |
Fix 5406844 Category switcher does not highlight current selection Change-Id: I7f6295d452764220bd3faa49526be25872a42e6d
es/layout/action_bar_text.xml
|
4f19a07ffe9e0de9e4de775a76e75797f11aa477 |
12-Mar-2012 |
Chih-Chung Chang <chihchung@google.com> |
Add DisableCameraReceiver to disable camera activities if there is no camera. Change-Id: I84061e05c5eec793bf528df1c43d931d22d91d35
ndroidManifest.xml
|
a27fc9e15a28c2de5bd71a46fa1db37e89d23331 |
12-Mar-2012 |
Chih-Chung Chang <chihchung@google.com> |
Add DisableCameraReceiver to disable camera activities if there is no camera. Change-Id: I84061e05c5eec793bf528df1c43d931d22d91d35
ndroidManifest.xml
|
2fe19c950eb46c425d36279923e1fa0b541ce2c8 |
11-Mar-2012 |
Chih-Chung Chang <chihchung@google.com> |
Change id "root" to "movie_view_root" to avoid confusion. There is also one id "root" in Camera. Change-Id: Id6ebc5362f5ddceabe6dab6218de9b091454bde7
rc/com/android/gallery3d/app/MovieActivity.java
|
b71b20d213e88ce7cd66ade6b129e70587faad76 |
11-Mar-2012 |
Chih-Chung Chang <chihchung@google.com> |
Change id "root" to "movie_view_root" to avoid confusion. There is also one id "root" in Camera. Change-Id: Id6ebc5362f5ddceabe6dab6218de9b091454bde7
es/layout/movie_view.xml
|
fb55994c78d7b6af919d45ab015f5dc0a8665ac8 |
11-Mar-2012 |
Chih-Chung Chang <chihchung@google.com> |
Change id "root" to "movie_view_root" to avoid confusion. There is also one id "root" in Camera. Change-Id: Id6ebc5362f5ddceabe6dab6218de9b091454bde7
es/layout/movie_view.xml
rc/com/android/gallery3d/app/MovieActivity.java
|
81ae27226b797f1be88db1d5fd05df4c6fa91d8b |
09-Mar-2012 |
Chih-Chung Chang <chihchung@google.com> |
Merge "Merge Camera into Gallery package."
|
392352c673069715e74deecafdc7b65565f04a31 |
09-Mar-2012 |
Chih-Chung Chang <chihchung@google.com> |
Merge "Merge Camera into Gallery package."
|
5bf615d46b3e023faa504413927aed80a9edadf5 |
08-Mar-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to master
|
b0d1d33aee1a26a5d2ad0c1f456495f22479371a |
08-Mar-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to master
|
6b8524e0c3799e2af78231965c8cf99db9f90065 |
08-Mar-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to master
|
60376a167dbeb3b93aa23a1e3f681974e076227c |
08-Mar-2012 |
Chih-Chung Chang <chihchung@google.com> |
Merge Camera into Gallery package. Change-Id: If66d4b841eec3d3f5384a561b07c0eeade92597a
leanSpec.mk
|
95d15606219aacc2bc986461f068b7f9610e9f7c |
08-Mar-2012 |
Chih-Chung Chang <chihchung@google.com> |
Merge Camera into Gallery package. Change-Id: If66d4b841eec3d3f5384a561b07c0eeade92597a
roguard.flags
|
5a4d66d474ec876a2a28fd5927890c18f18907e5 |
08-Mar-2012 |
Chih-Chung Chang <chihchung@google.com> |
Merge Camera into Gallery package. Change-Id: If66d4b841eec3d3f5384a561b07c0eeade92597a
ndroid.mk
|
007394392243824d3841c6a50665ad954bacbfaa |
08-Mar-2012 |
Chih-Chung Chang <chihchung@google.com> |
Merge Camera into Gallery package. Change-Id: If66d4b841eec3d3f5384a561b07c0eeade92597a
ndroidManifest.xml
|
def22b66ed3faae65972bb7bcc4230ab0d3665f0 |
08-Mar-2012 |
Chih-Chung Chang <chihchung@google.com> |
Merge Camera into Gallery package. Change-Id: If66d4b841eec3d3f5384a561b07c0eeade92597a
rc/com/android/gallery3d/app/GalleryAppImpl.java
|
63764789fdef4dfcdb3c0e1a9fa46b5d62312f07 |
08-Mar-2012 |
Chih-Chung Chang <chihchung@google.com> |
Merge Camera into Gallery package. Change-Id: If66d4b841eec3d3f5384a561b07c0eeade92597a
ndroid.mk
ndroidManifest.xml
leanSpec.mk
roguard.flags
rc/com/android/gallery3d/app/GalleryAppImpl.java
|
6720175dbb1817e8dd35a747d43660697084a386 |
08-Mar-2012 |
Yuli Huang <yuli@google.com> |
Fix b/5948180: Photo is repositioned during being scaled. Avoid repositioning photo to center vertically during scaling it. Change-Id: Id9f2de6b2b1611419a0c03888cff49a5336b39df
rc/com/android/gallery3d/ui/PositionController.java
|
8817fe8a5bbe65905e777230720293744f6a8cca |
08-Mar-2012 |
Yuli Huang <yuli@google.com> |
Fix b/5948180: Photo is repositioned during being scaled. Avoid repositioning photo to center vertically during scaling it. Change-Id: Id9f2de6b2b1611419a0c03888cff49a5336b39df
rc/com/android/gallery3d/ui/PositionController.java
|
cfa2c52513d7987ab74d2b94f36fb0357a3a418c |
08-Mar-2012 |
Yuli Huang <yuli@google.com> |
Merge "Fix b/5948187: Add progress text for loading video."
|
07b5d56aae9421f8353a0a22728f554e44258a08 |
07-Mar-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: I675ae2b5e04df6941251c8f561033fefffca3c93
es/values-in/strings.xml
|
8b266743b1f4c6e6b5169a5027facf8a9d648198 |
07-Mar-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: I675ae2b5e04df6941251c8f561033fefffca3c93
es/values-in/strings.xml
|
5a0c6b2f5a860e1f22cf6d10742e147f45025cb4 |
07-Mar-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to master
|
9c85e752ae39bee6b57a1980fd2df9445fdb5932 |
07-Mar-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to master
|
0893bd64c17a336525452537b44b1d4c8b1b3522 |
07-Mar-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to master
|
da172796bc166dd9a5321d78ac29fe0aa4cfdcae |
07-Mar-2012 |
Yuli Huang <yuli@google.com> |
Fix b/5948187: Add progress text for loading video. Change-Id: If85a5db3c6128cf0c59b97dc44f51cdfc87d225b
rc/com/android/gallery3d/app/MovieControllerOverlay.java
|
15b8ec53d9d79e25d08f53e5ab721dac9cedf16e |
07-Mar-2012 |
Yuli Huang <yuli@google.com> |
Fix b/5948187: Add progress text for loading video. Change-Id: If85a5db3c6128cf0c59b97dc44f51cdfc87d225b
rc/com/android/gallery3d/app/MovieControllerOverlay.java
|
88b29bb8922b26ec060dafcebaef199b4d82cf5c |
06-Mar-2012 |
Yuli Huang <yuli@google.com> |
Fix b/5885342: Multiple PhotoEditor activities cause exceptions. Avoid using a static variable to keep tracking views across activities. Change-Id: Ia53444502d476d37b64344e5aea5f58a06ee3b03
rc/com/android/gallery3d/photoeditor/EffectsBar.java
rc/com/android/gallery3d/photoeditor/PhotoEditor.java
rc/com/android/gallery3d/photoeditor/SpinnerProgressDialog.java
rc/com/android/gallery3d/photoeditor/Toolbar.java
|
1149eb582c588a0e980b0dcc7ef04c5983788981 |
06-Mar-2012 |
Yuli Huang <yuli@google.com> |
Fix b/5885342: Multiple PhotoEditor activities cause exceptions. Avoid using a static variable to keep tracking views across activities. Change-Id: Ia53444502d476d37b64344e5aea5f58a06ee3b03
rc/com/android/gallery3d/photoeditor/SpinnerProgressDialog.java
|
d67ec74304219b3e70caae32fbfaadfb9c3c76f4 |
06-Mar-2012 |
Yuli Huang <yuli@google.com> |
Fix b/5885342: Multiple PhotoEditor activities cause exceptions. Avoid using a static variable to keep tracking views across activities. Change-Id: Ia53444502d476d37b64344e5aea5f58a06ee3b03
rc/com/android/gallery3d/photoeditor/EffectsBar.java
rc/com/android/gallery3d/photoeditor/PhotoEditor.java
rc/com/android/gallery3d/photoeditor/SpinnerProgressDialog.java
rc/com/android/gallery3d/photoeditor/Toolbar.java
|
fc750e135227727de128b1349bfe2fd0768a2306 |
06-Mar-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to master
|
6d705f833f4cad133e472247a58f949c66842c82 |
06-Mar-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to master
|
6696043a3f116eaad983822a7f077e4d6a106ee0 |
02-Mar-2012 |
Chih-Chung Chang <chihchung@google.com> |
Use AnimationTime for animation caluclation. Change-Id: I3af8334978c054ddbc2050a240f0d9c113a44012
rc/com/android/gallery3d/ui/AnimationTime.java
rc/com/android/gallery3d/ui/FadeInTexture.java
rc/com/android/gallery3d/ui/GLRootView.java
rc/com/android/gallery3d/ui/Paper.java
rc/com/android/gallery3d/ui/PositionController.java
|
cb05834cedb8223fc59456afcd62fa7448f2b3b8 |
02-Mar-2012 |
Chih-Chung Chang <chihchung@google.com> |
Use AnimationTime for animation caluclation. Change-Id: I3af8334978c054ddbc2050a240f0d9c113a44012
rc/com/android/gallery3d/ui/AnimationTime.java
rc/com/android/gallery3d/ui/FadeInTexture.java
rc/com/android/gallery3d/ui/GLRootView.java
rc/com/android/gallery3d/ui/Paper.java
rc/com/android/gallery3d/ui/PositionController.java
|
d5a5085af53f9fe313a8a297d748283b7266c390 |
01-Mar-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to master
|
d4da10d47fc29b83a45d2df2e0bd3ef4edef5761 |
01-Mar-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to master
|
a787d2020e84f078607832ed109ee4b727fc3a9c |
01-Mar-2012 |
Yuli Huang <yuli@google.com> |
Fix a wrong flag value. Change-Id: I7450dc31bb307b19dcfd34ee7df83126df1d294e
rc/com/android/gallery3d/app/ActivityState.java
|
d83f5f227315cccfe3c23db90c93b5fd7be20597 |
01-Mar-2012 |
Yuli Huang <yuli@google.com> |
Fix a wrong flag value. Change-Id: I7450dc31bb307b19dcfd34ee7df83126df1d294e
rc/com/android/gallery3d/app/ActivityState.java
|
3976dea546ab53e050f2388a0a75916bbcfcd6d0 |
01-Mar-2012 |
Yuli Huang <yuli@google.com> |
Fix b/6064909: Photo might not be snapped back correctly. Photo might not be snapped back if the animation wasn't actually started because of no position/scale changes. Change-Id: I6b5e938bffd954b848cae04514a06d0427151025
rc/com/android/gallery3d/ui/PhotoView.java
rc/com/android/gallery3d/ui/PositionController.java
|
6068de20f4f19ca82ca01bef3b6dda796a79f724 |
01-Mar-2012 |
Yuli Huang <yuli@google.com> |
Fix b/6064909: Photo might not be snapped back correctly. Photo might not be snapped back if the animation wasn't actually started because of no position/scale changes. Change-Id: I6b5e938bffd954b848cae04514a06d0427151025
rc/com/android/gallery3d/ui/PhotoView.java
rc/com/android/gallery3d/ui/PositionController.java
|
5ad2c9f69c5b3bb43596dc7a38e1ec50435a5f90 |
29-Feb-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to master
|
dba5b5b9ac51902e6f7c9f392e671bd3d754ea0d |
29-Feb-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to master
|
12f5c2f8328de87f22a137861393951184af1100 |
29-Feb-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to master
|
75e11d5b2c22efe9c699d5340b365fa9f08da2cd |
23-Feb-2012 |
Yuli Huang <yuli@google.com> |
Fix b/5624131: Panning enlarged photo switches images by mistake. Avoid swiping images when panning to view vertically enlarged photo. Change-Id: Ieb72cb8f38595fbedc927e8a0380fe31532ee434
rc/com/android/gallery3d/ui/PhotoView.java
rc/com/android/gallery3d/ui/PositionController.java
|
2ce3c3bfe08fff5aee58007cc8ba8f4a50861ae2 |
23-Feb-2012 |
Yuli Huang <yuli@google.com> |
Fix b/5624131: Panning enlarged photo switches images by mistake. Avoid swiping images when panning to view vertically enlarged photo. Change-Id: Ieb72cb8f38595fbedc927e8a0380fe31532ee434
rc/com/android/gallery3d/ui/PhotoView.java
rc/com/android/gallery3d/ui/PositionController.java
|
31f124e9f1b068cad2ab17c7486fbb5c0d6fb627 |
29-Feb-2012 |
Ray Chen <raychen@google.com> |
Merge "Fix 5948189 BUG BASH: action bar flashes during multi-select"
|
bf645b65f2799ed4a76676a39145c6510f71f055 |
29-Feb-2012 |
Ray Chen <raychen@google.com> |
Merge "Fix 5948189 BUG BASH: action bar flashes during multi-select"
|
60bcd2f71196ce4b6b4a6f5a13455b2ef0dfdec5 |
20-Feb-2012 |
Ray Chen <raychen@google.com> |
Fix 5948189 BUG BASH: action bar flashes during multi-select This CL fixes the flashing by disabling MenuItem directly instead of setting null intent to ShareActionProvider, so there won't be any "icons shrinking" effect that causes flashing. The rest of the change is code refactoring. More comments are added and the final UI operations are merged into one Runnable object. Change-Id: I73843c1df6b7a9675176e1b3ae6a35cc1cb715fa
rc/com/android/gallery3d/ui/ActionModeHandler.java
|
301ea871a5f3b13adeae5ac1f0a36c86eff228e7 |
20-Feb-2012 |
Ray Chen <raychen@google.com> |
Fix 5948189 BUG BASH: action bar flashes during multi-select This CL fixes the flashing by disabling MenuItem directly instead of setting null intent to ShareActionProvider, so there won't be any "icons shrinking" effect that causes flashing. The rest of the change is code refactoring. More comments are added and the final UI operations are merged into one Runnable object. Change-Id: I73843c1df6b7a9675176e1b3ae6a35cc1cb715fa
rc/com/android/gallery3d/ui/ActionModeHandler.java
|
415c07d5710b3d61a212103d11150f6c960194e4 |
28-Feb-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: If2542a34f7e9e4b999252e8cf98cd2a5a8b9f3d9
es/values-tr/photoeditor_strings.xml
|
a810d85fbf30ac709f1900dcb2c53196ac731aff |
28-Feb-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: If2542a34f7e9e4b999252e8cf98cd2a5a8b9f3d9
es/values-tr/photoeditor_strings.xml
|
893d2585b64cecddd5027755ff4e47f0a960cfbb |
28-Feb-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to master
|
eb80fa2eea035cb3a16156e9e9fa0dd830738286 |
28-Feb-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to master
|
f352996cf1e438678a2f5ba9d7c1397a671da8d1 |
27-Feb-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: Idf31034a533999342bf2452f2e66b6cc0ae4dd7c
es/values-sw/strings.xml
|
2d309bb7e832ab0fd20ddae5115155c6573e0bb9 |
27-Feb-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: Idf31034a533999342bf2452f2e66b6cc0ae4dd7c
es/values-sw/strings.xml
|
88659c1e7e324c3870d6ce8c188ec9d2633b1aaf |
27-Feb-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to master
|
aa2f30a8763d7ef51025decc65c279bbfcbef38a |
27-Feb-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to master
|
14af227fdafc155d7b7058d5a6d76178c87095ab |
27-Feb-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to master
|
c3026d7fa398df377ad9f5f414fe3f4770564874 |
17-Feb-2012 |
Ray Chen <raychen@google.com> |
Fix 5948223 [bug bash] Albums text disappears when exiting gallery Change-Id: Ib787184f747ff30afabc35b16b46950dc3b5b50c
rc/com/android/gallery3d/app/ActivityState.java
rc/com/android/gallery3d/app/AlbumSetPage.java
rc/com/android/gallery3d/app/GalleryActionBar.java
|
fe1625c46f8258be4cd5e5e1ba69b584c1fe1a49 |
17-Feb-2012 |
Ray Chen <raychen@google.com> |
Fix 5948223 [bug bash] Albums text disappears when exiting gallery Change-Id: Ib787184f747ff30afabc35b16b46950dc3b5b50c
rc/com/android/gallery3d/app/ActivityState.java
rc/com/android/gallery3d/app/AlbumSetPage.java
rc/com/android/gallery3d/app/GalleryActionBar.java
|
657f172d9eb7add6745aff1cdb9bc07a4bfff273 |
16-Feb-2012 |
Ray Chen <raychen@google.com> |
Fix 5948410 BUG BASH: Temporarily title is displayed during gallery start Change-Id: I88a67e3e9437124001be836239736a8275c1abf4
rc/com/android/gallery3d/app/ActivityState.java
|
a9bd72c2efc7f7c26c60083d8f00380e60caf94e |
16-Feb-2012 |
Ray Chen <raychen@google.com> |
Fix 5948410 BUG BASH: Temporarily title is displayed during gallery start Change-Id: I88a67e3e9437124001be836239736a8275c1abf4
es/values/styles.xml
rc/com/android/gallery3d/app/ActivityState.java
|
9e8d49b586804b2793057789984ee439a1f909a5 |
16-Feb-2012 |
Ray Chen <raychen@google.com> |
Fix 5948410 BUG BASH: Temporarily title is displayed during gallery start Change-Id: I88a67e3e9437124001be836239736a8275c1abf4
es/values/styles.xml
|
fc0f1d4e6467a80dbbf3181c9e6ccf1a89d21582 |
23-Feb-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to master
|
4d85c89782ae8da78059031668d0da4c7c2cca36 |
23-Feb-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to master
|
23a22e3510d1ef95c67455b3f59025aa985b8542 |
22-Feb-2012 |
Chih-Chung Chang <chihchung@google.com> |
Remove unused code. Change-Id: I167596ab023671651df298ddb2b80b7c782f4223
allerycommon/src/com/android/gallery3d/common/BitmapUtils.java
allerycommon/src/com/android/gallery3d/common/Utils.java
|
980724bab5c59526803b302ccba25a9f50f27d1c |
22-Feb-2012 |
Chih-Chung Chang <chihchung@google.com> |
Remove unused code. Change-Id: I167596ab023671651df298ddb2b80b7c782f4223
allerycommon/src/com/android/gallery3d/common/BitmapUtils.java
allerycommon/src/com/android/gallery3d/common/Utils.java
rc/com/android/gallery3d/anim/AnimationSet.java
rc/com/android/gallery3d/app/AbstractGalleryActivity.java
rc/com/android/gallery3d/app/ActivityState.java
rc/com/android/gallery3d/app/AlbumDataAdapter.java
rc/com/android/gallery3d/app/AlbumPage.java
rc/com/android/gallery3d/app/AlbumSetDataAdapter.java
rc/com/android/gallery3d/app/AlbumSetPage.java
rc/com/android/gallery3d/app/ControllerOverlay.java
rc/com/android/gallery3d/app/FilterUtils.java
rc/com/android/gallery3d/app/GalleryActionBar.java
rc/com/android/gallery3d/app/GalleryActivity.java
rc/com/android/gallery3d/app/GalleryContext.java
rc/com/android/gallery3d/app/MovieControllerOverlay.java
rc/com/android/gallery3d/data/ChangeNotifier.java
rc/com/android/gallery3d/data/DataManager.java
rc/com/android/gallery3d/data/DecodeUtils.java
rc/com/android/gallery3d/data/DownloadCache.java
rc/com/android/gallery3d/data/DownloadUtils.java
rc/com/android/gallery3d/data/Face.java
rc/com/android/gallery3d/data/LocalVideo.java
rc/com/android/gallery3d/data/MediaDetails.java
rc/com/android/gallery3d/data/Path.java
rc/com/android/gallery3d/provider/GalleryProvider.java
rc/com/android/gallery3d/ui/AdaptiveBackground.java
rc/com/android/gallery3d/ui/AlbumSetView.java
rc/com/android/gallery3d/ui/AlbumSlidingWindow.java
rc/com/android/gallery3d/ui/BitmapTileProvider.java
rc/com/android/gallery3d/ui/BoxBlurFilter.java
rc/com/android/gallery3d/ui/Config.java
rc/com/android/gallery3d/ui/CustomMenu.java
rc/com/android/gallery3d/ui/DialogDetailsView.java
rc/com/android/gallery3d/ui/DrawableTexture.java
rc/com/android/gallery3d/ui/FilmStripView.java
rc/com/android/gallery3d/ui/GLCanvas.java
rc/com/android/gallery3d/ui/GLCanvasImpl.java
rc/com/android/gallery3d/ui/GLPaint.java
rc/com/android/gallery3d/ui/GLRoot.java
rc/com/android/gallery3d/ui/GLRootView.java
rc/com/android/gallery3d/ui/GLView.java
rc/com/android/gallery3d/ui/GalleryEGLConfigChooser.java
rc/com/android/gallery3d/ui/Icon.java
rc/com/android/gallery3d/ui/OnSelectedListener.java
rc/com/android/gallery3d/ui/Paper.java
rc/com/android/gallery3d/ui/RawTexture.java
rc/com/android/gallery3d/ui/ScrollBarView.java
rc/com/android/gallery3d/ui/SelectionManager.java
rc/com/android/gallery3d/ui/SlotView.java
rc/com/android/gallery3d/ui/StaticBackground.java
rc/com/android/gallery3d/ui/Texture.java
rc/com/android/gallery3d/util/FutureTask.java
rc/com/android/gallery3d/util/GalleryUtils.java
rc/com/android/gallery3d/util/IdentityCache.java
rc/com/android/gallery3d/util/IntArray.java
rc/com/android/gallery3d/util/JobLimiter.java
rc/com/android/gallery3d/util/LinkedNode.java
rc/com/android/gallery3d/util/UpdateHelper.java
ests/src/com/android/gallery3d/common/UtilsTest.java
ests/src/com/android/gallery3d/ui/GLCanvasStub.java
ests/src/com/android/gallery3d/ui/GLCanvasTest.java
ests/src/com/android/gallery3d/ui/GLViewTest.java
ests/src/com/android/gallery3d/ui/TextureTest.java
|
7b83fb8e3a8978b33a6b9bfc56d85fe2c1a9cf06 |
22-Feb-2012 |
Chih-Chung Chang <chihchung@google.com> |
Remove unused code. Change-Id: I167596ab023671651df298ddb2b80b7c782f4223
allerycommon/src/com/android/gallery3d/common/BitmapUtils.java
allerycommon/src/com/android/gallery3d/common/Utils.java
rc/com/android/gallery3d/anim/AnimationSet.java
rc/com/android/gallery3d/app/AbstractGalleryActivity.java
rc/com/android/gallery3d/app/ActivityState.java
rc/com/android/gallery3d/app/AlbumDataAdapter.java
rc/com/android/gallery3d/app/AlbumPage.java
rc/com/android/gallery3d/app/AlbumSetDataAdapter.java
rc/com/android/gallery3d/app/AlbumSetPage.java
rc/com/android/gallery3d/app/ControllerOverlay.java
rc/com/android/gallery3d/app/FilterUtils.java
rc/com/android/gallery3d/app/GalleryActionBar.java
rc/com/android/gallery3d/app/GalleryActivity.java
rc/com/android/gallery3d/app/GalleryContext.java
rc/com/android/gallery3d/app/MovieControllerOverlay.java
rc/com/android/gallery3d/data/ChangeNotifier.java
rc/com/android/gallery3d/data/DataManager.java
rc/com/android/gallery3d/data/DecodeUtils.java
rc/com/android/gallery3d/data/DownloadCache.java
rc/com/android/gallery3d/data/DownloadUtils.java
rc/com/android/gallery3d/data/Face.java
rc/com/android/gallery3d/data/LocalVideo.java
rc/com/android/gallery3d/data/MediaDetails.java
rc/com/android/gallery3d/data/Path.java
rc/com/android/gallery3d/provider/GalleryProvider.java
rc/com/android/gallery3d/ui/AdaptiveBackground.java
rc/com/android/gallery3d/ui/AlbumSetView.java
rc/com/android/gallery3d/ui/AlbumSlidingWindow.java
rc/com/android/gallery3d/ui/BitmapTileProvider.java
rc/com/android/gallery3d/ui/BoxBlurFilter.java
rc/com/android/gallery3d/ui/Config.java
rc/com/android/gallery3d/ui/CustomMenu.java
rc/com/android/gallery3d/ui/DialogDetailsView.java
rc/com/android/gallery3d/ui/DrawableTexture.java
rc/com/android/gallery3d/ui/FilmStripView.java
rc/com/android/gallery3d/ui/GLCanvas.java
rc/com/android/gallery3d/ui/GLCanvasImpl.java
rc/com/android/gallery3d/ui/GLPaint.java
rc/com/android/gallery3d/ui/GLRoot.java
rc/com/android/gallery3d/ui/GLRootView.java
rc/com/android/gallery3d/ui/GLView.java
rc/com/android/gallery3d/ui/GalleryEGLConfigChooser.java
rc/com/android/gallery3d/ui/Icon.java
rc/com/android/gallery3d/ui/OnSelectedListener.java
rc/com/android/gallery3d/ui/Paper.java
rc/com/android/gallery3d/ui/RawTexture.java
rc/com/android/gallery3d/ui/ScrollBarView.java
rc/com/android/gallery3d/ui/SelectionManager.java
rc/com/android/gallery3d/ui/SlotView.java
rc/com/android/gallery3d/ui/StaticBackground.java
rc/com/android/gallery3d/ui/Texture.java
rc/com/android/gallery3d/util/FutureTask.java
rc/com/android/gallery3d/util/GalleryUtils.java
rc/com/android/gallery3d/util/IdentityCache.java
rc/com/android/gallery3d/util/IntArray.java
rc/com/android/gallery3d/util/JobLimiter.java
rc/com/android/gallery3d/util/LinkedNode.java
rc/com/android/gallery3d/util/UpdateHelper.java
ests/src/com/android/gallery3d/common/UtilsTest.java
ests/src/com/android/gallery3d/ui/GLCanvasStub.java
ests/src/com/android/gallery3d/ui/GLCanvasTest.java
ests/src/com/android/gallery3d/ui/GLViewTest.java
ests/src/com/android/gallery3d/ui/TextureTest.java
|
668db110b923944560c1957e34d4ed57290bfd74 |
22-Feb-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to master
|
722b0741f216ef7bb49188fe1a27057cc88933e9 |
22-Feb-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to master
|
d92874aa026e33a3011a30b6fcc17019f8b1c0be |
17-Feb-2012 |
Chih-Chung Chang <chihchung@google.com> |
Reduce memory allocation and make small improvements. Change-Id: Iac3f302454119de6363cd5cfb158619e739b0536
allerycommon/src/com/android/gallery3d/common/Utils.java
|
be55f1e81c6021cf499c24331088fb01a8db9f91 |
17-Feb-2012 |
Chih-Chung Chang <chihchung@google.com> |
Reduce memory allocation and make small improvements. Change-Id: Iac3f302454119de6363cd5cfb158619e739b0536
allerycommon/src/com/android/gallery3d/common/Utils.java
rc/com/android/gallery3d/app/AlbumPage.java
rc/com/android/gallery3d/ui/AlbumSetSlidingWindow.java
rc/com/android/gallery3d/ui/AlbumSlidingWindow.java
rc/com/android/gallery3d/ui/DialogDetailsView.java
rc/com/android/gallery3d/ui/GLCanvas.java
rc/com/android/gallery3d/ui/GLCanvasImpl.java
ests/src/com/android/gallery3d/ui/GLCanvasStub.java
|
cfa105d3934c4dfa14f02b693bfa97c8d17d56a9 |
17-Feb-2012 |
Chih-Chung Chang <chihchung@google.com> |
Reduce memory allocation and make small improvements. Change-Id: Iac3f302454119de6363cd5cfb158619e739b0536
allerycommon/src/com/android/gallery3d/common/Utils.java
rc/com/android/gallery3d/app/AlbumPage.java
rc/com/android/gallery3d/ui/AlbumSetSlidingWindow.java
rc/com/android/gallery3d/ui/AlbumSlidingWindow.java
rc/com/android/gallery3d/ui/DialogDetailsView.java
rc/com/android/gallery3d/ui/GLCanvas.java
rc/com/android/gallery3d/ui/GLCanvasImpl.java
ests/src/com/android/gallery3d/ui/GLCanvasStub.java
|
097f2cd3481e10534ca2c9c945373dd9adba21a6 |
20-Feb-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to master
|
4ad6c39b38791bd26ebf4bc8f0fa156063b4674c |
20-Feb-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to master
|
bd24cc2d8e98804ebfc10b65d68278d3fe34673e |
20-Feb-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to master
|
eacfc1e850fdb83016a8b4b607909a9c9d8ec407 |
17-Feb-2012 |
Chih-Chung Chang <chihchung@google.com> |
Cache animation time value to reduce work and synchronize animation. Change-Id: I00081bc6037c01dafc56cf017dcc1da448c1d106
rc/com/android/gallery3d/ui/ProgressSpinner.java
|
b3d01963463a11d27c286ffbf7f715f59bbecf88 |
17-Feb-2012 |
Chih-Chung Chang <chihchung@google.com> |
Cache animation time value to reduce work and synchronize animation. Change-Id: I00081bc6037c01dafc56cf017dcc1da448c1d106
rc/com/android/gallery3d/ui/AdaptiveBackground.java
rc/com/android/gallery3d/ui/AnimationTime.java
rc/com/android/gallery3d/ui/CropView.java
rc/com/android/gallery3d/ui/EdgeEffect.java
rc/com/android/gallery3d/ui/GLCanvas.java
rc/com/android/gallery3d/ui/GLCanvasImpl.java
rc/com/android/gallery3d/ui/GLRootView.java
rc/com/android/gallery3d/ui/GLView.java
rc/com/android/gallery3d/ui/ProgressSpinner.java
rc/com/android/gallery3d/ui/SlideshowView.java
rc/com/android/gallery3d/ui/SlotView.java
ests/src/com/android/gallery3d/ui/GLCanvasTest.java
|
7d19f7f4281f232b9dceee4a5df390c03e2bd16b |
17-Feb-2012 |
Chih-Chung Chang <chihchung@google.com> |
Cache animation time value to reduce work and synchronize animation. Change-Id: I00081bc6037c01dafc56cf017dcc1da448c1d106
rc/com/android/gallery3d/ui/AdaptiveBackground.java
rc/com/android/gallery3d/ui/AnimationTime.java
rc/com/android/gallery3d/ui/CropView.java
rc/com/android/gallery3d/ui/EdgeEffect.java
rc/com/android/gallery3d/ui/GLCanvas.java
rc/com/android/gallery3d/ui/GLCanvasImpl.java
rc/com/android/gallery3d/ui/GLRootView.java
rc/com/android/gallery3d/ui/GLView.java
rc/com/android/gallery3d/ui/ProgressSpinner.java
rc/com/android/gallery3d/ui/SlideshowView.java
rc/com/android/gallery3d/ui/SlotView.java
ests/src/com/android/gallery3d/ui/GLCanvasTest.java
|
bb23e88996ed453ec3460d3d3bd470413d06d57c |
16-Feb-2012 |
Chih-Chung Chang <chihchung@google.com> |
Merge "Change from fillRect to clearBuffer for pure black background."
|
7088060138a888df81b68aaf22e79e0d2a10cb44 |
16-Feb-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am 09528ef1: am aa5bdb1a: Reconcile with ics-mr1-release * commit '09528ef10279f3893210ebcebb7a099e58c6c965':
|
463d25089b3be0146cf9e55e3eeb63cc489299f2 |
16-Feb-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am 09528ef1: am aa5bdb1a: Reconcile with ics-mr1-release * commit '09528ef10279f3893210ebcebb7a099e58c6c965':
|
eec271bee6a7af75502bf3f3d7fe327d50ba4017 |
16-Feb-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am be493ca8: am 5e73e2dc: Reconcile with ics-mr1-release * commit 'be493ca826bf56324aef42fbdbda0912539c9a3e':
|
a4e4ff794a98b8b4682297d9c4c525511a5c3778 |
16-Feb-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am be493ca8: am 5e73e2dc: Reconcile with ics-mr1-release * commit 'be493ca826bf56324aef42fbdbda0912539c9a3e':
|
ed0e84d75ed4f75ac9589bb3ea04b7327f8745f2 |
16-Feb-2012 |
Chih-Chung Chang <chihchung@google.com> |
Change from fillRect to clearBuffer for pure black background. Change-Id: Ie3da19b377f3e7926ab37c5936ce48cbb3227f92
rc/com/android/gallery3d/app/AlbumPage.java
rc/com/android/gallery3d/app/AlbumSetPage.java
rc/com/android/gallery3d/app/ManageCachePage.java
rc/com/android/gallery3d/ui/StaticBackground.java
|
ff951a85c3c9015ef7ccd8902e69ce88360a0cb8 |
16-Feb-2012 |
Chih-Chung Chang <chihchung@google.com> |
Change from fillRect to clearBuffer for pure black background. Change-Id: Ie3da19b377f3e7926ab37c5936ce48cbb3227f92
rc/com/android/gallery3d/app/AlbumPage.java
rc/com/android/gallery3d/app/AlbumSetPage.java
rc/com/android/gallery3d/app/ManageCachePage.java
rc/com/android/gallery3d/ui/StaticBackground.java
|
09528ef10279f3893210ebcebb7a099e58c6c965 |
16-Feb-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am aa5bdb1a: Reconcile with ics-mr1-release * commit 'aa5bdb1afac03ece211f0375372fcc7d35e4fbbd':
|
b670a0e3012660b6d14aeea5f8761877fe2b9bc2 |
16-Feb-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am aa5bdb1a: Reconcile with ics-mr1-release * commit 'aa5bdb1afac03ece211f0375372fcc7d35e4fbbd':
|
aa5bdb1afac03ece211f0375372fcc7d35e4fbbd |
16-Feb-2012 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with ics-mr1-release Change-Id: I5fc102975a6f3ef9fe1fa8c73260b9571dce0e1a
|
30f0333be19c6e5c023c214bae17842bc3d54867 |
16-Feb-2012 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with ics-mr1-release Change-Id: I5fc102975a6f3ef9fe1fa8c73260b9571dce0e1a
|
4dc71441ff27a5250e16a7cb3c0e5aab2a599c72 |
16-Feb-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am 5e73e2dc: Reconcile with ics-mr1-release * commit '5e73e2dcb3cea2d87a4c82c7e89919b3c766d3b0':
|
be493ca826bf56324aef42fbdbda0912539c9a3e |
16-Feb-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am 5e73e2dc: Reconcile with ics-mr1-release * commit '5e73e2dcb3cea2d87a4c82c7e89919b3c766d3b0':
|
5e73e2dcb3cea2d87a4c82c7e89919b3c766d3b0 |
16-Feb-2012 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with ics-mr1-release Change-Id: I3b1152bc0e20e7097af445995283581c655e3f2b
|
36e70f6e0895b9666cfab196fccf0d26dc25b75b |
16-Feb-2012 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with ics-mr1-release Change-Id: I3b1152bc0e20e7097af445995283581c655e3f2b
|
3950038a697470bb8b7cd6798716aecd8285eb00 |
16-Feb-2012 |
Chih-Chung Chang <chihchung@google.com> |
Simplify the reference from textures to GLCanvas. Change-Id: Ia64e60ec4b920b707148f7c2b9373ce484a52d9f
rc/com/android/gallery3d/ui/BasicTexture.java
rc/com/android/gallery3d/ui/GLRootView.java
rc/com/android/gallery3d/ui/NinePatchTexture.java
rc/com/android/gallery3d/ui/RawTexture.java
|
5b01ee731c6acbcef657746a23d5cfde2251ab7e |
16-Feb-2012 |
Chih-Chung Chang <chihchung@google.com> |
Simplify the reference from textures to GLCanvas. Change-Id: Ia64e60ec4b920b707148f7c2b9373ce484a52d9f
rc/com/android/gallery3d/ui/BasicTexture.java
rc/com/android/gallery3d/ui/GLRootView.java
rc/com/android/gallery3d/ui/NinePatchTexture.java
rc/com/android/gallery3d/ui/RawTexture.java
|
9d614b4433b9cd55bc19aaf3d4cf39f78c14e27f |
16-Feb-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to master
|
d84d3816a70b0457d63ee6ab731dec7c50c82b12 |
16-Feb-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to master
|
c7a1328f5321c2325ebca5c65dfd0e74f3d24420 |
16-Feb-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to master
|
93753e11e2d80eb9e035178fac87b523c5ef3108 |
16-Feb-2012 |
Chih-Chung Chang <chihchung@google.com> |
Make GLCanvas a bit faster. (1) make a faster version of translate(x, y). (2) make mapPoints() faster. (3) avoid calling canvas.rotate() when it is not needed. Change-Id: I364e2aa3fc9ee81c43f42f3af8b2d30a1241b482
rc/com/android/gallery3d/ui/ProgressSpinner.java
|
174cac8f92029fc2829c94f274e70793ae948931 |
16-Feb-2012 |
Chih-Chung Chang <chihchung@google.com> |
Make GLCanvas a bit faster. (1) make a faster version of translate(x, y). (2) make mapPoints() faster. (3) avoid calling canvas.rotate() when it is not needed. Change-Id: I364e2aa3fc9ee81c43f42f3af8b2d30a1241b482
rc/com/android/gallery3d/ui/GLCanvas.java
rc/com/android/gallery3d/ui/GLCanvasImpl.java
rc/com/android/gallery3d/ui/GLView.java
rc/com/android/gallery3d/ui/PhotoView.java
rc/com/android/gallery3d/ui/ProgressSpinner.java
rc/com/android/gallery3d/ui/SlideshowView.java
rc/com/android/gallery3d/ui/SlotView.java
rc/com/android/gallery3d/ui/TileImageView.java
ests/src/com/android/gallery3d/ui/GLCanvasStub.java
|
3f43ecbb1b7c8f24c9a6e3d6b9807a1d0ef2f2ab |
16-Feb-2012 |
Chih-Chung Chang <chihchung@google.com> |
Make GLCanvas a bit faster. (1) make a faster version of translate(x, y). (2) make mapPoints() faster. (3) avoid calling canvas.rotate() when it is not needed. Change-Id: I364e2aa3fc9ee81c43f42f3af8b2d30a1241b482
rc/com/android/gallery3d/ui/GLCanvas.java
rc/com/android/gallery3d/ui/GLCanvasImpl.java
rc/com/android/gallery3d/ui/GLView.java
rc/com/android/gallery3d/ui/PhotoView.java
rc/com/android/gallery3d/ui/ProgressSpinner.java
rc/com/android/gallery3d/ui/SlideshowView.java
rc/com/android/gallery3d/ui/SlotView.java
rc/com/android/gallery3d/ui/TileImageView.java
ests/src/com/android/gallery3d/ui/GLCanvasStub.java
|
5c488b930f229f1fae57a43321c8f8886d6939ab |
15-Feb-2012 |
Chih-Chung Chang <chihchung@google.com> |
Merge "Try to use less of "Long" to make the program faster."
|
ad21fbed030fa8c80b65ad6b6866a3e944f24e4f |
15-Feb-2012 |
Chih-Chung Chang <chihchung@google.com> |
Try to use less of "Long" to make the program faster. Change-Id: I6adb870a8f2bca97318d0fbb6f42388aef4c19c1
rc/com/android/gallery3d/app/AlbumPage.java
rc/com/android/gallery3d/app/AlbumSetPage.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/ui/AbstractDisplayItem.java
rc/com/android/gallery3d/ui/AlbumSetSlidingWindow.java
rc/com/android/gallery3d/ui/DisplayItem.java
rc/com/android/gallery3d/ui/NinePatchTexture.java
rc/com/android/gallery3d/ui/PhotoView.java
rc/com/android/gallery3d/ui/PositionProvider.java
rc/com/android/gallery3d/ui/PositionRepository.java
rc/com/android/gallery3d/ui/TileImageView.java
|
95018d10aa68ecbea7ebce434733341a642510de |
15-Feb-2012 |
Chih-Chung Chang <chihchung@google.com> |
Try to use less of "Long" to make the program faster. Change-Id: I6adb870a8f2bca97318d0fbb6f42388aef4c19c1
rc/com/android/gallery3d/app/AlbumPage.java
rc/com/android/gallery3d/app/AlbumSetPage.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/ui/AbstractDisplayItem.java
rc/com/android/gallery3d/ui/AlbumSetSlidingWindow.java
rc/com/android/gallery3d/ui/DisplayItem.java
rc/com/android/gallery3d/ui/NinePatchTexture.java
rc/com/android/gallery3d/ui/PhotoView.java
rc/com/android/gallery3d/ui/PositionProvider.java
rc/com/android/gallery3d/ui/PositionRepository.java
rc/com/android/gallery3d/ui/TileImageView.java
|
c63dcc97275776aacdc4ec2b3bfeb51af5db8862 |
15-Feb-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to master
|
d2ff0863a2c70ae462712ddbd370523260d8853b |
15-Feb-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to master
|
24955d2b7ce43127d168e474209bb59444756fee |
15-Feb-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to master
|
a66c0c1b4545131a78b6760d7c8ce6e09dd5e1f5 |
14-Feb-2012 |
The Android Automerger <android-build@android.com> |
merge in ics-mr1-release history after reset to ics-mr1
|
203290beb19aac56a2bfadcca876f853a2e80023 |
14-Feb-2012 |
The Android Automerger <android-build@android.com> |
merge in ics-mr1-release history after reset to ics-mr1
|
a0d2e4353c954837d3ee2b23f56a449c20a1b49d |
14-Feb-2012 |
Eric Fischer <enf@google.com> |
Import translations. Change-Id: I958b1d3318cbf5a8840ba8053ac748f1d96a7eff
es/values-ca/strings.xml
|
8700bfa0f30dd36fcd7877ed6975e1b13c7c20cc |
14-Feb-2012 |
Eric Fischer <enf@google.com> |
Import translations. Change-Id: I958b1d3318cbf5a8840ba8053ac748f1d96a7eff
es/values-ca/strings.xml
|
9441606bf600a13fbbe2b89f24d185dc37e801de |
14-Feb-2012 |
Chih-Chung Chang <chihchung@google.com> |
am eeda756e: Merge "Add profiling tools." * commit 'eeda756e6efb58710916d614a4c79437df25e380': Add profiling tools.
|
cfc4fcf32e99ea142c7ead90a3e246f26684e75b |
14-Feb-2012 |
Chih-Chung Chang <chihchung@google.com> |
Merge "Add profiling tools."
|
eeda756e6efb58710916d614a4c79437df25e380 |
14-Feb-2012 |
Chih-Chung Chang <chihchung@google.com> |
Merge "Add profiling tools."
|
562189f282e8b1fb65e13392ca24fd9d03e34f92 |
14-Feb-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to master
|
8ac9032842e826fa0a933909713d04c3008aeb1d |
14-Feb-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to master
|
c63a167cf489db8aa24052add8f68fdb8bff8d54 |
14-Feb-2012 |
Yuli Huang <yuli@google.com> |
am a431626b: Merge "Fix b/5948042: Incorrect scrolling position after deleting pictures." * commit 'a431626bba8c6441fe0ee007e9d950b47f06ad96': Fix b/5948042: Incorrect scrolling position after deleting pictures.
|
490ed6f3ea8fd90f78719f94ad403c0532ccad64 |
14-Feb-2012 |
Yuli Huang <yuli@google.com> |
Merge "Fix b/5948042: Incorrect scrolling position after deleting pictures."
|
a431626bba8c6441fe0ee007e9d950b47f06ad96 |
14-Feb-2012 |
Yuli Huang <yuli@google.com> |
Merge "Fix b/5948042: Incorrect scrolling position after deleting pictures."
|
99d437c1e7521225844385be99dd81c0a43b3489 |
03-Feb-2012 |
Chih-Chung Chang <chihchung@google.com> |
Add profiling tools. Change-Id: Ieab118ededaab5ef46408fac6fdb66b9fff4900e
ests/Android.mk
|
a9293180184b57a47110f1b3b9e3bc6ff0b2f9bf |
03-Feb-2012 |
Chih-Chung Chang <chihchung@google.com> |
Add profiling tools. Change-Id: Ieab118ededaab5ef46408fac6fdb66b9fff4900e
rc/com/android/gallery3d/ui/GLRootView.java
rc/com/android/gallery3d/util/Profile.java
rc/com/android/gallery3d/util/ProfileData.java
ests/src/com/android/gallery3d/util/ProfileTest.java
|
3d238a7a19b1010578709c63f86e12b2bce0e4fc |
03-Feb-2012 |
Chih-Chung Chang <chihchung@google.com> |
Add profiling tools. Change-Id: Ieab118ededaab5ef46408fac6fdb66b9fff4900e
rc/com/android/gallery3d/ui/GLRootView.java
rc/com/android/gallery3d/util/Profile.java
rc/com/android/gallery3d/util/ProfileData.java
ests/Android.mk
ests/src/com/android/gallery3d/util/ProfileTest.java
|
85c149f85c446026d76f11d1d0ec78aea37843b9 |
13-Feb-2012 |
Chih-Chung Chang <chihchung@google.com> |
am 7f10c153: Merge "Use FloatMath instead of Math." * commit '7f10c1533e087b528f58294edaba18726e350103': Use FloatMath instead of Math.
|
82e43c4a00ccc2c660c8c5b130ef5bc6f4f9e84a |
13-Feb-2012 |
Chih-Chung Chang <chihchung@google.com> |
Merge "Use FloatMath instead of Math."
|
7f10c1533e087b528f58294edaba18726e350103 |
13-Feb-2012 |
Chih-Chung Chang <chihchung@google.com> |
Merge "Use FloatMath instead of Math."
|
ca5b87028cf6d45544951fb04d0d7c0b26ffc39a |
13-Feb-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to master
|
31d3500c83abb4750652634216d245fd150c66aa |
13-Feb-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to master
|
c7c38375bfef6cbfb6ce5673242087fde76690f2 |
13-Feb-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to master
|
b8e94ce6214b79992bb4dcb4e61a44ad97908b80 |
13-Feb-2012 |
Yuli Huang <yuli@google.com> |
Fix b/5948042: Incorrect scrolling position after deleting pictures. Scrolling position may not be updated correctly after deleting some pictures. Change-Id: I82de2cf1178ed1f97e48162a0e3bdf00a34d9bad
rc/com/android/gallery3d/ui/SlotView.java
|
189e21a31f1c520b2802f734a53a37e5f3b455f4 |
13-Feb-2012 |
Yuli Huang <yuli@google.com> |
Fix b/5948042: Incorrect scrolling position after deleting pictures. Scrolling position may not be updated correctly after deleting some pictures. Change-Id: I82de2cf1178ed1f97e48162a0e3bdf00a34d9bad
rc/com/android/gallery3d/ui/SlotView.java
|
4a561d9410105830b06a66378dfbd73320d89d9f |
11-Feb-2012 |
Pin Ting <pinting@google.com> |
am fef6691d: Merge "Shows video filename read from OpenableColumns." * commit 'fef6691d870711d8cdaf3ac14b24e5a7c6496b6f': Shows video filename read from OpenableColumns.
|
fcd5b3547c69164dcf3c85536a9ae2b25e31010b |
11-Feb-2012 |
Pin Ting <pinting@google.com> |
Merge "Shows video filename read from OpenableColumns."
|
fef6691d870711d8cdaf3ac14b24e5a7c6496b6f |
11-Feb-2012 |
Pin Ting <pinting@google.com> |
Merge "Shows video filename read from OpenableColumns."
|
c20bc57295c1b4b73ea65701a94efaf519955351 |
11-Feb-2012 |
Chih-Chung Chang <chihchung@google.com> |
Use FloatMath instead of Math. Change-Id: I41661b231f6c034dbca6af26d5950eda6c5fc7da
allerycommon/src/com/android/gallery3d/common/BitmapUtils.java
|
4e05190c04eab6f4700c557ae488f3d7e344d29c |
11-Feb-2012 |
Chih-Chung Chang <chihchung@google.com> |
Use FloatMath instead of Math. Change-Id: I41661b231f6c034dbca6af26d5950eda6c5fc7da
allerycommon/src/com/android/gallery3d/common/BitmapUtils.java
rc/com/android/gallery3d/app/CropImage.java
rc/com/android/gallery3d/app/EyePosition.java
rc/com/android/gallery3d/data/LocationClustering.java
rc/com/android/gallery3d/photoeditor/RendererUtils.java
rc/com/android/gallery3d/ui/AlbumSetSlidingWindow.java
rc/com/android/gallery3d/ui/AlbumSlidingWindow.java
rc/com/android/gallery3d/ui/CropView.java
rc/com/android/gallery3d/ui/PositionController.java
rc/com/android/gallery3d/ui/StringTexture.java
rc/com/android/gallery3d/ui/TileImageView.java
|
fd91413ab46e2960803a33652025aebe3e05f2d9 |
11-Feb-2012 |
Chih-Chung Chang <chihchung@google.com> |
Use FloatMath instead of Math. Change-Id: I41661b231f6c034dbca6af26d5950eda6c5fc7da
allerycommon/src/com/android/gallery3d/common/BitmapUtils.java
rc/com/android/gallery3d/app/CropImage.java
rc/com/android/gallery3d/app/EyePosition.java
rc/com/android/gallery3d/data/LocationClustering.java
rc/com/android/gallery3d/photoeditor/RendererUtils.java
rc/com/android/gallery3d/ui/AlbumSetSlidingWindow.java
rc/com/android/gallery3d/ui/AlbumSlidingWindow.java
rc/com/android/gallery3d/ui/CropView.java
rc/com/android/gallery3d/ui/PositionController.java
rc/com/android/gallery3d/ui/StringTexture.java
rc/com/android/gallery3d/ui/TileImageView.java
|
f0e2547881f2f6b767377a018c492119173d8df8 |
11-Feb-2012 |
Chih-Chung Chang <chihchung@google.com> |
am 4a9c58cb: Merge "Revert "Use FloatMath instead of Math."" * commit '4a9c58cb0029a4ea96c2ade614c265805d699179': Revert "Use FloatMath instead of Math."
|
3d2225f6b0ff7f65620feaa283415a045718ffeb |
11-Feb-2012 |
Chih-Chung Chang <chihchung@google.com> |
Merge "Revert "Use FloatMath instead of Math.""
|
4a9c58cb0029a4ea96c2ade614c265805d699179 |
11-Feb-2012 |
Chih-Chung Chang <chihchung@google.com> |
Merge "Revert "Use FloatMath instead of Math.""
|
fa0c5fdbb402442fe8a39ecacb994a8be2750d68 |
11-Feb-2012 |
Chih-Chung Chang <chihchung@google.com> |
Revert "Use FloatMath instead of Math." This reverts commit 6bb8b2eb8695c042798f0eb798032cd30d642a65
allerycommon/src/com/android/gallery3d/common/BitmapUtils.java
|
1e33de955973996db59f08db6b843d9cd732c631 |
11-Feb-2012 |
Chih-Chung Chang <chihchung@google.com> |
Revert "Use FloatMath instead of Math." This reverts commit 6bb8b2eb8695c042798f0eb798032cd30d642a65
allerycommon/src/com/android/gallery3d/common/BitmapUtils.java
rc/com/android/gallery3d/app/CropImage.java
rc/com/android/gallery3d/app/EyePosition.java
rc/com/android/gallery3d/data/LocationClustering.java
rc/com/android/gallery3d/photoeditor/RendererUtils.java
rc/com/android/gallery3d/ui/AlbumSetSlidingWindow.java
rc/com/android/gallery3d/ui/AlbumSlidingWindow.java
rc/com/android/gallery3d/ui/CropView.java
rc/com/android/gallery3d/ui/PositionController.java
rc/com/android/gallery3d/ui/StringTexture.java
rc/com/android/gallery3d/ui/TileImageView.java
|
3e7cfd9d20f9e9830dddac7288d4d12c8839fba0 |
11-Feb-2012 |
Chih-Chung Chang <chihchung@google.com> |
Revert "Use FloatMath instead of Math." This reverts commit 6bb8b2eb8695c042798f0eb798032cd30d642a65
allerycommon/src/com/android/gallery3d/common/BitmapUtils.java
rc/com/android/gallery3d/app/CropImage.java
rc/com/android/gallery3d/app/EyePosition.java
rc/com/android/gallery3d/data/LocationClustering.java
rc/com/android/gallery3d/photoeditor/RendererUtils.java
rc/com/android/gallery3d/ui/AlbumSetSlidingWindow.java
rc/com/android/gallery3d/ui/AlbumSlidingWindow.java
rc/com/android/gallery3d/ui/CropView.java
rc/com/android/gallery3d/ui/PositionController.java
rc/com/android/gallery3d/ui/StringTexture.java
rc/com/android/gallery3d/ui/TileImageView.java
|
60bd15349d3f65e54fe692718211617d6acf5965 |
11-Feb-2012 |
Chih-Chung Chang <chihchung@google.com> |
am af4724e9: Merge "Use FloatMath instead of Math." * commit 'af4724e9fe7f0b6636c1c90219283c37acbee45b': Use FloatMath instead of Math.
|
fc2301b560b161c9e7645a4363ef4f71d155b38b |
11-Feb-2012 |
Chih-Chung Chang <chihchung@google.com> |
Merge "Use FloatMath instead of Math."
|
af4724e9fe7f0b6636c1c90219283c37acbee45b |
11-Feb-2012 |
Chih-Chung Chang <chihchung@google.com> |
Merge "Use FloatMath instead of Math."
|
1173fd0aa3f8fcd5fedbf790a996619a3cbf11f5 |
11-Feb-2012 |
Chih-Chung Chang <chihchung@google.com> |
Use FloatMath instead of Math. Change-Id: I26eb6a554f72c13ba2801ce35ef0cf2a1466a97b
allerycommon/src/com/android/gallery3d/common/BitmapUtils.java
|
e1e40b31bfce1885fb96edd1f92016cd73077d36 |
11-Feb-2012 |
Chih-Chung Chang <chihchung@google.com> |
Use FloatMath instead of Math. Change-Id: I26eb6a554f72c13ba2801ce35ef0cf2a1466a97b
allerycommon/src/com/android/gallery3d/common/BitmapUtils.java
rc/com/android/gallery3d/app/CropImage.java
rc/com/android/gallery3d/app/EyePosition.java
rc/com/android/gallery3d/data/LocationClustering.java
rc/com/android/gallery3d/photoeditor/RendererUtils.java
rc/com/android/gallery3d/ui/AlbumSetSlidingWindow.java
rc/com/android/gallery3d/ui/AlbumSlidingWindow.java
rc/com/android/gallery3d/ui/CropView.java
rc/com/android/gallery3d/ui/PositionController.java
rc/com/android/gallery3d/ui/StringTexture.java
rc/com/android/gallery3d/ui/TileImageView.java
|
6bb8b2eb8695c042798f0eb798032cd30d642a65 |
11-Feb-2012 |
Chih-Chung Chang <chihchung@google.com> |
Use FloatMath instead of Math. Change-Id: I26eb6a554f72c13ba2801ce35ef0cf2a1466a97b
allerycommon/src/com/android/gallery3d/common/BitmapUtils.java
rc/com/android/gallery3d/app/CropImage.java
rc/com/android/gallery3d/app/EyePosition.java
rc/com/android/gallery3d/data/LocationClustering.java
rc/com/android/gallery3d/photoeditor/RendererUtils.java
rc/com/android/gallery3d/ui/AlbumSetSlidingWindow.java
rc/com/android/gallery3d/ui/AlbumSlidingWindow.java
rc/com/android/gallery3d/ui/CropView.java
rc/com/android/gallery3d/ui/PositionController.java
rc/com/android/gallery3d/ui/StringTexture.java
rc/com/android/gallery3d/ui/TileImageView.java
|
72a973bffbeaf9e9d6ef9bccf1f34e60c6d6b735 |
10-Feb-2012 |
Pin Ting <pinting@google.com> |
Shows video filename read from OpenableColumns. bug:5796182 Change-Id: I92bc652d713bcc70b5a048f5948dc17e90a5e874
rc/com/android/gallery3d/app/Gallery.java
rc/com/android/gallery3d/app/MovieActivity.java
|
4ba06f02e9182160ce155871cbd088919b0ac0c6 |
10-Feb-2012 |
Pin Ting <pinting@google.com> |
Shows video filename read from OpenableColumns. bug:5796182 Change-Id: I92bc652d713bcc70b5a048f5948dc17e90a5e874
rc/com/android/gallery3d/app/Gallery.java
rc/com/android/gallery3d/app/MovieActivity.java
|
60b9b323957b8b85e47f13035cc1b9444682a322 |
10-Feb-2012 |
Justin Ho <justinho@google.com> |
am 164bd217: am 35659b2c: (-s ours) am 70992e04: (-s ours) am a64072a4: Merge "Import translations. DO NOT MERGE" into ics-mr1 * commit '164bd217f574f68e9f3b03ed59b34842cacf4ca5':
|
e57f497779a1d93922b0fd1e47599a35eb5c4945 |
10-Feb-2012 |
Justin Ho <justinho@google.com> |
am 164bd217: am 35659b2c: (-s ours) am 70992e04: (-s ours) am a64072a4: Merge "Import translations. DO NOT MERGE" into ics-mr1 * commit '164bd217f574f68e9f3b03ed59b34842cacf4ca5':
|
939450be2d5afa78baeefefa83008ec3ed1aeff8 |
10-Feb-2012 |
Justin Ho <justinho@google.com> |
am 35659b2c: (-s ours) am 70992e04: (-s ours) am a64072a4: Merge "Import translations. DO NOT MERGE" into ics-mr1 * commit '35659b2c06a70381b462f1e7029eda13aa5e97d6':
|
164bd217f574f68e9f3b03ed59b34842cacf4ca5 |
10-Feb-2012 |
Justin Ho <justinho@google.com> |
am 35659b2c: (-s ours) am 70992e04: (-s ours) am a64072a4: Merge "Import translations. DO NOT MERGE" into ics-mr1 * commit '35659b2c06a70381b462f1e7029eda13aa5e97d6':
|
dc97617758502c4f7bd888bacdee2012fe362be7 |
10-Feb-2012 |
Justin Ho <justinho@google.com> |
am b09b9bd0: am c2bc46ea: (-s ours) am 4e1e57fd: am a64072a4: Merge "Import translations. DO NOT MERGE" into ics-mr1 * commit 'b09b9bd0af11a5985c8854e9161c8e0a9637486f': Import translations. DO NOT MERGE
|
b288f1e8c20f3f3b99222030858e89ee6e6ffe0f |
10-Feb-2012 |
Justin Ho <justinho@google.com> |
am b09b9bd0: am c2bc46ea: (-s ours) am 4e1e57fd: am a64072a4: Merge "Import translations. DO NOT MERGE" into ics-mr1 * commit 'b09b9bd0af11a5985c8854e9161c8e0a9637486f': Import translations. DO NOT MERGE
|
905cd51b0a8f9481ff51521d0bbad79d461bab1d |
10-Feb-2012 |
Eric Fischer <enf@google.com> |
am c2661be5: am ee7512d6: (-s ours) Merge branch \'ics-scoop-plus-aosp\' of ssh://android-git:29418/platform/packages/apps/Gallery2 into ics-scoop-plus-aosp * commit 'c2661be5d5531cc70cf3f4c9387b4ac0cde5f0e5':
|
274b3aaf97d174ef2ff078e2fdee4a10ee0f5c97 |
10-Feb-2012 |
Eric Fischer <enf@google.com> |
am c2661be5: am ee7512d6: (-s ours) Merge branch \'ics-scoop-plus-aosp\' of ssh://android-git:29418/platform/packages/apps/Gallery2 into ics-scoop-plus-aosp * commit 'c2661be5d5531cc70cf3f4c9387b4ac0cde5f0e5':
|
f55a5f9ae24936289e39bd6a9ccdf1889bac6807 |
10-Feb-2012 |
Eric Fischer <enf@google.com> |
am d46c2b12: am 4707351e: (-s ours) am 3293fee0: am dfeefe6a: Import translations. DO NOT MERGE * commit 'd46c2b121f0f544d186e0ecd55a2e492bbd7465f': Import translations. DO NOT MERGE
|
8a74af111b7a2b35aaad92567426d37f58de2b4b |
10-Feb-2012 |
Eric Fischer <enf@google.com> |
am d46c2b12: am 4707351e: (-s ours) am 3293fee0: am dfeefe6a: Import translations. DO NOT MERGE * commit 'd46c2b121f0f544d186e0ecd55a2e492bbd7465f': Import translations. DO NOT MERGE
|
65155f43cc57dab34f08800f78519dbbb0515285 |
10-Feb-2012 |
Justin Ho <justinho@google.com> |
am c2bc46ea: (-s ours) am 4e1e57fd: am a64072a4: Merge "Import translations. DO NOT MERGE" into ics-mr1 * commit 'c2bc46ea31e7ec145f11ba7a7d5f5891ad0c50ac': Import translations. DO NOT MERGE
|
b09b9bd0af11a5985c8854e9161c8e0a9637486f |
10-Feb-2012 |
Justin Ho <justinho@google.com> |
am c2bc46ea: (-s ours) am 4e1e57fd: am a64072a4: Merge "Import translations. DO NOT MERGE" into ics-mr1 * commit 'c2bc46ea31e7ec145f11ba7a7d5f5891ad0c50ac': Import translations. DO NOT MERGE
|
e7b065221f7b6511bb0647d6643db9b40c9caa0a |
10-Feb-2012 |
Eric Fischer <enf@google.com> |
am ee7512d6: (-s ours) Merge branch \'ics-scoop-plus-aosp\' of ssh://android-git:29418/platform/packages/apps/Gallery2 into ics-scoop-plus-aosp * commit 'ee7512d63a1ea117b7655f28ea30bcb1d8cb151d':
|
c2661be5d5531cc70cf3f4c9387b4ac0cde5f0e5 |
10-Feb-2012 |
Eric Fischer <enf@google.com> |
am ee7512d6: (-s ours) Merge branch \'ics-scoop-plus-aosp\' of ssh://android-git:29418/platform/packages/apps/Gallery2 into ics-scoop-plus-aosp * commit 'ee7512d63a1ea117b7655f28ea30bcb1d8cb151d':
|
bbb053c014c7b622c221896ff6da3765901f3952 |
10-Feb-2012 |
Justin Ho <justinho@google.com> |
am 70992e04: (-s ours) am a64072a4: Merge "Import translations. DO NOT MERGE" into ics-mr1 * commit '70992e04d00e6708d33adbb7c016499b6e030d68':
|
35659b2c06a70381b462f1e7029eda13aa5e97d6 |
10-Feb-2012 |
Justin Ho <justinho@google.com> |
am 70992e04: (-s ours) am a64072a4: Merge "Import translations. DO NOT MERGE" into ics-mr1 * commit '70992e04d00e6708d33adbb7c016499b6e030d68':
|
0502c51b475c8573b4aaf107055c966936466f15 |
10-Feb-2012 |
Eric Fischer <enf@google.com> |
am 4707351e: (-s ours) am 3293fee0: am dfeefe6a: Import translations. DO NOT MERGE * commit '4707351e0baec6326e6c74b5c184a66552929c3b': Import translations. DO NOT MERGE
|
d46c2b121f0f544d186e0ecd55a2e492bbd7465f |
10-Feb-2012 |
Eric Fischer <enf@google.com> |
am 4707351e: (-s ours) am 3293fee0: am dfeefe6a: Import translations. DO NOT MERGE * commit '4707351e0baec6326e6c74b5c184a66552929c3b': Import translations. DO NOT MERGE
|
b569efce0192f8d4390ec3ba48d199f0f8c68241 |
10-Feb-2012 |
Justin Ho <justinho@google.com> |
am 4e1e57fd: am a64072a4: Merge "Import translations. DO NOT MERGE" into ics-mr1 * commit '4e1e57fdba6999cb46f1f72eb529ffbb68be83a6': Import translations. DO NOT MERGE
|
c2bc46ea31e7ec145f11ba7a7d5f5891ad0c50ac |
10-Feb-2012 |
Justin Ho <justinho@google.com> |
am 4e1e57fd: am a64072a4: Merge "Import translations. DO NOT MERGE" into ics-mr1 * commit '4e1e57fdba6999cb46f1f72eb529ffbb68be83a6': Import translations. DO NOT MERGE
|
079873e0b0bdfca1ee82b935b43470580bf28790 |
10-Feb-2012 |
Justin Ho <justinho@google.com> |
am a64072a4: Merge "Import translations. DO NOT MERGE" into ics-mr1 * commit 'a64072a481580cbe3f3166f0c6d4424b20f1275c': Import translations. DO NOT MERGE
|
f9abde7a728b5572f9e1c6187f98e84d1db42ae0 |
10-Feb-2012 |
Justin Ho <justinho@google.com> |
am a64072a4: Merge "Import translations. DO NOT MERGE" into ics-mr1 * commit 'a64072a481580cbe3f3166f0c6d4424b20f1275c': Import translations. DO NOT MERGE
|
70992e04d00e6708d33adbb7c016499b6e030d68 |
10-Feb-2012 |
Justin Ho <justinho@google.com> |
am a64072a4: Merge "Import translations. DO NOT MERGE" into ics-mr1 * commit 'a64072a481580cbe3f3166f0c6d4424b20f1275c': Import translations. DO NOT MERGE
|
5ab398eaa77cf7e486f9ecb71b87fb7785a14e57 |
10-Feb-2012 |
Justin Ho <justinho@google.com> |
am a64072a4: Merge "Import translations. DO NOT MERGE" into ics-mr1 * commit 'a64072a481580cbe3f3166f0c6d4424b20f1275c': Import translations. DO NOT MERGE
|
b87d5556c27552eeaaf66bb4a47abbf6a66c0d31 |
10-Feb-2012 |
Eric Fischer <enf@google.com> |
Merge branch 'ics-scoop-plus-aosp' of ssh://android-git:29418/platform/packages/apps/Gallery2 into ics-scoop-plus-aosp
|
ee7512d63a1ea117b7655f28ea30bcb1d8cb151d |
10-Feb-2012 |
Eric Fischer <enf@google.com> |
Merge branch 'ics-scoop-plus-aosp' of ssh://android-git:29418/platform/packages/apps/Gallery2 into ics-scoop-plus-aosp
|
4707351e0baec6326e6c74b5c184a66552929c3b |
10-Feb-2012 |
Eric Fischer <enf@google.com> |
am 3293fee0: am dfeefe6a: Import translations. DO NOT MERGE * commit '3293fee0e28ee082b91e171ae83c2dde6af2c036': Import translations. DO NOT MERGE
|
a9fc9b3e78d087a1c1c8753e36d12178df3f1fa0 |
10-Feb-2012 |
Eric Fischer <enf@google.com> |
am 3f9bc412: (-s ours) am dfeefe6a: Import translations. DO NOT MERGE * commit '3f9bc4128e2f59cef855863dcb71de5d0ecaf69b': Import translations. DO NOT MERGE
es/values-da/strings.xml
es/values-de/strings.xml
es/values-es-rUS/strings.xml
es/values-rm/strings.xml
es/values-ru/strings.xml
es/values-sw/strings.xml
es/values-vi/strings.xml
es/values-zu/strings.xml
|
fa47c9ec46f45db55fe4b45ac4c5c3036c6be82c |
10-Feb-2012 |
Eric Fischer <enf@google.com> |
am 3f9bc412: (-s ours) am dfeefe6a: Import translations. DO NOT MERGE * commit '3f9bc4128e2f59cef855863dcb71de5d0ecaf69b': Import translations. DO NOT MERGE
|
4e1e57fdba6999cb46f1f72eb529ffbb68be83a6 |
10-Feb-2012 |
Justin Ho <justinho@google.com> |
am a64072a4: Merge "Import translations. DO NOT MERGE" into ics-mr1 * commit 'a64072a481580cbe3f3166f0c6d4424b20f1275c': Import translations. DO NOT MERGE
|
f30132801cfcc08fef8f9be4f2433a886425d275 |
10-Feb-2012 |
Justin Ho <justinho@google.com> |
am a64072a4: Merge "Import translations. DO NOT MERGE" into ics-mr1 * commit 'a64072a481580cbe3f3166f0c6d4424b20f1275c': Import translations. DO NOT MERGE
|
a64072a481580cbe3f3166f0c6d4424b20f1275c |
10-Feb-2012 |
Justin Ho <justinho@google.com> |
Merge "Import translations. DO NOT MERGE" into ics-mr1
|
167540a82c6ed9e75d9b07310d89a6863b20b6b4 |
10-Feb-2012 |
Justin Ho <justinho@google.com> |
Merge "Import translations. DO NOT MERGE" into ics-mr1
|
8bb372d8c259cf62214182c780ccbe73f37875a7 |
10-Feb-2012 |
Eric Fischer <enf@google.com> |
am dfeefe6a: Import translations. DO NOT MERGE * commit 'dfeefe6a7a3ede9735c9f90dae99d5e354b621b7': Import translations. DO NOT MERGE
|
3293fee0e28ee082b91e171ae83c2dde6af2c036 |
10-Feb-2012 |
Eric Fischer <enf@google.com> |
am dfeefe6a: Import translations. DO NOT MERGE * commit 'dfeefe6a7a3ede9735c9f90dae99d5e354b621b7': Import translations. DO NOT MERGE
|
3f9bc4128e2f59cef855863dcb71de5d0ecaf69b |
10-Feb-2012 |
Eric Fischer <enf@google.com> |
am dfeefe6a: Import translations. DO NOT MERGE * commit 'dfeefe6a7a3ede9735c9f90dae99d5e354b621b7': Import translations. DO NOT MERGE
|
2ebd753f70057bcc1264b3d4cdfad6fbbbbd3f89 |
10-Feb-2012 |
Eric Fischer <enf@google.com> |
am dfeefe6a: Import translations. DO NOT MERGE * commit 'dfeefe6a7a3ede9735c9f90dae99d5e354b621b7': Import translations. DO NOT MERGE
|
1c77eccbbc6a0a9c5570a02a637b754bcdbb237f |
10-Feb-2012 |
Eric Fischer <enf@google.com> |
am dfeefe6a: Import translations. DO NOT MERGE * commit 'dfeefe6a7a3ede9735c9f90dae99d5e354b621b7': Import translations. DO NOT MERGE
|
326de084e4ca46a1934862f91d0aa301a5747d5f |
10-Feb-2012 |
Eric Fischer <enf@google.com> |
am dfeefe6a: Import translations. DO NOT MERGE * commit 'dfeefe6a7a3ede9735c9f90dae99d5e354b621b7': Import translations. DO NOT MERGE
|
eadf4221cfd64bfaa0396182ef57cd4bef29563d |
10-Feb-2012 |
Yuli Huang <yuli@google.com> |
am fbc235e4: Merge "Fix b/5974541: Support up to 45 degrees for straighten." * commit 'fbc235e42c17f8c06e6be753b0863ec2ee2539e7': Fix b/5974541: Support up to 45 degrees for straighten.
|
0a42b2c7973e108d6b82ac20e7537e29ea0686a0 |
10-Feb-2012 |
Yuli Huang <yuli@google.com> |
Merge "Fix b/5974541: Support up to 45 degrees for straighten."
|
fbc235e42c17f8c06e6be753b0863ec2ee2539e7 |
10-Feb-2012 |
Yuli Huang <yuli@google.com> |
Merge "Fix b/5974541: Support up to 45 degrees for straighten."
|
c4ca26e0eb7c4e3fd6ddb4f4b4d8d403dcc3aebc |
09-Feb-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to master
|
4cb1fd3130b3313ee0388e207563fe94baae969e |
09-Feb-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to master
|
845b0a7cd47b27c3d67939c70cfc7b2704319028 |
09-Feb-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to master
|
29d03d0306c6244bcf19ffa48e8e6d30e1821a66 |
09-Feb-2012 |
Ray Chen <raychen@google.com> |
am 49d11f8b: Merge "Fix indent." * commit '49d11f8bace6432c5246d832966a3b15b7e54933': Fix indent.
|
e525e76b9a0ec63a0805e8ce2f04d501c33cdb8d |
09-Feb-2012 |
Ray Chen <raychen@google.com> |
Merge "Fix indent."
|
49d11f8bace6432c5246d832966a3b15b7e54933 |
09-Feb-2012 |
Ray Chen <raychen@google.com> |
Merge "Fix indent."
|
fcb34eb96a8e7d9ac5cd408776efa92dd2b55d68 |
09-Feb-2012 |
Yuli Huang <yuli@google.com> |
Fix b/5974541: Support up to 45 degrees for straighten. Change-Id: I131a478c59f5619e801311d9872440b2c7014578
rc/com/android/gallery3d/photoeditor/filters/StraightenFilter.java
|
5dfa1bb1f296d30ee4b05c3818a214bf154c81ad |
09-Feb-2012 |
Yuli Huang <yuli@google.com> |
Fix b/5974541: Support up to 45 degrees for straighten. Change-Id: I131a478c59f5619e801311d9872440b2c7014578
rc/com/android/gallery3d/photoeditor/filters/StraightenFilter.java
|
a7af7d113f950a9590f40287a0aca49b80be2f45 |
09-Feb-2012 |
Yuli Huang <yuli@google.com> |
am f948355d: Merge "Fix b/5974663: inconsistent transparency of disabled action buttons." * commit 'f948355db86dde8531088d49c69a4ac0a5d1231e': Fix b/5974663: inconsistent transparency of disabled action buttons.
|
58990dbb6ae80511085cca6c40f136654e9b7cc2 |
09-Feb-2012 |
Yuli Huang <yuli@google.com> |
am f948355d: Merge "Fix b/5974663: inconsistent transparency of disabled action buttons." * commit 'f948355db86dde8531088d49c69a4ac0a5d1231e': Fix b/5974663: inconsistent transparency of disabled action buttons.
|
0545446a8f449f628e880b76d63ee6a653038723 |
09-Feb-2012 |
Pin Ting <pinting@google.com> |
am e4321efb: Merge "Shows image filename read from OpenableColumns." * commit 'e4321efb533ebf1801f5dd738ec3e8efe426e3a2': Shows image filename read from OpenableColumns.
|
ab6b92971e8c498abc53cfdaddc0b32f1447b9fc |
09-Feb-2012 |
Yuli Huang <yuli@google.com> |
Merge "Fix b/5974663: inconsistent transparency of disabled action buttons."
|
f948355db86dde8531088d49c69a4ac0a5d1231e |
09-Feb-2012 |
Yuli Huang <yuli@google.com> |
Merge "Fix b/5974663: inconsistent transparency of disabled action buttons."
|
ce08e9e203468b0073853d782456125c0fdc242b |
09-Feb-2012 |
Yuli Huang <yuli@google.com> |
Merge "Fix b/5974663: inconsistent transparency of disabled action buttons."
|
e4321efb533ebf1801f5dd738ec3e8efe426e3a2 |
09-Feb-2012 |
Pin Ting <pinting@google.com> |
Merge "Shows image filename read from OpenableColumns."
|
b4058ad452ce0d2a1ac5c9f0b3da4d1428e41178 |
09-Feb-2012 |
Pin Ting <pinting@google.com> |
Merge "Shows image filename read from OpenableColumns."
|
e4fe8b2be9cb28624e78606343d957edb3ed6cfc |
09-Feb-2012 |
Yuli Huang <yuli@google.com> |
Fix b/5974663: inconsistent transparency of disabled action buttons. 1. Avoid gray out save-button again as disabled alpha is already applied to all text buttons. 2. Reduce disabled alpha of image buttons to make them look consistent with text buttons. Change-Id: Ie76988db1424ce036470a754acd2e4501979dd1a
rc/com/android/gallery3d/photoeditor/ImageActionButton.java
rc/com/android/gallery3d/photoeditor/RestorableView.java
|
62b12225f5d244615845b222df0038db4776553f |
09-Feb-2012 |
Yuli Huang <yuli@google.com> |
Fix b/5974663: inconsistent transparency of disabled action buttons. 1. Avoid gray out save-button again as disabled alpha is already applied to all text buttons. 2. Reduce disabled alpha of image buttons to make them look consistent with text buttons. Change-Id: Ie76988db1424ce036470a754acd2e4501979dd1a
es/layout/photoeditor_actionbar.xml
es/layout/photoeditor_effects_menu.xml
rc/com/android/gallery3d/photoeditor/ImageActionButton.java
rc/com/android/gallery3d/photoeditor/RestorableView.java
|
e0f1afb886c47cbe222b1c16c86b7c3bd5742783 |
09-Feb-2012 |
Yuli Huang <yuli@google.com> |
Fix b/5974663: inconsistent transparency of disabled action buttons. 1. Avoid gray out save-button again as disabled alpha is already applied to all text buttons. 2. Reduce disabled alpha of image buttons to make them look consistent with text buttons. Change-Id: Ie76988db1424ce036470a754acd2e4501979dd1a
es/layout/photoeditor_actionbar.xml
es/layout/photoeditor_effects_menu.xml
|
c6175ab57ad6b5aae3cba00018ee8ca31a2fff1e |
09-Feb-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: Ied427c7a1b1e87e666b170a5aa533c638bab97a3
es/values-ru/photoeditor_strings.xml
es/values-vi/photoeditor_strings.xml
es/values-zh-rCN/photoeditor_strings.xml
|
b447f9ef018a6ca05977bc8aaa0490a0118e0116 |
09-Feb-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: Ied427c7a1b1e87e666b170a5aa533c638bab97a3
es/values-ru/photoeditor_strings.xml
es/values-vi/photoeditor_strings.xml
es/values-zh-rCN/photoeditor_strings.xml
|
dfeefe6a7a3ede9735c9f90dae99d5e354b621b7 |
09-Feb-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: I5d1ba410c706ae3d540af1b1b8cdf260ceb517eb
es/values-da/strings.xml
es/values-de/strings.xml
es/values-es-rUS/strings.xml
es/values-rm/strings.xml
es/values-ru/strings.xml
es/values-sw/strings.xml
es/values-vi/strings.xml
es/values-zu/strings.xml
|
62ee6cfa8b8ac25e350fa054c66d27d531129e18 |
09-Feb-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: I5d1ba410c706ae3d540af1b1b8cdf260ceb517eb
es/values-da/strings.xml
es/values-de/strings.xml
es/values-es-rUS/strings.xml
es/values-rm/strings.xml
es/values-ru/strings.xml
es/values-sw/strings.xml
es/values-vi/strings.xml
es/values-zu/strings.xml
|
694e1d531a384368510a7fd1576c62c44085d3fe |
08-Feb-2012 |
Eric Fischer <enf@google.com> |
am 25a69159: Import translations. DO NOT MERGE * commit '25a6915956887a33b60b848584176c2bc6845479': Import translations. DO NOT MERGE
|
5ae47f3a4e301866f2ec15bf226bd06ff63d1623 |
08-Feb-2012 |
Eric Fischer <enf@google.com> |
am 25a69159: Import translations. DO NOT MERGE * commit '25a6915956887a33b60b848584176c2bc6845479': Import translations. DO NOT MERGE
|
4182728efc0e00239dcd0adea5a697ddbce1420c |
08-Feb-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: Ib49ea69bac5f27840a1e542a5e0946c09a1d264c
es/values-af/strings.xml
es/values-iw/strings.xml
|
25a6915956887a33b60b848584176c2bc6845479 |
08-Feb-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: Ib49ea69bac5f27840a1e542a5e0946c09a1d264c
es/values-af/strings.xml
es/values-iw/strings.xml
|
a710891ed8ac3374a81eba7901c5f1a79b6f3223 |
08-Feb-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: Idf23634c1451bbfbd2e2bc815977b1a4dc7d8740
es/values-af/strings.xml
es/values-iw/strings.xml
|
eab98edc6dfa07974e3a8b97d93c20500036f2fd |
08-Feb-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: Idf23634c1451bbfbd2e2bc815977b1a4dc7d8740
es/values-af/strings.xml
es/values-iw/strings.xml
|
71c1fc6f577a9c54e683bef5999c00a0cf114d7b |
08-Feb-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to master
|
68edf86432dc411ef4a888e74ac73a99493bf652 |
08-Feb-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to master
|
e60480c880b0c19c13e49f96f45381d58c444e3c |
07-Feb-2012 |
Eric Fischer <enf@google.com> |
am 88c7a253: Import translations. DO NOT MERGE * commit '88c7a253f83302d57f7fafdd74a0021e59e9454f': Import translations. DO NOT MERGE
|
f4b37858ab65dc5acd0b84fd6d9618872c2f06f3 |
07-Feb-2012 |
Eric Fischer <enf@google.com> |
am 88c7a253: Import translations. DO NOT MERGE * commit '88c7a253f83302d57f7fafdd74a0021e59e9454f': Import translations. DO NOT MERGE
|
c60115d3144463d50da5f60784d40d20a7addc28 |
07-Feb-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: Ic559edd4271ee14e03a8435c4b52232e18e68d3b
es/values-es/strings.xml
es/values-fa/strings.xml
es/values-pt-rPT/strings.xml
es/values-sl/strings.xml
es/values-sw/strings.xml
es/values-tr/strings.xml
es/values-zh-rCN/strings.xml
es/values-zu/strings.xml
|
88c7a253f83302d57f7fafdd74a0021e59e9454f |
07-Feb-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: Ic559edd4271ee14e03a8435c4b52232e18e68d3b
es/values-es/strings.xml
es/values-fa/strings.xml
es/values-pt-rPT/strings.xml
es/values-sl/strings.xml
es/values-sw/strings.xml
es/values-tr/strings.xml
es/values-zh-rCN/strings.xml
es/values-zu/strings.xml
|
4d893b8042cf8adbd087ca1617c538a3578013cd |
07-Feb-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: I3ba481021ed7c70fdca6c53be64e0109be004fea
es/values-es/strings.xml
es/values-fa/strings.xml
es/values-pt-rPT/strings.xml
es/values-sl/strings.xml
es/values-sw/strings.xml
es/values-tr/strings.xml
es/values-zh-rCN/strings.xml
es/values-zu/strings.xml
|
0f4f594a1032f3210458268d4c1b0f9842b34f03 |
07-Feb-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: I3ba481021ed7c70fdca6c53be64e0109be004fea
es/values-es/strings.xml
es/values-fa/strings.xml
es/values-pt-rPT/strings.xml
es/values-sl/strings.xml
es/values-sw/strings.xml
es/values-tr/strings.xml
es/values-zh-rCN/strings.xml
es/values-zu/strings.xml
|
1d33c69510326298c524593a8fb5d65b571013dc |
07-Feb-2012 |
Pin Ting <pinting@google.com> |
Shows image filename read from OpenableColumns. bug:5796182 Change-Id: If43d2dd048ab003c1703bb1a466a19b6013cae85
rc/com/android/gallery3d/app/Gallery.java
|
0a5e1643d6155e057354907a7ee8d223f9bd28dd |
07-Feb-2012 |
Pin Ting <pinting@google.com> |
Shows image filename read from OpenableColumns. bug:5796182 Change-Id: If43d2dd048ab003c1703bb1a466a19b6013cae85
rc/com/android/gallery3d/app/Gallery.java
|
4e69a2bb9315662857a6f24a367fb9eff3dac862 |
07-Feb-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to master
|
a50f89060fbff219c136ece5d987f1b8730d1caa |
07-Feb-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to master
|
7df37791a47c6b1c02c9c242cba34ec07e604714 |
07-Feb-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to master
|
464baee5c6b98e1fa67de64660dcf4736562d39a |
07-Feb-2012 |
Ray Chen <raychen@google.com> |
Fix indent. Change-Id: I3e0c443ddfb2ebc777db7504c89ca1ffec119745
rc/com/android/gallery3d/app/AbstractGalleryActivity.java
|
fa011a292ea27fd6a885f980596e959ca83b9a4f |
07-Feb-2012 |
Ray Chen <raychen@google.com> |
Fix indent. Change-Id: I3e0c443ddfb2ebc777db7504c89ca1ffec119745
rc/com/android/gallery3d/app/AbstractGalleryActivity.java
|
83eba3b0a383f46ac48309487d110fd061e365f2 |
07-Feb-2012 |
Yuli Huang <yuli@google.com> |
am a7b78e22: Fix b/5840847: Always show \'Loading...\' for corrupt pictures. * commit 'a7b78e224b1808895ea2c3d42ae385526dea12aa': Fix b/5840847: Always show 'Loading...' for corrupt pictures.
|
a565ca26f6e11a8298099bbc28481d22a62af4af |
07-Feb-2012 |
Yuli Huang <yuli@google.com> |
Fix b/5840847: Always show 'Loading...' for corrupt pictures. Change-Id: I040f6e4090dad3e73b86062ddefd9bb0be581bf5
rc/com/android/gallery3d/app/PhotoDataAdapter.java
rc/com/android/gallery3d/ui/PhotoView.java
|
a7b78e224b1808895ea2c3d42ae385526dea12aa |
07-Feb-2012 |
Yuli Huang <yuli@google.com> |
Fix b/5840847: Always show 'Loading...' for corrupt pictures. Change-Id: I040f6e4090dad3e73b86062ddefd9bb0be581bf5
rc/com/android/gallery3d/app/PhotoDataAdapter.java
rc/com/android/gallery3d/ui/PhotoView.java
|
57fdbf1238a82ed0a5308c74011d8b9aba5fb070 |
06-Feb-2012 |
Eric Fischer <enf@google.com> |
am e69eba09: Import translations. DO NOT MERGE * commit 'e69eba096c3c88e944471499ca7bb47cf77d3e3c': Import translations. DO NOT MERGE
|
ae7ad527c80047ddfaf11aeb373e085fc61815d4 |
06-Feb-2012 |
Eric Fischer <enf@google.com> |
am e69eba09: Import translations. DO NOT MERGE * commit 'e69eba096c3c88e944471499ca7bb47cf77d3e3c': Import translations. DO NOT MERGE
|
e69eba096c3c88e944471499ca7bb47cf77d3e3c |
06-Feb-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: Ia770f26d04147c896cf3a6af0f2a2a5eabe23694
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-cs/strings.xml
es/values-et/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
499745c985fb7f6ac5226e830d2ca4d75d3afff9 |
06-Feb-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: Ia770f26d04147c896cf3a6af0f2a2a5eabe23694
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-cs/strings.xml
es/values-et/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
2368902b436eabc27a3505cdac4814c8cf9c176b |
06-Feb-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: Ie1f921dd8f676760bb776fa4201b2c9c4d2fbd11
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-cs/strings.xml
es/values-et/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
96ca7795367d8a447e9899247266c3b55c4f2c2b |
06-Feb-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: Ie1f921dd8f676760bb776fa4201b2c9c4d2fbd11
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-cs/strings.xml
es/values-et/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
79a6b1d5e258715938bb16c4b27c96a7972e2dde |
06-Feb-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to master
|
bc8ecbb22273e0535b241906bd0a8207eae34c50 |
06-Feb-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to master
|
7c233472a1a91c525b9f71830921b5d217b4c251 |
06-Feb-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to master
|
f2bf9ddb8a5cf9ca8948732b83e9784a191b4e7b |
06-Feb-2012 |
Pin Ting <pinting@google.com> |
am acd15c73: Merge "Shows status bar in gallery when in portrait view." * commit 'acd15c734363293975b259168537ed811889fcdc': Shows status bar in gallery when in portrait view.
|
5456f355db0c1f2c7a93a03b91794c9679e26daf |
06-Feb-2012 |
Pin Ting <pinting@google.com> |
am acd15c73: Merge "Shows status bar in gallery when in portrait view." * commit 'acd15c734363293975b259168537ed811889fcdc': Shows status bar in gallery when in portrait view.
|
feef78c1ecf63c88e052698040e809f25ffef0c4 |
06-Feb-2012 |
Pin Ting <pinting@google.com> |
Merge "Shows status bar in gallery when in portrait view."
|
acd15c734363293975b259168537ed811889fcdc |
06-Feb-2012 |
Pin Ting <pinting@google.com> |
Merge "Shows status bar in gallery when in portrait view."
|
dd3f3fdbd1b676d5d505bab300f798f2d88f203f |
06-Feb-2012 |
Pin Ting <pinting@google.com> |
Merge "Shows status bar in gallery when in portrait view."
|
60e1f075be818f37472607cee30a88cf3cd87c30 |
03-Feb-2012 |
Pin Ting <pinting@google.com> |
Shows status bar in gallery when in portrait view. bug: 5467810 Shows status bar in gallery, crop activity, picker activity when in portrait view; hide status bar when in landscape view. Change-Id: I17e2347f020db209ba0581a8e2f2aa19fcb4ceae
rc/com/android/gallery3d/app/AbstractGalleryActivity.java
|
4d50f7373a6205e197ffc1b73cdc5ffcbeb79fca |
03-Feb-2012 |
Pin Ting <pinting@google.com> |
Shows status bar in gallery when in portrait view. bug: 5467810 Shows status bar in gallery, crop activity, picker activity when in portrait view; hide status bar when in landscape view. Change-Id: I17e2347f020db209ba0581a8e2f2aa19fcb4ceae
es/values/styles.xml
rc/com/android/gallery3d/app/AbstractGalleryActivity.java
|
df0c77a766e4ac75e46ebecf386667d3789e9066 |
03-Feb-2012 |
Pin Ting <pinting@google.com> |
Shows status bar in gallery when in portrait view. bug: 5467810 Shows status bar in gallery, crop activity, picker activity when in portrait view; hide status bar when in landscape view. Change-Id: I17e2347f020db209ba0581a8e2f2aa19fcb4ceae
es/values/styles.xml
|
8e5b245c830ac812d8e2062d8f69c128cb3dca9b |
03-Feb-2012 |
Eric Fischer <enf@google.com> |
am 2dea7258: Import translations. DO NOT MERGE * commit '2dea725878d947401d13a6ce9cd3f620cabdd075': Import translations. DO NOT MERGE
|
3a093a47e9c06eb28eed7735a3907bad4e589487 |
03-Feb-2012 |
Eric Fischer <enf@google.com> |
am 2dea7258: Import translations. DO NOT MERGE * commit '2dea725878d947401d13a6ce9cd3f620cabdd075': Import translations. DO NOT MERGE
|
2dea725878d947401d13a6ce9cd3f620cabdd075 |
03-Feb-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: I35f3f1aa3dac1e55f3e15edbdf9b426d9967bb4f
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
f494a44b2c1a6a28a6d42df74cfaf25f0796628c |
03-Feb-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: I35f3f1aa3dac1e55f3e15edbdf9b426d9967bb4f
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
be68eb828b2fba3b9b0a55e0a46c09aea095d221 |
03-Feb-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: Ia25a1b5ebc12306a5bea1f8bc70dc8aef12016d6
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
ebe685c673ebdefa56736daa054223412db1dd7d |
03-Feb-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: Ia25a1b5ebc12306a5bea1f8bc70dc8aef12016d6
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
ff5e96d3d7538f055dd582b6fb0e82af219e0c97 |
03-Feb-2012 |
Ray Chen <raychen@google.com> |
am 585ae3d5: Fix 5948229 [Bug Bash] The app icon is clickable in album set view * commit '585ae3d5deccc58e282c55b980ef31eb655537ee': Fix 5948229 [Bug Bash] The app icon is clickable in album set view
|
7eeea83eaf4f7b0ac201835fa28b7ee71acedffa |
03-Feb-2012 |
Ray Chen <raychen@google.com> |
am 1e32e279: Fix 5658975 Gallery has \'CROP\' instead of \'SAVE\' or \'OK\' while setting the picture as wallpaper * commit '1e32e279f272392d61bc29aa31687c173071cdf0': Fix 5658975 Gallery has 'CROP' instead of 'SAVE' or 'OK' while setting the picture as wallpaper
|
3df5d1a7386db76c8ce2faf7ab63b35fe3b9b9a8 |
03-Feb-2012 |
Ray Chen <raychen@google.com> |
am 1e32e279: Fix 5658975 Gallery has \'CROP\' instead of \'SAVE\' or \'OK\' while setting the picture as wallpaper * commit '1e32e279f272392d61bc29aa31687c173071cdf0': Fix 5658975 Gallery has 'CROP' instead of 'SAVE' or 'OK' while setting the picture as wallpaper
|
3f68238643791c0cba312df8549d5dfcd1ef188c |
03-Feb-2012 |
Ray Chen <raychen@google.com> |
Fix 5948229 [Bug Bash] The app icon is clickable in album set view Change-Id: I563d2322fe5f1954ffaab7424b66d22722ed43a7
rc/com/android/gallery3d/app/ActivityState.java
|
585ae3d5deccc58e282c55b980ef31eb655537ee |
03-Feb-2012 |
Ray Chen <raychen@google.com> |
Fix 5948229 [Bug Bash] The app icon is clickable in album set view Change-Id: I563d2322fe5f1954ffaab7424b66d22722ed43a7
rc/com/android/gallery3d/app/ActivityState.java
|
90b6f6839f5e1fdfb6578711a9c2ab39d38182c0 |
03-Feb-2012 |
Ray Chen <raychen@google.com> |
Fix 5658975 Gallery has 'CROP' instead of 'SAVE' or 'OK' while setting the picture as wallpaper Change-Id: I520d760df2932f6dcb318c1362f15b82b044bcb3
es/values/strings.xml
|
1e32e279f272392d61bc29aa31687c173071cdf0 |
03-Feb-2012 |
Ray Chen <raychen@google.com> |
Fix 5658975 Gallery has 'CROP' instead of 'SAVE' or 'OK' while setting the picture as wallpaper Change-Id: I520d760df2932f6dcb318c1362f15b82b044bcb3
es/values/strings.xml
|
abda9d179519a844b6ef307f6aaf0899c8c2e7c8 |
02-Feb-2012 |
Eric Fischer <enf@google.com> |
am 26e78b45: Import translations. DO NOT MERGE * commit '26e78b45e25c069b3a4d6ca45748c61cdc0df3a9': Import translations. DO NOT MERGE
|
9df023f7f6c8157136cdd12bb57e5af721be7507 |
02-Feb-2012 |
Eric Fischer <enf@google.com> |
am 26e78b45: Import translations. DO NOT MERGE * commit '26e78b45e25c069b3a4d6ca45748c61cdc0df3a9': Import translations. DO NOT MERGE
|
85885c8067bfe7707d6748b718acfeda73178756 |
02-Feb-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: Iec8e38ba94d3c159c59715961d98e4cfa7d4fd1f
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
26e78b45e25c069b3a4d6ca45748c61cdc0df3a9 |
02-Feb-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: Iec8e38ba94d3c159c59715961d98e4cfa7d4fd1f
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
c2ca6c9094a59d49f5b96b262eef02b8e2564ce1 |
02-Feb-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: I997af10112474228ed5e1ff9a9b0b3000b026081
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
434f568a5e91e6214096b4456996407806470f37 |
02-Feb-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: I997af10112474228ed5e1ff9a9b0b3000b026081
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
f20f0d6dd3d96fa11e46c6435afa4c223208b3c1 |
02-Feb-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to master
|
4d6e55ee53d3d52cae59f7459dfde353489d446d |
02-Feb-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to master
|
a026085b58e07ddb7e35fa55199555002b7d2079 |
02-Feb-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to master
|
ea92ea5f5b86212a14e111cc0f6050f6392073b0 |
02-Feb-2012 |
Pin Ting <pinting@google.com> |
am ac7c72d8: Merge "Shows video filename passed from other apps." * commit 'ac7c72d8d8f7af477a74656603e0c27e01c25106': Shows video filename passed from other apps.
|
faa45c4f9b8ef4943bf1258fae6b41e4fed565cd |
02-Feb-2012 |
Pin Ting <pinting@google.com> |
am b333d7a4: Merge "Shows image filename passed from other apps." * commit 'b333d7a407d108d3c6de4bf016d0d6f7854ef903': Shows image filename passed from other apps.
|
ac7c72d8d8f7af477a74656603e0c27e01c25106 |
02-Feb-2012 |
Pin Ting <pinting@google.com> |
Merge "Shows video filename passed from other apps."
|
0eef4923a491305e854a7fb141e72d00be212bb6 |
02-Feb-2012 |
Pin Ting <pinting@google.com> |
Merge "Shows video filename passed from other apps."
|
b333d7a407d108d3c6de4bf016d0d6f7854ef903 |
02-Feb-2012 |
Pin Ting <pinting@google.com> |
Merge "Shows image filename passed from other apps."
|
3bc1a3498edfc7ce56c82be65e0ea1dbabba8ec2 |
02-Feb-2012 |
Pin Ting <pinting@google.com> |
Merge "Shows image filename passed from other apps."
|
143594f5a26cf68520ca4712435739d2ada339a3 |
18-Jan-2012 |
Pin Ting <pinting@google.com> |
Shows video filename passed from other apps. bug:5796182 Change-Id: I8de80b56105737ac38db117804b55a161150dbe9
rc/com/android/gallery3d/app/MovieActivity.java
|
cfd4375c6446e91d81e64dc72b9f3b9f35ac9cdd |
18-Jan-2012 |
Pin Ting <pinting@google.com> |
Shows video filename passed from other apps. bug:5796182 Change-Id: I8de80b56105737ac38db117804b55a161150dbe9
rc/com/android/gallery3d/app/MovieActivity.java
|
186f8b21cdbe6881a1e7fd452e3ef32e1d81d90f |
18-Jan-2012 |
Pin Ting <pinting@google.com> |
Shows image filename passed from other apps. bug:5796182 This change will be followed up by a change to the class android.content.Intent. Change-Id: I3c607c535a4e90d867a98528118d1b6f10fa45cf
rc/com/android/gallery3d/app/Gallery.java
|
22c0aec58109136fe8916bb3570857306eeb3c88 |
18-Jan-2012 |
Pin Ting <pinting@google.com> |
Shows image filename passed from other apps. bug:5796182 This change will be followed up by a change to the class android.content.Intent. Change-Id: I3c607c535a4e90d867a98528118d1b6f10fa45cf
rc/com/android/gallery3d/app/Gallery.java
|
0026000069decb21d02b1bc2c49ad8b39e534703 |
02-Feb-2012 |
Chih-Chung Chang <chihchung@google.com> |
am bea98898: Merge "Localize the "fail to load image" toast message." * commit 'bea9889873cc08775aa85dd169d9247a9eab42b3': Localize the "fail to load image" toast message.
|
bea9889873cc08775aa85dd169d9247a9eab42b3 |
02-Feb-2012 |
Chih-Chung Chang <chihchung@google.com> |
Merge "Localize the "fail to load image" toast message."
|
ffbb747a2ba16879fc4486f93b71fd1db61cfd84 |
01-Feb-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am a9b831da: am b5b73fc7: am 79c31703: Reconcile with ics-mr1-release * commit 'a9b831da919485a5e2c73e9d0a42d7a023fe547d':
|
a9b831da919485a5e2c73e9d0a42d7a023fe547d |
01-Feb-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am b5b73fc7: am 79c31703: Reconcile with ics-mr1-release * commit 'b5b73fc751dedcf62612e31bdfa0fbda4c589cb1':
|
b5b73fc751dedcf62612e31bdfa0fbda4c589cb1 |
01-Feb-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am 79c31703: Reconcile with ics-mr1-release * commit '79c31703151da5eaf8fb74a249091ddd54d0c2e9':
|
79c31703151da5eaf8fb74a249091ddd54d0c2e9 |
01-Feb-2012 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with ics-mr1-release Change-Id: I65ae67dd34f8ee65190369e77739b02e9937ab6c
|
1ae46c5bff20a67798e897f022796912db328227 |
01-Feb-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to master
|
c3a37789222cac934446bb6b0edcfb3149ed3745 |
01-Feb-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to master
|
3a5d9b36a171f1e18f71d7788be6b8f34b05f5a8 |
01-Feb-2012 |
Chih-Chung Chang <chihchung@google.com> |
Localize the "fail to load image" toast message. Bug 5875813. Change-Id: Ia11a3e909f90e8178238c390728b407708fabf8e
es/values/strings.xml
|
52da9b75f29ffe8744aca1e7fba2ad0871af1de0 |
01-Feb-2012 |
Chih-Chung Chang <chihchung@google.com> |
Localize the "fail to load image" toast message. Bug 5875813. Change-Id: Ia11a3e909f90e8178238c390728b407708fabf8e
rc/com/android/gallery3d/app/CropImage.java
|
f12d64978030d8e35794ad0cd37c177f3c8674a7 |
01-Feb-2012 |
Chih-Chung Chang <chihchung@google.com> |
Localize the "fail to load image" toast message. Bug 5875813. Change-Id: Ia11a3e909f90e8178238c390728b407708fabf8e
es/values/strings.xml
rc/com/android/gallery3d/app/CropImage.java
|
2f8e7e65b4232d9e6030386ad8ad92d2c883143e |
31-Jan-2012 |
Eric Fischer <enf@google.com> |
am 243264a1: Import translations. DO NOT MERGE * commit '243264a16cff574eac9d71d025299e23d574db8c': Import translations. DO NOT MERGE
|
243264a16cff574eac9d71d025299e23d574db8c |
31-Jan-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: Ie3311b4e9c1a346ffd070c1984dd252e6c39e77c
es/values-et/strings.xml
|
ad8c0cb3a829dc9e9ca16e6abc49866e23128dae |
31-Jan-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: Ie3311b4e9c1a346ffd070c1984dd252e6c39e77c
es/values-et/strings.xml
|
a3bd14e3884d353e16040bc9ec91cc153ee90272 |
31-Jan-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to master
|
3ae33ab19a97d11c9c5a023856b834778dccb712 |
31-Jan-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to master
|
7b73b3fe7c263bee2a056f9d1821fb3d6fa4b026 |
30-Jan-2012 |
Eric Fischer <enf@google.com> |
am 6e3c9b84: Import translations. DO NOT MERGE * commit '6e3c9b849c483000911eaf18c5858f141f0df82c': Import translations. DO NOT MERGE
|
6e3c9b849c483000911eaf18c5858f141f0df82c |
30-Jan-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: I23a1773bd5c2e54b8f9d15df26515c5c622877c9
es/values-da/strings.xml
|
dbf6adde1ea2269be6d7fc5fd71585755eb43f35 |
30-Jan-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: I23a1773bd5c2e54b8f9d15df26515c5c622877c9
es/values-da/strings.xml
|
42ed71fdb57ed24b329e9a37de6c333dd34d01a1 |
30-Jan-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to master
|
28b2957a41bf8161b25a8f80d9712c6f84caeffc |
30-Jan-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to master
|
b018d2ed7aab0c6d65e4e56f1ce2ed35272494bf |
30-Jan-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to master
|
ccc1496ca34be80bd9dd5da05a883bd25116e330 |
26-Jan-2012 |
Eric Fischer <enf@google.com> |
am 4edf83ca: Merge "Import translations. DO NOT MERGE" * commit '4edf83ca0dc58bdfed4864958ce0b1975e35e69c': Import translations. DO NOT MERGE
|
4edf83ca0dc58bdfed4864958ce0b1975e35e69c |
26-Jan-2012 |
Eric Fischer <enf@google.com> |
Merge "Import translations. DO NOT MERGE"
|
7f318d74295e88d1ed6d980b793061f4c309244f |
26-Jan-2012 |
Eric Fischer <enf@google.com> |
Merge "Import translations. DO NOT MERGE"
|
e7b1f2304354fd5d68160e827d68836d48a95e0e |
26-Jan-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: I4029bac1a72d77309819d59be84bc2e223711d6a
es/values-zh-rCN/photoeditor_strings.xml
|
304c6214715256b3a319be4222f9fb1ff823e6de |
26-Jan-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: I4029bac1a72d77309819d59be84bc2e223711d6a
es/values-zh-rCN/photoeditor_strings.xml
|
3bdd2806760220fc79bbf27b7a71b30b87464ab0 |
26-Jan-2012 |
Eric Fischer <enf@google.com> |
am 3ae681b8: Import translations. DO NOT MERGE * commit '3ae681b865447b986aba148c78767cb7a178303d': Import translations. DO NOT MERGE
|
3ae681b865447b986aba148c78767cb7a178303d |
26-Jan-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: Id2ddcf510c73a66027810668fd2601893f90d2df
es/values-be/strings.xml
es/values-es-rUS/strings.xml
es/values-et/strings.xml
es/values-rm/strings.xml
es/values-sw/strings.xml
es/values-zu/strings.xml
|
b82f4a0428ded3982d702c337dca77977e3ccb06 |
26-Jan-2012 |
Eric Fischer <enf@google.com> |
Import translations. DO NOT MERGE Change-Id: Id2ddcf510c73a66027810668fd2601893f90d2df
es/values-be/strings.xml
es/values-es-rUS/strings.xml
es/values-et/strings.xml
es/values-rm/strings.xml
es/values-sw/strings.xml
es/values-zu/strings.xml
|
09f2afcdc860ee19680aba1a21031213fa5c0c87 |
21-Jan-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am 56d754a2: am 7e11af8f: Reconcile with ics-mr1-release * commit '56d754a218f98c6dc491e70bb7f5457201b61f4f':
|
c9bb527e3a3a22b294e11cb0352ab7dd4e4376fb |
21-Jan-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am 7e11af8f: Reconcile with ics-mr1-release * commit '7e11af8f5813972dd64032e70068e10f87771234':
|
56d754a218f98c6dc491e70bb7f5457201b61f4f |
21-Jan-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am 7e11af8f: Reconcile with ics-mr1-release * commit '7e11af8f5813972dd64032e70068e10f87771234':
|
e92217b023c4b040be95c178faa2ccbb510a8f38 |
19-Jan-2012 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with ics-mr1-release Change-Id: Id6ecd416cb70e55c28ff885caae29d9000dc9133
|
7e11af8f5813972dd64032e70068e10f87771234 |
19-Jan-2012 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with ics-mr1-release Change-Id: Id6ecd416cb70e55c28ff885caae29d9000dc9133
|
04cdad34ab2a32535e504b8a61656c3de0594bfc |
18-Jan-2012 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
8fe890ba2efa42213ab79d2fc2b4e51ac3e343a3 |
18-Jan-2012 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
f60614ff4aa6450f312dff6955a63eda09ada4dc |
17-Jan-2012 |
Chih-Chung Chang <chihchung@google.com> |
am 39b453b3: am a2b62468: am 8f568da3: Patch. * commit '39b453b3504e39c25fb0772fcb0ebb4216d36d52': Patch.
|
30627217223af8631669d02f3a00fa58cbc45887 |
17-Jan-2012 |
Chih-Chung Chang <chihchung@google.com> |
am a2b62468: am 8f568da3: Patch. * commit 'a2b62468fcb23d80295fa25dba5551247204f34d': Patch.
|
39b453b3504e39c25fb0772fcb0ebb4216d36d52 |
17-Jan-2012 |
Chih-Chung Chang <chihchung@google.com> |
am a2b62468: am 8f568da3: Patch. * commit 'a2b62468fcb23d80295fa25dba5551247204f34d': Patch.
|
f0bcdc9740f321cc1c7b8a4b91cd70507d8f10da |
17-Jan-2012 |
Chih-Chung Chang <chihchung@google.com> |
am 8f568da3: Patch. * commit '8f568da373699781beb11cfa46a46c5871288353': Patch.
|
6c1098a3ee6acb5923bc5f588588a3112739903c |
17-Jan-2012 |
Chih-Chung Chang <chihchung@google.com> |
am 8f568da3: Patch. * commit '8f568da373699781beb11cfa46a46c5871288353': Patch.
|
3f80e41cab6b090060b0db920d0345782b2099f3 |
17-Jan-2012 |
Chih-Chung Chang <chihchung@google.com> |
am 8f568da3: Patch. * commit '8f568da373699781beb11cfa46a46c5871288353': Patch.
|
a2b62468fcb23d80295fa25dba5551247204f34d |
17-Jan-2012 |
Chih-Chung Chang <chihchung@google.com> |
am 8f568da3: Patch. * commit '8f568da373699781beb11cfa46a46c5871288353': Patch.
|
22743ab897ce8ce30c310bfec160b66e8b4e97b5 |
17-Jan-2012 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
4708f1d76c2a7fe031b73ee1375133a4d8748e14 |
17-Jan-2012 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
f9e5454976b74a7fbb831b4dde17854fde4bd862 |
16-Jan-2012 |
Pin Ting <pinting@google.com> |
am f31954e5: Fixes gallery crash due to attempt to open deleted photo. * commit 'f31954e5b5f227b07fe377545fb05327d7e7ffe6': Fixes gallery crash due to attempt to open deleted photo.
|
382e3a676fc3d4f130bfaeefd10eed2a75f128b4 |
13-Jan-2012 |
Pin Ting <pinting@google.com> |
Fixes gallery crash due to attempt to open deleted photo. bug:5630894 Change-Id: I540bf067561550def72ac513eed12dcd5a808a1a
rc/com/android/gallery3d/data/DataManager.java
|
f31954e5b5f227b07fe377545fb05327d7e7ffe6 |
13-Jan-2012 |
Pin Ting <pinting@google.com> |
Fixes gallery crash due to attempt to open deleted photo. bug:5630894 Change-Id: I540bf067561550def72ac513eed12dcd5a808a1a
rc/com/android/gallery3d/data/DataManager.java
|
1aff2e99c45979d1752e6ee94ee025ea77ce1831 |
14-Jan-2012 |
The Android Automerger <android-build@android.com> |
merge in ics-mr1-release history after reset to ics-mr1
|
6e395241e88847ceccf1c0a4e9d743da41293dba |
14-Jan-2012 |
The Android Automerger <android-build@android.com> |
merge in ics-mr1-release history after reset to ics-mr1
|
e9ca81a2fed768af4493c6aba897fa5cfc4523fb |
04-Jan-2012 |
Chih-Chung Chang <chihchung@google.com> |
Patch. Change-Id: I62fd65461e8989a1d5cf6bc353dfc4b61a2108c8
rc/com/android/gallery3d/ui/FlingScroller.java
rc/com/android/gallery3d/ui/PositionController.java
|
8f568da373699781beb11cfa46a46c5871288353 |
04-Jan-2012 |
Chih-Chung Chang <chihchung@google.com> |
Patch. Change-Id: I62fd65461e8989a1d5cf6bc353dfc4b61a2108c8
rc/com/android/gallery3d/ui/FlingScroller.java
rc/com/android/gallery3d/ui/PositionController.java
|
67e311cecd48ee3de5693db4cb7b0d258b356978 |
10-Jan-2012 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
270d66e0eb3b5a512a0f6825d4822cf0bd19e5e1 |
10-Jan-2012 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
7fa1f2222b8db51d1f7a56b6ef5c671baa219a8c |
09-Jan-2012 |
Chih-Chung Chang <chihchung@google.com> |
am d05b0be1: Fix 5835642: Only finish the page when it\'s still active. * commit 'd05b0be120bb217b4f56add24a4b31bee92455b2': Fix 5835642: Only finish the page when it's still active.
|
3cc027083b67ddbabe17c1fc975e1d6459d1054a |
08-Jan-2012 |
Chih-Chung Chang <chihchung@google.com> |
Fix 5835642: Only finish the page when it's still active. The original code can call finishState twice in a row with the calling stack: finishState -> onPause -> clearLoadingBit -> finishState. Change clearLoadingBit to call finishState only when it's currently active. Change-Id: I537dbdd6ce26b26aeb565e243c4168229d4a70ef
rc/com/android/gallery3d/app/AlbumPage.java
rc/com/android/gallery3d/app/AlbumSetPage.java
rc/com/android/gallery3d/app/StateManager.java
|
d05b0be120bb217b4f56add24a4b31bee92455b2 |
08-Jan-2012 |
Chih-Chung Chang <chihchung@google.com> |
Fix 5835642: Only finish the page when it's still active. The original code can call finishState twice in a row with the calling stack: finishState -> onPause -> clearLoadingBit -> finishState. Change clearLoadingBit to call finishState only when it's currently active. Change-Id: I537dbdd6ce26b26aeb565e243c4168229d4a70ef
rc/com/android/gallery3d/app/AlbumPage.java
rc/com/android/gallery3d/app/AlbumSetPage.java
rc/com/android/gallery3d/app/StateManager.java
|
6265807c4f1c7a2e2adfee9f4ad61a35662dd6ad |
02-Jan-2012 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
d7af8077fa18a59b88b59e8fdb565f85792e239d |
02-Jan-2012 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
97a304e9be42868e63fd21e1321ffef935db2230 |
30-Dec-2011 |
Eric Fischer <enf@google.com> |
am 1ed7e8f2: Import revised translations. * commit '1ed7e8f258b47c82e7e066f515aea1483ee53584': Import revised translations.
|
7aa8749e0f0b8dafe3669cc1aef5c373f80c294f |
29-Dec-2011 |
Eric Fischer <enf@google.com> |
Import revised translations. Change-Id: Iafdc61f194153262e70e0cd76253f8e816d6ac31
es/values-de/strings.xml
es/values-ru/photoeditor_strings.xml
es/values-ru/strings.xml
es/values-vi/photoeditor_strings.xml
es/values-vi/strings.xml
|
1ed7e8f258b47c82e7e066f515aea1483ee53584 |
29-Dec-2011 |
Eric Fischer <enf@google.com> |
Import revised translations. Change-Id: Iafdc61f194153262e70e0cd76253f8e816d6ac31
es/values-de/strings.xml
es/values-ru/photoeditor_strings.xml
es/values-ru/strings.xml
es/values-vi/photoeditor_strings.xml
es/values-vi/strings.xml
|
24f3b81e942192565482c93eecec396e7fd3da1b |
15-Dec-2011 |
Owen Lin <owenlin@google.com> |
am abe7f64f: Merge "Support querying account and picasa id of a picasa image." * commit 'abe7f64f9d433a0dad45acd93fbafa0a5e236998': Support querying account and picasa id of a picasa image.
|
d17d9c269d002f7ccef2c3aa4a1c668019fe767d |
14-Dec-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
b6f1fe48d73c855a6ce19a49dc5d02c500ce9bc0 |
14-Dec-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
abe7f64f9d433a0dad45acd93fbafa0a5e236998 |
14-Dec-2011 |
Owen Lin <owenlin@google.com> |
Merge "Support querying account and picasa id of a picasa image."
|
8dfc48d5aa8cfcec7abfe8c411f76c9cf979a2f3 |
13-Dec-2011 |
Owen Lin <owenlin@google.com> |
Support querying account and picasa id of a picasa image. Change-Id: I7d24fb70b0a8a01c5d0fbdb6205c25d74d1996a6 fix: 5482269
rc/com/android/gallery3d/provider/GalleryProvider.java
rc_pd/com/android/gallery3d/picasasource/PicasaSource.java
|
6f6230e40811effe0b0ca9ba023136b3b36130b7 |
13-Dec-2011 |
Owen Lin <owenlin@google.com> |
Support querying account and picasa id of a picasa image. Change-Id: I7d24fb70b0a8a01c5d0fbdb6205c25d74d1996a6 fix: 5482269
rc/com/android/gallery3d/provider/GalleryProvider.java
rc_pd/com/android/gallery3d/picasasource/PicasaSource.java
|
83e9e3034f782c96aaee894c7c33dd9cab81aaff |
13-Dec-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
7442c3c8f181a713d737d7d4247031c656655467 |
13-Dec-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
315d44724d404dcd7899f175aa2808e347099efc |
13-Dec-2011 |
Owen Lin <owenlin@google.com> |
am 89d07534: Make sure the backgroud is cleared in MovieActivity. * commit '89d0753435b0fdd9fdedc1778156a79786731c70': Make sure the backgroud is cleared in MovieActivity.
|
fbc9e7b0da5d577e25916a8ea806cdea657c763e |
12-Dec-2011 |
Owen Lin <owenlin@google.com> |
Make sure the backgroud is cleared in MovieActivity. Change-Id: I1a08c2df1a5c26bcb8de0900ec9c593c0f974d3d fix: 5742974
ndroidManifest.xml
|
3d90f2cd73d5198bbdb684f02b311aaf7e499f77 |
12-Dec-2011 |
Owen Lin <owenlin@google.com> |
Make sure the backgroud is cleared in MovieActivity. Change-Id: I1a08c2df1a5c26bcb8de0900ec9c593c0f974d3d fix: 5742974
es/values/styles.xml
|
89d0753435b0fdd9fdedc1778156a79786731c70 |
12-Dec-2011 |
Owen Lin <owenlin@google.com> |
Make sure the backgroud is cleared in MovieActivity. Change-Id: I1a08c2df1a5c26bcb8de0900ec9c593c0f974d3d fix: 5742974
ndroidManifest.xml
es/values/styles.xml
|
408142d88cd9443d3bf178db33eda8cc744fdf31 |
10-Dec-2011 |
The Android Open Source Project <initial-contribution@android.com> |
am 57129a21: am 520b7ee0: Reconcile with ics-mr1-release * commit '57129a21e1865bb44ea4c4a93f75ed996c9b2764':
|
57129a21e1865bb44ea4c4a93f75ed996c9b2764 |
09-Dec-2011 |
The Android Open Source Project <initial-contribution@android.com> |
am 520b7ee0: Reconcile with ics-mr1-release * commit '520b7ee0f0f3e0b1e2424f64a0c0912d4c19bf19':
|
520b7ee0f0f3e0b1e2424f64a0c0912d4c19bf19 |
08-Dec-2011 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with ics-mr1-release Change-Id: I3ff57eb4e0a33e875d39ce06a12f6809bc5f50db
|
0ba47a1d1d5923c760b3601296b7c9b04a9b3579 |
06-Dec-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
248c0da75185bfc5bc7280e485e275db1c9376d4 |
06-Dec-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
1f814515b693e6dc6547bb99df613f12d30ef524 |
06-Dec-2011 |
Yuli Huang <yuli@google.com> |
am 6ff91673: Improve Doodle UI for ending Doodle effect. * commit '6ff9167388b26ea67cad4497ddd2cf42e882b928': Improve Doodle UI for ending Doodle effect.
|
72a8d96b9b77a48562e1a650a928638281f9c7aa |
05-Dec-2011 |
Yuli Huang <yuli@google.com> |
Improve Doodle UI for ending Doodle effect. As doodle-view was removed before the final doodle results are produced by MFF and displayed, doodles drawn disappeared temporarily when the user exits Doodle effect. Change-Id: I72822ba840f41f509fe4e9a2e1022a5b40b14e6a
rc/com/android/gallery3d/photoeditor/actions/EffectAction.java
rc/com/android/gallery3d/photoeditor/actions/EffectToolKit.java
|
6ff9167388b26ea67cad4497ddd2cf42e882b928 |
05-Dec-2011 |
Yuli Huang <yuli@google.com> |
Improve Doodle UI for ending Doodle effect. As doodle-view was removed before the final doodle results are produced by MFF and displayed, doodles drawn disappeared temporarily when the user exits Doodle effect. Change-Id: I72822ba840f41f509fe4e9a2e1022a5b40b14e6a
rc/com/android/gallery3d/photoeditor/actions/EffectAction.java
rc/com/android/gallery3d/photoeditor/actions/EffectToolKit.java
|
8e27a42c6cf631803bd044cfcf9a8c02a7ce3673 |
05-Dec-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
bceeb2a6707cadf5f246383161d16087a2aac6ea |
05-Dec-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
494796e85c1e215b3f5e50f7f4846c67a9262f53 |
05-Dec-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
a817c64588ecfde4b64928d6f3d1c49c373b8d64 |
05-Dec-2011 |
Yuli Huang <yuli@google.com> |
am 26c03546: Fix effect-label layout and a TODO. * commit '26c0354619d6229a937f4232e2c9744385c046ad': Fix effect-label layout and a TODO.
|
1bcd04ac4b38b50e993533f1f18b5e5f3bc34008 |
02-Dec-2011 |
Yuli Huang <yuli@google.com> |
Fix effect-label layout and a TODO. 1. Seekbar was wrongly placed below effect label because of the added order. 2. Fix a TODO by refactoring EffectToolFactory to EffectToolKit. Change-Id: I8d37c2c2b6d15f2af65d4e6b27116afe01df63c9
rc/com/android/gallery3d/photoeditor/EffectsBar.java
rc/com/android/gallery3d/photoeditor/actions/ColorTemperatureAction.java
rc/com/android/gallery3d/photoeditor/actions/CropAction.java
rc/com/android/gallery3d/photoeditor/actions/DoodleAction.java
rc/com/android/gallery3d/photoeditor/actions/EffectAction.java
rc/com/android/gallery3d/photoeditor/actions/EffectToolFactory.java
rc/com/android/gallery3d/photoeditor/actions/EffectToolKit.java
rc/com/android/gallery3d/photoeditor/actions/FaceTanAction.java
rc/com/android/gallery3d/photoeditor/actions/FaceliftAction.java
rc/com/android/gallery3d/photoeditor/actions/FillLightAction.java
rc/com/android/gallery3d/photoeditor/actions/FisheyeAction.java
rc/com/android/gallery3d/photoeditor/actions/FlipAction.java
rc/com/android/gallery3d/photoeditor/actions/GrainAction.java
rc/com/android/gallery3d/photoeditor/actions/HighlightAction.java
rc/com/android/gallery3d/photoeditor/actions/RedEyeAction.java
rc/com/android/gallery3d/photoeditor/actions/RotateAction.java
rc/com/android/gallery3d/photoeditor/actions/SaturationAction.java
rc/com/android/gallery3d/photoeditor/actions/ShadowAction.java
rc/com/android/gallery3d/photoeditor/actions/SharpenAction.java
rc/com/android/gallery3d/photoeditor/actions/StraightenAction.java
rc/com/android/gallery3d/photoeditor/actions/TintAction.java
rc/com/android/gallery3d/photoeditor/actions/VignetteAction.java
|
26c0354619d6229a937f4232e2c9744385c046ad |
02-Dec-2011 |
Yuli Huang <yuli@google.com> |
Fix effect-label layout and a TODO. 1. Seekbar was wrongly placed below effect label because of the added order. 2. Fix a TODO by refactoring EffectToolFactory to EffectToolKit. Change-Id: I8d37c2c2b6d15f2af65d4e6b27116afe01df63c9
rc/com/android/gallery3d/photoeditor/EffectsBar.java
rc/com/android/gallery3d/photoeditor/actions/ColorTemperatureAction.java
rc/com/android/gallery3d/photoeditor/actions/CropAction.java
rc/com/android/gallery3d/photoeditor/actions/DoodleAction.java
rc/com/android/gallery3d/photoeditor/actions/EffectAction.java
rc/com/android/gallery3d/photoeditor/actions/EffectToolFactory.java
rc/com/android/gallery3d/photoeditor/actions/EffectToolKit.java
rc/com/android/gallery3d/photoeditor/actions/FaceTanAction.java
rc/com/android/gallery3d/photoeditor/actions/FaceliftAction.java
rc/com/android/gallery3d/photoeditor/actions/FillLightAction.java
rc/com/android/gallery3d/photoeditor/actions/FisheyeAction.java
rc/com/android/gallery3d/photoeditor/actions/FlipAction.java
rc/com/android/gallery3d/photoeditor/actions/GrainAction.java
rc/com/android/gallery3d/photoeditor/actions/HighlightAction.java
rc/com/android/gallery3d/photoeditor/actions/RedEyeAction.java
rc/com/android/gallery3d/photoeditor/actions/RotateAction.java
rc/com/android/gallery3d/photoeditor/actions/SaturationAction.java
rc/com/android/gallery3d/photoeditor/actions/ShadowAction.java
rc/com/android/gallery3d/photoeditor/actions/SharpenAction.java
rc/com/android/gallery3d/photoeditor/actions/StraightenAction.java
rc/com/android/gallery3d/photoeditor/actions/TintAction.java
rc/com/android/gallery3d/photoeditor/actions/VignetteAction.java
|
106f2df952a818758bdc95b14bf5b903f36f8c93 |
02-Dec-2011 |
Yuli Huang <yuli@google.com> |
am 5a3b6e09: Merge "Simplify EffectAction." * commit '5a3b6e0954b19142f4f4de09ce9f7e38052f283c': Simplify EffectAction.
|
63a3e9848a857d0681270353f4be50d108017fa4 |
02-Dec-2011 |
Yuli Huang <yuli@google.com> |
Merge "Simplify EffectAction."
|
5a3b6e0954b19142f4f4de09ce9f7e38052f283c |
02-Dec-2011 |
Yuli Huang <yuli@google.com> |
Merge "Simplify EffectAction."
|
e26a8c8f3f7c82b010a255988a2d92243da3d657 |
02-Dec-2011 |
Yuli Huang <yuli@google.com> |
Simplify EffectAction. 1. Make the whole effect item clickable instead of just the icon. 2. Rename interfaces/methods to improve readability. Change-Id: I647a13dae88b4527b7baba85bb83b9bd15bbe997
es/layout/photoeditor_effects_artistic.xml
es/layout/photoeditor_effects_color.xml
es/layout/photoeditor_effects_exposure.xml
es/layout/photoeditor_effects_fix.xml
|
72f77e4e3147cc856a472f31999d98d08fc19edc |
02-Dec-2011 |
Yuli Huang <yuli@google.com> |
Simplify EffectAction. 1. Make the whole effect item clickable instead of just the icon. 2. Rename interfaces/methods to improve readability. Change-Id: I647a13dae88b4527b7baba85bb83b9bd15bbe997
rc/com/android/gallery3d/photoeditor/EffectsBar.java
rc/com/android/gallery3d/photoeditor/EffectsMenu.java
rc/com/android/gallery3d/photoeditor/actions/AutoFixAction.java
rc/com/android/gallery3d/photoeditor/actions/CrossProcessAction.java
rc/com/android/gallery3d/photoeditor/actions/DocumentaryAction.java
rc/com/android/gallery3d/photoeditor/actions/DuotoneAction.java
rc/com/android/gallery3d/photoeditor/actions/EffectAction.java
rc/com/android/gallery3d/photoeditor/actions/GrayscaleAction.java
rc/com/android/gallery3d/photoeditor/actions/LomoishAction.java
rc/com/android/gallery3d/photoeditor/actions/NegativeAction.java
rc/com/android/gallery3d/photoeditor/actions/PosterizeAction.java
rc/com/android/gallery3d/photoeditor/actions/SepiaAction.java
rc/com/android/gallery3d/photoeditor/actions/TintAction.java
|
dc1b41c7f4226b24b8aa6b767b6c1edf77f87772 |
02-Dec-2011 |
Yuli Huang <yuli@google.com> |
Simplify EffectAction. 1. Make the whole effect item clickable instead of just the icon. 2. Rename interfaces/methods to improve readability. Change-Id: I647a13dae88b4527b7baba85bb83b9bd15bbe997
es/layout/photoeditor_effects_artistic.xml
es/layout/photoeditor_effects_color.xml
es/layout/photoeditor_effects_exposure.xml
es/layout/photoeditor_effects_fix.xml
rc/com/android/gallery3d/photoeditor/EffectsBar.java
rc/com/android/gallery3d/photoeditor/EffectsMenu.java
rc/com/android/gallery3d/photoeditor/actions/AutoFixAction.java
rc/com/android/gallery3d/photoeditor/actions/CrossProcessAction.java
rc/com/android/gallery3d/photoeditor/actions/DocumentaryAction.java
rc/com/android/gallery3d/photoeditor/actions/DuotoneAction.java
rc/com/android/gallery3d/photoeditor/actions/EffectAction.java
rc/com/android/gallery3d/photoeditor/actions/GrayscaleAction.java
rc/com/android/gallery3d/photoeditor/actions/LomoishAction.java
rc/com/android/gallery3d/photoeditor/actions/NegativeAction.java
rc/com/android/gallery3d/photoeditor/actions/PosterizeAction.java
rc/com/android/gallery3d/photoeditor/actions/SepiaAction.java
rc/com/android/gallery3d/photoeditor/actions/TintAction.java
|
93a9d84c32a8c5591e4cf5a1882e11b8e733c8cc |
02-Dec-2011 |
The Android Open Source Project <initial-contribution@android.com> |
am 292467da: Reconcile with ics-mr1-release * commit '292467da0d048ebabc70879d52508ca5d83674f8':
|
9718b6b4dd0073ac91adf3ac0995fcab8576d9c5 |
02-Dec-2011 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with ics-mr1-release Change-Id: Iaaf97ddd8d3786e661679d822ccdb7241303db51
|
292467da0d048ebabc70879d52508ca5d83674f8 |
02-Dec-2011 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with ics-mr1-release Change-Id: Iaaf97ddd8d3786e661679d822ccdb7241303db51
|
b8c32ac84c4f96445f6d1cf4d4e7704b44b194a4 |
02-Dec-2011 |
Yuli Huang <yuli@google.com> |
am 1d9a19dd: Remove unnecessary code. * commit '1d9a19ddfcbedb6d52f93dd5e5fefe6a3a9dfc26': Remove unnecessary code.
|
5fa9a3dc0c61ee80363125db5029f3683c3813d3 |
02-Dec-2011 |
Yuli Huang <yuli@google.com> |
Remove unnecessary code. Revert BitmapUtils changes made in cl:122870 as crop/rotate is now done in MFF. Change-Id: I3733c9acf911c4f694dd21dd533b0dd07350acea
rc/com/android/gallery3d/photoeditor/BitmapUtils.java
|
1d9a19ddfcbedb6d52f93dd5e5fefe6a3a9dfc26 |
02-Dec-2011 |
Yuli Huang <yuli@google.com> |
Remove unnecessary code. Revert BitmapUtils changes made in cl:122870 as crop/rotate is now done in MFF. Change-Id: I3733c9acf911c4f694dd21dd533b0dd07350acea
rc/com/android/gallery3d/photoeditor/BitmapUtils.java
|
7584758fe3e32ebeb616b00e5ef851955feff190 |
02-Dec-2011 |
Yuli Huang <yuli@google.com> |
am 203bb023: Merge "Refactor to remove obsolete design and improve code consistency." * commit '203bb023e745d2ee36e9bf19a638a2a7c817da40': Refactor to remove obsolete design and improve code consistency.
|
17b623f9bb97b881bba8fb40ca26ce910adab15c |
02-Dec-2011 |
Yuli Huang <yuli@google.com> |
Merge "Refactor to remove obsolete design and improve code consistency."
|
f713a5ced2916184c6a9d9cc56d137a404442495 |
02-Dec-2011 |
Yuli Huang <yuli@google.com> |
Merge "Refactor to remove obsolete design and improve code consistency."
|
203bb023e745d2ee36e9bf19a638a2a7c817da40 |
02-Dec-2011 |
Yuli Huang <yuli@google.com> |
Merge "Refactor to remove obsolete design and improve code consistency."
|
a39fe0ed6707414810db0ce88023fb505fde24bf |
02-Dec-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-mr1-release history after reset to ics-mr1
|
8da14d2f31f538832e1613037d932d48fb49be6e |
02-Dec-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-mr1-release history after reset to ics-mr1
|
b3769b3189155157a3c4a08e7149f3152b0178a8 |
01-Dec-2011 |
Daniel Sandler <dsandler@android.com> |
am 86c245b0: am a8e684f5: (-s ours) Merge "Remove dependency on support library. DO NOT MERGE." into ics-mr1 * commit '86c245b0f5f63e4bbde5eb5350024cc31586ee25': Remove dependency on support library. DO NOT MERGE.
|
4b827976a568440175c7ae7917976d8a92281353 |
01-Dec-2011 |
Daniel Sandler <dsandler@android.com> |
am a8e684f5: (-s ours) Merge "Remove dependency on support library. DO NOT MERGE." into ics-mr1 * commit 'a8e684f5da3e761debf8ae93ecdb63a8d9e3c7a3': Remove dependency on support library. DO NOT MERGE.
|
86c245b0f5f63e4bbde5eb5350024cc31586ee25 |
01-Dec-2011 |
Daniel Sandler <dsandler@android.com> |
am a8e684f5: (-s ours) Merge "Remove dependency on support library. DO NOT MERGE." into ics-mr1 * commit 'a8e684f5da3e761debf8ae93ecdb63a8d9e3c7a3': Remove dependency on support library. DO NOT MERGE.
|
8b3970fb39e9af69fe00c6f33a9a5f8664661f83 |
01-Dec-2011 |
Daniel Sandler <dsandler@android.com> |
am a8e684f5: Merge "Remove dependency on support library. DO NOT MERGE." into ics-mr1 * commit 'a8e684f5da3e761debf8ae93ecdb63a8d9e3c7a3': Remove dependency on support library. DO NOT MERGE.
|
1e05b46be3b0b7050db4ac97a010ea2921422203 |
01-Dec-2011 |
Daniel Sandler <dsandler@android.com> |
am a8e684f5: Merge "Remove dependency on support library. DO NOT MERGE." into ics-mr1 * commit 'a8e684f5da3e761debf8ae93ecdb63a8d9e3c7a3': Remove dependency on support library. DO NOT MERGE.
|
68d7a1a42ed46f1077405a289e20696b7c358b46 |
01-Dec-2011 |
Daniel Sandler <dsandler@android.com> |
Merge "Remove dependency on support library. DO NOT MERGE." into ics-mr1
|
a8e684f5da3e761debf8ae93ecdb63a8d9e3c7a3 |
01-Dec-2011 |
Daniel Sandler <dsandler@android.com> |
Merge "Remove dependency on support library. DO NOT MERGE." into ics-mr1
|
c5831f7b1c639806e5d59864848a5468b1dbb67c |
01-Dec-2011 |
Jeff Sharkey <jsharkey@android.com> |
am f4579c85: resolved conflicts for merge of c0715fd5 to master * commit 'f4579c85a6da20767170e31ef89f22c5f1932ef4': Add close() to Download cache.
|
af5e2faf47b3a71c07a9069efed2de31e49b4883 |
01-Dec-2011 |
Jeff Sharkey <jsharkey@android.com> |
resolved conflicts for merge of c0715fd5 to master Change-Id: Iab2221b984c2b86d0b220466f58368fbf1af5e20
|
0f5b04f2416b359db14927a55f67e7c618346e5f |
01-Dec-2011 |
Jeff Sharkey <jsharkey@android.com> |
resolved conflicts for merge of c0715fd5 to master Change-Id: Iab2221b984c2b86d0b220466f58368fbf1af5e20
|
f4579c85a6da20767170e31ef89f22c5f1932ef4 |
01-Dec-2011 |
Jeff Sharkey <jsharkey@android.com> |
resolved conflicts for merge of c0715fd5 to master Change-Id: Iab2221b984c2b86d0b220466f58368fbf1af5e20
|
95a8a5ed3babe32a267d4548668927ae32e0d1ef |
01-Dec-2011 |
Owen Lin <owenlin@google.com> |
am c0715fd5: Add close() to Download cache. * commit 'c0715fd58c287347458756e34f07cee1fd72b982': Add close() to Download cache.
|
486ae0aae9151aeba63cef06fb91ddc40c2a7508 |
01-Dec-2011 |
Owen Lin <owenlin@google.com> |
am c0715fd5: Add close() to Download cache. * commit 'c0715fd58c287347458756e34f07cee1fd72b982': Add close() to Download cache.
|
119d3a211076b99934760dfa67013b31891becc0 |
01-Dec-2011 |
Daniel Sandler <dsandler@android.com> |
Remove dependency on support library. DO NOT MERGE. Bug: 5689684 Change-Id: I95d1090b91302dc6686d36768721cca61e9d1249
rc/com/android/gallery3d/app/SlideshowDream.java
|
43072a9551c907236a9f0bb4e6506ef0bd5d6c03 |
01-Dec-2011 |
Daniel Sandler <dsandler@android.com> |
Remove dependency on support library. DO NOT MERGE. Bug: 5689684 Change-Id: I95d1090b91302dc6686d36768721cca61e9d1249
rc/com/android/gallery3d/app/SlideshowDream.java
|
14ff23808f86b3d3618177c86e0edf148dced11b |
28-Nov-2011 |
Yuli Huang <yuli@google.com> |
Refactor to remove obsolete design and improve code consistency. 1. Remove isValid()/validate() in Filter; EffectAction would push filters into the stack when being notified by notifyChanged(). 2. Make RedEyeAction consistent with DoodleAction by ignoring out-of-bounds operations. 3. Improve consistency by encapsulate effect-tool creation/removal in one class (EffectToolFactory). 4. Minimize variable visibility in EffectAction subclasses. 5. Fix unfinished doodle lost when exiting Doodle effect by multi-touch. Change-Id: I8d3b127c5fe8777eb45b7c5ae680f6a30a99635a
es/layout/photoeditor_crop_view.xml
es/layout/photoeditor_doodle_view.xml
es/layout/photoeditor_effect_tool_fullscreen.xml
es/layout/photoeditor_flip_view.xml
es/layout/photoeditor_rotate_view.xml
es/layout/photoeditor_touch_view.xml
|
11571bf7436900b513dd3696a90f546b25839591 |
28-Nov-2011 |
Yuli Huang <yuli@google.com> |
Refactor to remove obsolete design and improve code consistency. 1. Remove isValid()/validate() in Filter; EffectAction would push filters into the stack when being notified by notifyChanged(). 2. Make RedEyeAction consistent with DoodleAction by ignoring out-of-bounds operations. 3. Improve consistency by encapsulate effect-tool creation/removal in one class (EffectToolFactory). 4. Minimize variable visibility in EffectAction subclasses. 5. Fix unfinished doodle lost when exiting Doodle effect by multi-touch. Change-Id: I8d3b127c5fe8777eb45b7c5ae680f6a30a99635a
rc/com/android/gallery3d/photoeditor/EffectsBar.java
rc/com/android/gallery3d/photoeditor/actions/AutoFixAction.java
rc/com/android/gallery3d/photoeditor/actions/ColorTemperatureAction.java
rc/com/android/gallery3d/photoeditor/actions/CropAction.java
rc/com/android/gallery3d/photoeditor/actions/CrossProcessAction.java
rc/com/android/gallery3d/photoeditor/actions/DocumentaryAction.java
rc/com/android/gallery3d/photoeditor/actions/Doodle.java
rc/com/android/gallery3d/photoeditor/actions/DoodleAction.java
rc/com/android/gallery3d/photoeditor/actions/DoodleView.java
rc/com/android/gallery3d/photoeditor/actions/DuotoneAction.java
rc/com/android/gallery3d/photoeditor/actions/EffectAction.java
rc/com/android/gallery3d/photoeditor/actions/EffectToolFactory.java
rc/com/android/gallery3d/photoeditor/actions/FaceTanAction.java
rc/com/android/gallery3d/photoeditor/actions/FaceliftAction.java
rc/com/android/gallery3d/photoeditor/actions/FillLightAction.java
rc/com/android/gallery3d/photoeditor/actions/FisheyeAction.java
rc/com/android/gallery3d/photoeditor/actions/FlipAction.java
rc/com/android/gallery3d/photoeditor/actions/GrainAction.java
rc/com/android/gallery3d/photoeditor/actions/GrayscaleAction.java
rc/com/android/gallery3d/photoeditor/actions/HighlightAction.java
rc/com/android/gallery3d/photoeditor/actions/LomoishAction.java
rc/com/android/gallery3d/photoeditor/actions/NegativeAction.java
rc/com/android/gallery3d/photoeditor/actions/PosterizeAction.java
rc/com/android/gallery3d/photoeditor/actions/RedEyeAction.java
rc/com/android/gallery3d/photoeditor/actions/RotateAction.java
rc/com/android/gallery3d/photoeditor/actions/SaturationAction.java
rc/com/android/gallery3d/photoeditor/actions/SepiaAction.java
rc/com/android/gallery3d/photoeditor/actions/ShadowAction.java
rc/com/android/gallery3d/photoeditor/actions/SharpenAction.java
rc/com/android/gallery3d/photoeditor/actions/StraightenAction.java
rc/com/android/gallery3d/photoeditor/actions/TintAction.java
rc/com/android/gallery3d/photoeditor/actions/TouchView.java
rc/com/android/gallery3d/photoeditor/actions/VignetteAction.java
rc/com/android/gallery3d/photoeditor/filters/AbstractScaleFilter.java
rc/com/android/gallery3d/photoeditor/filters/CropFilter.java
rc/com/android/gallery3d/photoeditor/filters/CrossProcessFilter.java
rc/com/android/gallery3d/photoeditor/filters/DocumentaryFilter.java
rc/com/android/gallery3d/photoeditor/filters/DoodleFilter.java
rc/com/android/gallery3d/photoeditor/filters/DuotoneFilter.java
rc/com/android/gallery3d/photoeditor/filters/Filter.java
rc/com/android/gallery3d/photoeditor/filters/FlipFilter.java
rc/com/android/gallery3d/photoeditor/filters/GrayscaleFilter.java
rc/com/android/gallery3d/photoeditor/filters/LomoishFilter.java
rc/com/android/gallery3d/photoeditor/filters/NegativeFilter.java
rc/com/android/gallery3d/photoeditor/filters/PosterizeFilter.java
rc/com/android/gallery3d/photoeditor/filters/RedEyeFilter.java
rc/com/android/gallery3d/photoeditor/filters/RotateFilter.java
rc/com/android/gallery3d/photoeditor/filters/SepiaFilter.java
rc/com/android/gallery3d/photoeditor/filters/StraightenFilter.java
rc/com/android/gallery3d/photoeditor/filters/TintFilter.java
|
04085c3b17e4b6da6fb951e2cdbd35dfa153bb87 |
28-Nov-2011 |
Yuli Huang <yuli@google.com> |
Refactor to remove obsolete design and improve code consistency. 1. Remove isValid()/validate() in Filter; EffectAction would push filters into the stack when being notified by notifyChanged(). 2. Make RedEyeAction consistent with DoodleAction by ignoring out-of-bounds operations. 3. Improve consistency by encapsulate effect-tool creation/removal in one class (EffectToolFactory). 4. Minimize variable visibility in EffectAction subclasses. 5. Fix unfinished doodle lost when exiting Doodle effect by multi-touch. Change-Id: I8d3b127c5fe8777eb45b7c5ae680f6a30a99635a
es/layout/photoeditor_crop_view.xml
es/layout/photoeditor_doodle_view.xml
es/layout/photoeditor_effect_tool_fullscreen.xml
es/layout/photoeditor_flip_view.xml
es/layout/photoeditor_rotate_view.xml
es/layout/photoeditor_touch_view.xml
rc/com/android/gallery3d/photoeditor/EffectsBar.java
rc/com/android/gallery3d/photoeditor/actions/AutoFixAction.java
rc/com/android/gallery3d/photoeditor/actions/ColorTemperatureAction.java
rc/com/android/gallery3d/photoeditor/actions/CropAction.java
rc/com/android/gallery3d/photoeditor/actions/CrossProcessAction.java
rc/com/android/gallery3d/photoeditor/actions/DocumentaryAction.java
rc/com/android/gallery3d/photoeditor/actions/Doodle.java
rc/com/android/gallery3d/photoeditor/actions/DoodleAction.java
rc/com/android/gallery3d/photoeditor/actions/DoodleView.java
rc/com/android/gallery3d/photoeditor/actions/DuotoneAction.java
rc/com/android/gallery3d/photoeditor/actions/EffectAction.java
rc/com/android/gallery3d/photoeditor/actions/EffectToolFactory.java
rc/com/android/gallery3d/photoeditor/actions/FaceTanAction.java
rc/com/android/gallery3d/photoeditor/actions/FaceliftAction.java
rc/com/android/gallery3d/photoeditor/actions/FillLightAction.java
rc/com/android/gallery3d/photoeditor/actions/FisheyeAction.java
rc/com/android/gallery3d/photoeditor/actions/FlipAction.java
rc/com/android/gallery3d/photoeditor/actions/GrainAction.java
rc/com/android/gallery3d/photoeditor/actions/GrayscaleAction.java
rc/com/android/gallery3d/photoeditor/actions/HighlightAction.java
rc/com/android/gallery3d/photoeditor/actions/LomoishAction.java
rc/com/android/gallery3d/photoeditor/actions/NegativeAction.java
rc/com/android/gallery3d/photoeditor/actions/PosterizeAction.java
rc/com/android/gallery3d/photoeditor/actions/RedEyeAction.java
rc/com/android/gallery3d/photoeditor/actions/RotateAction.java
rc/com/android/gallery3d/photoeditor/actions/SaturationAction.java
rc/com/android/gallery3d/photoeditor/actions/SepiaAction.java
rc/com/android/gallery3d/photoeditor/actions/ShadowAction.java
rc/com/android/gallery3d/photoeditor/actions/SharpenAction.java
rc/com/android/gallery3d/photoeditor/actions/StraightenAction.java
rc/com/android/gallery3d/photoeditor/actions/TintAction.java
rc/com/android/gallery3d/photoeditor/actions/TouchView.java
rc/com/android/gallery3d/photoeditor/actions/VignetteAction.java
rc/com/android/gallery3d/photoeditor/filters/AbstractScaleFilter.java
rc/com/android/gallery3d/photoeditor/filters/CropFilter.java
rc/com/android/gallery3d/photoeditor/filters/CrossProcessFilter.java
rc/com/android/gallery3d/photoeditor/filters/DocumentaryFilter.java
rc/com/android/gallery3d/photoeditor/filters/DoodleFilter.java
rc/com/android/gallery3d/photoeditor/filters/DuotoneFilter.java
rc/com/android/gallery3d/photoeditor/filters/Filter.java
rc/com/android/gallery3d/photoeditor/filters/FlipFilter.java
rc/com/android/gallery3d/photoeditor/filters/GrayscaleFilter.java
rc/com/android/gallery3d/photoeditor/filters/LomoishFilter.java
rc/com/android/gallery3d/photoeditor/filters/NegativeFilter.java
rc/com/android/gallery3d/photoeditor/filters/PosterizeFilter.java
rc/com/android/gallery3d/photoeditor/filters/RedEyeFilter.java
rc/com/android/gallery3d/photoeditor/filters/RotateFilter.java
rc/com/android/gallery3d/photoeditor/filters/SepiaFilter.java
rc/com/android/gallery3d/photoeditor/filters/StraightenFilter.java
rc/com/android/gallery3d/photoeditor/filters/TintFilter.java
|
ada0af6550092f5986c1c9c541c5cc979d5c754b |
01-Dec-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
7a606f95cd228a4ee9f816159c2079eb3d441f67 |
01-Dec-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
b64bf28d9fec52400be89fd5f845f1f486acbd69 |
01-Dec-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
8628ec7a18af23688a9a6b185914aa4d7170e0b9 |
01-Dec-2011 |
Owen Lin <owenlin@google.com> |
Add close() to Download cache. Change-Id: Idf0482e9f3cd2f667dca902ffea75bb0a0225d2d fix: 5664497
allerycommon/src/com/android/gallery3d/common/BlobCache.java
allerycommon/src/com/android/gallery3d/common/FileCache.java
|
c0715fd58c287347458756e34f07cee1fd72b982 |
01-Dec-2011 |
Owen Lin <owenlin@google.com> |
Add close() to Download cache. Change-Id: Idf0482e9f3cd2f667dca902ffea75bb0a0225d2d fix: 5664497
allerycommon/src/com/android/gallery3d/common/BlobCache.java
allerycommon/src/com/android/gallery3d/common/FileCache.java
|
7fb19a9cef3a4ae0dbfa32ea4cb03d14e01cd2cf |
01-Dec-2011 |
Owen Lin <owenlin@google.com> |
Add close() to Download cache. Change-Id: Idf0482e9f3cd2f667dca902ffea75bb0a0225d2d fix: 5664497
allerycommon/src/com/android/gallery3d/common/BlobCache.java
allerycommon/src/com/android/gallery3d/common/FileCache.java
|
c4c4c81afe6d31b172f4abf3b2f2dcd27978de15 |
30-Nov-2011 |
The Android Open Source Project <initial-contribution@android.com> |
am 3a106dce: Reconcile with ics-mr1-release * commit '3a106dceb0f34751fa8b78de192ed75b2f6e2795':
|
9759cd881fcc880877471201199acde4c14c3ebe |
30-Nov-2011 |
Chih-Chung Chang <chihchung@google.com> |
am fa860f37: am 764482c4: Merge "Fix 5685925: Handle PACKAGE_CHANGED intent (when a package is enabled/disabled)" into ics-mr1 * commit 'fa860f3772f4b69a837add25de76dbe06daa8b3f': Fix 5685925: Handle PACKAGE_CHANGED intent (when a package is enabled/disabled)
|
28bbc4a676eb647c9219aedd2c63281231790378 |
30-Nov-2011 |
Chih-Chung Chang <chihchung@google.com> |
am e11e36e2: am 002a3fec: Fix 5686493: Crash when try to click any thumbnail * commit 'e11e36e2aefa19e99e40c78992e86764a75528c3': Fix 5686493: Crash when try to click any thumbnail
|
8890378fe54df92221b0bf09bad6684cc0cd0d51 |
30-Nov-2011 |
Daniel Sandler <dsandler@android.com> |
am 046d036a: am 45fa6771: Merge "Improve screen on/off logic in slideshow." into ics-mr1 * commit '046d036a24f624b8d30203a0e44a5fe761052c46': Improve screen on/off logic in slideshow.
|
777edc857e3585dc66b1d53f78fe2f0afc7e2e73 |
30-Nov-2011 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with ics-mr1-release Change-Id: I8c28be97a60bc619a3d853c08d5c1dcbec1c7e20
|
c6832775d16bcb7e7fd11b577fd9e4ce86f34d49 |
30-Nov-2011 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with ics-mr1-release Change-Id: I8c28be97a60bc619a3d853c08d5c1dcbec1c7e20
|
3a106dceb0f34751fa8b78de192ed75b2f6e2795 |
30-Nov-2011 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with ics-mr1-release Change-Id: I8c28be97a60bc619a3d853c08d5c1dcbec1c7e20
|
b8236aa449d0f5c5088598a9c50f801f5a8b48e4 |
30-Nov-2011 |
Chih-Chung Chang <chihchung@google.com> |
am 764482c4: Merge "Fix 5685925: Handle PACKAGE_CHANGED intent (when a package is enabled/disabled)" into ics-mr1 * commit '764482c4ebffc9c3cac21fcd8707811e981cd092': Fix 5685925: Handle PACKAGE_CHANGED intent (when a package is enabled/disabled)
|
fa860f3772f4b69a837add25de76dbe06daa8b3f |
30-Nov-2011 |
Chih-Chung Chang <chihchung@google.com> |
am 764482c4: Merge "Fix 5685925: Handle PACKAGE_CHANGED intent (when a package is enabled/disabled)" into ics-mr1 * commit '764482c4ebffc9c3cac21fcd8707811e981cd092': Fix 5685925: Handle PACKAGE_CHANGED intent (when a package is enabled/disabled)
|
58209e95e523d67523dd93cb0a71a9d2d9b5d9c1 |
30-Nov-2011 |
Chih-Chung Chang <chihchung@google.com> |
am 764482c4: Merge "Fix 5685925: Handle PACKAGE_CHANGED intent (when a package is enabled/disabled)" into ics-mr1 * commit '764482c4ebffc9c3cac21fcd8707811e981cd092': Fix 5685925: Handle PACKAGE_CHANGED intent (when a package is enabled/disabled)
|
e11e36e2aefa19e99e40c78992e86764a75528c3 |
30-Nov-2011 |
Chih-Chung Chang <chihchung@google.com> |
am 002a3fec: Fix 5686493: Crash when try to click any thumbnail * commit '002a3fece284f713537fad4523ee963d257350e9': Fix 5686493: Crash when try to click any thumbnail
|
47873020e4d1d1ab7e1b80a09cd5a41d94798d12 |
30-Nov-2011 |
Chih-Chung Chang <chihchung@google.com> |
am 002a3fec: Fix 5686493: Crash when try to click any thumbnail * commit '002a3fece284f713537fad4523ee963d257350e9': Fix 5686493: Crash when try to click any thumbnail
|
046d036a24f624b8d30203a0e44a5fe761052c46 |
30-Nov-2011 |
Daniel Sandler <dsandler@android.com> |
am 45fa6771: Merge "Improve screen on/off logic in slideshow." into ics-mr1 * commit '45fa677140112f725df3765be56edc715c226aa5': Improve screen on/off logic in slideshow.
|
ac11391cb7da2ae3856c1ec732a0769f40cb8eab |
30-Nov-2011 |
Daniel Sandler <dsandler@android.com> |
am 45fa6771: Merge "Improve screen on/off logic in slideshow." into ics-mr1 * commit '45fa677140112f725df3765be56edc715c226aa5': Improve screen on/off logic in slideshow.
|
64fc2ef255493adc0b95da216726d37306ad2440 |
30-Nov-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
8c402ded95449c7d35b8b8fdf05dd22552e6cf9b |
30-Nov-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
2013ec2d68778357a3d96dfeb1b4c61b9d3539e3 |
30-Nov-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
5ae80bcb2d18834501276ef29e7dab6fe6b5c669 |
30-Nov-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-mr1-release history after reset to ics-mr1
|
bb6e917199bd1630786fea373833c9cd5b2cfe0a |
30-Nov-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-mr1-release history after reset to ics-mr1
|
75d79720920d2fd94a454098ee5645e6cc3cd989 |
30-Nov-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-mr1-release history after reset to ics-mr1
|
6d12f847a07a5425eadfe0a4705d103e52e945fe |
30-Nov-2011 |
Chih-Chung Chang <chihchung@google.com> |
am 764482c4: Merge "Fix 5685925: Handle PACKAGE_CHANGED intent (when a package is enabled/disabled)" into ics-mr1 * commit '764482c4ebffc9c3cac21fcd8707811e981cd092': Fix 5685925: Handle PACKAGE_CHANGED intent (when a package is enabled/disabled)
|
510f2f2bcc21d4ed479281b9e40c8cf303670970 |
30-Nov-2011 |
Chih-Chung Chang <chihchung@google.com> |
am 764482c4: Merge "Fix 5685925: Handle PACKAGE_CHANGED intent (when a package is enabled/disabled)" into ics-mr1 * commit '764482c4ebffc9c3cac21fcd8707811e981cd092': Fix 5685925: Handle PACKAGE_CHANGED intent (when a package is enabled/disabled)
|
a190a65d052e71fc5a0e0fa26d9dc61a4ba340af |
30-Nov-2011 |
Chih-Chung Chang <chihchung@google.com> |
am 764482c4: Merge "Fix 5685925: Handle PACKAGE_CHANGED intent (when a package is enabled/disabled)" into ics-mr1 * commit '764482c4ebffc9c3cac21fcd8707811e981cd092': Fix 5685925: Handle PACKAGE_CHANGED intent (when a package is enabled/disabled)
|
546b394f550e57afbb3c491b7b5bfae7645af157 |
30-Nov-2011 |
Chih-Chung Chang <chihchung@google.com> |
Merge "Fix 5685925: Handle PACKAGE_CHANGED intent (when a package is enabled/disabled)" into ics-mr1
|
764482c4ebffc9c3cac21fcd8707811e981cd092 |
30-Nov-2011 |
Chih-Chung Chang <chihchung@google.com> |
Merge "Fix 5685925: Handle PACKAGE_CHANGED intent (when a package is enabled/disabled)" into ics-mr1
|
7ad5d39b38f96457a393fe0460db5548ddff9654 |
30-Nov-2011 |
Chih-Chung Chang <chihchung@google.com> |
am 002a3fec: Fix 5686493: Crash when try to click any thumbnail * commit '002a3fece284f713537fad4523ee963d257350e9': Fix 5686493: Crash when try to click any thumbnail
|
fd4d4ab7ffff51be635303eb0812e9ed36375505 |
30-Nov-2011 |
Chih-Chung Chang <chihchung@google.com> |
am 002a3fec: Fix 5686493: Crash when try to click any thumbnail * commit '002a3fece284f713537fad4523ee963d257350e9': Fix 5686493: Crash when try to click any thumbnail
|
e5a44c547ff86592bd79d39944302ce63b9b16c7 |
30-Nov-2011 |
Chih-Chung Chang <chihchung@google.com> |
Fix 5685925: Handle PACKAGE_CHANGED intent (when a package is enabled/disabled) Change-Id: Ia994264fb2c11fbc971840c8a103bbe9fa6ee7f7
ndroidManifest.xml
|
8c26741a616311034a1540a667fc181f1467433e |
30-Nov-2011 |
Chih-Chung Chang <chihchung@google.com> |
Fix 5685925: Handle PACKAGE_CHANGED intent (when a package is enabled/disabled) Change-Id: Ia994264fb2c11fbc971840c8a103bbe9fa6ee7f7
rc/com/android/gallery3d/app/PackagesMonitor.java
rc_pd/com/android/gallery3d/picasasource/PicasaSource.java
|
d091538f6949cca1c73213cea0b9fdf28c878046 |
30-Nov-2011 |
Chih-Chung Chang <chihchung@google.com> |
Fix 5685925: Handle PACKAGE_CHANGED intent (when a package is enabled/disabled) Change-Id: Ia994264fb2c11fbc971840c8a103bbe9fa6ee7f7
ndroidManifest.xml
rc/com/android/gallery3d/app/PackagesMonitor.java
rc_pd/com/android/gallery3d/picasasource/PicasaSource.java
|
002a3fece284f713537fad4523ee963d257350e9 |
30-Nov-2011 |
Chih-Chung Chang <chihchung@google.com> |
Fix 5686493: Crash when try to click any thumbnail Change-Id: Ia109333c3a207ca2a60889c2731f6c11737b5592
rc/com/android/gallery3d/app/ActivityState.java
|
9e22248b0e17d4ceafe6c2d774c566504eb87520 |
30-Nov-2011 |
Chih-Chung Chang <chihchung@google.com> |
Fix 5686493: Crash when try to click any thumbnail Change-Id: Ia109333c3a207ca2a60889c2731f6c11737b5592
rc/com/android/gallery3d/app/ActivityState.java
|
fa8b3e9b93e74bfea59209d7e7b2feb9295c0309 |
30-Nov-2011 |
Daniel Sandler <dsandler@android.com> |
am 45fa6771: Merge "Improve screen on/off logic in slideshow." into ics-mr1 * commit '45fa677140112f725df3765be56edc715c226aa5': Improve screen on/off logic in slideshow.
|
8c6843ddb1c7c9f95acd396fd32c19d583e9de8a |
30-Nov-2011 |
Daniel Sandler <dsandler@android.com> |
am 45fa6771: Merge "Improve screen on/off logic in slideshow." into ics-mr1 * commit '45fa677140112f725df3765be56edc715c226aa5': Improve screen on/off logic in slideshow.
|
45fa677140112f725df3765be56edc715c226aa5 |
30-Nov-2011 |
Daniel Sandler <dsandler@android.com> |
Merge "Improve screen on/off logic in slideshow." into ics-mr1
|
cdbaba43954012a317119cc20183eb4de5220e58 |
30-Nov-2011 |
Daniel Sandler <dsandler@android.com> |
Merge "Improve screen on/off logic in slideshow." into ics-mr1
|
1338e25d329612be13a98f25846da69482270fd6 |
29-Nov-2011 |
Eric Fischer <enf@google.com> |
am 4e94e885: Merge "Import revised translations. DO NOT MERGE" into ics-mr1 * commit '4e94e8858fc3187ec0eae83c70698c85115a630e': Import revised translations. DO NOT MERGE
|
3c6a370f2b7c175241d8b9a328ea238b952e5193 |
29-Nov-2011 |
Eric Fischer <enf@google.com> |
am 4e94e885: Merge "Import revised translations. DO NOT MERGE" into ics-mr1 * commit '4e94e8858fc3187ec0eae83c70698c85115a630e': Import revised translations. DO NOT MERGE
|
5232bf101b81793e1c8dfb28108d6e9f98f120c3 |
29-Nov-2011 |
Jeff Brown <jeffbrown@google.com> |
am 881fd799: Merge "Add application launch category." into ics-mr1 * commit '881fd799f1c54b934aa90310a54a145062264422': Add application launch category.
|
c0c71db2b16cbeb1b769fc0f6547baf2c06fed5c |
29-Nov-2011 |
Jeff Brown <jeffbrown@google.com> |
am 881fd799: Merge "Add application launch category." into ics-mr1 * commit '881fd799f1c54b934aa90310a54a145062264422': Add application launch category.
|
d5e37f348047863c162f9580973eec2d07e5b93f |
29-Nov-2011 |
Eric Fischer <enf@google.com> |
am e3e6a21d: am 4e94e885: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr1 * commit 'e3e6a21de63d23780c9a4cd1a56a3ff9a2c8deec': Import revised translations. DO NOT MERGE
|
82e2c1045a5fe2491c0d1f95a99e3d773b80f2c5 |
29-Nov-2011 |
Eric Fischer <enf@google.com> |
am 4e94e885: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr1 * commit '4e94e8858fc3187ec0eae83c70698c85115a630e': Import revised translations. DO NOT MERGE
|
e3e6a21de63d23780c9a4cd1a56a3ff9a2c8deec |
29-Nov-2011 |
Eric Fischer <enf@google.com> |
am 4e94e885: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr1 * commit '4e94e8858fc3187ec0eae83c70698c85115a630e': Import revised translations. DO NOT MERGE
|
4e94e8858fc3187ec0eae83c70698c85115a630e |
29-Nov-2011 |
Eric Fischer <enf@google.com> |
Merge "Import revised translations. DO NOT MERGE" into ics-mr1
|
552c69b472578b3591adf74be7fec2fa0b141cee |
29-Nov-2011 |
Jeff Brown <jeffbrown@google.com> |
am 7b43dc54: am 881fd799: Merge "Add application launch category." into ics-mr1 * commit '7b43dc54697d3bd576e4731b18340035b1b20c64': Add application launch category.
|
e953a7b42ab66bd66ab4fca2be7a08ff41d9190f |
29-Nov-2011 |
Eric Fischer <enf@google.com> |
Import revised translations. DO NOT MERGE Change-Id: Ie6d712f4b1ddaa2916dae6ca973283e0dee00188
es/values-es/strings.xml
es/values-ru/strings.xml
es/values-vi/photoeditor_strings.xml
|
0e537b38c32553457612ae2bdbe15644953dac2b |
29-Nov-2011 |
Eric Fischer <enf@google.com> |
Import revised translations. DO NOT MERGE Change-Id: Ie6d712f4b1ddaa2916dae6ca973283e0dee00188
es/values-es/strings.xml
es/values-ru/strings.xml
es/values-vi/photoeditor_strings.xml
|
9ec03da8d853e68810546fe71549211562563175 |
29-Nov-2011 |
Jeff Brown <jeffbrown@google.com> |
am 881fd799: Merge "Add application launch category." into ics-mr1 * commit '881fd799f1c54b934aa90310a54a145062264422': Add application launch category.
|
7b43dc54697d3bd576e4731b18340035b1b20c64 |
29-Nov-2011 |
Jeff Brown <jeffbrown@google.com> |
am 881fd799: Merge "Add application launch category." into ics-mr1 * commit '881fd799f1c54b934aa90310a54a145062264422': Add application launch category.
|
881fd799f1c54b934aa90310a54a145062264422 |
29-Nov-2011 |
Jeff Brown <jeffbrown@google.com> |
Merge "Add application launch category." into ics-mr1
|
d3004f7fd81dead4333bd15a3fe530fca632fada |
29-Nov-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-mr1-release history after reset to ics-mr1
|
c309dca7cc27dfb0f7115e6cb1ef6e644db42b1d |
29-Nov-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-mr1-release history after reset to ics-mr1
|
93a716f342ea61711ae72edb17971fae5072c692 |
29-Nov-2011 |
Eric Fischer <enf@google.com> |
am 9db11c5f: Merge "Import revised translations." * commit '9db11c5f1d1f7f86f7f10df70485eec9a492b688': Import revised translations.
|
9db11c5f1d1f7f86f7f10df70485eec9a492b688 |
29-Nov-2011 |
Eric Fischer <enf@google.com> |
Merge "Import revised translations."
|
c50683faf613f8d44940c9e7dd47d541ba23ade5 |
29-Nov-2011 |
Eric Fischer <enf@google.com> |
Import revised translations. Change-Id: I8bc47cbeb77931dd7003ce173680b39fd411b260
es/values-af/photoeditor_strings.xml
es/values-af/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-de/strings.xml
es/values-es/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/photoeditor_strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-ru/strings.xml
es/values-sr/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/photoeditor_strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
57732849c99d452b81adec2deb0d95b3feb57e9d |
29-Nov-2011 |
Eric Fischer <enf@google.com> |
Import revised translations. Change-Id: I8bc47cbeb77931dd7003ce173680b39fd411b260
es/values-af/photoeditor_strings.xml
es/values-af/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-de/strings.xml
es/values-es/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/photoeditor_strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-ru/strings.xml
es/values-sr/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/photoeditor_strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
8e03ab37eb78cbddd3b64f2d04fb5f2e5cf44abc |
29-Nov-2011 |
Wei Huang <weih@google.com> |
am 59029d5c: am 622c2b2c: Merge "Show a dialog to require updating PlusOne." into ics-mr1 * commit '59029d5c2fa6330a42d2bb8ab395f3a6c966e962': Show a dialog to require updating PlusOne.
|
92d916aa51e1b3ca85e4e93dc483b1fd31d37fc5 |
29-Nov-2011 |
Wei Huang <weih@google.com> |
am 622c2b2c: Merge "Show a dialog to require updating PlusOne." into ics-mr1 * commit '622c2b2c7721008e7851d0af3d89d3fc545ceaf6': Show a dialog to require updating PlusOne.
|
59029d5c2fa6330a42d2bb8ab395f3a6c966e962 |
29-Nov-2011 |
Wei Huang <weih@google.com> |
am 622c2b2c: Merge "Show a dialog to require updating PlusOne." into ics-mr1 * commit '622c2b2c7721008e7851d0af3d89d3fc545ceaf6': Show a dialog to require updating PlusOne.
|
7cf9a9590ff1db3bfb28b8eb4078a726f23dc8b3 |
29-Nov-2011 |
Wei Huang <weih@google.com> |
am 622c2b2c: Merge "Show a dialog to require updating PlusOne." into ics-mr1 * commit '622c2b2c7721008e7851d0af3d89d3fc545ceaf6': Show a dialog to require updating PlusOne.
|
8d39ded3639cbfefe679cca410c1c1b7fedf208c |
29-Nov-2011 |
Wei Huang <weih@google.com> |
am 622c2b2c: Merge "Show a dialog to require updating PlusOne." into ics-mr1 * commit '622c2b2c7721008e7851d0af3d89d3fc545ceaf6': Show a dialog to require updating PlusOne.
|
f4df1d6b037761a88b3907c864ef248a0bb1b911 |
29-Nov-2011 |
Chih-Chung Chang <chihchung@google.com> |
am 1b1e13c2: am fc8c503d: Fix 5661035: Accepts bluetooth keys while playing a video from gallery. * commit '1b1e13c2587312da8ff775c62a9b1dc7c2717e54': Fix 5661035: Accepts bluetooth keys while playing a video from gallery.
|
ecc9ab9e13cce49715b7c1acd3dcc6eb015c3f0f |
29-Nov-2011 |
Wei Huang <weih@google.com> |
Merge "Show a dialog to require updating PlusOne." into ics-mr1
|
622c2b2c7721008e7851d0af3d89d3fc545ceaf6 |
29-Nov-2011 |
Wei Huang <weih@google.com> |
Merge "Show a dialog to require updating PlusOne." into ics-mr1
|
c37ce29d625fa97d6cd1d4fe158d5c8a2c33e263 |
29-Nov-2011 |
Chih-Chung Chang <chihchung@google.com> |
am fc8c503d: Fix 5661035: Accepts bluetooth keys while playing a video from gallery. * commit 'fc8c503d1351c6ee62d233a944f2bd5220e64a55': Fix 5661035: Accepts bluetooth keys while playing a video from gallery.
|
1b1e13c2587312da8ff775c62a9b1dc7c2717e54 |
29-Nov-2011 |
Chih-Chung Chang <chihchung@google.com> |
am fc8c503d: Fix 5661035: Accepts bluetooth keys while playing a video from gallery. * commit 'fc8c503d1351c6ee62d233a944f2bd5220e64a55': Fix 5661035: Accepts bluetooth keys while playing a video from gallery.
|
159bf1addf7889e268809b29fa3ee757b2dc9c34 |
29-Nov-2011 |
Chih-Chung Chang <chihchung@google.com> |
am fc8c503d: Fix 5661035: Accepts bluetooth keys while playing a video from gallery. * commit 'fc8c503d1351c6ee62d233a944f2bd5220e64a55': Fix 5661035: Accepts bluetooth keys while playing a video from gallery.
|
25172fb2e800775492a4a0fc89f5f1753722cf71 |
29-Nov-2011 |
Chih-Chung Chang <chihchung@google.com> |
am fc8c503d: Fix 5661035: Accepts bluetooth keys while playing a video from gallery. * commit 'fc8c503d1351c6ee62d233a944f2bd5220e64a55': Fix 5661035: Accepts bluetooth keys while playing a video from gallery.
|
8e6fd7cee5467824cd96b4127ccc755c70bd4ea3 |
28-Nov-2011 |
Daniel Sandler <dsandler@android.com> |
Improve screen on/off logic in slideshow. When used as a screensaver or otherwise, the slideshow should not keep the screen on if the device is not plugged in. It should also allow the screen to lock while the slideshow is playing (otherwise a device left in this state may be left unsecured for long periods by accident). Additionally, when used as a screensaver, it must dismiss the keyguard in order to be shown on a secured device. Bug: 5660833 Change-Id: I1bafc50127aaa7ae2b67235d30736faa606c5ac1
rc/com/android/gallery3d/app/ActivityState.java
rc/com/android/gallery3d/app/SlideshowPage.java
|
b4a1da9f32d61cf9347617a382291e488428a744 |
28-Nov-2011 |
Daniel Sandler <dsandler@android.com> |
Improve screen on/off logic in slideshow. When used as a screensaver or otherwise, the slideshow should not keep the screen on if the device is not plugged in. It should also allow the screen to lock while the slideshow is playing (otherwise a device left in this state may be left unsecured for long periods by accident). Additionally, when used as a screensaver, it must dismiss the keyguard in order to be shown on a secured device. Bug: 5660833 Change-Id: I1bafc50127aaa7ae2b67235d30736faa606c5ac1
rc/com/android/gallery3d/app/ActivityState.java
rc/com/android/gallery3d/app/SlideshowPage.java
|
b5947c5669b3492d7e1295c16ab3efa00bfeb431 |
29-Nov-2011 |
Chih-Chung Chang <chihchung@google.com> |
Fix 5661035: Accepts bluetooth keys while playing a video from gallery. Change-Id: I8174b1a97baad563d8bbd685b9aab3a8ca428ead
rc/com/android/gallery3d/app/MovieActivity.java
rc/com/android/gallery3d/app/MoviePlayer.java
|
fc8c503d1351c6ee62d233a944f2bd5220e64a55 |
29-Nov-2011 |
Chih-Chung Chang <chihchung@google.com> |
Fix 5661035: Accepts bluetooth keys while playing a video from gallery. Change-Id: I8174b1a97baad563d8bbd685b9aab3a8ca428ead
rc/com/android/gallery3d/app/MovieActivity.java
rc/com/android/gallery3d/app/MoviePlayer.java
|
1c30c0124ebe3b85f98f77992048ec0443cdd935 |
29-Nov-2011 |
Jeff Brown <jeffbrown@google.com> |
Add application launch category. Bug: 5674723 Change-Id: I6e2cbd2f456d93b4a4e05df5f3be5d3fb05385f0
ndroidManifest.xml
|
4b8b92db6c7238c3d9cff3fc0a6bb8315ca2a0ba |
29-Nov-2011 |
Jeff Brown <jeffbrown@google.com> |
Add application launch category. Bug: 5674723 Change-Id: I6e2cbd2f456d93b4a4e05df5f3be5d3fb05385f0
ndroidManifest.xml
|
3b49fb51ae29f01387dfe105a97646f422c97cf8 |
28-Nov-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
5f7a9d83ee7912440046fbe8bfbaf5aa1f405188 |
28-Nov-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
8af3533b4df62912242e04d9851d17c252553071 |
28-Nov-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
e1ef008f7b0fc630e5c9b09536dfa2f700cd5734 |
28-Nov-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-mr1-release history after reset to ics-mr1
|
f468f531be1c200043bee3c9ab783978d9865b36 |
28-Nov-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-mr1-release history after reset to ics-mr1
|
c74fa8c2e8aee1649547447d42e523a3fb39c7ec |
24-Nov-2011 |
Owen Lin <owenlin@google.com> |
Show a dialog to require updating PlusOne. Change-Id: I1ff4f5eca90ade49b0785324b9319ef0b7d751ca fix: 5608342
rc/com/android/gallery3d/app/AlbumDataAdapter.java
rc/com/android/gallery3d/app/AlbumPage.java
rc/com/android/gallery3d/app/AlbumSetPage.java
rc/com/android/gallery3d/app/Gallery.java
rc/com/android/gallery3d/data/ComboAlbum.java
rc/com/android/gallery3d/data/ComboAlbumSet.java
rc/com/android/gallery3d/data/MediaSet.java
rc_pd/com/android/gallery3d/picasasource/PicasaSource.java
|
fe49be45412f8d0f68343662318e73822da486c8 |
24-Nov-2011 |
Owen Lin <owenlin@google.com> |
Show a dialog to require updating PlusOne. Change-Id: I1ff4f5eca90ade49b0785324b9319ef0b7d751ca fix: 5608342
rc/com/android/gallery3d/app/AlbumDataAdapter.java
rc/com/android/gallery3d/app/AlbumPage.java
rc/com/android/gallery3d/app/AlbumSetPage.java
rc/com/android/gallery3d/app/Gallery.java
rc/com/android/gallery3d/data/ComboAlbum.java
rc/com/android/gallery3d/data/ComboAlbumSet.java
rc/com/android/gallery3d/data/MediaSet.java
rc_pd/com/android/gallery3d/picasasource/PicasaSource.java
|
b39f07ed67cb5b28c7ee05836315c148b2b65b6d |
22-Nov-2011 |
The Android Open Source Project <initial-contribution@android.com> |
am e4fe38b7: Reconcile with ics-mr1-release * commit 'e4fe38b74589dbce167cd88d14b249f645a57b73':
|
5a7fe75b7c95c2612b4a27ebaaa8d324fac6a849 |
22-Nov-2011 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with ics-mr1-release Change-Id: Id5562da0ab0f961c8263b5a101a2ed3e32bd9b58
|
e4fe38b74589dbce167cd88d14b249f645a57b73 |
22-Nov-2011 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with ics-mr1-release Change-Id: Id5562da0ab0f961c8263b5a101a2ed3e32bd9b58
|
6ad10d097c9a48eb13fadae516e0177fa8090239 |
22-Nov-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-mr1-release history after reset to ics-mr1
|
fc9e18406735b0ad8095fd5033d429c9aec71fb8 |
22-Nov-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-mr1-release history after reset to ics-mr1
|
92a3f8005ba8ac4d9b27ed6a71a9d13aa9d7e79b |
22-Nov-2011 |
Eric Fischer <enf@google.com> |
am 62e1828c: am f36d8f29: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr1 * commit '62e1828c3bc2778ea07f6bf4cfb3f25681379f36': Import revised translations. DO NOT MERGE
|
eeb85e875d49c23b4ffcc627b60ffcb29fbd4809 |
22-Nov-2011 |
Eric Fischer <enf@google.com> |
am f36d8f29: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr1 * commit 'f36d8f299d57849a1afb1b0c271bb4be0d336e43': Import revised translations. DO NOT MERGE
|
62e1828c3bc2778ea07f6bf4cfb3f25681379f36 |
22-Nov-2011 |
Eric Fischer <enf@google.com> |
am f36d8f29: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr1 * commit 'f36d8f299d57849a1afb1b0c271bb4be0d336e43': Import revised translations. DO NOT MERGE
|
8e3ecb9dc2128db0c9d3b4a52270c6d0c1fcb27a |
22-Nov-2011 |
Eric Fischer <enf@google.com> |
am f36d8f29: Merge "Import revised translations. DO NOT MERGE" into ics-mr1 * commit 'f36d8f299d57849a1afb1b0c271bb4be0d336e43': Import revised translations. DO NOT MERGE
|
c2071d687dc1ddafbf29854c631b0c2afacc2b78 |
22-Nov-2011 |
Eric Fischer <enf@google.com> |
am f36d8f29: Merge "Import revised translations. DO NOT MERGE" into ics-mr1 * commit 'f36d8f299d57849a1afb1b0c271bb4be0d336e43': Import revised translations. DO NOT MERGE
|
f36d8f299d57849a1afb1b0c271bb4be0d336e43 |
22-Nov-2011 |
Eric Fischer <enf@google.com> |
Merge "Import revised translations. DO NOT MERGE" into ics-mr1
|
f08b41489d0e2c06b3fbba81479feac3aa5b6eee |
21-Nov-2011 |
Eric Fischer <enf@google.com> |
Import revised translations. DO NOT MERGE Change-Id: If5d0d2f8c75a8b8a210a0fe1b1d22da682f08c81
es/values-af/photoeditor_strings.xml
es/values-sw/strings.xml
es/values-vi/strings.xml
|
f09b6ef1983e7ba8db4fed2ff7c60339bc43d532 |
21-Nov-2011 |
Eric Fischer <enf@google.com> |
Import revised translations. DO NOT MERGE Change-Id: If5d0d2f8c75a8b8a210a0fe1b1d22da682f08c81
es/values-af/photoeditor_strings.xml
es/values-sw/strings.xml
es/values-vi/strings.xml
|
211081844dff60b7f2e5812f814529792d884e43 |
21-Nov-2011 |
Chih-Chung Chang <chihchung@google.com> |
am a13f3684: am 8cbc7c4e: Merge "Fix 5637927: NPE while trying to do slide show for gmail image attachment" into ics-mr1 * commit 'a13f36841cc2f6ed7f8c467ae7ff48cb57076f1d': Fix 5637927: NPE while trying to do slide show for gmail image attachment
|
8646eb70356c2a323a554d1a7df35db058244c43 |
21-Nov-2011 |
Chih-Chung Chang <chihchung@google.com> |
am 8cbc7c4e: Merge "Fix 5637927: NPE while trying to do slide show for gmail image attachment" into ics-mr1 * commit '8cbc7c4eedb204e3ad9fa1cb8a7a1b21f7464c74': Fix 5637927: NPE while trying to do slide show for gmail image attachment
|
a13f36841cc2f6ed7f8c467ae7ff48cb57076f1d |
21-Nov-2011 |
Chih-Chung Chang <chihchung@google.com> |
am 8cbc7c4e: Merge "Fix 5637927: NPE while trying to do slide show for gmail image attachment" into ics-mr1 * commit '8cbc7c4eedb204e3ad9fa1cb8a7a1b21f7464c74': Fix 5637927: NPE while trying to do slide show for gmail image attachment
|
2b69e93e1b60f0417a0a5a2a811208de26fce6d1 |
21-Nov-2011 |
Chih-Chung Chang <chihchung@google.com> |
am 8cbc7c4e: Merge "Fix 5637927: NPE while trying to do slide show for gmail image attachment" into ics-mr1 * commit '8cbc7c4eedb204e3ad9fa1cb8a7a1b21f7464c74': Fix 5637927: NPE while trying to do slide show for gmail image attachment
|
374f6f715dcc37de960c5256cd95cf1449103d96 |
21-Nov-2011 |
Chih-Chung Chang <chihchung@google.com> |
am 8cbc7c4e: Merge "Fix 5637927: NPE while trying to do slide show for gmail image attachment" into ics-mr1 * commit '8cbc7c4eedb204e3ad9fa1cb8a7a1b21f7464c74': Fix 5637927: NPE while trying to do slide show for gmail image attachment
|
ef71b24dbf31f73e6df8ae15ac2a1ad1cbc255f6 |
21-Nov-2011 |
Chih-Chung Chang <chihchung@google.com> |
Merge "Fix 5637927: NPE while trying to do slide show for gmail image attachment" into ics-mr1
|
8cbc7c4eedb204e3ad9fa1cb8a7a1b21f7464c74 |
21-Nov-2011 |
Chih-Chung Chang <chihchung@google.com> |
Merge "Fix 5637927: NPE while trying to do slide show for gmail image attachment" into ics-mr1
|
feb39cc3a4efffd7e9c64a2dc4b06aa2f553def8 |
19-Nov-2011 |
The Android Open Source Project <initial-contribution@android.com> |
am 3ec476a0: Reconcile with ics-mr1-release * commit '3ec476a03bcfabdea574d7bbf352e3e46ca8bc28':
|
3c1494b21cf68a1963dde137bba7ae5e7d1a6e05 |
19-Nov-2011 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with ics-mr1-release Change-Id: I1693539643fe35d4ffc893bf9b5444fd416756f2
|
ac263c5868994d21cf72c27d2ce982716c99aff9 |
19-Nov-2011 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with ics-mr1-release Change-Id: I1693539643fe35d4ffc893bf9b5444fd416756f2
|
3ec476a03bcfabdea574d7bbf352e3e46ca8bc28 |
19-Nov-2011 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with ics-mr1-release Change-Id: I1693539643fe35d4ffc893bf9b5444fd416756f2
|
02928aa6839ce73fa520a1a97108adaa6767e936 |
19-Nov-2011 |
Ray Chen <raychen@google.com> |
am 6ce002de: am 00b5f3c6: Fix 5635260 Albums view goes blank after changing view option and returning to albums view * commit '6ce002de51161bfd10abf86c59fd05d12c696153': Fix 5635260 Albums view goes blank after changing view option and returning to albums view
|
23f6c6e51114909e1e6f294b5faa8dee219572ba |
19-Nov-2011 |
Ray Chen <raychen@google.com> |
am 00b5f3c6: Fix 5635260 Albums view goes blank after changing view option and returning to albums view * commit '00b5f3c66113d14a7fc6f37d3a4e9d0c9b566eaa': Fix 5635260 Albums view goes blank after changing view option and returning to albums view
|
6ce002de51161bfd10abf86c59fd05d12c696153 |
19-Nov-2011 |
Ray Chen <raychen@google.com> |
am 00b5f3c6: Fix 5635260 Albums view goes blank after changing view option and returning to albums view * commit '00b5f3c66113d14a7fc6f37d3a4e9d0c9b566eaa': Fix 5635260 Albums view goes blank after changing view option and returning to albums view
|
81e4cff6dd3d1e6c4b3c44ffe1ca96f8347361e3 |
18-Nov-2011 |
Ray Chen <raychen@google.com> |
am 00b5f3c6: Fix 5635260 Albums view goes blank after changing view option and returning to albums view * commit '00b5f3c66113d14a7fc6f37d3a4e9d0c9b566eaa': Fix 5635260 Albums view goes blank after changing view option and returning to albums view
|
890e8b6a3cc8feca8b29bfa8fc15cfb82d25c217 |
18-Nov-2011 |
Ray Chen <raychen@google.com> |
am 00b5f3c6: Fix 5635260 Albums view goes blank after changing view option and returning to albums view * commit '00b5f3c66113d14a7fc6f37d3a4e9d0c9b566eaa': Fix 5635260 Albums view goes blank after changing view option and returning to albums view
|
cc09b14e5593d1e0c0f8b70e547340ce28588225 |
18-Nov-2011 |
Wei Huang <weih@google.com> |
am dd96bde2: am 71a296c2: Merge "Make sure startAnimation won\'t be called after onPause." into ics-mr1 * commit 'dd96bde27b4961e36059ede00060ae8a91096e81': Make sure startAnimation won't be called after onPause.
|
a536a575c770ed560a478e692d4af7e6e28e696a |
18-Nov-2011 |
Wei Huang <weih@google.com> |
am 71a296c2: Merge "Make sure startAnimation won\'t be called after onPause." into ics-mr1 * commit '71a296c27389fefa9361adada41715ae4623af32': Make sure startAnimation won't be called after onPause.
|
dd96bde27b4961e36059ede00060ae8a91096e81 |
18-Nov-2011 |
Wei Huang <weih@google.com> |
am 71a296c2: Merge "Make sure startAnimation won\'t be called after onPause." into ics-mr1 * commit '71a296c27389fefa9361adada41715ae4623af32': Make sure startAnimation won't be called after onPause.
|
86024818e1c03d1a1179510d91a038e1b756c9f4 |
18-Nov-2011 |
Chih-Chung Chang <chihchung@google.com> |
Fix 5637927: NPE while trying to do slide show for gmail image attachment Change-Id: If30aa9798a030a5b97c7ff626f91187d7da93ab5
rc/com/android/gallery3d/app/PhotoPage.java
|
2066200f8fd0a2ed5b97e53115eb5de6b56320e1 |
18-Nov-2011 |
Chih-Chung Chang <chihchung@google.com> |
Fix 5637927: NPE while trying to do slide show for gmail image attachment Change-Id: If30aa9798a030a5b97c7ff626f91187d7da93ab5
rc/com/android/gallery3d/app/PhotoPage.java
|
00b5f3c66113d14a7fc6f37d3a4e9d0c9b566eaa |
18-Nov-2011 |
Ray Chen <raychen@google.com> |
Fix 5635260 Albums view goes blank after changing view option and returning to albums view Change-Id: I1fd9776f050d16fc3abb723cc17b1cf07bd2f948
rc/com/android/gallery3d/app/AlbumSetPage.java
rc/com/android/gallery3d/app/GalleryActionBar.java
|
980202694fa6ad982fe04c5742c9042f47fe2dc2 |
18-Nov-2011 |
Ray Chen <raychen@google.com> |
Fix 5635260 Albums view goes blank after changing view option and returning to albums view Change-Id: I1fd9776f050d16fc3abb723cc17b1cf07bd2f948
rc/com/android/gallery3d/app/AlbumSetPage.java
rc/com/android/gallery3d/app/GalleryActionBar.java
|
d218838a45f71c1c9760381d72d4047e963f3789 |
18-Nov-2011 |
Wei Huang <weih@google.com> |
am 71a296c2: Merge "Make sure startAnimation won\'t be called after onPause." into ics-mr1 * commit '71a296c27389fefa9361adada41715ae4623af32': Make sure startAnimation won't be called after onPause.
|
4a5e0f14e02338286fbff2f14a130c3d10f20ce8 |
18-Nov-2011 |
Wei Huang <weih@google.com> |
am 71a296c2: Merge "Make sure startAnimation won\'t be called after onPause." into ics-mr1 * commit '71a296c27389fefa9361adada41715ae4623af32': Make sure startAnimation won't be called after onPause.
|
4acafbe1b90e3d817ceb6fa965402e49236ca885 |
18-Nov-2011 |
Wei Huang <weih@google.com> |
Merge "Make sure startAnimation won't be called after onPause." into ics-mr1
|
71a296c27389fefa9361adada41715ae4623af32 |
18-Nov-2011 |
Wei Huang <weih@google.com> |
Merge "Make sure startAnimation won't be called after onPause." into ics-mr1
|
b70ef12f8ca0d634c2277dacd58454b3dfecda71 |
17-Nov-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-mr1-release history after reset to ics-mr1
|
cfcccec28a4c4a774068707d5fa31b3a11dee207 |
17-Nov-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-mr1-release history after reset to ics-mr1
|
6f54afd6deb0ac8fc6788f75753e092471efc727 |
17-Nov-2011 |
Eric Fischer <enf@google.com> |
am 74ed8bd4: am 612e9d69: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr1 * commit '74ed8bd46dcfbf8cbc352c5cfb4f2f8df85eb8e1': Import revised translations. DO NOT MERGE
|
24a36125aabc7aeaaf5c3a80933d1f1e919229e2 |
17-Nov-2011 |
Eric Fischer <enf@google.com> |
am 612e9d69: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr1 * commit '612e9d697269cff5437366ae386dea7d6af6656c': Import revised translations. DO NOT MERGE
|
74ed8bd46dcfbf8cbc352c5cfb4f2f8df85eb8e1 |
17-Nov-2011 |
Eric Fischer <enf@google.com> |
am 612e9d69: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr1 * commit '612e9d697269cff5437366ae386dea7d6af6656c': Import revised translations. DO NOT MERGE
|
c907c3215c63402348599e532e2ea74caa9b95fc |
17-Nov-2011 |
Owen Lin <owenlin@google.com> |
Make sure startAnimation won't be called after onPause. Change-Id: I6c5238394b2ad64e22fbcb250ecd1534da7e8d03 fix: 5629252
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/ui/SlotView.java
|
8bc5bebba780ca4a322b466b06fc909331697cf4 |
17-Nov-2011 |
Owen Lin <owenlin@google.com> |
Make sure startAnimation won't be called after onPause. Change-Id: I6c5238394b2ad64e22fbcb250ecd1534da7e8d03 fix: 5629252
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/ui/SlotView.java
|
00764171ea727d18e9d9153d5d0bd67685a8c94b |
16-Nov-2011 |
Eric Fischer <enf@google.com> |
am 612e9d69: Merge "Import revised translations. DO NOT MERGE" into ics-mr1 * commit '612e9d697269cff5437366ae386dea7d6af6656c': Import revised translations. DO NOT MERGE
|
b05c151874f412e4b241e47d4a0cfa7ed2404754 |
16-Nov-2011 |
Eric Fischer <enf@google.com> |
am 612e9d69: Merge "Import revised translations. DO NOT MERGE" into ics-mr1 * commit '612e9d697269cff5437366ae386dea7d6af6656c': Import revised translations. DO NOT MERGE
|
612e9d697269cff5437366ae386dea7d6af6656c |
16-Nov-2011 |
Eric Fischer <enf@google.com> |
Merge "Import revised translations. DO NOT MERGE" into ics-mr1
|
56e782217bcddcc01139a231f0a763efa2bdc6ae |
16-Nov-2011 |
Eric Fischer <enf@google.com> |
Import revised translations. DO NOT MERGE Change-Id: I8d3977a59dd8ac6628b6e5095e76d9f26ab9f42f
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/photoeditor_strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/photoeditor_strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
f4391b9a107acb1ff9a2f51c8382aa30d9fcd131 |
16-Nov-2011 |
Eric Fischer <enf@google.com> |
Import revised translations. DO NOT MERGE Change-Id: I8d3977a59dd8ac6628b6e5095e76d9f26ab9f42f
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/photoeditor_strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/photoeditor_strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
4d15d4f0beec8c57eeeada659f5a522d3bbe9501 |
16-Nov-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
0b1ddb91f35fa59c0338e2b248ff455d2ef397e7 |
16-Nov-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
c9f00a77acac982c9fa4dde8975a1f5a9742f2e5 |
16-Nov-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
20c9c61012348bcdc6b22d33941bdfd3856f8474 |
16-Nov-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-mr1-release history after reset to ics-mr1
|
bf2c638f71aa0edb19c9e45a4fc89f1b0c4ef48c |
16-Nov-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-mr1-release history after reset to ics-mr1
|
6b729cdbe6df3d79e3fa74ee7d9a8b29a269140c |
16-Nov-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-mr1-release history after reset to ics-mr1
|
6d4a49a780badee7403f3b8a8c7ee44643502dbb |
16-Nov-2011 |
Ray Chen <raychen@google.com> |
am 4aaaeb86: am d7401652: Fix 5611147 attachments (picture) can\'t be viewed after they\'re saved * commit '4aaaeb8625547db8432cb3a489e771ad4f2dd12e': Fix 5611147 attachments (picture) can't be viewed after they're saved
|
d441f560d3e9302af814267b33d5e52e4b54e086 |
16-Nov-2011 |
Ray Chen <raychen@google.com> |
am d7401652: Fix 5611147 attachments (picture) can\'t be viewed after they\'re saved * commit 'd74016524fa899747411240daa453e5ca9cac219': Fix 5611147 attachments (picture) can't be viewed after they're saved
|
4aaaeb8625547db8432cb3a489e771ad4f2dd12e |
16-Nov-2011 |
Ray Chen <raychen@google.com> |
am d7401652: Fix 5611147 attachments (picture) can\'t be viewed after they\'re saved * commit 'd74016524fa899747411240daa453e5ca9cac219': Fix 5611147 attachments (picture) can't be viewed after they're saved
|
0b6f12095a6cb7ffad777f40df47ad0f24671f33 |
16-Nov-2011 |
Ray Chen <raychen@google.com> |
am d7401652: Fix 5611147 attachments (picture) can\'t be viewed after they\'re saved * commit 'd74016524fa899747411240daa453e5ca9cac219': Fix 5611147 attachments (picture) can't be viewed after they're saved
|
467be14dbb4b6f6acd62022229aeeaa8f75c599c |
16-Nov-2011 |
Ray Chen <raychen@google.com> |
am d7401652: Fix 5611147 attachments (picture) can\'t be viewed after they\'re saved * commit 'd74016524fa899747411240daa453e5ca9cac219': Fix 5611147 attachments (picture) can't be viewed after they're saved
|
cc8a5c291d9cd16ecf2047f167365adf1e68d635 |
16-Nov-2011 |
Ray Chen <raychen@google.com> |
Fix 5611147 attachments (picture) can't be viewed after they're saved Change-Id: I0de0b8c176e1c3f838e81e3549c6795613b90069
rc/com/android/gallery3d/data/MediaItem.java
rc/com/android/gallery3d/data/UriImage.java
|
d74016524fa899747411240daa453e5ca9cac219 |
16-Nov-2011 |
Ray Chen <raychen@google.com> |
Fix 5611147 attachments (picture) can't be viewed after they're saved Change-Id: I0de0b8c176e1c3f838e81e3549c6795613b90069
rc/com/android/gallery3d/data/MediaItem.java
rc/com/android/gallery3d/data/UriImage.java
|
4c4e3fc9d4afab3089ddd5252e0d13daee099bc9 |
15-Nov-2011 |
Eric Fischer <enf@google.com> |
am c83b3b07: am 8ab8a64c: (-s ours) am 756f9bc7: Import revised translations. DO NOT MERGE * commit 'c83b3b075d256346298d94d178129cfb89950cff': Import revised translations. DO NOT MERGE
|
3a1354392796b09e82e54ebdea3c9e2d59ef92d7 |
15-Nov-2011 |
Wei Huang <weih@google.com> |
am ba5be9d3: am bfbd7bb4: Merge "Fix 5481444 Face clustering should use PWA profile shot instead of random photo" into ics-mr1 * commit 'ba5be9d3bc76b0f67220db5524e3511e4989b51d': Fix 5481444 Face clustering should use PWA profile shot instead of random photo
|
c1101bd635a71a5624be85e72377fce3039832d2 |
15-Nov-2011 |
Eric Fischer <enf@google.com> |
am 8ab8a64c: (-s ours) am 756f9bc7: Import revised translations. DO NOT MERGE * commit '8ab8a64cc40a683d364829aad404fea4548cbd48': Import revised translations. DO NOT MERGE
|
c83b3b075d256346298d94d178129cfb89950cff |
15-Nov-2011 |
Eric Fischer <enf@google.com> |
am 8ab8a64c: (-s ours) am 756f9bc7: Import revised translations. DO NOT MERGE * commit '8ab8a64cc40a683d364829aad404fea4548cbd48': Import revised translations. DO NOT MERGE
|
88da27576ef7709a462bc518fbc146ca06fd049c |
15-Nov-2011 |
Wei Huang <weih@google.com> |
am bfbd7bb4: Merge "Fix 5481444 Face clustering should use PWA profile shot instead of random photo" into ics-mr1 * commit 'bfbd7bb47582be2a636eadffb041a698c52817f6': Fix 5481444 Face clustering should use PWA profile shot instead of random photo
|
9ffec1a40c20b522c0baa9ef591ec0108015f734 |
15-Nov-2011 |
Wei Huang <weih@google.com> |
am bfbd7bb4: Merge "Fix 5481444 Face clustering should use PWA profile shot instead of random photo" into ics-mr1 * commit 'bfbd7bb47582be2a636eadffb041a698c52817f6': Fix 5481444 Face clustering should use PWA profile shot instead of random photo
|
ba5be9d3bc76b0f67220db5524e3511e4989b51d |
15-Nov-2011 |
Wei Huang <weih@google.com> |
am bfbd7bb4: Merge "Fix 5481444 Face clustering should use PWA profile shot instead of random photo" into ics-mr1 * commit 'bfbd7bb47582be2a636eadffb041a698c52817f6': Fix 5481444 Face clustering should use PWA profile shot instead of random photo
|
32e5c2ac49650346a118effdf4207c876a73ab01 |
15-Nov-2011 |
Yuli Huang <yuli@google.com> |
am 76cc7711: am c5d42ff7: Merge "Fix b/5517002 by dismissing running progress dialog in onPause()." into ics-mr1 * commit '76cc7711837f5c2cb1c5908179b3f8a8f3fdb28c': Fix b/5517002 by dismissing running progress dialog in onPause().
|
df516776d1c108e85d38e6274d329b5ab5d2de9d |
15-Nov-2011 |
Yuli Huang <yuli@google.com> |
am c5d42ff7: Merge "Fix b/5517002 by dismissing running progress dialog in onPause()." into ics-mr1 * commit 'c5d42ff75d53d8e1321da7c901d7b0e5e2bbaa1b': Fix b/5517002 by dismissing running progress dialog in onPause().
|
24f681fd6c17efc715cac68495d3c64bda8317e2 |
15-Nov-2011 |
Yuli Huang <yuli@google.com> |
am c5d42ff7: Merge "Fix b/5517002 by dismissing running progress dialog in onPause()." into ics-mr1 * commit 'c5d42ff75d53d8e1321da7c901d7b0e5e2bbaa1b': Fix b/5517002 by dismissing running progress dialog in onPause().
|
76cc7711837f5c2cb1c5908179b3f8a8f3fdb28c |
15-Nov-2011 |
Yuli Huang <yuli@google.com> |
am c5d42ff7: Merge "Fix b/5517002 by dismissing running progress dialog in onPause()." into ics-mr1 * commit 'c5d42ff75d53d8e1321da7c901d7b0e5e2bbaa1b': Fix b/5517002 by dismissing running progress dialog in onPause().
|
5e1ca694f4a7d81fa79132d65f452f822b3f892d |
15-Nov-2011 |
Eric Fischer <enf@google.com> |
am 8ab8a64c: am 756f9bc7: Import revised translations. DO NOT MERGE * commit '8ab8a64cc40a683d364829aad404fea4548cbd48': Import revised translations. DO NOT MERGE
|
db756ba977f7024d34865575c2aff2f0a81463c9 |
15-Nov-2011 |
Eric Fischer <enf@google.com> |
am 8ab8a64c: am 756f9bc7: Import revised translations. DO NOT MERGE * commit '8ab8a64cc40a683d364829aad404fea4548cbd48': Import revised translations. DO NOT MERGE
|
806f9c2e75c3650c521978cd0b19794e2e9e978c |
15-Nov-2011 |
Eric Fischer <enf@google.com> |
am 756f9bc7: Import revised translations. DO NOT MERGE * commit '756f9bc72468a6fba926602b86525aed7bb05b40': Import revised translations. DO NOT MERGE
|
8ab8a64cc40a683d364829aad404fea4548cbd48 |
15-Nov-2011 |
Eric Fischer <enf@google.com> |
am 756f9bc7: Import revised translations. DO NOT MERGE * commit '756f9bc72468a6fba926602b86525aed7bb05b40': Import revised translations. DO NOT MERGE
|
1c198a27b9ad4590337f9d443be4e7dbcd7636da |
15-Nov-2011 |
Wei Huang <weih@google.com> |
am bfbd7bb4: Merge "Fix 5481444 Face clustering should use PWA profile shot instead of random photo" into ics-mr1 * commit 'bfbd7bb47582be2a636eadffb041a698c52817f6': Fix 5481444 Face clustering should use PWA profile shot instead of random photo
|
2a93cc3b7e385e29e85a518ad16bf149f0d00435 |
15-Nov-2011 |
Wei Huang <weih@google.com> |
am bfbd7bb4: Merge "Fix 5481444 Face clustering should use PWA profile shot instead of random photo" into ics-mr1 * commit 'bfbd7bb47582be2a636eadffb041a698c52817f6': Fix 5481444 Face clustering should use PWA profile shot instead of random photo
|
ce7d151a4a11169976a7055484f1ed4ca9faa105 |
15-Nov-2011 |
Wei Huang <weih@google.com> |
Merge "Fix 5481444 Face clustering should use PWA profile shot instead of random photo" into ics-mr1
|
bfbd7bb47582be2a636eadffb041a698c52817f6 |
15-Nov-2011 |
Wei Huang <weih@google.com> |
Merge "Fix 5481444 Face clustering should use PWA profile shot instead of random photo" into ics-mr1
|
4c396f89e70b0c82a665b91f0ddcfbe9f11870f9 |
15-Nov-2011 |
Owen Lin <owenlin@google.com> |
am af201bdc: am c903fd67: Fix the memory leak by WeakHashMap. * commit 'af201bdc9a915ee3aa7057710733abcf6dfc99a6': Fix the memory leak by WeakHashMap.
|
ad92ae7dd24f73b89ca80261b8f465c403ca5748 |
15-Nov-2011 |
Owen Lin <owenlin@google.com> |
am c903fd67: Fix the memory leak by WeakHashMap. * commit 'c903fd67c26d652f9dbd5cb321b64d1601357985': Fix the memory leak by WeakHashMap.
|
af201bdc9a915ee3aa7057710733abcf6dfc99a6 |
15-Nov-2011 |
Owen Lin <owenlin@google.com> |
am c903fd67: Fix the memory leak by WeakHashMap. * commit 'c903fd67c26d652f9dbd5cb321b64d1601357985': Fix the memory leak by WeakHashMap.
|
63d8f67ba97a42c900226fe2b6b159d0186fc05a |
15-Nov-2011 |
Yuli Huang <yuli@google.com> |
am c5d42ff7: Merge "Fix b/5517002 by dismissing running progress dialog in onPause()." into ics-mr1 * commit 'c5d42ff75d53d8e1321da7c901d7b0e5e2bbaa1b': Fix b/5517002 by dismissing running progress dialog in onPause().
|
7f22e7f6341b0ba080eac982e0ce39b4b1015af6 |
15-Nov-2011 |
Yuli Huang <yuli@google.com> |
am c5d42ff7: Merge "Fix b/5517002 by dismissing running progress dialog in onPause()." into ics-mr1 * commit 'c5d42ff75d53d8e1321da7c901d7b0e5e2bbaa1b': Fix b/5517002 by dismissing running progress dialog in onPause().
|
160cd35bac398923a5a796189dd9a44c1cf2b0f1 |
15-Nov-2011 |
Yuli Huang <yuli@google.com> |
am c5d42ff7: Merge "Fix b/5517002 by dismissing running progress dialog in onPause()." into ics-mr1 * commit 'c5d42ff75d53d8e1321da7c901d7b0e5e2bbaa1b': Fix b/5517002 by dismissing running progress dialog in onPause().
|
2cae8829a2736bb0eebfef618ea96d3f7f74f5cf |
15-Nov-2011 |
Owen Lin <owenlin@google.com> |
am c903fd67: Fix the memory leak by WeakHashMap. * commit 'c903fd67c26d652f9dbd5cb321b64d1601357985': Fix the memory leak by WeakHashMap.
|
d8d995a72de7ddc7180da78dbd221cc3411e1e86 |
15-Nov-2011 |
Owen Lin <owenlin@google.com> |
am c903fd67: Fix the memory leak by WeakHashMap. * commit 'c903fd67c26d652f9dbd5cb321b64d1601357985': Fix the memory leak by WeakHashMap.
|
122d0e411fc2cad77777a9087ccc2848bfe66e9c |
15-Nov-2011 |
Yuli Huang <yuli@google.com> |
Merge "Fix b/5517002 by dismissing running progress dialog in onPause()." into ics-mr1
|
c5d42ff75d53d8e1321da7c901d7b0e5e2bbaa1b |
15-Nov-2011 |
Yuli Huang <yuli@google.com> |
Merge "Fix b/5517002 by dismissing running progress dialog in onPause()." into ics-mr1
|
121e75c73e6d5f06f3432d34bf5fce44e0d17f7a |
15-Nov-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-mr1-release history after reset to ics-mr1
|
f46eec4a9a2c0a6f15a1a92a42b50dbf36f309fd |
15-Nov-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-mr1-release history after reset to ics-mr1
|
adf860cd9edec2bddb5ad0330c08a3a04c2b4bcc |
14-Nov-2011 |
Yuli Huang <yuli@google.com> |
Fix b/5517002 by dismissing running progress dialog in onPause(). Change-Id: I524f876e53776c38bc850120a2d7b7e6381ca33a
rc/com/android/gallery3d/photoeditor/SpinnerProgressDialog.java
|
12cbc0984310035f98c2440d974f31ceaf149a00 |
14-Nov-2011 |
Yuli Huang <yuli@google.com> |
Fix b/5517002 by dismissing running progress dialog in onPause(). Change-Id: I524f876e53776c38bc850120a2d7b7e6381ca33a
rc/com/android/gallery3d/photoeditor/EffectsBar.java
rc/com/android/gallery3d/photoeditor/PhotoEditor.java
rc/com/android/gallery3d/photoeditor/SpinnerProgressDialog.java
|
3235a3e842c52e472da5b2da18971ef259e92149 |
14-Nov-2011 |
Yuli Huang <yuli@google.com> |
Fix b/5517002 by dismissing running progress dialog in onPause(). Change-Id: I524f876e53776c38bc850120a2d7b7e6381ca33a
rc/com/android/gallery3d/photoeditor/EffectsBar.java
rc/com/android/gallery3d/photoeditor/PhotoEditor.java
rc/com/android/gallery3d/photoeditor/SpinnerProgressDialog.java
|
07217d549d95a9a086278c83d3bea198753c7a22 |
14-Nov-2011 |
Eric Fischer <enf@google.com> |
Import revised translations. DO NOT MERGE Change-Id: I325ec90678dbd808dc4cab87de77ddfcc8ececf2
es/values-de/strings.xml
|
756f9bc72468a6fba926602b86525aed7bb05b40 |
14-Nov-2011 |
Eric Fischer <enf@google.com> |
Import revised translations. DO NOT MERGE Change-Id: I325ec90678dbd808dc4cab87de77ddfcc8ececf2
es/values-de/strings.xml
|
606931461adcccaa0c906fd8ba31c472321e5d99 |
13-Nov-2011 |
Owen Lin <owenlin@google.com> |
Fix the memory leak by WeakHashMap. fix: 5601885 Also simplify the code. Change-Id: I97cdf00d84fa093ad7032e85ec7c31c3365e2447
rc/com/android/gallery3d/util/SpinnerVisibilitySetter.java
|
c903fd67c26d652f9dbd5cb321b64d1601357985 |
13-Nov-2011 |
Owen Lin <owenlin@google.com> |
Fix the memory leak by WeakHashMap. fix: 5601885 Also simplify the code. Change-Id: I97cdf00d84fa093ad7032e85ec7c31c3365e2447
rc/com/android/gallery3d/util/SpinnerVisibilitySetter.java
|
918f23d69a199eb6aeafec332a722b2969898390 |
13-Nov-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
ad77a515394097a5abc9d95874564d54f7144c5c |
13-Nov-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
c30ffa9b7ae72a2abdcbf45a6a82bb50d935cbb5 |
13-Nov-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
d28783b98999848195740f710f7763860bdee743 |
13-Nov-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-mr1-release history after reset to ics-mr1
|
1558f419aeb1bed62036abb38977086102904027 |
13-Nov-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-mr1-release history after reset to ics-mr1
|
3abdc49158665c089979500805003f39cb6e9744 |
13-Nov-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-mr1-release history after reset to ics-mr1
|
3858faa8549a3b22ce525211646826a0971c4a2e |
12-Nov-2011 |
Ray Chen <raychen@google.com> |
am 3e348145: am c9af80a1: Merge "Fix 5213252 [UI] Updated action bar layouts and action orders" into ics-mr1 * commit '3e348145db32983d098a2f6a1baecf19312ac3cd': Fix 5213252 [UI] Updated action bar layouts and action orders
|
6f20a5e3b3cff4289d5cfb85e7da76925e07d46a |
12-Nov-2011 |
Owen Lin <owenlin@google.com> |
am fa0af693: resolved conflicts for merge of 64d592c0 to master * commit 'fa0af6939e716e8ad07ca9200fbe665d165aefda': Request sync when opening Gallery/Album.
|
cad63ab3e486f569fd4b3a7b87a5d87e7ba7404c |
12-Nov-2011 |
Owen Lin <owenlin@google.com> |
am 4001b59b: am d80bb597: Merge "Show control overlay when earphone is unplugged" into ics-mr1 * commit '4001b59bc073c674bffa10b32d9c53654888ce37': Show control overlay when earphone is unplugged
|
ce1895f81874e643d5e57f68cca3b0523e7f1ff7 |
12-Nov-2011 |
Yuli Huang <yuli@google.com> |
am a6e4e6a8: am e193bc40: Merge "Fix b/5518211 by disabling effects when photo cannot be loaded." into ics-mr1 * commit 'a6e4e6a8709cd3c0ba4f594015e4a9e50ab2b282': Fix b/5518211 by disabling effects when photo cannot be loaded.
|
95cb52f23fa08764df3509f17e72316bd0b4b4c8 |
12-Nov-2011 |
Chih-Chung Chang <chihchung@google.com> |
am aa6bce7d: am b86c6aa0: Fix 5548567: Don\'t play video immediately. * commit 'aa6bce7d890ce47eb4cae2fef45ea307661bfd07': Fix 5548567: Don't play video immediately.
|
ec6141d03af4567d6cfe9f46379f197243821d58 |
11-Nov-2011 |
Ray Chen <raychen@google.com> |
am c9af80a1: Merge "Fix 5213252 [UI] Updated action bar layouts and action orders" into ics-mr1 * commit 'c9af80a1e46106b93271903753d36682b480479c': Fix 5213252 [UI] Updated action bar layouts and action orders
|
15539653a1b1a5009bdbc6a5cbf94462e62d5209 |
11-Nov-2011 |
Ray Chen <raychen@google.com> |
am c9af80a1: Merge "Fix 5213252 [UI] Updated action bar layouts and action orders" into ics-mr1 * commit 'c9af80a1e46106b93271903753d36682b480479c': Fix 5213252 [UI] Updated action bar layouts and action orders
|
3e348145db32983d098a2f6a1baecf19312ac3cd |
11-Nov-2011 |
Ray Chen <raychen@google.com> |
am c9af80a1: Merge "Fix 5213252 [UI] Updated action bar layouts and action orders" into ics-mr1 * commit 'c9af80a1e46106b93271903753d36682b480479c': Fix 5213252 [UI] Updated action bar layouts and action orders
|
b74708a8103bf95781727a49c05a4c8514ad274b |
03-Nov-2011 |
Ray Chen <raychen@google.com> |
Fix 5481444 Face clustering should use PWA profile shot instead of random photo Change-Id: Ie4e3f9ae19431ab5b36d216cd7f4c626de503bbf
allerycommon/src/com/android/gallery3d/common/BitmapUtils.java
|
51f0610147218ee72da9322ee9c10424f33a4227 |
03-Nov-2011 |
Ray Chen <raychen@google.com> |
Fix 5481444 Face clustering should use PWA profile shot instead of random photo Change-Id: Ie4e3f9ae19431ab5b36d216cd7f4c626de503bbf
allerycommon/src/com/android/gallery3d/common/BitmapUtils.java
rc/com/android/gallery3d/data/ClusterAlbum.java
rc/com/android/gallery3d/data/ClusterAlbumSet.java
rc/com/android/gallery3d/data/Clustering.java
rc/com/android/gallery3d/data/Face.java
rc/com/android/gallery3d/data/FaceClustering.java
rc/com/android/gallery3d/data/LocalImage.java
rc/com/android/gallery3d/data/MediaItem.java
rc_pd/com/android/gallery3d/picasasource/PicasaSource.java
|
04a9a44fb85263c4590ca68f92adff6f9da360e9 |
03-Nov-2011 |
Ray Chen <raychen@google.com> |
Fix 5481444 Face clustering should use PWA profile shot instead of random photo Change-Id: Ie4e3f9ae19431ab5b36d216cd7f4c626de503bbf
allerycommon/src/com/android/gallery3d/common/BitmapUtils.java
rc/com/android/gallery3d/data/ClusterAlbum.java
rc/com/android/gallery3d/data/ClusterAlbumSet.java
rc/com/android/gallery3d/data/Clustering.java
rc/com/android/gallery3d/data/Face.java
rc/com/android/gallery3d/data/FaceClustering.java
rc/com/android/gallery3d/data/LocalImage.java
rc/com/android/gallery3d/data/MediaItem.java
rc_pd/com/android/gallery3d/picasasource/PicasaSource.java
|
ddcca63483efc9b8e84acf3cd002e27a37123f2e |
11-Nov-2011 |
Owen Lin <owenlin@google.com> |
resolved conflicts for merge of 64d592c0 to master Change-Id: Iae4a66e37fcb852c4b105fe732c6597b638b2059
allerycommon/src/com/android/gallery3d/common/FileCache.java
|
fa0af6939e716e8ad07ca9200fbe665d165aefda |
11-Nov-2011 |
Owen Lin <owenlin@google.com> |
resolved conflicts for merge of 64d592c0 to master Change-Id: Iae4a66e37fcb852c4b105fe732c6597b638b2059
|
09e671801928490afe77151072f7ec118fa4d640 |
11-Nov-2011 |
Owen Lin <owenlin@google.com> |
resolved conflicts for merge of 64d592c0 to master Change-Id: Iae4a66e37fcb852c4b105fe732c6597b638b2059
|
eb05b060087c4023650b627933c45e0f4f015cb0 |
11-Nov-2011 |
Ray Chen <raychen@google.com> |
am c9af80a1: Merge "Fix 5213252 [UI] Updated action bar layouts and action orders" into ics-mr1 * commit 'c9af80a1e46106b93271903753d36682b480479c': Fix 5213252 [UI] Updated action bar layouts and action orders
|
acb3d724feee5efeef962ce1c1efa48bdab25ba1 |
11-Nov-2011 |
Ray Chen <raychen@google.com> |
am c9af80a1: Merge "Fix 5213252 [UI] Updated action bar layouts and action orders" into ics-mr1 * commit 'c9af80a1e46106b93271903753d36682b480479c': Fix 5213252 [UI] Updated action bar layouts and action orders
|
f6353189ecc0a355bd49b2cb1955dfe59209e6e5 |
11-Nov-2011 |
Ray Chen <raychen@google.com> |
am c9af80a1: Merge "Fix 5213252 [UI] Updated action bar layouts and action orders" into ics-mr1 * commit 'c9af80a1e46106b93271903753d36682b480479c': Fix 5213252 [UI] Updated action bar layouts and action orders
|
ae76c972d3735796663eff50fcb2a4fc7fcd6db0 |
11-Nov-2011 |
Ray Chen <raychen@google.com> |
Merge "Fix 5213252 [UI] Updated action bar layouts and action orders" into ics-mr1
|
63507711044202f1a590dc429a32c826b24789a4 |
11-Nov-2011 |
Ray Chen <raychen@google.com> |
Merge "Fix 5213252 [UI] Updated action bar layouts and action orders" into ics-mr1
|
c9af80a1e46106b93271903753d36682b480479c |
11-Nov-2011 |
Ray Chen <raychen@google.com> |
Merge "Fix 5213252 [UI] Updated action bar layouts and action orders" into ics-mr1
|
4001b59bc073c674bffa10b32d9c53654888ce37 |
11-Nov-2011 |
Owen Lin <owenlin@google.com> |
am d80bb597: Merge "Show control overlay when earphone is unplugged" into ics-mr1 * commit 'd80bb5974b0ec43ca1755aff4287fc7815504058': Show control overlay when earphone is unplugged
|
a6e4e6a8709cd3c0ba4f594015e4a9e50ab2b282 |
11-Nov-2011 |
Yuli Huang <yuli@google.com> |
am e193bc40: Merge "Fix b/5518211 by disabling effects when photo cannot be loaded." into ics-mr1 * commit 'e193bc40110b0606806c864234e95141be6bd312': Fix b/5518211 by disabling effects when photo cannot be loaded.
|
a898465dd8caac239847b8855804f69298321c7c |
11-Nov-2011 |
Yuli Huang <yuli@google.com> |
am e193bc40: Merge "Fix b/5518211 by disabling effects when photo cannot be loaded." into ics-mr1 * commit 'e193bc40110b0606806c864234e95141be6bd312': Fix b/5518211 by disabling effects when photo cannot be loaded.
|
cd33014879b3b4a7d7c9c9f7699fb82282a860df |
11-Nov-2011 |
Owen Lin <owenlin@google.com> |
am d80bb597: Merge "Show control overlay when earphone is unplugged" into ics-mr1 * commit 'd80bb5974b0ec43ca1755aff4287fc7815504058': Show control overlay when earphone is unplugged
|
65b1c3d4b5b14012ed9e7952ad35f75a714a2774 |
11-Nov-2011 |
Yuli Huang <yuli@google.com> |
am e193bc40: Merge "Fix b/5518211 by disabling effects when photo cannot be loaded." into ics-mr1 * commit 'e193bc40110b0606806c864234e95141be6bd312': Fix b/5518211 by disabling effects when photo cannot be loaded.
|
aa6bce7d890ce47eb4cae2fef45ea307661bfd07 |
11-Nov-2011 |
Chih-Chung Chang <chihchung@google.com> |
am b86c6aa0: Fix 5548567: Don\'t play video immediately. * commit 'b86c6aa085a66ffee2a178f4b5e2426cc67ca90b': Fix 5548567: Don't play video immediately.
|
a28f9aab0c8f704eaf02e05a364b29601164a219 |
11-Nov-2011 |
Chih-Chung Chang <chihchung@google.com> |
am b86c6aa0: Fix 5548567: Don\'t play video immediately. * commit 'b86c6aa085a66ffee2a178f4b5e2426cc67ca90b': Fix 5548567: Don't play video immediately.
|
b789e690891e62ea8f17689f1b4fa2db1d1cdf5d |
11-Nov-2011 |
Owen Lin <owenlin@google.com> |
am 64d592c0: Merge "Request sync when opening Gallery/Album." into ics-mr1 * commit '64d592c0573766162498bf16933bd8699b8fa77f': Request sync when opening Gallery/Album.
|
58e74e18d8f35ed88855b6c97cc51653e2469e70 |
11-Nov-2011 |
Owen Lin <owenlin@google.com> |
am 64d592c0: Merge "Request sync when opening Gallery/Album." into ics-mr1 * commit '64d592c0573766162498bf16933bd8699b8fa77f': Request sync when opening Gallery/Album.
|
774bd04705b2643f59941ea806f31d4d6a1c6fbb |
11-Nov-2011 |
Yuli Huang <yuli@google.com> |
am e193bc40: Merge "Fix b/5518211 by disabling effects when photo cannot be loaded." into ics-mr1 * commit 'e193bc40110b0606806c864234e95141be6bd312': Fix b/5518211 by disabling effects when photo cannot be loaded.
|
277d2641874edf899670cca6eed170a0400992f3 |
11-Nov-2011 |
Owen Lin <owenlin@google.com> |
am d80bb597: Merge "Show control overlay when earphone is unplugged" into ics-mr1 * commit 'd80bb5974b0ec43ca1755aff4287fc7815504058': Show control overlay when earphone is unplugged
|
efaab0b7fe41d4a6882ef21d0bd40f3186a9fd2e |
11-Nov-2011 |
Owen Lin <owenlin@google.com> |
am d80bb597: Merge "Show control overlay when earphone is unplugged" into ics-mr1 * commit 'd80bb5974b0ec43ca1755aff4287fc7815504058': Show control overlay when earphone is unplugged
|
9caf8bd046b8bfaf35de54533341055c4bdd367b |
11-Nov-2011 |
Yuli Huang <yuli@google.com> |
am e193bc40: Merge "Fix b/5518211 by disabling effects when photo cannot be loaded." into ics-mr1 * commit 'e193bc40110b0606806c864234e95141be6bd312': Fix b/5518211 by disabling effects when photo cannot be loaded.
|
046598b0b46106fb8035f76f2b91dc1c2ba372b9 |
11-Nov-2011 |
Yuli Huang <yuli@google.com> |
am e193bc40: Merge "Fix b/5518211 by disabling effects when photo cannot be loaded." into ics-mr1 * commit 'e193bc40110b0606806c864234e95141be6bd312': Fix b/5518211 by disabling effects when photo cannot be loaded.
|
3af5372290ec4e6033584966fa9de325ce84ec0d |
11-Nov-2011 |
Chih-Chung Chang <chihchung@google.com> |
am b86c6aa0: Fix 5548567: Don\'t play video immediately. * commit 'b86c6aa085a66ffee2a178f4b5e2426cc67ca90b': Fix 5548567: Don't play video immediately.
|
103c2833467e15f2cda0150b24fab737137133b9 |
11-Nov-2011 |
Chih-Chung Chang <chihchung@google.com> |
am b86c6aa0: Fix 5548567: Don\'t play video immediately. * commit 'b86c6aa085a66ffee2a178f4b5e2426cc67ca90b': Fix 5548567: Don't play video immediately.
|
64d592c0573766162498bf16933bd8699b8fa77f |
11-Nov-2011 |
Owen Lin <owenlin@google.com> |
Merge "Request sync when opening Gallery/Album." into ics-mr1
|
b4f0a855e6bfcaff390cc763383b15ef500e767b |
11-Nov-2011 |
Owen Lin <owenlin@google.com> |
Merge "Request sync when opening Gallery/Album." into ics-mr1
|
d80bb5974b0ec43ca1755aff4287fc7815504058 |
11-Nov-2011 |
Owen Lin <owenlin@google.com> |
Merge "Show control overlay when earphone is unplugged" into ics-mr1
|
7e0d6039f2ca726756277f31bbbce77c8476b911 |
11-Nov-2011 |
Owen Lin <owenlin@google.com> |
Merge "Show control overlay when earphone is unplugged" into ics-mr1
|
aea077a5767d28fcdade440825239adfbfb8f45a |
10-Nov-2011 |
Owen Lin <owenlin@google.com> |
Show control overlay when earphone is unplugged Change-Id: I3e259e66d318010a3f9e9b47b561a09b2db2b6a5 fix: 5563251
rc/com/android/gallery3d/app/MoviePlayer.java
|
50dab504e89c026ce7a5012e0f8ec342b41c738d |
10-Nov-2011 |
Owen Lin <owenlin@google.com> |
Show control overlay when earphone is unplugged Change-Id: I3e259e66d318010a3f9e9b47b561a09b2db2b6a5 fix: 5563251
rc/com/android/gallery3d/app/MoviePlayer.java
|
e193bc40110b0606806c864234e95141be6bd312 |
11-Nov-2011 |
Yuli Huang <yuli@google.com> |
Merge "Fix b/5518211 by disabling effects when photo cannot be loaded." into ics-mr1
|
c9ac7f1c5e5b5d665aad8919ab98645b9a18a28e |
11-Nov-2011 |
Yuli Huang <yuli@google.com> |
Merge "Fix b/5518211 by disabling effects when photo cannot be loaded." into ics-mr1
|
fbdd338d83596ba545a8a7c8105d2ad7b5df56e6 |
08-Nov-2011 |
Owen Lin <owenlin@google.com> |
Request sync when opening Gallery/Album. fix: 5519437 Change-Id: I0fb60415e3a92a677ca72ee8e0b95ae57e802152
rc/com/android/gallery3d/app/AlbumPage.java
rc/com/android/gallery3d/app/AlbumSetPage.java
|
1a03de88b2821a357be8e2060f7d5145cee901c0 |
08-Nov-2011 |
Owen Lin <owenlin@google.com> |
Request sync when opening Gallery/Album. fix: 5519437 Change-Id: I0fb60415e3a92a677ca72ee8e0b95ae57e802152
rc/com/android/gallery3d/app/AlbumPage.java
rc/com/android/gallery3d/app/AlbumSetPage.java
|
6cba52d638744808a67ea7acda6a2d1ac7583cbf |
11-Nov-2011 |
Eric Fischer <enf@google.com> |
am bfdc2058: Merge "Import revised translations." * commit 'bfdc2058f52c6ad3a5ee03ea7ee2a70321260dc2': Import revised translations.
|
a6a37c00442ead5c46336d481542ecb5e2c889d8 |
11-Nov-2011 |
Eric Fischer <enf@google.com> |
Merge "Import revised translations."
|
bfdc2058f52c6ad3a5ee03ea7ee2a70321260dc2 |
11-Nov-2011 |
Eric Fischer <enf@google.com> |
Merge "Import revised translations."
|
189bbeccfc540449430b1d4eb4f9982afb9d1e78 |
10-Nov-2011 |
The Android Open Source Project <initial-contribution@android.com> |
am ab22eb35: Reconcile with ics-mr1-release * commit 'ab22eb356188c58f2f91f2ddc6e3abed3fcc9740':
|
c44eee782fea05865c0fabcf1b9d6317d47b225b |
10-Nov-2011 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with ics-mr1-release Change-Id: I7af0b572fb36c3c93761232c46d9adf74da8aacd
|
ac9f1993d7ad66b87920b14e883eca4b2aab6f80 |
10-Nov-2011 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with ics-mr1-release Change-Id: I7af0b572fb36c3c93761232c46d9adf74da8aacd
|
ab22eb356188c58f2f91f2ddc6e3abed3fcc9740 |
10-Nov-2011 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with ics-mr1-release Change-Id: I7af0b572fb36c3c93761232c46d9adf74da8aacd
|
bcb8a5f8f5c4355fac6350928369a1226488d0d7 |
10-Nov-2011 |
Eric Fischer <enf@google.com> |
Import revised translations. Change-Id: I34e26a60238c1a846f6f9a327db7b892737539cf
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
199f1139a4b1718a7efeb0f348c957531674579c |
10-Nov-2011 |
Eric Fischer <enf@google.com> |
Import revised translations. Change-Id: I34e26a60238c1a846f6f9a327db7b892737539cf
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
a77938a12934f170370db92589f3cdf776149e69 |
10-Nov-2011 |
Chih-Chung Chang <chihchung@google.com> |
am 99a10821: am af92c510: Merge "Fix 5585254: Make system UI enter "low profile mode" while playing." into ics-mr1 * commit '99a1082122e040ff07fa2c044efd6d42c2450a75': Fix 5585254: Make system UI enter "low profile mode" while playing.
|
96b60271935b345b633883688e470e1b497928f2 |
10-Nov-2011 |
Chih-Chung Chang <chihchung@google.com> |
am af92c510: Merge "Fix 5585254: Make system UI enter "low profile mode" while playing." into ics-mr1 * commit 'af92c5100158fe39cca21abb76ca685bfe106eeb': Fix 5585254: Make system UI enter "low profile mode" while playing.
|
99a1082122e040ff07fa2c044efd6d42c2450a75 |
10-Nov-2011 |
Chih-Chung Chang <chihchung@google.com> |
am af92c510: Merge "Fix 5585254: Make system UI enter "low profile mode" while playing." into ics-mr1 * commit 'af92c5100158fe39cca21abb76ca685bfe106eeb': Fix 5585254: Make system UI enter "low profile mode" while playing.
|
e85e5118c6e09a82eb2eef11d333612e3f8df949 |
10-Nov-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
9af6494087ec14202824d95220f77745597b595f |
10-Nov-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
72744eca9ea483fa150c250d776f0e89ed228be2 |
10-Nov-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-mr1-release history after reset to ics-mr1
|
6f80531efb4cfc170c8e402cec40490bd858581d |
10-Nov-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-mr1-release history after reset to ics-mr1
|
b86c6aa085a66ffee2a178f4b5e2426cc67ca90b |
10-Nov-2011 |
Chih-Chung Chang <chihchung@google.com> |
Fix 5548567: Don't play video immediately. Change-Id: I30e9ebf7461e12250e1ef240c157e7f59b1ce2a1
rc/com/android/gallery3d/app/AlbumPage.java
|
0358bbb83b717544d1d20f650a6b8be4f6ff2e99 |
10-Nov-2011 |
Chih-Chung Chang <chihchung@google.com> |
Fix 5548567: Don't play video immediately. Change-Id: I30e9ebf7461e12250e1ef240c157e7f59b1ce2a1
rc/com/android/gallery3d/app/AlbumPage.java
|
3e66368478cfa90bda230e3ccbaf4341e20d3a72 |
09-Nov-2011 |
Ray Chen <raychen@google.com> |
Fix 5213252 [UI] Updated action bar layouts and action orders Change-Id: I798a86ed1f6883af1ea3cd3e9c67a6603d0273cc
es/menu-land/photo.xml
es/menu/operation.xml
es/menu/photo.xml
|
c3ed4ec81e47ff0d72e0513a1d039bc34e48f0b1 |
09-Nov-2011 |
Ray Chen <raychen@google.com> |
Fix 5213252 [UI] Updated action bar layouts and action orders Change-Id: I798a86ed1f6883af1ea3cd3e9c67a6603d0273cc
rc/com/android/gallery3d/app/AbstractGalleryActivity.java
|
108667b88ed4046556e967fcb9541fa9efd7c606 |
09-Nov-2011 |
Ray Chen <raychen@google.com> |
Fix 5213252 [UI] Updated action bar layouts and action orders Change-Id: I798a86ed1f6883af1ea3cd3e9c67a6603d0273cc
es/menu-land/photo.xml
es/menu/operation.xml
es/menu/photo.xml
rc/com/android/gallery3d/app/AbstractGalleryActivity.java
|
939e909cc937f20b762c22cdb67c55f84a3d0ffd |
10-Nov-2011 |
Yuli Huang <yuli@google.com> |
Fix b/5518211 by disabling effects when photo cannot be loaded. Change-Id: I9e5ae9cfaf9bee52cd63a0e77a3b083e47b59335
rc/com/android/gallery3d/photoeditor/SpinnerProgressDialog.java
|
f963bc2a7c86512e0414132f39702a124298edcf |
10-Nov-2011 |
Yuli Huang <yuli@google.com> |
Fix b/5518211 by disabling effects when photo cannot be loaded. Change-Id: I9e5ae9cfaf9bee52cd63a0e77a3b083e47b59335
rc/com/android/gallery3d/photoeditor/EffectsBar.java
rc/com/android/gallery3d/photoeditor/PhotoEditor.java
rc/com/android/gallery3d/photoeditor/SpinnerProgressDialog.java
|
fd3d9dab304d66f2f7d995440d996c688b6d9a31 |
10-Nov-2011 |
Yuli Huang <yuli@google.com> |
Fix b/5518211 by disabling effects when photo cannot be loaded. Change-Id: I9e5ae9cfaf9bee52cd63a0e77a3b083e47b59335
rc/com/android/gallery3d/photoeditor/EffectsBar.java
rc/com/android/gallery3d/photoeditor/PhotoEditor.java
rc/com/android/gallery3d/photoeditor/SpinnerProgressDialog.java
|
6c9cdded544d3b8cb6ae1ad30516744285286b0f |
10-Nov-2011 |
Ray Chen <raychen@google.com> |
am 30ba9e02: Merge "Fix 5453262 No pictures / Videos available in Gallery message not displayed" * commit '30ba9e029978705598b4cf2427b5d21a4c608e53': Fix 5453262 No pictures / Videos available in Gallery message not displayed
|
39062ff91ec6042ee2c4c46c3058dadacf62d171 |
10-Nov-2011 |
Ray Chen <raychen@google.com> |
Merge "Fix 5453262 No pictures / Videos available in Gallery message not displayed"
|
30ba9e029978705598b4cf2427b5d21a4c608e53 |
10-Nov-2011 |
Ray Chen <raychen@google.com> |
Merge "Fix 5453262 No pictures / Videos available in Gallery message not displayed"
|
0e422227e02888ea6e52a2a01e78f9779898b5b3 |
10-Nov-2011 |
Yuli Huang <yuli@google.com> |
am 26c6002b: am 8cfe549a: Fix b/5587210: Add file extension to display-name. * commit '26c6002bd211cf85b1049bcb6b26006a1496ac36': Fix b/5587210: Add file extension to display-name.
|
d470122388b4c063697de2774019453843842eed |
10-Nov-2011 |
Yuli Huang <yuli@google.com> |
am 8cfe549a: Fix b/5587210: Add file extension to display-name. * commit '8cfe549a3c6e50653ce50cedf90e8463d641987d': Fix b/5587210: Add file extension to display-name.
|
26c6002bd211cf85b1049bcb6b26006a1496ac36 |
10-Nov-2011 |
Yuli Huang <yuli@google.com> |
am 8cfe549a: Fix b/5587210: Add file extension to display-name. * commit '8cfe549a3c6e50653ce50cedf90e8463d641987d': Fix b/5587210: Add file extension to display-name.
|
748efd70ce85f2c1ea4c128ccc5d1277168ed638 |
10-Nov-2011 |
Chih-Chung Chang <chihchung@google.com> |
am af92c510: Merge "Fix 5585254: Make system UI enter "low profile mode" while playing." into ics-mr1 * commit 'af92c5100158fe39cca21abb76ca685bfe106eeb': Fix 5585254: Make system UI enter "low profile mode" while playing.
|
7fa9327b3b12e0c1a725150589acc8be479b2537 |
10-Nov-2011 |
Chih-Chung Chang <chihchung@google.com> |
am af92c510: Merge "Fix 5585254: Make system UI enter "low profile mode" while playing." into ics-mr1 * commit 'af92c5100158fe39cca21abb76ca685bfe106eeb': Fix 5585254: Make system UI enter "low profile mode" while playing.
|
669f5b8aed366c59c8c062e1049bc287ff73babf |
10-Nov-2011 |
Chih-Chung Chang <chihchung@google.com> |
Merge "Fix 5585254: Make system UI enter "low profile mode" while playing." into ics-mr1
|
af92c5100158fe39cca21abb76ca685bfe106eeb |
10-Nov-2011 |
Chih-Chung Chang <chihchung@google.com> |
Merge "Fix 5585254: Make system UI enter "low profile mode" while playing." into ics-mr1
|
56b7aa860446457264a0ecf8633b9a0879677b4d |
10-Nov-2011 |
Yuli Huang <yuli@google.com> |
am 5ba2576d: am 90b7a7a1: Fix b/5510870 by persisting states of save/share buttons. * commit '5ba2576ddcc315822100bdd904ea42a6bebce9e3': Fix b/5510870 by persisting states of save/share buttons.
|
8b2e521b418e1a86d7644c8860dff6c8e9eb2b96 |
10-Nov-2011 |
Yuli Huang <yuli@google.com> |
am 90b7a7a1: Fix b/5510870 by persisting states of save/share buttons. * commit '90b7a7a1fed287cab3500acdfaf4e82ec0a59dec': Fix b/5510870 by persisting states of save/share buttons.
|
5ba2576ddcc315822100bdd904ea42a6bebce9e3 |
10-Nov-2011 |
Yuli Huang <yuli@google.com> |
am 90b7a7a1: Fix b/5510870 by persisting states of save/share buttons. * commit '90b7a7a1fed287cab3500acdfaf4e82ec0a59dec': Fix b/5510870 by persisting states of save/share buttons.
|
1f4aa5294c6aef098ebe75331bd16e286950325a |
09-Nov-2011 |
Yuli Huang <yuli@google.com> |
am 8cfe549a: Fix b/5587210: Add file extension to display-name. * commit '8cfe549a3c6e50653ce50cedf90e8463d641987d': Fix b/5587210: Add file extension to display-name.
|
5521e232acb37eb76aa6d562ee087b4229874d56 |
09-Nov-2011 |
Yuli Huang <yuli@google.com> |
am 8cfe549a: Fix b/5587210: Add file extension to display-name. * commit '8cfe549a3c6e50653ce50cedf90e8463d641987d': Fix b/5587210: Add file extension to display-name.
|
f5b5dda8de2dcf4842b2491a5840aeb23d1fd02e |
09-Nov-2011 |
Yuli Huang <yuli@google.com> |
am 90b7a7a1: Fix b/5510870 by persisting states of save/share buttons. * commit '90b7a7a1fed287cab3500acdfaf4e82ec0a59dec': Fix b/5510870 by persisting states of save/share buttons.
|
db2daf6106fa16950c02a5d5b6f32d3e30700236 |
09-Nov-2011 |
Yuli Huang <yuli@google.com> |
am 90b7a7a1: Fix b/5510870 by persisting states of save/share buttons. * commit '90b7a7a1fed287cab3500acdfaf4e82ec0a59dec': Fix b/5510870 by persisting states of save/share buttons.
|
de1b184b2efd498c8ef8b203d38f4b30d6f7ca68 |
09-Nov-2011 |
Yuli Huang <yuli@google.com> |
Fix b/5587210: Add file extension to display-name. Change-Id: I7c3522f2532bbce688ee8d4d0403f7314baca481
rc/com/android/gallery3d/photoeditor/SaveCopyTask.java
|
8cfe549a3c6e50653ce50cedf90e8463d641987d |
09-Nov-2011 |
Yuli Huang <yuli@google.com> |
Fix b/5587210: Add file extension to display-name. Change-Id: I7c3522f2532bbce688ee8d4d0403f7314baca481
rc/com/android/gallery3d/photoeditor/SaveCopyTask.java
|
e3eb807bb71ff70effb581e9c354c5099fe766e5 |
09-Nov-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-mr1-release history after reset to ics-mr1
|
62db58a4511ade7a00faca14c45eb6b2fe918a9b |
09-Nov-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-mr1-release history after reset to ics-mr1
|
f9438170e9e3afa4de163352765950f40708096b |
09-Nov-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
557ac46a4246743a736bb1941f8bc2d53f78069b |
09-Nov-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
20f1e1e2ed63d16fb827a3153af01cbe5caa4405 |
09-Nov-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
3dbb732ba1699b731ad9902e703b5b0992e8c39f |
09-Nov-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-mr1-release history after reset to ics-mr1
|
9a867d445f2d824fb57cc4c04cc45da05250d341 |
09-Nov-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-mr1-release history after reset to ics-mr1
|
d2e66b10a90b64521ad9fbc00a129acad5a334b9 |
09-Nov-2011 |
Yuli Huang <yuli@google.com> |
am 19df0dc8: am 738e82e1: Fix b/5510870 by saving/restoring Activity states. * commit '19df0dc8551b9f363a5592ec07e8e4485ffc92b7': Fix b/5510870 by saving/restoring Activity states.
|
01b0411ded176d20d325529ca469e683035ab072 |
09-Nov-2011 |
Yuli Huang <yuli@google.com> |
am 1ece82da: am 13105e73: Merge "Add face tanning effect to gallery" into ics-mr1 * commit '1ece82dacd5f2a527bb89a637d860332d27c78df': Add face tanning effect to gallery
|
19df0dc8551b9f363a5592ec07e8e4485ffc92b7 |
09-Nov-2011 |
Yuli Huang <yuli@google.com> |
am 738e82e1: Fix b/5510870 by saving/restoring Activity states. * commit '738e82e163f90e1fe7aeef8bd153dc7763631f30': Fix b/5510870 by saving/restoring Activity states.
|
c62e804a74df652881a0b6180412f1c1955c64b5 |
09-Nov-2011 |
Yuli Huang <yuli@google.com> |
am 738e82e1: Fix b/5510870 by saving/restoring Activity states. * commit '738e82e163f90e1fe7aeef8bd153dc7763631f30': Fix b/5510870 by saving/restoring Activity states.
|
9d9226a7025a3516d7f1fa052a61ac993d51e7db |
09-Nov-2011 |
Chih-Chung Chang <chihchung@google.com> |
Fix 5585254: Make system UI enter "low profile mode" while playing. Change-Id: I91f680871b7a965f6776cb017dcd825a587e5054
rc/com/android/gallery3d/app/MoviePlayer.java
|
5383c573055927dfd856c3f360671d1887a971d5 |
09-Nov-2011 |
Chih-Chung Chang <chihchung@google.com> |
Fix 5585254: Make system UI enter "low profile mode" while playing. Change-Id: I91f680871b7a965f6776cb017dcd825a587e5054
rc/com/android/gallery3d/app/MoviePlayer.java
|
b69298a00f20f2a3b7ac8f5d3c350c3152d428c3 |
09-Nov-2011 |
Yuli Huang <yuli@google.com> |
Fix b/5510870 by persisting states of save/share buttons. Change-Id: Ida5c2868199b75a1a710ee5b92e0e3dffd71cec6
rc/com/android/gallery3d/photoeditor/FilterStack.java
rc/com/android/gallery3d/photoeditor/PhotoEditor.java
|
90b7a7a1fed287cab3500acdfaf4e82ec0a59dec |
09-Nov-2011 |
Yuli Huang <yuli@google.com> |
Fix b/5510870 by persisting states of save/share buttons. Change-Id: Ida5c2868199b75a1a710ee5b92e0e3dffd71cec6
rc/com/android/gallery3d/photoeditor/FilterStack.java
rc/com/android/gallery3d/photoeditor/PhotoEditor.java
|
c011a6b3ea4702c7fa68c8103172af71f937e88d |
09-Nov-2011 |
Ray Chen <raychen@google.com> |
Fix 5453262 No pictures / Videos available in Gallery message not displayed Change-Id: Ib6c8691e4206f9d6a07a7587d22a67c1a21bc5a5
rc/com/android/gallery3d/app/AlbumSetPage.java
|
3b26a14acaa3f3206815123e02b18a4144cfec8c |
09-Nov-2011 |
Ray Chen <raychen@google.com> |
Fix 5453262 No pictures / Videos available in Gallery message not displayed Change-Id: Ib6c8691e4206f9d6a07a7587d22a67c1a21bc5a5
rc/com/android/gallery3d/app/AlbumSetPage.java
|
9f0dade0d6e29c437c7da65a3d5f3b24dd44d9b9 |
08-Nov-2011 |
Yuli Huang <yuli@google.com> |
am 13105e73: Merge "Add face tanning effect to gallery" into ics-mr1 * commit '13105e73298f7ed0031232d48a7cf43ac4c0d21f': Add face tanning effect to gallery
|
3e65008308c4cf8b63c78fe5ae1ea141d25a0562 |
08-Nov-2011 |
Yuli Huang <yuli@google.com> |
am 13105e73: Merge "Add face tanning effect to gallery" into ics-mr1 * commit '13105e73298f7ed0031232d48a7cf43ac4c0d21f': Add face tanning effect to gallery
|
1ece82dacd5f2a527bb89a637d860332d27c78df |
08-Nov-2011 |
Yuli Huang <yuli@google.com> |
am 13105e73: Merge "Add face tanning effect to gallery" into ics-mr1 * commit '13105e73298f7ed0031232d48a7cf43ac4c0d21f': Add face tanning effect to gallery
|
b39ea3cf6dd62866b2da3710a5c75a594b0df425 |
08-Nov-2011 |
Yuli Huang <yuli@google.com> |
am 738e82e1: Fix b/5510870 by saving/restoring Activity states. * commit '738e82e163f90e1fe7aeef8bd153dc7763631f30': Fix b/5510870 by saving/restoring Activity states.
|
00df2da08e3989f5dbb4eadec9e1d38e265cf345 |
08-Nov-2011 |
Yuli Huang <yuli@google.com> |
am 738e82e1: Fix b/5510870 by saving/restoring Activity states. * commit '738e82e163f90e1fe7aeef8bd153dc7763631f30': Fix b/5510870 by saving/restoring Activity states.
|
16ac4446300bdc6b23a9436328a667996a70c278 |
04-Nov-2011 |
Yuli Huang <yuli@google.com> |
Fix b/5510870 by saving/restoring Activity states. 1. Filters implement Parcelable for saving/restoring states. 2. Extract Doodle for making doodling paths parcelable. Change-Id: Ice8e6e068891da8a8f9251e62d95ea755fa99933
rc/com/android/gallery3d/photoeditor/FilterStack.java
rc/com/android/gallery3d/photoeditor/PhotoEditor.java
rc/com/android/gallery3d/photoeditor/actions/ColorTemperatureAction.java
rc/com/android/gallery3d/photoeditor/actions/Doodle.java
rc/com/android/gallery3d/photoeditor/actions/DoodleAction.java
rc/com/android/gallery3d/photoeditor/actions/DoodlePaint.java
rc/com/android/gallery3d/photoeditor/actions/DoodleView.java
rc/com/android/gallery3d/photoeditor/actions/FillLightAction.java
rc/com/android/gallery3d/photoeditor/actions/HighlightAction.java
rc/com/android/gallery3d/photoeditor/actions/SaturationAction.java
rc/com/android/gallery3d/photoeditor/actions/ShadowAction.java
rc/com/android/gallery3d/photoeditor/actions/SharpenAction.java
rc/com/android/gallery3d/photoeditor/filters/AbstractScaleFilter.java
rc/com/android/gallery3d/photoeditor/filters/AutoFixFilter.java
rc/com/android/gallery3d/photoeditor/filters/ColorTemperatureFilter.java
rc/com/android/gallery3d/photoeditor/filters/CropFilter.java
rc/com/android/gallery3d/photoeditor/filters/CrossProcessFilter.java
rc/com/android/gallery3d/photoeditor/filters/DocumentaryFilter.java
rc/com/android/gallery3d/photoeditor/filters/DoodleFilter.java
rc/com/android/gallery3d/photoeditor/filters/DuotoneFilter.java
rc/com/android/gallery3d/photoeditor/filters/FaceTanFilter.java
rc/com/android/gallery3d/photoeditor/filters/FaceliftFilter.java
rc/com/android/gallery3d/photoeditor/filters/FillLightFilter.java
rc/com/android/gallery3d/photoeditor/filters/Filter.java
rc/com/android/gallery3d/photoeditor/filters/FilterCreator.java
rc/com/android/gallery3d/photoeditor/filters/FisheyeFilter.java
rc/com/android/gallery3d/photoeditor/filters/FlipFilter.java
rc/com/android/gallery3d/photoeditor/filters/GrainFilter.java
rc/com/android/gallery3d/photoeditor/filters/GrayscaleFilter.java
rc/com/android/gallery3d/photoeditor/filters/HighlightFilter.java
rc/com/android/gallery3d/photoeditor/filters/LomoishFilter.java
rc/com/android/gallery3d/photoeditor/filters/NegativeFilter.java
rc/com/android/gallery3d/photoeditor/filters/PosterizeFilter.java
rc/com/android/gallery3d/photoeditor/filters/RedEyeFilter.java
rc/com/android/gallery3d/photoeditor/filters/RotateFilter.java
rc/com/android/gallery3d/photoeditor/filters/SaturationFilter.java
rc/com/android/gallery3d/photoeditor/filters/SepiaFilter.java
rc/com/android/gallery3d/photoeditor/filters/ShadowFilter.java
rc/com/android/gallery3d/photoeditor/filters/SharpenFilter.java
rc/com/android/gallery3d/photoeditor/filters/StraightenFilter.java
rc/com/android/gallery3d/photoeditor/filters/TintFilter.java
rc/com/android/gallery3d/photoeditor/filters/VignetteFilter.java
|
738e82e163f90e1fe7aeef8bd153dc7763631f30 |
04-Nov-2011 |
Yuli Huang <yuli@google.com> |
Fix b/5510870 by saving/restoring Activity states. 1. Filters implement Parcelable for saving/restoring states. 2. Extract Doodle for making doodling paths parcelable. Change-Id: Ice8e6e068891da8a8f9251e62d95ea755fa99933
rc/com/android/gallery3d/photoeditor/FilterStack.java
rc/com/android/gallery3d/photoeditor/PhotoEditor.java
rc/com/android/gallery3d/photoeditor/actions/ColorTemperatureAction.java
rc/com/android/gallery3d/photoeditor/actions/Doodle.java
rc/com/android/gallery3d/photoeditor/actions/DoodleAction.java
rc/com/android/gallery3d/photoeditor/actions/DoodlePaint.java
rc/com/android/gallery3d/photoeditor/actions/DoodleView.java
rc/com/android/gallery3d/photoeditor/actions/FillLightAction.java
rc/com/android/gallery3d/photoeditor/actions/HighlightAction.java
rc/com/android/gallery3d/photoeditor/actions/SaturationAction.java
rc/com/android/gallery3d/photoeditor/actions/ShadowAction.java
rc/com/android/gallery3d/photoeditor/actions/SharpenAction.java
rc/com/android/gallery3d/photoeditor/filters/AbstractScaleFilter.java
rc/com/android/gallery3d/photoeditor/filters/AutoFixFilter.java
rc/com/android/gallery3d/photoeditor/filters/ColorTemperatureFilter.java
rc/com/android/gallery3d/photoeditor/filters/CropFilter.java
rc/com/android/gallery3d/photoeditor/filters/CrossProcessFilter.java
rc/com/android/gallery3d/photoeditor/filters/DocumentaryFilter.java
rc/com/android/gallery3d/photoeditor/filters/DoodleFilter.java
rc/com/android/gallery3d/photoeditor/filters/DuotoneFilter.java
rc/com/android/gallery3d/photoeditor/filters/FaceTanFilter.java
rc/com/android/gallery3d/photoeditor/filters/FaceliftFilter.java
rc/com/android/gallery3d/photoeditor/filters/FillLightFilter.java
rc/com/android/gallery3d/photoeditor/filters/Filter.java
rc/com/android/gallery3d/photoeditor/filters/FilterCreator.java
rc/com/android/gallery3d/photoeditor/filters/FisheyeFilter.java
rc/com/android/gallery3d/photoeditor/filters/FlipFilter.java
rc/com/android/gallery3d/photoeditor/filters/GrainFilter.java
rc/com/android/gallery3d/photoeditor/filters/GrayscaleFilter.java
rc/com/android/gallery3d/photoeditor/filters/HighlightFilter.java
rc/com/android/gallery3d/photoeditor/filters/LomoishFilter.java
rc/com/android/gallery3d/photoeditor/filters/NegativeFilter.java
rc/com/android/gallery3d/photoeditor/filters/PosterizeFilter.java
rc/com/android/gallery3d/photoeditor/filters/RedEyeFilter.java
rc/com/android/gallery3d/photoeditor/filters/RotateFilter.java
rc/com/android/gallery3d/photoeditor/filters/SaturationFilter.java
rc/com/android/gallery3d/photoeditor/filters/SepiaFilter.java
rc/com/android/gallery3d/photoeditor/filters/ShadowFilter.java
rc/com/android/gallery3d/photoeditor/filters/SharpenFilter.java
rc/com/android/gallery3d/photoeditor/filters/StraightenFilter.java
rc/com/android/gallery3d/photoeditor/filters/TintFilter.java
rc/com/android/gallery3d/photoeditor/filters/VignetteFilter.java
|
b5e7b26b317e832eb6ebc7d2cd908f7874c41e87 |
08-Nov-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
2bf7a6c13f25488c7cea898b3935731666d6d4d0 |
08-Nov-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
db61977d9959124da1fbe4da6a6d1a49eb734d23 |
08-Nov-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
df54f5b715076391fd595a0d6d29fcfb27eb6489 |
08-Nov-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-mr1-release history after reset to ics-mr1
|
40678ee2ff7e43f2e6bb51dbdb0f5008b2548cb9 |
08-Nov-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-mr1-release history after reset to ics-mr1
|
5063e036b342f6724489d91a34adad462d77c8b8 |
08-Nov-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-mr1-release history after reset to ics-mr1
|
115e2288fa94ce774c1d0bfcd671a8ce5f14f0ab |
08-Nov-2011 |
Yuli Huang <yuli@google.com> |
am 13105e73: Merge "Add face tanning effect to gallery" into ics-mr1 * commit '13105e73298f7ed0031232d48a7cf43ac4c0d21f': Add face tanning effect to gallery
|
8fbd145dc53c5d8bb84833ab2e841b7ac7b7cb00 |
08-Nov-2011 |
Yuli Huang <yuli@google.com> |
am 13105e73: Merge "Add face tanning effect to gallery" into ics-mr1 * commit '13105e73298f7ed0031232d48a7cf43ac4c0d21f': Add face tanning effect to gallery
|
352e65ffbb9391c0ffa9ce9d9a3eb2068b682291 |
08-Nov-2011 |
Yuli Huang <yuli@google.com> |
am 13105e73: Merge "Add face tanning effect to gallery" into ics-mr1 * commit '13105e73298f7ed0031232d48a7cf43ac4c0d21f': Add face tanning effect to gallery
|
95f64c1b98a3c223ff4b4fe14129de675a306450 |
08-Nov-2011 |
Yuli Huang <yuli@google.com> |
Merge "Add face tanning effect to gallery" into ics-mr1
|
b820346074c813500f2ea5b5ae1488fae2b29103 |
08-Nov-2011 |
Yuli Huang <yuli@google.com> |
Merge "Add face tanning effect to gallery" into ics-mr1
|
13105e73298f7ed0031232d48a7cf43ac4c0d21f |
08-Nov-2011 |
Yuli Huang <yuli@google.com> |
Merge "Add face tanning effect to gallery" into ics-mr1
|
e8f0d69d4bbef2bab1d853e0b473deb6a37e4528 |
07-Nov-2011 |
Eric Fischer <enf@google.com> |
am 3eeb824f: am 826c44f2: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr1 * commit '3eeb824faa141fa2fed26faf88ba0e446595c682': Import revised translations. DO NOT MERGE
|
43e4cc3c62e2aae44952bc236d9ae723526ec081 |
07-Nov-2011 |
Eric Fischer <enf@google.com> |
am 826c44f2: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr1 * commit '826c44f23e8f3a5b9b5ed0227816f0a6441b5ed8': Import revised translations. DO NOT MERGE
|
3eeb824faa141fa2fed26faf88ba0e446595c682 |
07-Nov-2011 |
Eric Fischer <enf@google.com> |
am 826c44f2: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr1 * commit '826c44f23e8f3a5b9b5ed0227816f0a6441b5ed8': Import revised translations. DO NOT MERGE
|
d4b4ace9149ee2c7adb9537eea4ce006638e639e |
07-Nov-2011 |
Eric Fischer <enf@google.com> |
am 826c44f2: Merge "Import revised translations. DO NOT MERGE" into ics-mr1 * commit '826c44f23e8f3a5b9b5ed0227816f0a6441b5ed8': Import revised translations. DO NOT MERGE
|
2519e97a159bfd7bfc6db3d62fb6a2ecdbfe7bdd |
07-Nov-2011 |
Eric Fischer <enf@google.com> |
am 826c44f2: Merge "Import revised translations. DO NOT MERGE" into ics-mr1 * commit '826c44f23e8f3a5b9b5ed0227816f0a6441b5ed8': Import revised translations. DO NOT MERGE
|
826c44f23e8f3a5b9b5ed0227816f0a6441b5ed8 |
07-Nov-2011 |
Eric Fischer <enf@google.com> |
Merge "Import revised translations. DO NOT MERGE" into ics-mr1
|
1c157ca11efba4ed18d70dc7676de5571eb9865a |
07-Nov-2011 |
Eric Fischer <enf@google.com> |
Merge "Import revised translations. DO NOT MERGE" into ics-mr1
|
f02f036d0bd4d1e75683c6f7a61d6a3fa82bd664 |
07-Nov-2011 |
Eric Fischer <enf@google.com> |
Import revised translations. DO NOT MERGE Change-Id: I60c0c0e36909fdad936f20880904a18ccddb503c
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
9eaab9fd013dd937f7775954a99613f5343c3faa |
07-Nov-2011 |
Eric Fischer <enf@google.com> |
Import revised translations. DO NOT MERGE Change-Id: I60c0c0e36909fdad936f20880904a18ccddb503c
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
cda0d3217d853c8a87dc3a65a546f648d5348afc |
07-Nov-2011 |
Wei Huang <weih@google.com> |
am b7bacbd5: am e9560e6c: Merge "Change OK to CROP fro CropImage." into ics-mr1 * commit 'b7bacbd5a7f487bd232c69bb1eebdb4a038c930d': Change OK to CROP fro CropImage.
|
f9a11bafc760653b25c2f42e57b69ac976b22cec |
07-Nov-2011 |
Wei Huang <weih@google.com> |
am e9560e6c: Merge "Change OK to CROP fro CropImage." into ics-mr1 * commit 'e9560e6c7bc55718c46264ac03eb7b44bfc857f2': Change OK to CROP fro CropImage.
|
b7bacbd5a7f487bd232c69bb1eebdb4a038c930d |
07-Nov-2011 |
Wei Huang <weih@google.com> |
am e9560e6c: Merge "Change OK to CROP fro CropImage." into ics-mr1 * commit 'e9560e6c7bc55718c46264ac03eb7b44bfc857f2': Change OK to CROP fro CropImage.
|
d308e33573e42b2e901c0ed43ef236c524a93f4a |
07-Nov-2011 |
Wei Huang <weih@google.com> |
am e9560e6c: Merge "Change OK to CROP fro CropImage." into ics-mr1 * commit 'e9560e6c7bc55718c46264ac03eb7b44bfc857f2': Change OK to CROP fro CropImage.
|
0f98cf582c1ce1ddfa23132241470181138ed5f9 |
07-Nov-2011 |
Wei Huang <weih@google.com> |
am e9560e6c: Merge "Change OK to CROP fro CropImage." into ics-mr1 * commit 'e9560e6c7bc55718c46264ac03eb7b44bfc857f2': Change OK to CROP fro CropImage.
|
e9560e6c7bc55718c46264ac03eb7b44bfc857f2 |
07-Nov-2011 |
Wei Huang <weih@google.com> |
Merge "Change OK to CROP fro CropImage." into ics-mr1
|
a8c361e2e293b42cf46755110bd26690b0ccad85 |
07-Nov-2011 |
Chih-Chung Chang <chihchung@google.com> |
am ebcdca0c: am d6985f9b: Fix 5457600: In UriImage, read exif to determine orientation. * commit 'ebcdca0c0d2a98705600f5bcc736d64e96a906e7': Fix 5457600: In UriImage, read exif to determine orientation.
|
9fc9468421510d7b170f230aa66a12b3f60f7287 |
07-Nov-2011 |
Chih-Chung Chang <chihchung@google.com> |
am d6985f9b: Fix 5457600: In UriImage, read exif to determine orientation. * commit 'd6985f9ba58c11c29760f28be07ebd229a9b7a39': Fix 5457600: In UriImage, read exif to determine orientation.
|
ebcdca0c0d2a98705600f5bcc736d64e96a906e7 |
07-Nov-2011 |
Chih-Chung Chang <chihchung@google.com> |
am d6985f9b: Fix 5457600: In UriImage, read exif to determine orientation. * commit 'd6985f9ba58c11c29760f28be07ebd229a9b7a39': Fix 5457600: In UriImage, read exif to determine orientation.
|
d9754e7e9b85dc0d5f0125a5457bf0d1bc55a62a |
07-Nov-2011 |
Chih-Chung Chang <chihchung@google.com> |
am d6985f9b: Fix 5457600: In UriImage, read exif to determine orientation. * commit 'd6985f9ba58c11c29760f28be07ebd229a9b7a39': Fix 5457600: In UriImage, read exif to determine orientation.
|
dcc4a8416bb5f58f9e21719293c42c6a2e8b06a0 |
07-Nov-2011 |
Chih-Chung Chang <chihchung@google.com> |
am d6985f9b: Fix 5457600: In UriImage, read exif to determine orientation. * commit 'd6985f9ba58c11c29760f28be07ebd229a9b7a39': Fix 5457600: In UriImage, read exif to determine orientation.
|
b24b631cf68387385e99682f98cad87ba14b80f3 |
07-Nov-2011 |
The Android Open Source Project <initial-contribution@android.com> |
am a6d87487: Reconcile with ics-mr1-release * commit 'a6d8748786f2662e93ecc6be7e016613052f85cf':
|
ae01e420be9101524b81c30de274a0a69093864d |
07-Nov-2011 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with ics-mr1-release Change-Id: I0eb3a8338e095504809785f4f9ff15c0e8fc7329
|
f27eb235ab98c8e300bee7a4c46507132ef97b80 |
07-Nov-2011 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with ics-mr1-release Change-Id: I0eb3a8338e095504809785f4f9ff15c0e8fc7329
|
a6d8748786f2662e93ecc6be7e016613052f85cf |
07-Nov-2011 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with ics-mr1-release Change-Id: I0eb3a8338e095504809785f4f9ff15c0e8fc7329
|
f34d5f0a969f7ec9f3351e7ce66a33754ea56bee |
07-Nov-2011 |
Owen Lin <owenlin@google.com> |
Change OK to CROP fro CropImage. fix: 5199444 Change-Id: I8ee74ba371c5537d7b86d771a202e0ac40668dfc
es/values/strings.xml
|
5a416fccf99526ee565d23bc504741292b9a6201 |
07-Nov-2011 |
Owen Lin <owenlin@google.com> |
Change OK to CROP fro CropImage. fix: 5199444 Change-Id: I8ee74ba371c5537d7b86d771a202e0ac40668dfc
es/values/strings.xml
|
0642afbbc1489eaf864049f51b03b9500fd210f6 |
06-Nov-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
cf877fa425e09060ff314702399b8dcef4ce2264 |
06-Nov-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
6ddce45e8c3d24542a68fc14d64defd1b89313af |
06-Nov-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
664d829c8586baf69ec2cacc81d6644b0c1d071c |
06-Nov-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-mr1-release history after reset to ics-mr1
|
4f7d2987ddad9437dd08bc75f7d51b36a5451f5a |
06-Nov-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-mr1-release history after reset to ics-mr1
|
7a86e3453d6ad477cf82446f32e02980970df630 |
06-Nov-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-mr1-release history after reset to ics-mr1
|
89e853d8b714fcef0a864265bb4ddfdd50f07e43 |
24-Oct-2011 |
Chih-Chung Chang <chihchung@google.com> |
Fix 5457600: In UriImage, read exif to determine orientation. Change-Id: Iacc5c52747a4ed4dd8f6cab48ce784aff907525b
rc/com/android/gallery3d/data/Exif.java
rc/com/android/gallery3d/data/UriImage.java
rc/com/android/gallery3d/ui/AbstractDisplayItem.java
|
d6985f9ba58c11c29760f28be07ebd229a9b7a39 |
24-Oct-2011 |
Chih-Chung Chang <chihchung@google.com> |
Fix 5457600: In UriImage, read exif to determine orientation. Change-Id: Iacc5c52747a4ed4dd8f6cab48ce784aff907525b
rc/com/android/gallery3d/data/Exif.java
rc/com/android/gallery3d/data/UriImage.java
rc/com/android/gallery3d/ui/AbstractDisplayItem.java
|
6618fde7e130855f074113ca6d6348d6a65e9ea3 |
14-Oct-2011 |
Ruei-sung Lin <rslin@google.com> |
Add face tanning effect to gallery bug: 5453164 Change-Id: I259e80325854b9e4a2d2c93db74b306b8e15535c
es/drawable/photoeditor_effect_facetan.png
es/layout/photoeditor_effects_fix.xml
|
4543d36c587153400b27c96a1a5fdfaab67bd3e2 |
14-Oct-2011 |
Ruei-sung Lin <rslin@google.com> |
Add face tanning effect to gallery bug: 5453164 Change-Id: I259e80325854b9e4a2d2c93db74b306b8e15535c
rc/com/android/gallery3d/photoeditor/actions/FaceTanAction.java
rc/com/android/gallery3d/photoeditor/filters/FaceTanFilter.java
|
08e2b473e93199241e432fc28cc8b8af242019cb |
14-Oct-2011 |
Ruei-sung Lin <rslin@google.com> |
Add face tanning effect to gallery bug: 5453164 Change-Id: I259e80325854b9e4a2d2c93db74b306b8e15535c
es/drawable/photoeditor_effect_facetan.png
es/layout/photoeditor_effects_fix.xml
rc/com/android/gallery3d/photoeditor/actions/FaceTanAction.java
rc/com/android/gallery3d/photoeditor/filters/FaceTanFilter.java
|
1c89606885931310358d18b31f614255c927a1a5 |
04-Nov-2011 |
The Android Open Source Project <initial-contribution@android.com> |
am 7f7cbdfc: Reconcile with ics-mr1-release * commit '7f7cbdfc2654121a3be8605f2d5dcf3011a025a5': Fix 5556160 Crash in gallery after playing slideshow Crespo IML33B.
|
943c0677489c5772927fbb31c811bafc121d1504 |
04-Nov-2011 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with ics-mr1-release Change-Id: Ic37b4c137bcb0afe35a796aa8538ba50a8a7fb19
|
5c98e994432a5f721e26646b4dc7a0372c59dd6b |
04-Nov-2011 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with ics-mr1-release Change-Id: Ic37b4c137bcb0afe35a796aa8538ba50a8a7fb19
|
7f7cbdfc2654121a3be8605f2d5dcf3011a025a5 |
04-Nov-2011 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with ics-mr1-release Change-Id: Ic37b4c137bcb0afe35a796aa8538ba50a8a7fb19
|
ed47faab170424a874de90dfd0f21969be96b974 |
03-Nov-2011 |
Ray Chen <raychen@google.com> |
Fix 5556160 Crash in gallery after playing slideshow Crespo IML33B. Change-Id: Ia3de43eae5d96c9f1674dd1ccb01dc004612bda9
rc/com/android/gallery3d/app/SlideshowPage.java
|
c0c433d0f87b3f05a9dd83d1afe1207503ed8685 |
03-Nov-2011 |
Ray Chen <raychen@google.com> |
Fix 5556160 Crash in gallery after playing slideshow Crespo IML33B. Change-Id: Ia3de43eae5d96c9f1674dd1ccb01dc004612bda9
rc/com/android/gallery3d/app/SlideshowPage.java
|
18cb07a7927d95b93cc34778ecd1cda3357a3350 |
03-Nov-2011 |
Wei Huang <weih@google.com> |
am 07b88daa: am 529f5341: Merge "Fix 5556160 Crash in gallery after playing slideshow Crespo IML33B." into ics-mr1 * commit '07b88daac3a120fdbbf893b3da4a0a27ebf00aaa': Fix 5556160 Crash in gallery after playing slideshow Crespo IML33B.
|
61b9880c8bd9fb4063d65e8543a94217f43f1a3e |
03-Nov-2011 |
Wei Huang <weih@google.com> |
am 529f5341: Merge "Fix 5556160 Crash in gallery after playing slideshow Crespo IML33B." into ics-mr1 * commit '529f53415f34835a32105a73a23f7aa94c5a7e16': Fix 5556160 Crash in gallery after playing slideshow Crespo IML33B.
|
07b88daac3a120fdbbf893b3da4a0a27ebf00aaa |
03-Nov-2011 |
Wei Huang <weih@google.com> |
am 529f5341: Merge "Fix 5556160 Crash in gallery after playing slideshow Crespo IML33B." into ics-mr1 * commit '529f53415f34835a32105a73a23f7aa94c5a7e16': Fix 5556160 Crash in gallery after playing slideshow Crespo IML33B.
|
abc3bfafa237b33f41e0aa26b95b6feac8c83c50 |
03-Nov-2011 |
Wei Huang <weih@google.com> |
am 529f5341: Merge "Fix 5556160 Crash in gallery after playing slideshow Crespo IML33B." into ics-mr1 * commit '529f53415f34835a32105a73a23f7aa94c5a7e16': Fix 5556160 Crash in gallery after playing slideshow Crespo IML33B.
|
9216b71fe4c881e60f219704c4d863a3fc372c02 |
03-Nov-2011 |
Wei Huang <weih@google.com> |
am 529f5341: Merge "Fix 5556160 Crash in gallery after playing slideshow Crespo IML33B." into ics-mr1 * commit '529f53415f34835a32105a73a23f7aa94c5a7e16': Fix 5556160 Crash in gallery after playing slideshow Crespo IML33B.
|
529f53415f34835a32105a73a23f7aa94c5a7e16 |
03-Nov-2011 |
Wei Huang <weih@google.com> |
Merge "Fix 5556160 Crash in gallery after playing slideshow Crespo IML33B." into ics-mr1
|
a93cf07b2cc645122b5699374e5a0bc85080059e |
03-Nov-2011 |
Wei Huang <weih@google.com> |
Merge "Fix 5556160 Crash in gallery after playing slideshow Crespo IML33B." into ics-mr1
|
c0ae6dfc978f55e61c952d0ffcb3592ba437a449 |
03-Nov-2011 |
Chih-Chung Chang <chihchung@google.com> |
am 9c6cc324: am cc2f8c4e: Merge "Fix 5543077: Gallery UI tweaks." into ics-mr1 * commit '9c6cc3247c5d22d70c716ac5627f0d53222779fa': Fix 5543077: Gallery UI tweaks.
|
955cd53470f7c9b2a538e0df4888abe8d9637163 |
03-Nov-2011 |
Chih-Chung Chang <chihchung@google.com> |
am cc2f8c4e: Merge "Fix 5543077: Gallery UI tweaks." into ics-mr1 * commit 'cc2f8c4e24a9cd8fcf99e960f0148a57128b6133': Fix 5543077: Gallery UI tweaks.
|
664a3f521fe8bdcbf5a81fcb41b823e1a58e6ae3 |
03-Nov-2011 |
Chih-Chung Chang <chihchung@google.com> |
am cc2f8c4e: Merge "Fix 5543077: Gallery UI tweaks." into ics-mr1 * commit 'cc2f8c4e24a9cd8fcf99e960f0148a57128b6133': Fix 5543077: Gallery UI tweaks.
|
9c6cc3247c5d22d70c716ac5627f0d53222779fa |
03-Nov-2011 |
Chih-Chung Chang <chihchung@google.com> |
am cc2f8c4e: Merge "Fix 5543077: Gallery UI tweaks." into ics-mr1 * commit 'cc2f8c4e24a9cd8fcf99e960f0148a57128b6133': Fix 5543077: Gallery UI tweaks.
|
823ad4f32ce2790463eea0c6d59a986e0418d463 |
03-Nov-2011 |
Chih-Chung Chang <chihchung@google.com> |
am cc2f8c4e: Merge "Fix 5543077: Gallery UI tweaks." into ics-mr1 * commit 'cc2f8c4e24a9cd8fcf99e960f0148a57128b6133': Fix 5543077: Gallery UI tweaks.
|
35a1381265708b293a44aefd4e6aa3af1a9a01e3 |
03-Nov-2011 |
Chih-Chung Chang <chihchung@google.com> |
am cc2f8c4e: Merge "Fix 5543077: Gallery UI tweaks." into ics-mr1 * commit 'cc2f8c4e24a9cd8fcf99e960f0148a57128b6133': Fix 5543077: Gallery UI tweaks.
|
607aeb0fece18ccd9c14eefe7c510658ba3b6945 |
03-Nov-2011 |
Chih-Chung Chang <chihchung@google.com> |
am cc2f8c4e: Merge "Fix 5543077: Gallery UI tweaks." into ics-mr1 * commit 'cc2f8c4e24a9cd8fcf99e960f0148a57128b6133': Fix 5543077: Gallery UI tweaks.
|
833b3475c3e9cd243efd0e5d4516cd3d5430b010 |
03-Nov-2011 |
Chih-Chung Chang <chihchung@google.com> |
Merge "Fix 5543077: Gallery UI tweaks." into ics-mr1
|
cc2f8c4e24a9cd8fcf99e960f0148a57128b6133 |
03-Nov-2011 |
Chih-Chung Chang <chihchung@google.com> |
Merge "Fix 5543077: Gallery UI tweaks." into ics-mr1
|
456d213a9f66b183bd5a0be362349350aabd12a4 |
03-Nov-2011 |
Chih-Chung Chang <chihchung@google.com> |
Merge "Fix 5543077: Gallery UI tweaks." into ics-mr1
|
cdc0fb4f2dfd13395d32787526e2fa571f572c55 |
03-Nov-2011 |
Chih-Chung Chang <chihchung@google.com> |
am acfc53ba: am 1a9b69fb: Merge "3252698: Make drawing target 60fps." into ics-mr1 * commit 'acfc53ba3422e1c78e3c78c47b3fe94681126037': 3252698: Make drawing target 60fps.
|
b7c95db2eabb6377e65b4dfc83fcd123e2024cfe |
03-Nov-2011 |
Chih-Chung Chang <chihchung@google.com> |
am 1a9b69fb: Merge "3252698: Make drawing target 60fps." into ics-mr1 * commit '1a9b69fbc17263e00aa138dde0c52b37fab6766b': 3252698: Make drawing target 60fps.
|
acfc53ba3422e1c78e3c78c47b3fe94681126037 |
03-Nov-2011 |
Chih-Chung Chang <chihchung@google.com> |
am 1a9b69fb: Merge "3252698: Make drawing target 60fps." into ics-mr1 * commit '1a9b69fbc17263e00aa138dde0c52b37fab6766b': 3252698: Make drawing target 60fps.
|
2b26543958d81c66ccd9101624a78b26d0043510 |
03-Nov-2011 |
Chih-Chung Chang <chihchung@google.com> |
am 1a9b69fb: Merge "3252698: Make drawing target 60fps." into ics-mr1 * commit '1a9b69fbc17263e00aa138dde0c52b37fab6766b': 3252698: Make drawing target 60fps.
|
d5f38bbca78497644781901128f57b290ab66f95 |
03-Nov-2011 |
Chih-Chung Chang <chihchung@google.com> |
am 1a9b69fb: Merge "3252698: Make drawing target 60fps." into ics-mr1 * commit '1a9b69fbc17263e00aa138dde0c52b37fab6766b': 3252698: Make drawing target 60fps.
|
1a9b69fbc17263e00aa138dde0c52b37fab6766b |
03-Nov-2011 |
Chih-Chung Chang <chihchung@google.com> |
Merge "3252698: Make drawing target 60fps." into ics-mr1
|
bcb316c3ff9b8be8f8cfeeacf2b6022f78de6c48 |
03-Nov-2011 |
Chih-Chung Chang <chihchung@google.com> |
Merge "3252698: Make drawing target 60fps." into ics-mr1
|
643546510d1bca9606659d4bb7ee94654f47707c |
03-Nov-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
1cfc689858f39ce48c115c1b1d3d0f00818d6842 |
03-Nov-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
94616fbddca71c5b2e6cc2658d23c734b0d322f0 |
03-Nov-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
905052af6fd0d1c79d2b986765e59a54c58a4e04 |
03-Nov-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-mr1-release history after reset to ics-mr1
|
3084b268069885599e47fbc16c2919237c73a962 |
03-Nov-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-mr1-release history after reset to ics-mr1
|
3355bcef7d75570bce98db12d97c87eeb517f658 |
03-Nov-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-mr1-release history after reset to ics-mr1
|
cf59134e8b15eae846c86b01c89409eb20722bbe |
03-Nov-2011 |
Chih-Chung Chang <chihchung@google.com> |
Fix 5543077: Gallery UI tweaks. Change-Id: I0b85b37ba851628acd0853e4de0985b494606487
es/layout/action_bar_text.xml
es/layout/manage_offline_bar.xml
es/values/dimensions.xml
|
47c476d3102e15ec4c8307d424adf6c54982d5f3 |
03-Nov-2011 |
Chih-Chung Chang <chihchung@google.com> |
Fix 5543077: Gallery UI tweaks. Change-Id: I0b85b37ba851628acd0853e4de0985b494606487
es/layout/action_bar_text.xml
es/layout/manage_offline_bar.xml
es/values/dimensions.xml
rc/com/android/gallery3d/ui/ManageCacheDrawer.java
|
344617d81ac1c1b113be871e37a7294ee3d9d0a7 |
03-Nov-2011 |
Chih-Chung Chang <chihchung@google.com> |
Fix 5543077: Gallery UI tweaks. Change-Id: I0b85b37ba851628acd0853e4de0985b494606487
rc/com/android/gallery3d/ui/ManageCacheDrawer.java
|
27112b4f1ad0ef18646fc80104ee98c75b432f4c |
03-Nov-2011 |
Ray Chen <raychen@google.com> |
am cb0b8f97: am da9f0c77: Merge "Fix 5420843 [UI] Text strings for selecting images/album for Gallery widget are confusing" into ics-mr1 * commit 'cb0b8f974fb97582b0b37458ec599226b5fb8f92': Fix 5420843 [UI] Text strings for selecting images/album for Gallery widget are confusing
|
45b092044cb15e0e6d9f6ebf98e693a6b4f03a82 |
03-Nov-2011 |
Ray Chen <raychen@google.com> |
am e2f9aaf5: am eda8303b: Merge "Fix 5511057 Action bar UI is broken when sorting within an album" into ics-mr1 * commit 'e2f9aaf5fa564decd9ad9a1e95ac48c6d9e5d447': Fix 5511057 Action bar UI is broken when sorting within an album
|
5cf17d15bce57182559d86b2348fcda212cb137b |
03-Nov-2011 |
Ray Chen <raychen@google.com> |
am da9f0c77: Merge "Fix 5420843 [UI] Text strings for selecting images/album for Gallery widget are confusing" into ics-mr1 * commit 'da9f0c773aa6c9ba228f30811df35d2c601dfdb6': Fix 5420843 [UI] Text strings for selecting images/album for Gallery widget are confusing
|
a935dd8c5d9e7a5874d01f117ea8e1518eb16b59 |
03-Nov-2011 |
Ray Chen <raychen@google.com> |
am eda8303b: Merge "Fix 5511057 Action bar UI is broken when sorting within an album" into ics-mr1 * commit 'eda8303bebf12f60edf15a2abbc08b99a7c35eef': Fix 5511057 Action bar UI is broken when sorting within an album
|
cb0b8f974fb97582b0b37458ec599226b5fb8f92 |
03-Nov-2011 |
Ray Chen <raychen@google.com> |
am da9f0c77: Merge "Fix 5420843 [UI] Text strings for selecting images/album for Gallery widget are confusing" into ics-mr1 * commit 'da9f0c773aa6c9ba228f30811df35d2c601dfdb6': Fix 5420843 [UI] Text strings for selecting images/album for Gallery widget are confusing
|
e2f9aaf5fa564decd9ad9a1e95ac48c6d9e5d447 |
03-Nov-2011 |
Ray Chen <raychen@google.com> |
am eda8303b: Merge "Fix 5511057 Action bar UI is broken when sorting within an album" into ics-mr1 * commit 'eda8303bebf12f60edf15a2abbc08b99a7c35eef': Fix 5511057 Action bar UI is broken when sorting within an album
|
c5a4fe8ac1ea6918bcd4437c9482559afd216e43 |
03-Nov-2011 |
Ray Chen <raychen@google.com> |
am da9f0c77: Merge "Fix 5420843 [UI] Text strings for selecting images/album for Gallery widget are confusing" into ics-mr1 * commit 'da9f0c773aa6c9ba228f30811df35d2c601dfdb6': Fix 5420843 [UI] Text strings for selecting images/album for Gallery widget are confusing
|
54e862a48ee425156f0dcbac5231c2a3e969ed7b |
03-Nov-2011 |
Ray Chen <raychen@google.com> |
am da9f0c77: Merge "Fix 5420843 [UI] Text strings for selecting images/album for Gallery widget are confusing" into ics-mr1 * commit 'da9f0c773aa6c9ba228f30811df35d2c601dfdb6': Fix 5420843 [UI] Text strings for selecting images/album for Gallery widget are confusing
|
92e850497f480e5d4147eb6b3b4c1b96e3e59529 |
03-Nov-2011 |
Ray Chen <raychen@google.com> |
am eda8303b: Merge "Fix 5511057 Action bar UI is broken when sorting within an album" into ics-mr1 * commit 'eda8303bebf12f60edf15a2abbc08b99a7c35eef': Fix 5511057 Action bar UI is broken when sorting within an album
|
36becf9da199cb518b54f1ebf132efcafc1a2aa9 |
03-Nov-2011 |
Ray Chen <raychen@google.com> |
am eda8303b: Merge "Fix 5511057 Action bar UI is broken when sorting within an album" into ics-mr1 * commit 'eda8303bebf12f60edf15a2abbc08b99a7c35eef': Fix 5511057 Action bar UI is broken when sorting within an album
|
6ebba648578e6128659b7415ae621641869f045b |
03-Nov-2011 |
Ray Chen <raychen@google.com> |
Merge "Fix 5420843 [UI] Text strings for selecting images/album for Gallery widget are confusing" into ics-mr1
|
da9f0c773aa6c9ba228f30811df35d2c601dfdb6 |
03-Nov-2011 |
Ray Chen <raychen@google.com> |
Merge "Fix 5420843 [UI] Text strings for selecting images/album for Gallery widget are confusing" into ics-mr1
|
6a023b3d85faeaba3b0ce4647b6bdbfa275b9cf8 |
03-Nov-2011 |
Ray Chen <raychen@google.com> |
Merge "Fix 5511057 Action bar UI is broken when sorting within an album" into ics-mr1
|
eda8303bebf12f60edf15a2abbc08b99a7c35eef |
03-Nov-2011 |
Ray Chen <raychen@google.com> |
Merge "Fix 5511057 Action bar UI is broken when sorting within an album" into ics-mr1
|
506200619672fa8221b98d50efbe77c777fae3e9 |
03-Nov-2011 |
Ray Chen <raychen@google.com> |
Fix 5556160 Crash in gallery after playing slideshow Crespo IML33B. Change-Id: Ia3de43eae5d96c9f1674dd1ccb01dc004612bda9
rc/com/android/gallery3d/app/SlideshowPage.java
|
c095cf0178a6bc8efec2a56c57b11f9b01173454 |
03-Nov-2011 |
Ray Chen <raychen@google.com> |
Fix 5556160 Crash in gallery after playing slideshow Crespo IML33B. Change-Id: Ia3de43eae5d96c9f1674dd1ccb01dc004612bda9
rc/com/android/gallery3d/app/SlideshowPage.java
|
6849ca0eb9c29c7e57c77bfede6363cbdfbea892 |
02-Nov-2011 |
Chih-Chung Chang <chihchung@google.com> |
3252698: Make drawing target 60fps. Change-Id: I5dbff93713422e49378b8e215cac8b7f749ef38a
rc/com/android/gallery3d/ui/GLRootView.java
|
eb638b3acc8f956d6ee2c50f6e7f67837dc0cbc8 |
02-Nov-2011 |
Chih-Chung Chang <chihchung@google.com> |
3252698: Make drawing target 60fps. Change-Id: I5dbff93713422e49378b8e215cac8b7f749ef38a
rc/com/android/gallery3d/ui/GLRootView.java
|
1c6012533f60194f8688afe77cdcc12215ec4d64 |
03-Nov-2011 |
Owen Lin <owenlin@google.com> |
am 5673af6e: am a98d3c4d: Merge "Add cover image to MediaSet." into ics-mr1 * commit '5673af6e9f89a910ad7a0f562c2ded098203c1cf': Add cover image to MediaSet.
|
705c427a8b059f7e3937d46801be63fe266fff12 |
03-Nov-2011 |
Owen Lin <owenlin@google.com> |
am a98d3c4d: Merge "Add cover image to MediaSet." into ics-mr1 * commit 'a98d3c4dbed84296496f5f710bd1289d735581d5': Add cover image to MediaSet.
|
5673af6e9f89a910ad7a0f562c2ded098203c1cf |
03-Nov-2011 |
Owen Lin <owenlin@google.com> |
am a98d3c4d: Merge "Add cover image to MediaSet." into ics-mr1 * commit 'a98d3c4dbed84296496f5f710bd1289d735581d5': Add cover image to MediaSet.
|
39239707c5dae2b89a28aa9a5996ae97980d515a |
03-Nov-2011 |
Owen Lin <owenlin@google.com> |
am a98d3c4d: Merge "Add cover image to MediaSet." into ics-mr1 * commit 'a98d3c4dbed84296496f5f710bd1289d735581d5': Add cover image to MediaSet.
|
35ea4d7a25779af1f2236bf822e85914d15ef36e |
03-Nov-2011 |
Owen Lin <owenlin@google.com> |
am a98d3c4d: Merge "Add cover image to MediaSet." into ics-mr1 * commit 'a98d3c4dbed84296496f5f710bd1289d735581d5': Add cover image to MediaSet.
|
a98d3c4dbed84296496f5f710bd1289d735581d5 |
03-Nov-2011 |
Owen Lin <owenlin@google.com> |
Merge "Add cover image to MediaSet." into ics-mr1
|
6e1e2cdb8c1a29dceb3596459747db110e8832db |
03-Nov-2011 |
Owen Lin <owenlin@google.com> |
Merge "Add cover image to MediaSet." into ics-mr1
|
03f289e94950d55d4e675fcb1b253641c70601c5 |
03-Nov-2011 |
Eric Fischer <enf@google.com> |
am aee7fdda: am e617b945: (-s ours) am 82635d92: (-s ours) Import revised translations. DO NOT MERGE * commit 'aee7fddaebbcdede0d5bf1d584bcf51fcc01efa1': Import revised translations. DO NOT MERGE
|
006eed29d81b5c7807e190b0b6dbae9a3a11cbcd |
03-Nov-2011 |
Eric Fischer <enf@google.com> |
am e617b945: (-s ours) am 82635d92: (-s ours) Import revised translations. DO NOT MERGE * commit 'e617b945b25f0034ff3136457b32bfe39b6d3e08': Import revised translations. DO NOT MERGE
|
aee7fddaebbcdede0d5bf1d584bcf51fcc01efa1 |
03-Nov-2011 |
Eric Fischer <enf@google.com> |
am e617b945: (-s ours) am 82635d92: (-s ours) Import revised translations. DO NOT MERGE * commit 'e617b945b25f0034ff3136457b32bfe39b6d3e08': Import revised translations. DO NOT MERGE
|
7d3d89a95aeb7fb4faa0f20abb8add8b0b010e16 |
03-Nov-2011 |
Eric Fischer <enf@google.com> |
am e617b945: am 82635d92: (-s ours) Import revised translations. DO NOT MERGE * commit 'e617b945b25f0034ff3136457b32bfe39b6d3e08': Import revised translations. DO NOT MERGE
|
d300cd3032660784d9b570c720b68a71ee71acd0 |
03-Nov-2011 |
Eric Fischer <enf@google.com> |
am e617b945: am 82635d92: (-s ours) Import revised translations. DO NOT MERGE * commit 'e617b945b25f0034ff3136457b32bfe39b6d3e08': Import revised translations. DO NOT MERGE
|
1c958dd2cd421a34ee30779103ddc578739001d9 |
03-Nov-2011 |
Eric Fischer <enf@google.com> |
am 82635d92: (-s ours) Import revised translations. DO NOT MERGE * commit '82635d92bc0f2186da650a00fa458d1c542e2ec9': Import revised translations. DO NOT MERGE
|
e617b945b25f0034ff3136457b32bfe39b6d3e08 |
03-Nov-2011 |
Eric Fischer <enf@google.com> |
am 82635d92: (-s ours) Import revised translations. DO NOT MERGE * commit '82635d92bc0f2186da650a00fa458d1c542e2ec9': Import revised translations. DO NOT MERGE
|
346a00892e71b1ade7e7c5581349a15162aec6c9 |
02-Nov-2011 |
Eric Fischer <enf@google.com> |
Import revised translations. DO NOT MERGE Change-Id: I6d64dfa6b24c8fdf56138637208d7e66ae95b7b2
es/values-uk/strings.xml
|
82635d92bc0f2186da650a00fa458d1c542e2ec9 |
02-Nov-2011 |
Eric Fischer <enf@google.com> |
Import revised translations. DO NOT MERGE Change-Id: I6d64dfa6b24c8fdf56138637208d7e66ae95b7b2
es/values-uk/strings.xml
|
0c2ba2eb1ca8ca5759a410fc5acdc4f8b9784496 |
02-Nov-2011 |
Eric Fischer <enf@google.com> |
am b72d2ab3: Merge "Import revised translations." * commit 'b72d2ab3c47b9093235e1f5f93ac6fddc104df9c': Import revised translations.
|
ddfa7f025d9c9550c6e8c1546736a06bdad37261 |
02-Nov-2011 |
Eric Fischer <enf@google.com> |
Merge "Import revised translations."
|
b72d2ab3c47b9093235e1f5f93ac6fddc104df9c |
02-Nov-2011 |
Eric Fischer <enf@google.com> |
Merge "Import revised translations."
|
4627b87a5f104f1077dfb2f22a5c5629d5b9e8e0 |
02-Nov-2011 |
Ray Chen <raychen@google.com> |
am a368e458: am c0c13c38: Merge "Fix 5471518 Playing slide show from any picture doesn\'t start from the current picture which is unexpected IRL17 Crespo" into ics-mr1 * commit 'a368e458166dd853c8df956e6b4f8b3f38d3183d': Fix 5471518 Playing slide show from any picture doesn't start from the current picture which is unexpected IRL17 Crespo
|
d645903c6bbe9ee778898a54c5a55a3bed2274a8 |
02-Nov-2011 |
Eric Fischer <enf@google.com> |
am 35adc6e2: (-s ours) am d1e3e976: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr1 * commit '35adc6e2b37ce47744a248f4cf4aa041e1400161': Import revised translations. DO NOT MERGE
|
25958570ba1a1e81f3ae86f451bd713069e75634 |
02-Nov-2011 |
Ray Chen <raychen@google.com> |
am c0c13c38: Merge "Fix 5471518 Playing slide show from any picture doesn\'t start from the current picture which is unexpected IRL17 Crespo" into ics-mr1 * commit 'c0c13c38c8e4e86689f4989ca268f71cbb46bff0': Fix 5471518 Playing slide show from any picture doesn't start from the current picture which is unexpected IRL17 Crespo
|
a368e458166dd853c8df956e6b4f8b3f38d3183d |
02-Nov-2011 |
Ray Chen <raychen@google.com> |
am c0c13c38: Merge "Fix 5471518 Playing slide show from any picture doesn\'t start from the current picture which is unexpected IRL17 Crespo" into ics-mr1 * commit 'c0c13c38c8e4e86689f4989ca268f71cbb46bff0': Fix 5471518 Playing slide show from any picture doesn't start from the current picture which is unexpected IRL17 Crespo
|
23f6cedb08619a1b33364ddf84da1987f666e44d |
02-Nov-2011 |
Eric Fischer <enf@google.com> |
am d1e3e976: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr1 * commit 'd1e3e97606b850022cced61bafb50a1989b76d15': Import revised translations. DO NOT MERGE
|
35adc6e2b37ce47744a248f4cf4aa041e1400161 |
02-Nov-2011 |
Eric Fischer <enf@google.com> |
am d1e3e976: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr1 * commit 'd1e3e97606b850022cced61bafb50a1989b76d15': Import revised translations. DO NOT MERGE
|
ed4f65b58d6214e6fe552c027a8a702196c20327 |
02-Nov-2011 |
Chih-Chung Chang <chihchung@google.com> |
am 6fb1ddf5: Merge "Fix 5533861: Correct the thumbnail area hit testing calculation." into ics-mr1 * commit '6fb1ddf56809a3eedfc36cb4c2ea56e0010bbaba': Fix 5533861: Correct the thumbnail area hit testing calculation.
|
264c19077bd71de041bdab98b196997b1b4b4093 |
02-Nov-2011 |
Chih-Chung Chang <chihchung@google.com> |
am 6fb1ddf5: Merge "Fix 5533861: Correct the thumbnail area hit testing calculation." into ics-mr1 * commit '6fb1ddf56809a3eedfc36cb4c2ea56e0010bbaba': Fix 5533861: Correct the thumbnail area hit testing calculation.
|
aa77a6195b0d5d00a01c96a3281ae876a86260b5 |
02-Nov-2011 |
Chih-Chung Chang <chihchung@google.com> |
am 4c89478b: Fix 5514384: add video/avi as a supported mime type. * commit '4c89478bfcea7a9b9f6ccc45594b472735e04f56': Fix 5514384: add video/avi as a supported mime type.
|
fc38f6c7c06945d30e1d7c446602f01332c0713f |
02-Nov-2011 |
Chih-Chung Chang <chihchung@google.com> |
am 4c89478b: Fix 5514384: add video/avi as a supported mime type. * commit '4c89478bfcea7a9b9f6ccc45594b472735e04f56': Fix 5514384: add video/avi as a supported mime type.
|
24997a2bae8ca799996c601e1182458d6a1fd0d8 |
02-Nov-2011 |
Eric Fischer <enf@google.com> |
Import revised translations. Change-Id: Iabba637909aec27731a7a991b3b8540da1c9b957
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/photoeditor_strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/photoeditor_strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
c955c5e0cefc8626ea439bcd8cf658259fe09818 |
02-Nov-2011 |
Eric Fischer <enf@google.com> |
Import revised translations. Change-Id: Iabba637909aec27731a7a991b3b8540da1c9b957
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/photoeditor_strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/photoeditor_strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
e0350f708c628059aebacf47ce99ef25a8e3fa64 |
02-Nov-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
e8c4b49cb87b94aecf23a5d971a783c28e90735f |
02-Nov-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
d119bb8a21ae89e0fc4e448bc77c81e753c9a9b9 |
02-Nov-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
fa3dc23e20108e246d7545ca8614f5a02a94ea72 |
02-Nov-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-mr1-release history after reset to ics-mr1
|
8a40981539141d9a4b896d7bb97e07b0aea70881 |
02-Nov-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-mr1-release history after reset to ics-mr1
|
477d297b95173b23b41eb704730b184ed9cace67 |
02-Nov-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-mr1-release history after reset to ics-mr1
|
372a66bca097cfa255bcedda1fbe15e9eddf8b29 |
02-Nov-2011 |
Ray Chen <raychen@google.com> |
am c0c13c38: Merge "Fix 5471518 Playing slide show from any picture doesn\'t start from the current picture which is unexpected IRL17 Crespo" into ics-mr1 * commit 'c0c13c38c8e4e86689f4989ca268f71cbb46bff0': Fix 5471518 Playing slide show from any picture doesn't start from the current picture which is unexpected IRL17 Crespo
|
3aee2a47f9c67af05de70980a78c8dd962cfe750 |
02-Nov-2011 |
Ray Chen <raychen@google.com> |
am c0c13c38: Merge "Fix 5471518 Playing slide show from any picture doesn\'t start from the current picture which is unexpected IRL17 Crespo" into ics-mr1 * commit 'c0c13c38c8e4e86689f4989ca268f71cbb46bff0': Fix 5471518 Playing slide show from any picture doesn't start from the current picture which is unexpected IRL17 Crespo
|
957ee6b245beedb1fa4af87771ebc756132f8fd8 |
02-Nov-2011 |
Ray Chen <raychen@google.com> |
Merge "Fix 5471518 Playing slide show from any picture doesn't start from the current picture which is unexpected IRL17 Crespo" into ics-mr1
|
c0c13c38c8e4e86689f4989ca268f71cbb46bff0 |
02-Nov-2011 |
Ray Chen <raychen@google.com> |
Merge "Fix 5471518 Playing slide show from any picture doesn't start from the current picture which is unexpected IRL17 Crespo" into ics-mr1
|
de8bb7f94b33d395bb3a5a5510ea998881e9cedc |
02-Nov-2011 |
Ray Chen <raychen@google.com> |
Merge "Fix 5453262 No pictures / Videos available in Gallery message not displayed"
|
9b68d53adfeb3a52c50375834e7f8b75b52eed8b |
02-Nov-2011 |
Ray Chen <raychen@google.com> |
Merge "Fix 5453262 No pictures / Videos available in Gallery message not displayed"
|
37405ef781156f08841d6d9351f0f7808e9c11da |
01-Nov-2011 |
Eric Fischer <enf@google.com> |
am d1e3e976: Merge "Import revised translations. DO NOT MERGE" into ics-mr1 * commit 'd1e3e97606b850022cced61bafb50a1989b76d15': Import revised translations. DO NOT MERGE
|
2777ac38076fbdb7a193a916cd1b102c8df31526 |
01-Nov-2011 |
Eric Fischer <enf@google.com> |
am d1e3e976: Merge "Import revised translations. DO NOT MERGE" into ics-mr1 * commit 'd1e3e97606b850022cced61bafb50a1989b76d15': Import revised translations. DO NOT MERGE
|
d1e3e97606b850022cced61bafb50a1989b76d15 |
01-Nov-2011 |
Eric Fischer <enf@google.com> |
Merge "Import revised translations. DO NOT MERGE" into ics-mr1
|
5d443be4a7333c17b9f48c552942b17dc86f7d54 |
01-Nov-2011 |
Eric Fischer <enf@google.com> |
Import revised translations. DO NOT MERGE Change-Id: Ib482395eb51431bb5c3f87f27c98f83f3281a88f
es/values-be/photoeditor_strings.xml
es/values-be/strings.xml
es/values-es/strings.xml
es/values-et/photoeditor_strings.xml
es/values-et/strings.xml
|
780ada9d55a9ed2502dbba9ffea507d82464e025 |
01-Nov-2011 |
Eric Fischer <enf@google.com> |
Import revised translations. DO NOT MERGE Change-Id: Ib482395eb51431bb5c3f87f27c98f83f3281a88f
es/values-be/photoeditor_strings.xml
es/values-be/strings.xml
es/values-es/strings.xml
es/values-et/photoeditor_strings.xml
es/values-et/strings.xml
|
d3c6a60bcff27afdb2c0dbc6f1670b1612908f13 |
01-Nov-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-mr1-release history after reset to ics-mr1
|
04a0db82e796c0dbba866ed4eb3908a7c2b593f2 |
01-Nov-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-mr1-release history after reset to ics-mr1
|
9ce0381a975f65ec7794a2d3436b0424d0030f39 |
27-Oct-2011 |
Owen Lin <owenlin@google.com> |
Add cover image to MediaSet. fix: 5519437 So that subclass can has its own definition on albums' cover. Change-Id: Idf2f89933291bedf02054b9488acffe4bd68b1b3
rc/com/android/gallery3d/app/AlbumSetDataAdapter.java
rc/com/android/gallery3d/data/MediaSet.java
|
735d01043e33127e9daba11f96d3325ece426d7c |
27-Oct-2011 |
Owen Lin <owenlin@google.com> |
Add cover image to MediaSet. fix: 5519437 So that subclass can has its own definition on albums' cover. Change-Id: Idf2f89933291bedf02054b9488acffe4bd68b1b3
rc/com/android/gallery3d/app/AlbumSetDataAdapter.java
rc/com/android/gallery3d/data/MediaSet.java
|
7c4eff6c33e540fe96159d2cebce5242759ff6c1 |
01-Nov-2011 |
Chih-Chung Chang <chihchung@google.com> |
am 6fb1ddf5: Merge "Fix 5533861: Correct the thumbnail area hit testing calculation." into ics-mr1 * commit '6fb1ddf56809a3eedfc36cb4c2ea56e0010bbaba': Fix 5533861: Correct the thumbnail area hit testing calculation.
|
0b830b14cdc2b4098e5664c8d38ef7fccb1c98bc |
01-Nov-2011 |
Chih-Chung Chang <chihchung@google.com> |
am 6fb1ddf5: Merge "Fix 5533861: Correct the thumbnail area hit testing calculation." into ics-mr1 * commit '6fb1ddf56809a3eedfc36cb4c2ea56e0010bbaba': Fix 5533861: Correct the thumbnail area hit testing calculation.
|
6fb1ddf56809a3eedfc36cb4c2ea56e0010bbaba |
01-Nov-2011 |
Chih-Chung Chang <chihchung@google.com> |
Merge "Fix 5533861: Correct the thumbnail area hit testing calculation." into ics-mr1
|
b1bfac81e2db44b2b33c16f854884749ca86c111 |
01-Nov-2011 |
Chih-Chung Chang <chihchung@google.com> |
am 4c89478b: Fix 5514384: add video/avi as a supported mime type. * commit '4c89478bfcea7a9b9f6ccc45594b472735e04f56': Fix 5514384: add video/avi as a supported mime type.
|
9711c5b183635732bd045c17b135e363f5122b01 |
01-Nov-2011 |
Chih-Chung Chang <chihchung@google.com> |
am 4c89478b: Fix 5514384: add video/avi as a supported mime type. * commit '4c89478bfcea7a9b9f6ccc45594b472735e04f56': Fix 5514384: add video/avi as a supported mime type.
|
d076de27aa76a701c033e7b3d835cbd210861e30 |
31-Oct-2011 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with ics-mr1-release Change-Id: Icedf366b2ea11de0f8b0f6107a549ccc2f97a58e
|
aa6044069bccc174181ce16da3a07055cc107ded |
31-Oct-2011 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with ics-mr1-release Change-Id: Icedf366b2ea11de0f8b0f6107a549ccc2f97a58e
|
bba647d0f6cca469145264f7e13e9586bdbd52c9 |
31-Oct-2011 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with ics-mr1-release Change-Id: Icedf366b2ea11de0f8b0f6107a549ccc2f97a58e
|
d72323ff28229ec53fee12b62c65a141eae7ebb4 |
31-Oct-2011 |
Ed Heyl <ed@google.com> |
Merge remote branch 'goog/ics-mr1' into ics-aah
|
c998b019648499f0bc702da2309e5d3ae8c5b50c |
31-Oct-2011 |
Ed Heyl <ed@google.com> |
Merge remote branch 'goog/ics-mr1' into ics-aah
|
80fe82c0481d36d6c4c09fa631fa7010a20a32f0 |
31-Oct-2011 |
Eric Fischer <enf@google.com> |
am 9c1fecf0: (-s ours) am 8e10103f: (-s ours) Import revised translations. DO NOT MERGE * commit '9c1fecf0a6e2325f72f56ba32bd0703314e0ef30': Import revised translations. DO NOT MERGE
|
718fec485880585087f89d50bbd25e546adba380 |
31-Oct-2011 |
Eric Fischer <enf@google.com> |
am 9c1fecf0: (-s ours) am 8e10103f: (-s ours) Import revised translations. DO NOT MERGE * commit '9c1fecf0a6e2325f72f56ba32bd0703314e0ef30': Import revised translations. DO NOT MERGE
|
809bff64030c4a3afb992a7f92089eda3a450803 |
31-Oct-2011 |
Chih-Chung Chang <chihchung@google.com> |
Fix 5533861: Correct the thumbnail area hit testing calculation. Change-Id: I3a9229497c955628cb49c42c0ee02c41eaadd705
rc/com/android/gallery3d/ui/SlotView.java
|
003328e9d121b31fec76e3599300931bb356e1bd |
31-Oct-2011 |
Chih-Chung Chang <chihchung@google.com> |
Fix 5533861: Correct the thumbnail area hit testing calculation. Change-Id: I3a9229497c955628cb49c42c0ee02c41eaadd705
rc/com/android/gallery3d/ui/SlotView.java
|
62485ff492b4e3b3bf4dea29b9b82773aac1e4c8 |
31-Oct-2011 |
Chih-Chung Chang <chihchung@google.com> |
Fix 5514384: add video/avi as a supported mime type. Change-Id: I197711a1ef0f5b6356573944c3012c6a14905579
ndroidManifest.xml
|
4c89478bfcea7a9b9f6ccc45594b472735e04f56 |
31-Oct-2011 |
Chih-Chung Chang <chihchung@google.com> |
Fix 5514384: add video/avi as a supported mime type. Change-Id: I197711a1ef0f5b6356573944c3012c6a14905579
ndroidManifest.xml
|
92b18f00f1e177b57d634b34881ba98fd6193b33 |
30-Oct-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
12f7c95caf3e631b5e50cdc6266bd1388075914e |
30-Oct-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
2dfbe90d8fbda95f9fd2b78a0ccd06d459cf72ce |
30-Oct-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-mr1-release history after reset to ics-mr1
|
ac1b650e092ab646116e1e71c6239bd3188ea1db |
30-Oct-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-mr1-release history after reset to ics-mr1
|
0cd1bf54deea069adf6f575ef11e3bf8e11d3959 |
29-Oct-2011 |
Eric Fischer <enf@google.com> |
am 8e10103f: (-s ours) Import revised translations. DO NOT MERGE * commit '8e10103fa8010a6756182a9a14c7504254dda36a': Import revised translations. DO NOT MERGE
|
9c1fecf0a6e2325f72f56ba32bd0703314e0ef30 |
29-Oct-2011 |
Eric Fischer <enf@google.com> |
am 8e10103f: (-s ours) Import revised translations. DO NOT MERGE * commit '8e10103fa8010a6756182a9a14c7504254dda36a': Import revised translations. DO NOT MERGE
|
761a1735a49199d2324ca169d2342a11ec7f9893 |
29-Oct-2011 |
Eric Fischer <enf@google.com> |
Import revised translations. DO NOT MERGE Change-Id: I838ee08834a0ab535519aa5886fb8593e49f59fc
es/values-es/strings.xml
es/values-ja/strings.xml
|
8e10103fa8010a6756182a9a14c7504254dda36a |
29-Oct-2011 |
Eric Fischer <enf@google.com> |
Import revised translations. DO NOT MERGE Change-Id: I838ee08834a0ab535519aa5886fb8593e49f59fc
es/values-es/strings.xml
es/values-ja/strings.xml
|
13aca64aff9fc09436cd6899f5b394dfac9ffa15 |
29-Oct-2011 |
Eric Fischer <enf@google.com> |
am eb9aa98a: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr1 * commit 'eb9aa98ad005f2accbc4f9566e49d685d2213493': Import revised translations. DO NOT MERGE
|
a23f58de9727662c10c2db121434ee75e1a23d31 |
29-Oct-2011 |
Eric Fischer <enf@google.com> |
am eb9aa98a: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr1 * commit 'eb9aa98ad005f2accbc4f9566e49d685d2213493': Import revised translations. DO NOT MERGE
|
68233762656fccf6452be45e33077e403e44ca4b |
28-Oct-2011 |
Eric Fischer <enf@google.com> |
Merge "Import revised translations. DO NOT MERGE" into ics-mr1
|
eb9aa98ad005f2accbc4f9566e49d685d2213493 |
28-Oct-2011 |
Eric Fischer <enf@google.com> |
Merge "Import revised translations. DO NOT MERGE" into ics-mr1
|
66f5a837019dd0224109a98cd7ef7884c9be9eb7 |
28-Oct-2011 |
Eric Fischer <enf@google.com> |
Import revised translations. DO NOT MERGE Change-Id: I76f98594896d654584cfa3d75a56264906837e46
es/values-ja/strings.xml
es/values-uk/strings.xml
|
948436c953d6c226c428c044ee994c30190b0cc8 |
28-Oct-2011 |
Eric Fischer <enf@google.com> |
Import revised translations. DO NOT MERGE Change-Id: I76f98594896d654584cfa3d75a56264906837e46
es/values-ja/strings.xml
es/values-uk/strings.xml
|
1499ab5606fb18185045b35817f36214ef090a87 |
28-Oct-2011 |
Eric Fischer <enf@google.com> |
Merge "Import revised translations."
|
2712ec649cf27093c62e346bee14f822e137696c |
28-Oct-2011 |
Eric Fischer <enf@google.com> |
Merge "Import revised translations."
|
cfdde3456ec01d773afeeaff2186548fc5c350e8 |
28-Oct-2011 |
Ed Heyl <ed@google.com> |
keep previous history after reset to mr1 plus aah changes (ics-aah-wip)
|
46f7444d065c9dec5ae51b97dcfbf3793ad6b950 |
28-Oct-2011 |
Ed Heyl <ed@google.com> |
keep previous history after reset to mr1 plus aah changes (ics-aah-wip)
ndroidManifest.xml
|
a042207945719bc0d93ecf26435bdd61a7ee7fdd |
28-Oct-2011 |
Ed Heyl <ed@google.com> |
keep previous history after reset to mr1 plus aah changes (ics-aah-wip)
|
71c9b1866af54a859893132d41fc38197fbd83b5 |
28-Oct-2011 |
Ed Heyl <ed@google.com> |
keep previous history after reset to mr1 plus aah changes (ics-aah-wip)
|
bab9ccc31fa6f999da599df6816c58c6bd2230b4 |
28-Oct-2011 |
Eric Fischer <enf@google.com> |
Import revised translations. Change-Id: Ib3f108fe3ad63e2621e439893494a48348a6b2ec
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/photoeditor_strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/photoeditor_strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/photoeditor_strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
a11c0745e2466a41bd9935fdda0362834c1851eb |
28-Oct-2011 |
Eric Fischer <enf@google.com> |
Import revised translations. Change-Id: Ib3f108fe3ad63e2621e439893494a48348a6b2ec
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/photoeditor_strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/photoeditor_strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/photoeditor_strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
dc7fcdeb3980743d883cf760adef13ba3f0631ca |
28-Oct-2011 |
Claudia de Veaux <deveaux@google.com> |
Merge "Edits to newly-added error messages, per UI text standards. Bugs: 5165745, 5162668"
|
9b90871f8748c8d6f07eddc273e7807689173557 |
28-Oct-2011 |
Claudia de Veaux <deveaux@google.com> |
Merge "Edits to newly-added error messages, per UI text standards. Bugs: 5165745, 5162668"
|
6b5ba470b0658f04824d20e4b638e2badeba229c |
27-Oct-2011 |
Ray Chen <raychen@google.com> |
Fix 5420843 [UI] Text strings for selecting images/album for Gallery widget are confusing Change-Id: Icd160f688496c5e9e70c13889e9e393cad0dc428
es/layout/choose_widget_type.xml
es/values/strings.xml
|
2a2108cfe1e73420acc9951122e9ea3825b97efe |
27-Oct-2011 |
Ray Chen <raychen@google.com> |
Fix 5420843 [UI] Text strings for selecting images/album for Gallery widget are confusing Change-Id: Icd160f688496c5e9e70c13889e9e393cad0dc428
es/layout/choose_widget_type.xml
es/values/strings.xml
|
c8d0c80bcf9591f12fc561e8785154e0781f4238 |
27-Oct-2011 |
Eric Fischer <enf@google.com> |
am 1f7c6c68: (-s ours) am cceae7e7: (-s ours) Import revised translations. DO NOT MERGE * commit '1f7c6c68c3e7d416d37ab3ce7d5ade86c0f899b1': Import revised translations. DO NOT MERGE
|
f4fa3933f5c7837708af24a152088d99df3d3f08 |
27-Oct-2011 |
Eric Fischer <enf@google.com> |
am 1f7c6c68: (-s ours) am cceae7e7: (-s ours) Import revised translations. DO NOT MERGE * commit '1f7c6c68c3e7d416d37ab3ce7d5ade86c0f899b1': Import revised translations. DO NOT MERGE
|
5d87b3665ba6ff0d617156f41a583a010053d4f8 |
27-Oct-2011 |
Eric Fischer <enf@google.com> |
am cceae7e7: (-s ours) Import revised translations. DO NOT MERGE * commit 'cceae7e79d7a795c6007170c174930061e0654a7': Import revised translations. DO NOT MERGE
|
1f7c6c68c3e7d416d37ab3ce7d5ade86c0f899b1 |
27-Oct-2011 |
Eric Fischer <enf@google.com> |
am cceae7e7: (-s ours) Import revised translations. DO NOT MERGE * commit 'cceae7e79d7a795c6007170c174930061e0654a7': Import revised translations. DO NOT MERGE
|
ad50fe0585dc9a7c3c888e3d980be1e0b615f882 |
27-Oct-2011 |
Claudia de Veaux <deveaux@google.com> |
Edits to newly-added error messages, per UI text standards. Bugs: 5165745, 5162668 Change-Id: I935ea51e608ef1941296f140878fc5146d12aa25
es/values/strings.xml
|
6354f35a71d26e6ab0c39efe9e3df0d58adbd96c |
27-Oct-2011 |
Claudia de Veaux <deveaux@google.com> |
Edits to newly-added error messages, per UI text standards. Bugs: 5165745, 5162668 Change-Id: I935ea51e608ef1941296f140878fc5146d12aa25
es/values/strings.xml
|
72c45dd1cded34e4ffd8e6b397dee48b2c25a263 |
27-Oct-2011 |
Eric Fischer <enf@google.com> |
Import revised translations. DO NOT MERGE Change-Id: I67c4dc34f67192f714172fbc5a82ff7cb8b81ff2
es/values-fr/photoeditor_strings.xml
es/values-fr/strings.xml
es/values-zh-rCN/strings.xml
|
cceae7e79d7a795c6007170c174930061e0654a7 |
27-Oct-2011 |
Eric Fischer <enf@google.com> |
Import revised translations. DO NOT MERGE Change-Id: I67c4dc34f67192f714172fbc5a82ff7cb8b81ff2
es/values-fr/photoeditor_strings.xml
es/values-fr/strings.xml
es/values-zh-rCN/strings.xml
|
a437f4e0686912f5eb72d597673821990e585d7d |
27-Oct-2011 |
Eric Fischer <enf@google.com> |
am 748e7efc: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr1 * commit '748e7efccccb61e8ce9e9ac86a6f2c8987bbcefb': Import revised translations. DO NOT MERGE
|
dc957b662403361c30b1c23902e1cf56b12e312f |
27-Oct-2011 |
Eric Fischer <enf@google.com> |
am 748e7efc: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr1 * commit '748e7efccccb61e8ce9e9ac86a6f2c8987bbcefb': Import revised translations. DO NOT MERGE
|
e76894584f77ef3c57f0c14f570972bc71c9c394 |
27-Oct-2011 |
Eric Fischer <enf@google.com> |
Merge "Import revised translations. DO NOT MERGE" into ics-mr1
|
748e7efccccb61e8ce9e9ac86a6f2c8987bbcefb |
27-Oct-2011 |
Eric Fischer <enf@google.com> |
Merge "Import revised translations. DO NOT MERGE" into ics-mr1
|
0c447d696eae9eb5cabfab386ae2bb34c7ded1b3 |
27-Oct-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
39f5e4aa7b221186ec71252a7e023335f9edc301 |
27-Oct-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
befd5c02b2d3393f200a3a5788b8aa112af9354c |
27-Oct-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
4c7fe4ddbf85fd7dac0277117136d1944edd9fc3 |
27-Oct-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-mr1-release history after reset to ics-mr1
|
4b53ce5bebaf3f991d501e5644c1239f45433b66 |
27-Oct-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-mr1-release history after reset to ics-mr1
|
2e9e7e5ff4146b1046940a019cea4fe9acd40a86 |
27-Oct-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-mr1-release history after reset to ics-mr1
|
09efcf9a9367bda0a9d28f312c9b3d0e93dd49da |
21-Oct-2011 |
Ray Chen <raychen@google.com> |
Fix 5471518 Playing slide show from any picture doesn't start from the current picture which is unexpected IRL17 Crespo Change-Id: I2ed78cee2f6257254794a7724897845c43a3e0a5
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/app/SlideshowDataAdapter.java
rc/com/android/gallery3d/app/SlideshowPage.java
|
604f053d040782159b61d3b74ee533bc2c0ccdd0 |
21-Oct-2011 |
Ray Chen <raychen@google.com> |
Fix 5471518 Playing slide show from any picture doesn't start from the current picture which is unexpected IRL17 Crespo Change-Id: I2ed78cee2f6257254794a7724897845c43a3e0a5
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/app/SlideshowDataAdapter.java
rc/com/android/gallery3d/app/SlideshowPage.java
|
6f20eed048d1fc4a03afa435e78aba75fbe1a8b6 |
26-Oct-2011 |
Ray Chen <raychen@google.com> |
Fix 5511057 Action bar UI is broken when sorting within an album Change-Id: I1b2d22b2fae8b20f03a761696ba1e2c5665d282b
rc/com/android/gallery3d/app/AlbumSetPage.java
|
9c21268fa8d394cca6cab78dd023a52e0b147a6e |
26-Oct-2011 |
Ray Chen <raychen@google.com> |
Fix 5511057 Action bar UI is broken when sorting within an album Change-Id: I1b2d22b2fae8b20f03a761696ba1e2c5665d282b
rc/com/android/gallery3d/app/AlbumSetPage.java
|
23c23055b6bd0a8b2aebc732969edf57443ba21a |
27-Oct-2011 |
Chih-Chung Chang <chihchung@google.com> |
am 25a329cf: Fix 5516359: Not able to share video to YouTube when the video is playing. * commit '25a329cfd7e055dd7c8ce69532aefe9a69ee4d75': Fix 5516359: Not able to share video to YouTube when the video is playing.
|
8d79d7aef57ab2a6fd3fa878baf8609905abdff4 |
27-Oct-2011 |
Chih-Chung Chang <chihchung@google.com> |
am 25a329cf: Fix 5516359: Not able to share video to YouTube when the video is playing. * commit '25a329cfd7e055dd7c8ce69532aefe9a69ee4d75': Fix 5516359: Not able to share video to YouTube when the video is playing.
|
67318092c00cf7ccbb3cabb271a7ebc3d3928306 |
27-Oct-2011 |
Chih-Chung Chang <chihchung@google.com> |
Fix 5516359: Not able to share video to YouTube when the video is playing. YouTube needs a content URI to share. Change-Id: I7088c11d9d5a0b97bbb6de4ca72d4cc097f9a03c
rc/com/android/gallery3d/data/LocalVideo.java
|
25a329cfd7e055dd7c8ce69532aefe9a69ee4d75 |
27-Oct-2011 |
Chih-Chung Chang <chihchung@google.com> |
Fix 5516359: Not able to share video to YouTube when the video is playing. YouTube needs a content URI to share. Change-Id: I7088c11d9d5a0b97bbb6de4ca72d4cc097f9a03c
rc/com/android/gallery3d/data/LocalVideo.java
|
2027328bb4d74951e46d798908765b66a4426cbe |
27-Oct-2011 |
Eric Fischer <enf@google.com> |
Import revised translations. DO NOT MERGE Change-Id: Ie311a298b5510a50728d61117a3855a866291ca4
es/values-fr/photoeditor_strings.xml
es/values-fr/strings.xml
es/values-zh-rCN/strings.xml
|
a1de4237459fc1221c9aeb1574c2737aa9f7b0a4 |
27-Oct-2011 |
Eric Fischer <enf@google.com> |
Import revised translations. DO NOT MERGE Change-Id: Ie311a298b5510a50728d61117a3855a866291ca4
es/values-fr/photoeditor_strings.xml
es/values-fr/strings.xml
es/values-zh-rCN/strings.xml
|
66ba64ecf5d3d73fe043529f7c9eb0a400293dcf |
26-Oct-2011 |
Ed Heyl <ed@google.com> |
undo reset to ics-mr1 until we have a better method
rc/com/android/gallery3d/data/LocalAlbum.java
rc/com/android/gallery3d/ui/ScrollerHelper.java
rc/com/android/gallery3d/util/MediaSetUtils.java
|
628825af6605adcaa02ea2fd0088b82a177557d4 |
26-Oct-2011 |
Ed Heyl <ed@google.com> |
undo reset to ics-mr1 until we have a better method
ndroidManifest.xml
|
23e11fafaae725ce15a4280d47715997a5ffdb50 |
26-Oct-2011 |
Ed Heyl <ed@google.com> |
undo reset to ics-mr1 until we have a better method
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-in/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/photoeditor_strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/photoeditor_strings.xml
es/values/strings.xml
|
f32a21f59a6c2a3851c518f4b861b55696082ee8 |
26-Oct-2011 |
Ed Heyl <ed@google.com> |
undo reset to ics-mr1 until we have a better method
|
45ea3da9a209b0d92a846a065a750e3525f8434a |
26-Oct-2011 |
Eric Fischer <enf@google.com> |
am b633e313: (-s ours) am 0e711f17: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr0 * commit 'b633e313820d725f7f56fe016494796a2413c549': Import revised translations. DO NOT MERGE
|
576c9c98d6c14aeb879f71654202c0c8d431d989 |
26-Oct-2011 |
Eric Fischer <enf@google.com> |
am b633e313: (-s ours) am 0e711f17: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr0 * commit 'b633e313820d725f7f56fe016494796a2413c549': Import revised translations. DO NOT MERGE
|
f4d6a596c51ecafa75ca770dbee9db57d7d35d0c |
26-Oct-2011 |
Eric Fischer <enf@google.com> |
am 0e711f17: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr0 * commit '0e711f17ec4252457453f8b9507aabc2a886d6d6': Import revised translations. DO NOT MERGE
|
b633e313820d725f7f56fe016494796a2413c549 |
26-Oct-2011 |
Eric Fischer <enf@google.com> |
am 0e711f17: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr0 * commit '0e711f17ec4252457453f8b9507aabc2a886d6d6': Import revised translations. DO NOT MERGE
|
0e711f17ec4252457453f8b9507aabc2a886d6d6 |
26-Oct-2011 |
Eric Fischer <enf@google.com> |
Merge "Import revised translations. DO NOT MERGE" into ics-mr0
|
a758938ecc936ee3d8cf73a0f4f3b131461d9e50 |
26-Oct-2011 |
Ed Heyl <ed@google.com> |
reset to ics-mr1, but keep history
rc/com/android/gallery3d/data/LocalAlbum.java
rc/com/android/gallery3d/ui/ScrollerHelper.java
rc/com/android/gallery3d/util/MediaSetUtils.java
|
311eef30d5a2b15d6825f483b68a22ab4bf351b0 |
26-Oct-2011 |
Ed Heyl <ed@google.com> |
reset to ics-mr1, but keep history
ndroidManifest.xml
|
e5de9c289f3943e583f261789c5575b05b1a0283 |
26-Oct-2011 |
Ed Heyl <ed@google.com> |
reset to ics-mr1, but keep history
|
e7ade34bc8c9c1995fcc66efdfa84ccf9b6ebf9c |
26-Oct-2011 |
Ed Heyl <ed@google.com> |
reset to ics-mr1, but keep history
|
86aac46ed419cceccae8a548d810f10c80efba74 |
26-Oct-2011 |
Eric Fischer <enf@google.com> |
am 1e7b81dc: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr1 * commit '1e7b81dcd0bf9b6a2bd90fc5895437656725ea34': Import revised translations. DO NOT MERGE
|
c2164ad9f40a196ce52f2625edd1ed15b39356c1 |
26-Oct-2011 |
Eric Fischer <enf@google.com> |
am 1e7b81dc: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr1 * commit '1e7b81dcd0bf9b6a2bd90fc5895437656725ea34': Import revised translations. DO NOT MERGE
|
1e7b81dcd0bf9b6a2bd90fc5895437656725ea34 |
26-Oct-2011 |
Eric Fischer <enf@google.com> |
Merge "Import revised translations. DO NOT MERGE" into ics-mr1
|
ccf95f6ccd13b9b502e10b2140c76e831613a19a |
26-Oct-2011 |
Eric Fischer <enf@google.com> |
Import revised translations. DO NOT MERGE Change-Id: I078484fe3bb63f021b35d935e864604681265fe4
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es/strings.xml
es/values-fa/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-in/strings.xml
es/values-it/photoeditor_strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/photoeditor_strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/photoeditor_strings.xml
es/values-zh-rTW/strings.xml
|
1e541581c4c653eb9858fcfaf3ea544f78f133a2 |
26-Oct-2011 |
Eric Fischer <enf@google.com> |
Import revised translations. DO NOT MERGE Change-Id: I078484fe3bb63f021b35d935e864604681265fe4
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es/strings.xml
es/values-fa/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-in/strings.xml
es/values-it/photoeditor_strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/photoeditor_strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/photoeditor_strings.xml
es/values-zh-rTW/strings.xml
|
005760adab4c3c75d2b27224244e90436e4f0c2c |
26-Oct-2011 |
Yuli Huang <yuli@google.com> |
am d0817e2d: am b1ac0614: am f66bd12b: Fix b/5501285 by ensuring bitmap in ARGB8888 format. * commit 'd0817e2d5027e71a99c8e0e9186c261f414d821c': Fix b/5501285 by ensuring bitmap in ARGB8888 format.
|
ec4a17d4ad24b527801b2c32d60294239542d5f5 |
26-Oct-2011 |
Yuli Huang <yuli@google.com> |
am b1ac0614: am f66bd12b: Fix b/5501285 by ensuring bitmap in ARGB8888 format. * commit 'b1ac0614afa725aa1bd759fb681d853983b2f1fb': Fix b/5501285 by ensuring bitmap in ARGB8888 format.
|
d0817e2d5027e71a99c8e0e9186c261f414d821c |
26-Oct-2011 |
Yuli Huang <yuli@google.com> |
am b1ac0614: am f66bd12b: Fix b/5501285 by ensuring bitmap in ARGB8888 format. * commit 'b1ac0614afa725aa1bd759fb681d853983b2f1fb': Fix b/5501285 by ensuring bitmap in ARGB8888 format.
|
f07097f19d0821ff007c7f2c037287c34181c4f6 |
26-Oct-2011 |
Yuli Huang <yuli@google.com> |
am f66bd12b: Fix b/5501285 by ensuring bitmap in ARGB8888 format. * commit 'f66bd12b33e0d590e192a3551e9affc55eef9a48': Fix b/5501285 by ensuring bitmap in ARGB8888 format.
|
b1ac0614afa725aa1bd759fb681d853983b2f1fb |
26-Oct-2011 |
Yuli Huang <yuli@google.com> |
am f66bd12b: Fix b/5501285 by ensuring bitmap in ARGB8888 format. * commit 'f66bd12b33e0d590e192a3551e9affc55eef9a48': Fix b/5501285 by ensuring bitmap in ARGB8888 format.
|
8d9232e2f4033a8b3a9c297388364252ca913250 |
26-Oct-2011 |
Eric Fischer <enf@google.com> |
Import revised translations. DO NOT MERGE Change-Id: I4da74b8d117cfc2336730179daa364b800e73f23
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-in/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/photoeditor_strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/photoeditor_strings.xml
|
a6d991d412f101cab2fa101becb33bea679ad493 |
26-Oct-2011 |
Eric Fischer <enf@google.com> |
Import revised translations. DO NOT MERGE Change-Id: I4da74b8d117cfc2336730179daa364b800e73f23
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-in/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/photoeditor_strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/photoeditor_strings.xml
|
f66bd12b33e0d590e192a3551e9affc55eef9a48 |
26-Oct-2011 |
Yuli Huang <yuli@google.com> |
Fix b/5501285 by ensuring bitmap in ARGB8888 format. Change-Id: I48ece547543207ba92276962fc6131859f615313
rc/com/android/gallery3d/photoeditor/BitmapUtils.java
|
1f96795daee8d21bf41847a59428b4f25837898f |
26-Oct-2011 |
Yuli Huang <yuli@google.com> |
Fix b/5501285 by ensuring bitmap in ARGB8888 format. Change-Id: I48ece547543207ba92276962fc6131859f615313
rc/com/android/gallery3d/photoeditor/BitmapUtils.java
|
94d9367556af199a423049ce83702bed6794d884 |
26-Oct-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
7dce47b149526820113561d4f572107a7211c820 |
26-Oct-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
3955cfc3ae08ff8a1fa0f5acd6aa1022165d3214 |
26-Oct-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
5324d8019be204b360ae05d15b7784e5cf244f46 |
26-Oct-2011 |
Ed Heyl <ed@google.com> |
am d9598402: am 2015a3c3: Merge remote branch \'goog/ics-mr0\' into ics-mr1 * commit 'd9598402bf73dabbb4d342c1a2ac72dbdf482a8f':
|
7a98213e8aebdbff0baef46b22fb6a7f447c0a22 |
26-Oct-2011 |
Ed Heyl <ed@google.com> |
am 2015a3c3: Merge remote branch \'goog/ics-mr0\' into ics-mr1 * commit '2015a3c36930045d6268871e9c6907533d863702':
|
d9598402bf73dabbb4d342c1a2ac72dbdf482a8f |
26-Oct-2011 |
Ed Heyl <ed@google.com> |
am 2015a3c3: Merge remote branch \'goog/ics-mr0\' into ics-mr1 * commit '2015a3c36930045d6268871e9c6907533d863702':
|
a76ea564af1c5b3cdf13f2b09832a0bf024b882f |
26-Oct-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-mr1-release history after reset to ics-mr1
|
4f8024827e3d74d1ad83dd6d3f2bb2047f5670fe |
26-Oct-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-mr1-release history after reset to ics-mr1
|
07a27f81554428df9a927d720f1e4101f5cc5e65 |
26-Oct-2011 |
Chih-Chung Chang <chihchung@google.com> |
am a425add4: Merge "Fix 4083882: When scrolling repeatedly, the Gallery jumps." * commit 'a425add4954b722e3913005c9045325a163a0c6b': Fix 4083882: When scrolling repeatedly, the Gallery jumps.
|
a384b3e3e815ace802038939f0abb2eb9af09142 |
26-Oct-2011 |
Chih-Chung Chang <chihchung@google.com> |
Merge "Fix 4083882: When scrolling repeatedly, the Gallery jumps."
|
a425add4954b722e3913005c9045325a163a0c6b |
26-Oct-2011 |
Chih-Chung Chang <chihchung@google.com> |
Merge "Fix 4083882: When scrolling repeatedly, the Gallery jumps."
|
8c88a722108367a7ca4911da53c9a05a13cd2d17 |
25-Oct-2011 |
Ed Heyl <ed@google.com> |
Merge remote branch 'goog/ics-mr0' into ics-mr1
|
2015a3c36930045d6268871e9c6907533d863702 |
25-Oct-2011 |
Ed Heyl <ed@google.com> |
Merge remote branch 'goog/ics-mr0' into ics-mr1
|
32360c8acfc0bcf29b8126897c1d71b01af24005 |
25-Oct-2011 |
Eric Fischer <enf@google.com> |
am 0ec7397a: Merge "Import revised translations." * commit '0ec7397ad80f401996f5b5be7e765f93d8361614': Import revised translations.
|
6a35a448c585286c3a008c8e70811fe944eaee1c |
25-Oct-2011 |
Eric Fischer <enf@google.com> |
Merge "Import revised translations."
|
0ec7397ad80f401996f5b5be7e765f93d8361614 |
25-Oct-2011 |
Eric Fischer <enf@google.com> |
Merge "Import revised translations."
|
ef24414b8367d2294286a4262ca1e65d32210bc1 |
25-Oct-2011 |
Eric Fischer <enf@google.com> |
Import revised translations. Change-Id: I4ba6ad38f5924e8ed58d44ec5ffb303f5c5f7faa
es/values-ar/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-es/strings.xml
es/values-fa/strings.xml
es/values-fr/strings.xml
es/values-in/strings.xml
es/values-it/photoeditor_strings.xml
es/values-it/strings.xml
es/values-ko/photoeditor_strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
|
840b39b52f7d4245d81b1bf5edab607113c6134f |
25-Oct-2011 |
Eric Fischer <enf@google.com> |
Import revised translations. Change-Id: I4ba6ad38f5924e8ed58d44ec5ffb303f5c5f7faa
es/values-ar/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-es/strings.xml
es/values-fa/strings.xml
es/values-fr/strings.xml
es/values-in/strings.xml
es/values-it/photoeditor_strings.xml
es/values-it/strings.xml
es/values-ko/photoeditor_strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
|
ac2bbb40d71943cf37c3279a3c9188b22c817edf |
25-Oct-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
2aa179b1c5120a0904bf21e633e7c980c3177ccd |
25-Oct-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
229620ec993e893ea1721f234153781e317a3833 |
25-Oct-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
b642bea4fda8ca5df04f7c017fb4c14517a24f6f |
25-Oct-2011 |
Chih-Chung Chang <chihchung@google.com> |
Fix 4083882: When scrolling repeatedly, the Gallery jumps. Change-Id: I1d69330c54d94e3f8917fa8e502cb5c244628a15
rc/com/android/gallery3d/ui/ScrollerHelper.java
|
80d8fe095a0c5c5a8d0690752e1989ebfa7ecbb9 |
25-Oct-2011 |
Chih-Chung Chang <chihchung@google.com> |
Fix 4083882: When scrolling repeatedly, the Gallery jumps. Change-Id: I1d69330c54d94e3f8917fa8e502cb5c244628a15
rc/com/android/gallery3d/ui/ScrollerHelper.java
|
9faf97daa14255604b45e35e5313b8f2f0d979cd |
25-Oct-2011 |
Chih-Chung Chang <chihchung@google.com> |
am e0f3d0c0: Merge "Fix 5450241: Forget to support https HTTP live urls." * commit 'e0f3d0c0754c90fccc717a88cd3a751cf6562275': Fix 5450241: Forget to support https HTTP live urls.
|
a5c4b9b9f3b10020a9371add04c506dcf8a322f2 |
25-Oct-2011 |
Chih-Chung Chang <chihchung@google.com> |
am 94aadd78: Merge "Fix 5454748: Localize hardcoded folder names." * commit '94aadd7897dfdc418c7f80b2042f584121defcce': Fix 5454748: Localize hardcoded folder names.
|
e0f3d0c0754c90fccc717a88cd3a751cf6562275 |
25-Oct-2011 |
Chih-Chung Chang <chihchung@google.com> |
Merge "Fix 5450241: Forget to support https HTTP live urls."
|
89c842462e1c7f7d8e02a414e373918ccf28e5df |
25-Oct-2011 |
Chih-Chung Chang <chihchung@google.com> |
Merge "Fix 5454748: Localize hardcoded folder names."
|
94aadd7897dfdc418c7f80b2042f584121defcce |
25-Oct-2011 |
Chih-Chung Chang <chihchung@google.com> |
Merge "Fix 5454748: Localize hardcoded folder names."
|
52dd6dabb8d4599bc5f400d5f3c9cadc18843b9e |
25-Oct-2011 |
Eric Fischer <enf@google.com> |
am a44f538f: (-s ours) am 5fcef11e: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr0 * commit 'a44f538f4f73c7a719a0e6ba9058acee8ddc6a53': Import revised translations. DO NOT MERGE
|
a44f538f4f73c7a719a0e6ba9058acee8ddc6a53 |
25-Oct-2011 |
Eric Fischer <enf@google.com> |
am 5fcef11e: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr0 * commit '5fcef11e93ea473c7abe63555d0124257e520d19': Import revised translations. DO NOT MERGE
|
0ceb74181a66d631e070de877c77906b510f5ac6 |
25-Oct-2011 |
Eric Fischer <enf@google.com> |
am 5fcef11e: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr0 * commit '5fcef11e93ea473c7abe63555d0124257e520d19': Import revised translations. DO NOT MERGE
|
41ad6beeb7bcef51060a465dcab502acdc886d60 |
25-Oct-2011 |
Eric Fischer <enf@google.com> |
Merge "Import revised translations. DO NOT MERGE" into ics-mr0
|
5fcef11e93ea473c7abe63555d0124257e520d19 |
25-Oct-2011 |
Eric Fischer <enf@google.com> |
Merge "Import revised translations. DO NOT MERGE" into ics-mr0
|
93ca80e6f7bfcac3646cff4c749c52bce77c1b20 |
25-Oct-2011 |
Eric Fischer <enf@google.com> |
Import revised translations. DO NOT MERGE Change-Id: I9ad63e3c80298ad541519506d7164b49d84a5e30
es/values-de/strings.xml
es/values-fr/strings.xml
es/values-ko/photoeditor_strings.xml
es/values-zh-rCN/strings.xml
|
c15ba4eb4a40fde391dfabdab66e2e6d575aed26 |
25-Oct-2011 |
Eric Fischer <enf@google.com> |
Import revised translations. DO NOT MERGE Change-Id: I9ad63e3c80298ad541519506d7164b49d84a5e30
es/values-de/strings.xml
es/values-fr/strings.xml
es/values-ko/photoeditor_strings.xml
es/values-zh-rCN/strings.xml
|
003006ecfc2c5c1f2e58cdfc273263ed2d20b8e7 |
24-Oct-2011 |
Yuli Huang <yuli@google.com> |
am 452dd579: am e334568e: Fix b/5500172: Remove unused face-tanning icon. * commit '452dd57981fd4ffd132fe5e3f3cbfe67f8ef9dd8': Fix b/5500172: Remove unused face-tanning icon.
|
452dd57981fd4ffd132fe5e3f3cbfe67f8ef9dd8 |
24-Oct-2011 |
Yuli Huang <yuli@google.com> |
am e334568e: Fix b/5500172: Remove unused face-tanning icon. * commit 'e334568eec58601254df46111a5fe1331b775e54': Fix b/5500172: Remove unused face-tanning icon.
|
3b307dfe67742e19dc0278011d4932698c46145a |
24-Oct-2011 |
Yuli Huang <yuli@google.com> |
am e334568e: Fix b/5500172: Remove unused face-tanning icon. * commit 'e334568eec58601254df46111a5fe1331b775e54': Fix b/5500172: Remove unused face-tanning icon.
|
59c91f039ed4b730ebbcc2effe3d64cc682641d4 |
24-Oct-2011 |
Chih-Chung Chang <chihchung@google.com> |
Fix 5450241: Forget to support https HTTP live urls. Change-Id: Ib8689a87e8cea4350c388e814807b6cef35fd381
ndroidManifest.xml
|
360f1dbe958aef87bd46b20aeab35193b1b51f01 |
24-Oct-2011 |
Chih-Chung Chang <chihchung@google.com> |
Fix 5450241: Forget to support https HTTP live urls. Change-Id: Ib8689a87e8cea4350c388e814807b6cef35fd381
ndroidManifest.xml
|
7c216174c27b4b905a50b95709a12401e85c2c7d |
24-Oct-2011 |
Chih-Chung Chang <chihchung@google.com> |
Fix 5454748: Localize hardcoded folder names. Change-Id: I91586d6f707a0352be6be524e848bd2c2dacab7e
rc/com/android/gallery3d/data/LocalAlbum.java
rc/com/android/gallery3d/util/MediaSetUtils.java
|
c6b3db8b10f29c96a70b7f0e3797f441cdc409b2 |
24-Oct-2011 |
Chih-Chung Chang <chihchung@google.com> |
Fix 5454748: Localize hardcoded folder names. Change-Id: I91586d6f707a0352be6be524e848bd2c2dacab7e
es/values/strings.xml
|
6caf221c4888f8632e8eb5b60b145bfca3557b3a |
24-Oct-2011 |
Chih-Chung Chang <chihchung@google.com> |
Fix 5454748: Localize hardcoded folder names. Change-Id: I91586d6f707a0352be6be524e848bd2c2dacab7e
es/values/strings.xml
rc/com/android/gallery3d/data/LocalAlbum.java
rc/com/android/gallery3d/util/MediaSetUtils.java
|
ebe2f80bade4a5129e68a1e2e5c705d26034e110 |
24-Oct-2011 |
Yuli Huang <yuli@google.com> |
Fix b/5500172: Remove unused face-tanning icon. Change-Id: Ie25cd01df9a48c1c26e2403e42e58c5729b5238f
es/drawable/photoeditor_effect_facetan.png
|
e334568eec58601254df46111a5fe1331b775e54 |
24-Oct-2011 |
Yuli Huang <yuli@google.com> |
Fix b/5500172: Remove unused face-tanning icon. Change-Id: Ie25cd01df9a48c1c26e2403e42e58c5729b5238f
es/drawable/photoeditor_effect_facetan.png
|
10fc0522ae9548e9738c783db86e2f9d7e5b9fb9 |
23-Oct-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
8f77994c8675e9a74f68486e5ee8bd88f307e66a |
23-Oct-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
d807c027b772ef947f5a6c10dd371e6850896a77 |
23-Oct-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
f3f75f0bf552bd1af7de0af6b72f0694c55c7a7c |
22-Oct-2011 |
Eric Fischer <enf@google.com> |
am 7bdf5cc3: (-s ours) am de3412c5: (-s ours) Import revised translations. DO NOT MERGE * commit '7bdf5cc3671ba866458eaa52ab41fe42bf2d7eda': Import revised translations. DO NOT MERGE
|
fb19274232adf7f35cf68c07519e6be1a1c5cd12 |
22-Oct-2011 |
Eric Fischer <enf@google.com> |
am de3412c5: (-s ours) Import revised translations. DO NOT MERGE * commit 'de3412c5161fb727dee8b305bc114ea8806643a9': Import revised translations. DO NOT MERGE
|
7bdf5cc3671ba866458eaa52ab41fe42bf2d7eda |
22-Oct-2011 |
Eric Fischer <enf@google.com> |
am de3412c5: (-s ours) Import revised translations. DO NOT MERGE * commit 'de3412c5161fb727dee8b305bc114ea8806643a9': Import revised translations. DO NOT MERGE
|
1a8c4aa0b550d554cbe725d47dc7434eba8717dd |
21-Oct-2011 |
Eric Fischer <enf@google.com> |
Import revised translations. DO NOT MERGE Change-Id: Ia9fc268cf6f18f3b963f4891062f5589e4bf5d45
es/values-it/strings.xml
es/values-ru/strings.xml
|
de3412c5161fb727dee8b305bc114ea8806643a9 |
21-Oct-2011 |
Eric Fischer <enf@google.com> |
Import revised translations. DO NOT MERGE Change-Id: Ia9fc268cf6f18f3b963f4891062f5589e4bf5d45
es/values-it/strings.xml
es/values-ru/strings.xml
|
b3ff5e06dac6190f0380432e06717e05ad36d1c2 |
21-Oct-2011 |
Eric Fischer <enf@google.com> |
am a2f8b42e: (-s ours) am ac3a825b: (-s ours) Import revised translations. DO NOT MERGE * commit 'a2f8b42e7a1c9039dab4e03200ccb21aab088a18': Import revised translations. DO NOT MERGE
|
5363b9bb2856509c89145d69c4933f2bb2c46dc4 |
21-Oct-2011 |
Eric Fischer <enf@google.com> |
am ac3a825b: (-s ours) Import revised translations. DO NOT MERGE * commit 'ac3a825b6e7072c33779968a7c2d8d36a1f37e6e': Import revised translations. DO NOT MERGE
|
a2f8b42e7a1c9039dab4e03200ccb21aab088a18 |
21-Oct-2011 |
Eric Fischer <enf@google.com> |
am ac3a825b: (-s ours) Import revised translations. DO NOT MERGE * commit 'ac3a825b6e7072c33779968a7c2d8d36a1f37e6e': Import revised translations. DO NOT MERGE
|
10f0b76507444af1a42539456464bd3867bc7bad |
21-Oct-2011 |
Ray Chen <raychen@google.com> |
Fix 5453262 No pictures / Videos available in Gallery message not displayed Change-Id: Ia4c03d4f4a89ebaa2534720d8a679243fbf81d52
rc/com/android/gallery3d/app/AlbumSetPage.java
|
4d635443afff910611ffa84ff8f84d5eff5e33fa |
21-Oct-2011 |
Ray Chen <raychen@google.com> |
Fix 5453262 No pictures / Videos available in Gallery message not displayed Change-Id: Ia4c03d4f4a89ebaa2534720d8a679243fbf81d52
rc/com/android/gallery3d/app/AlbumSetPage.java
|
a88d44307bdf09fb5f5f3a0da06fb4681be566cc |
21-Oct-2011 |
Eric Fischer <enf@google.com> |
Import revised translations. DO NOT MERGE Change-Id: Ieb1e402fd1f4caef7ec076b48a74666e5d215a75
es/values-it/photoeditor_strings.xml
es/values-ru/strings.xml
es/values-zh-rTW/strings.xml
|
ac3a825b6e7072c33779968a7c2d8d36a1f37e6e |
21-Oct-2011 |
Eric Fischer <enf@google.com> |
Import revised translations. DO NOT MERGE Change-Id: Ieb1e402fd1f4caef7ec076b48a74666e5d215a75
es/values-it/photoeditor_strings.xml
es/values-ru/strings.xml
es/values-zh-rTW/strings.xml
|
dad84e38ee80b69a175a65acf60de3782f78956a |
20-Oct-2011 |
Eric Fischer <enf@google.com> |
am 02480bb4: (-s ours) am 4e92cf0e: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr0 * commit '02480bb4b213029eb01d1b4e04eab49c27c3be9a': Import revised translations. DO NOT MERGE
|
707698dbf2bbd06c9ad11beedd995ec57b60d542 |
20-Oct-2011 |
Eric Fischer <enf@google.com> |
am 4e92cf0e: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr0 * commit '4e92cf0e9c92bd497d7205f71139ef88bca57aca': Import revised translations. DO NOT MERGE
|
02480bb4b213029eb01d1b4e04eab49c27c3be9a |
20-Oct-2011 |
Eric Fischer <enf@google.com> |
am 4e92cf0e: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr0 * commit '4e92cf0e9c92bd497d7205f71139ef88bca57aca': Import revised translations. DO NOT MERGE
|
a867e62d125e7b161e99e71b958c5e6877bfe58a |
20-Oct-2011 |
Eric Fischer <enf@google.com> |
Merge "Import revised translations. DO NOT MERGE" into ics-mr0
|
4e92cf0e9c92bd497d7205f71139ef88bca57aca |
20-Oct-2011 |
Eric Fischer <enf@google.com> |
Merge "Import revised translations. DO NOT MERGE" into ics-mr0
|
431d46800109bd0c7c1c1d3251adc5b8a6749ead |
20-Oct-2011 |
Eric Fischer <enf@google.com> |
Import revised translations. DO NOT MERGE Change-Id: I558df3af8ecafa5b45163c52ff174ee52b79e4c0
es/values-ar/strings.xml
es/values-el/strings.xml
es/values-es/strings.xml
es/values-fa/strings.xml
es/values-in/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
|
b6378a8c5c47f9d0db0ade5be00959c522a03d3d |
20-Oct-2011 |
Eric Fischer <enf@google.com> |
Import revised translations. DO NOT MERGE Change-Id: I558df3af8ecafa5b45163c52ff174ee52b79e4c0
es/values-ar/strings.xml
es/values-el/strings.xml
es/values-es/strings.xml
es/values-fa/strings.xml
es/values-in/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
|
de54ff88f6e5bee0a266c29e665523218f459ee1 |
20-Oct-2011 |
Yuli Huang <yuli@google.com> |
am 2dc016ea: am 7b62f488: Fix b/5401109. * commit '2dc016ea45e354b8d96f7571a90c98d1188dc445': Fix b/5401109.
|
773d368357ce50bc299551a768584d5a222fd440 |
20-Oct-2011 |
Yuli Huang <yuli@google.com> |
am 7b62f488: Fix b/5401109. * commit '7b62f4889a95406a00a4a5f25ef15f01322607eb': Fix b/5401109.
|
3f170d042bcf321baa84f06ca3939754040a3894 |
20-Oct-2011 |
Yuli Huang <yuli@google.com> |
am 7b62f488: Fix b/5401109. * commit '7b62f4889a95406a00a4a5f25ef15f01322607eb': Fix b/5401109.
|
2dc016ea45e354b8d96f7571a90c98d1188dc445 |
20-Oct-2011 |
Yuli Huang <yuli@google.com> |
am 7b62f488: Fix b/5401109. * commit '7b62f4889a95406a00a4a5f25ef15f01322607eb': Fix b/5401109.
|
960647247705f2c3e375061d234424b71c286e4d |
20-Oct-2011 |
Yuli Huang <yuli@google.com> |
Fix b/5401109. 1. Add FlipView similar to existing RotateView. 2. Add flipPhoto() similar to existing rotatePhoto() in PhotoView, and add setRenderToFlip() in RendererUtils. 3. Make FlipAction use FlipView/PhotoView similar to how RotateAction uses RotateView/PhotoView. Change-Id: I5642266adbc248c0b8eda48ddc29558ae9cbd21e
rc/com/android/gallery3d/photoeditor/PhotoView.java
rc/com/android/gallery3d/photoeditor/RendererUtils.java
rc/com/android/gallery3d/photoeditor/actions/EffectToolFactory.java
rc/com/android/gallery3d/photoeditor/actions/FlipAction.java
rc/com/android/gallery3d/photoeditor/actions/FlipView.java
rc/com/android/gallery3d/photoeditor/actions/RotateAction.java
rc/com/android/gallery3d/photoeditor/actions/RotateView.java
rc/com/android/gallery3d/photoeditor/actions/StraightenAction.java
|
d0b3cd7631f8ac34d5f6b4f51f05eba12bb4afd2 |
20-Oct-2011 |
Yuli Huang <yuli@google.com> |
Fix b/5401109. 1. Add FlipView similar to existing RotateView. 2. Add flipPhoto() similar to existing rotatePhoto() in PhotoView, and add setRenderToFlip() in RendererUtils. 3. Make FlipAction use FlipView/PhotoView similar to how RotateAction uses RotateView/PhotoView. Change-Id: I5642266adbc248c0b8eda48ddc29558ae9cbd21e
es/layout/photoeditor_flip_view.xml
|
7b62f4889a95406a00a4a5f25ef15f01322607eb |
20-Oct-2011 |
Yuli Huang <yuli@google.com> |
Fix b/5401109. 1. Add FlipView similar to existing RotateView. 2. Add flipPhoto() similar to existing rotatePhoto() in PhotoView, and add setRenderToFlip() in RendererUtils. 3. Make FlipAction use FlipView/PhotoView similar to how RotateAction uses RotateView/PhotoView. Change-Id: I5642266adbc248c0b8eda48ddc29558ae9cbd21e
es/layout/photoeditor_flip_view.xml
rc/com/android/gallery3d/photoeditor/PhotoView.java
rc/com/android/gallery3d/photoeditor/RendererUtils.java
rc/com/android/gallery3d/photoeditor/actions/EffectToolFactory.java
rc/com/android/gallery3d/photoeditor/actions/FlipAction.java
rc/com/android/gallery3d/photoeditor/actions/FlipView.java
rc/com/android/gallery3d/photoeditor/actions/RotateAction.java
rc/com/android/gallery3d/photoeditor/actions/RotateView.java
rc/com/android/gallery3d/photoeditor/actions/StraightenAction.java
|
2707f9e2717924461d968c0ea4c1e1a508ecb5ca |
20-Oct-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
5c1a2afe1681a9c992f557f4b439efa5a87527d0 |
20-Oct-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
2a4b78a77f189ec01f6aab04d19ee99ed96c0e3a |
20-Oct-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
fe21998b61a8f385707bd457f43dbb2dfe16624d |
20-Oct-2011 |
Owen Lin <owenlin@google.com> |
am dba62bd5: am a77f6c46: Fix the issue that cropping wrong region for protrait image. * commit 'dba62bd578151ed135f7455cb26dd8126d0926f3': Fix the issue that cropping wrong region for protrait image.
|
64dbda50d5a05842b2f793bf6c0d3d9c88a7d587 |
20-Oct-2011 |
Owen Lin <owenlin@google.com> |
am a77f6c46: Fix the issue that cropping wrong region for protrait image. * commit 'a77f6c46815195c8a2a39c9539163ea3e8683b5d': Fix the issue that cropping wrong region for protrait image.
|
dba62bd578151ed135f7455cb26dd8126d0926f3 |
20-Oct-2011 |
Owen Lin <owenlin@google.com> |
am a77f6c46: Fix the issue that cropping wrong region for protrait image. * commit 'a77f6c46815195c8a2a39c9539163ea3e8683b5d': Fix the issue that cropping wrong region for protrait image.
|
c1965fc2a109cf9d267b161800356c0dc4326cf0 |
19-Oct-2011 |
Owen Lin <owenlin@google.com> |
Fix the issue that cropping wrong region for protrait image. Change-Id: Iea7a3874eb7170f8cae943c00cf92669a92b0ae2 fix: 5470203
rc/com/android/gallery3d/app/CropImage.java
|
a77f6c46815195c8a2a39c9539163ea3e8683b5d |
19-Oct-2011 |
Owen Lin <owenlin@google.com> |
Fix the issue that cropping wrong region for protrait image. Change-Id: Iea7a3874eb7170f8cae943c00cf92669a92b0ae2 fix: 5470203
rc/com/android/gallery3d/app/CropImage.java
|
089e58b3e8b8d1ebbedb99ffe3cdec73ae906337 |
19-Oct-2011 |
Ray Chen <raychen@google.com> |
am a67a9bc8: am c0ba0936: Fix 5418759 User should be able to view only the preview of that attached * commit 'a67a9bc86f1e1029fd69724480ab7e15e766f1f8': Fix 5418759 User should be able to view only the preview of that attached
|
82d1bb02f8e29e8364b26acde6f28d0c4e0dd338 |
19-Oct-2011 |
Ray Chen <raychen@google.com> |
am c0ba0936: Fix 5418759 User should be able to view only the preview of that attached * commit 'c0ba0936bac7d56b92a409380c4d378ed2c272b0': Fix 5418759 User should be able to view only the preview of that attached
|
a67a9bc86f1e1029fd69724480ab7e15e766f1f8 |
19-Oct-2011 |
Ray Chen <raychen@google.com> |
am c0ba0936: Fix 5418759 User should be able to view only the preview of that attached * commit 'c0ba0936bac7d56b92a409380c4d378ed2c272b0': Fix 5418759 User should be able to view only the preview of that attached
|
c0ba0936bac7d56b92a409380c4d378ed2c272b0 |
19-Oct-2011 |
Ray Chen <raychen@google.com> |
Fix 5418759 User should be able to view only the preview of that attached Change-Id: Ie3eb2583f7753fc38db3d59aca544a95112010c7
rc/com/android/gallery3d/app/Gallery.java
|
1ce57c4093b75959ccff03bff9027d9cc8902c4a |
19-Oct-2011 |
Ray Chen <raychen@google.com> |
Fix 5418759 User should be able to view only the preview of that attached Change-Id: Ie3eb2583f7753fc38db3d59aca544a95112010c7
rc/com/android/gallery3d/app/Gallery.java
|
712579b261d1d02aef8dc25fd56926382f3f9c93 |
19-Oct-2011 |
Wei Huang <weih@google.com> |
am e2c46afe: am 6172a060: Merge "Fix a IllegalArgumentException in Gallery 0 not in (0, 0)" into ics-mr0 * commit 'e2c46afe6fb2ae2424f8440fc1af374b894a91a5': Fix a IllegalArgumentException in Gallery 0 not in (0, 0)
|
c0755d0b8f17f56604374236262137ee8071d255 |
19-Oct-2011 |
Wei Huang <weih@google.com> |
am 6172a060: Merge "Fix a IllegalArgumentException in Gallery 0 not in (0, 0)" into ics-mr0 * commit '6172a060689e424ad089594abd5ef1761f6f2ed3': Fix a IllegalArgumentException in Gallery 0 not in (0, 0)
|
e2c46afe6fb2ae2424f8440fc1af374b894a91a5 |
19-Oct-2011 |
Wei Huang <weih@google.com> |
am 6172a060: Merge "Fix a IllegalArgumentException in Gallery 0 not in (0, 0)" into ics-mr0 * commit '6172a060689e424ad089594abd5ef1761f6f2ed3': Fix a IllegalArgumentException in Gallery 0 not in (0, 0)
|
6172a060689e424ad089594abd5ef1761f6f2ed3 |
19-Oct-2011 |
Wei Huang <weih@google.com> |
Merge "Fix a IllegalArgumentException in Gallery 0 not in (0, 0)" into ics-mr0
|
2c6f312f908f863b93226fafab127a8f69d9d49a |
19-Oct-2011 |
Wei Huang <weih@google.com> |
Merge "Fix a IllegalArgumentException in Gallery 0 not in (0, 0)" into ics-mr0
|
7cdcdfcfcb86f40c1dd91c709905126c958f073a |
19-Oct-2011 |
Chih-Chung Chang <chihchung@google.com> |
am 655a9133: am d82ac818: Merge "Fix 5424444: Add code to save cropped image for non-local, non-picasa cases." into ics-mr0 * commit '655a9133b682752a9611bd1d1c6709eda1dedc1f': Fix 5424444: Add code to save cropped image for non-local, non-picasa cases.
|
3c6da1fb74d0843b27ba424b75b25d18b0e58eb2 |
19-Oct-2011 |
Chih-Chung Chang <chihchung@google.com> |
am d82ac818: Merge "Fix 5424444: Add code to save cropped image for non-local, non-picasa cases." into ics-mr0 * commit 'd82ac818b88f0755d0515b282445ac1752976140': Fix 5424444: Add code to save cropped image for non-local, non-picasa cases.
|
655a9133b682752a9611bd1d1c6709eda1dedc1f |
19-Oct-2011 |
Chih-Chung Chang <chihchung@google.com> |
am d82ac818: Merge "Fix 5424444: Add code to save cropped image for non-local, non-picasa cases." into ics-mr0 * commit 'd82ac818b88f0755d0515b282445ac1752976140': Fix 5424444: Add code to save cropped image for non-local, non-picasa cases.
|
9ff956f41b3787e7243a4873623af358d97e7102 |
19-Oct-2011 |
Ray Chen <raychen@google.com> |
am 0d94b210: resolved conflicts for merge of 71c8cbb7 to master * commit '0d94b210dfee1376a11aa53d07a7051a8c181787': Fix 5213252 [UI] Updated action bar layouts and action orders
|
1840ac207cc65db8e730ac601e75994a63e969ef |
19-Oct-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
03e61f42615a8d032bb022880a697584ff593549 |
19-Oct-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
46a6e22cff2b6893bc550f0fa77459bac542f985 |
19-Oct-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
d82ac818b88f0755d0515b282445ac1752976140 |
19-Oct-2011 |
Chih-Chung Chang <chihchung@google.com> |
Merge "Fix 5424444: Add code to save cropped image for non-local, non-picasa cases." into ics-mr0
|
3f1b6d96f5f377c8ec53bdfb0d28a3840dd016d0 |
19-Oct-2011 |
Ray Chen <raychen@google.com> |
resolved conflicts for merge of 71c8cbb7 to master Change-Id: Ia5dc7bc54bba46218a53959076777e695ebb9dfe
|
0d94b210dfee1376a11aa53d07a7051a8c181787 |
19-Oct-2011 |
Ray Chen <raychen@google.com> |
resolved conflicts for merge of 71c8cbb7 to master Change-Id: Ia5dc7bc54bba46218a53959076777e695ebb9dfe
|
134400a3516daf907c25f678c0535e57e171f418 |
19-Oct-2011 |
Chih-Chung Chang <chihchung@google.com> |
am fbfa7336: am bd47a5c6: Fix 5352588: Accept view intent without URI. * commit 'fbfa73361299c5a2284a5aaae8c2b824fd493cd9': Fix 5352588: Accept view intent without URI.
|
71c8cbb746e34c36d643dcd96eb83aef72faa03f |
19-Oct-2011 |
Ray Chen <raychen@google.com> |
Merge "Fix 5213252 [UI] Updated action bar layouts and action orders" into ics-mr0
|
318d78ca0b69cb8dffb200e6ae563501d9847bf5 |
19-Oct-2011 |
Chih-Chung Chang <chihchung@google.com> |
am bd47a5c6: Fix 5352588: Accept view intent without URI. * commit 'bd47a5c6bcdcb127adb13c454fec00d4989c50b6': Fix 5352588: Accept view intent without URI.
|
fbfa73361299c5a2284a5aaae8c2b824fd493cd9 |
19-Oct-2011 |
Chih-Chung Chang <chihchung@google.com> |
am bd47a5c6: Fix 5352588: Accept view intent without URI. * commit 'bd47a5c6bcdcb127adb13c454fec00d4989c50b6': Fix 5352588: Accept view intent without URI.
|
6156a86c4c2232165575b243a284ff10a87f1663 |
19-Oct-2011 |
Chih-Chung Chang <chihchung@google.com> |
Fix 5424444: Add code to save cropped image for non-local, non-picasa cases. Change-Id: Ib9f780f71fc9c50fa68a03ebb49f1bd007ca333d
rc/com/android/gallery3d/app/CropImage.java
|
ec3e885cfd25d02b3d140258e0c439811c5bd9b6 |
19-Oct-2011 |
Chih-Chung Chang <chihchung@google.com> |
Fix 5424444: Add code to save cropped image for non-local, non-picasa cases. Change-Id: Ib9f780f71fc9c50fa68a03ebb49f1bd007ca333d
rc/com/android/gallery3d/app/CropImage.java
|
2612ce8d1ae5c3b363c2bc66f52020eba4138a1b |
19-Oct-2011 |
Ray Chen <raychen@google.com> |
Fix 5213252 [UI] Updated action bar layouts and action orders Change-Id: I46e993014e578be2e948ecea775522abc2f38a46
es/menu/operation.xml
es/menu/photo.xml
|
8366827e73b3d0d9883b1bec09aa84595b85f460 |
19-Oct-2011 |
Ray Chen <raychen@google.com> |
Fix 5213252 [UI] Updated action bar layouts and action orders Change-Id: I46e993014e578be2e948ecea775522abc2f38a46
es/menu/operation.xml
es/menu/photo.xml
|
bd47a5c6bcdcb127adb13c454fec00d4989c50b6 |
18-Oct-2011 |
Chih-Chung Chang <chihchung@google.com> |
Fix 5352588: Accept view intent without URI. Change-Id: I719fd853b66c05c4fdbe70ff97993b9487997694
rc/com/android/gallery3d/app/Gallery.java
rc/com/android/gallery3d/util/GalleryUtils.java
|
fff46c04cffa09f37cc45d53ad3ddc7b020d20df |
18-Oct-2011 |
Chih-Chung Chang <chihchung@google.com> |
Fix 5352588: Accept view intent without URI. Change-Id: I719fd853b66c05c4fdbe70ff97993b9487997694
rc/com/android/gallery3d/app/Gallery.java
rc/com/android/gallery3d/util/GalleryUtils.java
|
24961676cd836d0bf669f57707c589d45dd08bd7 |
19-Oct-2011 |
Eric Fischer <enf@google.com> |
am 2a622069: Merge "Import revised translations." * commit '2a622069281b7b1211db53d787f0cc7d29a5b0bb': Import revised translations.
|
a0a967bf115fe4a132d59ef01357f3937fa82dd2 |
19-Oct-2011 |
Eric Fischer <enf@google.com> |
Merge "Import revised translations."
|
2a622069281b7b1211db53d787f0cc7d29a5b0bb |
19-Oct-2011 |
Eric Fischer <enf@google.com> |
Merge "Import revised translations."
|
e5f874152e42faead1e7e94084e4ca2890d5e714 |
19-Oct-2011 |
Eric Fischer <enf@google.com> |
Import revised translations. Change-Id: I69c2e0260f7f3951bb61c2073744a682696f02a2
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/photoeditor_strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/photoeditor_strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/photoeditor_strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/photoeditor_strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/photoeditor_strings.xml
es/values-ko/strings.xml
es/values-lt/photoeditor_strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/photoeditor_strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/photoeditor_strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/photoeditor_strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/photoeditor_strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/photoeditor_strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
4bf0a253f36fb501aea9c0ef3032a3a5dff0ba68 |
19-Oct-2011 |
Eric Fischer <enf@google.com> |
Import revised translations. Change-Id: I69c2e0260f7f3951bb61c2073744a682696f02a2
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/photoeditor_strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/photoeditor_strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/photoeditor_strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/photoeditor_strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/photoeditor_strings.xml
es/values-ko/strings.xml
es/values-lt/photoeditor_strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/photoeditor_strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/photoeditor_strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/photoeditor_strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/photoeditor_strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/photoeditor_strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
2a782fd1a84e659f69a7d9aab62c1fe8ac46aee3 |
18-Oct-2011 |
Eric Fischer <enf@google.com> |
am ebf95089: (-s ours) am c4d49226: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr0 * commit 'ebf950894c9c5698bb00e511c500e79d9d866839': Import revised translations. DO NOT MERGE
|
0706f039bb33579837ae91e02fc112d634ad1354 |
18-Oct-2011 |
Eric Fischer <enf@google.com> |
am c4d49226: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr0 * commit 'c4d4922645bbd1fdfed782f452801be52834374f': Import revised translations. DO NOT MERGE
|
ebf950894c9c5698bb00e511c500e79d9d866839 |
18-Oct-2011 |
Eric Fischer <enf@google.com> |
am c4d49226: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr0 * commit 'c4d4922645bbd1fdfed782f452801be52834374f': Import revised translations. DO NOT MERGE
|
27ec755b7e47dccc033f46d118a7e7ecc4aa1fce |
18-Oct-2011 |
Eric Fischer <enf@google.com> |
Merge "Import revised translations. DO NOT MERGE" into ics-mr0
|
c4d4922645bbd1fdfed782f452801be52834374f |
18-Oct-2011 |
Eric Fischer <enf@google.com> |
Merge "Import revised translations. DO NOT MERGE" into ics-mr0
|
58d83a5607eef166b09638b75449d2b6f7585ddd |
18-Oct-2011 |
Eric Fischer <enf@google.com> |
Import revised translations. DO NOT MERGE Change-Id: I84cd15d12f87d2a1aa7ef5703458e1e8a085358e
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/photoeditor_strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/photoeditor_strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/photoeditor_strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/photoeditor_strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/photoeditor_strings.xml
es/values-ko/strings.xml
es/values-lt/photoeditor_strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/photoeditor_strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/photoeditor_strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/photoeditor_strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/photoeditor_strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/photoeditor_strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
1eedb93dc9334f7b1d2d1d29829b3ba1ea16cd91 |
18-Oct-2011 |
Eric Fischer <enf@google.com> |
Import revised translations. DO NOT MERGE Change-Id: I84cd15d12f87d2a1aa7ef5703458e1e8a085358e
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/photoeditor_strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/photoeditor_strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/photoeditor_strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/photoeditor_strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/photoeditor_strings.xml
es/values-ko/strings.xml
es/values-lt/photoeditor_strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/photoeditor_strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/photoeditor_strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/photoeditor_strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/photoeditor_strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/photoeditor_strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
8abd544f9476803e8b03b7d4979f49f9c3387597 |
18-Oct-2011 |
Evan Millar <emillar@google.com> |
am 464efe50: am 9905668f: Merge "New widget preview assets" into ics-mr0 * commit '464efe506e5f4230cb1ed4d2a6e1aa77b2a34778': New widget preview assets
|
3383a5ea1d0726a2a36d5c245ec12aa4192fdaff |
18-Oct-2011 |
Evan Millar <emillar@google.com> |
am 9905668f: Merge "New widget preview assets" into ics-mr0 * commit '9905668f4cd39dd9dc8875178afddb6f1f6bfe61': New widget preview assets
|
464efe506e5f4230cb1ed4d2a6e1aa77b2a34778 |
18-Oct-2011 |
Evan Millar <emillar@google.com> |
am 9905668f: Merge "New widget preview assets" into ics-mr0 * commit '9905668f4cd39dd9dc8875178afddb6f1f6bfe61': New widget preview assets
|
d1002f6c92d5b5954831cbf21bef74f892fc485b |
18-Oct-2011 |
Evan Millar <emillar@google.com> |
Merge "New widget preview assets" into ics-mr0
|
9905668f4cd39dd9dc8875178afddb6f1f6bfe61 |
18-Oct-2011 |
Evan Millar <emillar@google.com> |
Merge "New widget preview assets" into ics-mr0
|
f0ab80f8749b4a72eae05296c0fc51316eea9c4a |
18-Oct-2011 |
Evan Millar <emillar@google.com> |
New widget preview assets Bug:5462438 Change-Id: I84efb185c7eb5647544cacf11f2d70fc6fad3498
es/drawable-hdpi/preview.png
es/drawable-mdpi/preview.png
es/drawable-xhdpi/preview.png
|
7dd61b34bb8dd8f99e36e678db37bf8d3143b7b1 |
18-Oct-2011 |
Evan Millar <emillar@google.com> |
New widget preview assets Bug:5462438 Change-Id: I84efb185c7eb5647544cacf11f2d70fc6fad3498
es/drawable-hdpi/preview.png
es/drawable-mdpi/preview.png
es/drawable-xhdpi/preview.png
|
bcd8293f8cdbf11f50ad6a50dbb179498cd5fdd5 |
18-Oct-2011 |
Yuli Huang <yuli@google.com> |
am 7204500d: am 07a3b570: Merge "Fix b/5403449." into ics-mr0 * commit '7204500d76ecb297df6df81509ce9258f8e50038': Fix b/5403449.
|
97bc33f5a2c114d922d466c4e0d984ea3254f9c9 |
18-Oct-2011 |
Yuli Huang <yuli@google.com> |
am 07a3b570: Merge "Fix b/5403449." into ics-mr0 * commit '07a3b57049665faf56f2c65b3310143a4ef464e7': Fix b/5403449.
|
9d7212f4e0a3e3651dd10afebb332b6b1380d62c |
18-Oct-2011 |
Yuli Huang <yuli@google.com> |
am 07a3b570: Merge "Fix b/5403449." into ics-mr0 * commit '07a3b57049665faf56f2c65b3310143a4ef464e7': Fix b/5403449.
|
7204500d76ecb297df6df81509ce9258f8e50038 |
18-Oct-2011 |
Yuli Huang <yuli@google.com> |
am 07a3b570: Merge "Fix b/5403449." into ics-mr0 * commit '07a3b57049665faf56f2c65b3310143a4ef464e7': Fix b/5403449.
|
d96b0b6334052bded3ccaf3596019df574300faf |
18-Oct-2011 |
Yuli Huang <yuli@google.com> |
Merge "Fix b/5403449." into ics-mr0
|
9280f5a3a175f2fdaa461116f11d1f8c09d96975 |
18-Oct-2011 |
Yuli Huang <yuli@google.com> |
Merge "Fix b/5403449." into ics-mr0
|
07a3b57049665faf56f2c65b3310143a4ef464e7 |
18-Oct-2011 |
Yuli Huang <yuli@google.com> |
Merge "Fix b/5403449." into ics-mr0
|
7f3b206a27424cc1ef1d57de4572da4da9cbeb23 |
18-Oct-2011 |
Wei Huang <weih@google.com> |
am 74148092: am 40ac84e6: Merge "Fix NPE while flipping through pictures." into ics-mr0 * commit '7414809287319140eca0bb89e691141f198eb171': Fix NPE while flipping through pictures.
|
84cf00f0791b33276c3b407208de5a2399b81fa3 |
18-Oct-2011 |
Chih-Chung Chang <chihchung@google.com> |
am f9c4464d: am 209a9163: Fix 5393669: New Player Control UI. * commit 'f9c4464d8aa366e9c7dc91493fcd8bfe2084277a': Fix 5393669: New Player Control UI.
|
3b671ed16b2bdf2d63038c045edb08d7316067e2 |
18-Oct-2011 |
Wei Huang <weih@google.com> |
am 40ac84e6: Merge "Fix NPE while flipping through pictures." into ics-mr0 * commit '40ac84e663e89a25540751075db1ff597124de66': Fix NPE while flipping through pictures.
|
7414809287319140eca0bb89e691141f198eb171 |
18-Oct-2011 |
Wei Huang <weih@google.com> |
am 40ac84e6: Merge "Fix NPE while flipping through pictures." into ics-mr0 * commit '40ac84e663e89a25540751075db1ff597124de66': Fix NPE while flipping through pictures.
|
9866c3f38c9f48ae81902140254ac66ea94d6c01 |
18-Oct-2011 |
Chih-Chung Chang <chihchung@google.com> |
am 209a9163: Fix 5393669: New Player Control UI. * commit '209a9163d4e8cee0bfe162ae598ef40e6051479c': Fix 5393669: New Player Control UI.
|
f9c4464d8aa366e9c7dc91493fcd8bfe2084277a |
18-Oct-2011 |
Chih-Chung Chang <chihchung@google.com> |
am 209a9163: Fix 5393669: New Player Control UI. * commit '209a9163d4e8cee0bfe162ae598ef40e6051479c': Fix 5393669: New Player Control UI.
|
d9d6d481276656dfae1c377f829a4e9220735aaf |
18-Oct-2011 |
Chih-Chung Chang <chihchung@google.com> |
am 209a9163: Fix 5393669: New Player Control UI. * commit '209a9163d4e8cee0bfe162ae598ef40e6051479c': Fix 5393669: New Player Control UI.
|
828fc0990b7a82613083511893de28f7ea367771 |
18-Oct-2011 |
Wei Huang <weih@google.com> |
Merge "Fix NPE while flipping through pictures." into ics-mr0
|
40ac84e663e89a25540751075db1ff597124de66 |
18-Oct-2011 |
Wei Huang <weih@google.com> |
Merge "Fix NPE while flipping through pictures." into ics-mr0
|
dd46fe623b16ba14c70a539b7599cc75c7799612 |
18-Oct-2011 |
Owen Lin <owenlin@google.com> |
Fix a IllegalArgumentException in Gallery 0 not in (0, 0) fix: 5379253 We add a hack to prevent flush out cached data. But the hack will leave the content window in an invalid values. Change-Id: I3ed1527b9ee9023b07ca44cafc27510ef9f08d59
rc/com/android/gallery3d/ui/AlbumSetSlidingWindow.java
rc/com/android/gallery3d/ui/AlbumSetView.java
rc/com/android/gallery3d/ui/AlbumSlidingWindow.java
rc/com/android/gallery3d/ui/AlbumView.java
|
d1d573b15391b54a3b36e603d08929c23ce1c4f4 |
18-Oct-2011 |
Owen Lin <owenlin@google.com> |
Fix a IllegalArgumentException in Gallery 0 not in (0, 0) fix: 5379253 We add a hack to prevent flush out cached data. But the hack will leave the content window in an invalid values. Change-Id: I3ed1527b9ee9023b07ca44cafc27510ef9f08d59
rc/com/android/gallery3d/ui/AlbumSetSlidingWindow.java
rc/com/android/gallery3d/ui/AlbumSetView.java
rc/com/android/gallery3d/ui/AlbumSlidingWindow.java
rc/com/android/gallery3d/ui/AlbumView.java
|
2e4790ceb28294ccc0fa7456ca379d9e902e7d98 |
18-Oct-2011 |
Owen Lin <owenlin@google.com> |
Fix NPE while flipping through pictures. Add a DECODE_FAIL state to Tile's lifecycle. fix: 5376092 Change-Id: I26ff946d5435f12a6ee84c80f07255cf8327ef32
rc/com/android/gallery3d/ui/TileImageView.java
rc/com/android/gallery3d/ui/TileImageViewAdapter.java
|
1b2cfc142830875991dd190f163ad14af66d9e11 |
18-Oct-2011 |
Owen Lin <owenlin@google.com> |
Fix NPE while flipping through pictures. Add a DECODE_FAIL state to Tile's lifecycle. fix: 5376092 Change-Id: I26ff946d5435f12a6ee84c80f07255cf8327ef32
rc/com/android/gallery3d/ui/TileImageView.java
rc/com/android/gallery3d/ui/TileImageViewAdapter.java
|
306f9d2b11f65e8ff35ad707a0d85c66c34b0c8b |
17-Oct-2011 |
Yuli Huang <yuli@google.com> |
Fix b/5403449. 1. Extract code that recreates/restores ActionBar as RestorableView, and make both ActionBar and EffectsMenu extend RestorableView. 2. Fix effects-menu buttons too close to each other. 3. Remove effects-menu buttons' highlight animations to look more responsive. Change-Id: I68e5bdcde702e611ccced5e169852c0e58a949fc
rc/com/android/gallery3d/photoeditor/ActionBar.java
rc/com/android/gallery3d/photoeditor/EffectsBar.java
rc/com/android/gallery3d/photoeditor/EffectsMenu.java
rc/com/android/gallery3d/photoeditor/PhotoEditor.java
rc/com/android/gallery3d/photoeditor/RestorableView.java
|
5ac228e7d9a7e57d8c3bfa9dca08378762aa8b47 |
17-Oct-2011 |
Yuli Huang <yuli@google.com> |
Fix b/5403449. 1. Extract code that recreates/restores ActionBar as RestorableView, and make both ActionBar and EffectsMenu extend RestorableView. 2. Fix effects-menu buttons too close to each other. 3. Remove effects-menu buttons' highlight animations to look more responsive. Change-Id: I68e5bdcde702e611ccced5e169852c0e58a949fc
es/drawable/photoeditor_toggle_button_background.xml
es/layout/photoeditor_actionbar.xml
es/layout/photoeditor_effects_menu.xml
es/layout/photoeditor_main.xml
es/values-sw320dp/photoeditor_dimens.xml
es/values-sw600dp/photoeditor_dimens.xml
es/values-sw800dp/photoeditor_dimens.xml
es/values/photoeditor_styles.xml
|
b5c54b675f6216659b04904661e39dc1b84cb403 |
17-Oct-2011 |
Yuli Huang <yuli@google.com> |
Fix b/5403449. 1. Extract code that recreates/restores ActionBar as RestorableView, and make both ActionBar and EffectsMenu extend RestorableView. 2. Fix effects-menu buttons too close to each other. 3. Remove effects-menu buttons' highlight animations to look more responsive. Change-Id: I68e5bdcde702e611ccced5e169852c0e58a949fc
es/drawable/photoeditor_toggle_button_background.xml
es/layout/photoeditor_actionbar.xml
es/layout/photoeditor_effects_menu.xml
es/layout/photoeditor_main.xml
es/values-sw320dp/photoeditor_dimens.xml
es/values-sw600dp/photoeditor_dimens.xml
es/values-sw800dp/photoeditor_dimens.xml
es/values/photoeditor_styles.xml
rc/com/android/gallery3d/photoeditor/ActionBar.java
rc/com/android/gallery3d/photoeditor/EffectsBar.java
rc/com/android/gallery3d/photoeditor/EffectsMenu.java
rc/com/android/gallery3d/photoeditor/PhotoEditor.java
rc/com/android/gallery3d/photoeditor/RestorableView.java
|
26d36b4322b08b1c9d6a25cc1478a7241b744b23 |
14-Oct-2011 |
Chih-Chung Chang <chihchung@google.com> |
Fix 5393669: New Player Control UI. Change-Id: I1aa310eee3b7715dbefea6b2f24e6f32481db49c
es/anim/player_out.xml
es/drawable-hdpi/bg_vidcontrol.png
es/drawable-hdpi/ic_vidcontrol_pause.png
es/drawable-hdpi/ic_vidcontrol_play.png
es/drawable-hdpi/ic_vidcontrol_reload.png
es/drawable-hdpi/scrubber_knob.png
es/drawable-mdpi/bg_vidcontrol.png
es/drawable-mdpi/ic_vidcontrol_pause.png
es/drawable-mdpi/ic_vidcontrol_play.png
es/drawable-mdpi/ic_vidcontrol_reload.png
es/drawable-mdpi/scrubber_knob.png
es/drawable-sw600dp-mdpi/bg_vidcontrol.png
es/drawable-sw600dp-mdpi/ic_vidcontrol_pause.png
es/drawable-sw600dp-mdpi/ic_vidcontrol_play.png
es/drawable-sw600dp-mdpi/ic_vidcontrol_reload.png
es/drawable-sw600dp-mdpi/scrubber_knob.png
es/drawable-sw600dp/bg_vidcontrol.png
es/drawable-sw600dp/ic_vidcontrol_pause.png
es/drawable-sw600dp/ic_vidcontrol_play.png
es/drawable-sw600dp/ic_vidcontrol_reload.png
es/drawable-sw600dp/scrubber_knob.png
es/drawable-xhdpi/bg_vidcontrol.png
es/drawable-xhdpi/ic_vidcontrol_pause.png
es/drawable-xhdpi/ic_vidcontrol_play.png
es/drawable-xhdpi/ic_vidcontrol_reload.png
es/drawable-xhdpi/scrubber_knob.png
es/layout/movie_view.xml
es/values/styles.xml
|
209a9163d4e8cee0bfe162ae598ef40e6051479c |
14-Oct-2011 |
Chih-Chung Chang <chihchung@google.com> |
Fix 5393669: New Player Control UI. Change-Id: I1aa310eee3b7715dbefea6b2f24e6f32481db49c
es/anim/player_out.xml
es/drawable-hdpi/bg_vidcontrol.png
es/drawable-hdpi/ic_vidcontrol_pause.png
es/drawable-hdpi/ic_vidcontrol_play.png
es/drawable-hdpi/ic_vidcontrol_reload.png
es/drawable-hdpi/scrubber_knob.png
es/drawable-mdpi/bg_vidcontrol.png
es/drawable-mdpi/ic_vidcontrol_pause.png
es/drawable-mdpi/ic_vidcontrol_play.png
es/drawable-mdpi/ic_vidcontrol_reload.png
es/drawable-mdpi/scrubber_knob.png
es/drawable-sw600dp-mdpi/bg_vidcontrol.png
es/drawable-sw600dp-mdpi/ic_vidcontrol_pause.png
es/drawable-sw600dp-mdpi/ic_vidcontrol_play.png
es/drawable-sw600dp-mdpi/ic_vidcontrol_reload.png
es/drawable-sw600dp-mdpi/scrubber_knob.png
es/drawable-sw600dp/bg_vidcontrol.png
es/drawable-sw600dp/ic_vidcontrol_pause.png
es/drawable-sw600dp/ic_vidcontrol_play.png
es/drawable-sw600dp/ic_vidcontrol_reload.png
es/drawable-sw600dp/scrubber_knob.png
es/drawable-xhdpi/bg_vidcontrol.png
es/drawable-xhdpi/ic_vidcontrol_pause.png
es/drawable-xhdpi/ic_vidcontrol_play.png
es/drawable-xhdpi/ic_vidcontrol_reload.png
es/drawable-xhdpi/scrubber_knob.png
es/layout/movie_view.xml
es/values/styles.xml
rc/com/android/gallery3d/app/ControllerOverlay.java
rc/com/android/gallery3d/app/MovieActivity.java
rc/com/android/gallery3d/app/MovieControllerOverlay.java
rc/com/android/gallery3d/app/MoviePlayer.java
rc/com/android/gallery3d/app/TimeBar.java
|
6645e87b4889a96cc977cc3b35ed9d43b33de328 |
14-Oct-2011 |
Chih-Chung Chang <chihchung@google.com> |
Fix 5393669: New Player Control UI. Change-Id: I1aa310eee3b7715dbefea6b2f24e6f32481db49c
rc/com/android/gallery3d/app/ControllerOverlay.java
rc/com/android/gallery3d/app/MovieActivity.java
rc/com/android/gallery3d/app/MovieControllerOverlay.java
rc/com/android/gallery3d/app/MoviePlayer.java
rc/com/android/gallery3d/app/TimeBar.java
|
fbc41bac8ba388148365ef437ad107cbf5e4192f |
16-Oct-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
9741dead711abf3db471d8d4f3353cabfcdf12f5 |
16-Oct-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
bd891071e896ab9ca4347b057ba0857116837a6a |
16-Oct-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
b8a166ce9a781851f183092b446dc51123a69b80 |
14-Oct-2011 |
Chih-Chung Chang <chihchung@google.com> |
am 5d393ac4: am b289d441: Fix 5398768: Add requestCreateBitmapRegionDecoder for InputStream. * commit '5d393ac4b272131104b1ffe9a04e84022e63c0f0': Fix 5398768: Add requestCreateBitmapRegionDecoder for InputStream.
|
5d393ac4b272131104b1ffe9a04e84022e63c0f0 |
14-Oct-2011 |
Chih-Chung Chang <chihchung@google.com> |
am b289d441: Fix 5398768: Add requestCreateBitmapRegionDecoder for InputStream. * commit 'b289d441eb5af97ac8716479831b1a2c5fe2e878': Fix 5398768: Add requestCreateBitmapRegionDecoder for InputStream.
|
f7e81320e4db190c441743906d1ffad9c0826bf0 |
14-Oct-2011 |
Chih-Chung Chang <chihchung@google.com> |
am b289d441: Fix 5398768: Add requestCreateBitmapRegionDecoder for InputStream. * commit 'b289d441eb5af97ac8716479831b1a2c5fe2e878': Fix 5398768: Add requestCreateBitmapRegionDecoder for InputStream.
|
b289d441eb5af97ac8716479831b1a2c5fe2e878 |
14-Oct-2011 |
Chih-Chung Chang <chihchung@google.com> |
Fix 5398768: Add requestCreateBitmapRegionDecoder for InputStream. Change-Id: Ied273ffbabc134fdd930e6415fc175a6221eb662
rc/com/android/gallery3d/data/DecodeUtils.java
|
903bb336e915b6c7ce560dd8a2c2722ae5fa3bf5 |
14-Oct-2011 |
Chih-Chung Chang <chihchung@google.com> |
Fix 5398768: Add requestCreateBitmapRegionDecoder for InputStream. Change-Id: Ied273ffbabc134fdd930e6415fc175a6221eb662
rc/com/android/gallery3d/data/DecodeUtils.java
|
daea94a6a3d333e3a5302ff77aec3d9da4185ddf |
13-Oct-2011 |
Yuli Huang <yuli@google.com> |
am 8c4db782: am 85bc435c: Fix UI. * commit '8c4db782ebc7b8132b474844589936f547b09368': Fix UI.
|
cc3d62ea11100086f9f9169b5eed5e1c1b88935e |
13-Oct-2011 |
Yuli Huang <yuli@google.com> |
am 85bc435c: Fix UI. * commit '85bc435c06ace72f5da72475e9b03b0ada9455e0': Fix UI.
|
8c4db782ebc7b8132b474844589936f547b09368 |
13-Oct-2011 |
Yuli Huang <yuli@google.com> |
am 85bc435c: Fix UI. * commit '85bc435c06ace72f5da72475e9b03b0ada9455e0': Fix UI.
|
e8fd92235fb40a3302ea7219c7c5c17f8ac32a29 |
13-Oct-2011 |
Yuli Huang <yuli@google.com> |
am 85bc435c: Fix UI. * commit '85bc435c06ace72f5da72475e9b03b0ada9455e0': Fix UI.
|
ad3229857bd9585129824b0bffa966bfbc2e8a3c |
13-Oct-2011 |
Yuli Huang <yuli@google.com> |
Fix UI. 1. Replace slider assets on tablets. 2. Add face-tan effect icon. 3. Change orange color to blue color in straighten effect to be consistent with crop effect. Change-Id: I073dea539d68d2a3d7782a520daa911879bc41cd
es/drawable-sw600dp/photoeditor_scale_seekbar_color.png
es/drawable-sw600dp/photoeditor_scale_seekbar_generic.png
es/drawable-sw600dp/photoeditor_scale_seekbar_light.png
es/drawable-sw600dp/photoeditor_scale_seekbar_shadow.png
es/drawable/photoeditor_effect_facetan.png
es/values-sw600dp/photoeditor_dimens.xml
es/values-sw800dp/photoeditor_dimens.xml
es/values/photoeditor_colors.xml
|
85bc435c06ace72f5da72475e9b03b0ada9455e0 |
13-Oct-2011 |
Yuli Huang <yuli@google.com> |
Fix UI. 1. Replace slider assets on tablets. 2. Add face-tan effect icon. 3. Change orange color to blue color in straighten effect to be consistent with crop effect. Change-Id: I073dea539d68d2a3d7782a520daa911879bc41cd
es/drawable-sw600dp/photoeditor_scale_seekbar_color.png
es/drawable-sw600dp/photoeditor_scale_seekbar_generic.png
es/drawable-sw600dp/photoeditor_scale_seekbar_light.png
es/drawable-sw600dp/photoeditor_scale_seekbar_shadow.png
es/drawable/photoeditor_effect_facetan.png
es/values-sw600dp/photoeditor_dimens.xml
es/values-sw800dp/photoeditor_dimens.xml
es/values/photoeditor_colors.xml
rc/com/android/gallery3d/photoeditor/actions/CropView.java
rc/com/android/gallery3d/photoeditor/actions/RotateView.java
|
c22d67d46f1d7dbf3f77f4ec597c0cc3752a1ce6 |
13-Oct-2011 |
Yuli Huang <yuli@google.com> |
Fix UI. 1. Replace slider assets on tablets. 2. Add face-tan effect icon. 3. Change orange color to blue color in straighten effect to be consistent with crop effect. Change-Id: I073dea539d68d2a3d7782a520daa911879bc41cd
rc/com/android/gallery3d/photoeditor/actions/CropView.java
rc/com/android/gallery3d/photoeditor/actions/RotateView.java
|
e31acf58e3c33cb227d5cd342e31f2675bcad273 |
13-Oct-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
b8abb20d2c1462c018068d566f5dd55087a39cd3 |
13-Oct-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
3dd733592b8da6b79f885ec80e78bf08666a269d |
13-Oct-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
56e1ae6cf7e0322e02860007cfee768fbdac2f5e |
13-Oct-2011 |
Ray Chen <raychen@google.com> |
am 9170edf4: Fix 5417248 Gallery shows Details for the same video no matter which is selected * commit '9170edf4071e0ef4a64e9af579a1e711447cfcfc': Fix 5417248 Gallery shows Details for the same video no matter which is selected
|
9170edf4071e0ef4a64e9af579a1e711447cfcfc |
06-Oct-2011 |
Ray Chen <raychen@google.com> |
Fix 5417248 Gallery shows Details for the same video no matter which is selected Change-Id: If221ac3d22adfd3a47d98923dab5c4c1e5ca263d
rc/com/android/gallery3d/app/AlbumPage.java
|
83046ac7bbc8862ec082380af8d63fac179fec80 |
06-Oct-2011 |
Ray Chen <raychen@google.com> |
Fix 5417248 Gallery shows Details for the same video no matter which is selected Change-Id: If221ac3d22adfd3a47d98923dab5c4c1e5ca263d
rc/com/android/gallery3d/app/AlbumPage.java
|
871b5c0499bb3a42f3d7c49df408fb52b0abb371 |
13-Oct-2011 |
Chih-Chung Chang <chihchung@google.com> |
am 9eaa4fc0: am 532d93ca: Fix 5254974: Add EdgeEffect for PhotoView. * commit '9eaa4fc0a3d5a60e46016269339ecffc8ac320d3': Fix 5254974: Add EdgeEffect for PhotoView.
|
69c4871c4a3c2c6442cc530f561ec6279d412691 |
13-Oct-2011 |
Ray Chen <raychen@google.com> |
am de10b425: Merge "Fix 5434523 No affordance in Gallery to share a video other than long-press in album view" * commit 'de10b42515a230df7cc324ad66dd863ad0f93e3d': Fix 5434523 No affordance in Gallery to share a video other than long-press in album view
|
91631203e60aa2b91aed1ad2fb08338e7d252193 |
13-Oct-2011 |
Chih-Chung Chang <chihchung@google.com> |
am 532d93ca: Fix 5254974: Add EdgeEffect for PhotoView. * commit '532d93caddc91a7aa33ca113adbc0b8255d498eb': Fix 5254974: Add EdgeEffect for PhotoView.
|
782ad9e465b57f863c5a85784a35bb52e48484b0 |
13-Oct-2011 |
Chih-Chung Chang <chihchung@google.com> |
am 532d93ca: Fix 5254974: Add EdgeEffect for PhotoView. * commit '532d93caddc91a7aa33ca113adbc0b8255d498eb': Fix 5254974: Add EdgeEffect for PhotoView.
|
9eaa4fc0a3d5a60e46016269339ecffc8ac320d3 |
13-Oct-2011 |
Chih-Chung Chang <chihchung@google.com> |
am 532d93ca: Fix 5254974: Add EdgeEffect for PhotoView. * commit '532d93caddc91a7aa33ca113adbc0b8255d498eb': Fix 5254974: Add EdgeEffect for PhotoView.
|
de10b42515a230df7cc324ad66dd863ad0f93e3d |
13-Oct-2011 |
Ray Chen <raychen@google.com> |
Merge "Fix 5434523 No affordance in Gallery to share a video other than long-press in album view"
|
97743846165a3ceb718bb1a7b047043371f55f4c |
13-Oct-2011 |
Ray Chen <raychen@google.com> |
Merge "Fix 5434523 No affordance in Gallery to share a video other than long-press in album view"
|
6fca4a3fb1b707bfd7c9b7c65cfad086e6bc7868 |
13-Oct-2011 |
Ray Chen <raychen@google.com> |
Merge "Fix 5434523 No affordance in Gallery to share a video other than long-press in album view"
|
950ef6ed8b1b7e87a7897fefff6d0f181e89ac5d |
13-Oct-2011 |
Ray Chen <raychen@google.com> |
am 1de36a55: Merge "Fix 5413911 Gallery app does not recognize that no files are selected for delete" * commit '1de36a558a9ccb5ce798a9a0adb68601ba6e1a08': Fix 5413911 Gallery app does not recognize that no files are selected for delete
|
0cd149f98a029aa2e6162b312642998361c0bdc3 |
12-Oct-2011 |
Chih-Chung Chang <chihchung@google.com> |
Fix 5254974: Add EdgeEffect for PhotoView. Change-Id: Ib9ea8fff14a932e8ec25c3f272fe0539776bb062
es/drawable-hdpi/overscroll_edge.png
es/drawable-hdpi/overscroll_glow.png
es/drawable-mdpi/overscroll_edge.png
es/drawable-mdpi/overscroll_glow.png
es/drawable-xhdpi/overscroll_edge.png
es/drawable-xhdpi/overscroll_glow.png
|
532d93caddc91a7aa33ca113adbc0b8255d498eb |
12-Oct-2011 |
Chih-Chung Chang <chihchung@google.com> |
Fix 5254974: Add EdgeEffect for PhotoView. Change-Id: Ib9ea8fff14a932e8ec25c3f272fe0539776bb062
es/drawable-hdpi/overscroll_edge.png
es/drawable-hdpi/overscroll_glow.png
es/drawable-mdpi/overscroll_edge.png
es/drawable-mdpi/overscroll_glow.png
es/drawable-xhdpi/overscroll_edge.png
es/drawable-xhdpi/overscroll_glow.png
rc/com/android/gallery3d/ui/EdgeEffect.java
rc/com/android/gallery3d/ui/EdgeView.java
rc/com/android/gallery3d/ui/FilmStripView.java
rc/com/android/gallery3d/ui/FlingScroller.java
rc/com/android/gallery3d/ui/GLCanvasImpl.java
rc/com/android/gallery3d/ui/PhotoView.java
rc/com/android/gallery3d/ui/PositionController.java
|
be074856000e2b417425585da0b4ffb36fc45bd1 |
12-Oct-2011 |
Chih-Chung Chang <chihchung@google.com> |
Fix 5254974: Add EdgeEffect for PhotoView. Change-Id: Ib9ea8fff14a932e8ec25c3f272fe0539776bb062
rc/com/android/gallery3d/ui/EdgeEffect.java
rc/com/android/gallery3d/ui/EdgeView.java
rc/com/android/gallery3d/ui/FilmStripView.java
rc/com/android/gallery3d/ui/FlingScroller.java
rc/com/android/gallery3d/ui/GLCanvasImpl.java
rc/com/android/gallery3d/ui/PhotoView.java
rc/com/android/gallery3d/ui/PositionController.java
|
1de36a558a9ccb5ce798a9a0adb68601ba6e1a08 |
13-Oct-2011 |
Ray Chen <raychen@google.com> |
Merge "Fix 5413911 Gallery app does not recognize that no files are selected for delete"
|
d3d96db908c95c4cfff7d67f4d1cd094445001ce |
13-Oct-2011 |
Ray Chen <raychen@google.com> |
Merge "Fix 5413911 Gallery app does not recognize that no files are selected for delete"
|
d077e2524a49ea66e8d003020172b659158358f0 |
13-Oct-2011 |
Ray Chen <raychen@google.com> |
Merge "Fix 5413911 Gallery app does not recognize that no files are selected for delete"
|
fe635460a8b7d799d61f2af63c581ca468a5d6f2 |
13-Oct-2011 |
Yuli Huang <yuli@google.com> |
am da86dd40: am eb83d83d: Fix b/5392171 and b/5389281. * commit 'da86dd40880feee9167de5899b2144e4bc826425': Fix b/5392171 and b/5389281.
|
da86dd40880feee9167de5899b2144e4bc826425 |
12-Oct-2011 |
Yuli Huang <yuli@google.com> |
am eb83d83d: Fix b/5392171 and b/5389281. * commit 'eb83d83d8ce6e5b7ff7a99a5da738f251bae0f21': Fix b/5392171 and b/5389281.
|
5e38ffd51fae92b696969bddb27eddda0371f1a9 |
12-Oct-2011 |
Yuli Huang <yuli@google.com> |
am eb83d83d: Fix b/5392171 and b/5389281. * commit 'eb83d83d8ce6e5b7ff7a99a5da738f251bae0f21': Fix b/5392171 and b/5389281.
|
87838c66781e31bccb7a8fc79ab4454a14c6ea9f |
12-Oct-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
cda277494f2d1b7f97c3a6018a1999cd88ca3765 |
12-Oct-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
eb83d83d8ce6e5b7ff7a99a5da738f251bae0f21 |
11-Oct-2011 |
Yuli Huang <yuli@google.com> |
Fix b/5392171 and b/5389281. 1. Fix b/5392171 by moving effect context creation into Filter to make sure it'd be created when needed. 2. Revise the fix for b/5389281 by clearing surface background even there's no photo. Change-Id: I212a552291c7df28b75a909bf6560634ba061e9f
rc/com/android/gallery3d/photoeditor/FilterStack.java
rc/com/android/gallery3d/photoeditor/PhotoView.java
rc/com/android/gallery3d/photoeditor/RendererUtils.java
rc/com/android/gallery3d/photoeditor/filters/Filter.java
|
80481cb46180021abe0f3cf959dacca2519b9c53 |
11-Oct-2011 |
Yuli Huang <yuli@google.com> |
Fix b/5392171 and b/5389281. 1. Fix b/5392171 by moving effect context creation into Filter to make sure it'd be created when needed. 2. Revise the fix for b/5389281 by clearing surface background even there's no photo. Change-Id: I212a552291c7df28b75a909bf6560634ba061e9f
rc/com/android/gallery3d/photoeditor/FilterStack.java
rc/com/android/gallery3d/photoeditor/PhotoView.java
rc/com/android/gallery3d/photoeditor/RendererUtils.java
rc/com/android/gallery3d/photoeditor/filters/Filter.java
|
95d46db68bbd7980ddcae30b21e32ba9e56f7d9c |
11-Oct-2011 |
Wei Huang <weih@google.com> |
am 7721c70a: Merge "Fix 5421152 [UI] Selecting "Posts - <username>" as an album for Gallery widget fails" * commit '7721c70a25e2984940ed6d2044ba74df59f1f08f': Fix 5421152 [UI] Selecting "Posts - <username>" as an album for Gallery widget fails
|
7721c70a25e2984940ed6d2044ba74df59f1f08f |
11-Oct-2011 |
Wei Huang <weih@google.com> |
Merge "Fix 5421152 [UI] Selecting "Posts - <username>" as an album for Gallery widget fails"
|
2b45bac3feb6a3b92322e873e7a4897415f8f8de |
11-Oct-2011 |
Wei Huang <weih@google.com> |
Merge "Fix 5421152 [UI] Selecting "Posts - <username>" as an album for Gallery widget fails"
|
375ed96be141405c325ca826101883e45bf4c781 |
11-Oct-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
f465d0269a9799500c9da84e3f1b60c0cd053c02 |
11-Oct-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
8837d4fdac60217ebd77753d401570463620c6dd |
11-Oct-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
e527da2121364f2aa678b1a6788e09af3d1cb819 |
11-Oct-2011 |
Yuli Huang <yuli@google.com> |
am 26f894d2: Merge "Fix b/5433856 and b/5433907." * commit '26f894d2785b7e0ada5f86f45e7ed6f055829b46': Fix b/5433856 and b/5433907.
|
26f894d2785b7e0ada5f86f45e7ed6f055829b46 |
11-Oct-2011 |
Yuli Huang <yuli@google.com> |
Merge "Fix b/5433856 and b/5433907."
|
c2c9df91a8f9b35d18d43593d75f65b78e6bfc38 |
11-Oct-2011 |
Yuli Huang <yuli@google.com> |
Merge "Fix b/5433856 and b/5433907."
|
ad790f2e24837eca6cc6e2b3622f32b3a750c74b |
11-Oct-2011 |
Ray Chen <raychen@google.com> |
Fix 5421152 [UI] Selecting "Posts - <username>" as an album for Gallery widget fails Change-Id: I32722ad2d5f83bb180baceeb887f1cf216eaf692
rc/com/android/gallery3d/data/ComboAlbum.java
|
c1f9318b9e80280eaab683eca2aad0beca16591d |
11-Oct-2011 |
Ray Chen <raychen@google.com> |
Fix 5421152 [UI] Selecting "Posts - <username>" as an album for Gallery widget fails Change-Id: I32722ad2d5f83bb180baceeb887f1cf216eaf692
rc/com/android/gallery3d/data/ComboAlbum.java
|
5cad2b09f2104a897bcc288730f7d7d20f7f201f |
11-Oct-2011 |
Ray Chen <raychen@google.com> |
am 377b0652: Fix 5199444 In crop interface, check button and X button should be switched Fix 5424781 Two "Tick mark" and "OK" option shows together in crop picture screen in Crespo IRL06. Fix some other UI issues. (HOME_UP) * commit '377b06525ef4e6028919a57383278e0fd07de1ea': Fix 5199444 In crop interface, check button and X button should be switched Fix 5424781 Two "Tick mark" and "OK" option shows together in crop picture screen in Crespo IRL06. Fix some other UI issues. (HOME_UP)
|
7ec6dba0378bb8e56d4c6e43a7cce1ceb3168e7c |
10-Oct-2011 |
Ray Chen <raychen@google.com> |
Fix 5199444 In crop interface, check button and X button should be switched Fix 5424781 Two "Tick mark" and "OK" option shows together in crop picture screen in Crespo IRL06. Fix some other UI issues. (HOME_UP) Change-Id: Idfa5a258af17b22f13a238cee63a43f3abff776b
es/menu/crop.xml
|
377b06525ef4e6028919a57383278e0fd07de1ea |
10-Oct-2011 |
Ray Chen <raychen@google.com> |
Fix 5199444 In crop interface, check button and X button should be switched Fix 5424781 Two "Tick mark" and "OK" option shows together in crop picture screen in Crespo IRL06. Fix some other UI issues. (HOME_UP) Change-Id: Idfa5a258af17b22f13a238cee63a43f3abff776b
es/menu/crop.xml
rc/com/android/gallery3d/app/CropImage.java
|
16e520ebdced709889a4994f52b1985510fa2a45 |
10-Oct-2011 |
Ray Chen <raychen@google.com> |
Fix 5199444 In crop interface, check button and X button should be switched Fix 5424781 Two "Tick mark" and "OK" option shows together in crop picture screen in Crespo IRL06. Fix some other UI issues. (HOME_UP) Change-Id: Idfa5a258af17b22f13a238cee63a43f3abff776b
rc/com/android/gallery3d/app/CropImage.java
|
e6e4beb069778fafd053552287e36304df5626eb |
11-Oct-2011 |
Ray Chen <raychen@google.com> |
Fix 5434523 No affordance in Gallery to share a video other than long-press in album view Change-Id: I99361fa209ee5ba4200ccb8c1708f649c04519c2
es/menu/movie.xml
rc/com/android/gallery3d/app/MovieActivity.java
|
c7c115b9b9ffe41f1d7bd6df4a7c80ffea591a46 |
11-Oct-2011 |
Ray Chen <raychen@google.com> |
Fix 5434523 No affordance in Gallery to share a video other than long-press in album view Change-Id: I99361fa209ee5ba4200ccb8c1708f649c04519c2
es/menu/movie.xml
|
3539b1c7f4e75846a4950ad54295c36ae5aa7da1 |
11-Oct-2011 |
Ray Chen <raychen@google.com> |
Fix 5434523 No affordance in Gallery to share a video other than long-press in album view Change-Id: I99361fa209ee5ba4200ccb8c1708f649c04519c2
rc/com/android/gallery3d/app/MovieActivity.java
|
1c2cadf77f2b89761832f50e67918c78a94d015a |
10-Oct-2011 |
Eric Fischer <enf@google.com> |
am b8c9dc32: Import revised translations. * commit 'b8c9dc320431c08404fdfa7e1e470d9df61b318f': Import revised translations.
|
e0e82f1de7396645244e475e1423e2f5fe518630 |
09-Oct-2011 |
Yuli Huang <yuli@google.com> |
Fix b/5433856 and b/5433907. 1. Make PhotoView restore rotation after the device awakes or the orientation changes. 2. Avoid outputting top filter until the active effect requests its output to fix incorrect Crop/Rotate/Doodle effects after device awakes. 3. Speed up rotation speed by removing queued outdated rotation. Change-Id: I5b82ccfe4e27ad5f1d2505bdd7a7540e0a77b55d
rc/com/android/gallery3d/photoeditor/FilterStack.java
rc/com/android/gallery3d/photoeditor/Photo.java
rc/com/android/gallery3d/photoeditor/PhotoView.java
rc/com/android/gallery3d/photoeditor/actions/RotateAction.java
|
566f653e477d8d594e6c69e394a52f616100bd31 |
09-Oct-2011 |
Yuli Huang <yuli@google.com> |
Fix b/5433856 and b/5433907. 1. Make PhotoView restore rotation after the device awakes or the orientation changes. 2. Avoid outputting top filter until the active effect requests its output to fix incorrect Crop/Rotate/Doodle effects after device awakes. 3. Speed up rotation speed by removing queued outdated rotation. Change-Id: I5b82ccfe4e27ad5f1d2505bdd7a7540e0a77b55d
rc/com/android/gallery3d/photoeditor/FilterStack.java
rc/com/android/gallery3d/photoeditor/Photo.java
rc/com/android/gallery3d/photoeditor/PhotoView.java
rc/com/android/gallery3d/photoeditor/actions/RotateAction.java
|
4519f17004b2ea58797cc51f7b78b8c7c2683c19 |
09-Oct-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
0433c6bfd3d86baf2282f2f93927a2e035f9d42d |
09-Oct-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
8be741cdfcc4d4dc143983fd5fc257dcb61dd852 |
09-Oct-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
b8c9dc320431c08404fdfa7e1e470d9df61b318f |
08-Oct-2011 |
Eric Fischer <enf@google.com> |
Import revised translations. Change-Id: If1ab0cee54999d4e6d6b003643cd9fe743568033
es/values-af/photoeditor_strings.xml
es/values-af/strings.xml
es/values-am/photoeditor_strings.xml
es/values-am/strings.xml
es/values-ar/photoeditor_strings.xml
es/values-ar/strings.xml
es/values-bg/photoeditor_strings.xml
es/values-bg/strings.xml
es/values-ca/photoeditor_strings.xml
es/values-ca/strings.xml
es/values-cs/photoeditor_strings.xml
es/values-cs/strings.xml
es/values-da/photoeditor_strings.xml
es/values-da/strings.xml
es/values-de/photoeditor_strings.xml
es/values-de/strings.xml
es/values-el/photoeditor_strings.xml
es/values-el/strings.xml
es/values-en-rGB/photoeditor_strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/photoeditor_strings.xml
es/values-es-rUS/strings.xml
es/values-es/photoeditor_strings.xml
es/values-es/strings.xml
es/values-fa/photoeditor_strings.xml
es/values-fa/strings.xml
es/values-fi/photoeditor_strings.xml
es/values-fi/strings.xml
es/values-fr/photoeditor_strings.xml
es/values-fr/strings.xml
es/values-hr/photoeditor_strings.xml
es/values-hr/strings.xml
es/values-hu/photoeditor_strings.xml
es/values-hu/strings.xml
es/values-in/photoeditor_strings.xml
es/values-in/strings.xml
es/values-it/photoeditor_strings.xml
es/values-it/strings.xml
es/values-iw/photoeditor_strings.xml
es/values-iw/strings.xml
es/values-ja/photoeditor_strings.xml
es/values-ja/strings.xml
es/values-ko/photoeditor_strings.xml
es/values-ko/strings.xml
es/values-lt/photoeditor_strings.xml
es/values-lt/strings.xml
es/values-lv/photoeditor_strings.xml
es/values-lv/strings.xml
es/values-ms/photoeditor_strings.xml
es/values-ms/strings.xml
es/values-nb/photoeditor_strings.xml
es/values-nb/strings.xml
es/values-nl/photoeditor_strings.xml
es/values-nl/strings.xml
es/values-pl/photoeditor_strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/photoeditor_strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/photoeditor_strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/photoeditor_strings.xml
es/values-ro/strings.xml
es/values-ru/photoeditor_strings.xml
es/values-ru/strings.xml
es/values-sk/photoeditor_strings.xml
es/values-sk/strings.xml
es/values-sl/photoeditor_strings.xml
es/values-sl/strings.xml
es/values-sr/photoeditor_strings.xml
es/values-sr/strings.xml
es/values-sv/photoeditor_strings.xml
es/values-sv/strings.xml
es/values-sw/photoeditor_strings.xml
es/values-sw/strings.xml
es/values-th/photoeditor_strings.xml
es/values-th/strings.xml
es/values-tl/photoeditor_strings.xml
es/values-tl/strings.xml
es/values-tr/photoeditor_strings.xml
es/values-tr/strings.xml
es/values-uk/photoeditor_strings.xml
es/values-uk/strings.xml
es/values-vi/photoeditor_strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/photoeditor_strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/photoeditor_strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/photoeditor_strings.xml
es/values-zu/strings.xml
|
0342ad02e1c6a925bbe83941f78e286271057d62 |
08-Oct-2011 |
Eric Fischer <enf@google.com> |
Import revised translations. Change-Id: If1ab0cee54999d4e6d6b003643cd9fe743568033
es/values-af/photoeditor_strings.xml
es/values-af/strings.xml
es/values-am/photoeditor_strings.xml
es/values-am/strings.xml
es/values-ar/photoeditor_strings.xml
es/values-ar/strings.xml
es/values-bg/photoeditor_strings.xml
es/values-bg/strings.xml
es/values-ca/photoeditor_strings.xml
es/values-ca/strings.xml
es/values-cs/photoeditor_strings.xml
es/values-cs/strings.xml
es/values-da/photoeditor_strings.xml
es/values-da/strings.xml
es/values-de/photoeditor_strings.xml
es/values-de/strings.xml
es/values-el/photoeditor_strings.xml
es/values-el/strings.xml
es/values-en-rGB/photoeditor_strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/photoeditor_strings.xml
es/values-es-rUS/strings.xml
es/values-es/photoeditor_strings.xml
es/values-es/strings.xml
es/values-fa/photoeditor_strings.xml
es/values-fa/strings.xml
es/values-fi/photoeditor_strings.xml
es/values-fi/strings.xml
es/values-fr/photoeditor_strings.xml
es/values-fr/strings.xml
es/values-hr/photoeditor_strings.xml
es/values-hr/strings.xml
es/values-hu/photoeditor_strings.xml
es/values-hu/strings.xml
es/values-in/photoeditor_strings.xml
es/values-in/strings.xml
es/values-it/photoeditor_strings.xml
es/values-it/strings.xml
es/values-iw/photoeditor_strings.xml
es/values-iw/strings.xml
es/values-ja/photoeditor_strings.xml
es/values-ja/strings.xml
es/values-ko/photoeditor_strings.xml
es/values-ko/strings.xml
es/values-lt/photoeditor_strings.xml
es/values-lt/strings.xml
es/values-lv/photoeditor_strings.xml
es/values-lv/strings.xml
es/values-ms/photoeditor_strings.xml
es/values-ms/strings.xml
es/values-nb/photoeditor_strings.xml
es/values-nb/strings.xml
es/values-nl/photoeditor_strings.xml
es/values-nl/strings.xml
es/values-pl/photoeditor_strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/photoeditor_strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/photoeditor_strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/photoeditor_strings.xml
es/values-ro/strings.xml
es/values-ru/photoeditor_strings.xml
es/values-ru/strings.xml
es/values-sk/photoeditor_strings.xml
es/values-sk/strings.xml
es/values-sl/photoeditor_strings.xml
es/values-sl/strings.xml
es/values-sr/photoeditor_strings.xml
es/values-sr/strings.xml
es/values-sv/photoeditor_strings.xml
es/values-sv/strings.xml
es/values-sw/photoeditor_strings.xml
es/values-sw/strings.xml
es/values-th/photoeditor_strings.xml
es/values-th/strings.xml
es/values-tl/photoeditor_strings.xml
es/values-tl/strings.xml
es/values-tr/photoeditor_strings.xml
es/values-tr/strings.xml
es/values-uk/photoeditor_strings.xml
es/values-uk/strings.xml
es/values-vi/photoeditor_strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/photoeditor_strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/photoeditor_strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/photoeditor_strings.xml
es/values-zu/strings.xml
|
409552fc41727619691bde3418bca294769a1bd0 |
07-Oct-2011 |
Hung-ying Tyan <tyanh@google.com> |
am 57cbaa1e: Request sync when there\'s no mediaItem in a mediaSet. * commit '57cbaa1ef40d2215c6400f5ae4af3a09e67abb2d': Request sync when there's no mediaItem in a mediaSet.
|
9d62da7986aef9d89356f6b169fafecd8936d9f6 |
30-Sep-2011 |
Hung-ying Tyan <tyanh@google.com> |
Request sync when there's no mediaItem in a mediaSet. This is to fix the problem where media items haven't been sync'ed when the album set or album is viewed for the first time. + Add MediaSet.SyncListener. + Make AlbumPage and AlbumSetPage implement SyncListener. + Implement requestSync() for ComboAlbum and ComboAlbumSet. + add ActivityState.isDestroyed(). This also fixes the problem where StateManager.finishState() may be called twice. Bug: 5337899 Change-Id: I25364c3ac25721a2650701c5d7931bfb6daa9303
rc/com/android/gallery3d/app/ActivityState.java
rc/com/android/gallery3d/app/AlbumDataAdapter.java
rc/com/android/gallery3d/app/AlbumPage.java
rc/com/android/gallery3d/app/AlbumSetPage.java
rc/com/android/gallery3d/app/StateManager.java
rc/com/android/gallery3d/data/ComboAlbum.java
rc/com/android/gallery3d/data/ComboAlbumSet.java
rc/com/android/gallery3d/data/MediaSet.java
|
57cbaa1ef40d2215c6400f5ae4af3a09e67abb2d |
30-Sep-2011 |
Hung-ying Tyan <tyanh@google.com> |
Request sync when there's no mediaItem in a mediaSet. This is to fix the problem where media items haven't been sync'ed when the album set or album is viewed for the first time. + Add MediaSet.SyncListener. + Make AlbumPage and AlbumSetPage implement SyncListener. + Implement requestSync() for ComboAlbum and ComboAlbumSet. + add ActivityState.isDestroyed(). This also fixes the problem where StateManager.finishState() may be called twice. Bug: 5337899 Change-Id: I25364c3ac25721a2650701c5d7931bfb6daa9303
es/values/strings.xml
rc/com/android/gallery3d/app/ActivityState.java
rc/com/android/gallery3d/app/AlbumDataAdapter.java
rc/com/android/gallery3d/app/AlbumPage.java
rc/com/android/gallery3d/app/AlbumSetPage.java
rc/com/android/gallery3d/app/StateManager.java
rc/com/android/gallery3d/data/ComboAlbum.java
rc/com/android/gallery3d/data/ComboAlbumSet.java
rc/com/android/gallery3d/data/MediaSet.java
|
e6cd39be506af638aec2f7a094d2570f9305b270 |
30-Sep-2011 |
Hung-ying Tyan <tyanh@google.com> |
Request sync when there's no mediaItem in a mediaSet. This is to fix the problem where media items haven't been sync'ed when the album set or album is viewed for the first time. + Add MediaSet.SyncListener. + Make AlbumPage and AlbumSetPage implement SyncListener. + Implement requestSync() for ComboAlbum and ComboAlbumSet. + add ActivityState.isDestroyed(). This also fixes the problem where StateManager.finishState() may be called twice. Bug: 5337899 Change-Id: I25364c3ac25721a2650701c5d7931bfb6daa9303
es/values/strings.xml
|
20cd84f69994c790988acd7db444a11ec305b520 |
07-Oct-2011 |
Ray Chen <raychen@google.com> |
am eaa750f6: Merge "Fix 5367090 Gallery top selector (Albums, Locations, Times...) dropdown must use framework component" * commit 'eaa750f62a064e142605c3531539699469948983': Fix 5367090 Gallery top selector (Albums, Locations, Times...) dropdown must use framework component
|
3f3b88eed1eb342db9c155ca14cc6e4eb173d9c6 |
07-Oct-2011 |
Ray Chen <raychen@google.com> |
am ccc57bf8: Merge "Fix 5343229 Location displayed as co-ordinates in details of picture captured from camera" * commit 'ccc57bf8ea5daf90ddcab779fb80ff4b005f5d92': Fix 5343229 Location displayed as co-ordinates in details of picture captured from camera
|
eaa750f62a064e142605c3531539699469948983 |
07-Oct-2011 |
Ray Chen <raychen@google.com> |
Merge "Fix 5367090 Gallery top selector (Albums, Locations, Times...) dropdown must use framework component"
|
04114c88ced07d3d642da37e3f6d25e8ab5e2052 |
07-Oct-2011 |
Ray Chen <raychen@google.com> |
Merge "Fix 5367090 Gallery top selector (Albums, Locations, Times...) dropdown must use framework component"
|
78eac46afd4c5b33c8c32f976974ebff6870c0a4 |
07-Oct-2011 |
Ray Chen <raychen@google.com> |
Merge "Fix 5343229 Location displayed as co-ordinates in details of picture captured from camera"
|
ccc57bf8ea5daf90ddcab779fb80ff4b005f5d92 |
07-Oct-2011 |
Ray Chen <raychen@google.com> |
Merge "Fix 5343229 Location displayed as co-ordinates in details of picture captured from camera"
|
5e421b94918175c4e2a3f1d5beb7555f3b2faa3b |
07-Oct-2011 |
Ray Chen <raychen@google.com> |
Merge "Fix 5343229 Location displayed as co-ordinates in details of picture captured from camera"
|
0b8f68f1dc22fe484f6d23a259f32e50acc022c4 |
07-Oct-2011 |
Ray Chen <raychen@google.com> |
am ce6c184b: Merge "Fix 5250813 Use new standardized no account screen on first launch" * commit 'ce6c184be522a99661c5279a403a1f1f3dfcb8f0': Fix 5250813 Use new standardized no account screen on first launch
|
e2d426993d2d516aabeaa88681e6b9a739c618ac |
07-Oct-2011 |
Ray Chen <raychen@google.com> |
Merge "Fix 5250813 Use new standardized no account screen on first launch"
|
ce6c184be522a99661c5279a403a1f1f3dfcb8f0 |
07-Oct-2011 |
Ray Chen <raychen@google.com> |
Merge "Fix 5250813 Use new standardized no account screen on first launch"
|
0c1f2c80818a0326fa55e6f709b49584ceab60b1 |
05-Oct-2011 |
Ray Chen <raychen@google.com> |
Fix 5413911 Gallery app does not recognize that no files are selected for delete Change-Id: I90efb3d7676a0810025dd37890c1251725a48223
es/menu/operation.xml
rc/com/android/gallery3d/ui/ActionModeHandler.java
rc/com/android/gallery3d/ui/MenuExecutor.java
|
a8f262111202654a1d0498a78f3287307d7b1494 |
05-Oct-2011 |
Ray Chen <raychen@google.com> |
Fix 5413911 Gallery app does not recognize that no files are selected for delete Change-Id: I90efb3d7676a0810025dd37890c1251725a48223
es/menu/operation.xml
|
875423f9a4185968a4ea83f45c31add457559dfb |
05-Oct-2011 |
Ray Chen <raychen@google.com> |
Fix 5413911 Gallery app does not recognize that no files are selected for delete Change-Id: I90efb3d7676a0810025dd37890c1251725a48223
rc/com/android/gallery3d/ui/ActionModeHandler.java
rc/com/android/gallery3d/ui/MenuExecutor.java
|
1a07f0908149adf41d44df5dde0e7f3abaf82eb6 |
06-Oct-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
5741c319b89a137ffd5b9394da83d64acd6b8cd5 |
06-Oct-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
6ed9a822c253d1932666fc491a68210ceb303b0a |
06-Oct-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
24efae2543d29f1aea8df9d16269ea6a5a874a16 |
06-Oct-2011 |
Yuli Huang <yuli@google.com> |
am f2ff1ad5: Replace slider assets and fix save-share-button height. * commit 'f2ff1ad51c57308f282473f7b9e47c454172bfca': Replace slider assets and fix save-share-button height.
|
8296cb6e9e884a018283f8fe55f08d4f1668cebe |
06-Oct-2011 |
Yuli Huang <yuli@google.com> |
Replace slider assets and fix save-share-button height. 1. Use the same slider asset for both fill-light and highlights. 2. Update slider assets and dimensions. 3. Fix save-share-button height didn't fill action-bar. Change-Id: I6b3a735c8f745084b89b1d6a035c7ed9bd4ff287
es/drawable-sw600dp/photoeditor_scale_seekbar_color.png
es/drawable-sw600dp/photoeditor_scale_seekbar_generic.png
es/drawable-sw600dp/photoeditor_scale_seekbar_light.png
es/drawable-sw600dp/photoeditor_scale_seekbar_shadow.png
es/drawable/photoeditor_scale_seekbar_color.9.png
es/drawable/photoeditor_scale_seekbar_color.png
es/drawable/photoeditor_scale_seekbar_filllight.9.png
es/drawable/photoeditor_scale_seekbar_generic.9.png
es/drawable/photoeditor_scale_seekbar_generic.png
es/drawable/photoeditor_scale_seekbar_highlight.9.png
es/drawable/photoeditor_scale_seekbar_light.png
es/drawable/photoeditor_scale_seekbar_shadow.9.png
es/drawable/photoeditor_scale_seekbar_shadow.png
es/drawable/photoeditor_seekbar_thumb.png
es/layout/photoeditor_actionbar.xml
es/values-sw320dp/photoeditor_dimens.xml
es/values-sw600dp/photoeditor_dimens.xml
es/values-sw800dp/photoeditor_dimens.xml
|
cc9bda9e1d83bc31c5432fb5b791f0e9d6dc0eeb |
06-Oct-2011 |
Yuli Huang <yuli@google.com> |
Replace slider assets and fix save-share-button height. 1. Use the same slider asset for both fill-light and highlights. 2. Update slider assets and dimensions. 3. Fix save-share-button height didn't fill action-bar. Change-Id: I6b3a735c8f745084b89b1d6a035c7ed9bd4ff287
rc/com/android/gallery3d/photoeditor/actions/EffectToolFactory.java
rc/com/android/gallery3d/photoeditor/actions/FillLightAction.java
rc/com/android/gallery3d/photoeditor/actions/HighlightAction.java
|
f2ff1ad51c57308f282473f7b9e47c454172bfca |
06-Oct-2011 |
Yuli Huang <yuli@google.com> |
Replace slider assets and fix save-share-button height. 1. Use the same slider asset for both fill-light and highlights. 2. Update slider assets and dimensions. 3. Fix save-share-button height didn't fill action-bar. Change-Id: I6b3a735c8f745084b89b1d6a035c7ed9bd4ff287
es/drawable-sw600dp/photoeditor_scale_seekbar_color.png
es/drawable-sw600dp/photoeditor_scale_seekbar_generic.png
es/drawable-sw600dp/photoeditor_scale_seekbar_light.png
es/drawable-sw600dp/photoeditor_scale_seekbar_shadow.png
es/drawable/photoeditor_scale_seekbar_color.9.png
es/drawable/photoeditor_scale_seekbar_color.png
es/drawable/photoeditor_scale_seekbar_filllight.9.png
es/drawable/photoeditor_scale_seekbar_generic.9.png
es/drawable/photoeditor_scale_seekbar_generic.png
es/drawable/photoeditor_scale_seekbar_highlight.9.png
es/drawable/photoeditor_scale_seekbar_light.png
es/drawable/photoeditor_scale_seekbar_shadow.9.png
es/drawable/photoeditor_scale_seekbar_shadow.png
es/drawable/photoeditor_seekbar_thumb.png
es/layout/photoeditor_actionbar.xml
es/values-sw320dp/photoeditor_dimens.xml
es/values-sw600dp/photoeditor_dimens.xml
es/values-sw800dp/photoeditor_dimens.xml
rc/com/android/gallery3d/photoeditor/actions/EffectToolFactory.java
rc/com/android/gallery3d/photoeditor/actions/FillLightAction.java
rc/com/android/gallery3d/photoeditor/actions/HighlightAction.java
|
8aefcaf98d2e36f2ee5802d97203b5b3c59b41cf |
05-Oct-2011 |
Ray Chen <raychen@google.com> |
Fix 5367090 Gallery top selector (Albums, Locations, Times...) dropdown must use framework component Change-Id: I38bdd487d5e406284d86557cfdd8592e598ebdd5
es/layout/action_bar_text.xml
|
843e84f93bdb137c869cab741234aa67c127a234 |
05-Oct-2011 |
Ray Chen <raychen@google.com> |
Fix 5367090 Gallery top selector (Albums, Locations, Times...) dropdown must use framework component Change-Id: I38bdd487d5e406284d86557cfdd8592e598ebdd5
es/layout/action_bar_text.xml
|
90e3383d1868f6aabf9faec13ccb018ec9022b82 |
06-Oct-2011 |
Yuli Huang <yuli@google.com> |
am 7051cc97: Merge "Fix b/5413887 and b/5389281." * commit '7051cc97f1098ff9c23ed02e0b6fe2088c8d1e98': Fix b/5413887 and b/5389281.
|
55a31faaa2a8fb5ee1a3c4c2a373adeb6a92c063 |
06-Oct-2011 |
Yuli Huang <yuli@google.com> |
Merge "Fix b/5413887 and b/5389281."
|
7051cc97f1098ff9c23ed02e0b6fe2088c8d1e98 |
06-Oct-2011 |
Yuli Huang <yuli@google.com> |
Merge "Fix b/5413887 and b/5389281."
|
52a460c34bda8b3bb28ae3139371068dbc1eb606 |
04-Oct-2011 |
Ray Chen <raychen@google.com> |
Fix 5343229 Location displayed as co-ordinates in details of picture captured from camera Change-Id: I223b69a3e10fe85a4622cf33110414cd14624f36
rc/com/android/gallery3d/ui/DetailsAddressResolver.java
rc/com/android/gallery3d/ui/DialogDetailsView.java
|
b5bc8833b142985652a0438ae7d64ff5477b590e |
04-Oct-2011 |
Ray Chen <raychen@google.com> |
Fix 5343229 Location displayed as co-ordinates in details of picture captured from camera Change-Id: I223b69a3e10fe85a4622cf33110414cd14624f36
rc/com/android/gallery3d/ui/DetailsAddressResolver.java
rc/com/android/gallery3d/ui/DialogDetailsView.java
|
331adb13192a31efbb4436f134c170175174a669 |
04-Oct-2011 |
Ray Chen <raychen@google.com> |
Fix 5343229 Location displayed as co-ordinates in details of picture captured from camera Change-Id: I223b69a3e10fe85a4622cf33110414cd14624f36
rc/com/android/gallery3d/ui/DetailsAddressResolver.java
|
73e791c4c42b66b7de3e6a4fa7ca05d9daa10cde |
04-Oct-2011 |
Ray Chen <raychen@google.com> |
Fix 5250813 Use new standardized no account screen on first launch This CL also fixes a bug in AlbumSetDataAdapter's ReloadTask, which causes empty screen after pause/resume. Change-Id: I7991d40a790384105ccb3021e1e51ba3e5ec8635
rc/com/android/gallery3d/app/AlbumSetDataAdapter.java
rc/com/android/gallery3d/app/AlbumSetPage.java
rc/com/android/gallery3d/app/Gallery.java
rc/com/android/gallery3d/ui/AlbumSetSlidingWindow.java
rc/com/android/gallery3d/ui/AlbumSetView.java
rc/com/android/gallery3d/ui/SlotView.java
rc_pd/com/android/gallery3d/picasasource/PicasaSource.java
|
dbf4ba12afba115888493caa34937643257e2bb1 |
04-Oct-2011 |
Ray Chen <raychen@google.com> |
Fix 5250813 Use new standardized no account screen on first launch This CL also fixes a bug in AlbumSetDataAdapter's ReloadTask, which causes empty screen after pause/resume. Change-Id: I7991d40a790384105ccb3021e1e51ba3e5ec8635
rc/com/android/gallery3d/app/AlbumSetDataAdapter.java
rc/com/android/gallery3d/app/AlbumSetPage.java
rc/com/android/gallery3d/app/Gallery.java
rc/com/android/gallery3d/ui/AlbumSetSlidingWindow.java
rc/com/android/gallery3d/ui/AlbumSetView.java
rc/com/android/gallery3d/ui/SlotView.java
rc_pd/com/android/gallery3d/picasasource/PicasaSource.java
|
ba40780e80d24674f1cec18212ff34c4b66494e9 |
06-Oct-2011 |
Claudia de Veaux <deveaux@google.com> |
am 2e8d1202: Edit to Gallery string. Bug: 5383037 "Delete?" should really just be "Delete". * commit '2e8d1202a5ef412a6afa7e89d899dfb631311c27': Edit to Gallery string. Bug: 5383037 "Delete?" should really just be "Delete".
|
42bd74425f0f9d9a5dad6e8eeb5b2a37aa8f6a8e |
06-Oct-2011 |
Claudia de Veaux <deveaux@google.com> |
Edit to Gallery string. Bug: 5383037 "Delete?" should really just be "Delete". Change-Id: Ibef97585fe3bae2a2e3062a01a3e9c8b260fe686
es/values/strings.xml
|
2e8d1202a5ef412a6afa7e89d899dfb631311c27 |
06-Oct-2011 |
Claudia de Veaux <deveaux@google.com> |
Edit to Gallery string. Bug: 5383037 "Delete?" should really just be "Delete". Change-Id: Ibef97585fe3bae2a2e3062a01a3e9c8b260fe686
es/values/strings.xml
|
d752081194ec74fc61618314c3a7bab19e6b4cf0 |
05-Oct-2011 |
Wei Huang <weih@google.com> |
am d19dcdd7: Merge "Use merged album as the default parent set for an local media." * commit 'd19dcdd76f07cf3c390a7645420dd76f8f45a3f7': Use merged album as the default parent set for an local media.
|
466734f088158151d872c59def524eada1f4005b |
05-Oct-2011 |
Wei Huang <weih@google.com> |
Merge "Use merged album as the default parent set for an local media."
|
d19dcdd76f07cf3c390a7645420dd76f8f45a3f7 |
05-Oct-2011 |
Wei Huang <weih@google.com> |
Merge "Use merged album as the default parent set for an local media."
|
14dcd8c8acd5c3e9748264984e9492385e2419c9 |
05-Oct-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
a5c62d20718daba1d99f01386a0e9309aaa9bef0 |
05-Oct-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
b30bc963d8ddaaf3a66a3260fe8edaf2df96c929 |
05-Oct-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
4a69aca749ffbef568138ac67a40a1041206bcd6 |
05-Oct-2011 |
Chih-Chung Chang <chihchung@google.com> |
am f2b74984: Merge "Fix 5319007: Add fling to PhotoView." * commit 'f2b749843e726866e4c3da77f000257a9add1144': Fix 5319007: Add fling to PhotoView.
|
0bc3bbc02c93b5391a0d1fca05431e263c6024b9 |
05-Oct-2011 |
Yuli Huang <yuli@google.com> |
am a7bbb047: Merge "Fix b/5032231: Allow share in Photo Editor." * commit 'a7bbb047782014cf794c6386df2ef20c57f3a164': Fix b/5032231: Allow share in Photo Editor.
|
05922af13db6fb928658e998802b89eb6ae47062 |
05-Oct-2011 |
Chih-Chung Chang <chihchung@google.com> |
Merge "Fix 5319007: Add fling to PhotoView."
|
f2b749843e726866e4c3da77f000257a9add1144 |
05-Oct-2011 |
Chih-Chung Chang <chihchung@google.com> |
Merge "Fix 5319007: Add fling to PhotoView."
|
4fdf38fbc8756ae232fbe7692d69df638e6055c4 |
03-Oct-2011 |
Chih-Chung Chang <chihchung@google.com> |
Fix 5319007: Add fling to PhotoView. Change-Id: Iacda65fbe1fcb3ad245ad99e0b062606ca6792b9
rc/com/android/gallery3d/ui/FlingScroller.java
rc/com/android/gallery3d/ui/PhotoView.java
rc/com/android/gallery3d/ui/PositionController.java
|
b3aab90bb37aa9cc60be32e05678ee55d6575ee8 |
03-Oct-2011 |
Chih-Chung Chang <chihchung@google.com> |
Fix 5319007: Add fling to PhotoView. Change-Id: Iacda65fbe1fcb3ad245ad99e0b062606ca6792b9
rc/com/android/gallery3d/ui/FlingScroller.java
rc/com/android/gallery3d/ui/PhotoView.java
rc/com/android/gallery3d/ui/PositionController.java
|
60c3c4b104eb3c23b8f23fdcfa570ee8417457cd |
05-Oct-2011 |
Owen Lin <owenlin@google.com> |
Use merged album as the default parent set for an local media. Change-Id: I36062cc1ea06ec9d2eb05e74157f4a071484a8a7 fix: 5141166
rc/com/android/gallery3d/data/LocalSource.java
|
9819424cbf0c21b50f4fefdd3472f543eec48d18 |
05-Oct-2011 |
Owen Lin <owenlin@google.com> |
Use merged album as the default parent set for an local media. Change-Id: I36062cc1ea06ec9d2eb05e74157f4a071484a8a7 fix: 5141166
rc/com/android/gallery3d/data/LocalSource.java
|
f94475fb525ef65c40365925da5b5a44ef645c05 |
05-Oct-2011 |
Yuli Huang <yuli@google.com> |
Fix b/5413887 and b/5389281. 1. Fix b/5413887 by releasing MFF effects as well as release MFF effect-context. 2. Fix b/5389281 by removing photoView.setPhoto(null). Change-Id: I1b848f6c87b03ba2539432fd6d6f13f4ac3a2907
rc/com/android/gallery3d/photoeditor/FilterStack.java
rc/com/android/gallery3d/photoeditor/filters/AutoFixFilter.java
rc/com/android/gallery3d/photoeditor/filters/ColorTemperatureFilter.java
rc/com/android/gallery3d/photoeditor/filters/CropFilter.java
rc/com/android/gallery3d/photoeditor/filters/CrossProcessFilter.java
rc/com/android/gallery3d/photoeditor/filters/DocumentaryFilter.java
rc/com/android/gallery3d/photoeditor/filters/DoodleFilter.java
rc/com/android/gallery3d/photoeditor/filters/DuotoneFilter.java
rc/com/android/gallery3d/photoeditor/filters/FaceliftFilter.java
rc/com/android/gallery3d/photoeditor/filters/FillLightFilter.java
rc/com/android/gallery3d/photoeditor/filters/Filter.java
rc/com/android/gallery3d/photoeditor/filters/FisheyeFilter.java
rc/com/android/gallery3d/photoeditor/filters/FlipFilter.java
rc/com/android/gallery3d/photoeditor/filters/GrainFilter.java
rc/com/android/gallery3d/photoeditor/filters/GrayscaleFilter.java
rc/com/android/gallery3d/photoeditor/filters/HighlightFilter.java
rc/com/android/gallery3d/photoeditor/filters/LomoishFilter.java
rc/com/android/gallery3d/photoeditor/filters/NegativeFilter.java
rc/com/android/gallery3d/photoeditor/filters/PosterizeFilter.java
rc/com/android/gallery3d/photoeditor/filters/RedEyeFilter.java
rc/com/android/gallery3d/photoeditor/filters/RotateFilter.java
rc/com/android/gallery3d/photoeditor/filters/SaturationFilter.java
rc/com/android/gallery3d/photoeditor/filters/SepiaFilter.java
rc/com/android/gallery3d/photoeditor/filters/ShadowFilter.java
rc/com/android/gallery3d/photoeditor/filters/SharpenFilter.java
rc/com/android/gallery3d/photoeditor/filters/StraightenFilter.java
rc/com/android/gallery3d/photoeditor/filters/TintFilter.java
rc/com/android/gallery3d/photoeditor/filters/VignetteFilter.java
|
c7e39d12860adf99a12c6b47e9aaa9d7ae098307 |
05-Oct-2011 |
Yuli Huang <yuli@google.com> |
Fix b/5413887 and b/5389281. 1. Fix b/5413887 by releasing MFF effects as well as release MFF effect-context. 2. Fix b/5389281 by removing photoView.setPhoto(null). Change-Id: I1b848f6c87b03ba2539432fd6d6f13f4ac3a2907
rc/com/android/gallery3d/photoeditor/FilterStack.java
rc/com/android/gallery3d/photoeditor/filters/AutoFixFilter.java
rc/com/android/gallery3d/photoeditor/filters/ColorTemperatureFilter.java
rc/com/android/gallery3d/photoeditor/filters/CropFilter.java
rc/com/android/gallery3d/photoeditor/filters/CrossProcessFilter.java
rc/com/android/gallery3d/photoeditor/filters/DocumentaryFilter.java
rc/com/android/gallery3d/photoeditor/filters/DoodleFilter.java
rc/com/android/gallery3d/photoeditor/filters/DuotoneFilter.java
rc/com/android/gallery3d/photoeditor/filters/FaceliftFilter.java
rc/com/android/gallery3d/photoeditor/filters/FillLightFilter.java
rc/com/android/gallery3d/photoeditor/filters/Filter.java
rc/com/android/gallery3d/photoeditor/filters/FisheyeFilter.java
rc/com/android/gallery3d/photoeditor/filters/FlipFilter.java
rc/com/android/gallery3d/photoeditor/filters/GrainFilter.java
rc/com/android/gallery3d/photoeditor/filters/GrayscaleFilter.java
rc/com/android/gallery3d/photoeditor/filters/HighlightFilter.java
rc/com/android/gallery3d/photoeditor/filters/LomoishFilter.java
rc/com/android/gallery3d/photoeditor/filters/NegativeFilter.java
rc/com/android/gallery3d/photoeditor/filters/PosterizeFilter.java
rc/com/android/gallery3d/photoeditor/filters/RedEyeFilter.java
rc/com/android/gallery3d/photoeditor/filters/RotateFilter.java
rc/com/android/gallery3d/photoeditor/filters/SaturationFilter.java
rc/com/android/gallery3d/photoeditor/filters/SepiaFilter.java
rc/com/android/gallery3d/photoeditor/filters/ShadowFilter.java
rc/com/android/gallery3d/photoeditor/filters/SharpenFilter.java
rc/com/android/gallery3d/photoeditor/filters/StraightenFilter.java
rc/com/android/gallery3d/photoeditor/filters/TintFilter.java
rc/com/android/gallery3d/photoeditor/filters/VignetteFilter.java
|
bdf4fff92048d19cb3b63824c2efcf489fb86bc8 |
05-Oct-2011 |
Yuli Huang <yuli@google.com> |
Merge "Fix b/5032231: Allow share in Photo Editor."
|
a7bbb047782014cf794c6386df2ef20c57f3a164 |
05-Oct-2011 |
Yuli Huang <yuli@google.com> |
Merge "Fix b/5032231: Allow share in Photo Editor."
|
0392b970057a7c2b041281247aaab89224aafee0 |
04-Oct-2011 |
Claudia de Veaux <deveaux@google.com> |
am 26e87940: Merge "Gallery string edits to bring to standards. Bugs: 165745, 5163232, 5162668, 5162667, 5162328, 5383037" * commit '26e879403f006fc59464b73352b9da68750825ca': Gallery string edits to bring to standards. Bugs: 165745, 5163232, 5162668, 5162667, 5162328, 5383037
|
26e879403f006fc59464b73352b9da68750825ca |
04-Oct-2011 |
Claudia de Veaux <deveaux@google.com> |
Merge "Gallery string edits to bring to standards. Bugs: 165745, 5163232, 5162668, 5162667, 5162328, 5383037"
|
6bd9fce7add938f45cf22efbc2631cb5fee85f9c |
04-Oct-2011 |
Claudia de Veaux <deveaux@google.com> |
Merge "Gallery string edits to bring to standards. Bugs: 165745, 5163232, 5162668, 5162667, 5162328, 5383037"
|
3807c5774cc60d0a8745d8e396ecc679dc7b7270 |
04-Oct-2011 |
Yuli Huang <yuli@google.com> |
Fix b/5032231: Allow share in Photo Editor. Change-Id: I5fd48243df76fd0c2617c92d7f73936172bf6c47
rc/com/android/gallery3d/photoeditor/ActionBar.java
rc/com/android/gallery3d/photoeditor/PhotoEditor.java
|
06498f8cea252c19509061ae6c8bfba49e0f9f03 |
04-Oct-2011 |
Yuli Huang <yuli@google.com> |
Fix b/5032231: Allow share in Photo Editor. Change-Id: I5fd48243df76fd0c2617c92d7f73936172bf6c47
es/layout/photoeditor_actionbar.xml
|
915d58379336d1c19df77f26336d82def95968de |
04-Oct-2011 |
Yuli Huang <yuli@google.com> |
Fix b/5032231: Allow share in Photo Editor. Change-Id: I5fd48243df76fd0c2617c92d7f73936172bf6c47
es/layout/photoeditor_actionbar.xml
rc/com/android/gallery3d/photoeditor/ActionBar.java
rc/com/android/gallery3d/photoeditor/PhotoEditor.java
|
fa046ec61487f71e9b02b8272cb613394007ceb7 |
04-Oct-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
44939c6da0ccc725e641bbdc528dc09942f94193 |
04-Oct-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
b3b395633723d6c05f0d6e6419faec0f758d4446 |
04-Oct-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
39b472fa7b6bec164691348e639aaf4a0613e307 |
04-Oct-2011 |
Yuli Huang <yuli@google.com> |
am 1d536ee8: Fix b/5375999: replace effect thumbnails. * commit '1d536ee817b887da443f296d4360046bdf190c79': Fix b/5375999: replace effect thumbnails.
|
c8957b85a13e9993c7620076be132876cb9ad6b7 |
04-Oct-2011 |
Yuli Huang <yuli@google.com> |
Fix b/5375999: replace effect thumbnails. 1. Replace Doodle/Facelift thumbnails. 2. Adjust effect label margins. 3. Remove unused imports from FaceliftFilter.java. Change-Id: I9e5f162721455ace62bb30d90301a9c70ff95fdc
rc/com/android/gallery3d/photoeditor/filters/FaceliftFilter.java
|
1d536ee817b887da443f296d4360046bdf190c79 |
04-Oct-2011 |
Yuli Huang <yuli@google.com> |
Fix b/5375999: replace effect thumbnails. 1. Replace Doodle/Facelift thumbnails. 2. Adjust effect label margins. 3. Remove unused imports from FaceliftFilter.java. Change-Id: I9e5f162721455ace62bb30d90301a9c70ff95fdc
es/drawable/photoeditor_effect_doodle.png
es/drawable/photoeditor_effect_facelift.png
es/values-sw320dp/photoeditor_dimens.xml
es/values-sw600dp/photoeditor_dimens.xml
es/values-sw800dp/photoeditor_dimens.xml
es/values/photoeditor_styles.xml
rc/com/android/gallery3d/photoeditor/filters/FaceliftFilter.java
|
81320578532c169d5cfd97647dd1c13478e393de |
04-Oct-2011 |
Yuli Huang <yuli@google.com> |
Fix b/5375999: replace effect thumbnails. 1. Replace Doodle/Facelift thumbnails. 2. Adjust effect label margins. 3. Remove unused imports from FaceliftFilter.java. Change-Id: I9e5f162721455ace62bb30d90301a9c70ff95fdc
es/drawable/photoeditor_effect_doodle.png
es/drawable/photoeditor_effect_facelift.png
es/values-sw320dp/photoeditor_dimens.xml
es/values-sw600dp/photoeditor_dimens.xml
es/values-sw800dp/photoeditor_dimens.xml
es/values/photoeditor_styles.xml
|
67b89337a7d6f35db66319ec2fbdd398a0e2f72a |
04-Oct-2011 |
Chih-Chung Chang <chihchung@google.com> |
am 676170e6: Simplify some calculation and add more comments. * commit '676170e619ad59ea97d04e0edcd62b1500304845': Simplify some calculation and add more comments.
|
f3c77ac39cf1af57285eab0da8db5eb4ec34bfd4 |
30-Sep-2011 |
Chih-Chung Chang <chihchung@google.com> |
Simplify some calculation and add more comments. Change-Id: I0fcb2e48ba88dc957c5454de09059a265c3dbec1
rc/com/android/gallery3d/ui/PhotoView.java
rc/com/android/gallery3d/ui/PositionController.java
|
676170e619ad59ea97d04e0edcd62b1500304845 |
30-Sep-2011 |
Chih-Chung Chang <chihchung@google.com> |
Simplify some calculation and add more comments. Change-Id: I0fcb2e48ba88dc957c5454de09059a265c3dbec1
rc/com/android/gallery3d/ui/PhotoView.java
rc/com/android/gallery3d/ui/PositionController.java
|
2f674239565cb6954751c6be19ca73f0f6ae63b1 |
04-Oct-2011 |
Claudia de Veaux <deveaux@google.com> |
Gallery string edits to bring to standards. Bugs: 165745, 5163232, 5162668, 5162667, 5162328, 5383037 Change-Id: Ifa7a9c608bbe59b104a0302555cfef54e00bb311
es/values/strings.xml
|
5ec3e39ac2e25f2dee2a0bfe2ba48153b7bdb72c |
04-Oct-2011 |
Claudia de Veaux <deveaux@google.com> |
Gallery string edits to bring to standards. Bugs: 165745, 5163232, 5162668, 5162667, 5162328, 5383037 Change-Id: Ifa7a9c608bbe59b104a0302555cfef54e00bb311
es/values/strings.xml
|
2860f5f843e324173fbb1e9835b1b5ef20cd0447 |
03-Oct-2011 |
Evan Millar <emillar@google.com> |
am 20cb268c: Remove the "Gallery" title from the AlbumSet page. * commit '20cb268c47ce382859c6b3245e71a73e05a629d4': Remove the "Gallery" title from the AlbumSet page.
|
ab83e37376705de78048188e0e28ee167d34a815 |
03-Oct-2011 |
Evan Millar <emillar@google.com> |
Remove the "Gallery" title from the AlbumSet page. bug:5239335 Change-Id: Iebe624fe8829cf6f905872caa958ebdc76aaa349
rc/com/android/gallery3d/app/AlbumSetPage.java
|
20cb268c47ce382859c6b3245e71a73e05a629d4 |
03-Oct-2011 |
Evan Millar <emillar@google.com> |
Remove the "Gallery" title from the AlbumSet page. bug:5239335 Change-Id: Iebe624fe8829cf6f905872caa958ebdc76aaa349
rc/com/android/gallery3d/app/AlbumSetPage.java
|
712180dc848e13e3d0f4baf65a7d206b1ed429d8 |
03-Oct-2011 |
Evan Millar <emillar@google.com> |
am fbd9b9f3: Merge "Get rid of "flashies" in the action bar." * commit 'fbd9b9f3ad927f2757807abc562dd2f6d3bea126': Get rid of "flashies" in the action bar.
|
45cad154e613c4eae07ca15bb8f0df8072e7a1b0 |
03-Oct-2011 |
Evan Millar <emillar@google.com> |
am 854b8337: Merge "Various UI fixes in Gallery" * commit '854b83378e9e69f54a64ecf56259a3b68fefa7a6': Various UI fixes in Gallery
|
0e03b811a0d81681095b2b77a2737e1be32121c9 |
03-Oct-2011 |
Evan Millar <emillar@google.com> |
Merge "Get rid of "flashies" in the action bar."
|
3745ce03f718935d96c6b1dd3a9fe50127873f19 |
03-Oct-2011 |
Evan Millar <emillar@google.com> |
Merge "Get rid of "flashies" in the action bar."
|
fbd9b9f3ad927f2757807abc562dd2f6d3bea126 |
03-Oct-2011 |
Evan Millar <emillar@google.com> |
Merge "Get rid of "flashies" in the action bar."
|
854b83378e9e69f54a64ecf56259a3b68fefa7a6 |
03-Oct-2011 |
Evan Millar <emillar@google.com> |
Merge "Various UI fixes in Gallery"
|
92aa3ff53508e1d3eeb60f3101eef9b70a0fab56 |
03-Oct-2011 |
Evan Millar <emillar@google.com> |
Merge "Various UI fixes in Gallery"
|
f63ed4000f3641929747627c51825fb77be1aa21 |
03-Oct-2011 |
Evan Millar <emillar@google.com> |
Merge "Various UI fixes in Gallery"
|
78b8b3777168d1c19e845794e560ff31d7e7eb24 |
03-Oct-2011 |
Evan Millar <emillar@google.com> |
Get rid of "flashies" in the action bar. -Filter out short spinner events. All spinner events that last <1sec are now ignored. We also enforce a minimum delay time of 2 sec. -Mark the share and delete menu items as visible="false" by default to get rid of the quick display/removal of them under scenarios where they are ultimately removed. bug:5398336 Change-Id: I0620532f3ab59d9fde46123620eb781a87445b54
es/menu/photo.xml
|
4995b5d02e67ff06b7db699a1a891da2c9e77bfa |
03-Oct-2011 |
Evan Millar <emillar@google.com> |
Get rid of "flashies" in the action bar. -Filter out short spinner events. All spinner events that last <1sec are now ignored. We also enforce a minimum delay time of 2 sec. -Mark the share and delete menu items as visible="false" by default to get rid of the quick display/removal of them under scenarios where they are ultimately removed. bug:5398336 Change-Id: I0620532f3ab59d9fde46123620eb781a87445b54
rc/com/android/gallery3d/util/GalleryUtils.java
rc/com/android/gallery3d/util/SpinnerVisibilitySetter.java
|
486c2ee153d7dad30d80e17fc8c2dd5133b86fb2 |
03-Oct-2011 |
Evan Millar <emillar@google.com> |
Get rid of "flashies" in the action bar. -Filter out short spinner events. All spinner events that last <1sec are now ignored. We also enforce a minimum delay time of 2 sec. -Mark the share and delete menu items as visible="false" by default to get rid of the quick display/removal of them under scenarios where they are ultimately removed. bug:5398336 Change-Id: I0620532f3ab59d9fde46123620eb781a87445b54
es/menu/photo.xml
rc/com/android/gallery3d/util/GalleryUtils.java
rc/com/android/gallery3d/util/SpinnerVisibilitySetter.java
|
948d2683a9f9ac825afd4aa6a3474ae2ba522e69 |
03-Oct-2011 |
Yuli Huang <yuli@google.com> |
am ae70ae47: Fix b/5317371 to make action-bar consistent with framework CAB. * commit 'ae70ae473dcd674d61c9e6a79afcf57f825f7302': Fix b/5317371 to make action-bar consistent with framework CAB.
|
ae70ae473dcd674d61c9e6a79afcf57f825f7302 |
30-Sep-2011 |
Yuli Huang <yuli@google.com> |
Fix b/5317371 to make action-bar consistent with framework CAB. 1. Refactor to decouple ActionBar from FilterStackListener and ActionBarListener to avoid FilterStack/Toolbar depending on ActionBar. 2. Recreate the action-bar on configuration changes and restore button status and behaviors from the old action-bar. 3. Use framework CAB styles/dimensions to have consistent look and feel. Change-Id: Ib7be0e0b8135f5f86af65b320f09b3d691464f54
es/drawable/photoeditor_arrow_back.png
es/layout/photoeditor_actionbar.xml
es/layout/photoeditor_main.xml
es/values-sw320dp-land/photoeditor_dimens.xml
es/values-sw320dp-port/photoeditor_dimens.xml
es/values-sw320dp/photoeditor_dimens.xml
es/values-sw600dp/photoeditor_dimens.xml
es/values-sw800dp/photoeditor_dimens.xml
es/values/photoeditor_strings.xml
es/values/photoeditor_styles.xml
rc/com/android/gallery3d/photoeditor/ActionBar.java
rc/com/android/gallery3d/photoeditor/FilterStack.java
rc/com/android/gallery3d/photoeditor/LoadScreennailTask.java
rc/com/android/gallery3d/photoeditor/PhotoEditor.java
rc/com/android/gallery3d/photoeditor/SaveCopyTask.java
rc/com/android/gallery3d/photoeditor/Toolbar.java
rc/com/android/gallery3d/photoeditor/ToolbarIdleHandler.java
rc/com/android/gallery3d/photoeditor/YesNoCancelDialogBuilder.java
|
6b66d707c43c5657e90cc72a86e2fb20238632f1 |
30-Sep-2011 |
Yuli Huang <yuli@google.com> |
Fix b/5317371 to make action-bar consistent with framework CAB. 1. Refactor to decouple ActionBar from FilterStackListener and ActionBarListener to avoid FilterStack/Toolbar depending on ActionBar. 2. Recreate the action-bar on configuration changes and restore button status and behaviors from the old action-bar. 3. Use framework CAB styles/dimensions to have consistent look and feel. Change-Id: Ib7be0e0b8135f5f86af65b320f09b3d691464f54
es/drawable/photoeditor_arrow_back.png
es/layout/photoeditor_actionbar.xml
es/layout/photoeditor_main.xml
es/values-sw320dp-land/photoeditor_dimens.xml
es/values-sw320dp-port/photoeditor_dimens.xml
es/values-sw320dp/photoeditor_dimens.xml
es/values-sw600dp/photoeditor_dimens.xml
es/values-sw800dp/photoeditor_dimens.xml
es/values/photoeditor_strings.xml
es/values/photoeditor_styles.xml
|
305740f973407ec783fac92490a6df1b675632e2 |
30-Sep-2011 |
Yuli Huang <yuli@google.com> |
Fix b/5317371 to make action-bar consistent with framework CAB. 1. Refactor to decouple ActionBar from FilterStackListener and ActionBarListener to avoid FilterStack/Toolbar depending on ActionBar. 2. Recreate the action-bar on configuration changes and restore button status and behaviors from the old action-bar. 3. Use framework CAB styles/dimensions to have consistent look and feel. Change-Id: Ib7be0e0b8135f5f86af65b320f09b3d691464f54
rc/com/android/gallery3d/photoeditor/ActionBar.java
rc/com/android/gallery3d/photoeditor/FilterStack.java
rc/com/android/gallery3d/photoeditor/LoadScreennailTask.java
rc/com/android/gallery3d/photoeditor/PhotoEditor.java
rc/com/android/gallery3d/photoeditor/SaveCopyTask.java
rc/com/android/gallery3d/photoeditor/Toolbar.java
rc/com/android/gallery3d/photoeditor/ToolbarIdleHandler.java
rc/com/android/gallery3d/photoeditor/YesNoCancelDialogBuilder.java
|
b5cd29dae0cacd3467046a7b56f35175a66f8a90 |
03-Oct-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
07560b23031edc849a05314d67fb6170920340b4 |
03-Oct-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
602a2da9ba3318b30a14fc6d7aed2c8c7d16ccfc |
03-Oct-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
29abf97a034747d0371c52413cd12ffb54d9e4b9 |
01-Oct-2011 |
Eric Fischer <enf@google.com> |
am 7777ff57: Merge "Import revised translations." * commit '7777ff571ecc799de390ea0d9fe51d85bba38aa8': Import revised translations.
|
7777ff571ecc799de390ea0d9fe51d85bba38aa8 |
01-Oct-2011 |
Eric Fischer <enf@google.com> |
Merge "Import revised translations."
|
91a0c8aec900c7d6473cf45f7b52cae3477ef59c |
01-Oct-2011 |
Eric Fischer <enf@google.com> |
Merge "Import revised translations."
|
8bf634cac75c37f6909914cf743df7bcd6ca6f52 |
01-Oct-2011 |
Eric Fischer <enf@google.com> |
Import revised translations. Change-Id: Ia087d1303cf26cb2e7679485c62ac41b24f5ad29
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/photoeditor_strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/photoeditor_strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/photoeditor_strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/photoeditor_strings.xml
es/values-ja/strings.xml
es/values-ko/photoeditor_strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/photoeditor_strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/photoeditor_strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/photoeditor_strings.xml
es/values-ro/strings.xml
es/values-ru/photoeditor_strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/photoeditor_strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/photoeditor_strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/photoeditor_strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
d93d908725fa1fa97bfe31a4f4c25b2c69e265dc |
01-Oct-2011 |
Eric Fischer <enf@google.com> |
Import revised translations. Change-Id: Ia087d1303cf26cb2e7679485c62ac41b24f5ad29
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/photoeditor_strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/photoeditor_strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/photoeditor_strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/photoeditor_strings.xml
es/values-ja/strings.xml
es/values-ko/photoeditor_strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/photoeditor_strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/photoeditor_strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/photoeditor_strings.xml
es/values-ro/strings.xml
es/values-ru/photoeditor_strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/photoeditor_strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/photoeditor_strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/photoeditor_strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
a29127be09f74782dee7d6c18cf6dd50728652aa |
30-Sep-2011 |
Evan Millar <emillar@google.com> |
Various UI fixes in Gallery -New assets for grid and strip selection borders. -Fix spacing in details dialog. -New scrollbar asset in the strip view. -Deleted unused ScrollView.java and GlDetailsView.java bug:5327238 Change-Id: I147b8f8069f42e345110f7ae86c47d331551f089
es/drawable-hdpi/grid_pressed.9.png
es/drawable-hdpi/grid_selected.9.png
es/drawable-hdpi/scrollbar_handle_holo_dark.9.png
es/drawable-hdpi/thumb_selected.9.png
es/drawable-mdpi/grid_pressed.9.png
es/drawable-mdpi/grid_selected.9.png
es/drawable-mdpi/scrollbar_handle_holo_dark.9.png
es/drawable-mdpi/thumb_selected.9.png
es/drawable-xhdpi/grid_pressed.9.png
es/drawable-xhdpi/grid_selected.9.png
es/drawable-xhdpi/thumb_selected.9.png
es/layout/details_list.xml
es/values-xlarge/bool.xml
es/values/bool.xml
rc/com/android/gallery3d/ui/DetailsHelper.java
rc/com/android/gallery3d/ui/DialogDetailsView.java
rc/com/android/gallery3d/ui/GLDetailsView.java
rc/com/android/gallery3d/ui/ScrollBarView.java
rc/com/android/gallery3d/ui/ScrollView.java
rc/com/android/gallery3d/ui/StripDrawer.java
|
cf19320192ae5799b7ba147949bc9ef0d3a9c8d5 |
30-Sep-2011 |
Evan Millar <emillar@google.com> |
Various UI fixes in Gallery -New assets for grid and strip selection borders. -Fix spacing in details dialog. -New scrollbar asset in the strip view. -Deleted unused ScrollView.java and GlDetailsView.java bug:5327238 Change-Id: I147b8f8069f42e345110f7ae86c47d331551f089
es/drawable-hdpi/grid_pressed.9.png
es/drawable-hdpi/grid_selected.9.png
es/drawable-hdpi/scrollbar_handle_holo_dark.9.png
es/drawable-hdpi/thumb_selected.9.png
es/drawable-mdpi/grid_pressed.9.png
es/drawable-mdpi/grid_selected.9.png
es/drawable-mdpi/scrollbar_handle_holo_dark.9.png
es/drawable-mdpi/thumb_selected.9.png
es/drawable-xhdpi/grid_pressed.9.png
es/drawable-xhdpi/grid_selected.9.png
es/drawable-xhdpi/thumb_selected.9.png
es/layout/details_list.xml
es/values-xlarge/bool.xml
es/values/bool.xml
|
1d9e17fbaae27845bec3c20723a6a67e5d8a5891 |
30-Sep-2011 |
Evan Millar <emillar@google.com> |
Various UI fixes in Gallery -New assets for grid and strip selection borders. -Fix spacing in details dialog. -New scrollbar asset in the strip view. -Deleted unused ScrollView.java and GlDetailsView.java bug:5327238 Change-Id: I147b8f8069f42e345110f7ae86c47d331551f089
rc/com/android/gallery3d/ui/DetailsHelper.java
rc/com/android/gallery3d/ui/DialogDetailsView.java
rc/com/android/gallery3d/ui/GLDetailsView.java
rc/com/android/gallery3d/ui/ScrollBarView.java
rc/com/android/gallery3d/ui/ScrollView.java
rc/com/android/gallery3d/ui/StripDrawer.java
|
f41cbb26da37f17ae20eff1d44354a24a9e811e4 |
30-Sep-2011 |
Ruei-sung Lin <rslin@google.com> |
am d37ff2ee: facelift in gallery * commit 'd37ff2eef80634dabd2f37ecfe6993ae56efb2d4': facelift in gallery
|
103febb6c83c96c356dde7c388f4faeffb5a9a11 |
19-Sep-2011 |
Ruei-sung Lin <rslin@google.com> |
facelift in gallery Change-Id: I7cb67c3d977d8b23957586bb5ad1dada096ef07b
ndroidManifest.xml
|
e0856697e69a7802040c004232e4cdec4113a88e |
19-Sep-2011 |
Ruei-sung Lin <rslin@google.com> |
facelift in gallery Change-Id: I7cb67c3d977d8b23957586bb5ad1dada096ef07b
rc/com/android/gallery3d/photoeditor/actions/FaceliftAction.java
rc/com/android/gallery3d/photoeditor/filters/FaceliftFilter.java
|
d37ff2eef80634dabd2f37ecfe6993ae56efb2d4 |
19-Sep-2011 |
Ruei-sung Lin <rslin@google.com> |
facelift in gallery Change-Id: I7cb67c3d977d8b23957586bb5ad1dada096ef07b
ndroidManifest.xml
es/drawable/photoeditor_effect_facelift.png
es/layout/photoeditor_effects_fix.xml
es/values/photoeditor_strings.xml
rc/com/android/gallery3d/photoeditor/actions/FaceliftAction.java
rc/com/android/gallery3d/photoeditor/filters/FaceliftFilter.java
|
576b8713c76c372e92d65ff79d158ea91539d9ca |
19-Sep-2011 |
Ruei-sung Lin <rslin@google.com> |
facelift in gallery Change-Id: I7cb67c3d977d8b23957586bb5ad1dada096ef07b
es/drawable/photoeditor_effect_facelift.png
es/layout/photoeditor_effects_fix.xml
es/values/photoeditor_strings.xml
|
d6feafde7efe91477afb973fa8847af0b55e93d9 |
30-Sep-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
cf4629eb647038629de9f8f601271aaf058a082e |
30-Sep-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
4ed50976f35c9f6044f15ffaa314db9c1844777d |
30-Sep-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
9b39f232f589b82d71a92eaf9c0a3848d51d1524 |
30-Sep-2011 |
Bor-Yeh Shen <byshen@google.com> |
am 75ebc879: Replace effect thumbnails. * commit '75ebc879150db8ebe77e95217d0b4d1a132d40b6': Replace effect thumbnails.
|
a75c4de8f048fe0ebacfc55406f6f13640c1079f |
30-Sep-2011 |
Chih-Chung Chang <chihchung@google.com> |
am 99b1e2bd: Merge "Fix 5336726: sort local albums by reverse chronological order." * commit '99b1e2bde5a31a729cb4cd536e7064443caef2d8': Fix 5336726: sort local albums by reverse chronological order.
|
f9b4f19e52476cba3c131a83facc7fc969cad93d |
30-Sep-2011 |
Owen Lin <owenlin@google.com> |
am c046bbaa: Merge "Rotate the image according to FullImageRotation." * commit 'c046bbaa7062a941b8fc462f6dcaabda926fa05a': Rotate the image according to FullImageRotation.
|
75ebc879150db8ebe77e95217d0b4d1a132d40b6 |
30-Sep-2011 |
Bor-Yeh Shen <byshen@google.com> |
Replace effect thumbnails. Change-Id: I7a8548f23b6e039d59a2e27c7e172fc499a55f91
es/drawable/photoeditor_effect_autofix.png
es/drawable/photoeditor_effect_crossprocess.png
es/drawable/photoeditor_effect_documentary.png
es/drawable/photoeditor_effect_doodle.png
es/drawable/photoeditor_effect_duotone.png
es/drawable/photoeditor_effect_filllight.png
es/drawable/photoeditor_effect_fisheye.png
es/drawable/photoeditor_effect_grain.png
es/drawable/photoeditor_effect_grayscale.png
es/drawable/photoeditor_effect_highlight.png
es/drawable/photoeditor_effect_lomoish.png
es/drawable/photoeditor_effect_negative.png
es/drawable/photoeditor_effect_posterize.png
es/drawable/photoeditor_effect_saturation.png
es/drawable/photoeditor_effect_sepia.png
es/drawable/photoeditor_effect_shadow.png
es/drawable/photoeditor_effect_temperature.png
es/drawable/photoeditor_effect_tint.png
es/drawable/photoeditor_effect_vignette.png
|
2ec4e1c43dbd2488738a4ab529a535a276425fd5 |
30-Sep-2011 |
Bor-Yeh Shen <byshen@google.com> |
Replace effect thumbnails. Change-Id: I7a8548f23b6e039d59a2e27c7e172fc499a55f91
es/drawable/photoeditor_effect_autofix.png
es/drawable/photoeditor_effect_crossprocess.png
es/drawable/photoeditor_effect_documentary.png
es/drawable/photoeditor_effect_doodle.png
es/drawable/photoeditor_effect_duotone.png
es/drawable/photoeditor_effect_filllight.png
es/drawable/photoeditor_effect_fisheye.png
es/drawable/photoeditor_effect_grain.png
es/drawable/photoeditor_effect_grayscale.png
es/drawable/photoeditor_effect_highlight.png
es/drawable/photoeditor_effect_lomoish.png
es/drawable/photoeditor_effect_negative.png
es/drawable/photoeditor_effect_posterize.png
es/drawable/photoeditor_effect_saturation.png
es/drawable/photoeditor_effect_sepia.png
es/drawable/photoeditor_effect_shadow.png
es/drawable/photoeditor_effect_temperature.png
es/drawable/photoeditor_effect_tint.png
es/drawable/photoeditor_effect_vignette.png
|
4074ff352ed8fafd2146eec9c6356b9b5e3bcd94 |
30-Sep-2011 |
Chih-Chung Chang <chihchung@google.com> |
Merge "Fix 5336726: sort local albums by reverse chronological order."
|
99b1e2bde5a31a729cb4cd536e7064443caef2d8 |
30-Sep-2011 |
Chih-Chung Chang <chihchung@google.com> |
Merge "Fix 5336726: sort local albums by reverse chronological order."
|
c046bbaa7062a941b8fc462f6dcaabda926fa05a |
30-Sep-2011 |
Owen Lin <owenlin@google.com> |
Merge "Rotate the image according to FullImageRotation."
|
5e478719599bc2cdbf9851353b2577f86946503c |
30-Sep-2011 |
Owen Lin <owenlin@google.com> |
Merge "Rotate the image according to FullImageRotation."
|
fbef386d12258a963295aa09afe62f7f1f44fba8 |
29-Sep-2011 |
Chih-Chung Chang <chihchung@google.com> |
Fix 5336726: sort local albums by reverse chronological order. Change-Id: I3a04286bea7f43d5f3542b37eddbb4a0801e94f5
rc/com/android/gallery3d/data/LocalAlbumSet.java
|
4bdd71bcde93e6f942e2a947a10ee32f63b37828 |
29-Sep-2011 |
Chih-Chung Chang <chihchung@google.com> |
Fix 5336726: sort local albums by reverse chronological order. Change-Id: I3a04286bea7f43d5f3542b37eddbb4a0801e94f5
rc/com/android/gallery3d/data/LocalAlbumSet.java
|
69617c885f5532a790d5a3b22ee0c7d2fa2cb809 |
29-Sep-2011 |
The Android Open Source Project <initial-contribution@android.com> |
am bfc7422b: Reconcile with ics-factoryrom-release * commit 'bfc7422b6b40edc7a0917db18adf02b972c22060':
|
bfc7422b6b40edc7a0917db18adf02b972c22060 |
29-Sep-2011 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with ics-factoryrom-release Change-Id: I83684406f2c3ac17cc89b746b27fb5a04333459b
|
cd3c07bc7e0659a34afc9fb200769f890697dc1d |
29-Sep-2011 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with ics-factoryrom-release Change-Id: I83684406f2c3ac17cc89b746b27fb5a04333459b
|
270e393c76284c3ea94ca69b11376b437744bac5 |
29-Sep-2011 |
Evan Millar <emillar@google.com> |
am 731d46ed: Merge "New spinner assets." * commit '731d46ed4c57df89ccd5f7b66149a5a2a2126e28': New spinner assets.
|
731d46ed4c57df89ccd5f7b66149a5a2a2126e28 |
29-Sep-2011 |
Evan Millar <emillar@google.com> |
Merge "New spinner assets."
|
d16620a211675677135318be42c60cb967d8f714 |
29-Sep-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
a71fefee7779cad1360ee686b39f7f81dd249658 |
29-Sep-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
adbe8ae5de0dddff627b21e5b77b21dc85304ceb |
29-Sep-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
2c3c51758a514893280a9ce320f2b280c325897b |
29-Sep-2011 |
Owen Lin <owenlin@google.com> |
Rotate the image according to FullImageRotation. Change-Id: I2c1285aa50b71e0efdbe3c4c50264e42c7b9ab97 fix: 5389974
rc/com/android/gallery3d/app/CropImage.java
|
1ebc9345a9e0aee724ba00c02cfcd975131d5b4f |
29-Sep-2011 |
Owen Lin <owenlin@google.com> |
Rotate the image according to FullImageRotation. Change-Id: I2c1285aa50b71e0efdbe3c4c50264e42c7b9ab97 fix: 5389974
rc/com/android/gallery3d/app/CropImage.java
|
af17f804d75e689ffaca38ddc1e47b2ee5273210 |
27-Sep-2011 |
Evan Millar <emillar@google.com> |
New spinner assets. bug:5340690 Change-Id: I0181ce266717ebaf0558e71c0057e2ca0c6f267f
es/drawable-hdpi/spinner_76_inner_holo.png
es/drawable-hdpi/spinner_76_outer_holo.png
es/drawable-mdpi/spinner_76_inner_holo.png
es/drawable-mdpi/spinner_76_outer_holo.png
es/drawable-xhdpi/spinner_76_inner_holo.png
es/drawable-xhdpi/spinner_76_outer_holo.png
|
3c6fc33eb849a2fea8a8bf2f942ac09b503e480c |
27-Sep-2011 |
Evan Millar <emillar@google.com> |
New spinner assets. bug:5340690 Change-Id: I0181ce266717ebaf0558e71c0057e2ca0c6f267f
es/drawable-hdpi/spinner_76_inner_holo.png
es/drawable-hdpi/spinner_76_outer_holo.png
es/drawable-mdpi/spinner_76_inner_holo.png
es/drawable-mdpi/spinner_76_outer_holo.png
es/drawable-xhdpi/spinner_76_inner_holo.png
es/drawable-xhdpi/spinner_76_outer_holo.png
|
debc1d7c0d9c40868e6545b7f0dc394a75fa1f0a |
29-Sep-2011 |
Owen Lin <owenlin@google.com> |
am 62969344: Add maskDebugInfo to display info for debugging build only. * commit '62969344d617c34c1dae2ed26f73018a097be4ce': Add maskDebugInfo to display info for debugging build only.
|
464b66583c0d455d1e1c407f1128545060821688 |
27-Sep-2011 |
Owen Lin <owenlin@google.com> |
Add maskDebugInfo to display info for debugging build only. bug: 5335366 Change-Id: I5b6de536bb8e9439b61eb3778fbb1801c8e898c8
allerycommon/src/com/android/gallery3d/common/Utils.java
|
6f0506ba4d5bc5579654df74e05d2f53ee15ff56 |
27-Sep-2011 |
Owen Lin <owenlin@google.com> |
Add maskDebugInfo to display info for debugging build only. bug: 5335366 Change-Id: I5b6de536bb8e9439b61eb3778fbb1801c8e898c8
allerycommon/src/com/android/gallery3d/common/Utils.java
|
62969344d617c34c1dae2ed26f73018a097be4ce |
27-Sep-2011 |
Owen Lin <owenlin@google.com> |
Add maskDebugInfo to display info for debugging build only. bug: 5335366 Change-Id: I5b6de536bb8e9439b61eb3778fbb1801c8e898c8
allerycommon/src/com/android/gallery3d/common/Utils.java
|
211213007700049a6254f044bf1bda7903e71bf0 |
29-Sep-2011 |
Chih-Chung Chang <chihchung@google.com> |
am 338d029f: Fix 5388852: Separate CropImage activity to another process to have more memory. * commit '338d029f0391b781bd6d1ee5ac1843fde1808f9a': Fix 5388852: Separate CropImage activity to another process to have more memory.
|
1d80150fd525a8c1bc95bc15a151d8eb575174bb |
29-Sep-2011 |
Chih-Chung Chang <chihchung@google.com> |
am 6c1f01e2: Small UI tweak: only show fade-in animation when the bitmap has not been available for rendering before. * commit '6c1f01e21406a05dc7d3258001aa901bd8628a79': Small UI tweak: only show fade-in animation when the bitmap has not been available for rendering before.
|
7f837851834bfba59d40320829b943fe87615f20 |
29-Sep-2011 |
Chih-Chung Chang <chihchung@google.com> |
Fix 5388852: Separate CropImage activity to another process to have more memory. Change-Id: I3bed66e9c61269f94d909508b8a4b3fa6b934976
ndroidManifest.xml
|
338d029f0391b781bd6d1ee5ac1843fde1808f9a |
29-Sep-2011 |
Chih-Chung Chang <chihchung@google.com> |
Fix 5388852: Separate CropImage activity to another process to have more memory. Change-Id: I3bed66e9c61269f94d909508b8a4b3fa6b934976
ndroidManifest.xml
|
ffaaec327edcce246b5b5b0cb2786dd74d1d6ec8 |
29-Sep-2011 |
Chih-Chung Chang <chihchung@google.com> |
Small UI tweak: only show fade-in animation when the bitmap has not been available for rendering before. Change-Id: I57df7911c5afa7aa2eec910d0e21679ed978ddad
rc/com/android/gallery3d/ui/AlbumSetSlidingWindow.java
rc/com/android/gallery3d/ui/AlbumSlidingWindow.java
|
6c1f01e21406a05dc7d3258001aa901bd8628a79 |
29-Sep-2011 |
Chih-Chung Chang <chihchung@google.com> |
Small UI tweak: only show fade-in animation when the bitmap has not been available for rendering before. Change-Id: I57df7911c5afa7aa2eec910d0e21679ed978ddad
rc/com/android/gallery3d/ui/AlbumSetSlidingWindow.java
rc/com/android/gallery3d/ui/AlbumSlidingWindow.java
|
5846c3023642b7e6b1c98e3c391138894d51a66b |
29-Sep-2011 |
Michael Jurka <mikejurka@google.com> |
am 15457fad: Merge "Change gallery crop interface to be consistent with widget resizing" * commit '15457fada6df984afe1b411a548f779bd7757f21': Change gallery crop interface to be consistent with widget resizing
|
d36a2bd4629f246ca6fef0913e2127ac49672538 |
29-Sep-2011 |
Michael Jurka <mikejurka@google.com> |
Merge "Change gallery crop interface to be consistent with widget resizing"
|
15457fada6df984afe1b411a548f779bd7757f21 |
29-Sep-2011 |
Michael Jurka <mikejurka@google.com> |
Merge "Change gallery crop interface to be consistent with widget resizing"
|
6f53e38a923e24532d2696e530762e1197158567 |
29-Sep-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
03ce4336d784d9dc4fbd2b89e747d4ed35af2954 |
29-Sep-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
c3a4e7d969578edf11e07ceab4923fd6fb92d6bb |
29-Sep-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
2b624500110ce4624bf8368e73ff6b619b443890 |
29-Sep-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-factoryrom-release history after reset to ics-factoryrom
|
53b3ef55734f272a1b5a3805c9d0c597e4fc5c0f |
29-Sep-2011 |
Eric Fischer <enf@google.com> |
am 91ca33ff: (-s ours) am 8b577a93: (-s ours) Import revised translations. DO NOT MERGE. * commit '91ca33ff77cbe9a2300c51fd48358223f1cbb789': Import revised translations. DO NOT MERGE.
|
ea87a694bce3521c756204fe0da0f911648cc224 |
29-Sep-2011 |
Eric Fischer <enf@google.com> |
am 8b577a93: (-s ours) Import revised translations. DO NOT MERGE. * commit '8b577a93abeecdc6832c9888e269d5ba66d17b23': Import revised translations. DO NOT MERGE.
|
91ca33ff77cbe9a2300c51fd48358223f1cbb789 |
29-Sep-2011 |
Eric Fischer <enf@google.com> |
am 8b577a93: (-s ours) Import revised translations. DO NOT MERGE. * commit '8b577a93abeecdc6832c9888e269d5ba66d17b23': Import revised translations. DO NOT MERGE.
|
8b577a93abeecdc6832c9888e269d5ba66d17b23 |
29-Sep-2011 |
Eric Fischer <enf@google.com> |
Import revised translations. DO NOT MERGE. Change-Id: Idaa85ef45826993b5bc1f4bdf7cd434a3fefb616
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-vi/strings.xml
es/values-zh-rTW/strings.xml
|
ebda00923fcfcd030c17084e3b8f4ac6b30ca5a1 |
29-Sep-2011 |
Eric Fischer <enf@google.com> |
Import revised translations. DO NOT MERGE. Change-Id: Idaa85ef45826993b5bc1f4bdf7cd434a3fefb616
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-vi/strings.xml
es/values-zh-rTW/strings.xml
|
e3f4b8fd2435e0af778230df455c905e23ec583e |
27-Sep-2011 |
Michael Jurka <mikejurka@google.com> |
Change gallery crop interface to be consistent with widget resizing - Always show the resize controls when you're not touching the UI - Change the resize controls to the holo style Change-Id: Ia32235d6d82196a24b26fc78b9e9e1e3fb1f5250
rc/com/android/gallery3d/photoeditor/actions/CropView.java
rc/com/android/gallery3d/ui/CropView.java
|
a8d587f4ea792eff03c43fb03a7052efb7d54572 |
27-Sep-2011 |
Michael Jurka <mikejurka@google.com> |
Change gallery crop interface to be consistent with widget resizing - Always show the resize controls when you're not touching the UI - Change the resize controls to the holo style Change-Id: Ia32235d6d82196a24b26fc78b9e9e1e3fb1f5250
es/drawable-hdpi/camera_crop_height_holo.png
es/drawable-hdpi/camera_crop_holo.png
es/drawable-hdpi/camera_crop_width_holo.png
es/drawable-mdpi/camera_crop_height_holo.png
es/drawable-mdpi/camera_crop_holo.png
es/drawable-mdpi/camera_crop_width_holo.png
es/drawable-xhdpi/camera_crop_holo.png
|
1dee1c625e02138c3f230d951aed7feb6c924080 |
27-Sep-2011 |
Michael Jurka <mikejurka@google.com> |
Change gallery crop interface to be consistent with widget resizing - Always show the resize controls when you're not touching the UI - Change the resize controls to the holo style Change-Id: Ia32235d6d82196a24b26fc78b9e9e1e3fb1f5250
es/drawable-hdpi/camera_crop_height_holo.png
es/drawable-hdpi/camera_crop_holo.png
es/drawable-hdpi/camera_crop_width_holo.png
es/drawable-mdpi/camera_crop_height_holo.png
es/drawable-mdpi/camera_crop_holo.png
es/drawable-mdpi/camera_crop_width_holo.png
es/drawable-xhdpi/camera_crop_holo.png
rc/com/android/gallery3d/photoeditor/actions/CropView.java
rc/com/android/gallery3d/ui/CropView.java
|
01f7726657d9ea4f5f669e3b2833e60b7852959a |
28-Sep-2011 |
Chih-Chung Chang <chihchung@google.com> |
am 9cf9756e: Merge "Fix 5384679: Back button doesn\'t work in Video Player" * commit '9cf9756e53c883ea3829b106aead60045754b610': Fix 5384679: Back button doesn't work in Video Player
|
b160bf641958039fb43c66b945e237ef78318c0e |
28-Sep-2011 |
Chih-Chung Chang <chihchung@google.com> |
Merge "Fix 5384679: Back button doesn't work in Video Player"
|
9cf9756e53c883ea3829b106aead60045754b610 |
28-Sep-2011 |
Chih-Chung Chang <chihchung@google.com> |
Merge "Fix 5384679: Back button doesn't work in Video Player"
|
51e09d5f70418a897df7724a5052ce6e0ce57fef |
28-Sep-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
7d797c0524c1ab3f5614531a49d03604add7aab5 |
28-Sep-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
10a1a5f0358f350be7538ede765847592080ef88 |
28-Sep-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
f96e343009649053b0b4bea5a1826fcb577763ef |
28-Sep-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-factoryrom-release history after reset to ics-factoryrom
|
5bf3bba0c72f1b7171ab60753385dbeb0628070e |
28-Sep-2011 |
Chih-Chung Chang <chihchung@google.com> |
Fix 5384679: Back button doesn't work in Video Player Change-Id: Idde8778fc5643ef21fd4ad39ffbaa3c9e0c7d147
rc/com/android/gallery3d/app/MoviePlayer.java
|
fbcc99ce6124d486cc9b3b57e67b700357fd0e65 |
28-Sep-2011 |
Chih-Chung Chang <chihchung@google.com> |
Fix 5384679: Back button doesn't work in Video Player Change-Id: Idde8778fc5643ef21fd4ad39ffbaa3c9e0c7d147
rc/com/android/gallery3d/app/MoviePlayer.java
|
f0d66432348d3ebf5773ce9db6be8e27de71643c |
28-Sep-2011 |
Chih-Chung Chang <chihchung@google.com> |
am 1a9982e3: Merge "Fix 5158468: Hide system bar when no play control is shown." * commit '1a9982e33095c6fd664b5fc4f3e0856bd6326155': Fix 5158468: Hide system bar when no play control is shown.
|
489b7c2bfc3e07ca503bb0f8bb6ceb8b5d2939af |
28-Sep-2011 |
Chih-Chung Chang <chihchung@google.com> |
Merge "Fix 5158468: Hide system bar when no play control is shown."
|
1a9982e33095c6fd664b5fc4f3e0856bd6326155 |
28-Sep-2011 |
Chih-Chung Chang <chihchung@google.com> |
Merge "Fix 5158468: Hide system bar when no play control is shown."
|
399bb7eab79c9e48efb5b481a5f9dc2536ff45b4 |
27-Sep-2011 |
Chih-Chung Chang <chihchung@google.com> |
Fix 5158468: Hide system bar when no play control is shown. Change-Id: Iada70c39440f19eec1cb00088531719bc1bb8328
rc/com/android/gallery3d/app/MovieActivity.java
rc/com/android/gallery3d/app/MoviePlayer.java
|
8176012eeb96bb167ef7c7ba2d02f82b646766f0 |
27-Sep-2011 |
Chih-Chung Chang <chihchung@google.com> |
Fix 5158468: Hide system bar when no play control is shown. Change-Id: Iada70c39440f19eec1cb00088531719bc1bb8328
rc/com/android/gallery3d/app/MovieActivity.java
rc/com/android/gallery3d/app/MoviePlayer.java
|
c9f446fcbe51a55fd668179539ad5d4fcfb1a288 |
28-Sep-2011 |
Chih-Chung Chang <chihchung@google.com> |
am 2f5b778e: Merge "Fix 5367072: Add thumbnail fade-in animation." * commit '2f5b778e9a5814084e1d5ff191fd02b0149ef568': Fix 5367072: Add thumbnail fade-in animation.
|
5be6dbe487c9db0945d332fc1cc6a6d96d7c016f |
28-Sep-2011 |
Chih-Chung Chang <chihchung@google.com> |
Merge "Fix 5367072: Add thumbnail fade-in animation."
|
2f5b778e9a5814084e1d5ff191fd02b0149ef568 |
28-Sep-2011 |
Chih-Chung Chang <chihchung@google.com> |
Merge "Fix 5367072: Add thumbnail fade-in animation."
|
1b2af5e5a75cf4c117e3e6c8d02fdb4587dff0be |
27-Sep-2011 |
Chih-Chung Chang <chihchung@google.com> |
Fix 5367072: Add thumbnail fade-in animation. Change-Id: I1101721c703d6dcb98f11178d54d65446f74ce06
rc/com/android/gallery3d/ui/AlbumSetSlidingWindow.java
rc/com/android/gallery3d/ui/AlbumSlidingWindow.java
rc/com/android/gallery3d/ui/DisplayItem.java
rc/com/android/gallery3d/ui/FadeInTexture.java
rc/com/android/gallery3d/ui/GridDrawer.java
rc/com/android/gallery3d/ui/HighlightDrawer.java
rc/com/android/gallery3d/ui/IconDrawer.java
rc/com/android/gallery3d/ui/ManageCacheDrawer.java
rc/com/android/gallery3d/ui/SelectionDrawer.java
rc/com/android/gallery3d/ui/SlotView.java
rc/com/android/gallery3d/ui/StripDrawer.java
rc/com/android/gallery3d/ui/Texture.java
|
da071d27a1435cce080b5c609d0d833555e5a175 |
27-Sep-2011 |
Chih-Chung Chang <chihchung@google.com> |
Fix 5367072: Add thumbnail fade-in animation. Change-Id: I1101721c703d6dcb98f11178d54d65446f74ce06
rc/com/android/gallery3d/ui/AlbumSetSlidingWindow.java
rc/com/android/gallery3d/ui/AlbumSlidingWindow.java
rc/com/android/gallery3d/ui/DisplayItem.java
rc/com/android/gallery3d/ui/FadeInTexture.java
rc/com/android/gallery3d/ui/GridDrawer.java
rc/com/android/gallery3d/ui/HighlightDrawer.java
rc/com/android/gallery3d/ui/IconDrawer.java
rc/com/android/gallery3d/ui/ManageCacheDrawer.java
rc/com/android/gallery3d/ui/SelectionDrawer.java
rc/com/android/gallery3d/ui/SlotView.java
rc/com/android/gallery3d/ui/StripDrawer.java
rc/com/android/gallery3d/ui/Texture.java
|
ab0d8c8190ca5164f9cf179f2ce5d8a8a43b7f59 |
28-Sep-2011 |
Ray Chen <raychen@google.com> |
am 31fa619b: Merge "Fix 5341761 gallery vibrate on confirm delete" * commit '31fa619bc23f75cd0f2999d4c9a37080ba1b87da': Fix 5341761 gallery vibrate on confirm delete
|
c29a5a347120a9aed277b578b0ea888c7e89b060 |
28-Sep-2011 |
Ray Chen <raychen@google.com> |
Merge "Fix 5341761 gallery vibrate on confirm delete"
|
31fa619bc23f75cd0f2999d4c9a37080ba1b87da |
28-Sep-2011 |
Ray Chen <raychen@google.com> |
Merge "Fix 5341761 gallery vibrate on confirm delete"
|
8338213347369b81918f8e9363e1b8740468e9c0 |
28-Sep-2011 |
Eric Fischer <enf@google.com> |
am 1c33452d: (-s ours) am 6fef1583: (-s ours) Import revised translations. DO NOT MERGE * commit '1c33452d2503e90533d987e5cdd30d7a72ce6c6c': Import revised translations. DO NOT MERGE
|
f39fa9be5e6fb02ec9f48fe0253044d4a9f38939 |
27-Sep-2011 |
Eric Fischer <enf@google.com> |
am 6fef1583: (-s ours) Import revised translations. DO NOT MERGE * commit '6fef1583e0e2a16bc0e45d8166704410b9ecd016': Import revised translations. DO NOT MERGE
|
1c33452d2503e90533d987e5cdd30d7a72ce6c6c |
27-Sep-2011 |
Eric Fischer <enf@google.com> |
am 6fef1583: (-s ours) Import revised translations. DO NOT MERGE * commit '6fef1583e0e2a16bc0e45d8166704410b9ecd016': Import revised translations. DO NOT MERGE
|
6fef1583e0e2a16bc0e45d8166704410b9ecd016 |
27-Sep-2011 |
Eric Fischer <enf@google.com> |
Import revised translations. DO NOT MERGE Change-Id: I19bd5d8966bb1d946e1885ac051f5256b4a25148
es/values-zh-rTW/strings.xml
|
b52bdebf4cebaa4d55d06adce1a61d3bab7fb989 |
27-Sep-2011 |
Eric Fischer <enf@google.com> |
Import revised translations. DO NOT MERGE Change-Id: I19bd5d8966bb1d946e1885ac051f5256b4a25148
es/values-zh-rTW/strings.xml
|
ff484a1a102b258541153c84a234205c763a915a |
27-Sep-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-factoryrom-release history after reset to ics-factoryrom
|
259d8daeeba17c3f254ab61e8fa95d3c3dcd3220 |
27-Sep-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-factoryrom-release history after reset to ics-factoryrom
|
98569757c27df3b6da5a0f65abc7f1456d93f87e |
27-Sep-2011 |
Yuli Huang <yuli@google.com> |
am 11d85417: am fef5b986: Fix b/5287869 (and b/5369640). * commit '11d854178adcb84563c2b2e4ebe84c26b71ac693': Fix b/5287869 (and b/5369640).
|
5050145590309e519d062421e3fc3b161375a613 |
27-Sep-2011 |
Yuli Huang <yuli@google.com> |
am fef5b986: Fix b/5287869 (and b/5369640). * commit 'fef5b9860f0a88fc673af2187938956ebd0ade75': Fix b/5287869 (and b/5369640).
|
11d854178adcb84563c2b2e4ebe84c26b71ac693 |
27-Sep-2011 |
Yuli Huang <yuli@google.com> |
am fef5b986: Fix b/5287869 (and b/5369640). * commit 'fef5b9860f0a88fc673af2187938956ebd0ade75': Fix b/5287869 (and b/5369640).
|
cbd0e95334ee2cda804d90497b8f8af1e1d0633f |
27-Sep-2011 |
Yuli Huang <yuli@google.com> |
Fix b/5287869 (and b/5369640). Images from some app (MMS) may not have columns that PhotoEditor tries to query, for example: the orientation. Just ignore the absent columns. Change-Id: I1cda4e32241d9be7819453ede225388c7535c18c
ndroidManifest.xml
|
fef5b9860f0a88fc673af2187938956ebd0ade75 |
27-Sep-2011 |
Yuli Huang <yuli@google.com> |
Fix b/5287869 (and b/5369640). Images from some app (MMS) may not have columns that PhotoEditor tries to query, for example: the orientation. Just ignore the absent columns. Change-Id: I1cda4e32241d9be7819453ede225388c7535c18c
ndroidManifest.xml
rc/com/android/gallery3d/photoeditor/BitmapUtils.java
rc/com/android/gallery3d/photoeditor/SaveCopyTask.java
|
a9c225508657af33060ff1fd950e8e3e954dea42 |
27-Sep-2011 |
Yuli Huang <yuli@google.com> |
Fix b/5287869 (and b/5369640). Images from some app (MMS) may not have columns that PhotoEditor tries to query, for example: the orientation. Just ignore the absent columns. Change-Id: I1cda4e32241d9be7819453ede225388c7535c18c
rc/com/android/gallery3d/photoeditor/BitmapUtils.java
rc/com/android/gallery3d/photoeditor/SaveCopyTask.java
|
c500cdc71b645af25971a595aca091d0d8430b84 |
27-Sep-2011 |
The Android Open Source Project <initial-contribution@android.com> |
am 9aa6bc65: Reconcile with ics-factoryrom-release * commit '9aa6bc65f48dfef781eacd8065bff73011ff2e48':
|
16d12744cb4069bdf0f5cbf8e5ef4026185396bd |
27-Sep-2011 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with ics-factoryrom-release Change-Id: Ic6421d14d0c9fac864e6fe67ae6cd763d50cab9a
|
9aa6bc65f48dfef781eacd8065bff73011ff2e48 |
27-Sep-2011 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with ics-factoryrom-release Change-Id: Ic6421d14d0c9fac864e6fe67ae6cd763d50cab9a
|
03667a09a4403fd0ea87f3e687e52a4caf5f5583 |
27-Sep-2011 |
Chih-Chung Chang <chihchung@google.com> |
am d5864a23: am d8ad9c0d: Fix 5369640: Only accept content://media URI for photo editor. * commit 'd5864a2301b3c0774881ffdf277c0d2168405240': Fix 5369640: Only accept content://media URI for photo editor.
|
733f2a547bb4480b9005760084fabc6232384a99 |
27-Sep-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
4defafefe07e67f9a4045ee4a49b83091837e349 |
27-Sep-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
30fc464f0b87d0003eb704edb930b446fc46cf78 |
27-Sep-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
d5864a2301b3c0774881ffdf277c0d2168405240 |
27-Sep-2011 |
Chih-Chung Chang <chihchung@google.com> |
am d8ad9c0d: Fix 5369640: Only accept content://media URI for photo editor. * commit 'd8ad9c0d4fbc8bf0bb8bb2849ef537f60f278f8f': Fix 5369640: Only accept content://media URI for photo editor.
|
ce9e0c5f536b393071f4745261894bf152cb92a9 |
27-Sep-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-factoryrom-release history after reset to ics-factoryrom
|
1e86a2be16bc7e01ad33c9a52d339d351bfbadf2 |
27-Sep-2011 |
Ray Chen <raychen@google.com> |
Fix 5341761 gallery vibrate on confirm delete Change-Id: I819855f28246c91324ea86ab9e0ac1ec1c19783c
rc/com/android/gallery3d/app/AlbumPage.java
rc/com/android/gallery3d/app/AlbumSetPage.java
rc/com/android/gallery3d/ui/SelectionManager.java
|
1f4e6d14bba7290ea0268fbde28ffc664d4f7004 |
27-Sep-2011 |
Ray Chen <raychen@google.com> |
Fix 5341761 gallery vibrate on confirm delete Change-Id: I819855f28246c91324ea86ab9e0ac1ec1c19783c
rc/com/android/gallery3d/app/AlbumPage.java
rc/com/android/gallery3d/app/AlbumSetPage.java
rc/com/android/gallery3d/ui/SelectionManager.java
|
f10ab916b601c45cd6f67340dff9239bba6e189c |
27-Sep-2011 |
Chih-Chung Chang <chihchung@google.com> |
am d4a046c2: Fix 5299746: Update panorama thumbnail overlay. * commit 'd4a046c2e1d6aece78a9a503d22eb5aca2243e33': Fix 5299746: Update panorama thumbnail overlay.
|
773dd066dabd20dfe00bd5aef09d966b4735f355 |
27-Sep-2011 |
Chih-Chung Chang <chihchung@google.com> |
am ec412549: Move out PositionController from PhotoView. * commit 'ec4125492f17130f65e49160a17bd437e01128a7': Move out PositionController from PhotoView.
|
cc6ea785f65fe10bb77b4e5030698309024b5382 |
27-Sep-2011 |
Chih-Chung Chang <chihchung@google.com> |
Fix 5299746: Update panorama thumbnail overlay. Change-Id: Ide3e592ad5f697acc6b2ebc2a092044803b82d7b
es/drawable-hdpi/ic_pan_thumb.9.png
es/drawable-hdpi/ic_pan_thumb.png
es/drawable-mdpi/ic_pan_thumb.9.png
es/drawable-mdpi/ic_pan_thumb.png
es/drawable-sw600dp-mdpi/ic_pan_thumb.9.png
es/drawable-sw600dp-mdpi/ic_pan_thumb.png
es/drawable-xhdpi/ic_pan_thumb.9.png
es/drawable-xhdpi/ic_pan_thumb.png
|
e251416400ea8870c3a6494ef4a5e7a4b59a0d4a |
27-Sep-2011 |
Chih-Chung Chang <chihchung@google.com> |
Fix 5299746: Update panorama thumbnail overlay. Change-Id: Ide3e592ad5f697acc6b2ebc2a092044803b82d7b
rc/com/android/gallery3d/ui/IconDrawer.java
|
d4a046c2e1d6aece78a9a503d22eb5aca2243e33 |
27-Sep-2011 |
Chih-Chung Chang <chihchung@google.com> |
Fix 5299746: Update panorama thumbnail overlay. Change-Id: Ide3e592ad5f697acc6b2ebc2a092044803b82d7b
es/drawable-hdpi/ic_pan_thumb.9.png
es/drawable-hdpi/ic_pan_thumb.png
es/drawable-mdpi/ic_pan_thumb.9.png
es/drawable-mdpi/ic_pan_thumb.png
es/drawable-sw600dp-mdpi/ic_pan_thumb.9.png
es/drawable-sw600dp-mdpi/ic_pan_thumb.png
es/drawable-xhdpi/ic_pan_thumb.9.png
es/drawable-xhdpi/ic_pan_thumb.png
rc/com/android/gallery3d/ui/IconDrawer.java
|
e779d9ccef436a66fae8c756a2c823286fa76ed3 |
26-Sep-2011 |
Chih-Chung Chang <chihchung@google.com> |
Fix 5369640: Only accept content://media URI for photo editor. Change-Id: Ie68e9cfb8ef8d181ac7e23abd4b0caa6ded20938
ndroidManifest.xml
|
d8ad9c0d4fbc8bf0bb8bb2849ef537f60f278f8f |
26-Sep-2011 |
Chih-Chung Chang <chihchung@google.com> |
Fix 5369640: Only accept content://media URI for photo editor. Change-Id: Ie68e9cfb8ef8d181ac7e23abd4b0caa6ded20938
ndroidManifest.xml
|
ec4125492f17130f65e49160a17bd437e01128a7 |
26-Sep-2011 |
Chih-Chung Chang <chihchung@google.com> |
Move out PositionController from PhotoView. Change-Id: Id1088ffbd67ff5e986fdf16f70ba24f1537d10ab
rc/com/android/gallery3d/ui/PhotoView.java
rc/com/android/gallery3d/ui/PositionController.java
|
07e6fca4b1b477bc0f4a0387ddb61f6c481efa5a |
26-Sep-2011 |
Chih-Chung Chang <chihchung@google.com> |
Move out PositionController from PhotoView. Change-Id: Id1088ffbd67ff5e986fdf16f70ba24f1537d10ab
rc/com/android/gallery3d/ui/PhotoView.java
rc/com/android/gallery3d/ui/PositionController.java
|
c4b83a29cd7a39a4759366535fb0889eb097b0ad |
27-Sep-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-factoryrom-release history after reset to ics-factoryrom
|
372ec01ddcbf00e49e93ccde130f26d9dcb56f43 |
27-Sep-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-factoryrom-release history after reset to ics-factoryrom
|
fa509cb802ca43d5edd3343b45ae2865087f76b2 |
26-Sep-2011 |
Owen Lin <owenlin@google.com> |
am 9696bf89: (-s ours) am 9025dba3: (-s ours) (DO NOT MERGE) * commit '9696bf893a7391be9acbf243a5ec1d2e60c1482c': (DO NOT MERGE)
|
a0ab2da9f8df41bf4b59fe85c8982ff06d2a659a |
26-Sep-2011 |
Owen Lin <owenlin@google.com> |
am 9025dba3: (-s ours) (DO NOT MERGE) * commit '9025dba35881391c24bdaa88d1ec84d15d722f65': (DO NOT MERGE)
|
4fb820e950ec8a542af6f2e4ac9faee790a9b315 |
26-Sep-2011 |
Owen Lin <owenlin@google.com> |
am 9025dba3: (-s ours) (DO NOT MERGE) * commit '9025dba35881391c24bdaa88d1ec84d15d722f65': (DO NOT MERGE)
|
9696bf893a7391be9acbf243a5ec1d2e60c1482c |
26-Sep-2011 |
Owen Lin <owenlin@google.com> |
am 9025dba3: (-s ours) (DO NOT MERGE) * commit '9025dba35881391c24bdaa88d1ec84d15d722f65': (DO NOT MERGE)
|
e5a947a2ea50a2b8b6baa8dcb597936b912a8164 |
26-Sep-2011 |
Owen Lin <owenlin@google.com> |
am 9025dba3: (-s ours) (DO NOT MERGE) * commit '9025dba35881391c24bdaa88d1ec84d15d722f65': (DO NOT MERGE)
|
3ffa042de68d782842910504123ca3f7c04933f6 |
13-Sep-2011 |
Owen Lin <owenlin@google.com> |
(DO NOT MERGE) Add a hard limit on the size of the widget images. There is a limit on the size of the data transfered by binder. For now, we just add a hard limit (360 pixel) to ensure the widget's image can be passed by binder. Also adjust the size of widget to make it looks better. Fix a bug in DecodeUtils which cause OOM for a image in size 12200x1920. In that case, we should generate a screen nail of size 640x101 instead of 4066x640. Change-Id: Ie42805d9e9e579b063fc99f5130ec433d695b8c9 fix: 5273271
es/values-xlarge/dimensions.xml
es/values/dimensions.xml
es/xml/widget_info.xml
|
1ef98e32ccc4c6f3f69f812c1a92294065d80271 |
13-Sep-2011 |
Owen Lin <owenlin@google.com> |
(DO NOT MERGE) Add a hard limit on the size of the widget images. There is a limit on the size of the data transfered by binder. For now, we just add a hard limit (360 pixel) to ensure the widget's image can be passed by binder. Also adjust the size of widget to make it looks better. Fix a bug in DecodeUtils which cause OOM for a image in size 12200x1920. In that case, we should generate a screen nail of size 640x101 instead of 4066x640. Change-Id: Ie42805d9e9e579b063fc99f5130ec433d695b8c9 fix: 5273271
allerycommon/src/com/android/gallery3d/common/BitmapUtils.java
rc/com/android/gallery3d/data/DecodeUtils.java
rc/com/android/gallery3d/gadget/WidgetConfigure.java
|
9025dba35881391c24bdaa88d1ec84d15d722f65 |
13-Sep-2011 |
Owen Lin <owenlin@google.com> |
(DO NOT MERGE) Add a hard limit on the size of the widget images. There is a limit on the size of the data transfered by binder. For now, we just add a hard limit (360 pixel) to ensure the widget's image can be passed by binder. Also adjust the size of widget to make it looks better. Fix a bug in DecodeUtils which cause OOM for a image in size 12200x1920. In that case, we should generate a screen nail of size 640x101 instead of 4066x640. Change-Id: Ie42805d9e9e579b063fc99f5130ec433d695b8c9 fix: 5273271
allerycommon/src/com/android/gallery3d/common/BitmapUtils.java
es/values-xlarge/dimensions.xml
es/values/dimensions.xml
es/xml/widget_info.xml
rc/com/android/gallery3d/data/DecodeUtils.java
rc/com/android/gallery3d/gadget/WidgetConfigure.java
|
c60f487e401b57bca03930204d93ad248e6323a6 |
13-Sep-2011 |
Owen Lin <owenlin@google.com> |
(DO NOT MERGE) Add a hard limit on the size of the widget images. There is a limit on the size of the data transfered by binder. For now, we just add a hard limit (360 pixel) to ensure the widget's image can be passed by binder. Also adjust the size of widget to make it looks better. Fix a bug in DecodeUtils which cause OOM for a image in size 12200x1920. In that case, we should generate a screen nail of size 640x101 instead of 4066x640. Change-Id: Ie42805d9e9e579b063fc99f5130ec433d695b8c9 fix: 5273271
allerycommon/src/com/android/gallery3d/common/BitmapUtils.java
|
c2a53e04ae9400b1b427217069a00b2544439c7f |
26-Sep-2011 |
The Android Open Source Project <initial-contribution@android.com> |
am a34041de: Reconcile with ics-factoryrom-release * commit 'a34041de9eb99c0f9eb87c8c797755665e3b9d09':
|
a34041de9eb99c0f9eb87c8c797755665e3b9d09 |
26-Sep-2011 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with ics-factoryrom-release Change-Id: Ica6df20fa29768f8c808da0cc5ec94d2b465a50a
|
0e98256369797a7c7f4752afd1a63cec3e2f469d |
26-Sep-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
fde153044b1cac79962b55c0d4bb485d4ea143f5 |
26-Sep-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
95f07e298bd1a8055f641f0f4377fc23cd498d44 |
26-Sep-2011 |
Chih-Chung Chang <chihchung@google.com> |
am 77dcf077: Fix 5223982: Add animation when scrolling hits the edge. * commit '77dcf07756dcf918c56afb0a8f7605577a7ce8e0': Fix 5223982: Add animation when scrolling hits the edge.
|
ca07852ce136f83cc1badac7d8c0ce234570bca2 |
26-Sep-2011 |
Chih-Chung Chang <chihchung@google.com> |
Fix 5223982: Add animation when scrolling hits the edge. Change-Id: I3c5191af3fe44ba835ae9b22755613a933065bcd
rc/com/android/gallery3d/ui/Paper.java
rc/com/android/gallery3d/ui/ScrollerHelper.java
rc/com/android/gallery3d/ui/SlotView.java
|
77dcf07756dcf918c56afb0a8f7605577a7ce8e0 |
26-Sep-2011 |
Chih-Chung Chang <chihchung@google.com> |
Fix 5223982: Add animation when scrolling hits the edge. Change-Id: I3c5191af3fe44ba835ae9b22755613a933065bcd
rc/com/android/gallery3d/ui/Paper.java
rc/com/android/gallery3d/ui/ScrollerHelper.java
rc/com/android/gallery3d/ui/SlotView.java
|
2d8f7067bfb7e6a082f8ea106539faadbc7217ab |
25-Sep-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
3815a17c609f2f6d7a942d2585281144cb44baed |
25-Sep-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
6db44a65b82d691423c04d23e2213af32b82bf9d |
25-Sep-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
d1e3d260a6e2ebd002bb51cf38d5fceaffa0916c |
25-Sep-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-factoryrom-release history after reset to ics-factoryrom
|
ac5a4ea3289e1db39d1469f495a4ec19c498ea6e |
24-Sep-2011 |
Eric Fischer <enf@google.com> |
am b9413a35: (-s ours) am 1e62174e: (-s ours) Import revised translations. DO NOT MERGE * commit 'b9413a357b2c30657584ac5d5c90e759f3147a19': Import revised translations. DO NOT MERGE
|
b8a7cf39a7a46db1ad5949bd0d6fd743dfa594ec |
24-Sep-2011 |
Eric Fischer <enf@google.com> |
am 1e62174e: (-s ours) Import revised translations. DO NOT MERGE * commit '1e62174ec98efedf58ce2e5a78cd8ba79dfcfde9': Import revised translations. DO NOT MERGE
|
b9413a357b2c30657584ac5d5c90e759f3147a19 |
24-Sep-2011 |
Eric Fischer <enf@google.com> |
am 1e62174e: (-s ours) Import revised translations. DO NOT MERGE * commit '1e62174ec98efedf58ce2e5a78cd8ba79dfcfde9': Import revised translations. DO NOT MERGE
|
da50791a753e4b7a7b816f879358536f247081a6 |
24-Sep-2011 |
Eric Fischer <enf@google.com> |
Import revised translations. DO NOT MERGE Change-Id: Ib27ab792aba090e740ba6ff15b9d27e53a1c1bc2
es/values-bg/photoeditor_strings.xml
es/values-de/photoeditor_strings.xml
es/values-es-rUS/photoeditor_strings.xml
es/values-ja/photoeditor_strings.xml
es/values-ko/photoeditor_strings.xml
es/values-ms/photoeditor_strings.xml
es/values-nl/photoeditor_strings.xml
es/values-ro/photoeditor_strings.xml
es/values-sw/strings.xml
es/values-tr/photoeditor_strings.xml
es/values-zh-rCN/photoeditor_strings.xml
es/values-zh-rTW/photoeditor_strings.xml
|
1e62174ec98efedf58ce2e5a78cd8ba79dfcfde9 |
24-Sep-2011 |
Eric Fischer <enf@google.com> |
Import revised translations. DO NOT MERGE Change-Id: Ib27ab792aba090e740ba6ff15b9d27e53a1c1bc2
es/values-bg/photoeditor_strings.xml
es/values-de/photoeditor_strings.xml
es/values-es-rUS/photoeditor_strings.xml
es/values-ja/photoeditor_strings.xml
es/values-ko/photoeditor_strings.xml
es/values-ms/photoeditor_strings.xml
es/values-nl/photoeditor_strings.xml
es/values-ro/photoeditor_strings.xml
es/values-sw/strings.xml
es/values-tr/photoeditor_strings.xml
es/values-zh-rCN/photoeditor_strings.xml
es/values-zh-rTW/photoeditor_strings.xml
|
2128aaf10781a5649a3793ab3db748e8de418982 |
23-Sep-2011 |
Chih-Chung Chang <chihchung@google.com> |
am 53eae8b0: Merge "Fix 5349519: The Select photo/video activity should use action bar." * commit '53eae8b02d2c29534ca74bc5feb2a2d8d7747d08': Fix 5349519: The Select photo/video activity should use action bar.
|
f02dacf2c5d46eb65a4d6b7ba7a85964b04001e2 |
23-Sep-2011 |
Chih-Chung Chang <chihchung@google.com> |
Merge "Fix 5349519: The Select photo/video activity should use action bar."
|
a8c5947d5eb81d34cc748d5222eec5ddc06fc48f |
23-Sep-2011 |
Chih-Chung Chang <chihchung@google.com> |
Merge "Fix 5349519: The Select photo/video activity should use action bar."
|
53eae8b02d2c29534ca74bc5feb2a2d8d7747d08 |
23-Sep-2011 |
Chih-Chung Chang <chihchung@google.com> |
Merge "Fix 5349519: The Select photo/video activity should use action bar."
|
8107a576a066775df3661f9219b90546cb9387f7 |
23-Sep-2011 |
Owen Lin <owenlin@google.com> |
am 02e68998: Fix crop never returns * commit '02e689987f4af3b16b19352b1745478cca964d76': Fix crop never returns
|
65e26535c22da813e1a8cb08cfa4f586a233af34 |
23-Sep-2011 |
Owen Lin <owenlin@google.com> |
Fix crop never returns fix: 5359106 We should return true if the save is successfully. Also make it more robust even with exceptions. Change-Id: I4d06b625177d4d479c89a7de1bcdf6f6f301a3da
rc/com/android/gallery3d/app/CropImage.java
|
8bb3fa52a14034e18528582b5b54bcd14c726460 |
23-Sep-2011 |
Owen Lin <owenlin@google.com> |
Fix crop never returns fix: 5359106 We should return true if the save is successfully. Also make it more robust even with exceptions. Change-Id: I4d06b625177d4d479c89a7de1bcdf6f6f301a3da
es/values/strings.xml
|
02e689987f4af3b16b19352b1745478cca964d76 |
23-Sep-2011 |
Owen Lin <owenlin@google.com> |
Fix crop never returns fix: 5359106 We should return true if the save is successfully. Also make it more robust even with exceptions. Change-Id: I4d06b625177d4d479c89a7de1bcdf6f6f301a3da
es/values/strings.xml
rc/com/android/gallery3d/app/CropImage.java
|
a64e3e5327e7a007877ed3081d15738913de1fc9 |
23-Sep-2011 |
Chih-Chung Chang <chihchung@google.com> |
Fix 5349519: The Select photo/video activity should use action bar. Change-Id: Ib537926c780fff6edd60d54c3d28740988d6221b
rc/com/android/gallery3d/app/AlbumPicker.java
rc/com/android/gallery3d/app/DialogPicker.java
rc/com/android/gallery3d/app/PickerActivity.java
|
a31c2571866b46f568a58df5318c13d4a0b22d9b |
23-Sep-2011 |
Chih-Chung Chang <chihchung@google.com> |
Fix 5349519: The Select photo/video activity should use action bar. Change-Id: Ib537926c780fff6edd60d54c3d28740988d6221b
es/layout/dialog_picker.xml
es/values-xlarge/styles.xml
es/values/styles.xml
|
3bbf133d949d2b51cce8db22dc0a2be64920c76c |
23-Sep-2011 |
Chih-Chung Chang <chihchung@google.com> |
Fix 5349519: The Select photo/video activity should use action bar. Change-Id: Ib537926c780fff6edd60d54c3d28740988d6221b
es/layout/dialog_picker.xml
es/values-xlarge/styles.xml
es/values/styles.xml
rc/com/android/gallery3d/app/AlbumPicker.java
rc/com/android/gallery3d/app/DialogPicker.java
rc/com/android/gallery3d/app/PickerActivity.java
|
df5fda6c59623d94c79502eb6e3b1c1db34ca070 |
23-Sep-2011 |
Chih-Chung Chang <chihchung@google.com> |
am 0461b105: Merge "Fix 5223982: Adding one pixel transparent border around the texture." * commit '0461b1058ff1b3bb9933a6e912851eda0bddf46c': Fix 5223982: Adding one pixel transparent border around the texture.
|
d40f50c847bd59c209e3577bc012896a7f35ea3b |
23-Sep-2011 |
Chih-Chung Chang <chihchung@google.com> |
Merge "Fix 5223982: Adding one pixel transparent border around the texture."
|
0461b1058ff1b3bb9933a6e912851eda0bddf46c |
23-Sep-2011 |
Chih-Chung Chang <chihchung@google.com> |
Merge "Fix 5223982: Adding one pixel transparent border around the texture."
|
bb6f096c1c53e1924c67e3f25369e5aa98ec55df |
22-Sep-2011 |
Chih-Chung Chang <chihchung@google.com> |
Fix 5223982: Adding one pixel transparent border around the texture. This avoids the jigged edge around the thumbnails when they are rotated. Change-Id: Ib2c5a75d1aa69a2f024e003a45111a8af4537f67
es/drawable/dark_strip.9.png
|
e3312ff2fe784f56c4f14601eaafe272ef95eade |
22-Sep-2011 |
Chih-Chung Chang <chihchung@google.com> |
Fix 5223982: Adding one pixel transparent border around the texture. This avoids the jigged edge around the thumbnails when they are rotated. Change-Id: Ib2c5a75d1aa69a2f024e003a45111a8af4537f67
rc/com/android/gallery3d/ui/AlbumSetSlidingWindow.java
rc/com/android/gallery3d/ui/AlbumSlidingWindow.java
rc/com/android/gallery3d/ui/BasicTexture.java
rc/com/android/gallery3d/ui/BitmapTexture.java
rc/com/android/gallery3d/ui/GLCanvasImpl.java
rc/com/android/gallery3d/ui/GridDrawer.java
rc/com/android/gallery3d/ui/HighlightDrawer.java
rc/com/android/gallery3d/ui/IconDrawer.java
rc/com/android/gallery3d/ui/SlotView.java
rc/com/android/gallery3d/ui/UploadedTexture.java
|
1a088db165c138f57d9445ca0b7e50fe90d3ad1d |
22-Sep-2011 |
Chih-Chung Chang <chihchung@google.com> |
Fix 5223982: Adding one pixel transparent border around the texture. This avoids the jigged edge around the thumbnails when they are rotated. Change-Id: Ib2c5a75d1aa69a2f024e003a45111a8af4537f67
es/drawable/dark_strip.9.png
rc/com/android/gallery3d/ui/AlbumSetSlidingWindow.java
rc/com/android/gallery3d/ui/AlbumSlidingWindow.java
rc/com/android/gallery3d/ui/BasicTexture.java
rc/com/android/gallery3d/ui/BitmapTexture.java
rc/com/android/gallery3d/ui/GLCanvasImpl.java
rc/com/android/gallery3d/ui/GridDrawer.java
rc/com/android/gallery3d/ui/HighlightDrawer.java
rc/com/android/gallery3d/ui/IconDrawer.java
rc/com/android/gallery3d/ui/SlotView.java
rc/com/android/gallery3d/ui/UploadedTexture.java
|
abe943b087537a1db40d8101fe800ef8e7b4f54f |
22-Sep-2011 |
The Android Open Source Project <initial-contribution@android.com> |
am 0158328e: Reconcile with ics-factoryrom-release * commit '0158328eee783a953222511e9931f18893dce20f':
|
150d6b89ac8cd296f95afe6d2d2158aa30fa65b9 |
22-Sep-2011 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with ics-factoryrom-release Change-Id: Icf295f55dd7df202e7e6f8b93a5d360abadb0d72
|
0158328eee783a953222511e9931f18893dce20f |
22-Sep-2011 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with ics-factoryrom-release Change-Id: Icf295f55dd7df202e7e6f8b93a5d360abadb0d72
|
c51281dbf676487669ed7e209f153e314f8e1148 |
21-Sep-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
a3152b9929785246b932aefa3dcec48fe054a2d1 |
21-Sep-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
057f70d03a71ccf8dc3ca7c0f6cecccafefd6ebc |
21-Sep-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
f9500a4e935b7472227ffae21b9e1510b80bf13b |
21-Sep-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-factoryrom-release history after reset to ics-factoryrom
|
c36362c42c0981c502ded93d27df22c149462a95 |
21-Sep-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-factoryrom-release history after reset to ics-factoryrom
|
f08df58c0f1b395e4925ace631475d27d0e53c41 |
21-Sep-2011 |
The Android Open Source Project <initial-contribution@android.com> |
am 29ea9ec5: Reconcile with ics-factoryrom-release * commit '29ea9ec5833d74a479321f432804f4178648d7f2':
|
86af26f6632caccd8a950142c40145ec17224304 |
21-Sep-2011 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with ics-factoryrom-release Change-Id: I445a06a1c4486a76a9278c2ab57415cd902f8927
|
29ea9ec5833d74a479321f432804f4178648d7f2 |
21-Sep-2011 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with ics-factoryrom-release Change-Id: I445a06a1c4486a76a9278c2ab57415cd902f8927
|
240a7206d10c086139a974e47928eec8dd46b7f0 |
21-Sep-2011 |
Chih-Chung Chang <chihchung@google.com> |
am 658773fe: Merge "Fix 5229466: Add "up" button to MovieActivity" * commit '658773fe7151ceacd32c3d853e48086d7ffd2cad': Fix 5229466: Add "up" button to MovieActivity
|
9b16e79ea2eaf249063f846b0e73c021741840f5 |
21-Sep-2011 |
Chih-Chung Chang <chihchung@google.com> |
Merge "Fix 5229466: Add "up" button to MovieActivity"
|
658773fe7151ceacd32c3d853e48086d7ffd2cad |
21-Sep-2011 |
Chih-Chung Chang <chihchung@google.com> |
Merge "Fix 5229466: Add "up" button to MovieActivity"
|
92ae5935e17910c2fad7299095ace16d0ee5492b |
21-Sep-2011 |
Chih-Chung Chang <chihchung@google.com> |
am 4c371990: Merge "Fix 5299746: Tweak layout and icons" * commit '4c3719904adf7138cb0686629e341fc9e2b073c8': Fix 5299746: Tweak layout and icons
|
cb577fbc1d33722c9b58aa9c732a4bc220e2e558 |
21-Sep-2011 |
Chih-Chung Chang <chihchung@google.com> |
Merge "Fix 5299746: Tweak layout and icons"
|
4c3719904adf7138cb0686629e341fc9e2b073c8 |
21-Sep-2011 |
Chih-Chung Chang <chihchung@google.com> |
Merge "Fix 5299746: Tweak layout and icons"
|
3f0de57839c38f8e4b29b8d353f26325b681aa81 |
21-Sep-2011 |
Chih-Chung Chang <chihchung@google.com> |
Fix 5229466: Add "up" button to MovieActivity Change-Id: I5d71bec7a7b09553c12afdd753cd77a73ace2c44
rc/com/android/gallery3d/app/MovieActivity.java
|
bb7d7b94c0454d9549b2c5da2977dcd49c1a3be5 |
21-Sep-2011 |
Chih-Chung Chang <chihchung@google.com> |
Fix 5229466: Add "up" button to MovieActivity Change-Id: I5d71bec7a7b09553c12afdd753cd77a73ace2c44
rc/com/android/gallery3d/app/MovieActivity.java
|
b158748a9b589549b5fd01104cbf42aee580bc56 |
21-Sep-2011 |
Chih-Chung Chang <chihchung@google.com> |
am 9029b4a4: Merge "Fix 5299746: Update assets." * commit '9029b4a45cb8f12799d5fbf827c8a494ee99a0e0': Fix 5299746: Update assets.
|
fa7e581da96d0dea3ef59ba548bea167ebebcad4 |
21-Sep-2011 |
Chih-Chung Chang <chihchung@google.com> |
Fix 5299746: Tweak layout and icons Change-Id: I36d050fb2459ca559b74be1112b4ac6a8566dc1e
es/drawable-hdpi/btn_make_offline_disabled_on_holo_dark.png
es/drawable-hdpi/btn_make_offline_normal_off_holo_dark.png
es/drawable-hdpi/btn_make_offline_normal_on_holo_dark.png
es/layout/manage_offline_bar.xml
es/values-xlarge/dimensions.xml
es/values/dimensions.xml
|
32a8c908d1ad9e1562d3daab08980b84dffe3cf6 |
21-Sep-2011 |
Chih-Chung Chang <chihchung@google.com> |
Fix 5299746: Tweak layout and icons Change-Id: I36d050fb2459ca559b74be1112b4ac6a8566dc1e
rc/com/android/gallery3d/app/Config.java
rc/com/android/gallery3d/app/ManageCachePage.java
rc/com/android/gallery3d/ui/ManageCacheDrawer.java
|
fafa06467fd79a1cf525b861ae0372db0b85bf09 |
21-Sep-2011 |
Chih-Chung Chang <chihchung@google.com> |
Fix 5299746: Tweak layout and icons Change-Id: I36d050fb2459ca559b74be1112b4ac6a8566dc1e
es/drawable-hdpi/btn_make_offline_disabled_on_holo_dark.png
es/drawable-hdpi/btn_make_offline_normal_off_holo_dark.png
es/drawable-hdpi/btn_make_offline_normal_on_holo_dark.png
es/layout/manage_offline_bar.xml
es/values-xlarge/dimensions.xml
es/values/dimensions.xml
rc/com/android/gallery3d/app/Config.java
rc/com/android/gallery3d/app/ManageCachePage.java
rc/com/android/gallery3d/ui/ManageCacheDrawer.java
|
9029b4a45cb8f12799d5fbf827c8a494ee99a0e0 |
21-Sep-2011 |
Chih-Chung Chang <chihchung@google.com> |
Merge "Fix 5299746: Update assets."
|
e601a8dcc53e83b6863399c5984fb056c91e35d2 |
21-Sep-2011 |
Yuli Huang <yuli@google.com> |
am e07d82c4: Merge "Fix tile-size to sync with the fix in factory branch." * commit 'e07d82c4e813b0ea5fd00b76bf9f97e442109593': Fix tile-size to sync with the fix in factory branch.
|
a312ccdd7be8cf2b733512429bdc9807c2cbb1c7 |
21-Sep-2011 |
Yuli Huang <yuli@google.com> |
Merge "Fix tile-size to sync with the fix in factory branch."
|
e07d82c4e813b0ea5fd00b76bf9f97e442109593 |
21-Sep-2011 |
Yuli Huang <yuli@google.com> |
Merge "Fix tile-size to sync with the fix in factory branch."
|
5ab1d83a6a258cd1e9399a43b78ad388c011c6fb |
21-Sep-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-factoryrom-release history after reset to ics-factoryrom
rc/com/android/gallery3d/ui/DialogDetailsView.java
|
65ef26dda959442aa433ba6bf14673f57c2b50dd |
21-Sep-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-factoryrom-release history after reset to ics-factoryrom
|
8f81d5030e5b70cfc7e4f9a47f0c86cf6bf7dd51 |
21-Sep-2011 |
Chih-Chung Chang <chihchung@google.com> |
Fix 5299746: Update assets. Change-Id: Ia0e2d5206835de51910ca8196ba71ecfb255b72d
es/drawable-hdpi/frame_overlay_gallery_camera.png
es/drawable-hdpi/frame_overlay_gallery_folder.png
es/drawable-hdpi/frame_overlay_gallery_picasa.png
es/drawable-hdpi/frame_overlay_gallery_ptp.png
es/drawable-hdpi/grid_pressed.9.png
es/drawable-hdpi/grid_selected.9.png
es/drawable-hdpi/ic_manage_pin_small.png
es/drawable-hdpi/ic_menu_make_offline.png
es/drawable-mdpi/frame_overlay_gallery_camera.png
es/drawable-mdpi/frame_overlay_gallery_folder.png
es/drawable-mdpi/frame_overlay_gallery_picasa.png
es/drawable-mdpi/frame_overlay_gallery_ptp.png
es/drawable-mdpi/grid_pressed.9.png
es/drawable-mdpi/grid_selected.9.png
es/drawable-mdpi/ic_manage_pin_small.png
es/drawable-mdpi/ic_menu_make_offline.png
es/drawable-xhdpi/frame_overlay_gallery_camera.png
es/drawable-xhdpi/frame_overlay_gallery_folder.png
es/drawable-xhdpi/frame_overlay_gallery_picasa.png
es/drawable-xhdpi/frame_overlay_gallery_ptp.png
es/drawable-xhdpi/grid_pressed.9.png
es/drawable-xhdpi/grid_selected.9.png
es/drawable-xhdpi/thumb_selected.png
es/layout/manage_offline_bar.xml
|
0c038059836f4e68ee5b50ce233574f48c367af8 |
21-Sep-2011 |
Chih-Chung Chang <chihchung@google.com> |
Fix 5299746: Update assets. Change-Id: Ia0e2d5206835de51910ca8196ba71ecfb255b72d
es/drawable-hdpi/frame_overlay_gallery_camera.png
es/drawable-hdpi/frame_overlay_gallery_folder.png
es/drawable-hdpi/frame_overlay_gallery_picasa.png
es/drawable-hdpi/frame_overlay_gallery_ptp.png
es/drawable-hdpi/grid_pressed.9.png
es/drawable-hdpi/grid_selected.9.png
es/drawable-hdpi/ic_manage_pin_small.png
es/drawable-hdpi/ic_menu_make_offline.png
es/drawable-mdpi/frame_overlay_gallery_camera.png
es/drawable-mdpi/frame_overlay_gallery_folder.png
es/drawable-mdpi/frame_overlay_gallery_picasa.png
es/drawable-mdpi/frame_overlay_gallery_ptp.png
es/drawable-mdpi/grid_pressed.9.png
es/drawable-mdpi/grid_selected.9.png
es/drawable-mdpi/ic_manage_pin_small.png
es/drawable-mdpi/ic_menu_make_offline.png
es/drawable-xhdpi/frame_overlay_gallery_camera.png
es/drawable-xhdpi/frame_overlay_gallery_folder.png
es/drawable-xhdpi/frame_overlay_gallery_picasa.png
es/drawable-xhdpi/frame_overlay_gallery_ptp.png
es/drawable-xhdpi/grid_pressed.9.png
es/drawable-xhdpi/grid_selected.9.png
es/drawable-xhdpi/thumb_selected.png
es/layout/manage_offline_bar.xml
|
f7266e3f38e2536c5208e5e2c4492ebc22debbf8 |
21-Sep-2011 |
Eric Fischer <enf@google.com> |
am 1830e274: (-s ours) am aa7fea54: (-s ours) Import revised translations. DO NOT MERGE * commit '1830e2740631589ef60ff6781e2189838fe1a326': Import revised translations. DO NOT MERGE
|
1830e2740631589ef60ff6781e2189838fe1a326 |
21-Sep-2011 |
Eric Fischer <enf@google.com> |
am aa7fea54: (-s ours) Import revised translations. DO NOT MERGE * commit 'aa7fea54c7d3d8cf58ff9fa35ffd9dbc3c820f77': Import revised translations. DO NOT MERGE
|
4b57553b7ae92c51f7aa2bfaea14fb7821a618e4 |
21-Sep-2011 |
Eric Fischer <enf@google.com> |
am aa7fea54: (-s ours) Import revised translations. DO NOT MERGE * commit 'aa7fea54c7d3d8cf58ff9fa35ffd9dbc3c820f77': Import revised translations. DO NOT MERGE
|
b661c16a551e3dd1987ece53714160c1b31d1f8e |
21-Sep-2011 |
Eric Fischer <enf@google.com> |
Import revised translations. DO NOT MERGE Change-Id: I05691313203444b01ae86ba89fb53358d036a1c8
es/values-bg/strings.xml
es/values-de/strings.xml
es/values-es-rUS/strings.xml
es/values-ja/strings.xml
es/values-ms/strings.xml
es/values-nl/strings.xml
es/values-ro/strings.xml
es/values-sw/strings.xml
es/values-tr/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
|
aa7fea54c7d3d8cf58ff9fa35ffd9dbc3c820f77 |
21-Sep-2011 |
Eric Fischer <enf@google.com> |
Import revised translations. DO NOT MERGE Change-Id: I05691313203444b01ae86ba89fb53358d036a1c8
es/values-bg/strings.xml
es/values-de/strings.xml
es/values-es-rUS/strings.xml
es/values-ja/strings.xml
es/values-ms/strings.xml
es/values-nl/strings.xml
es/values-ro/strings.xml
es/values-sw/strings.xml
es/values-tr/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
|
cdb9066c620d684ae5d0279fa40cc0bacb674269 |
20-Sep-2011 |
Eric Fischer <enf@google.com> |
am 8416d769: Merge "Import revised translations." * commit '8416d769c31232a54f5bcc4e90e8335db5bf00ed': Import revised translations.
|
e372552fa42f117d6b13baadf183296b2db6bd93 |
20-Sep-2011 |
Chih-Chung Chang <chihchung@google.com> |
am 992286ca: Merge "Fix 5224359: query width and height from media provider." * commit '992286cae8c88693228d21a12b9a514c3d932558': Fix 5224359: query width and height from media provider.
|
a806abf93830c0964057c5cbd9fc110bb88c580b |
20-Sep-2011 |
Ruei-sung Lin <rslin@google.com> |
am f3f04f86: am 1ede9972: parameter change to match api * commit 'f3f04f86e283044e7b165ef9e3fd6447e23c2c41': parameter change to match api
|
a1a5a164575cecbca56f0335ccba28d9d3c0dfb7 |
20-Sep-2011 |
Owen Lin <owenlin@google.com> |
am 4a827582: Merge "Lock rendering when switching state." * commit '4a827582bbe6a3c5f1fab0e43ad021c15983474e': Lock rendering when switching state.
|
6576081611556ea0e0cbac9830722493812cfefe |
20-Sep-2011 |
Owen Lin <owenlin@google.com> |
am d3a9464b: Merge "Pause the playback of video if the activity is resumed after 3 mins." * commit 'd3a9464bd4983158d20dd79de656ae5daf4070ee': Pause the playback of video if the activity is resumed after 3 mins.
|
1af24dad0541cf2fddfcbd7bf3239eea5b99ac1e |
20-Sep-2011 |
Hung-ying Tyan <tyanh@google.com> |
am 7b9ca694: Merge "Make the column type constants public in EntrySchema" * commit '7b9ca694e477754ab95f446e7de17ae57c9a0bd5': Make the column type constants public in EntrySchema
|
9933bf40dc0ef9a0c3299d91f9b1a456078d4459 |
20-Sep-2011 |
Ray Chen <raychen@google.com> |
am cb519d67: am 3264f438: Fix 5329642 Gallery crashes when viewing Details on certain photos * commit 'cb519d673125888207352baebda37567bb460c36': Fix 5329642 Gallery crashes when viewing Details on certain photos
|
5783724bdf769e39e7ccc9090cadab6b926cdf08 |
20-Sep-2011 |
Chih-Chung Chang <chihchung@google.com> |
am bc215419: Fix 5299746: New UI layout, part 2. * commit 'bc2154199aee16762e3758ad0cfed685323d9a9f': Fix 5299746: New UI layout, part 2.
|
7cb1d25186a484c84ea2e70ef4c57860fc8719ec |
20-Sep-2011 |
Chih-Chung Chang <chihchung@google.com> |
am 6c8d0fd8: Fix 5337270: Thumbnail is not generated for large GIF images. * commit '6c8d0fd879242f78a0c1a7daf4c037043663a49f': Fix 5337270: Thumbnail is not generated for large GIF images.
|
8416d769c31232a54f5bcc4e90e8335db5bf00ed |
20-Sep-2011 |
Eric Fischer <enf@google.com> |
Merge "Import revised translations."
|
71975c8ceb387cb59fcb66cfeda84eaa0e48d153 |
20-Sep-2011 |
Eric Fischer <enf@google.com> |
Merge "Import revised translations."
|
8ff474ddb8b8f56c7e751beccde5daacb9272c9e |
20-Sep-2011 |
Eric Fischer <enf@google.com> |
Import revised translations. Change-Id: Ieb950dd74b2e1f611bf3fcbce3114a8f520ef3dd
es/values-af/photoeditor_strings.xml
es/values-af/strings.xml
es/values-am/photoeditor_strings.xml
es/values-am/strings.xml
es/values-ar/photoeditor_strings.xml
es/values-ar/strings.xml
es/values-ca/photoeditor_strings.xml
es/values-ca/strings.xml
es/values-cs/photoeditor_strings.xml
es/values-cs/strings.xml
es/values-da/photoeditor_strings.xml
es/values-da/strings.xml
es/values-el/photoeditor_strings.xml
es/values-el/strings.xml
es/values-en-rGB/photoeditor_strings.xml
es/values-en-rGB/strings.xml
es/values-es/photoeditor_strings.xml
es/values-es/strings.xml
es/values-fa/photoeditor_strings.xml
es/values-fa/strings.xml
es/values-fi/photoeditor_strings.xml
es/values-fi/strings.xml
es/values-fr/photoeditor_strings.xml
es/values-fr/strings.xml
es/values-hr/photoeditor_strings.xml
es/values-hr/strings.xml
es/values-hu/photoeditor_strings.xml
es/values-hu/strings.xml
es/values-in/photoeditor_strings.xml
es/values-in/strings.xml
es/values-it/photoeditor_strings.xml
es/values-it/strings.xml
es/values-iw/photoeditor_strings.xml
es/values-iw/strings.xml
es/values-ko/photoeditor_strings.xml
es/values-ko/strings.xml
es/values-lt/photoeditor_strings.xml
es/values-lt/strings.xml
es/values-lv/photoeditor_strings.xml
es/values-lv/strings.xml
es/values-nb/photoeditor_strings.xml
es/values-nb/strings.xml
es/values-pl/photoeditor_strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/photoeditor_strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/photoeditor_strings.xml
es/values-pt/strings.xml
es/values-ru/photoeditor_strings.xml
es/values-ru/strings.xml
es/values-sk/photoeditor_strings.xml
es/values-sk/strings.xml
es/values-sl/photoeditor_strings.xml
es/values-sl/strings.xml
es/values-sr/photoeditor_strings.xml
es/values-sr/strings.xml
es/values-sv/photoeditor_strings.xml
es/values-sv/strings.xml
es/values-sw/photoeditor_strings.xml
es/values-sw/strings.xml
es/values-th/photoeditor_strings.xml
es/values-th/strings.xml
es/values-tl/photoeditor_strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/photoeditor_strings.xml
es/values-uk/strings.xml
es/values-vi/photoeditor_strings.xml
es/values-vi/strings.xml
es/values-zu/photoeditor_strings.xml
es/values-zu/strings.xml
|
1d6cf9d8feb8d2088295368a4cc661bc60ab4dce |
20-Sep-2011 |
Eric Fischer <enf@google.com> |
Import revised translations. Change-Id: Ieb950dd74b2e1f611bf3fcbce3114a8f520ef3dd
es/values-af/photoeditor_strings.xml
es/values-af/strings.xml
es/values-am/photoeditor_strings.xml
es/values-am/strings.xml
es/values-ar/photoeditor_strings.xml
es/values-ar/strings.xml
es/values-ca/photoeditor_strings.xml
es/values-ca/strings.xml
es/values-cs/photoeditor_strings.xml
es/values-cs/strings.xml
es/values-da/photoeditor_strings.xml
es/values-da/strings.xml
es/values-el/photoeditor_strings.xml
es/values-el/strings.xml
es/values-en-rGB/photoeditor_strings.xml
es/values-en-rGB/strings.xml
es/values-es/photoeditor_strings.xml
es/values-es/strings.xml
es/values-fa/photoeditor_strings.xml
es/values-fa/strings.xml
es/values-fi/photoeditor_strings.xml
es/values-fi/strings.xml
es/values-fr/photoeditor_strings.xml
es/values-fr/strings.xml
es/values-hr/photoeditor_strings.xml
es/values-hr/strings.xml
es/values-hu/photoeditor_strings.xml
es/values-hu/strings.xml
es/values-in/photoeditor_strings.xml
es/values-in/strings.xml
es/values-it/photoeditor_strings.xml
es/values-it/strings.xml
es/values-iw/photoeditor_strings.xml
es/values-iw/strings.xml
es/values-ko/photoeditor_strings.xml
es/values-ko/strings.xml
es/values-lt/photoeditor_strings.xml
es/values-lt/strings.xml
es/values-lv/photoeditor_strings.xml
es/values-lv/strings.xml
es/values-nb/photoeditor_strings.xml
es/values-nb/strings.xml
es/values-pl/photoeditor_strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/photoeditor_strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/photoeditor_strings.xml
es/values-pt/strings.xml
es/values-ru/photoeditor_strings.xml
es/values-ru/strings.xml
es/values-sk/photoeditor_strings.xml
es/values-sk/strings.xml
es/values-sl/photoeditor_strings.xml
es/values-sl/strings.xml
es/values-sr/photoeditor_strings.xml
es/values-sr/strings.xml
es/values-sv/photoeditor_strings.xml
es/values-sv/strings.xml
es/values-sw/photoeditor_strings.xml
es/values-sw/strings.xml
es/values-th/photoeditor_strings.xml
es/values-th/strings.xml
es/values-tl/photoeditor_strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/photoeditor_strings.xml
es/values-uk/strings.xml
es/values-vi/photoeditor_strings.xml
es/values-vi/strings.xml
es/values-zu/photoeditor_strings.xml
es/values-zu/strings.xml
|
dce7cab7a006b5fb16c777a508ccc28d8738eca1 |
20-Sep-2011 |
Chih-Chung Chang <chihchung@google.com> |
Merge "Fix 5224359: query width and height from media provider."
|
992286cae8c88693228d21a12b9a514c3d932558 |
20-Sep-2011 |
Chih-Chung Chang <chihchung@google.com> |
Merge "Fix 5224359: query width and height from media provider."
|
60de1c033af8a8e058b34ea96d14839666cd08fb |
20-Sep-2011 |
Yuli Huang <yuli@google.com> |
Fix tile-size to sync with the fix in factory branch. Change-Id: I208529a688d44c439dbf0c4d30e4d99e0631fc08
rc/com/android/gallery3d/photoeditor/filters/Filter.java
|
b951e3d8b3ef582aa4655384148c00912dd3e75c |
20-Sep-2011 |
Yuli Huang <yuli@google.com> |
Fix tile-size to sync with the fix in factory branch. Change-Id: I208529a688d44c439dbf0c4d30e4d99e0631fc08
rc/com/android/gallery3d/photoeditor/filters/Filter.java
|
940e2f668c8bc1a3e7493c2e3b684872daf097df |
20-Sep-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
5ea6208838a3f7fdffb064e0f4bda37ed3eb5cec |
20-Sep-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
f5ce47e439c931c0cf84b5aacca99b2a2d3797f1 |
20-Sep-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
f3f04f86e283044e7b165ef9e3fd6447e23c2c41 |
20-Sep-2011 |
Ruei-sung Lin <rslin@google.com> |
am 1ede9972: parameter change to match api * commit '1ede99728efe8bc622cdafc9d9416bce97d7da50': parameter change to match api
|
7d8f602aec4341943bd182e2b7f05ed71c66ef67 |
20-Sep-2011 |
Ruei-sung Lin <rslin@google.com> |
am 1ede9972: parameter change to match api * commit '1ede99728efe8bc622cdafc9d9416bce97d7da50': parameter change to match api
|
090cb8c3a5c862e4fe47fe6d40cfde26be30e135 |
20-Sep-2011 |
Chih-Chung Chang <chihchung@google.com> |
Fix 5224359: query width and height from media provider. Change-Id: Ib7a560822a1d1fdc2be8c572d4d9319f908f7c16
rc/com/android/gallery3d/data/LocalImage.java
rc/com/android/gallery3d/data/LocalVideo.java
|
cac63ebeb6848920b37ee883ddc22f3e5d1e1d61 |
20-Sep-2011 |
Chih-Chung Chang <chihchung@google.com> |
Fix 5224359: query width and height from media provider. Change-Id: Ib7a560822a1d1fdc2be8c572d4d9319f908f7c16
rc/com/android/gallery3d/data/LocalImage.java
rc/com/android/gallery3d/data/LocalVideo.java
|
4a827582bbe6a3c5f1fab0e43ad021c15983474e |
20-Sep-2011 |
Owen Lin <owenlin@google.com> |
Merge "Lock rendering when switching state."
|
6b3b2ded57b98f5ce58320ea3a3c861f3ff25156 |
20-Sep-2011 |
Owen Lin <owenlin@google.com> |
Merge "Lock rendering when switching state."
|
5e3892a940615f5ba782a320707c186b79e296d1 |
15-Sep-2011 |
Ruei-sung Lin <rslin@google.com> |
parameter change to match api Cherry-pick to fix b/5339529. Change-Id: Id84274e60c0feb8019f3418bd1f1feed0542ca51
rc/com/android/gallery3d/photoeditor/filters/DoodleFilter.java
rc/com/android/gallery3d/photoeditor/filters/FillLightFilter.java
rc/com/android/gallery3d/photoeditor/filters/GrainFilter.java
rc/com/android/gallery3d/photoeditor/filters/RotateFilter.java
rc/com/android/gallery3d/photoeditor/filters/VignetteFilter.java
|
1ede99728efe8bc622cdafc9d9416bce97d7da50 |
15-Sep-2011 |
Ruei-sung Lin <rslin@google.com> |
parameter change to match api Cherry-pick to fix b/5339529. Change-Id: Id84274e60c0feb8019f3418bd1f1feed0542ca51
rc/com/android/gallery3d/photoeditor/filters/DoodleFilter.java
rc/com/android/gallery3d/photoeditor/filters/FillLightFilter.java
rc/com/android/gallery3d/photoeditor/filters/GrainFilter.java
rc/com/android/gallery3d/photoeditor/filters/RotateFilter.java
rc/com/android/gallery3d/photoeditor/filters/VignetteFilter.java
|
d3a9464bd4983158d20dd79de656ae5daf4070ee |
20-Sep-2011 |
Owen Lin <owenlin@google.com> |
Merge "Pause the playback of video if the activity is resumed after 3 mins."
|
63de03a9ecc1af9224cce437728ef9eb38b7398b |
20-Sep-2011 |
Owen Lin <owenlin@google.com> |
Merge "Pause the playback of video if the activity is resumed after 3 mins."
|
998dcdb222a93f95a39c2ce04837b99ed383c478 |
20-Sep-2011 |
Hung-ying Tyan <tyanh@google.com> |
Merge "Make the column type constants public in EntrySchema"
|
7b9ca694e477754ab95f446e7de17ae57c9a0bd5 |
20-Sep-2011 |
Hung-ying Tyan <tyanh@google.com> |
Merge "Make the column type constants public in EntrySchema"
|
465ceb2610389c586cd788a3eedd1dac864fdd70 |
20-Sep-2011 |
Hung-ying Tyan <tyanh@google.com> |
Merge "Make the column type constants public in EntrySchema"
|
cb519d673125888207352baebda37567bb460c36 |
20-Sep-2011 |
Ray Chen <raychen@google.com> |
am 3264f438: Fix 5329642 Gallery crashes when viewing Details on certain photos * commit '3264f438f6787adcb875b2611b5c20c0b833ec5e': Fix 5329642 Gallery crashes when viewing Details on certain photos
|
23faef60ca9c41a0f7461174b5b82a344b3602fd |
20-Sep-2011 |
Ray Chen <raychen@google.com> |
am 3264f438: Fix 5329642 Gallery crashes when viewing Details on certain photos * commit '3264f438f6787adcb875b2611b5c20c0b833ec5e': Fix 5329642 Gallery crashes when viewing Details on certain photos
|
bc2154199aee16762e3758ad0cfed685323d9a9f |
19-Sep-2011 |
Chih-Chung Chang <chihchung@google.com> |
Fix 5299746: New UI layout, part 2. - Replace various icons and add xhdpi/sw600dp-mdpi versions of them. - When user press on the thumbnails, show a color overlay on it. - For a wide (w/h > 2) picture, add panorama overlay on it. - Align photo count label position when there is no icon for it. - Adjust offline page layout. Change-Id: I327d25806e99843bfa05d3ca0e9be5a8f9375595
es/drawable-hdpi/frame_overlay_gallery_ptp.png
es/drawable-hdpi/grid_pressed.9.png
es/drawable-hdpi/ic_album_overlay_ptp_holo.png
es/drawable-hdpi/ic_gallery_play.png
es/drawable-hdpi/manage_bar.9.png
es/drawable-mdpi/frame_overlay_gallery_ptp.png
es/drawable-mdpi/grid_pressed.9.png
es/drawable-mdpi/ic_album_overlay_ptp_holo.png
es/drawable-mdpi/ic_gallery_play.png
es/drawable-mdpi/manage_bar.9.png
es/drawable-sw600dp-mdpi/ic_pan_thumb.png
es/drawable-sw600dp-mdpi/ic_video_thumb.png
es/drawable-xhdpi/frame_overlay_gallery_camera.png
es/drawable-xhdpi/frame_overlay_gallery_folder.png
es/drawable-xhdpi/frame_overlay_gallery_picasa.png
es/drawable-xhdpi/frame_overlay_gallery_ptp.png
es/drawable-xhdpi/grid_pressed.9.png
es/drawable-xhdpi/grid_selected.9.png
es/drawable-xhdpi/ic_gallery_play.png
es/drawable-xhdpi/ic_menu_make_offline.png
es/drawable-xhdpi/ic_pan_thumb.png
es/drawable-xhdpi/ic_video_thumb.png
es/drawable-xhdpi/thumb_selected.png
es/layout-w480dp/manage_offline_bar.xml
es/layout/manage_offline_bar.xml
es/values-land/dimensions.xml
es/values/dimensions.xml
rc/com/android/gallery3d/app/AlbumPage.java
rc/com/android/gallery3d/app/AlbumSetPage.java
rc/com/android/gallery3d/app/Config.java
rc/com/android/gallery3d/app/ManageCachePage.java
rc/com/android/gallery3d/data/LocalImage.java
rc/com/android/gallery3d/data/LocalVideo.java
rc/com/android/gallery3d/data/MediaItem.java
rc/com/android/gallery3d/data/MtpImage.java
rc/com/android/gallery3d/data/UriImage.java
rc/com/android/gallery3d/ui/AlbumSetSlidingWindow.java
rc/com/android/gallery3d/ui/AlbumSetView.java
rc/com/android/gallery3d/ui/AlbumSlidingWindow.java
rc/com/android/gallery3d/ui/FilmStripView.java
rc/com/android/gallery3d/ui/GridDrawer.java
rc/com/android/gallery3d/ui/HighlightDrawer.java
rc/com/android/gallery3d/ui/IconDrawer.java
rc/com/android/gallery3d/ui/ManageCacheDrawer.java
rc/com/android/gallery3d/ui/SelectionDrawer.java
rc/com/android/gallery3d/ui/SelectionManager.java
rc/com/android/gallery3d/ui/SlotView.java
rc/com/android/gallery3d/ui/StripDrawer.java
rc/com/android/gallery3d/util/GalleryUtils.java
ests/src/com/android/gallery3d/data/MockItem.java
|
710db7746bf13003f869a2ceef1943e8ac1aea20 |
19-Sep-2011 |
Chih-Chung Chang <chihchung@google.com> |
Fix 5299746: New UI layout, part 2. - Replace various icons and add xhdpi/sw600dp-mdpi versions of them. - When user press on the thumbnails, show a color overlay on it. - For a wide (w/h > 2) picture, add panorama overlay on it. - Align photo count label position when there is no icon for it. - Adjust offline page layout. Change-Id: I327d25806e99843bfa05d3ca0e9be5a8f9375595
es/drawable-hdpi/frame_overlay_gallery_ptp.png
es/drawable-hdpi/grid_pressed.9.png
es/drawable-hdpi/ic_album_overlay_ptp_holo.png
es/drawable-hdpi/ic_gallery_play.png
es/drawable-hdpi/manage_bar.9.png
es/drawable-mdpi/frame_overlay_gallery_ptp.png
es/drawable-mdpi/grid_pressed.9.png
es/drawable-mdpi/ic_album_overlay_ptp_holo.png
es/drawable-mdpi/ic_gallery_play.png
es/drawable-mdpi/manage_bar.9.png
es/drawable-sw600dp-mdpi/ic_pan_thumb.png
es/drawable-sw600dp-mdpi/ic_video_thumb.png
es/drawable-xhdpi/frame_overlay_gallery_camera.png
es/drawable-xhdpi/frame_overlay_gallery_folder.png
es/drawable-xhdpi/frame_overlay_gallery_picasa.png
es/drawable-xhdpi/frame_overlay_gallery_ptp.png
es/drawable-xhdpi/grid_pressed.9.png
es/drawable-xhdpi/grid_selected.9.png
es/drawable-xhdpi/ic_gallery_play.png
es/drawable-xhdpi/ic_menu_make_offline.png
es/drawable-xhdpi/ic_pan_thumb.png
es/drawable-xhdpi/ic_video_thumb.png
es/drawable-xhdpi/thumb_selected.png
es/layout-w480dp/manage_offline_bar.xml
es/layout/manage_offline_bar.xml
es/values-land/dimensions.xml
es/values/dimensions.xml
|
70a73a7f7fad0a8d09fdb744bd3ca2051b39a93d |
19-Sep-2011 |
Chih-Chung Chang <chihchung@google.com> |
Fix 5299746: New UI layout, part 2. - Replace various icons and add xhdpi/sw600dp-mdpi versions of them. - When user press on the thumbnails, show a color overlay on it. - For a wide (w/h > 2) picture, add panorama overlay on it. - Align photo count label position when there is no icon for it. - Adjust offline page layout. Change-Id: I327d25806e99843bfa05d3ca0e9be5a8f9375595
rc/com/android/gallery3d/app/AlbumPage.java
rc/com/android/gallery3d/app/AlbumSetPage.java
rc/com/android/gallery3d/app/Config.java
rc/com/android/gallery3d/app/ManageCachePage.java
rc/com/android/gallery3d/data/LocalImage.java
rc/com/android/gallery3d/data/LocalVideo.java
rc/com/android/gallery3d/data/MediaItem.java
rc/com/android/gallery3d/data/MtpImage.java
rc/com/android/gallery3d/data/UriImage.java
rc/com/android/gallery3d/ui/AlbumSetSlidingWindow.java
rc/com/android/gallery3d/ui/AlbumSetView.java
rc/com/android/gallery3d/ui/AlbumSlidingWindow.java
rc/com/android/gallery3d/ui/FilmStripView.java
rc/com/android/gallery3d/ui/GridDrawer.java
rc/com/android/gallery3d/ui/HighlightDrawer.java
rc/com/android/gallery3d/ui/IconDrawer.java
rc/com/android/gallery3d/ui/ManageCacheDrawer.java
rc/com/android/gallery3d/ui/SelectionDrawer.java
rc/com/android/gallery3d/ui/SelectionManager.java
rc/com/android/gallery3d/ui/SlotView.java
rc/com/android/gallery3d/ui/StripDrawer.java
rc/com/android/gallery3d/util/GalleryUtils.java
ests/src/com/android/gallery3d/data/MockItem.java
|
733efc5bd620caf52a7179cb7609f66e55d86aae |
19-Sep-2011 |
Ray Chen <raychen@google.com> |
Fix 5329642 Gallery crashes when viewing Details on certain photos AddressResolvingListener (mAdapter) is not set until constructor returns, so NPE is thrown if the resolving happens really fast. This CL uses 'this' instead of mAdapter. Change-Id: Ifce0ea92a3eb5c794a73cf0e89a236ff3d948c18
rc/com/android/gallery3d/ui/DialogDetailsView.java
|
3264f438f6787adcb875b2611b5c20c0b833ec5e |
19-Sep-2011 |
Ray Chen <raychen@google.com> |
Fix 5329642 Gallery crashes when viewing Details on certain photos AddressResolvingListener (mAdapter) is not set until constructor returns, so NPE is thrown if the resolving happens really fast. This CL uses 'this' instead of mAdapter. Change-Id: Ifce0ea92a3eb5c794a73cf0e89a236ff3d948c18
rc/com/android/gallery3d/ui/DialogDetailsView.java
|
540e4698824654232f300992ed8c03b20c9d5946 |
14-Sep-2011 |
Owen Lin <owenlin@google.com> |
Pause the playback of video if the activity is resumed after 3 mins. fix: 5260232 Also keep the current playback position when the activity is resumed. Originally, we use the bookmark to keep the position. However, the bookmark will be ignored if 1.) The video duration is less than 2 mins, 2.) The video is just started (with 30sec), or 3.) The video is approching the end. I think resume should not limited by the above rules. And we did get some reports on this. (We mark them as WORK AS INTENTDED). Change-Id: Ib9ac359d7ccb6a0278777b0892f0821e16bbb745
rc/com/android/gallery3d/app/MovieActivity.java
rc/com/android/gallery3d/app/MoviePlayer.java
|
0fdbf235f6021738172f6f1ca4b6bbfa0d7ce655 |
14-Sep-2011 |
Owen Lin <owenlin@google.com> |
Pause the playback of video if the activity is resumed after 3 mins. fix: 5260232 Also keep the current playback position when the activity is resumed. Originally, we use the bookmark to keep the position. However, the bookmark will be ignored if 1.) The video duration is less than 2 mins, 2.) The video is just started (with 30sec), or 3.) The video is approching the end. I think resume should not limited by the above rules. And we did get some reports on this. (We mark them as WORK AS INTENTDED). Change-Id: Ib9ac359d7ccb6a0278777b0892f0821e16bbb745
rc/com/android/gallery3d/app/MovieActivity.java
rc/com/android/gallery3d/app/MoviePlayer.java
|
5ccc96ac39f9513f13977de4419d814112c23ab8 |
15-Sep-2011 |
Owen Lin <owenlin@google.com> |
Lock rendering when switching state. fix: 5126875 Change-Id: I118660b80cc5dfa8913865e303ed48f23e1c0705
rc/com/android/gallery3d/app/GalleryActionBar.java
|
b591b41ab6c9c541ce30f7eac14d71467d2f09f9 |
15-Sep-2011 |
Owen Lin <owenlin@google.com> |
Lock rendering when switching state. fix: 5126875 Change-Id: I118660b80cc5dfa8913865e303ed48f23e1c0705
rc/com/android/gallery3d/app/GalleryActionBar.java
|
6c8d0fd879242f78a0c1a7daf4c037043663a49f |
19-Sep-2011 |
Chih-Chung Chang <chihchung@google.com> |
Fix 5337270: Thumbnail is not generated for large GIF images. Change-Id: I8e2e8cafb01b2289f59b28b7e2eadae3dc5c0c50
allerycommon/src/com/android/gallery3d/common/BitmapUtils.java
rc/com/android/gallery3d/data/DecodeUtils.java
|
598c4e6d920dc8c4bd691a022f6c11864fcf5849 |
19-Sep-2011 |
Chih-Chung Chang <chihchung@google.com> |
Fix 5337270: Thumbnail is not generated for large GIF images. Change-Id: I8e2e8cafb01b2289f59b28b7e2eadae3dc5c0c50
allerycommon/src/com/android/gallery3d/common/BitmapUtils.java
|
af84ef2bc0b41c029ab1f8f589b4cf25c90331c1 |
19-Sep-2011 |
Chih-Chung Chang <chihchung@google.com> |
Fix 5337270: Thumbnail is not generated for large GIF images. Change-Id: I8e2e8cafb01b2289f59b28b7e2eadae3dc5c0c50
allerycommon/src/com/android/gallery3d/common/BitmapUtils.java
rc/com/android/gallery3d/data/DecodeUtils.java
|
884151232ccdbfabeda9a2e9627c2a499650f6be |
20-Sep-2011 |
Owen Lin <owenlin@google.com> |
am 5da31f8f: Add a hard limit on the size of the widget images. * commit '5da31f8fd85d7c1e33133473bd1fbc5e3a240f2d': Add a hard limit on the size of the widget images.
|
27a7e7b36ed5a42a0983a922db4df30b8fd154af |
13-Sep-2011 |
Owen Lin <owenlin@google.com> |
Add a hard limit on the size of the widget images. There is a limit on the size of the data transfered by binder. For now, we just add a hard limit (360 pixel) to ensure the widget's image can be passed by binder. Also adjust the size of widget to make it looks better. Fix a bug in DecodeUtils which cause OOM for a image in size 12200x1920. In that case, we should generate a screen nail of size 640x101 instead of 4066x640. Change-Id: Ia8227d8e5368471fe7af94bf164d67017aa321fa fix: 5273271
es/values-xlarge/dimensions.xml
es/values/dimensions.xml
es/xml/widget_info.xml
|
5da31f8fd85d7c1e33133473bd1fbc5e3a240f2d |
13-Sep-2011 |
Owen Lin <owenlin@google.com> |
Add a hard limit on the size of the widget images. There is a limit on the size of the data transfered by binder. For now, we just add a hard limit (360 pixel) to ensure the widget's image can be passed by binder. Also adjust the size of widget to make it looks better. Fix a bug in DecodeUtils which cause OOM for a image in size 12200x1920. In that case, we should generate a screen nail of size 640x101 instead of 4066x640. Change-Id: Ia8227d8e5368471fe7af94bf164d67017aa321fa fix: 5273271
allerycommon/src/com/android/gallery3d/common/BitmapUtils.java
es/values-xlarge/dimensions.xml
es/values/dimensions.xml
es/xml/widget_info.xml
rc/com/android/gallery3d/data/DecodeUtils.java
rc/com/android/gallery3d/gadget/WidgetConfigure.java
|
7b3e8bfa2a38aca92b458b10bc3f6b5de3d5eb69 |
13-Sep-2011 |
Owen Lin <owenlin@google.com> |
Add a hard limit on the size of the widget images. There is a limit on the size of the data transfered by binder. For now, we just add a hard limit (360 pixel) to ensure the widget's image can be passed by binder. Also adjust the size of widget to make it looks better. Fix a bug in DecodeUtils which cause OOM for a image in size 12200x1920. In that case, we should generate a screen nail of size 640x101 instead of 4066x640. Change-Id: Ia8227d8e5368471fe7af94bf164d67017aa321fa fix: 5273271
allerycommon/src/com/android/gallery3d/common/BitmapUtils.java
|
9ed28cc0b7108a95aebbc3fe59671e36149d2aa7 |
13-Sep-2011 |
Owen Lin <owenlin@google.com> |
Add a hard limit on the size of the widget images. There is a limit on the size of the data transfered by binder. For now, we just add a hard limit (360 pixel) to ensure the widget's image can be passed by binder. Also adjust the size of widget to make it looks better. Fix a bug in DecodeUtils which cause OOM for a image in size 12200x1920. In that case, we should generate a screen nail of size 640x101 instead of 4066x640. Change-Id: Ia8227d8e5368471fe7af94bf164d67017aa321fa fix: 5273271
allerycommon/src/com/android/gallery3d/common/BitmapUtils.java
rc/com/android/gallery3d/data/DecodeUtils.java
rc/com/android/gallery3d/gadget/WidgetConfigure.java
|
e3a84b486af57758c9311a500be13616d8b4b2f2 |
19-Sep-2011 |
Ray Chen <raychen@google.com> |
am d2ee3f2a: Merge "Fix 5329642 Gallery crashes when viewing Details on certain photos" * commit 'd2ee3f2ac4bf9faed16b8007efe8daf6ef4edcac': Fix 5329642 Gallery crashes when viewing Details on certain photos
|
ce0350f9532edf35d5509040f1f29199a470c573 |
19-Sep-2011 |
Ray Chen <raychen@google.com> |
am aa55bf69: Merge "Fix 5331012 [UI] No dropdown label when entering multi-select modes via menu > Select item(s) / group(s) / album(s)" * commit 'aa55bf692ec8472a401a3117ab2d4a72abe48ccf': Fix 5331012 [UI] No dropdown label when entering multi-select modes via menu > Select item(s) / group(s) / album(s)
|
67f9cd0df453240e51e450b8cc991c8a8d5b7fdd |
19-Sep-2011 |
Ray Chen <raychen@google.com> |
am acbab5b1: Merge "Fix 5291553 Not able to share downloaded image file" * commit 'acbab5b17f393e57f7466e5459fed41f518e2864': Fix 5291553 Not able to share downloaded image file
|
e26638f4c2325c8ff45366fd3d667592183d8d07 |
19-Sep-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
fafc808c8ac1a05b5a94444822efe536e54fc3a7 |
19-Sep-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
d2ee3f2ac4bf9faed16b8007efe8daf6ef4edcac |
19-Sep-2011 |
Ray Chen <raychen@google.com> |
Merge "Fix 5329642 Gallery crashes when viewing Details on certain photos"
|
56e813b555f7723a033bbb84ffc2ac517d4c1a2d |
19-Sep-2011 |
Ray Chen <raychen@google.com> |
Merge "Fix 5329642 Gallery crashes when viewing Details on certain photos"
|
aa55bf692ec8472a401a3117ab2d4a72abe48ccf |
19-Sep-2011 |
Ray Chen <raychen@google.com> |
Merge "Fix 5331012 [UI] No dropdown label when entering multi-select modes via menu > Select item(s) / group(s) / album(s)"
|
c154a12e776019ec4230d06ff5230eb5b96f4fd3 |
19-Sep-2011 |
Ray Chen <raychen@google.com> |
Merge "Fix 5331012 [UI] No dropdown label when entering multi-select modes via menu > Select item(s) / group(s) / album(s)"
|
924a510c32087410cd8e922a915c0486feb6790d |
19-Sep-2011 |
Ray Chen <raychen@google.com> |
Fix 5329642 Gallery crashes when viewing Details on certain photos AddressResolvingListener (mAdapter) is not set until constructor returns, so NPE is thrown if the resolving happens really fast. This CL uses 'this' instead of mAdapter. Change-Id: Ifce0ea92a3eb5c794a73cf0e89a236ff3d948c18
rc/com/android/gallery3d/ui/DialogDetailsView.java
|
1e4adaa16112edc86bdedd0c2e1a8b4a5eeb3e3c |
19-Sep-2011 |
Ray Chen <raychen@google.com> |
Fix 5329642 Gallery crashes when viewing Details on certain photos AddressResolvingListener (mAdapter) is not set until constructor returns, so NPE is thrown if the resolving happens really fast. This CL uses 'this' instead of mAdapter. Change-Id: Ifce0ea92a3eb5c794a73cf0e89a236ff3d948c18
rc/com/android/gallery3d/ui/DialogDetailsView.java
|
acbab5b17f393e57f7466e5459fed41f518e2864 |
19-Sep-2011 |
Ray Chen <raychen@google.com> |
Merge "Fix 5291553 Not able to share downloaded image file"
|
350646b3edc73227bfcd1024202cc0fe0405c1b9 |
19-Sep-2011 |
Ray Chen <raychen@google.com> |
Merge "Fix 5291553 Not able to share downloaded image file"
|
9b54e8c645d14748b7dd75e25b4db9e97e3415a9 |
18-Sep-2011 |
Ray Chen <raychen@google.com> |
Fix 5331012 [UI] No dropdown label when entering multi-select modes via menu > Select item(s) / group(s) / album(s) Change-Id: Ie46432dd136447942011f3565ab7a6406c461887
rc/com/android/gallery3d/app/AlbumPage.java
rc/com/android/gallery3d/ui/ActionModeHandler.java
|
afa492c195838a0884f59ab2b86d7f5207181d82 |
18-Sep-2011 |
Ray Chen <raychen@google.com> |
Fix 5331012 [UI] No dropdown label when entering multi-select modes via menu > Select item(s) / group(s) / album(s) Change-Id: Ie46432dd136447942011f3565ab7a6406c461887
rc/com/android/gallery3d/app/AlbumPage.java
rc/com/android/gallery3d/ui/ActionModeHandler.java
|
fe2fe4f64d80c7d5aea54f344f8b93a09e1c24e2 |
18-Sep-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
fedad70a7e9f4c3fa803a003d32dc903a8821c41 |
18-Sep-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
5b2a7d835fea7e47a6520b097cf5c4a99f163640 |
18-Sep-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
9becbb0db0ae08296855f07f424214bd92f30cbd |
18-Sep-2011 |
Hung-ying Tyan <tyanh@google.com> |
Make the column type constants public in EntrySchema so that we can use the 'type' member in ColumnInfo. Change-Id: Ia1a8af6fd0464b9b799796b5c99037531a0de00b
allerycommon/src/com/android/gallery3d/common/EntrySchema.java
|
a204257934c739687d7abf4e940298f178a5d278 |
18-Sep-2011 |
Hung-ying Tyan <tyanh@google.com> |
Make the column type constants public in EntrySchema so that we can use the 'type' member in ColumnInfo. Change-Id: Ia1a8af6fd0464b9b799796b5c99037531a0de00b
allerycommon/src/com/android/gallery3d/common/EntrySchema.java
|
213bcc1780ec0d6820a3c3b7a76462cbc26f34fe |
18-Sep-2011 |
Hung-ying Tyan <tyanh@google.com> |
Make the column type constants public in EntrySchema so that we can use the 'type' member in ColumnInfo. Change-Id: Ia1a8af6fd0464b9b799796b5c99037531a0de00b
allerycommon/src/com/android/gallery3d/common/EntrySchema.java
|
1167657cdfcf61c2b9f3934c32587423ba66ec07 |
17-Sep-2011 |
Eric Fischer <enf@google.com> |
am fc6bcf22: (-s ours) am 7697fb27: (-s ours) Import revised translations. DO NOT MERGE * commit 'fc6bcf223f83ff6b0c9d96e64ce876198eb4b3eb': Import revised translations. DO NOT MERGE
|
34c6eae8e431b97e386291acf059656211c736c7 |
17-Sep-2011 |
Eric Fischer <enf@google.com> |
am 7697fb27: (-s ours) Import revised translations. DO NOT MERGE * commit '7697fb27322de2e4b164726392a39a68e77b3fdf': Import revised translations. DO NOT MERGE
|
fc6bcf223f83ff6b0c9d96e64ce876198eb4b3eb |
17-Sep-2011 |
Eric Fischer <enf@google.com> |
am 7697fb27: (-s ours) Import revised translations. DO NOT MERGE * commit '7697fb27322de2e4b164726392a39a68e77b3fdf': Import revised translations. DO NOT MERGE
|
7697fb27322de2e4b164726392a39a68e77b3fdf |
17-Sep-2011 |
Eric Fischer <enf@google.com> |
Import revised translations. DO NOT MERGE Change-Id: I9f2fd3f5354c2b75fc86eb99e670e6ff21fd653b
es/values-af/photoeditor_strings.xml
es/values-af/strings.xml
es/values-am/photoeditor_strings.xml
es/values-am/strings.xml
es/values-ar/photoeditor_strings.xml
es/values-ar/strings.xml
es/values-ca/photoeditor_strings.xml
es/values-ca/strings.xml
es/values-cs/photoeditor_strings.xml
es/values-cs/strings.xml
es/values-da/photoeditor_strings.xml
es/values-da/strings.xml
es/values-el/photoeditor_strings.xml
es/values-el/strings.xml
es/values-en-rGB/photoeditor_strings.xml
es/values-en-rGB/strings.xml
es/values-es/photoeditor_strings.xml
es/values-es/strings.xml
es/values-fa/photoeditor_strings.xml
es/values-fa/strings.xml
es/values-fi/photoeditor_strings.xml
es/values-fi/strings.xml
es/values-fr/photoeditor_strings.xml
es/values-fr/strings.xml
es/values-hr/photoeditor_strings.xml
es/values-hr/strings.xml
es/values-hu/photoeditor_strings.xml
es/values-hu/strings.xml
es/values-in/photoeditor_strings.xml
es/values-in/strings.xml
es/values-it/photoeditor_strings.xml
es/values-it/strings.xml
es/values-iw/photoeditor_strings.xml
es/values-iw/strings.xml
es/values-ko/photoeditor_strings.xml
es/values-ko/strings.xml
es/values-lt/photoeditor_strings.xml
es/values-lt/strings.xml
es/values-lv/photoeditor_strings.xml
es/values-lv/strings.xml
es/values-nb/photoeditor_strings.xml
es/values-nb/strings.xml
es/values-pl/photoeditor_strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/photoeditor_strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/photoeditor_strings.xml
es/values-pt/strings.xml
es/values-ru/photoeditor_strings.xml
es/values-ru/strings.xml
es/values-sk/photoeditor_strings.xml
es/values-sk/strings.xml
es/values-sl/photoeditor_strings.xml
es/values-sl/strings.xml
es/values-sr/photoeditor_strings.xml
es/values-sr/strings.xml
es/values-sv/photoeditor_strings.xml
es/values-sv/strings.xml
es/values-sw/photoeditor_strings.xml
es/values-sw/strings.xml
es/values-th/photoeditor_strings.xml
es/values-th/strings.xml
es/values-tl/photoeditor_strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/photoeditor_strings.xml
es/values-uk/strings.xml
es/values-vi/photoeditor_strings.xml
es/values-vi/strings.xml
es/values-zu/photoeditor_strings.xml
es/values-zu/strings.xml
|
5ff34c5fb0a6a9939bb728906e59e7884e20e203 |
17-Sep-2011 |
Eric Fischer <enf@google.com> |
Import revised translations. DO NOT MERGE Change-Id: I9f2fd3f5354c2b75fc86eb99e670e6ff21fd653b
es/values-af/photoeditor_strings.xml
es/values-af/strings.xml
es/values-am/photoeditor_strings.xml
es/values-am/strings.xml
es/values-ar/photoeditor_strings.xml
es/values-ar/strings.xml
es/values-ca/photoeditor_strings.xml
es/values-ca/strings.xml
es/values-cs/photoeditor_strings.xml
es/values-cs/strings.xml
es/values-da/photoeditor_strings.xml
es/values-da/strings.xml
es/values-el/photoeditor_strings.xml
es/values-el/strings.xml
es/values-en-rGB/photoeditor_strings.xml
es/values-en-rGB/strings.xml
es/values-es/photoeditor_strings.xml
es/values-es/strings.xml
es/values-fa/photoeditor_strings.xml
es/values-fa/strings.xml
es/values-fi/photoeditor_strings.xml
es/values-fi/strings.xml
es/values-fr/photoeditor_strings.xml
es/values-fr/strings.xml
es/values-hr/photoeditor_strings.xml
es/values-hr/strings.xml
es/values-hu/photoeditor_strings.xml
es/values-hu/strings.xml
es/values-in/photoeditor_strings.xml
es/values-in/strings.xml
es/values-it/photoeditor_strings.xml
es/values-it/strings.xml
es/values-iw/photoeditor_strings.xml
es/values-iw/strings.xml
es/values-ko/photoeditor_strings.xml
es/values-ko/strings.xml
es/values-lt/photoeditor_strings.xml
es/values-lt/strings.xml
es/values-lv/photoeditor_strings.xml
es/values-lv/strings.xml
es/values-nb/photoeditor_strings.xml
es/values-nb/strings.xml
es/values-pl/photoeditor_strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/photoeditor_strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/photoeditor_strings.xml
es/values-pt/strings.xml
es/values-ru/photoeditor_strings.xml
es/values-ru/strings.xml
es/values-sk/photoeditor_strings.xml
es/values-sk/strings.xml
es/values-sl/photoeditor_strings.xml
es/values-sl/strings.xml
es/values-sr/photoeditor_strings.xml
es/values-sr/strings.xml
es/values-sv/photoeditor_strings.xml
es/values-sv/strings.xml
es/values-sw/photoeditor_strings.xml
es/values-sw/strings.xml
es/values-th/photoeditor_strings.xml
es/values-th/strings.xml
es/values-tl/photoeditor_strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/photoeditor_strings.xml
es/values-uk/strings.xml
es/values-vi/photoeditor_strings.xml
es/values-vi/strings.xml
es/values-zu/photoeditor_strings.xml
es/values-zu/strings.xml
|
106db9020becf0ac570f8a78e2f6f15c76c1f7d3 |
16-Sep-2011 |
Bor-Yeh Shen <byshen@google.com> |
Add a blue underline to the selected button Change-Id: I6e10c1a36f0838d96ecf2df7979302e405cf8fcb
es/drawable-hdpi/photoeditor_tab_selected_focused_holo.9.png
es/drawable-hdpi/photoeditor_tab_selected_holo.9.png
es/drawable-hdpi/photoeditor_tab_selected_pressed_holo.9.png
es/drawable-hdpi/photoeditor_tab_unselected_focused_holo.9.png
es/drawable-hdpi/photoeditor_tab_unselected_pressed_holo.9.png
es/drawable-mdpi/photoeditor_tab_selected_focused_holo.9.png
es/drawable-mdpi/photoeditor_tab_selected_holo.9.png
es/drawable-mdpi/photoeditor_tab_selected_pressed_holo.9.png
es/drawable-mdpi/photoeditor_tab_unselected_focused_holo.9.png
es/drawable-mdpi/photoeditor_tab_unselected_pressed_holo.9.png
es/drawable/photoeditor_toggle_button_background.xml
es/drawable/photoeditor_toggle_button_highlight.9.png
|
9df7afb5cb4a6f25df2d12b9d695da82c6bb8b0b |
16-Sep-2011 |
Bor-Yeh Shen <byshen@google.com> |
Add a blue underline to the selected button Change-Id: I6e10c1a36f0838d96ecf2df7979302e405cf8fcb
es/drawable-hdpi/photoeditor_tab_selected_focused_holo.9.png
es/drawable-hdpi/photoeditor_tab_selected_holo.9.png
es/drawable-hdpi/photoeditor_tab_selected_pressed_holo.9.png
es/drawable-hdpi/photoeditor_tab_unselected_focused_holo.9.png
es/drawable-hdpi/photoeditor_tab_unselected_pressed_holo.9.png
es/drawable-mdpi/photoeditor_tab_selected_focused_holo.9.png
es/drawable-mdpi/photoeditor_tab_selected_holo.9.png
es/drawable-mdpi/photoeditor_tab_selected_pressed_holo.9.png
es/drawable-mdpi/photoeditor_tab_unselected_focused_holo.9.png
es/drawable-mdpi/photoeditor_tab_unselected_pressed_holo.9.png
es/drawable/photoeditor_toggle_button_background.xml
es/drawable/photoeditor_toggle_button_highlight.9.png
|
f95aed139ef3292948f1ade97cc48312a62fc30d |
13-Sep-2011 |
Ray Chen <raychen@google.com> |
Fix 5239335 ICS Gallery: convert tabs at Gallery home to drop down Change-Id: I7503f724dbf16034513a6d8d6b0cb0425166a365
rc/com/android/gallery3d/app/AlbumSetPage.java
rc/com/android/gallery3d/app/GalleryActionBar.java
|
b5f8d908c5dd287052cd49eddaf1f82d858cca03 |
13-Sep-2011 |
Ray Chen <raychen@google.com> |
Fix 5239335 ICS Gallery: convert tabs at Gallery home to drop down Change-Id: I7503f724dbf16034513a6d8d6b0cb0425166a365
es/layout/action_bar_text.xml
rc/com/android/gallery3d/app/AlbumSetPage.java
rc/com/android/gallery3d/app/GalleryActionBar.java
|
c138187a52c3149b2a3d00b86363f5e55c474f9f |
13-Sep-2011 |
Ray Chen <raychen@google.com> |
Fix 5239335 ICS Gallery: convert tabs at Gallery home to drop down Change-Id: I7503f724dbf16034513a6d8d6b0cb0425166a365
es/layout/action_bar_text.xml
|
e12984c0c9766a6b4e157253492fcf7334f76115 |
16-Sep-2011 |
Chih-Chung Chang <chihchung@google.com> |
Merge "New UI for Gallery."
|
e7117abd9e9b3d5d9616c5387c4ad6402d4a1a58 |
16-Sep-2011 |
Chih-Chung Chang <chihchung@google.com> |
Merge "New UI for Gallery."
|
cf46a3abc26aac7cdb6b6993aeade053304b71d9 |
14-Sep-2011 |
Ray Chen <raychen@google.com> |
Fix 5291553 Not able to share downloaded image file Change-Id: I8e57b04e0231c592cc0dfe8a4f31e585510e753c
rc/com/android/gallery3d/app/PhotoPage.java
|
414190774a73ba9029808f946a4ee066628862d7 |
14-Sep-2011 |
Ray Chen <raychen@google.com> |
Fix 5291553 Not able to share downloaded image file Change-Id: I8e57b04e0231c592cc0dfe8a4f31e585510e753c
rc/com/android/gallery3d/app/PhotoPage.java
|
5bb73989b355f9875305c46062cc5fc35da053b6 |
14-Sep-2011 |
Chih-Chung Chang <chihchung@google.com> |
New UI for Gallery. Change-Id: I5f243c00ebac55a9b333a9e13d0cc9c371a85005
es/drawable-hdpi/album_frame.9.png
es/drawable-hdpi/frame_overlay_gallery_camera.png
es/drawable-hdpi/frame_overlay_gallery_folder.png
es/drawable-hdpi/frame_overlay_gallery_picasa.png
es/drawable-hdpi/grid_selected.9.png
es/drawable-hdpi/grid_selected_top.9.png
es/drawable-hdpi/ic_album_overlay_camera_holo.png
es/drawable-hdpi/ic_album_overlay_folder_holo.png
es/drawable-hdpi/ic_album_overlay_picassa_holo.png
es/drawable-hdpi/ic_gallery_play.png
es/drawable-hdpi/ic_pan_thumb.png
es/drawable-hdpi/ic_video_thumb.png
es/drawable-hdpi/import_translucent.9.png
es/drawable-hdpi/manage_frame.9.png
es/drawable-hdpi/thumbnail_album_video_overlay_holo.png
es/drawable-hdpi/videooverlay.png
es/drawable-mdpi/album_frame.9.png
es/drawable-mdpi/frame_overlay_gallery_camera.png
es/drawable-mdpi/frame_overlay_gallery_folder.png
es/drawable-mdpi/frame_overlay_gallery_picasa.png
es/drawable-mdpi/grid_selected.9.png
es/drawable-mdpi/grid_selected_top.9.png
es/drawable-mdpi/ic_album_overlay_camera_holo.png
es/drawable-mdpi/ic_album_overlay_folder_holo.png
es/drawable-mdpi/ic_album_overlay_picassa_holo.png
es/drawable-mdpi/ic_gallery_play.png
es/drawable-mdpi/ic_pan_thumb.png
es/drawable-mdpi/ic_video_thumb.png
es/drawable-mdpi/import_translucent.9.png
es/drawable-mdpi/manage_frame.9.png
es/drawable-mdpi/thumbnail_album_video_overlay_holo.png
es/drawable-mdpi/videooverlay.png
es/values-xlarge/dimensions.xml
es/values/dimensions.xml
|
07069deef65cad3a094afd8da3014f2e33df5628 |
14-Sep-2011 |
Chih-Chung Chang <chihchung@google.com> |
New UI for Gallery. Change-Id: I5f243c00ebac55a9b333a9e13d0cc9c371a85005
rc/com/android/gallery3d/app/AlbumPage.java
rc/com/android/gallery3d/app/AlbumSetDataAdapter.java
rc/com/android/gallery3d/app/AlbumSetPage.java
rc/com/android/gallery3d/app/Config.java
rc/com/android/gallery3d/app/ManageCachePage.java
rc/com/android/gallery3d/ui/AlbumSetSlidingWindow.java
rc/com/android/gallery3d/ui/AlbumSetView.java
rc/com/android/gallery3d/ui/AlbumSlidingWindow.java
rc/com/android/gallery3d/ui/AlbumView.java
rc/com/android/gallery3d/ui/DisplayItem.java
rc/com/android/gallery3d/ui/FilmStripView.java
rc/com/android/gallery3d/ui/GLDetailsView.java
rc/com/android/gallery3d/ui/GridDrawer.java
rc/com/android/gallery3d/ui/HighlightDrawer.java
rc/com/android/gallery3d/ui/IconDrawer.java
rc/com/android/gallery3d/ui/ManageCacheDrawer.java
rc/com/android/gallery3d/ui/MultiLineTexture.java
rc/com/android/gallery3d/ui/SelectionDrawer.java
rc/com/android/gallery3d/ui/SlotView.java
rc/com/android/gallery3d/ui/StringTexture.java
rc/com/android/gallery3d/ui/StripDrawer.java
|
9201679ed1c485767f2e334aa618bd733024af03 |
14-Sep-2011 |
Chih-Chung Chang <chihchung@google.com> |
New UI for Gallery. Change-Id: I5f243c00ebac55a9b333a9e13d0cc9c371a85005
es/drawable-hdpi/album_frame.9.png
es/drawable-hdpi/frame_overlay_gallery_camera.png
es/drawable-hdpi/frame_overlay_gallery_folder.png
es/drawable-hdpi/frame_overlay_gallery_picasa.png
es/drawable-hdpi/grid_selected.9.png
es/drawable-hdpi/grid_selected_top.9.png
es/drawable-hdpi/ic_album_overlay_camera_holo.png
es/drawable-hdpi/ic_album_overlay_folder_holo.png
es/drawable-hdpi/ic_album_overlay_picassa_holo.png
es/drawable-hdpi/ic_gallery_play.png
es/drawable-hdpi/ic_pan_thumb.png
es/drawable-hdpi/ic_video_thumb.png
es/drawable-hdpi/import_translucent.9.png
es/drawable-hdpi/manage_frame.9.png
es/drawable-hdpi/thumbnail_album_video_overlay_holo.png
es/drawable-hdpi/videooverlay.png
es/drawable-mdpi/album_frame.9.png
es/drawable-mdpi/frame_overlay_gallery_camera.png
es/drawable-mdpi/frame_overlay_gallery_folder.png
es/drawable-mdpi/frame_overlay_gallery_picasa.png
es/drawable-mdpi/grid_selected.9.png
es/drawable-mdpi/grid_selected_top.9.png
es/drawable-mdpi/ic_album_overlay_camera_holo.png
es/drawable-mdpi/ic_album_overlay_folder_holo.png
es/drawable-mdpi/ic_album_overlay_picassa_holo.png
es/drawable-mdpi/ic_gallery_play.png
es/drawable-mdpi/ic_pan_thumb.png
es/drawable-mdpi/ic_video_thumb.png
es/drawable-mdpi/import_translucent.9.png
es/drawable-mdpi/manage_frame.9.png
es/drawable-mdpi/thumbnail_album_video_overlay_holo.png
es/drawable-mdpi/videooverlay.png
es/values-xlarge/dimensions.xml
es/values/dimensions.xml
rc/com/android/gallery3d/app/AlbumPage.java
rc/com/android/gallery3d/app/AlbumSetDataAdapter.java
rc/com/android/gallery3d/app/AlbumSetPage.java
rc/com/android/gallery3d/app/Config.java
rc/com/android/gallery3d/app/ManageCachePage.java
rc/com/android/gallery3d/ui/AlbumSetSlidingWindow.java
rc/com/android/gallery3d/ui/AlbumSetView.java
rc/com/android/gallery3d/ui/AlbumSlidingWindow.java
rc/com/android/gallery3d/ui/AlbumView.java
rc/com/android/gallery3d/ui/DisplayItem.java
rc/com/android/gallery3d/ui/FilmStripView.java
rc/com/android/gallery3d/ui/GLDetailsView.java
rc/com/android/gallery3d/ui/GridDrawer.java
rc/com/android/gallery3d/ui/HighlightDrawer.java
rc/com/android/gallery3d/ui/IconDrawer.java
rc/com/android/gallery3d/ui/ManageCacheDrawer.java
rc/com/android/gallery3d/ui/MultiLineTexture.java
rc/com/android/gallery3d/ui/SelectionDrawer.java
rc/com/android/gallery3d/ui/SlotView.java
rc/com/android/gallery3d/ui/StringTexture.java
rc/com/android/gallery3d/ui/StripDrawer.java
|
cc1621240b297bf0790ba7e375615693220b596c |
16-Sep-2011 |
Ray Chen <raychen@google.com> |
Merge "Fix 5290260 Unable to rotate left or right to album from Gallery"
|
8e90387256db7b9d89eca2ec25325ee61d817903 |
16-Sep-2011 |
Ray Chen <raychen@google.com> |
Merge "Fix 5290260 Unable to rotate left or right to album from Gallery"
|
59534ca5d85079832f7d32e9aaf28c12cb08b255 |
15-Sep-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
414565a813631da310d0d3225ff6985198858b6d |
15-Sep-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
deff258ea4e5723b351739418919251ae1048e46 |
14-Sep-2011 |
Ray Chen <raychen@google.com> |
Fix 5290260 Unable to rotate left or right to album from Gallery Separate menu operation and sharing options to different methods so execution side is consistent with menu options. Change-Id: Ia0105b333035051e33e9563fb2186cf1a29bc225
rc/com/android/gallery3d/ui/ActionModeHandler.java
|
571c9e1f8d11cc8df2be2f1c79e6ede701a08e41 |
14-Sep-2011 |
Ray Chen <raychen@google.com> |
Fix 5290260 Unable to rotate left or right to album from Gallery Separate menu operation and sharing options to different methods so execution side is consistent with menu options. Change-Id: Ia0105b333035051e33e9563fb2186cf1a29bc225
rc/com/android/gallery3d/ui/ActionModeHandler.java
|
89635c7fded2db6c6d0f06ca9bd4ce7a93d6a93e |
15-Sep-2011 |
Ruei-sung Lin <rslin@google.com> |
parameter change to match api Change-Id: Ia6df0c3a52ee7c6a499a7088a800a2ea9ada1294
rc/com/android/gallery3d/photoeditor/filters/DoodleFilter.java
rc/com/android/gallery3d/photoeditor/filters/FillLightFilter.java
rc/com/android/gallery3d/photoeditor/filters/Filter.java
rc/com/android/gallery3d/photoeditor/filters/GrainFilter.java
rc/com/android/gallery3d/photoeditor/filters/RotateFilter.java
rc/com/android/gallery3d/photoeditor/filters/VignetteFilter.java
|
31aaaa38a75be3b36236ae745d15887d1246a2c5 |
15-Sep-2011 |
Ruei-sung Lin <rslin@google.com> |
parameter change to match api Change-Id: Ia6df0c3a52ee7c6a499a7088a800a2ea9ada1294
rc/com/android/gallery3d/photoeditor/filters/DoodleFilter.java
rc/com/android/gallery3d/photoeditor/filters/FillLightFilter.java
rc/com/android/gallery3d/photoeditor/filters/Filter.java
rc/com/android/gallery3d/photoeditor/filters/GrainFilter.java
rc/com/android/gallery3d/photoeditor/filters/RotateFilter.java
rc/com/android/gallery3d/photoeditor/filters/VignetteFilter.java
|
6dce07c9ddad36e1d0de957534c948f83bc89e85 |
15-Sep-2011 |
Marius Renn <renn@google.com> |
Update for compatibility with Effects API naming change. Part of bugfix 5287103. NOTE: This will fix the build, but temporarily break the Doodle effect on the photo editor. Will check in fixes later. Change-Id: I4a0e1696965c296ac9388c2ee9c49c0bdcaaf5a1
rc/com/android/gallery3d/photoeditor/filters/DoodleFilter.java
|
1753ac9e74621f86f92a53115d23362534f08105 |
15-Sep-2011 |
Marius Renn <renn@google.com> |
Update for compatibility with Effects API naming change. Part of bugfix 5287103. NOTE: This will fix the build, but temporarily break the Doodle effect on the photo editor. Will check in fixes later. Change-Id: I4a0e1696965c296ac9388c2ee9c49c0bdcaaf5a1
rc/com/android/gallery3d/photoeditor/filters/DoodleFilter.java
|
da84812ef3020e39b9268339a6b70e96b292ff3c |
14-Sep-2011 |
Ray Chen <raychen@google.com> |
Merge "Fix 5288270 PTP camera gallery launch, prompts the user to "select all" instead if "Deselect all""
|
d3ec7831835a9f656ff72b05a5b3bc01a8c56a4a |
14-Sep-2011 |
Ray Chen <raychen@google.com> |
Merge "Fix 5288270 PTP camera gallery launch, prompts the user to "select all" instead if "Deselect all""
|
ac8cf1e7a5897d4f7b1db97705fd66fd130a9672 |
14-Sep-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
a7d30efded0ccd04fa1327b7c6a183d2940bbf74 |
14-Sep-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
b80d96b6a9181dc92595671f9ae3a4ebc09d9d50 |
14-Sep-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
3e544dfd4f84483249274a7d2107a68310bdd36b |
14-Sep-2011 |
Chih-Chung Chang <chihchung@google.com> |
Merge "Fix 5196286: Crash if the last clustered album is deleted."
|
765dcecfb188b48705939c8b8ffb332ea4c07d2d |
14-Sep-2011 |
Chih-Chung Chang <chihchung@google.com> |
Merge "Fix 5196286: Crash if the last clustered album is deleted."
|
df483f4f21ae34147d9023ae0297dc8b9792a224 |
10-Sep-2011 |
Ray Chen <raychen@google.com> |
Fix 5288270 PTP camera gallery launch, prompts the user to "select all" instead if "Deselect all" Change-Id: I80bcb347d3d2384e3fd18d2692ab459e0d39e86f
rc/com/android/gallery3d/ui/ActionModeHandler.java
rc/com/android/gallery3d/ui/SelectionManager.java
|
e3c968f892585490b938ea2bcef81f8dca4a81f8 |
10-Sep-2011 |
Ray Chen <raychen@google.com> |
Fix 5288270 PTP camera gallery launch, prompts the user to "select all" instead if "Deselect all" Change-Id: I80bcb347d3d2384e3fd18d2692ab459e0d39e86f
rc/com/android/gallery3d/ui/ActionModeHandler.java
rc/com/android/gallery3d/ui/SelectionManager.java
|
47d6ad0a4025be6b185639596595da7aabeb4f57 |
14-Sep-2011 |
Chih-Chung Chang <chihchung@google.com> |
Fix 5196286: Crash if the last clustered album is deleted. Change-Id: I5e451d3cebd61c31465cba56aebe66cc3a999e2d
rc/com/android/gallery3d/app/AlbumSetDataAdapter.java
|
7cf4777f2d6691b5490b7e8df76d154ea5fd8bf7 |
14-Sep-2011 |
Chih-Chung Chang <chihchung@google.com> |
Fix 5196286: Crash if the last clustered album is deleted. Change-Id: I5e451d3cebd61c31465cba56aebe66cc3a999e2d
rc/com/android/gallery3d/app/AlbumSetDataAdapter.java
|
3312c9b950e7183e45243083186bcd25e87a8338 |
14-Sep-2011 |
Yuli Huang <yuli@google.com> |
Merge "Fix b/5182741: Add 'Edit' title in the action-bar."
|
5eea58a345d419c6eda16e4500413192e78f848f |
14-Sep-2011 |
Yuli Huang <yuli@google.com> |
Merge "Fix b/5182741: Add 'Edit' title in the action-bar."
|
a55d51cfa1165bf6233c1b0c713cd2571860c691 |
14-Sep-2011 |
Yuli Huang <yuli@google.com> |
Merge "Fix b/5182741: Add 'Edit' title in the action-bar."
|
4694f2097b7bd59c050369722ac3ce787c18ccb4 |
14-Sep-2011 |
Owen Lin <owenlin@google.com> |
Merge "Use different UIs for phone's portrait mode in manage offline page."
|
3ff75bc0cc30d621a4c213364efcd62c1f8c5180 |
14-Sep-2011 |
Owen Lin <owenlin@google.com> |
Merge "Use different UIs for phone's portrait mode in manage offline page."
|
c1b2e954f031b0299ebd749b5e3b92e86dd79d18 |
14-Sep-2011 |
Yuli Huang <yuli@google.com> |
Fix b/5182741: Add 'Edit' title in the action-bar. Change-Id: I3964bfcb23818f2f3f8364475f74b401f7eed097
es/layout/photoeditor_main.xml
es/values-sw320dp/photoeditor_dimens.xml
es/values-sw600dp/photoeditor_dimens.xml
es/values-sw800dp/photoeditor_dimens.xml
|
72963d1288aa082e8a0497cb7acc1c15d95b0233 |
14-Sep-2011 |
Yuli Huang <yuli@google.com> |
Fix b/5182741: Add 'Edit' title in the action-bar. Change-Id: I3964bfcb23818f2f3f8364475f74b401f7eed097
rc/com/android/gallery3d/photoeditor/ActionBar.java
|
8cb3c51b16dc4aa9aea1a252eb59d6b5cbb33af3 |
14-Sep-2011 |
Yuli Huang <yuli@google.com> |
Fix b/5182741: Add 'Edit' title in the action-bar. Change-Id: I3964bfcb23818f2f3f8364475f74b401f7eed097
es/layout/photoeditor_main.xml
es/values-sw320dp/photoeditor_dimens.xml
es/values-sw600dp/photoeditor_dimens.xml
es/values-sw800dp/photoeditor_dimens.xml
rc/com/android/gallery3d/photoeditor/ActionBar.java
|
6eb768fc3012ee427f267d1b5312669afea9624b |
14-Sep-2011 |
Owen Lin <owenlin@google.com> |
Merge "Fix picasa images rotate incorrectly."
|
2b40d7c0857117f6276886b9c67bca596886d88c |
14-Sep-2011 |
Owen Lin <owenlin@google.com> |
Merge "Fix picasa images rotate incorrectly."
|
bc552bd908babd43087dba4638ea974892264c30 |
09-Sep-2011 |
Owen Lin <owenlin@google.com> |
Use different UIs for phone's portrait mode in manage offline page. fix: 5100503 The original UI design is not suitable for phone's portait mode. I move the UIs from GL view to android View to get better support. Change-Id: Ice5f536129f66b51cdaf4db1be750be7bc072c7f
es/drawable-hdpi/ic_manage_pin_small.png
es/drawable-mdpi/ic_manage_pin_small.png
es/layout-w480dp/manage_offline_bar.xml
es/layout/main.xml
es/layout/manage_offline_bar.xml
rc/com/android/gallery3d/ui/ProgressBar.java
|
5f01ca642b0edce21a6941c4c7a4b41190773e13 |
09-Sep-2011 |
Owen Lin <owenlin@google.com> |
Use different UIs for phone's portrait mode in manage offline page. fix: 5100503 The original UI design is not suitable for phone's portait mode. I move the UIs from GL view to android View to get better support. Change-Id: Ice5f536129f66b51cdaf4db1be750be7bc072c7f
rc/com/android/gallery3d/app/AbstractGalleryActivity.java
rc/com/android/gallery3d/app/ActivityState.java
rc/com/android/gallery3d/app/ManageCachePage.java
rc/com/android/gallery3d/app/StateManager.java
rc/com/android/gallery3d/ui/CacheBarView.java
rc/com/android/gallery3d/ui/CacheStorageUsageInfo.java
rc/com/android/gallery3d/ui/Label.java
rc/com/android/gallery3d/ui/ProgressBar.java
rc/com/android/gallery3d/ui/TextButton.java
|
8e565703e8d482421714383a8ad40a67929ce2da |
09-Sep-2011 |
Owen Lin <owenlin@google.com> |
Use different UIs for phone's portrait mode in manage offline page. fix: 5100503 The original UI design is not suitable for phone's portait mode. I move the UIs from GL view to android View to get better support. Change-Id: Ice5f536129f66b51cdaf4db1be750be7bc072c7f
es/drawable-hdpi/ic_manage_pin_small.png
es/drawable-mdpi/ic_manage_pin_small.png
es/layout-w480dp/manage_offline_bar.xml
es/layout/main.xml
es/layout/manage_offline_bar.xml
rc/com/android/gallery3d/app/AbstractGalleryActivity.java
rc/com/android/gallery3d/app/ActivityState.java
rc/com/android/gallery3d/app/ManageCachePage.java
rc/com/android/gallery3d/app/StateManager.java
rc/com/android/gallery3d/ui/CacheBarView.java
rc/com/android/gallery3d/ui/CacheStorageUsageInfo.java
rc/com/android/gallery3d/ui/Label.java
rc/com/android/gallery3d/ui/ProgressBar.java
rc/com/android/gallery3d/ui/TextButton.java
|
36064d1d4450494983652a5264a5d27cab454eed |
13-Sep-2011 |
Chih-Chung Chang <chihchung@google.com> |
Fix 5280798: Click on filmstrip during swiping causes crash. After swiping animation finishes we move to the previous picture. But if during the animation the user clicks the first thumbnail on the filmstrip, we will have no previous picture to move to. Now disallow clicking on the filmstrip during the swiping animation. Change-Id: Ie910c346cbf35543fedb6812b04c8e78faab0d0f
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/app/SinglePhotoDataAdapter.java
rc/com/android/gallery3d/ui/FilmStripView.java
rc/com/android/gallery3d/ui/PhotoView.java
|
3a54b9ae67eb7b38f19ea0bdeeef26efc0a1afa1 |
13-Sep-2011 |
Chih-Chung Chang <chihchung@google.com> |
Fix 5280798: Click on filmstrip during swiping causes crash. After swiping animation finishes we move to the previous picture. But if during the animation the user clicks the first thumbnail on the filmstrip, we will have no previous picture to move to. Now disallow clicking on the filmstrip during the swiping animation. Change-Id: Ie910c346cbf35543fedb6812b04c8e78faab0d0f
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/app/SinglePhotoDataAdapter.java
rc/com/android/gallery3d/ui/FilmStripView.java
rc/com/android/gallery3d/ui/PhotoView.java
|
464cda5d29aad903d56984ec4175e688be240452 |
13-Sep-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
0996d17813260711cd564e1335d953eb5d964d78 |
13-Sep-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
a9152a05bddd69628a3fd57e8b2c05976d2e3aa8 |
13-Sep-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
92154677af88fd8c04074558209c26ec069c3653 |
13-Sep-2011 |
Owen Lin <owenlin@google.com> |
Change theme for GallerySettings. fix: 5290466 Change-Id: Ib6051f6f8e83d077df029b938b77d3619a4653ed
ndroidManifest.xml
|
21cd97ffd2367f6ebb371a81b4a6137a5ed29fd4 |
13-Sep-2011 |
Owen Lin <owenlin@google.com> |
Change theme for GallerySettings. fix: 5290466 Change-Id: Ib6051f6f8e83d077df029b938b77d3619a4653ed
ndroidManifest.xml
|
e0c32157e3aabdb8f78692d777232eb30a2513e2 |
13-Sep-2011 |
Chih-Chung Chang <chihchung@google.com> |
Merge "Fix 5058723: Don't show screennails of videos in slide show"
|
6af98c9e0f4125d658b10303a01adef6a5a9e8f1 |
13-Sep-2011 |
Chih-Chung Chang <chihchung@google.com> |
Merge "Fix 5058723: Don't show screennails of videos in slide show"
|
346003ea5005fb2dacbc08b8c34230ae6e33e034 |
13-Sep-2011 |
Chih-Chung Chang <chihchung@google.com> |
Merge "Fix 5284804: Kill 3D tilt effect based on device rotation."
|
2cd8cc06b813cd8d55010f91b78e30e096b2681f |
13-Sep-2011 |
Chih-Chung Chang <chihchung@google.com> |
Merge "Fix 5284804: Kill 3D tilt effect based on device rotation."
|
96309a4205f69bd79a10d7d149a11e8b8a846acd |
09-Sep-2011 |
Chih-Chung Chang <chihchung@google.com> |
Fix 5058723: Don't show screennails of videos in slide show Change-Id: I25c3ee3f1ae69c9c54c1e579a6469ee20f1774be
rc/com/android/gallery3d/app/SlideshowDataAdapter.java
rc/com/android/gallery3d/app/SlideshowPage.java
|
78979fc21d1e1111a504cc07ae6b0e0bc4d61447 |
09-Sep-2011 |
Chih-Chung Chang <chihchung@google.com> |
Fix 5058723: Don't show screennails of videos in slide show Change-Id: I25c3ee3f1ae69c9c54c1e579a6469ee20f1774be
rc/com/android/gallery3d/app/SlideshowDataAdapter.java
rc/com/android/gallery3d/app/SlideshowPage.java
|
0513a9e07c161a2abec9a3598935cd31c7824ecc |
13-Sep-2011 |
Yuli Huang <yuli@google.com> |
Merge "Fix b/4643148: Make PhotoEditor integrated into Gallery."
|
c34f3531112a74b659a0247bf779f93205df05d9 |
13-Sep-2011 |
Yuli Huang <yuli@google.com> |
Merge "Fix b/4643148: Make PhotoEditor integrated into Gallery."
|
2fc88b09bebe78917efb371274d43220b2bd86a7 |
13-Sep-2011 |
Chih-Chung Chang <chihchung@google.com> |
Fix 5284804: Kill 3D tilt effect based on device rotation. Change-Id: Ic8a81d591e42fc97b6ca8eca2b6c66cd90f74cdc
rc/com/android/gallery3d/app/EyePosition.java
|
fd06154c0d51fd8686ffec3955e54f5c18e87da0 |
13-Sep-2011 |
Chih-Chung Chang <chihchung@google.com> |
Fix 5284804: Kill 3D tilt effect based on device rotation. Change-Id: Ic8a81d591e42fc97b6ca8eca2b6c66cd90f74cdc
rc/com/android/gallery3d/app/EyePosition.java
|
46027feb3b117b935f7af430946b8d9271784fd3 |
12-Sep-2011 |
Eric Fischer <enf@google.com> |
Import revised translations. Change-Id: Ib0e2131240074ef02677a61acfd796f8900db9c6
es/values-af/photoeditor_strings.xml
es/values-af/strings.xml
es/values-am/photoeditor_strings.xml
es/values-am/strings.xml
es/values-ar/photoeditor_strings.xml
es/values-ar/strings.xml
es/values-bg/photoeditor_strings.xml
es/values-bg/strings.xml
es/values-ca/photoeditor_strings.xml
es/values-ca/strings.xml
es/values-cs/photoeditor_strings.xml
es/values-cs/strings.xml
es/values-da/photoeditor_strings.xml
es/values-da/strings.xml
es/values-de/photoeditor_strings.xml
es/values-de/strings.xml
es/values-el/photoeditor_strings.xml
es/values-el/strings.xml
es/values-en-rGB/photoeditor_strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/photoeditor_strings.xml
es/values-es-rUS/strings.xml
es/values-es/photoeditor_strings.xml
es/values-es/strings.xml
es/values-fa/photoeditor_strings.xml
es/values-fa/strings.xml
es/values-fi/photoeditor_strings.xml
es/values-fi/strings.xml
es/values-fr/photoeditor_strings.xml
es/values-fr/strings.xml
es/values-hr/photoeditor_strings.xml
es/values-hr/strings.xml
es/values-hu/photoeditor_strings.xml
es/values-hu/strings.xml
es/values-in/photoeditor_strings.xml
es/values-in/strings.xml
es/values-it/photoeditor_strings.xml
es/values-it/strings.xml
es/values-iw/photoeditor_strings.xml
es/values-iw/strings.xml
es/values-ja/photoeditor_strings.xml
es/values-ja/strings.xml
es/values-ko/photoeditor_strings.xml
es/values-ko/strings.xml
es/values-lt/photoeditor_strings.xml
es/values-lt/strings.xml
es/values-lv/photoeditor_strings.xml
es/values-lv/strings.xml
es/values-ms/photoeditor_strings.xml
es/values-ms/strings.xml
es/values-nb/photoeditor_strings.xml
es/values-nb/strings.xml
es/values-nl/photoeditor_strings.xml
es/values-nl/strings.xml
es/values-pl/photoeditor_strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/photoeditor_strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/photoeditor_strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/photoeditor_strings.xml
es/values-ro/strings.xml
es/values-ru/photoeditor_strings.xml
es/values-ru/strings.xml
es/values-sk/photoeditor_strings.xml
es/values-sk/strings.xml
es/values-sl/photoeditor_strings.xml
es/values-sl/strings.xml
es/values-sr/photoeditor_strings.xml
es/values-sr/strings.xml
es/values-sv/photoeditor_strings.xml
es/values-sv/strings.xml
es/values-sw/photoeditor_strings.xml
es/values-sw/strings.xml
es/values-th/photoeditor_strings.xml
es/values-th/strings.xml
es/values-tl/photoeditor_strings.xml
es/values-tl/strings.xml
es/values-tr/photoeditor_strings.xml
es/values-tr/strings.xml
es/values-uk/photoeditor_strings.xml
es/values-uk/strings.xml
es/values-vi/photoeditor_strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/photoeditor_strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/photoeditor_strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/photoeditor_strings.xml
es/values-zu/strings.xml
|
6be3e0e0e3e506d0bdb1e5b94256bc73ce225e2e |
12-Sep-2011 |
Eric Fischer <enf@google.com> |
Import revised translations. Change-Id: Ib0e2131240074ef02677a61acfd796f8900db9c6
es/values-af/photoeditor_strings.xml
es/values-af/strings.xml
es/values-am/photoeditor_strings.xml
es/values-am/strings.xml
es/values-ar/photoeditor_strings.xml
es/values-ar/strings.xml
es/values-bg/photoeditor_strings.xml
es/values-bg/strings.xml
es/values-ca/photoeditor_strings.xml
es/values-ca/strings.xml
es/values-cs/photoeditor_strings.xml
es/values-cs/strings.xml
es/values-da/photoeditor_strings.xml
es/values-da/strings.xml
es/values-de/photoeditor_strings.xml
es/values-de/strings.xml
es/values-el/photoeditor_strings.xml
es/values-el/strings.xml
es/values-en-rGB/photoeditor_strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/photoeditor_strings.xml
es/values-es-rUS/strings.xml
es/values-es/photoeditor_strings.xml
es/values-es/strings.xml
es/values-fa/photoeditor_strings.xml
es/values-fa/strings.xml
es/values-fi/photoeditor_strings.xml
es/values-fi/strings.xml
es/values-fr/photoeditor_strings.xml
es/values-fr/strings.xml
es/values-hr/photoeditor_strings.xml
es/values-hr/strings.xml
es/values-hu/photoeditor_strings.xml
es/values-hu/strings.xml
es/values-in/photoeditor_strings.xml
es/values-in/strings.xml
es/values-it/photoeditor_strings.xml
es/values-it/strings.xml
es/values-iw/photoeditor_strings.xml
es/values-iw/strings.xml
es/values-ja/photoeditor_strings.xml
es/values-ja/strings.xml
es/values-ko/photoeditor_strings.xml
es/values-ko/strings.xml
es/values-lt/photoeditor_strings.xml
es/values-lt/strings.xml
es/values-lv/photoeditor_strings.xml
es/values-lv/strings.xml
es/values-ms/photoeditor_strings.xml
es/values-ms/strings.xml
es/values-nb/photoeditor_strings.xml
es/values-nb/strings.xml
es/values-nl/photoeditor_strings.xml
es/values-nl/strings.xml
es/values-pl/photoeditor_strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/photoeditor_strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/photoeditor_strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/photoeditor_strings.xml
es/values-ro/strings.xml
es/values-ru/photoeditor_strings.xml
es/values-ru/strings.xml
es/values-sk/photoeditor_strings.xml
es/values-sk/strings.xml
es/values-sl/photoeditor_strings.xml
es/values-sl/strings.xml
es/values-sr/photoeditor_strings.xml
es/values-sr/strings.xml
es/values-sv/photoeditor_strings.xml
es/values-sv/strings.xml
es/values-sw/photoeditor_strings.xml
es/values-sw/strings.xml
es/values-th/photoeditor_strings.xml
es/values-th/strings.xml
es/values-tl/photoeditor_strings.xml
es/values-tl/strings.xml
es/values-tr/photoeditor_strings.xml
es/values-tr/strings.xml
es/values-uk/photoeditor_strings.xml
es/values-uk/strings.xml
es/values-vi/photoeditor_strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/photoeditor_strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/photoeditor_strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/photoeditor_strings.xml
es/values-zu/strings.xml
|
e47b9e56e9c91c3b104bf69df29d066482514d9a |
12-Sep-2011 |
Eric Fischer <enf@google.com> |
Merge "Import revised translations."
|
276349f9e5562b0d346b323f85dc790377bf386f |
12-Sep-2011 |
Eric Fischer <enf@google.com> |
Merge "Import revised translations."
|
e684dcdf05c40d5875331be5cb2bd1ec998fedf8 |
12-Sep-2011 |
Eric Fischer <enf@google.com> |
Import revised translations. Change-Id: Ica26d038fb954438100062d2bb451eacfaa4bf90
es/values-ar/strings.xml
es/values-de/strings.xml
es/values-fr/strings.xml
es/values-nb/strings.xml
es/values-pt-rPT/strings.xml
es/values-ru/strings.xml
es/values-sw/strings.xml
es/values-tr/strings.xml
|
201855a79cb9c5131a6cea057f4add500b54d54c |
12-Sep-2011 |
Eric Fischer <enf@google.com> |
Import revised translations. Change-Id: Ica26d038fb954438100062d2bb451eacfaa4bf90
es/values-ar/strings.xml
es/values-de/strings.xml
es/values-fr/strings.xml
es/values-nb/strings.xml
es/values-pt-rPT/strings.xml
es/values-ru/strings.xml
es/values-sw/strings.xml
es/values-tr/strings.xml
|
00e51f972847eb9922913554e64cdd6c15fba793 |
12-Sep-2011 |
Yuli Huang <yuli@google.com> |
Fix b/4643148: Make PhotoEditor integrated into Gallery. 1. Move PhotoEditor code/resources into Gallery for single apk. 2. Change PhotoEditor package to com.android.gallery3d.photoeditor. 3. Rename PhotoEditor resources to avoid mess up Gallery resources. 4. Move Doodle effect from fix-effects to color-effects. 5. Update PhotoEditor bottom action-bar background. Change-Id: I1a2f7d27d89a14fe6a0435575b993ed8b75e6bf4
ndroidManifest.xml
|
ab5055ac921f194f4d43f173881d17cf76719efd |
12-Sep-2011 |
Yuli Huang <yuli@google.com> |
Fix b/4643148: Make PhotoEditor integrated into Gallery. 1. Move PhotoEditor code/resources into Gallery for single apk. 2. Change PhotoEditor package to com.android.gallery3d.photoeditor. 3. Rename PhotoEditor resources to avoid mess up Gallery resources. 4. Move Doodle effect from fix-effects to color-effects. 5. Update PhotoEditor bottom action-bar background. Change-Id: I1a2f7d27d89a14fe6a0435575b993ed8b75e6bf4
rc/com/android/gallery3d/photoeditor/ActionBar.java
rc/com/android/gallery3d/photoeditor/BitmapUtils.java
rc/com/android/gallery3d/photoeditor/EffectsBar.java
rc/com/android/gallery3d/photoeditor/FilterStack.java
rc/com/android/gallery3d/photoeditor/LoadScreennailTask.java
rc/com/android/gallery3d/photoeditor/OnDoneBitmapCallback.java
rc/com/android/gallery3d/photoeditor/OnDoneCallback.java
rc/com/android/gallery3d/photoeditor/Photo.java
rc/com/android/gallery3d/photoeditor/PhotoEditor.java
rc/com/android/gallery3d/photoeditor/PhotoView.java
rc/com/android/gallery3d/photoeditor/RendererUtils.java
rc/com/android/gallery3d/photoeditor/SaveCopyTask.java
rc/com/android/gallery3d/photoeditor/SpinnerProgressDialog.java
rc/com/android/gallery3d/photoeditor/Toolbar.java
rc/com/android/gallery3d/photoeditor/ToolbarIdleHandler.java
rc/com/android/gallery3d/photoeditor/actions/AbstractSeekBar.java
rc/com/android/gallery3d/photoeditor/actions/AutoFixAction.java
rc/com/android/gallery3d/photoeditor/actions/ColorSeekBar.java
rc/com/android/gallery3d/photoeditor/actions/ColorTemperatureAction.java
rc/com/android/gallery3d/photoeditor/actions/CropAction.java
rc/com/android/gallery3d/photoeditor/actions/CropView.java
rc/com/android/gallery3d/photoeditor/actions/CrossProcessAction.java
rc/com/android/gallery3d/photoeditor/actions/DocumentaryAction.java
rc/com/android/gallery3d/photoeditor/actions/DoodleAction.java
rc/com/android/gallery3d/photoeditor/actions/DoodlePaint.java
rc/com/android/gallery3d/photoeditor/actions/DoodleView.java
rc/com/android/gallery3d/photoeditor/actions/DuotoneAction.java
rc/com/android/gallery3d/photoeditor/actions/EffectAction.java
rc/com/android/gallery3d/photoeditor/actions/EffectToolFactory.java
rc/com/android/gallery3d/photoeditor/actions/FillLightAction.java
rc/com/android/gallery3d/photoeditor/actions/FisheyeAction.java
rc/com/android/gallery3d/photoeditor/actions/FlipAction.java
rc/com/android/gallery3d/photoeditor/actions/FullscreenToolView.java
rc/com/android/gallery3d/photoeditor/actions/GrainAction.java
rc/com/android/gallery3d/photoeditor/actions/GrayscaleAction.java
rc/com/android/gallery3d/photoeditor/actions/HighlightAction.java
rc/com/android/gallery3d/photoeditor/actions/LomoishAction.java
rc/com/android/gallery3d/photoeditor/actions/NegativeAction.java
rc/com/android/gallery3d/photoeditor/actions/PosterizeAction.java
rc/com/android/gallery3d/photoeditor/actions/RedEyeAction.java
rc/com/android/gallery3d/photoeditor/actions/RotateAction.java
rc/com/android/gallery3d/photoeditor/actions/RotateView.java
rc/com/android/gallery3d/photoeditor/actions/SaturationAction.java
rc/com/android/gallery3d/photoeditor/actions/ScaleSeekBar.java
rc/com/android/gallery3d/photoeditor/actions/SepiaAction.java
rc/com/android/gallery3d/photoeditor/actions/ShadowAction.java
rc/com/android/gallery3d/photoeditor/actions/SharpenAction.java
rc/com/android/gallery3d/photoeditor/actions/StraightenAction.java
rc/com/android/gallery3d/photoeditor/actions/TintAction.java
rc/com/android/gallery3d/photoeditor/actions/TouchView.java
rc/com/android/gallery3d/photoeditor/actions/VignetteAction.java
rc/com/android/gallery3d/photoeditor/filters/AutoFixFilter.java
rc/com/android/gallery3d/photoeditor/filters/ColorTemperatureFilter.java
rc/com/android/gallery3d/photoeditor/filters/CropFilter.java
rc/com/android/gallery3d/photoeditor/filters/CrossProcessFilter.java
rc/com/android/gallery3d/photoeditor/filters/DocumentaryFilter.java
rc/com/android/gallery3d/photoeditor/filters/DoodleFilter.java
rc/com/android/gallery3d/photoeditor/filters/DuotoneFilter.java
rc/com/android/gallery3d/photoeditor/filters/FillLightFilter.java
rc/com/android/gallery3d/photoeditor/filters/Filter.java
rc/com/android/gallery3d/photoeditor/filters/FisheyeFilter.java
rc/com/android/gallery3d/photoeditor/filters/FlipFilter.java
rc/com/android/gallery3d/photoeditor/filters/GrainFilter.java
rc/com/android/gallery3d/photoeditor/filters/GrayscaleFilter.java
rc/com/android/gallery3d/photoeditor/filters/HighlightFilter.java
rc/com/android/gallery3d/photoeditor/filters/LomoishFilter.java
rc/com/android/gallery3d/photoeditor/filters/NegativeFilter.java
rc/com/android/gallery3d/photoeditor/filters/PosterizeFilter.java
rc/com/android/gallery3d/photoeditor/filters/RedEyeFilter.java
rc/com/android/gallery3d/photoeditor/filters/RotateFilter.java
rc/com/android/gallery3d/photoeditor/filters/SaturationFilter.java
rc/com/android/gallery3d/photoeditor/filters/SepiaFilter.java
rc/com/android/gallery3d/photoeditor/filters/ShadowFilter.java
rc/com/android/gallery3d/photoeditor/filters/SharpenFilter.java
rc/com/android/gallery3d/photoeditor/filters/StraightenFilter.java
rc/com/android/gallery3d/photoeditor/filters/TintFilter.java
rc/com/android/gallery3d/photoeditor/filters/VignetteFilter.java
|
efd1db011b7c85ffd590ec80f535d95070d4371e |
12-Sep-2011 |
Yuli Huang <yuli@google.com> |
Fix b/4643148: Make PhotoEditor integrated into Gallery. 1. Move PhotoEditor code/resources into Gallery for single apk. 2. Change PhotoEditor package to com.android.gallery3d.photoeditor. 3. Rename PhotoEditor resources to avoid mess up Gallery resources. 4. Move Doodle effect from fix-effects to color-effects. 5. Update PhotoEditor bottom action-bar background. Change-Id: I1a2f7d27d89a14fe6a0435575b993ed8b75e6bf4
es/anim/photoeditor_fade_in.xml
es/anim/photoeditor_fade_out.xml
es/drawable/photoeditor_actionbar_translucent.9.png
es/drawable/photoeditor_actionbar_translucent_bottom.9.png
es/drawable/photoeditor_arrow_back.png
es/drawable/photoeditor_artistic.png
es/drawable/photoeditor_color.png
es/drawable/photoeditor_effect_autofix.png
es/drawable/photoeditor_effect_crop.png
es/drawable/photoeditor_effect_crossprocess.png
es/drawable/photoeditor_effect_documentary.png
es/drawable/photoeditor_effect_doodle.png
es/drawable/photoeditor_effect_duotone.png
es/drawable/photoeditor_effect_filllight.png
es/drawable/photoeditor_effect_fisheye.png
es/drawable/photoeditor_effect_flip.png
es/drawable/photoeditor_effect_grain.png
es/drawable/photoeditor_effect_grayscale.png
es/drawable/photoeditor_effect_highlight.png
es/drawable/photoeditor_effect_lomoish.png
es/drawable/photoeditor_effect_negative.png
es/drawable/photoeditor_effect_posterize.png
es/drawable/photoeditor_effect_redeye.png
es/drawable/photoeditor_effect_rotate.png
es/drawable/photoeditor_effect_saturation.png
es/drawable/photoeditor_effect_sepia.png
es/drawable/photoeditor_effect_shadow.png
es/drawable/photoeditor_effect_sharpen.png
es/drawable/photoeditor_effect_straighten.png
es/drawable/photoeditor_effect_temperature.png
es/drawable/photoeditor_effect_tint.png
es/drawable/photoeditor_effect_vignette.png
es/drawable/photoeditor_exposure.png
es/drawable/photoeditor_fix.png
es/drawable/photoeditor_redo.png
es/drawable/photoeditor_scale_seekbar_color.9.png
es/drawable/photoeditor_scale_seekbar_filllight.9.png
es/drawable/photoeditor_scale_seekbar_generic.9.png
es/drawable/photoeditor_scale_seekbar_highlight.9.png
es/drawable/photoeditor_scale_seekbar_shadow.9.png
es/drawable/photoeditor_seekbar_thumb.png
es/drawable/photoeditor_toggle_button_background.xml
es/drawable/photoeditor_toggle_button_highlight.9.png
es/drawable/photoeditor_undo.png
es/layout/photoeditor_color_seekbar.xml
es/layout/photoeditor_crop_view.xml
es/layout/photoeditor_doodle_view.xml
es/layout/photoeditor_effect_tool_panel.xml
es/layout/photoeditor_effects_artistic.xml
es/layout/photoeditor_effects_color.xml
es/layout/photoeditor_effects_exposure.xml
es/layout/photoeditor_effects_fix.xml
es/layout/photoeditor_effects_gallery.xml
es/layout/photoeditor_main.xml
es/layout/photoeditor_rotate_view.xml
es/layout/photoeditor_scale_seekbar.xml
es/layout/photoeditor_touch_view.xml
es/values-sw320dp/photoeditor_dimens.xml
es/values-sw600dp/photoeditor_dimens.xml
es/values-sw800dp/photoeditor_dimens.xml
es/values/photoeditor_arrays.xml
es/values/photoeditor_colors.xml
es/values/photoeditor_styles.xml
rc/com/android/gallery3d/photoeditor/SpinnerProgressDialog.java
|
6a12ad70df5da5052a8381e2cdda79e6a314cee9 |
12-Sep-2011 |
Yuli Huang <yuli@google.com> |
Fix b/4643148: Make PhotoEditor integrated into Gallery. 1. Move PhotoEditor code/resources into Gallery for single apk. 2. Change PhotoEditor package to com.android.gallery3d.photoeditor. 3. Rename PhotoEditor resources to avoid mess up Gallery resources. 4. Move Doodle effect from fix-effects to color-effects. 5. Update PhotoEditor bottom action-bar background. Change-Id: I1a2f7d27d89a14fe6a0435575b993ed8b75e6bf4
ndroidManifest.xml
es/anim/photoeditor_fade_in.xml
es/anim/photoeditor_fade_out.xml
es/drawable/photoeditor_actionbar_translucent.9.png
es/drawable/photoeditor_actionbar_translucent_bottom.9.png
es/drawable/photoeditor_arrow_back.png
es/drawable/photoeditor_artistic.png
es/drawable/photoeditor_color.png
es/drawable/photoeditor_effect_autofix.png
es/drawable/photoeditor_effect_crop.png
es/drawable/photoeditor_effect_crossprocess.png
es/drawable/photoeditor_effect_documentary.png
es/drawable/photoeditor_effect_doodle.png
es/drawable/photoeditor_effect_duotone.png
es/drawable/photoeditor_effect_filllight.png
es/drawable/photoeditor_effect_fisheye.png
es/drawable/photoeditor_effect_flip.png
es/drawable/photoeditor_effect_grain.png
es/drawable/photoeditor_effect_grayscale.png
es/drawable/photoeditor_effect_highlight.png
es/drawable/photoeditor_effect_lomoish.png
es/drawable/photoeditor_effect_negative.png
es/drawable/photoeditor_effect_posterize.png
es/drawable/photoeditor_effect_redeye.png
es/drawable/photoeditor_effect_rotate.png
es/drawable/photoeditor_effect_saturation.png
es/drawable/photoeditor_effect_sepia.png
es/drawable/photoeditor_effect_shadow.png
es/drawable/photoeditor_effect_sharpen.png
es/drawable/photoeditor_effect_straighten.png
es/drawable/photoeditor_effect_temperature.png
es/drawable/photoeditor_effect_tint.png
es/drawable/photoeditor_effect_vignette.png
es/drawable/photoeditor_exposure.png
es/drawable/photoeditor_fix.png
es/drawable/photoeditor_redo.png
es/drawable/photoeditor_scale_seekbar_color.9.png
es/drawable/photoeditor_scale_seekbar_filllight.9.png
es/drawable/photoeditor_scale_seekbar_generic.9.png
es/drawable/photoeditor_scale_seekbar_highlight.9.png
es/drawable/photoeditor_scale_seekbar_shadow.9.png
es/drawable/photoeditor_seekbar_thumb.png
es/drawable/photoeditor_toggle_button_background.xml
es/drawable/photoeditor_toggle_button_highlight.9.png
es/drawable/photoeditor_undo.png
es/layout/photoeditor_color_seekbar.xml
es/layout/photoeditor_crop_view.xml
es/layout/photoeditor_doodle_view.xml
es/layout/photoeditor_effect_tool_panel.xml
es/layout/photoeditor_effects_artistic.xml
es/layout/photoeditor_effects_color.xml
es/layout/photoeditor_effects_exposure.xml
es/layout/photoeditor_effects_fix.xml
es/layout/photoeditor_effects_gallery.xml
es/layout/photoeditor_main.xml
es/layout/photoeditor_rotate_view.xml
es/layout/photoeditor_scale_seekbar.xml
es/layout/photoeditor_touch_view.xml
es/values-sw320dp/photoeditor_dimens.xml
es/values-sw600dp/photoeditor_dimens.xml
es/values-sw800dp/photoeditor_dimens.xml
es/values/photoeditor_arrays.xml
es/values/photoeditor_colors.xml
es/values/photoeditor_styles.xml
rc/com/android/gallery3d/photoeditor/ActionBar.java
rc/com/android/gallery3d/photoeditor/BitmapUtils.java
rc/com/android/gallery3d/photoeditor/EffectsBar.java
rc/com/android/gallery3d/photoeditor/FilterStack.java
rc/com/android/gallery3d/photoeditor/LoadScreennailTask.java
rc/com/android/gallery3d/photoeditor/OnDoneBitmapCallback.java
rc/com/android/gallery3d/photoeditor/OnDoneCallback.java
rc/com/android/gallery3d/photoeditor/Photo.java
rc/com/android/gallery3d/photoeditor/PhotoEditor.java
rc/com/android/gallery3d/photoeditor/PhotoView.java
rc/com/android/gallery3d/photoeditor/RendererUtils.java
rc/com/android/gallery3d/photoeditor/SaveCopyTask.java
rc/com/android/gallery3d/photoeditor/SpinnerProgressDialog.java
rc/com/android/gallery3d/photoeditor/Toolbar.java
rc/com/android/gallery3d/photoeditor/ToolbarIdleHandler.java
rc/com/android/gallery3d/photoeditor/actions/AbstractSeekBar.java
rc/com/android/gallery3d/photoeditor/actions/AutoFixAction.java
rc/com/android/gallery3d/photoeditor/actions/ColorSeekBar.java
rc/com/android/gallery3d/photoeditor/actions/ColorTemperatureAction.java
rc/com/android/gallery3d/photoeditor/actions/CropAction.java
rc/com/android/gallery3d/photoeditor/actions/CropView.java
rc/com/android/gallery3d/photoeditor/actions/CrossProcessAction.java
rc/com/android/gallery3d/photoeditor/actions/DocumentaryAction.java
rc/com/android/gallery3d/photoeditor/actions/DoodleAction.java
rc/com/android/gallery3d/photoeditor/actions/DoodlePaint.java
rc/com/android/gallery3d/photoeditor/actions/DoodleView.java
rc/com/android/gallery3d/photoeditor/actions/DuotoneAction.java
rc/com/android/gallery3d/photoeditor/actions/EffectAction.java
rc/com/android/gallery3d/photoeditor/actions/EffectToolFactory.java
rc/com/android/gallery3d/photoeditor/actions/FillLightAction.java
rc/com/android/gallery3d/photoeditor/actions/FisheyeAction.java
rc/com/android/gallery3d/photoeditor/actions/FlipAction.java
rc/com/android/gallery3d/photoeditor/actions/FullscreenToolView.java
rc/com/android/gallery3d/photoeditor/actions/GrainAction.java
rc/com/android/gallery3d/photoeditor/actions/GrayscaleAction.java
rc/com/android/gallery3d/photoeditor/actions/HighlightAction.java
rc/com/android/gallery3d/photoeditor/actions/LomoishAction.java
rc/com/android/gallery3d/photoeditor/actions/NegativeAction.java
rc/com/android/gallery3d/photoeditor/actions/PosterizeAction.java
rc/com/android/gallery3d/photoeditor/actions/RedEyeAction.java
rc/com/android/gallery3d/photoeditor/actions/RotateAction.java
rc/com/android/gallery3d/photoeditor/actions/RotateView.java
rc/com/android/gallery3d/photoeditor/actions/SaturationAction.java
rc/com/android/gallery3d/photoeditor/actions/ScaleSeekBar.java
rc/com/android/gallery3d/photoeditor/actions/SepiaAction.java
rc/com/android/gallery3d/photoeditor/actions/ShadowAction.java
rc/com/android/gallery3d/photoeditor/actions/SharpenAction.java
rc/com/android/gallery3d/photoeditor/actions/StraightenAction.java
rc/com/android/gallery3d/photoeditor/actions/TintAction.java
rc/com/android/gallery3d/photoeditor/actions/TouchView.java
rc/com/android/gallery3d/photoeditor/actions/VignetteAction.java
rc/com/android/gallery3d/photoeditor/filters/AutoFixFilter.java
rc/com/android/gallery3d/photoeditor/filters/ColorTemperatureFilter.java
rc/com/android/gallery3d/photoeditor/filters/CropFilter.java
rc/com/android/gallery3d/photoeditor/filters/CrossProcessFilter.java
rc/com/android/gallery3d/photoeditor/filters/DocumentaryFilter.java
rc/com/android/gallery3d/photoeditor/filters/DoodleFilter.java
rc/com/android/gallery3d/photoeditor/filters/DuotoneFilter.java
rc/com/android/gallery3d/photoeditor/filters/FillLightFilter.java
rc/com/android/gallery3d/photoeditor/filters/Filter.java
rc/com/android/gallery3d/photoeditor/filters/FisheyeFilter.java
rc/com/android/gallery3d/photoeditor/filters/FlipFilter.java
rc/com/android/gallery3d/photoeditor/filters/GrainFilter.java
rc/com/android/gallery3d/photoeditor/filters/GrayscaleFilter.java
rc/com/android/gallery3d/photoeditor/filters/HighlightFilter.java
rc/com/android/gallery3d/photoeditor/filters/LomoishFilter.java
rc/com/android/gallery3d/photoeditor/filters/NegativeFilter.java
rc/com/android/gallery3d/photoeditor/filters/PosterizeFilter.java
rc/com/android/gallery3d/photoeditor/filters/RedEyeFilter.java
rc/com/android/gallery3d/photoeditor/filters/RotateFilter.java
rc/com/android/gallery3d/photoeditor/filters/SaturationFilter.java
rc/com/android/gallery3d/photoeditor/filters/SepiaFilter.java
rc/com/android/gallery3d/photoeditor/filters/ShadowFilter.java
rc/com/android/gallery3d/photoeditor/filters/SharpenFilter.java
rc/com/android/gallery3d/photoeditor/filters/StraightenFilter.java
rc/com/android/gallery3d/photoeditor/filters/TintFilter.java
rc/com/android/gallery3d/photoeditor/filters/VignetteFilter.java
|
c5de01adfefd310ef212cf83acba4b16a6354bd9 |
12-Sep-2011 |
Justin Ho <justinho@google.com> |
Merge "Updated Gallery2 widget dimens Bug: 5278970"
|
2c704be3f593ece6ef5b96ff166f126f4afc9d23 |
12-Sep-2011 |
Justin Ho <justinho@google.com> |
Merge "Updated Gallery2 widget dimens Bug: 5278970"
|
d784763aec4ae3b3dac4e1d770c4249b8f6214aa |
11-Sep-2011 |
Owen Lin <owenlin@google.com> |
Fix picasa images rotate incorrectly. fix: 5268469 Change-Id: I58fc4a6d4a10c2952040eedee5936efa949b66e2
allerycommon/src/com/android/gallery3d/common/BitmapUtils.java
|
b251df22a421b5affb15d7a18700889647dbc856 |
11-Sep-2011 |
Owen Lin <owenlin@google.com> |
Fix picasa images rotate incorrectly. fix: 5268469 Change-Id: I58fc4a6d4a10c2952040eedee5936efa949b66e2
allerycommon/src/com/android/gallery3d/common/BitmapUtils.java
rc/com/android/gallery3d/app/PhotoDataAdapter.java
rc/com/android/gallery3d/data/MediaItem.java
|
22493b29c32142f2588c623f5c78e9167352dddc |
11-Sep-2011 |
Owen Lin <owenlin@google.com> |
Fix picasa images rotate incorrectly. fix: 5268469 Change-Id: I58fc4a6d4a10c2952040eedee5936efa949b66e2
allerycommon/src/com/android/gallery3d/common/BitmapUtils.java
rc/com/android/gallery3d/app/PhotoDataAdapter.java
rc/com/android/gallery3d/data/MediaItem.java
|
7fe9abf054c3a087393aede36773c6d18ddd8ae8 |
11-Sep-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
85fb046633c98df334f87ed8a7e0ec65df9033f2 |
11-Sep-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
9958264c70a08d90abba9df55e331c1e1288a51a |
11-Sep-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
9004bbadef374f70c2d34751d12cf3799774837f |
09-Sep-2011 |
Yuli Huang <yuli@google.com> |
Move PhotoEditor strings into Gallery2. 1. Rename Gallery string "crop" to "crop_action". 2. Rename PhotoEditor string "app_name" to "photoeditor_name". Change-Id: I22279e7e45b690f22fe8e0e8dd645bb4df821646
es/menu/operation.xml
es/menu/photo.xml
es/values/photoeditor_strings.xml
es/values/strings.xml
|
1d8303b290a0c2fba972886045027b38d0c38ab4 |
09-Sep-2011 |
Yuli Huang <yuli@google.com> |
Move PhotoEditor strings into Gallery2. 1. Rename Gallery string "crop" to "crop_action". 2. Rename PhotoEditor string "app_name" to "photoeditor_name". Change-Id: I22279e7e45b690f22fe8e0e8dd645bb4df821646
es/menu/operation.xml
es/menu/photo.xml
es/values/photoeditor_strings.xml
es/values/strings.xml
|
68b8fe5ba3414c0e2b2ebb8fb77dfbf197c1873a |
09-Sep-2011 |
Eric Fischer <enf@google.com> |
Merge "Import revised translations."
|
280b150f211d6afc5740c50db46dd223ec33bc47 |
09-Sep-2011 |
Eric Fischer <enf@google.com> |
Merge "Import revised translations."
|
ae761be3d01771594cb9fc7d789b55dfa7cbb5c6 |
09-Sep-2011 |
Eric Fischer <enf@google.com> |
Merge "Restore deleted strings still referenced from menus."
|
ad839bf22e7006d5f1afe857bbedc8e91a16ef3c |
09-Sep-2011 |
Eric Fischer <enf@google.com> |
Merge "Restore deleted strings still referenced from menus."
|
890e39b31e6922ecec3b0d8b12ef8f2913361551 |
09-Sep-2011 |
Justin Ho <justinho@google.com> |
Updated Gallery2 widget dimens Bug: 5278970 Change-Id: Ia650a167bf44baf202fdee527a52af4148d2e8ae
es/xml/widget_info.xml
|
36eedd4a36fb925ce427e4c371353b60ebfa2897 |
09-Sep-2011 |
Justin Ho <justinho@google.com> |
Updated Gallery2 widget dimens Bug: 5278970 Change-Id: Ia650a167bf44baf202fdee527a52af4148d2e8ae
es/xml/widget_info.xml
|
84d69b3f38585e7f69bafcc926d10814d5586516 |
09-Sep-2011 |
Chih-Chung Chang <chihchung@google.com> |
Merge "Fix 5221190: Make movie player background black."
|
1c783b5458fc4a39cbaa7db7c6b4fcb4b0615f1d |
08-Sep-2011 |
Chih-Chung Chang <chihchung@google.com> |
Fix 5221190: Make movie player background black. Change-Id: I2ffb81a2b0aa267a14f7fbe03afe3c3e95dd1069
es/values-xlarge/styles.xml
es/values/styles.xml
|
b31e9fbe1c206866009e855d581fd6b221c89c18 |
08-Sep-2011 |
Chih-Chung Chang <chihchung@google.com> |
Fix 5221190: Make movie player background black. Change-Id: I2ffb81a2b0aa267a14f7fbe03afe3c3e95dd1069
es/values-xlarge/styles.xml
es/values/styles.xml
|
6a5a246ca7973054364f5ee8ca2df3164bf38458 |
09-Sep-2011 |
Owen Lin <owenlin@google.com> |
Merge "Revert "bug #5252975: guard against null bitmap object, don't NPE.""
|
54b86186df09b6f89dee4947f7872baed2b8ad5c |
09-Sep-2011 |
Owen Lin <owenlin@google.com> |
Merge "Revert "bug #5252975: guard against null bitmap object, don't NPE.""
|
03266b7f1b163f6729910743da3bd1dda2b60cfa |
09-Sep-2011 |
Owen Lin <owenlin@google.com> |
Merge "Revert "bug #5252975: guard against null bitmap object, don't NPE.""
|
595e91283f97731bb63d82c48511185a4d406dd5 |
09-Sep-2011 |
Chih-Chung Chang <chihchung@google.com> |
Merge "Fix 5189194: Change color of borders."
|
b05f955f5326d0ea5f31799a65f5558064623970 |
08-Sep-2011 |
Chih-Chung Chang <chihchung@google.com> |
Fix 5189194: Change color of borders. Change-Id: I9b1c5da91ac6314e9f38926efb0e2ed569ad4b4c
es/drawable-hdpi/album_frame.9.png
es/drawable-hdpi/focus_box.9.png
es/drawable-hdpi/grid_selected.9.png
es/drawable-hdpi/grid_selected_top.9.png
es/drawable-mdpi/album_frame.9.png
es/drawable-mdpi/focus_box.9.png
es/drawable-mdpi/grid_selected.9.png
es/drawable-mdpi/grid_selected_top.9.png
|
de3f564a56f96de70e01c82d8552d806acce2cf8 |
08-Sep-2011 |
Chih-Chung Chang <chihchung@google.com> |
Fix 5189194: Change color of borders. Change-Id: I9b1c5da91ac6314e9f38926efb0e2ed569ad4b4c
es/drawable-hdpi/album_frame.9.png
es/drawable-hdpi/focus_box.9.png
es/drawable-hdpi/grid_selected.9.png
es/drawable-hdpi/grid_selected_top.9.png
es/drawable-mdpi/album_frame.9.png
es/drawable-mdpi/focus_box.9.png
es/drawable-mdpi/grid_selected.9.png
es/drawable-mdpi/grid_selected_top.9.png
|
5a0da44db4a7dafd5ebef34ae3e999faa291db87 |
09-Sep-2011 |
Ray Chen <raychen@google.com> |
Merge "Fix 5267234 com.google.android.gallery3d: java.lang.IllegalArgumentException: The stateview to be finished is not at the top of the stack:"
|
27ad8403dbdd74481514851fe98c5da73198d911 |
09-Sep-2011 |
Ray Chen <raychen@google.com> |
Merge "Fix 5267234 com.google.android.gallery3d: java.lang.IllegalArgumentException: The stateview to be finished is not at the top of the stack:"
|
93db577592f48c09b87865db43bab4e93a6ab732 |
09-Sep-2011 |
Ray Chen <raychen@google.com> |
Fix 5267234 com.google.android.gallery3d: java.lang.IllegalArgumentException: The stateview to be finished is not at the top of the stack: setNavigationMode triggers recursive tabs onSelected events. Change-Id: Id9f58b4a73c4d7836b62e33e2f9b3676ba3f95c2
rc/com/android/gallery3d/app/GalleryActionBar.java
|
eab374bafe5237a77698c4135c92eb26faedfa2b |
09-Sep-2011 |
Ray Chen <raychen@google.com> |
Fix 5267234 com.google.android.gallery3d: java.lang.IllegalArgumentException: The stateview to be finished is not at the top of the stack: setNavigationMode triggers recursive tabs onSelected events. Change-Id: Id9f58b4a73c4d7836b62e33e2f9b3676ba3f95c2
rc/com/android/gallery3d/app/GalleryActionBar.java
|
efe620bf1cf3ae2973b25fd4f7bc78fd77931546 |
09-Sep-2011 |
Eric Fischer <enf@google.com> |
Import revised translations. Change-Id: I626154da45e8cc168585c56f4fc0dc0df42c681f
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
0fb82acd080b0f42a75bd06ad84ba9d366642637 |
09-Sep-2011 |
Eric Fischer <enf@google.com> |
Import revised translations. Change-Id: I626154da45e8cc168585c56f4fc0dc0df42c681f
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
80f958224648f4f29d66ba222bc65a18874a8b6d |
09-Sep-2011 |
Eric Fischer <enf@google.com> |
Restore deleted strings still referenced from menus. Change-Id: Ib3a08b56f278387fd277601f0baaf09d42f7ce09
es/values/strings.xml
|
10451538452da4815da408f4f000884a077a8f78 |
09-Sep-2011 |
Eric Fischer <enf@google.com> |
Restore deleted strings still referenced from menus. Change-Id: Ib3a08b56f278387fd277601f0baaf09d42f7ce09
es/values/strings.xml
|
5327226d6401e54e1f32783ea8e03ff05dd4cc1a |
08-Sep-2011 |
Ray Chen <raychen@google.com> |
Merge "Fix 5247983 posted photos from multiple accounts showing up in same folder"
|
5ab802259ac272af94dee32f0aa95cc76104ccc5 |
08-Sep-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
09847a36c35533632e7b22754fe7486a46eb15ff |
08-Sep-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
bbef85118ad9c1e6ff11644ac1ad77f34e0e5865 |
08-Sep-2011 |
Ray Chen <raychen@google.com> |
Fix 5247983 posted photos from multiple accounts showing up in same folder Change-Id: I892134b49fceb5d5467d689e6d6a92169980940b
es/values/strings.xml
|
d88ae0d6ca7d9f24b84a6e7ec4ca1d4f38ec88f0 |
08-Sep-2011 |
Ray Chen <raychen@google.com> |
Fix 5247983 posted photos from multiple accounts showing up in same folder Change-Id: I892134b49fceb5d5467d689e6d6a92169980940b
es/values/strings.xml
|
377436d87c014ae5ebf641c6f22c64f527a7e3fb |
08-Sep-2011 |
Chih-Chung Chang <chihchung@google.com> |
Fix 5263604: View not attached to window manager. We need to make sure the dialog is dismissed before onDestroy is finished so we still have the window. (We do it in onPause.) Change-Id: I896583a67e117c9e4c5a1312541d67efa01295bf
rc/com/android/gallery3d/app/PhotoPage.java
|
2785956f8f5654966a41e20f482f4af3057eea3f |
08-Sep-2011 |
Chih-Chung Chang <chihchung@google.com> |
Fix 5263604: View not attached to window manager. We need to make sure the dialog is dismissed before onDestroy is finished so we still have the window. (We do it in onPause.) Change-Id: I896583a67e117c9e4c5a1312541d67efa01295bf
rc/com/android/gallery3d/app/PhotoPage.java
|
9b9bdfd28d4dc8d92dbaf8c6f097d2c70a3c7ebc |
07-Sep-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
dc89965b2a6cdde1428e89d9a99cd71050bf98ce |
07-Sep-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
6ee3afc7db3f844b92f5ad8c14cf7349167f7000 |
07-Sep-2011 |
Owen Lin <owenlin@google.com> |
Merge "Copy exif data for cropped image."
|
8fdb6f6ba7244decea7938d4781664a2e5ede97a |
07-Sep-2011 |
Owen Lin <owenlin@google.com> |
Merge "Copy exif data for cropped image."
|
3190f6975341d1e726c42c1b86a17b956578a40c |
02-Sep-2011 |
Owen Lin <owenlin@google.com> |
Copy exif data for cropped image. fix: 5248023 Change-Id: I2f59bfd96ca7533195f7019cc76080579dff8d1e
rc/com/android/gallery3d/app/CropImage.java
rc/com/android/gallery3d/util/GalleryUtils.java
rc_pd/com/android/gallery3d/picasasource/PicasaSource.java
|
abf2790337692007d5aa0f844e8f6d6f96d0de97 |
02-Sep-2011 |
Owen Lin <owenlin@google.com> |
Copy exif data for cropped image. fix: 5248023 Change-Id: I2f59bfd96ca7533195f7019cc76080579dff8d1e
rc/com/android/gallery3d/app/CropImage.java
rc/com/android/gallery3d/util/GalleryUtils.java
rc_pd/com/android/gallery3d/picasasource/PicasaSource.java
|
7b5dd39da57dcaaf5556b00c13c28c4e5d2da9c1 |
07-Sep-2011 |
Owen Lin <owenlin@google.com> |
Merge "Fix a no-thumbnail error message."
|
c4800c4a8252c8db65e4815225c4a3b2cfa03706 |
07-Sep-2011 |
Owen Lin <owenlin@google.com> |
Merge "Fix a no-thumbnail error message."
|
4522eafaaba9b2d6a2ce4a41bd7a04258d9624e8 |
06-Sep-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
3ed0fb13c4389794479a28b51e33e84d025c4e3b |
06-Sep-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
ae55055aa223715f6d5924fe7dcc96c73e67c560 |
06-Sep-2011 |
Owen Lin <owenlin@google.com> |
Fix a no-thumbnail error message. This happens if we cancel the first image reqest and then resend another in a very short time. We may got an null image for the first request and think this is a invalid bitmap. Change-Id: I9ab62a658c281ef3d197474a5db50579e560f1bd
rc/com/android/gallery3d/app/PhotoDataAdapter.java
|
e7327d0566b182c522ca6dfa8e04c649d8f631a0 |
06-Sep-2011 |
Owen Lin <owenlin@google.com> |
Fix a no-thumbnail error message. This happens if we cancel the first image reqest and then resend another in a very short time. We may got an null image for the first request and think this is a invalid bitmap. Change-Id: I9ab62a658c281ef3d197474a5db50579e560f1bd
rc/com/android/gallery3d/app/PhotoDataAdapter.java
|
e616606914e730cd34e21eada52b54e60aab0e10 |
06-Sep-2011 |
Owen Lin <owenlin@google.com> |
Revert "bug #5252975: guard against null bitmap object, don't NPE." This reverts commit 7012ebe1c85e538c572e23d4cb98cad88699c782. We would like to know the crash as soon as possible. bug: 5252975
allerycommon/src/com/android/gallery3d/common/BitmapUtils.java
rc/com/android/gallery3d/data/ImageCacheRequest.java
|
ef142e1db5978c3983c82e95adf25e5c13f473a5 |
06-Sep-2011 |
Owen Lin <owenlin@google.com> |
Revert "bug #5252975: guard against null bitmap object, don't NPE." This reverts commit 7012ebe1c85e538c572e23d4cb98cad88699c782. We would like to know the crash as soon as possible. bug: 5252975
allerycommon/src/com/android/gallery3d/common/BitmapUtils.java
|
ea0feffc18ed2d0086d5fc4c57353f9e81154099 |
06-Sep-2011 |
Owen Lin <owenlin@google.com> |
Revert "bug #5252975: guard against null bitmap object, don't NPE." This reverts commit 7012ebe1c85e538c572e23d4cb98cad88699c782. We would like to know the crash as soon as possible. bug: 5252975
allerycommon/src/com/android/gallery3d/common/BitmapUtils.java
rc/com/android/gallery3d/data/ImageCacheRequest.java
|
14eb965bde9b8d40b9f503f7a87247b9336b68df |
06-Sep-2011 |
Hung-ying Tyan <tyanh@google.com> |
Suppress log from Utils.parseXXXSafely(). Callers already expect non-number strings with these calls. No need to print out the stack trace. Change-Id: I27226ca50e4e7e906939505ad5d53906e8999e95
allerycommon/src/com/android/gallery3d/common/Utils.java
|
d76bb5eec866103fda69483481b6c85527f08892 |
06-Sep-2011 |
Hung-ying Tyan <tyanh@google.com> |
Suppress log from Utils.parseXXXSafely(). Callers already expect non-number strings with these calls. No need to print out the stack trace. Change-Id: I27226ca50e4e7e906939505ad5d53906e8999e95
allerycommon/src/com/android/gallery3d/common/Utils.java
|
3f6d333221f1b522328ce589ba6d2dd46c375c76 |
06-Sep-2011 |
Hung-ying Tyan <tyanh@google.com> |
Suppress log from Utils.parseXXXSafely(). Callers already expect non-number strings with these calls. No need to print out the stack trace. Change-Id: I27226ca50e4e7e906939505ad5d53906e8999e95
allerycommon/src/com/android/gallery3d/common/Utils.java
|
a533ea1f997c9fa0f79dbe40b0fb34b8d35bf364 |
05-Sep-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
e09ff6cd5a039fe56550ec9a148743a50c6cdf01 |
05-Sep-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
47b16c476a9556981c6dd8628efa1f862bc14620 |
05-Sep-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
edb0625f451b7a4f952ed18af00e24f5b85a3805 |
05-Sep-2011 |
Owen Lin <owenlin@google.com> |
Merge "Move resources related to sync to Gallery2."
|
91e6e227a462b27119a7cfe6bd90c1d004f8e47c |
02-Sep-2011 |
Owen Lin <owenlin@google.com> |
Move resources related to sync to Gallery2. fix: 5241300 Change-Id: I03ff96478a0e43b9d6c8e327034bda46fc071664
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
es/values/strings.xml
es/xml/syncadapter.xml
|
2b8953b35e140d89b087ff2106e12064de02ee14 |
02-Sep-2011 |
Owen Lin <owenlin@google.com> |
Move resources related to sync to Gallery2. fix: 5241300 Change-Id: I03ff96478a0e43b9d6c8e327034bda46fc071664
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
es/values/strings.xml
es/xml/syncadapter.xml
|
ace280a70fd1ead67039b9667d3905c85703c094 |
30-Aug-2011 |
Owen Lin <owenlin@google.com> |
Improve the performance of Reviewing a photo. fix: 5144370 There is two componenet in the photo page. One is the large photo and the other is the thumbnail strip. They idenpendently load their own data and images. This change fixes several issues here: 1. Prevent sending to many jobs to ThreadPool and block others. In a worse case, if the thumbnail strip send image requests first, it may block the ThreadPool very long. 2. Improve the performance of extracting thumbnails from local files. Now we try to extract the thumbnails from EXIF data first. Change-Id: I45100d4daa025efb479f47c4f105de2b4731b498
allerycommon/src/com/android/gallery3d/common/BitmapUtils.java
rc/com/android/gallery3d/app/PhotoDataAdapter.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/data/DecodeUtils.java
rc/com/android/gallery3d/data/LocalImage.java
rc/com/android/gallery3d/ui/AlbumSlidingWindow.java
rc/com/android/gallery3d/ui/FilmStripView.java
rc/com/android/gallery3d/ui/GLView.java
rc/com/android/gallery3d/util/JobLimiter.java
|
7fb09a025b25d0dce0f95ec083b53b7a04f8954a |
30-Aug-2011 |
Owen Lin <owenlin@google.com> |
Improve the performance of Reviewing a photo. fix: 5144370 There is two componenet in the photo page. One is the large photo and the other is the thumbnail strip. They idenpendently load their own data and images. This change fixes several issues here: 1. Prevent sending to many jobs to ThreadPool and block others. In a worse case, if the thumbnail strip send image requests first, it may block the ThreadPool very long. 2. Improve the performance of extracting thumbnails from local files. Now we try to extract the thumbnails from EXIF data first. Change-Id: I45100d4daa025efb479f47c4f105de2b4731b498
allerycommon/src/com/android/gallery3d/common/BitmapUtils.java
|
113bfc77c4468411da9ae1290553c3be89f8df9a |
30-Aug-2011 |
Owen Lin <owenlin@google.com> |
Improve the performance of Reviewing a photo. fix: 5144370 There is two componenet in the photo page. One is the large photo and the other is the thumbnail strip. They idenpendently load their own data and images. This change fixes several issues here: 1. Prevent sending to many jobs to ThreadPool and block others. In a worse case, if the thumbnail strip send image requests first, it may block the ThreadPool very long. 2. Improve the performance of extracting thumbnails from local files. Now we try to extract the thumbnails from EXIF data first. Change-Id: I45100d4daa025efb479f47c4f105de2b4731b498
allerycommon/src/com/android/gallery3d/common/BitmapUtils.java
rc/com/android/gallery3d/app/PhotoDataAdapter.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/data/DecodeUtils.java
rc/com/android/gallery3d/data/LocalImage.java
rc/com/android/gallery3d/ui/AlbumSlidingWindow.java
rc/com/android/gallery3d/ui/FilmStripView.java
rc/com/android/gallery3d/ui/GLView.java
rc/com/android/gallery3d/util/JobLimiter.java
|
c99115a0af6d37b1e1b50dd5557bc697405fc721 |
03-Sep-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
214fa0fc4c5b2956394c9c029568489c2cedace6 |
03-Sep-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
e3e9f9d367faa371cd89fac22117e0b2c2e88331 |
03-Sep-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
7012ebe1c85e538c572e23d4cb98cad88699c782 |
02-Sep-2011 |
Wei Huang <weih@google.com> |
bug #5252975: guard against null bitmap object, don't NPE. - check for null Bitmap object before using. Change-Id: I99d85916dae45128d67be084860d66dd89ec2f95
allerycommon/src/com/android/gallery3d/common/BitmapUtils.java
rc/com/android/gallery3d/data/ImageCacheRequest.java
|
9c12d7512df688131384328fb6ffb89b36cc4393 |
02-Sep-2011 |
Wei Huang <weih@google.com> |
bug #5252975: guard against null bitmap object, don't NPE. - check for null Bitmap object before using. Change-Id: I99d85916dae45128d67be084860d66dd89ec2f95
allerycommon/src/com/android/gallery3d/common/BitmapUtils.java
rc/com/android/gallery3d/data/ImageCacheRequest.java
|
c53a616f18c70d4f0d3c7fb186833754e00eb817 |
02-Sep-2011 |
Wei Huang <weih@google.com> |
bug #5252975: guard against null bitmap object, don't NPE. - check for null Bitmap object before using. Change-Id: I99d85916dae45128d67be084860d66dd89ec2f95
allerycommon/src/com/android/gallery3d/common/BitmapUtils.java
|
28eb58218cfd50d07e8e333b4b7fd000037c6749 |
02-Sep-2011 |
Ray Chen <raychen@google.com> |
Merge "Fix a few monkey issues: 5157713 and 5157712 Add debugging message for 5192628."
|
6180b2e50dd6f4df2de8d208bd4e7329e43120ce |
02-Sep-2011 |
Ray Chen <raychen@google.com> |
Merge "Fix a few monkey issues: 5157713 and 5157712 Add debugging message for 5192628."
|
ce811df0fc04278e440aed176c0f2ab4a64f22f5 |
31-Aug-2011 |
Ray Chen <raychen@google.com> |
Fix a few monkey issues: 5157713 and 5157712 Add debugging message for 5192628. Change-Id: I257cabf1a93be256ed84aeaf3c9a871ecc5b1171
rc/com/android/gallery3d/ui/MenuExecutor.java
rc/com/android/gallery3d/ui/TileImageView.java
|
b2b451802fca3d81aaaa68b68c71e928015bbe34 |
31-Aug-2011 |
Ray Chen <raychen@google.com> |
Fix a few monkey issues: 5157713 and 5157712 Add debugging message for 5192628. Change-Id: I257cabf1a93be256ed84aeaf3c9a871ecc5b1171
rc/com/android/gallery3d/ui/MenuExecutor.java
rc/com/android/gallery3d/ui/TileImageView.java
|
3b8147e5c566fde6bc145865013bb7f0141d4591 |
02-Sep-2011 |
Owen Lin <owenlin@google.com> |
Merge "Remove resources for Settings."
|
a5809bbf1742c3b74b707799dd866325ee927bab |
02-Sep-2011 |
Owen Lin <owenlin@google.com> |
Merge "Remove resources for Settings."
|
a6b93639bea72d847f9b4d9c02e1ed2477b9a92d |
02-Sep-2011 |
Owen Lin <owenlin@google.com> |
Merge "Fix alias not found issue."
|
a610ef4c0c46e6737384c6c7cdcc307c3b0b813f |
01-Sep-2011 |
Justin Ho <justinho@google.com> |
Unused assets removed from Gallery2 Bug: 5032006 Change-Id: Ie9c5a902b874d6ad2be7bcee5477222a47e0c834
es/drawable-hdpi/border_photo_frame_widget_focused_pressed_holo.9.png
es/drawable-hdpi/gallery_widget_preview.png
es/drawable-hdpi/ic_control_fail.png
es/drawable-hdpi/media_control_bg.9.png
es/drawable-hdpi/player_scrubber.png
es/drawable-mdpi/border_photo_frame_widget_focused_pressed_holo.9.png
es/drawable-mdpi/gallery_widget_preview.png
es/drawable-mdpi/ic_control_fail.png
es/drawable-mdpi/media_control_bg.9.png
es/drawable-mdpi/player_scrubber.png
|
82905dd6ae2b4eeca8f748aa3be897237210b888 |
01-Sep-2011 |
Justin Ho <justinho@google.com> |
Unused assets removed from Gallery2 Bug: 5032006 Change-Id: Ie9c5a902b874d6ad2be7bcee5477222a47e0c834
es/drawable-hdpi/border_photo_frame_widget_focused_pressed_holo.9.png
es/drawable-hdpi/gallery_widget_preview.png
es/drawable-hdpi/ic_control_fail.png
es/drawable-hdpi/media_control_bg.9.png
es/drawable-hdpi/player_scrubber.png
es/drawable-mdpi/border_photo_frame_widget_focused_pressed_holo.9.png
es/drawable-mdpi/gallery_widget_preview.png
es/drawable-mdpi/ic_control_fail.png
es/drawable-mdpi/media_control_bg.9.png
es/drawable-mdpi/player_scrubber.png
|
3c2289811e5e5a3ac46a78b57eab92b2b1ca5eae |
23-Aug-2011 |
Owen Lin <owenlin@google.com> |
Remove resources for Settings. Change-Id: I59a95966cbe9c90553716111ecddb84623002610
es/layout/account_header_preference.xml
es/layout/account_sync_preference.xml
es/layout/account_visible_preference.xml
es/layout/auto_upload_account_preference.xml
es/layout/auto_upload_help_text_preference.xml
es/values/strings.xml
es/xml/gallery_settings.xml
|
deb5910808d7363ca73b44804d89e5b430c03fcb |
23-Aug-2011 |
Owen Lin <owenlin@google.com> |
Remove resources for Settings. Change-Id: I59a95966cbe9c90553716111ecddb84623002610
es/layout/account_header_preference.xml
es/layout/account_sync_preference.xml
es/layout/account_visible_preference.xml
es/layout/auto_upload_account_preference.xml
es/layout/auto_upload_help_text_preference.xml
es/values/strings.xml
es/xml/gallery_settings.xml
|
734290823b0326dc18a85a7a3bc03f6a0bc0f18d |
01-Sep-2011 |
Owen Lin <owenlin@google.com> |
Fix alias not found issue. Also remove note message in proguard. Change-Id: I7e15a3b00d7caf32565d035f6c972d302e38d49f
roguard.flags
|
4d888ed930b5898882b77f80239476b3205f7046 |
01-Sep-2011 |
Owen Lin <owenlin@google.com> |
Fix alias not found issue. Also remove note message in proguard. Change-Id: I7e15a3b00d7caf32565d035f6c972d302e38d49f
ndroidManifest.xml
|
2733d79920254aeecdca6b84f125f0626144653e |
01-Sep-2011 |
Owen Lin <owenlin@google.com> |
Fix alias not found issue. Also remove note message in proguard. Change-Id: I7e15a3b00d7caf32565d035f6c972d302e38d49f
ndroidManifest.xml
roguard.flags
|
d87875e4f5a7e2bbf1f0785258e2cb3ec89189c9 |
31-Aug-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
e9e430786e55dd15c8b5db3c5331bca0f4d068aa |
31-Aug-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
49996c457933dfb618286f12ce6e5ff3a9fe6388 |
31-Aug-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
1ec4765cf78452cb8c1fe2aa11210f340ed47a70 |
31-Aug-2011 |
Owen Lin <owenlin@google.com> |
Merge "Revert "Revert "Move resource to sync library."""
|
36ed2ce6c9282cf3cc60644ed5b5abd1f809e424 |
31-Aug-2011 |
Owen Lin <owenlin@google.com> |
Merge "Revert "Revert "Move resource to sync library."""
|
83d4691e8dae4e6fe9090f71283b96ee2b911236 |
30-Aug-2011 |
Ray Chen <raychen@google.com> |
Debugging 5166199. Add log messages for analysis. Change-Id: I1786e540b5bf19460dcca06acd8a77c9287593f8
rc/com/android/gallery3d/app/AlbumSetPage.java
rc/com/android/gallery3d/app/GalleryActionBar.java
rc/com/android/gallery3d/app/ManageCachePage.java
|
e9ae772f3400d53d24ce3d2834bd5866de599406 |
30-Aug-2011 |
Ray Chen <raychen@google.com> |
Debugging 5166199. Add log messages for analysis. Change-Id: I1786e540b5bf19460dcca06acd8a77c9287593f8
rc/com/android/gallery3d/app/AlbumSetPage.java
rc/com/android/gallery3d/app/GalleryActionBar.java
rc/com/android/gallery3d/app/ManageCachePage.java
|
d84a2f485d4cda9408f750cbf6cb2eb956bb95e6 |
30-Aug-2011 |
Ray Chen <raychen@google.com> |
Fix 5188208 [UI] Remove action bar title in Photo/Video view for portrait phone Change-Id: I20fba5894e46536f6972bc812d7f2aa5f52840b5
es/values-w480dp/bool.xml
es/values/bool.xml
|
3f414cbd44b45e98262c1ac214f93f7e6bbee1ce |
30-Aug-2011 |
Ray Chen <raychen@google.com> |
Fix 5188208 [UI] Remove action bar title in Photo/Video view for portrait phone Change-Id: I20fba5894e46536f6972bc812d7f2aa5f52840b5
rc/com/android/gallery3d/app/PhotoPage.java
|
267e152714d75bb6378ee2ffffa90ca4343ca829 |
30-Aug-2011 |
Ray Chen <raychen@google.com> |
Fix 5188208 [UI] Remove action bar title in Photo/Video view for portrait phone Change-Id: I20fba5894e46536f6972bc812d7f2aa5f52840b5
es/values-w480dp/bool.xml
es/values/bool.xml
rc/com/android/gallery3d/app/PhotoPage.java
|
4105c5e73185c792c3576a20f620791e32dd316c |
29-Aug-2011 |
Ray Chen <raychen@google.com> |
Fix 5189197: NPE in MovieActivity Change-Id: I58f9e2c0840b4d752c2f795451ed4bc8212bb1ce
rc/com/android/gallery3d/app/MovieActivity.java
|
dcb265c9d08029bbb8fd77d3514482d10db53a3c |
29-Aug-2011 |
Ray Chen <raychen@google.com> |
Fix 5189197: NPE in MovieActivity Change-Id: I58f9e2c0840b4d752c2f795451ed4bc8212bb1ce
rc/com/android/gallery3d/app/MovieActivity.java
|
94c1caed4720fef052fcd9b0712b748bd23cc45b |
31-Aug-2011 |
Ray Chen <raychen@google.com> |
Merge "Fix 5134299 [UI] Select photo or album activities should have a Cancel label not x icon"
|
07e77a5582f69bdd584391aa214e397b631b0d3c |
31-Aug-2011 |
Ray Chen <raychen@google.com> |
Merge "Fix 5134299 [UI] Select photo or album activities should have a Cancel label not x icon"
|
6b5f59d91844d5a98af9b92204526cc0b3b4860c |
30-Aug-2011 |
Wei Huang <weih@google.com> |
bug #5234237: fix NPE in Gallery - mActivity.getGalleryActionBar() can return null, check for null before using it. Change-Id: Ib84d5d56e51e6098adee9323c5e8d5c78f9a76e8
rc/com/android/gallery3d/app/AlbumSetPage.java
|
efb4bc67eecf468d8b9b49e644fc9230bded122d |
30-Aug-2011 |
Wei Huang <weih@google.com> |
bug #5234237: fix NPE in Gallery - mActivity.getGalleryActionBar() can return null, check for null before using it. Change-Id: Ib84d5d56e51e6098adee9323c5e8d5c78f9a76e8
rc/com/android/gallery3d/app/AlbumSetPage.java
|
ce73c4c14e659876c1943ba933e404292166be1a |
29-Aug-2011 |
Ray Chen <raychen@google.com> |
Fix 4975579 PTP: Unable to load the thumbnails while connected to camera There's a deadlock in threadpool. The fix has been verified. Change-Id: I000527f55fc2a3777bd4bb06817a9967b2f50488
rc/com/android/gallery3d/data/MtpImage.java
rc/com/android/gallery3d/ui/ActionModeHandler.java
|
0b4d5c5a5834d0113068959c57e0e10bf919a081 |
29-Aug-2011 |
Ray Chen <raychen@google.com> |
Fix 4975579 PTP: Unable to load the thumbnails while connected to camera There's a deadlock in threadpool. The fix has been verified. Change-Id: I000527f55fc2a3777bd4bb06817a9967b2f50488
rc/com/android/gallery3d/data/MtpImage.java
rc/com/android/gallery3d/ui/ActionModeHandler.java
|
4de0f5222a8c35f422008b3a41058b6f50c20918 |
30-Aug-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
es/values/styles.xml
|
28d81efb20707395ee5cc182c0a7a05a549e2f62 |
30-Aug-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
rc/com/android/gallery3d/app/ActivityState.java
rc/com/android/gallery3d/app/AlbumPage.java
rc/com/android/gallery3d/app/AlbumSetPage.java
rc/com/android/gallery3d/app/GalleryActionBar.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/gadget/WidgetDatabaseHelper.java
|
bfdb7a5a4db6d93257aa14a31489f2d28f2305d4 |
30-Aug-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
afe15889b7e4880e83617a6afc2863b9f3b3449e |
30-Aug-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
es/values/styles.xml
|
76fd35ee902c59dd5e381edc1595550c5845e22f |
30-Aug-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
rc/com/android/gallery3d/app/ActivityState.java
rc/com/android/gallery3d/app/AlbumPage.java
rc/com/android/gallery3d/app/AlbumSetPage.java
rc/com/android/gallery3d/app/GalleryActionBar.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/gadget/WidgetDatabaseHelper.java
|
8d5d1c5f6b10630d3ef4a7432587d16b9e4e64ab |
30-Aug-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
ea80ff93b6070ff671da46d6078cdf753cc6f8c3 |
30-Aug-2011 |
Wei Huang <weih@google.com> |
bug #5234237: fix NPE in Gallery - mActivity.getGalleryActionBar() can return null, check for null before using it. Change-Id: Ib84d5d56e51e6098adee9323c5e8d5c78f9a76e8
rc/com/android/gallery3d/app/AlbumSetPage.java
|
a79bbef0ffe0b99cb8d0e5dcedd3082abc61559c |
30-Aug-2011 |
Wei Huang <weih@google.com> |
bug #5234237: fix NPE in Gallery - mActivity.getGalleryActionBar() can return null, check for null before using it. Change-Id: Ib84d5d56e51e6098adee9323c5e8d5c78f9a76e8
rc/com/android/gallery3d/app/AlbumSetPage.java
|
0ba0e9e5e4bae838e0cce29a509f875b434a0542 |
30-Aug-2011 |
Wei Huang <weih@google.com> |
Merge "Fix 4975579 PTP: Unable to load the thumbnails while connected to camera"
|
1a3ad3641eaee86b0401695b52959a44b1f63b1d |
30-Aug-2011 |
Wei Huang <weih@google.com> |
Merge "Fix 4975579 PTP: Unable to load the thumbnails while connected to camera"
|
4d846ca5ad92ea614a6153416141e899efc90305 |
30-Aug-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
c09fdd59cf35e00cacc377863cd8e40c5d37e318 |
30-Aug-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
7f027cdf75c0598d6858b92d57c40f596d5c0fac |
30-Aug-2011 |
Owen Lin <owenlin@google.com> |
Revert "Revert "Move resource to sync library."" This reverts commit 779377e489158b8db0be1168002f4416f4ef319c.
es/layout/cache_notification.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values/strings.xml
|
97c1d8ddb24ab1d50858bcbd0a0a46c2c391213a |
30-Aug-2011 |
Owen Lin <owenlin@google.com> |
Revert "Revert "Move resource to sync library."" This reverts commit 779377e489158b8db0be1168002f4416f4ef319c.
es/layout/cache_notification.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values/strings.xml
|
02e89f97924ab817ac9014c4f620ffb72a126579 |
30-Aug-2011 |
Ray Chen <raychen@google.com> |
Fix 5134299 [UI] Select photo or album activities should have a Cancel label not x icon Change-Id: I77c4cd2f8b27e48786d410bd39a16c918a7407b3
es/menu/pickup.xml
|
f346653cdb285fffd389def7cf5e09a116a71ca1 |
30-Aug-2011 |
Ray Chen <raychen@google.com> |
Fix 5134299 [UI] Select photo or album activities should have a Cancel label not x icon Change-Id: I77c4cd2f8b27e48786d410bd39a16c918a7407b3
es/menu/pickup.xml
|
995eb0936a0d14eb07073333802fbb5b98d9b30d |
28-Aug-2011 |
Owen Lin <owenlin@google.com> |
Fix several issues in Gallery2. fix: 5189318 - use transparent background for tabs fix: 5174277 - menu mailfunctioned after slideshow (a hack): fix: 5153387 - wrong tab is selected in album set page Change-Id: I68092039e566b5f7409ae509f65b227b06da16bb
es/values/styles.xml
|
6cf807453fb58ccd4cc513ff187b306c7090e67c |
28-Aug-2011 |
Owen Lin <owenlin@google.com> |
Fix several issues in Gallery2. fix: 5189318 - use transparent background for tabs fix: 5174277 - menu mailfunctioned after slideshow (a hack): fix: 5153387 - wrong tab is selected in album set page Change-Id: I68092039e566b5f7409ae509f65b227b06da16bb
es/values/styles.xml
rc/com/android/gallery3d/app/ActivityState.java
rc/com/android/gallery3d/app/AlbumPage.java
rc/com/android/gallery3d/app/AlbumSetPage.java
rc/com/android/gallery3d/app/GalleryActionBar.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/gadget/WidgetDatabaseHelper.java
|
44aac4bcb6ddd0b6553a198db4adb479d3437c8e |
28-Aug-2011 |
Owen Lin <owenlin@google.com> |
Fix several issues in Gallery2. fix: 5189318 - use transparent background for tabs fix: 5174277 - menu mailfunctioned after slideshow (a hack): fix: 5153387 - wrong tab is selected in album set page Change-Id: I68092039e566b5f7409ae509f65b227b06da16bb
rc/com/android/gallery3d/app/ActivityState.java
rc/com/android/gallery3d/app/AlbumPage.java
rc/com/android/gallery3d/app/AlbumSetPage.java
rc/com/android/gallery3d/app/GalleryActionBar.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/gadget/WidgetDatabaseHelper.java
|
5afc4916f4e6f26ea72ac955466888821b3a070e |
29-Aug-2011 |
Wei Huang <weih@google.com> |
Revert "Move resource to sync library." This reverts commit 50602e846230d8d944b81c651b11f40c8d21221c.
es/layout/cache_notification.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values/strings.xml
|
c339b76e90924bdbbdf514820cce11d25b8f8c60 |
29-Aug-2011 |
Wei Huang <weih@google.com> |
Revert "Move resource to sync library." This reverts commit 50602e846230d8d944b81c651b11f40c8d21221c.
es/layout/cache_notification.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values/strings.xml
|
86a8b2cf9b311ef3d857061ddc9bc801192bc8b0 |
29-Aug-2011 |
Wei Huang <weih@google.com> |
Revert "Move resource to sync library." This reverts commit 50602e846230d8d944b81c651b11f40c8d21221c.
es/layout/cache_notification.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values/strings.xml
|
779377e489158b8db0be1168002f4416f4ef319c |
29-Aug-2011 |
Wei Huang <weih@google.com> |
Revert "Move resource to sync library." This reverts commit 50602e846230d8d944b81c651b11f40c8d21221c.
es/layout/cache_notification.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values/strings.xml
|
7474877ffcaa8480872083b36e3d2b00eb0bc867 |
29-Aug-2011 |
Ray Chen <raychen@google.com> |
Fix 4975579 PTP: Unable to load the thumbnails while connected to camera There's a deadlock in threadpool. The fix has been verified. Change-Id: I000527f55fc2a3777bd4bb06817a9967b2f50488
rc/com/android/gallery3d/data/MtpImage.java
rc/com/android/gallery3d/ui/ActionModeHandler.java
|
8da5fdfe8f8d15aa688e504afd3ede2555de8bde |
29-Aug-2011 |
Ray Chen <raychen@google.com> |
Fix 4975579 PTP: Unable to load the thumbnails while connected to camera There's a deadlock in threadpool. The fix has been verified. Change-Id: I000527f55fc2a3777bd4bb06817a9967b2f50488
rc/com/android/gallery3d/data/MtpImage.java
rc/com/android/gallery3d/ui/ActionModeHandler.java
|
b7c2ed35a8311410817ae6e6bc47f89f7279695c |
29-Aug-2011 |
Owen Lin <owenlin@google.com> |
Merge "Make sure the sides of a backup image are less than 1024."
|
b60402ba7551478d324fb777bb5f45b11dffe37c |
29-Aug-2011 |
Owen Lin <owenlin@google.com> |
Make sure the sides of a backup image are less than 1024. fix: 5117367 In this case(5117367), the original backup image would be 2325x1029, which exceeds the limit of an texture and thus shows a blank image. Change-Id: I3176e191c68199308fe3770c10ee0ae2d310c96a
rc/com/android/gallery3d/app/SinglePhotoDataAdapter.java
|
5007a96dea76c9f3871b97579b51853029c115a0 |
29-Aug-2011 |
Owen Lin <owenlin@google.com> |
Make sure the sides of a backup image are less than 1024. fix: 5117367 In this case(5117367), the original backup image would be 2325x1029, which exceeds the limit of an texture and thus shows a blank image. Change-Id: I3176e191c68199308fe3770c10ee0ae2d310c96a
rc/com/android/gallery3d/app/SinglePhotoDataAdapter.java
|
bdcae32b3b12e99798b1c7f10d6fda49d41fc509 |
26-Aug-2011 |
Owen Lin <owenlin@google.com> |
Move resource to sync library. Change-Id: I9bcd9f65b0e222d2a54eef505096706f586fc1a6
es/layout/cache_notification.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values/strings.xml
|
50602e846230d8d944b81c651b11f40c8d21221c |
26-Aug-2011 |
Owen Lin <owenlin@google.com> |
Move resource to sync library. Change-Id: I9bcd9f65b0e222d2a54eef505096706f586fc1a6
es/layout/cache_notification.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values/strings.xml
|
ea6afaebe071ada8439ad88ee3d892cae4391bfd |
28-Aug-2011 |
Owen Lin <owenlin@google.com> |
Merge "Use getEmbeddedPicture to get thumbnail of a picture."
|
d17108392a0715a374e2738d2fd5623a4967df14 |
28-Aug-2011 |
Owen Lin <owenlin@google.com> |
Merge "Use getEmbeddedPicture to get thumbnail of a picture."
|
7f24a84d74a761eb66c90307358269246a716647 |
28-Aug-2011 |
Owen Lin <owenlin@google.com> |
Merge "Launch Gallery from review intent."
|
7815efda6c0632dd80424ee9aca5cfcfcac14646 |
28-Aug-2011 |
Owen Lin <owenlin@google.com> |
Merge "Launch Gallery from review intent."
|
335cad27ab9924a3781888cef21dc9a5de4d9c1c |
27-Aug-2011 |
Owen Lin <owenlin@google.com> |
Merge "Fix: 5217165, cannot edit downloaded image"
|
a21a6b302dde029246d510edcb2d62ae3c645ead |
27-Aug-2011 |
Owen Lin <owenlin@google.com> |
Merge "Fix: 5217165, cannot edit downloaded image"
|
d4ddc2242e84483d62743ad73901badae90325ec |
26-Aug-2011 |
Eric Fischer <enf@google.com> |
Import revised translations. Change-Id: I545c2484686c2123c73566939f89503820a16f23
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
252df033d9ebfad4bbdddb6726d304509fa3695d |
26-Aug-2011 |
Eric Fischer <enf@google.com> |
Import revised translations. Change-Id: I545c2484686c2123c73566939f89503820a16f23
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
57382b756d26cb58fe6e53e8238edb745c882cd8 |
26-Aug-2011 |
Owen Lin <owenlin@google.com> |
Fix: 5217165, cannot edit downloaded image The contentUri of the download image is "file:///xxx". Thus, it cannot get the correct file type. So, we pass the mimetype in the intent to fix this issue. Change-Id: I49b4b96472eb6a1561fbada95190c829728c037e
rc/com/android/gallery3d/ui/MenuExecutor.java
|
1801ef094a8afe7973dc4ec877cc51262fd1544a |
26-Aug-2011 |
Owen Lin <owenlin@google.com> |
Fix: 5217165, cannot edit downloaded image The contentUri of the download image is "file:///xxx". Thus, it cannot get the correct file type. So, we pass the mimetype in the intent to fix this issue. Change-Id: I49b4b96472eb6a1561fbada95190c829728c037e
rc/com/android/gallery3d/ui/MenuExecutor.java
|
0fba76118f02b8812926be604589d81b70b336bf |
26-Aug-2011 |
Owen Lin <owenlin@google.com> |
Use getEmbeddedPicture to get thumbnail of a picture. Change-Id: I69d0d2129906eb780df3940f0bdce0e84c5e2b1d fix: 4190748
allerycommon/src/com/android/gallery3d/common/BitmapUtils.java
|
d26c253b21e0acf18c0fde5fcfa256100d39ebe5 |
26-Aug-2011 |
Owen Lin <owenlin@google.com> |
Use getEmbeddedPicture to get thumbnail of a picture. Change-Id: I69d0d2129906eb780df3940f0bdce0e84c5e2b1d fix: 4190748
allerycommon/src/com/android/gallery3d/common/BitmapUtils.java
|
8cdfc6a0cd6b32f4c2baa64dbaddb8f496dced6d |
26-Aug-2011 |
Owen Lin <owenlin@google.com> |
Use getEmbeddedPicture to get thumbnail of a picture. Change-Id: I69d0d2129906eb780df3940f0bdce0e84c5e2b1d fix: 4190748
allerycommon/src/com/android/gallery3d/common/BitmapUtils.java
|
f595f26b83a5f30b7356e4dcbb85c23a6c0bd554 |
26-Aug-2011 |
Ray Chen <raychen@google.com> |
Fix 5133608 [UI] Details should be displayed as a system dialog in phone UI We need this to reset the grid drawer. Change-Id: Iead6568db1903d7e722f0e8154388ccd8f1aee67
rc/com/android/gallery3d/app/AlbumPage.java
rc/com/android/gallery3d/app/AlbumSetPage.java
rc/com/android/gallery3d/ui/DialogDetailsView.java
|
a4f0526dc8d993fb914d0e6505e22a1f30ad0e14 |
26-Aug-2011 |
Ray Chen <raychen@google.com> |
Fix 5133608 [UI] Details should be displayed as a system dialog in phone UI We need this to reset the grid drawer. Change-Id: Iead6568db1903d7e722f0e8154388ccd8f1aee67
rc/com/android/gallery3d/app/AlbumPage.java
rc/com/android/gallery3d/app/AlbumSetPage.java
rc/com/android/gallery3d/ui/DialogDetailsView.java
|
799c8444584db9fc945454997669432c279e17ae |
26-Aug-2011 |
Owen Lin <owenlin@google.com> |
Launch Gallery from review intent. Change-Id: Iaa2e9bdfde3ac6566dd65464ece82f4a5ced6831 fix: 3462852
rc/com/android/gallery3d/app/ActivityState.java
rc/com/android/gallery3d/app/Gallery.java
rc/com/android/gallery3d/app/StateManager.java
|
b6284920898627fa787900a99fc97b71a0c77574 |
26-Aug-2011 |
Owen Lin <owenlin@google.com> |
Launch Gallery from review intent. Change-Id: Iaa2e9bdfde3ac6566dd65464ece82f4a5ced6831 fix: 3462852
rc/com/android/gallery3d/app/ActivityState.java
rc/com/android/gallery3d/app/Gallery.java
rc/com/android/gallery3d/app/StateManager.java
|
7c56dc26503e304905971830da9527968b64e6ab |
24-Aug-2011 |
Ray Chen <raychen@google.com> |
Fix 5133608 [UI] Details should be displayed as a system dialog in phone UI Fix 5132798 [UI] Details popup on tablet is incorrectly placed and should not have x icon to close Fix 5199822 Long press and select "detail" shows details of another item Change-Id: I0e992ded8a154edb1c7a81b75d0461d5bf309f31
es/drawable-hdpi/ic_lockscreen_chevron_up.png
es/drawable-mdpi/ic_lockscreen_chevron_up.png
es/layout/details.xml
es/values-xlarge/bool.xml
es/values/bool.xml
es/values/strings.xml
rc/com/android/gallery3d/ui/DetailsAddressResolver.java
|
327eeb846fa6b2649db90fc4e5708f7fdcbbfaa2 |
24-Aug-2011 |
Ray Chen <raychen@google.com> |
Fix 5133608 [UI] Details should be displayed as a system dialog in phone UI Fix 5132798 [UI] Details popup on tablet is incorrectly placed and should not have x icon to close Fix 5199822 Long press and select "detail" shows details of another item Change-Id: I0e992ded8a154edb1c7a81b75d0461d5bf309f31
rc/com/android/gallery3d/app/AlbumPage.java
rc/com/android/gallery3d/app/AlbumSetPage.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/ui/DetailsAddressResolver.java
rc/com/android/gallery3d/ui/DetailsHelper.java
rc/com/android/gallery3d/ui/DetailsWindow.java
rc/com/android/gallery3d/ui/DialogDetailsView.java
rc/com/android/gallery3d/ui/GLDetailsView.java
rc/com/android/gallery3d/ui/ScrollView.java
|
4105e22d72d7a44e67cba4a58ad88018ed664d10 |
24-Aug-2011 |
Ray Chen <raychen@google.com> |
Fix 5133608 [UI] Details should be displayed as a system dialog in phone UI Fix 5132798 [UI] Details popup on tablet is incorrectly placed and should not have x icon to close Fix 5199822 Long press and select "detail" shows details of another item Change-Id: I0e992ded8a154edb1c7a81b75d0461d5bf309f31
es/drawable-hdpi/ic_lockscreen_chevron_up.png
es/drawable-mdpi/ic_lockscreen_chevron_up.png
es/layout/details.xml
es/values-xlarge/bool.xml
es/values/bool.xml
es/values/strings.xml
rc/com/android/gallery3d/app/AlbumPage.java
rc/com/android/gallery3d/app/AlbumSetPage.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/ui/DetailsAddressResolver.java
rc/com/android/gallery3d/ui/DetailsHelper.java
rc/com/android/gallery3d/ui/DetailsWindow.java
rc/com/android/gallery3d/ui/DialogDetailsView.java
rc/com/android/gallery3d/ui/GLDetailsView.java
rc/com/android/gallery3d/ui/ScrollView.java
|
ca69a7dd02057818b7d3d61979561958d6109758 |
26-Aug-2011 |
Ray Chen <raychen@google.com> |
Merge "Fix 5205456 After sharing multiple images, the selection should be cleared"
|
2b0da6233f82b57c9905d59f4c6e2fe770e56c96 |
26-Aug-2011 |
Ray Chen <raychen@google.com> |
Merge "Fix 5205456 After sharing multiple images, the selection should be cleared"
|
11e7f198384fc18a624b27980fc65ef65fd3cbcb |
25-Aug-2011 |
Ray Chen <raychen@google.com> |
Fix 5188970 Cannot close Gallery when opened from Email/Gmail Change-Id: I7af203a9aec8ebaf6c33fa592c996f917e0caca8
rc/com/android/gallery3d/app/AlbumPage.java
rc/com/android/gallery3d/app/AlbumSetPage.java
|
bd8e025f1bb39b2be236b183ea8e78f93b308ad1 |
25-Aug-2011 |
Ray Chen <raychen@google.com> |
Fix 5188970 Cannot close Gallery when opened from Email/Gmail Change-Id: I7af203a9aec8ebaf6c33fa592c996f917e0caca8
rc/com/android/gallery3d/app/AlbumPage.java
rc/com/android/gallery3d/app/AlbumSetPage.java
|
6e08652a742e80e2db4bdb6d3782327efc2a090c |
25-Aug-2011 |
Ray Chen <raychen@google.com> |
Fix 5199444 In crop interface, check button and X button should be switched Change-Id: I96e83c6a7afe9aef7c3ac54d8902fb5495e4b76d
es/menu/crop.xml
|
60cb2b3f149db439eec4e3dfe25dad34e38848ea |
25-Aug-2011 |
Ray Chen <raychen@google.com> |
Fix 5199444 In crop interface, check button and X button should be switched Change-Id: I96e83c6a7afe9aef7c3ac54d8902fb5495e4b76d
es/menu/crop.xml
|
6b7d527695cfbe5681865654bf078358f5ca687f |
18-Aug-2011 |
Ray Chen <raychen@google.com> |
Fix 5027908 Crash in MMS while attaching a picture from Picasa Change-Id: I7f67a7da5191f0ec8fbe3fc3c2d79e54394c4715
rc/com/android/gallery3d/provider/GalleryProvider.java
|
cd09872e859075aa8b5b90a151b0cae901bf4810 |
18-Aug-2011 |
Ray Chen <raychen@google.com> |
Fix 5027908 Crash in MMS while attaching a picture from Picasa Change-Id: I7f67a7da5191f0ec8fbe3fc3c2d79e54394c4715
rc/com/android/gallery3d/provider/GalleryProvider.java
|
90464f2241c2f0fcd1aee23ccff7255ca4dc4242 |
24-Aug-2011 |
Owen Lin <owenlin@google.com> |
Merge "Fix shortcup broken issue."
|
023a8c06b5e3fafab92cc07f2f93641253e32bb3 |
24-Aug-2011 |
Owen Lin <owenlin@google.com> |
Merge "Fix shortcup broken issue."
|
7876805a21e522941dd6f8ec9683755229be6eff |
18-Aug-2011 |
Owen Lin <owenlin@google.com> |
Fix shortcup broken issue. fix: 5154308 Change-Id: I5cd2ef8efb84d4f356b3fe93106bddf10e0823cc
ndroidManifest.xml
|
585778e0d576d458dd8a0c695373208a53e798ec |
18-Aug-2011 |
Owen Lin <owenlin@google.com> |
Fix shortcup broken issue. fix: 5154308 Change-Id: I5cd2ef8efb84d4f356b3fe93106bddf10e0823cc
es/xml/widget_info.xml
|
5673202ac99b89112a82210016885a9355f7e991 |
18-Aug-2011 |
Owen Lin <owenlin@google.com> |
Fix shortcup broken issue. fix: 5154308 Change-Id: I5cd2ef8efb84d4f356b3fe93106bddf10e0823cc
rc/com/android/gallery3d/app/GalleryAppImpl.java
rc/com/android/gallery3d/gadget/LocalPhotoSource.java
rc/com/android/gallery3d/gadget/MediaSetSource.java
rc/com/android/gallery3d/gadget/PhotoAppWidgetProvider.java
rc/com/android/gallery3d/gadget/WidgetClickHandler.java
rc/com/android/gallery3d/gadget/WidgetConfigure.java
rc/com/android/gallery3d/gadget/WidgetDatabaseHelper.java
rc/com/android/gallery3d/gadget/WidgetService.java
rc/com/android/gallery3d/gadget/WidgetSource.java
rc/com/android/gallery3d/gadget/WidgetTypeChooser.java
rc/com/android/gallery3d/gadget/WidgetUtils.java
rc/com/android/gallery3d/widget/LocalPhotoSource.java
rc/com/android/gallery3d/widget/MediaSetSource.java
rc/com/android/gallery3d/widget/WidgetClickHandler.java
rc/com/android/gallery3d/widget/WidgetConfigure.java
rc/com/android/gallery3d/widget/WidgetDatabaseHelper.java
rc/com/android/gallery3d/widget/WidgetProvider.java
rc/com/android/gallery3d/widget/WidgetService.java
rc/com/android/gallery3d/widget/WidgetSource.java
rc/com/android/gallery3d/widget/WidgetTypeChooser.java
rc/com/android/gallery3d/widget/WidgetUtils.java
|
d6db8eab6df048b9065834113a6d46a885af01d3 |
18-Aug-2011 |
Owen Lin <owenlin@google.com> |
Fix shortcup broken issue. fix: 5154308 Change-Id: I5cd2ef8efb84d4f356b3fe93106bddf10e0823cc
ndroidManifest.xml
es/xml/widget_info.xml
rc/com/android/gallery3d/app/GalleryAppImpl.java
rc/com/android/gallery3d/gadget/LocalPhotoSource.java
rc/com/android/gallery3d/gadget/MediaSetSource.java
rc/com/android/gallery3d/gadget/PhotoAppWidgetProvider.java
rc/com/android/gallery3d/gadget/WidgetClickHandler.java
rc/com/android/gallery3d/gadget/WidgetConfigure.java
rc/com/android/gallery3d/gadget/WidgetDatabaseHelper.java
rc/com/android/gallery3d/gadget/WidgetService.java
rc/com/android/gallery3d/gadget/WidgetSource.java
rc/com/android/gallery3d/gadget/WidgetTypeChooser.java
rc/com/android/gallery3d/gadget/WidgetUtils.java
rc/com/android/gallery3d/widget/LocalPhotoSource.java
rc/com/android/gallery3d/widget/MediaSetSource.java
rc/com/android/gallery3d/widget/WidgetClickHandler.java
rc/com/android/gallery3d/widget/WidgetConfigure.java
rc/com/android/gallery3d/widget/WidgetDatabaseHelper.java
rc/com/android/gallery3d/widget/WidgetProvider.java
rc/com/android/gallery3d/widget/WidgetService.java
rc/com/android/gallery3d/widget/WidgetSource.java
rc/com/android/gallery3d/widget/WidgetTypeChooser.java
rc/com/android/gallery3d/widget/WidgetUtils.java
|
13160eec854c6ac8985db1c5fb86d1523e92f860 |
24-Aug-2011 |
Owen Lin <owenlin@google.com> |
Fix cannot edit picasa synced images. Change-Id: Ic2df3f6a8a93711c8616b1532acef12d67341062 fix: 5202762
rc/com/android/gallery3d/data/MtpImage.java
rc/com/android/gallery3d/provider/GalleryProvider.java
|
476a89e18fc6b8a472b4e352d20be3a09a1776a4 |
24-Aug-2011 |
Owen Lin <owenlin@google.com> |
Fix cannot edit picasa synced images. Change-Id: Ic2df3f6a8a93711c8616b1532acef12d67341062 fix: 5202762
rc/com/android/gallery3d/data/MtpImage.java
rc/com/android/gallery3d/provider/GalleryProvider.java
|
d2e19e16729154f4924951cf3c89fd79768538c2 |
24-Aug-2011 |
Ray Chen <raychen@google.com> |
Fix 5205456 After sharing multiple images, the selection should be cleared Change-Id: I9fd12d371269197e1e05a6c49dae2b9a81ae4ca0
rc/com/android/gallery3d/app/GalleryActionBar.java
rc/com/android/gallery3d/ui/ActionModeHandler.java
|
d6f517849bc63338ce2ab2c51c9fb7a3e167b916 |
24-Aug-2011 |
Ray Chen <raychen@google.com> |
Fix 5205456 After sharing multiple images, the selection should be cleared Change-Id: I9fd12d371269197e1e05a6c49dae2b9a81ae4ca0
rc/com/android/gallery3d/app/GalleryActionBar.java
rc/com/android/gallery3d/ui/ActionModeHandler.java
|
31c7b13bf1c93f7eabd658e55c545eccd9d347a9 |
23-Aug-2011 |
Owen Lin <owenlin@google.com> |
Merge "Fix unknown type for GL issue."
|
666f131bda5fbb02a07d54cfb0282e1d224d8f19 |
23-Aug-2011 |
Owen Lin <owenlin@google.com> |
Merge "Fix unknown type for GL issue."
|
7c0c90753c81e64b7e3cce0677b8dd7f61bbf7dc |
22-Aug-2011 |
Eric Fischer <enf@google.com> |
Import revised translations. Change-Id: I6069ac29facfbd1e43c9b844e722b9645e8376dd
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
90bcd482f48e66227b7d9fc4ad4681cbaae60fc5 |
22-Aug-2011 |
Eric Fischer <enf@google.com> |
Import revised translations. Change-Id: I6069ac29facfbd1e43c9b844e722b9645e8376dd
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
|
b225416022949bbc265ead6832ef92e9e08aa3fe |
19-Aug-2011 |
Owen Lin <owenlin@google.com> |
Fix unknown type for GL issue. fix: 5171449 Change-Id: Ib62e3237584144e94be6be773c292002bea5d21c
rc/com/android/gallery3d/data/DecodeUtils.java
rc/com/android/gallery3d/ui/TileImageView.java
|
c060a99d0d0f6a0bbcf3cd6bbc6ee9d91e15814d |
19-Aug-2011 |
Owen Lin <owenlin@google.com> |
Fix unknown type for GL issue. fix: 5171449 Change-Id: Ib62e3237584144e94be6be773c292002bea5d21c
rc/com/android/gallery3d/data/DecodeUtils.java
rc/com/android/gallery3d/ui/TileImageView.java
|
e979160a10fcfc9d580b6bbacc11af6ee40ef32a |
19-Aug-2011 |
Ray Chen <raychen@google.com> |
Merge "Fix 5179285 "Show on Map" intent for geotagged images mis-formatted in French"
|
b668a0ba747d751253b04e8fef42d64a9e4feae7 |
19-Aug-2011 |
Ray Chen <raychen@google.com> |
Merge "Fix 5179285 "Show on Map" intent for geotagged images mis-formatted in French"
|
77fd27466cabd2506acd76b29e3381fba5101a65 |
19-Aug-2011 |
Ray Chen <raychen@google.com> |
Merge "Fix 5179825 Toast is created in a unprepared looper."
|
bc4be6e707ee101dfbdc0c11f20baedc896f2905 |
19-Aug-2011 |
Ray Chen <raychen@google.com> |
Fix 5158515 [UI] Slideshow action in portrait Photo/Video and Video playback views should be in the overflow/menu Change-Id: If3171b9db1ad2f9f238f1fd5625ac9a1ed7d5ef0
es/menu/photo.xml
|
402656b4d8bd58cb17ef7bc3d1aff01a5b63d72e |
19-Aug-2011 |
Ray Chen <raychen@google.com> |
Fix 5158515 [UI] Slideshow action in portrait Photo/Video and Video playback views should be in the overflow/menu Change-Id: If3171b9db1ad2f9f238f1fd5625ac9a1ed7d5ef0
es/menu/photo.xml
|
d39cf88ba45d82e5dbb7475a6de042ea072c100c |
19-Aug-2011 |
Ray Chen <raychen@google.com> |
Fix 5179825 Toast is created in a unprepared looper. Change-Id: I80021755bc012340ed00fa52a20bf560369e9368
rc/com/android/gallery3d/data/LocationClustering.java
|
598e242e3cb97f61a1eaf71d21459e45a5b2db42 |
19-Aug-2011 |
Ray Chen <raychen@google.com> |
Fix 5179825 Toast is created in a unprepared looper. Change-Id: I80021755bc012340ed00fa52a20bf560369e9368
rc/com/android/gallery3d/data/LocationClustering.java
|
06d90f453e650ddece8423ef2bef888f64b40ae3 |
19-Aug-2011 |
Ray Chen <raychen@google.com> |
Fix 5179285 "Show on Map" intent for geotagged images mis-formatted in French Change-Id: I4af6b549b534786163505d41b181888d347743d9
rc/com/android/gallery3d/ui/DetailsWindow.java
rc/com/android/gallery3d/util/GalleryUtils.java
|
376be105e4396612a28c8911ce98d823a328d407 |
19-Aug-2011 |
Ray Chen <raychen@google.com> |
Fix 5179285 "Show on Map" intent for geotagged images mis-formatted in French Change-Id: I4af6b549b534786163505d41b181888d347743d9
rc/com/android/gallery3d/ui/DetailsWindow.java
rc/com/android/gallery3d/util/GalleryUtils.java
|
4aee2ab0eeb7cb65c7128600b1284f8389d9b5b0 |
17-Aug-2011 |
Owen Lin <owenlin@google.com> |
Initial code for Gallery2. fix: 5176434 Change-Id: I041e282b9c7b34ceb1db8b033be2b853bb3a992c
ndroid.mk
allerycommon/Android.mk
ests/Android.mk
|
33f3a80fdff82236f65afd46b70b8f949d6a2107 |
17-Aug-2011 |
Owen Lin <owenlin@google.com> |
Initial code for Gallery2. fix: 5176434 Change-Id: I041e282b9c7b34ceb1db8b033be2b853bb3a992c
roguard.flags
|
4261e8fb4056d66a18396db7c53f020818cce4ee |
17-Aug-2011 |
Owen Lin <owenlin@google.com> |
Initial code for Gallery2. fix: 5176434 Change-Id: I041e282b9c7b34ceb1db8b033be2b853bb3a992c
allerycommon/Android.mk
allerycommon/src/com/android/gallery3d/common/BitmapUtils.java
allerycommon/src/com/android/gallery3d/common/BlobCache.java
allerycommon/src/com/android/gallery3d/common/Entry.java
allerycommon/src/com/android/gallery3d/common/EntrySchema.java
allerycommon/src/com/android/gallery3d/common/FileCache.java
allerycommon/src/com/android/gallery3d/common/Fingerprint.java
allerycommon/src/com/android/gallery3d/common/HttpClientFactory.java
allerycommon/src/com/android/gallery3d/common/LruCache.java
allerycommon/src/com/android/gallery3d/common/Utils.java
|
b540ef1ebcc326cb42568fda7ad8ae33b9fb9d0a |
17-Aug-2011 |
Owen Lin <owenlin@google.com> |
Initial code for Gallery2. fix: 5176434 Change-Id: I041e282b9c7b34ceb1db8b033be2b853bb3a992c
ndroidManifest.xml
ests/AndroidManifest.xml
|
a2fba687d4d2dbb3b2db8866b054ecb0e42871b2 |
17-Aug-2011 |
Owen Lin <owenlin@google.com> |
Initial code for Gallery2. fix: 5176434 Change-Id: I041e282b9c7b34ceb1db8b033be2b853bb3a992c
allerycommon/src/com/android/gallery3d/common/BitmapUtils.java
allerycommon/src/com/android/gallery3d/common/BlobCache.java
allerycommon/src/com/android/gallery3d/common/Entry.java
allerycommon/src/com/android/gallery3d/common/EntrySchema.java
allerycommon/src/com/android/gallery3d/common/FileCache.java
allerycommon/src/com/android/gallery3d/common/Fingerprint.java
allerycommon/src/com/android/gallery3d/common/HttpClientFactory.java
allerycommon/src/com/android/gallery3d/common/LruCache.java
allerycommon/src/com/android/gallery3d/common/Utils.java
rc/com/android/gallery3d/anim/AlphaAnimation.java
rc/com/android/gallery3d/anim/Animation.java
rc/com/android/gallery3d/anim/AnimationSet.java
rc/com/android/gallery3d/anim/CanvasAnimation.java
rc/com/android/gallery3d/anim/FloatAnimation.java
rc/com/android/gallery3d/app/AbstractGalleryActivity.java
rc/com/android/gallery3d/app/ActivityState.java
rc/com/android/gallery3d/app/AlbumDataAdapter.java
rc/com/android/gallery3d/app/AlbumPage.java
rc/com/android/gallery3d/app/AlbumPicker.java
rc/com/android/gallery3d/app/AlbumSetDataAdapter.java
rc/com/android/gallery3d/app/AlbumSetPage.java
rc/com/android/gallery3d/app/Config.java
rc/com/android/gallery3d/app/CropImage.java
rc/com/android/gallery3d/app/DialogPicker.java
rc/com/android/gallery3d/app/EyePosition.java
rc/com/android/gallery3d/app/FilterUtils.java
rc/com/android/gallery3d/app/Gallery.java
rc/com/android/gallery3d/app/GalleryActionBar.java
rc/com/android/gallery3d/app/GalleryActivity.java
rc/com/android/gallery3d/app/GalleryApp.java
rc/com/android/gallery3d/app/GalleryAppImpl.java
rc/com/android/gallery3d/app/GalleryContext.java
rc/com/android/gallery3d/app/LoadingListener.java
rc/com/android/gallery3d/app/Log.java
rc/com/android/gallery3d/app/ManageCachePage.java
rc/com/android/gallery3d/app/MovieActivity.java
rc/com/android/gallery3d/app/MoviePlayer.java
rc/com/android/gallery3d/app/PackagesMonitor.java
rc/com/android/gallery3d/app/PhotoDataAdapter.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/app/SinglePhotoDataAdapter.java
rc/com/android/gallery3d/app/SlideshowDataAdapter.java
rc/com/android/gallery3d/app/SlideshowDream.java
rc/com/android/gallery3d/app/SlideshowPage.java
rc/com/android/gallery3d/app/StateManager.java
rc/com/android/gallery3d/app/UsbDeviceActivity.java
rc/com/android/gallery3d/app/Wallpaper.java
rc/com/android/gallery3d/data/ChangeNotifier.java
rc/com/android/gallery3d/data/ClusterAlbum.java
rc/com/android/gallery3d/data/ClusterAlbumSet.java
rc/com/android/gallery3d/data/ClusterSource.java
rc/com/android/gallery3d/data/Clustering.java
rc/com/android/gallery3d/data/ComboAlbum.java
rc/com/android/gallery3d/data/ComboAlbumSet.java
rc/com/android/gallery3d/data/ComboSource.java
rc/com/android/gallery3d/data/ContentListener.java
rc/com/android/gallery3d/data/DataManager.java
rc/com/android/gallery3d/data/DecodeUtils.java
rc/com/android/gallery3d/data/DownloadCache.java
rc/com/android/gallery3d/data/DownloadEntry.java
rc/com/android/gallery3d/data/DownloadUtils.java
rc/com/android/gallery3d/data/Face.java
rc/com/android/gallery3d/data/FaceClustering.java
rc/com/android/gallery3d/data/FilterSet.java
rc/com/android/gallery3d/data/FilterSource.java
rc/com/android/gallery3d/data/ImageCacheRequest.java
rc/com/android/gallery3d/data/ImageCacheService.java
rc/com/android/gallery3d/data/LocalAlbum.java
rc/com/android/gallery3d/data/LocalAlbumSet.java
rc/com/android/gallery3d/data/LocalImage.java
rc/com/android/gallery3d/data/LocalMediaItem.java
rc/com/android/gallery3d/data/LocalMergeAlbum.java
rc/com/android/gallery3d/data/LocalSource.java
rc/com/android/gallery3d/data/LocalVideo.java
rc/com/android/gallery3d/data/LocationClustering.java
rc/com/android/gallery3d/data/Log.java
rc/com/android/gallery3d/data/MediaDetails.java
rc/com/android/gallery3d/data/MediaItem.java
rc/com/android/gallery3d/data/MediaObject.java
rc/com/android/gallery3d/data/MediaSet.java
rc/com/android/gallery3d/data/MediaSource.java
rc/com/android/gallery3d/data/MtpClient.java
rc/com/android/gallery3d/data/MtpContext.java
rc/com/android/gallery3d/data/MtpDevice.java
rc/com/android/gallery3d/data/MtpDeviceSet.java
rc/com/android/gallery3d/data/MtpImage.java
rc/com/android/gallery3d/data/MtpSource.java
rc/com/android/gallery3d/data/Path.java
rc/com/android/gallery3d/data/PathMatcher.java
rc/com/android/gallery3d/data/SizeClustering.java
rc/com/android/gallery3d/data/TagClustering.java
rc/com/android/gallery3d/data/TimeClustering.java
rc/com/android/gallery3d/data/UriImage.java
rc/com/android/gallery3d/data/UriSource.java
rc/com/android/gallery3d/provider/GalleryProvider.java
rc/com/android/gallery3d/ui/AbstractDisplayItem.java
rc/com/android/gallery3d/ui/ActionModeHandler.java
rc/com/android/gallery3d/ui/AdaptiveBackground.java
rc/com/android/gallery3d/ui/AlbumSetSlidingWindow.java
rc/com/android/gallery3d/ui/AlbumSetView.java
rc/com/android/gallery3d/ui/AlbumSlidingWindow.java
rc/com/android/gallery3d/ui/AlbumView.java
rc/com/android/gallery3d/ui/BasicTexture.java
rc/com/android/gallery3d/ui/BitmapTexture.java
rc/com/android/gallery3d/ui/BitmapTileProvider.java
rc/com/android/gallery3d/ui/BoxBlurFilter.java
rc/com/android/gallery3d/ui/CacheBarView.java
rc/com/android/gallery3d/ui/CanvasTexture.java
rc/com/android/gallery3d/ui/ColorTexture.java
rc/com/android/gallery3d/ui/Config.java
rc/com/android/gallery3d/ui/CropView.java
rc/com/android/gallery3d/ui/CustomMenu.java
rc/com/android/gallery3d/ui/DetailsWindow.java
rc/com/android/gallery3d/ui/DisplayItem.java
rc/com/android/gallery3d/ui/DownUpDetector.java
rc/com/android/gallery3d/ui/DrawableTexture.java
rc/com/android/gallery3d/ui/FilmStripView.java
rc/com/android/gallery3d/ui/GLCanvas.java
rc/com/android/gallery3d/ui/GLCanvasImpl.java
rc/com/android/gallery3d/ui/GLPaint.java
rc/com/android/gallery3d/ui/GLRoot.java
rc/com/android/gallery3d/ui/GLRootView.java
rc/com/android/gallery3d/ui/GLView.java
rc/com/android/gallery3d/ui/GalleryEGLConfigChooser.java
rc/com/android/gallery3d/ui/GridDrawer.java
rc/com/android/gallery3d/ui/HighlightDrawer.java
rc/com/android/gallery3d/ui/Icon.java
rc/com/android/gallery3d/ui/IconDrawer.java
rc/com/android/gallery3d/ui/ImportCompleteListener.java
rc/com/android/gallery3d/ui/Label.java
rc/com/android/gallery3d/ui/Log.java
rc/com/android/gallery3d/ui/ManageCacheDrawer.java
rc/com/android/gallery3d/ui/MeasureHelper.java
rc/com/android/gallery3d/ui/MenuExecutor.java
rc/com/android/gallery3d/ui/MultiLineTexture.java
rc/com/android/gallery3d/ui/NinePatchChunk.java
rc/com/android/gallery3d/ui/NinePatchTexture.java
rc/com/android/gallery3d/ui/OnSelectedListener.java
rc/com/android/gallery3d/ui/Paper.java
rc/com/android/gallery3d/ui/PhotoView.java
rc/com/android/gallery3d/ui/PositionProvider.java
rc/com/android/gallery3d/ui/PositionRepository.java
rc/com/android/gallery3d/ui/ProgressBar.java
rc/com/android/gallery3d/ui/ProgressSpinner.java
rc/com/android/gallery3d/ui/RawTexture.java
rc/com/android/gallery3d/ui/ResourceTexture.java
rc/com/android/gallery3d/ui/ScrollBarView.java
rc/com/android/gallery3d/ui/ScrollView.java
rc/com/android/gallery3d/ui/ScrollerHelper.java
rc/com/android/gallery3d/ui/SelectionDrawer.java
rc/com/android/gallery3d/ui/SelectionManager.java
rc/com/android/gallery3d/ui/SlideshowView.java
rc/com/android/gallery3d/ui/SlotView.java
rc/com/android/gallery3d/ui/StaticBackground.java
rc/com/android/gallery3d/ui/StringTexture.java
rc/com/android/gallery3d/ui/StripDrawer.java
rc/com/android/gallery3d/ui/SynchronizedHandler.java
rc/com/android/gallery3d/ui/TextButton.java
rc/com/android/gallery3d/ui/Texture.java
rc/com/android/gallery3d/ui/TileImageView.java
rc/com/android/gallery3d/ui/TileImageViewAdapter.java
rc/com/android/gallery3d/ui/UploadedTexture.java
rc/com/android/gallery3d/ui/UserInteractionListener.java
rc/com/android/gallery3d/util/CacheManager.java
rc/com/android/gallery3d/util/Future.java
rc/com/android/gallery3d/util/FutureListener.java
rc/com/android/gallery3d/util/FutureTask.java
rc/com/android/gallery3d/util/GalleryUtils.java
rc/com/android/gallery3d/util/IdentityCache.java
rc/com/android/gallery3d/util/IntArray.java
rc/com/android/gallery3d/util/InterruptableOutputStream.java
rc/com/android/gallery3d/util/LinkedNode.java
rc/com/android/gallery3d/util/Log.java
rc/com/android/gallery3d/util/MediaSetUtils.java
rc/com/android/gallery3d/util/PriorityThreadFactory.java
rc/com/android/gallery3d/util/ReverseGeocoder.java
rc/com/android/gallery3d/util/ThreadPool.java
rc/com/android/gallery3d/util/UpdateHelper.java
rc/com/android/gallery3d/widget/LocalPhotoSource.java
rc/com/android/gallery3d/widget/MediaSetSource.java
rc/com/android/gallery3d/widget/WidgetClickHandler.java
rc/com/android/gallery3d/widget/WidgetConfigure.java
rc/com/android/gallery3d/widget/WidgetDatabaseHelper.java
rc/com/android/gallery3d/widget/WidgetProvider.java
rc/com/android/gallery3d/widget/WidgetService.java
rc/com/android/gallery3d/widget/WidgetSource.java
rc/com/android/gallery3d/widget/WidgetTypeChooser.java
rc/com/android/gallery3d/widget/WidgetUtils.java
rc_pd/com/android/gallery3d/picasasource/PicasaSource.java
rc_pd/com/android/gallery3d/settings/GallerySettings.java
ests/src/com/android/gallery3d/anim/AnimationTest.java
ests/src/com/android/gallery3d/common/BlobCacheTest.java
ests/src/com/android/gallery3d/common/UtilsTest.java
ests/src/com/android/gallery3d/data/GalleryAppMock.java
ests/src/com/android/gallery3d/data/GalleryAppStub.java
ests/src/com/android/gallery3d/data/LocalDataTest.java
ests/src/com/android/gallery3d/data/MediaSetTest.java
ests/src/com/android/gallery3d/data/MockItem.java
ests/src/com/android/gallery3d/data/MockSet.java
ests/src/com/android/gallery3d/data/MockSource.java
ests/src/com/android/gallery3d/data/PathTest.java
ests/src/com/android/gallery3d/data/RealDataTest.java
ests/src/com/android/gallery3d/ui/GLCanvasMock.java
ests/src/com/android/gallery3d/ui/GLCanvasStub.java
ests/src/com/android/gallery3d/ui/GLCanvasTest.java
ests/src/com/android/gallery3d/ui/GLMock.java
ests/src/com/android/gallery3d/ui/GLRootMock.java
ests/src/com/android/gallery3d/ui/GLRootStub.java
ests/src/com/android/gallery3d/ui/GLStub.java
ests/src/com/android/gallery3d/ui/GLViewMock.java
ests/src/com/android/gallery3d/ui/GLViewTest.java
ests/src/com/android/gallery3d/ui/PointerInfo.java
ests/src/com/android/gallery3d/ui/TextureTest.java
ests/src/com/android/gallery3d/util/IntArrayTest.java
|
f9a0a4306d589b4a4e20554fed512a603426bfa1 |
17-Aug-2011 |
Owen Lin <owenlin@google.com> |
Initial code for Gallery2. fix: 5176434 Change-Id: I041e282b9c7b34ceb1db8b033be2b853bb3a992c
ndroid.mk
ndroidManifest.xml
allerycommon/Android.mk
allerycommon/src/com/android/gallery3d/common/BitmapUtils.java
allerycommon/src/com/android/gallery3d/common/BlobCache.java
allerycommon/src/com/android/gallery3d/common/Entry.java
allerycommon/src/com/android/gallery3d/common/EntrySchema.java
allerycommon/src/com/android/gallery3d/common/FileCache.java
allerycommon/src/com/android/gallery3d/common/Fingerprint.java
allerycommon/src/com/android/gallery3d/common/HttpClientFactory.java
allerycommon/src/com/android/gallery3d/common/LruCache.java
allerycommon/src/com/android/gallery3d/common/Utils.java
roguard.flags
es/drawable-hdpi/actionbar_translucent.9.png
es/drawable-hdpi/album_frame.9.png
es/drawable-hdpi/appwidget_photo_border.9.png
es/drawable-hdpi/background.jpg
es/drawable-hdpi/background_portrait.jpg
es/drawable-hdpi/border_photo_frame_widget_focused_holo.9.png
es/drawable-hdpi/border_photo_frame_widget_focused_pressed_holo.9.png
es/drawable-hdpi/border_photo_frame_widget_holo.9.png
es/drawable-hdpi/border_photo_frame_widget_pressed_holo.9.png
es/drawable-hdpi/btn_default_normal_holo_dark.9.png
es/drawable-hdpi/btn_default_pressed_holo_dark.9.png
es/drawable-hdpi/btn_make_offline_disabled_on_holo_dark.png
es/drawable-hdpi/btn_make_offline_normal_off_holo_dark.png
es/drawable-hdpi/btn_make_offline_normal_on_holo_dark.png
es/drawable-hdpi/cab_divider_vertical_dark.png
es/drawable-hdpi/camera_crop_height_holo.png
es/drawable-hdpi/camera_crop_width_holo.png
es/drawable-hdpi/dropdown_normal_holo_dark.9.png
es/drawable-hdpi/focus_box.9.png
es/drawable-hdpi/gallery_widget_preview.png
es/drawable-hdpi/grid_selected.9.png
es/drawable-hdpi/grid_selected_top.9.png
es/drawable-hdpi/ic_album_overlay_camera_holo.png
es/drawable-hdpi/ic_album_overlay_folder_holo.png
es/drawable-hdpi/ic_album_overlay_picassa_holo.png
es/drawable-hdpi/ic_album_overlay_ptp_holo.png
es/drawable-hdpi/ic_control_fail.png
es/drawable-hdpi/ic_control_play.png
es/drawable-hdpi/ic_manage_pin.png
es/drawable-hdpi/ic_menu_camera_holo_light.png
es/drawable-hdpi/ic_menu_cancel_holo_light.png
es/drawable-hdpi/ic_menu_info_details.png
es/drawable-hdpi/ic_menu_ptp_holo_light.png
es/drawable-hdpi/ic_menu_save_holo_light.png
es/drawable-hdpi/ic_menu_share_holo_light.png
es/drawable-hdpi/ic_menu_slideshow_holo_light.png
es/drawable-hdpi/ic_menu_trash_holo_light.png
es/drawable-hdpi/icn_media_pause_focused_holo_dark.png
es/drawable-hdpi/icn_media_pause_normal_holo_dark.png
es/drawable-hdpi/icn_media_pause_pressed_holo_dark.png
es/drawable-hdpi/icn_media_play_focused_holo_dark.png
es/drawable-hdpi/icn_media_play_normal_holo_dark.png
es/drawable-hdpi/icn_media_play_pressed_holo_dark.png
es/drawable-hdpi/import_translucent.9.png
es/drawable-hdpi/manage_bar.9.png
es/drawable-hdpi/manage_frame.9.png
es/drawable-hdpi/media_control_bg.9.png
es/drawable-hdpi/navstrip_translucent.9.png
es/drawable-hdpi/player_scrubber.png
es/drawable-hdpi/popup_full_dark.9.png
es/drawable-hdpi/preview.png
es/drawable-hdpi/progress_bg_holo_dark.9.png
es/drawable-hdpi/progress_primary_holo_dark.9.png
es/drawable-hdpi/progress_secondary_holo_dark.9.png
es/drawable-hdpi/scrollbar_handle_holo_dark.9.png
es/drawable-hdpi/spinner_76_inner_holo.png
es/drawable-hdpi/spinner_76_outer_holo.png
es/drawable-hdpi/thumbnail_album_video_overlay_holo.png
es/drawable-hdpi/videooverlay.png
es/drawable-hdpi/wallpaper_picker_preview.png
es/drawable-mdpi/actionbar_translucent.9.png
es/drawable-mdpi/album_frame.9.png
es/drawable-mdpi/appwidget_photo_border.9.png
es/drawable-mdpi/background.jpg
es/drawable-mdpi/background_portrait.jpg
es/drawable-mdpi/border_photo_frame_widget_focused_holo.9.png
es/drawable-mdpi/border_photo_frame_widget_focused_pressed_holo.9.png
es/drawable-mdpi/border_photo_frame_widget_holo.9.png
es/drawable-mdpi/border_photo_frame_widget_pressed_holo.9.png
es/drawable-mdpi/btn_default_normal_holo_dark.9.png
es/drawable-mdpi/btn_default_pressed_holo_dark.9.png
es/drawable-mdpi/btn_make_offline_disabled_on_holo_dark.png
es/drawable-mdpi/btn_make_offline_normal_off_holo_dark.png
es/drawable-mdpi/btn_make_offline_normal_on_holo_dark.png
es/drawable-mdpi/cab_divider_vertical_dark.png
es/drawable-mdpi/camera_crop_height_holo.png
es/drawable-mdpi/camera_crop_width_holo.png
es/drawable-mdpi/dropdown_normal_holo_dark.9.png
es/drawable-mdpi/focus_box.9.png
es/drawable-mdpi/gallery_widget_preview.png
es/drawable-mdpi/grid_selected.9.png
es/drawable-mdpi/grid_selected_top.9.png
es/drawable-mdpi/ic_album_overlay_camera_holo.png
es/drawable-mdpi/ic_album_overlay_folder_holo.png
es/drawable-mdpi/ic_album_overlay_picassa_holo.png
es/drawable-mdpi/ic_album_overlay_ptp_holo.png
es/drawable-mdpi/ic_control_fail.png
es/drawable-mdpi/ic_control_play.png
es/drawable-mdpi/ic_manage_pin.png
es/drawable-mdpi/ic_menu_camera_holo_light.png
es/drawable-mdpi/ic_menu_cancel_holo_light.png
es/drawable-mdpi/ic_menu_info_details.png
es/drawable-mdpi/ic_menu_ptp_holo_light.png
es/drawable-mdpi/ic_menu_save_holo_light.png
es/drawable-mdpi/ic_menu_share_holo_light.png
es/drawable-mdpi/ic_menu_slideshow_holo_light.png
es/drawable-mdpi/ic_menu_trash_holo_light.png
es/drawable-mdpi/icn_media_pause_focused_holo_dark.png
es/drawable-mdpi/icn_media_pause_normal_holo_dark.png
es/drawable-mdpi/icn_media_pause_pressed_holo_dark.png
es/drawable-mdpi/icn_media_play_focused_holo_dark.png
es/drawable-mdpi/icn_media_play_normal_holo_dark.png
es/drawable-mdpi/icn_media_play_pressed_holo_dark.png
es/drawable-mdpi/import_translucent.9.png
es/drawable-mdpi/manage_bar.9.png
es/drawable-mdpi/manage_frame.9.png
es/drawable-mdpi/media_control_bg.9.png
es/drawable-mdpi/navstrip_translucent.9.png
es/drawable-mdpi/player_scrubber.png
es/drawable-mdpi/popup_full_dark.9.png
es/drawable-mdpi/preview.png
es/drawable-mdpi/progress_bg_holo_dark.9.png
es/drawable-mdpi/progress_primary_holo_dark.9.png
es/drawable-mdpi/progress_secondary_holo_dark.9.png
es/drawable-mdpi/scrollbar_handle_holo_dark.9.png
es/drawable-mdpi/spinner_76_inner_holo.png
es/drawable-mdpi/spinner_76_outer_holo.png
es/drawable-mdpi/thumbnail_album_video_overlay_holo.png
es/drawable-mdpi/videooverlay.png
es/drawable-mdpi/wallpaper_picker_preview.png
es/drawable/border_photo_frame_widget.xml
es/drawable/icn_media_pause.xml
es/drawable/icn_media_play.xml
es/layout/account_header_preference.xml
es/layout/account_sync_preference.xml
es/layout/account_visible_preference.xml
es/layout/action_mode.xml
es/layout/appwidget_loading_item.xml
es/layout/appwidget_main.xml
es/layout/appwidget_photo_item.xml
es/layout/auto_upload_account_preference.xml
es/layout/auto_upload_help_text_preference.xml
es/layout/cache_notification.xml
es/layout/choose_widget_type.xml
es/layout/cropimage.xml
es/layout/dialog_picker.xml
es/layout/main.xml
es/layout/movie_view.xml
es/layout/photo_frame.xml
es/menu/album.xml
es/menu/albumset.xml
es/menu/crop.xml
es/menu/filterby.xml
es/menu/groupby.xml
es/menu/operation.xml
es/menu/photo.xml
es/menu/pickup.xml
es/menu/selection.xml
es/menu/settings.xml
es/mipmap-hdpi/ic_launcher_gallery.png
es/mipmap-mdpi/ic_launcher_gallery.png
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-w1024dp/strings.xml
es/values-xlarge/dimensions.xml
es/values-xlarge/styles.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
es/values/dimensions.xml
es/values/ids.xml
es/values/strings.xml
es/values/styles.xml
es/xml/device_filter.xml
es/xml/gallery_settings.xml
es/xml/syncadapter.xml
es/xml/wallpaper_picker_preview.xml
es/xml/widget_info.xml
rc/com/android/gallery3d/anim/AlphaAnimation.java
rc/com/android/gallery3d/anim/Animation.java
rc/com/android/gallery3d/anim/AnimationSet.java
rc/com/android/gallery3d/anim/CanvasAnimation.java
rc/com/android/gallery3d/anim/FloatAnimation.java
rc/com/android/gallery3d/app/AbstractGalleryActivity.java
rc/com/android/gallery3d/app/ActivityState.java
rc/com/android/gallery3d/app/AlbumDataAdapter.java
rc/com/android/gallery3d/app/AlbumPage.java
rc/com/android/gallery3d/app/AlbumPicker.java
rc/com/android/gallery3d/app/AlbumSetDataAdapter.java
rc/com/android/gallery3d/app/AlbumSetPage.java
rc/com/android/gallery3d/app/Config.java
rc/com/android/gallery3d/app/CropImage.java
rc/com/android/gallery3d/app/DialogPicker.java
rc/com/android/gallery3d/app/EyePosition.java
rc/com/android/gallery3d/app/FilterUtils.java
rc/com/android/gallery3d/app/Gallery.java
rc/com/android/gallery3d/app/GalleryActionBar.java
rc/com/android/gallery3d/app/GalleryActivity.java
rc/com/android/gallery3d/app/GalleryApp.java
rc/com/android/gallery3d/app/GalleryAppImpl.java
rc/com/android/gallery3d/app/GalleryContext.java
rc/com/android/gallery3d/app/LoadingListener.java
rc/com/android/gallery3d/app/Log.java
rc/com/android/gallery3d/app/ManageCachePage.java
rc/com/android/gallery3d/app/MovieActivity.java
rc/com/android/gallery3d/app/MoviePlayer.java
rc/com/android/gallery3d/app/PackagesMonitor.java
rc/com/android/gallery3d/app/PhotoDataAdapter.java
rc/com/android/gallery3d/app/PhotoPage.java
rc/com/android/gallery3d/app/SinglePhotoDataAdapter.java
rc/com/android/gallery3d/app/SlideshowDataAdapter.java
rc/com/android/gallery3d/app/SlideshowDream.java
rc/com/android/gallery3d/app/SlideshowPage.java
rc/com/android/gallery3d/app/StateManager.java
rc/com/android/gallery3d/app/UsbDeviceActivity.java
rc/com/android/gallery3d/app/Wallpaper.java
rc/com/android/gallery3d/data/ChangeNotifier.java
rc/com/android/gallery3d/data/ClusterAlbum.java
rc/com/android/gallery3d/data/ClusterAlbumSet.java
rc/com/android/gallery3d/data/ClusterSource.java
rc/com/android/gallery3d/data/Clustering.java
rc/com/android/gallery3d/data/ComboAlbum.java
rc/com/android/gallery3d/data/ComboAlbumSet.java
rc/com/android/gallery3d/data/ComboSource.java
rc/com/android/gallery3d/data/ContentListener.java
rc/com/android/gallery3d/data/DataManager.java
rc/com/android/gallery3d/data/DecodeUtils.java
rc/com/android/gallery3d/data/DownloadCache.java
rc/com/android/gallery3d/data/DownloadEntry.java
rc/com/android/gallery3d/data/DownloadUtils.java
rc/com/android/gallery3d/data/Face.java
rc/com/android/gallery3d/data/FaceClustering.java
rc/com/android/gallery3d/data/FilterSet.java
rc/com/android/gallery3d/data/FilterSource.java
rc/com/android/gallery3d/data/ImageCacheRequest.java
rc/com/android/gallery3d/data/ImageCacheService.java
rc/com/android/gallery3d/data/LocalAlbum.java
rc/com/android/gallery3d/data/LocalAlbumSet.java
rc/com/android/gallery3d/data/LocalImage.java
rc/com/android/gallery3d/data/LocalMediaItem.java
rc/com/android/gallery3d/data/LocalMergeAlbum.java
rc/com/android/gallery3d/data/LocalSource.java
rc/com/android/gallery3d/data/LocalVideo.java
rc/com/android/gallery3d/data/LocationClustering.java
rc/com/android/gallery3d/data/Log.java
rc/com/android/gallery3d/data/MediaDetails.java
rc/com/android/gallery3d/data/MediaItem.java
rc/com/android/gallery3d/data/MediaObject.java
rc/com/android/gallery3d/data/MediaSet.java
rc/com/android/gallery3d/data/MediaSource.java
rc/com/android/gallery3d/data/MtpClient.java
rc/com/android/gallery3d/data/MtpContext.java
rc/com/android/gallery3d/data/MtpDevice.java
rc/com/android/gallery3d/data/MtpDeviceSet.java
rc/com/android/gallery3d/data/MtpImage.java
rc/com/android/gallery3d/data/MtpSource.java
rc/com/android/gallery3d/data/Path.java
rc/com/android/gallery3d/data/PathMatcher.java
rc/com/android/gallery3d/data/SizeClustering.java
rc/com/android/gallery3d/data/TagClustering.java
rc/com/android/gallery3d/data/TimeClustering.java
rc/com/android/gallery3d/data/UriImage.java
rc/com/android/gallery3d/data/UriSource.java
rc/com/android/gallery3d/provider/GalleryProvider.java
rc/com/android/gallery3d/ui/AbstractDisplayItem.java
rc/com/android/gallery3d/ui/ActionModeHandler.java
rc/com/android/gallery3d/ui/AdaptiveBackground.java
rc/com/android/gallery3d/ui/AlbumSetSlidingWindow.java
rc/com/android/gallery3d/ui/AlbumSetView.java
rc/com/android/gallery3d/ui/AlbumSlidingWindow.java
rc/com/android/gallery3d/ui/AlbumView.java
rc/com/android/gallery3d/ui/BasicTexture.java
rc/com/android/gallery3d/ui/BitmapTexture.java
rc/com/android/gallery3d/ui/BitmapTileProvider.java
rc/com/android/gallery3d/ui/BoxBlurFilter.java
rc/com/android/gallery3d/ui/CacheBarView.java
rc/com/android/gallery3d/ui/CanvasTexture.java
rc/com/android/gallery3d/ui/ColorTexture.java
rc/com/android/gallery3d/ui/Config.java
rc/com/android/gallery3d/ui/CropView.java
rc/com/android/gallery3d/ui/CustomMenu.java
rc/com/android/gallery3d/ui/DetailsWindow.java
rc/com/android/gallery3d/ui/DisplayItem.java
rc/com/android/gallery3d/ui/DownUpDetector.java
rc/com/android/gallery3d/ui/DrawableTexture.java
rc/com/android/gallery3d/ui/FilmStripView.java
rc/com/android/gallery3d/ui/GLCanvas.java
rc/com/android/gallery3d/ui/GLCanvasImpl.java
rc/com/android/gallery3d/ui/GLPaint.java
rc/com/android/gallery3d/ui/GLRoot.java
rc/com/android/gallery3d/ui/GLRootView.java
rc/com/android/gallery3d/ui/GLView.java
rc/com/android/gallery3d/ui/GalleryEGLConfigChooser.java
rc/com/android/gallery3d/ui/GridDrawer.java
rc/com/android/gallery3d/ui/HighlightDrawer.java
rc/com/android/gallery3d/ui/Icon.java
rc/com/android/gallery3d/ui/IconDrawer.java
rc/com/android/gallery3d/ui/ImportCompleteListener.java
rc/com/android/gallery3d/ui/Label.java
rc/com/android/gallery3d/ui/Log.java
rc/com/android/gallery3d/ui/ManageCacheDrawer.java
rc/com/android/gallery3d/ui/MeasureHelper.java
rc/com/android/gallery3d/ui/MenuExecutor.java
rc/com/android/gallery3d/ui/MultiLineTexture.java
rc/com/android/gallery3d/ui/NinePatchChunk.java
rc/com/android/gallery3d/ui/NinePatchTexture.java
rc/com/android/gallery3d/ui/OnSelectedListener.java
rc/com/android/gallery3d/ui/Paper.java
rc/com/android/gallery3d/ui/PhotoView.java
rc/com/android/gallery3d/ui/PositionProvider.java
rc/com/android/gallery3d/ui/PositionRepository.java
rc/com/android/gallery3d/ui/ProgressBar.java
rc/com/android/gallery3d/ui/ProgressSpinner.java
rc/com/android/gallery3d/ui/RawTexture.java
rc/com/android/gallery3d/ui/ResourceTexture.java
rc/com/android/gallery3d/ui/ScrollBarView.java
rc/com/android/gallery3d/ui/ScrollView.java
rc/com/android/gallery3d/ui/ScrollerHelper.java
rc/com/android/gallery3d/ui/SelectionDrawer.java
rc/com/android/gallery3d/ui/SelectionManager.java
rc/com/android/gallery3d/ui/SlideshowView.java
rc/com/android/gallery3d/ui/SlotView.java
rc/com/android/gallery3d/ui/StaticBackground.java
rc/com/android/gallery3d/ui/StringTexture.java
rc/com/android/gallery3d/ui/StripDrawer.java
rc/com/android/gallery3d/ui/SynchronizedHandler.java
rc/com/android/gallery3d/ui/TextButton.java
rc/com/android/gallery3d/ui/Texture.java
rc/com/android/gallery3d/ui/TileImageView.java
rc/com/android/gallery3d/ui/TileImageViewAdapter.java
rc/com/android/gallery3d/ui/UploadedTexture.java
rc/com/android/gallery3d/ui/UserInteractionListener.java
rc/com/android/gallery3d/util/CacheManager.java
rc/com/android/gallery3d/util/Future.java
rc/com/android/gallery3d/util/FutureListener.java
rc/com/android/gallery3d/util/FutureTask.java
rc/com/android/gallery3d/util/GalleryUtils.java
rc/com/android/gallery3d/util/IdentityCache.java
rc/com/android/gallery3d/util/IntArray.java
rc/com/android/gallery3d/util/InterruptableOutputStream.java
rc/com/android/gallery3d/util/LinkedNode.java
rc/com/android/gallery3d/util/Log.java
rc/com/android/gallery3d/util/MediaSetUtils.java
rc/com/android/gallery3d/util/PriorityThreadFactory.java
rc/com/android/gallery3d/util/ReverseGeocoder.java
rc/com/android/gallery3d/util/ThreadPool.java
rc/com/android/gallery3d/util/UpdateHelper.java
rc/com/android/gallery3d/widget/LocalPhotoSource.java
rc/com/android/gallery3d/widget/MediaSetSource.java
rc/com/android/gallery3d/widget/WidgetClickHandler.java
rc/com/android/gallery3d/widget/WidgetConfigure.java
rc/com/android/gallery3d/widget/WidgetDatabaseHelper.java
rc/com/android/gallery3d/widget/WidgetProvider.java
rc/com/android/gallery3d/widget/WidgetService.java
rc/com/android/gallery3d/widget/WidgetSource.java
rc/com/android/gallery3d/widget/WidgetTypeChooser.java
rc/com/android/gallery3d/widget/WidgetUtils.java
rc_pd/com/android/gallery3d/picasasource/PicasaSource.java
rc_pd/com/android/gallery3d/settings/GallerySettings.java
ests/Android.mk
ests/AndroidManifest.xml
ests/src/com/android/gallery3d/anim/AnimationTest.java
ests/src/com/android/gallery3d/common/BlobCacheTest.java
ests/src/com/android/gallery3d/common/UtilsTest.java
ests/src/com/android/gallery3d/data/GalleryAppMock.java
ests/src/com/android/gallery3d/data/GalleryAppStub.java
ests/src/com/android/gallery3d/data/LocalDataTest.java
ests/src/com/android/gallery3d/data/MediaSetTest.java
ests/src/com/android/gallery3d/data/MockItem.java
ests/src/com/android/gallery3d/data/MockSet.java
ests/src/com/android/gallery3d/data/MockSource.java
ests/src/com/android/gallery3d/data/PathTest.java
ests/src/com/android/gallery3d/data/RealDataTest.java
ests/src/com/android/gallery3d/ui/GLCanvasMock.java
ests/src/com/android/gallery3d/ui/GLCanvasStub.java
ests/src/com/android/gallery3d/ui/GLCanvasTest.java
ests/src/com/android/gallery3d/ui/GLMock.java
ests/src/com/android/gallery3d/ui/GLRootMock.java
ests/src/com/android/gallery3d/ui/GLRootStub.java
ests/src/com/android/gallery3d/ui/GLStub.java
ests/src/com/android/gallery3d/ui/GLViewMock.java
ests/src/com/android/gallery3d/ui/GLViewTest.java
ests/src/com/android/gallery3d/ui/PointerInfo.java
ests/src/com/android/gallery3d/ui/TextureTest.java
ests/src/com/android/gallery3d/util/IntArrayTest.java
|
a85c80227a56f3b7f917464096cd33877093616f |
17-Aug-2011 |
Owen Lin <owenlin@google.com> |
Initial code for Gallery2. fix: 5176434 Change-Id: I041e282b9c7b34ceb1db8b033be2b853bb3a992c
es/drawable-hdpi/actionbar_translucent.9.png
es/drawable-hdpi/album_frame.9.png
es/drawable-hdpi/appwidget_photo_border.9.png
es/drawable-hdpi/background.jpg
es/drawable-hdpi/background_portrait.jpg
es/drawable-hdpi/border_photo_frame_widget_focused_holo.9.png
es/drawable-hdpi/border_photo_frame_widget_focused_pressed_holo.9.png
es/drawable-hdpi/border_photo_frame_widget_holo.9.png
es/drawable-hdpi/border_photo_frame_widget_pressed_holo.9.png
es/drawable-hdpi/btn_default_normal_holo_dark.9.png
es/drawable-hdpi/btn_default_pressed_holo_dark.9.png
es/drawable-hdpi/btn_make_offline_disabled_on_holo_dark.png
es/drawable-hdpi/btn_make_offline_normal_off_holo_dark.png
es/drawable-hdpi/btn_make_offline_normal_on_holo_dark.png
es/drawable-hdpi/cab_divider_vertical_dark.png
es/drawable-hdpi/camera_crop_height_holo.png
es/drawable-hdpi/camera_crop_width_holo.png
es/drawable-hdpi/dropdown_normal_holo_dark.9.png
es/drawable-hdpi/focus_box.9.png
es/drawable-hdpi/gallery_widget_preview.png
es/drawable-hdpi/grid_selected.9.png
es/drawable-hdpi/grid_selected_top.9.png
es/drawable-hdpi/ic_album_overlay_camera_holo.png
es/drawable-hdpi/ic_album_overlay_folder_holo.png
es/drawable-hdpi/ic_album_overlay_picassa_holo.png
es/drawable-hdpi/ic_album_overlay_ptp_holo.png
es/drawable-hdpi/ic_control_fail.png
es/drawable-hdpi/ic_control_play.png
es/drawable-hdpi/ic_manage_pin.png
es/drawable-hdpi/ic_menu_camera_holo_light.png
es/drawable-hdpi/ic_menu_cancel_holo_light.png
es/drawable-hdpi/ic_menu_info_details.png
es/drawable-hdpi/ic_menu_ptp_holo_light.png
es/drawable-hdpi/ic_menu_save_holo_light.png
es/drawable-hdpi/ic_menu_share_holo_light.png
es/drawable-hdpi/ic_menu_slideshow_holo_light.png
es/drawable-hdpi/ic_menu_trash_holo_light.png
es/drawable-hdpi/icn_media_pause_focused_holo_dark.png
es/drawable-hdpi/icn_media_pause_normal_holo_dark.png
es/drawable-hdpi/icn_media_pause_pressed_holo_dark.png
es/drawable-hdpi/icn_media_play_focused_holo_dark.png
es/drawable-hdpi/icn_media_play_normal_holo_dark.png
es/drawable-hdpi/icn_media_play_pressed_holo_dark.png
es/drawable-hdpi/import_translucent.9.png
es/drawable-hdpi/manage_bar.9.png
es/drawable-hdpi/manage_frame.9.png
es/drawable-hdpi/media_control_bg.9.png
es/drawable-hdpi/navstrip_translucent.9.png
es/drawable-hdpi/player_scrubber.png
es/drawable-hdpi/popup_full_dark.9.png
es/drawable-hdpi/preview.png
es/drawable-hdpi/progress_bg_holo_dark.9.png
es/drawable-hdpi/progress_primary_holo_dark.9.png
es/drawable-hdpi/progress_secondary_holo_dark.9.png
es/drawable-hdpi/scrollbar_handle_holo_dark.9.png
es/drawable-hdpi/spinner_76_inner_holo.png
es/drawable-hdpi/spinner_76_outer_holo.png
es/drawable-hdpi/thumbnail_album_video_overlay_holo.png
es/drawable-hdpi/videooverlay.png
es/drawable-hdpi/wallpaper_picker_preview.png
es/drawable-mdpi/actionbar_translucent.9.png
es/drawable-mdpi/album_frame.9.png
es/drawable-mdpi/appwidget_photo_border.9.png
es/drawable-mdpi/background.jpg
es/drawable-mdpi/background_portrait.jpg
es/drawable-mdpi/border_photo_frame_widget_focused_holo.9.png
es/drawable-mdpi/border_photo_frame_widget_focused_pressed_holo.9.png
es/drawable-mdpi/border_photo_frame_widget_holo.9.png
es/drawable-mdpi/border_photo_frame_widget_pressed_holo.9.png
es/drawable-mdpi/btn_default_normal_holo_dark.9.png
es/drawable-mdpi/btn_default_pressed_holo_dark.9.png
es/drawable-mdpi/btn_make_offline_disabled_on_holo_dark.png
es/drawable-mdpi/btn_make_offline_normal_off_holo_dark.png
es/drawable-mdpi/btn_make_offline_normal_on_holo_dark.png
es/drawable-mdpi/cab_divider_vertical_dark.png
es/drawable-mdpi/camera_crop_height_holo.png
es/drawable-mdpi/camera_crop_width_holo.png
es/drawable-mdpi/dropdown_normal_holo_dark.9.png
es/drawable-mdpi/focus_box.9.png
es/drawable-mdpi/gallery_widget_preview.png
es/drawable-mdpi/grid_selected.9.png
es/drawable-mdpi/grid_selected_top.9.png
es/drawable-mdpi/ic_album_overlay_camera_holo.png
es/drawable-mdpi/ic_album_overlay_folder_holo.png
es/drawable-mdpi/ic_album_overlay_picassa_holo.png
es/drawable-mdpi/ic_album_overlay_ptp_holo.png
es/drawable-mdpi/ic_control_fail.png
es/drawable-mdpi/ic_control_play.png
es/drawable-mdpi/ic_manage_pin.png
es/drawable-mdpi/ic_menu_camera_holo_light.png
es/drawable-mdpi/ic_menu_cancel_holo_light.png
es/drawable-mdpi/ic_menu_info_details.png
es/drawable-mdpi/ic_menu_ptp_holo_light.png
es/drawable-mdpi/ic_menu_save_holo_light.png
es/drawable-mdpi/ic_menu_share_holo_light.png
es/drawable-mdpi/ic_menu_slideshow_holo_light.png
es/drawable-mdpi/ic_menu_trash_holo_light.png
es/drawable-mdpi/icn_media_pause_focused_holo_dark.png
es/drawable-mdpi/icn_media_pause_normal_holo_dark.png
es/drawable-mdpi/icn_media_pause_pressed_holo_dark.png
es/drawable-mdpi/icn_media_play_focused_holo_dark.png
es/drawable-mdpi/icn_media_play_normal_holo_dark.png
es/drawable-mdpi/icn_media_play_pressed_holo_dark.png
es/drawable-mdpi/import_translucent.9.png
es/drawable-mdpi/manage_bar.9.png
es/drawable-mdpi/manage_frame.9.png
es/drawable-mdpi/media_control_bg.9.png
es/drawable-mdpi/navstrip_translucent.9.png
es/drawable-mdpi/player_scrubber.png
es/drawable-mdpi/popup_full_dark.9.png
es/drawable-mdpi/preview.png
es/drawable-mdpi/progress_bg_holo_dark.9.png
es/drawable-mdpi/progress_primary_holo_dark.9.png
es/drawable-mdpi/progress_secondary_holo_dark.9.png
es/drawable-mdpi/scrollbar_handle_holo_dark.9.png
es/drawable-mdpi/spinner_76_inner_holo.png
es/drawable-mdpi/spinner_76_outer_holo.png
es/drawable-mdpi/thumbnail_album_video_overlay_holo.png
es/drawable-mdpi/videooverlay.png
es/drawable-mdpi/wallpaper_picker_preview.png
es/drawable/border_photo_frame_widget.xml
es/drawable/icn_media_pause.xml
es/drawable/icn_media_play.xml
es/layout/account_header_preference.xml
es/layout/account_sync_preference.xml
es/layout/account_visible_preference.xml
es/layout/action_mode.xml
es/layout/appwidget_loading_item.xml
es/layout/appwidget_main.xml
es/layout/appwidget_photo_item.xml
es/layout/auto_upload_account_preference.xml
es/layout/auto_upload_help_text_preference.xml
es/layout/cache_notification.xml
es/layout/choose_widget_type.xml
es/layout/cropimage.xml
es/layout/dialog_picker.xml
es/layout/main.xml
es/layout/movie_view.xml
es/layout/photo_frame.xml
es/menu/album.xml
es/menu/albumset.xml
es/menu/crop.xml
es/menu/filterby.xml
es/menu/groupby.xml
es/menu/operation.xml
es/menu/photo.xml
es/menu/pickup.xml
es/menu/selection.xml
es/menu/settings.xml
es/mipmap-hdpi/ic_launcher_gallery.png
es/mipmap-mdpi/ic_launcher_gallery.png
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-w1024dp/strings.xml
es/values-xlarge/dimensions.xml
es/values-xlarge/styles.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
es/values/dimensions.xml
es/values/ids.xml
es/values/strings.xml
es/values/styles.xml
es/xml/device_filter.xml
es/xml/gallery_settings.xml
es/xml/syncadapter.xml
es/xml/wallpaper_picker_preview.xml
es/xml/widget_info.xml
rc/com/android/gallery3d/ui/ProgressBar.java
rc/com/android/gallery3d/ui/ProgressSpinner.java
|
a053a3179cfee3d2bb666eff5f4f03a96b092e04 |
11-Aug-2011 |
Ed Heyl <ed@google.com> |
new project, first commit
|